@xcanwin/manyoyo 7.0.21 → 7.0.24

package/lib/web/server.js

@@ -30,6 +30,8 @@ const {
     projectSessionEvents
 } = require('../core/events');
 const { FileEventStore } = require('../core/event-store');
+const { buildManyoyoLogPath, getLocalDateTag } = require('../log-path');
+const { isValidLogDateTag, readServeLogEntries } = require('../serve-log-reader');
 
 
 const WEB_HISTORY_MAX_MESSAGES = 500;
@@ -4572,6 +4574,33 @@ function sendWebUnauthorized(res, pathname, ctx) {
     );
 }
 
+// 运行日志查看接口的支撑函数。日志目录以 serve 实际使用的 logger.path 为准，
+// 拿不到时退回 ~/.manyoyo/logs/serve/ 的默认规则
+function resolveServeLogDir(ctx) {
+    if (ctx && ctx.logger && typeof ctx.logger.path === 'string' && ctx.logger.path) {
+        return path.dirname(ctx.logger.path);
+    }
+    return buildManyoyoLogPath('serve').dir;
+}
+
+function listServeLogDates(ctx) {
+    const dir = resolveServeLogDir(ctx);
+    let names = [];
+    try {
+        names = fs.readdirSync(dir);
+    } catch (e) {
+        return [];
+    }
+    return names
+        .map(name => {
+            const matched = String(name).match(/^serve-(\d{4}-\d{2}-\d{2})\.log$/);
+            return matched ? matched[1] : '';
+        })
+        .filter(Boolean)
+        .sort()
+        .reverse();
+}
+
 async function handleWebApi(req, res, pathname, ctx, state) {
     // [P2-03] 对非只读请求校验自定义头，防止 CSRF 攻击
     // 跨站请求无法设置自定义头（浏览器同源策略），合法前端请求统一携带此头
@@ -4582,6 +4611,48 @@ async function handleWebApi(req, res, pathname, ctx, state) {
         }
     }
     const routes = [
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/logs/dates' ? [] : null,
+            handler: async () => {
+                sendJson(res, 200, { dates: listServeLogDates(ctx) });
+            }
+        },
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/logs' ? [] : null,
+            handler: async () => {
+                const requestUrl = new URL(req.url || '/api/logs', 'http://localhost');
+                const rawDate = requestUrl.searchParams.get('date') || '';
+                // date 会拼进文件名，必须白名单校验，否则能拼出目录穿越
+                if (rawDate && !isValidLogDateTag(rawDate)) {
+                    sendJson(res, 400, { error: 'date 必须是 YYYY-MM-DD' });
+                    return;
+                }
+                const date = rawDate || getLocalDateTag();
+                const levelParam = (requestUrl.searchParams.get('level') || '').trim();
+                const levels = levelParam
+                    ? levelParam.split(',').map(item => item.trim().toUpperCase()).filter(Boolean)
+                    : [];
+                const endOffsetParam = requestUrl.searchParams.get('endOffset');
+                const result = readServeLogEntries(
+                    path.join(resolveServeLogDir(ctx), `serve-${date}.log`),
+                    {
+                        limit: Number(requestUrl.searchParams.get('limit')) || undefined,
+                        endOffset: endOffsetParam === null ? undefined : Number(endOffsetParam),
+                        levels,
+                        keyword: requestUrl.searchParams.get('keyword') || '',
+                        session: requestUrl.searchParams.get('session') || ''
+                    }
+                );
+                sendJson(res, 200, {
+                    date,
+                    entries: result.entries,
+                    nextEndOffset: result.nextEndOffset,
+                    limit: result.limit
+                });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath === '/api/fs/directories' ? [] : null,
@@ -5430,6 +5501,31 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     'Cache-Control': 'no-store',
                     'X-Accel-Buffering': 'no'
                 });
+                // agent 流的生命周期日志：每轮最多三条（开始 / 客户端断开 / 结束），
+                // 不是逐事件打点。没有这几条的话，用户报"跑到一半断流了"时服务端
+                // 日志里查不到任何痕迹——断连本身只发生在客户端侧，服务端不主动感知
+                const turnStartedAt = Date.now();
+                const turnSessionKey = buildWebSessionKey(sessionRef.containerName, sessionRef.agentId);
+                ctx.logger.info('agent turn started', {
+                    session: turnSessionKey,
+                    agentProgram: agentMeta.agentProgram,
+                    contextMode,
+                    resumeAttempted,
+                    resumeSucceeded
+                });
+                // 'close' 先于 'finish' 触发且 writableFinished 仍为 false，说明是
+                // 客户端/反代把连接掐了，而不是我们正常收尾。此时容器里的任务还在跑，
+                // 前端会转入恢复轮询——日志要把这个区别写清楚，否则事后无法归因
+                res.on('close', () => {
+                    if (res.writableFinished) {
+                        return;
+                    }
+                    ctx.logger.warn('agent stream client disconnected', {
+                        session: turnSessionKey,
+                        elapsedMs: Date.now() - turnStartedAt,
+                        runContinues: state.agentRuns.has(sessionRef.containerName)
+                    });
+                });
                 // agent 可能几十秒不产生任何输出（长 WebSearch、长 Bash、长思考），
                 // 而反向代理按"上游多久没发字节"计空闲超时（nginx proxy_read_timeout
                 // 默认 60s），超时会 RST 掉这条流，浏览器侧抛 network error。这里定期
@@ -5546,6 +5642,12 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                             });
                         }
                     });
+                    ctx.logger.info('agent turn finished', {
+                        session: turnSessionKey,
+                        durationMs: Date.now() - turnStartedAt,
+                        exitCode: result.exitCode,
+                        interrupted: result.interrupted === true
+                    });
                     traceLines.push(result.interrupted === true ? '[任务] 已停止' : '[任务] 已完成');
                     patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
                         pending: false,
@@ -5585,6 +5687,11 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         interrupted: result.interrupted === true
                     }, result.interrupted === true ? 'process.interrupted' : 'process.exited', { exitCode: result.exitCode });
                 } catch (e) {
+                    ctx.logger.error('agent turn failed', {
+                        session: turnSessionKey,
+                        durationMs: Date.now() - turnStartedAt,
+                        message: e && e.message ? e.message : 'Agent 执行失败'
+                    });
                     traceLines.push(`[错误] ${e && e.message ? e.message : 'Agent 执行失败'}`);
                     patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
                         pending: false,

package/package.json

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