chatccc 0.2.54 → 0.2.56

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,14 +84,17 @@ 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 subagentModelTrim = (subagentModel ?? "").trim();
+  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
+  if (!hasApiOverride) 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.
+  // 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;
@@ -101,8 +105,12 @@ function buildSdkEnv(
   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 (baseUrlTrim) {
+    env.ANTHROPIC_BASE_URL = baseUrlTrim;
+  } else {
+    delete env.ANTHROPIC_BASE_URL;
+  }
+  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
   return env;
 }
 
@@ -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;
 }
@@ -158,6 +167,7 @@ export function normalizeSdkMessage(msg: SdkMessageLike): UnifiedStreamMessage |
       } else if (block.type === "tool_use") {
         blocks.push({
           type: "tool_use",
+          id: (block as { id?: string }).id,
           name: block.name ?? "unknown",
           input: block.input,
         });
@@ -212,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;
@@ -219,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;
@@ -232,6 +244,7 @@ class ClaudeAdapter implements ToolAdapter {
       this.isEmpty,
       this.apiKey,
       this.baseUrl,
+      this.subagentModel,
     );
     const session = unstable_v2_createSession(sessionOpts as any);
 
@@ -276,12 +289,20 @@ class ClaudeAdapter implements ToolAdapter {
       this.isEmpty,
       this.apiKey,
       this.baseUrl,
+      this.subagentModel,
     );
     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();
@@ -295,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

@@ -117,6 +117,7 @@ export function normalizeCursorMessage(
       } else if (block.type === "tool_use") {
         blocks.push({
           type: "tool_use",
+          id: block.tool_use_id,
           name: block.name ?? "unknown",
           input: block.input,
         });
@@ -345,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;
@@ -366,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

@@ -85,6 +85,7 @@ import {
 } from "./cardkit.ts";
 import {
   MAX_PROCESSED,
+  clearAdapterCache,
   loadSessionRegistryForBinding,
   processedMessages,
   rebuildBindingsFromRegistry,
@@ -745,6 +746,7 @@ async function main(): Promise<void> {
   // 会话时自动看到新值）。setup 首次激活走 onActivate 路径，不依赖此 hook。
   setReloadConfigHook(() => {
     reloadConfigFromDisk();
+    clearAdapterCache();
     appendStartupTrace("reload-from-ui: config reloaded", {
       appIdMask: maskAppId(APP_ID),
     });
@@ -769,6 +771,7 @@ async function main(): Promise<void> {
       startSetupMode(CHATCCC_PORT, {
         onActivate: async (httpServer: Server) => {
           reloadConfigFromDisk();
+          clearAdapterCache();
           appendStartupTrace("setup-activate: reloaded config from disk", {
             appIdMaskAfterReload: maskAppId(APP_ID),
           });

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,
@@ -20,6 +21,7 @@ import {
   ts,
 } from "./config.ts";
 import { buildProgressCard, getToolEmoji, truncateContent } from "./cards.ts";
+import { simplifyToolUse, simplifyToolResult } from "./simplify.ts";
 import { logTrace } from "./trace.ts";
 import type { UnifiedBlock } from "./adapters/adapter-interface.ts";
 import type { ToolAdapter } from "./adapters/adapter-interface.ts";
@@ -171,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,
@@ -385,6 +388,7 @@ export function pickFinalReply(state: AccumulatorState): string {
 export function accumulateBlockContent(
   block: UnifiedBlock,
   state: AccumulatorState,
+  toolCallMap?: Map<string, { name: string; input: unknown }>,
 ): void {
   switch (block.type) {
     case "thinking":
@@ -392,35 +396,55 @@ export function accumulateBlockContent(
       state.accumulatedContent += block.thinking;
       break;
     case "tool_use": {
-      const inputStr =
-        typeof block.input === "object"
-          ? JSON.stringify(block.input)
-          : String(block.input ?? "");
-      const shortInput =
-        inputStr.length > 300 ? inputStr.slice(0, 300) + "..." : inputStr;
-      state.accumulatedContent +=
-        `\n\n${getToolEmoji(block.name)} **${block.name}**\n\`${shortInput}\`\n`;
+      // 记录 tool_use 信息供后续 tool_result 使用
+      if (toolCallMap && block.id) {
+        toolCallMap.set(block.id, { name: block.name, input: block.input });
+      }
+      const simplified = simplifyToolUse(block.name, block.input);
+      if (simplified !== null) {
+        state.accumulatedContent += `\n\n${simplified}\n`;
+      } else {
+        const inputStr =
+          typeof block.input === "object"
+            ? JSON.stringify(block.input)
+            : String(block.input ?? "");
+        const shortInput =
+          inputStr.length > 300 ? inputStr.slice(0, 300) + "..." : inputStr;
+        state.accumulatedContent +=
+          `\n\n${getToolEmoji(block.name)} **${block.name}**\n\`${shortInput}\`\n`;
+      }
       break;
     }
     case "tool_result": {
       const toolUseId = block.tool_use_id;
-      const resultContent = block.content;
-      let resultStr = "";
-      if (typeof resultContent === "string") {
-        resultStr = resultContent;
-      } else if (Array.isArray(resultContent)) {
-        resultStr = resultContent
-          .map((c: { type?: string; text?: string }) => c.text ?? "")
-          .join("");
-      } else if (resultContent) {
-        resultStr = JSON.stringify(resultContent);
-      }
-      const shortResult =
-        resultStr.length > 200 ? resultStr.slice(0, 200) + "..." : resultStr;
       const isError = block.is_error;
-      const icon = isError ? "❌" : "✅"; // ❌ : ✅
-      state.accumulatedContent +=
-        `${icon} *${toolUseId.slice(-6)}*: ${shortResult}\n`;
+      // 查找对应的 tool_use 以获取工具名和输入
+      const toolCall = toolCallMap?.get(toolUseId);
+      const toolName = toolCall?.name;
+      const toolInput = toolCall?.input;
+      const simplified = toolName
+        ? simplifyToolResult(toolName, toolUseId, !!isError, toolInput)
+        : null;
+      if (simplified !== null) {
+        state.accumulatedContent += `${simplified}\n`;
+      } else {
+        const resultContent = block.content;
+        let resultStr = "";
+        if (typeof resultContent === "string") {
+          resultStr = resultContent;
+        } else if (Array.isArray(resultContent)) {
+          resultStr = resultContent
+            .map((c: { type?: string; text?: string }) => c.text ?? "")
+            .join("");
+        } else if (resultContent) {
+          resultStr = JSON.stringify(resultContent);
+        }
+        const shortResult =
+          resultStr.length > 200 ? resultStr.slice(0, 200) + "..." : resultStr;
+        const icon = isError ? "❌" : "✅"; // ❌ : ✅
+        state.accumulatedContent +=
+          `${icon} *${toolUseId.slice(-6)}*: ${shortResult}\n`;
+      }
       break;
     }
     case "redacted_thinking":
@@ -584,7 +608,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 }> {
@@ -756,11 +780,12 @@ export async function runAgentSession(
 
   let lastFileWrite = Date.now();
   const FILE_WRITE_INTERVAL_MS = 2000;
+  const toolCallMap = new Map<string, { name: string; input: unknown }>();
 
   try {
     for await (const unifiedMsg of adapter.prompt(sessionId, userTextWithCapabilities, cwd, controller.signal)) {
       for (const block of unifiedMsg.blocks) {
-        accumulateBlockContent(block, state);
+        accumulateBlockContent(block, state, toolCallMap);
 
         if (block.type === "compact_boundary" && block.post_tokens) {
           for (const cid of getChatsForSession(sessionId)) {
@@ -1299,6 +1324,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();
+}

package/src/simplify.ts

@@ -0,0 +1,120 @@
+import { existsSync, readFileSync } from "node:fs";
+import { resolve as resolvePath } from "node:path";
+import { PROJECT_ROOT } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// 消息简化规则 —— 数据驱动，在 simplify.json 中配置
+// ---------------------------------------------------------------------------
+
+interface ToolRule {
+  template: string;
+  maxLength: number;
+}
+
+interface SimplifyConfig {
+  tool_use?: Record<string, ToolRule>;
+  tool_result?: Record<string, ToolRule>;
+}
+
+let config: SimplifyConfig | null = null;
+let loaded = false;
+
+function loadConfig(): SimplifyConfig {
+  const filePath = resolvePath(PROJECT_ROOT, "simplify.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("[SIMPLIFY] simplify.json 格式错误：应为对象");
+      return {};
+    }
+    return parsed as SimplifyConfig;
+  } catch (err) {
+    console.error(`[SIMPLIFY] 读取 simplify.json 失败: ${(err as Error).message}`);
+    return {};
+  }
+}
+
+function getConfig(): SimplifyConfig {
+  if (!loaded) {
+    config = loadConfig();
+    loaded = true;
+  }
+  return config!;
+}
+
+/** 热重载 */
+export function reloadSimplifyConfig(): void {
+  loaded = false;
+  config = null;
+}
+
+/**
+ * 对模板字符串中的 {field} 占位符做替换。
+ * fields 为可用字段映射，extra 是额外的上下文（如 tool_use_id 的 id）。
+ */
+function resolveTemplate(template: string, fields: Record<string, unknown>, extra?: Record<string, string>): string {
+  let result = template;
+  if (extra) {
+    for (const [k, v] of Object.entries(extra)) {
+      result = result.split(`{${k}}`).join(v);
+    }
+  }
+  for (const [k, v] of Object.entries(fields)) {
+    const strVal = typeof v === "string" ? v : JSON.stringify(v);
+    result = result.split(`{${k}}`).join(strVal);
+  }
+  return result;
+}
+
+/**
+ * 简化 tool_use 展示。
+ * 返回 null 表示无规则，调用方应回退到默认格式化。
+ */
+export function simplifyToolUse(name: string, input: unknown): string | null {
+  const cfg = getConfig();
+  const rules = cfg.tool_use;
+  if (!rules) return null;
+  const rule = rules[name];
+  if (!rule) return null;
+
+  const fields = typeof input === "object" && input !== null
+    ? input as Record<string, unknown>
+    : {};
+  let result = resolveTemplate(rule.template, fields);
+  if (result.length > rule.maxLength) {
+    result = result.slice(0, rule.maxLength) + "...";
+  }
+  return result;
+}
+
+/**
+ * 简化 tool_result 展示。
+ * 返回 null 表示无规则，调用方应回退到默认格式化。
+ * toolCallInput 为对应的 tool_use 输入（可选），用于在 result 模板中引用输入字段。
+ */
+export function simplifyToolResult(
+  name: string,
+  toolUseId: string,
+  isError: boolean,
+  toolCallInput?: unknown,
+): string | null {
+  const cfg = getConfig();
+  const rules = cfg.tool_result;
+  if (!rules) return null;
+  const rule = rules[name];
+  if (!rule) return null;
+
+  const id = toolUseId.slice(-6);
+  const extra = { id };
+  const fields = toolCallInput && typeof toolCallInput === "object"
+    ? toolCallInput as Record<string, unknown>
+    : {};
+  let result = resolveTemplate(rule.template, fields, extra);
+  if (isError) result = "❌ " + result;
+  if (result.length > rule.maxLength) {
+    result = result.slice(0, rule.maxLength) + "...";
+  }
+  return result;
+}