@xcanwin/manyoyo 6.2.7 → 6.2.8

package/lib/web/frontend/app.js

@@ -387,35 +387,6 @@
         return status;
     }
 
-    function buildStructuredTraceResidualLines(message) {
-        const lines = String(message && message.content ? message.content : '')
-            .split('\n')
-            .map(function (line) {
-                return String(line || '').trim();
-            })
-            .filter(Boolean);
-        const traceEvents = Array.isArray(message && message.traceEvents) ? message.traceEvents : [];
-        const consumed = new Map();
-        traceEvents.forEach(function (traceEvent) {
-            const key = traceEvent && traceEvent.text ? String(traceEvent.text).trim() : '';
-            if (!key) {
-                return;
-            }
-            consumed.set(key, (consumed.get(key) || 0) + 1);
-        });
-        return lines.filter(function (line) {
-            if (!line || line === '[执行过程]') {
-                return false;
-            }
-            const remaining = consumed.get(line) || 0;
-            if (remaining > 0) {
-                consumed.set(line, remaining - 1);
-                return false;
-            }
-            return true;
-        });
-    }
-
     function resolveTraceTone(traceEvent) {
         const kind = traceEvent && traceEvent.kind ? String(traceEvent.kind) : '';
         if (kind === 'command') return 'command';
@@ -586,20 +557,24 @@
         const container = document.createElement('div');
         container.className = 'trace-structured';
 
+        const messageId = message && message.id ? message.id : '';
+        const pending = Boolean(state.agentRun.active && state.agentRun.traceMessageId === messageId);
+
         const flow = document.createElement('div');
         flow.className = 'trace-flow';
-        buildStructuredTraceResidualLines(message).forEach(function (line) {
-            flow.appendChild(createResidualTraceCard(line));
-        });
+        if (pending) {
+            window.ManyoyoChatBehavior.buildStructuredTraceResidualLines(message).forEach(function (line) {
+                flow.appendChild(createResidualTraceCard(line));
+            });
+        }
         const traceEvents = Array.isArray(message && message.traceEvents) ? message.traceEvents : [];
-        traceEvents.forEach(function (traceEvent) {
+        const mergedTraceEvents = window.ManyoyoChatBehavior.mergeToolTraceEvents(traceEvents);
+        mergedTraceEvents.forEach(function (traceEvent) {
             flow.appendChild(createTraceEventCard(traceEvent));
         });
 
-        const messageId = message && message.id ? message.id : '';
-        const pending = Boolean(state.agentRun.active && state.agentRun.traceMessageId === messageId);
-        const summaryInfo = window.ManyoyoChatBehavior.summarizeTraceFlow(traceEvents, { pending });
-        const hasError = traceEvents.some(function (event) {
+        const summaryInfo = window.ManyoyoChatBehavior.summarizeTraceFlow(mergedTraceEvents, { pending });
+        const hasError = mergedTraceEvents.some(function (event) {
             return event && event.kind === 'error';
         });
         const defaultOpen = hasError;

package/lib/web/frontend/chat-behavior.js

@@ -22,6 +22,62 @@
         return trimmed ? `${trimmed} · MANYOYO Web` : 'MANYOYO Web';
     }
 
+    function buildStructuredTraceResidualLines(message) {
+        const lines = String(message && message.content ? message.content : '')
+            .split('\n')
+            .map(line => String(line || '').trim())
+            .filter(Boolean);
+        const traceEvents = Array.isArray(message && message.traceEvents) ? message.traceEvents : [];
+        const consumed = new Map();
+        traceEvents.forEach(traceEvent => {
+            const text = traceEvent && traceEvent.text ? String(traceEvent.text) : '';
+            if (!text) {
+                return;
+            }
+            text.split('\n').forEach(subLine => {
+                const key = String(subLine || '').trim();
+                if (!key) {
+                    return;
+                }
+                consumed.set(key, (consumed.get(key) || 0) + 1);
+            });
+        });
+        return lines.filter(line => {
+            if (!line || line === '[执行过程]') {
+                return false;
+            }
+            const remaining = consumed.get(line) || 0;
+            if (remaining > 0) {
+                consumed.set(line, remaining - 1);
+                return false;
+            }
+            return true;
+        });
+    }
+
+    const MERGEABLE_TRACE_KINDS = new Set(['tool', 'command', 'mcp']);
+
+    function mergeToolTraceEvents(traceEvents) {
+        const events = Array.isArray(traceEvents) ? traceEvents : [];
+        const result = [];
+        const indexByKey = new Map();
+        events.forEach(event => {
+            const kind = event && event.kind ? String(event.kind) : '';
+            const toolId = event && event.toolId ? String(event.toolId) : '';
+            if (MERGEABLE_TRACE_KINDS.has(kind) && toolId) {
+                const key = `${kind}:${toolId}`;
+                if (indexByKey.has(key)) {
+                    const index = indexByKey.get(key);
+                    result[index] = Object.assign({}, result[index], event);
+                    return;
+                }
+                indexByKey.set(key, result.length);
+            }
+            result.push(event);
+        });
+        return result;
+    }
+
     function mergeTraceIntoReply(messages) {
         const list = Array.isArray(messages) ? messages : [];
         const result = [];
@@ -44,6 +100,8 @@
         isNearBottom,
         summarizeTraceFlow,
         buildDocumentTitle,
-        mergeTraceIntoReply
+        mergeTraceIntoReply,
+        mergeToolTraceEvents,
+        buildStructuredTraceResidualLines
     };
 }());

package/lib/web/server.js

@@ -1483,6 +1483,7 @@ function prepareCodexTraceEvent(payload) {
     const mcpServer = pickFirstString(item.server);
     const mcpTool = pickFirstString(item.tool);
     const itemStatus = pickFirstString(item.status);
+    const toolId = pickFirstString(item.id);
 
     function shortenText(value, maxChars = 140) {
         const raw = clipText(stripAnsi(String(value || '')).replace(/\s+/g, ' ').trim(), maxChars);
@@ -1558,14 +1559,16 @@ function prepareCodexTraceEvent(payload) {
             return createTraceEvent('tool', `[工具开始] ${toolName || 'tool_call'}`, {
                 phase: 'started',
                 status: pickDisplayStatus('in_progress'),
-                toolName: toolName || 'tool_call'
+                toolName: toolName || 'tool_call',
+                toolId
             });
         }
         if (itemType === 'command_execution') {
             return createTraceEvent('command', `[命令开始] ${commandText || 'command_execution'}`, {
                 phase: 'started',
                 status: pickDisplayStatus('in_progress'),
-                command: commandText || 'command_execution'
+                command: commandText || 'command_execution',
+                toolId
             });
         }
         if (itemType === 'mcp_tool_call') {
@@ -1583,7 +1586,8 @@ function prepareCodexTraceEvent(payload) {
                     arguments: item.arguments && typeof item.arguments === 'object' && !Array.isArray(item.arguments)
                         ? item.arguments
                         : null,
-                    argumentSummary: summary
+                    argumentSummary: summary,
+                    toolId
                 }
             );
         }
@@ -1612,7 +1616,8 @@ function prepareCodexTraceEvent(payload) {
             return createTraceEvent('tool', `[工具完成] ${toolName || 'tool_call'}`, {
                 phase: 'completed',
                 status: pickDisplayStatus('completed'),
-                toolName: toolName || 'tool_call'
+                toolName: toolName || 'tool_call',
+                toolId
             });
         }
         if (itemType === 'command_execution') {
@@ -1622,7 +1627,8 @@ function prepareCodexTraceEvent(payload) {
                 status: pickDisplayStatus(suffix),
                 command: commandText || 'command_execution',
                 exitCode: typeof item.exit_code === 'number' ? item.exit_code : null,
-                result: item.aggregated_output !== undefined ? item.aggregated_output : null
+                result: item.aggregated_output !== undefined ? item.aggregated_output : null,
+                toolId
             });
         }
         if (itemType === 'mcp_tool_call') {
@@ -1642,7 +1648,8 @@ function prepareCodexTraceEvent(payload) {
                         : null,
                     argumentSummary: summary,
                     result: item.result !== undefined ? item.result : null,
-                    error: item.error !== undefined ? item.error : null
+                    error: item.error !== undefined ? item.error : null,
+                    toolId
                 }
             );
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "6.2.7",
+    "version": "6.2.8",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",