imtoagent 0.2.0

package/modules/agent/claude-adapter.ts

@@ -0,0 +1,258 @@
+// ================================================================
+// Claude Agent SDK Adapter — 实现 SDK AgentAdapter 接口
+// ================================================================
+// 职责：对接 Claude Agent SDK，将 AgentInput 转换为 AgentOutput
+// 不负责：session 管理、统计、格式化、错误处理（由 SDK Runtime 接管）
+// ================================================================
+
+import { query } from '@anthropic-ai/claude-agent-sdk';
+import type { SDKMessage } from '@anthropic-ai/claude-agent-sdk';
+import type { AgentAdapter, AgentInput, AgentOutput, Session } from '../core/types';
+import { buildAttachmentHint } from '../core/types';
+import { buildSystemPrompt } from '../prompt-builder';
+
+// ================================================================
+// ClaudeAdapter 上下文
+// ================================================================
+
+export interface ClaudeAdapterContext {
+  /** 用于构建 system prompt（IM 能力 + bot 名 + soul） */
+  imModule?: { getCapabilities(): any } | null;
+  botName: string;
+  /** 模型别名映射（sonnet/opus/haiku → 实际供应商/模型） */
+  modelAliases: Record<string, string>;
+}
+
+// ================================================================
+// 工具函数
+// ================================================================
+
+function resolveAlias(modelSpec: string): string {
+  const i = modelSpec.indexOf('/');
+  return i >= 0 ? modelSpec.slice(i + 1) : modelSpec;
+}
+
+function extractText(msg: SDKMessage): string | null {
+  if (msg.type !== 'assistant') return null;
+  const content = (msg as any).message?.content;
+  if (!Array.isArray(content)) return null;
+  return content.filter((b: any) => b.type === 'text').map((b: any) => b.text).join('') || null;
+}
+
+function extractToolCalls(msg: SDKMessage): Array<{ name: string; summary: string }> {
+  if (msg.type !== 'assistant') return [];
+  const content = (msg as any).message?.content;
+  if (!Array.isArray(content)) return [];
+  const results: Array<{ name: string; summary: string }> = [];
+  for (const block of content) {
+    if (block.type === 'tool_use' && block.name) {
+      const input = block.input || {};
+      let summary = '';
+      if (['Read', 'Edit', 'Write'].includes(block.name) && input.file_path) {
+        const p = String(input.file_path);
+        summary = p.includes('/') ? p.split('/').pop()! : p;
+      } else if (block.name === 'Bash' && input.command) {
+        summary = String(input.command).trim().slice(0, 60);
+      }
+      results.push({ name: block.name, summary });
+    }
+  }
+  return results;
+}
+
+// ================================================================
+// ClaudeAdapter — 实现 AgentAdapter
+// ================================================================
+
+export class ClaudeAdapter implements AgentAdapter {
+  readonly name = 'Claude Agent SDK';
+  private ctx: ClaudeAdapterContext;
+  private activeControllers: AbortController[] = [];
+  /** 单次调用最大超时（毫秒），0 = 不限制 */
+  static MAX_CALL_TIMEOUT_MS = 5 * 60 * 1000; // 5 分钟
+
+  constructor(ctx: ClaudeAdapterContext) {
+    this.ctx = ctx;
+  }
+
+  /**
+   * 清理所有活跃的子进程和请求。
+   * 在 gracefulShutdown 时由 index.ts 调用。
+   */
+  cleanup(): void {
+    const count = this.activeControllers.length;
+    if (count > 0) {
+      console.log(`[ClaudeAdapter] cleanup: aborting ${count} active request(s)`);
+      for (const ctrl of this.activeControllers) {
+        try { ctrl.abort(); } catch {}
+      }
+      this.activeControllers = [];
+    }
+  }
+
+  /**
+   * 处理单条用户消息
+   * 
+   * 接收 AgentInput，调用 Claude SDK，返回 AgentOutput
+   * Session 管理、统计、格式化由 SDK Runtime 负责
+   */
+  async handleMessage(input: AgentInput): Promise<AgentOutput> {
+    const { text, session, workingDir, model, systemPrompt: overrideSystemPrompt } = input;
+    const sessionAny = session as any; // 向后兼容：访问旧字段
+
+    // 创建 AbortController 并注册（用于超时 + shutdown 清理）
+    const abortCtrl = new AbortController();
+    this.activeControllers.push(abortCtrl);
+
+    // 确定模型名
+    const modelName = model.includes('/') ? model.slice(model.indexOf('/') + 1) : model;
+    const aliases = this.ctx.modelAliases;
+
+    // 附件信息注入：让 Agent 知道用户发送了附件（图片/文件/语音）及本地路径
+    let effectiveText = text;
+    if (input.attachments && input.attachments.length > 0) {
+      effectiveText = buildAttachmentHint(input.attachments) + '\n\n---\n\n' + effectiveText;
+    }
+
+    // Claude SDK 环境变量（走本地 :18899 代理）
+    const customEnv: Record<string, string> = {
+      ...process.env,
+      ANTHROPIC_BASE_URL: 'http://localhost:18899',
+      ANTHROPIC_API_KEY: '',
+      ANTHROPIC_AUTH_TOKEN: '',
+      ANTHROPIC_MODEL: '',
+      ANTHROPIC_DEFAULT_SONNET_MODEL: resolveAlias(aliases.sonnet || ''),
+      ANTHROPIC_DEFAULT_OPUS_MODEL: resolveAlias(aliases.opus || ''),
+      ANTHROPIC_DEFAULT_HAIKU_MODEL: resolveAlias(aliases.haiku || ''),
+    };
+
+    // 构建查询选项
+    const queryOptions: any = {
+      cwd: workingDir,
+      maxTurns: 50,
+      model: modelName,
+      permissionMode: sessionAny.permissionMode || 'bypassPermissions',
+      persistSession: true,
+      abortController: abortCtrl,
+    };
+
+    // 超时保护：防止 Claude CLI 子进程无限运行
+    let timeoutId: ReturnType<typeof setTimeout> | null = null;
+    if (ClaudeAdapter.MAX_CALL_TIMEOUT_MS > 0) {
+      timeoutId = setTimeout(() => {
+        console.log(`[ClaudeAdapter] ⏰ 超时 (${ClaudeAdapter.MAX_CALL_TIMEOUT_MS / 1000}s)，中止请求`);
+        abortCtrl.abort();
+      }, ClaudeAdapter.MAX_CALL_TIMEOUT_MS);
+    }
+
+    // System Prompt（优先使用传入的，否则自行构建）
+    if (overrideSystemPrompt) {
+      queryOptions.systemPrompt = overrideSystemPrompt;
+    } else {
+      queryOptions.systemPrompt = buildSystemPrompt({
+        imModule: this.ctx.imModule || null,
+        botName: this.ctx.botName,
+      });
+    }
+
+    // 恢复/创建 SDK 会话 ID
+    const shouldClear = session.startFresh;
+    session.startFresh = false;
+    const sdkSessionId = shouldClear ? undefined : (session.metadata?.sdkSessionId || sessionAny.sdkSessionId);
+    if (sdkSessionId) {
+      queryOptions.resume = sdkSessionId;
+      console.log(`[ClaudeAdapter] resuming sdkSessionId=${sdkSessionId}`);
+    } else {
+      const newId = crypto.randomUUID();
+      queryOptions.sessionId = newId;
+      // 立即写入 metadata，避免流中丢失
+      session.metadata.sdkSessionId = newId;
+      sessionAny.sdkSessionId = newId;
+      console.log(`[ClaudeAdapter] new sessionId=${newId}`);
+    }
+
+    console.log(`[ClaudeAdapter] query model=${modelName} cwd=${workingDir} resume=${!!sdkSessionId}`);
+
+    try {
+    // 执行 Claude SDK 查询（流式）
+    const q = query({
+      prompt: [{
+        type: 'user',
+        message: { role: 'user', content: [{ type: 'text', text: effectiveText }] },
+      }],
+      options: queryOptions,
+      env: customEnv,
+    });
+
+    let fullResponse = '';
+    const toolCalls: Array<{ name: string; summary: string }> = [];
+
+    for await (const msg of q) {
+      const msgAny = msg as any;
+
+      // 捕获 SDK session ID（存入 metadata 供 SDK Runtime 持久化）
+      if (msgAny.session_id && !session.metadata?.sdkSessionId) {
+        session.metadata.sdkSessionId = msgAny.session_id;
+        // 向后兼容：也写回旧字段
+        sessionAny.sdkSessionId = msgAny.session_id;
+      }
+
+      // 提取文本
+      const extractedText = extractText(msg);
+      if (extractedText) fullResponse += extractedText;
+
+      // 提取工具调用
+      const calls = extractToolCalls(msg);
+      toolCalls.push(...calls);
+
+      // 处理最终结果
+      if (msg.type === 'result') {
+        const result = msgAny;
+
+        if (result.subtype === 'error' || result.subtype === 'cancelled') {
+          throw new Error(result.error || result.result || '未知错误');
+        }
+
+        const usage = {
+          inputTokens: result.usage?.input_tokens || 0,
+          outputTokens: result.usage?.output_tokens || 0,
+          costUSD: result.total_cost_usd || 0,
+          durationMs: result.duration_ms || 0,
+          numTurns: result.num_turns || 0,
+        };
+
+        if (timeoutId) clearTimeout(timeoutId);
+        const responseText = fullResponse || `✅ 已完成 (${toolCalls.length} 步操作)`;
+
+        return {
+          text: responseText,
+          toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+          usage,
+        };
+      }
+    }
+
+    // 流结束但没有 result 消息
+    return {
+      text: fullResponse || '✅ 完成',
+      toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+    };
+
+    } catch (err: any) {
+      if (timeoutId) clearTimeout(timeoutId);
+      // 如果是被 abort（超时或手动清理），提供有意义的消息
+      if (abortCtrl.signal.aborted) {
+        console.log(`[ClaudeAdapter] 请求已被中止 (${err.message || 'aborted'})`);
+        return {
+          text: '⚠️ 请求超时或已被取消，请稍后重试。',
+        };
+      }
+      throw err;
+    } finally {
+      // 清理当前 AbortController
+      const idx = this.activeControllers.indexOf(abortCtrl);
+      if (idx >= 0) this.activeControllers.splice(idx, 1);
+      if (timeoutId) clearTimeout(timeoutId);
+    }
+  }
+}

package/modules/agent/claude.ts

@@ -0,0 +1,160 @@
+// Claude Agent 模块
+// 对接 Claude Agent SDK，通过 :18899 Proxy 调用 Provider
+
+import { query } from '@anthropic-ai/claude-agent-sdk';
+import type { AgentContext } from '../types';
+import { parseToBlocks, type UnifiedBlock } from '../capabilities';
+import { buildSystemPrompt, resolveCapabilities } from '../prompt-builder';
+import type { SDKMessage } from '@anthropic-ai/claude-agent-sdk';
+
+// ================================================================
+// 工具函数
+// ================================================================
+function resolveAlias(modelSpec: string): string {
+  const i = modelSpec.indexOf('/');
+  return i >= 0 ? modelSpec.slice(i + 1) : modelSpec;
+}
+
+function extractText(msg: SDKMessage): string | null {
+  if (msg.type !== 'assistant') return null;
+  const content = (msg as any).message?.content;
+  if (!Array.isArray(content)) return null;
+  return content.filter((b: any) => b.type === 'text').map((b: any) => b.text).join('') || null;
+}
+
+function extractToolInfo(msg: SDKMessage): { name: string; summary: string } | null {
+  if (msg.type !== 'assistant') return null;
+  const content = (msg as any).message?.content;
+  if (!Array.isArray(content)) return null;
+  const tool = content.find((b: any) => b.type === 'tool_use');
+  if (!tool?.name) return null;
+  const input = tool.input || {};
+  let summary = '';
+  if (['Read','Edit','Write'].includes(tool.name) && input.file_path) {
+    const p = String(input.file_path);
+    summary = p.includes('/') ? p.split('/').pop()! : p;
+  } else if (tool.name === 'Bash' && input.command) {
+    summary = String(input.command).trim().slice(0, 60);
+  }
+  return { name: tool.name, summary };
+}
+
+// ================================================================
+// Claude 模块类
+// ================================================================
+
+/**
+ * 注意：此模块目前依赖宿主 Bot 实例的方法（reply/sendProgress/addToolLog 等）。
+ * Phase 2 第一步先原样提取，后续逐步解耦为干净接口。
+ */
+export class ClaudeAgentModule {
+  private ctx: AgentContext;
+
+  constructor(ctx: AgentContext) {
+    this.ctx = ctx;
+  }
+
+  async handleMessage(chatId: string, text: string, session: any) {
+    session.generator.push({
+      type: 'user', message: { role: 'user', content: [{ type: 'text', text }] },
+    });
+    if (!session.running) this._startLoop(chatId);
+  }
+
+  private async _startLoop(chatId: string) {
+    const ctx = this.ctx;
+    const session = ctx.sessions.get(chatId);
+    if (!session || session.running) return;
+    session.running = true;
+    console.log(`[${ctx.name}] Claude 循环启动 chat=${chatId.slice(-8)}`);
+
+    try {
+      const modelSpec = ctx.activeModel;
+      const modelName = modelSpec.slice(modelSpec.indexOf('/') + 1);
+      const aliases = ctx.modelAliases;
+      const customEnv: Record<string, string> = {
+        ...process.env,
+        ANTHROPIC_BASE_URL: 'http://localhost:18899',
+        ANTHROPIC_API_KEY: '', ANTHROPIC_AUTH_TOKEN: '', ANTHROPIC_MODEL: '',
+        ANTHROPIC_DEFAULT_SONNET_MODEL: resolveAlias(aliases.sonnet),
+        ANTHROPIC_DEFAULT_OPUS_MODEL: resolveAlias(aliases.opus),
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: resolveAlias(aliases.haiku),
+      };
+
+      const queryOptions: any = {
+        cwd: session.cwd || ctx.defaultCwd,
+        maxTurns: 50, model: modelName,
+        permissionMode: session.permissionMode || 'bypassPermissions',
+        persistSession: true,
+      };
+      if (session.sdkSessionId) {
+        queryOptions.resume = session.sdkSessionId;
+      } else {
+        queryOptions.sessionId = crypto.randomUUID();
+      }
+
+      const botName = ctx.name;
+      const systemPrompt = buildSystemPrompt({
+        imModule: ctx.imModule || null,
+        botName,
+      });
+      console.log(`[Claude] 📝 system prompt built (${systemPrompt.length} chars, bot=${botName})`);
+      queryOptions.systemPrompt = systemPrompt;
+
+      const q = query({
+        prompt: session.generator.generate(),
+        options: queryOptions, env: customEnv,
+      });
+
+      let fullResponse = '', toolCalls = 0;
+      let callInput = 0, callOutput = 0, callCost = 0, callDur = 0;
+
+      for await (const msg of q) {
+        const msgAny = msg as any;
+        if (msgAny.session_id && !session.sdkSessionId) {
+          session.sdkSessionId = msgAny.session_id;
+          ctx.persistSession(chatId, session);
+        }
+        const text = extractText(msg);
+        if (text) fullResponse += text;
+        const toolInfo = extractToolInfo(msg);
+        if (toolInfo) { toolCalls++; ctx.addToolLog(chatId, toolInfo); }
+
+        if (msg.type === 'result') {
+          const result = msg as any;
+          callInput = result.usage?.input_tokens || 0;
+          callOutput = result.usage?.output_tokens || 0;
+          callCost = result.total_cost_usd || 0;
+          callDur = result.duration_ms || 0;
+
+          ctx.accumulateStats(session, {
+            inputTokens: callInput, outputTokens: callOutput,
+            costUSD: callCost, durationMs: callDur,
+            numTurns: result.num_turns || 0,
+          });
+
+          if (result.subtype === 'error' || result.subtype === 'cancelled') {
+            await ctx.reply(chatId, `❌ ${result.error || result.result || '未知错误'}`);
+          } else if (fullResponse) {
+            await ctx.sendFormattedReply(chatId, fullResponse);
+          } else {
+            await ctx.reply(chatId, `✅ 已完成 (${toolCalls} 步操作)`);
+          }
+
+          ctx.flushToolLog(chatId);
+          const costStr = callCost > 0 ? `费用 $${callCost.toFixed(4)}\n` : '';
+          await ctx.sendProgress(chatId,
+            `✅ 完成 (${toolCalls} 步)\n输入 ${callInput.toLocaleString()} Token\n输出 ${callOutput.toLocaleString()} Token\n${costStr}耗时 ${(callDur/1000).toFixed(1)}s`);
+          fullResponse = ''; toolCalls = 0;
+        }
+      }
+    } catch (e: any) {
+      console.error(`[${ctx.name}] Claude 错误: ${e.message}`);
+      await ctx.reply(chatId, `❌ ${e.message}`);
+    } finally {
+      session.running = false;
+      session.generator.close();
+      ctx.persistSession(chatId, session);
+    }
+  }
+}

package/modules/agent/codex-adapter.ts

@@ -0,0 +1,232 @@
+// ================================================================
+// Codex Agent Adapter — 实现 SDK AgentAdapter 接口
+// ================================================================
+// 职责：对接 Codex CLI，将 AgentInput 转换为 AgentOutput
+// 支持两条路径：
+//   1. App-Server（优先）：进程内 HTTP 流式，长记忆，崩溃不丢上下文
+//   2. CLI 子进程（fallback）：codex exec/resume
+// ================================================================
+
+import type { AgentAdapter, AgentInput, AgentOutput, Session } from '../core/types';
+import { buildAttachmentHint } from '../core/types';
+import { buildSystemPrompt } from '../prompt-builder';
+import { getAppServerManager, type AgentEvent } from './codex-exec-server';
+
+// ================================================================
+// CodexAdapter 上下文
+// ================================================================
+
+export interface CodexAdapterContext {
+  imModule?: { getCapabilities(): any } | null;
+  botName: string;
+}
+
+// ================================================================
+// Codex CLI 调用
+// ================================================================
+
+interface CodexJsonEvent {
+  type: string;
+  thread_id?: string;
+  item?: { type: string; text?: string; name?: string; arguments?: string; output?: string };
+  text?: string;
+  delta?: string;
+  message?: { content?: { type: string; text?: string }[] };
+  error?: string;
+}
+
+function processCodexStream(stdout: string): { threadId: string; response: string } {
+  let threadId = '', response = '';
+  for (const line of stdout.split('\n')) {
+    if (!line.trim()) continue;
+    try {
+      const evt: CodexJsonEvent = JSON.parse(line);
+      if (evt.type === 'thread.started' && evt.thread_id) {
+        threadId = evt.thread_id;
+      } else if (evt.type === 'item.completed') {
+        if (evt.item?.type === 'agent_message') {
+          response = (response ? response + '\n' : '') + (evt.item.text || '');
+        }
+      } else if (evt.type === 'error' || evt.type === 'thread.error') {
+        console.error(`[CodexAdapter] event error: ${(evt as any).message || (evt as any).error || JSON.stringify(evt)}`);
+      }
+    } catch {}
+  }
+  return { threadId, response };
+}
+
+async function spawnCodexExec(cwd: string, prompt: string): Promise<{ threadId: string; response: string }> {
+  const child = Bun.spawn(['codex', 'exec', '-p', 'imtoagent', '-s', 'danger-full-access',
+    '--skip-git-repo-check', '--json', prompt], {
+    cwd, stdout: 'pipe', stderr: 'pipe',
+  });
+
+  let stdout = '', stderr = '';
+  try {
+    [stdout, stderr] = await Promise.all([
+      new Response(child.stdout).text().catch((e: any) => { throw new Error(`stdout 读取失败: ${e?.message || e}`); }),
+      new Response(child.stderr).text().catch((e: any) => { throw new Error(`stderr 读取失败: ${e?.message || e}`); }),
+    ]);
+  } catch (ioErr: any) {
+    try { child.kill('SIGKILL'); } catch {}
+    throw new Error(`codex exec I/O 异常: ${ioErr.message}`);
+  }
+
+  const code = await child.exited.catch(() => -1);
+  const { threadId, response } = processCodexStream(stdout);
+  if (code !== 0 || !threadId) throw new Error(`codex exec exit ${code}: ${stderr.slice(0, 300)}`);
+  return { threadId, response };
+}
+
+async function spawnCodexResume(cwd: string, threadId: string, prompt: string): Promise<{ response: string }> {
+  const child = Bun.spawn(['codex', 'exec', 'resume', threadId,
+    '--dangerously-bypass-approvals-and-sandbox', '-c', 'model_provider=imtoagent', '-c', 'model=gpt-5.5', '--json', '--skip-git-repo-check', prompt], {
+    cwd, stdout: 'pipe', stderr: 'pipe',
+  });
+
+  let stdout = '', stderr = '';
+  try {
+    [stdout, stderr] = await Promise.all([
+      new Response(child.stdout).text().catch((e: any) => { throw new Error(`stdout 读取失败: ${e?.message || e}`); }),
+      new Response(child.stderr).text().catch((e: any) => { throw new Error(`stderr 读取失败: ${e?.message || e}`); }),
+    ]);
+  } catch (ioErr: any) {
+    try { child.kill('SIGKILL'); } catch {}
+    throw new Error(`codex exec resume I/O 异常: ${ioErr.message}`);
+  }
+
+  const code = await child.exited.catch(() => -1);
+  if (code !== 0) throw new Error(`codex exec resume exit ${code}: ${stderr.slice(0, 300)}`);
+  return { response: processCodexStream(stdout).response };
+}
+
+// ================================================================
+// App-Server 路径（优先）
+// ================================================================
+
+async function runViaAppServer(
+  cwd: string, prompt: string, chatId: string, session: Session,
+  isFresh: boolean
+): Promise<{ threadId: string; response: string; usage: { inputTokens: number; outputTokens: number } }> {
+  const manager = getAppServerManager();
+  const client = await manager.getClient(chatId);
+
+  const currentGen = manager.generation;
+  const sessionAny = session as any;
+  const threadExpired = sessionAny._appServerGen !== currentGen;
+  if (isFresh || !sessionAny.codexThreadId || threadExpired) {
+    sessionAny.codexThreadId = await client.startThread(cwd);
+    sessionAny._appServerGen = currentGen;
+    session.metadata.codexThreadId = sessionAny.codexThreadId;
+    console.log(`[CodexAdapter] app-server 全新 thread=${sessionAny.codexThreadId.slice(-8)}${threadExpired ? ' (进程重启)' : ''}`);
+  }
+
+  await client.sendPrompt(sessionAny.codexThreadId, prompt, cwd);
+
+  let response = '';
+  let totalUsage = { inputTokens: 0, outputTokens: 0 };
+  const startTime = Date.now();
+  const MAX_DURATION = 600_000; // 10 分钟
+
+  for await (const event of client.receiveEvents()) {
+    if (Date.now() - startTime > MAX_DURATION) {
+      console.error('[CodexAdapter] app-server 任务超时 (10min)');
+      break;
+    }
+
+    switch (event.type) {
+      case 'text_delta':
+        response += event.textDelta || '';
+        break;
+      case 'tool_call':
+        break; // tool 日志由 Runtime 层处理
+      case 'turn_result':
+        totalUsage.inputTokens += event.usage?.inputTokens || 0;
+        totalUsage.outputTokens += event.usage?.outputTokens || 0;
+        break;
+      case 'error':
+        throw new Error(`app-server 错误: ${event.error}`);
+    }
+  }
+
+  return { threadId: sessionAny.codexThreadId, response, usage: totalUsage };
+}
+
+// ================================================================
+// CodexAdapter — 实现 AgentAdapter
+// ================================================================
+
+export class CodexAdapter implements AgentAdapter {
+  readonly name = 'Codex CLI';
+  private ctx: CodexAdapterContext;
+
+  constructor(ctx: CodexAdapterContext) {
+    this.ctx = ctx;
+  }
+
+  async handleMessage(input: AgentInput): Promise<AgentOutput> {
+    const { text, session, workingDir, systemPrompt: overrideSystemPrompt } = input;
+    const sessionAny = session as any;
+    const cwd = workingDir;
+
+    let effectiveText = text;
+
+    // 附件信息注入：让 Agent 知道用户发送了附件（图片/文件/语音）及本地路径
+    if (input.attachments && input.attachments.length > 0) {
+      effectiveText = buildAttachmentHint(input.attachments) + '\n\n---\n\n' + effectiveText;
+    }
+
+    if (session.codexMode === 'plan') {
+      effectiveText = `[模式: 先计划后执行] 请先制定一个清晰的计划，等我确认后再执行。用户请求: ${effectiveText}`;
+    }
+
+    const isFresh = session.startFresh || !sessionAny.codexThreadId;
+    session.startFresh = false;
+
+    // 优先尝试 app-server
+    let useExecFallback = false;
+    let response: string;
+    let execServerUsage: { inputTokens: number; outputTokens: number } | null = null;
+
+    try {
+      const r = await runViaAppServer(cwd, effectiveText, input.chatId, session, isFresh);
+      response = r.response;
+      execServerUsage = r.usage;
+    } catch (appErr: any) {
+      const errMsg = appErr.message || '';
+      console.error(`[CodexAdapter] app-server 失败: ${errMsg}`);
+
+      if (errMsg.includes('thread not found') || errMsg.includes('Thread not found')) {
+        try {
+          sessionAny.codexThreadId = undefined;
+          const r2 = await runViaAppServer(cwd, effectiveText, input.chatId, session, true);
+          response = r2.response;
+          execServerUsage = r2.usage;
+          console.error(`[CodexAdapter] app-server thread 重建成功`);
+        } catch {
+          useExecFallback = true;
+        }
+      } else {
+        useExecFallback = true;
+      }
+    }
+
+    if (useExecFallback) {
+      getAppServerManager().removeClient(input.chatId);
+      if (isFresh || !sessionAny.codexThreadId) {
+        const r = await spawnCodexExec(cwd, effectiveText);
+        sessionAny.codexThreadId = r.threadId;
+        session.metadata.codexThreadId = r.threadId;
+        response = r.response;
+      } else {
+        const r = await spawnCodexResume(cwd, sessionAny.codexThreadId, effectiveText);
+        response = r.response;
+      }
+    }
+
+    return {
+      text: response || '✅ 已完成',
+      usage: execServerUsage || undefined,
+    };
+  }
+}