chatccc 0.2.58 → 0.2.59

package/src/__tests__/orchestrator.test.ts

@@ -1,168 +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", "生成中...");
-  });
-});
+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", "生成中...");
+  });
+});

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

@@ -1,10 +1,10 @@
 import { describe, it, expect } from "vitest";
 import {
-  applyClaudeApiMode,
-  chooseStartPath,
-  detectClaudeApiMode,
-  unflattenConfig,
-} from "../web-ui.ts";
+  applyClaudeApiMode,
+  chooseStartPath,
+  detectClaudeApiMode,
+  unflattenConfig,
+} from "../web-ui.ts";
 
 // ---------------------------------------------------------------------------
 // detectClaudeApiMode — 加载已有 config 时如何判定 UI 初始模式
@@ -57,7 +57,7 @@ describe("detectClaudeApiMode", () => {
 //   - mode 未传 默认按 official 兌底（不保留可能误填的密钥）
 // ---------------------------------------------------------------------------
 
-describe("applyClaudeApiMode", () => {
+describe("applyClaudeApiMode", () => {
   it("mode=official 时清空 CLAUDE_API_KEY / CLAUDE_BASE_URL（即使 vars 没传）", () => {
     const out = applyClaudeApiMode({ CHATCCC_APP_ID: "x" }, "official");
     expect(out).toEqual({
@@ -128,23 +128,23 @@ describe("applyClaudeApiMode", () => {
     expect(input).toEqual({ CLAUDE_API_KEY: "sk-x" }); // 原对象未变
     expect(out).not.toBe(input);
   });
-});
-
-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",
-      },
-    });
-  });
-});
+});
+
+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/__tests__/wechat-platform.test.ts

@@ -1,9 +1,17 @@
-import { describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { buildHelpCard } from "../cards.ts";
-import { createWechatAdapter } from "../wechat-platform.ts";
+import {
+  _flushPendingClawFinalTextForTest,
+  _resetWechatClawStateForTest,
+  createWechatAdapter,
+} from "../wechat-platform.ts";
 
 describe("createWechatAdapter", () => {
+  beforeEach(() => {
+    _resetWechatClawStateForTest();
+  });
+
   it("degrades raw cards to plain text messages", async () => {
     const wire = {
       push: vi.fn(async (_chatId: string, _text: string) => "msg-id"),
@@ -54,4 +62,38 @@ describe("createWechatAdapter", () => {
       "[WECHAT] sendText skipped (claw limit): chatId=wx-chat-limit count=11",
     );
   });
+
+  it("queues final messages after the claw limit until the user wakes the chat", async () => {
+    const wire = {
+      push: vi.fn(async (_chatId: string, _text: string) => "msg-id"),
+      sendText: vi.fn(
+        async (_chatId: string, _text: string, _contextToken?: string) =>
+          "msg-id",
+      ),
+    };
+    const log = vi.fn();
+    const platform = createWechatAdapter({
+      getWire: () => wire,
+      log,
+    });
+    const chatId = "wx-chat-final-limit";
+    const finalText = "done\n━━━ 回答结束 ━━━";
+
+    for (let i = 0; i < 10; i++) {
+      await expect(platform.sendText(chatId, `chunk ${i}`)).resolves.toBe(true);
+    }
+
+    await expect(platform.sendText(chatId, finalText)).resolves.toBe(true);
+    expect(wire.push).toHaveBeenCalledTimes(10);
+    expect(log).toHaveBeenCalledWith(
+      `[WECHAT] final queued (claw limit): chatId=${chatId} count=11 len=${finalText.length}`,
+    );
+
+    await expect(_flushPendingClawFinalTextForTest(chatId, wire, log)).resolves.toBe(true);
+    expect(wire.push).toHaveBeenCalledTimes(11);
+    expect(wire.push).toHaveBeenLastCalledWith(chatId, finalText);
+    expect(log).toHaveBeenCalledWith(
+      `[WECHAT] pending final sent after claw wake: chatId=${chatId} len=${finalText.length}`,
+    );
+  });
 });

package/src/adapters/claude-adapter.ts

@@ -86,33 +86,33 @@ function buildSdkEnv(
   baseUrl: string | undefined,
   subagentModel: string | undefined,
 ): Record<string, string | undefined> | undefined {
-  const apiKeyTrim = (apiKey ?? "").trim();
-  const baseUrlTrim = (baseUrl ?? "").trim();
-  const subagentModelTrim = (subagentModel ?? "").trim();
-  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
-  if (!hasApiOverride) return undefined;
-
-  const env: Record<string, string | undefined> = { ...process.env };
-  // ChatCCC's third-party Claude API config is authoritative when present.
-  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
-  delete env.ANTHROPIC_AUTH_TOKEN;
-  delete env.CLAUDE_CODE_OAUTH_TOKEN;
-  delete env.ANTHROPIC_MODEL;
-  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
-  delete env.CLAUDE_CODE_EFFORT_LEVEL;
-
-  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
-  if (baseUrlTrim) {
-    env.ANTHROPIC_BASE_URL = baseUrlTrim;
-  } else {
-    delete env.ANTHROPIC_BASE_URL;
-  }
-  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
-  return env;
-}
+  const apiKeyTrim = (apiKey ?? "").trim();
+  const baseUrlTrim = (baseUrl ?? "").trim();
+  const subagentModelTrim = (subagentModel ?? "").trim();
+  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
+  if (!hasApiOverride) return undefined;
+
+  const env: Record<string, string | undefined> = { ...process.env };
+  // ChatCCC's third-party Claude API config is authoritative when present.
+  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
+  delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.CLAUDE_CODE_OAUTH_TOKEN;
+  delete env.ANTHROPIC_MODEL;
+  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
+  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
+  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+  delete env.CLAUDE_CODE_EFFORT_LEVEL;
+
+  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
+  if (baseUrlTrim) {
+    env.ANTHROPIC_BASE_URL = baseUrlTrim;
+  } else {
+    delete env.ANTHROPIC_BASE_URL;
+  }
+  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
+  return env;
+}
 
 function resolveSettingSources(
   _apiKey: string | undefined,
@@ -291,19 +291,19 @@ class ClaudeAdapter implements ToolAdapter {
       this.baseUrl,
       this.subagentModel,
     );
-    const session = unstable_v2_resumeSession(
-      sessionId,
-      sessionOpts as any,
-    );
-
-    if (signal?.aborted) {
-      session.close();
-      return;
-    }
-    const onAbort = () => { session.close(); };
-    signal?.addEventListener("abort", onAbort, { once: true });
-
-    await session.send(userText);
+    const session = unstable_v2_resumeSession(
+      sessionId,
+      sessionOpts as any,
+    );
+
+    if (signal?.aborted) {
+      session.close();
+      return;
+    }
+    const onAbort = () => { session.close(); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+
+    await session.send(userText);
 
     const stream = session.stream();
 

package/src/index.ts

@@ -84,9 +84,9 @@ import {
   updateCardKitCard,
 } from "./cardkit.ts";
 import {
-  MAX_PROCESSED,
-  clearAdapterCache,
-  loadSessionRegistryForBinding,
+  MAX_PROCESSED,
+  clearAdapterCache,
+  loadSessionRegistryForBinding,
   processedMessages,
   rebuildBindingsFromRegistry,
   resetState,
@@ -744,12 +744,12 @@ async function main(): Promise<void> {
   // "保存并启动" 时，web-ui 会调用本回调，把磁盘上刚保存的 config.json
   // 刷进进程内的 export let 常量（live binding 让 CLAUDE_MODEL 等下次创建
   // 会话时自动看到新值）。setup 首次激活走 onActivate 路径，不依赖此 hook。
-  setReloadConfigHook(() => {
-    reloadConfigFromDisk();
-    clearAdapterCache();
-    appendStartupTrace("reload-from-ui: config reloaded", {
-      appIdMask: maskAppId(APP_ID),
-    });
+  setReloadConfigHook(() => {
+    reloadConfigFromDisk();
+    clearAdapterCache();
+    appendStartupTrace("reload-from-ui: config reloaded", {
+      appIdMask: maskAppId(APP_ID),
+    });
   });
   setExtraApiHandler(async (req, res) => {
     return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res));
@@ -769,12 +769,12 @@ async function main(): Promise<void> {
       // 凭证不全：进 setup 向导。注入 onActivate 回调让用户点"保存并启动"
       // 时，原地（同进程）调用 startBotService，复用 setup HTTP server。
       startSetupMode(CHATCCC_PORT, {
-        onActivate: async (httpServer: Server) => {
-          reloadConfigFromDisk();
-          clearAdapterCache();
-          appendStartupTrace("setup-activate: reloaded config from disk", {
-            appIdMaskAfterReload: maskAppId(APP_ID),
-          });
+        onActivate: async (httpServer: Server) => {
+          reloadConfigFromDisk();
+          clearAdapterCache();
+          appendStartupTrace("setup-activate: reloaded config from disk", {
+            appIdMaskAfterReload: maskAppId(APP_ID),
+          });
           try {
             await startBotService({ httpServer, port: CHATCCC_PORT });
             installShutdownHandlers(httpServer);
@@ -818,8 +818,8 @@ async function main(): Promise<void> {
     try {
       await startBotService({ httpServer, port: CHATCCC_PORT });
     } catch (err) {
-      printServiceDidNotStart((err as Error).message);
-      process.exit(1);
+      console.error(`\n[飞书] 启动失败: ${(err as Error).message}`);
+      console.error("[飞书] 微信等其他平台不受影响，将继续启动。\n");
     }
   }