chatccc 0.2.230 → 0.2.231

package/src/__tests__/privacy.test.ts

@@ -1,198 +1,198 @@
-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";
-
-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>;
-let getPrivacyConfig: () => { enabled: boolean; rules: Record<string, string> };
-
-beforeEach(async () => {
-  vi.resetModules();
-  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;
-  getPrivacyConfig = mod.getPrivacyConfig;
-});
-
-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("returns original text when privacy.json is missing", () => {
-    reloadPrivacyRules();
-    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
-  });
-
-  it("supports legacy flat privacy rules", 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("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" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("a b a b")).toBe("A B A B");
-  });
-
-  it("returns empty text directly", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify({ x: "y" }),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("")).toBe("");
-  });
-
-  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" }),
-      "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 forces a reload", 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" });
-
-    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("returns original text for malformed JSON", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      "not json",
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("hello")).toBe("hello");
-  });
-
-  it("returns original text for array JSON", async () => {
-    await writeFile(
-      join(TEST_DATA_DIR, "privacy.json"),
-      JSON.stringify(["a", "b"]),
-      "utf-8",
-    );
-    reloadPrivacyRules();
-
-    expect(applyPrivacy("hello")).toBe("hello");
-  });
-});
+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";
+
+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>;
+let getPrivacyConfig: () => { enabled: boolean; rules: Record<string, string> };
+
+beforeEach(async () => {
+  vi.resetModules();
+  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;
+  getPrivacyConfig = mod.getPrivacyConfig;
+});
+
+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("returns original text when privacy.json is missing", () => {
+    reloadPrivacyRules();
+    expect(applyPrivacy("hello weizhangjian")).toBe("hello weizhangjian");
+  });
+
+  it("supports legacy flat privacy rules", 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("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" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("a b a b")).toBe("A B A B");
+  });
+
+  it("returns empty text directly", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      JSON.stringify({ x: "y" }),
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("")).toBe("");
+  });
+
+  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" }),
+      "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 forces a reload", 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" });
+
+    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("returns original text for malformed JSON", async () => {
+    await writeFile(
+      join(TEST_DATA_DIR, "privacy.json"),
+      "not json",
+      "utf-8",
+    );
+    reloadPrivacyRules();
+
+    expect(applyPrivacy("hello")).toBe("hello");
+  });
+
+  it("returns original text for array 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__/progress-reducer.test.ts

@@ -1,110 +1,121 @@
-import { describe, expect, it } from "vitest";
-
-import type { ChatEvent } from "../builtin/index.ts";
-import { reduceProgress, summarizeToolInput, summarizeToolResult } from "../progress/reducer.ts";
-import { progressView } from "../progress/view.ts";
-
-function feed(events: ChatEvent[]) {
-  return events.reduce(reduceProgress, progressView({ headerTitle: "生成中..." }));
-}
-
-describe("reduceProgress", () => {
-  it("accumulates text via accumulated field", () => {
-    const view = feed([
-      { type: "text", text: "Hello", accumulated: "Hello" },
-      { type: "text", text: " world", accumulated: "Hello world" },
-    ]);
-    expect(view.text).toBe("Hello world");
-    expect(view.status).toBe("generating");
-    expect(view.showStop).toBe(true);
-  });
-
-  it("appends tool_use as running and resolves status on tool_result", () => {
-    const view = feed([
-      { type: "tool_use", id: "t1", name: "edit_file", input: { path: "a.ts" } },
-      { type: "tool_result", tool_use_id: "t1", name: "edit_file", content: "ok", is_error: false },
-    ]);
-    expect(view.tools).toHaveLength(1);
-    expect(view.tools[0]).toMatchObject({
-      id: "t1",
-      name: "edit_file",
-      status: "ok",
-      summary: "ok",
-    });
-  });
-
-  it("marks tool as error when is_error is true", () => {
-    const view = feed([
-      { type: "tool_use", id: "t2", name: "run_command", input: { command: "npm test" } },
-      { type: "tool_result", tool_use_id: "t2", name: "run_command", content: "boom", is_error: true },
-    ]);
-    expect(view.tools[0].status).toBe("error");
-    expect(view.tools[0].summary).toBe("boom");
-  });
-
-  it("falls back to last running tool when tool_use_id mismatches", () => {
-    const view = feed([
-      { type: "tool_use", id: undefined, name: "list_dir", input: {} },
-      { type: "tool_result", tool_use_id: "unknown-id", name: "list_dir", content: "ok", is_error: false },
-    ]);
-    expect(view.tools[0].status).toBe("ok");
-  });
-
-  it("keeps multiple tool calls independently", () => {
-    const view = feed([
-      { type: "tool_use", id: "a", name: "read_file", input: { path: "a" } },
-      { type: "tool_use", id: "b", name: "read_file", input: { path: "b" } },
-      { type: "tool_result", tool_use_id: "b", name: "read_file", content: "bb", is_error: false },
-    ]);
-    expect(view.tools[0].status).toBe("running");
-    expect(view.tools[1].status).toBe("ok");
-  });
-
-  it("marks done: status done, showStop false, text finalized", () => {
-    const view = feed([
-      { type: "text", text: "part", accumulated: "part" },
-      { type: "done", text: "final answer" },
-    ]);
-    expect(view.status).toBe("done");
-    expect(view.showStop).toBe(false);
-    expect(view.text).toBe("final answer");
-  });
-
-  it("marks error status and keeps text", () => {
-    const view = feed([
-      { type: "text", text: "x", accumulated: "x" },
-      { type: "error", message: "boom" },
-    ]);
-    expect(view.status).toBe("error");
-    expect(view.showStop).toBe(false);
-    expect(view.text).toBe("x");
-  });
-
-  it("ignores compact events without changing the view identity", () => {
-    const base = progressView({ headerTitle: "生成中..." });
-    const result = reduceProgress(base, { type: "compact", compactedMessages: 5 });
-    expect(result).toBe(base);
-  });
-
-  it("does not mutate the previous view (immutable updates)", () => {
-    const base = progressView({ headerTitle: "生成中..." });
-    const next = reduceProgress(base, { type: "text", text: "hi", accumulated: "hi" });
-    expect(base.text).toBe("");
-    expect(next.text).toBe("hi");
-    expect(next).not.toBe(base);
-  });
-});
-
-describe("summarizeToolInput / summarizeToolResult", () => {
-  it("flattens multiline input to one line", () => {
-    const s = summarizeToolInput({ path: "a\nb", big: "x".repeat(200) });
-    expect(s).not.toContain("\n");
-    expect(s.length).toBeLessThanOrEqual(121);
-    expect(s.endsWith("…")).toBe(true);
-  });
-
-  it("takes first line of result content", () => {
-    expect(summarizeToolResult("line1\nline2\n")).toBe("line1");
-    expect(summarizeToolResult({ ok: true })).toBe('{"ok":true}');
-  });
-});
+import { describe, expect, it } from "vitest";
+
+import type { ChatEvent } from "../builtin/index.ts";
+import { reduceProgress, summarizeToolInput, summarizeToolResult } from "../progress/reducer.ts";
+import { progressView } from "../progress/view.ts";
+
+function feed(events: ChatEvent[]) {
+  return events.reduce(reduceProgress, progressView({ headerTitle: "生成中..." }));
+}
+
+describe("reduceProgress", () => {
+  it("renders explicit compaction and generation phases", () => {
+    const compacting = reduceProgress(
+      progressView({ headerTitle: "Generating..." }),
+      { type: "status", phase: "compacting" },
+    );
+    expect(compacting.headerTitle).toBe("压缩上下文中...");
+
+    const generating = reduceProgress(compacting, { type: "status", phase: "generating" });
+    expect(generating.headerTitle).toBe("生成回复中...");
+  });
+
+  it("accumulates text via accumulated field", () => {
+    const view = feed([
+      { type: "text", text: "Hello", accumulated: "Hello" },
+      { type: "text", text: " world", accumulated: "Hello world" },
+    ]);
+    expect(view.text).toBe("Hello world");
+    expect(view.status).toBe("generating");
+    expect(view.showStop).toBe(true);
+  });
+
+  it("appends tool_use as running and resolves status on tool_result", () => {
+    const view = feed([
+      { type: "tool_use", id: "t1", name: "edit_file", input: { path: "a.ts" } },
+      { type: "tool_result", tool_use_id: "t1", name: "edit_file", content: "ok", is_error: false },
+    ]);
+    expect(view.tools).toHaveLength(1);
+    expect(view.tools[0]).toMatchObject({
+      id: "t1",
+      name: "edit_file",
+      status: "ok",
+      summary: "ok",
+    });
+  });
+
+  it("marks tool as error when is_error is true", () => {
+    const view = feed([
+      { type: "tool_use", id: "t2", name: "run_command", input: { command: "npm test" } },
+      { type: "tool_result", tool_use_id: "t2", name: "run_command", content: "boom", is_error: true },
+    ]);
+    expect(view.tools[0].status).toBe("error");
+    expect(view.tools[0].summary).toBe("boom");
+  });
+
+  it("falls back to last running tool when tool_use_id mismatches", () => {
+    const view = feed([
+      { type: "tool_use", id: undefined, name: "list_dir", input: {} },
+      { type: "tool_result", tool_use_id: "unknown-id", name: "list_dir", content: "ok", is_error: false },
+    ]);
+    expect(view.tools[0].status).toBe("ok");
+  });
+
+  it("keeps multiple tool calls independently", () => {
+    const view = feed([
+      { type: "tool_use", id: "a", name: "read_file", input: { path: "a" } },
+      { type: "tool_use", id: "b", name: "read_file", input: { path: "b" } },
+      { type: "tool_result", tool_use_id: "b", name: "read_file", content: "bb", is_error: false },
+    ]);
+    expect(view.tools[0].status).toBe("running");
+    expect(view.tools[1].status).toBe("ok");
+  });
+
+  it("marks done: status done, showStop false, text finalized", () => {
+    const view = feed([
+      { type: "text", text: "part", accumulated: "part" },
+      { type: "done", text: "final answer" },
+    ]);
+    expect(view.status).toBe("done");
+    expect(view.showStop).toBe(false);
+    expect(view.text).toBe("final answer");
+  });
+
+  it("marks error status and keeps text", () => {
+    const view = feed([
+      { type: "text", text: "x", accumulated: "x" },
+      { type: "error", message: "boom" },
+    ]);
+    expect(view.status).toBe("error");
+    expect(view.showStop).toBe(false);
+    expect(view.text).toBe("x");
+  });
+
+  it("ignores compact events without changing the view identity", () => {
+    const base = progressView({ headerTitle: "生成中..." });
+    const result = reduceProgress(base, { type: "compact", compactedMessages: 5 });
+    expect(result).toBe(base);
+  });
+
+  it("does not mutate the previous view (immutable updates)", () => {
+    const base = progressView({ headerTitle: "生成中..." });
+    const next = reduceProgress(base, { type: "text", text: "hi", accumulated: "hi" });
+    expect(base.text).toBe("");
+    expect(next.text).toBe("hi");
+    expect(next).not.toBe(base);
+  });
+});
+
+describe("summarizeToolInput / summarizeToolResult", () => {
+  it("flattens multiline input to one line", () => {
+    const s = summarizeToolInput({ path: "a\nb", big: "x".repeat(200) });
+    expect(s).not.toContain("\n");
+    expect(s.length).toBeLessThanOrEqual(121);
+    expect(s.endsWith("…")).toBe(true);
+  });
+
+  it("takes first line of result content", () => {
+    expect(summarizeToolResult("line1\nline2\n")).toBe("line1");
+    expect(summarizeToolResult({ ok: true })).toBe('{"ok":true}');
+  });
+});