@xcanwin/manyoyo 8.6.7 → 8.6.8

package/lib/web/server.js

@@ -835,6 +835,44 @@ function stripAnsi(text) {
     return text.replace(/\x1b\[[0-9;]*m/g, '');
 }
 
+// Agent 原始输出只保留开头 AGENT_RAW_OUTPUT_MAX_CHARS（会话 id 在开头），另外保留一份结尾：
+// 最终回复和用量都在输出末尾，超过上限后只看开头会把截断点之前的某条中间说明当成最终回复
+const AGENT_RAW_OUTPUT_MAX_CHARS = 32 * 1024 * 1024;
+const AGENT_OUTPUT_TAIL_MAX_CHARS = 8 * 1024 * 1024;
+// 最终回复的上限：远大于正常回复，只挡住把整个文件当回复打出来的极端情况
+const AGENT_FINAL_REPLY_MAX_CHARS = 1000000;
+
+function createTailBuffer(maxChars) {
+    let parts = [];
+    let size = 0;
+    return {
+        push(text) {
+            if (!text) return;
+            parts.push(text);
+            size += text.length;
+            if (size > maxChars * 2) {
+                const joined = parts.join('').slice(-maxChars);
+                parts = [joined];
+                size = joined.length;
+            }
+        },
+        text() {
+            return parts.join('').slice(-maxChars);
+        }
+    };
+}
+
+// 结束后的回复文本：结构化输出里提取到的最终回复按 AGENT_FINAL_REPLY_MAX_CHARS（远大于正常回复）保留；
+// 提取不到才退回原始输出，原始输出按 WEB_OUTPUT_MAX_CHARS 截断
+function resolveAgentFinalOutput(agentProgram, { stdout, stdoutTruncated, stdoutTail, raw }) {
+    const extracted = (stdoutTruncated ? extractAgentMessageFromStructuredOutput(agentProgram, stdoutTail) : '')
+        || extractAgentMessageFromStructuredOutput(agentProgram, stdout);
+    if (extracted) {
+        return clipText(stripAnsi(extracted).trim(), AGENT_FINAL_REPLY_MAX_CHARS);
+    }
+    return clipText(stripAnsi(raw).trim() || '(无输出)');
+}
+
 function clipText(text, maxChars = WEB_OUTPUT_MAX_CHARS) {
     if (typeof text !== 'string') return '';
     if (text.length <= maxChars) return text;
@@ -1062,6 +1100,11 @@ function extractClaudeAgentMessage(text) {
     let lastMessage = '';
     for (const rawLine of String(text || '').split('\n')) {
         const payload = parseJsonObjectLine(rawLine);
+        // result 事件带权威的最终文本；后台任务场景结尾有两个 result（第一个是中间结论），取最后一个
+        if (payload && payload.type === 'result' && typeof payload.result === 'string' && payload.result.trim()) {
+            lastMessage = payload.result.trim();
+            continue;
+        }
         if (!payload || payload.type !== 'assistant' || pickFirstString(payload.parent_tool_use_id)) {
             continue;
         }
@@ -2291,7 +2334,8 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
 }
 
 function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, meta, result) {
-    const turnUsage = extractTurnUsage(agentMeta.agentProgram, result.stdout);
+    // 用量在输出末尾：原始输出超过上限时开头里没有它
+    const turnUsage = extractTurnUsage(agentMeta.agentProgram, result.stdoutTail || result.stdout);
     const replyMessage = appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
         exitCode: result.exitCode,
         mode: 'agent',
@@ -3778,7 +3822,8 @@ async function execCommandInWebContainer(ctx, containerName, command, options =
             { stdio: ['ignore', 'pipe', 'pipe'] }
         );
 
-        const MAX_RAW_OUTPUT_CHARS = 32 * 1024 * 1024;
+        const MAX_RAW_OUTPUT_CHARS = ctx.agentRawOutputMaxChars || AGENT_RAW_OUTPUT_MAX_CHARS;
+        const stdoutTail = createTailBuffer(Math.min(MAX_RAW_OUTPUT_CHARS, AGENT_OUTPUT_TAIL_MAX_CHARS));
         let stdoutOutput = '';
         let stderrOutput = '';
         let stdoutTruncated = false;
@@ -3788,6 +3833,7 @@ async function execCommandInWebContainer(ctx, containerName, command, options =
             if (!chunk) return;
             const text = chunk.toString('utf-8');
             if (!text) return;
+            if (target.tail) target.tail.push(text);
             if (target.value.length >= MAX_RAW_OUTPUT_CHARS) {
                 target.truncated = true;
                 return;
@@ -3801,7 +3847,11 @@ async function execCommandInWebContainer(ctx, containerName, command, options =
             target.value += text;
         }
 
+        // 按流解码：逐块 toString 会把跨块的多字节字符（中文）拆成乱码
+        process.stdout.setEncoding('utf8');
+        process.stderr.setEncoding('utf8');
         process.stdout.on('data', chunk => appendChunk(chunk, {
+            tail: stdoutTail,
             get value() { return stdoutOutput; },
             set value(nextValue) { stdoutOutput = nextValue; },
             get truncated() { return stdoutTruncated; },
@@ -3820,13 +3870,14 @@ async function execCommandInWebContainer(ctx, containerName, command, options =
             const clippedStdout = stdoutTruncated ? `${stdoutOutput}\n...[stdout-truncated]` : stdoutOutput;
             const clippedStderr = stderrTruncated ? `${stderrOutput}\n...[stderr-truncated]` : stderrOutput;
             const clippedRaw = `${clippedStdout}${clippedStdout && clippedStderr ? '\n' : ''}${clippedStderr}`;
-            const extractedAgentMessage = extractAgentMessageFromStructuredOutput(agentProgram, clippedStdout);
-            const cleanOutputSource = extractedAgentMessage || clippedRaw;
-            const output = clipText(stripAnsi(cleanOutputSource).trim() || '(无输出)');
+            // 结尾只在开头被截断时才需要（拼接最多 16MB，只算一次）
+            const tailText = stdoutTruncated ? stdoutTail.text() : '';
+            const output = resolveAgentFinalOutput(agentProgram, { stdout: clippedStdout, stdoutTruncated, stdoutTail: tailText, raw: clippedRaw });
             resolve({
                 exitCode,
                 output,
                 stdout: clippedStdout,
+                ...(stdoutTruncated ? { stdoutTail: tailText } : {}),
                 stderr: clippedStderr
             });
         });
@@ -4230,7 +4281,8 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
     }
 
     return await new Promise((resolve, reject) => {
-        const MAX_RAW_OUTPUT_CHARS = 32 * 1024 * 1024;
+        const MAX_RAW_OUTPUT_CHARS = ctx.agentRawOutputMaxChars || AGENT_RAW_OUTPUT_MAX_CHARS;
+        const stdoutTail = createTailBuffer(Math.min(MAX_RAW_OUTPUT_CHARS, AGENT_OUTPUT_TAIL_MAX_CHARS));
         let stdoutOutput = '';
         let stderrOutput = '';
         let stdoutTruncated = false;
@@ -4245,6 +4297,7 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
             if (!chunk) return;
             const text = chunk.toString('utf-8');
             if (!text) return;
+            if (target.tail) target.tail.push(text);
             if (target.value.length >= MAX_RAW_OUTPUT_CHARS) {
                 target.truncated = true;
                 return;
@@ -4325,8 +4378,12 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
             return pending;
         }
 
+        // 按流解码：逐块 toString 会把跨块的多字节字符（中文）拆成乱码
+        process.stdout.setEncoding('utf8');
+        process.stderr.setEncoding('utf8');
         process.stdout.on('data', chunk => {
             appendChunk(chunk, {
+                tail: stdoutTail,
                 get value() { return stdoutOutput; },
                 set value(nextValue) { stdoutOutput = nextValue; },
                 get truncated() { return stdoutTruncated; },
@@ -4364,13 +4421,14 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
             const clippedStdout = stdoutTruncated ? `${stdoutOutput}\n...[stdout-truncated]` : stdoutOutput;
             const clippedStderr = stderrTruncated ? `${stderrOutput}\n...[stderr-truncated]` : stderrOutput;
             const clippedRaw = `${clippedStdout}${clippedStdout && clippedStderr ? '\n' : ''}${clippedStderr}`;
-            const extractedAgentMessage = extractAgentMessageFromStructuredOutput(agentProgram, clippedStdout);
-            const cleanOutputSource = extractedAgentMessage || clippedRaw;
-            const output = clipText(stripAnsi(cleanOutputSource).trim() || '(无输出)');
+            // 结尾只在开头被截断时才需要（拼接最多 16MB，只算一次）
+            const tailText = stdoutTruncated ? stdoutTail.text() : '';
+            const output = resolveAgentFinalOutput(agentProgram, { stdout: clippedStdout, stdoutTruncated, stdoutTail: tailText, raw: clippedRaw });
             resolve({
                 exitCode,
                 output,
                 stdout: clippedStdout,
+                ...(stdoutTruncated ? { stdoutTail: tailText } : {}),
                 // 真实的 claude 收到 SIGINT 会正常收尾、退出码为 0（L3 实测）：发过信号就算被打断，不能只看退出码
                 interrupted: runState.stopping === true && (exitCode !== 0 || runState.signaled === true)
             });
@@ -7532,6 +7590,10 @@ async function startWebServer(options) {
         agentStopGraceMs: Number.isFinite(options.agentStopGraceMs) && options.agentStopGraceMs > 0
             ? options.agentStopGraceMs
             : agentRunControl.DEFAULT_GRACE_MS,
+        // Agent 原始输出保留开头的上限（测试可调小）；结尾另留一份，见 createTailBuffer
+        agentRawOutputMaxChars: Number.isFinite(options.agentRawOutputMaxChars) && options.agentRawOutputMaxChars > 0
+            ? options.agentRawOutputMaxChars
+            : AGENT_RAW_OUTPUT_MAX_CHARS,
         // 追加提示词“当前步骤结束后插入”等不到步骤边界时，退化成立即打断的等待时间
         agentStepFallbackMs: Number.isFinite(options.agentStepFallbackMs) && options.agentStepFallbackMs > 0
             ? options.agentStepFallbackMs

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.6.7",
+    "version": "8.6.8",
     "imageVersion": "2.2.0-common",
     "playwrightCliVersion": "0.1.19",
     "patchrightCoreVersion": "1.63.0",
@@ -45,6 +45,7 @@
         "test": "jest --coverage && npm run test:web",
         "test:unit": "jest test/ --testPathIgnorePatterns '<rootDir>/temp/' '<rootDir>/.claude/' '<rootDir>/test/integration/' && npm run test:web",
         "test:integration": "jest test/integration/ --runInBand",
+        "test:experience": "jest test/integration/web-chat-experience.test.js --runInBand",
         "test:installer": "jest test/installer.test.js",
         "lint:sh": "command -v shellcheck >/dev/null 2>&1 || { echo '未安装 shellcheck：macOS 用 brew install shellcheck，Debian/Ubuntu 用 sudo apt install shellcheck，或用 docker run --rm -v \"$PWD:/mnt\" -w /mnt koalaman/shellcheck:stable scripts/install.sh scripts/offline/*.sh' >&2; exit 1; } && shellcheck -s sh -x -e SC1091 scripts/install.sh scripts/offline/*.sh",
         "docs:dev": "vitepress dev docs --host 127.0.0.1 --port 5173",