agentgui 1.0.434 → 1.0.436

package/lib/ws-handlers-session.js

@@ -60,14 +60,80 @@ function checkAgentAuth(agent) {
   return s;
 }
 
-async function acpFetch(port, path, body = null) {
+async function acpFetch(port, pth, body = null) {
   const opts = { headers: { 'Content-Type': 'application/json' }, signal: AbortSignal.timeout(3000) };
   if (body !== null) { opts.method = 'POST'; opts.body = JSON.stringify(body); }
-  const res = await fetch(`http://localhost:${port}${path}`, opts);
+  const res = await fetch(`http://localhost:${port}${pth}`, opts);
   if (!res.ok) return null;
   return res.json();
 }
 
+function getApiKey(name) {
+  const envMap = {
+    anthropic: 'ANTHROPIC_API_KEY',
+    google: 'GOOGLE_GENAI_API_KEY',
+    openai: 'OPENAI_API_KEY'
+  };
+  if (process.env[envMap[name]]) return process.env[envMap[name]];
+  const configPaths = {
+    anthropic: [
+      path.join(os.homedir(), '.claude.json'),
+      path.join(os.homedir(), '.anthropic.json')
+    ],
+    google: [
+      path.join(os.homedir(), '.gemini.json'),
+      path.join(os.homedir(), '.config', 'gemini', 'credentials.json')
+    ],
+    openai: [
+      path.join(os.homedir(), '.openai.json')
+    ]
+  };
+  for (const p of (configPaths[name] || [])) {
+    const data = readJson(p);
+    if (data) {
+      const key = data.api_key || data.apiKey || data.github_token;
+      if (key) return key;
+    }
+  }
+  return null;
+}
+
+async function fetchModelsFromAPI(agentId) {
+  if (agentId === 'claude-code') {
+    const apiKey = getApiKey('anthropic');
+    if (!apiKey) return null;
+    try {
+      const res = await fetch('https://api.anthropic.com/v1/models', {
+        headers: { 'x-api-key': apiKey, 'anthropic-version': '2023-06-01' },
+        signal: AbortSignal.timeout(8000)
+      });
+      if (!res.ok) return null;
+      const data = await res.json();
+      const items = (data.data || []).filter(m => m.id && m.id.startsWith('claude-'));
+      if (items.length === 0) return null;
+      return items.map(m => ({ id: m.id, label: m.display_name || m.id.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase()) }));
+    } catch { return null; }
+  }
+  if (agentId === 'gemini') {
+    const apiKey = getApiKey('google');
+    if (!apiKey) return null;
+    try {
+      const res = await fetch(`https://generativelanguage.googleapis.com/v1beta/models?key=${apiKey}`, {
+        signal: AbortSignal.timeout(8000)
+      });
+      if (!res.ok) return null;
+      const data = await res.json();
+      const items = (data.models || []).filter(m => m.name && m.name.includes('gemini'));
+      if (items.length === 0) return null;
+      return items.map(m => {
+        const id = m.name.replace(/^models\//, '');
+        return { id, label: id.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase()) };
+      });
+    } catch { return null; }
+  }
+  return null;
+}
+
 export function register(router, deps) {
   const { db, discoveredAgents, modelCache,
     getAgentDescriptor, activeScripts, broadcastSync, startGeminiOAuth,
@@ -108,9 +174,9 @@ export function register(router, deps) {
 
   router.handle('agent.subagents', async (p) => {
     const agent = discoveredAgents.find(x => x.id === p.id);
-    if (!agent || agent.protocol !== 'acp') return { subAgents: [] };
+    if (!agent || agent.protocol !== 'acp' || !agent.acpPort) return { subAgents: [] };
     try {
-      const data = await acpFetch(agent.acpPort || 8080, '/agents/search', {});
+      const data = await acpFetch(agent.acpPort, '/agents/search', {});
       const list = Array.isArray(data) ? data : (data?.agents || []);
       return { subAgents: list.map(a => ({ id: a.agent_id || a.id, name: a.metadata?.ref?.name || a.name || a.agent_id || a.id })) };
     } catch (_) { return { subAgents: [] }; }
@@ -132,8 +198,8 @@ export function register(router, deps) {
     const cached = modelCache.get(p.id);
     if (cached && (Date.now() - cached.ts) < 300000) return { models: cached.models };
     const agent = discoveredAgents.find(x => x.id === p.id);
-    if (agent?.protocol === 'acp') {
-      const port = agent.acpPort || 8080;
+    if (agent?.protocol === 'acp' && agent.acpPort) {
+      const port = agent.acpPort;
       try {
         const data = await acpFetch(port, '/v1/models');
         const models = (data?.data || data?.models || []).map(m => ({
@@ -167,9 +233,9 @@ export function register(router, deps) {
         }
       } catch (_) {}
     }
-    const acpAgents = discoveredAgents.filter(x => x.protocol === 'acp');
+    const acpAgents = discoveredAgents.filter(x => x.protocol === 'acp' && x.acpPort);
     for (const acpAgent of acpAgents) {
-      const port = acpAgent.acpPort || 8080;
+      const port = acpAgent.acpPort;
       try {
         const desc = await acpFetch(port, `/agents/${p.id}/descriptor`);
         if (desc) {
@@ -184,6 +250,11 @@ export function register(router, deps) {
         }
       } catch (_) {}
     }
+    const apiModels = await fetchModelsFromAPI(p.id);
+    if (apiModels && apiModels.length > 0) {
+      modelCache.set(p.id, { models: apiModels, ts: Date.now() });
+      return { models: apiModels };
+    }
     return { models: [] };
   });
 

package/package.json

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

package/server.js

@@ -442,8 +442,46 @@ function modelIdToLabel(id) {
   return base.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
 }
 
-async function getModelsForAgent() {
-  return [];
+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') {
+    const apiKey = process.env.ANTHROPIC_API_KEY;
+    if (apiKey) {
+      try {
+        const res = await fetch('https://api.anthropic.com/v1/models', {
+          headers: { 'x-api-key': apiKey, 'anthropic-version': '2023-06-01' },
+          signal: AbortSignal.timeout(8000)
+        });
+        if (res.ok) {
+          const data = await res.json();
+          const items = (data.data || []).filter(m => m.id && m.id.startsWith('claude-'));
+          if (items.length > 0) models = items.map(m => ({ id: m.id, label: m.display_name || modelIdToLabel(m.id) }));
+        }
+      } catch (_) {}
+    }
+  } else if (agentId === 'gemini') {
+    const apiKey = process.env.GOOGLE_GENAI_API_KEY;
+    if (apiKey) {
+      try {
+        const res = await fetch(`https://generativelanguage.googleapis.com/v1beta/models?key=${apiKey}`, {
+          signal: AbortSignal.timeout(8000)
+        });
+        if (res.ok) {
+          const data = await res.json();
+          const items = (data.models || []).filter(m => m.name && m.name.includes('gemini'));
+          if (items.length > 0) models = items.map(m => {
+            const id = m.name.replace(/^models\//, '');
+            return { id, label: id.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase()) };
+          });
+        }
+      } catch (_) {}
+    }
+  }
+  const result = models || [];
+  modelCache.set(agentId, { models: result, timestamp: Date.now() });
+  return result;
 }
 
 const GEMINI_SCOPES = [