scriptscat
diff --git a/‎.github/workflows/build.yaml‎
Lines changed: 0 additions & 1 deletion b/‎.github/workflows/build.yaml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.github/workflows/test.yaml‎
Lines changed: 0 additions & 1 deletion b/‎.github/workflows/test.yaml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.husky/pre-commit‎
Lines changed: 13 additions & 28 deletions b/‎.husky/pre-commit‎
Lines changed: 13 additions & 28 deletions
diff --git a/‎e2e/agent-chat.spec.ts‎
Lines changed: 19 additions & 0 deletions b/‎e2e/agent-chat.spec.ts‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎e2e/agent-conversation.spec.ts‎
Lines changed: 204 additions & 0 deletions b/‎e2e/agent-conversation.spec.ts‎
Lines changed: 204 additions & 0 deletions
@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - release/*
-      - feature/*
       - dev
     paths-ignore:
       - ".github/**"
 
@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - release/*
-      - feature/*
       - dev
       - develop/*
   pull_request:
 
@@ -1,35 +1,20 @@
 #!/bin/sh
 
-# Skip checks: SKIP_PRE_PUSH=1 git push or git push --no-verify
-if [ "$SKIP_PRE_PUSH" = "1" ]; then
-  echo "⏭ SKIP_PRE_PUSH=1, skipping pre-push checks"
+# Skip: SKIP_PRE_COMMIT=1 git commit 或 git commit --no-verify
+if [ "$SKIP_PRE_COMMIT" = "1" ]; then
+  echo "⏭ SKIP_PRE_COMMIT=1, skipping pre-commit checks"
   exit 0
 fi
 
-# Only run checks when pushing to main or release/* branches
-remote="$1"
-need_check=0
-
-while read local_ref local_sha remote_ref remote_sha; do
-  branch=$(echo "$remote_ref" | sed 's|refs/heads/||')
-
-  if [ "$branch" = "main" ] || echo "$branch" | grep -q "^release/"; then
-    need_check=1
-    echo "🔍 Detected push target: $branch"
-  fi
-done
-
-if [ "$need_check" = "0" ]; then
-  exit 0
-fi
-
-echo ""
-echo "▶ Running lint..."
 pnpm run lint || exit 1
 
-echo ""
-echo "▶ Running tests..."
-pnpm run test:ci || exit 1
-
-echo ""
-echo "✅ All checks passed! (build and e2e tests will run in CI)"
+# 在 main 或 release/* 分支上提交时额外跑测试
+branch=$(git rev-parse --abbrev-ref HEAD)
+if [ "$branch" = "main" ] || echo "$branch" | grep -q "^release/"; then
+  echo ""
+  echo "🔍 Detected branch: $branch"
+  echo "▶ Running tests..."
+  pnpm run test:ci || exit 1
+  echo ""
+  echo "✅ All checks passed!"
+fi
@@ -0,0 +1,19 @@
+import { test, expect } from "./agent-fixtures";
+import { openAgentChatPage } from "./utils";
+
+test.describe("Agent Chat", () => {
+  test("should show new chat button and model selector", async ({ context, extensionId }) => {
+    const page = await openAgentChatPage(context, extensionId);
+    await page.waitForTimeout(2000);
+
+    // 新建会话按钮应可见
+    const newChatBtn = page.locator("button", { hasText: /new|新建/i }).first();
+    await expect(newChatBtn).toBeVisible({ timeout: 10000 });
+
+    // 模型选择器应可见且包含预配置的 Mock LLM 模型
+    const modelSelect = page.locator(".arco-select");
+    await expect(modelSelect.first()).toBeVisible({ timeout: 5000 });
+
+    await page.close();
+  });
+});
@@ -0,0 +1,204 @@
+import { expect } from "@playwright/test";
+import { test, makeTextSSE, makeToolCallSSE } from "./agent-fixtures";
+import { runInlineTestScript } from "./utils";
+
+const TARGET_URL = "https://content-security-policy.com/";
+
+test.describe("Agent Conversation API", () => {
+  test.setTimeout(300_000);
+
+  test("basic chat — send message and receive text reply", async ({ context, extensionId, mockLLMResponse }) => {
+    mockLLMResponse(() => makeTextSSE("1+1等于2。"));
+
+    const code = `// ==UserScript==
+// @name         Agent Basic Chat Test
+// @namespace    https://e2e.test
+// @version      1.0.0
+// @description  Test basic CAT.agent.conversation.chat()
+// @author       E2E
+// @match        ${TARGET_URL}*
+// @grant        CAT.agent.conversation
+// ==/UserScript==
+
+(async () => {
+  let passed = 0;
+  let failed = 0;
+  function assert(name, condition) {
+    if (condition) { passed++; console.log("PASS: " + name); }
+    else { failed++; console.log("FAIL: " + name); }
+  }
+
+  try {
+    const conv = await CAT.agent.conversation.create({
+      system: "你是一个助手。",
+    });
+    assert("conversation created", !!conv && !!conv.id);
+
+    const reply = await conv.chat("1+1等于几？");
+    assert("reply has content", !!reply.content);
+    assert("reply content correct", reply.content.includes("2"));
+    assert("reply has usage", !!reply.usage);
+  } catch (e) {
+    failed++;
+    console.log("ERROR: " + e.message);
+  }
+
+  console.log("通过: " + passed + ", 失败: " + failed);
+})();
+`;
+
+    const { passed, failed, logs } = await runInlineTestScript(context, extensionId, code, TARGET_URL, 60_000);
+
+    console.log(`[agent-basic-chat] passed=${passed}, failed=${failed}`);
+    if (failed !== 0) console.log("[agent-basic-chat] logs:", logs.join("\n"));
+    expect(failed, "Some basic chat tests failed").toBe(0);
+    expect(passed, "No test results found").toBeGreaterThan(0);
+  });
+
+  test("tool calling — script-defined tools are invoked", async ({ context, extensionId, mockLLMResponse }) => {
+    let callCount = 0;
+    mockLLMResponse(() => {
+      callCount++;
+      // First call: LLM decides to call the tool
+      if (callCount === 1) {
+        return makeToolCallSSE([
+          {
+            id: "call_1",
+            name: "get_weather",
+            arguments: JSON.stringify({ city: "北京" }),
+          },
+        ]);
+      }
+      // Second call: after tool result, LLM gives final answer
+      return makeTextSSE("北京今天22度，多云。");
+    });
+
+    const code = `// ==UserScript==
+// @name         Agent Tool Calling Test
+// @namespace    https://e2e.test
+// @version      1.0.0
+// @description  Test tool calling via CAT.agent.conversation
+// @author       E2E
+// @match        ${TARGET_URL}*
+// @grant        CAT.agent.conversation
+// ==/UserScript==
+
+(async () => {
+  let passed = 0;
+  let failed = 0;
+  let toolCalled = false;
+  let toolArgs = null;
+
+  function assert(name, condition) {
+    if (condition) { passed++; console.log("PASS: " + name); }
+    else { failed++; console.log("FAIL: " + name); }
+  }
+
+  try {
+    const conv = await CAT.agent.conversation.create({
+      system: "你是天气助手。",
+      tools: [
+        {
+          name: "get_weather",
+          description: "获取天气",
+          parameters: {
+            type: "object",
+            properties: {
+              city: { type: "string", description: "城市" },
+            },
+            required: ["city"],
+          },
+          handler: async (args) => {
+            toolCalled = true;
+            toolArgs = args;
+            return { city: args.city, temperature: 22, condition: "多云" };
+          },
+        },
+      ],
+    });
+
+    const reply = await conv.chat("北京天气怎么样？");
+    assert("tool was called", toolCalled);
+    assert("tool received city arg", toolArgs && toolArgs.city === "北京");
+    assert("final reply has content", !!reply.content);
+    assert("final reply mentions weather", reply.content.includes("22") || reply.content.includes("多云"));
+  } catch (e) {
+    failed++;
+    console.log("ERROR: " + e.message);
+  }
+
+  console.log("通过: " + passed + ", 失败: " + failed);
+})();
+`;
+
+    const { passed, failed, logs } = await runInlineTestScript(context, extensionId, code, TARGET_URL, 60_000);
+
+    console.log(`[agent-tool-calling] passed=${passed}, failed=${failed}`);
+    if (failed !== 0) console.log("[agent-tool-calling] logs:", logs.join("\n"));
+    expect(failed, "Some tool calling tests failed").toBe(0);
+    expect(passed, "No test results found").toBeGreaterThan(0);
+  });
+
+  test("multi-turn conversation — context is preserved", async ({ context, extensionId, mockLLMResponse }) => {
+    let requestCount = 0;
+    let lastMessages: any[] = [];
+
+    mockLLMResponse(({ messages }) => {
+      requestCount++;
+      lastMessages = messages;
+      if (requestCount === 1) {
+        return makeTextSSE("斐波那契数列是一个数列，每个数是前两个数之和。");
+      }
+      return makeTextSSE("前5个数是：1, 1, 2, 3, 5。");
+    });
+
+    const code = `// ==UserScript==
+// @name         Agent Multi-turn Test
+// @namespace    https://e2e.test
+// @version      1.0.0
+// @description  Test multi-turn conversation context preservation
+// @author       E2E
+// @match        ${TARGET_URL}*
+// @grant        CAT.agent.conversation
+// ==/UserScript==
+
+(async () => {
+  let passed = 0;
+  let failed = 0;
+  function assert(name, condition) {
+    if (condition) { passed++; console.log("PASS: " + name); }
+    else { failed++; console.log("FAIL: " + name); }
+  }
+
+  try {
+    const conv = await CAT.agent.conversation.create({
+      system: "你是数学老师。",
+    });
+
+    const reply1 = await conv.chat("什么是斐波那契数列？");
+    assert("first reply has content", !!reply1.content);
+
+    const reply2 = await conv.chat("前5个数是什么？");
+    assert("second reply has content", !!reply2.content);
+    assert("second reply has fibonacci numbers", reply2.content.includes("1") && reply2.content.includes("5"));
+  } catch (e) {
+    failed++;
+    console.log("ERROR: " + e.message);
+  }
+
+  console.log("通过: " + passed + ", 失败: " + failed);
+})();
+`;
+
+    const { passed, failed, logs } = await runInlineTestScript(context, extensionId, code, TARGET_URL, 60_000);
+
+    console.log(`[agent-multi-turn] passed=${passed}, failed=${failed}`);
+    if (failed !== 0) console.log("[agent-multi-turn] logs:", logs.join("\n"));
+    expect(failed, "Some multi-turn tests failed").toBe(0);
+    expect(passed, "No test results found").toBeGreaterThan(0);
+    // Verify the mock received multiple requests (context was sent)
+    expect(requestCount, "Should have made 2 LLM requests").toBe(2);
+    // The second request should contain history messages
+    expect(lastMessages.length, "Second request should include conversation history").toBeGreaterThan(2);
+  });
+});