codebee 0.1.66 → 0.1.67

package/app/ui/app.js

@@ -4315,6 +4315,7 @@ function drawTaskDetail(key, runs, appendFrom) {
           '<span class="role">' + esc(s.role) + "</span>" +
           '<span class="who">' + esc(t(s.agent_label || s.agent)) + "</span>" +
           (String(s.model || "").trim() ? '<span class="st-model" title="' + esc(t("实际派发模型")) + '">' + esc(String(s.model).trim()) + "</span>" : "") +
+          (String(s.provider || "").trim() ? '<span class="st-prov" title="' + esc(t("实际用上游（厂商@网关）")) + '">' + esc(String(s.provider).trim()) + "</span>" : "") +
           '<span class="sum">' + esc((s.note ? "◆ " + s.note + " — " : "") + (s.summary || "")) + "</span>" +
           '<span class="dur">' + (s.duration_s != null ? s.duration_s + "s" : "") + "</span>" +
           statusChip(s.status) +
@@ -4757,6 +4758,7 @@ function renderRunDetailSteps(run, token) {
         '<span class="role">' + esc(s.role) + "</span>" +
         '<span class="who">' + esc(t(s.agent_label || s.agent)) + "</span>" +
         (s.model ? '<span class="st-model" title="' + esc(t("实际派发模型")) + '">' + esc(s.model) + "</span>" : "") +
+        (String(s.provider || "").trim() ? '<span class="st-prov" title="' + esc(t("实际用上游（厂商@网关）")) + '">' + esc(String(s.provider).trim()) + "</span>" : "") +
         '<span class="sum">' + esc((s.note ? "◆ " + s.note + " — " : "") + (s.summary || "")) + "</span>" +
         '<span class="dur">' + (s.duration_s != null ? s.duration_s + "s" : "") + "</span>" +
         statusChip(s.status) +
@@ -4818,6 +4820,7 @@ async function renderRunDetail() {
     (run.error ? '<span class="stat err">' + errTag(run.error) + esc(run.error.slice(0, 200)) + "</span>" : "") +
     '<span class="stat tasksum hidden" id="rd-meta-task"></span>';
   if (S.detailSide) fillMetaTask(S.detailSide.stats || {});   // 缓存命中：轮询重画不闪丢累计组
+  renderTimeoutRow(rcTask, run);
   renderPlan(run);
   renderRouting(run);
   renderChapterScores(run);
@@ -6189,9 +6192,174 @@ const FP_IMG = new Set(["png", "jpg", "jpeg", "gif", "webp", "bmp", "ico", "svg"
 const FP_TXT = new Set(["md", "txt", "log", "csv", "yml", "yaml", "ini", "toml", "json",
   "py", "js", "ts", "jsx", "tsx", "html", "htm", "css", "svg", "bat", "sh", "ps1",
   "c", "h", "cpp", "hpp", "java", "go", "rs", "xml", "sql", "mqtt", "proto"]);
+const FP_DOCX = new Set(["docx"]);   // 只认 OOXML；legacy .doc 二进制不在此列
+const FP_PDF = new Set(["pdf"]);
+const FP_XLSX = new Set(["xlsx"]);   // 只认 OOXML；legacy .xls 二进制不在此列
 
 function _fpExt(name) { return (String(name).split(".").pop() || "").toLowerCase(); }
 
+/* docx 只读预览（试探功能）：渲染器走 jsdelivr 懒加载（docx-preview 依赖
+ * JSZip，两者只在首次打开 docx 时加载，平时零请求零开销）；加载/渲染失败
+ * 优雅回落到下载提示。渲染内容是用户自己工作目录的文件，信任面与网页成品
+ * 预览页签一致。版本钉死，升级要走一次人工验证。 */
+let _docxLibs = null;
+function _loadDocxLibs() {
+  if (_docxLibs) return _docxLibs;
+  const load = (src) => new Promise((res, rej) => {
+    const s = document.createElement("script");
+    s.src = src; s.onload = () => res(); s.onerror = () => rej(new Error("load fail: " + src));
+    document.head.appendChild(s);
+  });
+  _docxLibs = Promise.all([
+    load("https://cdn.jsdelivr.net/npm/jszip@3.10.1/dist/jszip.min.js"),
+    load("https://cdn.jsdelivr.net/npm/docx-preview@0.4.1/dist/docx-preview.min.js"),
+  ]).then(() => {
+    if (!window.docx || !window.JSZip) throw new Error("docx 渲染器未就绪");
+  });
+  _docxLibs.catch(() => { _docxLibs = null; });   // 失败不缓存，下次打开可重试
+  return _docxLibs;
+}
+
+async function _fpRenderDocx(url) {
+  const el = _fpEnsure();
+  try {
+    const [r] = await Promise.all([fetch(url), _loadDocxLibs()]);
+    if (!r.ok) throw new Error("HTTP " + r.status);
+    if (!filePopIsOpen()) return;
+    _fpSetBody('<div class="fp-docx"><div class="fp-docx-load">' + esc(t("渲染中…")) + "</div></div>");
+    const box = el.querySelector(".fp-docx");
+    await window.docx.renderAsync(await r.arrayBuffer(), box, null, { inWrapper: true });
+    if (!filePopIsOpen()) return;
+    const loader = box.querySelector(".fp-docx-load");
+    if (loader) loader.remove();
+  } catch (e) {
+    if (filePopIsOpen())
+      _fpSetBody('<div class="fp-hint">' + esc(t("docx 预览不可用（渲染器需联网首次加载）；可下载后查看。")) + "</div>");
+  }
+}
+
+/* PDF 只读预览（WorkDSH「真任务以可读产物收尾」切片）：pdf.js 走 jsdelivr
+ * 懒加载，钉 3.11.174（最后带 UMD 构建的版本，4.x 转 ESM 不适用 script 注入）；
+ * 渲染进 canvas，按弹窗宽度适配；大 PDF 封顶 20 页防渲染爆内存，超页给下载
+ * 提示。加载/渲染失败优雅回落下载提示，与 docx 同款。 */
+const FP_PDF_MAX_PAGES = 20;
+let _pdfLib = null;
+function _loadPdfLib() {
+  if (_pdfLib) return _pdfLib;
+  const base = "https://cdn.jsdelivr.net/npm/pdfjs-dist@3.11.174/legacy/build/";
+  const load = (src) => new Promise((res, rej) => {
+    const s = document.createElement("script");
+    s.src = src; s.onload = () => res(); s.onerror = () => rej(new Error("load fail: " + src));
+    document.head.appendChild(s);
+  });
+  _pdfLib = load(base + "pdf.min.js").then(() => {
+    if (!window.pdfjsLib) throw new Error("pdf 渲染器未就绪");
+    window.pdfjsLib.GlobalWorkerOptions.workerSrc = base + "pdf.worker.min.js";
+  });
+  _pdfLib.catch(() => { _pdfLib = null; });   // 失败不缓存，下次打开可重试
+  return _pdfLib;
+}
+
+async function _fpRenderPdf(url) {
+  const el = _fpEnsure();
+  try {
+    const [r] = await Promise.all([fetch(url), _loadPdfLib()]);
+    if (!r.ok) throw new Error("HTTP " + r.status);
+    if (!filePopIsOpen()) return;
+    _fpSetBody('<div class="fp-pdf"><div class="fp-docx-load">' + esc(t("渲染中…")) + "</div></div>");
+    const box = el.querySelector(".fp-pdf");
+    const doc = await window.pdfjsLib.getDocument({ data: await r.arrayBuffer() }).promise;
+    if (!filePopIsOpen()) return;
+    const loader = box.querySelector(".fp-docx-load");
+    if (loader) loader.remove();
+    const total = doc.numPages;
+    const width = Math.max(320, (box.clientWidth || 800) - 8);
+    for (let i = 1; i <= Math.min(total, FP_PDF_MAX_PAGES); i++) {
+      const page = await doc.getPage(i);
+      if (!filePopIsOpen()) return;
+      const vp1 = page.getViewport({ scale: width / page.getViewport({ scale: 1 }).width });
+      const canvas = document.createElement("canvas");
+      canvas.className = "fp-pdf-page";
+      canvas.width = Math.floor(vp1.width); canvas.height = Math.floor(vp1.height);
+      await page.render({ canvasContext: canvas.getContext("2d"), viewport: vp1 }).promise;
+      box.appendChild(canvas);
+    }
+    if (total > FP_PDF_MAX_PAGES)
+      box.insertAdjacentHTML("beforeend", '<div class="fp-hint">' +
+        esc(t("仅渲染前 {0} 页（共 {1} 页），完整内容请下载。")
+          .replace("{0}", FP_PDF_MAX_PAGES).replace("{1}", total)) + "</div>");
+  } catch (e) {
+    if (filePopIsOpen())
+      _fpSetBody('<div class="fp-hint">' + esc(t("PDF 预览不可用（渲染器需联网首次加载）；可下载后查看。")) + "</div>");
+  }
+}
+
+/* xlsx 只读预览：SheetJS 走 jsdelivr 懒加载（钉 0.18.5，npm 末版）；多工作表
+ * 给页签切换；单元格按文本渲染（raw:false，日期/数字走显示值），200 行 ×
+ * 40 列封顶，超限给下载提示。只认 OOXML 的 .xlsx——legacy .xls 仍走下载。 */
+const FP_XLS_MAX_ROWS = 200, FP_XLS_MAX_COLS = 40;
+let _xlsxLib = null;
+function _loadXlsxLib() {
+  if (_xlsxLib) return _xlsxLib;
+  const load = (src) => new Promise((res, rej) => {
+    const s = document.createElement("script");
+    s.src = src; s.onload = () => res(); s.onerror = () => rej(new Error("load fail: " + src));
+    document.head.appendChild(s);
+  });
+  _xlsxLib = load("https://cdn.jsdelivr.net/npm/xlsx@0.18.5/dist/xlsx.full.min.js")
+    .then(() => { if (!window.XLSX) throw new Error("xlsx 渲染器未就绪"); });
+  _xlsxLib.catch(() => { _xlsxLib = null; });
+  return _xlsxLib;
+}
+
+async function _fpRenderXlsx(url) {
+  const el = _fpEnsure();
+  try {
+    const [r] = await Promise.all([fetch(url), _loadXlsxLib()]);
+    if (!r.ok) throw new Error("HTTP " + r.status);
+    if (!filePopIsOpen()) return;
+    _fpSetBody('<div class="fp-xlsx"><div class="fp-docx-load">' + esc(t("渲染中…")) + "</div></div>");
+    const box = el.querySelector(".fp-xlsx");
+    const wb = window.XLSX.read(await r.arrayBuffer(), { type: "array" });
+    if (!filePopIsOpen()) return;
+    box.innerHTML = "";
+    const tabs = document.createElement("div");
+    tabs.className = "fp-xls-tabs";
+    const pane = document.createElement("div");
+    box.appendChild(tabs); box.appendChild(pane);
+    const drawSheet = (idx) => {
+      const ws = wb.Sheets[wb.SheetNames[idx]];
+      const rows = window.XLSX.utils.sheet_to_json(ws, { header: 1, defval: "", raw: false });
+      let html = '<table class="fp-xls"><tbody>';
+      rows.slice(0, FP_XLS_MAX_ROWS).forEach((row, ri) => {
+        const tag = ri === 0 ? "th" : "td";
+        html += "<tr>" + row.slice(0, FP_XLS_MAX_COLS).map((c) =>
+          "<" + tag + ">" + esc(String(c == null ? "" : c)) + "</" + tag + ">").join("") + "</tr>";
+      });
+      html += "</tbody></table>";
+      if (rows.length > FP_XLS_MAX_ROWS)
+        html += '<div class="fp-hint">' +
+          esc(t("已截断：仅显示前 {0} 行 × {1} 列；完整内容请下载。")
+            .replace("{0}", FP_XLS_MAX_ROWS).replace("{1}", FP_XLS_MAX_COLS)) + "</div>";
+      pane.innerHTML = html;
+      tabs.querySelectorAll(".fp-xls-tab").forEach((b, i) =>
+        b.classList.toggle("active", i === idx));
+    };
+    wb.SheetNames.forEach((sn, i) => {
+      const b = document.createElement("button");
+      b.className = "ghost fp-xls-tab" + (i === 0 ? " active" : "");
+      b.type = "button"; b.textContent = sn;
+      b.addEventListener("click", () => drawSheet(i));
+      tabs.appendChild(b);
+    });
+    if (!wb.SheetNames.length) throw new Error("empty workbook");
+    drawSheet(0);
+  } catch (e) {
+    if (filePopIsOpen())
+      _fpSetBody('<div class="fp-hint">' + esc(t("表格预览不可用（渲染器需联网首次加载）；可下载后查看。")) + "</div>");
+  }
+}
+
 /* 按 URL 弹窗预览：图片 blob 直显、md 渲染、文本/代码等宽原文、json 美化、
  * 其余二进制只给下载。成品弹窗与目录文件弹窗共用；目录文件弹窗带 save
  * 上下文 → 额外给「编辑」，改完保存回工作目录（POST /api/dir/save）。 */
@@ -6239,6 +6407,9 @@ async function _fpPreviewUrl(url, name, size, opts) {
       el.querySelector(".fp-acts").insertAdjacentHTML("afterbegin", btns.join(""));
       return;
     }
+    if (FP_DOCX.has(ext)) { await _fpRenderDocx(url); return; }
+    if (FP_PDF.has(ext)) { await _fpRenderPdf(url); return; }
+    if (FP_XLSX.has(ext)) { await _fpRenderXlsx(url); return; }
     _fpSetBody('<div class="fp-hint">' + esc(t("二进制文件不预览，可下载查看。")) + "</div>");
   } catch (e) {
     _fpSetBody('<div class="fp-hint">' + esc(t("内容读取失败：") + (e.message || e)) + "</div>");
@@ -6411,22 +6582,82 @@ function fmtSize(n) {
 /* 成品文件行（检查器「成品文件」与主栏「成果」分区共用一套标记）：
  * fc-row：文件行 + 弹窗预览按钮同行排布，避免按钮独占一行参差不齐。
  * 点文件名与点「预览」同款 artPopup 弹窗，行为一致不 surprise。 */
-function artifactsChips(runId, files) {
+function artifactsChips(runId, files, prevRun) {
   return files.map((f) => {
     const isTxt = FP_TXT.has(_fpExt(f.name));   // 文本/代码都有弹窗预览（按代码格式展示）
+    // 与上一版对比（OpenCreator「版本化对比」借鉴）：同名文本文件在上一版
+    // run 也存在时给 diff 入口；prevRun=null（无历史/清单拉取失败）静默不给
+    const diffable = isTxt && prevRun && prevRun.names.has(f.name);
     return '<span class="fc-row">' +
       '<a class="file-chip artifact-file-open" href="' + urlAuth("/api/runs/" + encodeURIComponent(runId) + "/file?name=" +
       encodeURIComponent(f.name)) + '" target="_blank" rel="noopener" ' +
       'title="' + esc(f.name + " · " + fmtSize(f.size)) + '" data-file-run="' + esc(runId) + '" data-file-name="' + esc(f.name) + '" data-file-size="' + (Number(f.size) || 0) + '">' +
       '<i class="fx">' + esc(_fpExt(f.name).slice(0, 4) || "file") + "</i>" +
-      '<span class="p">' + esc(f.name) + "</span><i>" + fmtSize(f.size) + "</i></a>" +
+      '<span class="p">' + esc(f.name) + '</span><i>' + fmtSize(f.size) + "</i></a>" +
       (isTxt ? '<a class="file-chip prev artifact-file-preview" title="' + esc(t("查看内容")) +
         '" data-file-run="' + esc(runId) + '" data-file-name="' + esc(f.name) + '" data-file-size="' + (Number(f.size) || 0) + '">' +
         '<svg class="ico" aria-hidden="true"><use href="#i-book"/></svg>' + t("预览") + "</a>" : "") +
+      (diffable ? '<a class="file-chip prev artifact-file-diff" title="' + esc(t("与上一版对比")) +
+        '" data-file-run="' + esc(runId) + '" data-prev-run="' + esc(prevRun.id) +
+        '" data-file-name="' + esc(f.name) + '" data-file-size="' + (Number(f.size) || 0) + '">' +
+        '<svg class="ico" aria-hidden="true"><use href="#i-git-branch"/></svg>' + t("对比") + "</a>" : "") +
       "</span>";
   }).join("");
 }
 
+/* 两版 diff 弹窗正文（纯函数在 artdiff.js，node 直测）：统一 diff 行 + 长
+ * 相同段折叠；中段超限诚实给整块计数（不装作逐行对齐）。 */
+function artifactDiffBody(a, b) {
+  const d = ArtifactDiff.diff(a, b);
+  if (d.identical) return '<div class="fp-hint">' + esc(t("两版内容一致。")) + "</div>";
+  const gap = (n) => '<div class="dl-gap">… ' + esc(t("{0} 行相同（已折叠）").replace("{0}", n)) + " …</div>";
+  const ln = (cls, s, mark) => '<div class="dl-ln dl-' + cls + '"><i>' + mark + "</i>" + esc(s || "") + "</div>";
+  let html = "";
+  if (d.prefix) html += gap(d.prefix);
+  if (d.oversized) {
+    html += '<div class="dl-gap">' +
+      esc(t("变更过大（旧 {0} 行 → 新 {1} 行），不逐行对齐；可分别打开两版查看。")
+        .replace("{0}", d.oversized.a).replace("{1}", d.oversized.b)) + "</div>";
+  } else {
+    const rows = d.rows || [];
+    let run = 0, runAt = 0;   // 连续相同行折叠：≥6 行合并成一个 gap
+    rows.forEach((r, idx) => {
+      if (r.t === "=") { if (!run) runAt = idx; run++; return; }
+      if (run < 6) for (let k = runAt; k < runAt + run; k++) html += ln("eq", rows[k].s, " ");
+      else html += gap(run);
+      run = 0;
+      html += r.t === "+" ? ln("add", r.s, "+") : ln("del", r.s, "−");
+    });
+    if (run < 6) for (let k = runAt; k < runAt + run; k++) html += ln("eq", rows[k].s, " ");
+    else if (run) html += gap(run);
+  }
+  if (d.suffix) html += gap(d.suffix);
+  return '<pre class="art-diff">' + html + "</pre>";
+}
+
+/* 对比上一版弹窗：取两版文本 → diff 渲染（复用成品弹窗骨架）。 */
+window.artDiffPopup = async function (runId, prevRunId, name) {
+  _fpSaveCtx = null; _fpRawText = ""; _fpDirty = false; _fpCopyText = null;
+  const nm = String(name).split("/").pop();
+  _fpOpen(nm + " · " + t("与上一版对比"),
+    '<i>' + esc(String(prevRunId).slice(0, 8)) + " → " + esc(String(runId).slice(0, 8)) + "</i>", "");
+  _fpSetBody('<div class="fp-hint">' + esc(t("正在取两版内容…")) + "</div>");
+  const u1 = urlAuth("/api/runs/" + encodeURIComponent(prevRunId) + "/file?name=" + encodeURIComponent(name));
+  const u2 = urlAuth("/api/runs/" + encodeURIComponent(runId) + "/file?name=" + encodeURIComponent(name));
+  try {
+    const [r1, r2] = await Promise.all([fetch(u1), fetch(u2)]);
+    if (!r1.ok || !r2.ok) throw new Error("HTTP " + (r1.ok ? r2.status : r1.status));
+    const [a, b] = await Promise.all([r1.text(), r2.text()]);
+    if (!filePopIsOpen()) return;
+    if (a.length + b.length > 4 * 1024 * 1024)
+      _fpSetBody('<div class="fp-hint">' + esc(t("文件过大，不在线对比；可分别打开两版查看。")) + "</div>");
+    else _fpSetBody(artifactDiffBody(a, b));
+  } catch (e) {
+    if (filePopIsOpen())
+      _fpSetBody('<div class="fp-hint">' + esc(t("内容读取失败：") + (e.message || e)) + "</div>");
+  }
+};
+
 async function loadArtifacts(runId) {
   // 双入口同源渲染：检查器「成品文件」TAB + 主栏详情「成果」分区。
   let d;
@@ -6457,7 +6688,20 @@ async function loadArtifacts(runId) {
   }
   const head = '<div class="files-head"><span class="sec-title">' + t("成品文件") + '</span>' +
     '<span class="wd" title="' + esc(t("点击复制")) + '" onclick="copyText(this.textContent)">' + esc(d.workdir) + "</span></div>";
-  const chips = artifactsChips(runId, files);
+  // 上一版 run 的文件清单（详情上下文才有）：同名文本文件给「对比」入口；
+  // 拉不到/无历史静默降级——对比是增强不是闸门
+  let prevRun = null;
+  if (detailOwns && S.detailTaskKey) {
+    const prev = (_taskRunsCache.get(S.detailTaskKey) || []).find((r) => r.id !== runId);
+    if (prev) {
+      try {
+        const pd = await api("/api/runs/" + encodeURIComponent(prev.id) + "/files");
+        if (pd && (pd.files || []).length)
+          prevRun = { id: prev.id, names: new Set(pd.files.map((f2) => f2.name)) };
+      } catch (e) { /* 上一版清单不可用就不给对比 */ }
+    }
+  }
+  const chips = artifactsChips(runId, files, prevRun);
   if (box) box.innerHTML = head + '<div class="file-chips">' + chips + "</div>";
   if (mainBox) { mainBox.classList.remove("hidden");
     mainBox.innerHTML = head + '<div class="file-chips">' + chips + "</div>"; }
@@ -8038,6 +8282,56 @@ window.toggleRdModelMenu = toggleRdModelMenu;
   });
 })();
 
+// 任务总时限（秒）选项：任务信息弹层里的空闲可改项（2026-09-24 戍边骑奴案：
+// 12 章连载默认 1 小时在慢链天跑不完）。值不入轮询重建的 rd-meta，防 select 弹回。
+const TASK_TIMEOUT_CHOICES = [
+  [1800, "30 分钟"], [3600, "1 小时"], [7200, "2 小时"], [10800, "3 小时"],
+  [14400, "4 小时"], [21600, "6 小时"], [43200, "12 小时"], [86400, "24 小时"],
+];
+
+function timeoutLabel(s) {
+  const hit = TASK_TIMEOUT_CHOICES.find((c) => c[0] === Number(s));
+  if (hit) return hit[1];
+  const m = Math.round(Number(s) / 60);
+  return (m >= 60 ? (Math.round(m / 60 * 10) / 10) + " 小时" : m + " 分钟");
+}
+
+function renderTimeoutRow(rcTask, run) {
+  const row = $("rd-timeout-row"), sel = $("rd-timeout");
+  if (!row || !sel) return;
+  if (!rcTask) { row.classList.add("hidden"); return; }
+  row.classList.remove("hidden");
+  const cur = Number(rcTask.timeout_s || 3600);
+  // 选项一次性构建；当前值不在档内时补一项，避免选中丢失
+  const want = TASK_TIMEOUT_CHOICES.map((c) => c[0]).concat(
+    TASK_TIMEOUT_CHOICES.some((c) => c[0] === cur) ? [] : [cur]).join(",");
+  if (sel.dataset.choices !== want) {
+    sel.dataset.choices = want;
+    sel.innerHTML = TASK_TIMEOUT_CHOICES
+      .map((c) => '<option value="' + c[0] + '">' + esc(t(c[1])) + "</option>").join("") +
+      (TASK_TIMEOUT_CHOICES.some((c) => c[0] === cur)
+        ? "" : '<option value="' + cur + '">' + esc(t("自定义 ") + timeoutLabel(cur)) + "</option>");
+  }
+  const busy = ["queued", "running"].indexOf(rcTask.status) >= 0;
+  sel.disabled = busy;
+  // 用户正操作（含失焦瞬间）不回写 value，防轮询把刚选的值弹回旧值
+  if (document.activeElement !== sel) sel.value = String(cur);
+  if (!sel.dataset.bound) {
+    sel.dataset.bound = "1";
+    sel.addEventListener("change", async () => {
+      const task = (S.state && (S.state.tasks || []).find((x) => x.id === rcTask.id)) || rcTask;
+      const patch = { timeout_s: Number(sel.value) || 3600 };
+      if (task.rev != null) patch.expected_rev = task.rev;
+      try {
+        const data = await api("/api/tasks/" + encodeURIComponent(rcTask.id) + "/params", {
+          method: "POST", operation: false, body: JSON.stringify(patch) });
+        if (data && data.rev != null) task.rev = data.rev;
+        task.timeout_s = patch.timeout_s;   // 即时回显，不等轮询
+      } catch (e) { toast(e && e.message ? e.message : "保存失败", true); }
+    });
+  }
+}
+
 async function rdPrefsPush(what) {
   // what: mode|thinking|model（变更源）；写任务参数（空闲态才允许）
   const task = (S.lastRun && S.lastRun.task_id && S.state &&
@@ -8051,16 +8345,29 @@ async function rdPrefsPush(what) {
     patch.direct_model = rdModelMv;
     patch.direct_agent = rdModelAgent;
   }
+  // 修订 CAS（借鉴 WorkDSH 契约纪律）：带上页面所见的任务修订号，别的窗口
+  // 先改过则后端拒绝过期写入；本地提示后由轮询回填最新值——「我改成功了」
+  // 的假象（实际已被人覆盖）就此消失。
+  if (task.rev != null) patch.expected_rev = task.rev;
   try {
-    await api("/api/tasks/" + encodeURIComponent(task.id) + "/params", {
+    const data = await api("/api/tasks/" + encodeURIComponent(task.id) + "/params", {
       method: "POST", operation: false, body: JSON.stringify(patch) });
-  } catch (e) { /* 运行中/网络失败不打断对话，发送前还有兜底 */ }
+    if (data && data.rev != null) task.rev = data.rev;   // 续用凭据：连推时后几次不再过期
+  } catch (e) {
+    if (String((e && e.message) || "").indexOf("已被其他窗口修改") >= 0) {
+      toast(e.message, true);   // 冲突要可见：静默吞掉=又一种假成功
+    }
+    /* 运行中/网络失败不打断对话，发送前还有兜底 */
+  }
 }
 
 async function rdPrefsPushAll() {
-  // 发送前兜底：三个一起推（/chat 开新一轮前调用；失败静默——值已在前端，
-  // 下一轮 poll 的回填也不会覆盖用户刚选的值）
-  await Promise.all([rdPrefsPush("mode"), rdPrefsPush("thinking"), rdPrefsPush("model")]);
+  // 发送前兜底：三个一起推（/chat 开新一轮前调用）。改为顺序推——三次都带
+  // expected_rev，并发推会在第一次成功后让后两次全成过期写入被拒；
+  // 值已在前端，失败静默同前，下一轮 poll 的回填也不会覆盖用户刚选的值。
+  await rdPrefsPush("mode");
+  await rdPrefsPush("thinking");
+  await rdPrefsPush("model");
 }
 
 function drawChatAtts() {
@@ -10753,7 +11060,7 @@ function mkSetView(v) {
 function mkrFilterKey() {
   const q = (($("mkr-search") || {}).value || "").trim().toLowerCase();
   const srcSel = $("mkr-source");
-  return q + "|" + (srcSel ? srcSel.value : "");
+  return q + "|" + (srcSel ? srcSel.value : "") + "|" + (S.mkrInst ? "inst" : "");
 }
 
 /* 搜索防抖：过滤在服务端对全量做，停 350ms 再发请求；只跟当前过滤键变化时重拉首页 */
@@ -10778,6 +11085,7 @@ async function mkrLoadPage(reset) {
   let url = "/api/market/remote?offset=" + (S.mkrOffset || 0) + "&limit=" + MKR_PAGE;
   if (srcSel && srcSel.value) url += "&source=" + encodeURIComponent(srcSel.value);
   if (q) url += "&q=" + encodeURIComponent(q);
+  if (S.mkrInst) url += "&installed=1";
   S.mkrLoading = true;
   let data = null;
   try { data = await api(url); } catch (e) { data = null; }
@@ -10829,11 +11137,20 @@ function renderMarketRemote() {
   const times = (data.sources || []).map((s) => s.fetched_at).filter(Boolean);
   const meta = $("mkr-meta");
   if (meta) meta.textContent = times.length ? t("目录更新于 ") + times.join(" / ") : "";
+  // 「已安装 N」入口：计数是全量已装（未过滤），点击切换只看已安装
+  const instBtn = $("mkr-installed");
+  if (instBtn) {
+    instBtn.textContent = t("已安装 ") + (Number(data.installed_total) || 0);
+    instBtn.classList.toggle("active", !!S.mkrInst);
+    instBtn.setAttribute("aria-pressed", S.mkrInst ? "true" : "false");
+  }
   const items = S.mkrAll || [];
   mkCount(t("已加载 ") + items.length + t(" / 共 ") + data.total + t(" 个"));
   if (!items.length) {
     grid.innerHTML = '<div class="empty">' + (data.total === 0 && !S.mkrOffset && !(($("mkr-search")||{}).value||"").trim() && !(srcSel||{}).value
-      ? t("外部目录还是空的，点「拉取更新」从公开生态获取。")
+      ? (S.mkrInst
+          ? t("还没有从外部目录安装过插件；退出过滤后逛逛目录，安装前会先给你看包内容。")
+          : t("外部目录还是空的，点「拉取更新」从公开生态获取。"))
       : t("没有符合条件插件")) + "</div>";
     const more = $("mkr-more");
     if (more) more.classList.add("hidden");
@@ -10889,15 +11206,73 @@ async function mkrRefresh() {
   btn.textContent = old;
 }
 
+/* 两阶段安装（先看后装）：① 预览——服务端下载+剥离式检查但不落盘，弹框展示
+ * 包内容（文件清单/体量/剥离项/完整性）；② 确认——带 token 安装那份已检内容，
+ * 不重复下载。token 一次性，安装失败弹框保留可重试。 */
 async function mkrInstall(id) {
-  // 安装要现场下载插件包（zip/tarball，实测 10~60s），必须立刻给反馈，
-  // 否则用户以为点了没反应；按钮按 data-mk 定位，失败时由重拉页面复位
   const btn = document.querySelector('#mkr-grid button[data-mk="' + id + '"]');
-  if (btn) { btn.disabled = true; btn.textContent = t("安装中…"); }
-  toast(t("正在下载安装，插件包较大时需要约一分钟…"));
+  if (btn) { btn.disabled = true; btn.textContent = t("检查中…"); }
+  toast(t("正在下载插件包做安装前检查，包较大时需要约一分钟…"));
+  let p;
   try {
-    const r = await api("/api/market/remote/install", { method: "POST",
+    p = await api("/api/market/remote/preview", { method: "POST",
       body: JSON.stringify({ id }), timeout: 180000 });
+  } catch (e) {
+    toast(e.message, true);
+    mkrLoadPage(true);   // 失败重拉复位按钮
+    return;
+  }
+  mkrShowInstallPreview(p);
+}
+
+function _mkrIntegrityText(k) {
+  const map = {
+    verified: t("sha256 已校验"),
+    unverified: t("无哈希（HTTPS 传输 + 纯技能白名单兜底）"),
+    "git-ref": t("按 git ref 锁定"),
+    "git-head": t("跟随仓库 HEAD"),
+  };
+  return map[k] || k || "";
+}
+
+function mkrShowInstallPreview(p) {
+  p = p || {};
+  const rows = (p.file_list || []).map((f) =>
+    '<tr><td title="' + esc(f.path) + '">' + esc(f.path) + '</td><td class="mkpv-chars">' + esc(mkCharsText(f.chars)) + "</td></tr>").join("");
+  const moreF = p.files_total > (p.file_list || []).length
+    ? '<tr><td colspan="2" class="mkpv-more">' + t("…等共 ") + p.files_total + t(" 个文件") + "</td></tr>" : "";
+  const stripped = p.stripped || [];
+  const strippedHtml = stripped.length
+    ? '<div class="mkpv-sec">' + t("将自动剥离（不写入、不执行）：") + "</div>" +
+      '<ul class="mkpv-strip">' + stripped.map((s) => "<li>" + esc(s) + "</li>").join("") +
+      (p.stripped_total > stripped.length
+        ? '<li class="mkpv-more">' + t("…等 ") + p.stripped_total + t(" 个") + "</li>" : "") + "</ul>"
+    : "";
+  const skills = (p.skills || []).map((s) => '<span class="tag">' + esc(s) + "</span>").join("");
+  openModal(t("安装前确认"),
+    '<div class="mkpv">' +
+    '<div class="mkpv-name">' + esc(p.title || p.id || "") + "</div>" +
+    '<div class="mkpv-meta"><span>' + esc(t("来源：") + (p.source || "")) + "</span>" +
+    (p.version ? "<span>v" + esc(p.version) + "</span>" : "") +
+    "<span>" + esc(_mkrIntegrityText(p.integrity)) + "</span></div>" +
+    (skills ? '<div class="mkpv-skills">' + t("包含技能：") + skills + "</div>" : "") +
+    '<div class="mkpv-sum">' + t("共 ") + (p.files_total || 0) + t(" 个文件 · ") + esc(mkCharsText(p.total_chars || 0)) + "</div>" +
+    (rows ? '<table class="mkpv-files"><thead><tr><th>' + t("文件") + "</th><th>" + t("体量") +
+      "</th></tr></thead><tbody>" + rows + moreF + "</tbody></table>" : "") +
+    strippedHtml +
+    '<p class="hint">' + t("安装后运行任务时自动注入提示词；可到「经验库」启停或卸载。") + "</p>" +
+    "</div>",
+    '<button class="ghost" onclick="closeModal()">' + t("取消") + "</button>" +
+    '<button class="primary" id="mkpv-ok" onclick="mkrInstallConfirm(\'' + esc(p.token || "") + '\',\'' + esc(p.id || "") + '\')">' + t("确认安装") + "</button>");
+}
+
+async function mkrInstallConfirm(token, id) {
+  const ok = $("mkpv-ok");
+  if (ok) { ok.disabled = true; ok.textContent = t("安装中…"); }
+  try {
+    const r = await api("/api/market/remote/install", { method: "POST",
+      body: JSON.stringify({ id, token }), timeout: 180000 });
+    closeModal();
     if (r && r.already) toast(t("该插件已安装过"));
     else {
       // 剥离式安装：脚本/钩子/MCP 文件被剔除但技能装上了，如实告知剔除了什么
@@ -10907,8 +11282,13 @@ async function mkrInstall(id) {
           + (stripped.length > 3 ? t(" 等 ") + stripped.length + t(" 个文件") : "")
         : ""));
     }
-  } catch (e) { toast(e.message, true); }
-  mkrLoadPage(true);   // 重装当前过滤页（已安装徽章要翻牌，失败也复位按钮）
+  } catch (e) {
+    toast(e.message, true);
+    const ok2 = $("mkpv-ok");
+    if (ok2) { ok2.disabled = false; ok2.textContent = t("确认安装"); }
+    return;   // 弹框保留：可重试或取消（token 未消费）
+  }
+  mkrLoadPage(true);   // 已安装徽章要翻牌
 }
 
 
@@ -13119,6 +13499,12 @@ document.addEventListener("DOMContentLoaded", () => {
   const bindArtifactClicks = (root) => {
     if (!root) return;
     root.addEventListener("click", (e) => {
+      const diff = e.target.closest(".artifact-file-diff[data-prev-run]");
+      if (diff) {   // 对比上一版：先于通用预览分支（chip 同样带 data-file-run/name）
+        e.preventDefault();
+        artDiffPopup(diff.dataset.fileRun, diff.dataset.prevRun, diff.dataset.fileName || "");
+        return;
+      }
       const file = e.target.closest("[data-file-run][data-file-name]");
       if (!file) return;
       e.preventDefault();
@@ -13541,6 +13927,10 @@ document.addEventListener("DOMContentLoaded", () => {
     mkrLoadPage(true);
   });
   $("mkr-source").addEventListener("change", () => mkrLoadPage(true));
+  $("mkr-installed").addEventListener("click", () => {
+    S.mkrInst = !S.mkrInst;
+    mkrLoadPage(true);
+  });
   $("mkr-refresh").addEventListener("click", mkrRefresh);
   $("mkr-more-btn").addEventListener("click", () => mkrLoadPage(false));
   mkrBindSentinel();

package/app/ui/artdiff.js

@@ -0,0 +1,74 @@
+/* 成品两版对比的纯 diff 计算（OpenCreator「版本化对比」借鉴）。
+ * 独立文件无 DOM 依赖：app.js 用 window.ArtifactDiff 渲染，tests 用
+ * module.exports 直测。算法：公共前后缀修剪 + 中段 LCS（上限保护，
+ * 超限诚实降级为整块替换计数，不装作对齐了）。 */
+(function (root, factory) {
+  var api = factory();
+  if (typeof window !== "undefined") window.ArtifactDiff = api;
+  if (typeof module !== "undefined" && module.exports) module.exports = api;
+})(typeof self !== "undefined" ? self : this, function () {
+  "use strict";
+
+  var MID_CAP = 400;          // 中段行数单边上限
+  var MID_PRODUCT_CAP = 160000; // LCS DP 格子上限（400×400）
+
+  /* LCS 回溯产出统一 diff 行：[{t:"="|"-"/"+", s:行文本}]（只对中段）。 */
+  function lcsRows(A, B) {
+    var n = A.length, m = B.length;
+    var dp = [];
+    for (var k = 0; k <= n; k++) dp.push(new Uint32Array(m + 1));
+    for (var i = n - 1; i >= 0; i--)
+      for (var j = m - 1; j >= 0; j--)
+        dp[i][j] = A[i] === B[j] ? dp[i + 1][j + 1] + 1
+          : (dp[i + 1][j] >= dp[i][j + 1] ? dp[i + 1][j] : dp[i][j + 1]);
+    var rows = [];
+    i = 0; j = 0;
+    while (i < n && j < m) {
+      if (A[i] === B[j]) { rows.push({ t: "=", s: A[i] }); i++; j++; }
+      else if (dp[i + 1][j] >= dp[i][j + 1]) { rows.push({ t: "-", s: A[i] }); i++; }
+      else { rows.push({ t: "+", s: B[j] }); j++; }
+    }
+    while (i < n) { rows.push({ t: "-", s: A[i] }); i++; }
+    while (j < m) { rows.push({ t: "+", s: B[j] }); j++; }
+    return rows;
+  }
+
+  /* 对外主口：旧版 a、新版 b → {
+   *   prefix/suffix: 相同行数（渲染端折叠展示），
+   *   identical: 布尔，两版一致，
+   *   rows: 中段统一 diff 行（超限时为 null），
+   *   oversized: {a, b} 超限时中段行数（诚实整块计数） } */
+  function diff(a, b) {
+    a = String(a == null ? "" : a);
+    b = String(b == null ? "" : b);
+    var A = a.split("\n"), B = b.split("\n");
+    var p = 0;
+    while (p < A.length && p < B.length && A[p] === B[p]) p++;
+    var s = 0;
+    while (s < A.length - p && s < B.length - p &&
+           A[A.length - 1 - s] === B[B.length - 1 - s]) s++;
+    var midA = A.slice(p, A.length - s), midB = B.slice(p, B.length - s);
+    var out = { prefix: p, suffix: s, identical: !midA.length && !midB.length,
+                rows: null, oversized: null };
+    if (out.identical) return out;
+    if (midA.length > MID_CAP || midB.length > MID_CAP ||
+        midA.length * midB.length > MID_PRODUCT_CAP) {
+      out.oversized = { a: midA.length, b: midB.length };
+      return out;
+    }
+    out.rows = lcsRows(midA, midB);
+    return out;
+  }
+
+  /* rows → 摘要计数（+x/-y，渲染端徽章用）。 */
+  function counts(d) {
+    var add = 0, del = 0;
+    if (d.oversized) return { add: d.oversized.b, del: d.oversized.a };
+    (d.rows || []).forEach(function (r) {
+      if (r.t === "+") add++; else if (r.t === "-") del++;
+    });
+    return { add: add, del: del };
+  }
+
+  return { diff: diff, counts: counts, lcsRows: lcsRows };
+});