chatccc 0.2.52 → 0.2.54

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

@@ -12,14 +12,14 @@ import {
   CLAUDE_BASE_URL,
   CLAUDE_EFFORT,
   CLAUDE_MODEL,
-  CURSOR_AGENT_ARGS,
-  CURSOR_AGENT_COMMAND,
-  FEISHU_ENABLED,
-  GIT_TIMEOUT_MS,
-  GIT_TIMEOUT_SECONDS,
-  ILINK_ENABLED,
-  applyLoadedConfig,
-  config,
+  CURSOR_AGENT_ARGS,
+  CURSOR_AGENT_COMMAND,
+  FEISHU_ENABLED,
+  GIT_TIMEOUT_MS,
+  GIT_TIMEOUT_SECONDS,
+  ILINK_ENABLED,
+  applyLoadedConfig,
+  config,
   resolveDefaultAgentTool,
   type AppConfig,
 } from "../config.ts";
@@ -35,9 +35,9 @@ import {
 //      原地切换复用同一 server，重新读端口只会引入混乱）
 // ---------------------------------------------------------------------------
 
-const baseAppConfig: AppConfig = {
-  feishu: { appId: "INITIAL_APP", appSecret: "INITIAL_SECRET" },
-  platforms: { feishu: { enabled: true }, ilink: { enabled: true } },
+const baseAppConfig: AppConfig = {
+  feishu: { appId: "INITIAL_APP", appSecret: "INITIAL_SECRET" },
+  platforms: { feishu: { enabled: true }, ilink: { enabled: true } },
   port: 18080,
   gitTimeoutSeconds: 180,
   allowInterrupt: false,
@@ -97,7 +97,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
     expect(CLAUDE_BASE_URL).toBe("https://gw2.example/anthropic");
   });
 
-  it("更新 GIT_TIMEOUT_SECONDS 与 GIT_TIMEOUT_MS（毫秒派生值同步刷新）", () => {
+  it("更新 GIT_TIMEOUT_SECONDS 与 GIT_TIMEOUT_MS（毫秒派生值同步刷新）", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
       gitTimeoutSeconds: 240,
@@ -106,20 +106,20 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
     expect(GIT_TIMEOUT_SECONDS).toBe(240);
     // 派生值必须跟着更新，否则 /git 仍然按旧 timeout 运行
     expect(GIT_TIMEOUT_MS).toBe(240 * 1000);
-  });
-
-  it("更新平台开关（默认飞书和微信都开启）", () => {
-    expect(FEISHU_ENABLED).toBe(true);
-    expect(ILINK_ENABLED).toBe(true);
-
-    applyLoadedConfig({
-      ...structuredClone(baseAppConfig),
-      platforms: { feishu: { enabled: false }, ilink: { enabled: true } },
-    });
-
-    expect(FEISHU_ENABLED).toBe(false);
-    expect(ILINK_ENABLED).toBe(true);
-  });
+  });
+
+  it("更新平台开关（默认飞书和微信都开启）", () => {
+    expect(FEISHU_ENABLED).toBe(true);
+    expect(ILINK_ENABLED).toBe(true);
+
+    applyLoadedConfig({
+      ...structuredClone(baseAppConfig),
+      platforms: { feishu: { enabled: false }, ilink: { enabled: true } },
+    });
+
+    expect(FEISHU_ENABLED).toBe(false);
+    expect(ILINK_ENABLED).toBe(true);
+  });
 
   it("CURSOR_AGENT_ARGS 跟随 cursor.model 重新解析", () => {
     applyLoadedConfig({

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

@@ -1,19 +1,19 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-
-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 };
-      };
-    };
-
-    expect(sample.platforms?.feishu?.enabled).toBe(true);
-    expect(sample.platforms?.ilink?.enabled).toBe(true);
-  });
-});
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
+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 };
+      };
+    };
+
+    expect(sample.platforms?.feishu?.enabled).toBe(true);
+    expect(sample.platforms?.ilink?.enabled).toBe(true);
+  });
+});

package/src/__tests__/crash-logging.test.ts

@@ -1,9 +1,9 @@
-import { mkdtemp, readFile, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { describe, it, expect, vi } from "vitest";
-
-import { buildCrashLoggingHandlers, installCrashLogging, setupFileLogging } from "../shared.ts";
+import { mkdtemp, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, it, expect, vi } from "vitest";
+
+import { buildCrashLoggingHandlers, installCrashLogging, setupFileLogging } from "../shared.ts";
 
 describe("buildCrashLoggingHandlers", () => {
   it("uncaughtException: 写诊断、刷新日志、调用 onFatal", () => {
@@ -144,7 +144,7 @@ describe("buildCrashLoggingHandlers", () => {
   });
 });
 
-describe("installCrashLogging", () => {
+describe("installCrashLogging", () => {
   it("注册所有相关事件监听器", () => {
     const before = {
       uncaught: process.listenerCount("uncaughtException"),
@@ -209,58 +209,58 @@ describe("installCrashLogging", () => {
     } finally {
       cleanup();
     }
-  });
-});
-
-describe("setupFileLogging", () => {
-  it("flush 后继续写日志不会触发 write after end，且日志已落盘", async () => {
-    const originalLog = console.log;
-    const originalError = console.error;
-    console.log = vi.fn() as never;
-    console.error = vi.fn() as never;
-    const dir = await mkdtemp(join(tmpdir(), "chatccc-log-"));
-
-    try {
-      const fileLog = setupFileLogging(dir, "index");
-
-      console.log("before flush");
-      fileLog.flush();
-
-      expect(() => console.error("after flush")).not.toThrow();
-      fileLog.flush();
-
-      const content = await readFile(fileLog.logPath, "utf8");
-      expect(content).toContain("[LOG] before flush");
-      expect(content).toContain("[ERR] after flush");
-    } finally {
-      console.log = originalLog;
-      console.error = originalError;
-      await rm(dir, { recursive: true, force: true });
-    }
-  });
-
-  it("日志参数无法 JSON 序列化时也不会让 console 调用抛错", async () => {
-    const originalLog = console.log;
-    const originalError = console.error;
-    console.log = vi.fn() as never;
-    console.error = vi.fn() as never;
-    const dir = await mkdtemp(join(tmpdir(), "chatccc-log-"));
-
-    try {
-      const fileLog = setupFileLogging(dir, "index");
-      const circular: Record<string, unknown> = { name: "root" };
-      circular.self = circular;
-
-      expect(() => console.log("circular", circular)).not.toThrow();
-      fileLog.flush();
-
-      const content = await readFile(fileLog.logPath, "utf8");
-      expect(content).toContain("[LOG] circular");
-      expect(content).toContain("self");
-    } finally {
-      console.log = originalLog;
-      console.error = originalError;
-      await rm(dir, { recursive: true, force: true });
-    }
-  });
-});
+  });
+});
+
+describe("setupFileLogging", () => {
+  it("flush 后继续写日志不会触发 write after end，且日志已落盘", async () => {
+    const originalLog = console.log;
+    const originalError = console.error;
+    console.log = vi.fn() as never;
+    console.error = vi.fn() as never;
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-log-"));
+
+    try {
+      const fileLog = setupFileLogging(dir, "index");
+
+      console.log("before flush");
+      fileLog.flush();
+
+      expect(() => console.error("after flush")).not.toThrow();
+      fileLog.flush();
+
+      const content = await readFile(fileLog.logPath, "utf8");
+      expect(content).toContain("[LOG] before flush");
+      expect(content).toContain("[ERR] after flush");
+    } finally {
+      console.log = originalLog;
+      console.error = originalError;
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  it("日志参数无法 JSON 序列化时也不会让 console 调用抛错", async () => {
+    const originalLog = console.log;
+    const originalError = console.error;
+    console.log = vi.fn() as never;
+    console.error = vi.fn() as never;
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-log-"));
+
+    try {
+      const fileLog = setupFileLogging(dir, "index");
+      const circular: Record<string, unknown> = { name: "root" };
+      circular.self = circular;
+
+      expect(() => console.log("circular", circular)).not.toThrow();
+      fileLog.flush();
+
+      const content = await readFile(fileLog.logPath, "utf8");
+      expect(content).toContain("[LOG] circular");
+      expect(content).toContain("self");
+    } finally {
+      console.log = originalLog;
+      console.error = originalError;
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+});

package/src/__tests__/fixtures/codex_simple_text.jsonl

@@ -1,4 +1,4 @@
-{"type":"thread.started","thread_id":"019e15c7-t001-7901-b92c-9a4371e07750"}
-{"type":"turn.started"}
-{"type":"item.completed","item":{"id":"item_0","type":"agent_message","text":"hello"}}
-{"type":"turn.completed","usage":{"input_tokens":12964,"cached_input_tokens":11136,"output_tokens":5,"reasoning_output_tokens":0}}
+{"type":"thread.started","thread_id":"019e15c7-t001-7901-b92c-9a4371e07750"}
+{"type":"turn.started"}
+{"type":"item.completed","item":{"id":"item_0","type":"agent_message","text":"hello"}}
+{"type":"turn.completed","usage":{"input_tokens":12964,"cached_input_tokens":11136,"output_tokens":5,"reasoning_output_tokens":0}}

package/src/__tests__/fixtures/codex_with_tool.jsonl

@@ -1,6 +1,6 @@
-{"type":"thread.started","thread_id":"019e15c8-t002-7441-9bfb-eec7b1ef4c4c"}
-{"type":"turn.started"}
-{"type":"item.started","item":{"id":"item_0","type":"command_execution","command":"powershell.exe -Command echo tool_test","aggregated_output":"","exit_code":null,"status":"in_progress"}}
-{"type":"item.completed","item":{"id":"item_0","type":"command_execution","command":"powershell.exe -Command echo tool_test","aggregated_output":"tool_test\r\n","exit_code":0,"status":"completed"}}
-{"type":"item.completed","item":{"id":"item_1","type":"agent_message","text":"tool_test"}}
-{"type":"turn.completed","usage":{"input_tokens":26021,"cached_input_tokens":22272,"output_tokens":52,"reasoning_output_tokens":0}}
+{"type":"thread.started","thread_id":"019e15c8-t002-7441-9bfb-eec7b1ef4c4c"}
+{"type":"turn.started"}
+{"type":"item.started","item":{"id":"item_0","type":"command_execution","command":"powershell.exe -Command echo tool_test","aggregated_output":"","exit_code":null,"status":"in_progress"}}
+{"type":"item.completed","item":{"id":"item_0","type":"command_execution","command":"powershell.exe -Command echo tool_test","aggregated_output":"tool_test\r\n","exit_code":0,"status":"completed"}}
+{"type":"item.completed","item":{"id":"item_1","type":"agent_message","text":"tool_test"}}
+{"type":"turn.completed","usage":{"input_tokens":26021,"cached_input_tokens":22272,"output_tokens":52,"reasoning_output_tokens":0}}

package/src/__tests__/im-skills.test.ts

@@ -1,46 +1,46 @@
-import { mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { afterEach, describe, expect, it } from "vitest";
-
-import { buildImSkillsPrompt } from "../im-skills.ts";
-
-let tempRoot: string | null = null;
-
-describe("IM skills prompt rendering", () => {
-  afterEach(async () => {
-    if (tempRoot) await rm(tempRoot, { recursive: true, force: true });
-    tempRoot = null;
-  });
-
-  it("loads skill.md files and renders runtime variables", async () => {
-    tempRoot = await mkdtemp(join(tmpdir(), "chatccc-im-skills-"));
-    const skillDir = join(tempRoot, "feishu-skill");
-    await mkdir(skillDir);
-    await writeFile(
-      join(skillDir, "skill.md"),
-      [
-        "---",
-        "name: feishu-skill",
-        "---",
-        "GET {{session_grants_url}}?sid={{session_id}}",
-        "cwd={{cwd}}",
-      ].join("\n"),
-      "utf-8",
-    );
-
-    const prompt = await buildImSkillsPrompt({
-      skillsDir: tempRoot,
-      variables: {
-        cwd: "C:/work",
-        session_grants_url: "http://127.0.0.1:18080/api/agent/session-grants",
-        session_id: "sid_test",
-      },
-    });
-
-    expect(prompt).toContain("[ChatCCC IM skill: feishu-skill]");
-    expect(prompt).toContain("GET http://127.0.0.1:18080/api/agent/session-grants?sid=sid_test");
-    expect(prompt).toContain("cwd=C:/work");
-    expect(prompt).not.toContain("{{");
-  });
-});
+import { mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { afterEach, describe, expect, it } from "vitest";
+
+import { buildImSkillsPrompt } from "../im-skills.ts";
+
+let tempRoot: string | null = null;
+
+describe("IM skills prompt rendering", () => {
+  afterEach(async () => {
+    if (tempRoot) await rm(tempRoot, { recursive: true, force: true });
+    tempRoot = null;
+  });
+
+  it("loads skill.md files and renders runtime variables", async () => {
+    tempRoot = await mkdtemp(join(tmpdir(), "chatccc-im-skills-"));
+    const skillDir = join(tempRoot, "feishu-skill");
+    await mkdir(skillDir);
+    await writeFile(
+      join(skillDir, "skill.md"),
+      [
+        "---",
+        "name: feishu-skill",
+        "---",
+        "GET {{session_grants_url}}?sid={{session_id}}",
+        "cwd={{cwd}}",
+      ].join("\n"),
+      "utf-8",
+    );
+
+    const prompt = await buildImSkillsPrompt({
+      skillsDir: tempRoot,
+      variables: {
+        cwd: "C:/work",
+        session_grants_url: "http://127.0.0.1:18080/api/agent/session-grants",
+        session_id: "sid_test",
+      },
+    });
+
+    expect(prompt).toContain("[ChatCCC IM skill: feishu-skill]");
+    expect(prompt).toContain("GET http://127.0.0.1:18080/api/agent/session-grants?sid=sid_test");
+    expect(prompt).toContain("cwd=C:/work");
+    expect(prompt).not.toContain("{{");
+  });
+});

package/src/__tests__/privacy.test.ts

@@ -0,0 +1,143 @@
+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";
+
+// 在 import privacy 之前 mock config，让 USER_DATA_DIR 指向临时目录
+const TEST_DATA_DIR = await mkdtemp(join(tmpdir(), "chatccc-privacy-test-"));
+vi.mock("../config.ts", async () => {
+  const actual = await vi.importActual<typeof import("../config.ts")>("../config.ts");
+  return {
+    ...actual,
+    USER_DATA_DIR: TEST_DATA_DIR,
+    ts: () => "test-ts",
+  };
+});
+
+let applyPrivacy: (text: string) => string;
+let reloadPrivacyRules: () => void;
+let getPrivacyRules: () => Record<string, string>;
+
+beforeEach(async () => {
+  vi.resetModules();
+  // 清理临时目录中的 privacy.json
+  try {
+    await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
+  } catch {}
+  const mod = await import("../privacy.ts");
+  applyPrivacy = mod.applyPrivacy;
+  reloadPrivacyRules = mod.reloadPrivacyRules;
+  getPrivacyRules = mod.getPrivacyRules;
+});
+
+afterEach(async () => {
+  try {
+    await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
+  } catch {}
+});
+
+afterAll(async () => {
+  try {
+    await rm(TEST_DATA_DIR, { recursive: true, force: true });
+  } catch {}
+});
+
+describe("applyPrivacy", () => {
+  it("无 privacy.json 时返回原文", () => {
+    reloadPrivacyRules();
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
+  });
+
+  it("privacy.json 存在时按规则替换", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ weizhangjian: "wzj", secret: "***" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello wzj");
+    expect(applyPrivacy("my secret is safe")).toBe("my *** is safe");
+    expect(applyPrivacy("weizhangjian and secret")).toBe("wzj and ***");
+  });
+
+  it("多规则替换多次出现", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ a: "A", b: "B" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("a b a b")).toBe("A B A B");
+  });
+
+  it("空文本直接返回", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ x: "y" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("")).toBe("");
+  });
+
+  it("规则中的特殊字符不会被当作正则", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ "a.b": "X", "(test)": "Y", "*star": "Z" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello a.b world")).toBe("hello X world");
+    expect(applyPrivacy("text (test) here")).toBe("text Y here");
+    expect(applyPrivacy("a *star shines")).toBe("a Z shines");
+  });
+
+  it("reloadPrivacyRules 强制重新加载", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ old: "OLD" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("old")).toBe("OLD");
+    expect(getPrivacyRules()).toEqual({ old: "OLD" });
+
+    // 变更磁盘内容后 reload
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ new: "NEW" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("new")).toBe("NEW");
+    expect(getPrivacyRules()).toEqual({ new: "NEW" });
+  });
+
+  it("格式错误的 JSON 不抛异常，返回原文", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      "not json",
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello")).toBe("hello");
+  });
+
+  it("数组格式的 JSON 不抛异常，返回原文", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify(["a", "b"]),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello")).toBe("hello");
+  });
+});

package/src/__tests__/session.test.ts

@@ -4,12 +4,12 @@ import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 
 // mock stream-state 以支持在测试中控制累积长度
-const mockStreamStates = new Map<string, { accumulatedContent: string; finalReply: string }>();
+const mockStreamStates = new Map<string, { accumulatedContent: string; finalReply: string; status?: "running" | "done" | "stopped" }>();
 vi.mock("../stream-state.ts", () => ({
   readStreamState: async (sid: string) => {
     const state = mockStreamStates.get(sid);
     if (!state) return null;
-    return { sessionId: sid, accumulatedContent: state.accumulatedContent, finalReply: state.finalReply, status: "running", chunkCount: 0, turnCount: 0, contextTokens: 0, updatedAt: Date.now(), cwd: "", tool: "claude" };
+    return { sessionId: sid, accumulatedContent: state.accumulatedContent, finalReply: state.finalReply, status: state.status ?? "running", chunkCount: 0, turnCount: 0, contextTokens: 0, updatedAt: Date.now(), cwd: "", tool: "claude" };
   },
   writeStreamState: async () => {},
   createEmptyStreamState: (sid: string, cwd: string, tool: string, turnCount: number) => ({
@@ -41,6 +41,7 @@ import {
   setSessionPlatform,
   recordChatPlatform,
   _getPlatformForChatForTest,
+  ensureDisplayLoop,
 } from "../session.ts";
 import {
   activePrompts,
@@ -183,6 +184,60 @@ describe("chat platform routing", () => {
 // processedMessages 全部保留——SDK 重连不应当影响后台 prompt 的执行。
 // ---------------------------------------------------------------------------
 
+describe("ensureDisplayLoop WeChat delta", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    resetState();
+    resetBindingState();
+    mockStreamStates.clear();
+  });
+
+  afterEach(() => {
+    resetBindingState();
+    vi.useRealTimers();
+  });
+
+  it("sends only new accumulated content when tool output arrives before an already-sent final reply", async () => {
+    const platform = mockPlatform("wechat");
+    platform.kind = "wechat";
+    setSessionPlatform(platform);
+
+    bindChatToSession("sid-wechat", "chat-wechat");
+    recordLastActiveChat("sid-wechat", "chat-wechat");
+    sessionInfoMap.set("chat-wechat", {
+      sessionId: "sid-wechat",
+      turnCount: 1,
+      lastContextTokens: 0,
+      startTime: 0,
+      tool: "claude",
+    });
+
+    mockStreamStates.set("sid-wechat", {
+      accumulatedContent: "",
+      finalReply: "partial reply",
+    });
+    ensureDisplayLoop("sid-wechat");
+    await vi.advanceTimersByTimeAsync(3000);
+
+    mockStreamStates.set("sid-wechat", {
+      accumulatedContent: "tool output\n",
+      finalReply: "partial reply",
+    });
+    await vi.advanceTimersByTimeAsync(3000);
+
+    expect(platform.sendText).toHaveBeenNthCalledWith(
+      1,
+      "chat-wechat",
+      "partial reply",
+    );
+    expect(platform.sendText).toHaveBeenNthCalledWith(
+      2,
+      "chat-wechat",
+      "tool output",
+    );
+  });
+});
+
 describe("rebuildBindingsFromRegistry", () => {
   let registryFile = "";