agentgui 1.0.614 → 1.0.615

package/lib/tool-manager.js

@@ -5,11 +5,15 @@ import path from 'path';
 
 const isWindows = os.platform() === 'win32';
 const TOOLS = [
-  { id: 'gm-cc', name: 'Claude Code', pkg: 'gm-cc', pluginId: 'gm-cc' },
-  { id: 'gm-oc', name: 'OpenCode', pkg: 'gm-oc', pluginId: 'gm-oc' },
-  { id: 'gm-gc', name: 'Gemini CLI', pkg: 'gm-gc', pluginId: 'gm' },
-  { id: 'gm-kilo', name: 'Kilo', pkg: 'gm-kilo', pluginId: 'gm-kilo' },
-  { id: 'codex', name: 'Codex CLI', pkg: '@openai/codex', pluginId: 'codex' },
+  { id: 'cli-claude', name: 'Claude Code', pkg: '@anthropic-ai/claude-code', category: 'cli' },
+  { id: 'cli-opencode', name: 'OpenCode', pkg: 'opencode-ai', category: 'cli' },
+  { id: 'cli-gemini', name: 'Gemini CLI', pkg: '@google/gemini-cli', category: 'cli' },
+  { id: 'cli-kilo', name: 'Kilo Code', pkg: '@kilocode/cli', category: 'cli' },
+  { id: 'cli-codex', name: 'Codex CLI', pkg: '@openai/codex', category: 'cli' },
+  { id: 'gm-cc', name: 'GM Claude', pkg: 'gm-cc', pluginId: 'gm-cc', category: 'plugin' },
+  { id: 'gm-oc', name: 'GM OpenCode', pkg: 'gm-oc', pluginId: 'gm-oc', category: 'plugin' },
+  { id: 'gm-gc', name: 'GM Gemini', pkg: 'gm-gc', pluginId: 'gm', category: 'plugin' },
+  { id: 'gm-kilo', name: 'GM Kilo', pkg: 'gm-kilo', pluginId: 'gm-kilo', category: 'plugin' },
 ];
 
 const statusCache = new Map();
@@ -132,6 +136,34 @@ const getPublishedVersion = async (pkg) => {
   }
 };
 
+const checkCliInstalled = (pkg) => {
+  try {
+    const cmd = isWindows ? 'where' : 'which';
+    const binMap = { '@anthropic-ai/claude-code': 'claude', 'opencode-ai': 'opencode', '@google/gemini-cli': 'gemini', '@kilocode/cli': 'kilo', '@openai/codex': 'codex' };
+    const bin = binMap[pkg];
+    if (bin) {
+      const { execSync } = require('child_process');
+      execSync(`${cmd} ${bin}`, { stdio: 'pipe', timeout: 3000 });
+      return true;
+    }
+  } catch (_) {}
+  return false;
+};
+
+const getCliVersion = (pkg) => {
+  try {
+    const binMap = { '@anthropic-ai/claude-code': 'claude', 'opencode-ai': 'opencode', '@google/gemini-cli': 'gemini', '@kilocode/cli': 'kilo', '@openai/codex': 'codex' };
+    const bin = binMap[pkg];
+    if (bin) {
+      const { execSync } = require('child_process');
+      const out = execSync(`${bin} --version`, { stdio: 'pipe', timeout: 5000, encoding: 'utf8' });
+      const match = out.match(/(\d+\.\d+\.\d+)/);
+      if (match) return match[1];
+    }
+  } catch (_) {}
+  return null;
+};
+
 const checkToolInstalled = (pluginId) => {
   try {
     const homeDir = os.homedir();
@@ -141,7 +173,6 @@ const checkToolInstalled = (pluginId) => {
     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;
-    if (pluginId === 'codex' && fs.existsSync(path.join(homeDir, '.codex', 'plugin.json'))) return true;
   } catch (_) {}
   return false;
 };
@@ -159,27 +190,20 @@ const compareVersions = (v1, v2) => {
   return false;
 };
 
-const checkToolViaBunx = async (pkg, pluginId = null) => {
+const checkToolViaBunx = async (pkg, pluginId = null, category = 'plugin') => {
   try {
-    const actualPluginId = pluginId || pkg;
-    const installed = checkToolInstalled(actualPluginId);
-    const installedVersion = getInstalledVersion(pkg, pluginId);
+    const isCli = category === 'cli';
+    const installed = isCli ? checkCliInstalled(pkg) : checkToolInstalled(pluginId || pkg);
+    const installedVersion = isCli ? getCliVersion(pkg) : getInstalledVersion(pkg, pluginId);
     const publishedVersion = await getPublishedVersion(pkg);
     const needsUpdate = installed && publishedVersion && compareVersions(installedVersion, publishedVersion);
     const isUpToDate = installed && !needsUpdate;
-
-    return {
-      installed,
-      isUpToDate,
-      upgradeNeeded: needsUpdate,
-      output: 'version-check',
-      installedVersion,
-      publishedVersion
-    };
+    return { installed, isUpToDate, upgradeNeeded: needsUpdate, output: 'version-check', installedVersion, publishedVersion };
   } catch (_) {
-    const actualPluginId = pluginId || pkg;
-    const installedVersion = getInstalledVersion(pkg, pluginId);
-    return { installed: checkToolInstalled(actualPluginId), isUpToDate: false, upgradeNeeded: false, output: '', installedVersion, publishedVersion: null };
+    const isCli = category === 'cli';
+    const installed = isCli ? checkCliInstalled(pkg) : checkToolInstalled(pluginId || pkg);
+    const installedVersion = isCli ? getCliVersion(pkg) : getInstalledVersion(pkg, pluginId);
+    return { installed, isUpToDate: false, upgradeNeeded: false, output: '', installedVersion, publishedVersion: null };
   }
 };
 
@@ -218,9 +242,10 @@ export async function checkToolStatusAsync(toolId) {
     };
   }
 
-  const result = await checkToolViaBunx(tool.pkg, tool.pluginId);
+  const result = await checkToolViaBunx(tool.pkg, tool.pluginId, tool.category);
   const status = {
     toolId,
+    category: tool.category,
     installed: result.installed,
     isUpToDate: result.isUpToDate,
     upgradeNeeded: result.upgradeNeeded,
@@ -241,6 +266,29 @@ export async function checkForUpdates(toolId) {
   return { needsUpdate: status.upgradeNeeded && status.installed };
 }
 
+const spawnNpmInstall = (pkg, onProgress) => new Promise((resolve) => {
+  const cmd = isWindows ? 'npm.cmd' : 'npm';
+  let completed = false, stderr = '', stdout = '';
+  let proc;
+  try {
+    proc = spawn(cmd, ['install', '-g', pkg], { stdio: ['pipe', 'pipe', 'pipe'], timeout: 300000, shell: isWindows });
+  } catch (err) {
+    return resolve({ success: false, error: `Failed to spawn npm install: ${err.message}` });
+  }
+  if (!proc) return resolve({ success: false, error: 'Failed to spawn npm process' });
+  const timer = setTimeout(() => { if (!completed) { completed = true; try { proc.kill('SIGKILL'); } catch (_) {} resolve({ success: false, error: 'Timeout (5min)' }); } }, 300000);
+  const onData = (d) => { if (onProgress) onProgress({ type: 'progress', data: d.toString() }); };
+  if (proc.stdout) proc.stdout.on('data', (d) => { stdout += d.toString(); onData(d); });
+  if (proc.stderr) proc.stderr.on('data', (d) => { stderr += d.toString(); onData(d); });
+  proc.on('close', (code) => {
+    clearTimeout(timer);
+    if (completed) return;
+    completed = true;
+    resolve(code === 0 ? { success: true, error: null, pkg } : { success: false, error: (stdout + stderr).substring(0, 1000) || 'Failed' });
+  });
+  proc.on('error', (err) => { clearTimeout(timer); if (!completed) { completed = true; resolve({ success: false, error: err.message }); } });
+});
+
 const spawnBunxProc = (pkg, onProgress) => new Promise((resolve) => {
   const cmd = isWindows ? 'bun.cmd' : 'bun';
   let completed = false, stderr = '', stdout = '';
@@ -313,22 +361,22 @@ const spawnBunxProc = (pkg, onProgress) => new Promise((resolve) => {
   });
 });
 
+const spawnForTool = (tool, onProgress) => {
+  return tool.category === 'cli' ? spawnNpmInstall(tool.pkg, onProgress) : spawnBunxProc(tool.pkg, onProgress);
+};
+
 export async function install(toolId, onProgress) {
   const tool = getTool(toolId);
   if (!tool) return { success: false, error: 'Tool not found' };
   if (installLocks.get(toolId)) return { success: false, error: 'Install in progress' };
   installLocks.set(toolId, true);
   try {
-    const result = await spawnBunxProc(tool.pkg, onProgress);
+    const result = await spawnForTool(tool, onProgress);
     if (result.success) {
-      // Give the filesystem a moment to settle after bun x install
       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);
+      const version = tool.category === 'cli' ? getCliVersion(tool.pkg) : getInstalledVersion(tool.pkg, tool.pluginId);
       const freshStatus = await checkToolStatusAsync(toolId);
       return { success: true, error: null, version: version || freshStatus.publishedVersion || 'unknown', ...freshStatus };
     }
@@ -347,12 +395,12 @@ export async function update(toolId, onProgress) {
 
   installLocks.set(toolId, true);
   try {
-    const result = await spawnBunxProc(tool.pkg, onProgress);
+    const result = await spawnForTool(tool, onProgress);
     if (result.success) {
       await new Promise(r => setTimeout(r, 500));
       statusCache.delete(toolId);
       versionCache.clear();
-      const version = getInstalledVersion(tool.pkg, tool.pluginId);
+      const version = tool.category === 'cli' ? getCliVersion(tool.pkg) : getInstalledVersion(tool.pkg, tool.pluginId);
       const freshStatus = await checkToolStatusAsync(toolId);
       return { success: true, error: null, version: version || freshStatus.publishedVersion || 'unknown', ...freshStatus };
     }

package/lib/ws-handlers-util.js

@@ -261,6 +261,7 @@ export function register(router, deps) {
         id: t.id,
         name: t.name,
         pkg: t.pkg,
+        category: t.category || 'plugin',
         installed: t.installed,
         status: t.installed ? (t.isUpToDate ? 'installed' : 'needs_update') : 'not_installed',
         isUpToDate: t.isUpToDate,

package/package.json

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

package/server.js

@@ -1838,6 +1838,7 @@ const server = http.createServer(async (req, res) => {
         id: t.id,
         name: t.name,
         pkg: t.pkg,
+        category: t.category || 'plugin',
         installed: t.installed,
         status: t.installed ? (t.isUpToDate ? 'installed' : 'needs_update') : 'not_installed',
         isUpToDate: t.isUpToDate,
@@ -2006,10 +2007,11 @@ const server = http.createServer(async (req, res) => {
     }
 
     if (pathOnly === '/api/tools/update' && req.method === 'POST') {
-      sendJSON(req, res, 200, { updating: true, toolCount: 4 });
-      broadcastSync({ type: 'tools_update_started', tools: ['gm-cc', 'gm-oc', 'gm-gc', 'gm-kilo'] });
+      const allToolIds = ['cli-claude', 'cli-opencode', 'cli-gemini', 'cli-kilo', 'cli-codex', 'gm-cc', 'gm-oc', 'gm-gc', 'gm-kilo'];
+      sendJSON(req, res, 200, { updating: true, toolCount: allToolIds.length });
+      broadcastSync({ type: 'tools_update_started', tools: allToolIds });
       setImmediate(async () => {
-        const toolIds = ['gm-cc', 'gm-oc', 'gm-gc', 'gm-kilo'];
+        const toolIds = allToolIds;
         const results = {};
         for (const toolId of toolIds) {
           try {
@@ -4766,7 +4768,7 @@ function onServerReady() {
     }, 6000);
   }).catch(err => console.error('[ACP] Startup error:', err.message));
 
-  const toolIds = ['gm-oc', 'gm-gc', 'gm-kilo', 'gm-cc', 'codex'];
+  const toolIds = ['cli-claude', 'cli-opencode', 'cli-gemini', 'cli-kilo', 'cli-codex', 'gm-cc', 'gm-oc', 'gm-gc', 'gm-kilo'];
   queries.initializeToolInstallations(toolIds.map(id => ({ id })));
   console.log('[TOOLS] Starting background provisioning...');
   toolManager.autoProvision((evt) => {

package/static/css/tools-popup.css

@@ -458,3 +458,15 @@
   opacity: 0.6;
   cursor: not-allowed;
 }
+
+.tool-section-header {
+  grid-column: 1 / -1;
+  font-size: 0.7rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: var(--color-text-secondary);
+  padding: 0.5rem 0 0.25rem;
+  border-bottom: 1px solid var(--color-border);
+  margin-bottom: 0.25rem;
+}

package/static/js/terminal.js

@@ -157,11 +157,14 @@
 
   window.addEventListener('view-switched', function(e) {
     if (e.detail.view === 'terminal') {
-      if (!termActive) {
-        termActive = true;
-        connectAndStart();
-        setTimeout(function() { if (fitAddon) try { fitAddon.fit(); } catch(_) {} }, 100);
+      if (!ensureTerm()) {
+        setTimeout(function() { window.dispatchEvent(new CustomEvent('view-switched', { detail: { view: 'terminal' } })); }, 200);
+        return;
       }
+      termActive = true;
+      connectAndStart();
+      setTimeout(function() { if (fitAddon) try { fitAddon.fit(); } catch(_) {} }, 50);
+      setTimeout(function() { if (fitAddon) try { fitAddon.fit(); } catch(_) {} }, 300);
     } else if (termActive) {
       stopTerminal();
     }

package/static/js/tools-manager.js

@@ -304,49 +304,41 @@
       return;
     }
 
-    scroll.innerHTML = tools.map(function(tool) {
+    var cliTools = tools.filter(function(t) { return t.category === 'cli'; });
+    var pluginTools = tools.filter(function(t) { return t.category === 'plugin'; });
+    var uncategorized = tools.filter(function(t) { return !t.category; });
+
+    function renderToolCard(tool) {
       var statusClass = getStatusClass(tool);
       var isInstalling = tool.status === 'installing' || tool.status === 'updating';
       var versionInfo = '';
       if (tool.installedVersion || tool.publishedVersion) {
         versionInfo = '<div class="tool-versions">';
-        if (tool.installedVersion) {
-          versionInfo += '<span class="tool-version-item">v' + esc(tool.installedVersion) + '</span>';
-        }
-        if (tool.publishedVersion && tool.installedVersion !== tool.publishedVersion) {
-          versionInfo += '<span class="tool-version-item">(v' + esc(tool.publishedVersion) + ' available)</span>';
-        }
+        if (tool.installedVersion) versionInfo += '<span class="tool-version-item">v' + esc(tool.installedVersion) + '</span>';
+        if (tool.publishedVersion && tool.installedVersion !== tool.publishedVersion) versionInfo += '<span class="tool-version-item">(v' + esc(tool.publishedVersion) + ' available)</span>';
         versionInfo += '</div>';
       }
-
       return '<div class="tool-item">' +
         '<div style="display: flex; flex-direction: column; gap: 0.3rem;">' +
-        '<div class="tool-header">' +
-        '<span class="tool-name">' + esc(tool.name || tool.id) + '</span>' +
-        '</div>' +
-        '<div class="tool-status-indicator ' + statusClass + '">' +
-        '<span class="tool-status-dot"></span>' +
-        '<span>' + getStatusText(tool) + '</span>' +
-        '</div>' +
+        '<div class="tool-header"><span class="tool-name">' + esc(tool.name || tool.id) + '</span></div>' +
+        '<div class="tool-status-indicator ' + statusClass + '"><span class="tool-status-dot"></span><span>' + getStatusText(tool) + '</span></div>' +
         versionInfo +
-        (isInstalling && tool.progress !== undefined ?
-          '<div class="tool-progress-container">' +
-          '<div class="tool-progress-bar"><div class="tool-progress-fill" style="width:' + Math.min(tool.progress, 100) + '%"></div></div>' +
-          '</div>' : '') +
+        (isInstalling && tool.progress !== undefined ? '<div class="tool-progress-container"><div class="tool-progress-bar"><div class="tool-progress-fill" style="width:' + Math.min(tool.progress, 100) + '%"></div></div></div>' : '') +
         (tool.error_message ? '<div class="tool-error-message">Error: ' + esc(tool.error_message.substring(0, 40)) + '</div>' : '') +
         '</div>' +
         '<div class="tool-actions">' +
-        (tool.status === 'not_installed' ?
-          '<button class="tool-btn tool-btn-primary" onclick="window.toolsManager.install(\'' + tool.id + '\')" ' + (operationInProgress.has(tool.id) ? 'disabled' : '') + '>Install</button>' :
-          (tool.hasUpdate || tool.status === 'needs_update') ?
-          '<button class="tool-btn tool-btn-primary" onclick="window.toolsManager.update(\'' + tool.id + '\')" ' + (operationInProgress.has(tool.id) ? 'disabled' : '') + '>Update</button>' :
-          tool.status === 'failed' ?
-          '<button class="tool-btn tool-btn-primary" onclick="window.toolsManager.install(\'' + tool.id + '\')" ' + (operationInProgress.has(tool.id) ? 'disabled' : '') + '>Retry</button>' :
-          '<button class="tool-btn tool-btn-secondary" onclick="window.toolsManager.refresh()" ' + (isRefreshing ? 'disabled' : '') + '>✓</button>'
-        ) +
-        '</div>' +
-        '</div>';
-    }).join('');
+        (tool.status === 'not_installed' ? '<button class="tool-btn tool-btn-primary" onclick="window.toolsManager.install(\'' + tool.id + '\')" ' + (operationInProgress.has(tool.id) ? 'disabled' : '') + '>Install</button>' :
+          (tool.hasUpdate || tool.status === 'needs_update') ? '<button class="tool-btn tool-btn-primary" onclick="window.toolsManager.update(\'' + tool.id + '\')" ' + (operationInProgress.has(tool.id) ? 'disabled' : '') + '>Update</button>' :
+          tool.status === 'failed' ? '<button class="tool-btn tool-btn-primary" onclick="window.toolsManager.install(\'' + tool.id + '\')" ' + (operationInProgress.has(tool.id) ? 'disabled' : '') + '>Retry</button>' :
+          '<button class="tool-btn tool-btn-secondary" onclick="window.toolsManager.refresh()" ' + (isRefreshing ? 'disabled' : '') + '>✓</button>') +
+        '</div></div>';
+    }
+
+    var html = '';
+    if (cliTools.length) html += '<div class="tool-section-header">CLI Agents</div>' + cliTools.map(renderToolCard).join('');
+    if (pluginTools.length) html += '<div class="tool-section-header">GM Plugins</div>' + pluginTools.map(renderToolCard).join('');
+    if (uncategorized.length) html += uncategorized.map(renderToolCard).join('');
+    scroll.innerHTML = html;
   }
 
   function esc(s) {