imtoagent 0.3.12 → 0.3.14

package/modules/agent/opencode-adapter.ts

@@ -10,6 +10,10 @@ import type { AgentAdapter, AgentInput, AgentOutput } from '../core/types';
 import { buildAttachmentHint } from '../core/types';
 import { buildSystemPrompt } from '../prompt-builder';
 import { getDataDir } from '../utils/paths';
+import { getNpmGlobalBin } from '../utils/backend-check';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
 
 // ================================================================
 // OpenCodeAdapter 上下文
@@ -248,8 +252,21 @@ export async function startOpenCodeServer(): Promise<void> {
   } catch {}
 
   console.log('[OpenCodeAdapter] starting opencode serve...');
+
+  // Resolve opencode binary with fallbacks (matches checkOne() logic)
+  const home = os.homedir();
+  const customPath = path.join(home, '.opencode', 'bin', 'opencode');
+  const npmBin = getNpmGlobalBin();
+  const npmBinPath = npmBin ? path.join(npmBin, 'opencode') : null;
+  const ocBinPath =
+    (npmBinPath && fs.existsSync(npmBinPath)) ? npmBinPath :
+    fs.existsSync(customPath) ? customPath :
+    'opencode'; // fallback to PATH lookup
+
+  console.log(`[OpenCodeAdapter] Using opencode binary: ${ocBinPath}`);
+
   const child = Bun.spawn(
-    ['opencode', 'serve', '--port', String(OC_PORT), '--hostname', '127.0.0.1'],
+    [ocBinPath, 'serve', '--port', String(OC_PORT), '--hostname', '127.0.0.1'],
     {
       cwd: getDataDir(),
       env: {

package/modules/utils/backend-check.ts

@@ -28,7 +28,7 @@ const BACKEND_DEFS: Omit<BackendInfo, 'installed' | 'version'>[] = [
 
 let _cachedNpmBin: string | null | undefined = undefined;
 
-function getNpmGlobalBin(): string | null {
+export function getNpmGlobalBin(): string | null {
   if (_cachedNpmBin !== undefined) return _cachedNpmBin;
   try {
     const prefix = execSync('npm get prefix', { encoding: 'utf-8', timeout: 5000 }).trim();
@@ -111,6 +111,38 @@ export function formatBackendStatus(backends: BackendInfo[]): string {
   }).join('\n');
 }
 
+// ================================================================
+// Shell config helpers — auto-add paths for user
+// ================================================================
+
+function getShellConfigFile(): string | null {
+  const candidates = ['.zshrc', '.bashrc', '.bash_profile', '.profile'];
+  const home = os.homedir();
+  for (const name of candidates) {
+    const p = path.join(home, name);
+    if (fs.existsSync(p)) return p;
+  }
+  // fallback: create .zshrc on macOS
+  if (process.platform === 'darwin') {
+    return path.join(home, '.zshrc');
+  }
+  return null;
+}
+
+function ensurePathInConfig(configPath: string, binDir: string): void {
+  const exportLine = `export PATH="${binDir}:$PATH"`;
+  try {
+    if (fs.existsSync(configPath)) {
+      const content = fs.readFileSync(configPath, 'utf-8');
+      // Skip if already present
+      if (content.includes(binDir)) return;
+    }
+    fs.appendFileSync(configPath, `\n# Added by imtoagent setup\n${exportLine}\n`);
+    // Also update current process.env for immediate detection
+    process.env.PATH = `${binDir}:${process.env.PATH}`;
+  } catch {}
+}
+
 // ================================================================
 // 自动安装后端 CLI
 // ================================================================
@@ -171,7 +203,8 @@ export async function installBackend(
       return false;
     }
 
-    // 安装完成后验证 — 优先用 npm bin 目录直接检查
+    // 安装完成后验证 — 按优先级依次检查
+    // 1) npm global bin
     if (npmBinDir) {
       const binPath = path.join(npmBinDir, b.type);
       try {
@@ -183,18 +216,25 @@ export async function installBackend(
       } catch {}
     }
 
-    // fallback 2: check custom install paths
+    // 2) OpenCode custom install path
     if (type === 'opencode') {
-      const opencodePath = path.join(os.homedir(), '.opencode', 'bin', 'opencode');
+      const opencodeBinDir = path.join(os.homedir(), '.opencode', 'bin');
+      const opencodePath = path.join(opencodeBinDir, 'opencode');
       if (fs.existsSync(opencodePath)) {
-        const version = execSync(`"${opencodePath}" version`, { encoding: 'utf-8', timeout: 5000 }).trim();
-        console.log(`\n✅ ${b.label} installed successfully! Version: ${version}`);
-        console.log(`   ⚠️  Add to PATH: echo 'export PATH=$HOME/.opencode/bin:$PATH' >> ~/.zshrc`);
-        return true;
+        try {
+          const version = execSync(`"${opencodePath}" version`, { encoding: 'utf-8', timeout: 5000 }).trim();
+          // 自动配置 PATH（如果 shell 配置文件存在且未包含该行）
+          const shellConfig = getShellConfigFile();
+          if (shellConfig) {
+            ensurePathInConfig(shellConfig, opencodeBinDir);
+          }
+          console.log(`\n✅ ${b.label} installed successfully! Version: ${version}`);
+          return true;
+        } catch {}
       }
     }
 
-    // fallback 3: via PATH
+    // 3) via PATH
     const info = checkOne(b);
     if (info.installed) {
       console.log(`\n✅ ${b.label} installed successfully! Version: ${info.version}`);

package/package.json

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