chatccc 0.2.56 → 0.2.58

package/README.md

@@ -32,7 +32,7 @@ ChatCCC 把本地 AI 编程工具接入即时通讯软件。你可以在手机
 | 会话形态 | 群聊，一群一会话 | 私聊，一对一 |
 | 消息展示 | CardKit 卡片，流式更新 | 纯文本，增量推送 |
 | `/new` | 自动创建新群并绑定新会话 | 在当前私聊里创建新会话 |
-| 多会话并行 | 直接切换不同群 | 需要在同一私聊内切换上下文 |
+| 多会话并行 | 直接切换不同群 | 支持并行，使用切换指令后未完成的任务会继续在后台进行，但不如飞书直观方便 |
 | 群管理 | 支持创建、重命名、解散、头像 | 不支持 |
 | 接入成本 | 需要配置飞书应用 | 启动后扫码登录 |
 

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.58",
   "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__/orchestrator.test.ts

@@ -0,0 +1,168 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import type { PlatformAdapter } from "../platform-adapter.ts";
+import type { SessionInfo, ToolAdapter } from "../adapters/adapter-interface.ts";
+
+const mockStreamStates = new Map<string, { status: "running" | "done" | "stopped"; finalReply: string }>();
+
+vi.mock("../im-skills.ts", () => ({
+  buildImSkillsPrompt: async () => "",
+  exportSkillSubDocs: async () => {},
+}));
+
+vi.mock("../stream-state.ts", () => ({
+  readStreamState: async (sessionId: string) => {
+    const state = mockStreamStates.get(sessionId);
+    if (!state) return null;
+    return {
+      sessionId,
+      status: state.status,
+      accumulatedContent: "",
+      finalReply: state.finalReply,
+      chunkCount: 0,
+      turnCount: 1,
+      contextTokens: 0,
+      updatedAt: Date.now(),
+      cwd: "F:\\repo",
+      tool: "claude",
+    };
+  },
+  writeStreamState: async (state: { sessionId: string; status: "running" | "done" | "stopped"; finalReply: string }) => {
+    mockStreamStates.set(state.sessionId, {
+      status: state.status,
+      finalReply: state.finalReply,
+    });
+  },
+  createEmptyStreamState: (sessionId: string, cwd: string, tool: string, turnCount: number) => ({
+    sessionId,
+    status: "running" as const,
+    accumulatedContent: "",
+    finalReply: "",
+    chunkCount: 0,
+    turnCount,
+    contextTokens: 0,
+    updatedAt: Date.now(),
+    cwd,
+    tool,
+  }),
+  fixStaleStreamStates: async () => {},
+}));
+
+import { handleCommand } from "../orchestrator.ts";
+import {
+  _clearAdapterCacheForTest,
+  _resetSessionRegistryFileForTest,
+  _resetSessionToolsFileForTest,
+  _setAdapterForToolForTest,
+  _setSessionRegistryFileForTest,
+  _setSessionToolsFileForTest,
+  recordSessionRegistry,
+  resetState,
+} from "../session.ts";
+import { activePrompts, resetBindingState } from "../session-chat-binding.ts";
+
+function mockPlatform(): PlatformAdapter {
+  return {
+    kind: "wechat",
+    sendText: vi.fn(async () => true),
+    sendCard: vi.fn(async () => true),
+    sendRawCard: vi.fn(async () => true),
+    createGroup: vi.fn(async () => "unused-group"),
+    updateChatInfo: vi.fn(async () => {}),
+    getChatInfo: vi.fn(async () => ({ name: "微信会话", description: "" })),
+    disbandChat: vi.fn(async () => {}),
+    setChatAvatar: vi.fn(async () => {}),
+    extractSessionInfo: vi.fn(() => null),
+    cardCreate: vi.fn(async () => "card-id"),
+    cardSend: vi.fn(async () => "message-id"),
+    cardUpdate: vi.fn(async () => {}),
+  };
+}
+
+function mockAdapter(): ToolAdapter {
+  return {
+    displayName: "Claude",
+    sessionDescPrefix: "Claude Session:",
+    createSession: async () => ({ sessionId: "sid-wechat" }),
+    prompt: async function* () {
+      yield {
+        type: "assistant",
+        blocks: [{ type: "text", text: "done" }],
+      };
+    },
+    getSessionInfo: async (sessionId: string): Promise<SessionInfo> => ({
+      sessionId,
+      cwd: "F:\\repo",
+    }),
+    closeSession: async () => {},
+  };
+}
+
+describe("handleCommand WeChat processing ack", () => {
+  let tempDir: string;
+
+  beforeEach(async () => {
+    vi.useFakeTimers();
+    tempDir = await mkdtemp(join(tmpdir(), "chatccc-orchestrator-"));
+    _setSessionRegistryFileForTest(join(tempDir, "session-registry.json"));
+    _setSessionToolsFileForTest(join(tempDir, "sessions.json"));
+    resetState();
+    resetBindingState();
+    mockStreamStates.clear();
+    _setAdapterForToolForTest("claude", mockAdapter());
+  });
+
+  afterEach(async () => {
+    resetState();
+    resetBindingState();
+    _clearAdapterCacheForTest();
+    _resetSessionRegistryFileForTest();
+    _resetSessionToolsFileForTest();
+    vi.useRealTimers();
+    await rm(tempDir, { recursive: true, force: true });
+  });
+
+  it("does not send the WeChat processing ack when the session is already running", async () => {
+    const platform = mockPlatform();
+    await recordSessionRegistry({
+      chatId: "wx-chat",
+      sessionId: "sid-wechat",
+      tool: "claude",
+      chatName: "busy-session",
+      running: true,
+    });
+    activePrompts.set("sid-wechat", {
+      controller: new AbortController(),
+      stopped: false,
+      startTime: Date.now(),
+    });
+
+    await handleCommand(platform, "继续说明", "wx-chat", "wx-user", Date.now(), "p2p");
+
+    expect(platform.sendText).not.toHaveBeenCalledWith("wx-chat", "生成中...");
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "wx-chat",
+      "生成中",
+      "该会话正在生成回复中，请等待完成后再发送新消息。",
+      "yellow",
+    );
+  });
+
+  it("sends the WeChat processing ack after the busy check for normal prompts", async () => {
+    const platform = mockPlatform();
+    await recordSessionRegistry({
+      chatId: "wx-chat",
+      sessionId: "sid-wechat",
+      tool: "claude",
+      chatName: "ready-session",
+      running: false,
+    });
+
+    await handleCommand(platform, "继续说明", "wx-chat", "wx-user", Date.now(), "p2p");
+
+    expect(platform.sendText).toHaveBeenCalledWith("wx-chat", "生成中...");
+  });
+});