chatccc 0.2.234 → 0.2.236

package/README.md

@@ -210,9 +210,29 @@ chatccc
 
 Claude Code、Cursor 和 Codex 需要对应的本地工具；CCC Agent 内置于 ChatCCC，开箱即用，**模型接入不限于 DeepSeek**——它走 OpenAI 兼容协议，任意兼容端点都可以直接替换（详见下文 CCC Agent）。
 
+#### CCC Agent
+
+CCC Agent 是 ChatCCC 内置的编程 Agent，不需要额外安装 CLI，开箱即用。在首次配置向导或 Web 管理页中启用后，填写 API Key、Base URL 和模型即可使用；它可以设为 `/new` 的默认 Agent，也可以通过 `/new ccc` 显式创建会话。
+
+**API 支持不限于 DeepSeek。** CCC Agent 底层使用 OpenAI 兼容协议（`@ai-sdk/openai-compatible`），DeepSeek 只是出厂默认端点。`ccc.DEEPSEEK_API_KEY` / `ccc.DEEPSEEK_BASE_URL` 可以指向**任意 OpenAI 兼容服务**，例如：
+
+| 服务 | Base URL 示例 | 说明 |
+| --- | --- | --- |
+| DeepSeek（默认） | `https://api.deepseek.com/v1` | 官方端点，支持 `/usage` 余额查询 |
+| OpenAI | `https://api.openai.com/v1` | 官方模型 |
+| Kimi / Moonshot | `https://api.moonshot.cn/v1` | 国内直连 |
+| 通义千问 / 智谱 GLM / 豆包 / MiniMax | 各家 `…/v1` 端点 | 国内 OpenAI 兼容服务 |
+| Ollama / vLLM / LM Studio | `http://localhost:11434/v1` | 本地或自建推理服务 |
+
+更换服务只需把 `ccc.DEEPSEEK_BASE_URL` 改为对应端点、`ccc.DEEPSEEK_API_KEY` 改为对应 Key、`ccc.model` 改为目标模型名即可。`reasoning_effort` 等 DeepSeek 扩展字段对不认识的模型会自动忽略，不影响其他服务。余额查询仅对官方 DeepSeek 域名（`api.deepseek.com`）生效，指向其他端点时自动跳过，不影响对话。
+
+`ccc.alternativeModel` 是单个备选模型，只会加入 `/model` 的人工切换列表，不会在请求失败时自动重试或切换，避免重复执行带副作用的工具调用。
+
 #### Claude Code
 
-本机完成 Claude Code 登录后即可使用。ChatCCC 通过 Anthropic Claude Agent SDK 调用 Claude Code 能力，同时支持官方和第三方 Anthropic 兼容 API：使用官方服务无需额外配置，使用第三方 API 则填写 `claude.apiKey` 和 `claude.baseUrl`。`claude.model`、`claude.subagentModel`、`claude.effort`、`claude.apiKey`、`claude.baseUrl` 均为选填；`claude.maxTurn` 控制每次对话的最大轮数（默认 0，即无限制）。填写后会把对应配置传给 Claude Agent SDK；留空则以 `~/.claude/settings.json` 为准。
+ChatCCC 通过 Anthropic Claude Agent SDK 调用 Claude Code 能力。SDK 引擎（含 Claude Code CLI 原生二进制，约 220MB）**按需下载**：在首次配置向导或 Web 管理页的「Claude Code」卡片点「安装 Claude Code SDK」（开关从关闭切到打开时也会弹出安装确认），页面会显示下载进度条，完成后即可使用。**只有启用 Claude Code 的用户才需要下载**，不使用 Claude Code 的安装不包含该引擎，chatccc 主包体积保持精简。
+
+SDK 始终使用其内置的 Claude Code CLI（档位 b），不依赖用户自行安装的 `claude` 命令。本机完成 Claude Code 登录后即可使用（SDK 复用 `~/.claude` 登录态）；同时支持官方和第三方 Anthropic 兼容 API：使用官方服务无需额外配置，使用第三方 API 则填写 `claude.apiKey` 和 `claude.baseUrl`。`claude.model`、`claude.subagentModel`、`claude.effort`、`claude.apiKey`、`claude.baseUrl` 均为选填；`claude.maxTurn` 控制每次对话的最大轮数（默认 0，即无限制）。填写后会把对应配置传给 Claude Agent SDK；留空则以 `~/.claude/settings.json` 为准。
 
 #### Cursor Agent CLI
 
@@ -239,24 +259,6 @@ codex --version
 
 Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理，也可以在 `config.json` 中覆盖。
 
-#### CCC Agent
-
-CCC Agent 是 ChatCCC 内置的编程 Agent，不需要额外安装 CLI，开箱即用。在首次配置向导或 Web 管理页中启用后，填写 API Key、Base URL 和模型即可使用；它可以设为 `/new` 的默认 Agent，也可以通过 `/new ccc` 显式创建会话。
-
-**API 支持不限于 DeepSeek。** CCC Agent 底层使用 OpenAI 兼容协议（`@ai-sdk/openai-compatible`），DeepSeek 只是出厂默认端点。`ccc.DEEPSEEK_API_KEY` / `ccc.DEEPSEEK_BASE_URL` 可以指向**任意 OpenAI 兼容服务**，例如：
-
-| 服务 | Base URL 示例 | 说明 |
-| --- | --- | --- |
-| DeepSeek（默认） | `https://api.deepseek.com/v1` | 官方端点，支持 `/usage` 余额查询 |
-| OpenAI | `https://api.openai.com/v1` | 官方模型 |
-| Kimi / Moonshot | `https://api.moonshot.cn/v1` | 国内直连 |
-| 通义千问 / 智谱 GLM / 豆包 / MiniMax | 各家 `…/v1` 端点 | 国内 OpenAI 兼容服务 |
-| Ollama / vLLM / LM Studio | `http://localhost:11434/v1` | 本地或自建推理服务 |
-
-更换服务只需把 `ccc.DEEPSEEK_BASE_URL` 改为对应端点、`ccc.DEEPSEEK_API_KEY` 改为对应 Key、`ccc.model` 改为目标模型名即可。`reasoning_effort` 等 DeepSeek 扩展字段对不认识的模型会自动忽略，不影响其他服务。余额查询仅对官方 DeepSeek 域名（`api.deepseek.com`）生效，指向其他端点时自动跳过，不影响对话。
-
-`ccc.alternativeModel` 是单个备选模型，只会加入 `/model` 的人工切换列表，不会在请求失败时自动重试或切换，避免重复执行带副作用的工具调用。
-
 #### 可选：Chrome CDP
 
 常驻 Chrome CDP 开关用于维护本机 Chrome DevTools Protocol 端口；Codex `/usage` 可通过它读取 ChatGPT 订阅到期时间和剩余天数。
@@ -408,4 +410,4 @@ CCC Agent 是 ChatCCC 内置的编程 Agent，不需要额外安装 CLI，开箱
 
 ## 技术栈
 
-TypeScript / Node.js >= 20 / tsx / AI SDK / Anthropic Claude Agent SDK / Cursor Agent CLI / Codex CLI / 飞书 WebSocket API / CardKit / 微信 iLink
+TypeScript / Node.js >= 20 / tsx / AI SDK / Anthropic Claude Agent SDK（按需下载，仅启用 Claude Code 时安装）/ Cursor Agent CLI / Codex CLI / 飞书 WebSocket API / CardKit / 微信 iLink

package/config.sample.json

@@ -44,6 +44,15 @@
       "keepCompleted": false
     }
   },
+  "ccc": {
+    "enabled": false,
+    "defaultAgent": false,
+    "DEEPSEEK_API_KEY": "",
+    "DEEPSEEK_BASE_URL": "https://api.deepseek.com/v1",
+    "model": "deepseek-v4-pro",
+    "alternativeModel": "",
+    "effort": ""
+  },
   "claude": {
     "enabled": false,
     "defaultAgent": true,
@@ -71,14 +80,5 @@
     "alternativeModel": "",
     "effort": "",
     "fastMode": false
-  },
-  "ccc": {
-    "enabled": false,
-    "defaultAgent": false,
-    "DEEPSEEK_API_KEY": "",
-    "DEEPSEEK_BASE_URL": "https://api.deepseek.com/v1",
-    "model": "deepseek-v4-pro",
-    "alternativeModel": "",
-    "effort": ""
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.234",
+  "version": "0.2.236",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
@@ -48,7 +48,6 @@
   },
   "dependencies": {
     "@ai-sdk/openai-compatible": "^2.0.47",
-    "@anthropic-ai/claude-agent-sdk": "0.2.133",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@openilink/openilink-sdk-node": "^0.6.0",
     "@vscode/ripgrep": "^1.18.0",

package/src/__tests__/claude-raw-stream-log.test.ts

@@ -1,22 +1,22 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 const resumeSessionMock = vi.hoisted(() => vi.fn());
 const createRawStreamLogMock = vi.hoisted(() => vi.fn());
 const rawLogWriteLineMock = vi.hoisted(() => vi.fn());
 const rawLogCloseMock = vi.hoisted(() => vi.fn());
 
-vi.mock("@anthropic-ai/claude-agent-sdk", () => ({
-  getSessionInfo: vi.fn(),
-  unstable_v2_createSession: vi.fn(),
-  unstable_v2_resumeSession: resumeSessionMock,
-}));
+// 注意：SDK 已从 chatccc 依赖中移除，改为按需安装 + 动态 import（变量路径），
+// vi.mock 无法拦截；这里通过 __setClaudeSdkModuleForTest 注入假 SDK 模块。
 
 vi.mock("../adapters/raw-stream-log.ts", () => ({
   createRawStreamLog: createRawStreamLogMock,
 }));
 
 import { config } from "../config.ts";
-import { createClaudeAdapter } from "../adapters/claude-adapter.ts";
+import {
+  __setClaudeSdkModuleForTest,
+  createClaudeAdapter,
+} from "../adapters/claude-adapter.ts";
 
 const originalRawStreamLogs = structuredClone(config.rawStreamLogs);
 
@@ -26,7 +26,16 @@ async function collect(iterable: AsyncIterable<unknown>): Promise<unknown[]> {
   return events;
 }
 
+beforeEach(() => {
+  __setClaudeSdkModuleForTest({
+    getSessionInfo: vi.fn(),
+    unstable_v2_createSession: vi.fn(),
+    unstable_v2_resumeSession: resumeSessionMock,
+  });
+});
+
 afterEach(() => {
+  __setClaudeSdkModuleForTest(null);
   resumeSessionMock.mockReset();
   createRawStreamLogMock.mockReset();
   rawLogWriteLineMock.mockReset();

package/src/__tests__/claude-sdk-installer.test.ts

@@ -0,0 +1,285 @@
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  chmodSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+  existsSync,
+} from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import {
+  CLAUDE_SDK_VERSION,
+  getClaudeSdkEntryPath,
+  getClaudeSdkInstalledVersion,
+  installClaudeSdk,
+  isClaudeSdkInstalled,
+  isClaudeSdkInstalling,
+  type SdkInstallProgress,
+} from "../claude-sdk-installer.ts";
+
+// ---------------------------------------------------------------------------
+// 工具：fake npm（可执行脚本，模拟安装过程并伪造产物）
+// ---------------------------------------------------------------------------
+
+const tempDirs: string[] = [];
+
+function makeTempDir(prefix = "claude-sdk-test-"): string {
+  const dir = mkdtempSync(join(tmpdir(), prefix));
+  tempDirs.push(dir);
+  return dir;
+}
+
+/** 伪造 SDK 产物：node_modules/@anthropic-ai/claude-agent-sdk/package.json */
+function fakeInstallArtifact(dir: string, version: string = CLAUDE_SDK_VERSION): void {
+  const pkgDir = join(dir, "node_modules", "@anthropic-ai", "claude-agent-sdk");
+  mkdirSync(pkgDir, { recursive: true });
+  writeFileSync(
+    join(pkgDir, "package.json"),
+    JSON.stringify({ name: "@anthropic-ai/claude-agent-sdk", version }),
+    "utf8",
+  );
+}
+
+/** 生成 fake npm 可执行脚本，行为由环境变量控制（FAKE_NPM_FAIL / FAKE_NPM_SLEEP） */
+function makeFakeNpmCommand(workDir: string): string {
+  const mjs = join(workDir, "fake-npm.mjs");
+  writeFileSync(
+    mjs,
+    [
+      'import fs from "node:fs";',
+      'const args = process.argv.slice(2);',
+      'const prefixIdx = args.indexOf("--prefix");',
+      'const dir = prefixIdx >= 0 ? args[prefixIdx + 1] : null;',
+      'const pkg = args.find((a) => a.startsWith("@anthropic-ai/claude-agent-sdk@"));',
+      'const version = pkg ? pkg.split("@").pop() : "0.0.0";',
+      'if (dir) {',
+      '  fs.mkdirSync(dir + "/node_modules/@anthropic-ai/claude-agent-sdk", { recursive: true });',
+      '  fs.writeFileSync(dir + "/node_modules/@anthropic-ai/claude-agent-sdk/package.json", JSON.stringify({ name: "@anthropic-ai/claude-agent-sdk", version }));',
+      "}",
+      'console.log("npm http fetch GET 200 https://registry.npmjs.org/fake");',
+      'console.log("npm http fetch GET 200 https://registry.npmjs.org/fake2");',
+      'if (process.env.FAKE_NPM_SLEEP) {',
+      "  await new Promise((r) => setTimeout(r, Number(process.env.FAKE_NPM_SLEEP)));",
+      "}",
+      'if (process.env.FAKE_NPM_FAIL === "1") process.exit(1);',
+      "process.exit(0);",
+      "",
+    ].join("\n"),
+    "utf8",
+  );
+
+  if (process.platform === "win32") {
+    const cmd = join(workDir, "fake-npm.cmd");
+    const winPath = mjs.replace(/\//g, "\\");
+    writeFileSync(
+      cmd,
+      ["@echo off", `node "${winPath}" %*`, ""].join("\r\n"),
+      "utf8",
+    );
+    return cmd;
+  }
+  const sh = join(workDir, "fake-npm.sh");
+  writeFileSync(sh, `#!/bin/sh\nexec node "${mjs}" "$@"\n`, "utf8");
+  // chmod +x
+  try {
+    chmodSync(sh, 0o755);
+  } catch {
+    // POSIX only
+  }
+  return sh;
+}
+
+const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
+
+afterEach(() => {
+  for (const dir of tempDirs.splice(0)) {
+    try {
+      rmSync(dir, { recursive: true, force: true });
+    } catch {
+      // 清理失败不阻塞
+    }
+  }
+});
+
+// ---------------------------------------------------------------------------
+// 状态查询
+// ---------------------------------------------------------------------------
+
+describe("claude-sdk-installer 状态查询", () => {
+  it("getClaudeSdkEntryPath 指向 sdk.mjs 入口", () => {
+    const dir = makeTempDir();
+    const entry = getClaudeSdkEntryPath(dir);
+    expect(entry).toContain(join("node_modules", "@anthropic-ai", "claude-agent-sdk"));
+    expect(entry.endsWith("sdk.mjs")).toBe(true);
+  });
+
+  it("isClaudeSdkInstalled：空目录为 false，有 package.json 为 true", () => {
+    const dir = makeTempDir();
+    expect(isClaudeSdkInstalled(dir)).toBe(false);
+    fakeInstallArtifact(dir);
+    expect(isClaudeSdkInstalled(dir)).toBe(true);
+  });
+
+  it("getClaudeSdkInstalledVersion：读取版本号", () => {
+    const dir = makeTempDir();
+    expect(getClaudeSdkInstalledVersion(dir)).toBeNull();
+    fakeInstallArtifact(dir, "9.9.9");
+    expect(getClaudeSdkInstalledVersion(dir)).toBe("9.9.9");
+  });
+
+  it("getClaudeSdkInstalledVersion：损坏 JSON 返回 null", () => {
+    const dir = makeTempDir();
+    const pkgDir = join(dir, "node_modules", "@anthropic-ai", "claude-agent-sdk");
+    mkdirSync(pkgDir, { recursive: true });
+    writeFileSync(join(pkgDir, "package.json"), "{ not json", "utf8");
+    expect(getClaudeSdkInstalledVersion(dir)).toBeNull();
+  });
+
+  it("isClaudeSdkInstalling：无锁为 false", () => {
+    const dir = makeTempDir();
+    expect(isClaudeSdkInstalling(dir)).toBe(false);
+  });
+
+  it("isClaudeSdkInstalling：活 pid 锁为 true", () => {
+    const dir = makeTempDir();
+    writeFileSync(join(dir, ".installing"), String(process.pid), "utf8");
+    expect(isClaudeSdkInstalling(dir)).toBe(true);
+  });
+
+  it("isClaudeSdkInstalling：死 pid 锁自动清除并返回 false", () => {
+    const dir = makeTempDir();
+    writeFileSync(join(dir, ".installing"), "999999999", "utf8");
+    expect(isClaudeSdkInstalling(dir)).toBe(false);
+    expect(existsSync(join(dir, ".installing"))).toBe(false);
+  });
+
+  it("isClaudeSdkInstalling：损坏锁自动清除并返回 false", () => {
+    const dir = makeTempDir();
+    writeFileSync(join(dir, ".installing"), "abc", "utf8");
+    expect(isClaudeSdkInstalling(dir)).toBe(false);
+    expect(existsSync(join(dir, ".installing"))).toBe(false);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// 安装流程
+// ---------------------------------------------------------------------------
+
+describe("installClaudeSdk", () => {
+  it("已装同版本 → 直接 done，不 spawn", async () => {
+    const dir = makeTempDir();
+    fakeInstallArtifact(dir, CLAUDE_SDK_VERSION);
+    const phases: string[] = [];
+    await installClaudeSdk({
+      dir,
+      npmCommand: "definitely-not-exists",
+      onProgress: (p) => phases.push(p.phase),
+    });
+    expect(phases).toEqual(["done"]);
+    expect(getClaudeSdkInstalledVersion(dir)).toBe(CLAUDE_SDK_VERSION);
+  });
+
+  it("未安装 → fake npm 成功 → done + 锁清除 + 进度序列", async () => {
+    const dir = makeTempDir();
+    const npmCommand = makeFakeNpmCommand(makeTempDir());
+    const phases: string[] = [];
+    const messages: string[] = [];
+    await installClaudeSdk({
+      dir,
+      npmCommand,
+      onProgress: (p) => {
+        phases.push(p.phase);
+        messages.push(p.message);
+      },
+    });
+    expect(phases[0]).toBe("detecting");
+    expect(phases).toContain("downloading");
+    expect(phases[phases.length - 1]).toBe("done");
+    expect(isClaudeSdkInstalled(dir)).toBe(true);
+    expect(getClaudeSdkInstalledVersion(dir)).toBe(CLAUDE_SDK_VERSION);
+    expect(existsSync(join(dir, ".installing"))).toBe(false);
+  });
+
+  it("已装不同版本 → 触发重装并成功", async () => {
+    const dir = makeTempDir();
+    fakeInstallArtifact(dir, "0.1.0");
+    const npmCommand = makeFakeNpmCommand(makeTempDir());
+    await installClaudeSdk({ dir, npmCommand });
+    expect(getClaudeSdkInstalledVersion(dir)).toBe(CLAUDE_SDK_VERSION);
+  });
+
+  it("安装失败（fake npm exit 1）→ error + 目录清理 + reject", async () => {
+    const dir = makeTempDir();
+    const npmCommand = makeFakeNpmCommand(makeTempDir());
+    const phases: string[] = [];
+    process.env.FAKE_NPM_FAIL = "1";
+    try {
+      await expect(
+        installClaudeSdk({
+          dir,
+          npmCommand,
+          onProgress: (p) => phases.push(p.phase),
+        }).then(() => {
+          throw new Error("should have rejected");
+        }),
+      ).rejects.toThrow(/退出码 1/);
+    } finally {
+      delete process.env.FAKE_NPM_FAIL;
+    }
+    expect(phases[phases.length - 1]).toBe("error");
+    expect(existsSync(dir)).toBe(false);
+  });
+
+  it("安装失败（spawn error）→ reject 且不残留锁", async () => {
+    const dir = makeTempDir();
+    await expect(
+      installClaudeSdk({ dir, npmCommand: join(makeTempDir(), "no-such-npm") }),
+    ).rejects.toThrow();
+    expect(existsSync(dir)).toBe(false);
+  });
+
+  it("锁存在（活 pid）→ reject 且不启动安装", async () => {
+    const dir = makeTempDir();
+    writeFileSync(join(dir, ".installing"), String(process.pid), "utf8");
+    await expect(
+      installClaudeSdk({ dir, npmCommand: "definitely-not-exists" }),
+    ).rejects.toThrow(/另一个安装任务/);
+  });
+
+  it("并发：安装进行中再次调用 → reject", async () => {
+    const dir = makeTempDir();
+    const npmCommand = makeFakeNpmCommand(makeTempDir());
+    process.env.FAKE_NPM_SLEEP = "400";
+    try {
+      const p1 = installClaudeSdk({
+        dir,
+        npmCommand,
+        expectedVersion: CLAUDE_SDK_VERSION,
+      });
+      await sleep(80); // 等 installInProgress = true
+      await expect(
+        installClaudeSdk({ dir, npmCommand }),
+      ).rejects.toThrow(/正在安装/);
+      await p1;
+    } finally {
+      delete process.env.FAKE_NPM_SLEEP;
+    }
+    expect(getClaudeSdkInstalledVersion(dir)).toBe(CLAUDE_SDK_VERSION);
+  });
+
+  it("进度 percent 单调且封顶 100", async () => {
+    const dir = makeTempDir();
+    const npmCommand = makeFakeNpmCommand(makeTempDir());
+    const progress: SdkInstallProgress[] = [];
+    await installClaudeSdk({ dir, npmCommand, onProgress: (p) => progress.push(p) });
+    expect(progress.length).toBeGreaterThan(1);
+    for (const p of progress) {
+      expect(p.percent).toBeGreaterThanOrEqual(0);
+      expect(p.percent).toBeLessThanOrEqual(100);
+    }
+    expect(progress[progress.length - 1].percent).toBe(100);
+  });
+});