@xcanwin/manyoyo 7.0.13 → 7.0.16

package/lib/web/server.js

@@ -30,6 +30,82 @@ const {
     projectSessionEvents
 } = require('../core/events');
 const { FileEventStore } = require('../core/event-store');
+const { buildManyoyoLogPath, getLocalDateTag } = require('../log-path'); // DIAG_LOG
+
+// DIAG_LOG BEGIN：临时详细诊断日志基础设施，用于排查 serve 接口超时 / agent
+// 流式回复长时间卡在"…"不实时更新的问题。排查结束后可整体删除：全局搜索
+// "DIAG_LOG" 能定位到全部相关代码（这段辅助函数、各处打点调用、下方
+// /api/diag/logs 接口、/logs 页面路由），一并删掉不影响其它功能。
+const DIAG_LOG_LINE_PATTERN = /^\[([^\]]+)\] \[pid:(\d+)\] \[(\w+)\] \[DIAG_LOG\] (\S+)(?: ([\s\S]*))?$/;
+
+function diagLog(ctx, category, extra = {}) {
+    if (!ctx || !ctx.logger || typeof ctx.logger.info !== 'function') {
+        return;
+    }
+    ctx.logger.info(`[DIAG_LOG] ${String(category || '')}`, extra);
+}
+
+function parseDiagLogLine(line) {
+    const matched = String(line || '').match(DIAG_LOG_LINE_PATTERN);
+    if (!matched) {
+        return null;
+    }
+    let extra = {};
+    if (matched[5]) {
+        try {
+            extra = JSON.parse(matched[5]);
+        } catch (e) {
+            extra = { raw: matched[5] };
+        }
+    }
+    return {
+        ts: matched[1],
+        pid: Number(matched[2]),
+        level: matched[3],
+        category: matched[4],
+        extra
+    };
+}
+
+function diagLogDir(ctx) {
+    if (ctx && ctx.logger && typeof ctx.logger.path === 'string' && ctx.logger.path) {
+        return path.dirname(ctx.logger.path);
+    }
+    return buildManyoyoLogPath('serve').dir;
+}
+
+function readDiagLogEntries(ctx, options = {}) {
+    const dateTag = options.date ? String(options.date) : getLocalDateTag();
+    const filePath = path.join(diagLogDir(ctx), `serve-${dateTag}.log`);
+    if (!fs.existsSync(filePath)) {
+        return [];
+    }
+    const limit = Number.isInteger(options.limit) && options.limit > 0 ? Math.min(options.limit, 2000) : 500;
+    const category = options.category ? String(options.category) : '';
+    const session = options.session ? String(options.session) : '';
+    const keyword = options.keyword ? String(options.keyword).toLowerCase() : '';
+
+    const lines = fs.readFileSync(filePath, 'utf-8').split('\n');
+    const entries = [];
+    for (const line of lines) {
+        const entry = parseDiagLogLine(line);
+        if (!entry) {
+            continue;
+        }
+        if (category && entry.category !== category) {
+            continue;
+        }
+        if (session && entry.extra.session !== session) {
+            continue;
+        }
+        if (keyword && !line.toLowerCase().includes(keyword)) {
+            continue;
+        }
+        entries.push(entry);
+    }
+    return entries.slice(-limit);
+}
+// DIAG_LOG END（下方还有零散打点调用与 /api/diag/logs、/logs 路由，同样标记为 DIAG_LOG）
 
 const WEB_HISTORY_MAX_MESSAGES = 500;
 const WEB_OUTPUT_MAX_CHARS = 16000;
@@ -2068,7 +2144,7 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
 
 function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, meta, result) {
     const turnUsage = extractTurnUsage(agentMeta.agentProgram, result.stdout);
-    appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
+    const replyMessage = appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
         exitCode: result.exitCode,
         mode: 'agent',
         contextMode: meta.contextMode,
@@ -2090,6 +2166,7 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
         patch.usageTotal = accumulateUsageTotal(agentSession.usageTotal, turnUsage);
     }
     patchWebAgentSessionState(state.webHistoryDir, sessionRef, patch);
+    return replyMessage;
 }
 
 function appendWebAgentTraceMessage(webHistoryDir, sessionRefOrContainerName, content, extra = {}) {
@@ -3088,6 +3165,7 @@ function listWebManyoyoContainers(ctx) {
         return map;
     }
 
+    const candidates = [];
     output.trim().split('\n').forEach(line => {
         const [name, status, image] = line.split('\t');
         if (!ctx.isValidContainerName(name)) {
@@ -3097,23 +3175,46 @@ function listWebManyoyoContainers(ctx) {
         if (!imageName.includes('manyoyo') && !name.startsWith('manyoyo-') && !name.startsWith('my-')) {
             return;
         }
-        let defaultCommand = '';
+        candidates.push({ name, status, imageName });
+    });
+
+    // 逐容器单独 docker inspect 是 N+1 同步阻塞调用（spawnSync 无 timeout，会
+    // 独占 Node 单线程事件循环）；容器一多，serve 所有接口（包括正在流式输出
+    // 的 agent/stream）都会被拖慢甚至冻结。这里合并成一次批量 inspect。
+    const defaultCommandByName = {};
+    if (candidates.length) {
+        let inspectOutput = '';
         try {
-            defaultCommand = String(
+            inspectOutput = String(
                 ctx.dockerExecArgs(
-                    ['inspect', '-f', '{{index .Config.Labels "manyoyo.default_cmd"}}', name],
+                    [
+                        'inspect',
+                        '-f',
+                        '{{.Name}}\t{{index .Config.Labels "manyoyo.default_cmd"}}',
+                        ...candidates.map(c => c.name)
+                    ],
                     { ignoreError: true }
                 ) || ''
-            ).trim();
+            );
         } catch (e) {
-            defaultCommand = '';
+            inspectOutput = '';
         }
+        inspectOutput.split('\n').forEach(line => {
+            const [rawName, defaultCommand] = line.split('\t');
+            if (!rawName) {
+                return;
+            }
+            defaultCommandByName[rawName.replace(/^\//, '')] = (defaultCommand || '').trim();
+        });
+    }
+
+    candidates.forEach(({ name, status, imageName }) => {
         map[name] = {
             name,
             status: status || 'unknown',
             image: imageName,
             createdAt: estimateStartTimeFromStatus(status),
-            defaultCommand
+            defaultCommand: defaultCommandByName[name] || ''
         };
     });
 
@@ -3799,11 +3900,37 @@ function stopWebAgentRun(state, containerName) {
     try {
         runState.process.kill('SIGTERM');
     } catch (e) {
-        return false;
+        // 进程可能已自行退出，视为停止成功（close 事件会收尾）
     }
     return true;
 }
 
+// serve 重启等原因会丢失 agentRuns 运行登记，但消息里可能残留 pending 标记
+// （孤儿任务：容器里的进程或许还在跑，但再没有任何代码会去收尾这些消息）。
+// 前端把 pending 视为"任务进行中"会永久禁用输入，这里把它们标记为已中断
+function interruptOrphanPendingMessages(webHistoryDir, sessionRef) {
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true });
+    if (!agentSession || !Array.isArray(agentSession.messages)) {
+        return;
+    }
+    let touched = false;
+    for (const message of agentSession.messages) {
+        if (message && message.pending === true) {
+            message.pending = false;
+            message.interrupted = true;
+            touched = true;
+        }
+    }
+    if (!touched) {
+        return;
+    }
+    const timestamp = new Date().toISOString();
+    agentSession.updatedAt = timestamp;
+    history.updatedAt = timestamp;
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+}
+
 function sendHtml(res, statusCode, html, extraHeaders = {}) {
     res.writeHead(statusCode, {
         'Content-Type': 'text/html; charset=utf-8',
@@ -4117,6 +4244,123 @@ function renderLoginHtml(ctx) {
     return applyServeTitle(loadTemplate('login.html'), ctx);
 }
 
+// DIAG_LOG：临时诊断日志查看页，自成一个内联 HTML 字符串（不接入 frontend-shadcn
+// 构建流程），配合 /api/diag/logs 接口使用。排查结束后可整体删除本函数及其
+// 调用点（全局搜索 "DIAG_LOG"）。
+function renderDiagLogsHtml() {
+    return `<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<title>MANYOYO 诊断日志</title>
+<style>
+  body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; background: #0b0d12; color: #d7dae0; }
+  header { padding: 12px 16px; display: flex; gap: 8px; flex-wrap: wrap; align-items: center; border-bottom: 1px solid #262b36; position: sticky; top: 0; background: #0b0d12; }
+  header input, header select { background: #171a21; border: 1px solid #2c313d; color: #d7dae0; padding: 5px 8px; border-radius: 4px; font-size: 13px; }
+  header button { background: #2b6cb0; border: none; color: #fff; padding: 6px 12px; border-radius: 4px; cursor: pointer; font-size: 13px; }
+  header button.secondary { background: #2c313d; }
+  header label { font-size: 12px; display: flex; align-items: center; gap: 4px; }
+  main { padding: 8px 16px 40px; }
+  table { width: 100%; border-collapse: collapse; font-size: 12px; }
+  th, td { text-align: left; padding: 4px 8px; border-bottom: 1px solid #1c202a; vertical-align: top; white-space: pre-wrap; word-break: break-all; }
+  th { position: sticky; top: 53px; background: #0b0d12; color: #8b93a3; font-weight: 600; }
+  tr:hover { background: #12151c; }
+  .cat { display: inline-block; padding: 1px 6px; border-radius: 3px; background: #1e2530; color: #8fd3ff; }
+  .status-ok { color: #7ee787; }
+  .status-err { color: #ff7b72; }
+  .dur-slow { color: #ffa657; font-weight: 600; }
+  #count { color: #8b93a3; font-size: 12px; }
+</style>
+</head>
+<body>
+<header>
+  <strong>诊断日志</strong>
+  <label>日期 <input id="f-date" type="text" placeholder="YYYY-MM-DD"></label>
+  <label>分类 <input id="f-category" type="text" placeholder="http_request / docker_exec / stream_event / stream_exec_start / stream_exec_end"></label>
+  <label>会话 <input id="f-session" type="text" placeholder="containerName 或 containerName~agentId"></label>
+  <label>关键字 <input id="f-keyword" type="text" placeholder="任意文本"></label>
+  <label>条数 <input id="f-limit" type="text" value="500" style="width:60px"></label>
+  <button id="btn-refresh">刷新</button>
+  <label><input id="f-auto" type="checkbox"> 每 2 秒自动刷新</label>
+  <span id="count"></span>
+</header>
+<main>
+  <table>
+    <thead><tr><th>时间</th><th>分类</th><th>详情</th></tr></thead>
+    <tbody id="rows"></tbody>
+  </table>
+</main>
+<script>
+(function () {
+  var timer = null;
+  function fmtExtra(entry) {
+    var e = entry.extra || {};
+    var parts = [];
+    if (e.method) parts.push(e.method + ' ' + (e.path || ''));
+    if (typeof e.status === 'number') {
+      parts.push('<span class="' + (e.status < 400 ? 'status-ok' : 'status-err') + '">status=' + e.status + '</span>');
+    }
+    if (typeof e.durationMs === 'number') {
+      parts.push('<span class="' + (e.durationMs > 1000 ? 'dur-slow' : '') + '">' + e.durationMs + 'ms</span>');
+    }
+    if (e.session) parts.push('session=' + e.session);
+    if (e.args) parts.push('args=' + JSON.stringify(e.args));
+    if (e.type) parts.push('type=' + e.type);
+    if (typeof e.seq === 'number') parts.push('seq=' + e.seq);
+    if (typeof e.sinceStartMs === 'number') parts.push('sinceStart=' + e.sinceStartMs + 'ms');
+    if (typeof e.totalDurationMs === 'number') parts.push('total=' + e.totalDurationMs + 'ms');
+    if (typeof e.eventCount === 'number') parts.push('events=' + e.eventCount);
+    if (e.error) parts.push('<span class="status-err">error=' + e.error + '</span>');
+    var rest = {};
+    Object.keys(e).forEach(function (k) {
+      if (['method','path','status','durationMs','session','args','type','seq','sinceStartMs','totalDurationMs','eventCount','error'].indexOf(k) === -1) {
+        rest[k] = e[k];
+      }
+    });
+    if (Object.keys(rest).length) parts.push(JSON.stringify(rest));
+    return parts.join('  ');
+  }
+  function escapeHtml(s) {
+    return String(s == null ? '' : s).replace(/[&<>"']/g, function (c) {
+      return { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c];
+    });
+  }
+  function load() {
+    var params = new URLSearchParams();
+    var date = document.getElementById('f-date').value.trim();
+    var category = document.getElementById('f-category').value.trim();
+    var session = document.getElementById('f-session').value.trim();
+    var keyword = document.getElementById('f-keyword').value.trim();
+    var limit = document.getElementById('f-limit').value.trim();
+    if (date) params.set('date', date);
+    if (category) params.set('category', category);
+    if (session) params.set('session', session);
+    if (keyword) params.set('keyword', keyword);
+    if (limit) params.set('limit', limit);
+    fetch('/api/diag/logs?' + params.toString(), { headers: { 'X-Requested-With': 'XMLHttpRequest' } })
+      .then(function (r) { return r.json(); })
+      .then(function (data) {
+        var entries = data.entries || [];
+        document.getElementById('count').textContent = entries.length + ' 条（' + data.date + '）';
+        var rows = entries.slice().reverse().map(function (entry) {
+          return '<tr><td>' + escapeHtml(entry.ts) + '</td><td><span class="cat">' + escapeHtml(entry.category) + '</span></td><td>' + fmtExtra(entry) + '</td></tr>';
+        });
+        document.getElementById('rows').innerHTML = rows.join('');
+      });
+  }
+  document.getElementById('btn-refresh').addEventListener('click', load);
+  document.getElementById('f-auto').addEventListener('change', function (e) {
+    if (timer) { clearInterval(timer); timer = null; }
+    if (e.target.checked) { timer = setInterval(load, 2000); }
+  });
+  load();
+})();
+</script>
+</body>
+</html>
+`;
+}
+
 function toPositiveInt(value, fallback) {
     const parsed = Number.parseInt(value, 10);
     if (!Number.isFinite(parsed) || parsed <= 0) {
@@ -4410,6 +4654,23 @@ async function handleWebApi(req, res, pathname, ctx, state) {
         }
     }
     const routes = [
+        // DIAG_LOG：临时诊断日志查询接口，配合 /logs 页面使用，排查完成后与
+        // diagLog/readDiagLogEntries 一起整体删除即可（全局搜索 "DIAG_LOG"）。
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/diag/logs' ? [] : null,
+            handler: async () => {
+                const requestUrl = new URL(req.url || '/api/diag/logs', 'http://localhost');
+                const entries = readDiagLogEntries(ctx, {
+                    date: requestUrl.searchParams.get('date') || undefined,
+                    category: requestUrl.searchParams.get('category') || undefined,
+                    session: requestUrl.searchParams.get('session') || undefined,
+                    keyword: requestUrl.searchParams.get('keyword') || undefined,
+                    limit: Number(requestUrl.searchParams.get('limit')) || undefined
+                });
+                sendJson(res, 200, { date: requestUrl.searchParams.get('date') || getLocalDateTag(), entries });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath === '/api/fs/directories' ? [] : null,
@@ -5212,7 +5473,8 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
                 if (state.agentRuns.has(sessionRef.containerName)) {
-                    sendJson(res, 409, { error: '当前会话已有运行中的 agent 任务' });
+                    // 锁是容器级的：同一容器里其他 agent 会话在跑任务时同样命中这里
+                    sendJson(res, 409, { error: '当前容器已有运行中的 agent 任务，请等它结束或先停止' });
                     return;
                 }
 
@@ -5259,6 +5521,10 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     type: 'meta',
                     containerName: sessionRef.containerName,
                     sessionName: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    // 前端用这两个 id 把本地乐观占位（local-* / __streaming_trace__）换成
+                    // 服务端持久化 id，轮询对账时 React key 才能对得上、DOM 不整体重建
+                    userMessageId: userMessage && userMessage.id,
+                    traceMessageId: traceMessage && traceMessage.id,
                     contextMode,
                     resumeAttempted,
                     resumeSucceeded,
@@ -5279,10 +5545,26 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     pending: true
                 });
 
+                const diagStreamStartedAt = Date.now(); // DIAG_LOG
+                let diagEventSeq = 0; // DIAG_LOG
+                diagLog(ctx, 'stream_exec_start', { // DIAG_LOG
+                    session: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    agentProgram: agentMeta.agentProgram,
+                    command
+                });
                 try {
                     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
+                            });
                             if (event && event.type === 'trace' && event.text) {
                                 traceLines.push(String(event.text));
                                 if (event.traceEvent && typeof event.traceEvent === 'object') {
@@ -5323,6 +5605,13 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                             });
                         }
                     });
+                    diagLog(ctx, 'stream_exec_end', { // DIAG_LOG
+                        session: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                        totalDurationMs: Date.now() - diagStreamStartedAt,
+                        eventCount: diagEventSeq,
+                        interrupted: result.interrupted === true,
+                        exitCode: result.exitCode
+                    });
                     traceLines.push(result.interrupted === true ? '[任务] 已停止' : '[任务] 已完成');
                     patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
                         pending: false,
@@ -5342,7 +5631,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     if (streamingReplyMessageId) {
                         removeWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId);
                     }
-                    finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, {
+                    const replyMessage = finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, {
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
@@ -5353,6 +5642,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         type: 'result',
                         exitCode: result.exitCode,
                         output: result.output,
+                        // 最终 assistant 消息的持久化 id：前端把 __streaming__ 占位换成它，
+                        // 发送后的首次对账才不会重建整个消息列表 DOM（滚动位置/选区保持）
+                        replyMessageId: replyMessage && replyMessage.id,
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
@@ -5397,6 +5689,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
                 const stopped = stopWebAgentRun(state, sessionRef.containerName);
                 if (!stopped) {
+                    // 运行登记不存在（serve 重启后常见的孤儿任务）：把残留的
+                    // pending 消息标记为已中断，否则前端会因 pending 永久禁用输入
+                    interruptOrphanPendingMessages(state.webHistoryDir, sessionRef);
                     sendJson(res, 404, { error: '当前会话没有运行中的 agent 任务' });
                     return;
                 }
@@ -5530,6 +5825,29 @@ async function startWebServer(options) {
         throw new Error('Web 认证配置缺失，请设置 serve -U / serve -P');
     }
 
+    // DIAG_LOG：包一层记录每次 docker/podman 子进程调用的参数与耗时，覆盖
+    // listWebManyoyoContainers、ensureWebContainer 等所有经由 ctx.dockerExecArgs
+    // 发起的调用，不需要逐个调用点单独打点。
+    if (typeof ctx.dockerExecArgs === 'function') {
+        const rawDockerExecArgs = ctx.dockerExecArgs;
+        ctx.dockerExecArgs = (args, execOptions) => {
+            const startedAt = Date.now();
+            let errorMessage = '';
+            try {
+                return rawDockerExecArgs(args, execOptions);
+            } catch (e) {
+                errorMessage = e && e.message ? e.message : String(e);
+                throw e;
+            } finally {
+                diagLog(ctx, 'docker_exec', {
+                    args: Array.isArray(args) ? args : [],
+                    durationMs: Date.now() - startedAt,
+                    error: errorMessage || undefined
+                });
+            }
+        };
+    }
+
     const state = {
         webHistoryDir: options.webHistoryDir || path.join(os.homedir(), '.manyoyo', 'web-history'),
         webConfigPath: options.webConfigPath || getDefaultWebConfigPath(),
@@ -5559,6 +5877,20 @@ async function startWebServer(options) {
     });
 
     const server = http.createServer(async (req, res) => {
+        // DIAG_LOG：记录每个 HTTP 请求从进入到响应完成（含长连接的 agent/stream，
+        // 'finish' 在 chunked 响应整体结束时才触发）的方法/路径/状态码/耗时。
+        const diagRequestStartedAt = Date.now();
+        res.on('finish', () => {
+            const rawPath = String(req.url || '').split('?')[0];
+            const sessionMatch = rawPath.match(/^\/api\/sessions\/([^/]+)/);
+            diagLog(ctx, 'http_request', {
+                method: req.method,
+                path: rawPath,
+                status: res.statusCode,
+                durationMs: Date.now() - diagRequestStartedAt,
+                session: sessionMatch ? decodeURIComponent(sessionMatch[1]) : undefined
+            });
+        });
         try {
             const fallbackHost = `${formatUrlHost(ctx.serverHost)}:${ctx.serverPort}`;
             const url = new URL(req.url, `http://${req.headers.host || fallbackHost}`);
@@ -5593,6 +5925,13 @@ async function startWebServer(options) {
                 return;
             }
 
+            // DIAG_LOG：临时诊断日志查看页，排查完成后与 renderDiagLogsHtml、
+            // /api/diag/logs 一起整体删除即可（全局搜索 "DIAG_LOG"）。
+            if (req.method === 'GET' && pathname === '/logs') {
+                sendHtml(res, 200, renderDiagLogsHtml());
+                return;
+            }
+
             const appFrontendMatch = pathname.match(/^\/app\/frontend\/([A-Za-z0-9._-]+)$/);
             if (req.method === 'GET' && appFrontendMatch) {
                 const assetName = appFrontendMatch[1];

package/package.json

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