agentgui 1.0.636 → 1.0.637

package/lib/plugins/tools-plugin.js

@@ -1,6 +1,10 @@
 // Tools plugin - tool detection, versioning, install/update handlers
 
-import { execSync } from 'child_process';
+import { spawnSync } from 'child_process';
+import os from 'os';
+
+const isWindows = os.platform() === 'win32';
+const bunCmd = isWindows ? 'bun.cmd' : 'bun';
 
 export default {
   name: 'tools',
@@ -15,19 +19,21 @@ export default {
 
     const detectTools = async () => {
       const tools = [
-        { id: 'gm-cc', pkg: '@anthropic-ai/claude-code', name: 'Claude Code' },
-        { id: 'gm-oc', pkg: 'opencode-ai', name: 'OpenCode' },
-        { id: 'gm-gc', pkg: '@google/gemini-cli', name: 'Gemini CLI' },
-        { id: 'gm-kilo', pkg: '@kilocode/cli', name: 'Kilo' },
+        { id: 'gm-cc', pkg: 'gm-cc', name: 'GM Claude' },
+        { id: 'gm-oc', pkg: 'gm-oc', name: 'GM OpenCode' },
+        { id: 'gm-gc', pkg: 'gm-gc', name: 'GM Gemini' },
+        { id: 'gm-kilo', pkg: 'gm-kilo', name: 'GM Kilo' },
+        { id: 'gm-codex', pkg: 'gm-codex', name: 'GM Codex' },
+        { id: 'cli-claude', pkg: '@anthropic-ai/claude-code', name: 'Claude Code' },
+        { id: 'cli-opencode', pkg: 'opencode-ai', name: 'OpenCode' },
+        { id: 'cli-gemini', pkg: '@google/gemini-cli', name: 'Gemini CLI' },
+        { id: 'cli-kilo', pkg: '@kilocode/cli', name: 'Kilo Code' },
+        { id: 'cli-codex', pkg: '@openai/codex', name: 'Codex CLI' },
       ];
 
       for (const tool of tools) {
-        try {
-          execSync(`bun x ${tool.pkg} --version`, { stdio: 'ignore' });
-          tool.installed = true;
-        } catch {
-          tool.installed = false;
-        }
+        const result = spawnSync(bunCmd, ['x', tool.pkg, '--version'], { stdio: 'ignore', timeout: 10000 });
+        tool.installed = result.status === 0;
         toolCache.set(tool.id, tool);
       }
       return tools;

package/lib/tool-manager.js

@@ -14,6 +14,7 @@ const TOOLS = [
   { id: 'gm-oc', name: 'GM OpenCode', pkg: 'gm-oc', pluginId: 'gm', category: 'plugin', frameWork: 'opencode' },
   { id: 'gm-gc', name: 'GM Gemini', pkg: 'gm-gc', pluginId: 'gm', category: 'plugin', frameWork: 'gemini' },
   { id: 'gm-kilo', name: 'GM Kilo', pkg: 'gm-kilo', pluginId: 'gm', category: 'plugin', frameWork: 'kilo' },
+  { id: 'gm-codex', name: 'GM Codex', pkg: 'gm-codex', pluginId: 'gm', category: 'plugin', frameWork: 'codex' },
 ];
 
 const statusCache = new Map();
@@ -123,14 +124,15 @@ const getInstalledVersion = (pkg, pluginId = null, frameWork = null) => {
 
     // Check Codex CLI (stored at ~/.codex)
     if (!frameWork || frameWork === 'codex') {
-      const codexPath = path.join(homeDir, '.codex', 'plugin.json');
-      if (fs.existsSync(codexPath)) {
+      const codexPluginPath = path.join(homeDir, '.codex', 'plugins', actualPluginId, 'plugin.json');
+      if (fs.existsSync(codexPluginPath)) {
         try {
-          const pluginJson = JSON.parse(fs.readFileSync(codexPath, 'utf-8'));
+          const pluginJson = JSON.parse(fs.readFileSync(codexPluginPath, 'utf-8'));
           if (pluginJson.version) return pluginJson.version;
         } catch (e) {
-          console.warn(`[tool-manager] Failed to parse ${codexPath}:`, e.message);
+          console.warn(`[tool-manager] Failed to parse ${codexPluginPath}:`, e.message);
         }
+        return 'installed';
       }
     }
   } catch (_) {}
@@ -204,6 +206,9 @@ const checkToolInstalled = (pluginId, frameWork = null) => {
       if (fs.existsSync(path.join(homeDir, '.config', 'kilo', 'agents', pluginId + '.md'))) return true;
       if (fs.existsSync(path.join(homeDir, '.config', 'kilo', 'agents', pluginId))) return true;
     }
+    if (!frameWork || frameWork === 'codex') {
+      if (fs.existsSync(path.join(homeDir, '.codex', 'plugins', pluginId))) return true;
+    }
   } catch (_) {}
   return false;
 };

package/package.json

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