@xcanwin/manyoyo 7.0.18 → 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_.-]*)$/;
@@ -462,9 +467,10 @@ function removeContainerIdempotent(ctx, containerName) {
     }
 }
 
-function removeAllAgentHistoryArtifacts(state, containerName, agentIds) {
+function removeAllAgentHistoryArtifacts(webHistoryDir, containerName, agentIds) {
+    const eventStore = new FileEventStore(webHistoryDir);
     (Array.isArray(agentIds) ? agentIds : []).forEach(agentId => {
-        state.eventStore.remove(buildWebSessionKey(containerName, agentId));
+        eventStore.remove(buildWebSessionKey(containerName, agentId));
     });
 }
 
@@ -622,57 +628,29 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
     return message;
 }
 
-// 流式过程中高频出现的"透传"控制事件类型（见 resolveWebStreamControlEventType）：
-// 每个 content_delta/trace 事件都会各自触发一次，量随回合长度线性增长。会话
-// 生命周期事件（session.ready/stopping/process.exited 等）不在其中，必须每次
-// 都立即落盘。
-const NOISY_CONTROL_EVENT_TYPES = new Set(['process.stdout', 'agent.turn.delta', 'agent.tool.observed']);
-const LIVE_HISTORY_FLUSH_INTERVAL_MS = 400;
-
-// 中间态历史落盘节流：同一 aggregateId 在节流窗口内只允许成功落盘一次，供
-// appendWebSessionControlEvent（events 镜像）与 /agent/stream 路由里的
-// patchWebSessionMessage（trace/content_delta 消息内容）共用同一个"落盘配额"，
-// 避免同一个事件被两条独立写路径各自整份重写一次 demo.json。节流只影响"实时
-// 进度对轮询标签页可见的时机"，不影响最终数据——两条写路径在回合结束/出错时
-// 都还有一次不受节流影响的完整落盘。
-function shouldFlushLiveHistory(state, aggregateId) {
-    const now = Date.now();
-    const lastFlushAt = state._liveHistoryFlushThrottle.get(aggregateId) || 0;
-    if (now - lastFlushAt < LIVE_HISTORY_FLUSH_INTERVAL_MS) {
-        return false;
-    }
-    state._liveHistoryFlushThrottle.set(aggregateId, now);
-    return true;
-}
-
-function appendWebSessionControlEvent(state, sessionRef, type, data = {}) {
-    const aggregateId = buildWebSessionKey(sessionRef.containerName, sessionRef.agentId);
-    // seq 必须以 state.eventStore 的内存缓存为准（而不是下面 agentSession.events
-    // 这份可能因落盘节流而滞后的历史 JSON 副本），否则节流生效时算出来的 seq
-    // 会与 eventStore 实际的 lastSeq 对不上，append() 会因"seq 必须连续递增"报错。
+function appendWebSessionControlEvent(webHistoryDir, sessionRef, type, data = {}) {
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true, includeArchived: true });
+    const events = Array.isArray(agentSession.events) ? agentSession.events : [];
+    const lastEvent = events.length ? events[events.length - 1] : null;
     const event = createControlEvent({
         type,
-        aggregateId,
-        seq: state.eventStore.getNextSeq(aggregateId),
+        aggregateId: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+        seq: lastEvent ? lastEvent.seq + 1 : 1,
         data
     });
-    state.eventStore.append(event);
-
-    const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
-    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true, includeArchived: true });
-    const events = Array.isArray(agentSession.events) ? agentSession.events : [];
+    const eventStore = new FileEventStore(webHistoryDir);
+    eventStore.append(event);
     agentSession.events = [...events, event].slice(-WEB_HISTORY_MAX_MESSAGES);
     agentSession.updatedAt = event.timestamp;
     history.updatedAt = event.timestamp;
-    if (!NOISY_CONTROL_EVENT_TYPES.has(type) || shouldFlushLiveHistory(state, aggregateId)) {
-        saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
-    }
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
     return event;
 }
 
-function loadWebSessionControlEvents(state, sessionRef, fallbackEvents = []) {
+function loadWebSessionControlEvents(webHistoryDir, sessionRef, fallbackEvents = []) {
     try {
-        const events = state.eventStore.read(
+        const events = new FileEventStore(webHistoryDir).read(
             buildWebSessionKey(sessionRef.containerName, sessionRef.agentId)
         );
         if (events.length) {
@@ -957,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) {
@@ -1819,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);
@@ -2096,7 +2106,7 @@ function prepareCodexTraceEvent(payload) {
 async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
     const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true, includeArchived: true });
-    const containerMap = listWebManyoyoContainers(ctx, state);
+    const containerMap = listWebManyoyoContainers(ctx);
     const containerInfo = containerMap[sessionRef.containerName] || {};
     const normalizedContainerTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
     if (normalizedContainerTemplate !== history.agentPromptCommand) {
@@ -3036,7 +3046,7 @@ function buildCreateRuntime(ctx, state, payload) {
 }
 
 function resolveUniqueContainerName(ctx, state, baseName) {
-    const containerMap = listWebManyoyoContainers(ctx, state);
+    const containerMap = listWebManyoyoContainers(ctx);
     const historyNames = listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName);
     const taken = new Set([...Object.keys(containerMap), ...historyNames]);
     // 基于历史最大编号 +1 命名，即使较小编号的副本被删除也不回收其编号，
@@ -3117,7 +3127,7 @@ async function createClonedContainer(ctx, state, sourceContainerName, requestedN
     let finalName = '';
     if (requestedName) {
         validateContainerNameStrict(requestedName);
-        const containerMap = listWebManyoyoContainers(ctx, state);
+        const containerMap = listWebManyoyoContainers(ctx);
         const historyNames = listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName);
         const taken = new Set([...Object.keys(containerMap), ...historyNames]);
         if (taken.has(requestedName)) {
@@ -3181,20 +3191,7 @@ function estimateStartTimeFromStatus(status) {
     return null;
 }
 
-// 同一进程内短 TTL 缓存：GET /api/sessions、/detail 等接口各自独立调用这个函数，
-// 容器一多时 docker ps + 批量 inspect 本身就不便宜，多标签页轮询会让它们在
-// 短时间内反复触发。2 秒内的重复调用直接复用上一次结果，不再次触碰
-// ctx.dockerExecArgs（同步 spawnSync，会独占事件循环）。
-const CONTAINER_LIST_CACHE_TTL_MS = 2000;
-
-function listWebManyoyoContainers(ctx, state) {
-    if (state && state._containerListCache) {
-        const { timestamp, data } = state._containerListCache;
-        if (Date.now() - timestamp < CONTAINER_LIST_CACHE_TTL_MS) {
-            return data;
-        }
-    }
-
+function listWebManyoyoContainers(ctx) {
     const output = ctx.dockerExecArgs(
         ['ps', '-a', '--format', '{{.Names}}\t{{.Status}}\t{{.Image}}'],
         { ignoreError: true }
@@ -3202,9 +3199,6 @@ function listWebManyoyoContainers(ctx, state) {
 
     const map = {};
     if (!output.trim()) {
-        if (state) {
-            state._containerListCache = { timestamp: Date.now(), data: map };
-        }
         return map;
     }
 
@@ -3261,9 +3255,6 @@ function listWebManyoyoContainers(ctx, state) {
         };
     });
 
-    if (state) {
-        state._containerListCache = { timestamp: Date.now(), data: map };
-    }
     return map;
 }
 
@@ -3798,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;
@@ -3920,9 +3917,9 @@ function sendNdjson(res, payload) {
     res.write(`${JSON.stringify(payload)}\n`);
 }
 
-function createWebStreamEmitter(res, state, sessionRef) {
+function createWebStreamEmitter(res, webHistoryDir, sessionRef) {
     return (payload, type, data = {}) => {
-        const controlEvent = appendWebSessionControlEvent(state, sessionRef, type, data);
+        const controlEvent = appendWebSessionControlEvent(webHistoryDir, sessionRef, type, data);
         sendNdjson(res, { ...payload, controlEvent });
     };
 }
@@ -4016,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);
@@ -4116,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
@@ -4159,7 +4161,7 @@ function buildSessionAudit(ctx, state, sessionRef) {
     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
     const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true })
         || createEmptyWebAgentSession(sessionRef.agentId);
-    const events = loadWebSessionControlEvents(state, sessionRef, agentSession.events);
+    const events = loadWebSessionControlEvents(state.webHistoryDir, sessionRef, agentSession.events);
     const applied = history.applied && typeof history.applied === 'object' && !Array.isArray(history.applied)
         ? history.applied
         : {};
@@ -4827,7 +4829,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
             method: 'GET',
             match: currentPath => currentPath === '/api/system/capacity' ? [] : null,
             handler: async () => {
-                const containerMap = listWebManyoyoContainers(ctx, state);
+                const containerMap = listWebManyoyoContainers(ctx);
                 const diskPath = path.dirname(path.resolve(state.webConfigPath));
                 const report = estimateContainerCapacity({
                     runtimeCommand: ctx.dockerCmd || 'docker',
@@ -4904,7 +4906,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
             method: 'GET',
             match: currentPath => currentPath === '/api/sessions' ? [] : null,
             handler: async () => {
-                const containerMap = listWebManyoyoContainers(ctx, state);
+                const containerMap = listWebManyoyoContainers(ctx);
                 const names = new Set([
                     ...Object.keys(containerMap),
                     ...listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName)
@@ -4917,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);
@@ -5302,7 +5304,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                const containerMap = listWebManyoyoContainers(ctx, state);
+                const containerMap = listWebManyoyoContainers(ctx);
                 const detail = buildSessionDetail(ctx, state, containerMap, sessionRef);
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail });
             }
@@ -5315,7 +5317,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 if (!sessionRef) {
                     return;
                 }
-                const containerMap = listWebManyoyoContainers(ctx, state);
+                const containerMap = listWebManyoyoContainers(ctx);
                 const containerInfo = containerMap[sessionRef.containerName] || {};
                 const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
                 const effectiveTemplate = resolveEffectiveAgentPromptCommandForSession(
@@ -5413,7 +5415,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                const containerMap = listWebManyoyoContainers(ctx, state);
+                const containerMap = listWebManyoyoContainers(ctx);
                 const detail = buildSessionDetail(ctx, state, containerMap, sessionRef);
                 sendJson(res, 200, {
                     saved: true,
@@ -5562,7 +5564,30 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     'Cache-Control': 'no-store',
                     'X-Accel-Buffering': 'no'
                 });
-                const emitStreamEvent = createWebStreamEmitter(res, state, 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,
@@ -5591,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
@@ -5602,29 +5628,35 @@ 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') {
                                     traceEvents.push(event.traceEvent);
                                 }
-                                if (shouldFlushLiveHistory(state, buildWebSessionKey(sessionRef.containerName, sessionRef.agentId))) {
-                                    patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
-                                        content: traceLines.join('\n'),
-                                        traceEvents: traceEvents.slice(),
-                                        pending: true
-                                    });
-                                }
+                                patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
+                                    content: traceLines.join('\n'),
+                                    traceEvents: traceEvents.slice(),
+                                    pending: true
+                                });
                             }
                             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,
@@ -5640,13 +5672,24 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                     streamingReplyMessageId = streamingReplyMessage && streamingReplyMessage.id
                                         ? streamingReplyMessage.id
                                         : '';
-                                } else if (shouldFlushLiveHistory(state, buildWebSessionKey(sessionRef.containerName, sessionRef.agentId))) {
+                                    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) : ''
@@ -5723,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();
                 }
             }
@@ -5743,7 +5787,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     sendJson(res, 404, { error: '当前会话没有运行中的 agent 任务' });
                     return;
                 }
-                appendWebSessionControlEvent(state, sessionRef, 'session.stopping');
+                appendWebSessionControlEvent(state.webHistoryDir, sessionRef, 'session.stopping');
                 sendJson(res, 200, { ok: true, stopping: true });
             }
         },
@@ -5762,7 +5806,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
 
                 if (removeHistory) {
                     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
-                    removeAllAgentHistoryArtifacts(state, sessionRef.containerName, Object.keys(history.agents || {}));
+                    removeAllAgentHistoryArtifacts(state.webHistoryDir, sessionRef.containerName, Object.keys(history.agents || {}));
                     removeWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
                 } else if (removedContainer) {
                     appendWebSessionMessage(state.webHistoryDir, sessionRef, 'system', `容器 ${sessionRef.containerName} 已删除。`);
@@ -5791,7 +5835,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 if (history.agents && typeof history.agents === 'object') {
                     if (removeHistory) {
                         delete history.agents[sessionRef.agentId];
-                        removeAllAgentHistoryArtifacts(state, sessionRef.containerName, [sessionRef.agentId]);
+                        removeAllAgentHistoryArtifacts(state.webHistoryDir, sessionRef.containerName, [sessionRef.agentId]);
                     } else if (history.agents[sessionRef.agentId]) {
                         history.agents[sessionRef.agentId].archived = true;
                         history.agents[sessionRef.agentId].updatedAt = new Date().toISOString();
@@ -5861,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: '',
@@ -5903,11 +5951,6 @@ async function startWebServer(options) {
         terminalSessions: new Map(),
         agentRuns: new Map()
     };
-    // 跨请求复用同一个 FileEventStore 实例，append() 的增量缓存才能生效
-    // （否则每次都 new 一个新实例，缓存永远命中不到）
-    state.eventStore = new FileEventStore(state.webHistoryDir);
-    // shouldFlushLiveHistory() 的节流状态：aggregateId -> 上次成功落盘的时间戳
-    state._liveHistoryFlushThrottle = new Map();
 
     ensureWebHistoryDir(state.webHistoryDir);
 

package/package.json

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