chatccc 0.2.197 → 0.2.199

package/src/__tests__/web-ui.test.ts

@@ -1,209 +1,209 @@
-import { describe, it, expect } from "vitest";
-import {
-  PAGE_HTML,
-  chooseStartPath,
-  getRestartRequiredReasons,
-  unflattenConfig,
-} from "../web-ui.ts";
-
-describe("unflattenConfig", () => {
-  it("maps Claude subagent model into claude.subagentModel", () => {
-    expect(
-      unflattenConfig({
-        CHATCCC_ANTHROPIC_MODEL: "claude-sonnet-4-6",
-        CHATCCC_ANTHROPIC_SUBAGENT_MODEL: "claude-haiku-4-5-20251001",
-      }),
-    ).toEqual({
-      claude: {
-        model: "claude-sonnet-4-6",
-        subagentModel: "claude-haiku-4-5-20251001",
-      },
-    });
-  });
-
-  it("maps Claude apiKey and baseUrl into claude config", () => {
-    expect(
-      unflattenConfig({
-        CHATCCC_ANTHROPIC_API_KEY: "sk-test-key",
-        CHATCCC_ANTHROPIC_BASE_URL: "https://api.example.com",
-      }),
-    ).toEqual({
-      claude: {
-        apiKey: "sk-test-key",
-        baseUrl: "https://api.example.com",
-      },
-    });
-  });
-
-  it("maps Cursor and Codex alternative models into agent config", () => {
-    expect(
-      unflattenConfig({
-        CHATCCC_CURSOR_ALTERNATIVE_MODEL: "gpt-5.5-high",
-        CHATCCC_CODEX_ALTERNATIVE_MODEL: "gpt-5.3-codex",
-      }),
-    ).toEqual({
-      cursor: {
-        alternativeModel: "gpt-5.5-high",
-      },
-      codex: {
-        alternativeModel: "gpt-5.3-codex",
-      },
-    });
-  });
-
-  it("maps Chrome CDP guard fields into chromeDevtools config", () => {
-    expect(
-      unflattenConfig({
-        CHATCCC_CHROME_DEVTOOLS_ENABLED: true,
-        CHATCCC_CHROME_DEVTOOLS_PORT: "15166",
-        CHATCCC_CHROME_DEVTOOLS_PATH: "C:/Program Files/Google/Chrome/Application/chrome.exe",
-      }),
-    ).toEqual({
-      chromeDevtools: {
-        enabled: true,
-        port: 15166,
-        chromePath: "C:/Program Files/Google/Chrome/Application/chrome.exe",
-      },
-    });
-  });
-});
-
-describe("getRestartRequiredReasons", () => {
-  const baseConfig = {
-    feishu: { appId: "cli_old", appSecret: "secret_old" },
-    platforms: {
-      feishu: { enabled: true, platformType: "feishu" },
-      ilink: { enabled: true, reuseTokenOnStart: true },
-    },
-    chromeDevtools: { enabled: false, port: 15166, chromePath: "" },
-    port: 18080,
-    claude: {
-      enabled: true,
-      defaultAgent: true,
-      model: "",
-      subagentModel: "",
-      effort: "",
-      apiKey: "",
-      baseUrl: "",
-      maxTurn: 0,
-    },
-    cursor: {
-      enabled: true,
-      defaultAgent: false,
-      path: "",
-      model: "",
-      alternativeModel: "",
-      avatarBatteryMode: "apiPercent",
-      onDemandMonthlyBudget: 1000,
-    },
-    codex: {
-      enabled: true,
-      defaultAgent: false,
-      path: "",
-      model: "",
-      alternativeModel: "",
-      effort: "",
-    },
-  };
-
-  it("does not require restart for agent and Chrome runtime settings", () => {
-    expect(
-      getRestartRequiredReasons(baseConfig, {
-        ...baseConfig,
-        chromeDevtools: { enabled: true, port: 15167, chromePath: "C:/Chrome/chrome.exe" },
-        claude: { ...baseConfig.claude, model: "claude-sonnet", apiKey: "sk-test", maxTurn: 8 },
-        cursor: { ...baseConfig.cursor, path: "C:/cursor-agent.cmd", model: "cursor-model" },
-        codex: { ...baseConfig.codex, path: "C:/codex.cmd", model: "gpt-5.3-codex", effort: "high" },
-      }),
-    ).toEqual([]);
-  });
-
-  it("requires restart for port, Feishu credentials, platform type, and platform lifecycle", () => {
-    expect(
-      getRestartRequiredReasons(baseConfig, {
-        ...baseConfig,
-        feishu: { appId: "cli_new", appSecret: "secret_new" },
-        platforms: {
-          feishu: { enabled: false, platformType: "lark" },
-          ilink: { enabled: false, reuseTokenOnStart: false },
-        },
-        port: 18081,
-      }),
-    ).toEqual([
-      "port",
-      "feishu.appId",
-      "feishu.appSecret",
-      "platforms.feishu.platformType",
-      "platforms.feishu.enabled",
-      "platforms.ilink.enabled",
-      "platforms.ilink.reuseTokenOnStart",
-    ]);
-  });
-});
-
-describe("dashboard edit modal", () => {
-  it("shows the edit modal and overlay when a section edit button is clicked", () => {
-    expect(PAGE_HTML).toContain("function editSection(section)");
-    expect(PAGE_HTML).toContain("document.getElementById('edit-modal').classList.remove('hidden');");
-    expect(PAGE_HTML).toContain("document.getElementById('edit-overlay').classList.remove('hidden');");
-  });
-
-  it("uses plain alternative model labels for Cursor and Codex", () => {
-    expect(PAGE_HTML).toContain("field-CHATCCC_CURSOR_ALTERNATIVE_MODEL");
-    expect(PAGE_HTML).toContain("field-CHATCCC_CODEX_ALTERNATIVE_MODEL");
-    expect(PAGE_HTML).toContain("备选模型");
-  });
-
-  it("shows config effect scope hints", () => {
-    expect(PAGE_HTML).toContain("生效范围：保存后下一条消息或下个新会话生效");
-    expect(PAGE_HTML).toContain("生效范围：飞书开关、App ID、App Secret 或平台类型变更需要重启 ChatCCC");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// chooseStartPath — /api/start 的路径选择
-// 关键护栏：
-//   - setup 模式（hasInplaceActivateHook=true）下 isServiceRunning 永远为 true
-//     （setup 进程自己占着 PID 文件），必须无条件走 inplace；否则用户点
-//     "保存并启动"将永远拿到 "Service is already running"。
-//   - dashboard 模式 + service 已运行（通常就是当前进程自己）→ "reload"：
-//     用户点"保存并启动"想让新 config 生效，但服务正在跑——不真重启，仅
-//     调用 reloadConfigFromDisk() 刷新进程内 export let 常量。绝不能再
-//     返回"already running"挡用户路。
-//   - dashboard 模式 + service 未运行 → spawn 一个新的（旧 service 退出后场景）。
-// ---------------------------------------------------------------------------
-
-describe("chooseStartPath", () => {
-  it("setup 模式（注入 inplace hook）→ inplace（不管 PID 文件状态）", () => {
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: true,
-        isServiceRunning: true,
-      }),
-    ).toBe("inplace");
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: true,
-        isServiceRunning: false,
-      }),
-    ).toBe("inplace");
-  });
-
-  it("dashboard 模式 + service 已运行 → reload（仅刷新 config，不真重启）", () => {
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: false,
-        isServiceRunning: true,
-      }),
-    ).toBe("reload");
-  });
-
-  it("dashboard 模式 + service 未运行 → spawn", () => {
-    expect(
-      chooseStartPath({
-        hasInplaceActivateHook: false,
-        isServiceRunning: false,
-      }),
-    ).toBe("spawn");
-  });
-});
+import { describe, it, expect } from "vitest";
+import {
+  PAGE_HTML,
+  chooseStartPath,
+  getRestartRequiredReasons,
+  unflattenConfig,
+} from "../web-ui.ts";
+
+describe("unflattenConfig", () => {
+  it("maps Claude subagent model into claude.subagentModel", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_ANTHROPIC_MODEL: "claude-sonnet-4-6",
+        CHATCCC_ANTHROPIC_SUBAGENT_MODEL: "claude-haiku-4-5-20251001",
+      }),
+    ).toEqual({
+      claude: {
+        model: "claude-sonnet-4-6",
+        subagentModel: "claude-haiku-4-5-20251001",
+      },
+    });
+  });
+
+  it("maps Claude apiKey and baseUrl into claude config", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_ANTHROPIC_API_KEY: "sk-test-key",
+        CHATCCC_ANTHROPIC_BASE_URL: "https://api.example.com",
+      }),
+    ).toEqual({
+      claude: {
+        apiKey: "sk-test-key",
+        baseUrl: "https://api.example.com",
+      },
+    });
+  });
+
+  it("maps Cursor and Codex alternative models into agent config", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_CURSOR_ALTERNATIVE_MODEL: "gpt-5.5-high",
+        CHATCCC_CODEX_ALTERNATIVE_MODEL: "gpt-5.3-codex",
+      }),
+    ).toEqual({
+      cursor: {
+        alternativeModel: "gpt-5.5-high",
+      },
+      codex: {
+        alternativeModel: "gpt-5.3-codex",
+      },
+    });
+  });
+
+  it("maps Chrome CDP guard fields into chromeDevtools config", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_CHROME_DEVTOOLS_ENABLED: true,
+        CHATCCC_CHROME_DEVTOOLS_PORT: "15166",
+        CHATCCC_CHROME_DEVTOOLS_PATH: "C:/Program Files/Google/Chrome/Application/chrome.exe",
+      }),
+    ).toEqual({
+      chromeDevtools: {
+        enabled: true,
+        port: 15166,
+        chromePath: "C:/Program Files/Google/Chrome/Application/chrome.exe",
+      },
+    });
+  });
+});
+
+describe("getRestartRequiredReasons", () => {
+  const baseConfig = {
+    feishu: { appId: "cli_old", appSecret: "secret_old" },
+    platforms: {
+      feishu: { enabled: true, platformType: "feishu" },
+      ilink: { enabled: true, reuseTokenOnStart: true },
+    },
+    chromeDevtools: { enabled: false, port: 15166, chromePath: "" },
+    port: 18080,
+    claude: {
+      enabled: true,
+      defaultAgent: true,
+      model: "",
+      subagentModel: "",
+      effort: "",
+      apiKey: "",
+      baseUrl: "",
+      maxTurn: 0,
+    },
+    cursor: {
+      enabled: true,
+      defaultAgent: false,
+      path: "",
+      model: "",
+      alternativeModel: "",
+      avatarBatteryMode: "apiPercent",
+      onDemandMonthlyBudget: 1000,
+    },
+    codex: {
+      enabled: true,
+      defaultAgent: false,
+      path: "",
+      model: "",
+      alternativeModel: "",
+      effort: "",
+    },
+  };
+
+  it("does not require restart for agent and Chrome runtime settings", () => {
+    expect(
+      getRestartRequiredReasons(baseConfig, {
+        ...baseConfig,
+        chromeDevtools: { enabled: true, port: 15167, chromePath: "C:/Chrome/chrome.exe" },
+        claude: { ...baseConfig.claude, model: "claude-sonnet", apiKey: "sk-test", maxTurn: 8 },
+        cursor: { ...baseConfig.cursor, path: "C:/cursor-agent.cmd", model: "cursor-model" },
+        codex: { ...baseConfig.codex, path: "C:/codex.cmd", model: "gpt-5.3-codex", effort: "high" },
+      }),
+    ).toEqual([]);
+  });
+
+  it("requires restart for port, Feishu credentials, platform type, and platform lifecycle", () => {
+    expect(
+      getRestartRequiredReasons(baseConfig, {
+        ...baseConfig,
+        feishu: { appId: "cli_new", appSecret: "secret_new" },
+        platforms: {
+          feishu: { enabled: false, platformType: "lark" },
+          ilink: { enabled: false, reuseTokenOnStart: false },
+        },
+        port: 18081,
+      }),
+    ).toEqual([
+      "port",
+      "feishu.appId",
+      "feishu.appSecret",
+      "platforms.feishu.platformType",
+      "platforms.feishu.enabled",
+      "platforms.ilink.enabled",
+      "platforms.ilink.reuseTokenOnStart",
+    ]);
+  });
+});
+
+describe("dashboard edit modal", () => {
+  it("shows the edit modal and overlay when a section edit button is clicked", () => {
+    expect(PAGE_HTML).toContain("function editSection(section)");
+    expect(PAGE_HTML).toContain("document.getElementById('edit-modal').classList.remove('hidden');");
+    expect(PAGE_HTML).toContain("document.getElementById('edit-overlay').classList.remove('hidden');");
+  });
+
+  it("uses plain alternative model labels for Cursor and Codex", () => {
+    expect(PAGE_HTML).toContain("field-CHATCCC_CURSOR_ALTERNATIVE_MODEL");
+    expect(PAGE_HTML).toContain("field-CHATCCC_CODEX_ALTERNATIVE_MODEL");
+    expect(PAGE_HTML).toContain("备选模型");
+  });
+
+  it("shows config effect scope hints", () => {
+    expect(PAGE_HTML).toContain("生效范围：保存后下一条消息或下个新会话生效");
+    expect(PAGE_HTML).toContain("生效范围：飞书开关、App ID、App Secret 或平台类型变更需要重启 ChatCCC");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// chooseStartPath — /api/start 的路径选择
+// 关键护栏：
+//   - setup 模式（hasInplaceActivateHook=true）下 isServiceRunning 永远为 true
+//     （setup 进程自己占着 PID 文件），必须无条件走 inplace；否则用户点
+//     "保存并启动"将永远拿到 "Service is already running"。
+//   - dashboard 模式 + service 已运行（通常就是当前进程自己）→ "reload"：
+//     用户点"保存并启动"想让新 config 生效，但服务正在跑——不真重启，仅
+//     调用 reloadConfigFromDisk() 刷新进程内 export let 常量。绝不能再
+//     返回"already running"挡用户路。
+//   - dashboard 模式 + service 未运行 → spawn 一个新的（旧 service 退出后场景）。
+// ---------------------------------------------------------------------------
+
+describe("chooseStartPath", () => {
+  it("setup 模式（注入 inplace hook）→ inplace（不管 PID 文件状态）", () => {
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: true,
+        isServiceRunning: true,
+      }),
+    ).toBe("inplace");
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: true,
+        isServiceRunning: false,
+      }),
+    ).toBe("inplace");
+  });
+
+  it("dashboard 模式 + service 已运行 → reload（仅刷新 config，不真重启）", () => {
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: false,
+        isServiceRunning: true,
+      }),
+    ).toBe("reload");
+  });
+
+  it("dashboard 模式 + service 未运行 → spawn", () => {
+    expect(
+      chooseStartPath({
+        hasInplaceActivateHook: false,
+        isServiceRunning: false,
+      }),
+    ).toBe("spawn");
+  });
+});

package/src/adapters/ccc-adapter.ts

@@ -1,121 +1,121 @@
-import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "../builtin/index.ts";
-import {
-  getBuiltinContextSession,
-  newBuiltinSessionId,
-  normalizeBuiltinSessionId,
-} from "../builtin/context.ts";
-import { config, CCC_SESSION_PREFIX } from "../config.ts";
-import type {
-  CreateSessionResult,
-  SessionInfo,
-  ToolAdapter,
-  ToolPromptOptions,
-  UnifiedStreamMessage,
-} from "./adapter-interface.ts";
-
-export interface CccAdapterOptions extends ChatSessionConfig {
-  contextDir?: string;
-  compactAtTokens?: number;
-  keepRecentMessages?: number;
-  maxSteps?: number;
-}
-
-function toChatSessionOptions(
-  sessionId: string,
-  cwd: string,
-  options: CccAdapterOptions,
-): ChatSessionOptions {
-  return {
-    cwd,
-    persist: true,
-    sessionId,
-    contextDir: options.contextDir,
-    compactAtTokens: options.compactAtTokens,
-    keepRecentMessages: options.keepRecentMessages,
-    maxSteps: options.maxSteps,
-  };
-}
-
-export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
-  const chatConfig: ChatSessionConfig = {
-    ...(options.apiKey !== undefined ? { apiKey: options.apiKey } : {}),
-    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
-    ...(options.model !== undefined ? { model: options.model } : {}),
-  };
-
-  return {
-    displayName: "CCC Agent",
-    sessionDescPrefix: CCC_SESSION_PREFIX,
-
-    async createSession(cwd: string): Promise<CreateSessionResult> {
-      const sessionId = newBuiltinSessionId();
-      const session = new ChatSession(
-        chatConfig,
-        toChatSessionOptions(sessionId, cwd, options),
-      );
-      session.reset();
-      return { sessionId };
-    },
-
-    async *prompt(
-      sessionId: string,
-      userText: string,
-      cwd: string,
-      signal?: AbortSignal,
-      _promptOptions?: ToolPromptOptions,
-    ): AsyncIterable<UnifiedStreamMessage> {
-      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
-      const session = new ChatSession(
-        chatConfig,
-        toChatSessionOptions(normalizedSessionId, cwd, options),
-      );
-
-      for await (const event of session.chat(userText, signal)) {
-        if (event.type === "text") {
-          yield {
-            type: "assistant",
-            blocks: [{ type: "text", text: event.text }],
-          };
-        } else if (event.type === "tool_use") {
-          yield {
-            type: "assistant",
-            blocks: [{
-              type: "tool_use",
-              id: event.id,
-              name: event.name,
-              input: event.input,
-            }],
-          };
-        } else if (event.type === "tool_result") {
-          yield {
-            type: "assistant",
-            blocks: [{
-              type: "tool_result",
-              tool_use_id: event.tool_use_id,
-              content: event.content,
-              is_error: event.is_error,
-            }],
-          };
-        } else if (event.type === "error") {
-          throw new Error(event.message);
-        }
-      }
-    },
-
-    async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
-      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
-      const info = getBuiltinContextSession(normalizedSessionId, options.contextDir);
-      if (!info) return undefined;
-      return {
-        sessionId: info.sessionId,
-        cwd: info.cwd,
-        lastModified: info.updatedAt,
-        model: options.model ?? config.ccc.model,
-      };
-    },
-
-    async closeSession(_sessionId: string): Promise<void> {
-      // ChatSession uses one request-scoped stream per prompt. AbortSignal handles cancellation.
-    },
-  };
-}
+import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "../builtin/index.ts";
+import {
+  getBuiltinContextSession,
+  newBuiltinSessionId,
+  normalizeBuiltinSessionId,
+} from "../builtin/context.ts";
+import { config, CCC_SESSION_PREFIX } from "../config.ts";
+import type {
+  CreateSessionResult,
+  SessionInfo,
+  ToolAdapter,
+  ToolPromptOptions,
+  UnifiedStreamMessage,
+} from "./adapter-interface.ts";
+
+export interface CccAdapterOptions extends ChatSessionConfig {
+  contextDir?: string;
+  compactAtTokens?: number;
+  keepRecentMessages?: number;
+  maxSteps?: number;
+}
+
+function toChatSessionOptions(
+  sessionId: string,
+  cwd: string,
+  options: CccAdapterOptions,
+): ChatSessionOptions {
+  return {
+    cwd,
+    persist: true,
+    sessionId,
+    contextDir: options.contextDir,
+    compactAtTokens: options.compactAtTokens,
+    keepRecentMessages: options.keepRecentMessages,
+    maxSteps: options.maxSteps,
+  };
+}
+
+export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
+  const chatConfig: ChatSessionConfig = {
+    ...(options.apiKey !== undefined ? { apiKey: options.apiKey } : {}),
+    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
+    ...(options.model !== undefined ? { model: options.model } : {}),
+  };
+
+  return {
+    displayName: "CCC Agent",
+    sessionDescPrefix: CCC_SESSION_PREFIX,
+
+    async createSession(cwd: string): Promise<CreateSessionResult> {
+      const sessionId = newBuiltinSessionId();
+      const session = new ChatSession(
+        chatConfig,
+        toChatSessionOptions(sessionId, cwd, options),
+      );
+      session.reset();
+      return { sessionId };
+    },
+
+    async *prompt(
+      sessionId: string,
+      userText: string,
+      cwd: string,
+      signal?: AbortSignal,
+      _promptOptions?: ToolPromptOptions,
+    ): AsyncIterable<UnifiedStreamMessage> {
+      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+      const session = new ChatSession(
+        chatConfig,
+        toChatSessionOptions(normalizedSessionId, cwd, options),
+      );
+
+      for await (const event of session.chat(userText, signal)) {
+        if (event.type === "text") {
+          yield {
+            type: "assistant",
+            blocks: [{ type: "text", text: event.text }],
+          };
+        } else if (event.type === "tool_use") {
+          yield {
+            type: "assistant",
+            blocks: [{
+              type: "tool_use",
+              id: event.id,
+              name: event.name,
+              input: event.input,
+            }],
+          };
+        } else if (event.type === "tool_result") {
+          yield {
+            type: "assistant",
+            blocks: [{
+              type: "tool_result",
+              tool_use_id: event.tool_use_id,
+              content: event.content,
+              is_error: event.is_error,
+            }],
+          };
+        } else if (event.type === "error") {
+          throw new Error(event.message);
+        }
+      }
+    },
+
+    async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
+      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+      const info = getBuiltinContextSession(normalizedSessionId, options.contextDir);
+      if (!info) return undefined;
+      return {
+        sessionId: info.sessionId,
+        cwd: info.cwd,
+        lastModified: info.updatedAt,
+        model: options.model ?? config.ccc.model,
+      };
+    },
+
+    async closeSession(_sessionId: string): Promise<void> {
+      // ChatSession uses one request-scoped stream per prompt. AbortSignal handles cancellation.
+    },
+  };
+}