chatccc 0.2.235 → 0.2.236

package/README.md

@@ -230,7 +230,7 @@ CCC Agent 是 ChatCCC 内置的编程 Agent，不需要额外安装 CLI，开箱
 
 #### Claude Code
 
-ChatCCC 通过 Anthropic Claude Agent SDK 调用 Claude Code 能力。SDK 引擎（含 Claude Code CLI 原生二进制，约 220MB）**按需下载**：在首次配置向导或 Web 管理页的「Claude Code」卡片点「安装引擎」，页面会显示下载进度条，完成后即可使用。**只有启用 Claude Code 的用户才需要下载**，不使用 Claude Code 的安装不包含该引擎，chatccc 主包体积保持精简。
+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` 为准。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.235",
+  "version": "0.2.236",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
@@ -59,7 +59,6 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.2.133",
     "@types/node": "^20.0.0",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/ws": "^8.18.1",

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

@@ -1,96 +1,96 @@
-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());
-
-// 注意：SDK 已从 chatccc 依赖中移除，改为按需安装 + 动态 import（变量路径），
-// vi.mock 无法拦截；这里通过 __setClaudeSdkModuleForTest 注入假 SDK 模块。
-
-vi.mock("../adapters/raw-stream-log.ts", () => ({
-  createRawStreamLog: createRawStreamLogMock,
-}));
-
-import { config } from "../config.ts";
-import {
-  __setClaudeSdkModuleForTest,
-  createClaudeAdapter,
-} from "../adapters/claude-adapter.ts";
-
-const originalRawStreamLogs = structuredClone(config.rawStreamLogs);
-
-async function collect(iterable: AsyncIterable<unknown>): Promise<unknown[]> {
-  const events: unknown[] = [];
-  for await (const event of iterable) events.push(event);
-  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();
-  rawLogCloseMock.mockReset();
-  config.rawStreamLogs = structuredClone(originalRawStreamLogs);
-});
-
-describe("Claude raw stream logs", () => {
-  it("writes raw Claude SDK stream messages when enabled", async () => {
-    const rawMessages = [
-      { type: "system", subtype: "init", session_id: "sid-raw", cwd: "F:/project", model: "claude-test" },
-      { type: "assistant", message: { content: [{ type: "text", text: "hello" }] } },
-    ];
-    const session = {
-      send: vi.fn(async () => {}),
-      stream: async function* () {
-        for (const msg of rawMessages) yield msg;
-      },
-      close: vi.fn(),
-    };
-    resumeSessionMock.mockReturnValueOnce(session);
-    createRawStreamLogMock.mockResolvedValueOnce({
-      filePath: "claude.jsonl.gz",
-      writeLine: rawLogWriteLineMock,
-      close: rawLogCloseMock,
-    });
-    config.rawStreamLogs.claude = {
-      enabled: true,
-      maxBytesPerTurn: 4096,
-      retentionDays: 5,
-      keepCompleted: false,
-    };
-
-    const adapter = createClaudeAdapter({
-      model: "claude-test",
-      effort: "high",
-      isEmpty: (value) => value.trim() === "",
-    });
-    const events = await collect(adapter.prompt("sid-raw", "hi", "F:/project"));
-
-    expect(createRawStreamLogMock).toHaveBeenCalledWith(expect.objectContaining({
-      enabled: true,
-      tool: "claude",
-      sessionId: "sid-raw",
-      label: "prompt",
-      maxBytesPerTurn: 4096,
-      retentionDays: 5,
-    }));
-    expect(rawLogWriteLineMock).toHaveBeenNthCalledWith(1, JSON.stringify(rawMessages[0]));
-    expect(rawLogWriteLineMock).toHaveBeenNthCalledWith(2, JSON.stringify(rawMessages[1]));
-    expect(rawLogCloseMock).toHaveBeenCalledWith({ keep: false });
-    expect(session.close).toHaveBeenCalledOnce();
-    expect(events).toContainEqual({
-      type: "assistant",
-      blocks: [{ type: "text", text: "hello" }],
-    });
-  });
-});
+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());
+
+// 注意：SDK 已从 chatccc 依赖中移除，改为按需安装 + 动态 import（变量路径），
+// vi.mock 无法拦截；这里通过 __setClaudeSdkModuleForTest 注入假 SDK 模块。
+
+vi.mock("../adapters/raw-stream-log.ts", () => ({
+  createRawStreamLog: createRawStreamLogMock,
+}));
+
+import { config } from "../config.ts";
+import {
+  __setClaudeSdkModuleForTest,
+  createClaudeAdapter,
+} from "../adapters/claude-adapter.ts";
+
+const originalRawStreamLogs = structuredClone(config.rawStreamLogs);
+
+async function collect(iterable: AsyncIterable<unknown>): Promise<unknown[]> {
+  const events: unknown[] = [];
+  for await (const event of iterable) events.push(event);
+  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();
+  rawLogCloseMock.mockReset();
+  config.rawStreamLogs = structuredClone(originalRawStreamLogs);
+});
+
+describe("Claude raw stream logs", () => {
+  it("writes raw Claude SDK stream messages when enabled", async () => {
+    const rawMessages = [
+      { type: "system", subtype: "init", session_id: "sid-raw", cwd: "F:/project", model: "claude-test" },
+      { type: "assistant", message: { content: [{ type: "text", text: "hello" }] } },
+    ];
+    const session = {
+      send: vi.fn(async () => {}),
+      stream: async function* () {
+        for (const msg of rawMessages) yield msg;
+      },
+      close: vi.fn(),
+    };
+    resumeSessionMock.mockReturnValueOnce(session);
+    createRawStreamLogMock.mockResolvedValueOnce({
+      filePath: "claude.jsonl.gz",
+      writeLine: rawLogWriteLineMock,
+      close: rawLogCloseMock,
+    });
+    config.rawStreamLogs.claude = {
+      enabled: true,
+      maxBytesPerTurn: 4096,
+      retentionDays: 5,
+      keepCompleted: false,
+    };
+
+    const adapter = createClaudeAdapter({
+      model: "claude-test",
+      effort: "high",
+      isEmpty: (value) => value.trim() === "",
+    });
+    const events = await collect(adapter.prompt("sid-raw", "hi", "F:/project"));
+
+    expect(createRawStreamLogMock).toHaveBeenCalledWith(expect.objectContaining({
+      enabled: true,
+      tool: "claude",
+      sessionId: "sid-raw",
+      label: "prompt",
+      maxBytesPerTurn: 4096,
+      retentionDays: 5,
+    }));
+    expect(rawLogWriteLineMock).toHaveBeenNthCalledWith(1, JSON.stringify(rawMessages[0]));
+    expect(rawLogWriteLineMock).toHaveBeenNthCalledWith(2, JSON.stringify(rawMessages[1]));
+    expect(rawLogCloseMock).toHaveBeenCalledWith({ keep: false });
+    expect(session.close).toHaveBeenCalledOnce();
+    expect(events).toContainEqual({
+      type: "assistant",
+      blocks: [{ type: "text", text: "hello" }],
+    });
+  });
+});