imtoagent 0.3.0 → 0.3.1

package/modules/utils/backend-check.ts

@@ -3,6 +3,8 @@
 // ================================================================
 
 import { execSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
 
 export interface BackendInfo {
   type: 'claude' | 'codex' | 'opencode';
@@ -18,20 +20,64 @@ const BACKEND_DEFS: Omit<BackendInfo, 'installed' | 'version'>[] = [
   { type: 'opencode', label: 'OpenCode',   installHint: 'npm install -g opencode' },
 ];
 
-function checkOne(b: Omit<BackendInfo, 'installed' | 'version'>): BackendInfo {
+// ================================================================
+// 获取 npm 全局 bin 目录
+// 解决 PATH 未包含 npm global bin 时的检测失败问题
+// ================================================================
+
+let _cachedNpmBin: string | null | undefined = undefined;
+
+function getNpmGlobalBin(): string | null {
+  if (_cachedNpmBin !== undefined) return _cachedNpmBin;
   try {
-    let version: string | null = null;
-    if (b.type === 'claude') {
-      version = execSync('claude --version', { encoding: 'utf-8', timeout: 5000 }).trim();
-    } else if (b.type === 'codex') {
-      version = execSync('codex --version', { encoding: 'utf-8', timeout: 5000 }).trim();
-    } else {
-      version = execSync('opencode version', { encoding: 'utf-8', timeout: 5000 }).trim();
+    const prefix = execSync('npm get prefix', { encoding: 'utf-8', timeout: 5000 }).trim();
+    if (!prefix) {
+      _cachedNpmBin = null;
+      return null;
     }
+    const binDir = path.join(prefix, 'bin');
+    if (fs.existsSync(binDir)) {
+      _cachedNpmBin = binDir;
+      return binDir;
+    }
+    _cachedNpmBin = null;
+    return null;
+  } catch {
+    _cachedNpmBin = null;
+    return null;
+  }
+}
+
+function checkOne(b: Omit<BackendInfo, 'installed' | 'version'>): BackendInfo {
+  const versionCmd: Record<string, string> = {
+    claude: 'claude --version',
+    codex: 'codex --version',
+    opencode: 'opencode version',
+  };
+
+  // 先尝试 PATH 中的命令
+  try {
+    const version = execSync(versionCmd[b.type], { encoding: 'utf-8', timeout: 5000 }).trim();
     return { ...b, installed: true, version };
   } catch {
-    return { ...b, installed: false, version: null };
+    // PATH 中找不到，继续尝试 npm global bin
+  }
+
+  // fallback：直接从 npm global bin 目录运行
+  const npmBin = getNpmGlobalBin();
+  if (npmBin) {
+    const binPath = path.join(npmBin, b.type);
+    try {
+      if (fs.existsSync(binPath)) {
+        const version = execSync(`"${binPath}" --version`, { encoding: 'utf-8', timeout: 5000 }).trim();
+        return { ...b, installed: true, version };
+      }
+    } catch {
+      // bin 存在但执行失败，视为未安装
+    }
   }
+
+  return { ...b, installed: false, version: null };
 }
 
 export function checkAllBackends(): BackendInfo[] {
@@ -75,11 +121,16 @@ export async function installBackend(
   console.log(`   命令: ${b.installHint}\n`);
 
   try {
-    // 用 bash -lc 加载用户 shell 环境（.bashrc/.zshrc），确保 npm 在 PATH 中
-    const child = Bun.spawn(['bash', '-lc', b.installHint], {
+    // 获取 npm 全局 bin 目录，用于安装后验证（复用 getNpmGlobalBin 缓存）
+    const npmBinDir = getNpmGlobalBin();
+
+    // 用 zsh -ic 加载用户 shell 环境（匹配 macOS 默认 shell）
+    // 传入当前 PATH 环境变量，确保 npm 可执行文件可访问
+    const child = Bun.spawn(['zsh', '-ic', b.installHint], {
       stdout: 'pipe',
       stderr: 'pipe',
-      stdin: 'inherit',
+      stdin: 'ignore',
+      env: { ...process.env },
     });
 
     const decoder = new TextDecoder();
@@ -104,16 +155,35 @@ export async function installBackend(
 
     if (exitCode !== 0) {
       console.error(`\n❌ ${b.label} 安装失败 (退出码: ${exitCode})`);
+      console.error(`   可手动运行: ${b.installHint}`);
       return false;
     }
 
-    // 安装完成后验证
+    // 安装完成后验证 — 优先用 npm bin 目录直接检查
+    if (npmBinDir) {
+      const binPath = path.join(npmBinDir, b.type);
+      try {
+        if (fs.existsSync(binPath)) {
+          const version = execSync(`"${binPath}" --version`, { encoding: 'utf-8', timeout: 5000 }).trim();
+          console.log(`\n✅ ${b.label} 安装成功! 版本: ${version}`);
+          return true;
+        }
+      } catch {}
+    }
+
+    // fallback: 通过 PATH 查找
     const info = checkOne(b);
     if (info.installed) {
       console.log(`\n✅ ${b.label} 安装成功! 版本: ${info.version}`);
       return true;
     } else {
-      console.error(`\n❌ ${b.label} 安装后仍未检测到，请手动运行: ${b.installHint}`);
+      console.error(`\n❌ ${b.label} 安装后仍未检测到`);
+      if (npmBinDir) {
+        console.error(`   npm 全局 bin 目录: ${npmBinDir}`);
+        console.error(`   建议将该目录添加到 PATH，或手动运行: ${b.installHint}`);
+      } else {
+        console.error(`   请手动运行: ${b.installHint}`);
+      }
       return false;
     }
   } catch (e: any) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "imtoagent",
-  "version": "0.3.0",
-  "description": "IM \u2194 Agent \u7edf\u4e00\u7f51\u5173 \u2014 \u98de\u4e66/Telegram/\u5fae\u4fe1/\u4f01\u4e1a\u5fae\u4fe1\u5bf9\u63a5 Claude Code/Codex/OpenCode",
+  "version": "0.3.1",
+  "description": "IM ↔ Agent 统一网关 — 飞书/Telegram/微信/企业微信对接 Claude Code/Codex/OpenCode",
   "type": "module",
   "bin": {
     "imtoagent": "./bin/imtoagent.cjs"