@xcanwin/manyoyo 6.2.7 → 6.2.9

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;
@@ -2108,6 +2083,13 @@
                 { label: '最近 resume', value: lastResumeText },
                 { label: '最近结果', value: detail.lastResumeOk == null ? '暂无' : (detail.lastResumeOk ? '成功' : '失败'), tone: detail.lastResumeOk == null ? 'info' : (detail.lastResumeOk ? 'ok' : 'danger') }
             ]);
+            renderKeyValueCard(detailSummary, '用量统计', detail.usageTotal ? [
+                { label: '累计输入 tokens', value: String(detail.usageTotal.inputTokens) },
+                { label: '累计输出 tokens', value: String(detail.usageTotal.outputTokens) },
+                { label: '累计花费', value: typeof detail.usageTotal.costUsd === 'number' ? `$${detail.usageTotal.costUsd.toFixed(4)}` : '暂不支持' }
+            ] : [
+                { label: '状态', value: '暂无数据（当前 Agent 程序不支持用量统计，或还未执行过对话）', tone: 'info' }
+            ]);
             renderKeyValueCard(detailSummary, '最近活动', [
                 { label: '最近角色', value: latestRoleLabel },
                 { label: '最近时间', value: latestTimestampText },

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

@@ -189,7 +189,25 @@ function createEmptyWebAgentSession(agentId, agentName) {
         lastResumeAt: null,
         lastResumeOk: null,
         lastResumeError: '',
-        engineSessionId: ''
+        engineSessionId: '',
+        usageTotal: null
+    };
+}
+
+function normalizeWebAgentUsageTotal(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    if (typeof value.inputTokens !== 'number' || typeof value.outputTokens !== 'number') {
+        return null;
+    }
+    if (typeof value.costUsd !== 'number' && value.costUsd !== null) {
+        return null;
+    }
+    return {
+        inputTokens: value.inputTokens,
+        outputTokens: value.outputTokens,
+        costUsd: typeof value.costUsd === 'number' ? value.costUsd : null
     };
 }
 
@@ -218,7 +236,8 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
         lastResumeOk: typeof source.lastResumeOk === 'boolean' ? source.lastResumeOk : null,
         lastResumeError: typeof source.lastResumeError === 'string' ? source.lastResumeError : '',
-        engineSessionId: typeof source.engineSessionId === 'string' ? source.engineSessionId : ''
+        engineSessionId: typeof source.engineSessionId === 'string' ? source.engineSessionId : '',
+        usageTotal: normalizeWebAgentUsageTotal(source.usageTotal)
     };
 }
 
@@ -1039,6 +1058,86 @@ function extractEngineSessionId(agentProgram, text) {
     return '';
 }
 
+function extractClaudeTurnUsage(text) {
+    let result = null;
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (!payload || payload.type !== 'result') {
+            continue;
+        }
+        const usage = toPlainObject(payload.usage);
+        result = {
+            inputTokens: typeof usage.input_tokens === 'number' ? usage.input_tokens : null,
+            outputTokens: typeof usage.output_tokens === 'number' ? usage.output_tokens : null,
+            costUsd: typeof payload.total_cost_usd === 'number' ? payload.total_cost_usd : null
+        };
+    }
+    return result;
+}
+
+function extractCodexTurnUsage(text) {
+    let result = null;
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (!payload || payload.type !== 'turn.completed') {
+            continue;
+        }
+        const usage = toPlainObject(payload.usage);
+        result = {
+            inputTokens: typeof usage.input_tokens === 'number' ? usage.input_tokens : null,
+            outputTokens: typeof usage.output_tokens === 'number' ? usage.output_tokens : null,
+            costUsd: null
+        };
+    }
+    return result;
+}
+
+function extractOpenCodeTurnUsage(text) {
+    let result = null;
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (!payload || payload.type !== 'step_finish') {
+            continue;
+        }
+        const part = toPlainObject(payload.part);
+        const tokens = toPlainObject(part.tokens);
+        result = {
+            inputTokens: typeof tokens.input === 'number' ? tokens.input : null,
+            outputTokens: typeof tokens.output === 'number' ? tokens.output : null,
+            costUsd: typeof part.cost === 'number' ? part.cost : null
+        };
+    }
+    return result;
+}
+
+// Gemini 的非交互 stream-json 输出目前没有已确认的 usage/token 字段可解析，故不返回数据（而非猜测字段名）。
+function extractTurnUsage(agentProgram, text) {
+    if (agentProgram === 'claude') {
+        return extractClaudeTurnUsage(text);
+    }
+    if (agentProgram === 'codex') {
+        return extractCodexTurnUsage(text);
+    }
+    if (agentProgram === 'opencode') {
+        return extractOpenCodeTurnUsage(text);
+    }
+    return null;
+}
+
+function accumulateUsageTotal(baseline, turnUsage) {
+    const base = baseline && typeof baseline === 'object'
+        ? baseline
+        : { inputTokens: 0, outputTokens: 0, costUsd: null };
+    const baseCost = typeof base.costUsd === 'number' ? base.costUsd : null;
+    const turnCost = typeof turnUsage.costUsd === 'number' ? turnUsage.costUsd : null;
+    return {
+        inputTokens: (base.inputTokens || 0) + (turnUsage.inputTokens || 0),
+        outputTokens: (base.outputTokens || 0) + (turnUsage.outputTokens || 0),
+        // 引擎从未上报过费用（如 Codex）时保持 null，不要伪装成"花费为 0"
+        costUsd: baseCost === null && turnCost === null ? null : (baseCost || 0) + (turnCost || 0)
+    };
+}
+
 function getAgentRuntimeMeta(template) {
     const normalizedTemplate = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
     const agentProgram = resolveAgentProgram(normalizedTemplate);
@@ -1483,6 +1582,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 +1658,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 +1685,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 +1715,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 +1726,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 +1747,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
                 }
             );
         }
@@ -1755,13 +1861,15 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
 }
 
 function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, meta, result) {
+    const turnUsage = extractTurnUsage(agentMeta.agentProgram, result.stdout);
     appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
         exitCode: result.exitCode,
         mode: 'agent',
         contextMode: meta.contextMode,
         resumeAttempted: meta.resumeAttempted,
         resumeSucceeded: meta.resumeSucceeded,
-        interrupted: result.interrupted === true
+        interrupted: result.interrupted === true,
+        ...(turnUsage ? { usage: turnUsage } : {})
     });
     const patch = {
         lastResumeAt: meta.resumeAttempted ? new Date().toISOString() : (agentSession.lastResumeAt || null),
@@ -1772,6 +1880,9 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
     if (engineSessionId) {
         patch.engineSessionId = engineSessionId;
     }
+    if (turnUsage) {
+        patch.usageTotal = accumulateUsageTotal(agentSession.usageTotal, turnUsage);
+    }
     patchWebAgentSessionState(state.webHistoryDir, sessionRef, patch);
 }
 
@@ -3619,6 +3730,7 @@ function buildSessionDetail(ctx, state, containerMap, name) {
         lastResumeAt: agentSession.lastResumeAt || null,
         lastResumeOk: typeof agentSession.lastResumeOk === 'boolean' ? agentSession.lastResumeOk : null,
         lastResumeError: agentSession.lastResumeError || '',
+        usageTotal: agentSession.usageTotal || null,
         applied
     };
 }

package/package.json

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