agentgui 1.0.832 → 1.0.834

package/lib/plugins/agents-plugin.js

@@ -1,7 +1,4 @@
-// Agents plugin - agent discovery, runner spawning, process management
-
 import path from 'path';
-import { runClaudeWithStreaming } from '../claude-runner.js';
 
 export default {
   name: 'agents',

package/lib/speech-manager.js

@@ -2,7 +2,6 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { createRequire } from 'module';
-
 let speechModule = null;
 let _broadcastSync = null;
 let _syncClients = null;
@@ -13,18 +12,15 @@ export function initSpeechManager({ broadcastSync, syncClients, queries }) {
   _syncClients = syncClients;
   _queries = queries;
 }
-
 export async function ensurePocketTtsSetup(onProgress) {
   const r = createRequire(import.meta.url);
   const serverTTS = r('webtalk/server-tts');
   return serverTTS.ensureInstalled(onProgress);
 }
-
 export async function getSpeech() {
   if (!speechModule) speechModule = await import('./speech.js');
   return speechModule;
 }
-
 const ttsTextAccumulators = new Map();
 
 export const voiceCacheManager = {
@@ -58,7 +54,6 @@ export const voiceCacheManager = {
     }
   }
 };
-
 export const modelDownloadState = {
   downloading: false,
   progress: null,
@@ -68,7 +63,6 @@ export const modelDownloadState = {
   downloadMetrics: new Map(),
   waiters: []
 };
-
 export function broadcastModelProgress(progress) {
   modelDownloadState.progress = progress;
   const broadcastData = {
@@ -203,4 +197,4 @@ function pushTTSAudio(cacheKey, wav, conversationId, sessionId, voiceId) {
     sessionId,
     timestamp: Date.now()
   });
-}
+}

package/lib/ws-handlers-session.js

@@ -1,79 +1,7 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { execSync, spawn } from 'child_process';
-import { ensureRunning, touch, queryModels } from './acp-sdk-manager.js';
-
-function spawnScript(cmd, args, convId, scriptName, agentId, deps) {
-  const { activeScripts, broadcastSync, modelCache } = deps;
-  if (activeScripts.has(convId)) throw { code: 409, message: 'Process already running' };
-  const child = spawn(cmd, args, {
-    stdio: ['pipe', 'pipe', 'pipe'],
-    env: { ...process.env, FORCE_COLOR: '1' },
-    shell: os.platform() === 'win32'
-  });
-  activeScripts.set(convId, { process: child, script: scriptName, startTime: Date.now() });
-  broadcastSync({ type: 'script_started', conversationId: convId, script: scriptName, agentId, timestamp: Date.now() });
-  const relay = (stream) => (chunk) => {
-    broadcastSync({ type: 'script_output', conversationId: convId, data: chunk.toString(), stream, timestamp: Date.now() });
-  };
-  child.stdout.on('data', relay('stdout'));
-  child.stderr.on('data', relay('stderr'));
-  child.on('error', (err) => {
-    activeScripts.delete(convId);
-    broadcastSync({ type: 'script_stopped', conversationId: convId, code: 1, error: err.message, timestamp: Date.now() });
-  });
-  child.on('close', (code) => {
-    activeScripts.delete(convId);
-    if (modelCache && agentId) modelCache.delete(agentId);
-    broadcastSync({ type: 'script_stopped', conversationId: convId, code: code || 0, timestamp: Date.now() });
-  });
-  return child.pid;
-}
-
-function readJson(filePath) {
-  try { return fs.existsSync(filePath) ? JSON.parse(fs.readFileSync(filePath, 'utf-8')) : null; } catch { return null; }
-}
-
-function checkAgentAuth(agent) {
-  const s = { id: agent.id, name: agent.name, authenticated: false, detail: '' };
-  try {
-    if (agent.id === 'claude-code') {
-      const creds = readJson(path.join(os.homedir(), '.claude', '.credentials.json'));
-      if (creds?.claudeAiOauth?.expiresAt > Date.now()) {
-        s.authenticated = true;
-        s.detail = creds.claudeAiOauth.subscriptionType || 'authenticated';
-      } else { s.detail = creds ? 'expired' : 'no credentials'; }
-    } else if (agent.id === 'gemini') {
-      const oauth = readJson(path.join(os.homedir(), '.gemini', 'oauth_creds.json'));
-      const accts = readJson(path.join(os.homedir(), '.gemini', 'google_accounts.json'));
-      const hasOAuth = !!(oauth?.refresh_token || oauth?.access_token);
-      if (accts?.active) { s.authenticated = true; s.detail = accts.active; }
-      else if (hasOAuth) { s.authenticated = true; s.detail = 'oauth'; }
-      else { s.detail = accts ? 'logged out' : 'no credentials'; }
-    } else if (agent.id === 'opencode') {
-      const out = execSync('opencode auth list 2>&1', { encoding: 'utf-8', timeout: 5000 });
-      const m = out.match(/(\d+)\s+credentials?/);
-      if (m && parseInt(m[1], 10) > 0) { s.authenticated = true; s.detail = m[1] + ' credential(s)'; }
-      else { s.detail = 'no credentials'; }
-    } else { s.detail = 'unknown'; }
-  } catch { s.detail = 'check failed'; }
-  return s;
-}
-
-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}${pth}`, opts);
-  if (!res.ok) return null;
-  return res.json();
-}
-
+import { queryModels } from './acp-sdk-manager.js';
 
 export function register(router, deps) {
-  const { db, discoveredAgents, modelCache,
-    getAgentDescriptor, activeScripts, broadcastSync, startGeminiOAuth,
-    geminiOAuthState } = deps;
+  const { db, discoveredAgents, modelCache, getAgentDescriptor } = deps;
   console.log('[ws-handlers-session] register() called with discoveredAgents.length:', discoveredAgents.length);
 
   router.handle('sess.get', (p) => {
@@ -129,8 +57,6 @@ export function register(router, deps) {
       }))
     };
   });
-  // Note: agent.subagents is handled by ws-handlers-util.js which is registered after this file
-  // Keeping this note to avoid duplicate handler registration
 
   router.handle('agent.get', (p) => {
     const a = discoveredAgents.find(x => x.id === p.id);
@@ -165,44 +91,4 @@ export function register(router, deps) {
   });
 
   router.handle('agent.search', (p) => db.searchAgents(discoveredAgents, p.query || p));
-
-  router.handle('agent.auth', async (p) => {
-    const agentId = p.id;
-    if (!discoveredAgents.find(a => a.id === agentId)) throw { code: 404, message: 'Agent not found' };
-    if (agentId === 'gemini') {
-      const result = await startGeminiOAuth();
-      const cid = '__agent_auth__';
-      broadcastSync({ type: 'script_started', conversationId: cid, script: 'auth-gemini', agentId: 'gemini', timestamp: Date.now() });
-      broadcastSync({ type: 'script_output', conversationId: cid, data: `\x1b[36mOpening Google OAuth...\x1b[0m\r\n\r\nVisit:\r\n${result.authUrl}\r\n`, stream: 'stdout', timestamp: Date.now() });
-      const pollId = setInterval(() => {
-        const st = geminiOAuthState();
-        if (st.status === 'success') {
-          clearInterval(pollId);
-          broadcastSync({ type: 'script_output', conversationId: cid, data: `\r\n\x1b[32mAuth OK${st.email ? ' (' + st.email + ')' : ''}\x1b[0m\r\n`, stream: 'stdout', timestamp: Date.now() });
-          broadcastSync({ type: 'script_stopped', conversationId: cid, code: 0, timestamp: Date.now() });
-        } else if (st.status === 'error') {
-          clearInterval(pollId);
-          broadcastSync({ type: 'script_output', conversationId: cid, data: `\r\n\x1b[31mAuth failed: ${st.error}\x1b[0m\r\n`, stream: 'stderr', timestamp: Date.now() });
-          broadcastSync({ type: 'script_stopped', conversationId: cid, code: 1, error: st.error, timestamp: Date.now() });
-        }
-      }, 1000);
-      setTimeout(() => clearInterval(pollId), 5 * 60 * 1000);
-      return { ok: true, agentId, authUrl: result.authUrl, mode: result.mode };
-    }
-    const cmds = { 'claude-code': { cmd: 'claude', args: ['setup-token'] }, 'opencode': { cmd: 'opencode', args: ['auth', 'login'] } };
-    const c = cmds[agentId];
-    if (!c) throw { code: 400, message: 'No auth command for this agent' };
-    const pid = spawnScript(c.cmd, c.args, '__agent_auth__', 'auth-' + agentId, agentId, { activeScripts, broadcastSync });
-    return { ok: true, agentId, pid };
-  });
-
-  router.handle('agent.authstat', () => ({ agents: discoveredAgents.map(checkAgentAuth) }));
-
-  router.handle('agent.update', (p) => {
-    const cmds = { 'claude-code': { cmd: 'claude', args: ['update', '--yes'] } };
-    const c = cmds[p.id];
-    if (!c) throw { code: 400, message: 'No update command for this agent' };
-    const pid = spawnScript(c.cmd, c.args, '__agent_update__', 'update-' + p.id, p.id, { activeScripts, broadcastSync, modelCache });
-    return { ok: true, agentId: p.id, pid };
-  });
-}
+}

package/lib/ws-handlers-session2.js

@@ -0,0 +1,106 @@
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { execSync, spawn } from 'child_process';
+
+function spawnScript(cmd, args, convId, scriptName, agentId, deps) {
+  const { activeScripts, broadcastSync, modelCache } = deps;
+  if (activeScripts.has(convId)) throw { code: 409, message: 'Process already running' };
+  const child = spawn(cmd, args, {
+    stdio: ['pipe', 'pipe', 'pipe'],
+    env: { ...process.env, FORCE_COLOR: '1' },
+    shell: os.platform() === 'win32'
+  });
+  activeScripts.set(convId, { process: child, script: scriptName, startTime: Date.now() });
+  broadcastSync({ type: 'script_started', conversationId: convId, script: scriptName, agentId, timestamp: Date.now() });
+  const relay = (stream) => (chunk) => {
+    broadcastSync({ type: 'script_output', conversationId: convId, data: chunk.toString(), stream, timestamp: Date.now() });
+  };
+  child.stdout.on('data', relay('stdout'));
+  child.stderr.on('data', relay('stderr'));
+  child.on('error', (err) => {
+    activeScripts.delete(convId);
+    broadcastSync({ type: 'script_stopped', conversationId: convId, code: 1, error: err.message, timestamp: Date.now() });
+  });
+  child.on('close', (code) => {
+    activeScripts.delete(convId);
+    if (modelCache && agentId) modelCache.delete(agentId);
+    broadcastSync({ type: 'script_stopped', conversationId: convId, code: code || 0, timestamp: Date.now() });
+  });
+  return child.pid;
+}
+
+function readJson(filePath) {
+  try { return fs.existsSync(filePath) ? JSON.parse(fs.readFileSync(filePath, 'utf-8')) : null; } catch { return null; }
+}
+
+function checkAgentAuth(agent) {
+  const s = { id: agent.id, name: agent.name, authenticated: false, detail: '' };
+  try {
+    if (agent.id === 'claude-code') {
+      const creds = readJson(path.join(os.homedir(), '.claude', '.credentials.json'));
+      if (creds?.claudeAiOauth?.expiresAt > Date.now()) {
+        s.authenticated = true;
+        s.detail = creds.claudeAiOauth.subscriptionType || 'authenticated';
+      } else { s.detail = creds ? 'expired' : 'no credentials'; }
+    } else if (agent.id === 'gemini') {
+      const oauth = readJson(path.join(os.homedir(), '.gemini', 'oauth_creds.json'));
+      const accts = readJson(path.join(os.homedir(), '.gemini', 'google_accounts.json'));
+      const hasOAuth = !!(oauth?.refresh_token || oauth?.access_token);
+      if (accts?.active) { s.authenticated = true; s.detail = accts.active; }
+      else if (hasOAuth) { s.authenticated = true; s.detail = 'oauth'; }
+      else { s.detail = accts ? 'logged out' : 'no credentials'; }
+    } else if (agent.id === 'opencode') {
+      const out = execSync('opencode auth list 2>&1', { encoding: 'utf-8', timeout: 5000 });
+      const m = out.match(/(\d+)\s+credentials?/);
+      if (m && parseInt(m[1], 10) > 0) { s.authenticated = true; s.detail = m[1] + ' credential(s)'; }
+      else { s.detail = 'no credentials'; }
+    } else { s.detail = 'unknown'; }
+  } catch { s.detail = 'check failed'; }
+  return s;
+}
+
+export function register(router, deps) {
+  const { discoveredAgents, modelCache, activeScripts, broadcastSync,
+    startGeminiOAuth, geminiOAuthState } = deps;
+
+  router.handle('agent.auth', async (p) => {
+    const agentId = p.id;
+    if (!discoveredAgents.find(a => a.id === agentId)) throw { code: 404, message: 'Agent not found' };
+    if (agentId === 'gemini') {
+      const result = await startGeminiOAuth();
+      const cid = '__agent_auth__';
+      broadcastSync({ type: 'script_started', conversationId: cid, script: 'auth-gemini', agentId: 'gemini', timestamp: Date.now() });
+      broadcastSync({ type: 'script_output', conversationId: cid, data: `\x1b[36mOpening Google OAuth...\x1b[0m\r\n\r\nVisit:\r\n${result.authUrl}\r\n`, stream: 'stdout', timestamp: Date.now() });
+      const pollId = setInterval(() => {
+        const st = geminiOAuthState();
+        if (st.status === 'success') {
+          clearInterval(pollId);
+          broadcastSync({ type: 'script_output', conversationId: cid, data: `\r\n\x1b[32mAuth OK${st.email ? ' (' + st.email + ')' : ''}\x1b[0m\r\n`, stream: 'stdout', timestamp: Date.now() });
+          broadcastSync({ type: 'script_stopped', conversationId: cid, code: 0, timestamp: Date.now() });
+        } else if (st.status === 'error') {
+          clearInterval(pollId);
+          broadcastSync({ type: 'script_output', conversationId: cid, data: `\r\n\x1b[31mAuth failed: ${st.error}\x1b[0m\r\n`, stream: 'stderr', timestamp: Date.now() });
+          broadcastSync({ type: 'script_stopped', conversationId: cid, code: 1, error: st.error, timestamp: Date.now() });
+        }
+      }, 1000);
+      setTimeout(() => clearInterval(pollId), 5 * 60 * 1000);
+      return { ok: true, agentId, authUrl: result.authUrl, mode: result.mode };
+    }
+    const cmds = { 'claude-code': { cmd: 'claude', args: ['setup-token'] }, 'opencode': { cmd: 'opencode', args: ['auth', 'login'] } };
+    const c = cmds[agentId];
+    if (!c) throw { code: 400, message: 'No auth command for this agent' };
+    const pid = spawnScript(c.cmd, c.args, '__agent_auth__', 'auth-' + agentId, agentId, { activeScripts, broadcastSync });
+    return { ok: true, agentId, pid };
+  });
+
+  router.handle('agent.authstat', () => ({ agents: discoveredAgents.map(checkAgentAuth) }));
+
+  router.handle('agent.update', (p) => {
+    const cmds = { 'claude-code': { cmd: 'claude', args: ['update', '--yes'] } };
+    const c = cmds[p.id];
+    if (!c) throw { code: 400, message: 'No update command for this agent' };
+    const pid = spawnScript(c.cmd, c.args, '__agent_update__', 'update-' + p.id, p.id, { activeScripts, broadcastSync, modelCache });
+    return { ok: true, agentId: p.id, pid };
+  });
+}

package/package.json

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

package/server.js

@@ -14,7 +14,7 @@ import express from 'express';
 import Busboy from 'busboy';
 import fsbrowse from 'fsbrowse';
 import { queries } from './database.js';
-import { runClaudeWithStreaming } from './lib/claude-runner.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 { startGeminiOAuth, exchangeGeminiOAuthCode, handleGeminiOAuthCallback, getGeminiOAuthStatus, getGeminiOAuthState } from './lib/oauth-gemini.js';