agentgui 1.0.511 → 1.0.513

package/lib/tool-manager.js

@@ -6,10 +6,10 @@ import path from 'path';
 
 const isWindows = os.platform() === 'win32';
 const TOOLS = [
-  { id: 'gm-oc', name: 'OpenCode', pkg: 'opencode-ai' },
-  { id: 'gm-gc', name: 'Gemini CLI', pkg: '@google/gemini-cli' },
-  { id: 'gm-kilo', name: 'Kilo', pkg: '@kilocode/cli' },
-  { id: 'gm-cc', name: 'Claude Code', pkg: '@anthropic-ai/claude-code' },
+  { 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' },
 ];
 
 const statusCache = new Map();
@@ -23,12 +23,14 @@ const getNodeModulesPath = () => {
   return path.join(__dirname, '..', 'node_modules');
 };
 
-const getInstalledVersion = (pkg) => {
+const getInstalledVersion = (pkg, pluginId = null) => {
   try {
     const homeDir = os.homedir();
+    const tool = pluginId ? TOOLS.find(t => t.pkg === pkg) : null;
+    const actualPluginId = pluginId || (tool?.pluginId) || pkg;
 
-    // Check Claude Code plugins
-    const claudePath = path.join(homeDir, '.claude', 'plugins', pkg, 'plugin.json');
+    // Check Claude Code plugins using correct pluginId
+    const claudePath = path.join(homeDir, '.claude', 'plugins', actualPluginId, 'plugin.json');
     if (fs.existsSync(claudePath)) {
       try {
         const pluginJson = JSON.parse(fs.readFileSync(claudePath, 'utf-8'));
@@ -38,8 +40,8 @@ const getInstalledVersion = (pkg) => {
       }
     }
 
-    // Check OpenCode agents
-    const opencodePath = path.join(homeDir, '.config', 'opencode', 'agents', pkg, 'plugin.json');
+    // Check OpenCode agents using correct pluginId
+    const opencodePath = path.join(homeDir, '.config', 'opencode', 'agents', actualPluginId, 'plugin.json');
     if (fs.existsSync(opencodePath)) {
       try {
         const pluginJson = JSON.parse(fs.readFileSync(opencodePath, 'utf-8'));
@@ -50,7 +52,7 @@ const getInstalledVersion = (pkg) => {
     }
 
     // Check Gemini CLI agents (stored as 'gm' directory)
-    const geminiPath = path.join(homeDir, '.gemini', 'extensions', 'gm', 'plugin.json');
+    const geminiPath = path.join(homeDir, '.gemini', 'extensions', actualPluginId, 'plugin.json');
     if (fs.existsSync(geminiPath)) {
       try {
         const pluginJson = JSON.parse(fs.readFileSync(geminiPath, 'utf-8'));
@@ -60,7 +62,7 @@ const getInstalledVersion = (pkg) => {
       }
     }
     // Try gemini-extension.json as fallback
-    const geminiExtPath = path.join(homeDir, '.gemini', 'extensions', 'gm', 'gemini-extension.json');
+    const geminiExtPath = path.join(homeDir, '.gemini', 'extensions', actualPluginId, 'gemini-extension.json');
     if (fs.existsSync(geminiExtPath)) {
       try {
         const extJson = JSON.parse(fs.readFileSync(geminiExtPath, 'utf-8'));
@@ -70,8 +72,8 @@ const getInstalledVersion = (pkg) => {
       }
     }
 
-    // Check Kilo agents
-    const kiloPath = path.join(homeDir, '.config', 'kilo', 'agents', pkg, 'plugin.json');
+    // Check Kilo agents using correct pluginId
+    const kiloPath = path.join(homeDir, '.config', 'kilo', 'agents', actualPluginId, 'plugin.json');
     if (fs.existsSync(kiloPath)) {
       try {
         const pluginJson = JSON.parse(fs.readFileSync(kiloPath, 'utf-8'));
@@ -379,7 +381,7 @@ export async function install(toolId, onProgress) {
       statusCache.delete(toolId);
       versionCache.clear();
 
-      const version = getInstalledVersion(tool.pkg);
+      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);
@@ -413,7 +415,7 @@ export async function update(toolId, onProgress) {
       statusCache.delete(toolId);
       versionCache.clear();
 
-      const version = getInstalledVersion(tool.pkg);
+      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);

package/package.json

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

package/server.js

@@ -1817,15 +1817,28 @@ const server = http.createServer(async (req, res) => {
 
     if (pathOnly.match(/^\/api\/tools\/([^/]+)\/status$/)) {
       const toolId = pathOnly.match(/^\/api\/tools\/([^/]+)\/status$/)[1];
-      const status = toolManager.checkToolStatus(toolId);
-      if (!status) {
+      const dbStatus = queries.getToolStatus(toolId);
+      const tmStatus = toolManager.checkToolStatus(toolId);
+      if (!tmStatus && !dbStatus) {
         sendJSON(req, res, 404, { error: 'Tool not found' });
         return;
       }
+
+      // Merge database status with tool manager status
+      const status = {
+        toolId,
+        installed: tmStatus?.installed || (dbStatus?.status === 'installed'),
+        isUpToDate: tmStatus?.isUpToDate || false,
+        upgradeNeeded: tmStatus?.upgradeNeeded || false,
+        status: dbStatus?.status || (tmStatus?.installed ? 'installed' : 'not_installed'),
+        installedVersion: dbStatus?.version || tmStatus?.installedVersion || null,
+        timestamp: Date.now(),
+        error_message: dbStatus?.error_message || null
+      };
+
       if (status.installed) {
-        const updates = await toolManager.checkForUpdates(toolId, status.version);
-        status.hasUpdate = updates.hasUpdate;
-        status.latestVersion = updates.latestVersion;
+        const updates = await toolManager.checkForUpdates(toolId);
+        status.hasUpdate = updates.needsUpdate || false;
       }
       sendJSON(req, res, 200, status);
       return;
@@ -1850,17 +1863,13 @@ const server = http.createServer(async (req, res) => {
         if (!installCompleted) {
           installCompleted = true;
           queries.updateToolStatus(toolId, { status: 'failed', error_message: 'Install timeout after 6 minutes' });
-          if (wsOptimizer && wsOptimizer.broadcast) {
-            wsOptimizer.broadcast({ type: 'tool_install_failed', toolId, data: { success: false, error: 'Install timeout after 6 minutes' } });
-          }
+          broadcastSync({ type: 'tool_install_failed', toolId, data: { success: false, error: 'Install timeout after 6 minutes' } });
           queries.addToolInstallHistory(toolId, 'install', 'failed', 'Install timeout after 6 minutes');
         }
       }, 360000);
 
       toolManager.install(toolId, (msg) => {
-        if (wsOptimizer && wsOptimizer.broadcast) {
-          wsOptimizer.broadcast({ type: 'tool_install_progress', toolId, data: msg });
-        }
+        broadcastSync({ type: 'tool_install_progress', toolId, data: msg });
       }).then(async (result) => {
         clearTimeout(installTimeout);
         if (installCompleted) return;
@@ -1871,16 +1880,12 @@ const server = http.createServer(async (req, res) => {
           queries.updateToolStatus(toolId, { status: 'installed', version, installed_at: Date.now() });
           const freshStatus = await toolManager.checkToolStatusAsync(toolId);
           console.log(`[TOOLS-API] Fresh status after install for ${toolId}:`, JSON.stringify(freshStatus));
-          if (wsOptimizer && wsOptimizer.broadcast) {
-            wsOptimizer.broadcast({ type: 'tool_install_complete', toolId, data: { success: true, ...freshStatus } });
-          }
+          broadcastSync({ type: 'tool_install_complete', toolId, data: { success: true, ...freshStatus } });
           queries.addToolInstallHistory(toolId, 'install', 'success', null);
         } else {
           console.error(`[TOOLS-API] Install failed for ${toolId}:`, result.error);
           queries.updateToolStatus(toolId, { status: 'failed', error_message: result.error });
-          if (wsOptimizer && wsOptimizer.broadcast) {
-            wsOptimizer.broadcast({ type: 'tool_install_failed', toolId, data: result });
-          }
+          broadcastSync({ type: 'tool_install_failed', toolId, data: result });
           queries.addToolInstallHistory(toolId, 'install', 'failed', result.error);
         }
       }).catch((err) => {
@@ -1890,9 +1895,7 @@ const server = http.createServer(async (req, res) => {
         const error = err?.message || 'Unknown error';
         console.error(`[TOOLS-API] Install error for ${toolId}:`, error);
         queries.updateToolStatus(toolId, { status: 'failed', error_message: error });
-        if (wsOptimizer && wsOptimizer.broadcast) {
-          wsOptimizer.broadcast({ type: 'tool_install_failed', toolId, data: { success: false, error } });
-        }
+        broadcastSync({ type: 'tool_install_failed', toolId, data: { success: false, error } });
         queries.addToolInstallHistory(toolId, 'install', 'failed', error);
       });
       return;
@@ -1919,17 +1922,13 @@ const server = http.createServer(async (req, res) => {
         if (!updateCompleted) {
           updateCompleted = true;
           queries.updateToolStatus(toolId, { status: 'failed', error_message: 'Update timeout after 6 minutes' });
-          if (wsOptimizer && wsOptimizer.broadcast) {
-            wsOptimizer.broadcast({ type: 'tool_update_failed', toolId, data: { success: false, error: 'Update timeout after 6 minutes' } });
-          }
+          broadcastSync({ type: 'tool_update_failed', toolId, data: { success: false, error: 'Update timeout after 6 minutes' } });
           queries.addToolInstallHistory(toolId, 'update', 'failed', 'Update timeout after 6 minutes');
         }
       }, 360000);
 
       toolManager.update(toolId, (msg) => {
-        if (wsOptimizer && wsOptimizer.broadcast) {
-          wsOptimizer.broadcast({ type: 'tool_update_progress', toolId, data: msg });
-        }
+        broadcastSync({ type: 'tool_update_progress', toolId, data: msg });
       }).then(async (result) => {
         clearTimeout(updateTimeout);
         if (updateCompleted) return;
@@ -1940,16 +1939,12 @@ const server = http.createServer(async (req, res) => {
           queries.updateToolStatus(toolId, { status: 'installed', version, installed_at: Date.now() });
           const freshStatus = await toolManager.checkToolStatusAsync(toolId);
           console.log(`[TOOLS-API] Fresh status after update for ${toolId}:`, JSON.stringify(freshStatus));
-          if (wsOptimizer && wsOptimizer.broadcast) {
-            wsOptimizer.broadcast({ type: 'tool_update_complete', toolId, data: { success: true, ...freshStatus } });
-          }
+          broadcastSync({ type: 'tool_update_complete', toolId, data: { success: true, ...freshStatus } });
           queries.addToolInstallHistory(toolId, 'update', 'success', null);
         } else {
           console.error(`[TOOLS-API] Update failed for ${toolId}:`, result.error);
           queries.updateToolStatus(toolId, { status: 'failed', error_message: result.error });
-          if (wsOptimizer && wsOptimizer.broadcast) {
-            wsOptimizer.broadcast({ type: 'tool_update_failed', toolId, data: result });
-          }
+          broadcastSync({ type: 'tool_update_failed', toolId, data: result });
           queries.addToolInstallHistory(toolId, 'update', 'failed', result.error);
         }
       }).catch((err) => {
@@ -1959,9 +1954,7 @@ const server = http.createServer(async (req, res) => {
         const error = err?.message || 'Unknown error';
         console.error(`[TOOLS-API] Update error for ${toolId}:`, error);
         queries.updateToolStatus(toolId, { status: 'failed', error_message: error });
-        if (wsOptimizer && wsOptimizer.broadcast) {
-          wsOptimizer.broadcast({ type: 'tool_update_failed', toolId, data: { success: false, error } });
-        }
+        broadcastSync({ type: 'tool_update_failed', toolId, data: { success: false, error } });
         queries.addToolInstallHistory(toolId, 'update', 'failed', error);
       });
       return;