agentgui 1.0.445 → 1.0.447

package/database.js

@@ -341,7 +341,8 @@ try {
     workingDirectory: 'TEXT',
     claudeSessionId: 'TEXT',
     isStreaming: 'INTEGER DEFAULT 0',
-    model: 'TEXT'
+    model: 'TEXT',
+    subAgent: 'TEXT'
   };
 
   let addedColumns = false;
@@ -527,13 +528,13 @@ function generateId(prefix) {
 
 export const queries = {
   _db: db,
-  createConversation(agentType, title = null, workingDirectory = null, model = null) {
+  createConversation(agentType, title = null, workingDirectory = null, model = null, subAgent = null) {
     const id = generateId('conv');
     const now = Date.now();
     const stmt = prep(
-      `INSERT INTO conversations (id, agentId, agentType, title, created_at, updated_at, status, workingDirectory, model) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      `INSERT INTO conversations (id, agentId, agentType, title, created_at, updated_at, status, workingDirectory, model, subAgent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     );
-    stmt.run(id, agentType, agentType, title, now, now, 'active', workingDirectory, model);
+    stmt.run(id, agentType, agentType, title, now, now, 'active', workingDirectory, model, subAgent);
 
     return {
       id,
@@ -541,6 +542,7 @@ export const queries = {
       title,
       workingDirectory,
       model,
+      subAgent,
       created_at: now,
       updated_at: now,
       status: 'active'
@@ -559,7 +561,7 @@ export const queries = {
 
   getConversationsList() {
     const stmt = prep(
-      'SELECT id, agentId, title, agentType, created_at, updated_at, messageCount, workingDirectory, isStreaming, model FROM conversations WHERE status != ? ORDER BY updated_at DESC'
+      'SELECT id, agentId, title, agentType, created_at, updated_at, messageCount, workingDirectory, isStreaming, model, subAgent FROM conversations WHERE status != ? ORDER BY updated_at DESC'
     );
     return stmt.all('deleted');
   },
@@ -579,11 +581,12 @@ export const queries = {
     const agentId = data.agentId !== undefined ? data.agentId : conv.agentId;
     const agentType = data.agentType !== undefined ? data.agentType : conv.agentType;
     const model = data.model !== undefined ? data.model : conv.model;
+    const subAgent = data.subAgent !== undefined ? data.subAgent : conv.subAgent;
 
     const stmt = prep(
-      `UPDATE conversations SET title = ?, status = ?, agentId = ?, agentType = ?, model = ?, updated_at = ? WHERE id = ?`
+      `UPDATE conversations SET title = ?, status = ?, agentId = ?, agentType = ?, model = ?, subAgent = ?, updated_at = ? WHERE id = ?`
     );
-    stmt.run(title, status, agentId, agentType, model, now, id);
+    stmt.run(title, status, agentId, agentType, model, subAgent, now, id);
 
     return {
       ...conv,
@@ -592,6 +595,7 @@ export const queries = {
       agentId,
       agentType,
       model,
+      subAgent,
       updated_at: now
     };
   },
@@ -619,13 +623,13 @@ export const queries = {
   },
 
   getStreamingConversations() {
-    const stmt = prep('SELECT id, title, claudeSessionId, agentId, agentType, model FROM conversations WHERE isStreaming = 1');
+    const stmt = prep('SELECT id, title, claudeSessionId, agentId, agentType, model, subAgent FROM conversations WHERE isStreaming = 1');
     return stmt.all();
   },
 
   getResumableConversations() {
     const stmt = prep(
-      "SELECT id, title, claudeSessionId, agentId, agentType, workingDirectory, model FROM conversations WHERE isStreaming = 1 AND claudeSessionId IS NOT NULL AND claudeSessionId != ''"
+      "SELECT id, title, claudeSessionId, agentId, agentType, workingDirectory, model, subAgent FROM conversations WHERE isStreaming = 1 AND claudeSessionId IS NOT NULL AND claudeSessionId != ''"
     );
     return stmt.all();
   },

package/lib/claude-runner.js

@@ -359,6 +359,7 @@ class AgentRunner {
             mcpServers: []
           };
           if (config.model) sessionParams.model = config.model;
+          if (config.subAgent) sessionParams.agent = config.subAgent;
           const sessionRequest = {
             jsonrpc: '2.0',
             id: ++requestId,

package/lib/ws-handlers-conv.js

@@ -15,8 +15,8 @@ export function register(router, deps) {
 
   router.handle('conv.new', (p) => {
     const wd = p.workingDirectory ? path.resolve(p.workingDirectory) : null;
-    const conv = queries.createConversation(p.agentId, p.title, wd, p.model || null);
-    queries.createEvent('conversation.created', { agentId: p.agentId, workingDirectory: conv.workingDirectory, model: conv.model }, conv.id);
+    const conv = queries.createConversation(p.agentId, p.title, wd, p.model || null, p.subAgent || null);
+    queries.createEvent('conversation.created', { agentId: p.agentId, workingDirectory: conv.workingDirectory, model: conv.model, subAgent: conv.subAgent }, conv.id);
     broadcastSync({ type: 'conversation_created', conversation: conv });
     return { conversation: conv };
   });
@@ -87,7 +87,7 @@ export function register(router, deps) {
     if (!entry) {
       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);
+      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 };
   });
@@ -96,19 +96,19 @@ export function register(router, deps) {
     return queries.getPaginatedMessages(p.id, Math.min(p.limit || 50, 100), Math.max(p.offset || 0, 0));
   });
 
-  function startExecution(convId, message, agentId, model, content) {
+  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);
     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).catch(() => {});
+    processMessageWithStreaming(convId, message.id, session.id, content, agentId, model, subAgent).catch(() => {});
     return session;
   }
 
-  function enqueue(convId, content, agentId, model, messageId) {
+  function enqueue(convId, content, agentId, model, messageId, subAgent) {
     if (!messageQueues.has(convId)) messageQueues.set(convId, []);
-    messageQueues.get(convId).push({ content, agentId, model, messageId });
+    messageQueues.get(convId).push({ content, agentId, model, messageId, subAgent });
     const queueLength = messageQueues.get(convId).length;
     broadcastSync({ type: 'queue_status', conversationId: convId, queueLength, messageId, timestamp: Date.now() });
     return queueLength;
@@ -119,15 +119,16 @@ export function register(router, deps) {
     if (!conv) notFound('Conversation not found');
     const agentId = p.agentId || conv.agentType || conv.agentId || 'claude-code';
     const model = p.model || conv.model || null;
+    const subAgent = p.subAgent || conv.subAgent || null;
     const idempotencyKey = p.idempotencyKey || null;
     const message = queries.createMessage(p.id, 'user', p.content, idempotencyKey);
     queries.createEvent('message.created', { role: 'user', messageId: message.id }, p.id);
     broadcastSync({ type: 'message_created', conversationId: p.id, message, timestamp: Date.now() });
     if (activeExecutions.has(p.id)) {
-      const qp = enqueue(p.id, p.content, agentId, model, message.id);
+      const qp = enqueue(p.id, p.content, agentId, model, message.id, subAgent);
       return { message, queued: true, queuePosition: qp, idempotencyKey };
     }
-    const session = startExecution(p.id, message, agentId, model, p.content);
+    const session = startExecution(p.id, message, agentId, model, p.content, subAgent);
     return { message, session, idempotencyKey };
   });
 
@@ -143,14 +144,15 @@ export function register(router, deps) {
     const prompt = p.content || p.message || '';
     const agentId = p.agentId || conv.agentType || conv.agentId || 'claude-code';
     const model = p.model || conv.model || null;
+    const subAgent = p.subAgent || conv.subAgent || null;
     const userMessage = queries.createMessage(p.id, 'user', prompt);
     queries.createEvent('message.created', { role: 'user', messageId: userMessage.id }, p.id);
     broadcastSync({ type: 'message_created', conversationId: p.id, message: userMessage, timestamp: Date.now() });
     if (activeExecutions.has(p.id)) {
-      const qp = enqueue(p.id, prompt, agentId, model, userMessage.id);
+      const qp = enqueue(p.id, prompt, agentId, model, userMessage.id, subAgent);
       return { message: userMessage, queued: true, queuePosition: qp };
     }
-    const session = startExecution(p.id, userMessage, agentId, model, prompt);
+    const session = startExecution(p.id, userMessage, agentId, model, prompt, subAgent);
     return { message: userMessage, session, streamId: session.id };
   });
 

package/package.json

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

package/server.js

@@ -1045,6 +1045,7 @@ const server = http.createServer(async (req, res) => {
         const body = await parseBody(req);
         const agentId = body.agentId || conv.agentType || conv.agentId || 'claude-code';
         const model = body.model || conv.model || null;
+        const subAgent = body.subAgent || conv.subAgent || null;
         const idempotencyKey = body.idempotencyKey || null;
         const message = queries.createMessage(conversationId, 'user', body.content, idempotencyKey);
         queries.createEvent('message.created', { role: 'user', messageId: message.id }, conversationId);
@@ -1052,7 +1053,7 @@ const server = http.createServer(async (req, res) => {
 
         if (activeExecutions.has(conversationId)) {
           if (!messageQueues.has(conversationId)) messageQueues.set(conversationId, []);
-          messageQueues.get(conversationId).push({ content: body.content, agentId, model, messageId: message.id });
+          messageQueues.get(conversationId).push({ content: body.content, agentId, model, messageId: message.id, subAgent });
           const queueLength = messageQueues.get(conversationId).length;
           broadcastSync({ type: 'queue_status', conversationId, queueLength, messageId: message.id, timestamp: Date.now() });
           sendJSON(req, res, 200, { message, queued: true, queuePosition: queueLength, idempotencyKey });
@@ -1076,7 +1077,7 @@ const server = http.createServer(async (req, res) => {
 
         sendJSON(req, res, 201, { message, session, idempotencyKey });
 
-        processMessageWithStreaming(conversationId, message.id, session.id, body.content, agentId, model)
+        processMessageWithStreaming(conversationId, message.id, session.id, body.content, agentId, model, subAgent)
           .catch(err => {
             console.error(`[messages] Uncaught error for conv ${conversationId}:`, err.message);
             debugLog(`[messages] Uncaught error: ${err.message}`);
@@ -1095,6 +1096,7 @@ const server = http.createServer(async (req, res) => {
       const prompt = body.content || body.message || '';
       const agentId = body.agentId || conv.agentType || conv.agentId || 'claude-code';
       const model = body.model || conv.model || null;
+      const subAgent = body.subAgent || conv.subAgent || null;
 
       const userMessage = queries.createMessage(conversationId, 'user', prompt);
       queries.createEvent('message.created', { role: 'user', messageId: userMessage.id }, conversationId);
@@ -1104,7 +1106,7 @@ const server = http.createServer(async (req, res) => {
       if (activeExecutions.has(conversationId)) {
         debugLog(`[stream] Conversation ${conversationId} is busy, queuing message`);
         if (!messageQueues.has(conversationId)) messageQueues.set(conversationId, []);
-        messageQueues.get(conversationId).push({ content: prompt, agentId, model, messageId: userMessage.id });
+        messageQueues.get(conversationId).push({ content: prompt, agentId, model, messageId: userMessage.id, subAgent });
 
         const queueLength = messageQueues.get(conversationId).length;
         broadcastSync({ type: 'queue_status', conversationId, queueLength, messageId: userMessage.id, timestamp: Date.now() });
@@ -1130,7 +1132,7 @@ const server = http.createServer(async (req, res) => {
 
       sendJSON(req, res, 200, { message: userMessage, session, streamId: session.id });
 
-      processMessageWithStreaming(conversationId, userMessage.id, session.id, prompt, agentId, model)
+      processMessageWithStreaming(conversationId, userMessage.id, session.id, prompt, agentId, model, subAgent)
         .catch(err => debugLog(`[stream] Uncaught error: ${err.message}`));
       return;
     }
@@ -3148,7 +3150,7 @@ function createChunkBatcher() {
   return { add, drain };
 }
 
-async function processMessageWithStreaming(conversationId, messageId, sessionId, content, agentId, model) {
+async function processMessageWithStreaming(conversationId, messageId, sessionId, content, agentId, model, subAgent) {
   const startTime = Date.now();
   touchACP(agentId);
   
@@ -3309,7 +3311,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
                   conversationId,
                   timestamp: Date.now()
                 });
-                scheduleRetry(conversationId, messageId, content, agentId, model);
+                scheduleRetry(conversationId, messageId, content, agentId, model, subAgent);
               }, retryAfterSec * 1000);
               
               return; // Stop processing events
@@ -3431,7 +3433,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
                 conversationId,
                 timestamp: Date.now()
               });
-              scheduleRetry(conversationId, messageId, content, agentId, model);
+              scheduleRetry(conversationId, messageId, content, agentId, model, subAgent);
             }, retryAfterSec * 1000);
             
             return;
@@ -3487,6 +3489,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
     };
 
     const resolvedModel = model || conv?.model || null;
+    const resolvedSubAgent = subAgent || conv?.subAgent || null;
     const config = {
       verbose: true,
       outputFormat: 'stream-json',
@@ -3495,6 +3498,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
       resumeSessionId,
       systemPrompt: SYSTEM_PROMPT,
       model: resolvedModel || undefined,
+      subAgent: resolvedSubAgent || undefined,
       onEvent,
       onPid: (pid) => {
         const entry = activeExecutions.get(conversationId);
@@ -3611,7 +3615,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
           conversationId,
           timestamp: Date.now()
         });
-        scheduleRetry(conversationId, messageId, content, agentId, model);
+        scheduleRetry(conversationId, messageId, content, agentId, model, subAgent);
       }, cooldownMs);
       return;
     }
@@ -3645,7 +3649,7 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
   }
 }
 
-function scheduleRetry(conversationId, messageId, content, agentId, model) {
+function scheduleRetry(conversationId, messageId, content, agentId, model, subAgent) {
   debugLog(`[rate-limit] scheduleRetry called for conv ${conversationId}, messageId=${messageId}`);
 
   if (!content) {
@@ -3672,7 +3676,7 @@ function scheduleRetry(conversationId, messageId, content, agentId, model) {
   activeExecutions.set(conversationId, { pid: null, startTime, sessionId: newSession.id, lastActivity: startTime });
 
   debugLog(`[rate-limit] Calling processMessageWithStreaming for retry`);
-  processMessageWithStreaming(conversationId, messageId, newSession.id, content, agentId, model)
+  processMessageWithStreaming(conversationId, messageId, newSession.id, content, agentId, model, subAgent)
     .catch(err => {
       debugLog(`[rate-limit] Retry failed: ${err.message}`);
       console.error(`[rate-limit] Retry error for conv ${conversationId}:`, err);
@@ -3710,7 +3714,7 @@ function drainMessageQueue(conversationId) {
   const startTime = Date.now();
   activeExecutions.set(conversationId, { pid: null, startTime, sessionId: session.id, lastActivity: startTime });
 
-  processMessageWithStreaming(conversationId, next.messageId, session.id, next.content, next.agentId, next.model)
+  processMessageWithStreaming(conversationId, next.messageId, session.id, next.content, next.agentId, next.model, next.subAgent)
     .catch(err => debugLog(`[queue] Error processing queued message: ${err.message}`));
 }
 
@@ -4074,7 +4078,7 @@ async function resumeInterruptedStreams() {
         const messageId = lastMsg?.id || null;
         console.log(`[RESUME] Resuming conv ${conv.id} (claude session: ${conv.claudeSessionId})`);
 
-        processMessageWithStreaming(conv.id, messageId, session.id, promptText, conv.agentType, conv.model)
+        processMessageWithStreaming(conv.id, messageId, session.id, promptText, conv.agentType, conv.model, conv.subAgent)
           .catch(err => debugLog(`[RESUME] Error resuming conv ${conv.id}: ${err.message}`));
 
         if (i < toResume.length - 1) {

package/static/js/client.js

@@ -372,7 +372,6 @@ class AgentGUIClient {
     if (this.ui.agentSelector) {
       this.ui.agentSelector.addEventListener('change', () => {
         if (!this._agentLocked) {
-          this.loadModelsForAgent(this.getEffectiveAgentId());
           this.saveAgentAndModelToConversation();
         }
       });
@@ -1261,6 +1260,7 @@ class AgentGUIClient {
     const conv = this.state.currentConversation;
     const isNewConversation = conv && !conv.messageCount && !this.state.streamingConversations.has(conv.id);
     const agentId = (isNewConversation ? this.getCurrentAgent() : null) || conv?.agentType || this.getCurrentAgent();
+    const subAgent = this.getEffectiveSubAgent() || conv?.subAgent || null;
     const model = this.ui.modelSelector?.value || null;
 
     if (!prompt.trim()) {
@@ -1281,11 +1281,12 @@ class AgentGUIClient {
     try {
       if (conv?.id) {
         this.lockAgentAndModel(agentId, model);
-        await this.streamToConversation(conv.id, savedPrompt, agentId, model);
+        await this.streamToConversation(conv.id, savedPrompt, agentId, model, subAgent);
         this._confirmOptimisticMessage(pendingId);
       } else {
         const body = { agentId, title: savedPrompt.substring(0, 50) };
         if (model) body.model = model;
+        if (subAgent) body.subAgent = subAgent;
         const { conversation } = await window.wsClient.rpc('conv.new', body);
         this.state.currentConversation = conversation;
         this.lockAgentAndModel(agentId, model);
@@ -1295,7 +1296,7 @@ class AgentGUIClient {
           window.conversationManager.select(conversation.id);
         }
 
-        await this.streamToConversation(conversation.id, savedPrompt, agentId, model);
+        await this.streamToConversation(conversation.id, savedPrompt, agentId, model, subAgent);
         this._confirmOptimisticMessage(pendingId);
       }
     } catch (error) {
@@ -1536,7 +1537,7 @@ class AgentGUIClient {
     `;
   }
 
-  async streamToConversation(conversationId, prompt, agentId, model) {
+  async streamToConversation(conversationId, prompt, agentId, model, subAgent) {
     try {
       if (this.wsManager.isConnected) {
         this.wsManager.sendMessage({ type: 'subscribe', conversationId });
@@ -1544,6 +1545,7 @@ class AgentGUIClient {
 
       const streamBody = { id: conversationId, content: prompt, agentId };
       if (model) streamBody.model = model;
+      if (subAgent) streamBody.subAgent = subAgent;
       let result;
       try {
         result = await window.wsClient.rpc('msg.stream', streamBody);
@@ -1553,6 +1555,7 @@ class AgentGUIClient {
           const conv = this.state.currentConversation;
           const createBody = { agentId, title: conv?.title || prompt.substring(0, 50), workingDirectory: conv?.workingDirectory || null };
           if (model) createBody.model = model;
+          if (subAgent) createBody.subAgent = subAgent;
           const { conversation: newConv } = await window.wsClient.rpc('conv.new', createBody);
           this.state.currentConversation = newConv;
           if (window.conversationManager) {
@@ -1560,7 +1563,7 @@ class AgentGUIClient {
             window.conversationManager.select(newConv.id);
           }
           this.updateUrlForConversation(newConv.id);
-          return this.streamToConversation(newConv.id, prompt, agentId, model);
+          return this.streamToConversation(newConv.id, prompt, agentId, model, subAgent);
         }
         throw e;
       }
@@ -1875,7 +1878,7 @@ class AgentGUIClient {
           .map(a => `<option value="${a.id}">${a.name}</option>`)
           .join('');
         this.ui.agentSelector.style.display = 'inline-block';
-        this.loadModelsForAgent(this.getEffectiveAgentId());
+        this.loadModelsForAgent(cliAgentId);
       }
     } catch (_) {
       // No sub-agents available for this CLI tool — keep hidden
@@ -1972,6 +1975,7 @@ class AgentGUIClient {
   applyAgentAndModelSelection(conversation, hasActivity) {
     const agentId = conversation.agentId || conversation.agentType || null;
     const model = conversation.model || null;
+    const subAgent = conversation.subAgent || null;
 
     if (hasActivity) {
       this._setCliSelectorToAgent(agentId);
@@ -1981,6 +1985,11 @@ class AgentGUIClient {
       this._setCliSelectorToAgent(agentId);
 
       const effectiveAgentId = agentId || this.getEffectiveAgentId();
+      this.loadSubAgentsForCli(effectiveAgentId).then(() => {
+        if (subAgent && this.ui.agentSelector) {
+          this.ui.agentSelector.value = subAgent;
+        }
+      });
       this.loadModelsForAgent(effectiveAgentId).then(() => {
         if (model && this.ui.modelSelector) {
           this.ui.modelSelector.value = model;
@@ -2562,10 +2571,14 @@ class AgentGUIClient {
    * Get current selected agent
    */
   getEffectiveAgentId() {
+    return this.ui.cliSelector?.value || null;
+  }
+
+  getEffectiveSubAgent() {
     if (this.ui.agentSelector?.value && this.ui.agentSelector.style.display !== 'none') {
       return this.ui.agentSelector.value;
     }
-    return this.ui.cliSelector?.value || null;
+    return null;
   }
 
   getCurrentAgent() {
@@ -2576,8 +2589,9 @@ class AgentGUIClient {
     const convId = this.state.currentConversation;
     if (!convId || this._agentLocked) return;
     const agentId = this.getEffectiveAgentId();
+    const subAgent = this.getEffectiveSubAgent();
     const model = this.getCurrentModel();
-    window.wsClient.rpc('conv.upd', { id: convId, agentType: agentId, model: model || undefined }).catch(() => {});
+    window.wsClient.rpc('conv.upd', { id: convId, agentType: agentId, subAgent: subAgent || undefined, model: model || undefined }).catch(() => {});
   }
 
   /**