agentgui 1.0.267 → 1.0.268

package/lib/claude-runner.js

@@ -736,6 +736,196 @@ registry.register({
   }
 });
 
+/**
+ * Common ACP protocol handler for all ACP agents
+ */
+function createACPProtocolHandler() {
+  return function(message, context) {
+    if (!message || typeof message !== 'object') return null;
+
+    // Handle ACP session/update notifications
+    if (message.method === 'session/update') {
+      const params = message.params || {};
+      const update = params.update || {};
+      
+      // Agent message chunk (text response)
+      if (update.sessionUpdate === 'agent_message_chunk' && update.content) {
+        let contentBlock;
+        
+        // Handle different content formats
+        if (typeof update.content === 'string') {
+          contentBlock = { type: 'text', text: update.content };
+        } else if (update.content.type === 'text' && update.content.text) {
+          contentBlock = update.content;
+        } else if (update.content.text) {
+          contentBlock = { type: 'text', text: update.content.text };
+        } else if (update.content.content) {
+          const inner = update.content.content;
+          if (typeof inner === 'string') {
+            contentBlock = { type: 'text', text: inner };
+          } else if (inner.type === 'text' && inner.text) {
+            contentBlock = inner;
+          } else {
+            contentBlock = { type: 'text', text: JSON.stringify(inner) };
+          }
+        } else {
+          contentBlock = { type: 'text', text: JSON.stringify(update.content) };
+        }
+        
+        return {
+          type: 'assistant',
+          message: {
+            role: 'assistant',
+            content: [contentBlock]
+          },
+          session_id: params.sessionId
+        };
+      }
+      
+      // Tool call
+      if (update.sessionUpdate === 'tool_call') {
+        return {
+          type: 'assistant',
+          message: {
+            role: 'assistant',
+            content: [{
+              type: 'tool_use',
+              id: update.toolCallId,
+              name: update.title || update.kind || 'tool',
+              kind: update.kind || 'other',
+              input: update.rawInput || update.input || {}
+            }]
+          },
+          session_id: params.sessionId
+        };
+      }
+      
+      // Tool call update (result) - handle all statuses
+      if (update.sessionUpdate === 'tool_call_update') {
+        const status = update.status;
+        const isError = status === 'failed';
+        const isCompleted = status === 'completed';
+        
+        if (!isCompleted && !isError) {
+          return {
+            type: 'tool_status',
+            tool_use_id: update.toolCallId,
+            status: status,
+            kind: update.kind || 'other',
+            locations: update.locations || [],
+            session_id: params.sessionId
+          };
+        }
+        
+        const contentParts = [];
+        if (update.content && Array.isArray(update.content)) {
+          for (const item of update.content) {
+            if (item.type === 'content' && item.content) {
+              const innerContent = item.content;
+              if (innerContent.type === 'text' && innerContent.text) {
+                contentParts.push(innerContent.text);
+              } else if (innerContent.type === 'resource' && innerContent.resource) {
+                contentParts.push(innerContent.resource.text || JSON.stringify(innerContent.resource));
+              } else {
+                contentParts.push(JSON.stringify(innerContent));
+              }
+            } else if (item.type === 'diff') {
+              const diffText = item.oldText 
+                ? `--- ${item.path}\n+++ ${item.path}\n${item.oldText}\n---\n${item.newText}`
+                : `+++ ${item.path}\n${item.newText}`;
+              contentParts.push(diffText);
+            } else if (item.type === 'terminal') {
+              contentParts.push(`[Terminal: ${item.terminalId}]`);
+            }
+          }
+        }
+        
+        const combinedContent = contentParts.join('\n') || (update.rawOutput ? JSON.stringify(update.rawOutput) : '');
+        
+        return {
+          type: 'user',
+          message: {
+            role: 'user',
+            content: [{
+              type: 'tool_result',
+              tool_use_id: update.toolCallId,
+              content: combinedContent,
+              is_error: isError
+            }]
+          },
+          session_id: params.sessionId
+        };
+      }
+      
+      // Usage update
+      if (update.sessionUpdate === 'usage_update') {
+        return {
+          type: 'usage',
+          usage: {
+            used: update.used,
+            size: update.size,
+            cost: update.cost
+          },
+          session_id: params.sessionId
+        };
+      }
+      
+      // Plan update
+      if (update.sessionUpdate === 'plan') {
+        return {
+          type: 'plan',
+          entries: update.entries || [],
+          session_id: params.sessionId
+        };
+      }
+      
+      return null;
+    }
+
+    // Handle prompt response (end of turn)
+    if (message.id && message.result && message.result.stopReason) {
+      return {
+        type: 'result',
+        result: '',
+        stopReason: message.result.stopReason,
+        usage: message.result.usage,
+        session_id: context.sessionId
+      };
+    }
+
+    if (message.method === 'error' || message.error) {
+      return {
+        type: 'error',
+        error: message.error || message.params || { message: 'Unknown error' }
+      };
+    }
+
+    return null;
+  };
+}
+
+    // Handle prompt response (end of turn)
+    if (message.id && message.result && message.result.stopReason) {
+      return {
+        type: 'result',
+        result: '',
+        stopReason: message.result.stopReason,
+        usage: message.result.usage,
+        session_id: context.sessionId
+      };
+    }
+
+    if (message.method === 'error' || message.error) {
+      return {
+        type: 'error',
+        error: message.error || message.params || { message: 'Unknown error' }
+      };
+    }
+
+    return null;
+  }
+});
+
 /**
  * Common ACP protocol handler for all ACP agents
  */

package/package.json

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

package/server.js

@@ -2821,6 +2821,19 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
     return;
   }
   
+  if (activeExecutions.has(conversationId)) {
+    debugLog(`[stream] Conversation ${conversationId} already has active execution, aborting duplicate`);
+    return;
+  }
+  
+  if (rateLimitState.has(conversationId)) {
+    const rlState = rateLimitState.get(conversationId);
+    if (rlState.retryAt > Date.now()) {
+      debugLog(`[stream] Conversation ${conversationId} is in rate limit cooldown, aborting`);
+      return;
+    }
+  }
+  
   activeExecutions.set(conversationId, { pid: null, startTime, sessionId, lastActivity: startTime });
   queries.setIsStreaming(conversationId, true);
   queries.updateSession(sessionId, { status: 'active' });

package/static/index.html

@@ -970,6 +970,10 @@
     details { margin: 0.25rem 0; }
     summary { cursor: pointer; user-select: none; padding: 0.375rem; border-radius: 0.25rem; transition: background-color 0.2s; }
     summary:hover { background-color: var(--color-bg-secondary); }
+    .permanently-expanded > summary { cursor: default; }
+    .permanently-expanded > summary::before { display: none; }
+    .permanently-expanded > summary::-webkit-details-marker { display: none; }
+    .permanently-expanded > summary::marker { display: none; content: ''; }
 
     /* ===== Folder Browser Modal ===== */
     .folder-modal-overlay { display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.5); z-index:2000; align-items:center; justify-content:center; }
@@ -2196,6 +2200,35 @@
     .folded-tool.has-error > .folded-tool-body { border-top-color: #fecaca; }
     html.dark .folded-tool.has-error > .folded-tool-body { border-top-color: #7f1d1d; }
 
+    /* --- Success/Error status icons in header --- */
+    .folded-tool.has-success > .folded-tool-bar .folded-tool-icon::after,
+    .folded-tool.has-error > .folded-tool-bar .folded-tool-icon::after {
+      content: '';
+      display: inline-block;
+      width: 1rem;
+      height: 1rem;
+      margin-left: 0.375rem;
+      background-size: contain;
+      background-repeat: no-repeat;
+      flex-shrink: 0;
+    }
+    .folded-tool.has-success > .folded-tool-bar .folded-tool-icon::after {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 20 20' fill='%2316a34a'%3E%3Cpath fill-rule='evenodd' d='M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z' clip-rule='evenodd'/%3E%3C/svg%3E");
+    }
+    html.dark .folded-tool.has-success > .folded-tool-bar .folded-tool-icon::after {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 20 20' fill='%234ade80'%3E%3Cpath fill-rule='evenodd' d='M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z' clip-rule='evenodd'/%3E%3C/svg%3E");
+    }
+    .folded-tool.has-error > .folded-tool-bar .folded-tool-icon::after {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 20 20' fill='%23ef4444'%3E%3Cpath fill-rule='evenodd' d='M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z' clip-rule='evenodd'/%3E%3C/svg%3E");
+    }
+    html.dark .folded-tool.has-error > .folded-tool-bar .folded-tool-icon::after {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 20 20' fill='%23f87171'%3E%3Cpath fill-rule='evenodd' d='M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z' clip-rule='evenodd'/%3E%3C/svg%3E");
+    }
+    .folded-tool-icon {
+      display: inline-flex;
+      align-items: center;
+    }
+
     /* --- Consecutive block joining --- */
     .folded-tool + .folded-tool,
     .block-tool-use + .block-tool-use {

package/static/js/client.js

@@ -2305,7 +2305,13 @@ class AgentGUIClient {
           } else {
             this.unlockAgentAndModel();
             if (this.ui.agentSelector && cached.conversation.agentType) this.ui.agentSelector.value = cached.conversation.agentType;
-            if (cached.conversation.agentType) this.loadModelsForAgent(cached.conversation.agentType);
+            if (cached.conversation.agentType) {
+              this.loadModelsForAgent(cached.conversation.agentType).then(() => {
+                if (cached.conversation.model && this.ui.modelSelector) {
+                  this.ui.modelSelector.value = cached.conversation.model;
+                }
+              });
+            }
           }
           this.conversationCache.delete(conversationId);
           this.restoreScrollPosition(conversationId);
@@ -2340,7 +2346,13 @@ class AgentGUIClient {
       } else {
         this.unlockAgentAndModel();
         if (this.ui.agentSelector && conversation.agentType) this.ui.agentSelector.value = conversation.agentType;
-        if (conversation.agentType) this.loadModelsForAgent(conversation.agentType);
+        if (conversation.agentType) {
+          this.loadModelsForAgent(conversation.agentType).then(() => {
+            if (conversation.model && this.ui.modelSelector) {
+              this.ui.modelSelector.value = conversation.model;
+            }
+          });
+        }
       }
 
       const chunks = (rawChunks || []).map(chunk => ({

package/static/js/streaming-renderer.js

@@ -519,7 +519,7 @@ class StreamingRenderer {
 
     const thinking = block.thinking || '';
     div.innerHTML = `
-      <details>
+      <details open>
         <summary>
           <svg viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"/></svg>
           <span>Thinking Process</span>
@@ -740,7 +740,8 @@ class StreamingRenderer {
     const input = block.input || {};
 
     const details = document.createElement('details');
-    details.className = 'block-tool-use folded-tool';
+    details.className = 'block-tool-use folded-tool permanently-expanded';
+    details.setAttribute('open', '');
     if (block.id) details.dataset.toolUseId = block.id;
     details.classList.add(this._getBlockTypeClass('tool_use'));
     details.classList.add(this._getToolColorClass(toolName));
@@ -1296,7 +1297,8 @@ class StreamingRenderer {
    */
   renderBlockSystem(block, context) {
     const details = document.createElement('details');
-    details.className = 'folded-tool folded-tool-info';
+    details.className = 'folded-tool folded-tool-info permanently-expanded';
+    details.setAttribute('open', '');
     details.dataset.eventType = 'system';
     details.classList.add(this._getBlockTypeClass('system'));
     const desc = block.model ? this.escapeHtml(block.model) : 'Session';
@@ -1333,7 +1335,8 @@ class StreamingRenderer {
     const statsDesc = [duration, cost, turns ? turns + ' turns' : ''].filter(Boolean).join(' / ');
 
     const details = document.createElement('details');
-    details.className = isError ? 'folded-tool folded-tool-error' : 'folded-tool';
+    details.className = isError ? 'folded-tool folded-tool-error permanently-expanded' : 'folded-tool permanently-expanded';
+    details.setAttribute('open', '');
     details.dataset.eventType = 'result';
     details.classList.add(this._getBlockTypeClass(isError ? 'error' : 'result'));
 
@@ -1766,7 +1769,8 @@ class StreamingRenderer {
     const msgPreview = message.length > 80 ? message.substring(0, 77) + '...' : message;
 
     const details = document.createElement('details');
-    details.className = 'folded-tool folded-tool-error';
+    details.className = 'folded-tool folded-tool-error permanently-expanded';
+    details.setAttribute('open', '');
     details.dataset.eventId = event.id || '';
     details.dataset.eventType = 'error';
     const summary = document.createElement('summary');