myagent-ai 1.11.0 → 1.11.1

package/package.json

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

package/web/ui/chat/chat_main.js

@@ -2002,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';
@@ -2113,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',
           }
@@ -2125,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++;
     }
   }