myagent-ai 1.9.2 → 1.9.4

package/package.json

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

package/web/ui/chat/chat.js

@@ -3,7 +3,7 @@
 
 (function() {
   var base = new URL('.', window.location.href).href;
-  var v = '?v=5';
+  var v = '?v=6';
   var files = [
     { url: base + 'left_sessions.html' + v, container: 'leftSessionsContainer' },
     { url: base + 'middle_chat.html' + v, container: 'middleChatContainer' },

package/web/ui/chat/flow_engine.js

@@ -620,17 +620,17 @@ function toggleExecEventsPanel(header) {
 function renderInlineExecEvent(data, msgIdx) {
   // V2 Tool Event handling (called with full part: {type:'v2_tool', data:{...}})
   if (data.type === 'v2_tool') {
-    var inner = data.data;
-    var isStart = inner.status === 'running' || inner.type === 'tool_start';
-    var iconEmoji = isStart ? '⚡' : (inner.success ? '✅' : '❌');
-    var title = inner.title || (inner.tool_name || '工具调用');
-    var metaParts = [];
+    let inner = data.data;
+    let isStart = inner.status === 'running' || inner.type === 'tool_start';
+    let iconEmoji = isStart ? '⚡' : (inner.success ? '✅' : '❌');
+    let title = inner.title || (inner.tool_name || '工具调用');
+    let metaParts = [];
     if (inner.tool_name) metaParts.push(escapeHtml(inner.tool_name));
     if (inner.timeout) metaParts.push('超时 ' + inner.timeout + 's');
     if (inner.callback !== undefined) metaParts.push(inner.callback ? '回调LLM' : '无回调');
-    var metaText = metaParts.join(' · ');
+    let metaText = metaParts.join(' · ');
 
-    var bodyHtml = '';
+    let bodyHtml = '';
     if (inner.type === 'tool_result' && inner.summary) {
       bodyHtml += '<div class="inline-exec-summary">' + escapeHtml(inner.summary) + '</div>';
     }
@@ -639,7 +639,7 @@ function renderInlineExecEvent(data, msgIdx) {
     }
     // Show params for tool_start
     if (inner.type === 'tool_start' && inner.params) {
-      var paramPreview = typeof inner.params === 'string' ? inner.params : JSON.stringify(inner.params);
+      let paramPreview = typeof inner.params === 'string' ? inner.params : JSON.stringify(inner.params);
       if (paramPreview.length > 200) paramPreview = paramPreview.substring(0, 200) + '...';
       bodyHtml += '<div class="inline-exec-code">' + escapeHtml(paramPreview) + '</div>';
     }
@@ -814,6 +814,31 @@ function showToolResultModal(msgIndex, eventId) {
   document.body.appendChild(overlay);
 }
 
+// ══════════════════════════════════════════════════════
+// ── V2 Content Assembler (V2 内容组装) ──
+// ══════════════════════════════════════════════════════
+
+function _assembleV2Content(msg, msgParts) {
+  // Priority 1: V2 reasoning text (user-facing response from v2_reasoning events)
+  if (msg._v2Reasoning && msg._v2Reasoning.trim()) {
+    return msg._v2Reasoning.trim();
+  }
+  // Priority 2: V2 ask user text
+  if (msg._askUser && msg._askUser.trim()) {
+    return msg._askUser.trim();
+  }
+  // Priority 3: V1 text parts (backward compat — non-V2 mode)
+  var textParts = msgParts.filter(function(p) { return p.type === 'text'; });
+  if (textParts.length > 0) {
+    return textParts.map(function(p) { return p.content; }).join('\n\n');
+  }
+  // Priority 4: raw content from message (server-stored response)
+  if (msg.content && msg.content.trim() && msg.content !== '(无回复)') {
+    return msg.content.trim();
+  }
+  return '(无回复)';
+}
+
 // ══════════════════════════════════════════════════════
 // ── Send Message (核心 SSE 流式消息发送) ──
 // ══════════════════════════════════════════════════════
@@ -827,7 +852,8 @@ async function sendMessage() {
   // ── 如果正在生成，弹出处理选择框 ──
   if (state.isGenerating) {
     state.tempInputText = text;
-    document.getElementById('injectModal').style.display = 'flex';
+    var modal = document.getElementById('injectModal');
+    if (modal) { modal.style.display = 'flex'; }
     return;
   }
 
@@ -903,10 +929,17 @@ async function sendMessage() {
     let msgIdx = state.messages.length;
     let sessionIdReceived = sessionId;
     let fullThought = '';
+    let _isV2Mode = false;   // Track whether V2 structured output events are received
+    let _v2RawXml = '';      // In V2 mode, accumulate raw XML from text_delta separately
+    let _v2ReasoningText = ''; // Accumulated V2 reasoning text for content
 
     function flushCurrentText() {
       if (currentText.trim()) {
-        msgParts.push({type: 'text', content: currentText});
+        // In V2 mode, text_delta contains raw XML — do NOT add to msgParts as user-facing text
+        if (!_isV2Mode) {
+          msgParts.push({type: 'text', content: currentText});
+        }
+        // Always accumulate for backward compat content field
       }
       currentText = '';
     }
@@ -949,12 +982,16 @@ async function sendMessage() {
           } else if (evt.type === 'text_delta') {
             // Incremental streaming token
             currentText += evt.content;
-            // Build backward-compat content from all parts + streaming text
-            const allText = msgParts.filter(p => p.type === 'text').map(p => p.content).join('\n\n')
-              + (currentText.trim() ? '\n\n' + currentText : '');
+            if (_isV2Mode) {
+              // In V2 mode, text_delta contains raw XML — store separately, not as user-facing content
+              _v2RawXml = currentText;
+              // Show V2 reasoning text as streaming content (if available)
+              state.messages[msgIdx]._streamingText = _v2ReasoningText || '';
+            } else {
+              // V1 mode: text_delta IS the user-facing content
+              state.messages[msgIdx]._streamingText = currentText;
+            }
             state.messages[msgIdx].parts = [...msgParts];
-            state.messages[msgIdx]._streamingText = currentText;
-            state.messages[msgIdx].content = allText;
             throttledStreamUpdate(msgIdx);
             // ── 分段流式 TTS：推送增量文本 ──
             if (ttsManager.enabled && !ttsManager._streamActive) {
@@ -981,7 +1018,7 @@ async function sendMessage() {
             if (state.messages[msgIdx]) {
               state.messages[msgIdx].streaming = false;
               state.messages[msgIdx].parts = [...msgParts];
-              state.messages[msgIdx].content = msgParts.filter(p => p.type === 'text').map(p => p.content).join('\n\n') || '(无回复)';
+              state.messages[msgIdx].content = _assembleV2Content(state.messages[msgIdx], msgParts);
               state.messages[msgIdx]._streamingText = '';
               if (allExecEvents.length > 0) state.messages[msgIdx].exec_events = [...allExecEvents];
             }
@@ -999,7 +1036,7 @@ async function sendMessage() {
             flushCurrentText();
             state.messages[msgIdx].parts = [...msgParts];
             state.messages[msgIdx]._streamingText = '';
-            state.messages[msgIdx].content = msgParts.filter(p => p.type === 'text').map(p => p.content).join('\n\n') || '';
+            state.messages[msgIdx].content = _assembleV2Content(state.messages[msgIdx], msgParts);
             throttledStreamUpdate(msgIdx);
             // 停止当前轮次的 TTS 播放，防止旧迭代语音与新迭代语音互相打断
             if (ttsManager.enabled && ttsManager._streamActive) {
@@ -1040,7 +1077,10 @@ async function sendMessage() {
                 }
               }
             }
-          // V2 Structured Output Events
+          // V2 Structured Output Events — mark V2 mode
+          } else if (evt.type === 'v2_context') {
+            // V2 context event — confirms we're in V2 mode
+            _isV2Mode = true;
           } else if (evt.type === 'v2_output_parsed') {
             // LLM output was parsed into structured format
             // evt.data contains: {usersays_correct, task_plan, tools_to_call, remember, recall, ask_user, finish}
@@ -1119,11 +1159,22 @@ async function sendMessage() {
             state.messages[msgIdx]._memorySaved = (state.messages[msgIdx]._memorySaved || '') +
               (evt.content ? evt.content.substring(0, 100) : '');
           } else if (evt.type === 'v2_reasoning') {
-            // V2 reasoning text from model (similar to thought_delta)
+            // V2 reasoning text from model — this IS the user-facing content in V2 mode
             if (!state.messages[msgIdx]._v2Reasoning) {
               state.messages[msgIdx]._v2Reasoning = '';
             }
+            // Add separator between multiple reasoning events (e.g., beforecalltext + final text)
+            if (state.messages[msgIdx]._v2Reasoning.length > 0 && evt.content) {
+              state.messages[msgIdx]._v2Reasoning += '\n\n';
+            }
             state.messages[msgIdx]._v2Reasoning += evt.content;
+            _v2ReasoningText = state.messages[msgIdx]._v2Reasoning;
+            // In V2 mode, update streaming text to show reasoning content
+            if (_isV2Mode) {
+              state.messages[msgIdx]._streamingText = _v2ReasoningText;
+              // Also update content for real-time display
+              state.messages[msgIdx].content = _v2ReasoningText;
+            }
             throttledStreamUpdate(msgIdx);
           } else if (evt.type === 'done') {
             flushCurrentText();
@@ -1134,7 +1185,8 @@ async function sendMessage() {
             state.messages[msgIdx].parts = [...msgParts];
             state.messages[msgIdx]._streamingText = '';
             state.messages[msgIdx].exec_events = [...allExecEvents];
-            state.messages[msgIdx].content = msgParts.filter(p => p.type === 'text').map(p => p.content).join('\n\n') || '(无回复)';
+            // Assemble final content: prefer V2 reasoning/ask text over raw XML
+            state.messages[msgIdx].content = _assembleV2Content(state.messages[msgIdx], msgParts);
           } else if (evt.type === 'reasoning_delta') {
             // 模型推理过程增量文本（OpenAI o1/o3/DeepSeek-R1 等推理模型）
             if (!state.messages[msgIdx].reasoning) state.messages[msgIdx].reasoning = '';
@@ -1163,7 +1215,8 @@ async function sendMessage() {
       state.messages[msgIdx].parts = [...msgParts];
       state.messages[msgIdx]._streamingText = '';
       state.messages[msgIdx].exec_events = allExecEvents;
-      state.messages[msgIdx].content = msgParts.filter(p => p.type === 'text').map(p => p.content).join('\n\n') || '(无回复)';
+      // Assemble final content: prefer V2 reasoning/ask text over raw XML
+      state.messages[msgIdx].content = _assembleV2Content(state.messages[msgIdx], msgParts);
     }
     
     // Task list 已通过 SSE task_list_update 事件实时推送，无需再轮询
@@ -1230,6 +1283,19 @@ function stopGenerating() {
   if (state.abortController) {
     state.abortController.abort();
   }
+  // 立即重置 UI 状态（防止 abort 后 finally 未执行导致 UI 卡死）
+  state.isGenerating = false;
+  state.abortController = null;
+  hideTypingIndicator();
+  stopExecTimerPolling();
+  var sendBtn = document.getElementById('sendBtn');
+  var stopBtn = document.getElementById('stopBtn');
+  var input = document.getElementById('userInput');
+  if (sendBtn) { sendBtn.style.display = ''; sendBtn.disabled = !(input && input.value.trim()); }
+  if (stopBtn) stopBtn.style.display = 'none';
+  // 关闭可能打开的 injectModal
+  var injectModal = document.getElementById('injectModal');
+  if (injectModal) injectModal.style.display = 'none';
 }
 
 // ══════════════════════════════════════════════════════
@@ -1237,7 +1303,8 @@ function stopGenerating() {
 // ══════════════════════════════════════════════════════
 
 function closeInjectModal() {
-  document.getElementById('injectModal').style.display = 'none';
+  var modal = document.getElementById('injectModal');
+  if (modal) modal.style.display = 'none';
   state.tempInputText = '';
 }
 
@@ -1438,7 +1505,8 @@ function handleKeyDown(e) {
     if (state.isGenerating) {
       // 任务执行中，使用统一的 injectModal 弹出选择对话框
       state.tempInputText = text;
-      document.getElementById('injectModal').style.display = 'flex';
+      var modal = document.getElementById('injectModal');
+      if (modal) { modal.style.display = 'flex'; }
     } else {
       sendMessage();
     }

package/web/ui/chat/middle_chat.html

@@ -142,4 +142,17 @@
         <div class="input-hint">MyAgent 可能会出错，请核实重要信息</div>
       </div>
     </div>
+
+    <!-- Inject Modal (生成中消息注入选择) -->
+    <div id="injectModal" class="modal-overlay" style="display:none">
+      <div class="modal">
+        <h3>任务执行中</h3>
+        <p>Agent 正在执行任务，请选择如何处理你的消息：</p>
+        <div style="display:flex;flex-direction:column;gap:8px;margin-bottom:0">
+          <button class="modal-btn" style="width:100%;justify-content:center;background:var(--accent);color:#fff" onclick="handleInjectChoice('queue')">排队等待</button>
+          <button class="modal-btn" style="width:100%;justify-content:center" onclick="handleInjectChoice('inject')">注入当前任务</button>
+          <button class="modal-btn" style="width:100%;justify-content:center;color:var(--text2)" onclick="closeInjectModal()">取消</button>
+        </div>
+      </div>
+    </div>
   </div>