agentgui 1.0.831 → 1.0.832

package/lib/ws-handlers-conv.js

@@ -14,7 +14,6 @@ function validate(schema, params) {
 
 const ConvNewSchema = z.object({ agentId: z.string().optional(), title: z.string().optional(), workingDirectory: z.string().optional(), model: z.string().optional(), subAgent: z.string().optional() }).passthrough();
 const ConvUpdSchema = z.object({ id: z.string().min(1, 'id required') }).passthrough();
-const ConvSteerSchema = z.object({ id: z.string().min(1, 'conversation id required'), content: z.union([z.string(), z.record(z.any())]).refine(v => v !== undefined && v !== null && v !== '', { message: 'content required' }) }).passthrough();
 
 export function register(router, deps) {
   const { queries, activeExecutions, rateLimitState,
@@ -72,7 +71,6 @@ export function register(router, deps) {
   });
 
   router.handle('conv.del.all', (p) => {
-    // Clean up all execution machine actors
     const convs = queries.getConversationsList();
     for (const c of convs) { cleanupExecution(c.id); execMachine.remove(c.id); }
     if (!queries.deleteAllConversations()) fail(500, 'Failed to delete all conversations');
@@ -137,146 +135,4 @@ export function register(router, deps) {
     }
     return { ok: true };
   });
-
-  router.handle('conv.export', (p) => {
-    const conv = queries.getConversation(p.id);
-    if (!conv) notFound();
-    const msgs = queries.getConversationMessages(p.id);
-    const format = p.format || 'markdown';
-    if (format === 'json') return { conversation: conv, messages: msgs };
-    let md = `# ${conv.title || 'Conversation'}\n\n`;
-    md += `Agent: ${conv.agentType || 'unknown'} | Created: ${new Date(conv.created_at).toISOString()}\n\n---\n\n`;
-    for (const m of msgs) {
-      const role = m.role === 'user' ? 'User' : 'Assistant';
-      md += `## ${role}\n\n`;
-      let content = m.content;
-      try { const parsed = JSON.parse(content); if (Array.isArray(parsed)) { content = parsed.map(b => b.text || b.content || JSON.stringify(b)).join('\n'); } } catch {}
-      md += content + '\n\n---\n\n';
-    }
-    return { markdown: md, title: conv.title };
-  });
-
-  router.handle('conv.import', (p) => {
-    if (!p.conversation || !p.messages) throw Object.assign(new Error('Missing conversation or messages'), { code: 400 });
-    const src = p.conversation;
-    const conv = queries.createConversation(
-      src.agentId || src.agentType || 'claude-code',
-      src.title || 'Imported Conversation',
-      src.workingDirectory || null,
-      src.model || null
-    );
-    for (const msg of p.messages) {
-      queries.createMessage(conv.id, msg.role || 'user', msg.content || '');
-    }
-    broadcastSync({ type: 'conversation_created', conversation: queries.getConversation(conv.id) });
-    return { conversation: queries.getConversation(conv.id), importedMessages: p.messages.length };
-  });
-
-  router.handle('conv.sync', (p) => {
-    const conv = queries.getConversation(p.id);
-    if (!conv) notFound();
-    const machineSnap = execMachine.snapshot(p.id);
-    const executionState = machineSnap?.value || 'idle';
-    const latestSession = queries.getLatestSession(p.id);
-    const sinceSeq = parseInt(p.sinceSeq || '-1');
-    const since = parseInt(p.since || '0');
-    let missedChunks = [];
-    if (latestSession && sinceSeq >= 0) {
-      missedChunks = queries.getChunksSinceSeq(latestSession.id, sinceSeq);
-    } else if (latestSession && since > 0) {
-      missedChunks = queries.getConversationChunksSince(p.id, since);
-    }
-    return {
-      conversation: conv,
-      executionState,
-      isActivelyStreaming: execMachine.isActive(p.id),
-      latestSession,
-      missedChunks,
-      missedCount: missedChunks.length,
-      queueLength: machineSnap?.context?.queue?.length || 0
-    };
-  });
-
-  router.handle('conv.search', (p) => {
-    if (!p.query || typeof p.query !== 'string' || p.query.trim().length < 2) return { results: [] };
-    const limit = Math.min(parseInt(p.limit || '50'), 200);
-    return { results: queries.searchMessages(p.query.trim(), limit) };
-  });
-
-  router.handle('conv.prune', (p) => {
-    const conv = queries.getConversation(p.id);
-    if (!conv) notFound();
-    const keep = Math.max(parseInt(p.keep || '500'), 100);
-    const sessions = queries.getConversationSessions(p.id);
-    if (!sessions || sessions.length === 0) return { pruned: 0 };
-    const latestSessionId = sessions[0]?.id;
-    let pruned = 0;
-    for (const sess of sessions) {
-      if (sess.id === latestSessionId) continue;
-      const count = queries.getSessionChunks(sess.id)?.length || 0;
-      if (count > 0) { queries.deleteSessionChunks(sess.id); pruned += count; }
-    }
-    return { pruned, kept: latestSessionId, sessionsProcessed: sessions.length };
-  });
-
-  router.handle('conv.cancel', (p) => {
-    if (!execMachine.isActive(p.id)) notFound('No active execution to cancel');
-    const ctx = execMachine.getContext(p.id);
-    const pid = ctx?.pid || activeExecutions.get(p.id)?.pid;
-    const sessionId = ctx?.sessionId || activeExecutions.get(p.id)?.sessionId;
-    if (pid) { try { process.kill(-pid, 'SIGKILL'); } catch { try { process.kill(pid, 'SIGKILL'); } catch {} } }
-    if (sessionId) queries.updateSession(sessionId, { status: 'interrupted', completed_at: Date.now() });
-    cleanupExecution(p.id, false);
-    broadcastSync({ type: 'streaming_complete', sessionId, conversationId: p.id, interrupted: true, timestamp: Date.now() });
-    return { ok: true, cancelled: true, conversationId: p.id, sessionId };
-  });
-
-  router.handle('conv.inject', (p) => {
-    const conv = queries.getConversation(p.id);
-    if (!conv) notFound('Conversation not found');
-    if (!p.content) fail(400, 'Missing content');
-    const message = queries.createMessage(p.id, 'user', '[INJECTED] ' + p.content);
-    if (!execMachine.isActive(p.id)) {
-      const agentId = conv.agentId || 'claude-code';
-      const session = queries.createSession(p.id, agentId, 'pending');
-      processMessageWithStreaming(p.id, message.id, session.id, message.content, agentId, conv.model || null, conv.subAgent || null);
-    }
-    return { ok: true, injected: true, conversationId: p.id, messageId: message.id };
-  });
-
-  router.handle('conv.steer', (p) => {
-    p = validate(ConvSteerSchema, p);
-    const conv = queries.getConversation(p.id);
-    if (!conv) notFound('Conversation not found');
-
-    if (!execMachine.isActive(p.id)) fail(409, 'No active execution to steer');
-
-    const ctx = execMachine.getContext(p.id);
-    const pid = ctx?.pid || activeExecutions.get(p.id)?.pid;
-    const sessionId = ctx?.sessionId || activeExecutions.get(p.id)?.sessionId;
-
-    if (pid) {
-      try { process.kill(-pid, 'SIGKILL'); } catch { try { process.kill(pid, 'SIGKILL'); } catch (e) {} }
-    }
-
-    if (sessionId) queries.updateSession(sessionId, { status: 'interrupted', completed_at: Date.now() });
-    cleanupExecution(p.id);
-
-    // Clear claudeSessionId so new execution starts fresh without --resume on a killed session
-    queries.setClaudeSessionId(p.id, null);
-
-    broadcastSync({ type: 'streaming_complete', sessionId, conversationId: p.id, interrupted: true, timestamp: Date.now() });
-
-    const agentId = conv.agentType || conv.agentId || 'claude-code';
-    const model = conv.model || null;
-    const subAgent = conv.subAgent || null;
-    const steerContent = typeof p.content === 'string' ? p.content : (p.content ? JSON.stringify(p.content) : '');
-    const message = queries.createMessage(p.id, 'user', steerContent);
-    queries.createEvent('message.created', { role: 'user', messageId: message.id }, p.id);
-    broadcastSync({ type: 'message_created', conversationId: p.id, message, timestamp: Date.now() });
-    startExecution(p.id, message, agentId, model, steerContent, subAgent);
-
-    return { ok: true, steered: true, conversationId: p.id, messageId: message.id };
-  });
-
 }

package/lib/ws-handlers-conv2.js

@@ -0,0 +1,169 @@
+import { z } from 'zod';
+import * as execMachine from './execution-machine.js';
+
+function fail(code, message) { const e = new Error(message); e.code = code; throw e; }
+function notFound(msg = 'Not found') { fail(404, msg); }
+function validate(schema, params) {
+  const result = schema.safeParse(params);
+  if (!result.success) fail(400, result.error.issues.map(i => i.message).join('; '));
+  return result.data;
+}
+
+const ConvSteerSchema = z.object({ id: z.string().min(1, 'conversation id required'), content: z.union([z.string(), z.record(z.any())]).refine(v => v !== undefined && v !== null && v !== '', { message: 'content required' }) }).passthrough();
+
+export function register(router, deps) {
+  const { queries, activeExecutions, rateLimitState,
+    broadcastSync, processMessageWithStreaming, cleanupExecution,
+    getJsonlWatcher = () => null, logError = () => {} } = deps;
+
+  function startExecution(convId, message, agentId, model, content, subAgent) {
+    const session = queries.createSession(convId);
+    queries.createEvent('session.created', { messageId: message.id, sessionId: session.id }, convId, session.id);
+    execMachine.send(convId, { type: 'START', sessionId: session.id });
+    activeExecutions.set(convId, { pid: null, startTime: Date.now(), sessionId: session.id, lastActivity: Date.now() });
+    queries.setIsStreaming(convId, true);
+    broadcastSync({ type: 'streaming_start', sessionId: session.id, conversationId: convId, messageId: message.id, agentId, timestamp: Date.now() });
+    processMessageWithStreaming(convId, message.id, session.id, content, agentId, model, subAgent).catch(e => logError('startExecution', e, { convId }));
+    return session;
+  }
+
+  router.handle('conv.export', (p) => {
+    const conv = queries.getConversation(p.id);
+    if (!conv) notFound();
+    const msgs = queries.getConversationMessages(p.id);
+    const format = p.format || 'markdown';
+    if (format === 'json') return { conversation: conv, messages: msgs };
+    let md = `# ${conv.title || 'Conversation'}\n\n`;
+    md += `Agent: ${conv.agentType || 'unknown'} | Created: ${new Date(conv.created_at).toISOString()}\n\n---\n\n`;
+    for (const m of msgs) {
+      const role = m.role === 'user' ? 'User' : 'Assistant';
+      md += `## ${role}\n\n`;
+      let content = m.content;
+      try { const parsed = JSON.parse(content); if (Array.isArray(parsed)) { content = parsed.map(b => b.text || b.content || JSON.stringify(b)).join('\n'); } } catch {}
+      md += content + '\n\n---\n\n';
+    }
+    return { markdown: md, title: conv.title };
+  });
+
+  router.handle('conv.import', (p) => {
+    if (!p.conversation || !p.messages) throw Object.assign(new Error('Missing conversation or messages'), { code: 400 });
+    const src = p.conversation;
+    const conv = queries.createConversation(
+      src.agentId || src.agentType || 'claude-code',
+      src.title || 'Imported Conversation',
+      src.workingDirectory || null,
+      src.model || null
+    );
+    for (const msg of p.messages) {
+      queries.createMessage(conv.id, msg.role || 'user', msg.content || '');
+    }
+    broadcastSync({ type: 'conversation_created', conversation: queries.getConversation(conv.id) });
+    return { conversation: queries.getConversation(conv.id), importedMessages: p.messages.length };
+  });
+
+  router.handle('conv.sync', (p) => {
+    const conv = queries.getConversation(p.id);
+    if (!conv) notFound();
+    const machineSnap = execMachine.snapshot(p.id);
+    const executionState = machineSnap?.value || 'idle';
+    const latestSession = queries.getLatestSession(p.id);
+    const sinceSeq = parseInt(p.sinceSeq || '-1');
+    const since = parseInt(p.since || '0');
+    let missedChunks = [];
+    if (latestSession && sinceSeq >= 0) {
+      missedChunks = queries.getChunksSinceSeq(latestSession.id, sinceSeq);
+    } else if (latestSession && since > 0) {
+      missedChunks = queries.getConversationChunksSince(p.id, since);
+    }
+    return {
+      conversation: conv,
+      executionState,
+      isActivelyStreaming: execMachine.isActive(p.id),
+      latestSession,
+      missedChunks,
+      missedCount: missedChunks.length,
+      queueLength: machineSnap?.context?.queue?.length || 0
+    };
+  });
+
+  router.handle('conv.search', (p) => {
+    if (!p.query || typeof p.query !== 'string' || p.query.trim().length < 2) return { results: [] };
+    const limit = Math.min(parseInt(p.limit || '50'), 200);
+    return { results: queries.searchMessages(p.query.trim(), limit) };
+  });
+
+  router.handle('conv.prune', (p) => {
+    const conv = queries.getConversation(p.id);
+    if (!conv) notFound();
+    const keep = Math.max(parseInt(p.keep || '500'), 100);
+    const sessions = queries.getConversationSessions(p.id);
+    if (!sessions || sessions.length === 0) return { pruned: 0 };
+    const latestSessionId = sessions[0]?.id;
+    let pruned = 0;
+    for (const sess of sessions) {
+      if (sess.id === latestSessionId) continue;
+      const count = queries.getSessionChunks(sess.id)?.length || 0;
+      if (count > 0) { queries.deleteSessionChunks(sess.id); pruned += count; }
+    }
+    return { pruned, kept: latestSessionId, sessionsProcessed: sessions.length };
+  });
+
+  router.handle('conv.cancel', (p) => {
+    if (!execMachine.isActive(p.id)) notFound('No active execution to cancel');
+    const ctx = execMachine.getContext(p.id);
+    const pid = ctx?.pid || activeExecutions.get(p.id)?.pid;
+    const sessionId = ctx?.sessionId || activeExecutions.get(p.id)?.sessionId;
+    if (pid) { try { process.kill(-pid, 'SIGKILL'); } catch { try { process.kill(pid, 'SIGKILL'); } catch {} } }
+    if (sessionId) queries.updateSession(sessionId, { status: 'interrupted', completed_at: Date.now() });
+    cleanupExecution(p.id, false);
+    broadcastSync({ type: 'streaming_complete', sessionId, conversationId: p.id, interrupted: true, timestamp: Date.now() });
+    return { ok: true, cancelled: true, conversationId: p.id, sessionId };
+  });
+
+  router.handle('conv.inject', (p) => {
+    const conv = queries.getConversation(p.id);
+    if (!conv) notFound('Conversation not found');
+    if (!p.content) fail(400, 'Missing content');
+    const message = queries.createMessage(p.id, 'user', '[INJECTED] ' + p.content);
+    if (!execMachine.isActive(p.id)) {
+      const agentId = conv.agentId || 'claude-code';
+      const session = queries.createSession(p.id, agentId, 'pending');
+      processMessageWithStreaming(p.id, message.id, session.id, message.content, agentId, conv.model || null, conv.subAgent || null);
+    }
+    return { ok: true, injected: true, conversationId: p.id, messageId: message.id };
+  });
+
+  router.handle('conv.steer', (p) => {
+    p = validate(ConvSteerSchema, p);
+    const conv = queries.getConversation(p.id);
+    if (!conv) notFound('Conversation not found');
+
+    if (!execMachine.isActive(p.id)) fail(409, 'No active execution to steer');
+
+    const ctx = execMachine.getContext(p.id);
+    const pid = ctx?.pid || activeExecutions.get(p.id)?.pid;
+    const sessionId = ctx?.sessionId || activeExecutions.get(p.id)?.sessionId;
+
+    if (pid) {
+      try { process.kill(-pid, 'SIGKILL'); } catch { try { process.kill(pid, 'SIGKILL'); } catch (e) {} }
+    }
+
+    if (sessionId) queries.updateSession(sessionId, { status: 'interrupted', completed_at: Date.now() });
+    cleanupExecution(p.id);
+
+    queries.setClaudeSessionId(p.id, null);
+
+    broadcastSync({ type: 'streaming_complete', sessionId, conversationId: p.id, interrupted: true, timestamp: Date.now() });
+
+    const agentId = conv.agentType || conv.agentId || 'claude-code';
+    const model = conv.model || null;
+    const subAgent = conv.subAgent || null;
+    const steerContent = typeof p.content === 'string' ? p.content : (p.content ? JSON.stringify(p.content) : '');
+    const message = queries.createMessage(p.id, 'user', steerContent);
+    queries.createEvent('message.created', { role: 'user', messageId: message.id }, p.id);
+    broadcastSync({ type: 'message_created', conversationId: p.id, message, timestamp: Date.now() });
+    startExecution(p.id, message, agentId, model, steerContent, subAgent);
+
+    return { ok: true, steered: true, conversationId: p.id, messageId: message.id };
+  });
+}

package/package.json

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

package/server.js

@@ -33,7 +33,9 @@ import { WsRouter } from './lib/ws-protocol.js';
 import { encode as wsEncode } from './lib/codec.js';
 const sendWs = (ws, obj) => { if (ws.readyState === 1) ws.send(wsEncode(obj)); };
 import { register as registerConvHandlers } from './lib/ws-handlers-conv.js';
+import { register as registerConvHandlers2 } from './lib/ws-handlers-conv2.js';
 import { register as registerSessionHandlers } from './lib/ws-handlers-session.js';
+import { register as registerSessionHandlers2 } from './lib/ws-handlers-session2.js';
 import { register as registerRunHandlers } from './lib/ws-handlers-run.js';
 import { register as registerUtilHandlers } from './lib/ws-handlers-util.js';
 import { register as registerOAuthHandlers } from './lib/ws-handlers-oauth.js';
@@ -2627,6 +2629,11 @@ registerConvHandlers(wsRouter, {
   broadcastSync, processMessageWithStreaming, cleanupExecution,
   getJsonlWatcher: () => jsonlWatcher
 });
+registerConvHandlers2(wsRouter, {
+  queries, activeExecutions, rateLimitState,
+  broadcastSync, processMessageWithStreaming, cleanupExecution,
+  getJsonlWatcher: () => jsonlWatcher
+});
 
 registerMsgHandlers(wsRouter, {
   queries, activeExecutions, messageQueues,
@@ -2641,6 +2648,10 @@ registerSessionHandlers(wsRouter, {
   getAgentDescriptor, activeScripts, broadcastSync,
   startGeminiOAuth: (req) => startGeminiOAuth(req, { PORT, BASE_URL, rootDir }), geminiOAuthState: getGeminiOAuthState
 });
+registerSessionHandlers2(wsRouter, {
+  discoveredAgents, modelCache, activeScripts, broadcastSync,
+  startGeminiOAuth: (req) => startGeminiOAuth(req, { PORT, BASE_URL, rootDir }), geminiOAuthState: getGeminiOAuthState
+});
 debugLog('[INIT] registerSessionHandlers completed');
 
 registerRunHandlers(wsRouter, {