chatccc 0.2.225 → 0.2.227

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

@@ -1,141 +1,252 @@
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { afterEach, describe, expect, it } from "vitest";
-
-import {
-  buildSkillsIndexPrompt,
-  parseSkillFrontmatter,
-  scanSkillsDirs,
-} from "../builtin/skills.ts";
-
-const tempDirs: string[] = [];
-
-async function makeTempDir(): Promise<string> {
-  const dir = await mkdtemp(join(tmpdir(), "chatccc-skills-"));
-  tempDirs.push(dir);
-  return dir;
-}
-
-afterEach(async () => {
-  await Promise.all(tempDirs.splice(0).map((dir) => rm(dir, { recursive: true, force: true })));
-});
-
-describe("parseSkillFrontmatter", () => {
-  it("parses name and description from frontmatter", () => {
-    const content = [
-      "---",
-      "name: feishu-doc-download-md",
-      "description: 下载飞书文档为 Markdown",
-      "---",
-      "",
-      "# 正文",
-    ].join("\n");
-    expect(parseSkillFrontmatter(content)).toEqual({
-      name: "feishu-doc-download-md",
-      description: "下载飞书文档为 Markdown",
-    });
-  });
-
-  it("returns null when there is no frontmatter", () => {
-    expect(parseSkillFrontmatter("# just a heading")).toBeNull();
-  });
-
-  it("tolerates missing description", () => {
-    expect(parseSkillFrontmatter("---\nname: minimal-skill\n---\n\nbody")).toEqual({
-      name: "minimal-skill",
-      description: "",
-    });
-  });
-
-  it("handles CRLF line endings", () => {
-    const content = "---\r\nname: crlf-skill\r\ndescription: CRLF 描述\r\n---\r\n\r\nbody";
-    expect(parseSkillFrontmatter(content)).toEqual({
-      name: "crlf-skill",
-      description: "CRLF 描述",
-    });
-  });
-});
-
-describe("scanSkillsDirs", () => {
-  it("scans multiple dirs, skips hidden/system dirs, dedupes by name (later dir wins)", async () => {
-    const dir = await makeTempDir();
-    const userA = join(dir, "codex-skills");
-    const userB = join(dir, "agents-skills");
-    const project = join(dir, "project-codex");
-    await mkdir(join(userA, "feishu-doc"), { recursive: true });
-    await mkdir(join(userA, ".system"), { recursive: true });
-    await mkdir(join(userA, "no-skill-dir"));
-    await mkdir(join(userB, "feishu-doc"), { recursive: true });
-    await mkdir(join(userB, "another"), { recursive: true });
-    await mkdir(join(project, "feishu-doc"), { recursive: true });
-
-    await writeFile(
-      join(userA, "feishu-doc", "SKILL.md"),
-      "---\nname: feishu-doc\ndescription: 用户级 A\n---\n",
-      "utf8",
-    );
-    await writeFile(
-      join(userA, ".system", "SKILL.md"),
-      "---\nname: system-skill\ndescription: 内置\n---\n",
-      "utf8",
-    );
-    await writeFile(
-      join(userB, "feishu-doc", "SKILL.md"),
-      "---\nname: feishu-doc\ndescription: 用户级 B\n---\n",
-      "utf8",
-    );
-    await writeFile(
-      join(userB, "another", "SKILL.md"),
-      "---\nname: another\ndescription: 另一个\n---\n",
-      "utf8",
-    );
-    await writeFile(
-      join(project, "feishu-doc", "SKILL.md"),
-      "---\nname: feishu-doc\ndescription: 项目级覆盖\n---\n",
-      "utf8",
-    );
-
-    const skills = scanSkillsDirs([userA, userB, project]);
-
-    // 去重：同名保留一个，后面的目录（项目级）覆盖前面的（用户级）
-    expect(skills).toHaveLength(2);
-    const byName = new Map(skills.map((s) => [s.name, s]));
-    expect(byName.get("feishu-doc")?.description).toBe("项目级覆盖");
-    expect(byName.get("feishu-doc")?.skillPath).toBe(join(project, "feishu-doc", "SKILL.md"));
-    expect(byName.get("another")?.description).toBe("另一个");
-    expect(byName.has("system-skill")).toBe(false); // 隐藏目录被排除
-  });
-
-  it("skips missing directories and dirs without SKILL.md", async () => {
-    const dir = await makeTempDir();
-    await mkdir(join(dir, "empty-dir"));
-
-    const skills = scanSkillsDirs([join(dir, "missing-dir"), join(dir, "empty-dir")]);
-
-    expect(skills).toEqual([]);
-  });
-});
-
-describe("buildSkillsIndexPrompt", () => {
-  it("renders a skill index with names, paths and descriptions", () => {
-    const prompt = buildSkillsIndexPrompt([
-      {
-        name: "feishu-doc",
-        description: "下载飞书文档",
-        skillPath: "C:\\users\\x\\skills\\feishu-doc\\SKILL.md",
-      },
-    ]);
-
-    expect(prompt).toContain("## Available Skills");
-    expect(prompt).toContain("**feishu-doc**");
-    expect(prompt).toContain("下载飞书文档");
-    expect(prompt).toContain("C:\\users\\x\\skills\\feishu-doc\\SKILL.md");
-    expect(prompt).toContain("read_file");
-  });
-
-  it("returns empty string for no skills", () => {
-    expect(buildSkillsIndexPrompt([])).toBe("");
-  });
-});
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync, writeFileSync, mkdirSync, utimesSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import {
+  parseSkillFrontmatter,
+  scanSkillsDirs,
+  buildDefaultSkillDirs,
+  buildSkillsIndexPrompt,
+  buildSkillTemplate,
+  type SkillDirSpec,
+  type SkillSource,
+  type SkillScope,
+} from "../builtin/skills.ts";
+
+let tempRoot: string;
+
+beforeEach(() => {
+  tempRoot = mkdtempSync(join(tmpdir(), "deepccc-skills-"));
+});
+
+afterEach(() => {
+  try {
+    rmSync(tempRoot, { recursive: true, force: true });
+  } catch {}
+});
+
+function makeSkill(specDir: string, name: string, description: string): string {
+  const dir = join(specDir, name);
+  mkdirSync(dir, { recursive: true });
+  const skillPath = join(dir, "SKILL.md");
+  writeFileSync(skillPath, `---\nname: ${name}\ndescription: ${description}\n---\n\nbody\n`, "utf8");
+  return skillPath;
+}
+
+function spec(
+  dir: string,
+  source: SkillSource,
+  scope: SkillScope = "global",
+): SkillDirSpec {
+  return { dir, source, scope };
+}
+
+describe("parseSkillFrontmatter", () => {
+  it("parses name and description from frontmatter", () => {
+    const content = [
+      "---",
+      "name: feishu-doc-download-md",
+      "description: 涓嬭浇椋炰功鏂囨。涓?Markdown",
+      "---",
+      "",
+      "# 姝ｆ枃",
+    ].join("\n");
+    expect(parseSkillFrontmatter(content)).toEqual({
+      name: "feishu-doc-download-md",
+      description: "涓嬭浇椋炰功鏂囨。涓?Markdown",
+    });
+  });
+
+  it("returns null when there is no frontmatter", () => {
+    expect(parseSkillFrontmatter("# just a heading")).toBeNull();
+  });
+
+  it("tolerates missing description", () => {
+    expect(parseSkillFrontmatter("---\nname: minimal-skill\n---\n\nbody")).toEqual({
+      name: "minimal-skill",
+      description: "",
+    });
+  });
+
+  it("handles CRLF line endings", () => {
+    const content = "---\r\nname: crlf-skill\r\ndescription: CRLF 鎻忚堪\r\n---\r\n\r\nbody";
+    expect(parseSkillFrontmatter(content)).toEqual({
+      name: "crlf-skill",
+      description: "CRLF 鎻忚堪",
+    });
+  });
+});
+
+describe("scanSkillsDirs priority matrix", () => {
+  it("codex wins over cursor, cursor wins over claude for same-name skills", async () => {
+    const claudeDir = join(tempRoot, "claude");
+    const cursorDir = join(tempRoot, "cursor");
+    const codexDir = join(tempRoot, "codex");
+    makeSkill(claudeDir, "dupe", "claude version");
+    makeSkill(cursorDir, "dupe", "cursor version");
+    makeSkill(codexDir, "dupe", "codex version");
+    makeSkill(codexDir, "only-codex", "codex only");
+
+    const skills = await scanSkillsDirs([
+      spec(claudeDir, "claude"),
+      spec(cursorDir, "cursor"),
+      spec(codexDir, "codex"),
+    ]);
+
+    const byName = new Map(skills.map((s) => [s.name, s]));
+    expect(byName.get("dupe")?.description).toBe("codex version");
+    expect(byName.get("dupe")?.source).toBe("codex");
+    expect(byName.get("dupe")?.skillPath).toContain(join("codex", "dupe"));
+    expect(byName.get("only-codex")?.source).toBe("codex");
+  });
+
+  it("project scope wins over global scope within the same source", async () => {
+    const globalCodex = join(tempRoot, "codex-global");
+    const projectCodex = join(tempRoot, "codex-project");
+    makeSkill(globalCodex, "dup", "global version");
+    makeSkill(projectCodex, "dup", "project version");
+
+    const skills = await scanSkillsDirs([
+      spec(globalCodex, "codex", "global"),
+      spec(projectCodex, "codex", "project"),
+    ]);
+
+    const byName = new Map(skills.map((s) => [s.name, s]));
+    expect(byName.get("dup")?.description).toBe("project version");
+    expect(byName.get("dup")?.scope).toBe("project");
+  });
+
+  it("deepccc source has the highest priority over codex", async () => {
+    const codexDir = join(tempRoot, "codex");
+    const deepcccDir = join(tempRoot, "deepccc");
+    makeSkill(codexDir, "dup", "from codex");
+    makeSkill(deepcccDir, "dup", "from deepccc");
+
+    const skills = await scanSkillsDirs([
+      spec(codexDir, "codex"),
+      spec(deepcccDir, "deepccc"),
+    ]);
+
+    expect(skills.find((s) => s.name === "dup")?.description).toBe("from deepccc");
+    expect(skills.find((s) => s.name === "dup")?.source).toBe("deepccc");
+  });
+
+  it("skips hidden dirs, dirs without SKILL.md, and missing dirs", async () => {
+    const dir = join(tempRoot, "src");
+    mkdirSync(join(dir, ".system"), { recursive: true });
+    writeFileSync(join(dir, ".system", "SKILL.md"), "---\nname: system-skill\ndescription: x\n---\n", "utf8");
+    mkdirSync(join(dir, "no-skill-dir"));
+
+    makeSkill(dir, "ok", "fine");
+    const skills = await scanSkillsDirs([
+      spec(join(tempRoot, "missing-dir"), "codex"),
+      spec(dir, "codex"),
+    ]);
+
+    expect(skills).toHaveLength(1);
+    expect(skills[0].name).toBe("ok");
+  });
+});
+
+describe("scanSkillsDirs hot reload (mtime cache)", () => {
+  it("re-reads a skill after its SKILL.md content changes", async () => {
+    const dir = join(tempRoot, "src");
+    const skillPath = makeSkill(dir, "live", "v1");
+
+    const first = await scanSkillsDirs([spec(dir, "deepccc")]);
+    expect(first.find((s) => s.name === "live")?.description).toBe("v1");
+
+    writeFileSync(skillPath, "---\nname: live\ndescription: v2\n---\n\nbody\n", "utf8");
+    utimesSync(skillPath, new Date(Date.now() + 3000), new Date(Date.now() + 3000)); // 寮哄埗 mtime 鍓嶈繘
+
+    const second = await scanSkillsDirs([spec(dir, "deepccc")]);
+    expect(second.find((s) => s.name === "live")?.description).toBe("v2");
+  });
+
+  it("new skill dirs are picked up on the next scan", async () => {
+    const dir = join(tempRoot, "src");
+    makeSkill(dir, "a", "A");
+
+    const first = await scanSkillsDirs([spec(dir, "deepccc")]);
+    expect(first).toHaveLength(1);
+
+    makeSkill(dir, "b", "B"); // 鏂版妧鑳斤紝鏃犻渶鏀?mtime锛堢洰褰曟灇涓炬瘡娆￠兘鍋氾級
+    const second = await scanSkillsDirs([spec(dir, "deepccc")]);
+    expect(second.map((s) => s.name).sort()).toEqual(["a", "b"]);
+  });
+
+  it("unchanged skills return identical results across scans", async () => {
+    const dir = join(tempRoot, "src");
+    makeSkill(dir, "a", "A");
+
+    const first = await scanSkillsDirs([spec(dir, "deepccc")]);
+    const second = await scanSkillsDirs([spec(dir, "deepccc")]);
+    expect(second).toEqual(first);
+  });
+});
+
+describe("buildDefaultSkillDirs", () => {
+  it("orders dirs low->high priority: claude < cursor < codex < deepccc, project after global", () => {
+    const dirs = buildDefaultSkillDirs("C:/proj");
+    expect(dirs.map((d) => `${d.source}:${d.scope}`)).toEqual([
+      "claude:global",
+      "claude:project",
+      "cursor:global",
+      "cursor:project",
+      "codex:global",
+      "codex:global",
+      "codex:project",
+      "deepccc:global",
+      "deepccc:project",
+    ]);
+  });
+
+  it("points codex global dirs at ~/.codex/skills and ~/.agents/skills", () => {
+    const dirs = buildDefaultSkillDirs("C:/proj").filter((d) => d.source === "codex" && d.scope === "global");
+    expect(dirs.map((d) => d.dir)).toEqual([
+      join(require("node:os").homedir(), ".codex", "skills"),
+      join(require("node:os").homedir(), ".agents", "skills"),
+    ]);
+  });
+});
+
+describe("buildSkillsIndexPrompt", () => {
+  it("renders index with source markers and the skill creation convention", () => {
+    const prompt = buildSkillsIndexPrompt([
+      {
+        name: "feishu-doc",
+        description: "涓嬭浇椋炰功鏂囨。",
+        skillPath: "C:/x/feishu-doc/SKILL.md",
+        source: "codex",
+        scope: "global",
+      },
+    ]);
+
+    expect(prompt).toContain("## Available Skills");
+    expect(prompt).toContain("**feishu-doc**");
+    expect(prompt).toContain("[codex:global]");
+    expect(prompt).toContain("## Creating Skills");
+    expect(prompt).toContain(".deepccc/skills");
+    expect(prompt).toContain("read_file");
+  });
+
+  it("returns empty string for no skills", () => {
+    expect(buildSkillsIndexPrompt([])).toBe("");
+  });
+});
+
+describe("buildSkillTemplate", () => {
+  it("renders a Codex-style SKILL.md with frontmatter", () => {
+    const tpl = buildSkillTemplate("my-skill", "does something");
+    expect(tpl.startsWith("---")).toBe(true);
+    expect(tpl).toContain("name: my-skill");
+    expect(tpl).toContain("description: does something");
+    expect(tpl).toContain("# my-skill");
+  });
+
+  it("defaults description to empty when omitted", () => {
+    const tpl = buildSkillTemplate("bare-skill", "");
+    expect(tpl).toContain("description: ");
+  });
+});

package/src/adapters/ccc-adapter.ts

@@ -33,6 +33,9 @@ function toChatSessionOptions(
     compactAtTokens: options.compactAtTokens,
     keepRecentMessages: options.keepRecentMessages,
     maxSteps: options.maxSteps,
+    // chatccc 无终端可交互，且对齐 claude/codex 适配器的 bypass 模式：
+    // 高危命令不询问，全部放行（与独立 deepccc CLI 的 ask 模式不同）
+    permissionMode: "bypass",
   };
 }