chatccc 0.2.56 → 0.2.57

package/README.md

@@ -158,9 +158,9 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
   "claude": {
     "enabled": false,
     "defaultAgent": true,
-    "model": "claude-sonnet-4-6",
-    "subagentModel": "",
-    "effort": "",
+    "model": "claude-sonnet-4-6",
+    "subagentModel": "",
+    "effort": "",
     "apiKey": "",
     "baseUrl": ""
   },
@@ -189,9 +189,9 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `gitTimeoutSeconds` | `/git` 命令超时时间，默认 180 秒 |
 | `*.enabled` | 是否启用对应 AI Agent |
 | `*.defaultAgent` | `/new` 未指定 Agent 时使用哪个工具 |
-| `cursor.path` / `codex.path` | CLI 可执行文件路径；留空时自动探测或使用 PATH |
-| `claude.model` / `claude.subagentModel` | Claude Code 主模型 / subagent 模型；`subagentModel` 仅在第三方 API 模式下注入 `CLAUDE_CODE_SUBAGENT_MODEL` |
-| `claude.apiKey` / `claude.baseUrl` | 第三方 Anthropic 兼容网关配置；官方 Claude 用户留空 |
+| `cursor.path` / `codex.path` | CLI 可执行文件路径；留空时自动探测或使用 PATH |
+| `claude.model` / `claude.subagentModel` | Claude Code 主模型 / subagent 模型；`subagentModel` 仅在第三方 API 模式下注入 `CLAUDE_CODE_SUBAGENT_MODEL` |
+| `claude.apiKey` / `claude.baseUrl` | 第三方 Anthropic 兼容网关配置；官方 Claude 用户留空 |
 
 > 当前 ChatCCC 以 `bypassPermissions` 模式运行，会跳过 Agent 操作确认。请只在可信环境中使用。
 

package/config.sample.json

@@ -10,14 +10,14 @@
   "port": 18080,
   "gitTimeoutSeconds": 180,
   "allowInterrupt": false,
-  "claude": {
-    "enabled": false,
-    "defaultAgent": true,
-    "model": "claude-sonnet-4-6",
-    "subagentModel": "",
-    "effort": "",
-    "apiKey": "",
-    "baseUrl": ""
+  "claude": {
+    "enabled": false,
+    "defaultAgent": true,
+    "model": "claude-sonnet-4-6",
+    "subagentModel": "",
+    "effort": "",
+    "apiKey": "",
+    "baseUrl": ""
   },
   "cursor": {
     "enabled": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.56",
+  "version": "0.2.57",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/claude-adapter.test.ts

@@ -771,10 +771,10 @@ describe("createClaudeAdapter — env 注入", () => {
     expect(opts.env.ANTHROPIC_BASE_URL).toBe("https://api.deepseek.com/anthropic");
   });
 
-  it("apiKey + baseUrl 都设置 → 同时覆盖", async () => {
-    setupMockCreateSession();
-    const adapter = createClaudeAdapter({
-      model: "",
+  it("apiKey + baseUrl 都设置 → 同时覆盖", async () => {
+    setupMockCreateSession();
+    const adapter = createClaudeAdapter({
+      model: "",
       effort: "",
       isEmpty: (v) => v.trim() === "",
       apiKey: "sk-x",
@@ -784,50 +784,50 @@ describe("createClaudeAdapter — env 注入", () => {
     await adapter.createSession("/cwd");
 
     const opts = sdk.unstable_v2_createSession.mock.calls[0][0];
-    expect(opts.env.ANTHROPIC_API_KEY).toBe("sk-x");
-    expect(opts.env.ANTHROPIC_BASE_URL).toBe("https://gateway.example/anthropic");
-  });
-
-  it("官方 API 模式下 subagentModel 不注入 env，也不覆盖 Claude 登录环境", async () => {
-    setupMockCreateSession();
-    process.env.CLAUDE_CODE_OAUTH_TOKEN = "oauth-from-login";
-    const adapter = createClaudeAdapter({
-      model: "claude-sonnet-4-6",
-      subagentModel: "claude-haiku-4-5-20251001",
-      effort: "",
-      isEmpty: (v) => v.trim() === "",
-      apiKey: "",
-      baseUrl: "",
-    });
-
-    await adapter.createSession("/cwd");
-
-    const opts = sdk.unstable_v2_createSession.mock.calls[0][0];
-    expect(opts).not.toHaveProperty("env");
-  });
-
-  it("第三方 API 模式下 subagentModel 通过 CLAUDE_CODE_SUBAGENT_MODEL 覆盖 Haiku", async () => {
-    setupMockCreateSession();
-    process.env.CLAUDE_CODE_OAUTH_TOKEN = "oauth-from-login";
-    const adapter = createClaudeAdapter({
-      model: "claude-sonnet-4-6",
-      subagentModel: "claude-haiku-4-5-20251001",
-      effort: "",
-      isEmpty: (v) => v.trim() === "",
-      apiKey: "sk-thirdparty",
-      baseUrl: "https://gateway.example/anthropic",
-    });
-
-    await adapter.createSession("/cwd");
-
-    const opts = sdk.unstable_v2_createSession.mock.calls[0][0];
-    expect(opts.model).toBe("claude-sonnet-4-6");
-    expect(opts.env.ANTHROPIC_API_KEY).toBe("sk-thirdparty");
-    expect(opts.env.CLAUDE_CODE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
-    expect(opts.env.CLAUDE_CODE_OAUTH_TOKEN).toBeUndefined();
-  });
-
-  it("ChatCCC API config is isolated from Claude settings auth/model env", async () => {
+    expect(opts.env.ANTHROPIC_API_KEY).toBe("sk-x");
+    expect(opts.env.ANTHROPIC_BASE_URL).toBe("https://gateway.example/anthropic");
+  });
+
+  it("官方 API 模式下 subagentModel 不注入 env，也不覆盖 Claude 登录环境", async () => {
+    setupMockCreateSession();
+    process.env.CLAUDE_CODE_OAUTH_TOKEN = "oauth-from-login";
+    const adapter = createClaudeAdapter({
+      model: "claude-sonnet-4-6",
+      subagentModel: "claude-haiku-4-5-20251001",
+      effort: "",
+      isEmpty: (v) => v.trim() === "",
+      apiKey: "",
+      baseUrl: "",
+    });
+
+    await adapter.createSession("/cwd");
+
+    const opts = sdk.unstable_v2_createSession.mock.calls[0][0];
+    expect(opts).not.toHaveProperty("env");
+  });
+
+  it("第三方 API 模式下 subagentModel 通过 CLAUDE_CODE_SUBAGENT_MODEL 覆盖 Haiku", async () => {
+    setupMockCreateSession();
+    process.env.CLAUDE_CODE_OAUTH_TOKEN = "oauth-from-login";
+    const adapter = createClaudeAdapter({
+      model: "claude-sonnet-4-6",
+      subagentModel: "claude-haiku-4-5-20251001",
+      effort: "",
+      isEmpty: (v) => v.trim() === "",
+      apiKey: "sk-thirdparty",
+      baseUrl: "https://gateway.example/anthropic",
+    });
+
+    await adapter.createSession("/cwd");
+
+    const opts = sdk.unstable_v2_createSession.mock.calls[0][0];
+    expect(opts.model).toBe("claude-sonnet-4-6");
+    expect(opts.env.ANTHROPIC_API_KEY).toBe("sk-thirdparty");
+    expect(opts.env.CLAUDE_CODE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
+    expect(opts.env.CLAUDE_CODE_OAUTH_TOKEN).toBeUndefined();
+  });
+
+  it("ChatCCC API config is isolated from Claude settings auth/model env", async () => {
     setupMockCreateSession();
     process.env.ANTHROPIC_AUTH_TOKEN = "token-from-claude-settings";
     process.env.CLAUDE_CODE_OAUTH_TOKEN = "oauth-from-claude-settings";

package/src/__tests__/config-reload.test.ts

@@ -10,9 +10,9 @@ import {
   CHATCCC_PORT,
   CLAUDE_API_KEY,
   CLAUDE_BASE_URL,
-  CLAUDE_EFFORT,
-  CLAUDE_MODEL,
-  CLAUDE_SUBAGENT_MODEL,
+  CLAUDE_EFFORT,
+  CLAUDE_MODEL,
+  CLAUDE_SUBAGENT_MODEL,
   CURSOR_AGENT_ARGS,
   CURSOR_AGENT_COMMAND,
   FEISHU_ENABLED,
@@ -44,10 +44,10 @@ const baseAppConfig: AppConfig = {
   allowInterrupt: false,
   claude: {
     enabled: true,
-    defaultAgent: true,
-    model: "initial-model",
-    subagentModel: "initial-subagent-model",
-    effort: "initial-effort",
+    defaultAgent: true,
+    model: "initial-model",
+    subagentModel: "initial-subagent-model",
+    effort: "initial-effort",
     apiKey: "sk-initial",
     baseUrl: "https://initial.gw/anthropic",
   },
@@ -80,22 +80,22 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
     expect(APP_SECRET).toBe("NEW_APP_SECRET");
   });
 
-  it("更新 Claude 配置（model / subagentModel / effort / apiKey / baseUrl）", () => {
+  it("更新 Claude 配置（model / subagentModel / effort / apiKey / baseUrl）", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
       claude: {
         enabled: true,
-        defaultAgent: true,
-        model: "claude-sonnet-4-6",
-        subagentModel: "claude-haiku-4-5-20251001",
-        effort: "high",
+        defaultAgent: true,
+        model: "claude-sonnet-4-6",
+        subagentModel: "claude-haiku-4-5-20251001",
+        effort: "high",
         apiKey: "sk-newkey",
         baseUrl: "https://gw2.example/anthropic",
       },
     });
 
-    expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");
-    expect(CLAUDE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
+    expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");
+    expect(CLAUDE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
     expect(CLAUDE_EFFORT).toBe("high");
     expect(CLAUDE_API_KEY).toBe("sk-newkey");
     expect(CLAUDE_BASE_URL).toBe("https://gw2.example/anthropic");

package/src/__tests__/config-sample.test.ts

@@ -6,25 +6,25 @@ import { describe, expect, it } from "vitest";
 describe("config.sample.json", () => {
   it("enables Feishu and WeChat iLink by default", () => {
     const configSamplePath = join(process.cwd(), "config.sample.json");
-    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
-      platforms?: {
-        feishu?: { enabled?: unknown };
-        ilink?: { enabled?: unknown };
-      };
-      claude?: { model?: unknown; subagentModel?: unknown };
-    };
-
-    expect(sample.platforms?.feishu?.enabled).toBe(true);
-    expect(sample.platforms?.ilink?.enabled).toBe(true);
-  });
-
-  it("uses an Anthropic official main model and leaves subagent override empty by default", () => {
-    const configSamplePath = join(process.cwd(), "config.sample.json");
-    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
-      claude?: { model?: unknown; subagentModel?: unknown };
-    };
-
-    expect(sample.claude?.model).toBe("claude-sonnet-4-6");
-    expect(sample.claude?.subagentModel).toBe("");
-  });
-});
+    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
+      platforms?: {
+        feishu?: { enabled?: unknown };
+        ilink?: { enabled?: unknown };
+      };
+      claude?: { model?: unknown; subagentModel?: unknown };
+    };
+
+    expect(sample.platforms?.feishu?.enabled).toBe(true);
+    expect(sample.platforms?.ilink?.enabled).toBe(true);
+  });
+
+  it("uses an Anthropic official main model and leaves subagent override empty by default", () => {
+    const configSamplePath = join(process.cwd(), "config.sample.json");
+    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
+      claude?: { model?: unknown; subagentModel?: unknown };
+    };
+
+    expect(sample.claude?.model).toBe("claude-sonnet-4-6");
+    expect(sample.claude?.subagentModel).toBe("");
+  });
+});

package/src/__tests__/privacy.test.ts

@@ -1,143 +1,143 @@
-import { describe, it, expect, beforeEach, afterEach, afterAll, vi } from "vitest";
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-// 在 import privacy 之前 mock config，让 USER_DATA_DIR 指向临时目录
-const TEST_DATA_DIR = await mkdtemp(join(tmpdir(), "chatccc-privacy-test-"));
-vi.mock("../config.ts", async () => {
-  const actual = await vi.importActual<typeof import("../config.ts")>("../config.ts");
-  return {
-    ...actual,
-    USER_DATA_DIR: TEST_DATA_DIR,
-    ts: () => "test-ts",
-  };
-});
-
-let applyPrivacy: (text: string) => string;
-let reloadPrivacyRules: () => void;
-let getPrivacyRules: () => Record<string, string>;
-
-beforeEach(async () => {
-  vi.resetModules();
-  // 清理临时目录中的 privacy.json
-  try {
-    await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
-  } catch {}
-  const mod = await import("../privacy.ts");
-  applyPrivacy = mod.applyPrivacy;
-  reloadPrivacyRules = mod.reloadPrivacyRules;
-  getPrivacyRules = mod.getPrivacyRules;
-});
-
-afterEach(async () => {
-  try {
-    await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
-  } catch {}
-});
-
-afterAll(async () => {
-  try {
-    await rm(TEST_DATA_DIR, { recursive: true, force: true });
-  } catch {}
-});
-
-describe("applyPrivacy", () => {
-  it("无 privacy.json 时返回原文", () => {
-    reloadPrivacyRules();
-    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
-  });
-
-  it("privacy.json 存在时按规则替换", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ weizhangjian: "wzj", secret: "***" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("hello weizhangjian")).toBe("hello wzj");
-    expect(applyPrivacy("my secret is safe")).toBe("my *** is safe");
-    expect(applyPrivacy("weizhangjian and secret")).toBe("wzj and ***");
-  });
-
-  it("多规则替换多次出现", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ a: "A", b: "B" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("a b a b")).toBe("A B A B");
-  });
-
-  it("空文本直接返回", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ x: "y" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("")).toBe("");
-  });
-
-  it("规则中的特殊字符不会被当作正则", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ "a.b": "X", "(test)": "Y", "*star": "Z" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("hello a.b world")).toBe("hello X world");
-    expect(applyPrivacy("text (test) here")).toBe("text Y here");
-    expect(applyPrivacy("a *star shines")).toBe("a Z shines");
-  });
-
-  it("reloadPrivacyRules 强制重新加载", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ old: "OLD" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("old")).toBe("OLD");
-    expect(getPrivacyRules()).toEqual({ old: "OLD" });
-
-    // 变更磁盘内容后 reload
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ new: "NEW" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("new")).toBe("NEW");
-    expect(getPrivacyRules()).toEqual({ new: "NEW" });
-  });
-
-  it("格式错误的 JSON 不抛异常，返回原文", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      "not json",
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("hello")).toBe("hello");
-  });
-
-  it("数组格式的 JSON 不抛异常，返回原文", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify(["a", "b"]),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("hello")).toBe("hello");
-  });
+import { describe, it, expect, beforeEach, afterEach, afterAll, vi } from "vitest";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+// 在 import privacy 之前 mock config，让 USER_DATA_DIR 指向临时目录
+const TEST_DATA_DIR = await mkdtemp(join(tmpdir(), "chatccc-privacy-test-"));
+vi.mock("../config.ts", async () => {
+  const actual = await vi.importActual<typeof import("../config.ts")>("../config.ts");
+  return {
+    ...actual,
+    USER_DATA_DIR: TEST_DATA_DIR,
+    ts: () => "test-ts",
+  };
+});
+
+let applyPrivacy: (text: string) => string;
+let reloadPrivacyRules: () => void;
+let getPrivacyRules: () => Record<string, string>;
+
+beforeEach(async () => {
+  vi.resetModules();
+  // 清理临时目录中的 privacy.json
+  try {
+    await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
+  } catch {}
+  const mod = await import("../privacy.ts");
+  applyPrivacy = mod.applyPrivacy;
+  reloadPrivacyRules = mod.reloadPrivacyRules;
+  getPrivacyRules = mod.getPrivacyRules;
+});
+
+afterEach(async () => {
+  try {
+    await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
+  } catch {}
+});
+
+afterAll(async () => {
+  try {
+    await rm(TEST_DATA_DIR, { recursive: true, force: true });
+  } catch {}
+});
+
+describe("applyPrivacy", () => {
+  it("无 privacy.json 时返回原文", () => {
+    reloadPrivacyRules();
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
+  });
+
+  it("privacy.json 存在时按规则替换", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ weizhangjian: "wzj", secret: "***" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello wzj");
+    expect(applyPrivacy("my secret is safe")).toBe("my *** is safe");
+    expect(applyPrivacy("weizhangjian and secret")).toBe("wzj and ***");
+  });
+
+  it("多规则替换多次出现", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ a: "A", b: "B" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("a b a b")).toBe("A B A B");
+  });
+
+  it("空文本直接返回", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ x: "y" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("")).toBe("");
+  });
+
+  it("规则中的特殊字符不会被当作正则", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ "a.b": "X", "(test)": "Y", "*star": "Z" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello a.b world")).toBe("hello X world");
+    expect(applyPrivacy("text (test) here")).toBe("text Y here");
+    expect(applyPrivacy("a *star shines")).toBe("a Z shines");
+  });
+
+  it("reloadPrivacyRules 强制重新加载", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ old: "OLD" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("old")).toBe("OLD");
+    expect(getPrivacyRules()).toEqual({ old: "OLD" });
+
+    // 变更磁盘内容后 reload
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ new: "NEW" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("new")).toBe("NEW");
+    expect(getPrivacyRules()).toEqual({ new: "NEW" });
+  });
+
+  it("格式错误的 JSON 不抛异常，返回原文", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      "not json",
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello")).toBe("hello");
+  });
+
+  it("数组格式的 JSON 不抛异常，返回原文", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify(["a", "b"]),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello")).toBe("hello");
+  });
 });

package/src/__tests__/session.test.ts

@@ -662,7 +662,7 @@ describe("accumulateBlockContent", () => {
   it("accumulates thinking block into accumulatedContent", () => {
     const s = freshState();
     accumulateBlockContent({ type: "thinking", thinking: "Let me think..." }, s);
-    expect(s.accumulatedContent).toBe("Let me think...");
+    expect(s.accumulatedContent).toBe("\n> Let me think...\n");
     expect(s.chunkCount).toBe(1);
     expect(s.finalText).toBe("");
   });
@@ -786,7 +786,7 @@ describe("accumulateBlockContent", () => {
     );
     accumulateBlockContent({ type: "text", text: "I found the results." }, s);
 
-    expect(s.accumulatedContent).toContain("Hmm...");
+    expect(s.accumulatedContent).toContain("> Hmm...");
     expect(s.accumulatedContent).toContain("Grep");
     expect(s.accumulatedContent).toContain("found 3 matches");
     expect(s.finalText).toBe("I found the results.");