chatccc 0.2.175 → 0.2.176

package/src/__tests__/orchestrator.test.ts

@@ -6,8 +6,8 @@ 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 }>();
-const mockGetCodexUsageSummary = vi.hoisted(() => vi.fn());
+const mockStreamStates = new Map<string, { status: "running" | "done" | "stopped"; finalReply: string }>();
+const mockGetCodexUsageSummary = vi.hoisted(() => vi.fn());
 
 vi.mock("../im-skills.ts", () => ({
   buildImSkillsPrompt: async () => "",
@@ -15,7 +15,7 @@ vi.mock("../im-skills.ts", () => ({
   exportSkillSubDocs: async () => {},
 }));
 
-vi.mock("../stream-state.ts", () => ({
+vi.mock("../stream-state.ts", () => ({
   readStreamState: async (sessionId: string) => {
     const state = mockStreamStates.get(sessionId);
     if (!state) return null;
@@ -50,14 +50,14 @@ vi.mock("../stream-state.ts", () => ({
     cwd,
     tool,
   }),
-  fixStaleStreamStates: async () => {},
-}));
-
-vi.mock("../feishu-platform.ts", () => ({
-  getCodexUsageSummary: mockGetCodexUsageSummary,
-  getTenantAccessToken: vi.fn(async () => "tenant-token"),
-  sendPostMessage: vi.fn(async () => true),
-}));
+  fixStaleStreamStates: async () => {},
+}));
+
+vi.mock("../feishu-platform.ts", () => ({
+  getCodexUsageSummary: mockGetCodexUsageSummary,
+  getTenantAccessToken: vi.fn(async () => "tenant-token"),
+  sendPostMessage: vi.fn(async () => true),
+}));
 
 import { handleCommand } from "../orchestrator.ts";
 import {
@@ -120,14 +120,14 @@ describe("handleCommand WeChat processing ack", () => {
     _setSessionToolsFileForTest(join(tempDir, "sessions.json"));
     resetState();
     resetBindingState();
-    mockStreamStates.clear();
-    mockGetCodexUsageSummary.mockReset();
-    mockGetCodexUsageSummary.mockResolvedValue({
-      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
-      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
-    });
-    _setAdapterForToolForTest("claude", mockAdapter());
-  });
+    mockStreamStates.clear();
+    mockGetCodexUsageSummary.mockReset();
+    mockGetCodexUsageSummary.mockResolvedValue({
+      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+    });
+    _setAdapterForToolForTest("claude", mockAdapter());
+  });
 
   afterEach(async () => {
     resetState();
@@ -249,7 +249,7 @@ describe("handleCommand WeChat processing ack", () => {
     expect(registry["feishu-group"]?.sessionId).toBe("sid-feishu-new");
   });
 
-  it("cleans stale Feishu p2p binding but keeps valid commands from auto-creating a group", async () => {
+  it("cleans stale Feishu p2p binding but keeps valid commands from auto-creating a group", async () => {
     const platform = mockPlatform("feishu");
     await recordSessionRegistry({
       chatId: "feishu-p2p",
@@ -264,76 +264,76 @@ describe("handleCommand WeChat processing ack", () => {
     expect(platform.createGroup).not.toHaveBeenCalled();
     expect(platform.sendRawCard).toHaveBeenCalled();
     const registry = await loadSessionRegistryForBinding();
-    expect(registry["feishu-p2p"]).toBeUndefined();
-  });
-
-  it("handles /usage without creating a new Feishu group", async () => {
-    const platform = mockPlatform("feishu");
-    mockGetCodexUsageSummary.mockResolvedValue({
-      fiveHour: { usedPercent: 37, remainingPercent: 63, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
-      weekly: { usedPercent: 12, remainingPercent: 88, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
-    });
-
-    await handleCommand(platform, "/usage", "feishu-p2p", "ou-user", Date.now(), "p2p");
-
-    expect(platform.createGroup).not.toHaveBeenCalled();
-    expect(platform.sendCard).toHaveBeenCalledWith(
-      "feishu-p2p",
-      "Codex Usage",
-      expect.stringContaining("**5h:** 已用 37%，剩余 63%，重置:"),
-      "blue",
-    );
-    expect(platform.sendCard).toHaveBeenCalledWith(
-      "feishu-p2p",
-      "Codex Usage",
-      expect.stringContaining("约 2小时52分钟后"),
-      "blue",
-    );
-    expect(platform.sendCard).toHaveBeenCalledWith(
-      "feishu-p2p",
-      "Codex Usage",
-      expect.stringContaining("[███████░░░░░░░░░░░░░]"),
-      "blue",
-    );
-    expect(platform.sendCard).toHaveBeenCalledWith(
-      "feishu-p2p",
-      "Codex Usage",
-      expect.stringContaining("**周:** 已用 12%，剩余 88%，重置:"),
-      "blue",
-    );
-    expect(platform.sendCard).toHaveBeenCalledWith(
-      "feishu-p2p",
-      "Codex Usage",
-      expect.stringContaining("约 3天18小时17分钟后"),
-      "blue",
-    );
-    expect(platform.sendCard).toHaveBeenCalledWith(
-      "feishu-p2p",
-      "Codex Usage",
-      expect.stringContaining("[██░░░░░░░░░░░░░░░░░░]"),
-      "blue",
-    );
-  });
-
-  it("only advertises /usage in new Codex session ready messages", async () => {
-    const codexPlatform = mockPlatform("feishu");
-    _setAdapterForToolForTest("codex", mockAdapter("sid-codex"));
-
-    await handleCommand(codexPlatform, "/new codex", "feishu-p2p", "ou-user", Date.now(), "p2p");
-
-    expect(codexPlatform.sendCard).toHaveBeenCalledWith(
-      "feishu-group",
-      "Codex Session Ready",
-      expect.stringContaining("发送 **/usage** 查看 Codex 5h 和周用量。"),
-      "green",
-    );
-
-    const claudePlatform = mockPlatform("feishu");
-    await handleCommand(claudePlatform, "/new claude", "feishu-p2p-2", "ou-user", Date.now(), "p2p");
-
-    const claudeReadyCall = vi.mocked(claudePlatform.sendCard).mock.calls.find(
-      ([chatId, title]) => chatId === "feishu-group" && title === "Claude Code Session Ready",
-    );
-    expect(claudeReadyCall?.[2]).not.toContain("/usage");
-  });
-});
+    expect(registry["feishu-p2p"]).toBeUndefined();
+  });
+
+  it("handles /usage without creating a new Feishu group", async () => {
+    const platform = mockPlatform("feishu");
+    mockGetCodexUsageSummary.mockResolvedValue({
+      fiveHour: { usedPercent: 37, remainingPercent: 63, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
+      weekly: { usedPercent: 12, remainingPercent: 88, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
+    });
+
+    await handleCommand(platform, "/usage", "feishu-p2p", "ou-user", Date.now(), "p2p");
+
+    expect(platform.createGroup).not.toHaveBeenCalled();
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("**5h:** 已用 37%，剩余 63%，重置:"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("约 2小时52分钟后"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("[███████░░░░░░░░░░░░░]"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("**周:** 已用 12%，剩余 88%，重置:"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("约 3天18小时17分钟后"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("[██░░░░░░░░░░░░░░░░░░]"),
+      "blue",
+    );
+  });
+
+  it("only advertises /usage in new Codex session ready messages", async () => {
+    const codexPlatform = mockPlatform("feishu");
+    _setAdapterForToolForTest("codex", mockAdapter("sid-codex"));
+
+    await handleCommand(codexPlatform, "/new codex", "feishu-p2p", "ou-user", Date.now(), "p2p");
+
+    expect(codexPlatform.sendCard).toHaveBeenCalledWith(
+      "feishu-group",
+      "Codex Session Ready",
+      expect.stringContaining("发送 **/usage** 查看 Codex 5h 和周用量。"),
+      "green",
+    );
+
+    const claudePlatform = mockPlatform("feishu");
+    await handleCommand(claudePlatform, "/new claude", "feishu-p2p-2", "ou-user", Date.now(), "p2p");
+
+    const claudeReadyCall = vi.mocked(claudePlatform.sendCard).mock.calls.find(
+      ([chatId, title]) => chatId === "feishu-group" && title === "Claude Code Session Ready",
+    );
+    expect(claudeReadyCall?.[2]).not.toContain("/usage");
+  });
+});

package/src/__tests__/privacy.test.ts

@@ -3,7 +3,6 @@ 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");
@@ -17,10 +16,10 @@ vi.mock("../config.ts", async () => {
 let applyPrivacy: (text: string) => string;
 let reloadPrivacyRules: () => void;
 let getPrivacyRules: () => Record<string, string>;
+let getPrivacyConfig: () => { enabled: boolean; rules: Record<string, string> };
 
 beforeEach(async () => {
   vi.resetModules();
-  // 清理临时目录中的 privacy.json
   try {
     await rm(join(TEST_DATA_DIR, "privacy.json"), { force: true });
   } catch {}
@@ -28,6 +27,7 @@ beforeEach(async () => {
   applyPrivacy = mod.applyPrivacy;
   reloadPrivacyRules = mod.reloadPrivacyRules;
   getPrivacyRules = mod.getPrivacyRules;
+  getPrivacyConfig = mod.getPrivacyConfig;
 });
 
 afterEach(async () => {
@@ -43,12 +43,12 @@ afterAll(async () => {
 });
 
 describe("applyPrivacy", () => {
-  it("无 privacy.json 时返回原文", () => {
+  it("returns original text when privacy.json is missing", () => {
     reloadPrivacyRules();
     expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
   });
 
-  it("privacy.json 存在时按规则替换", async () => {
+  it("supports legacy flat privacy rules", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify({ weizhangjian: "wzj", secret: "***" }),
@@ -61,7 +61,63 @@ describe("applyPrivacy", () => {
     expect(applyPrivacy("weizhangjian and secret")).toBe("wzj and ***");
   });
 
-  it("多规则替换多次出现", async () => {
+  it("supports privacy.json schema with enabled=false", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ enabled: false, rules: { weizhangjian: "wzj" } }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(getPrivacyConfig()).toEqual({ enabled: false, rules: { weizhangjian: "wzj" } });
+    expect(getPrivacyRules()).toEqual({ weizhangjian: "wzj" });
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
+  });
+
+  it("supports privacy.json schema with enabled=true", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ enabled: true, rules: { weizhangjian: "wzj" } }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello wzj");
+  });
+
+  it("accepts UTF-8 BOM in privacy.json", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      `\uFEFF${JSON.stringify({ enabled: false, rules: { weizhangjian: "wzj" } })}`,
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(getPrivacyConfig()).toEqual({ enabled: false, rules: { weizhangjian: "wzj" } });
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
+  });
+
+  it("auto reloads privacy.json changes without explicit reload", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ weizhangjian: "wzj" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello wzj");
+
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ enabled: false, rules: { weizhangjian: "wzj-disabled" } }),
+      "utf-8",
+    );
+
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
+    expect(getPrivacyConfig()).toEqual({ enabled: false, rules: { weizhangjian: "wzj-disabled" } });
+  });
+
+  it("replaces multiple rules and repeated occurrences", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify({ a: "A", b: "B" }),
@@ -72,7 +128,7 @@ describe("applyPrivacy", () => {
     expect(applyPrivacy("a b a b")).toBe("A B A B");
   });
 
-  it("空文本直接返回", async () => {
+  it("returns empty text directly", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify({ x: "y" }),
@@ -83,7 +139,7 @@ describe("applyPrivacy", () => {
     expect(applyPrivacy("")).toBe("");
   });
 
-  it("规则中的特殊字符不会被当作正则", async () => {
+  it("treats special characters in rule keys literally", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify({ "a.b": "X", "(test)": "Y", "*star": "Z" }),
@@ -96,7 +152,7 @@ describe("applyPrivacy", () => {
     expect(applyPrivacy("a *star shines")).toBe("a Z shines");
   });
 
-  it("reloadPrivacyRules 强制重新加载", async () => {
+  it("reloadPrivacyRules forces a reload", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify({ old: "OLD" }),
@@ -107,7 +163,6 @@ describe("applyPrivacy", () => {
     expect(applyPrivacy("old")).toBe("OLD");
     expect(getPrivacyRules()).toEqual({ old: "OLD" });
 
-    // 变更磁盘内容后 reload
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify({ new: "NEW" }),
@@ -119,7 +174,7 @@ describe("applyPrivacy", () => {
     expect(getPrivacyRules()).toEqual({ new: "NEW" });
   });
 
-  it("格式错误的 JSON 不抛异常，返回原文", async () => {
+  it("returns original text for malformed JSON", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       "not json",
@@ -130,7 +185,7 @@ describe("applyPrivacy", () => {
     expect(applyPrivacy("hello")).toBe("hello");
   });
 
-  it("数组格式的 JSON 不抛异常，返回原文", async () => {
+  it("returns original text for array JSON", async () => {
     await writeFile(
       join(TEST_DATA_DIR, "privacy.json"),
       JSON.stringify(["a", "b"]),
@@ -140,4 +195,4 @@ describe("applyPrivacy", () => {
 
     expect(applyPrivacy("hello")).toBe("hello");
   });
-});
+});

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

@@ -1,92 +1,92 @@
-import { describe, it, expect } from "vitest";
-import {
-  PAGE_HTML,
-  chooseStartPath,
-  unflattenConfig,
-} from "../web-ui.ts";
-
-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",
-      },
-    });
-  });
-
-  it("maps Claude apiKey and baseUrl into claude config", () => {
-    expect(
-      unflattenConfig({
-        CHATCCC_ANTHROPIC_API_KEY: "sk-test-key",
-        CHATCCC_ANTHROPIC_BASE_URL: "https://api.example.com",
-      }),
-    ).toEqual({
-      claude: {
-        apiKey: "sk-test-key",
-        baseUrl: "https://api.example.com",
-      },
-    });
-  });
-});
-
-describe("dashboard edit modal", () => {
-  it("shows the edit modal and overlay when a section edit button is clicked", () => {
-    expect(PAGE_HTML).toContain("function editSection(section)");
-    expect(PAGE_HTML).toContain("document.getElementById('edit-modal').classList.remove('hidden');");
-    expect(PAGE_HTML).toContain("document.getElementById('edit-overlay').classList.remove('hidden');");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// chooseStartPath — /api/start 的路径选择
-// 关键护栏：
-//   - setup 模式（hasInplaceActivateHook=true）下 isServiceRunning 永远为 true
-//     （setup 进程自己占着 PID 文件），必须无条件走 inplace；否则用户点
-//     "保存并启动"将永远拿到 "Service is already running"。
-//   - dashboard 模式 + service 已运行（通常就是当前进程自己）→ "reload"：
-//     用户点"保存并启动"想让新 config 生效，但服务正在跑——不真重启，仅
-//     调用 reloadConfigFromDisk() 刷新进程内 export let 常量。绝不能再
-//     返回"already running"挡用户路。
-//   - dashboard 模式 + service 未运行 → spawn 一个新的（旧 service 退出后场景）。
-// ---------------------------------------------------------------------------
-
-describe("chooseStartPath", () => {
-  it("setup 模式（注入 inplace hook）→ inplace（不管 PID 文件状态）", () => {
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: true,
-        isServiceRunning: true,
-      }),
-    ).toBe("inplace");
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: true,
-        isServiceRunning: false,
-      }),
-    ).toBe("inplace");
-  });
-
-  it("dashboard 模式 + service 已运行 → reload（仅刷新 config，不真重启）", () => {
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: false,
-        isServiceRunning: true,
-      }),
-    ).toBe("reload");
-  });
-
-  it("dashboard 模式 + service 未运行 → spawn", () => {
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: false,
-        isServiceRunning: false,
-      }),
-    ).toBe("spawn");
-  });
-});
+import { describe, it, expect } from "vitest";
+import {
+  PAGE_HTML,
+  chooseStartPath,
+  unflattenConfig,
+} from "../web-ui.ts";
+
+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",
+      },
+    });
+  });
+
+  it("maps Claude apiKey and baseUrl into claude config", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_ANTHROPIC_API_KEY: "sk-test-key",
+        CHATCCC_ANTHROPIC_BASE_URL: "https://api.example.com",
+      }),
+    ).toEqual({
+      claude: {
+        apiKey: "sk-test-key",
+        baseUrl: "https://api.example.com",
+      },
+    });
+  });
+});
+
+describe("dashboard edit modal", () => {
+  it("shows the edit modal and overlay when a section edit button is clicked", () => {
+    expect(PAGE_HTML).toContain("function editSection(section)");
+    expect(PAGE_HTML).toContain("document.getElementById('edit-modal').classList.remove('hidden');");
+    expect(PAGE_HTML).toContain("document.getElementById('edit-overlay').classList.remove('hidden');");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// chooseStartPath — /api/start 的路径选择
+// 关键护栏：
+//   - setup 模式（hasInplaceActivateHook=true）下 isServiceRunning 永远为 true
+//     （setup 进程自己占着 PID 文件），必须无条件走 inplace；否则用户点
+//     "保存并启动"将永远拿到 "Service is already running"。
+//   - dashboard 模式 + service 已运行（通常就是当前进程自己）→ "reload"：
+//     用户点"保存并启动"想让新 config 生效，但服务正在跑——不真重启，仅
+//     调用 reloadConfigFromDisk() 刷新进程内 export let 常量。绝不能再
+//     返回"already running"挡用户路。
+//   - dashboard 模式 + service 未运行 → spawn 一个新的（旧 service 退出后场景）。
+// ---------------------------------------------------------------------------
+
+describe("chooseStartPath", () => {
+  it("setup 模式（注入 inplace hook）→ inplace（不管 PID 文件状态）", () => {
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: true,
+        isServiceRunning: true,
+      }),
+    ).toBe("inplace");
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: true,
+        isServiceRunning: false,
+      }),
+    ).toBe("inplace");
+  });
+
+  it("dashboard 模式 + service 已运行 → reload（仅刷新 config，不真重启）", () => {
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: false,
+        isServiceRunning: true,
+      }),
+    ).toBe("reload");
+  });
+
+  it("dashboard 模式 + service 未运行 → spawn", () => {
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: false,
+        isServiceRunning: false,
+      }),
+    ).toBe("spawn");
+  });
+});