chatccc 0.2.196 → 0.2.198

package/src/__tests__/builtin-file-tools.test.ts

@@ -1,196 +1,224 @@
-import { execFile } from "node:child_process";
-import { createHash } from "node:crypto";
-import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { promisify } from "node:util";
-
-import { afterEach, describe, expect, it } from "vitest";
-
-import {
-  applyPatchForTool,
-  createFileForTool,
-  deleteFileForTool,
-  editFileForTool,
-  listDirForTool,
-  moveFileForTool,
-  readFileForTool,
-  searchCodeForTool,
-} from "../builtin/file-tools.ts";
-
-const execFileAsync = promisify(execFile);
-const tempDirs: string[] = [];
-
-async function makeTempDir(): Promise<string> {
-  const dir = await mkdtemp(join(tmpdir(), "chatccc-builtin-tools-"));
-  tempDirs.push(dir);
-  return dir;
-}
-
-async function hasRg(): Promise<boolean> {
-  try {
-    await execFileAsync("rg", ["--version"]);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function sha256(text: string): string {
-  return createHash("sha256").update(text).digest("hex");
-}
-
-afterEach(async () => {
-  await Promise.all(tempDirs.splice(0).map((dir) => rm(dir, { recursive: true, force: true })));
-});
-
-describe("builtin file tools", () => {
-  it("reads a text file with line ranges", async () => {
-    const dir = await makeTempDir();
-    await writeFile(join(dir, ".secret.txt"), "one\ntwo\nthree\n", "utf8");
-
-    const result = await readFileForTool(dir, { path: ".secret.txt", startLine: 2, endLine: 3 });
-
-    expect(result).toEqual(expect.objectContaining({
-      sha256: sha256("one\ntwo\nthree\n"),
-      isBinary: false,
-      content: "two\nthree",
-      startLine: 2,
-      endLine: 3,
-      totalLines: 4,
-    }));
-    expect(result.path).toContain(".secret.txt");
-  });
-
-  it("lists directory entries including hidden files", async () => {
-    const dir = await makeTempDir();
-    await writeFile(join(dir, ".env"), "TOKEN=x", "utf8");
-
-    const result = await listDirForTool(dir);
-
-    expect(result.entries).toContainEqual(expect.objectContaining({
-      name: ".env",
-      type: "file",
-    }));
-  });
-
-  it("searches code with rg without using a shell", async () => {
-    if (!await hasRg()) return;
-
-    const dir = await makeTempDir();
-    await writeFile(join(dir, "a.ts"), "const marker = 1;\n", "utf8");
-
-    const result = await searchCodeForTool(dir, { query: "marker", glob: "*.ts" });
-
-    expect(result.matches).toEqual([
-      expect.objectContaining({
-        line: 1,
-        text: "const marker = 1;",
-      }),
-    ]);
-  });
-
-  it("edits a file with exact replacements and a SHA-256 precondition", async () => {
-    const dir = await makeTempDir();
-    const file = join(dir, "edit.txt");
-    await writeFile(file, "alpha\nbeta\ngamma\n", "utf8");
-
-    const result = await editFileForTool(dir, {
-      path: "edit.txt",
-      expectedSha256: sha256("alpha\nbeta\ngamma\n"),
-      edits: [{ oldText: "beta", newText: "BETA" }],
-    });
-
-    expect(result).toEqual(expect.objectContaining({
-      changed: true,
-      editsApplied: 1,
-      beforeSha256: sha256("alpha\nbeta\ngamma\n"),
-      afterSha256: sha256("alpha\nBETA\ngamma\n"),
-    }));
-    await expect(readFile(file, "utf8")).resolves.toBe("alpha\nBETA\ngamma\n");
-  });
-
-  it("rejects edits when the SHA-256 precondition does not match", async () => {
-    const dir = await makeTempDir();
-    await writeFile(join(dir, "edit.txt"), "current\n", "utf8");
-
-    await expect(editFileForTool(dir, {
-      path: "edit.txt",
-      expectedSha256: sha256("stale\n"),
-      edits: [{ oldText: "current", newText: "next" }],
-    })).rejects.toThrow("SHA-256 mismatch");
-  });
-
-  it("creates and deletes files", async () => {
-    const dir = await makeTempDir();
-
-    const created = await createFileForTool(dir, {
-      path: "created.txt",
-      content: "created\n",
-    });
-    expect(created).toEqual(expect.objectContaining({
-      changed: true,
-      afterSha256: sha256("created\n"),
-    }));
-    await expect(readFile(join(dir, "created.txt"), "utf8")).resolves.toBe("created\n");
-
-    const deleted = await deleteFileForTool(dir, {
-      path: "created.txt",
-      expectedSha256: sha256("created\n"),
-    });
-    expect(deleted).toEqual(expect.objectContaining({
-      deleted: true,
-      beforeSha256: sha256("created\n"),
-    }));
-    await expect(stat(join(dir, "created.txt"))).rejects.toThrow();
-  });
-
-  it("moves files and creates the destination directory", async () => {
-    const dir = await makeTempDir();
-    await writeFile(join(dir, "old.txt"), "move me\n", "utf8");
-
-    const result = await moveFileForTool(dir, {
-      sourcePath: "old.txt",
-      destinationPath: "nested/new.txt",
-      expectedSourceSha256: sha256("move me\n"),
-    });
-
-    expect(result).toEqual(expect.objectContaining({
-      moved: true,
-      sourceSha256: sha256("move me\n"),
-    }));
-    await expect(stat(join(dir, "old.txt"))).rejects.toThrow();
-    await expect(readFile(join(dir, "nested", "new.txt"), "utf8")).resolves.toBe("move me\n");
-  });
-
-  it("applies a unified diff patch", async () => {
-    const dir = await makeTempDir();
-    await writeFile(join(dir, "patch.txt"), "one\ntwo\nthree\n", "utf8");
-
-    const result = await applyPatchForTool(dir, {
-      patch: [
-        "--- a/patch.txt",
-        "+++ b/patch.txt",
-        "@@ -1,4 +1,4 @@",
-        " one",
-        "-two",
-        "+TWO",
-        " three",
-        " ",
-        "",
-      ].join("\n"),
-      expectedSha256ByPath: {
-        "patch.txt": sha256("one\ntwo\nthree\n"),
-      },
-    });
-
-    expect(result.changedFiles).toEqual([
-      expect.objectContaining({
-        action: "edit",
-        beforeSha256: sha256("one\ntwo\nthree\n"),
-        afterSha256: sha256("one\nTWO\nthree\n"),
-      }),
-    ]);
-    await expect(readFile(join(dir, "patch.txt"), "utf8")).resolves.toBe("one\nTWO\nthree\n");
-  });
-});
+import { execFile } from "node:child_process";
+import { createHash } from "node:crypto";
+import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { promisify } from "node:util";
+
+import { afterEach, describe, expect, it } from "vitest";
+
+import {
+  applyPatchForTool,
+  createFileForTool,
+  deleteFileForTool,
+  editFileForTool,
+  listDirForTool,
+  moveFileForTool,
+  readFileForTool,
+  runCommandForTool,
+  searchCodeForTool,
+} from "../builtin/file-tools.ts";
+
+const execFileAsync = promisify(execFile);
+const tempDirs: string[] = [];
+
+async function makeTempDir(): Promise<string> {
+  const dir = await mkdtemp(join(tmpdir(), "chatccc-builtin-tools-"));
+  tempDirs.push(dir);
+  return dir;
+}
+
+async function hasRg(): Promise<boolean> {
+  try {
+    await execFileAsync("rg", ["--version"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function sha256(text: string): string {
+  return createHash("sha256").update(text).digest("hex");
+}
+
+afterEach(async () => {
+  await Promise.all(tempDirs.splice(0).map((dir) => rm(dir, { recursive: true, force: true })));
+});
+
+describe("builtin file tools", () => {
+  it("reads a text file with line ranges", async () => {
+    const dir = await makeTempDir();
+    await writeFile(join(dir, ".secret.txt"), "one\ntwo\nthree\n", "utf8");
+
+    const result = await readFileForTool(dir, { path: ".secret.txt", startLine: 2, endLine: 3 });
+
+    expect(result).toEqual(expect.objectContaining({
+      sha256: sha256("one\ntwo\nthree\n"),
+      isBinary: false,
+      content: "two\nthree",
+      startLine: 2,
+      endLine: 3,
+      totalLines: 4,
+    }));
+    expect(result.path).toContain(".secret.txt");
+  });
+
+  it("lists directory entries including hidden files", async () => {
+    const dir = await makeTempDir();
+    await writeFile(join(dir, ".env"), "TOKEN=x", "utf8");
+
+    const result = await listDirForTool(dir);
+
+    expect(result.entries).toContainEqual(expect.objectContaining({
+      name: ".env",
+      type: "file",
+    }));
+  });
+
+  it("searches code with rg without using a shell", async () => {
+    if (!await hasRg()) return;
+
+    const dir = await makeTempDir();
+    await writeFile(join(dir, "a.ts"), "const marker = 1;\n", "utf8");
+
+    const result = await searchCodeForTool(dir, { query: "marker", glob: "*.ts" });
+
+    expect(result.matches).toEqual([
+      expect.objectContaining({
+        line: 1,
+        text: "const marker = 1;",
+      }),
+    ]);
+  });
+
+  it("runs non-interactive shell commands in the requested cwd", async () => {
+    const dir = await makeTempDir();
+
+    const result = await runCommandForTool(dir, {
+      command: "node -e \"process.stdout.write(process.cwd())\"",
+      timeoutMs: 5_000,
+    });
+
+    expect(result.exitCode).toBe(0);
+    expect(result.timedOut).toBe(false);
+    expect(result.stdout.toLowerCase()).toBe(dir.toLowerCase());
+    expect(result.stderr).toBe("");
+  });
+
+  it("returns non-zero command exits without throwing", async () => {
+    const dir = await makeTempDir();
+
+    const result = await runCommandForTool(dir, {
+      command: "node -e \"process.stderr.write('failed'); process.exit(7)\"",
+      timeoutMs: 5_000,
+    });
+
+    expect(result.exitCode).toBe(7);
+    expect(result.stderr).toBe("failed");
+    expect(result.timedOut).toBe(false);
+  });
+
+  it("edits a file with exact replacements and a SHA-256 precondition", async () => {
+    const dir = await makeTempDir();
+    const file = join(dir, "edit.txt");
+    await writeFile(file, "alpha\nbeta\ngamma\n", "utf8");
+
+    const result = await editFileForTool(dir, {
+      path: "edit.txt",
+      expectedSha256: sha256("alpha\nbeta\ngamma\n"),
+      edits: [{ oldText: "beta", newText: "BETA" }],
+    });
+
+    expect(result).toEqual(expect.objectContaining({
+      changed: true,
+      editsApplied: 1,
+      beforeSha256: sha256("alpha\nbeta\ngamma\n"),
+      afterSha256: sha256("alpha\nBETA\ngamma\n"),
+    }));
+    await expect(readFile(file, "utf8")).resolves.toBe("alpha\nBETA\ngamma\n");
+  });
+
+  it("rejects edits when the SHA-256 precondition does not match", async () => {
+    const dir = await makeTempDir();
+    await writeFile(join(dir, "edit.txt"), "current\n", "utf8");
+
+    await expect(editFileForTool(dir, {
+      path: "edit.txt",
+      expectedSha256: sha256("stale\n"),
+      edits: [{ oldText: "current", newText: "next" }],
+    })).rejects.toThrow("SHA-256 mismatch");
+  });
+
+  it("creates and deletes files", async () => {
+    const dir = await makeTempDir();
+
+    const created = await createFileForTool(dir, {
+      path: "created.txt",
+      content: "created\n",
+    });
+    expect(created).toEqual(expect.objectContaining({
+      changed: true,
+      afterSha256: sha256("created\n"),
+    }));
+    await expect(readFile(join(dir, "created.txt"), "utf8")).resolves.toBe("created\n");
+
+    const deleted = await deleteFileForTool(dir, {
+      path: "created.txt",
+      expectedSha256: sha256("created\n"),
+    });
+    expect(deleted).toEqual(expect.objectContaining({
+      deleted: true,
+      beforeSha256: sha256("created\n"),
+    }));
+    await expect(stat(join(dir, "created.txt"))).rejects.toThrow();
+  });
+
+  it("moves files and creates the destination directory", async () => {
+    const dir = await makeTempDir();
+    await writeFile(join(dir, "old.txt"), "move me\n", "utf8");
+
+    const result = await moveFileForTool(dir, {
+      sourcePath: "old.txt",
+      destinationPath: "nested/new.txt",
+      expectedSourceSha256: sha256("move me\n"),
+    });
+
+    expect(result).toEqual(expect.objectContaining({
+      moved: true,
+      sourceSha256: sha256("move me\n"),
+    }));
+    await expect(stat(join(dir, "old.txt"))).rejects.toThrow();
+    await expect(readFile(join(dir, "nested", "new.txt"), "utf8")).resolves.toBe("move me\n");
+  });
+
+  it("applies a unified diff patch", async () => {
+    const dir = await makeTempDir();
+    await writeFile(join(dir, "patch.txt"), "one\ntwo\nthree\n", "utf8");
+
+    const result = await applyPatchForTool(dir, {
+      patch: [
+        "--- a/patch.txt",
+        "+++ b/patch.txt",
+        "@@ -1,4 +1,4 @@",
+        " one",
+        "-two",
+        "+TWO",
+        " three",
+        " ",
+        "",
+      ].join("\n"),
+      expectedSha256ByPath: {
+        "patch.txt": sha256("one\ntwo\nthree\n"),
+      },
+    });
+
+    expect(result.changedFiles).toEqual([
+      expect.objectContaining({
+        action: "edit",
+        beforeSha256: sha256("one\ntwo\nthree\n"),
+        afterSha256: sha256("one\nTWO\nthree\n"),
+      }),
+    ]);
+    await expect(readFile(join(dir, "patch.txt"), "utf8")).resolves.toBe("one\nTWO\nthree\n");
+  });
+});

package/src/__tests__/builtin-session-select.test.ts

@@ -1,116 +1,116 @@
-import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { describe, expect, it } from "vitest";
-
-import { defaultBuiltinSessionId } from "../builtin/context.ts";
-import { resolveBuiltinSession } from "../builtin/session-select.ts";
-
-async function writeSession(
-  contextDir: string,
-  sessionId: string,
-  options: { cwd?: string; updatedAt: number; totalMessages?: number },
-): Promise<void> {
-  const dir = join(contextDir, sessionId);
-  await mkdir(dir, { recursive: true });
-  await writeFile(
-    join(dir, "context.json"),
-    JSON.stringify({
-      version: 1,
-      createdAt: options.updatedAt,
-      updatedAt: options.updatedAt,
-      sessionId,
-      ...(options.cwd ? { cwd: options.cwd } : {}),
-      summary: "",
-      messages: [],
-      totalMessages: options.totalMessages ?? 0,
-      compactedMessages: 0,
-    }),
-    "utf8",
-  );
-}
-
-describe("resolveBuiltinSession", () => {
-  it("creates a fresh timestamp session by default", async () => {
-    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-session-select-new-"));
-
-    const result = resolveBuiltinSession({
-      cwd: "C:\\repo",
-      contextDir,
-      now: new Date(2026, 6, 2, 12, 15, 30),
-      randomSuffix: "a1b2c3",
-    });
-
-    expect(result).toEqual({
-      mode: "new",
-      sessionId: "session-20260702-121530-a1b2c3",
-    });
-  });
-
-  it("resumes an explicit existing session id", async () => {
-    const contextDir = join(tmpdir(), `chatccc-session-select-explicit-${Date.now()}`);
-    await writeSession(contextDir, "manual-session", { updatedAt: 1 });
-
-    expect(resolveBuiltinSession({
-      cwd: "C:\\repo",
-      contextDir,
-      resume: "manual-session",
-    })).toEqual({
-      mode: "resumed",
-      sessionId: "manual-session",
-    });
-  });
-
-  it("fails when an explicit session id does not exist", async () => {
-    const contextDir = join(tmpdir(), `chatccc-session-select-missing-${Date.now()}`);
-
-    expect(() => resolveBuiltinSession({
-      cwd: "C:\\repo",
-      contextDir,
-      resume: "missing",
-    })).toThrow("未找到 ccc 会话: missing");
-  });
-
-  it("resumes the newest session for cwd when resume has no id", async () => {
-    const contextDir = join(tmpdir(), `chatccc-session-select-cwd-${Date.now()}`);
-    await writeSession(contextDir, "old-match", { cwd: "C:\\repo", updatedAt: 1_000 });
-    await writeSession(contextDir, "new-match", { cwd: "C:\\repo", updatedAt: 2_000 });
-    await writeSession(contextDir, "other-cwd", { cwd: "C:\\other", updatedAt: 3_000 });
-
-    expect(resolveBuiltinSession({
-      cwd: "C:\\repo",
-      contextDir,
-      resume: true,
-    })).toEqual({
-      mode: "resumed",
-      sessionId: "new-match",
-    });
-  });
-
-  it("resumes legacy cwd-hash sessions when resume has no id", async () => {
-    const contextDir = join(tmpdir(), `chatccc-session-select-legacy-${Date.now()}`);
-    const cwd = "C:\\repo";
-    const legacySessionId = defaultBuiltinSessionId(cwd);
-    await writeSession(contextDir, legacySessionId, { updatedAt: 1_000 });
-
-    expect(resolveBuiltinSession({
-      cwd,
-      contextDir,
-      resume: true,
-    })).toEqual({
-      mode: "resumed",
-      sessionId: legacySessionId,
-    });
-  });
-
-  it("fails when there is no cwd session to resume", async () => {
-    const contextDir = join(tmpdir(), `chatccc-session-select-empty-${Date.now()}`);
-
-    expect(() => resolveBuiltinSession({
-      cwd: "C:\\repo",
-      contextDir,
-      resume: true,
-    })).toThrow("未找到当前目录可恢复的 ccc 会话");
-  });
-});
+import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import { defaultBuiltinSessionId } from "../builtin/context.ts";
+import { resolveBuiltinSession } from "../builtin/session-select.ts";
+
+async function writeSession(
+  contextDir: string,
+  sessionId: string,
+  options: { cwd?: string; updatedAt: number; totalMessages?: number },
+): Promise<void> {
+  const dir = join(contextDir, sessionId);
+  await mkdir(dir, { recursive: true });
+  await writeFile(
+    join(dir, "context.json"),
+    JSON.stringify({
+      version: 1,
+      createdAt: options.updatedAt,
+      updatedAt: options.updatedAt,
+      sessionId,
+      ...(options.cwd ? { cwd: options.cwd } : {}),
+      summary: "",
+      messages: [],
+      totalMessages: options.totalMessages ?? 0,
+      compactedMessages: 0,
+    }),
+    "utf8",
+  );
+}
+
+describe("resolveBuiltinSession", () => {
+  it("creates a fresh timestamp session by default", async () => {
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-session-select-new-"));
+
+    const result = resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      now: new Date(2026, 6, 2, 12, 15, 30),
+      randomSuffix: "a1b2c3",
+    });
+
+    expect(result).toEqual({
+      mode: "new",
+      sessionId: "session-20260702-121530-a1b2c3",
+    });
+  });
+
+  it("resumes an explicit existing session id", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-explicit-${Date.now()}`);
+    await writeSession(contextDir, "manual-session", { updatedAt: 1 });
+
+    expect(resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: "manual-session",
+    })).toEqual({
+      mode: "resumed",
+      sessionId: "manual-session",
+    });
+  });
+
+  it("fails when an explicit session id does not exist", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-missing-${Date.now()}`);
+
+    expect(() => resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: "missing",
+    })).toThrow("未找到 ccc 会话: missing");
+  });
+
+  it("resumes the newest session for cwd when resume has no id", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-cwd-${Date.now()}`);
+    await writeSession(contextDir, "old-match", { cwd: "C:\\repo", updatedAt: 1_000 });
+    await writeSession(contextDir, "new-match", { cwd: "C:\\repo", updatedAt: 2_000 });
+    await writeSession(contextDir, "other-cwd", { cwd: "C:\\other", updatedAt: 3_000 });
+
+    expect(resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: true,
+    })).toEqual({
+      mode: "resumed",
+      sessionId: "new-match",
+    });
+  });
+
+  it("resumes legacy cwd-hash sessions when resume has no id", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-legacy-${Date.now()}`);
+    const cwd = "C:\\repo";
+    const legacySessionId = defaultBuiltinSessionId(cwd);
+    await writeSession(contextDir, legacySessionId, { updatedAt: 1_000 });
+
+    expect(resolveBuiltinSession({
+      cwd,
+      contextDir,
+      resume: true,
+    })).toEqual({
+      mode: "resumed",
+      sessionId: legacySessionId,
+    });
+  });
+
+  it("fails when there is no cwd session to resume", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-empty-${Date.now()}`);
+
+    expect(() => resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: true,
+    })).toThrow("未找到当前目录可恢复的 ccc 会话");
+  });
+});