chatccc 0.2.54 → 0.2.56

package/README.md

@@ -158,7 +158,8 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
   "claude": {
     "enabled": false,
     "defaultAgent": true,
-    "model": "",
+    "model": "claude-sonnet-4-6",
+    "subagentModel": "",
     "effort": "",
     "apiKey": "",
     "baseUrl": ""
@@ -189,6 +190,7 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `*.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 用户留空 |
 
 > 当前 ChatCCC 以 `bypassPermissions` 模式运行，会跳过 Agent 操作确认。请只在可信环境中使用。

package/config.sample.json

@@ -13,7 +13,8 @@
   "claude": {
     "enabled": false,
     "defaultAgent": true,
-    "model": "",
+    "model": "claude-sonnet-4-6",
+    "subagentModel": "",
     "effort": "",
     "apiKey": "",
     "baseUrl": ""

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "chatccc",
-  "version": "0.2.54",
-  "description": "Feishu bot bridge for Claude Code",
-  "license": "Apache-2.0",
-  "type": "module",
-  "main": "./src/index.ts",
-  "bin": {
-    "chatccc": "bin/chatccc.mjs"
-  },
-  "files": [
-    "src/",
-    "bin/",
-    "demo/ilink_echo_probe.ts",
-    "im-skills/",
-    "images/img_readme_*.jpg",
-    "images/img_readme_*.png",
-    "images/avatars/status_*.png",
-    "images/avatars/badges/",
-    "package.json",
-    "README.md",
-    "config.sample.json"
-  ],
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "chatccc": "tsx src/index.ts",
-    "start": "tsx src/index.ts",
-    "demo:bot-test": "tsx demo/bot_test.ts",
-    "demo:bot-test:local": "tsx demo/bot_test.ts --local",
-    "demo:create-group": "tsx src/index.ts",
-    "demo:create-group:local": "tsx src/index.ts --local",
-    "demo:permission-check": "tsx demo/permission_check.ts",
-    "demo:claude-hi": "tsx demo/claude_say_hi.ts",
-    "demo:codex-hi": "tsx demo/codex_say_hi.ts",
-    "demo:ilink-echo": "tsx demo/ilink_echo_probe.ts",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
-  "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.2.133",
-    "@larksuiteoapi/node-sdk": "^1.59.0",
-    "@openilink/openilink-sdk-node": "^0.6.0",
-    "nodemailer": "^8.0.7",
-    "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.34.5",
-    "tsx": "^4.0.0",
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.18.1",
-    "typescript": "^5.0.0",
-    "vitest": "^4.1.5"
-  },
-  "engines": {
-    "node": ">=20"
-  }
-}
+{
+  "name": "chatccc",
+  "version": "0.2.56",
+  "description": "Feishu bot bridge for Claude Code",
+  "license": "Apache-2.0",
+  "type": "module",
+  "main": "./src/index.ts",
+  "bin": {
+    "chatccc": "bin/chatccc.mjs"
+  },
+  "files": [
+    "src/",
+    "bin/",
+    "demo/ilink_echo_probe.ts",
+    "im-skills/",
+    "images/img_readme_*.jpg",
+    "images/img_readme_*.png",
+    "images/avatars/status_*.png",
+    "images/avatars/badges/",
+    "package.json",
+    "README.md",
+    "config.sample.json"
+  ],
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "chatccc": "tsx src/index.ts",
+    "start": "tsx src/index.ts",
+    "demo:bot-test": "tsx demo/bot_test.ts",
+    "demo:bot-test:local": "tsx demo/bot_test.ts --local",
+    "demo:create-group": "tsx src/index.ts",
+    "demo:create-group:local": "tsx src/index.ts --local",
+    "demo:permission-check": "tsx demo/permission_check.ts",
+    "demo:claude-hi": "tsx demo/claude_say_hi.ts",
+    "demo:codex-hi": "tsx demo/codex_say_hi.ts",
+    "demo:ilink-echo": "tsx demo/ilink_echo_probe.ts",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "dependencies": {
+    "@anthropic-ai/claude-agent-sdk": "0.2.133",
+    "@larksuiteoapi/node-sdk": "^1.59.0",
+    "@openilink/openilink-sdk-node": "^0.6.0",
+    "nodemailer": "^8.0.7",
+    "qrcode-terminal": "^0.12.0",
+    "sharp": "^0.34.5",
+    "tsx": "^4.0.0",
+    "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.18.1",
+    "typescript": "^5.0.0",
+    "vitest": "^4.1.5"
+  },
+  "engines": {
+    "node": ">=20"
+  }
+}

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

@@ -788,6 +788,45 @@ describe("createClaudeAdapter — env 注入", () => {
     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";

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

@@ -12,6 +12,7 @@ import {
   CLAUDE_BASE_URL,
   CLAUDE_EFFORT,
   CLAUDE_MODEL,
+  CLAUDE_SUBAGENT_MODEL,
   CURSOR_AGENT_ARGS,
   CURSOR_AGENT_COMMAND,
   FEISHU_ENABLED,
@@ -45,6 +46,7 @@ const baseAppConfig: AppConfig = {
     enabled: true,
     defaultAgent: true,
     model: "initial-model",
+    subagentModel: "initial-subagent-model",
     effort: "initial-effort",
     apiKey: "sk-initial",
     baseUrl: "https://initial.gw/anthropic",
@@ -78,20 +80,22 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
     expect(APP_SECRET).toBe("NEW_APP_SECRET");
   });
 
-  it("更新 Claude 配置（model / effort / apiKey / baseUrl）", () => {
+  it("更新 Claude 配置（model / subagentModel / effort / apiKey / baseUrl）", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
       claude: {
         enabled: true,
         defaultAgent: true,
-        model: "deepseek-v4-pro",
+        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("deepseek-v4-pro");
+    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

@@ -11,9 +11,20 @@ describe("config.sample.json", () => {
         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__/session.test.ts

@@ -682,20 +682,22 @@ describe("accumulateBlockContent", () => {
     );
     expect(s.accumulatedContent).toContain("📖"); // 📖
     expect(s.accumulatedContent).toContain("**Read**");
-    expect(s.accumulatedContent).toContain("file_path");
+    expect(s.accumulatedContent).toContain("/tmp/test.txt");
   });
 
   it("accumulates tool_use block with long input truncated", () => {
     const s = freshState();
     const longInput = "x".repeat(500);
     accumulateBlockContent(
-      { type: "tool_use", name: "Bash", input: longInput },
+      { type: "tool_use", name: "Bash", input: { command: longInput } },
       s,
     );
-    expect(s.accumulatedContent).toContain("...");
-    // Should be truncated to 300 + "..."
-    const inputPart = s.accumulatedContent.split("`")[1];
-    expect(inputPart.length).toBeLessThanOrEqual(304); // 300 + "..."
+    // 简化规则截断到 500 chars
+    expect(s.accumulatedContent).toContain("🖥️");
+    expect(s.accumulatedContent).toContain("**Bash**");
+    // command 超过 maxLength=500 时会被截断
+    const body = s.accumulatedContent.split("**Bash** ")[1]?.trim() ?? "";
+    expect(body.length).toBeLessThanOrEqual(503); // 500 + "..."
   });
 
   it("accumulates tool_result block with success icon (✅)", () => {

package/src/__tests__/simplify.test.ts

@@ -0,0 +1,283 @@
+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";
+
+const TEST_DATA_DIR = await mkdtemp(join(tmpdir(), "chatccc-simplify-test-"));
+vi.mock("../config.ts", async () => {
+  const actual = await vi.importActual<typeof import("../config.ts")>("../config.ts");
+  return {
+    ...actual,
+    PROJECT_ROOT: TEST_DATA_DIR,
+    ts: () => "test-ts",
+  };
+});
+
+let simplifyToolUse: (name: string, input: unknown) => string | null;
+let simplifyToolResult: (name: string, toolUseId: string, isError: boolean, toolCallInput?: unknown) => string | null;
+let reloadSimplifyConfig: () => void;
+
+beforeEach(async () => {
+  vi.resetModules();
+  try {
+    await rm(join(TEST_DATA_DIR, "simplify.json"), { force: true });
+  } catch {}
+  const mod = await import("../simplify.ts");
+  simplifyToolUse = mod.simplifyToolUse;
+  simplifyToolResult = mod.simplifyToolResult;
+  reloadSimplifyConfig = mod.reloadSimplifyConfig;
+});
+
+afterAll(async () => {
+  try {
+    await rm(TEST_DATA_DIR, { recursive: true, force: true });
+  } catch {}
+});
+
+describe("simplifyToolUse", () => {
+  it("无 simplify.json 时返回 null（回退默认格式化）", () => {
+    reloadSimplifyConfig();
+    expect(simplifyToolUse("Read", { file_path: "/tmp/x.ts" })).toBeNull();
+  });
+
+  it("有规则时按模板格式化 tool_use", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          Read: { template: "📖 **Read** {file_path}", maxLength: 300 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolUse("Read", { file_path: "/home/user/project/src/index.ts" }))
+      .toBe("📖 **Read** /home/user/project/src/index.ts");
+  });
+
+  it("无对应工具规则时返回 null", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          Read: { template: "📖 **Read** {file_path}", maxLength: 300 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolUse("Write", { file_path: "/tmp/x.ts" })).toBeNull();
+  });
+
+  it("模板中未匹配的占位符保留原文", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          Read: { template: "📖 **Read** {file_path} {unknown_field}", maxLength: 300 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolUse("Read", { file_path: "/tmp/x.ts" }))
+      .toBe("📖 **Read** /tmp/x.ts {unknown_field}");
+  });
+
+  it("超过 maxLength 时截断", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          Bash: { template: "🖥️ **Bash** {command}", maxLength: 20 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    const result = simplifyToolUse("Bash", { command: "echo hello world this is a long command" });
+    expect(result).toBeTruthy();
+    // 被截断了：长度不超过 maxLength + 3（"..." 后缀）
+    expect(result!.length).toBeLessThanOrEqual(23);
+    expect(result!.endsWith("...")).toBe(true);
+  });
+
+  it("多字段模板", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          Grep: { template: "🔎 **Grep** {pattern} in {path}", maxLength: 300 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolUse("Grep", { pattern: "TODO", path: "src/" }))
+      .toBe("🔎 **Grep** TODO in src/");
+  });
+
+  it("input 为 null 时不抛异常", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          TodoWrite: { template: "✅ **TodoWrite**", maxLength: 200 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolUse("TodoWrite", null)).toBe("✅ **TodoWrite**");
+  });
+});
+
+describe("simplifyToolResult", () => {
+  it("无 simplify.json 时返回 null", () => {
+    reloadSimplifyConfig();
+    expect(simplifyToolResult("Read", "abc123def456", false)).toBeNull();
+  });
+
+  it("有规则时按模板格式化 tool_result", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_result: {
+          Read: { template: "✅ *{id}*: 已读取", maxLength: 200 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolResult("Read", "abc123def456", false))
+      .toBe("✅ *def456*: 已读取");
+  });
+
+  it("isError 时结果前加 ❌", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_result: {
+          Read: { template: "✅ *{id}*: 已读取", maxLength: 200 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolResult("Read", "abc123def456", true))
+      .toBe("❌ ✅ *def456*: 已读取");
+  });
+
+  it("tool_result 模板可使用 tool_use 的输入字段", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_result: {
+          Write: { template: "✅ *{id}*: 已写入 {file_path}", maxLength: 200 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolResult("Write", "abc123def456", false, { file_path: "/tmp/out.txt" }))
+      .toBe("✅ *def456*: 已写入 /tmp/out.txt");
+  });
+
+  it("无对应工具规则时返回 null", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_result: {
+          Read: { template: "✅ *{id}*: 已读取", maxLength: 200 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    expect(simplifyToolResult("Write", "abc123def456", false)).toBeNull();
+  });
+});
+
+describe("accumulateBlockContent with simplification", () => {
+  it("tool_use 使用简化规则，tool_result 回退默认格式", async () => {
+    // 动态 import session 以使用当前 mock 的简单化模块
+    const { accumulateBlockContent } = await import("../session.ts");
+
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_use: {
+          Read: { template: "📖 **Read** {file_path}", maxLength: 300 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    const state = { accumulatedContent: "", finalText: "", finalCompleteText: "", chunkCount: 0 };
+    const toolCallMap = new Map<string, { name: string; input: unknown }>();
+
+    accumulateBlockContent(
+      { type: "tool_use", id: "toolu_001", name: "Read", input: { file_path: "/src/app.ts" } },
+      state,
+      toolCallMap,
+    );
+
+    expect(state.accumulatedContent).toBe("\n\n📖 **Read** /src/app.ts\n");
+  });
+
+  it("无简化规则时回退默认 tool_use 格式", async () => {
+    const { accumulateBlockContent: acb } = await import("../session.ts");
+
+    reloadSimplifyConfig(); // 无 simplify.json
+
+    const state = { accumulatedContent: "", finalText: "", finalCompleteText: "", chunkCount: 0 };
+    const toolCallMap = new Map<string, { name: string; input: unknown }>();
+
+    acb(
+      { type: "tool_use", id: "toolu_001", name: "Read", input: { file_path: "/src/app.ts" } },
+      state,
+      toolCallMap,
+    );
+
+    expect(state.accumulatedContent).toContain("📖 **Read**");
+    expect(state.accumulatedContent).toContain('{"file_path":"/src/app.ts"}');
+  });
+
+  it("tool_result 使用简化规则", async () => {
+    const { accumulateBlockContent: acb } = await import("../session.ts");
+
+    await writeFile(
+      join(TEST_DATA_DIR, "simplify.json"),
+      JSON.stringify({
+        tool_result: {
+          Read: { template: "✅ *{id}*: 已读取 {file_path}", maxLength: 200 },
+        },
+      }),
+      "utf-8",
+    );
+    reloadSimplifyConfig();
+
+    const state = { accumulatedContent: "", finalText: "", finalCompleteText: "", chunkCount: 0 };
+    const toolCallMap = new Map<string, { name: string; input: unknown }>();
+    toolCallMap.set("toolu_001", { name: "Read", input: { file_path: "/src/app.ts" } });
+
+    acb(
+      { type: "tool_result", tool_use_id: "toolu_001", content: "file content here..." },
+      state,
+      toolCallMap,
+    );
+
+    expect(state.accumulatedContent).toBe("✅ *lu_001*: 已读取 /src/app.ts\n");
+  });
+});

package/src/__tests__/web-ui.test.ts

@@ -3,6 +3,7 @@ import {
   applyClaudeApiMode,
   chooseStartPath,
   detectClaudeApiMode,
+  unflattenConfig,
 } from "../web-ui.ts";
 
 // ---------------------------------------------------------------------------
@@ -129,6 +130,22 @@ describe("applyClaudeApiMode", () => {
   });
 });
 
+describe("unflattenConfig", () => {
+  it("maps Claude subagent model into claude.subagentModel", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_ANTHROPIC_MODEL: "claude-sonnet-4-6",
+        CHATCCC_ANTHROPIC_SUBAGENT_MODEL: "claude-haiku-4-5-20251001",
+      }),
+    ).toEqual({
+      claude: {
+        model: "claude-sonnet-4-6",
+        subagentModel: "claude-haiku-4-5-20251001",
+      },
+    });
+  });
+});
+
 // ---------------------------------------------------------------------------
 // chooseStartPath — /api/start 的路径选择
 // 关键护栏：

package/src/adapters/adapter-interface.ts

@@ -39,6 +39,8 @@ export interface UnifiedTextFinalBlock {
 
 export interface UnifiedToolUseBlock {
   type: "tool_use";
+  /** 工具调用 ID，用于与 tool_result 对应（Claude SDK 会提供，Cursor 旧格式可能无） */
+  id?: string;
   name: string;
   input: unknown;
 }