myagent-ai 1.13.4 → 1.13.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/ui/chat/chat_main.js

@@ -2419,14 +2419,14 @@ function _renderMessagesInner() {
         partsInner += '<div class="timeline-segment">' + renderMarkdown(msg._streamingText) + _cursor + '</div>';
       }
       if (partsInner) {
-        // All parts (text segments + tool calls) wrapped in ONE message-bubble
-        timelineHtml = '<div class="message-bubble"><div class="msg-timeline">' + partsInner + '</div></div>';
+        // All parts (text segments + tool calls) wrapped in ONE message-bubble (full width during streaming)
+        timelineHtml = '<div class="message-bubble msg-bubble-wrapper"><div class="msg-timeline">' + partsInner + '</div></div>';
       }
     }
 
-    // Backward compat: single bubble for messages without parts
+    // Backward compat: single bubble for messages without parts (full width)
     const singleBubbleHtml = (!hasParts && !hasStreamingText)
-      ? (content ? `<div class="message-bubble">${content}${ttsIndicator}</div>` : '')
+      ? (content ? `<div class="message-bubble msg-bubble-wrapper">${content}${ttsIndicator}</div>` : '')
       : '';
 
     // Exec events panel: only for backward compat (messages without parts loaded from DB)
@@ -3459,6 +3459,9 @@ const ttsManager = {
   _audioPlaying: false,     // 队列是否正在播放
   _stopRequested: false,    // 是否已请求停止
   _streamMsgIndex: -1,      // 流式模式对应的消息索引
+  _pendingFetches: 0,       // 正在进行的 TTS 请求计数（防竞态）
+  _flushed: false,          // streamFlush 已调用（防竞态停止）
+  _firstChunkSent: false,   // 是否已发送第一个音频块（降低首句延迟）
 
   init() {
     // Load TTS enabled state from localStorage
@@ -3545,6 +3548,9 @@ const ttsManager = {
     this._audioQueue = [];
     this._audioPlaying = false;
     this._stopRequested = false;
+    this._pendingFetches = 0;
+    this._flushed = false;
+    this._firstChunkSent = false;
     // 保持 _streamActive = true 和 isPlaying = true
     // 这样后续的 text_delta 会继续往新的缓冲区添加文本
     // 新的句子会被合成并入队播放
@@ -3574,6 +3580,9 @@ const ttsManager = {
     this._streamMsgIndex = msgIndex;
     this.currentMsgIndex = msgIndex;
     this.isPlaying = true;
+    this._pendingFetches = 0;
+    this._flushed = false;
+    this._firstChunkSent = false;
   },
 
   /**
@@ -3588,6 +3597,27 @@ const ttsManager = {
 
     this._streamBuffer += delta;
 
+    // 首句快速通道：第一个音频块降低延迟，缓冲区达到 25 字即触发
+    if (!this._firstChunkSent && this._streamBuffer.length >= 25) {
+      var lastSep = -1;
+      for (var k = 0; k < this._streamBuffer.length; k++) {
+        var c = this._streamBuffer[k];
+        if (c === '，' || c === ',' || c === '。' || c === '！' || c === '？' || c === '；' || c === ' ' || c === '\n') {
+          lastSep = k;
+        }
+      }
+      if (lastSep > 0) {
+        var firstChunk = this._streamBuffer.substring(0, lastSep + 1).trim();
+        this._streamBuffer = this._streamBuffer.substring(lastSep + 1);
+        var cleanFirst = this._cleanForStreamTTS(firstChunk);
+        if (cleanFirst) {
+          this._firstChunkSent = true;
+          this._enqueueTTS(cleanFirst);
+        }
+      }
+      return;
+    }
+
     // 检测句子边界：中文句号/感叹号/问号，英文句号+空格，或换行
     var boundaryPattern = /[。！？]|\.(?:\s|$)|\n/;
     var boundaryIdx = -1;
@@ -3643,8 +3673,15 @@ const ttsManager = {
         this._enqueueTTS(cleanText);
       }
     }
-    // 标记流式阶段结束（队列播完后自动清理状态）
-    this._streamActive = false;
+    // 标记已刷新，但不立即停止 —— 等队列和 pending fetch 全部完成后再停止
+    this._flushed = true;
+    // 如果没有 pending fetch 且队列为空，立即停止
+    if (this._pendingFetches === 0 && this._audioQueue.length === 0 && !this._audioPlaying) {
+      this.isPlaying = false;
+      this._streamActive = false;
+      this.currentMsgIndex = -1;
+      this.updatePlayingIndicator();
+    }
   },
 
   /**
@@ -3683,6 +3720,7 @@ const ttsManager = {
   _enqueueTTS(text) {
     if (this._stopRequested) return;
     var self = this;
+    self._pendingFetches++;
 
     (async function() {
       try {
@@ -3719,6 +3757,15 @@ const ttsManager = {
         }
       } catch (e) {
         console.error('TTS stream chunk error:', e);
+      } finally {
+        self._pendingFetches--;
+        // 如果已 flush 且没有更多 pending，检查是否该停止
+        if (self._flushed && self._pendingFetches === 0 && self._audioQueue.length === 0 && !self._audioPlaying) {
+          self.isPlaying = false;
+          self._streamActive = false;
+          self.currentMsgIndex = -1;
+          self.updatePlayingIndicator();
+        }
       }
     })();
   },
@@ -3736,15 +3783,16 @@ const ttsManager = {
     }
 
     if (this._audioQueue.length === 0) {
-      // 队列空了，检查流式是否已结束
-      if (!this._streamActive) {
-        // 流结束且队列为空 → 播放完成
+      // 队列空了，检查流式是否已结束 AND 没有 pending fetches
+      if (this._flushed && this._pendingFetches === 0) {
+        // 流已结束、无 pending 请求、队列空 → 播放完成
         this.isPlaying = false;
+        this._streamActive = false;
         this._audioPlaying = false;
         this.currentMsgIndex = -1;
         this.updatePlayingIndicator();
       }
-      // 如果流还在继续，等待新的音频入队
+      // 如果流还在继续或还有 pending fetches，等待新的音频入队
       return;
     }
 

package/web/ui/chat/flow_engine.js

@@ -472,59 +472,7 @@ function updateStreamingMessage(msgIdx) {
     }
   }
 
-  // V2 Reasoning block (from v2_reasoning events)
-  if (msg._v2Reasoning) {
-    let v2ReasoningBlock = null;
-    const allThoughts2 = contentArea.querySelectorAll('.thought-block');
-    for (const tb of allThoughts2) {
-      const label = tb.querySelector('.thought-label');
-      if (label && label.textContent.includes('V2 推理')) {
-        v2ReasoningBlock = tb;
-        break;
-      }
-    }
-    if (!v2ReasoningBlock && msg.thought) {
-      // Skip if V1 thought already exists - don't duplicate
-    } else {
-      const v2Len = msg._v2Reasoning.length;
-      const v2WordCount = msg.streaming
-        ? '<span class="thought-word-count">' + v2Len + ' 字</span>'
-        : '';
-      if (v2ReasoningBlock) {
-        // Incremental update for V2 reasoning block
-        const label = v2ReasoningBlock.querySelector('.thought-label');
-        if (label) label.innerHTML = 'V2 推理过程' + v2WordCount;
-        const badge = v2ReasoningBlock.querySelector('.thought-badge');
-        if (badge) badge.textContent = msg.streaming ? '推理中...' : '已完成';
-        const thoughtContent = v2ReasoningBlock.querySelector('.thought-content');
-        if (thoughtContent && msg.streaming) {
-          const prevLen = v2ReasoningBlock._lastV2Len || 0;
-          if (msg._v2Reasoning.length > prevLen) {
-            const newText = msg._v2Reasoning.substring(prevLen);
-            thoughtContent.insertAdjacentHTML('beforeend', renderMarkdown(newText));
-            v2ReasoningBlock._lastV2Len = msg._v2Reasoning.length;
-            // 自动滚动 V2 推理框内部内容到底部
-            thoughtContent.scrollTop = thoughtContent.scrollHeight;
-          }
-        } else if (thoughtContent && !msg.streaming) {
-          thoughtContent.innerHTML = renderMarkdown(msg._v2Reasoning);
-          v2ReasoningBlock._lastV2Len = msg._v2Reasoning.length;
-        }
-      } else if (!msg.thought) {
-        const v2Html = `<details class="thought-block ${msg.streaming ? 'streaming' : ''}" ${msg.streaming ? 'open' : ''}>
-          <summary>
-            <span class="thought-icon">🧠</span>
-            <span class="thought-label">V2 推理过程${v2WordCount}</span>
-            ${msg.streaming ? '<span class="thought-badge">推理中...</span>' : '<span class="thought-badge">已完成</span>'}
-          </summary>
-          <div class="thought-content">${renderMarkdown(msg._v2Reasoning)}</div>
-        </details>`;
-        contentArea.insertAdjacentHTML('afterbegin', v2Html);
-        const newBlock = contentArea.querySelector(':scope > .thought-block');
-        if (newBlock) newBlock._lastV2Len = msg._v2Reasoning.length;
-      }
-    }
-  }
+  // V2 Reasoning: content is already rendered in msg.parts timeline, skip separate block to avoid duplication
 
   // Update content - timeline (interleaved text + exec events) or single bubble (backward compat)
   const hasParts = Array.isArray(msg.parts);