@xcanwin/manyoyo 7.0.17 → 7.0.20

package/lib/web/server.js

@@ -138,6 +138,11 @@ const WEB_SESSION_KEY_SEPARATOR = '~';
 const WEB_DEFAULT_AGENT_ID = 'default';
 const WEB_DEFAULT_AGENT_NAME = 'AGENT 1';
 const WEB_CONFIG_KEEP_SECRET_PLACEHOLDER = '***HIDDEN_SECRET***';
+// 取 15s 是为了在 nginx proxy_read_timeout 默认 60s 下留足余量（即便某次心跳
+// 因事件循环繁忙被推迟，也还有三次机会），同时不至于把 NDJSON 流刷得太碎
+const DEFAULT_AGENT_STREAM_HEARTBEAT_MS = 15 * 1000;
+// token 级增量的历史落盘节流：写盘只为断线/刷新后能对账恢复，不需要逐 token 持久化
+const AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS = 1000;
 const FRONTEND_DIR = path.join(__dirname, 'frontend');
 const SAFE_CONTAINER_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_.-]*$/;
 const IMAGE_VERSION_TAG_PATTERN = /^(\d+\.\d+\.\d+)-([A-Za-z0-9][A-Za-z0-9_.-]*)$/;
@@ -930,7 +935,12 @@ function buildClaudeAgentExecCommand(template, prompt, options = {}) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
     const flagSpecs = [
         { flag: '--verbose', pattern: /(?:^|\s)--verbose(?:\s|$)/ },
-        { flag: '--output-format stream-json', pattern: /(?:^|\s)--output-format(?:\s|$)/ }
+        { flag: '--output-format stream-json', pattern: /(?:^|\s)--output-format(?:\s|$)/ },
+        // 没有这个 flag 时 claude 只在整条 assistant 消息生成完之后才吐一行 JSON：
+        // 一段几千字的回答会静默几十秒再一次性刷出来，用户看到的"执行过程"是分批跳变的。
+        // 带上之后会额外输出 stream_event/content_block_delta 的 token 级增量
+        //（解析见 extractContentDeltaFromPayload）
+        { flag: '--include-partial-messages', pattern: /(?:^|\s)--include-partial-messages(?:\s|$)/ }
     ];
     const sessionId = options && typeof options.sessionId === 'string' ? options.sessionId.trim() : '';
     if (sessionId) {
@@ -1792,12 +1802,39 @@ function prepareStructuredTraceEvents(agentProgram, payload, state) {
     return [];
 }
 
-function extractContentDeltaFromPayload(agentProgram, payload) {
+function extractContentDeltaFromPayload(agentProgram, payload, state = {}) {
     if (!payload || typeof payload !== 'object') {
         return null;
     }
     if (agentProgram === 'claude') {
-        if (pickFirstString(payload.type) !== 'assistant') {
+        const payloadType = pickFirstString(payload.type);
+        // --include-partial-messages 产生的 token 级增量。text 是累计全文（服务端
+        // 落盘用），chunk 是本次新增的片段（下发给前端用）——一轮回答可能有几千个
+        // 增量，每次都把累计全文发一遍是 O(n²) 流量，长回答能到 MB 级。
+        // 一轮里可能有多条 assistant 消息（正文→工具→正文），message_start 清空累计，
+        // 语义与下面整条 assistant 消息的 reset 一致
+        if (payloadType === 'stream_event') {
+            const streamEvent = toPlainObject(payload.event);
+            const streamEventType = pickFirstString(streamEvent.type);
+            if (streamEventType === 'message_start') {
+                state.claudePartialText = '';
+                return { text: '', reset: true, partial: true, chunk: '', chunkReset: true };
+            }
+            if (streamEventType !== 'content_block_delta') {
+                return null;
+            }
+            const delta = toPlainObject(streamEvent.delta);
+            if (pickFirstString(delta.type) !== 'text_delta') {
+                return null;
+            }
+            const deltaText = typeof delta.text === 'string' ? delta.text : '';
+            if (!deltaText) {
+                return null;
+            }
+            state.claudePartialText = `${state.claudePartialText || ''}${deltaText}`;
+            return { text: state.claudePartialText, reset: true, partial: true, chunk: deltaText };
+        }
+        if (payloadType !== 'assistant') {
             return null;
         }
         const message = toPlainObject(payload.message);
@@ -3752,7 +3789,13 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
                         }
                         onEvent({
                             type: 'content_delta',
-                            content: contentDeltaAccumulator
+                            content: contentDeltaAccumulator,
+                            // token 级增量标记为 partial：调用方据此跳过事件日志、
+                            // 并对历史落盘做节流（否则每个 token 都要重写一次历史 JSON）；
+                            // chunk/chunkReset 只在 partial 时有意义，见 extractContentDeltaFromPayload
+                            partial: deltaContent.partial === true,
+                            chunk: typeof deltaContent.chunk === 'string' ? deltaContent.chunk : '',
+                            chunkReset: deltaContent.chunkReset === true
                         });
                     }
                     return;
@@ -3970,10 +4013,15 @@ function getValidSessionRef(ctx, res, encodedName) {
     return parsed;
 }
 
-function buildSessionSummary(ctx, state, containerMap, sessionRef) {
+// preloadedHistory：调用方已经读过同一个容器的历史时直接复用。历史 JSON 是整份
+// 读文件 + JSON.parse，容器多、agent 多时按 agent 数重复读会把 GET /api/sessions
+// 拖到秒级，而它是同步 IO——事件循环被占住期间 agent/stream 的输出只能攒着分批推
+function buildSessionSummary(ctx, state, containerMap, sessionRef, preloadedHistory = null) {
     const containerName = sessionRef && sessionRef.containerName ? sessionRef.containerName : '';
     const agentId = sessionRef && sessionRef.agentId ? sessionRef.agentId : WEB_DEFAULT_AGENT_ID;
-    const history = loadWebSessionHistory(state.webHistoryDir, containerName);
+    const history = preloadedHistory && typeof preloadedHistory === 'object'
+        ? preloadedHistory
+        : loadWebSessionHistory(state.webHistoryDir, containerName);
     const realAgentSession = getWebAgentSession(history, agentId, { includeArchived: true });
     const agentSession = realAgentSession
         || (agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
@@ -4070,7 +4118,7 @@ function buildSessionDetail(ctx, state, containerMap, name) {
         sessionRef.agentId,
         containerInfo.defaultCommand
     );
-    const summary = buildSessionSummary(ctx, state, containerMap, sessionRef);
+    const summary = buildSessionSummary(ctx, state, containerMap, sessionRef, history);
     const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true })
         || (sessionRef.agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
     const latestMessage = agentSession && agentSession.messages.length
@@ -4871,7 +4919,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                             .map(agentSession => buildSessionSummary(ctx, state, containerMap, {
                                 containerName: name,
                                 agentId: agentSession.agentId
-                            }))
+                            }, history))
                             .filter(Boolean);
                     })
                     .sort(compareWebSessionCreatedDesc);
@@ -5516,7 +5564,30 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     'Cache-Control': 'no-store',
                     'X-Accel-Buffering': 'no'
                 });
-                const emitStreamEvent = createWebStreamEmitter(res, state.webHistoryDir, sessionRef);
+                // agent 可能几十秒不产生任何输出（长 WebSearch、长 Bash、长思考），
+                // 而反向代理按"上游多久没发字节"计空闲超时（nginx proxy_read_timeout
+                // 默认 60s），超时会 RST 掉这条流，浏览器侧抛 network error。这里定期
+                // 发一行 ping 保活；前端忽略该事件，也不写入会话事件日志
+                const heartbeatMs = ctx.agentStreamHeartbeatMs || DEFAULT_AGENT_STREAM_HEARTBEAT_MS;
+                let lastStreamWriteAt = Date.now();
+                const heartbeatTimer = setInterval(() => {
+                    if (res.writableEnded || res.destroyed) {
+                        return;
+                    }
+                    if (Date.now() - lastStreamWriteAt < heartbeatMs) {
+                        return;
+                    }
+                    sendNdjson(res, { type: 'ping' });
+                    lastStreamWriteAt = Date.now();
+                }, Math.max(50, Math.floor(heartbeatMs / 2)));
+                if (typeof heartbeatTimer.unref === 'function') {
+                    heartbeatTimer.unref();
+                }
+                const rawEmitStreamEvent = createWebStreamEmitter(res, state.webHistoryDir, sessionRef);
+                const emitStreamEvent = (...args) => {
+                    lastStreamWriteAt = Date.now();
+                    return rawEmitStreamEvent(...args);
+                };
                 emitStreamEvent({
                     type: 'meta',
                     containerName: sessionRef.containerName,
@@ -5545,6 +5616,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     pending: true
                 });
 
+                let lastPartialPersistAt = 0;
                 const diagStreamStartedAt = Date.now(); // DIAG_LOG
                 let diagEventSeq = 0; // DIAG_LOG
                 diagLog(ctx, 'stream_exec_start', { // DIAG_LOG
@@ -5556,15 +5628,20 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     const result = await execAgentInWebContainerStream(ctx, state, sessionRef, command, {
                         agentProgram: agentMeta.agentProgram,
                         onEvent: event => {
-                            diagEventSeq += 1; // DIAG_LOG
-                            diagLog(ctx, 'stream_event', { // DIAG_LOG
-                                session: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
-                                seq: diagEventSeq,
-                                type: event && event.type,
-                                sinceStartMs: Date.now() - diagStreamStartedAt,
-                                textLength: event && typeof event.text === 'string' ? event.text.length : undefined,
-                                contentLength: event && typeof event.content === 'string' ? event.content.length : undefined
-                            });
+                            // token 级增量：只走网线，不进事件日志、不逐条打诊断日志，
+                            // 历史落盘按 AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS 节流
+                            const isPartialDelta = event && event.type === 'content_delta' && event.partial === true;
+                            if (!isPartialDelta) {
+                                diagEventSeq += 1; // DIAG_LOG
+                                diagLog(ctx, 'stream_event', { // DIAG_LOG
+                                    session: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                                    seq: diagEventSeq,
+                                    type: event && event.type,
+                                    sinceStartMs: Date.now() - diagStreamStartedAt,
+                                    textLength: event && typeof event.text === 'string' ? event.text.length : undefined,
+                                    contentLength: event && typeof event.content === 'string' ? event.content.length : undefined
+                                });
+                            }
                             if (event && event.type === 'trace' && event.text) {
                                 traceLines.push(String(event.text));
                                 if (event.traceEvent && typeof event.traceEvent === 'object') {
@@ -5577,6 +5654,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                 });
                             }
                             if (event && event.type === 'content_delta' && typeof event.content === 'string') {
+                                const now = Date.now();
+                                const shouldPersist = !isPartialDelta
+                                    || now - lastPartialPersistAt >= AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS;
                                 if (!streamingReplyMessageId) {
                                     const streamingReplyMessage = appendWebSessionMessage(
                                         state.webHistoryDir,
@@ -5592,13 +5672,24 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                     streamingReplyMessageId = streamingReplyMessage && streamingReplyMessage.id
                                         ? streamingReplyMessage.id
                                         : '';
-                                } else {
+                                    lastPartialPersistAt = now;
+                                } else if (shouldPersist) {
                                     patchWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId, {
                                         content: event.content,
                                         pending: true
                                     });
+                                    lastPartialPersistAt = now;
                                 }
                             }
+                            if (isPartialDelta) {
+                                lastStreamWriteAt = Date.now();
+                                // 只发增量片段：前端在 content_chunk 上做追加，
+                                // reset 表示换了一条 assistant 消息、从空白重新开始
+                                sendNdjson(res, event.chunkReset === true
+                                    ? { type: 'content_chunk', text: '', reset: true }
+                                    : { type: 'content_chunk', text: event.chunk });
+                                return;
+                            }
                             emitStreamEvent(event, resolveWebStreamControlEventType(event), {
                                 transportType: event && event.type ? event.type : '',
                                 text: event && (event.text || event.content) ? String(event.text || event.content) : ''
@@ -5675,6 +5766,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         error: e && e.message ? e.message : 'Agent 执行失败'
                     }, 'agent.turn.failed', { error: e && e.message ? e.message : 'Agent 执行失败' });
                 } finally {
+                    clearInterval(heartbeatTimer);
                     res.end();
                 }
             }
@@ -5813,6 +5905,10 @@ async function startWebServer(options) {
         showImagePullHint: options.showImagePullHint,
         removeContainer: options.removeContainer,
         logger: options.logger && typeof options.logger.info === 'function' ? options.logger : fallbackLogger,
+        // agent/stream 的保活心跳间隔，需小于反向代理的空闲读超时（nginx 默认 60s）
+        agentStreamHeartbeatMs: Number.isFinite(options.agentStreamHeartbeatMs) && options.agentStreamHeartbeatMs > 0
+            ? options.agentStreamHeartbeatMs
+            : DEFAULT_AGENT_STREAM_HEARTBEAT_MS,
         colors: options.colors || {
             GREEN: '',
             CYAN: '',

package/package.json

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