imtoagent 0.3.20 → 0.3.22

package/README.md

@@ -1,4 +1,4 @@
-# imtoagent — IM ↔ Agent Unified Gateway
+# IMtoAgent — IM ↔ Agent Unified Gateway
 
 Connect Feishu, Telegram, personal WeChat, and WeCom to AI coding agents like Claude Code, Codex (GPT), OpenCode, and more.
 
@@ -180,6 +180,34 @@ The interactive wizard will guide you through:
 | `imtoagent status` | Check running status |
 | `imtoagent restore` | Hot reload recovery |
 | `imtoagent daemon` | Foreground daemon mode (crash auto-restart) |
+| `imtoagent update-system` | Upgrade IMtoAgent itself via npm |
+| `imtoagent update-backend [type]` | Upgrade an agent backend (claude/codex/opencode) |
+
+### Upgrading
+
+**Upgrade IMtoAgent itself:**
+
+```bash
+imtoagent update-system
+```
+
+This runs `npm update -g imtoagent` and verifies the new version.
+
+**Upgrade agent backends:**
+
+```bash
+# Auto-detect current Bot's backend and upgrade it
+imtoagent update-backend
+
+# Upgrade a specific backend
+imtoagent update-backend codex
+imtoagent update-backend claude
+imtoagent update-backend opencode
+```
+
+The command detects how each backend was installed (npm, brew, or manual) and uses the correct upgrade command automatically.
+
+### Running Modes
 
 ### Running Modes
 

package/bin/imtoagent-real

@@ -46,6 +46,14 @@ switch (command) {
   case 'daemon':
     await cmdDaemon();
     break;
+  case 'update-system':
+    await cmdUpdateSystem();
+    break;
+  case 'update-backend': {
+    const backendType = process.argv[3] as 'claude' | 'codex' | 'opencode' | undefined;
+    await cmdUpdateBackend(backendType);
+    break;
+  }
   case undefined: {
     const dataDir = getDataDir();
     const configPath = path.join(dataDir, 'config.json');
@@ -89,13 +97,16 @@ function printHelp() {
 imtoagent — IM ↔ Agent Unified Gateway
 
 Usage:
-  imtoagent setup     Interactive setup wizard
-  imtoagent start     Start gateway in background (returns immediately)
-  imtoagent run       Start gateway in foreground (Ctrl+C to stop)
-  imtoagent stop      Stop gateway
-  imtoagent status    Check running status
-  imtoagent restore   Hot reload
-  imtoagent daemon    Foreground daemon with auto-restart (for launchd/systemd)
+  imtoagent setup               Interactive setup wizard
+  imtoagent start               Start gateway in background (returns immediately)
+  imtoagent run                 Start gateway in foreground (Ctrl+C to stop)
+  imtoagent stop                Stop gateway
+  imtoagent status              Check running status
+  imtoagent restore             Hot reload
+  imtoagent daemon              Foreground daemon with auto-restart (for launchd/systemd)
+  imtoagent update-system       Upgrade imtoagent itself
+  imtoagent update-backend      Upgrade current Bot's backend
+  imtoagent update-backend TYPE Upgrade specific backend (codex|claude|opencode)
 
 Data directory: ${getDataDir()}
 `);
@@ -485,3 +496,121 @@ async function cmdDaemon(): Promise<void> {
 
   console.log('👋 Daemon stopped');
 }
+
+// ================================================================
+// update-system — upgrade imtoagent itself
+// ================================================================
+async function cmdUpdateSystem(): Promise<void> {
+  const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
+  const currentVer = pkg.version;
+  console.log('\n📦 Upgrading imtoagent...');
+  console.log(`   Current version: ${currentVer}\n`);
+
+  console.log('   Running: npm update -g imtoagent\n');
+
+  try {
+    const child = Bun.spawn(['zsh', '-ic', 'npm update -g imtoagent'], {
+      stdout: 'pipe',
+      stderr: 'pipe',
+      stdin: 'ignore',
+      env: { ...process.env },
+    });
+
+    const decoder = new TextDecoder();
+
+    const stdoutReader = child.stdout.getReader();
+    while (true) {
+      const { done, value } = await stdoutReader.read();
+      if (done) break;
+      process.stdout.write(decoder.decode(value, { stream: true }));
+    }
+
+    const stderrReader = child.stderr.getReader();
+    while (true) {
+      const { done, value } = await stderrReader.read();
+      if (done) break;
+      process.stderr.write(decoder.decode(value, { stream: true }));
+    }
+
+    const exitCode = await child.exited;
+    if (exitCode !== 0) {
+      console.error(`\n❌ imtoagent upgrade failed (exit code: ${exitCode})`);
+      process.exit(1);
+    }
+
+    // Read new version
+    let newVer = 'unknown';
+    try {
+      const newPkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
+      newVer = newPkg.version;
+    } catch {
+      // Can't read new version (possibly process swapped), check via CLI
+      try {
+        newVer = execSync('imtoagent --version', { encoding: 'utf-8', timeout: 5000 }).trim();
+      } catch {}
+    }
+
+    console.log(`\n✅ imtoagent upgraded: ${currentVer} → ${newVer}`);
+    console.log(`   Restart gateway with: imtoagent stop && imtoagent start`);
+  } catch (e: any) {
+    console.error(`\n❌ Error upgrading imtoagent: ${e.message || e}`);
+    process.exit(1);
+  }
+}
+
+// ================================================================
+// update-backend — upgrade a backend agent
+// ================================================================
+async function cmdUpdateBackend(backendType?: 'claude' | 'codex' | 'opencode'): Promise<void> {
+  const dataDir = getDataDir();
+  const configPath = path.join(dataDir, 'config.json');
+
+  // Determine which backend to upgrade
+  let targetType: 'claude' | 'codex' | 'opencode';
+
+  if (backendType) {
+    if (!['claude', 'codex', 'opencode'].includes(backendType)) {
+      console.error(`❌ Unknown backend: ${backendType}`);
+      console.error(`   Valid: claude, codex, opencode`);
+      process.exit(1);
+    }
+    targetType = backendType;
+  } else {
+    // Auto-detect from config (use first bot's backend)
+    if (!fs.existsSync(configPath)) {
+      console.error('❌ No config found. Run "imtoagent setup" first.');
+      process.exit(1);
+    }
+    const cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+    const bots = cfg.bots || [];
+    if (bots.length === 0) {
+      console.error('❌ No bots configured.');
+      process.exit(1);
+    }
+    targetType = bots[0].backend;
+    if (!targetType) {
+      console.error('❌ First bot has no backend configured.');
+      process.exit(1);
+    }
+    console.log(`   Auto-detected backend: ${targetType} (from bot: ${bots[0].name})\n`);
+  }
+
+  // Show current status
+  const { checkBackend } = await import('../modules/utils/backend-check');
+  const info = checkBackend(targetType);
+  console.log(`   ${info.label}: ${info.version || 'not installed'} (${info.installSource})`);
+
+  if (!info.installed) {
+    console.error(`\n❌ ${info.label} not installed.`);
+    console.error(`   Install: imtoagent setup`);
+    process.exit(1);
+  }
+
+  // Run upgrade
+  const { upgradeBackend } = await import('../modules/utils/backend-check');
+  const result = await upgradeBackend(targetType);
+
+  if (!result.success) {
+    process.exit(1);
+  }
+}

package/modules/agent/claude-adapter.ts

@@ -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

@@ -80,7 +80,7 @@ async function ocSendPrompt(
   while (turn < MAX_TURNS) {
     if (Date.now() - startTime > MAX_DURATION) {
       console.error(`[OpenCodeAdapter] Task timed out (${MAX_DURATION / 60000}min)`);
-      if (onProgress) onProgress('⚠️ 任务超时，已停止');
+      if (onProgress) onProgress('⚠️ Task timed out, stopped');
       break;
     }
     turn++;
@@ -131,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 (onProgress) onProgress(`🔧 正在执行: ${name} — ${summary.slice(0, 60)}`);
+        if (onProgress) onProgress(`🔧 Executing: ${name} — ${summary.slice(0, 60)}`);
         console.log(`[OpenCodeAdapter] 🔧 turn ${turn}: ${name} ${summary.slice(0, 60)}`);
       }
     }
@@ -139,7 +139,7 @@ async function ocSendPrompt(
     // 有文本回复 → 任务完成（OpenCode 内部已完成多轮 agent loop）
     if (hasText) {
       console.log(`[OpenCodeAdapter] ✅ completed at turn ${turn}/${MAX_TURNS}`);
-      if (onProgress) onProgress(`✅ 第 ${turn} 轮处理完成`);
+      if (onProgress) onProgress(`✅ Turn ${turn} completed`);
       break;
     }
 
@@ -150,7 +150,7 @@ async function ocSendPrompt(
     }
 
     // 仅有 tool_call 无文本 → 推进下一轮
-    if (onProgress) onProgress(`⏳ 第 ${turn}/${MAX_TURNS} 轮，继续推进...`);
+    if (onProgress) onProgress(`⏳ Turn ${turn}/${MAX_TURNS}, continuing...`);
     promptText = 'Continue executing, complete remaining tasks';
   }
 

package/modules/utils/backend-check.ts

@@ -7,20 +7,70 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 
+export type InstallSource = 'npm' | 'brew' | 'manual' | 'unknown';
+
 export interface BackendInfo {
   type: 'claude' | 'codex' | 'opencode';
   label: string;
   installed: boolean;
   version: string | null;
   installHint: string;
+  installSource: InstallSource;
+  binaryPath: string | null;
+  upgradeCommand: string | null;
 }
 
-const BACKEND_DEFS: Omit<BackendInfo, 'installed' | 'version'>[] = [
+const BACKEND_DEFS: Omit<BackendInfo, 'installed' | 'version' | 'installSource' | 'binaryPath' | 'upgradeCommand'>[] = [
   { type: 'claude', label: 'Claude Code', installHint: 'npm install -g @anthropic-ai/claude-agent-sdk' },
   { type: 'codex',  label: 'Codex',       installHint: 'npm install -g @openai/codex' },
   { type: 'opencode', label: 'OpenCode',   installHint: 'curl -fsSL https://opencode.ai/install | bash' },
 ];
 
+// ================================================================
+// 安装来源检测
+// ================================================================
+
+/**
+ * 根据二进制路径判断安装来源
+ */
+export function detectInstallSource(binaryPath: string, type: string): InstallSource {
+  if (binaryPath.includes('/opt/homebrew/') || binaryPath.includes('/usr/local/Cellar/')) {
+    return 'brew';
+  }
+  if (binaryPath.includes('node_modules/')) {
+    return 'npm';
+  }
+  if (type === 'opencode' && binaryPath.includes('.opencode/')) {
+    return 'manual';
+  }
+  return 'unknown';
+}
+
+/**
+ * 根据安装来源和后端类型生成升级命令
+ */
+export function getUpgradeCommand(source: InstallSource, type: string): string | null {
+  switch (source) {
+    case 'brew':
+      const brewPkg: Record<string, string> = { claude: undefined, codex: 'codex', opencode: undefined };
+      if (brewPkg[type]) return `brew upgrade ${brewPkg[type]}`;
+      return null; // claude/opencode not on brew
+    case 'npm':
+      const npmPkg: Record<string, string> = {
+        claude: '@anthropic-ai/claude-agent-sdk',
+        codex: '@openai/codex',
+        opencode: 'opencode',
+      };
+      if (npmPkg[type]) return `npm update -g ${npmPkg[type]}`;
+      return null;
+    case 'manual':
+      if (type === 'opencode') return 'curl -fsSL https://opencode.ai/install | bash';
+      return null;
+    case 'unknown':
+      return null;
+  }
+}
+
 // ================================================================
 // 获取 npm 全局 bin 目录
 // 解决 PATH 未包含 npm global bin 时的检测失败问题
@@ -49,47 +99,75 @@ export function getNpmGlobalBin(): string | null {
   }
 }
 
-function checkOne(b: Omit<BackendInfo, 'installed' | 'version'>): BackendInfo {
+/**
+ * 定位后端可执行文件（按优先级）
+ * 返回 { path, version } 或 null
+ */
+function findBackendBinary(type: string): { binaryPath: string; version: string } | null {
   const versionCmd: Record<string, string> = {
     claude: 'claude --version',
     codex: 'codex --version',
     opencode: 'opencode version',
   };
 
-  // 先尝试 PATH 中的命令
+  // 1) PATH 中的命令（最常见）
   try {
-    const version = execSync(versionCmd[b.type], { encoding: 'utf-8', timeout: 5000 }).trim();
-    return { ...b, installed: true, version };
-  } catch {
-    // PATH 中找不到，继续尝试 fallback
-  }
+    const version = execSync(versionCmd[type], { encoding: 'utf-8', timeout: 5000 }).trim();
+    // 解析真实路径（处理 symlink）
+    const binName = type;
+    const realPath = execSync(`command -v ${binName}`, { encoding: 'utf-8', timeout: 3000 }).trim();
+    return { binaryPath: realPath, version };
+  } catch {}
 
-  // fallback 1: npm global bin
+  // 2) npm global bin
   const npmBin = getNpmGlobalBin();
   if (npmBin) {
-    const binPath = path.join(npmBin, b.type);
+    const binPath = path.join(npmBin, type);
     try {
       if (fs.existsSync(binPath)) {
         const version = execSync(`"${binPath}" --version`, { encoding: 'utf-8', timeout: 5000 }).trim();
-        return { ...b, installed: true, version };
+        return { binaryPath: binPath, version };
       }
-    } catch {
-      // bin 存在但执行失败，视为未安装
-    }
+    } catch {}
   }
 
-  // fallback 2: OpenCode custom install path
-  if (b.type === 'opencode') {
+  // 3) OpenCode custom install path
+  if (type === 'opencode') {
     const opencodePath = path.join(os.homedir(), '.opencode', 'bin', 'opencode');
     try {
       if (fs.existsSync(opencodePath)) {
         const version = execSync(`"${opencodePath}" version`, { encoding: 'utf-8', timeout: 5000 }).trim();
-        return { ...b, installed: true, version };
+        return { binaryPath: opencodePath, version };
       }
     } catch {}
   }
 
-  return { ...b, installed: false, version: null };
+  return null;
+}
+
+function checkOne(b: Omit<BackendInfo, 'installed' | 'version' | 'installSource' | 'binaryPath' | 'upgradeCommand'>): BackendInfo {
+  const found = findBackendBinary(b.type);
+  if (found) {
+    const installSource = detectInstallSource(found.binaryPath, b.type);
+    const upgradeCommand = getUpgradeCommand(installSource, b.type);
+    return {
+      ...b,
+      installed: true,
+      version: found.version,
+      installSource,
+      binaryPath: found.binaryPath,
+      upgradeCommand,
+    };
+  }
+
+  return {
+    ...b,
+    installed: false,
+    version: null,
+    installSource: 'unknown',
+    binaryPath: null,
+    upgradeCommand: null,
+  };
 }
 
 export function checkAllBackends(): BackendInfo[] {
@@ -106,8 +184,9 @@ export function formatBackendStatus(backends: BackendInfo[]): string {
   return backends.map(b => {
     const icon = b.installed ? '✅' : '❌';
     const ver = b.version ? ` v${b.version}` : '';
+    const source = b.installed && b.installSource !== 'unknown' ? ` (${b.installSource})` : '';
     const hint = b.installed ? '' : ` → ${b.installHint}`;
-    return `  ${icon} ${b.label}${ver}${hint}`;
+    return `  ${icon} ${b.label}${ver}${source}${hint}`;
   }).join('\n');
 }
 
@@ -143,6 +222,90 @@ function ensurePathInConfig(configPath: string, binDir: string): void {
   } catch {}
 }
 
+// ================================================================
+// 升级后端 CLI
+// ================================================================
+
+/**
+ * 升级已安装的后端到最新版
+ * 根据检测到的 installSource 自动选择正确的升级命令
+ */
+export async function upgradeBackend(
+  type: 'claude' | 'codex' | 'opencode',
+): Promise<{ success: boolean; oldVer: string; newVer: string }> {
+  const b = BACKEND_DEFS.find((x) => x.type === type);
+  if (!b) {
+    return { success: false, oldVer: '', newVer: '' };
+  }
+
+  const currentInfo = checkOne(b);
+  if (!currentInfo.installed) {
+    console.error(`❌ ${b.label} not installed. Use installBackend() instead.`);
+    return { success: false, oldVer: '', newVer: '' };
+  }
+
+  const upgradeCmd = currentInfo.upgradeCommand;
+  if (!upgradeCmd) {
+    console.error(`❌ Cannot determine upgrade method for ${b.label} (source: ${currentInfo.installSource})`);
+    console.error(`   Please upgrade manually.`);
+    return { success: false, oldVer: currentInfo.version || '', newVer: '' };
+  }
+
+  const oldVer = currentInfo.version || '';
+  console.log(`\n📦 Upgrading ${b.label}...`);
+  console.log(`   Current: ${oldVer}`);
+  console.log(`   Source: ${currentInfo.installSource}`);
+  console.log(`   Command: ${upgradeCmd}\n`);
+
+  try {
+    const child = Bun.spawn(['zsh', '-ic', upgradeCmd], {
+      stdout: 'pipe',
+      stderr: 'pipe',
+      stdin: 'ignore',
+      env: { ...process.env },
+    });
+
+    const decoder = new TextDecoder();
+
+    const stdoutReader = child.stdout.getReader();
+    while (true) {
+      const { done, value } = await stdoutReader.read();
+      if (done) break;
+      process.stdout.write(decoder.decode(value, { stream: true }));
+    }
+
+    const stderrReader = child.stderr.getReader();
+    while (true) {
+      const { done, value } = await stderrReader.read();
+      if (done) break;
+      process.stderr.write(decoder.decode(value, { stream: true }));
+    }
+
+    const exitCode = await child.exited;
+    if (exitCode !== 0) {
+      console.error(`\n❌ ${b.label} upgrade failed (exit code: ${exitCode})`);
+      return { success: false, oldVer, newVer: '' };
+    }
+
+    // 验证新版本
+    const newInfo = checkOne(b);
+    const newVer = newInfo.version || '';
+    if (newInfo.installed && newVer !== oldVer) {
+      console.log(`\n✅ ${b.label} upgraded: ${oldVer} → ${newVer}`);
+      return { success: true, oldVer, newVer };
+    } else if (newVer === oldVer) {
+      console.log(`\n✅ ${b.label} is already at latest version (${newVer})`);
+      return { success: true, oldVer, newVer };
+    } else {
+      console.log(`\n✅ ${b.label} upgrade completed (new version: ${newVer})`);
+      return { success: true, oldVer, newVer };
+    }
+  } catch (e: any) {
+    console.error(`\n❌ Error upgrading ${b.label}: ${e.message || e}`);
+    return { success: false, oldVer, newVer: '' };
+  }
+}
+
 // ================================================================
 // 自动安装后端 CLI
 // ================================================================

package/package.json

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