agentgui 1.0.934 → 1.0.935

package/lib/codec.js

@@ -1,4 +1,13 @@
-import { pack, unpack } from 'msgpackr';
-
-export function encode(obj) { return pack(obj); }
-export function decode(buf) { return unpack(buf instanceof Uint8Array ? buf : new Uint8Array(buf)); }
+// agentgui WS wire codec — plain JSON (UTF-8 text frames).
+// Browser-compatible (no msgpackr). encode() returns a string the ws library
+// sends as a text frame; decode() handles both Buffer/Uint8Array (Node) and
+// string (browser) inputs.
+
+export function encode(obj) { return JSON.stringify(obj); }
+
+export function decode(buf) {
+  if (typeof buf === 'string') return JSON.parse(buf);
+  if (buf instanceof Uint8Array) return JSON.parse(new TextDecoder().decode(buf));
+  if (buf && typeof buf.toString === 'function') return JSON.parse(buf.toString('utf8'));
+  return JSON.parse(String(buf));
+}

package/lib/ws-handlers-util.js

@@ -1,7 +1,10 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
+import crypto from 'crypto';
 import { execSync, spawnSync } from 'child_process';
+import { runClaudeWithStreaming } from './claude-runner-run.js';
+import { registry } from './claude-runner-agents.js';
 
 function err(code, message) { const e = new Error(message); e.code = code; throw e; }
 
@@ -13,7 +16,106 @@ const SUB_AGENT_MAP = {
 };
 
 export function register(router, deps) {
-  const { queries, wsOptimizer, broadcastSync, getProviderConfigs, saveProviderConfig, STARTUP_CWD, discoveredAgents } = deps;
+  const { queries, wsOptimizer, broadcastSync, getProviderConfigs, saveProviderConfig, STARTUP_CWD, discoveredAgents, subscriptionIndex, activeChats } = deps;
+
+  // --- agents.list: enumerate registered ACP agents + claude-code ---
+  router.handle('agents.list', () => {
+    const agents = registry.list().map(a => ({
+      id: a.id,
+      name: a.name,
+      protocol: a.protocol,
+      supportsStdin: !!a.supportsStdin,
+      features: a.supportedFeatures || [],
+    }));
+    return { agents };
+  });
+
+  // --- conversation.subscribe: register this ws for sessionId broadcasts ---
+  router.handle('conversation.subscribe', (p, ws) => {
+    const sid = p?.sessionId;
+    if (!sid || typeof sid !== 'string') err(400, 'sessionId required');
+    if (!subscriptionIndex.has(sid)) subscriptionIndex.set(sid, new Set());
+    subscriptionIndex.get(sid).add(ws);
+    ws.subscriptions = ws.subscriptions || new Set();
+    ws.subscriptions.add(sid);
+    return { subscribed: true, sessionId: sid };
+  });
+
+  // --- chat.sendMessage: start a one-shot streaming chat with an agent.
+  // Bypasses the gutted db-queries layer entirely; calls runClaudeWithStreaming
+  // directly and broadcasts streaming_* events scoped to an ephemeral sessionId.
+  router.handle('chat.sendMessage', async (p, ws) => {
+    const content = (p?.content || '').toString();
+    if (!content) err(400, 'content required');
+    const agentId = p?.agentId || 'claude-code';
+    const model = p?.model || undefined;
+    const subAgent = p?.subAgent || undefined;
+    const cwd = p?.cwd || STARTUP_CWD;
+    if (!registry.has(agentId)) err(404, `Unknown agentId: ${agentId}`);
+
+    const sessionId = 'chat-' + crypto.randomBytes(8).toString('hex');
+    // Auto-subscribe the originating ws so it receives its own broadcasts.
+    if (!subscriptionIndex.has(sessionId)) subscriptionIndex.set(sessionId, new Set());
+    subscriptionIndex.get(sessionId).add(ws);
+    ws.subscriptions = ws.subscriptions || new Set();
+    ws.subscriptions.add(sessionId);
+
+    const ctrl = { aborted: false, proc: null };
+    activeChats.set(sessionId, ctrl);
+
+    // Fire-and-forget. Errors broadcast as streaming_error.
+    (async () => {
+      let eventCount = 0;
+      broadcastSync({ type: 'streaming_start', sessionId, agentId, timestamp: Date.now() });
+      const onEvent = (parsed) => {
+        eventCount++;
+        if (parsed?.type === 'assistant' && parsed.message?.content) {
+          for (const block of parsed.message.content) {
+            broadcastSync({ type: 'streaming_progress', sessionId, block, blockRole: 'assistant', seq: eventCount, timestamp: Date.now() });
+          }
+        } else if (parsed?.type === 'user' && parsed.message?.content) {
+          const blocks = Array.isArray(parsed.message.content) ? parsed.message.content : [];
+          for (const block of blocks) {
+            if (block?.type === 'tool_result') {
+              broadcastSync({ type: 'streaming_progress', sessionId, block, blockRole: 'tool_result', seq: eventCount, timestamp: Date.now() });
+            }
+          }
+        } else if (parsed?.type === 'result') {
+          const block = { type: 'result', result: parsed.result, subtype: parsed.subtype, duration_ms: parsed.duration_ms, total_cost_usd: parsed.total_cost_usd, is_error: !!parsed.is_error };
+          broadcastSync({ type: 'streaming_progress', sessionId, block, blockRole: 'result', seq: eventCount, isResult: true, timestamp: Date.now() });
+        }
+      };
+      try {
+        const config = {
+          verbose: true, outputFormat: 'stream-json', timeout: 1800000, print: true,
+          model, subAgent, onEvent,
+          onPid: () => {}, onProcess: (proc) => { ctrl.proc = proc; },
+        };
+        await runClaudeWithStreaming(content, cwd, agentId, config);
+        broadcastSync({ type: 'streaming_complete', sessionId, agentId, eventCount, timestamp: Date.now() });
+      } catch (e) {
+        broadcastSync({ type: 'streaming_error', sessionId, agentId, error: e.message || String(e), recoverable: false, timestamp: Date.now() });
+      } finally {
+        activeChats.delete(sessionId);
+      }
+    })();
+
+    return { sessionId, started: true };
+  });
+
+  // --- chat.cancel: abort an in-flight chat ---
+  router.handle('chat.cancel', (p) => {
+    const sid = p?.sessionId;
+    if (!sid) err(400, 'sessionId required');
+    const ctrl = activeChats.get(sid);
+    if (!ctrl) return { cancelled: false, reason: 'not-found' };
+    ctrl.aborted = true;
+    try { ctrl.proc?.kill?.(); } catch {}
+    activeChats.delete(sid);
+    return { cancelled: true };
+  });
+
+
 
   router.handle('home', () => ({ home: os.homedir(), cwd: STARTUP_CWD }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.934",
+  "version": "1.0.935",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",
@@ -37,7 +37,6 @@
     "form-data": "^4.0.5",
     "fsbrowse": "latest",
     "lru-cache": "^11.2.7",
-    "msgpackr": "^1.11.8",
     "opencode-ai": "^1.2.15",
     "p-retry": "^7.1.1",
     "puppeteer-core": "^24.37.5",

package/scripts/smoke-ws-chat.mjs

@@ -0,0 +1,62 @@
+// Smoke-test the WS chat protocol added in this session.
+// Boots no server — assumes one is already running at ws://localhost:$PORT/sync.
+//
+// Usage: PORT=3990 node scripts/smoke-ws-chat.mjs
+//
+// Checks:
+//  1. WS connects, receives sync_connected.
+//  2. agents.list returns a non-empty array.
+//  3. (optional) conversation.subscribe returns subscribed:true.
+
+import WebSocket from 'ws';
+
+const PORT = process.env.PORT || 3000;
+const URL = `ws://localhost:${PORT}/sync`;
+
+const ws = new WebSocket(URL);
+let reqId = 0;
+const pending = new Map();
+
+const call = (method, params) => new Promise((resolve, reject) => {
+  const r = ++reqId;
+  pending.set(r, { resolve, reject });
+  ws.send(JSON.stringify({ m: method, r, p: params || {} }));
+  setTimeout(() => { if (pending.has(r)) { pending.delete(r); reject(new Error('timeout: ' + method)); } }, 5000);
+});
+
+ws.on('open', async () => {
+  console.log('WS open:', URL);
+});
+
+ws.on('message', async (data) => {
+  let msg;
+  try { msg = JSON.parse(data.toString('utf8')); } catch { console.log('decode fail:', data); return; }
+  const items = Array.isArray(msg) ? msg : [msg];
+  for (const m of items) {
+    if (m && m.r !== undefined && (m.d !== undefined || m.e !== undefined)) {
+      const p = pending.get(m.r);
+      if (!p) continue;
+      pending.delete(m.r);
+      if (m.e) p.reject(new Error(m.e.m));
+      else p.resolve(m.d);
+    } else if (m?.type === 'sync_connected') {
+      console.log('sync_connected, clientId =', m.clientId);
+      try {
+        const r1 = await call('agents.list');
+        console.log('agents.list OK, count =', r1.agents.length, '— first =', r1.agents[0]?.id);
+        const r2 = await call('conversation.subscribe', { sessionId: 'smoke-test-sid' });
+        console.log('conversation.subscribe OK =', r2);
+        console.log('PASS');
+        process.exit(0);
+      } catch (e) {
+        console.error('FAIL:', e.message);
+        process.exit(1);
+      }
+    }
+  }
+});
+
+ws.on('error', (e) => { console.error('ws error:', e.message); process.exit(1); });
+ws.on('close', (code, reason) => { console.log('ws close:', code, reason?.toString()); });
+
+setTimeout(() => { console.error('overall timeout'); process.exit(1); }, 15000);

package/server.js

@@ -11,6 +11,7 @@ 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 { createRegistry } from './lib/routes-registry.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';
 import { WsRouter } from './lib/ws-protocol.js';
@@ -123,8 +124,10 @@ const { processMessageWithStreaming } = createProcessMessage({
   scheduleRetry, drainMessageQueue, createEventHandler
 });
 
+const activeChats = new Map();
 const wsRouter = new WsRouter();
 createRegistry(wsRouter, { queries, sendJSON, parseBody, broadcastSync, debugLog, PORT, BASE_URL, rootDir, STARTUP_CWD, PKG_VERSION, processMessageWithStreaming, activeExecutions, activeProcessesByRunId, activeScripts, messageQueues, rateLimitState, cleanupExecution, discoveredAgents, getACPStatus, modelCache, getModelsForAgent, logError, syncClients, wsOptimizer, errLogPath, getJsonlWatcher: () => getJsonlWatcher(), routes: _routes });
+registerWsHandlers(wsRouter, { queries, wsOptimizer, broadcastSync, getProviderConfigs, saveProviderConfig, STARTUP_CWD, discoveredAgents, subscriptionIndex, activeChats });
 
 
 const { wss, hotReloadClients } = createWsSetup(server, {

package/site/app/js/backend.js

@@ -1,6 +1,11 @@
-// agentgui backend client. Resolves base URL from ?backend= or localStorage or default
-// (same-origin). Talks to the local agentgui server: ccsniff history routes, /health,
-// and the /sync WebSocket for chat streaming.
+// agentgui backend client. Same-origin by default. Talks to:
+//  - HTTP: /health, /v1/history/* (served by ccsniff)
+//  - WS  : /sync   (JSON envelope: requests {m, r, p}; replies {r, d|e};
+//          broadcasts {type, sessionId, ...})
+// No external acptoapi dependency. Chat + agent listing flow over the WS.
+
+import { encode, decode } from './codec.js';
+
 const KEY = 'agentgui.backend';
 const DEFAULT_BACKEND = '';
 
@@ -11,27 +16,19 @@ export function getBackend() {
   return localStorage.getItem(KEY) || DEFAULT_BACKEND;
 }
 
-export function setBackend(url) {
-  localStorage.setItem(KEY, url);
-}
+export function setBackend(url) { localStorage.setItem(KEY, url); }
 
 export async function probeBackend(base) {
   try {
     const r = await fetch(base + '/health', { method: 'GET' });
     if (!r.ok) return { ok: false, status: r.status };
-    const j = await r.json();
-    return { ok: true, info: j };
+    return { ok: true, info: await r.json() };
   } catch (e) {
     return { ok: false, error: e.message };
   }
 }
 
-export async function listModels(base) {
-  const r = await fetch(base + '/v1/models');
-  if (!r.ok) throw new Error('models: ' + r.status);
-  const j = await r.json();
-  return j.data || [];
-}
+// ---------- History (HTTP, served by ccsniff) ----------
 
 export async function listSessions(base) {
   const r = await fetch(base + '/v1/history/sessions');
@@ -63,39 +60,184 @@ export function streamHistory(base, onEvent) {
   return es;
 }
 
-// Streaming chat completions using OpenAI-style SSE.
-export async function* streamChat(base, { model, messages, signal }) {
-  const r = await fetch(base + '/v1/chat/completions', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ model, messages, stream: true }),
-    signal,
-  });
-  if (!r.ok) {
-    const t = await r.text();
-    throw new Error('chat: ' + r.status + ' ' + t.slice(0, 300));
+// ---------- WebSocket client (/sync) ----------
+
+const SYNC_PATH = '/sync';
+let _ws = null;
+let _wsReady = null;       // Promise that resolves when ws is OPEN
+let _nextReqId = 1;
+const _pending = new Map();          // requestId → { resolve, reject }
+const _sessionListeners = new Map(); // sessionId → Set<(event)=>void>
+
+function wsUrl(base) {
+  if (base) {
+    // Absolute base like http://host:port → ws(s)://host:port/sync
+    try {
+      const u = new URL(base);
+      const proto = u.protocol === 'https:' ? 'wss:' : 'ws:';
+      return proto + '//' + u.host + SYNC_PATH;
+    } catch {}
   }
-  const reader = r.body.getReader();
-  const dec = new TextDecoder();
-  let buf = '';
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buf += dec.decode(value, { stream: true });
-    let idx;
-    while ((idx = buf.indexOf('\n\n')) !== -1) {
-      const block = buf.slice(0, idx);
-      buf = buf.slice(idx + 2);
-      const line = block.split('\n').find(l => l.startsWith('data:'));
-      if (!line) continue;
-      const payload = line.slice(5).trim();
-      if (payload === '[DONE]') return;
+  // Same-origin
+  const proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
+  return proto + '//' + location.host + SYNC_PATH;
+}
+
+function ensureWs(base) {
+  if (_ws && _ws.readyState === 1) return _wsReady;
+  if (_ws && _ws.readyState === 0) return _wsReady;
+  _ws = new WebSocket(wsUrl(base));
+  _wsReady = new Promise((resolve, reject) => {
+    _ws.addEventListener('open', () => resolve(_ws));
+    _ws.addEventListener('error', (e) => reject(e));
+    _ws.addEventListener('close', () => {
+      // Reject all pending requests on close so callers can recover.
+      for (const [, p] of _pending) p.reject(new Error('ws closed'));
+      _pending.clear();
+      _ws = null;
+      _wsReady = null;
+    });
+    _ws.addEventListener('message', (ev) => {
+      let msg;
       try {
-        const j = JSON.parse(payload);
-        const delta = j.choices?.[0]?.delta?.content;
-        if (delta) yield { type: 'text', text: delta };
-        if (j.error) yield { type: 'error', error: j.error };
-      } catch (_) {}
+        // Server sends text frames (JSON via codec). ev.data is string.
+        msg = typeof ev.data === 'string' ? JSON.parse(ev.data) : decode(ev.data);
+      } catch { return; }
+      // Reply to a prior request?
+      if (msg && msg.r !== undefined && (msg.d !== undefined || msg.e !== undefined)) {
+        const p = _pending.get(msg.r);
+        if (!p) return;
+        _pending.delete(msg.r);
+        if (msg.e) p.reject(new Error(msg.e.m || ('ws error ' + msg.e.c)));
+        else p.resolve(msg.d);
+        return;
+      }
+      // Unsolicited broadcast — route by sessionId to subscribers.
+      // Server may send a single event or a batch (array) per ws-optimizer.
+      const items = Array.isArray(msg) ? msg : [msg];
+      for (const item of items) {
+        const sid = item?.sessionId;
+        if (!sid) continue;
+        const subs = _sessionListeners.get(sid);
+        if (!subs) continue;
+        for (const fn of subs) { try { fn(item); } catch {} }
+      }
+    });
+  });
+  return _wsReady;
+}
+
+function wsCall(base, method, params) {
+  return ensureWs(base).then(() => new Promise((resolve, reject) => {
+    const r = _nextReqId++;
+    _pending.set(r, { resolve, reject });
+    _ws.send(encode({ m: method, r, p: params || {} }));
+  }));
+}
+
+function addSessionListener(sessionId, fn) {
+  if (!_sessionListeners.has(sessionId)) _sessionListeners.set(sessionId, new Set());
+  _sessionListeners.get(sessionId).add(fn);
+  return () => {
+    const s = _sessionListeners.get(sessionId);
+    if (s) { s.delete(fn); if (s.size === 0) _sessionListeners.delete(sessionId); }
+  };
+}
+
+// ---------- Agents / models (WS) ----------
+
+export async function listModels(base) {
+  const { agents } = await wsCall(base, 'agents.list', {});
+  // Compatibility shape: app.js expects an array of {id, name?, ...}
+  return agents || [];
+}
+
+// ---------- Streaming chat (WS) ----------
+//
+// Yields events of shape:
+//   { type: 'text',  text: '...' }    — assistant text deltas
+//   { type: 'tool',  block: {...} }   — tool_use blocks
+//   { type: 'result', block: {...} }  — terminal result block
+//   { type: 'error', error: '...' }
+//
+// Caller signature kept compatible with the previous HTTP/SSE impl.
+export async function* streamChat(base, { model, messages, signal, agentId }) {
+  // The last user message is the prompt; agentgui's claude-runner doesn't
+  // accept a full message list — it spawns the agent for a single prompt.
+  // For multi-turn, the agent's own session/resume handles continuity.
+  const last = messages[messages.length - 1];
+  const content = last?.content || '';
+  if (!content) return;
+
+  // app.js treats the "model" picker as the agent picker (selects from
+  // agents.list ids). If no explicit agentId is given, model IS the agent.
+  // If `model` looks like a real model id (has a slash), keep it as model
+  // and default agent to claude-code.
+  let resolvedAgentId = agentId;
+  let resolvedModel = model;
+  if (!resolvedAgentId) {
+    if (!model || /^[a-z][a-z0-9-]*$/.test(model)) {
+      // Bare slug — treat as agentId.
+      resolvedAgentId = model || 'claude-code';
+      resolvedModel = undefined;
+    } else {
+      resolvedAgentId = 'claude-code';
+    }
+  }
+
+  // Queue events here; the async iterator pulls from it.
+  const queue = [];
+  let resolveWait = null;
+  let done = false;
+  let errored = null;
+  const push = (ev) => { queue.push(ev); if (resolveWait) { resolveWait(); resolveWait = null; } };
+
+  // Kick off the chat on the server.
+  let started;
+  try {
+    started = await wsCall(base, 'chat.sendMessage', { content, agentId: resolvedAgentId, model: resolvedModel });
+  } catch (e) {
+    yield { type: 'error', error: e.message };
+    return;
+  }
+  const sessionId = started?.sessionId;
+  if (!sessionId) { yield { type: 'error', error: 'no sessionId from server' }; return; }
+
+  const unsub = addSessionListener(sessionId, (ev) => {
+    if (ev.type === 'streaming_progress') {
+      const block = ev.block;
+      if (block?.type === 'text' && block.text) push({ type: 'text', text: block.text });
+      else if (block?.type === 'tool_use') push({ type: 'tool', block });
+      else if (block?.type === 'tool_result') push({ type: 'tool', block });
+      else if (block?.type === 'result') push({ type: 'result', block });
+    } else if (ev.type === 'streaming_complete') {
+      done = true;
+      if (resolveWait) { resolveWait(); resolveWait = null; }
+    } else if (ev.type === 'streaming_error') {
+      errored = ev.error || 'streaming error';
+      done = true;
+      if (resolveWait) { resolveWait(); resolveWait = null; }
+    }
+  });
+
+  // Wire AbortSignal to chat.cancel.
+  const onAbort = () => { wsCall(base, 'chat.cancel', { sessionId }).catch(() => {}); };
+  if (signal) {
+    if (signal.aborted) onAbort();
+    else signal.addEventListener('abort', onAbort, { once: true });
+  }
+
+  try {
+    while (!done || queue.length > 0) {
+      if (queue.length === 0) {
+        await new Promise(r => { resolveWait = r; });
+        continue;
+      }
+      yield queue.shift();
     }
+    if (errored) yield { type: 'error', error: errored };
+  } finally {
+    unsub();
+    if (signal) signal.removeEventListener?.('abort', onAbort);
   }
 }

package/site/app/js/codec.js

@@ -0,0 +1,8 @@
+// Browser mirror of lib/codec.js. JSON over WS text frames.
+export function encode(obj) { return JSON.stringify(obj); }
+export function decode(buf) {
+  if (typeof buf === 'string') return JSON.parse(buf);
+  if (buf instanceof ArrayBuffer) return JSON.parse(new TextDecoder().decode(new Uint8Array(buf)));
+  if (buf instanceof Uint8Array) return JSON.parse(new TextDecoder().decode(buf));
+  return JSON.parse(String(buf));
+}