imtoagent 0.3.19 → 0.3.21

package/modules/agent/claude-adapter.ts

@@ -69,7 +69,7 @@ export class ClaudeAdapter implements AgentAdapter {
   private ctx: ClaudeAdapterContext;
   private activeControllers: AbortController[] = [];
   /** 单次调用最大超时（毫秒），0 = 不限制 */
-  static MAX_CALL_TIMEOUT_MS = 5 * 60 * 1000; // 5 分钟
+  static MAX_CALL_TIMEOUT_MS = 15 * 60 * 1000; // 15 分钟
 
   constructor(ctx: ClaudeAdapterContext) {
     this.ctx = ctx;
@@ -100,6 +100,10 @@ export class ClaudeAdapter implements AgentAdapter {
     const { text, session, workingDir, model, systemPrompt: overrideSystemPrompt } = input;
     const sessionAny = session as any; // 向后兼容：访问旧字段
 
+    // 进度回调
+    const onProgress = async (t: string) => { try { await input.sendProgress?.(t); } catch {} };
+    let turnCount = 0;
+
     // 创建 AbortController 并注册（用于超时 + shutdown 清理）
     const abortCtrl = new AbortController();
     this.activeControllers.push(abortCtrl);
@@ -205,6 +209,16 @@ export class ClaudeAdapter implements AgentAdapter {
       const calls = extractToolCalls(msg);
       toolCalls.push(...calls);
 
+      // 进度输出（仅 assistant 消息）
+      if (msg.type === 'assistant') {
+        turnCount++;
+        if (calls.length > 0) {
+          const names = calls.map(c => c.name).join(', ');
+          const summary = calls[0].summary.slice(0, 60);
+          onProgress(`🔧 Executing: ${names} — ${summary}`);
+        }
+      }
+
       // 处理最终结果
       if (msg.type === 'result') {
         const result = msgAny;
@@ -222,6 +236,7 @@ export class ClaudeAdapter implements AgentAdapter {
         };
 
         if (timeoutId) clearTimeout(timeoutId);
+        if (turnCount > 0) onProgress(`✅ Turn ${turnCount} completed`);
         const responseText = fullResponse || `✅ Completed (${toolCalls.length} steps)`;
 
         return {

package/modules/agent/codex-adapter.ts

@@ -106,8 +106,9 @@ async function spawnCodexResume(cwd: string, threadId: string, prompt: string):
 
 async function runViaAppServer(
   cwd: string, prompt: string, chatId: string, session: Session,
-  isFresh: boolean
+  isFresh: boolean, onProgress?: (text: string) => Promise<void>
 ): Promise<{ threadId: string; response: string; usage: { inputTokens: number; outputTokens: number } }> {
+  let turnCount = 0;
   const manager = getAppServerManager();
   const client = await manager.getClient(chatId);
 
@@ -138,9 +139,14 @@ async function runViaAppServer(
       case 'text_delta':
         response += event.textDelta || '';
         break;
-      case 'tool_call':
-        break; // tool 日志由 Runtime 层处理
+      case 'tool_call': {
+        const name = (event as any).toolCall?.name || (event as any).tool?.name || 'Tool';
+        onProgress?.(`🔧 Executing: ${name}`);
+        break;
+      }
       case 'turn_result':
+        turnCount++;
+        onProgress?.(`✅ Turn ${turnCount} completed`);
         totalUsage.inputTokens += event.usage?.inputTokens || 0;
         totalUsage.outputTokens += event.usage?.outputTokens || 0;
         break;
@@ -189,7 +195,8 @@ export class CodexAdapter implements AgentAdapter {
     let execServerUsage: { inputTokens: number; outputTokens: number } | null = null;
 
     try {
-      const r = await runViaAppServer(cwd, effectiveText, input.chatId, session, isFresh);
+      const r = await runViaAppServer(cwd, effectiveText, input.chatId, session, isFresh,
+      async (t: string) => { try { await input.sendProgress?.(t); } catch {} });
       response = r.response;
       execServerUsage = r.usage;
     } catch (appErr: any) {
@@ -199,7 +206,8 @@ export class CodexAdapter implements AgentAdapter {
       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);
+          const r2 = await runViaAppServer(cwd, effectiveText, input.chatId, session, true,
+            async (t: string) => { try { await input.sendProgress?.(t); } catch {} });
           response = r2.response;
           execServerUsage = r2.usage;
           console.error(`[CodexAdapter] app-server thread rebuilt successfully`);
@@ -213,6 +221,7 @@ export class CodexAdapter implements AgentAdapter {
 
     if (useExecFallback) {
       getAppServerManager().removeClient(input.chatId);
+      input.sendProgress?.('⚙️ Processing... (CLI mode, no streaming progress)').catch(() => {});
       if (isFresh || !sessionAny.codexThreadId) {
         const r = await spawnCodexExec(cwd, effectiveText);
         sessionAny.codexThreadId = r.threadId;

package/modules/agent/opencode-adapter.ts

@@ -64,12 +64,12 @@ async function ocSendPrompt(
   initialText: string,
   system: string,
   defaultModel: { providerID: string; modelID: string },
-  onTool?: (name: string, args: Record<string, any>) => void,
+  onProgress?: (text: string) => void,
   cancelSignal?: AbortSignal
 ): Promise<{ response: string; toolCalls: Array<{ name: string; summary: string }> }> {
   const MAX_TURNS = 50;
-  const TURN_TIMEOUT = 300_000;  // 5 min per turn
-  const MAX_DURATION = 600_000;  // total timeout 10 min
+  const TURN_TIMEOUT = 900_000;  // 15 min per turn
+  const MAX_DURATION = 3_600_000;  // total timeout 60 min
   const startTime = Date.now();
 
   let promptText = initialText;
@@ -79,7 +79,8 @@ async function ocSendPrompt(
 
   while (turn < MAX_TURNS) {
     if (Date.now() - startTime > MAX_DURATION) {
-      console.error('[OpenCodeAdapter] Task timed out (10min)');
+      console.error(`[OpenCodeAdapter] Task timed out (${MAX_DURATION / 60000}min)`);
+      if (onProgress) onProgress('⚠️ Task timed out, stopped');
       break;
     }
     turn++;
@@ -130,7 +131,7 @@ async function ocSendPrompt(
         const summary = args.command || args.cmd || args.file_path || args.query
           || JSON.stringify(args).slice(0, 80);
         allToolCalls.push({ name, summary });
-        if (onTool) onTool(name, args);
+        if (onProgress) onProgress(`🔧 Executing: ${name} — ${summary.slice(0, 60)}`);
         console.log(`[OpenCodeAdapter] 🔧 turn ${turn}: ${name} ${summary.slice(0, 60)}`);
       }
     }
@@ -138,6 +139,7 @@ async function ocSendPrompt(
     // 有文本回复 → 任务完成（OpenCode 内部已完成多轮 agent loop）
     if (hasText) {
       console.log(`[OpenCodeAdapter] ✅ completed at turn ${turn}/${MAX_TURNS}`);
+      if (onProgress) onProgress(`✅ Turn ${turn} completed`);
       break;
     }
 
@@ -147,7 +149,8 @@ async function ocSendPrompt(
       break;
     }
 
-    // 仅有 tool_call 无文本 → OpenCode 无法自行执行，推进下一轮
+    // 仅有 tool_call 无文本 → 推进下一轮
+    if (onProgress) onProgress(`⏳ Turn ${turn}/${MAX_TURNS}, continuing...`);
     promptText = 'Continue executing, complete remaining tasks';
   }
 
@@ -215,16 +218,18 @@ export class OpenCodeAdapter implements AgentAdapter {
     console.log(`[OpenCodeAdapter] 📝 system prompt built (${systemPrompt.length} chars)`);
 
     // 发送 prompt（多轮循环：自动推进 tool_call → 纯文本响应）
+    // 注意：ocSendPrompt 不直接依赖 ctx，由 handleMessage 传入 onProgress 回调
+    const onProgress = async (text: string) => {
+      try { await input.sendProgress?.(text); } catch {}
+    };
+
     const { response, toolCalls } = await ocSendPrompt(
       serverUrl,
       sessionAny.ocSessionId,
       effectiveText,
       systemPrompt,
       defaultModel,
-      // onTool 回调：适配器层不依赖外部 ctx，直接记日志
-      (name, args) => {
-        // 工具调用日志由 Runtime 层统一格式化
-      },
+      onProgress,
       input.cancelSignal
     );
 

package/modules/core/runtime.ts

@@ -157,6 +157,7 @@ export class AgentRuntime {
           systemPrompt: ctx.systemPrompt,
           model: ctx.model,
           cancelSignal: ctx.cancelSignal,
+          sendProgress: (t: string) => ctx.sendProgress(t),
         };
 
         const output = await adapter.handleMessage(input);

package/modules/core/types.ts

@@ -115,6 +115,8 @@ export interface AgentInput {
   model: string;
   /** 外部取消信号（用于 /stop 等中断命令） */
   cancelSignal?: AbortSignal;
+  /** 进度回调（适配器向用户发送中间状态，如工具调用、思考进度） */
+  sendProgress?: (text: string) => Promise<void>;
 }
 
 /** Agent 输出 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imtoagent",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "IM ↔ Agent 统一网关 — 飞书/Telegram/微信/企业微信对接 Claude Code/Codex/OpenCode",
   "type": "module",
   "bin": {