chatccc 0.2.63 → 0.2.65

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

@@ -1,4 +1,4 @@
-import { mkdtemp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdtemp, mkdir, rm, writeFile, readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { afterEach, describe, expect, it } from "vitest";
@@ -44,58 +44,57 @@ describe("IM skills prompt rendering", () => {
     expect(prompt).not.toContain("{{");
   });
 
-  it("renders separate WeChat image, file, and video capability docs", async () => {
-    tempRoot = await mkdtemp(join(tmpdir(), "chatccc-im-skills-cache-"));
-    const prompt = await buildImSkillsPrompt({
-      variables: {
-        cwd: "C:/work",
-        im_skills_cache_dir: tempRoot,
-        wechat_send_image_script: "C:/work/im-skills/wechat-image-skill/send-image.mjs",
-        wechat_send_file_script: "C:/work/im-skills/wechat-file-skill/send-file.mjs",
-        wechat_send_video_script: "C:/work/im-skills/wechat-video-skill/send-video.mjs",
-      },
-    });
+  it("filters skills by enabledSkillNames", async () => {
+    tempRoot = await mkdtemp(join(tmpdir(), "chatccc-im-skills-filter-"));
+    const feishuDir = join(tempRoot, "feishu-skill");
+    const wechatDir = join(tempRoot, "wechat-skill");
+    const outDir = join(tempRoot, "out");
+    await mkdir(feishuDir);
+    await mkdir(wechatDir);
+    await writeFile(join(feishuDir, "skill.md"), "Feishu {{cwd}}", "utf-8");
+    await writeFile(join(feishuDir, "receive-send-image.md"), "Feishu doc", "utf-8");
+    await writeFile(join(wechatDir, "skill.md"), "WeChat {{cwd}}", "utf-8");
+    await writeFile(join(wechatDir, "receive-send-image.md"), "WeChat doc", "utf-8");
 
-    const exported = await exportSkillSubDocs(
-      {
-        variables: {
-          cwd: "C:/work",
-          im_skills_cache_dir: tempRoot,
-          wechat_send_image_script: "C:/work/im-skills/wechat-image-skill/send-image.mjs",
-          wechat_send_file_script: "C:/work/im-skills/wechat-file-skill/send-file.mjs",
-          wechat_send_video_script: "C:/work/im-skills/wechat-video-skill/send-video.mjs",
-        },
-      },
-      tempRoot,
-    );
+    const input = {
+      skillsDir: tempRoot,
+      enabledSkillNames: ["feishu-skill"],
+      variables: { cwd: "C:/work" },
+    };
+    const prompt = await buildImSkillsPrompt(input);
+    const exported = await exportSkillSubDocs(input, outDir);
 
-    expect(prompt).toContain("[ChatCCC IM skill: wechat-image-skill]");
-    expect(prompt).toContain("[ChatCCC IM skill: wechat-file-skill]");
-    expect(prompt).toContain("[ChatCCC IM skill: wechat-video-skill]");
+    expect(prompt).toContain("[ChatCCC IM skill: feishu-skill]");
+    expect(prompt).toContain("Feishu C:/work");
     expect(prompt).not.toContain("[ChatCCC IM skill: wechat-skill]");
-    expect(prompt).toContain("Receive images");
-    expect(prompt).toContain("Send images");
-    expect(prompt).toContain("Receive files");
-    expect(prompt).toContain("Send files");
-    expect(prompt).toContain("Receive videos");
-    expect(prompt).toContain("Send videos");
-    expect(prompt).toContain("receive-send-image.md");
-    expect(prompt).toContain("receive-send-file.md");
-    expect(prompt).toContain("receive-send-video.md");
-    expect(prompt).not.toContain("{{wechat_send_image_script}}");
-    expect(prompt).not.toContain("{{wechat_send_file_script}}");
-    expect(prompt).not.toContain("{{wechat_send_video_script}}");
-    expect(exported.some((file) => file.endsWith(join("wechat-image-skill", "receive-send-image.md")))).toBe(true);
-    expect(exported.some((file) => file.endsWith(join("wechat-file-skill", "receive-send-file.md")))).toBe(true);
-    expect(exported.some((file) => file.endsWith(join("wechat-video-skill", "receive-send-video.md")))).toBe(true);
-    await expect(readFile(join(tempRoot, "wechat-image-skill", "receive-send-image.md"), "utf8")).resolves.toContain(
-      "send-image.mjs",
-    );
-    await expect(readFile(join(tempRoot, "wechat-file-skill", "receive-send-file.md"), "utf8")).resolves.toContain(
-      "send-file.mjs",
-    );
-    await expect(readFile(join(tempRoot, "wechat-video-skill", "receive-send-video.md"), "utf8")).resolves.toContain(
-      "send-video.mjs",
+    expect(prompt).not.toContain("WeChat C:/work");
+    expect(exported).toHaveLength(1);
+    expect(exported[0]).toContain(join("feishu-skill", "receive-send-image.md"));
+    await expect(readFile(join(outDir, "feishu-skill", "receive-send-image.md"), "utf8")).resolves.toContain(
+      "Feishu doc",
     );
   });
+
+  it("skips filtering when enabledSkillNames is omitted", async () => {
+    tempRoot = await mkdtemp(join(tmpdir(), "chatccc-im-skills-all-"));
+    const feishuDir = join(tempRoot, "feishu-skill");
+    const wechatDir = join(tempRoot, "wechat-skill");
+    const outDir = join(tempRoot, "out");
+    await mkdir(feishuDir);
+    await mkdir(wechatDir);
+    await writeFile(join(feishuDir, "skill.md"), "Feishu {{cwd}}", "utf-8");
+    await writeFile(join(feishuDir, "receive-send-image.md"), "Feishu doc", "utf-8");
+    await writeFile(join(wechatDir, "skill.md"), "WeChat {{cwd}}", "utf-8");
+    await writeFile(join(wechatDir, "receive-send-image.md"), "WeChat doc", "utf-8");
+
+    const prompt = await buildImSkillsPrompt({
+      skillsDir: tempRoot,
+      variables: { cwd: "C:/work" },
+    });
+    const exported = await exportSkillSubDocs({ skillsDir: tempRoot, variables: { cwd: "C:/work" } }, outDir);
+
+    expect(prompt).toContain("[ChatCCC IM skill: feishu-skill]");
+    expect(prompt).toContain("[ChatCCC IM skill: wechat-skill]");
+    expect(exported.length).toBeGreaterThanOrEqual(2);
+  });
 });

package/src/__tests__/orchestrator.test.ts

@@ -146,7 +146,7 @@ describe("handleCommand WeChat processing ack", () => {
     expect(platform.sendCard).toHaveBeenCalledWith(
       "wx-chat",
       "生成中",
-      "该会话正在生成回复中，请等待完成后再发送新消息。如需中断生成，请发送 /stop 指令。",
+      "该会话正在生成回复中，请等待完成后再发送新消息。",
       "yellow",
     );
   });

package/src/__tests__/privacy.test.ts

@@ -1,143 +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");
-  });
+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");
+  });
 });