chatccc 0.2.246 → 0.2.248

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

@@ -107,6 +107,7 @@ describe("unflattenConfig", () => {
         CHATCCC_CCC_MODEL: "deepseek-v4-flash",
         CHATCCC_CCC_ALTERNATIVE_MODEL: "deepseek-v4-pro",
         CHATCCC_CCC_EFFORT: "max",
+        CHATCCC_CCC_PROVIDER: "anthropic",
       }),
     ).toEqual({
       ccc: {
@@ -117,6 +118,7 @@ describe("unflattenConfig", () => {
         model: "deepseek-v4-flash",
         alternativeModel: "deepseek-v4-pro",
         effort: "max",
+        provider: "anthropic",
       },
     });
   });

package/src/adapters/adapter-interface.ts

@@ -66,21 +66,21 @@ export interface UnifiedSearchResultBlock {
   query: string;
 }
 
-export interface UnifiedCompactBoundaryBlock {
-  type: "compact_boundary";
-  trigger: "manual" | "auto";
-  pre_tokens: number;
-  post_tokens?: number;
-}
-
-export interface UnifiedAgentStatusBlock {
-  type: "agent_status";
-  status: "compacting" | "responding";
-}
-
-export type UnifiedBlock =
-  | UnifiedAgentStatusBlock
-  | UnifiedThinkingBlock
+export interface UnifiedCompactBoundaryBlock {
+  type: "compact_boundary";
+  trigger: "manual" | "auto";
+  pre_tokens: number;
+  post_tokens?: number;
+}
+
+export interface UnifiedAgentStatusBlock {
+  type: "agent_status";
+  status: "compacting" | "responding";
+}
+
+export type UnifiedBlock =
+  | UnifiedAgentStatusBlock
+  | UnifiedThinkingBlock
   | UnifiedTextBlock
   | UnifiedTextFinalBlock
   | UnifiedToolUseBlock
@@ -93,17 +93,17 @@ export type UnifiedBlock =
 // UnifiedStreamMessage — 一次 SDK/CLI 事件对应的归一化消息
 // ---------------------------------------------------------------------------
 
-export interface UnifiedStreamMessage {
-  type: "assistant" | "user" | "system";
-  blocks: UnifiedBlock[];
-  /**
-   * 适配器确认本事件代表一条完整、权威的最终回复，而不是流式文本片段。
-   *
-   * response-stall 终止与最终事件可能在同一事件循环边界竞态；只有该标记
-   * 为 true 时，上层才允许把已经触发的超时改判为正常完成。
-   */
-  isFinalResponse?: boolean;
-}
+export interface UnifiedStreamMessage {
+  type: "assistant" | "user" | "system";
+  blocks: UnifiedBlock[];
+  /**
+   * 适配器确认本事件代表一条完整、权威的最终回复，而不是流式文本片段。
+   *
+   * response-stall 终止与最终事件可能在同一事件循环边界竞态；只有该标记
+   * 为 true 时，上层才允许把已经触发的超时改判为正常完成。
+   */
+  isFinalResponse?: boolean;
+}
 
 // ---------------------------------------------------------------------------
 // CreateSessionResult
@@ -151,25 +151,25 @@ export interface ToolPromptOptions {
 // ToolAdapter — 统一的 AI 工具适配器接口
 // ---------------------------------------------------------------------------
 
-export interface ToolAdapter {
+export interface ToolAdapter {
   /** 日志/展示用名称，如 "Claude" */
   readonly displayName: string;
 
   /** 群描述中会话 ID 的前缀，如 "Claude Session:" */
-  readonly sessionDescPrefix: string;
-
-  /**
-   * Whether ChatCCC may infer a stalled response from unchanged streamed output.
-   * Defaults to true. Adapters that only emit output after a request completes must disable it.
-   */
-  readonly responseStallDetectionEnabled?: boolean;
-
-  /**
-   * 创建新会话，返回会话 ID。
-   * 适配器内部需处理后台流消费（静默消费 stream 中除 init 外的所有事件）。
-   * signal 用于上层在长期收不到 init 事件时终止底层 SDK/CLI。
-   */
-  createSession(cwd: string, signal?: AbortSignal): Promise<CreateSessionResult>;
+  readonly sessionDescPrefix: string;
+
+  /**
+   * Whether ChatCCC may infer a stalled response from unchanged streamed output.
+   * Defaults to true. Adapters that only emit output after a request completes must disable it.
+   */
+  readonly responseStallDetectionEnabled?: boolean;
+
+  /**
+   * 创建新会话，返回会话 ID。
+   * 适配器内部需处理后台流消费（静默消费 stream 中除 init 外的所有事件）。
+   * signal 用于上层在长期收不到 init 事件时终止底层 SDK/CLI。
+   */
+  createSession(cwd: string, signal?: AbortSignal): Promise<CreateSessionResult>;
 
   /**
    * 向已有会话发送提示文本，返回归一化消息的异步迭代器。
@@ -214,4 +214,4 @@ export function parseUserCommand(userText: string): UserCommand {
   if (original.startsWith("/plan")) return { original, mode: "plan" };
   if (original.startsWith("/ask")) return { original, mode: "ask" };
   return { original, mode: null };
-}
+}

package/src/adapters/ccc-adapter.ts

@@ -1,150 +1,150 @@
-import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "../../deepccc-agent/src/index.ts";
-import { config as deepCccConfig } from "../../deepccc-agent/src/config.ts";
-import {
-  getBuiltinContextSession,
-  newBuiltinSessionId,
-  normalizeBuiltinSessionId,
-} from "../../deepccc-agent/src/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;
-  compactionTimeoutMs?: 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,
-    compactionTimeoutMs: options.compactionTimeoutMs,
-    maxSteps: options.maxSteps,
-    // chatccc 无终端可交互，且对齐 claude/codex 适配器的 bypass 模式：
-    // 高危命令不询问，全部放行（与独立 deepccc CLI 的 ask 模式不同）
-    permissionMode: "bypass",
-  };
-}
-
-export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
-  if (!options.apiKey?.trim()) {
-    throw new Error("ChatCCC 未配置 CCC Agent API Key。请先填写 ccc.DEEPSEEK_API_KEY 后再启用 CCC Agent。");
-  }
-
-  const chatConfig: ChatSessionConfig = {
-    apiKey: options.apiKey,
-    ...(options.provider !== undefined ? { provider: options.provider } : {}),
-    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
-    ...(options.model !== undefined ? { model: options.model } : {}),
-    ...(options.effort !== undefined ? { effort: options.effort } : {}),
-  };
-
-  return {
-    displayName: "CCC Agent",
-    sessionDescPrefix: CCC_SESSION_PREFIX,
-    // Non-streaming DeepCCC emits its reply only after the provider request finishes,
-    // so unchanged output cannot distinguish a slow request from a stalled response.
-    responseStallDetectionEnabled: deepCccConfig.streaming,
-
-    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 === "status") {
-          yield {
-            type: "assistant",
-            blocks: [{
-              type: "agent_status",
-              status: event.phase === "compacting" ? "compacting" : "responding",
-            }],
-          };
-        } else 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 === "done" && !signal?.aborted) {
-          yield {
-            type: "assistant",
-            blocks: [],
-            isFinalResponse: true,
-          };
-        } 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 "../../deepccc-agent/src/index.ts";
+import { config as deepCccConfig } from "../../deepccc-agent/src/config.ts";
+import {
+  getBuiltinContextSession,
+  newBuiltinSessionId,
+  normalizeBuiltinSessionId,
+} from "../../deepccc-agent/src/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;
+  compactionTimeoutMs?: 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,
+    compactionTimeoutMs: options.compactionTimeoutMs,
+    maxSteps: options.maxSteps,
+    // chatccc 无终端可交互，且对齐 claude/codex 适配器的 bypass 模式：
+    // 高危命令不询问，全部放行（与独立 deepccc CLI 的 ask 模式不同）
+    permissionMode: "bypass",
+  };
+}
+
+export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
+  if (!options.apiKey?.trim()) {
+    throw new Error("ChatCCC 未配置 CCC Agent API Key。请先填写 ccc.DEEPSEEK_API_KEY 后再启用 CCC Agent。");
+  }
+
+  const chatConfig: ChatSessionConfig = {
+    apiKey: options.apiKey,
+    ...(options.provider !== undefined ? { provider: options.provider } : {}),
+    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
+    ...(options.model !== undefined ? { model: options.model } : {}),
+    ...(options.effort !== undefined ? { effort: options.effort } : {}),
+  };
+
+  return {
+    displayName: "CCC Agent",
+    sessionDescPrefix: CCC_SESSION_PREFIX,
+    // Non-streaming DeepCCC emits its reply only after the provider request finishes,
+    // so unchanged output cannot distinguish a slow request from a stalled response.
+    responseStallDetectionEnabled: deepCccConfig.streaming,
+
+    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 === "status") {
+          yield {
+            type: "assistant",
+            blocks: [{
+              type: "agent_status",
+              status: event.phase === "compacting" ? "compacting" : "responding",
+            }],
+          };
+        } else 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 === "done" && !signal?.aborted) {
+          yield {
+            type: "assistant",
+            blocks: [],
+            isFinalResponse: true,
+          };
+        } 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.
+    },
+  };
+}

package/src/config-utils.ts

@@ -20,7 +20,7 @@ import { join } from "node:path";
  * - `value` 去除空白后等于 `"default"`（不区分大小写）→ 视作 `""` 并 warn。
  * - 其余情况原样返回（不裁剪两端空白，留给具体调用方决定）。
  */
-export function normalizeOptionalConfigField(
+export function normalizeOptionalConfigField(
   value: unknown,
   options: { label: string; fallback?: string },
 ): string {
@@ -33,18 +33,42 @@ export function normalizeOptionalConfigField(
     );
     return "";
   }
-  return value;
-}
-
-/**
- * CCC Agent requires credentials owned by ChatCCC. An explicit enabled=true
- * must not make the agent selectable when that credential is absent.
- */
-export function resolveCccEnabled(rawEnabled: unknown, apiKey: unknown): boolean {
-  const hasApiKey = typeof apiKey === "string" && apiKey.trim().length > 0;
-  if (!hasApiKey) return false;
-  return typeof rawEnabled === "boolean" ? rawEnabled : true;
-}
+  return value;
+}
+
+/**
+ * ccc.provider 的合法取值：空字符串表示不 override（跟随 DeepCCC 内核配置），
+ * 或者显式指定 openai / anthropic 两种协议之一。
+ */
+export type CccProviderOverride = "" | "openai" | "anthropic";
+
+/**
+ * 归一化 `ccc.provider`（ChatCCC 主进程配置对 DeepCCC 内核传输层的 override）：
+ * - 非字符串 / 空串 / 字面量 "default" → `""`（不 override，跟随
+ *   ~/.deepccc/config.json 或 DEEPCCC_PROVIDER，向后兼容旧 config.json）
+ * - `openai` / `anthropic`（大小写不敏感）→ 规范化小写返回
+ * - 其它非法值 → `""` 并打印 warning（避免运行时 normalizeDeepCccProvider 抛错）
+ */
+export function normalizeCccProviderOverride(value: unknown): CccProviderOverride {
+  if (typeof value !== "string") return "";
+  const trimmed = value.trim().toLowerCase();
+  if (trimmed === "" || trimmed === "default") return "";
+  if (trimmed === "openai" || trimmed === "anthropic") return trimmed;
+  console.warn(
+    `[CONFIG] ccc.provider 的值 "${value}" 非法，已忽略（仅支持 openai / anthropic / 空字符串）。`,
+  );
+  return "";
+}
+
+/**
+ * CCC Agent requires credentials owned by ChatCCC. An explicit enabled=true
+ * must not make the agent selectable when that credential is absent.
+ */
+export function resolveCccEnabled(rawEnabled: unknown, apiKey: unknown): boolean {
+  const hasApiKey = typeof apiKey === "string" && apiKey.trim().length > 0;
+  if (!hasApiKey) return false;
+  return typeof rawEnabled === "boolean" ? rawEnabled : true;
+}
 
 // ---------------------------------------------------------------------------
 // /git 超时配置相关

package/src/config.ts

@@ -11,10 +11,12 @@ import {
   anthropicConfigDisplay,
   autoDetectCodexPath,
   autoDetectCursorPath,
-  normalizeOptionalConfigField,
-  readToolCliPath,
-  resolveCccEnabled,
-} from "./config-utils.ts";
+  normalizeCccProviderOverride,
+  normalizeOptionalConfigField,
+  readToolCliPath,
+  resolveCccEnabled,
+} from "./config-utils.ts";
+import type { CccProviderOverride } from "./config-utils.ts";
 
 // 重新导出 config-utils 中的纯函数/常量，保持对外 API 不变
 // （历史上这些符号都从 ./config.ts 导入；新代码可直接从 ./config-utils.ts 导入以避免触发本文件的副作用）
@@ -23,11 +25,11 @@ export {
   MIN_GIT_TIMEOUT_SECONDS,
   MAX_GIT_TIMEOUT_SECONDS,
   parseGitTimeoutSeconds,
-  normalizeOptionalConfigField,
-  isAnthropicConfigEmpty,
-  anthropicConfigDisplay,
-  resolveCccEnabled,
-} from "./config-utils.ts";
+  normalizeOptionalConfigField,
+  isAnthropicConfigEmpty,
+  anthropicConfigDisplay,
+  resolveCccEnabled,
+} from "./config-utils.ts";
 export type { ParsedGitTimeout } from "./config-utils.ts";
 
 // ---------------------------------------------------------------------------
@@ -123,6 +125,12 @@ export interface CccConfig {
    * DeepSeek reasoning_effort 请求字段；留空表示不传（服务端默认 medium）。
    */
   effort: string;
+  /**
+   * API 协议 override（选填）：openai（OpenAI 兼容协议）或 anthropic（Anthropic
+   * Messages 协议）。留空（""）表示不 override，跟随 DeepCCC 内核配置
+   * （~/.deepccc/config.json 的 provider 或 DEEPCCC_PROVIDER 环境变量）。
+   */
+  provider: CccProviderOverride;
 }
 
 export interface FeishuConfig {
@@ -470,6 +478,7 @@ function loadConfig(): AppConfig {
       model: DEFAULT_CCC_MODEL,
       alternativeModel: "",
       effort: "",
+      provider: "",
     },
   };
 
@@ -597,10 +606,10 @@ function loadConfig(): AppConfig {
     );
   // 旧版 ccc 配置没有 enabled。只用 API Key 推断启用，避免 sample 中自带的
   // 默认 Base URL / model 让升级用户在未配置凭证时意外启用 CCC Agent。
-  const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
-  const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
-  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
-  const cccEnabled = resolveCccEnabled(cccRaw.enabled, cccRaw.DEEPSEEK_API_KEY);
+  const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
+  const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
+  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
+  const cccEnabled = resolveCccEnabled(cccRaw.enabled, cccRaw.DEEPSEEK_API_KEY);
   const chromeDevtoolsPort = Number(chromeDevtoolsRaw.port);
   const explicitDefaultTool: AgentTool | null =
     typeof claude.defaultAgent === "boolean" && claude.defaultAgent && claudeEnabled ? "claude" :
@@ -702,6 +711,7 @@ function loadConfig(): AppConfig {
       model: normalizeOptionalConfigField(cccRaw.model, { label: "ccc.model", fallback: DEFAULT_CCC_MODEL }),
       alternativeModel: normalizeOptionalConfigField(cccRaw.alternativeModel, { label: "ccc.alternativeModel" }),
       effort: normalizeOptionalConfigField(cccRaw.effort, { label: "ccc.effort" }),
+      provider: normalizeCccProviderOverride(cccRaw.provider),
     },
   };
 }

package/src/session.ts

@@ -713,6 +713,8 @@ export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter
       baseURL: config.ccc.DEEPSEEK_BASE_URL,
       model: effectiveModel || undefined,
       effort: effectiveEffort || undefined,
+      // 留空（""）不传 → ChatSession 跟随 DeepCCC 内核配置（~/.deepccc/config.json 或 DEEPCCC_PROVIDER）
+      ...(config.ccc.provider ? { provider: config.ccc.provider } : {}),
     });
   } else {
     adapter = createClaudeAdapter({