chatccc 0.2.195 → 0.2.197

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

@@ -1,56 +1,56 @@
-import { describe, expect, it } from "vitest";
-
-import { createCtrlCState } from "../builtin/sigint.ts";
-
-describe("builtin CLI Ctrl+C state", () => {
-  it("requires two presses to interrupt an active generation", () => {
-    let now = 1_000;
-    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
-
-    expect(state.press(true)).toBe("arm-interrupt");
-    expect(state.press(true)).toBe("interrupt");
-  });
-
-  it("requires two presses to exit while idle", () => {
-    let now = 1_000;
-    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
-
-    expect(state.press(false)).toBe("arm-exit");
-    expect(state.press(false)).toBe("exit");
-  });
-
-  it("expires the pending confirmation after the window", () => {
-    let now = 1_000;
-    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
-
-    expect(state.press(true)).toBe("arm-interrupt");
-
-    now += 2_001;
-
-    expect(state.press(true)).toBe("arm-interrupt");
-    expect(state.press(true)).toBe("interrupt");
-  });
-
-  it("does not convert a pending interrupt into an idle exit after reset", () => {
-    let now = 1_000;
-    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
-
-    expect(state.press(true)).toBe("arm-interrupt");
-
-    state.reset();
-    now += 1_000;
-
-    expect(state.press(false)).toBe("arm-exit");
-  });
-
-  it("does not confirm a different action with the second press", () => {
-    let now = 1_000;
-    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
-
-    expect(state.press(true)).toBe("arm-interrupt");
-    now += 500;
-
-    expect(state.press(false)).toBe("arm-exit");
-    expect(state.press(false)).toBe("exit");
-  });
-});
+import { describe, expect, it } from "vitest";
+
+import { createCtrlCState } from "../builtin/sigint.ts";
+
+describe("builtin CLI Ctrl+C state", () => {
+  it("requires two presses to interrupt an active generation", () => {
+    let now = 1_000;
+    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
+
+    expect(state.press(true)).toBe("arm-interrupt");
+    expect(state.press(true)).toBe("interrupt");
+  });
+
+  it("requires two presses to exit while idle", () => {
+    let now = 1_000;
+    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
+
+    expect(state.press(false)).toBe("arm-exit");
+    expect(state.press(false)).toBe("exit");
+  });
+
+  it("expires the pending confirmation after the window", () => {
+    let now = 1_000;
+    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
+
+    expect(state.press(true)).toBe("arm-interrupt");
+
+    now += 2_001;
+
+    expect(state.press(true)).toBe("arm-interrupt");
+    expect(state.press(true)).toBe("interrupt");
+  });
+
+  it("does not convert a pending interrupt into an idle exit after reset", () => {
+    let now = 1_000;
+    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
+
+    expect(state.press(true)).toBe("arm-interrupt");
+
+    state.reset();
+    now += 1_000;
+
+    expect(state.press(false)).toBe("arm-exit");
+  });
+
+  it("does not confirm a different action with the second press", () => {
+    let now = 1_000;
+    const state = createCtrlCState({ windowMs: 2_000, now: () => now });
+
+    expect(state.press(true)).toBe("arm-interrupt");
+    now += 500;
+
+    expect(state.press(false)).toBe("arm-exit");
+    expect(state.press(false)).toBe("exit");
+  });
+});

package/src/__tests__/cards.test.ts

@@ -1,18 +1,18 @@
 import { describe, it, expect } from "vitest";
-import {
-  buildProgressCard,
-  buildHelpCard,
+import {
+  buildProgressCard,
+  buildHelpCard,
   buildCdContent,
   buildCdCard,
   buildSessionsCard,
-  buildStatusCard,
-  buildCodexUsageCard,
-  buildCodexResetConfirmCard,
-  buildButtons,
-  truncateContent,
-  getToolEmoji,
-} from "../cards.ts";
-import { ABD_HELP_LINE } from "../shared-prefix.ts";
+  buildStatusCard,
+  buildCodexUsageCard,
+  buildCodexResetConfirmCard,
+  buildButtons,
+  truncateContent,
+  getToolEmoji,
+} from "../cards.ts";
+import { ABD_HELP_LINE } from "../shared-prefix.ts";
 
 // ---------------------------------------------------------------------------
 // truncateContent
@@ -154,32 +154,32 @@ describe("buildHelpCard", () => {
     expect(parsed.elements[0].text.content).toContain("你好");
   });
 
-  it("includes action buttons", () => {
-    const card = buildHelpCard("test");
-    const parsed = JSON.parse(card);
-    const action = parsed.elements[2];
-    expect(action.tag).toBe("action");
-    expect(action.actions).toHaveLength(7);
-  });
-
-  it("adds ABD prefix help as the final help line", () => {
-    const card = buildHelpCard("test");
-    const parsed = JSON.parse(card);
-    const lines = parsed.elements[1].text.content.split("\n");
-
-    expect(lines).toContain("发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡");
-    expect(lines.at(-1)).toBe(ABD_HELP_LINE);
-  });
-
-  it("does not advertise the hidden ccc agent", () => {
-    const card = buildHelpCard("test");
-    const parsed = JSON.parse(card);
-    const text = JSON.stringify(parsed);
-
-    expect(text).not.toContain("/new ccc");
-    expect(text).not.toContain("CCC Agent");
-  });
-});
+  it("includes action buttons", () => {
+    const card = buildHelpCard("test");
+    const parsed = JSON.parse(card);
+    const action = parsed.elements[2];
+    expect(action.tag).toBe("action");
+    expect(action.actions).toHaveLength(7);
+  });
+
+  it("adds ABD prefix help as the final help line", () => {
+    const card = buildHelpCard("test");
+    const parsed = JSON.parse(card);
+    const lines = parsed.elements[1].text.content.split("\n");
+
+    expect(lines).toContain("发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡");
+    expect(lines.at(-1)).toBe(ABD_HELP_LINE);
+  });
+
+  it("does not advertise the hidden ccc agent", () => {
+    const card = buildHelpCard("test");
+    const parsed = JSON.parse(card);
+    const text = JSON.stringify(parsed);
+
+    expect(text).not.toContain("/new ccc");
+    expect(text).not.toContain("CCC Agent");
+  });
+});
 
 // ---------------------------------------------------------------------------
 // buildCdContent
@@ -373,29 +373,29 @@ describe("buildSessionsCard", () => {
     expect(content).toContain("Cursor 会话");
   });
 
-  it("omits Cursor section when no Cursor sessions", () => {
-    const card = buildSessionsCard([
-      { sessionId: "c1", chatName: "", chatId: "oc_c1", active: false, turnCount: 1, elapsedSeconds: null, model: "(留空)", tool: "claude" },
-    ]);
-    const parsed = JSON.parse(card);
-    const content: string = parsed.elements[0].text.content;
-    expect(content).toContain("Claude Code 会话");
-    expect(content).not.toContain("Cursor 会话");
-  });
-
-  it("labels hidden ccc sessions without grouping them as Claude Code", () => {
-    const card = buildSessionsCard([
-      { sessionId: "session-20260702-121530-a1b2c3", chatName: "", chatId: "oc_ccc", active: false, turnCount: 1, elapsedSeconds: null, model: "deepseek-v4-pro", tool: "ccc" },
-    ]);
-    const parsed = JSON.parse(card);
-    const content: string = parsed.elements[0].text.content;
-
-    expect(content).toContain("CCC Agent 会话");
-    expect(content).toContain("工具: CCC Agent");
-    expect(content).not.toContain("Claude Code 会话");
-  });
-
-  it("displays chatName when provided", () => {
+  it("omits Cursor section when no Cursor sessions", () => {
+    const card = buildSessionsCard([
+      { sessionId: "c1", chatName: "", chatId: "oc_c1", active: false, turnCount: 1, elapsedSeconds: null, model: "(留空)", tool: "claude" },
+    ]);
+    const parsed = JSON.parse(card);
+    const content: string = parsed.elements[0].text.content;
+    expect(content).toContain("Claude Code 会话");
+    expect(content).not.toContain("Cursor 会话");
+  });
+
+  it("labels hidden ccc sessions without grouping them as Claude Code", () => {
+    const card = buildSessionsCard([
+      { sessionId: "session-20260702-121530-a1b2c3", chatName: "", chatId: "oc_ccc", active: false, turnCount: 1, elapsedSeconds: null, model: "deepseek-v4-pro", tool: "ccc" },
+    ]);
+    const parsed = JSON.parse(card);
+    const content: string = parsed.elements[0].text.content;
+
+    expect(content).toContain("CCC Agent 会话");
+    expect(content).toContain("工具: CCC Agent");
+    expect(content).not.toContain("Claude Code 会话");
+  });
+
+  it("displays chatName when provided", () => {
     const card = buildSessionsCard([
       { sessionId: "abc123", chatName: "帮我写代码-src", chatId: "oc_abc123", active: false, turnCount: 2, elapsedSeconds: null, model: "Claude Opus 4.7", tool: "claude" },
     ]);
@@ -446,7 +446,7 @@ describe("buildSessionsCard", () => {
 // buildStatusCard
 // ---------------------------------------------------------------------------
 
-describe("buildStatusCard", () => {
+describe("buildStatusCard", () => {
   it("returns valid JSON with status text", () => {
     const card = buildStatusCard("一切正常");
     const parsed = JSON.parse(card);
@@ -466,54 +466,54 @@ describe("buildStatusCard", () => {
     const action = parsed.elements[2];
     expect(action.actions[0].text.content).toBe("收起");
   });
-});
-
-// ---------------------------------------------------------------------------
-// buildCodexUsageCard / buildCodexResetConfirmCard
-// ---------------------------------------------------------------------------
-
-describe("Codex usage reset cards", () => {
-  it("shows the reset button only when reset credits are available", () => {
-    const card = buildCodexUsageCard("Codex 用量", 2);
-    const parsed = JSON.parse(card);
-    const action = parsed.elements.find((element: any) => element.tag === "action");
-    expect(action.actions[0].text.content).toBe("发起重置");
-    expect(action.actions[0].value).toEqual({ action: "codex_reset_request", availableCount: 2 });
-
-    const noCreditCard = buildCodexUsageCard("Codex 用量", 0);
-    const noCreditParsed = JSON.parse(noCreditCard);
-    expect(noCreditParsed.elements.some((element: any) => element.tag === "action")).toBe(false);
-  });
-
-  it("builds yes/no confirmation buttons tied to the parent usage card", () => {
-    const card = buildCodexResetConfirmCard({
-      availableCount: 2,
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-    const parsed = JSON.parse(card);
-    const action = parsed.elements.find((element: any) => element.tag === "action");
-
-    expect(action.actions[0].text.content).toBe("是，发起重置");
-    expect(action.actions[0].value).toEqual({
-      action: "codex_reset_confirm",
-      decision: "yes",
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-    expect(action.actions[1].text.content).toBe("否");
-    expect(action.actions[1].value).toEqual({
-      action: "codex_reset_confirm",
-      decision: "no",
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-  });
-});
-
-// ---------------------------------------------------------------------------
-// buildButtons
-// ---------------------------------------------------------------------------
+});
+
+// ---------------------------------------------------------------------------
+// buildCodexUsageCard / buildCodexResetConfirmCard
+// ---------------------------------------------------------------------------
+
+describe("Codex usage reset cards", () => {
+  it("shows the reset button only when reset credits are available", () => {
+    const card = buildCodexUsageCard("Codex 用量", 2);
+    const parsed = JSON.parse(card);
+    const action = parsed.elements.find((element: any) => element.tag === "action");
+    expect(action.actions[0].text.content).toBe("发起重置");
+    expect(action.actions[0].value).toEqual({ action: "codex_reset_request", availableCount: 2 });
+
+    const noCreditCard = buildCodexUsageCard("Codex 用量", 0);
+    const noCreditParsed = JSON.parse(noCreditCard);
+    expect(noCreditParsed.elements.some((element: any) => element.tag === "action")).toBe(false);
+  });
+
+  it("builds yes/no confirmation buttons tied to the parent usage card", () => {
+    const card = buildCodexResetConfirmCard({
+      availableCount: 2,
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+    const parsed = JSON.parse(card);
+    const action = parsed.elements.find((element: any) => element.tag === "action");
+
+    expect(action.actions[0].text.content).toBe("是，发起重置");
+    expect(action.actions[0].value).toEqual({
+      action: "codex_reset_confirm",
+      decision: "yes",
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+    expect(action.actions[1].text.content).toBe("否");
+    expect(action.actions[1].value).toEqual({
+      action: "codex_reset_confirm",
+      decision: "no",
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+  });
+});
+
+// ---------------------------------------------------------------------------
+// buildButtons
+// ---------------------------------------------------------------------------
 
 describe("buildButtons", () => {
   it("returns action with buttons", () => {

package/src/__tests__/ccc-adapter.test.ts

@@ -1,113 +1,114 @@
-import { mkdtemp } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-const streamTextMock = vi.fn();
-const generateTextMock = vi.fn();
-
-vi.mock("@ai-sdk/openai-compatible", () => ({
-  createOpenAICompatible: vi.fn(() => (modelId: string) => ({ modelId })),
-}));
-
-vi.mock("ai", () => ({
-  streamText: streamTextMock,
-  generateText: generateTextMock,
-  stepCountIs: vi.fn((count: number) => ({ count })),
-  jsonSchema: vi.fn((schema: unknown) => schema),
-  tool: vi.fn((definition: unknown) => definition),
-}));
-
-async function* textStream(...chunks: string[]): AsyncIterable<string> {
-  for (const chunk of chunks) yield chunk;
-}
-
-async function* fullStream(...parts: unknown[]): AsyncIterable<unknown> {
-  for (const part of parts) yield part;
-}
-
-afterEach(() => {
-  streamTextMock.mockReset();
-  generateTextMock.mockReset();
-});
-
-describe("createCccAdapter", () => {
-  it("creates a persisted ccc session and exposes model/cwd metadata", async () => {
-    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
-    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-meta-"));
-    const adapter = createCccAdapter({
-      apiKey: "sk-test",
-      contextDir,
-      model: "deepseek-v4-pro",
-    });
-
-    const created = await adapter.createSession("F:\\repo");
-    const info = await adapter.getSessionInfo(created.sessionId);
-
-    expect(created.sessionId).toMatch(/^session-\d{8}-\d{6}-[a-f0-9]{6}$/);
-    expect(info).toEqual(expect.objectContaining({
-      sessionId: created.sessionId,
-      cwd: "F:\\repo",
-      model: "deepseek-v4-pro",
-    }));
-  });
-
-  it("maps ChatSession text chunks to unified assistant text blocks", async () => {
-    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
-    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-stream-"));
-    const adapter = createCccAdapter({
-      apiKey: "sk-test",
-      contextDir,
-      model: "deepseek-v4-flash",
-    });
-    const { sessionId } = await adapter.createSession("F:\\repo");
-    streamTextMock.mockReturnValueOnce({ textStream: textStream("hello", " world") });
-
-    const messages = [];
-    for await (const message of adapter.prompt(sessionId, "hi", "F:\\repo")) {
-      messages.push(message);
-    }
-
-    expect(messages).toEqual([
-      { type: "assistant", blocks: [{ type: "text", text: "hello" }] },
-      { type: "assistant", blocks: [{ type: "text", text: " world" }] },
-    ]);
-    expect(streamTextMock).toHaveBeenCalledWith(expect.objectContaining({
-      model: { modelId: "deepseek-v4-flash" },
-    }));
-  });
-
-  it("maps ChatSession tool events to unified tool blocks", async () => {
-    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
-    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-tools-"));
-    const adapter = createCccAdapter({
-      apiKey: "sk-test",
-      contextDir,
-      model: "deepseek-v4-flash",
-    });
-    const { sessionId } = await adapter.createSession("F:\\repo");
-    streamTextMock.mockReturnValueOnce({
-      fullStream: fullStream(
-        { type: "tool-call", toolCallId: "call-1", toolName: "read_file", input: { path: "README.md" } },
-        { type: "tool-result", toolCallId: "call-1", toolName: "read_file", output: { content: "hello" } },
-      ),
-    });
-
-    const messages = [];
-    for await (const message of adapter.prompt(sessionId, "read", "F:\\repo")) {
-      messages.push(message);
-    }
-
-    expect(messages).toEqual([
-      {
-        type: "assistant",
-        blocks: [{ type: "tool_use", id: "call-1", name: "read_file", input: { path: "README.md" } }],
-      },
-      {
-        type: "assistant",
-        blocks: [{ type: "tool_result", tool_use_id: "call-1", content: { content: "hello" }, is_error: false }],
-      },
-    ]);
-  });
-});
+import { mkdtemp } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const streamTextMock = vi.fn();
+const generateTextMock = vi.fn();
+
+vi.mock("@ai-sdk/openai-compatible", () => ({
+  createOpenAICompatible: vi.fn(() => (modelId: string) => ({ modelId })),
+}));
+
+vi.mock("ai", () => ({
+  streamText: streamTextMock,
+  generateText: generateTextMock,
+  isLoopFinished: vi.fn(() => ({ loopFinished: true })),
+  stepCountIs: vi.fn((count: number) => ({ count })),
+  jsonSchema: vi.fn((schema: unknown) => schema),
+  tool: vi.fn((definition: unknown) => definition),
+}));
+
+async function* textStream(...chunks: string[]): AsyncIterable<string> {
+  for (const chunk of chunks) yield chunk;
+}
+
+async function* fullStream(...parts: unknown[]): AsyncIterable<unknown> {
+  for (const part of parts) yield part;
+}
+
+afterEach(() => {
+  streamTextMock.mockReset();
+  generateTextMock.mockReset();
+});
+
+describe("createCccAdapter", () => {
+  it("creates a persisted ccc session and exposes model/cwd metadata", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-meta-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      model: "deepseek-v4-pro",
+    });
+
+    const created = await adapter.createSession("F:\\repo");
+    const info = await adapter.getSessionInfo(created.sessionId);
+
+    expect(created.sessionId).toMatch(/^session-\d{8}-\d{6}-[a-f0-9]{6}$/);
+    expect(info).toEqual(expect.objectContaining({
+      sessionId: created.sessionId,
+      cwd: "F:\\repo",
+      model: "deepseek-v4-pro",
+    }));
+  });
+
+  it("maps ChatSession text chunks to unified assistant text blocks", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-stream-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      model: "deepseek-v4-flash",
+    });
+    const { sessionId } = await adapter.createSession("F:\\repo");
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("hello", " world") });
+
+    const messages = [];
+    for await (const message of adapter.prompt(sessionId, "hi", "F:\\repo")) {
+      messages.push(message);
+    }
+
+    expect(messages).toEqual([
+      { type: "assistant", blocks: [{ type: "text", text: "hello" }] },
+      { type: "assistant", blocks: [{ type: "text", text: " world" }] },
+    ]);
+    expect(streamTextMock).toHaveBeenCalledWith(expect.objectContaining({
+      model: { modelId: "deepseek-v4-flash" },
+    }));
+  });
+
+  it("maps ChatSession tool events to unified tool blocks", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-tools-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      model: "deepseek-v4-flash",
+    });
+    const { sessionId } = await adapter.createSession("F:\\repo");
+    streamTextMock.mockReturnValueOnce({
+      fullStream: fullStream(
+        { type: "tool-call", toolCallId: "call-1", toolName: "read_file", input: { path: "README.md" } },
+        { type: "tool-result", toolCallId: "call-1", toolName: "read_file", output: { content: "hello" } },
+      ),
+    });
+
+    const messages = [];
+    for await (const message of adapter.prompt(sessionId, "read", "F:\\repo")) {
+      messages.push(message);
+    }
+
+    expect(messages).toEqual([
+      {
+        type: "assistant",
+        blocks: [{ type: "tool_use", id: "call-1", name: "read_file", input: { path: "README.md" } }],
+      },
+      {
+        type: "assistant",
+        blocks: [{ type: "tool_result", tool_use_id: "call-1", content: { content: "hello" }, is_error: false }],
+      },
+    ]);
+  });
+});