chatccc 0.2.230 → 0.2.231

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

@@ -1,211 +1,211 @@
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync, existsSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const testHome = vi.hoisted(() => ({ dir: "" }));
-
-const aiMocks = vi.hoisted(() => ({
-  streamText: vi.fn(),
-  generateText: vi.fn(),
-}));
-
-vi.mock("node:os", async () => {
-  const actual = await vi.importActual<typeof import("node:os")>("node:os");
-  const [{ mkdtempSync }, { join }] = await Promise.all([import("node:fs"), import("node:path")]);
-  testHome.dir = mkdtempSync(join(actual.tmpdir(), "chatccc-builtin-perm-"));
-  return { ...actual, homedir: () => testHome.dir };
-});
-
-vi.mock("@ai-sdk/openai-compatible", () => ({
-  createOpenAICompatible: vi.fn(() => (modelId: string) => ({ modelId })),
-}));
-
-vi.mock("ai", () => ({
-  streamText: aiMocks.streamText,
-  generateText: aiMocks.generateText,
-  isLoopFinished: vi.fn(() => ({ loopFinished: true })),
-  stepCountIs: vi.fn((count: number) => ({ count })),
-  jsonSchema: vi.fn((schema: unknown) => schema),
-  tool: vi.fn((definition: unknown) => definition),
-}));
-
-vi.mock("../builtin/raw-stream-log.ts", () => ({
-  createRawStreamLog: vi.fn().mockResolvedValue(null),
-}));
-
-import {
-  PermissionGate,
-  getAllowRules,
-  isDangerousCommand,
-  matchRule,
-  reloadAllowRules,
-} from "../builtin/permissions.ts";
-import { createBuiltinFileTools } from "../builtin/file-tools.ts";
-import { ChatSession } from "../builtin/index.ts";
-
-const streamTextMock = aiMocks.streamText;
-const generateTextMock = aiMocks.generateText;
-
-const ALLOW_FILE = () => join(testHome.dir, ".deepccc", "allow.json");
-
-async function collect(iterable: AsyncIterable<unknown>): Promise<unknown[]> {
-  const events: unknown[] = [];
-  for await (const event of iterable) events.push(event);
-  return events;
-}
-
-async function* textStream(...chunks: string[]): AsyncIterable<string> {
-  for (const chunk of chunks) yield chunk;
-}
-
-function lastRunCommandExecute(): (input: { command: string }, opts?: unknown) => Promise<unknown> {
-  const call = streamTextMock.mock.calls.at(-1)?.[0] as { tools?: Record<string, { execute?: unknown }> };
-  const execute = call?.tools?.run_command?.execute as ((input: { command: string }, opts?: unknown) => Promise<unknown>) | undefined;
-  if (!execute) throw new Error("streamText was not called with tools.run_command.execute");
-  return execute;
-}
-
-afterEach(() => {
-  try {
-    rmSync(ALLOW_FILE(), { force: true });
-  } catch {}
-  reloadAllowRules();
-  streamTextMock.mockReset();
-  generateTextMock.mockReset();
-});
-
-beforeEach(() => {
-  try {
-    rmSync(join(testHome.dir, ".deepccc"), { recursive: true, force: true });
-  } catch {}
-  mkdirSync(join(testHome.dir, ".deepccc"), { recursive: true });
-  reloadAllowRules();
-});
-
-describe("builtin permissions module", () => {
-  it("flags destructive commands and ignores normal ones", () => {
-    expect(isDangerousCommand("rm -rf node_modules")).toBe(true);
-    expect(isDangerousCommand("git push --force origin main")).toBe(true);
-    expect(isDangerousCommand("git status")).toBe(false);
-    expect(isDangerousCommand("npm test")).toBe(false);
-  });
-
-  it("matches allow/deny rules with wildcards and relative paths", () => {
-    expect(matchRule("run_command:git status*", "run_command:git status --short")).toBe(true);
-    expect(matchRule("edit_file:node_modules/**", "edit_file:node_modules/a/b.js")).toBe(true);
-    expect(matchRule("run_command:npm test", "run_command:npm test extra")).toBe(false);
-  });
-
-  it("returns empty rules when allow.json is missing", () => {
-    expect(getAllowRules()).toEqual({ allow: [], deny: [] });
-  });
-
-  it("loads rules from ~/.deepccc/allow.json", () => {
-    writeFileSync(ALLOW_FILE(), JSON.stringify({ deny: ["run_command:npm publish*"] }), "utf-8");
-    reloadAllowRules();
-    expect(getAllowRules().deny).toEqual(["run_command:npm publish*"]);
-  });
-});
-
-describe("builtin PermissionGate", () => {
-  it("bypass mode allows everything", async () => {
-    const gate = new PermissionGate("bypass");
-    expect(await gate.check({ tool: "run_command", action: "rm -rf /", reason: "high-risk", detail: "x" })).toBe("allow");
-  });
-
-  it("ask mode denies high-risk without resolver", async () => {
-    const gate = new PermissionGate("ask");
-    expect(await gate.check({ tool: "run_command", action: "rm -rf x", reason: "high-risk", detail: "x" })).toBe("deny");
-  });
-
-  it("ask mode allows non-high-risk operations without asking", async () => {
-    const resolver = vi.fn();
-    const gate = new PermissionGate("ask", resolver as never);
-    expect(await gate.check({ tool: "run_command", action: "npm test", reason: "rule", detail: "x" })).toBe("allow");
-    expect(await gate.check({ tool: "edit_file", action: "src/a.ts", reason: "rule", detail: "x" })).toBe("allow");
-    expect(resolver).not.toHaveBeenCalled();
-  });
-
-  it("follows resolver answer", async () => {
-    let answer: "allow" | "deny" = "allow";
-    const gate = new PermissionGate("ask", async () => answer);
-    expect(await gate.check({ tool: "run_command", action: "rm -rf x", reason: "high-risk", detail: "x" })).toBe("allow");
-    answer = "deny";
-    expect(await gate.check({ tool: "run_command", action: "rm -rf x", reason: "high-risk", detail: "x" })).toBe("deny");
-  });
-
-  it("deny rule wins over allow rule", async () => {
-    writeFileSync(
-      ALLOW_FILE(),
-      JSON.stringify({ allow: ["run_command:rm -rf /tmp*"], deny: ["run_command:rm -rf /tmp/forbidden*"] }),
-      "utf-8",
-    );
-    reloadAllowRules();
-    const gate = new PermissionGate("ask");
-    expect(await gate.check({ tool: "run_command", action: "rm -rf /tmp/forbidden/x", reason: "high-risk", detail: "x" })).toBe("deny");
-  });
-});
-
-describe("builtin file-tools permission integration", () => {
-  it("run_command high-risk is denied by default gate", async () => {
-    const tools = createBuiltinFileTools(testHome.dir, { permissionGate: new PermissionGate("ask") });
-    const tool = tools.run_command as unknown as {
-      execute: (input: { command: string }, opts?: unknown) => Promise<unknown>;
-    };
-    await expect(tool.execute({ command: "rm -rf node_modules" }, { abortSignal: undefined })).rejects.toThrow(/权限拒绝/);
-  });
-
-  it("no gate keeps original behavior", async () => {
-    const tools = createBuiltinFileTools(testHome.dir);
-    const tool = tools.run_command as unknown as {
-      execute: (input: { command: string }, opts?: unknown) => Promise<{ exitCode: number | null }>;
-    };
-    const result = await tool.execute({ command: "node -e \"console.log('ok')\"" }, { abortSignal: undefined });
-    expect(result.exitCode).toBe(0);
-  });
-});
-
-describe("builtin ChatSession permission integration", () => {
-  it("permissionMode bypass lets high-risk run_command execute", async () => {
-    const session = new ChatSession(
-      { apiKey: "sk-test" },
-      { sessionId: "perm-bypass", permissionMode: "bypass" },
-    );
-    streamTextMock.mockReturnValueOnce({ textStream: textStream("hi") });
-    await collect(session.chat("hi"));
-
-    const result = (await lastRunCommandExecute()({ command: "node -e \"console.log('ok')\"" }, { abortSignal: undefined })) as { exitCode: number };
-    expect(result.exitCode).toBe(0);
-  });
-
-  it("default ask mode without resolver denies high-risk run_command", async () => {
-    const session = new ChatSession(
-      { apiKey: "sk-test" },
-      { sessionId: "perm-ask" },
-    );
-    streamTextMock.mockReturnValueOnce({ textStream: textStream("hi") });
-    await collect(session.chat("hi"));
-
-    await expect(
-      lastRunCommandExecute()({ command: "rm -rf node_modules" }, { abortSignal: undefined }),
-    ).rejects.toThrow(/权限拒绝/);
-  });
-});
-
-describe("ccc-adapter uses bypass mode (aligns with claude/codex)", () => {
-  it("tools created via ccc adapter run high-risk commands without asking", async () => {
-    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
-    const adapter = createCccAdapter({ apiKey: "sk-test", contextDir: testHome.dir });
-    const { sessionId } = await adapter.createSession(testHome.dir);
-    streamTextMock.mockReturnValueOnce({ textStream: textStream("hi") });
-
-    for await (const _m of adapter.prompt(sessionId, "hi", testHome.dir)) {
-      // drain
-    }
-
-    const result = (await lastRunCommandExecute()({ command: "node -e \"console.log('bypass')\"" }, { abortSignal: undefined })) as { exitCode: number };
-    expect(result.exitCode).toBe(0);
-  });
-});
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync, existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const testHome = vi.hoisted(() => ({ dir: "" }));
+
+const aiMocks = vi.hoisted(() => ({
+  streamText: vi.fn(),
+  generateText: vi.fn(),
+}));
+
+vi.mock("node:os", async () => {
+  const actual = await vi.importActual<typeof import("node:os")>("node:os");
+  const [{ mkdtempSync }, { join }] = await Promise.all([import("node:fs"), import("node:path")]);
+  testHome.dir = mkdtempSync(join(actual.tmpdir(), "chatccc-builtin-perm-"));
+  return { ...actual, homedir: () => testHome.dir };
+});
+
+vi.mock("@ai-sdk/openai-compatible", () => ({
+  createOpenAICompatible: vi.fn(() => (modelId: string) => ({ modelId })),
+}));
+
+vi.mock("ai", () => ({
+  streamText: aiMocks.streamText,
+  generateText: aiMocks.generateText,
+  isLoopFinished: vi.fn(() => ({ loopFinished: true })),
+  stepCountIs: vi.fn((count: number) => ({ count })),
+  jsonSchema: vi.fn((schema: unknown) => schema),
+  tool: vi.fn((definition: unknown) => definition),
+}));
+
+vi.mock("../builtin/raw-stream-log.ts", () => ({
+  createRawStreamLog: vi.fn().mockResolvedValue(null),
+}));
+
+import {
+  PermissionGate,
+  getAllowRules,
+  isDangerousCommand,
+  matchRule,
+  reloadAllowRules,
+} from "../builtin/permissions.ts";
+import { createBuiltinFileTools } from "../builtin/file-tools.ts";
+import { ChatSession } from "../builtin/index.ts";
+
+const streamTextMock = aiMocks.streamText;
+const generateTextMock = aiMocks.generateText;
+
+const ALLOW_FILE = () => join(testHome.dir, ".deepccc", "allow.json");
+
+async function collect(iterable: AsyncIterable<unknown>): Promise<unknown[]> {
+  const events: unknown[] = [];
+  for await (const event of iterable) events.push(event);
+  return events;
+}
+
+async function* textStream(...chunks: string[]): AsyncIterable<string> {
+  for (const chunk of chunks) yield chunk;
+}
+
+function lastRunCommandExecute(): (input: { command: string }, opts?: unknown) => Promise<unknown> {
+  const call = streamTextMock.mock.calls.at(-1)?.[0] as { tools?: Record<string, { execute?: unknown }> };
+  const execute = call?.tools?.run_command?.execute as ((input: { command: string }, opts?: unknown) => Promise<unknown>) | undefined;
+  if (!execute) throw new Error("streamText was not called with tools.run_command.execute");
+  return execute;
+}
+
+afterEach(() => {
+  try {
+    rmSync(ALLOW_FILE(), { force: true });
+  } catch {}
+  reloadAllowRules();
+  streamTextMock.mockReset();
+  generateTextMock.mockReset();
+});
+
+beforeEach(() => {
+  try {
+    rmSync(join(testHome.dir, ".deepccc"), { recursive: true, force: true });
+  } catch {}
+  mkdirSync(join(testHome.dir, ".deepccc"), { recursive: true });
+  reloadAllowRules();
+});
+
+describe("builtin permissions module", () => {
+  it("flags destructive commands and ignores normal ones", () => {
+    expect(isDangerousCommand("rm -rf node_modules")).toBe(true);
+    expect(isDangerousCommand("git push --force origin main")).toBe(true);
+    expect(isDangerousCommand("git status")).toBe(false);
+    expect(isDangerousCommand("npm test")).toBe(false);
+  });
+
+  it("matches allow/deny rules with wildcards and relative paths", () => {
+    expect(matchRule("run_command:git status*", "run_command:git status --short")).toBe(true);
+    expect(matchRule("edit_file:node_modules/**", "edit_file:node_modules/a/b.js")).toBe(true);
+    expect(matchRule("run_command:npm test", "run_command:npm test extra")).toBe(false);
+  });
+
+  it("returns empty rules when allow.json is missing", () => {
+    expect(getAllowRules()).toEqual({ allow: [], deny: [] });
+  });
+
+  it("loads rules from ~/.deepccc/allow.json", () => {
+    writeFileSync(ALLOW_FILE(), JSON.stringify({ deny: ["run_command:npm publish*"] }), "utf-8");
+    reloadAllowRules();
+    expect(getAllowRules().deny).toEqual(["run_command:npm publish*"]);
+  });
+});
+
+describe("builtin PermissionGate", () => {
+  it("bypass mode allows everything", async () => {
+    const gate = new PermissionGate("bypass");
+    expect(await gate.check({ tool: "run_command", action: "rm -rf /", reason: "high-risk", detail: "x" })).toBe("allow");
+  });
+
+  it("ask mode denies high-risk without resolver", async () => {
+    const gate = new PermissionGate("ask");
+    expect(await gate.check({ tool: "run_command", action: "rm -rf x", reason: "high-risk", detail: "x" })).toBe("deny");
+  });
+
+  it("ask mode allows non-high-risk operations without asking", async () => {
+    const resolver = vi.fn();
+    const gate = new PermissionGate("ask", resolver as never);
+    expect(await gate.check({ tool: "run_command", action: "npm test", reason: "rule", detail: "x" })).toBe("allow");
+    expect(await gate.check({ tool: "edit_file", action: "src/a.ts", reason: "rule", detail: "x" })).toBe("allow");
+    expect(resolver).not.toHaveBeenCalled();
+  });
+
+  it("follows resolver answer", async () => {
+    let answer: "allow" | "deny" = "allow";
+    const gate = new PermissionGate("ask", async () => answer);
+    expect(await gate.check({ tool: "run_command", action: "rm -rf x", reason: "high-risk", detail: "x" })).toBe("allow");
+    answer = "deny";
+    expect(await gate.check({ tool: "run_command", action: "rm -rf x", reason: "high-risk", detail: "x" })).toBe("deny");
+  });
+
+  it("deny rule wins over allow rule", async () => {
+    writeFileSync(
+      ALLOW_FILE(),
+      JSON.stringify({ allow: ["run_command:rm -rf /tmp*"], deny: ["run_command:rm -rf /tmp/forbidden*"] }),
+      "utf-8",
+    );
+    reloadAllowRules();
+    const gate = new PermissionGate("ask");
+    expect(await gate.check({ tool: "run_command", action: "rm -rf /tmp/forbidden/x", reason: "high-risk", detail: "x" })).toBe("deny");
+  });
+});
+
+describe("builtin file-tools permission integration", () => {
+  it("run_command high-risk is denied by default gate", async () => {
+    const tools = createBuiltinFileTools(testHome.dir, { permissionGate: new PermissionGate("ask") });
+    const tool = tools.run_command as unknown as {
+      execute: (input: { command: string }, opts?: unknown) => Promise<unknown>;
+    };
+    await expect(tool.execute({ command: "rm -rf node_modules" }, { abortSignal: undefined })).rejects.toThrow(/权限拒绝/);
+  });
+
+  it("no gate keeps original behavior", async () => {
+    const tools = createBuiltinFileTools(testHome.dir);
+    const tool = tools.run_command as unknown as {
+      execute: (input: { command: string }, opts?: unknown) => Promise<{ exitCode: number | null }>;
+    };
+    const result = await tool.execute({ command: "node -e \"console.log('ok')\"" }, { abortSignal: undefined });
+    expect(result.exitCode).toBe(0);
+  });
+});
+
+describe("builtin ChatSession permission integration", () => {
+  it("permissionMode bypass lets high-risk run_command execute", async () => {
+    const session = new ChatSession(
+      { apiKey: "sk-test" },
+      { sessionId: "perm-bypass", permissionMode: "bypass" },
+    );
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("hi") });
+    await collect(session.chat("hi"));
+
+    const result = (await lastRunCommandExecute()({ command: "node -e \"console.log('ok')\"" }, { abortSignal: undefined })) as { exitCode: number };
+    expect(result.exitCode).toBe(0);
+  });
+
+  it("default ask mode without resolver denies high-risk run_command", async () => {
+    const session = new ChatSession(
+      { apiKey: "sk-test" },
+      { sessionId: "perm-ask" },
+    );
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("hi") });
+    await collect(session.chat("hi"));
+
+    await expect(
+      lastRunCommandExecute()({ command: "rm -rf node_modules" }, { abortSignal: undefined }),
+    ).rejects.toThrow(/权限拒绝/);
+  });
+});
+
+describe("ccc-adapter uses bypass mode (aligns with claude/codex)", () => {
+  it("tools created via ccc adapter run high-risk commands without asking", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const adapter = createCccAdapter({ apiKey: "sk-test", contextDir: testHome.dir });
+    const { sessionId } = await adapter.createSession(testHome.dir);
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("hi") });
+
+    for await (const _m of adapter.prompt(sessionId, "hi", testHome.dir)) {
+      // drain
+    }
+
+    const result = (await lastRunCommandExecute()({ command: "node -e \"console.log('bypass')\"" }, { abortSignal: undefined })) as { exitCode: number };
+    expect(result.exitCode).toBe(0);
+  });
+});

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("DeepCCC session not found: 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("No resumable DeepCCC session found for cwd: C:\\repo");
-  });
-});
+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("DeepCCC session not found: 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("No resumable DeepCCC session found for cwd: C:\\repo");
+  });
+});