chatccc 0.2.195 → 0.2.197

package/src/session.ts

@@ -2,9 +2,9 @@ import { readFile, writeFile, mkdir } from "node:fs/promises";
 import { dirname, join } from "node:path";
 
 import {
-  CLAUDE_API_KEY,
-  CLAUDE_BASE_URL,
-  CLAUDE_MAX_TURN,
+  CLAUDE_API_KEY,
+  CLAUDE_BASE_URL,
+  CLAUDE_MAX_TURN,
   CLAUDE_MODEL,
   CLAUDE_SUBAGENT_MODEL,
   CHATCCC_PORT,
@@ -14,23 +14,23 @@ import {
   addRecentDir,
   anthropicConfigDisplay,
   config,
-  fileLog,
-  getDefaultCwd,
-  getDefaultEffortForTool,
-  isAnthropicConfigEmpty,
-  toolDisplayName,
-  ts,
-} from "./config.ts";
+  fileLog,
+  getDefaultCwd,
+  getDefaultEffortForTool,
+  isAnthropicConfigEmpty,
+  toolDisplayName,
+  ts,
+} from "./config.ts";
 import { buildProgressCard, getToolEmoji, isCodeBlockOpen, 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";
 import type { ToolProcessInfo } from "./adapters/adapter-interface.ts";
-import { createClaudeAdapter } from "./adapters/claude-adapter.ts";
-import { createCursorAdapter } from "./adapters/cursor-adapter.ts";
-import { createCodexAdapter } from "./adapters/codex-adapter.ts";
-import { createCccAdapter } from "./adapters/ccc-adapter.ts";
+import { createClaudeAdapter } from "./adapters/claude-adapter.ts";
+import { createCursorAdapter } from "./adapters/cursor-adapter.ts";
+import { createCodexAdapter } from "./adapters/codex-adapter.ts";
+import { createCccAdapter } from "./adapters/ccc-adapter.ts";
 import { resourceMonitor, registerProcess, unregisterProcess } from "./adapters/resource-monitor.ts";
 import { buildImSkillsPromptCached, exportSkillSubDocs, clearImSkillsPromptCache } from "./im-skills.ts";
 import type { PlatformAdapter } from "./platform-adapter.ts";
@@ -334,14 +334,14 @@ export function resetState(): void {
   for (const prompt of activePrompts.values()) {
     if (prompt.processMonitor) clearInterval(prompt.processMonitor);
   }
-  activePrompts.clear();
-  displayCards.clear();
-  sessionModelOverrides.clear();
-  sessionEffortOverrides.clear();
-  adapterCache.clear();
-  stopUnifiedDisplayLoop();
-  console.log(`[${ts()}] [RESET] State cleared (dedup + active sessions + bindings)`);
-}
+  activePrompts.clear();
+  displayCards.clear();
+  sessionModelOverrides.clear();
+  sessionEffortOverrides.clear();
+  adapterCache.clear();
+  stopUnifiedDisplayLoop();
+  console.log(`[${ts()}] [RESET] State cleared (dedup + active sessions + bindings)`);
+}
 
 // 注:`rebuildBindingsFromRegistry` 定义在下方与 loadSessionRegistry 同区域,
 // 是 onReady/onReconnected 取代 resetState 的正确入口。
@@ -353,8 +353,8 @@ export function resetState(): void {
 const adapterCache = new Map<string, ToolAdapter>();
 
 // Per-session 模型覆盖（/model 命令设置，不持久化）
-const sessionModelOverrides = new Map<string, string>();
-const sessionEffortOverrides = new Map<string, string>();
+const sessionModelOverrides = new Map<string, string>();
+const sessionEffortOverrides = new Map<string, string>();
 
 /** 返回 session 的生效模型：优先 per-session 覆盖，其次全局配置（Claude） */
 function getModelForSession(sessionId?: string): string {
@@ -366,27 +366,27 @@ function getModelForSession(sessionId?: string): string {
 }
 
 /** 返回指定 tool 的生效模型：优先 per-session 覆盖，其次 tool 默认配置 */
-export function getEffectiveModelForTool(tool: string, sessionId?: string): string {
-  if (sessionId) {
-    const override = sessionModelOverrides.get(sessionId);
-    if (override) return override;
-  }
-  if (tool === "cursor") return config.cursor.model;
-  if (tool === "codex") return config.codex.model;
-  if (tool === "ccc") return config.ccc.model;
-  return CLAUDE_MODEL;
-}
-
-export function getEffectiveEffortForTool(tool: string, sessionId?: string): string {
-  if (sessionId) {
-    const override = sessionEffortOverrides.get(sessionId);
-    if (override) return override;
-  }
-  if (tool === "claude" || tool === "codex") {
-    return getDefaultEffortForTool(tool);
-  }
-  return "";
-}
+export function getEffectiveModelForTool(tool: string, sessionId?: string): string {
+  if (sessionId) {
+    const override = sessionModelOverrides.get(sessionId);
+    if (override) return override;
+  }
+  if (tool === "cursor") return config.cursor.model;
+  if (tool === "codex") return config.codex.model;
+  if (tool === "ccc") return config.ccc.model;
+  return CLAUDE_MODEL;
+}
+
+export function getEffectiveEffortForTool(tool: string, sessionId?: string): string {
+  if (sessionId) {
+    const override = sessionEffortOverrides.get(sessionId);
+    if (override) return override;
+  }
+  if (tool === "claude" || tool === "codex") {
+    return getDefaultEffortForTool(tool);
+  }
+  return "";
+}
 
 /** 为指定 session 设置模型覆盖（/model <name>） */
 export function setSessionModelOverride(sessionId: string, model: string): void {
@@ -395,43 +395,43 @@ export function setSessionModelOverride(sessionId: string, model: string): void
 }
 
 /** 清除指定 session 的模型覆盖（/model clear） */
-export function clearSessionModelOverride(sessionId: string): void {
-  sessionModelOverrides.delete(sessionId);
-  adapterCache.clear();
-}
-
-export function setSessionEffortOverride(sessionId: string, effort: string): void {
-  sessionEffortOverrides.set(sessionId, effort);
-  adapterCache.clear();
-}
-
-export function clearSessionEffortOverride(sessionId: string): void {
-  sessionEffortOverrides.delete(sessionId);
-  adapterCache.clear();
-}
-
-export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter {
-  const effectiveModel = getEffectiveModelForTool(tool, sessionId);
-  const effectiveEffort = getEffectiveEffortForTool(tool, sessionId);
-  const cacheKey = `${tool}:${effectiveModel || ""}:${effectiveEffort || ""}`;
-  const cached = adapterCache.get(cacheKey);
-  if (cached) return cached;
-
-  let adapter: ToolAdapter;
-  if (tool === "cursor") {
-    adapter = createCursorAdapter({ model: effectiveModel || undefined });
-  } else if (tool === "codex") {
-    adapter = createCodexAdapter({ model: effectiveModel || undefined, effort: effectiveEffort || undefined });
-  } else if (tool === "ccc") {
-    adapter = createCccAdapter({ model: effectiveModel || undefined });
-  } else {
-    adapter = createClaudeAdapter({
-      model: effectiveModel,
-      subagentModel: CLAUDE_SUBAGENT_MODEL,
-      effort: effectiveEffort,
-      apiKey: CLAUDE_API_KEY,
-      baseUrl: CLAUDE_BASE_URL,
-      isEmpty: isAnthropicConfigEmpty,
+export function clearSessionModelOverride(sessionId: string): void {
+  sessionModelOverrides.delete(sessionId);
+  adapterCache.clear();
+}
+
+export function setSessionEffortOverride(sessionId: string, effort: string): void {
+  sessionEffortOverrides.set(sessionId, effort);
+  adapterCache.clear();
+}
+
+export function clearSessionEffortOverride(sessionId: string): void {
+  sessionEffortOverrides.delete(sessionId);
+  adapterCache.clear();
+}
+
+export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter {
+  const effectiveModel = getEffectiveModelForTool(tool, sessionId);
+  const effectiveEffort = getEffectiveEffortForTool(tool, sessionId);
+  const cacheKey = `${tool}:${effectiveModel || ""}:${effectiveEffort || ""}`;
+  const cached = adapterCache.get(cacheKey);
+  if (cached) return cached;
+
+  let adapter: ToolAdapter;
+  if (tool === "cursor") {
+    adapter = createCursorAdapter({ model: effectiveModel || undefined });
+  } else if (tool === "codex") {
+    adapter = createCodexAdapter({ model: effectiveModel || undefined, effort: effectiveEffort || undefined });
+  } else if (tool === "ccc") {
+    adapter = createCccAdapter({ model: effectiveModel || undefined });
+  } else {
+    adapter = createClaudeAdapter({
+      model: effectiveModel,
+      subagentModel: CLAUDE_SUBAGENT_MODEL,
+      effort: effectiveEffort,
+      apiKey: CLAUDE_API_KEY,
+      baseUrl: CLAUDE_BASE_URL,
+      isEmpty: isAnthropicConfigEmpty,
       maxTurn: CLAUDE_MAX_TURN,
     });
   }
@@ -859,23 +859,23 @@ export async function switchChatBinding(args: SwitchChatBindingArgs): Promise<Sw
 function formatToolConfigForLog(tool: string, sessionModel?: string, sessionId?: string): string {
   if (tool === "cursor") {
     return `model=${sessionModel ?? "(由 cursor-agent 决定，init 事件后学习)"}`;
-  }
-  if (tool === "codex") {
-    const m = getEffectiveModelForTool(tool, sessionId);
-    const e = getEffectiveEffortForTool(tool, sessionId);
-    const modelStr = m.trim() !== "" ? m : "(由 codex config.toml 决定)";
-    const effortStr = e.trim() !== ""
-      ? `effort=${e}`
-      : "effort=(由 codex config.toml 决定)";
-    return `model=${modelStr}, ${effortStr}`;
-  }
-  if (tool === "ccc") {
-    const m = getEffectiveModelForTool(tool, sessionId);
-    const modelStr = m.trim() !== "" ? m : "(not configured)";
-    return `model=${modelStr}, baseURL=${config.ccc.DEEPSEEK_BASE_URL}`;
-  }
-  return `model=${anthropicConfigDisplay(getModelForSession(sessionId))}, subagentModel=${anthropicConfigDisplay(CLAUDE_SUBAGENT_MODEL)}, effort=${anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId))}`;
-}
+  }
+  if (tool === "codex") {
+    const m = getEffectiveModelForTool(tool, sessionId);
+    const e = getEffectiveEffortForTool(tool, sessionId);
+    const modelStr = m.trim() !== "" ? m : "(由 codex config.toml 决定)";
+    const effortStr = e.trim() !== ""
+      ? `effort=${e}`
+      : "effort=(由 codex config.toml 决定)";
+    return `model=${modelStr}, ${effortStr}`;
+  }
+  if (tool === "ccc") {
+    const m = getEffectiveModelForTool(tool, sessionId);
+    const modelStr = m.trim() !== "" ? m : "(not configured)";
+    return `model=${modelStr}, baseURL=${config.ccc.DEEPSEEK_BASE_URL}`;
+  }
+  return `model=${anthropicConfigDisplay(getModelForSession(sessionId))}, subagentModel=${anthropicConfigDisplay(CLAUDE_SUBAGENT_MODEL)}, effort=${anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId))}`;
+}
 
 export async function initClaudeSession(tool: string, overrideCwd?: string, chatId?: string): Promise<{ sessionId: string; cwd: string }> {
   const cwd = overrideCwd ?? (await getDefaultCwd(chatId));
@@ -990,12 +990,12 @@ export async function runAgentSession(
     const imSkillsCacheDir = join(USER_DATA_DIR, "im-skills");
     const skillVariables = {
       cwd,
-      session_id: sessionId,
-      im_skills_cache_dir: imSkillsCacheDir,
-      delegate_task_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/delegate-task`,
-      send_image_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/send-image`,
-      send_file_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/send-file`,
-      send_image_script: join(feishuSkillDir, "send-image.mjs"),
+      session_id: sessionId,
+      im_skills_cache_dir: imSkillsCacheDir,
+      delegate_task_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/delegate-task`,
+      send_image_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/send-image`,
+      send_file_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/send-file`,
+      send_image_script: join(feishuSkillDir, "send-image.mjs"),
       send_file_script: join(feishuSkillDir, "send-file.mjs"),
       download_video_script: join(feishuSkillDir, "download-video.mjs"),
       wechat_send_image_script: join(wechatImageSkillDir, "send-image.mjs"),
@@ -1171,6 +1171,7 @@ export async function runAgentSession(
   let lastFileWrite = Date.now();
   const FILE_WRITE_INTERVAL_MS = 2000;
   const toolCallMap = new Map<string, { name: string; input: unknown }>();
+  let streamErrored = false;
 
   try {
     for await (const unifiedMsg of adapter.prompt(sessionId, userTextWithCapabilities, cwd, controller.signal, {
@@ -1224,6 +1225,7 @@ export async function runAgentSession(
       }
     }
   } catch (streamErr) {
+    streamErrored = true;
     console.error(`[${ts()}] [STREAM] Error in stream loop for ${sessionId}: ${(streamErr as Error).message}`);
   } finally {
     // 标记 prompt 结束
@@ -1239,7 +1241,7 @@ export async function runAgentSession(
     // 读到新状态并终结旧卡片。否则 setImmediate 在 CHECK 阶段先于
     // writeFile I/O（POLL 阶段）执行，display loop 会误以为旧轮仍在
     // 运行中并更新旧卡片，而不是新建卡片。
-    const finalStatus = (wasAbnormalExit || wasResourceStuck) ? "error" : wasStopped ? "stopped" : "done";
+    const finalStatus = (streamErrored || wasAbnormalExit || wasResourceStuck) ? "error" : wasStopped ? "stopped" : "done";
     const finalReply = pickFinalReply(state).trim();
 
     // stop-stuck-loop 接口可能在 fire-and-forget 中已写入带 final_reply 的
@@ -1789,27 +1791,27 @@ async function resolveModelEffort(
       // adapter 异常时降级为占位符（不阻塞 /state 卡片）
     }
     return { model, effort: null };
-  }
-  if (tool === "codex") {
-    const m = getEffectiveModelForTool(tool, sessionId);
-    const e = getEffectiveEffortForTool(tool, sessionId);
-    return {
-      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
-      effort: e.trim() !== "" ? e : UNKNOWN_MODEL_PLACEHOLDER,
-    };
-  }
-  if (tool === "ccc") {
-    const m = getEffectiveModelForTool(tool, sessionId);
-    return {
-      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
-      effort: null,
-    };
-  }
-  return {
-    model: anthropicConfigDisplay(getModelForSession(sessionId)),
-    effort: anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId)),
-  };
-}
+  }
+  if (tool === "codex") {
+    const m = getEffectiveModelForTool(tool, sessionId);
+    const e = getEffectiveEffortForTool(tool, sessionId);
+    return {
+      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
+      effort: e.trim() !== "" ? e : UNKNOWN_MODEL_PLACEHOLDER,
+    };
+  }
+  if (tool === "ccc") {
+    const m = getEffectiveModelForTool(tool, sessionId);
+    return {
+      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
+      effort: null,
+    };
+  }
+  return {
+    model: anthropicConfigDisplay(getModelForSession(sessionId)),
+    effort: anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId)),
+  };
+}
 
 export async function getSessionStatus(chatId: string): Promise<SessionStatus | null> {
   const info = sessionInfoMap.get(chatId);
@@ -1915,9 +1917,9 @@ export function _setAdapterForToolForTest(tool: string, adapter: ToolAdapter): v
   adapterCache.set(tool, adapter);
   // 同时设置当前配置模型对应的 key（getAdapterForTool 会优先 lookup 含 model 的 key）
   const effective = getEffectiveModelForTool(tool);
-  const effort = getEffectiveEffortForTool(tool);
-  adapterCache.set(`${tool}:${effective || ""}:${effort || ""}`, adapter);
-  if (effective) adapterCache.set(`${tool}:${effective}`, adapter);
+  const effort = getEffectiveEffortForTool(tool);
+  adapterCache.set(`${tool}:${effective || ""}:${effort || ""}`, adapter);
+  if (effective) adapterCache.set(`${tool}:${effective}`, adapter);
 }
 
 export function clearAdapterCache(): void {