@xcanwin/manyoyo 7.0.20 → 7.0.23

package/lib/web/server.js

@@ -30,82 +30,7 @@ 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;
@@ -2755,11 +2680,26 @@ function parseAndValidateConfigRaw(raw) {
     return config;
 }
 
+// 新建容器对话框会拿 defaults.hostPath 做预填，但 validateHostPath 明确拒绝
+// 根目录 / /home / $HOME。serve 以 $HOME 启动（root 用户下就是 /root）时，
+// 预填的值必定创建失败——这里直接留空，逼用户用"选择"选一个真实工作目录
+function sanitizeDefaultHostPath(hostPath) {
+    const value = String(hostPath || '').trim();
+    if (!value) {
+        return '';
+    }
+    const homeDir = process.env.HOME || os.homedir() || '/home';
+    if (value === '/' || value === '/home' || value === homeDir) {
+        return '';
+    }
+    return value;
+}
+
 function buildConfigDefaults(ctx, config) {
     const parsed = toPlainObject(config);
     const defaults = {
         containerName: hasOwn(parsed, 'containerName') ? String(parsed.containerName || '') : '',
-        hostPath: pickFirstString(parsed.hostPath, ctx.hostPath),
+        hostPath: sanitizeDefaultHostPath(pickFirstString(parsed.hostPath, ctx.hostPath)),
         containerPath: pickFirstString(parsed.containerPath, ctx.containerPath),
         imageName: pickFirstString(parsed.imageName, ctx.imageName),
         imageVersion: pickFirstString(parsed.imageVersion, ctx.imageVersion),
@@ -3216,8 +3156,11 @@ function listWebManyoyoContainers(ctx) {
     });
 
     // 逐容器单独 docker inspect 是 N+1 同步阻塞调用（spawnSync 无 timeout，会
-    // 独占 Node 单线程事件循环）；容器一多，serve 所有接口（包括正在流式输出
-    // 的 agent/stream）都会被拖慢甚至冻结。这里合并成一次批量 inspect。
+    // 独占 Node 单线程事件循环），这里合并成一次批量 inspect。
+    // 注意：31 个容器实测 `ps -a` 约 40ms、批量 `inspect` 约 45ms，容器运行时调用
+    // 并不是 GET /api/sessions 慢的原因——真正的开销在逐容器同步读取并解析整份
+    // 历史 JSON（见 buildSessionSummary 的 preloadedHistory 注释）。排查这条路径
+    // 变慢时别先怀疑 docker/podman。
     const defaultCommandByName = {};
     if (candidates.length) {
         let inspectOutput = '';
@@ -3712,24 +3655,38 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
     const sessionRef = typeof sessionRefOrContainerName === 'string'
         ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
         : sessionRefOrContainerName;
-    const sessionKey = buildWebSessionKey(sessionRef.containerName, sessionRef.agentId);
     const agentProgram = typeof opts.agentProgram === 'string' ? opts.agentProgram : '';
     const onEvent = typeof opts.onEvent === 'function' ? opts.onEvent : () => {};
-    const process = spawn(
-        ctx.dockerCmd,
-        ['exec', sessionRef.containerName, '/bin/bash', '-lc', command],
-        { stdio: ['ignore', 'pipe', 'pipe'] }
-    );
+    // 调用方可能已经在路由入口占过锁（见 reserveWebAgentRun）：复用那一份 runState，
+    // 不要另起一个对象，否则 stopWebAgentRun 拿到的还是占位、杀不到真正的进程
+    const runState = opts.runState && typeof opts.runState === 'object'
+        ? opts.runState
+        : reserveWebAgentRun(state, sessionRef);
+    let process;
+    try {
+        process = spawn(
+            ctx.dockerCmd,
+            ['exec', sessionRef.containerName, '/bin/bash', '-lc', command],
+            { stdio: ['ignore', 'pipe', 'pipe'] }
+        );
+    } catch (e) {
+        // spawn 同步抛错（如 dockerCmd 不存在）时必须释放锁，否则这个容器永远发不出消息
+        releaseWebAgentRun(state, sessionRef.containerName, runState);
+        throw e;
+    }
 
-    const runState = {
-        containerName: sessionRef.containerName,
-        sessionKey,
-        process,
-        command,
-        startedAt: new Date().toISOString(),
-        stopping: false
-    };
+    runState.process = process;
+    runState.command = command;
+    runState.startedAt = new Date().toISOString();
     state.agentRuns.set(sessionRef.containerName, runState);
+    // 准备阶段（拉起容器等）用户就点了停止：进程刚 spawn 出来立刻收掉
+    if (runState.stopping === true) {
+        try {
+            process.kill('SIGTERM');
+        } catch (e) {
+            // 进程可能已经退出，忽略
+        }
+    }
 
     return await new Promise((resolve, reject) => {
         const MAX_RAW_OUTPUT_CHARS = 32 * 1024 * 1024;
@@ -3847,11 +3804,11 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
         });
 
         process.on('error', error => {
-            state.agentRuns.delete(sessionRef.containerName);
+            releaseWebAgentRun(state, sessionRef.containerName, runState);
             reject(error);
         });
         process.on('close', code => {
-            state.agentRuns.delete(sessionRef.containerName);
+            releaseWebAgentRun(state, sessionRef.containerName, runState);
             if (stdoutPending) {
                 emitStdoutTraceLine(stdoutPending);
                 stdoutPending = '';
@@ -3934,9 +3891,43 @@ function resolveWebStreamControlEventType(event) {
     return 'process.stdout';
 }
 
+// 容器级运行锁的"占位"。必须在路由里同步调用：从 409 检查到真正 spawn 之间隔着
+// readJsonBody / prepareWebAgentExecution（含 ensureWebContainer 拉起容器）等多个
+// await，容器冷启动时这个窗口有好几秒。不先占住的话第二次发送会穿过 409 检查，
+// 同一容器里真的跑起两个 agent 进程，而且后者会覆盖前者的运行登记，
+// 让第一个进程再也停不掉
+function reserveWebAgentRun(state, sessionRef) {
+    const runState = {
+        containerName: sessionRef.containerName,
+        sessionKey: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+        process: null,
+        command: '',
+        startedAt: new Date().toISOString(),
+        stopping: false
+    };
+    state.agentRuns.set(sessionRef.containerName, runState);
+    return runState;
+}
+
+// 只有占位仍是自己那一份时才释放，避免误删别人的登记
+function releaseWebAgentRun(state, containerName, runState) {
+    if (state.agentRuns.get(containerName) === runState) {
+        state.agentRuns.delete(containerName);
+    }
+}
+
 function stopWebAgentRun(state, containerName) {
     const runState = state.agentRuns.get(containerName);
-    if (!runState || !runState.process || runState.process.killed) {
+    if (!runState) {
+        return false;
+    }
+    if (!runState.process) {
+        // 还在准备阶段（拉起容器 / 探测 resume），进程尚未 spawn：先记下停止意图，
+        // execAgentInWebContainerStream 拿到进程后会立刻收掉它
+        runState.stopping = true;
+        return true;
+    }
+    if (runState.process.killed) {
         return false;
     }
     runState.stopping = true;
@@ -4041,6 +4032,7 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef, preloadedHist
             status: containerInfo.status || 'history',
             defaultCommand: containerInfo.defaultCommand || ''
         });
+    const agentRunState = state.agentRuns ? state.agentRuns.get(containerName) : undefined;
     const createdAt = agentSession.createdAt || containerInfo.createdAt || null;
     const updatedAt = agentSession.updatedAt
         || (latestMessage && latestMessage.timestamp)
@@ -4067,6 +4059,11 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef, preloadedHist
         hostPath: applied.hostPath || '',
         containerPath: applied.containerPath || '',
         archived: agentSession.archived === true,
+        // 运行锁是容器级的，界面却是 agent 级的：把"容器在忙"和"是不是自己在忙"
+        // 都透出去，同容器的其他 AGENT 才能提前禁用输入，而不是点了发送才吃 409
+        containerBusy: agentRunState !== undefined,
+        agentRunning: agentRunState !== undefined
+            && agentRunState.sessionKey === buildWebSessionKey(containerName, agentId),
         ...(synthetic ? { synthetic: true } : {})
     };
 }
@@ -4292,123 +4289,6 @@ 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) {
@@ -4702,23 +4582,6 @@ 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,
@@ -5525,6 +5388,8 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     sendJson(res, 409, { error: '当前容器已有运行中的 agent 任务，请等它结束或先停止' });
                     return;
                 }
+                // 紧接着检查同步占位，中间不能有 await，否则并发请求会同时穿过上面这道检查
+                const runState = reserveWebAgentRun(state, sessionRef);
 
                 const userMessage = appendWebSessionMessage(state.webHistoryDir, sessionRef, 'user', prompt, {
                     mode: 'agent',
@@ -5544,6 +5409,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 try {
                     prepared = await prepareWebAgentExecution(ctx, state, sessionRef, prompt);
                 } catch (e) {
+                    releaseWebAgentRun(state, sessionRef.containerName, runState);
                     removeWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id);
                     removeWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id);
                     sendJson(res, 400, { error: e && e.message ? e.message : 'Agent 执行准备失败' });
@@ -5617,31 +5483,15 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
 
                 let lastPartialPersistAt = 0;
-                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,
+                        // 复用路由入口占好的那把锁，而不是另起一份运行登记
+                        runState,
                         onEvent: event => {
-                            // token 级增量：只走网线，不进事件日志、不逐条打诊断日志，
-                            // 历史落盘按 AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS 节流
+                            // 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') {
@@ -5696,13 +5546,6 @@ 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,
@@ -5921,29 +5764,6 @@ 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(),
@@ -5973,20 +5793,6 @@ 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}`);
@@ -6021,13 +5827,6 @@ 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.20",
+    "version": "7.0.23",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",