myagent-ai 1.10.9 → 1.11.1

package/package.json

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

package/web/ui/chat/chat.css

@@ -482,6 +482,11 @@ input,textarea,select{font:inherit}
 @keyframes badgePulse{0%,100%{opacity:1}50%{opacity:.6}}
 .thought-block:not(.streaming) summary .thought-badge{background:var(--bg4);color:var(--text3);animation:none}
 .thought-content{width:100%;padding:10px 14px 14px;font-size:13px;line-height:1.7;color:var(--text2);border-top:1px solid var(--border-light);max-height:300px;overflow-y:auto;overflow-x:hidden;word-break:break-word;overflow-wrap:break-word}
+/* Reasoning (模型推理过程): limit to ~5 lines, scrollable */
+.thought-block .thought-content.reasoning-content{max-height:calc(1.7em * 5 + 28px);min-height:0}
+.thought-block .thought-content.reasoning-content::-webkit-scrollbar{width:4px}
+.thought-block .thought-content.reasoning-content::-webkit-scrollbar-thumb{background:var(--bg4);border-radius:2px}
+.thought-block .thought-content.reasoning-content::-webkit-scrollbar-track{background:transparent}
 .thought-content p{margin:4px 0}
 .thought-content p:first-child{margin-top:0}
 .thought-content p:last-child{margin-bottom:0}

package/web/ui/chat/chat_main.js

@@ -1600,6 +1600,7 @@ async function clearSessionFromMenu(id) {
 }
 
 function formatSessionName(id) {
+  if (!id) return '新会话';
   if (id.startsWith('web_')) return id.replace('web_', '').replace(/_/g, ' ');
   if (id.startsWith('cli_')) return 'CLI: ' + id.replace('cli_', '');
   // Strip agent prefix if present (e.g., "default_web_2024..." -> "web_2024...")
@@ -2001,108 +2002,112 @@ async function clearCurrentChat() {
 }
 
 // ── Group History Messages ──
-// Groups consecutive non-user messages (assistant + tool) into single assistant messages
-// with parts[] for timeline rendering, matching the streaming display format.
-// This creates: user → [assistant (speak → tool → speak → tool)] → user → ...
+// Groups consecutive non-user messages (assistant + tool_call + tool_result) into single
+// assistant messages with parts[] for timeline rendering, matching the streaming display.
+//
+// DB storage pattern:
+//   user_input → role="user",    key="user_input"
+//   text       → role="assistant", key=""
+//   tool_call  → role="assistant", key="tool_call"  (NOT role="tool"!)
+//   tool_result→ role="tool",     key="tool_result"
+//
+// Result: user → [assistant { text → tool_call → tool_result → text → ... }] → user
 function groupHistoryMessages(messages) {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
 
   const grouped = [];
   let i = 0;
+  let _evtId = 0; // Event ID counter
 
   while (i < messages.length) {
     const msg = messages[i];
 
     if (msg.role === 'user') {
-      // User message: pass through as-is
       grouped.push({ role: 'user', content: msg.content, time: msg.time || '' });
       i++;
     } else if (msg.role === 'assistant') {
-      // Start of a new agent group: collect all consecutive non-user messages
+      // Start of a new agent group: collect ALL consecutive non-user messages
       const parts = [];
       let lastAssistantTime = msg.time || '';
 
-      // If assistant has content, add as text part
-      if (msg.content && msg.content.trim() && msg.content !== '(无回复)') {
+      // Process the first assistant message
+      if (msg.key === 'tool_call') {
+        const toolName = (msg.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
+        parts.push({
+          type: 'exec',
+          data: {
+            id: _evtId++,
+            type: 'tool_call',
+            title: toolName ? ('调用工具: ' + toolName) : msg.content.substring(0, 100),
+            tool_name: toolName,
+            status: 'done',
+          }
+        });
+      } else if (msg.content && msg.content.trim() && msg.content !== '(无回复)') {
         parts.push({ type: 'text', content: msg.content });
       }
 
-      i++; // Move to next message
+      i++;
 
-      // Collect following tool messages
-      while (i < messages.length && messages[i].role === 'tool') {
-        const toolMsg = messages[i];
-        const isResult = toolMsg.key === 'tool_result';
-        const isCall = toolMsg.key === 'tool_call';
+      // Collect all following tool_call (role=assistant), tool_result (role=tool),
+      // and assistant text messages into the same group.
+      // This handles: text → tool_call → tool_result → text → tool_call → tool_result → text
+      while (i < messages.length) {
+        const next = messages[i];
 
-        if (isCall) {
-          // Extract tool name from content
-          const toolName = (toolMsg.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
+        if (next.role === 'tool') {
+          const isOk = !next.content.includes('失败');
           parts.push({
             type: 'exec',
             data: {
-              id: 'hist_tool_' + i,
-              type: 'tool_call',
-              title: toolMsg.content.substring(0, 100) || ('调用工具: ' + toolName),
-              tool_name: toolName,
-              status: 'done',
-            }
-          });
-        } else if (isResult) {
-          // Determine success/failure from content
-          const isOk = !toolMsg.content.includes('失败');
-          parts.push({
-            type: 'exec',
-            data: {
-              id: 'hist_tool_' + i,
+              id: _evtId++,
               type: 'tool_result',
-              title: (toolMsg.content.substring(0, 80) || '工具执行结果'),
+              title: next.content.substring(0, 80) || '工具执行结果',
               success: isOk,
-              summary: toolMsg.content.substring(0, 500),
+              summary: next.content.substring(0, 500),
+              result: { output: next.content.substring(0, 2000) },
             }
           });
-        } else {
-          // Generic tool message
+          i++;
+        } else if (next.role === 'assistant' && next.key === 'tool_call') {
+          const toolName = (next.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
           parts.push({
             type: 'exec',
             data: {
-              id: 'hist_tool_' + i,
+              id: _evtId++,
               type: 'tool_call',
-              title: toolMsg.content.substring(0, 100) || '工具调用',
+              title: toolName ? ('调用工具: ' + toolName) : next.content.substring(0, 100),
+              tool_name: toolName,
               status: 'done',
             }
           });
-        }
-
-        i++;
-
-        // If next message is an assistant message, add its content as a text part and continue
-        // This handles the pattern: text → tool → text → tool
-        if (i < messages.length && messages[i].role === 'assistant') {
-          const nextAssistant = messages[i];
-          if (nextAssistant.content && nextAssistant.content.trim() && nextAssistant.content !== '(无回复)') {
-            parts.push({ type: 'text', content: nextAssistant.content });
-            lastAssistantTime = nextAssistant.time || lastAssistantTime;
+          lastAssistantTime = next.time || lastAssistantTime;
+          i++;
+        } else if (next.role === 'assistant') {
+          if (next.content && next.content.trim() && next.content !== '(无回复)') {
+            parts.push({ type: 'text', content: next.content });
           }
+          lastAssistantTime = next.time || lastAssistantTime;
           i++;
+        } else {
+          break;
         }
       }
 
-      // Create grouped assistant message with parts
-      // Assemble content from text parts for backward compat
       const textParts = parts.filter(p => p.type === 'text');
-      const assembledContent = textParts.map(p => p.content).join('\n\n');
+      const assembledContent = textParts.length > 0
+        ? textParts[textParts.length - 1].content
+        : '';
 
       grouped.push({
         role: 'assistant',
-        content: assembledContent || '',
+        content: assembledContent,
         time: lastAssistantTime,
         parts: parts.length > 0 ? parts : undefined,
-        // Also collect exec_events for backward compat display
         exec_events: parts.filter(p => p.type === 'exec').map(p => p.data),
       });
     } else if (msg.role === 'tool') {
-      // Orphan tool message (no preceding assistant) — wrap in an assistant group
+      // Orphan tool message — wrap in an assistant group
       const parts = [];
       const isResult = msg.key === 'tool_result';
       const isCall = msg.key === 'tool_call';
@@ -2112,9 +2117,9 @@ function groupHistoryMessages(messages) {
         parts.push({
           type: 'exec',
           data: {
-            id: 'hist_tool_' + i,
+            id: _evtId++,
             type: 'tool_call',
-            title: msg.content.substring(0, 100) || ('调用工具: ' + toolName),
+            title: toolName ? ('调用工具: ' + toolName) : msg.content.substring(0, 100),
             tool_name: toolName,
             status: 'done',
           }
@@ -2124,34 +2129,65 @@ function groupHistoryMessages(messages) {
         parts.push({
           type: 'exec',
           data: {
-            id: 'hist_tool_' + i,
+            id: _evtId++,
             type: 'tool_result',
             title: msg.content.substring(0, 80) || '工具执行结果',
             success: isOk,
             summary: msg.content.substring(0, 500),
+            result: { output: msg.content.substring(0, 2000) },
           }
         });
       }
 
       i++;
-      // Check if next is assistant (to include its content)
-      if (i < messages.length && messages[i].role === 'assistant') {
-        const nextAssistant = messages[i];
-        if (nextAssistant.content && nextAssistant.content.trim() && nextAssistant.content !== '(无回复)') {
-          parts.push({ type: 'text', content: nextAssistant.content });
+      while (i < messages.length) {
+        const next = messages[i];
+        if (next.role === 'assistant' && next.key === 'tool_call') {
+          const toolName = (next.content.match(/^调用工具:\s*(\S+)/) || [])[1] || '';
+          parts.push({
+            type: 'exec',
+            data: {
+              id: _evtId++,
+              type: 'tool_call',
+              title: toolName ? ('调用工具: ' + toolName) : next.content.substring(0, 100),
+              tool_name: toolName,
+              status: 'done',
+            }
+          });
+          i++;
+        } else if (next.role === 'assistant') {
+          if (next.content && next.content.trim() && next.content !== '(无回复)') {
+            parts.push({ type: 'text', content: next.content });
+          }
+          i++;
+        } else if (next.role === 'tool') {
+          const isOk = !next.content.includes('失败');
+          parts.push({
+            type: 'exec',
+            data: {
+              id: _evtId++,
+              type: 'tool_result',
+              title: next.content.substring(0, 80) || '工具执行结果',
+              success: isOk,
+              summary: next.content.substring(0, 500),
+              result: { output: next.content.substring(0, 2000) },
+            }
+          });
+          i++;
+        } else {
+          break;
         }
-        i++;
       }
 
+      const textParts = parts.filter(p => p.type === 'text');
       grouped.push({
         role: 'assistant',
-        content: parts.filter(p => p.type === 'text').map(p => p.content).join('\n\n'),
+        content: textParts.length > 0 ? textParts[textParts.length - 1].content : '',
         time: msg.time || '',
         parts: parts.length > 0 ? parts : undefined,
         exec_events: parts.filter(p => p.type === 'exec').map(p => p.data),
       });
     } else {
-      // Skip unknown roles
       i++;
     }
   }
@@ -2261,7 +2297,7 @@ function _renderMessagesInner() {
           <span class="thought-label">模型推理过程</span>
           ${isStreaming ? '<span class="thought-badge">推理中...</span>' : '<span class="thought-badge">已完成</span>'}
         </summary>
-        <div class="thought-content">${renderMarkdown(msg.reasoning)}</div>
+        <div class="thought-content reasoning-content">${renderMarkdown(msg.reasoning)}</div>
       </details>`;
     })() : '';
     const actionBtns = (!isUser && msg.content) ? `
@@ -2323,7 +2359,7 @@ function _renderMessagesInner() {
     const execEventsHtml = (!isUser && !hasParts && msg.exec_events && msg.exec_events.length > 0)
       ? renderExecEvents(msg.exec_events, i) : '';
     html += `
-      <div class="message-row ${msg.role}">
+      <div class="message-row ${msg.role}${msg.streaming ? ' streaming' : ''}">
         <div class="message-avatar">${avatar}</div>
         <div class="message-content" style="flex:1;min-width:0">
           ${reasoningHtml}
@@ -2441,6 +2477,21 @@ function formatTime(timeStr) {
 function scrollToBottom(force) {
   const c = document.getElementById('messagesContainer');
   if (!c) return;
+  // During streaming: pin the active assistant message to the top of the chat window
+  // so the user can see the full response content below
+  const isStreaming = state.isGenerating;
+  if (isStreaming && !force) {
+    const activeRow = c.querySelector('.message-row.assistant.streaming, .message-row.assistant:last-of-type');
+    if (activeRow) {
+      requestAnimationFrame(() => {
+        const rowTop = activeRow.offsetTop;
+        // Scroll so the assistant row sits at the very top of the visible area
+        c.scrollTop = rowTop;
+        updateScrollToBottomBtn(c.scrollHeight - c.scrollTop - c.clientHeight);
+      });
+      return;
+    }
+  }
   requestAnimationFrame(() => {
     // Smart scroll: only auto-scroll if user is near bottom (within 120px)
     // or if force is true

package/web/ui/chat/flow_engine.js

@@ -377,7 +377,7 @@ function updateStreamingMessage(msgIdx) {
           <span class="thought-label">模型推理过程${reasoningWordCount}</span>
           ${msg.streaming ? '<span class="thought-badge">推理中...</span>' : '<span class="thought-badge">已完成</span>'}
         </summary>
-        <div class="thought-content">${renderMarkdown(msg.reasoning)}</div>
+        <div class="thought-content reasoning-content">${renderMarkdown(msg.reasoning)}</div>
       </details>`;
       contentArea.insertAdjacentHTML('afterbegin', reasoningHtml);
       // Set initial length tracking
@@ -1438,25 +1438,29 @@ async function sendMessage() {
             // evt.result contains: {success, output, error, ...}
             // 记录到调试控制台
             if (window.addDebugLog) {
-              window.addDebugLog(evt.result && evt.result.success ? 'tool' : 'error',
-                (evt.tool.toolname || '工具') + ' 执行' + (evt.result && evt.result.success ? '成功' : '失败'), {
-                tool: evt.tool.toolname,
-                success: evt.result && evt.result.success,
-                error: evt.result && evt.result.error,
-                result: evt.result && (evt.result.output || evt.result.error)
+              var _toolResult = evt.result || {};
+              var _toolInfo = evt.tool || {};
+              window.addDebugLog(_toolResult.success ? 'tool' : 'error',
+                (_toolInfo.toolname || '工具') + ' 执行' + (_toolResult.success ? '成功' : '失败'), {
+                tool: _toolInfo.toolname,
+                success: _toolResult.success,
+                error: _toolResult.error,
+                result: _toolResult.output || _toolResult.error
               });
             }
+            var _r = evt.result || {};
+            var _t = evt.tool || {};
             var resultEvent = {
               type: 'v2_tool',
               data: {
                 id: 'v2tool_' + Date.now() + '_' + allExecEvents.length,
                 type: 'tool_result',
-                title: (evt.tool.toolname || '工具') + ' 执行完成',
-                tool_name: evt.tool.toolname,
-                success: evt.result.success,
-                summary: (evt.result.output || evt.result.error || '').substring(0, 500),
-                result: evt.result,
-                callback: evt.tool.callback
+                title: (_t.toolname || '工具') + ' 执行完成',
+                tool_name: _t.toolname,
+                success: !!_r.success,
+                summary: (_r.output || _r.error || '').substring(0, 500),
+                result: _r,
+                callback: _t.callback
               }
             };
             msgParts.push(resultEvent);