chatccc 0.2.230 → 0.2.231

package/src/__tests__/cardkit.test.ts

@@ -1,60 +1,60 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-import { updateCardKitCard } from "../cardkit.ts";
-
-function abortError(): Error {
-  const err = new Error("aborted");
-  err.name = "AbortError";
-  return err;
-}
-
-describe("CardKit request timeout", () => {
-  afterEach(() => {
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.unstubAllGlobals();
-  });
-
-  it("aborts a hung card update so display.cardBusy can be released", async () => {
-    vi.useFakeTimers();
-    vi.spyOn(console, "error").mockImplementation(() => {});
-
-    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
-      new Promise<Response>((_resolve, reject) => {
-        init?.signal?.addEventListener("abort", () => reject(abortError()));
-      })
-    ));
-    vi.stubGlobal("fetch", fetchMock);
-
-    const update = expect(updateCardKitCard("token", "card-1", "{}", 7))
-      .rejects.toThrow("updateCard cardId=card-1 seq=7 timeout after 15000ms");
-    await vi.advanceTimersByTimeAsync(15_000);
-
-    await update;
-    expect(fetchMock).toHaveBeenCalledWith(
-      expect.stringContaining("/cardkit/v1/cards/card-1"),
-      expect.objectContaining({ signal: expect.any(AbortSignal) }),
-    );
-  });
-
-  it("also aborts when response body reading hangs", async () => {
-    vi.useFakeTimers();
-    vi.spyOn(console, "error").mockImplementation(() => {});
-
-    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
-      Promise.resolve({
-        status: 200,
-        text: () => new Promise<string>((_resolve, reject) => {
-          init?.signal?.addEventListener("abort", () => reject(abortError()));
-        }),
-      } as Response)
-    ));
-    vi.stubGlobal("fetch", fetchMock);
-
-    const update = expect(updateCardKitCard("token", "card-2", "{}", 8))
-      .rejects.toThrow("updateCard cardId=card-2 seq=8 timeout after 15000ms");
-    await vi.advanceTimersByTimeAsync(15_000);
-
-    await update;
-  });
-});
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { updateCardKitCard } from "../cardkit.ts";
+
+function abortError(): Error {
+  const err = new Error("aborted");
+  err.name = "AbortError";
+  return err;
+}
+
+describe("CardKit request timeout", () => {
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+    vi.unstubAllGlobals();
+  });
+
+  it("aborts a hung card update so display.cardBusy can be released", async () => {
+    vi.useFakeTimers();
+    vi.spyOn(console, "error").mockImplementation(() => {});
+
+    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
+      new Promise<Response>((_resolve, reject) => {
+        init?.signal?.addEventListener("abort", () => reject(abortError()));
+      })
+    ));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const update = expect(updateCardKitCard("token", "card-1", "{}", 7))
+      .rejects.toThrow("updateCard cardId=card-1 seq=7 timeout after 15000ms");
+    await vi.advanceTimersByTimeAsync(15_000);
+
+    await update;
+    expect(fetchMock).toHaveBeenCalledWith(
+      expect.stringContaining("/cardkit/v1/cards/card-1"),
+      expect.objectContaining({ signal: expect.any(AbortSignal) }),
+    );
+  });
+
+  it("also aborts when response body reading hangs", async () => {
+    vi.useFakeTimers();
+    vi.spyOn(console, "error").mockImplementation(() => {});
+
+    const fetchMock = vi.fn((_url: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => (
+      Promise.resolve({
+        status: 200,
+        text: () => new Promise<string>((_resolve, reject) => {
+          init?.signal?.addEventListener("abort", () => reject(abortError()));
+        }),
+      } as Response)
+    ));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const update = expect(updateCardKitCard("token", "card-2", "{}", 8))
+      .rejects.toThrow("updateCard cardId=card-2 seq=8 timeout after 15000ms");
+    await vi.advanceTimersByTimeAsync(15_000);
+
+    await update;
+  });
+});

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

@@ -1,136 +1,170 @@
-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" }] },
-      { type: "assistant", blocks: [], isFinalResponse: true },
-    ]);
-    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 }],
-      },
-      { type: "assistant", blocks: [], isFinalResponse: true },
-    ]);
-  });
-
-  it("passes effort into ChatSession so streamText receives reasoningEffort", async () => {
-    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
-    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-effort-"));
-    const adapter = createCccAdapter({
-      apiKey: "sk-test",
-      contextDir,
-      effort: "xhigh",
-    });
-    const { sessionId } = await adapter.createSession("F:\\repo");
-    streamTextMock.mockReturnValueOnce({ textStream: textStream("ok") });
-
-    for await (const _message of adapter.prompt(sessionId, "hi", "F:\\repo")) {
-      // drain
-    }
-
-    expect(streamTextMock).toHaveBeenLastCalledWith(expect.objectContaining({
-      providerOptions: { deepseek: { reasoningEffort: "xhigh" } },
-    }));
-  });
-});
+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: "agent_status", status: "responding" }] },
+      { type: "assistant", blocks: [{ type: "text", text: "hello" }] },
+      { type: "assistant", blocks: [{ type: "text", text: " world" }] },
+      { type: "assistant", blocks: [], isFinalResponse: true },
+    ]);
+    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: "agent_status", status: "responding" }] },
+      {
+        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 }],
+      },
+      { type: "assistant", blocks: [], isFinalResponse: true },
+    ]);
+  });
+
+  it("maps DeepCCC compaction and generation phases to unified activity blocks", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-status-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      compactAtTokens: 1,
+      keepRecentMessages: 1,
+    });
+    const { sessionId } = await adapter.createSession("F:\\repo");
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("old") });
+    for await (const _message of adapter.prompt(sessionId, "old question", "F:\\repo")) {
+      // drain
+    }
+
+    generateTextMock.mockResolvedValueOnce({ text: "summary" });
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("new") });
+    const messages = [];
+    for await (const message of adapter.prompt(sessionId, "new question", "F:\\repo")) {
+      messages.push(message);
+    }
+
+    expect(messages[0]).toEqual({
+      type: "assistant",
+      blocks: [{ type: "agent_status", status: "compacting" }],
+    });
+    expect(messages).toContainEqual({
+      type: "assistant",
+      blocks: [{ type: "agent_status", status: "responding" }],
+    });
+  });
+
+  it("passes effort into ChatSession so streamText receives reasoningEffort", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-effort-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      effort: "xhigh",
+    });
+    const { sessionId } = await adapter.createSession("F:\\repo");
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("ok") });
+
+    for await (const _message of adapter.prompt(sessionId, "hi", "F:\\repo")) {
+      // drain
+    }
+
+    expect(streamTextMock).toHaveBeenLastCalledWith(expect.objectContaining({
+      providerOptions: { deepseek: { reasoningEffort: "xhigh" } },
+    }));
+  });
+});

package/src/__tests__/chatgpt-subscription-rpc.test.ts

@@ -1,89 +1,89 @@
-import { Readable } from "node:stream";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const mockGetChatGptSubscriptionStatus = vi.hoisted(() => vi.fn());
-
-vi.mock("../chatgpt-subscription.ts", () => ({
-  getChatGptSubscriptionStatus: mockGetChatGptSubscriptionStatus,
-}));
-
-import {
-  CHATGPT_SUBSCRIPTION_PATH,
-  handleChatGptSubscriptionRequest,
-} from "../chatgpt-subscription-rpc.ts";
-
-function request(path = CHATGPT_SUBSCRIPTION_PATH, method = "POST"): Readable & {
-  url?: string;
-  method?: string;
-  headers: Record<string, string>;
-} {
-  const req = Readable.from([]) as Readable & {
-    url?: string;
-    method?: string;
-    headers: Record<string, string>;
-  };
-  req.url = path;
-  req.method = method;
-  req.headers = {};
-  return req;
-}
-
-function response() {
-  const res = {
-    statusCode: 0,
-    headers: {} as Record<string, string>,
-    body: "",
-    writeHead(status: number, headers: Record<string, string>) {
-      this.statusCode = status;
-      this.headers = headers;
-      return this;
-    },
-    end(chunk?: string) {
-      this.body += chunk ?? "";
-      return this;
-    },
-  };
-  return res;
-}
-
-describe("ChatGPT subscription RPC", () => {
-  beforeEach(() => {
-    mockGetChatGptSubscriptionStatus.mockReset();
-    mockGetChatGptSubscriptionStatus.mockResolvedValue({
-      ok: false,
-      code: "chrome_cdp_disabled",
-      reason: "Chrome CDP guard is disabled in ChatCCC config.",
-      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
-    });
-  });
-
-  it("returns the structured subscription lookup JSON", async () => {
-    const req = request();
-    const res = response();
-
-    await expect(handleChatGptSubscriptionRequest(req as never, res as never)).resolves.toBe(true);
-
-    expect(res.statusCode).toBe(200);
-    expect(JSON.parse(res.body)).toEqual({
-      ok: false,
-      code: "chrome_cdp_disabled",
-      reason: "Chrome CDP guard is disabled in ChatCCC config.",
-      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
-    });
-  });
-
-  it("does not handle other paths", async () => {
-    const res = response();
-
-    await expect(handleChatGptSubscriptionRequest(request("/api/other") as never, res as never)).resolves.toBe(false);
-    expect(res.body).toBe("");
-  });
-
-  it("rejects non-POST methods", async () => {
-    const res = response();
-
-    await expect(handleChatGptSubscriptionRequest(request(CHATGPT_SUBSCRIPTION_PATH, "GET") as never, res as never)).resolves.toBe(true);
-    expect(res.statusCode).toBe(405);
-    expect(JSON.parse(res.body)).toMatchObject({ ok: false, code: "method_not_allowed" });
-  });
-});
+import { Readable } from "node:stream";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mockGetChatGptSubscriptionStatus = vi.hoisted(() => vi.fn());
+
+vi.mock("../chatgpt-subscription.ts", () => ({
+  getChatGptSubscriptionStatus: mockGetChatGptSubscriptionStatus,
+}));
+
+import {
+  CHATGPT_SUBSCRIPTION_PATH,
+  handleChatGptSubscriptionRequest,
+} from "../chatgpt-subscription-rpc.ts";
+
+function request(path = CHATGPT_SUBSCRIPTION_PATH, method = "POST"): Readable & {
+  url?: string;
+  method?: string;
+  headers: Record<string, string>;
+} {
+  const req = Readable.from([]) as Readable & {
+    url?: string;
+    method?: string;
+    headers: Record<string, string>;
+  };
+  req.url = path;
+  req.method = method;
+  req.headers = {};
+  return req;
+}
+
+function response() {
+  const res = {
+    statusCode: 0,
+    headers: {} as Record<string, string>,
+    body: "",
+    writeHead(status: number, headers: Record<string, string>) {
+      this.statusCode = status;
+      this.headers = headers;
+      return this;
+    },
+    end(chunk?: string) {
+      this.body += chunk ?? "";
+      return this;
+    },
+  };
+  return res;
+}
+
+describe("ChatGPT subscription RPC", () => {
+  beforeEach(() => {
+    mockGetChatGptSubscriptionStatus.mockReset();
+    mockGetChatGptSubscriptionStatus.mockResolvedValue({
+      ok: false,
+      code: "chrome_cdp_disabled",
+      reason: "Chrome CDP guard is disabled in ChatCCC config.",
+      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
+    });
+  });
+
+  it("returns the structured subscription lookup JSON", async () => {
+    const req = request();
+    const res = response();
+
+    await expect(handleChatGptSubscriptionRequest(req as never, res as never)).resolves.toBe(true);
+
+    expect(res.statusCode).toBe(200);
+    expect(JSON.parse(res.body)).toEqual({
+      ok: false,
+      code: "chrome_cdp_disabled",
+      reason: "Chrome CDP guard is disabled in ChatCCC config.",
+      chromeCdp: { enabled: false, port: 15166, status: "skipped" },
+    });
+  });
+
+  it("does not handle other paths", async () => {
+    const res = response();
+
+    await expect(handleChatGptSubscriptionRequest(request("/api/other") as never, res as never)).resolves.toBe(false);
+    expect(res.body).toBe("");
+  });
+
+  it("rejects non-POST methods", async () => {
+    const res = response();
+
+    await expect(handleChatGptSubscriptionRequest(request(CHATGPT_SUBSCRIPTION_PATH, "GET") as never, res as never)).resolves.toBe(true);
+    expect(res.statusCode).toBe(405);
+    expect(JSON.parse(res.body)).toMatchObject({ ok: false, code: "method_not_allowed" });
+  });
+});