mingdao-harness 0.4.3 → 0.4.5

package/src/web/server.js

@@ -85,15 +85,30 @@ function readBody(req, limit = 40 * 1024 * 1024) {
     /** @type {any[]} */
     const chunks = [];
     let size = 0;
+    let settled = false;
+    const settle = (/** @type {any} */ fn, /** @type {any} */ v) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(slowTimer);
+      fn(v);
+    };
     // 审计 P2-6：慢速连接防护——60s 未传完请求体即断开，防占满 socket
     const slowTimer = setTimeout(() => {
       const err = /** @type {Error & { status?: number }} */ (new Error('请求体上传超时（60s）'));
       err.status = 408;
       req.destroy();
-      reject(err);
+      settle(reject, err);
     }, 60000);
-    req.on('end', () => clearTimeout(slowTimer));
-    req.on('close', () => clearTimeout(slowTimer));
+    // P1-6（v0.4.5）：body 上传中断（客户端刷新/abort）时 Node 通常只触发 close 不发 error/end——
+    // 此前 close 仅 clearTimeout 不 reject → Promise 永久 pending → /api/chat 的 inflight 槽永久泄漏，
+    // 重复 N 次后服务对所有会话 429。close 且未 settle 时 reject（status 499）。
+    req.on('close', () => {
+      if (!settled) {
+        const err = /** @type {Error & { status?: number }} */ (new Error('请求体上传中断（客户端断开）'));
+        err.status = 499;
+        settle(reject, err);
+      }
+    });
     req.on('data', (/** @type {any} */ d) => {
       size += d.length;
       if (size > MAX_BODY) {
@@ -102,7 +117,7 @@ function readBody(req, limit = 40 * 1024 * 1024) {
         // 排空残余数据但保留连接：让上层 catch 返回真 413（此前 destroy 导致客户端只收到连接重置）
         req.pause();
         req.resume();
-        reject(err);
+        settle(reject, err);
         return;
       }
       chunks.push(d);
@@ -110,17 +125,17 @@ function readBody(req, limit = 40 * 1024 * 1024) {
     req.on('end', () => {
       const raw = Buffer.concat(chunks).toString('utf8');
       try {
-        resolve(raw ? JSON.parse(raw) : {});
+        settle(resolve, raw ? JSON.parse(raw) : {});
       } catch {
-        resolve({});
+        settle(resolve, {});
       }
     });
-    req.on('error', reject);
+    req.on('error', (/** @type {any} */ e) => settle(reject, e));
   });
 }
 
-/** @param {{ host?: string, port?: number, authToken?: string|null, [key: string]: any }} [opts] */
-export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken } = {}) {
+/** @param {{ host?: string, port?: number, authToken?: string|null, onBusy?: (busy: boolean) => void, [key: string]: any }} [opts] */
+export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken, onBusy } = {}) {
   const home = ensureHome();
   const cfg = loadConfig();
   if (!cfg) {
@@ -206,7 +221,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
   let mcpManager = null;
   if (cfg.mcpServers && Object.keys(cfg.mcpServers).length) {
     // 超时后输家 promise 仍在跑：迟到就绪的 manager 立即 stop，防 detached 子进程成孤儿（自查 #2）
-    const mcpStartP = startMcpServers(cfg.mcpServers, workingDir).catch(() => null);
+    const mcpStartP = startMcpServers(cfg.mcpServers, workingDir, cfg).catch(() => null);
     mcpManager = await Promise.race([
       mcpStartP,
       new Promise((/** @type {any} */ r) => setTimeout(() => r(null), 6000)),
@@ -230,6 +245,18 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
   let inflight = 0; // 质检 S2：在途聊天请求计数（与请求生命周期绑定，防 readBody 期间并发超限）
   const tasks = new Map(); // taskId -> { res, send, abortHandler, pendingAsk, session, startedAt, status, message, durationMs }
   let taskSeq = 0;
+  // 忙状态通知（v0.4.3 network error 修复）：有 running 任务即「忙」——桌面版据此在生成期
+  // 防睡眠/防熄屏（macOS 熄屏会中断 Chromium 网络栈导致 SSE 断连）。onBusy 由调用方注入。
+  let lastBusy = false;
+  function notifyBusy() {
+    const busy = [...tasks.values()].some((/** @type {any} */ t) => t.status === 'running');
+    if (busy !== lastBusy) {
+      lastBusy = busy;
+      try {
+        onBusy?.(busy);
+      } catch {}
+    }
+  }
   // 会话文件互斥（质检 C1/M3）：同一 session 文件的 append 与 compact 整文件重写必须串行
   const sessionLocks = new Map();
   /** @param {any} file @param {any} fn */
@@ -321,6 +348,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
     const entry = /** @type {any} */ ({ res, send: null, abortHandler: null, pendingAsk: null, session: null, startedAt: Date.now(), status: 'running', message: '', durationMs: 0 });
     srvlog('chat 开始 ' + taskId + ' session=' + (body.file || '新会话') + ' 消息长度=' + String(body.message || '').length);
     tasks.set(taskId, entry);
+    notifyBusy(); // 进入 running → 忙
     /** @param {any} obj */
     const send = (obj) => {
       try {
@@ -350,6 +378,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
     const built = buildUserContent(userMessage, body.attachments, visionSupported);
     if (built.error) {
       entry.status = 'failed';
+      notifyBusy();
       send({ type: 'error', message: built.error });
       clearInterval(progressTimer);
       res.end();
@@ -490,6 +519,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
       providerNow = await getProviderFor(runModel); // 审计 P1-1：失败时清理任务占位，避免僵尸 running 耗尽并发
     } catch (/** @type {any} */ err) {
       entry.status = 'failed';
+      notifyBusy();
       entry.durationMs = Date.now() - entry.startedAt;
       send({ type: 'error', message: `模型 ${runModel} 不可用：${String(err?.message || err)}` });
       clearInterval(progressTimer);
@@ -497,6 +527,18 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
       pruneTasks();
       return;
     }
+    // v0.4.4：长任务费用逐轮入账——记录已按轮入账的累计 usage，最终补记最后一轮 + 兜底总结的剩余。
+    // v0.4.5：onUsage 收 (modelName, delta)——主/子代理各自按实际模型归属（子代理经 spawnTask 透传，费用不漏计）。
+    const recorded = { prompt_tokens: 0, completion_tokens: 0, prompt_cache_hit_tokens: 0, prompt_cache_miss_tokens: 0 };
+    const onUsage = (/** @type {string} */ modelName, /** @type {any} */ delta) => {
+      recorded.prompt_tokens += delta?.prompt_tokens || 0;
+      recorded.completion_tokens += delta?.completion_tokens || 0;
+      recorded.prompt_cache_hit_tokens += delta?.prompt_cache_hit_tokens || 0;
+      recorded.prompt_cache_miss_tokens += delta?.prompt_cache_miss_tokens || 0;
+      try {
+        recordUsage(modelName, delta, null);
+      } catch {}
+    };
     const agent = createAgent({
       provider: providerNow,
       permission,
@@ -511,6 +553,8 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
         withSessionLock(session.file, () => rewriteSession(session.file, msgs)).catch(() => {}); // onCompact 为同步回调：入队串行即可
         persistedBefore = msgs.length;
       },
+      // 每轮结束回调本轮增量 usage → 逐轮入账（长任务期间「今日费用」实时累计）
+      onUsage,
       // 审计记录归入当前会话（P3-5）
       sessionRef: { name: path.basename(session.file) },
     });
@@ -531,6 +575,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
           entry.abortHandler?.();
         } catch {}
         entry.status = 'failed';
+        notifyBusy();
         entry.durationMs = Date.now() - entry.startedAt;
         pruneTasks();
       }
@@ -544,7 +589,14 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
       session.routeStats = { steps: st.steps + (io.stats().toolCount || 0), truncated: st.truncated + (r.truncated ? 1 : 0) };
       await withSessionLock(session.file, () => appendMessages(session.file, messages.slice(persistedBefore)));
       io.printUsageLine({ modelName: runModel, usage: r.usage, durationMs: r.durationMs });
-      recordUsage(r.perf?.usedModel || runModel, r.usage, /** @type {any} */ (r.perf));
+      // v0.4.4：补记最后一轮 + 兜底总结的剩余 usage（自动续跑轮已在 onUsage 逐轮入账，避免重复计）
+      const remaining = {
+        prompt_tokens: Math.max(0, (r.usage?.prompt_tokens || 0) - recorded.prompt_tokens),
+        completion_tokens: Math.max(0, (r.usage?.completion_tokens || 0) - recorded.completion_tokens),
+        prompt_cache_hit_tokens: Math.max(0, (r.usage?.prompt_cache_hit_tokens || 0) - recorded.prompt_cache_hit_tokens),
+        prompt_cache_miss_tokens: Math.max(0, (r.usage?.prompt_cache_miss_tokens || 0) - recorded.prompt_cache_miss_tokens),
+      };
+      recordUsage(r.perf?.usedModel || runModel, remaining, /** @type {any} */ (r.perf));
       // v0.3.0 P0-3：轮末提取项目记忆（有工具工作才提，fire-and-forget）。写文件供「未来会话」用，
       // 当前会话用快照（上文已注入），故不会中途改系统提示、不破坏前缀缓存。
       if (io.stats().toolCount > 0) {
@@ -579,6 +631,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
         clearTaskState(finalSessionName);
       }
       entry.status = r.aborted ? 'aborted' : 'done';
+      notifyBusy();
       entry.durationMs = Date.now() - entry.startedAt;
       srvlog('chat 发送 done ' + taskId + ' status=' + entry.status + ' 总耗时=' + entry.durationMs + 'ms');
       // 预算可视化（评估 A5）：会话当前 token 占用 / 预算
@@ -607,6 +660,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
       });
     } catch (/** @type {any} */ err) {
       entry.status = 'failed';
+      notifyBusy();
       entry.durationMs = Date.now() - entry.startedAt;
       srvlog('chat 错误 ' + taskId + ' ' + String(err?.message || err));
       send({ type: 'error', message: String(err?.message || err) });

package/src/workspace.js

@@ -6,6 +6,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { mingdaoHome, ensureHome } from './config.js';
+import { atomicWriteFileSync } from './atomic-write.js';
 
 export function workspacesFile() {
   return path.join(mingdaoHome(), 'workspaces.json');
@@ -23,11 +24,8 @@ export function loadWorkspaces() {
 export function saveWorkspaces(/** @type {any} */ ws) {
   try {
     ensureHome();
-    // 原子写：临时文件 + rename，避免崩溃后注册表被冲空
-    const target = workspacesFile();
-    const tmp = target + '.tmp';
-    fs.writeFileSync(tmp, JSON.stringify(ws, null, 2) + '\n');
-    fs.renameSync(tmp, target);
+    // 原子写（评估 6.6）：随机 tmp 名 + rename，避免崩溃冲空与跨进程共名 tmp 串扰
+    atomicWriteFileSync(workspacesFile(), JSON.stringify(ws, null, 2) + '\n');
   } catch {}
 }
 
@@ -121,10 +119,8 @@ export function loadSessionWorkspaces() {
 export function saveSessionWorkspaces(/** @type {any} */ map) {
   try {
     ensureHome();
-    const target = sessionWorkspacesFile();
-    const tmp = target + '.tmp';
-    fs.writeFileSync(tmp, JSON.stringify(map, null, 2) + '\n', { mode: 0o600 });
-    fs.renameSync(tmp, target);
+    // 原子写（评估 6.6）：随机 tmp 名 + rename
+    atomicWriteFileSync(sessionWorkspacesFile(), JSON.stringify(map, null, 2) + '\n', { mode: 0o600 });
   } catch {}
 }