agentgui 1.0.640 → 1.0.642

package/lib/claude-runner.js

@@ -10,8 +10,8 @@ function getSpawnOptions(cwd, additionalOptions = {}) {
   if (!options.env) {
     options.env = { ...process.env };
   }
-  // Allow spawning claude inside another claude session
-  delete options.env.CLAUDECODE;
+  // Keep CLAUDECODE for plugin support (gm plugin requires this)
+  // Don't delete it as it prevents plugins from loading
   return options;
 }
 
@@ -613,7 +613,7 @@ registry.register({
   closeStdin: true, // must close stdin or claude 2.1.72 hangs waiting for input in --print mode
   useJsonRpcStdin: false,
   supportedFeatures: ['streaming', 'resume', 'system-prompt', 'permissions-skip'],
-  spawnEnv: { MAX_THINKING_TOKENS: '0', AGENTGUI_SUBPROCESS: '1' },
+  spawnEnv: { MAX_THINKING_TOKENS: '0' },
 
   buildArgs(prompt, config) {
     const {

package/lib/ws-handlers-util.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { execSync, spawn } from 'child_process';
+import { execSync, spawn, spawnSync } from 'child_process';
 
 function err(code, message) { const e = new Error(message); e.code = code; throw e; }
 
@@ -268,65 +268,47 @@ export function register(router, deps) {
     }
   });
 
-  router.handle('agent.subagents', async (p) => {
-    const { id } = p;
-    if (!id) err(400, 'Missing agent id');
-
-    // For Claude Code, read skills from ~/.claude/skills directory
-    if (id === 'cli-claude') {
-      const skillsDir = path.join(os.homedir(), '.claude', 'skills');
-      try {
-        const entries = fs.readdirSync(skillsDir, { withFileTypes: true });
-        const skills = entries
-          .filter(e => e.isDirectory() || e.isSymbolicLink())
-          .map(e => {
-            // Try to read SKILL.md to get the actual name
-            const md = path.join(skillsDir, e.name, 'SKILL.md');
-            let name = e.name;
-            try {
-              const content = fs.readFileSync(md, 'utf-8');
-              const m = content.match(/^name:\s*(.+)$/m);
-              if (m) name = m[1].trim();
-            } catch (_) {
-              // Fallback: format the directory name as the skill name
-              name = e.name
-                .split(/[\-_]/)
-                .map(w => w.charAt(0).toUpperCase() + w.slice(1))
-                .join(' ');
-            }
-            return { id: e.name, name };
-          })
-          .sort((a, b) => a.name.localeCompare(b.name));
-
-        if (skills.length > 0) {
-          console.log(`[agent.subagents] Found ${skills.length} Claude Code skills:`, skills.map(s => s.name).join(', '));
-          return { subAgents: skills };
-        }
-        return { subAgents: [] };
-      } catch (err) {
-        console.error(`[agent.subagents] Error reading skills directory:`, err.message);
-        return { subAgents: [] };
-      }
-    }
-
-    // Map CLI agent IDs to their corresponding plugin sub-agents
-    const subAgentMap = {
-      'cli-opencode': [{ id: 'gm-oc', name: 'GM OpenCode' }],
-      'cli-gemini': [{ id: 'gm-gc', name: 'GM Gemini' }],
-      'cli-kilo': [{ id: 'gm-kilo', name: 'GM Kilo' }],
-      'cli-codex': []
-    };
-
-    const subAgents = subAgentMap[id] || [];
-
-    // Filter to only installed sub-agents
-    try {
-      const tools = await toolManager.getAllToolsAsync();
-      const installedPlugins = new Set(tools.filter(t => t.category === 'plugin' && t.installed).map(t => t.id));
-      const availableSubAgents = subAgents.filter(sa => installedPlugins.has(sa.id));
-      return { subAgents: availableSubAgents };
-    } catch (e) {
-      return { subAgents };
-    }
+  router.handle('agent.subagents', async (p) => {
+    const { id } = p;
+    if (!id) err(400, 'Missing agent id');
+
+    // Claude Code: run 'claude agents list' and parse output
+    if (id === 'claude-code' || id === 'cli-claude') {
+      const spawnEnv = { ...process.env };
+      delete spawnEnv.CLAUDECODE;
+      const result = spawnSync('claude', ['agents', 'list'], {
+        encoding: 'utf-8', timeout: 10000, stdio: ['pipe', 'pipe', 'pipe'],
+        env: spawnEnv
+      });
+      if (result.status !== 0 || !result.stdout) return { subAgents: [] };
+      const output = result.stdout.trim();
+      // Output format: '  agentId · model' lines under section headers
+      const agents = [];
+      for (const line of output.split('\n').filter(l => l.trim())) {
+        const match = line.match(/^  (\S+)\s+·/);
+        if (match) {
+          const id = match[1];
+          agents.push({ id, name: id });
+        }
+      }
+      console.log('[agent.subagents] claude agents list found:', agents.map(a => a.id).join(', '));
+      return { subAgents: agents };
+    }
+
+    // ACP agents: hardcoded map filtered by installed tools
+    const subAgentMap = {
+      'opencode':     [{ id: 'gm-oc',   name: 'GM OpenCode' }],
+      'cli-opencode': [{ id: 'gm-oc',   name: 'GM OpenCode' }],
+      'gemini':       [{ id: 'gm-gc',   name: 'GM Gemini'   }],
+      'cli-gemini':   [{ id: 'gm-gc',   name: 'GM Gemini'   }],
+      'kilo':         [{ id: 'gm-kilo', name: 'GM Kilo'     }],
+      'cli-kilo':     [{ id: 'gm-kilo', name: 'GM Kilo'     }],
+      'codex':        [],
+      'cli-codex':    []
+    };
+    const subAgents = subAgentMap[id] || [];
+    const tools = await toolManager.getAllToolsAsync();
+    const installed = new Set(tools.filter(t => t.category === 'plugin' && t.installed).map(t => t.id));
+    return { subAgents: subAgents.filter(sa => installed.has(sa.id)) };
   });
 }

package/package.json

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

package/server.js

@@ -534,9 +534,12 @@ function discoverAgents() {
       console.log(`[discoverAgents] Skipping CLI wrapper ${wrapper.id} (ACP agent ${wrapper.acpId} not found)`);
     }
   }
-  console.log('[discoverAgents] Final agent count:', agents.length, 'Agent IDs:', agents.map(a => a.id).join(', '));
+  // Remove raw ACP agents that have a cli-wrapper (avoid duplicates in UI)
+  const wrappedAcpIds = new Set(cliWrappers.filter(w => agents.some(a => a.id === w.acpId)).map(w => w.acpId));
+  const filtered = agents.filter(a => !wrappedAcpIds.has(a.id));
+  console.log('[discoverAgents] Final agent count:', filtered.length, 'Agent IDs:', filtered.map(a => a.id).join(', '));
 
-  return agents;
+  return filtered;
 }
 
 // Function to discover agents from external ACP servers

package/static/index.html

@@ -1120,9 +1120,6 @@
       .message { max-width: 95%; }
       .messages-wrapper { padding: 0.375rem 0.5rem; }
       .input-section { padding: 0.5rem; padding-bottom: calc(0.5rem + env(safe-area-inset-bottom)); }
-      .cli-selector { display: none !important; }
-      .sub-agent-selector { display: none !important; }
-      .model-selector { display: none !important; }
     }
 
     /* ===== SCROLLBAR STYLING ===== */

package/static/js/client.js

@@ -442,10 +442,10 @@ class AgentGUIClient {
 
     if (this.ui.agentSelector) {
       this.ui.agentSelector.addEventListener('change', () => {
-        // Load models for the selected sub-agent
-        const selectedSubAgentId = this.ui.agentSelector.value;
-        if (selectedSubAgentId) {
-          this.loadModelsForAgent(selectedSubAgentId);
+        // Load models for parent CLI agent when sub-agent changes
+        const parentAgentId = this.ui.cliSelector?.value;
+        if (parentAgentId) {
+          this.loadModelsForAgent(parentAgentId);
         }
         if (!this._agentLocked) {
           this.saveAgentAndModelToConversation();
@@ -2076,7 +2076,7 @@ class AgentGUIClient {
         // Auto-select first sub-agent and load its models
         const firstSubAgentId = subAgents[0].id;
         this.ui.agentSelector.value = firstSubAgentId;
-        this.loadModelsForAgent(firstSubAgentId);
+        this.loadModelsForAgent(cliAgentId); // models keyed to parent agent
       } else {
         console.log(`[Agent Selector] No sub-agents found for ${cliAgentId}`);
         // Load models for the CLI agent itself (fallback for agents without sub-agents)