agentgui 1.0.429 → 1.0.431

package/lib/claude-runner.js

@@ -10,6 +10,25 @@ function getSpawnOptions(cwd, additionalOptions = {}) {
   return options;
 }
 
+function resolveCommand(command, npxPackage) {
+  const whichCmd = isWindows ? 'where' : 'which';
+  const check = spawnSync(whichCmd, [command], { encoding: 'utf-8', timeout: 3000 });
+  if (check.status === 0 && (check.stdout || '').trim()) {
+    return { cmd: command, prefixArgs: [] };
+  }
+  if (npxPackage) {
+    const npxCheck = spawnSync(whichCmd, ['npx'], { encoding: 'utf-8', timeout: 3000 });
+    if (npxCheck.status === 0) {
+      return { cmd: 'npx', prefixArgs: ['--yes', npxPackage] };
+    }
+    const bunxCheck = spawnSync(whichCmd, ['bunx'], { encoding: 'utf-8', timeout: 3000 });
+    if (bunxCheck.status === 0) {
+      return { cmd: 'bunx', prefixArgs: [npxPackage] };
+    }
+  }
+  return { cmd: command, prefixArgs: [] };
+}
+
 /**
  * Agent Framework
  * Extensible registry for AI agent CLI integrations
@@ -30,6 +49,7 @@ class AgentRunner {
     this.requiresAdapter = config.requiresAdapter || false;
     this.adapterCommand = config.adapterCommand || null;
     this.adapterArgs = config.adapterArgs || [];
+    this.npxPackage = config.npxPackage || null;
   }
 
   defaultBuildArgs(prompt, config) {
@@ -226,9 +246,15 @@ class AgentRunner {
         onError = null
       } = config;
 
-      const cmd = this.requiresAdapter && this.adapterCommand ? this.adapterCommand : this.command;
-      const baseArgs = this.requiresAdapter && this.adapterCommand ? this.adapterArgs : this.buildArgs(prompt, config);
-      const args = [...baseArgs];
+      let cmd, args;
+      if (this.requiresAdapter && this.adapterCommand) {
+        cmd = this.adapterCommand;
+        args = [...this.adapterArgs];
+      } else {
+        const resolved = resolveCommand(this.command, this.npxPackage);
+        cmd = resolved.cmd;
+        args = [...resolved.prefixArgs, ...this.buildArgs(prompt, config)];
+      }
 
       const proc = spawn(cmd, args, getSpawnOptions(cwd));
 
@@ -494,7 +520,8 @@ class AgentRegistry {
       command: a.command,
       protocol: a.protocol,
       requiresAdapter: a.requiresAdapter,
-      supportedFeatures: a.supportedFeatures
+      supportedFeatures: a.supportedFeatures,
+      npxPackage: a.npxPackage
     }));
   }
 
@@ -503,11 +530,21 @@ class AgentRegistry {
       try {
         const whichCmd = isWindows ? 'where' : 'which';
         const which = spawnSync(whichCmd, [agent.command], { encoding: 'utf-8', timeout: 3000 });
-        if (which.status !== 0) return false;
-        const binPath = (which.stdout || '').trim().split('\n')[0].trim();
-        if (!binPath) return false;
-        const check = spawnSync(binPath, ['--version'], { encoding: 'utf-8', timeout: 10000, shell: isWindows });
-        return check.status === 0 && (check.stdout || '').trim().length > 0;
+        if (which.status === 0) {
+          const binPath = (which.stdout || '').trim().split('\n')[0].trim();
+          if (binPath) {
+            const check = spawnSync(binPath, ['--version'], { encoding: 'utf-8', timeout: 10000, shell: isWindows });
+            if (check.status === 0 && (check.stdout || '').trim().length > 0) return true;
+          }
+        }
+        const a = this.agents.get(agent.id);
+        if (a && a.npxPackage) {
+          const npxCheck = spawnSync(whichCmd, ['npx'], { encoding: 'utf-8', timeout: 3000 });
+          if (npxCheck.status === 0) return true;
+          const bunxCheck = spawnSync(whichCmd, ['bunx'], { encoding: 'utf-8', timeout: 3000 });
+          if (bunxCheck.status === 0) return true;
+        }
+        return false;
       } catch {
         return false;
       }
@@ -571,6 +608,7 @@ registry.register({
   command: 'opencode',
   protocol: 'acp',
   supportsStdin: false,
+  npxPackage: 'opencode-ai',
   supportedFeatures: ['streaming', 'resume', 'acp-protocol'],
 
   buildArgs(prompt, config) {
@@ -923,6 +961,7 @@ registry.register({
   command: 'gemini',
   protocol: 'acp',
   supportsStdin: false,
+  npxPackage: '@google/gemini-cli',
   supportedFeatures: ['streaming', 'resume', 'acp-protocol'],
   buildArgs(prompt, config) {
     const args = ['--experimental-acp', '--yolo'];
@@ -1085,6 +1124,7 @@ registry.register({
   command: 'kilo',
   protocol: 'acp',
   supportsStdin: false,
+  npxPackage: '@kilocode/cli',
   supportedFeatures: ['streaming', 'resume', 'acp-protocol', 'models'],
 
   buildArgs(prompt, config) {

package/package.json

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

package/server.js

@@ -384,9 +384,9 @@ function discoverAgents() {
   const agents = [];
   const binaries = [
     { cmd: 'claude', id: 'claude-code', name: 'Claude Code', icon: 'C', protocol: 'cli' },
-    { cmd: 'opencode', id: 'opencode', name: 'OpenCode', icon: 'O', protocol: 'acp' },
-    { cmd: 'gemini', id: 'gemini', name: 'Gemini CLI', icon: 'G', protocol: 'acp' },
-    { cmd: 'kilo', id: 'kilo', name: 'Kilo Code', icon: 'K', protocol: 'acp' },
+    { cmd: 'opencode', id: 'opencode', name: 'OpenCode', icon: 'O', protocol: 'acp', npxPackage: 'opencode-ai' },
+    { cmd: 'gemini', id: 'gemini', name: 'Gemini CLI', icon: 'G', protocol: 'acp', npxPackage: '@google/gemini-cli' },
+    { cmd: 'kilo', id: 'kilo', name: 'Kilo Code', icon: 'K', protocol: 'acp', npxPackage: '@kilocode/cli' },
     { cmd: 'goose', id: 'goose', name: 'Goose', icon: 'g', protocol: 'acp' },
     { cmd: 'openhands', id: 'openhands', name: 'OpenHands', icon: 'H', protocol: 'acp' },
     { cmd: 'augment', id: 'augment', name: 'Augment Code', icon: 'A', protocol: 'acp' },
@@ -400,13 +400,11 @@ function discoverAgents() {
   ];
   for (const bin of binaries) {
     const result = findCommand(bin.cmd);
-    if (result) agents.push({ 
-      id: bin.id, 
-      name: bin.name, 
-      icon: bin.icon, 
-      path: result, 
-      protocol: bin.protocol 
-    });
+    if (result) {
+      agents.push({ id: bin.id, name: bin.name, icon: bin.icon, path: result, protocol: bin.protocol });
+    } else if (bin.npxPackage) {
+      agents.push({ id: bin.id, name: bin.name, icon: bin.icon, path: null, protocol: bin.protocol, npxPackage: bin.npxPackage, npxLaunchable: true });
+    }
   }
   return agents;
 }
@@ -444,87 +442,8 @@ function modelIdToLabel(id) {
   return base.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
 }
 
-async function fetchClaudeModelsFromAPI() {
-  const apiKey = process.env.ANTHROPIC_API_KEY;
-  if (!apiKey) return null;
-  try {
-    const https = await import('https');
-    return new Promise((resolve) => {
-      const req = https.default.request({
-        hostname: 'api.anthropic.com', path: '/v1/models', method: 'GET',
-        headers: { 'x-api-key': apiKey, 'anthropic-version': '2023-06-01' },
-        timeout: 8000
-      }, (res) => {
-        let body = '';
-        res.on('data', d => body += d);
-        res.on('end', () => {
-          try {
-            const data = JSON.parse(body);
-            const items = (data.data || []).filter(m => m.id && m.id.startsWith('claude-'));
-            if (items.length === 0) return resolve(null);
-            const models = items.map(m => ({ id: m.id, label: m.display_name || modelIdToLabel(m.id) }));
-            resolve(models);
-          } catch { resolve(null); }
-        });
-      });
-      req.on('error', () => resolve(null));
-      req.on('timeout', () => { req.destroy(); resolve(null); });
-      req.end();
-    });
-  } catch { return null; }
-}
-
-async function fetchGeminiModelsFromAPI() {
-  const apiKey = process.env.GOOGLE_GENAI_API_KEY;
-  if (!apiKey) return null;
-  try {
-    const https = await import('https');
-    return new Promise((resolve) => {
-      const req = https.default.request({
-        hostname: 'generativelanguage.googleapis.com',
-        path: '/v1beta/models?key=' + apiKey,
-        method: 'GET',
-        timeout: 8000
-      }, (res) => {
-        let body = '';
-        res.on('data', d => body += d);
-        res.on('end', () => {
-          try {
-            const data = JSON.parse(body);
-            const items = (data.models || []).filter(m => m.name && m.name.includes('gemini'));
-            if (items.length === 0) return resolve(null);
-            const models = items.map(m => {
-              const modelId = m.name.replace(/^models\//, '');
-              return { id: modelId, label: modelId.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase()) };
-            });
-            resolve(models);
-          } catch { resolve(null); }
-        });
-      });
-      req.on('error', () => resolve(null));
-      req.on('timeout', () => { req.destroy(); resolve(null); });
-      req.end();
-    });
-  } catch { return null; }
-}
-
-async function getModelsForAgent(agentId) {
-  const cached = modelCache.get(agentId);
-  if (cached && Date.now() - cached.timestamp < 3600000) {
-    return cached.models;
-  }
-
-  let models = null;
-
-  if (agentId === 'claude-code') {
-    models = await fetchClaudeModelsFromAPI();
-  } else if (agentId === 'gemini') {
-    models = await fetchGeminiModelsFromAPI();
-  }
-
-  const result = models || [];
-  modelCache.set(agentId, { models: result, timestamp: Date.now() });
-  return result;
+async function getModelsForAgent() {
+  return [];
 }
 
 const GEMINI_SCOPES = [