chatccc 0.2.186 → 0.2.188

package/config.sample.json

@@ -12,30 +12,30 @@
     "port": 15166,
     "chromePath": ""
   },
-  "port": 18080,
-  "gitTimeoutSeconds": 180,
-  "allowInterrupt": false,
-  "rawStreamLogs": {
-    "claude": {
-      "enabled": false,
-      "maxBytesPerTurn": 52428800,
-      "retentionDays": 7,
-      "keepCompleted": false
-    },
-    "cursor": {
-      "enabled": false,
-      "maxBytesPerTurn": 52428800,
-      "retentionDays": 7,
-      "keepCompleted": false
-    },
-    "codex": {
-      "enabled": false,
-      "maxBytesPerTurn": 52428800,
-      "retentionDays": 7,
-      "keepCompleted": false
-    }
-  },
-  "claude": {
+  "port": 18080,
+  "gitTimeoutSeconds": 180,
+  "allowInterrupt": false,
+  "rawStreamLogs": {
+    "claude": {
+      "enabled": false,
+      "maxBytesPerTurn": 52428800,
+      "retentionDays": 7,
+      "keepCompleted": false
+    },
+    "cursor": {
+      "enabled": false,
+      "maxBytesPerTurn": 52428800,
+      "retentionDays": 7,
+      "keepCompleted": false
+    },
+    "codex": {
+      "enabled": false,
+      "maxBytesPerTurn": 52428800,
+      "retentionDays": 7,
+      "keepCompleted": false
+    }
+  },
+  "claude": {
     "enabled": false,
     "defaultAgent": true,
     "model": "",
@@ -50,14 +50,21 @@
     "defaultAgent": false,
     "path": "",
     "model": "",
+    "alternativeModel": "",
     "avatarBatteryMode": "apiPercent",
     "onDemandMonthlyBudget": 1000
   },
-  "codex": {
-    "enabled": false,
-    "defaultAgent": false,
-    "path": "",
-    "model": "",
-    "effort": ""
-  }
-}
+  "codex": {
+    "enabled": false,
+    "defaultAgent": false,
+    "path": "",
+    "model": "",
+    "alternativeModel": "",
+    "effort": ""
+  },
+  "ccc": {
+    "DEEPSEEK_API_KEY": "",
+    "DEEPSEEK_BASE_URL": "https://api.deepseek.com/v1",
+    "model": "deepseek-v4-pro[1m]"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.186",
+  "version": "0.2.188",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

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

@@ -0,0 +1,33 @@
+import { afterEach, describe, expect, it } from "vitest";
+
+import { ChatSession } from "../builtin/index.ts";
+import { config } from "../config.ts";
+
+const originalDeepSeekApiKey = process.env.DEEPSEEK_API_KEY;
+const originalCccConfig = structuredClone(config.ccc);
+
+afterEach(() => {
+  if (originalDeepSeekApiKey === undefined) {
+    delete process.env.DEEPSEEK_API_KEY;
+  } else {
+    process.env.DEEPSEEK_API_KEY = originalDeepSeekApiKey;
+  }
+  config.ccc = structuredClone(originalCccConfig);
+});
+
+describe("builtin ChatSession config", () => {
+  it("does not fall back to DEEPSEEK_API_KEY environment variable", () => {
+    config.ccc = {
+      DEEPSEEK_API_KEY: "",
+      DEEPSEEK_BASE_URL: "https://api.deepseek.com/v1",
+      model: "deepseek-v4-pro[1m]",
+    };
+    process.env.DEEPSEEK_API_KEY = "sk-env-should-not-be-used";
+
+    expect(() => new ChatSession()).toThrow("ccc.DEEPSEEK_API_KEY 未设置");
+  });
+
+  it("allows constructor parameters to override config defaults", () => {
+    expect(() => new ChatSession({ apiKey: "sk-test" })).not.toThrow();
+  });
+});

package/src/__tests__/chrome-devtools-guard.test.ts

@@ -3,6 +3,7 @@ import { spawn } from "node:child_process";
 
 import {
   ensureChromeCdpRunning,
+  ensureChatcccPageOpen,
   isChromeCdpHealthy,
   probeChromeCdp,
   resolveChromeExecutable,
@@ -122,4 +123,43 @@ describe("Chrome CDP guard", () => {
     expect(resolveChromeUserDataDir(15166, { LOCALAPPDATA: "C:/Users/me/AppData/Local" }))
       .toBe("C:\\Users\\me\\AppData\\Local\\chatccc\\chrome-cdp-15166");
   });
+
+  it("opens the configured ChatCCC page when no localhost or loopback page is present", async () => {
+    const fetchImpl = vi.fn(async (input: string | URL | Request, init?: RequestInit) => {
+      const url = String(input);
+      if (url === "http://127.0.0.1:15166/json/list") {
+        return new Response(JSON.stringify([
+          { id: "chatgpt", type: "page", url: "https://chatgpt.com/", webSocketDebuggerUrl: "ws://page" },
+        ]), { status: 200 });
+      }
+      if (url === "http://127.0.0.1:15166/json/new?http%3A%2F%2Flocalhost%3A18081%2F") {
+        expect(init?.method).toBe("PUT");
+        return new Response(JSON.stringify({ id: "chatccc" }), { status: 200 });
+      }
+      throw new Error(`unexpected fetch ${url}`);
+    }) as unknown as typeof fetch;
+
+    await expect(ensureChatcccPageOpen(15166, 18081, { fetchImpl })).resolves.toEqual({
+      ok: true,
+      opened: true,
+    });
+  });
+
+  it("does not open another ChatCCC page when localhost or 127.0.0.1 is already present", async () => {
+    const fetchImpl = vi.fn(async (input: string | URL | Request) => {
+      const url = String(input);
+      if (url === "http://127.0.0.1:15166/json/list") {
+        return new Response(JSON.stringify([
+          { id: "chatccc", type: "page", url: "http://127.0.0.1:18080/", webSocketDebuggerUrl: "ws://page" },
+        ]), { status: 200 });
+      }
+      throw new Error(`unexpected fetch ${url}`);
+    }) as unknown as typeof fetch;
+
+    await expect(ensureChatcccPageOpen(15166, 18080, { fetchImpl })).resolves.toEqual({
+      ok: true,
+      opened: false,
+    });
+    expect(fetchImpl).toHaveBeenCalledTimes(1);
+  });
 });

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

@@ -22,6 +22,7 @@ import {
   ILINK_ENABLED,
   applyLoadedConfig,
   config,
+  getAllModelsForTool,
   resolveDefaultAgentTool,
   type AppConfig,
 } from "../config.ts";
@@ -41,15 +42,15 @@ const baseAppConfig: AppConfig = {
   feishu: { appId: "INITIAL_APP", appSecret: "INITIAL_SECRET" },
   platforms: { feishu: { enabled: true }, ilink: { enabled: true } },
   chromeDevtools: { enabled: false, port: 15166, chromePath: "" },
-  port: 18080,
-  gitTimeoutSeconds: 180,
-  allowInterrupt: false,
-  rawStreamLogs: {
-    claude: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-    cursor: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-    codex: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-  },
-  claude: {
+  port: 18080,
+  gitTimeoutSeconds: 180,
+  allowInterrupt: false,
+  rawStreamLogs: {
+    claude: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+    cursor: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+    codex: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+  },
+  claude: {
     enabled: true,
     defaultAgent: true,
     model: "initial-model",
@@ -64,11 +65,13 @@ const baseAppConfig: AppConfig = {
     defaultAgent: false,
     path: "/initial/cursor",
     model: "initial-cursor-model",
+    alternativeModel: "initial-cursor-alt-model",
     avatarBatteryMode: "apiPercent",
     onDemandMonthlyBudget: 1000,
-  },
-  codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", effort: "initial-codex-effort" },
-};
+  },
+  codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", alternativeModel: "initial-codex-alt-model", effort: "initial-codex-effort" },
+  ccc: { DEEPSEEK_API_KEY: "initial-ccc-key", DEEPSEEK_BASE_URL: "https://initial.deepseek.test/v1", model: "initial-ccc-model" },
+};
 
 // 把 module 状态抢救快照：每个 it 跑前重置回这个状态，避免污染相邻测试。
 // 不直接用启动时的 config 引用做 snapshot——它可能已经被前一个 it 改写。
@@ -145,7 +148,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
   it("CURSOR_AGENT_ARGS 跟随 cursor.model 重新解析", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
-      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "claude-3.7-sonnet", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
+      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "claude-3.7-sonnet", alternativeModel: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
     });
 
     // CURSOR_AGENT_ARGS 是 ['-p', '--force', '--approve-mcps', ..., '--model', 'claude-3.7-sonnet']
@@ -157,7 +160,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
   it("cursor.model 留空时 CURSOR_AGENT_ARGS 不含 --model", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
-      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
+      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "", alternativeModel: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
     });
 
     expect(CURSOR_AGENT_ARGS).not.toContain("--model");
@@ -166,12 +169,23 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
   it("CURSOR_AGENT_COMMAND 优先取 config.cursor.path", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
-      cursor: { enabled: true, defaultAgent: false, path: "C:/custom/cursor.exe", model: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
+      cursor: { enabled: true, defaultAgent: false, path: "C:/custom/cursor.exe", model: "", alternativeModel: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
     });
 
     expect(CURSOR_AGENT_COMMAND).toBe("C:/custom/cursor.exe");
   });
 
+  it("/model 候选列表包含 Cursor/Codex 的单个备选模型并保持主模型优先", () => {
+    const cfg = structuredClone(baseAppConfig);
+    cfg.cursor.model = "cursor-main";
+    cfg.cursor.alternativeModel = "cursor-alt";
+    cfg.codex.model = "codex-main";
+    cfg.codex.alternativeModel = "codex-main";
+
+    expect(getAllModelsForTool("cursor", cfg)).toEqual(["cursor-main", "cursor-alt"]);
+    expect(getAllModelsForTool("codex", cfg)).toEqual(["codex-main"]);
+  });
+
   it("不修改 CHATCCC_PORT（端口在 setup 切换时必须保持不变）", () => {
     const portBefore = CHATCCC_PORT;
     applyLoadedConfig({
@@ -191,7 +205,7 @@ describe("applyLoadedConfig — config 对象引用契约", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
       feishu: { appId: "REF_TEST_APP", appSecret: "REF_TEST_SECRET" },
-      codex: { enabled: true, defaultAgent: false, path: "/refresh/codex", model: "fresh-model", effort: "low" },
+      codex: { enabled: true, defaultAgent: false, path: "/refresh/codex", model: "fresh-model", alternativeModel: "", effort: "low" },
     });
 
     // 必须是同一个引用：codex-adapter 等下游模块"直接 import config"，

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

@@ -28,33 +28,55 @@ describe("config.sample.json", () => {
     expect(sample.claude?.subagentModel).toBe("");
   });
 
-  it("keeps Chrome CDP guard disabled by default with port 15166", () => {
+  it("leaves Cursor and Codex alternative models empty by default", () => {
     const configSamplePath = join(process.cwd(), "config.sample.json");
     const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
-      chromeDevtools?: { enabled?: unknown; port?: unknown; chromePath?: unknown };
+      cursor?: { alternativeModel?: unknown };
+      codex?: { alternativeModel?: unknown };
     };
 
-    expect(sample.chromeDevtools?.enabled).toBe(false);
-    expect(sample.chromeDevtools?.port).toBe(15166);
-    expect(sample.chromeDevtools?.chromePath).toBe("");
+    expect(sample.cursor?.alternativeModel).toBe("");
+    expect(sample.codex?.alternativeModel).toBe("");
   });
 
-  it("keeps raw stream logs disabled by default for every agent", () => {
+  it("sets ccc agent DeepSeek defaults in the sample config", () => {
     const configSamplePath = join(process.cwd(), "config.sample.json");
     const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
-      rawStreamLogs?: Record<string, {
-        enabled?: unknown;
-        maxBytesPerTurn?: unknown;
-        retentionDays?: unknown;
-        keepCompleted?: unknown;
-      }>;
+      ccc?: { DEEPSEEK_API_KEY?: unknown; DEEPSEEK_BASE_URL?: unknown; model?: unknown };
     };
 
-    for (const tool of ["claude", "cursor", "codex"]) {
-      expect(sample.rawStreamLogs?.[tool]?.enabled).toBe(false);
-      expect(sample.rawStreamLogs?.[tool]?.maxBytesPerTurn).toBe(52_428_800);
-      expect(sample.rawStreamLogs?.[tool]?.retentionDays).toBe(7);
-      expect(sample.rawStreamLogs?.[tool]?.keepCompleted).toBe(false);
-    }
+    expect(sample.ccc?.DEEPSEEK_API_KEY).toBe("");
+    expect(sample.ccc?.DEEPSEEK_BASE_URL).toBe("https://api.deepseek.com/v1");
+    expect(sample.ccc?.model).toBe("deepseek-v4-pro[1m]");
   });
-});
+
+  it("keeps Chrome CDP guard disabled by default with port 15166", () => {
+    const configSamplePath = join(process.cwd(), "config.sample.json");
+    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
+      chromeDevtools?: { enabled?: unknown; port?: unknown; chromePath?: unknown };
+    };
+
+    expect(sample.chromeDevtools?.enabled).toBe(false);
+    expect(sample.chromeDevtools?.port).toBe(15166);
+    expect(sample.chromeDevtools?.chromePath).toBe("");
+  });
+
+  it("keeps raw stream logs disabled by default for every agent", () => {
+    const configSamplePath = join(process.cwd(), "config.sample.json");
+    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
+      rawStreamLogs?: Record<string, {
+        enabled?: unknown;
+        maxBytesPerTurn?: unknown;
+        retentionDays?: unknown;
+        keepCompleted?: unknown;
+      }>;
+    };
+
+    for (const tool of ["claude", "cursor", "codex"]) {
+      expect(sample.rawStreamLogs?.[tool]?.enabled).toBe(false);
+      expect(sample.rawStreamLogs?.[tool]?.maxBytesPerTurn).toBe(52_428_800);
+      expect(sample.rawStreamLogs?.[tool]?.retentionDays).toBe(7);
+      expect(sample.rawStreamLogs?.[tool]?.keepCompleted).toBe(false);
+    }
+  });
+});