agentgui 1.0.989 → 1.0.991

package/lib/agent-discovery.js

@@ -23,13 +23,6 @@ const BINARIES = [
   { cmd: 'hermes', id: 'hermes', name: 'Hermes Agent', icon: 'h', protocol: 'acp' },
 ];
 
-const CLI_WRAPPERS = [
-  { id: 'cli-opencode', name: 'OpenCode', icon: 'O', protocol: 'cli-wrapper', acpId: 'opencode' },
-  { id: 'cli-gemini', name: 'Gemini', icon: 'G', protocol: 'cli-wrapper', acpId: 'gemini' },
-  { id: 'cli-kilo', name: 'Kilo', icon: 'K', protocol: 'cli-wrapper', acpId: 'kilo' },
-  { id: 'cli-codex', name: 'Codex', icon: 'X', protocol: 'cli-wrapper', acpId: 'codex' },
-];
-
 export function findCommand(cmd, rootDir) {
   if (!cmd) return null;
   const isWindows = os.platform() === 'win32';
@@ -66,57 +59,6 @@ export function findCommand(cmd, rootDir) {
   return null;
 }
 
-export async function queryACPServerAgents(baseUrl) {
-  const endpoint = baseUrl.endsWith('/') ? baseUrl + 'agents/search' : baseUrl + '/agents/search';
-  try {
-    const response = await fetch(endpoint, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
-      body: JSON.stringify({}),
-      signal: AbortSignal.timeout(5000)
-    });
-    if (!response.ok) {
-      console.error(`Failed to query ACP agents from ${baseUrl}: ${response.status}`);
-      return [];
-    }
-    const data = await response.json();
-    if (!data?.agents || !Array.isArray(data.agents)) {
-      console.error(`Invalid agents response from ${baseUrl}`);
-      return [];
-    }
-    return data.agents.map(agent => ({
-      id: agent.agent_id || agent.id,
-      name: agent.metadata?.ref?.name || agent.name || 'Unknown Agent',
-      metadata: {
-        ref: {
-          name: agent.metadata?.ref?.name,
-          version: agent.metadata?.ref?.version,
-          url: agent.metadata?.ref?.url,
-          tags: agent.metadata?.ref?.tags
-        },
-        description: agent.metadata?.description,
-        author: agent.metadata?.author,
-        license: agent.metadata?.license
-      },
-      specs: agent.specs ? {
-        capabilities: agent.specs.capabilities,
-        input_schema: agent.specs.input_schema || agent.specs.input,
-        output_schema: agent.specs.output_schema || agent.specs.output,
-        thread_state_schema: agent.specs.thread_state_schema || agent.specs.thread_state,
-        config_schema: agent.specs.config_schema || agent.specs.config,
-        custom_streaming_update_schema: agent.specs.custom_streaming_update_schema || agent.specs.custom_streaming_update
-      } : null,
-      custom_data: agent.custom_data,
-      icon: agent.metadata?.ref?.name?.charAt(0) || 'A',
-      protocol: 'acp',
-      path: baseUrl
-    }));
-  } catch (error) {
-    console.error(`ACP agents query failed for ${baseUrl}: ${error.message}`);
-    return [];
-  }
-}
-
 export function discoverAgents(rootDir) {
   const agents = [];
   for (const bin of BINARIES) {
@@ -130,30 +72,8 @@ export function discoverAgents(rootDir) {
     }
   }
 
-  console.log('[discoverAgents] Found agents:', agents.map(a => a.id).join(', '));
-  for (const wrapper of CLI_WRAPPERS) {
-    if (agents.some(a => a.id === wrapper.acpId)) {
-      console.log(`[discoverAgents] Adding CLI wrapper for ${wrapper.id}`);
-      agents.push(wrapper);
-    } else {
-      console.log(`[discoverAgents] Skipping CLI wrapper ${wrapper.id} (ACP agent ${wrapper.acpId} not found)`);
-    }
-  }
-  const wrappedAcpIds = new Set(CLI_WRAPPERS.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 filtered;
-}
-
-export async function discoverExternalACPServers(discoveredAgents) {
-  const externalAgents = [];
-  for (const agent of discoveredAgents.filter(a => a.protocol === 'acp' && a.acpPort)) {
-    try {
-      const agents = await queryACPServerAgents(`http://localhost:${agent.acpPort}`);
-      externalAgents.push(...agents);
-    } catch (_) {}
-  }
-  return externalAgents;
+  console.log('[discoverAgents] Final agent count:', agents.length, 'Agent IDs:', agents.map(a => a.id).join(', '));
+  return agents;
 }
 
 export async function initializeAgentDiscovery(discoveredAgents, rootDir, logError) {

package/lib/process-message.js

@@ -1,4 +1,4 @@
-export function createProcessMessage({ queries, activeExecutions, rateLimitState, execMachine, broadcastSync, runClaudeWithStreaming, cleanupExecution, discoveredAgents, STARTUP_CWD, buildSystemPrompt, parseRateLimitResetTime, touchACP, getJsonlWatcher, debugLog, logError, scheduleRetry, drainMessageQueue, createEventHandler }) {
+export function createProcessMessage({ queries, activeExecutions, rateLimitState, execMachine, broadcastSync, runClaudeWithStreaming, cleanupExecution, STARTUP_CWD, buildSystemPrompt, parseRateLimitResetTime, touchACP, getJsonlWatcher, debugLog, logError, scheduleRetry, drainMessageQueue, createEventHandler }) {
   async function processMessageWithStreaming(conversationId, messageId, sessionId, content, agentId, model, subAgent) {
     const startTime = Date.now();
     touchACP(agentId);
@@ -31,9 +31,7 @@ export function createProcessMessage({ queries, activeExecutions, rateLimitState
     // Resolve agent before building stateRef so isJsonlBacked can be set correctly.
     // claude-code (protocol: direct) writes JSONL -> JsonlParser owns event broadcasting.
     // All other agents (protocol: acp) rely solely on onEvent for streaming.
-    let resolvedAgentId = agentId || 'claude-code';
-    const wrapperAgent = discoveredAgents.find(a => a.id === resolvedAgentId && a.protocol === 'cli-wrapper' && a.acpId);
-    if (wrapperAgent) resolvedAgentId = wrapperAgent.acpId;
+    const resolvedAgentId = agentId || 'claude-code';
     const isJsonlBacked = resolvedAgentId === 'claude-code';
     // stateRef tracks eventCount (for session response metadata) and resumeSessionId
     const stateRef = { eventCount: 0, resumeSessionId: conv?.claudeSessionId || null };

package/lib/server-startup.js

@@ -41,7 +41,6 @@ export function createOnServerReady({ queries, broadcastSync, warmAssetCache, st
       console.log('[ACP] On-demand startup enabled (ACP tools start when first used)');
       setTimeout(() => {
         const acpStatus = getACPStatus();
-        for (const s of acpStatus) { if (s.healthy) { const agent = discoveredAgents.find(a => a.id === s.id); if (agent) agent.acpPort = s.port; } }
         if (acpStatus.length > 0) console.log(`[ACP] Tools ready: ${acpStatus.filter(s => s.healthy).map(s => s.id + ':' + s.port).join(', ') || 'none healthy yet'}`);
       }, 6000);
     }).catch(err => console.error('[ACP] Startup error:', err.message));

package/lib/server-utils.js

@@ -45,18 +45,10 @@ export function makeGetModelsForAgent(deps) {
         { id: 'opus', label: 'Opus' }
       ];
     } else {
-      // The client sends canonical registry ids ('opencode', 'kilo', 'codex'),
-      // but discoverAgents() replaces each found ACP agent with its cli-wrapper
-      // entry whose own id is prefixed ('cli-opencode') and whose acpId carries
-      // the original id. Match on acpId too so model discovery resolves the
-      // wrapper instead of finding nothing and silently returning [] models.
-      const agent = discoveredAgents.find(a => a.id === agentId || a.acpId === agentId);
+      const agent = discoveredAgents.find(a => a.id === agentId);
       if (agent?.protocol === 'acp') {
         await ensureRunning(agentId);
         try { models = await queryACPModels(agentId); } catch (_) {}
-      } else if (agent?.protocol === 'cli-wrapper' && agent.acpId) {
-        await ensureRunning(agent.acpId);
-        try { models = await queryACPModels(agent.acpId); } catch (_) {}
       }
     }
     modelCache.set(agentId, { models, timestamp: Date.now() });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.989",
+  "version": "1.0.991",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/server.js

@@ -9,7 +9,7 @@ import { createHistoryRouter } from 'ccsniff';
 import { queries } from './database.js';
 import { runClaudeWithStreaming } from './lib/claude-runner-run.js';
 import { initializeDescriptors, getAgentDescriptor } from './lib/agent-descriptors.js';
-import { discoverExternalACPServers, initializeAgentDiscovery } from './lib/agent-discovery.js';
+import { initializeAgentDiscovery } from './lib/agent-discovery.js';
 import { register as registerWsHandlers } from './lib/ws-handlers-util.js';
 import { BROADCAST_TYPES } from './lib/broadcast.js';
 import { WSOptimizer } from './lib/ws-optimizer.js';

package/test.js

@@ -340,13 +340,13 @@ await ok('cross-tab-storage: "updated in another tab" banner on stale load', ()
   }
 });
 
-await ok('agents.models: resolves cli-wrapper by acpId (registry id, not wrapper id)', async () => {
-  // The client picker sends canonical registry ids ('opencode'), but
-  // discoverAgents() stores only the cli-wrapper entry ('cli-opencode',
-  // acpId:'opencode'). getModelsForAgent must resolve via acpId, else model
-  // discovery silently returns [] for every ACP agent (witnessed regression).
+await ok('agents.models: ACP agent reaches ensureRunning + queryACPModels (not empty)', async () => {
+  // discoveredAgents and the client both use the canonical registry id
+  // ('opencode', protocol 'acp'). getModelsForAgent must start the ACP server
+  // and query it - a regression once silently returned [] for every ACP agent
+  // because of an id-scheme mismatch.
   const { makeGetModelsForAgent } = await import('./lib/server-utils.js');
-  const discoveredAgents = [{ id: 'cli-opencode', protocol: 'cli-wrapper', acpId: 'opencode' }];
+  const discoveredAgents = [{ id: 'opencode', protocol: 'acp' }];
   const calls = [];
   const getModels = makeGetModelsForAgent({
     modelCache: new Map(),
@@ -355,7 +355,7 @@ await ok('agents.models: resolves cli-wrapper by acpId (registry id, not wrapper
     queryACPModels: async (id) => { calls.push(['query', id]); return [{ id: 'm1', label: 'M1' }]; },
   });
   const models = await getModels('opencode');
-  assert.deepEqual(calls, [['ensure', 'opencode'], ['query', 'opencode']], 'should ensureRunning + query with acpId');
+  assert.deepEqual(calls, [['ensure', 'opencode'], ['query', 'opencode']], 'should ensureRunning + query the ACP agent');
   assert.equal(models.length, 1, 'should return the ACP-provided models, not an empty list');
 });