chatccc 0.2.246 → 0.2.248

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

@@ -1,194 +1,194 @@
-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-sdk/anthropic", () => ({
-  createAnthropic: 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("disables response-stall detection when DeepCCC streaming is disabled", async () => {
-    const { config: deepCccConfig } = await import("../../deepccc-agent/src/config.ts");
-    const previousStreaming = deepCccConfig.streaming;
-    deepCccConfig.streaming = false;
-
-    try {
-      const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
-      const adapter = createCccAdapter({ apiKey: "sk-test" });
-
-      expect(adapter.responseStallDetectionEnabled).toBe(false);
-    } finally {
-      deepCccConfig.streaming = previousStreaming;
-    }
-  });
-
-  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",
-      provider: "openai",
-      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",
-      provider: "openai",
-      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",
-      provider: "openai",
-      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",
-      provider: "openai",
-      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",
-      provider: "openai",
-      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-sdk/anthropic", () => ({
+  createAnthropic: 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("disables response-stall detection when DeepCCC streaming is disabled", async () => {
+    const { config: deepCccConfig } = await import("../../deepccc-agent/src/config.ts");
+    const previousStreaming = deepCccConfig.streaming;
+    deepCccConfig.streaming = false;
+
+    try {
+      const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+      const adapter = createCccAdapter({ apiKey: "sk-test" });
+
+      expect(adapter.responseStallDetectionEnabled).toBe(false);
+    } finally {
+      deepCccConfig.streaming = previousStreaming;
+    }
+  });
+
+  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",
+      provider: "openai",
+      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",
+      provider: "openai",
+      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",
+      provider: "openai",
+      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",
+      provider: "openai",
+      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",
+      provider: "openai",
+      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__/config-reload.test.ts

@@ -72,7 +72,7 @@ const baseAppConfig: AppConfig = {
     onDemandMonthlyBudget: 1000,
   },
   codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", alternativeModel: "initial-codex-alt-model", effort: "initial-codex-effort", fastMode: false },
-  ccc: { enabled: true, defaultAgent: false, DEEPSEEK_API_KEY: "initial-ccc-key", DEEPSEEK_BASE_URL: "https://initial.deepseek.test/v1", model: "initial-ccc-model", alternativeModel: "initial-ccc-alt-model", effort: "initial-ccc-effort" },
+  ccc: { enabled: true, defaultAgent: false, DEEPSEEK_API_KEY: "initial-ccc-key", DEEPSEEK_BASE_URL: "https://initial.deepseek.test/v1", model: "initial-ccc-model", alternativeModel: "initial-ccc-alt-model", effort: "initial-ccc-effort", provider: "" },
 };
 
 // 把 module 状态抢救快照：每个 it 跑前重置回这个状态，避免污染相邻测试。

package/src/__tests__/config-utils.test.ts

@@ -0,0 +1,40 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { normalizeCccProviderOverride } from "../config-utils.ts";
+
+describe("normalizeCccProviderOverride", () => {
+  const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+
+  afterEach(() => {
+    warnSpy.mockClear();
+  });
+
+  it("returns empty string for missing / non-string values (no override)", () => {
+    expect(normalizeCccProviderOverride(undefined)).toBe("");
+    expect(normalizeCccProviderOverride(null)).toBe("");
+    expect(normalizeCccProviderOverride(42)).toBe("");
+    expect(normalizeCccProviderOverride({})).toBe("");
+    expect(warnSpy).not.toHaveBeenCalled();
+  });
+
+  it("treats empty/whitespace and legacy 'default' as no override", () => {
+    expect(normalizeCccProviderOverride("")).toBe("");
+    expect(normalizeCccProviderOverride("   ")).toBe("");
+    expect(normalizeCccProviderOverride("default")).toBe("");
+    expect(normalizeCccProviderOverride("DEFAULT")).toBe("");
+    expect(warnSpy).not.toHaveBeenCalled();
+  });
+
+  it("normalizes openai / anthropic case-insensitively", () => {
+    expect(normalizeCccProviderOverride("openai")).toBe("openai");
+    expect(normalizeCccProviderOverride("OPENAI")).toBe("openai");
+    expect(normalizeCccProviderOverride(" anthropic ")).toBe("anthropic");
+    expect(normalizeCccProviderOverride("Anthropic")).toBe("anthropic");
+    expect(warnSpy).not.toHaveBeenCalled();
+  });
+
+  it("ignores invalid values with a warning", () => {
+    expect(normalizeCccProviderOverride("gemini")).toBe("");
+    expect(normalizeCccProviderOverride("oai")).toBe("");
+    expect(warnSpy).toHaveBeenCalledTimes(2);
+  });
+});

package/src/__tests__/session-ccc-config.test.ts

@@ -31,10 +31,12 @@ describe("CCC Agent ChatCCC configuration", () => {
       DEEPSEEK_BASE_URL: "https://chatccc.example.com/v1",
       model: "chatccc-model",
       effort: "high",
+      provider: "",
     });
 
     getAdapterForTool("ccc");
 
+    // provider 留空时不传 → ChatSession 跟随 DeepCCC 内核配置（~/.deepccc/config.json 或 DEEPCCC_PROVIDER）
     expect(createCccAdapterMock).toHaveBeenCalledWith({
       apiKey: "chatccc-api-key",
       baseURL: "https://chatccc.example.com/v1",
@@ -42,4 +44,23 @@ describe("CCC Agent ChatCCC configuration", () => {
       effort: "high",
     });
   });
+
+  it("forwards ccc.provider override to createCccAdapter", () => {
+    Object.assign(config.ccc, {
+      DEEPSEEK_API_KEY: "chatccc-api-key",
+      DEEPSEEK_BASE_URL: "https://chatccc.example.com/v1",
+      model: "chatccc-model",
+      effort: "",
+      provider: "anthropic",
+    });
+
+    getAdapterForTool("ccc");
+
+    expect(createCccAdapterMock).toHaveBeenCalledWith({
+      apiKey: "chatccc-api-key",
+      baseURL: "https://chatccc.example.com/v1",
+      model: "chatccc-model",
+      provider: "anthropic",
+    });
+  });
 });