agentgui 1.0.520 → 1.0.521

package/lib/tool-manager.js

@@ -1,15 +1,14 @@
 import { spawn } from 'child_process';
-import { execSync } from 'child_process';
 import os from 'os';
 import fs from 'fs';
 import path from 'path';
 
 const isWindows = os.platform() === 'win32';
 const TOOLS = [
-  { id: 'gm-oc', name: 'OpenCode', pkg: 'opencode-ai', pluginId: 'opencode-ai' },
-  { id: 'gm-gc', name: 'Gemini CLI', pkg: '@google/gemini-cli', pluginId: 'gm' },
-  { id: 'gm-kilo', name: 'Kilo', pkg: '@kilocode/cli', pluginId: '@kilocode/cli' },
-  { id: 'gm-cc', name: 'Claude Code', pkg: '@anthropic-ai/claude-code', pluginId: 'gm' },
+  { id: 'gm-oc', name: 'gm-oc', pkg: 'gm-oc', pluginId: 'gm-oc' },
+  { id: 'gm-gc', name: 'gm-gc', pkg: 'gm-gc', pluginId: 'gm' },
+  { id: 'gm-kilo', name: 'gm-kilo', pkg: 'gm-kilo', pluginId: 'gm-kilo' },
+  { id: 'gm-cc', name: 'gm-cc', pkg: 'gm-cc', pluginId: 'gm-cc' },
 ];
 
 const statusCache = new Map();
@@ -18,11 +17,6 @@ const versionCache = new Map();
 
 const getTool = (id) => TOOLS.find(t => t.id === id);
 
-const getNodeModulesPath = () => {
-  const __dirname = path.dirname(new URL(import.meta.url).pathname);
-  return path.join(__dirname, '..', 'node_modules');
-};
-
 const getInstalledVersion = (pkg, pluginId = null) => {
   try {
     const homeDir = os.homedir();
@@ -86,45 +80,6 @@ const getInstalledVersion = (pkg, pluginId = null) => {
   return null;
 };
 
-const getCliToolVersion = async (pkg) => {
-  try {
-    const cliName = pkg.split('/').pop();
-    const nodeModulesPath = getNodeModulesPath();
-    const cliBinPath = path.join(nodeModulesPath, '.bin', cliName);
-
-    if (fs.existsSync(cliBinPath)) {
-      const result = await new Promise((resolve) => {
-        const proc = spawn(cliBinPath, ['--version'], {
-          stdio: ['pipe', 'pipe', 'pipe'],
-          timeout: 5000,
-          shell: isWindows
-        });
-        let stdout = '';
-        proc.stdout.on('data', (d) => { stdout += d.toString(); });
-        const timer = setTimeout(() => {
-          try { proc.kill('SIGKILL'); } catch (_) {}
-          resolve(null);
-        }, 5000);
-        proc.on('close', (code) => {
-          clearTimeout(timer);
-          if (code === 0) {
-            const version = stdout.trim().split(/[\s\(]/)[0];
-            resolve(version && version.match(/^\d+\.\d+/) ? version : null);
-          } else {
-            resolve(null);
-          }
-        });
-        proc.on('error', () => {
-          clearTimeout(timer);
-          resolve(null);
-        });
-      });
-      return result;
-    }
-  } catch (_) {}
-  return null;
-};
-
 const getPublishedVersion = async (pkg) => {
   try {
     const cacheKey = `published-${pkg}`;
@@ -165,35 +120,15 @@ const getPublishedVersion = async (pkg) => {
   }
 };
 
-const checkToolInstalled = (pkg) => {
+const checkToolInstalled = (pluginId) => {
   try {
     const homeDir = os.homedir();
-
-    // Check Claude Code plugins
-    if (fs.existsSync(path.join(homeDir, '.claude', 'plugins', pkg))) {
-      return true;
-    }
-
-    // Check OpenCode agents
-    if (fs.existsSync(path.join(homeDir, '.config', 'opencode', 'agents', pkg))) {
-      return true;
-    }
-
-    // Check Gemini CLI agents (always stored as 'gm' directory)
-    if (fs.existsSync(path.join(homeDir, '.gemini', 'extensions', 'gm'))) {
-      return true;
-    }
-
-    // Check Kilo agents
-    if (fs.existsSync(path.join(homeDir, '.config', 'kilo', 'agents', pkg))) {
-      return true;
-    }
-
-    // Check node_modules as fallback
-    const nodeModulesPath = getNodeModulesPath();
-    if (fs.existsSync(path.join(nodeModulesPath, pkg))) {
-      return true;
-    }
+    if (fs.existsSync(path.join(homeDir, '.claude', 'plugins', pluginId))) return true;
+    if (fs.existsSync(path.join(homeDir, '.gemini', 'extensions', pluginId))) return true;
+    if (fs.existsSync(path.join(homeDir, '.config', 'opencode', 'agents', pluginId + '.md'))) return true;
+    if (fs.existsSync(path.join(homeDir, '.config', 'kilo', 'agents', pluginId + '.md'))) return true;
+    if (fs.existsSync(path.join(homeDir, '.config', 'opencode', 'agents', 'gm.md'))) return true;
+    if (fs.existsSync(path.join(homeDir, '.config', 'kilo', 'agents', 'gm.md'))) return true;
   } catch (_) {}
   return false;
 };
@@ -213,12 +148,10 @@ const compareVersions = (v1, v2) => {
 
 const checkToolViaBunx = async (pkg, pluginId = null) => {
   try {
-    const installed = checkToolInstalled(pkg);
+    const actualPluginId = pluginId || pkg;
+    const installed = checkToolInstalled(actualPluginId);
     const installedVersion = getInstalledVersion(pkg, pluginId);
     const publishedVersion = await getPublishedVersion(pkg);
-
-    // Determine if update is needed by comparing versions
-    // Do NOT run bunx --version as it triggers installation/upgrade
     const needsUpdate = installed && publishedVersion && compareVersions(installedVersion, publishedVersion);
     const isUpToDate = installed && !needsUpdate;
 
@@ -231,8 +164,9 @@ const checkToolViaBunx = async (pkg, pluginId = null) => {
       publishedVersion
     };
   } catch (_) {
-    const installedVersion = getInstalledVersion(pkg);
-    return { installed: checkToolInstalled(pkg), isUpToDate: false, upgradeNeeded: false, output: '', installedVersion, publishedVersion: null };
+    const actualPluginId = pluginId || pkg;
+    const installedVersion = getInstalledVersion(pkg, pluginId);
+    return { installed: checkToolInstalled(actualPluginId), isUpToDate: false, upgradeNeeded: false, output: '', installedVersion, publishedVersion: null };
   }
 };
 
@@ -382,14 +316,8 @@ export async function install(toolId, onProgress) {
       versionCache.clear();
 
       const version = getInstalledVersion(tool.pkg, tool.pluginId);
-      if (!version) {
-        console.warn(`[tool-manager] Install succeeded but version detection failed for ${toolId}. Attempting CLI check...`);
-        const cliVersion = await getCliToolVersion(tool.pkg);
-        const freshStatus = await checkToolStatusAsync(toolId);
-        return { success: true, error: null, version: cliVersion || 'unknown', ...freshStatus };
-      }
       const freshStatus = await checkToolStatusAsync(toolId);
-      return { success: true, error: null, version, ...freshStatus };
+      return { success: true, error: null, version: version || freshStatus.publishedVersion || 'unknown', ...freshStatus };
     }
     return result;
   } finally {
@@ -408,22 +336,12 @@ export async function update(toolId, onProgress) {
   try {
     const result = await spawnBunxProc(tool.pkg, onProgress);
     if (result.success) {
-      // Give the filesystem a moment to settle after bunx update
       await new Promise(r => setTimeout(r, 500));
-
-      // Aggressively clear all version caches to force fresh detection
       statusCache.delete(toolId);
       versionCache.clear();
-
       const version = getInstalledVersion(tool.pkg, tool.pluginId);
-      if (!version) {
-        console.warn(`[tool-manager] Update succeeded but version detection failed for ${toolId}. Attempting CLI check...`);
-        const cliVersion = await getCliToolVersion(tool.pkg);
-        const freshStatus = await checkToolStatusAsync(toolId);
-        return { success: true, error: null, version: cliVersion || 'unknown', ...freshStatus };
-      }
       const freshStatus = await checkToolStatusAsync(toolId);
-      return { success: true, error: null, version, ...freshStatus };
+      return { success: true, error: null, version: version || freshStatus.publishedVersion || 'unknown', ...freshStatus };
     }
     return result;
   } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.520",
+  "version": "1.0.521",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",