@xcanwin/manyoyo 7.0.16 → 7.0.18

package/lib/web/server.js

@@ -462,10 +462,9 @@ function removeContainerIdempotent(ctx, containerName) {
     }
 }
 
-function removeAllAgentHistoryArtifacts(webHistoryDir, containerName, agentIds) {
-    const eventStore = new FileEventStore(webHistoryDir);
+function removeAllAgentHistoryArtifacts(state, containerName, agentIds) {
     (Array.isArray(agentIds) ? agentIds : []).forEach(agentId => {
-        eventStore.remove(buildWebSessionKey(containerName, agentId));
+        state.eventStore.remove(buildWebSessionKey(containerName, agentId));
     });
 }
 
@@ -623,29 +622,57 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
     return message;
 }
 
-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;
+// 流式过程中高频出现的"透传"控制事件类型（见 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 必须连续递增"报错。
     const event = createControlEvent({
         type,
-        aggregateId: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
-        seq: lastEvent ? lastEvent.seq + 1 : 1,
+        aggregateId,
+        seq: state.eventStore.getNextSeq(aggregateId),
         data
     });
-    const eventStore = new FileEventStore(webHistoryDir);
-    eventStore.append(event);
+    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 : [];
     agentSession.events = [...events, event].slice(-WEB_HISTORY_MAX_MESSAGES);
     agentSession.updatedAt = event.timestamp;
     history.updatedAt = event.timestamp;
-    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+    if (!NOISY_CONTROL_EVENT_TYPES.has(type) || shouldFlushLiveHistory(state, aggregateId)) {
+        saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
+    }
     return event;
 }
 
-function loadWebSessionControlEvents(webHistoryDir, sessionRef, fallbackEvents = []) {
+function loadWebSessionControlEvents(state, sessionRef, fallbackEvents = []) {
     try {
-        const events = new FileEventStore(webHistoryDir).read(
+        const events = state.eventStore.read(
             buildWebSessionKey(sessionRef.containerName, sessionRef.agentId)
         );
         if (events.length) {
@@ -2069,7 +2096,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);
+    const containerMap = listWebManyoyoContainers(ctx, state);
     const containerInfo = containerMap[sessionRef.containerName] || {};
     const normalizedContainerTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
     if (normalizedContainerTemplate !== history.agentPromptCommand) {
@@ -3009,7 +3036,7 @@ function buildCreateRuntime(ctx, state, payload) {
 }
 
 function resolveUniqueContainerName(ctx, state, baseName) {
-    const containerMap = listWebManyoyoContainers(ctx);
+    const containerMap = listWebManyoyoContainers(ctx, state);
     const historyNames = listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName);
     const taken = new Set([...Object.keys(containerMap), ...historyNames]);
     // 基于历史最大编号 +1 命名，即使较小编号的副本被删除也不回收其编号，
@@ -3090,7 +3117,7 @@ async function createClonedContainer(ctx, state, sourceContainerName, requestedN
     let finalName = '';
     if (requestedName) {
         validateContainerNameStrict(requestedName);
-        const containerMap = listWebManyoyoContainers(ctx);
+        const containerMap = listWebManyoyoContainers(ctx, state);
         const historyNames = listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName);
         const taken = new Set([...Object.keys(containerMap), ...historyNames]);
         if (taken.has(requestedName)) {
@@ -3154,7 +3181,20 @@ function estimateStartTimeFromStatus(status) {
     return null;
 }
 
-function listWebManyoyoContainers(ctx) {
+// 同一进程内短 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;
+        }
+    }
+
     const output = ctx.dockerExecArgs(
         ['ps', '-a', '--format', '{{.Names}}\t{{.Status}}\t{{.Image}}'],
         { ignoreError: true }
@@ -3162,6 +3202,9 @@ function listWebManyoyoContainers(ctx) {
 
     const map = {};
     if (!output.trim()) {
+        if (state) {
+            state._containerListCache = { timestamp: Date.now(), data: map };
+        }
         return map;
     }
 
@@ -3218,6 +3261,9 @@ function listWebManyoyoContainers(ctx) {
         };
     });
 
+    if (state) {
+        state._containerListCache = { timestamp: Date.now(), data: map };
+    }
     return map;
 }
 
@@ -3874,9 +3920,9 @@ function sendNdjson(res, payload) {
     res.write(`${JSON.stringify(payload)}\n`);
 }
 
-function createWebStreamEmitter(res, webHistoryDir, sessionRef) {
+function createWebStreamEmitter(res, state, sessionRef) {
     return (payload, type, data = {}) => {
-        const controlEvent = appendWebSessionControlEvent(webHistoryDir, sessionRef, type, data);
+        const controlEvent = appendWebSessionControlEvent(state, sessionRef, type, data);
         sendNdjson(res, { ...payload, controlEvent });
     };
 }
@@ -4113,7 +4159,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.webHistoryDir, sessionRef, agentSession.events);
+    const events = loadWebSessionControlEvents(state, sessionRef, agentSession.events);
     const applied = history.applied && typeof history.applied === 'object' && !Array.isArray(history.applied)
         ? history.applied
         : {};
@@ -4781,7 +4827,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
             method: 'GET',
             match: currentPath => currentPath === '/api/system/capacity' ? [] : null,
             handler: async () => {
-                const containerMap = listWebManyoyoContainers(ctx);
+                const containerMap = listWebManyoyoContainers(ctx, state);
                 const diskPath = path.dirname(path.resolve(state.webConfigPath));
                 const report = estimateContainerCapacity({
                     runtimeCommand: ctx.dockerCmd || 'docker',
@@ -4858,7 +4904,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
             method: 'GET',
             match: currentPath => currentPath === '/api/sessions' ? [] : null,
             handler: async () => {
-                const containerMap = listWebManyoyoContainers(ctx);
+                const containerMap = listWebManyoyoContainers(ctx, state);
                 const names = new Set([
                     ...Object.keys(containerMap),
                     ...listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName)
@@ -5256,7 +5302,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                const containerMap = listWebManyoyoContainers(ctx);
+                const containerMap = listWebManyoyoContainers(ctx, state);
                 const detail = buildSessionDetail(ctx, state, containerMap, sessionRef);
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail });
             }
@@ -5269,7 +5315,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 if (!sessionRef) {
                     return;
                 }
-                const containerMap = listWebManyoyoContainers(ctx);
+                const containerMap = listWebManyoyoContainers(ctx, state);
                 const containerInfo = containerMap[sessionRef.containerName] || {};
                 const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
                 const effectiveTemplate = resolveEffectiveAgentPromptCommandForSession(
@@ -5367,7 +5413,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                const containerMap = listWebManyoyoContainers(ctx);
+                const containerMap = listWebManyoyoContainers(ctx, state);
                 const detail = buildSessionDetail(ctx, state, containerMap, sessionRef);
                 sendJson(res, 200, {
                     saved: true,
@@ -5516,7 +5562,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     'Cache-Control': 'no-store',
                     'X-Accel-Buffering': 'no'
                 });
-                const emitStreamEvent = createWebStreamEmitter(res, state.webHistoryDir, sessionRef);
+                const emitStreamEvent = createWebStreamEmitter(res, state, sessionRef);
                 emitStreamEvent({
                     type: 'meta',
                     containerName: sessionRef.containerName,
@@ -5570,11 +5616,13 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                 if (event.traceEvent && typeof event.traceEvent === 'object') {
                                     traceEvents.push(event.traceEvent);
                                 }
-                                patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
-                                    content: traceLines.join('\n'),
-                                    traceEvents: traceEvents.slice(),
-                                    pending: true
-                                });
+                                if (shouldFlushLiveHistory(state, buildWebSessionKey(sessionRef.containerName, sessionRef.agentId))) {
+                                    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') {
                                 if (!streamingReplyMessageId) {
@@ -5592,7 +5640,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                     streamingReplyMessageId = streamingReplyMessage && streamingReplyMessage.id
                                         ? streamingReplyMessage.id
                                         : '';
-                                } else {
+                                } else if (shouldFlushLiveHistory(state, buildWebSessionKey(sessionRef.containerName, sessionRef.agentId))) {
                                     patchWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId, {
                                         content: event.content,
                                         pending: true
@@ -5695,7 +5743,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     sendJson(res, 404, { error: '当前会话没有运行中的 agent 任务' });
                     return;
                 }
-                appendWebSessionControlEvent(state.webHistoryDir, sessionRef, 'session.stopping');
+                appendWebSessionControlEvent(state, sessionRef, 'session.stopping');
                 sendJson(res, 200, { ok: true, stopping: true });
             }
         },
@@ -5714,7 +5762,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
 
                 if (removeHistory) {
                     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
-                    removeAllAgentHistoryArtifacts(state.webHistoryDir, sessionRef.containerName, Object.keys(history.agents || {}));
+                    removeAllAgentHistoryArtifacts(state, sessionRef.containerName, Object.keys(history.agents || {}));
                     removeWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
                 } else if (removedContainer) {
                     appendWebSessionMessage(state.webHistoryDir, sessionRef, 'system', `容器 ${sessionRef.containerName} 已删除。`);
@@ -5743,7 +5791,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.webHistoryDir, sessionRef.containerName, [sessionRef.agentId]);
+                        removeAllAgentHistoryArtifacts(state, sessionRef.containerName, [sessionRef.agentId]);
                     } else if (history.agents[sessionRef.agentId]) {
                         history.agents[sessionRef.agentId].archived = true;
                         history.agents[sessionRef.agentId].updatedAt = new Date().toISOString();
@@ -5855,6 +5903,11 @@ 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.16",
+    "version": "7.0.18",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",