@xcanwin/manyoyo 6.2.8 → 6.2.9

package/lib/web/frontend/app.js

@@ -2083,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/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);
@@ -1762,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),
@@ -1779,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);
 }
 
@@ -3626,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.8",
+    "version": "6.2.9",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",