chatccc 0.2.245 → 0.2.247

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),
     },
   };
 }