mingdao-harness 0.2.7 → 0.3.0

package/src/web/server.js

@@ -25,9 +25,12 @@ import { createProvider, resolveProviderConfig, helperProvider } from '../provid
 import { MODELS, modelPreset, PROVIDERS } from '../models.js';
 import { routeTask, routingConfig } from '../routing.js';
 import { buildUserContent } from './attachments.js';
+import { MAX_CONCURRENT } from './constants.js';
 import { createAgent } from '../agent.js';
 import { createPermission } from '../permissions.js';
 import { buildSystemPrompt } from '../prompts.js';
+import { loadProjectMemory, extractAndAppendProjectMemory } from '../memory.js';
+import { saveTaskState, clearTaskState, loadTaskState, resumePrompt } from '../task-state.js';
 import { createWebIO } from './web-io.js';
 import { startMcpServers } from '../mcp.js';
 import {
@@ -217,7 +220,6 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
   };
 
   // 任务注册表：支持多会话并行——每个任务独立的 SSE 流、权限确认、中断控制
-  const MAX_CONCURRENT = 8;
   let inflight = 0; // 质检 S2：在途聊天请求计数（与请求生命周期绑定，防 readBody 期间并发超限）
   const tasks = new Map(); // taskId -> { res, send, abortHandler, pendingAsk, session, startedAt, status, message, durationMs }
   let taskSeq = 0;
@@ -231,6 +233,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
     return next;
   }
   const draftTexts = new Map(); // 质检 A5：草稿按会话维度存储（此前单槽多客户端互相覆盖）
+  const sessionMemoryCache = new Map(); // v0.3.0 P0-3：项目记忆「会话内快照」——同一会话系统提示恒定（保前缀缓存）
 
   // —— 服务端诊断日志（第二问无反应排查 + 长期运维）：<mingdao-home>/logs/web-server.log ——
   // 记录每次对话的关键阶段与耗时；2MB 滚动。桌面版与 WebUI 共用同一日志。
@@ -390,12 +393,30 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
     if (!sessionWsDir) {
       setSessionWorkspace(sessionName, taskDir, currentWorkspace(workingDir)?.name || null);
     }
-    const systemPrompt = buildSystemPrompt({ workingDir: taskDir, withJournal: body.withJournal === true });
+    // v0.3.0 P0-3：项目记忆会话内快照——本会话全程用同一份快照（前缀稳定），
+    // 每轮结束提取的新条目只写文件、不回灌当前会话。
+    let projectMemorySnapshot = sessionMemoryCache.get(sessionName);
+    if (projectMemorySnapshot === undefined) {
+      projectMemorySnapshot = loadProjectMemory(taskDir);
+      sessionMemoryCache.set(sessionName, projectMemorySnapshot);
+      if (sessionMemoryCache.size > 200) {
+        const oldest = sessionMemoryCache.keys().next().value;
+        sessionMemoryCache.delete(oldest);
+      }
+    }
+    const systemPrompt = buildSystemPrompt({ workingDir: taskDir, withJournal: body.withJournal === true, projectMemory: projectMemorySnapshot });
     let messages =
       session.messages?.length && session.messages[0]?.role === 'system'
         ? session.messages
         : [{ role: 'system', content: systemPrompt }, ...(session.messages || [])];
     messages[0] = { role: 'system', content: systemPrompt }; // 总是刷新 system（记忆/技能/AGENTS.md 最新）
+    // v0.3.0 P0-2：续跑——继续一个有未完成检查点的会话时，先注入进度摘要让模型从断点接着做
+    if (!isNew) {
+      const ts = loadTaskState(sessionName);
+      if (ts && (ts.status === 'cap' || ts.status === 'interrupted')) {
+        messages.push({ role: 'user', content: resumePrompt(ts) });
+      }
+    }
     messages.push({ role: 'user', content: built.content });
     // 落盘用文本版（图文数组只发给模型，会话文件保持字符串可渲染）
     await withSessionLock(session.file, () => appendMessages(session.file, [{ role: 'user', content: built.persistText }]));
@@ -483,6 +504,11 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
       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.3.0 P0-3：轮末提取项目记忆（有工具工作才提，fire-and-forget）。写文件供「未来会话」用，
+      // 当前会话用快照（上文已注入），故不会中途改系统提示、不破坏前缀缓存。
+      if (io.stats().toolCount > 0) {
+        extractAndAppendProjectMemory({ cfg, provider: providerNow, model: titleModel(cfg, runModel), messages, workingDir: taskDir }).catch(() => {});
+      }
       maybeAutoSync().catch(() => {});
       // 新会话自动标题（可配置关闭）
       srvlog('chat 标题生成前 ' + taskId);
@@ -498,6 +524,19 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
           }
         } catch {}
       }
+      // v0.3.0 P0-2：任务检查点——跑满步数(capHit)或中断(aborted)时落盘供续跑，正常完成清除
+      const finalSessionName = path.basename(session.file);
+      if (r.capHit || r.aborted) {
+        saveTaskState(finalSessionName, {
+          goal: built.persistText,
+          progress: r.text || '',
+          artifacts: io.stats().deliverables,
+          status: r.capHit ? 'cap' : 'interrupted',
+          updatedAt: new Date().toISOString(),
+        });
+      } else {
+        clearTaskState(finalSessionName);
+      }
       entry.status = r.aborted ? 'aborted' : 'done';
       entry.durationMs = Date.now() - entry.startedAt;
       srvlog('chat 发送 done ' + taskId + ' status=' + entry.status + ' 总耗时=' + entry.durationMs + 'ms');
@@ -519,7 +558,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
         durationMs: r.durationMs,
         truncated: r.truncated,
         aborted: r.aborted,
-        note: r.note || (r.text ? '' : `（本轮共执行 ${io.stats().toolCount} 步工具操作${io.stats().deliverables.length ? `、交付 ${io.stats().deliverables.length} 个文件` : ''}，但模型没有输出总结文字——可追问「总结一下刚才的工作」）`),
+        note: r.note || (r.text ? '' : `（任务已执行 ${io.stats().toolCount} 步工具操作${io.stats().deliverables.length ? `、交付 ${io.stats().deliverables.length} 个文件` : ''}，自动收尾总结未能生成——可追问「总结一下刚才的工作」）`),
         stats: io.stats(),
         session: path.basename(session.file),
       });
@@ -544,7 +583,7 @@ export async function runWebServer({ host = '127.0.0.1', port = 3820, authToken
     providerCache, getProviderFor, tasks,
     MAX_CONCURRENT, pruneTasks, handleChat,
     mcpFacade, provider, validateRemoteUrl, isPrivateHost,
-    authEnabled, tokenMatches, requestToken, trustedHost, INDEX_HTML, draftTexts, startupCwd,
+    authEnabled, tokenMatches, requestToken, trustedHost, INDEX_HTML, draftTexts, startupCwd, sessionMemoryCache,
     state: { get modelName() { return modelName; }, set modelName(v) { modelName = v; },
              get workingDir() { return workingDir; }, set workingDir(v) { workingDir = v; } },
     refs: { get inflight() { return inflight; }, set inflight(v) { inflight = v; } },

package/src/web/util.js

@@ -0,0 +1,201 @@
+// 纯前端工具（零状态，仅依赖 DOM/标准 API）：选择器、转义、Markdown 渲染、格式化。
+// 从 app.js 拆分（v0.2.8 C2）：这些函数被消息渲染/轨迹/设置等多处复用，独立成模块便于维护与测试。
+
+export const $ = (s) => document.querySelector(s);
+
+export function esc(s) {
+  return String(s ?? '')
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+}
+
+export function highlight(code, lang) {
+  const kws = new Set(
+    'const let var function return if else for while import from export class new await async try catch throw null undefined true false def elif raise with as lambda None True False self echo exit if then else fi done local function'.split(
+      ' '
+    )
+  );
+  const re = /(\/\/[^\n]*|#[^\n]*|"(?:\\.|[^"\\])*"|'[^']*'|`[^`]*`|\b\d[\d._]*\b|[A-Za-z_$][\w$]*)/g;
+  return esc(code).replace(re, (tok) => {
+    if (tok.startsWith('//') || tok.startsWith('#')) return '<span class="hl-c">' + tok + '</span>';
+    if (/^["'`]/.test(tok)) return '<span class="hl-s">' + tok + '</span>';
+    if (/^\d/.test(tok)) return '<span class="hl-n">' + tok + '</span>';
+    if (kws.has(tok)) return '<span class="hl-kw">' + tok + '</span>';
+    return tok;
+  });
+}
+
+export function renderMarkdown(text) {
+  // 块级解析（美化：加粗标题 / 段落 / 真列表 / 引用 / 分割线，参照 DeepSeek-Harness 会话排版）
+  const lines = String(text).split('\n');
+  let out = '';
+  let code = null;
+  let codeLang = '';
+  const flushCode = () => {
+    if (code !== null) {
+      out +=
+        '<div class="codeblock"><div class="cb-banner"><span class="cb-lang"><span class="cb-dot"></span>' +
+        (esc(codeLang) || 'code') +
+        '</span><span class="cb-copy" style="cursor:pointer">复制</span></div><pre><code class="lang-' +
+        esc(codeLang) +
+        '">' +
+        highlight(code.join('\n'), codeLang) +
+        '</code></pre></div>';
+      code = null;
+    }
+  };
+  let para = [];
+  let list = null; // {type:'ul'|'ol', items:[]}
+  const flushPara = () => {
+    if (para.length) {
+      out += '<p>' + para.join('<br>') + '</p>';
+      para = [];
+    }
+  };
+  const flushList = () => {
+    if (list) {
+      out += '<' + list.type + '>' + list.items.map((i) => '<li>' + i + '</li>').join('') + '</' + list.type + '>';
+      list = null;
+    }
+  };
+  // 行内元素（审计 P1-3：内容与 codeLang 均经 esc 转义防 XSS）
+  const inline = (l) => {
+    let s = esc(l);
+    s = s
+      .replace(/`([^`]+)`/g, '<code>$1</code>')
+      .replace(/\*\*([^*]+)\*\*/g, '<b>$1</b>')
+      .replace(/\*([^*\s][^*]*)\*/g, '<i>$1</i>')
+      .replace(/\[([^\]]+)\]\((https?:\/\/[^\s'"<>)]+)\)/g, '<a href="$2" target="_blank" rel="noopener">$1</a>');
+    return s;
+  };
+  for (const line of lines) {
+    const t = line.trim();
+    if (t.startsWith('```')) {
+      if (code === null) {
+        flushList();
+        flushPara();
+        code = [];
+        codeLang = t.slice(3).trim().split(/\s+/)[0] || '';
+      } else flushCode();
+      continue;
+    }
+    if (code !== null) {
+      code.push(line);
+      continue;
+    }
+    if (t === '') {
+      flushList();
+      flushPara();
+      continue;
+    }
+    const h = t.match(/^(#{1,6})\s+(.*)$/);
+    if (h) {
+      flushList();
+      flushPara();
+      const level = Math.min(h[1].length, 4);
+      out += '<h' + level + '>' + inline(h[2]) + '</h' + level + '>';
+      continue;
+    }
+    const ul = t.match(/^([-*+])\s+(.*)$/);
+    if (ul) {
+      flushPara();
+      if (!list || list.type !== 'ul') {
+        flushList();
+        list = { type: 'ul', items: [] };
+      }
+      list.items.push(inline(ul[2]));
+      continue;
+    }
+    const ol = t.match(/^(\d+)[.)]\s+(.*)$/);
+    if (ol) {
+      flushPara();
+      if (!list || list.type !== 'ol') {
+        flushList();
+        list = { type: 'ol', items: [] };
+      }
+      list.items.push(inline(ol[2]));
+      continue;
+    }
+    if (/^>\s?/.test(t)) {
+      flushList();
+      flushPara();
+      out += '<blockquote>' + inline(t.replace(/^>\s?/, '')) + '</blockquote>';
+      continue;
+    }
+    if (/^(-{3,}|\*{3,})$/.test(t)) {
+      flushList();
+      flushPara();
+      out += '<hr>';
+      continue;
+    }
+    flushList();
+    para.push(inline(t));
+  }
+  flushCode();
+  flushList();
+  flushPara();
+  return out;
+}
+
+export function scrollBottom() {
+  const sc = document.querySelector('main');
+  if (sc) sc.scrollTop = sc.scrollHeight;
+}
+
+export function expandableBody(previewHtml, fullHtml) {
+  const b = document.createElement('div');
+  b.className = 'body';
+  const prev = document.createElement('div');
+  const full = document.createElement('div');
+  prev.innerHTML = previewHtml;
+  full.innerHTML = fullHtml;
+  full.style.display = 'none';
+  const btn = document.createElement('button');
+  btn.textContent = '展开全文';
+  btn.style.cssText = 'padding:1px 8px;font-size:11px;margin-top:4px';
+  btn.onclick = () => {
+    const open = full.style.display !== 'none';
+    full.style.display = open ? 'none' : 'block';
+    btn.textContent = open ? '展开全文' : '收起';
+    scrollBottom();
+  };
+  b.appendChild(prev);
+  b.appendChild(full);
+  b.appendChild(btn);
+  return b;
+}
+
+export function resultText(r) {
+  if (r == null || r === undefined) return '';
+  if (typeof r === 'string') return r;
+  if (r.output) return String(r.output);
+  if (r.stdout || r.stderr) return String(r.stdout || '') + String(r.stderr || '');
+  return JSON.stringify(r);
+}
+
+export function truncText(t, n) {
+  t = String(t || '');
+  return t.length > n ? t.slice(0, n) + '\n…（截断，共 ' + t.length + ' 字）' : t;
+}
+
+export function fmtDur(ms) {
+  if (!ms) return '0s';
+  const sec = Math.round(ms / 1000);
+  const m = Math.floor(sec / 60);
+  return m > 0 ? m + 'm' + String(sec % 60).padStart(2, '0') + 's' : sec + 's';
+}
+
+export function fmtTok(n) {
+  if (n >= 1e9) return (n / 1e9).toFixed(1) + 'B';
+  if (n >= 1e6) return (n / 1e6).toFixed(0) + 'M';
+  if (n >= 1e3) return (n / 1e3).toFixed(1) + 'K';
+  return String(n);
+}
+
+export function fmtT(n) {
+  n = Number(n || 0);
+  return n >= 1000 ? (n / 1000).toFixed(1) + 'k' : String(n);
+}