chatccc 0.2.55 → 0.2.57

package/src/adapters/claude-adapter.ts

@@ -53,6 +53,7 @@ interface SdkMessageLike {
 
 export interface ClaudeAdapterOptions {
   model: string;
+  subagentModel?: string;
   effort: string;
   /** 判断字段是否为"不传给 SDK"的占位（项目约定：空字符串/全空白） */
   isEmpty: (value: string) => boolean;
@@ -83,28 +84,35 @@ export interface ClaudeAdapterOptions {
 function buildSdkEnv(
   apiKey: string | undefined,
   baseUrl: string | undefined,
+  subagentModel: string | undefined,
 ): Record<string, string | undefined> | undefined {
-  const apiKeyTrim = (apiKey ?? "").trim();
-  const baseUrlTrim = (baseUrl ?? "").trim();
-  if (!apiKeyTrim && !baseUrlTrim) return undefined;
-
-  const env: Record<string, string | undefined> = { ...process.env };
-  // ChatCCC's Claude API config is authoritative when present. Remove Claude
-  // Code/user settings env that can silently override gateway/auth/model choice.
-  delete env.ANTHROPIC_AUTH_TOKEN;
-  delete env.CLAUDE_CODE_OAUTH_TOKEN;
-  delete env.ANTHROPIC_MODEL;
-  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
-  delete env.CLAUDE_CODE_EFFORT_LEVEL;
-
-  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
-  if (baseUrlTrim) env.ANTHROPIC_BASE_URL = baseUrlTrim;
-  else delete env.ANTHROPIC_BASE_URL;
-  return env;
-}
+  const apiKeyTrim = (apiKey ?? "").trim();
+  const baseUrlTrim = (baseUrl ?? "").trim();
+  const subagentModelTrim = (subagentModel ?? "").trim();
+  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
+  if (!hasApiOverride) return undefined;
+
+  const env: Record<string, string | undefined> = { ...process.env };
+  // ChatCCC's third-party Claude API config is authoritative when present.
+  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
+  delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.CLAUDE_CODE_OAUTH_TOKEN;
+  delete env.ANTHROPIC_MODEL;
+  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
+  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
+  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+  delete env.CLAUDE_CODE_EFFORT_LEVEL;
+
+  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
+  if (baseUrlTrim) {
+    env.ANTHROPIC_BASE_URL = baseUrlTrim;
+  } else {
+    delete env.ANTHROPIC_BASE_URL;
+  }
+  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
+  return env;
+}
 
 function resolveSettingSources(
   _apiKey: string | undefined,
@@ -126,6 +134,7 @@ function buildSessionOptions(
   isEmpty: (value: string) => boolean,
   apiKey: string | undefined,
   baseUrl: string | undefined,
+  subagentModel: string | undefined,
 ): Record<string, unknown> {
   const o: Record<string, unknown> = {
     cwd,
@@ -136,7 +145,7 @@ function buildSessionOptions(
   };
   if (!isEmpty(model)) o.model = model;
   if (!isEmpty(effort)) o.effort = effort;
-  const env = buildSdkEnv(apiKey, baseUrl);
+  const env = buildSdkEnv(apiKey, baseUrl, subagentModel);
   if (env) o.env = env;
   return o;
 }
@@ -213,6 +222,7 @@ class ClaudeAdapter implements ToolAdapter {
   readonly sessionDescPrefix = "Claude Code Session:";
   private model: string;
   private effort: string;
+  private subagentModel: string | undefined;
   private isEmpty: (value: string) => boolean;
   private apiKey: string | undefined;
   private baseUrl: string | undefined;
@@ -220,6 +230,7 @@ class ClaudeAdapter implements ToolAdapter {
   constructor(options: ClaudeAdapterOptions) {
     this.model = options.model;
     this.effort = options.effort;
+    this.subagentModel = options.subagentModel;
     this.isEmpty = options.isEmpty;
     this.apiKey = options.apiKey;
     this.baseUrl = options.baseUrl;
@@ -233,6 +244,7 @@ class ClaudeAdapter implements ToolAdapter {
       this.isEmpty,
       this.apiKey,
       this.baseUrl,
+      this.subagentModel,
     );
     const session = unstable_v2_createSession(sessionOpts as any);
 
@@ -277,13 +289,21 @@ class ClaudeAdapter implements ToolAdapter {
       this.isEmpty,
       this.apiKey,
       this.baseUrl,
+      this.subagentModel,
     );
-    const session = unstable_v2_resumeSession(
-      sessionId,
-      sessionOpts as any,
-    );
-
-    await session.send(userText);
+    const session = unstable_v2_resumeSession(
+      sessionId,
+      sessionOpts as any,
+    );
+
+    if (signal?.aborted) {
+      session.close();
+      return;
+    }
+    const onAbort = () => { session.close(); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+
+    await session.send(userText);
 
     const stream = session.stream();
 
@@ -296,6 +316,7 @@ class ClaudeAdapter implements ToolAdapter {
         if (normalized) yield normalized;
       }
     } finally {
+      signal?.removeEventListener("abort", onAbort);
       session.close();
     }
   }

package/src/adapters/codex-adapter.ts

@@ -242,6 +242,9 @@ class CodexAdapter implements ToolAdapter {
 
     const proc = spawnCodex(args, cwd, userText);
 
+    const onAbort = () => { proc.kill(); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+
     try {
       for await (const raw of readJsonLines(proc, signal)) {
         if (signal?.aborted) break;
@@ -261,6 +264,7 @@ class CodexAdapter implements ToolAdapter {
         if (normalized) yield normalized;
       }
     } finally {
+      signal?.removeEventListener("abort", onAbort);
       proc.kill();
     }
   }

package/src/adapters/cursor-adapter.ts

@@ -346,6 +346,9 @@ class CursorAdapter implements ToolAdapter {
     const proc = spawnAgent(["--resume", sessionId], cwd, userText);
     this.activeProcs.add(proc);
 
+    const onAbort = () => { proc.kill(); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+
     try {
       for await (const raw of readJsonLines(proc, signal)) {
         if (signal?.aborted) break;
@@ -367,6 +370,7 @@ class CursorAdapter implements ToolAdapter {
         if (normalized) yield normalized;
       }
     } finally {
+      signal?.removeEventListener("abort", onAbort);
       proc.kill();
       this.activeProcs.delete(proc);
     }

package/src/config.ts

@@ -63,6 +63,7 @@ export interface ClaudeConfig {
   /** 是否作为 /new 未指定工具时使用的默认 Agent */
   defaultAgent: boolean;
   model: string;
+  subagentModel: string;
   effort: string;
   apiKey: string;
   baseUrl: string;
@@ -302,7 +303,7 @@ function loadConfig(): AppConfig {
     port: 18080,
     gitTimeoutSeconds: 180,
     allowInterrupt: false,
-    claude: { enabled: false, defaultAgent: true, model: "", effort: "", apiKey: "", baseUrl: "" },
+    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "" },
     cursor: { enabled: false, defaultAgent: false, path: "", model: "claude-opus-4-7-max" },
     codex: { enabled: false, defaultAgent: false, path: "", model: "", effort: "" },
   };
@@ -336,6 +337,9 @@ function loadConfig(): AppConfig {
   let raw: string;
   try {
     raw = readFileSync(CONFIG_FILE, "utf-8");
+    // 移除可能意外写入的 UTF-8 BOM（如通过记事本编辑等场景），
+    // 避免 JSON.parse 因 BOM 失败导致返回空默认值、丢失所有配置。
+    if (raw.charCodeAt(0) === 0xfeff) raw = raw.slice(1);
   } catch (err) {
     console.error(`[CONFIG] 无法读取 config.json: ${(err as Error).message}`);
     return defaults;
@@ -378,6 +382,7 @@ function loadConfig(): AppConfig {
   const claudeNonEmpty = (): boolean =>
     Boolean(
       (typeof claude.model === "string" && claude.model.trim()) ||
+      (typeof claude.subagentModel === "string" && claude.subagentModel.trim()) ||
       (typeof claude.effort === "string" && claude.effort.trim()) ||
       (typeof claude.apiKey === "string" && claude.apiKey.trim()) ||
       (typeof claude.baseUrl === "string" && claude.baseUrl.trim()),
@@ -438,6 +443,7 @@ function loadConfig(): AppConfig {
       enabled: claudeEnabled,
       defaultAgent: defaultTool === "claude",
       model: normalizeOptionalConfigField(claude.model, { label: "claude.model" }),
+      subagentModel: normalizeOptionalConfigField(claude.subagentModel, { label: "claude.subagentModel" }),
       effort: normalizeOptionalConfigField(claude.effort, { label: "claude.effort" }),
       apiKey: claude.apiKey ?? "",
       baseUrl: claude.baseUrl ?? "",
@@ -498,6 +504,7 @@ export const CHATCCC_PORT = config.port;
 export const LOCAL_RELAY_URL = `ws://127.0.0.1:${CHATCCC_PORT}`;
 
 export let CLAUDE_MODEL = config.claude.model;
+export let CLAUDE_SUBAGENT_MODEL = config.claude.subagentModel;
 export let CLAUDE_EFFORT = config.claude.effort;
 /** Anthropic 兼容网关的 API key（仅经 SDK 子进程 env 传递，从不写入主进程 process.env） */
 export let CLAUDE_API_KEY = config.claude.apiKey;
@@ -573,6 +580,7 @@ export function applyLoadedConfig(next: AppConfig): void {
   ILINK_ENABLED = next.platforms.ilink.enabled;
   ILINK_REUSE_TOKEN_ON_START = next.platforms.ilink.reuseTokenOnStart ?? true;
   CLAUDE_MODEL = next.claude.model;
+  CLAUDE_SUBAGENT_MODEL = next.claude.subagentModel;
   CLAUDE_EFFORT = next.claude.effort;
   CLAUDE_API_KEY = next.claude.apiKey;
   CLAUDE_BASE_URL = next.claude.baseUrl;
@@ -705,6 +713,11 @@ export function reportEnvironmentVariableReadout(): void {
     `         Claude 模型: ${anthropicConfigDisplay(CLAUDE_MODEL)}（留空时不向 SDK 传 model）`
   );
 
+  console.log(`  [默认] [可选] claude.subagentModel`);
+  console.log(
+    `         Claude Subagent 模型: ${anthropicConfigDisplay(CLAUDE_SUBAGENT_MODEL)}（留空时不向 SDK 传 CLAUDE_CODE_SUBAGENT_MODEL）`
+  );
+
   console.log(`  [默认] [可选] claude.effort`);
   console.log(
     `         思考深度: ${anthropicConfigDisplay(CLAUDE_EFFORT)}（留空时不向 SDK 传 effort）`

package/src/index.ts

@@ -84,8 +84,9 @@ import {
   updateCardKitCard,
 } from "./cardkit.ts";
 import {
-  MAX_PROCESSED,
-  loadSessionRegistryForBinding,
+  MAX_PROCESSED,
+  clearAdapterCache,
+  loadSessionRegistryForBinding,
   processedMessages,
   rebuildBindingsFromRegistry,
   resetState,
@@ -743,11 +744,12 @@ async function main(): Promise<void> {
   // "保存并启动" 时，web-ui 会调用本回调，把磁盘上刚保存的 config.json
   // 刷进进程内的 export let 常量（live binding 让 CLAUDE_MODEL 等下次创建
   // 会话时自动看到新值）。setup 首次激活走 onActivate 路径，不依赖此 hook。
-  setReloadConfigHook(() => {
-    reloadConfigFromDisk();
-    appendStartupTrace("reload-from-ui: config reloaded", {
-      appIdMask: maskAppId(APP_ID),
-    });
+  setReloadConfigHook(() => {
+    reloadConfigFromDisk();
+    clearAdapterCache();
+    appendStartupTrace("reload-from-ui: config reloaded", {
+      appIdMask: maskAppId(APP_ID),
+    });
   });
   setExtraApiHandler(async (req, res) => {
     return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res));
@@ -767,11 +769,12 @@ async function main(): Promise<void> {
       // 凭证不全：进 setup 向导。注入 onActivate 回调让用户点"保存并启动"
       // 时，原地（同进程）调用 startBotService，复用 setup HTTP server。
       startSetupMode(CHATCCC_PORT, {
-        onActivate: async (httpServer: Server) => {
-          reloadConfigFromDisk();
-          appendStartupTrace("setup-activate: reloaded config from disk", {
-            appIdMaskAfterReload: maskAppId(APP_ID),
-          });
+        onActivate: async (httpServer: Server) => {
+          reloadConfigFromDisk();
+          clearAdapterCache();
+          appendStartupTrace("setup-activate: reloaded config from disk", {
+            appIdMaskAfterReload: maskAppId(APP_ID),
+          });
           try {
             await startBotService({ httpServer, port: CHATCCC_PORT });
             installShutdownHandlers(httpServer);

package/src/privacy.ts

@@ -1,68 +1,68 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { USER_DATA_DIR } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// 隐私替换规则
-// ---------------------------------------------------------------------------
-
-interface PrivacyRules {
-  [key: string]: string;
-}
-
-let rules: PrivacyRules | null = null;
-let loaded = false;
-
-function loadRules(): PrivacyRules {
-  const filePath = join(USER_DATA_DIR, "privacy.json");
-  if (!existsSync(filePath)) {
-    return {};
-  }
-  try {
-    const raw = readFileSync(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error(`[PRIVACY] privacy.json 格式错误：应为对象`);
-      return {};
-    }
-    for (const [k, v] of Object.entries(parsed)) {
-      if (typeof v !== "string") {
-        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
-        delete (parsed as Record<string, unknown>)[k];
-      }
-    }
-    return parsed as PrivacyRules;
-  } catch (err) {
-    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
-    return {};
-  }
-}
-
-export function getPrivacyRules(): PrivacyRules {
-  if (!loaded) {
-    rules = loadRules();
-    loaded = true;
-  }
-  return rules!;
-}
-
-/** 重新加载规则（热更新用） */
-export function reloadPrivacyRules(): void {
-  loaded = false;
-  rules = null;
-}
-
-/**
- * 对文本应用隐私替换规则。
- * 若无规则或文本为空，直接返回原文。
- */
-export function applyPrivacy(text: string): string {
-  const r = getPrivacyRules();
-  if (Object.keys(r).length === 0 || !text) return text;
-  let result = text;
-  for (const [from, to] of Object.entries(r)) {
-    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
-    result = result.split(from).join(to);
-  }
-  return result;
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { USER_DATA_DIR } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// 隐私替换规则
+// ---------------------------------------------------------------------------
+
+interface PrivacyRules {
+  [key: string]: string;
+}
+
+let rules: PrivacyRules | null = null;
+let loaded = false;
+
+function loadRules(): PrivacyRules {
+  const filePath = join(USER_DATA_DIR, "privacy.json");
+  if (!existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error(`[PRIVACY] privacy.json 格式错误：应为对象`);
+      return {};
+    }
+    for (const [k, v] of Object.entries(parsed)) {
+      if (typeof v !== "string") {
+        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
+        delete (parsed as Record<string, unknown>)[k];
+      }
+    }
+    return parsed as PrivacyRules;
+  } catch (err) {
+    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
+    return {};
+  }
+}
+
+export function getPrivacyRules(): PrivacyRules {
+  if (!loaded) {
+    rules = loadRules();
+    loaded = true;
+  }
+  return rules!;
+}
+
+/** 重新加载规则（热更新用） */
+export function reloadPrivacyRules(): void {
+  loaded = false;
+  rules = null;
+}
+
+/**
+ * 对文本应用隐私替换规则。
+ * 若无规则或文本为空，直接返回原文。
+ */
+export function applyPrivacy(text: string): string {
+  const r = getPrivacyRules();
+  if (Object.keys(r).length === 0 || !text) return text;
+  let result = text;
+  for (const [from, to] of Object.entries(r)) {
+    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
+    result = result.split(from).join(to);
+  }
+  return result;
 }

package/src/session.ts

@@ -6,6 +6,7 @@ import {
   CLAUDE_BASE_URL,
   CLAUDE_EFFORT,
   CLAUDE_MODEL,
+  CLAUDE_SUBAGENT_MODEL,
   CHATCCC_PORT,
   PROJECT_ROOT,
   SESSIONS_FILE,
@@ -172,6 +173,7 @@ export function getAdapterForTool(tool: string): ToolAdapter {
   } else {
     adapter = createClaudeAdapter({
       model: CLAUDE_MODEL,
+      subagentModel: CLAUDE_SUBAGENT_MODEL,
       effort: CLAUDE_EFFORT,
       isEmpty: isAnthropicConfigEmpty,
       apiKey: CLAUDE_API_KEY,
@@ -391,7 +393,8 @@ export function accumulateBlockContent(
   switch (block.type) {
     case "thinking":
       state.chunkCount++;
-      state.accumulatedContent += block.thinking;
+      // 用引用块标记思考内容（中文无法斜体，引用块有视觉区分）
+      state.accumulatedContent += `\n> ${block.thinking.replace(/\n/g, "\n> ")}\n`;
       break;
     case "tool_use": {
       // 记录 tool_use 信息供后续 tool_result 使用
@@ -606,7 +609,7 @@ function formatToolConfigForLog(tool: string, sessionModel?: string): string {
       : "effort=(由 codex config.toml 决定)";
     return `model=${modelStr}, ${effortStr}`;
   }
-  return `model=${anthropicConfigDisplay(CLAUDE_MODEL)}, effort=${anthropicConfigDisplay(CLAUDE_EFFORT)}`;
+  return `model=${anthropicConfigDisplay(CLAUDE_MODEL)}, subagentModel=${anthropicConfigDisplay(CLAUDE_SUBAGENT_MODEL)}, effort=${anthropicConfigDisplay(CLAUDE_EFFORT)}`;
 }
 
 export async function initClaudeSession(tool: string, overrideCwd?: string, chatId?: string): Promise<{ sessionId: string; cwd: string }> {
@@ -1322,6 +1325,10 @@ export function _setAdapterForToolForTest(tool: string, adapter: ToolAdapter): v
   adapterCache.set(tool, adapter);
 }
 
-export function _clearAdapterCacheForTest(): void {
+export function clearAdapterCache(): void {
   adapterCache.clear();
 }
+
+export function _clearAdapterCacheForTest(): void {
+  clearAdapterCache();
+}