agentgui 1.0.234 → 1.0.236

package/lib/claude-runner.js

@@ -561,11 +561,33 @@ registry.register({
       
       // 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: [update.content]
+            content: [contentBlock]
           },
           session_id: params.sessionId
         };
@@ -580,26 +602,63 @@ registry.register({
             content: [{
               type: 'tool_use',
               id: update.toolCallId,
-              name: update.title || 'tool',
-              input: update.input || {}
+              name: update.title || update.kind || 'tool',
+              input: update.rawInput || update.input || {}
             }]
           },
           session_id: params.sessionId
         };
       }
       
-      // Tool call update (result)
-      if (update.sessionUpdate === 'tool_call_update' && update.status === 'completed') {
-        const content = update.content && update.content[0] ? update.content[0].content : null;
+      // 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,
+            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: 'assistant',
+          type: 'user',
           message: {
-            role: 'assistant',
+            role: 'user',
             content: [{
               type: 'tool_result',
               tool_use_id: update.toolCallId,
-              content: content ? (content.text || JSON.stringify(content)) : '',
-              is_error: false
+              content: combinedContent,
+              is_error: isError
             }]
           },
           session_id: params.sessionId
@@ -668,11 +727,33 @@ function createACPProtocolHandler() {
       
       // 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: [update.content]
+            content: [contentBlock]
           },
           session_id: params.sessionId
         };
@@ -687,26 +768,63 @@ function createACPProtocolHandler() {
             content: [{
               type: 'tool_use',
               id: update.toolCallId,
-              name: update.title || 'tool',
-              input: update.input || {}
+              name: update.title || update.kind || 'tool',
+              input: update.rawInput || update.input || {}
             }]
           },
           session_id: params.sessionId
         };
       }
       
-      // Tool call update (result)
-      if (update.sessionUpdate === 'tool_call_update' && update.status === 'completed') {
-        const content = update.content && update.content[0] ? update.content[0].content : null;
+      // 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,
+            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: 'assistant',
+          type: 'user',
           message: {
-            role: 'assistant',
+            role: 'user',
             content: [{
               type: 'tool_result',
               tool_use_id: update.toolCallId,
-              content: content ? (content.text || JSON.stringify(content)) : '',
-              is_error: false
+              content: combinedContent,
+              is_error: isError
             }]
           },
           session_id: params.sessionId
@@ -726,6 +844,15 @@ function createACPProtocolHandler() {
         };
       }
       
+      // Plan update
+      if (update.sessionUpdate === 'plan') {
+        return {
+          type: 'plan',
+          entries: update.entries || [],
+          session_id: params.sessionId
+        };
+      }
+      
       return null;
     }
 

package/lib/speech.js

@@ -89,10 +89,7 @@ function synthesize(text, voiceId) {
 function synthesizeStream(text, voiceId) {
   if (needsPatch && voiceId && PREDEFINED_IDS.has(voiceId)) {
     return (async function* () {
-      const sentences = serverTTS.splitSentences(text);
-      for (const sentence of sentences) {
-        yield await synthesizeDirect(sentence, voiceId);
-      }
+      yield await synthesizeDirect(text, voiceId);
     })();
   }
   return serverTTS.synthesizeStream(text, voiceId, EXTRA_VOICE_DIRS);

package/package.json

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

package/server.js

@@ -120,19 +120,16 @@ function flushTTSaccumulator(key, conversationId, sessionId) {
       }
     }
     if (voices.size === 0) return;
-    const sentences = speech.splitSentences(text);
+    const cacheKey = speech.ttsCacheKey(text, vid);
     for (const vid of voices) {
-      for (const sentence of sentences) {
-        const cacheKey = speech.ttsCacheKey(sentence, vid);
-        const cached = speech.ttsCacheGet(cacheKey);
-        if (cached) {
-          pushTTSAudio(cacheKey, cached, conversationId, sessionId, vid);
-          continue;
-        }
-        speech.synthesize(sentence, vid).then(wav => {
-          pushTTSAudio(cacheKey, wav, conversationId, sessionId, vid);
-        }).catch(() => {});
+      const cached = speech.ttsCacheGet(cacheKey);
+      if (cached) {
+        pushTTSAudio(cacheKey, cached, conversationId, sessionId, vid);
+        continue;
       }
+      speech.synthesize(text, vid).then(wav => {
+        pushTTSAudio(cacheKey, wav, conversationId, sessionId, vid);
+      }).catch(() => {});
     }
   }).catch(() => {});
 }
@@ -2069,6 +2066,46 @@ async function processMessageWithStreaming(conversationId, messageId, sessionId,
         if (parsed.result && allBlocks.length === 0) {
           allBlocks.push({ type: 'text', text: String(parsed.result) });
         }
+      } else if (parsed.type === 'tool_status') {
+        // Handle ACP tool status updates (in_progress, pending)
+        broadcastSync({
+          type: 'streaming_progress',
+          sessionId,
+          conversationId,
+          block: {
+            type: 'tool_status',
+            tool_use_id: parsed.tool_use_id,
+            status: parsed.status
+          },
+          seq: currentSequence,
+          timestamp: Date.now()
+        });
+      } else if (parsed.type === 'usage') {
+        // Handle ACP usage updates
+        broadcastSync({
+          type: 'streaming_progress',
+          sessionId,
+          conversationId,
+          block: {
+            type: 'usage',
+            usage: parsed.usage
+          },
+          seq: currentSequence,
+          timestamp: Date.now()
+        });
+      } else if (parsed.type === 'plan') {
+        // Handle ACP plan updates
+        broadcastSync({
+          type: 'streaming_progress',
+          sessionId,
+          conversationId,
+          block: {
+            type: 'plan',
+            entries: parsed.entries
+          },
+          seq: currentSequence,
+          timestamp: Date.now()
+        });
       }
     };
 

package/static/js/streaming-renderer.js

@@ -351,6 +351,12 @@ class StreamingRenderer {
           return this.renderBlockSystem(block, context);
         case 'result':
           return this.renderBlockResult(block, context);
+        case 'tool_status':
+          return this.renderBlockToolStatus(block, context);
+        case 'usage':
+          return this.renderBlockUsage(block, context);
+        case 'plan':
+          return this.renderBlockPlan(block, context);
         default:
           return this.renderBlockGeneric(block, context);
       }
@@ -1320,6 +1326,95 @@ class StreamingRenderer {
     return details;
   }
 
+  /**
+   * Render tool status block (ACP in_progress/pending updates)
+   */
+  renderBlockToolStatus(block, context) {
+    const status = block.status || 'pending';
+    const statusIcons = {
+      pending: '<svg viewBox="0 0 20 20" fill="currentColor" style="color:var(--color-text-secondary)"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z" clip-rule="evenodd"/></svg>',
+      in_progress: '<svg viewBox="0 0 20 20" fill="currentColor" class="animate-spin" style="color:var(--color-info)"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z" clip-rule="evenodd"/></svg>'
+    };
+    const statusLabels = {
+      pending: 'Pending',
+      in_progress: 'Running...'
+    };
+
+    const div = document.createElement('div');
+    div.className = 'block-tool-status';
+    div.dataset.toolUseId = block.tool_use_id || '';
+    div.innerHTML = `
+      <div style="display:flex;align-items:center;gap:0.5rem;padding:0.25rem 0.5rem;font-size:0.75rem;color:var(--color-text-secondary)">
+        ${statusIcons[status] || statusIcons.pending}
+        <span>${statusLabels[status] || status}</span>
+      </div>
+    `;
+    return div;
+  }
+
+  /**
+   * Render usage block (ACP usage updates)
+   */
+  renderBlockUsage(block, context) {
+    const usage = block.usage || {};
+    const used = usage.used || 0;
+    const size = usage.size || 0;
+    const cost = usage.cost ? '$' + usage.cost.toFixed(4) : '';
+
+    const div = document.createElement('div');
+    div.className = 'block-usage';
+    div.innerHTML = `
+      <div style="display:flex;gap:1rem;padding:0.25rem 0.5rem;font-size:0.7rem;color:var(--color-text-secondary);background:var(--color-bg-secondary);border-radius:0.25rem">
+        ${used ? `<span><strong>Used:</strong> ${used.toLocaleString()}</span>` : ''}
+        ${size ? `<span><strong>Context:</strong> ${size.toLocaleString()}</span>` : ''}
+        ${cost ? `<span><strong>Cost:</strong> ${cost}</span>` : ''}
+      </div>
+    `;
+    return div;
+  }
+
+  /**
+   * Render plan block (ACP plan updates)
+   */
+  renderBlockPlan(block, context) {
+    const entries = block.entries || [];
+    if (entries.length === 0) return null;
+
+    const priorityColors = {
+      high: '#ef4444',
+      medium: '#f59e0b',
+      low: '#6b7280'
+    };
+    const statusIcons = {
+      pending: '○',
+      in_progress: '◐',
+      completed: '●'
+    };
+
+    const div = document.createElement('div');
+    div.className = 'block-plan';
+    div.innerHTML = `
+      <details class="folded-tool folded-tool-info">
+        <summary class="folded-tool-bar">
+          <span class="folded-tool-icon"><svg viewBox="0 0 20 20" fill="currentColor"><path d="M9 2a1 1 0 000 2h2a1 1 0 100-2H9z"/><path fill-rule="evenodd" d="M4 5a2 2 0 012-2 3 3 0 003 3h2a3 3 0 003-3 2 2 0 012 2v11a2 2 0 01-2 2H6a2 2 0 01-2-2V5zm3 4a1 1 0 000 2h.01a1 1 0 100-2H7zm3 0a1 1 0 000 2h3a1 1 0 100-2h-3zm-3 4a1 1 0 100 2h.01a1 1 0 100-2H7zm3 0a1 1 0 100 2h3a1 1 0 100-2h-3z" clip-rule="evenodd"/></svg></span>
+          <span class="folded-tool-name">Plan</span>
+          <span class="folded-tool-desc">${entries.length} tasks</span>
+        </summary>
+        <div class="folded-tool-body">
+          <div style="display:flex;flex-direction:column;gap:0.375rem">
+            ${entries.map(e => `
+              <div style="display:flex;align-items:center;gap:0.5rem;font-size:0.8rem">
+                <span style="color:${priorityColors[e.priority] || priorityColors.low}">${statusIcons[e.status] || statusIcons.pending}</span>
+                <span style="${e.status === 'completed' ? 'text-decoration:line-through;opacity:0.6' : ''}">${this.escapeHtml(e.content || '')}</span>
+              </div>
+            `).join('')}
+          </div>
+        </div>
+      </details>
+    `;
+    return div;
+  }
+
   /**
    * Render generic block with formatted key-value pairs
    */

package/static/js/voice.js

@@ -317,9 +317,23 @@
   }
 
   function splitSentences(text) {
+    if (!text) return [text];
     var raw = text.match(/[^.!?]+[.!?]+[\s]?|[^.!?]+$/g);
     if (!raw) return [text];
-    return raw.map(function(s) { return s.trim(); }).filter(function(s) { return s.length > 0; });
+    var sentences = raw.map(function(s) { return s.trim(); }).filter(function(s) { return s.length > 0; });
+    var result = [];
+    for (var i = 0; i < sentences.length; i++) {
+      var s = sentences[i];
+      if (result.length > 0) {
+        var prev = result[result.length - 1];
+        if (s.match(/^(\d+[\.\)]|\d+\s)/) || prev.match(/\d+[\.\)]$/)) {
+          result[result.length - 1] = prev + ' ' + s;
+          continue;
+        }
+      }
+      result.push(s);
+    }
+    return result;
   }
 
   var audioChunkQueue = [];
@@ -382,17 +396,9 @@
       return;
     }
 
-    var sentences = splitSentences(text);
+    var sentences = [text];
     var cachedSentences = [];
-    var uncachedText = [];
-    for (var i = 0; i < sentences.length; i++) {
-      var blob = getCachedTTSBlob(sentences[i]);
-      if (blob) {
-        cachedSentences.push({ idx: i, blob: blob });
-      } else {
-        uncachedText.push(sentences[i]);
-      }
-    }
+    var uncachedText = [text];
 
     if (cachedSentences.length === sentences.length) {
       ttsConsecutiveFailures = 0;
@@ -530,16 +536,32 @@
     if (!container) return;
     var emptyMsg = container.querySelector('.voice-empty');
     if (emptyMsg) emptyMsg.remove();
+    var lastChild = container.lastElementChild;
+    if (!isUser && lastChild && lastChild.classList.contains('voice-block') && !lastChild.classList.contains('voice-block-user')) {
+      var contentSpan = lastChild.querySelector('.voice-block-content');
+      if (contentSpan) {
+        contentSpan.textContent += '\n' + stripHtml(text);
+        lastChild._fullText = (lastChild._fullText || contentSpan.textContent) + '\n' + text;
+        scrollVoiceToBottom();
+        return lastChild;
+      }
+    }
     var div = document.createElement('div');
     div.className = 'voice-block' + (isUser ? ' voice-block-user' : '');
-    div.textContent = isUser ? text : stripHtml(text);
-    if (!isUser) {
+    if (isUser) {
+      div.textContent = text;
+    } else {
+      var contentSpan = document.createElement('span');
+      contentSpan.className = 'voice-block-content';
+      contentSpan.textContent = stripHtml(text);
+      div.appendChild(contentSpan);
+      div._fullText = text;
       var rereadBtn = document.createElement('button');
       rereadBtn.className = 'voice-reread-btn';
       rereadBtn.title = 'Re-read aloud';
       rereadBtn.innerHTML = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"/><path d="M19.07 4.93a10 10 0 0 1 0 14.14M15.54 8.46a5 5 0 0 1 0 7.07"/></svg>';
       rereadBtn.addEventListener('click', function() {
-        speak(text);
+        speak(div._fullText || contentSpan.textContent);
       });
       div.appendChild(rereadBtn);
     }