agentgui 1.0.435 → 1.0.437

package/lib/ws-handlers-session.js

@@ -60,14 +60,15 @@ 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();
 }
 
+
 export function register(router, deps) {
   const { db, discoveredAgents, modelCache,
     getAgentDescriptor, activeScripts, broadcastSync, startGeminiOAuth,
@@ -128,64 +129,29 @@ export function register(router, deps) {
     return d;
   });
 
-  router.handle('agent.models', async (p) => {
-    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' && agent.acpPort) {
-      const port = agent.acpPort;
-      try {
-        const data = await acpFetch(port, '/v1/models');
-        const models = (data?.data || data?.models || []).map(m => ({
-          id: m.id || m.model_id,
-          label: m.name || m.display_name || m.id || m.model_id
-        })).filter(m => m.id);
-        if (models.length > 0) { modelCache.set(p.id, { models, ts: Date.now() }); return { models }; }
-      } catch (_) {}
-      try {
-        const data = await acpFetch(port, '/agents/search', {});
-        const list = Array.isArray(data) ? data : (data?.agents || []);
-        const allModels = new Map();
-        for (const a of list) {
-          const agentId = a.agent_id || a.id;
-          const name = a.metadata?.ref?.name || a.name || agentId;
-          if (agentId && name) allModels.set(agentId, name);
-          for (const m of (a.metadata?.models || a.specs?.models || [])) {
-            const id = m.id || m;
-            if (id) allModels.set(id, m.name || m.label || id);
-          }
-          try {
-            const desc = await acpFetch(port, `/agents/${agentId}/descriptor`);
-            const enumVals = desc?.specs?.config?.properties?.model?.enum || desc?.specs?.input?.properties?.model?.enum || [];
-            for (const v of enumVals) allModels.set(v, v);
-          } catch (_) {}
-        }
-        if (allModels.size > 0) {
-          const models = Array.from(allModels.entries()).map(([id, label]) => ({ id, label }));
-          modelCache.set(p.id, { models, ts: Date.now() });
-          return { models };
-        }
-      } catch (_) {}
-    }
-    const acpAgents = discoveredAgents.filter(x => x.protocol === 'acp' && x.acpPort);
-    for (const acpAgent of acpAgents) {
-      const port = acpAgent.acpPort;
-      try {
-        const desc = await acpFetch(port, `/agents/${p.id}/descriptor`);
-        if (desc) {
-          const enumVals = desc?.specs?.config?.properties?.model?.enum || desc?.specs?.input?.properties?.model?.enum || [];
-          if (enumVals.length > 0) {
-            const models = enumVals.map(v => ({ id: v, label: v }));
-            modelCache.set(p.id, { models, ts: Date.now() });
-            return { models };
-          }
-          const name = desc?.metadata?.ref?.name;
-          if (name) { const models = [{ id: p.id, label: name }]; modelCache.set(p.id, { models, ts: Date.now() }); return { models }; }
-        }
-      } catch (_) {}
-    }
-    return { models: [] };
-  });
+  router.handle('agent.models', async (p) => {
+    const cached = modelCache.get(p.id);
+    if (cached && (Date.now() - cached.ts) < 300000) return { models: cached.models };
+    let models = [];
+    if (p.id === 'claude-code') {
+      models = [
+        { id: 'claude-haiku', label: 'Haiku' },
+        { id: 'claude-sonnet', label: 'Sonnet' },
+        { id: 'claude-opus', label: 'Opus' }
+      ];
+    } else {
+      const agent = discoveredAgents.find(x => x.id === p.id);
+      if (agent?.protocol === 'acp' && agent.acpPort) {
+        try {
+          const data = await acpFetch(agent.acpPort, '/models');
+          const list = data?.data || data?.models || (Array.isArray(data) ? data : []);
+          models = list.map(m => ({ id: m.id || m.model_id, label: m.name || m.display_name || m.id || m.model_id })).filter(m => m.id);
+        } catch (_) {}
+      }
+    }
+    if (models.length > 0) modelCache.set(p.id, { models, ts: Date.now() });
+    return { models };
+  });
 
   router.handle('agent.search', (p) => db.searchAgents(discoveredAgents, p.query || p));
 

package/package.json

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

package/server.js

@@ -411,22 +411,13 @@ function discoverAgents() {
 
 // Function to discover agents from external ACP servers
 async function discoverExternalACPServers() {
-  // Default ACP servers to query (excluding local server to prevent recursion)
-  const acpServers = [
-    'http://localhost:8080',         // Common default ACP port
-  ];
-  
   const externalAgents = [];
-  for (const serverUrl of acpServers) {
+  for (const agent of discoveredAgents.filter(a => a.protocol === 'acp' && a.acpPort)) {
     try {
-      console.log(`Querying ACP agents from: ${serverUrl}`);
-      const agents = await queryACPServerAgents(serverUrl);
+      const agents = await queryACPServerAgents(`http://localhost:${agent.acpPort}`);
       externalAgents.push(...agents);
-    } catch (error) {
-      console.error(`Failed to query ${serverUrl}:`, error.message);
-    }
+    } catch (_) {}
   }
-  
   return externalAgents;
 }
 
@@ -435,15 +426,34 @@ initializeDescriptors(discoveredAgents);
 
 const modelCache = new Map();
 
-function modelIdToLabel(id) {
-  const base = id.replace(/^claude-/, '').replace(/-\d{8}$/, '');
-  const m = base.match(/^(\w+)-(\d+)(?:-(\d+))?$/);
-  if (m) return `${m[1].charAt(0).toUpperCase() + m[1].slice(1)} ${m[3] ? m[2] + '.' + m[3] : m[2]}`;
-  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 < 300000) return cached.models;
+  let models = [];
+  if (agentId === 'claude-code') {
+    models = [
+      { id: 'claude-haiku', label: 'Haiku' },
+      { id: 'claude-sonnet', label: 'Sonnet' },
+      { id: 'claude-opus', label: 'Opus' }
+    ];
+  } else {
+    const agent = discoveredAgents.find(a => a.id === agentId);
+    if (agent?.protocol === 'acp' && agent.acpPort) {
+      try {
+        const res = await fetch(`http://localhost:${agent.acpPort}/models`, {
+          headers: { 'Content-Type': 'application/json' },
+          signal: AbortSignal.timeout(3000)
+        });
+        if (res.ok) {
+          const data = await res.json();
+          const list = data?.data || data?.models || (Array.isArray(data) ? data : []);
+          models = list.map(m => ({ id: m.id || m.model_id, label: m.name || m.display_name || m.id || m.model_id })).filter(m => m.id);
+        }
+      } catch (_) {}
+    }
+  }
+  modelCache.set(agentId, { models, timestamp: Date.now() });
+  return models;
 }
 
 const GEMINI_SCOPES = [
@@ -3813,7 +3823,7 @@ registerConvHandlers(wsRouter, {
 });
 
 registerSessionHandlers(wsRouter, {
-  db: queries, discoveredAgents, getModelsForAgent, modelCache,
+  db: queries, discoveredAgents, modelCache,
   getAgentDescriptor, activeScripts, broadcastSync,
   startGeminiOAuth, geminiOAuthState: () => geminiOAuthState
 });