codebee 0.1.96 → 0.1.98

package/app/ui/app.js

@@ -4696,12 +4696,127 @@ function renderTaskDetail() {
   setResumeNowBtn(null);   // 退避与否要看 run 数据，先收起防上一个任务残留
   const isTask = ((S.state || {}).tasks || []).some((t2) => t2.id === key);
   if (isTask) {
+    renderProjectMemoryControls(key);
+    renderCheckpointControls(latestSummary.id || "", true);
+    refreshCheckpointRestoreAvailability(latestSummary);
+    if (latestSummary.id && S._checkpointRun !== latestSummary.id) {
+      S._checkpointRun = latestSummary.id;
+      loadRunCheckpoints(latestSummary.id);
+    }
     loadTaskRuns(key, latestSummary);
     return;
   }
   drawTaskDetail(key, ((S.state || {}).runs || []).filter((r) => (r.task_id || r.id) === key));
 }
 
+function renderCheckpointControls(runId, visible) {
+  const box = $("rd-checkpoints");
+  if (!box) return;
+  box.classList.toggle("hidden", !visible || !runId);
+  if (runId && box.dataset.runId !== runId) {
+    box.dataset.runId = runId;
+    box.dataset.hasRestorable = "false";
+    const restore = $("rd-checkpoints-restore");
+    if (restore) restore.classList.add("hidden");
+    box.classList.add("needs-load");
+  }
+}
+
+function refreshCheckpointRestoreAvailability(run) {
+  const box = $("rd-checkpoints");
+  const button = $("rd-checkpoints-restore");
+  if (!box || !button) return;
+  const terminal = !!run && ["done", "failed", "cancelled", "timeout"].includes(run.status);
+  button.classList.toggle("hidden", !terminal || box.dataset.hasRestorable !== "true");
+}
+
+function renderProjectMemoryControls(taskId) {
+  const box = $("rd-project-memory");
+  if (!box) return;
+  const task = ((S.state || {}).tasks || []).find((item) => item.id === taskId);
+  box.classList.toggle("hidden", !task || !task.workdir);
+  if (task && task.workdir && S._projectMemoryTask !== taskId) {
+    S._projectMemoryTask = taskId;
+    loadProjectMemory(taskId);
+  }
+}
+
+window.loadProjectMemory = async function (taskId) {
+  taskId = taskId || S.detailTaskKey || ((S.state || {}).tasks || []).find((item) => item.id === S.lastRunTask?.id)?.id;
+  if (!taskId) return;
+  const requestSeq = S._projectMemorySeq = (S._projectMemorySeq || 0) + 1;
+  const box = $("rd-project-memory-body");
+  if (!box) return;
+  box.textContent = t("正在加载项目记忆…");
+  try {
+    const data = await api("/api/tasks/" + encodeURIComponent(taskId) + "/memory");
+    if (requestSeq !== S._projectMemorySeq) return;
+    if (S.detailTaskKey && S.detailTaskKey !== taskId) return;
+    const entries = data.entries || [];
+    if (!entries.length) { box.innerHTML = '<span class="hint">' + esc(t("暂无项目记忆")) + "</span>"; return; }
+    box.innerHTML = entries.map((entry) => {
+      const canApprove = entry.status === "pending" && !entry.expired && entry.verified;
+      const canRestore = entry.status === "archived" && !entry.expired && entry.verified;
+      const actions = (canApprove ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'approve\',' + Number(entry.version) + ')">' + esc(t("批准")) + "</button><button type=\"button\" class=\"ghost small\" onclick=\"decideProjectMemory('" + jsq(taskId) + "','" + jsq(entry.id) + "','reject'," + Number(entry.version) + ')\">' + esc(t("拒绝")) + "</button>" : "") +
+        (entry.status === "approved" ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'archive\',' + Number(entry.version) + ')">' + esc(t("归档")) + "</button>" : "") +
+        (canRestore ? '<button type="button" class="ghost small" onclick="decideProjectMemory(\'' + jsq(taskId) + '\',\'' + jsq(entry.id) + '\',\'restore\',' + Number(entry.version) + ')">' + esc(t("恢复")) + "</button>" : "");
+      return '<article class="rd-memory-row"><div><strong>' + esc(entry.title || t("项目记忆")) + '</strong><span class="chip">' + esc(entry.status || "") + (entry.expired ? " · " + esc(t("已过期")) : "") + '</span></div><pre>' + esc(entry.content || "") + '</pre><div class="rd-memory-actions">' + actions + "</div></article>";
+    }).join("");
+  } catch (error) { box.innerHTML = '<span class="hint">' + esc(t("加载项目记忆失败：")) + esc(error.message) + "</span>"; }
+};
+
+window.decideProjectMemory = async function (taskId, id, action, version) {
+  try {
+    await api("/api/tasks/" + encodeURIComponent(taskId) + "/memory", {
+      method: "POST", headers: Object.assign({ "Content-Type": "application/json" }, authHeaders()),
+      body: JSON.stringify({ id, action, expected_version: version }),
+    });
+    await loadProjectMemory(taskId);
+  } catch (error) { toast(t("项目记忆操作失败：") + error.message, true); }
+};
+
+window.loadRunCheckpoints = async function (requestedRunId) {
+  const runId = requestedRunId || S.detailRunId || ((S.state || {}).task_latest || {})[S.detailTaskKey]?.id;
+  if (!runId) return;
+  const requestSeq = S._checkpointRequestSeq = (S._checkpointRequestSeq || 0) + 1;
+  const body = $("rd-checkpoints-body");
+  const box = $("rd-checkpoints");
+  box.classList.remove("hidden");
+  body.textContent = t("正在读取文件检查点…");
+  try {
+    const data = await api("/api/runs/" + encodeURIComponent(runId) + "/checkpoints");
+    if (requestSeq !== S._checkpointRequestSeq) return;
+    if (S.detailRunId && S.detailRunId !== runId) return;
+    if (S.detailTaskKey) {
+      const current = ((S.state || {}).task_latest || {})[S.detailTaskKey];
+      if (current && current.id !== runId) return;
+    }
+    const files = data.files && data.files.files || [];
+    const restore = $("rd-checkpoints-restore");
+    const latest = S.detailTaskKey && ((S.state || {}).task_latest || {})[S.detailTaskKey];
+    const run = (S.lastRun && S.lastRun.id === runId) ? S.lastRun : latest;
+    box.dataset.hasRestorable = files.some((file) => file.restorable) ? "true" : "false";
+    refreshCheckpointRestoreAvailability(run);
+    body.innerHTML = (data.files && data.files.warning ? '<p class="hint">' + esc(data.files.warning) + "</p>" : "") +
+      (files.length ? files.map((file) => '<article class="rd-checkpoint-row"><strong>' + esc(file.path) + '</strong><span class="chip">' + esc(file.status) + (file.restorable ? " · " + esc(t("可恢复")) : "") + '</span><pre>' + esc(file.diff || "") + "</pre></article>").join("") : '<span class="hint">' + esc(t("此运行没有文件快照")) + "</span>");
+    box.dataset.runId = runId;
+    box.classList.remove("needs-load");
+  } catch (error) { body.innerHTML = '<span class="hint">' + esc(t("检查点读取失败：")) + esc(error.message) + "</span>"; }
+};
+
+window.restoreRunCheckpoints = async function () {
+  const runId = $("rd-checkpoints")?.dataset.runId;
+  if (!runId || !await uiConfirm(t("恢复会覆盖检查点记录的文件，shell、MCP 和外部服务副作用不保证可回滚。确定继续？"), { ok: t("恢复文件"), danger: true })) return;
+  try {
+    const result = await api("/api/runs/" + encodeURIComponent(runId) + "/checkpoints/restore", {
+      method: "POST", headers: Object.assign({ "Content-Type": "application/json" }, authHeaders()),
+      body: JSON.stringify({ confirm: true }),
+    });
+    toast(t("已恢复 ") + (result.restored || 0) + t(" 个文件") + ((result.conflicts || []).length ? "；" + t("冲突 ") + result.conflicts.join(", ") : ""));
+    await loadRunCheckpoints();
+  } catch (error) { toast(t("恢复失败：") + error.message, true); }
+};
+
 function loadTaskRuns(key, latestSummary) {
   const cached = _taskRunsCache.get(key);
   if (cached) {
@@ -5501,6 +5616,18 @@ async function renderRunDetail() {
   $("btn-share").classList.toggle("hidden", active);   // 分享页：结束后可生成自包含 HTML
   $("btn-talk").classList.toggle("hidden", !(run.task_id && !chatEngineIsDirect(run)));
   const rcTask = ((S.state || {}).tasks || []).find((x) => x.id === run.task_id);
+  if (rcTask) {
+    renderProjectMemoryControls(rcTask.id);
+  } else {
+    const memoryBox = $("rd-project-memory");
+    if (memoryBox) memoryBox.classList.add("hidden");
+  }
+  renderCheckpointControls(run.id, !!rcTask);
+  refreshCheckpointRestoreAvailability(run);
+  if (rcTask && S._checkpointRun !== run.id) {
+    S._checkpointRun = run.id;
+    loadRunCheckpoints(run.id);
+  }
   // 签名守卫（模型页/检查器同款）：数据没变不重绘。详情区是全页最重的
   // 渲染面，此前 SSE 推送+轮询每 8s 无差别整块重写，是「页面一闪一闪、
   // 发布表单填一半被清空」的总根源（2026-09-30 用户实案）。运行中 ETA
@@ -6041,42 +6168,58 @@ function pbBlock(task, platform) {
     if (run && run.status === "running") {
       btns += '<span class="pb-book">' + esc(t("自动发布中 ") + run.done + "/" + run.total) + "</span>";
     } else if (au.pending > 0) {
-      btns += ' <button class="ghost" ' + (busy || !au.guard_ok ? "disabled" : "") +
-        ' title="' + esc(au.guard_ok ? t("按章号顺序逐章填稿（人工模式每点一次填一章，浏览器里提交后再点发下一章）") : au.guard_reason || "") + '"' +
+      // 门禁不再禁用按钮：点了走 pbApiWithQualityOverride 的复审/强制对话，
+      // 死按钮只会让用户无路可走（2026-10-08 实案：guard false 全灰点不了）
+      btns += ' <button class="ghost" ' + (busy ? "disabled" : "") +
+        ' title="' + esc(au.guard_ok ? t("按章号顺序逐章填稿（人工模式每点一次填一章，浏览器里提交后再点发下一章）") : t("护栏提示：") + (au.guard_reason || "")) + '"' +
         ' onclick="pbPublishAll(\'' + esc(task.id) + "', '" + platform + '\')">' +
         t("发布全部待发") + t("（") + au.pending + t("）") + "</button>";
     }
-    // 批量选择：待发章号 chips（默认全选），「发布所选」人工模式 / 「直发所选」
-    // 逐章自动提交（护栏每日上限/连败退避照常生效）。分卷由服务端按卷计划
-    // 自动选/建（volumes.py），界面上不用管卷。
-    const items = (au.items && au.items.length ? au.items : [])
-      .map((x) => Number(x.chapter_no)).filter((n) => n > 0);
-    if (items.length && !run) {
+    // 批量选择：待发章号 chips 按卷分组（卷计划来自服务端 items[].volume），
+    // 「发布所选」人工模式 / 「直发所选」逐章自动提交（护栏照常生效）。
+    // 分卷由服务端按卷计划自动选/建（volumes.py），界面上不用管卷。
+    const its = (au.items && au.items.length ? au.items : [])
+      .map((x) => ({ n: Number(x.chapter_no), v: x.volume || "" }))
+      .filter((x) => x.n > 0);
+    if (its.length && !run) {
       const key = task.id + ":" + platform;
-      const sig = items.join(",");
+      const sig = its.map((x) => x.n).join(",");
       S.pbSel = S.pbSel || {};
       if (!S.pbSel[key] || S.pbSel[key].sig !== sig)
-        S.pbSel[key] = { sig, sel: new Set(items) };
+        S.pbSel[key] = { sig, sel: new Set(its.map((x) => x.n)) };
       const sel = S.pbSel[key].sel;
+      // 连续段按卷名分组；无卷计划的整块平铺不显示卷头
+      const groups = [];
+      for (const x of its) {
+        const g = groups[groups.length - 1];
+        if (g && g.v === x.v) g.ns.push(x.n);
+        else groups.push({ v: x.v, ns: [x.n] });
+      }
       let chips = "";
-      for (const n of items)
-        chips += '<label class="pb-chip' + (sel.has(n) ? " on" : "") + '">' +
-          '<input type="checkbox" ' + (sel.has(n) ? "checked" : "") +
-          ' onchange="pbSelToggle(\'' + esc(task.id) + "','" + platform + "'," + n + ',this.checked)">' +
-          n + "</label>";
+      for (const g of groups) {
+        if (groups.length > 1 || g.v)
+          chips += '<div class="pb-vol">' + esc(g.v || t("未分卷")) + "</div>";
+        for (const n of g.ns)
+          chips += '<label class="pb-chip' + (sel.has(n) ? " on" : "") + '">' +
+            '<input type="checkbox" ' + (sel.has(n) ? "checked" : "") +
+            ' onchange="pbSelToggle(\'' + esc(task.id) + "','" + platform + "'," + n + ',this.checked)">' +
+            n + "</label>";
+      }
       pendHtml += '<div class="pb-pend" data-key="' + esc(key) + '">' +
         '<div class="pb-pend-head">' +
-        '<span>' + esc(t("待发 ")) + items.length + esc(t(" 章（按卷计划自动分卷）")) + "</span>" +
+        '<span>' + esc(t("待发 ")) + its.length + esc(t(" 章（按卷计划自动分卷）")) + "</span>" +
         '<a href="javascript:void(0)" onclick="pbSelAll(\'' + esc(task.id) + "','" + platform + "',true)" + '">' + esc(t("全选")) + "</a>" +
         '<a href="javascript:void(0)" onclick="pbSelAll(\'' + esc(task.id) + "','" + platform + "',false)" + '">' + esc(t("清空")) + "</a>" +
         "</div>" +
         '<div class="pb-pend-chips">' + chips + "</div>" +
         '<div class="pb-pend-btns">' +
-        '<button class="ghost" ' + (busy || !au.guard_ok || !sel.size ? "disabled" : "") +
+        '<button class="ghost" ' + (busy || !sel.size ? "disabled" : "") +
+        ' title="' + esc(au.guard_ok ? "" : t("护栏提示：") + (au.guard_reason || "")) + '"' +
         ' onclick="pbPublishSelected(\'' + esc(task.id) + "','" + platform + '\',false)">' +
         t("发布所选") + t("（") + sel.size + t("）") + "</button>" +
-        '<button class="ghost" ' + (busy || !au.guard_ok || !sel.size ? "disabled" : "") +
-        ' title="' + esc(t("所选章节逐章自动提交（无人值守），护栏每日上限/连败退避照常生效")) + '"' +
+        '<button class="ghost" ' + (busy || !sel.size ? "disabled" : "") +
+        ' title="' + esc(t("所选章节逐章自动提交（无人值守），护栏每日上限/连败退避照常生效") +
+          (au.guard_ok ? "" : "；" + t("护栏提示：") + (au.guard_reason || ""))) + '"' +
         ' onclick="pbPublishSelected(\'' + esc(task.id) + "','" + platform + '\',true)">' +
         t("直发所选") + t("（") + sel.size + t("）") + "</button>" +
         "</div></div>";
@@ -6358,12 +6501,36 @@ window.pbConfirmChapter = async function (taskId, platform, chapterNo) {
   S._pbSig = ""; pbKick();
 };
 
+function pbSelCountSync(key) {
+  // 就地对账：按钮计数/禁用态与全部 chip 勾选态向状态层看齐——重绘链一旦
+  // 断掉（poll 失败/详情上下文切换），勾选与计数也不许脱节（2026-10-08 实案
+  // 「勾了 18 计数 48」即重绘未跟上）。
+  const box = document.querySelector('.pb-pend[data-key="' +
+    String(key).replace(/"/g, "&quot;") + '"]');
+  const ent = (S.pbSel || {})[key];
+  if (!box || !ent) return;
+  for (const b of box.querySelectorAll("button")) {
+    const t = b.textContent || "";
+    if (/（\d+）$/.test(t)) b.textContent = t.replace(/（\d+）$/, "（" + ent.sel.size + "）");
+    b.disabled = ent.sel.size === 0;
+  }
+  for (const c of box.querySelectorAll(".pb-chip")) {
+    const inp = c.querySelector("input");
+    const num = Number((c.textContent || "").trim());
+    if (!inp || !num) continue;
+    const on = ent.sel.has(num);
+    if (inp.checked !== on) inp.checked = on;
+    c.classList.toggle("on", on);
+  }
+}
+
 window.pbSelToggle = function (taskId, platform, no, on) {
   const key = taskId + ":" + platform;
   const ent = (S.pbSel || {})[key];
   if (!ent) return;
   if (on) ent.sel.add(Number(no)); else ent.sel.delete(Number(no));
-  S._pbSig = ""; pbKick();   // 重画刷新按钮计数（勾选态存 S.pbSel 不丢）
+  pbSelCountSync(key);       // 先就地同步，再触发整块重绘
+  S._pbSig = ""; pbKick();
 };
 
 window.pbSelAll = function (taskId, platform, all) {
@@ -6372,6 +6539,7 @@ window.pbSelAll = function (taskId, platform, all) {
   if (!ent) return;
   if (all) for (const n of ent.sig.split(",")) ent.sel.add(Number(n));
   else ent.sel.clear();
+  pbSelCountSync(key);
   S._pbSig = ""; pbKick();
 };
 
@@ -8337,26 +8505,17 @@ function hiveThinkLine(lines) {
   return "";
 }
 
-const hiveSceneTransform = { x: 0, y: 0, zoom: 1 };
-
-function updateHiveSceneTransform() {
-  const scene = $("rd-hive-cells");
-  if (!scene) return;
-  scene.style.setProperty("--scene-x", hiveSceneTransform.x + "px");
-  scene.style.setProperty("--scene-y", hiveSceneTransform.y + "px");
-  scene.style.setProperty("--scene-zoom", String(hiveSceneTransform.zoom));
-}
+/* —— 3D 场景（WebGL 蜂巢塔）控制层：引擎在 hive3d.js，这里只管模式切换/
+ * localStorage 持久化/WebGL 不可用降级，以及把 renderHive 的泳道数据翻译给场景。 —— */
+let hiveScene = null;          // Hive3D 场景实例（懒创建）
+let hiveSceneDead = false;     // WebGL 不可用/上下文丢失——本次页面周期内不再尝试
+let hiveMode = "3d";           // 当前视图模式（orch.hiveView）
+let hiveRunId = "";            // 最近一次 renderHive 的 run.id（尾巴/思考缓存键前缀）
+const hiveLiveMeta = {};       // rel -> { started_at }（3D 芯片秒表用）
+let hiveDialogPoll = null;
+let hiveDialogKey = "";
 
-function setHiveSceneMode(mode) {
-  const scene = $("rd-hive-cells");
-  const viewport = $("rd-hive-viewport");
-  const tools = document.querySelector(".hive-scene-tools");
-  if (!scene || !viewport) return;
-  const is3d = mode !== "2d";
-  scene.classList.toggle("hive-3d", is3d);
-  scene.classList.toggle("hive-2d", !is3d);
-  viewport.classList.toggle("hive-2d", !is3d);
-  if (tools) tools.classList.toggle("hive-2d", !is3d);
+function setHiveSceneButtons(is3d) {
   document.querySelectorAll("[data-hive-view]").forEach((button) => {
     const active = button.dataset.hiveView === (is3d ? "3d" : "2d");
     button.classList.toggle("active", active);
@@ -8364,66 +8523,180 @@ function setHiveSceneMode(mode) {
   });
 }
 
+function ensureHiveScene() {
+  if (hiveScene || hiveSceneDead) return hiveScene;
+  const canvas = $("rd-hive-gl"), overlay = $("rd-hive-overlay");
+  if (!canvas || !overlay || !window.Hive3D) { hiveSceneDead = true; return null; }
+  hiveScene = window.Hive3D.create({
+    canvas, overlay,
+    onCellActivate(rid, rel, cell) { openHiveMonitorLog(rid, rel, cell); },
+    /* 悬停气泡与运行中芯片的实时内容：尾巴/思考来自 hiveTick 的缓存，秒表现算 */
+    cellRefresh(rel) {
+      const key = hiveRunId + "|" + rel;
+      const meta = hiveLiveMeta[rel] || {};
+      return {
+        tail: hiveTails[key] || "",
+        think: hiveThink[key] || "",
+        elapsed: meta.started_at ? hiveElapsed(meta.started_at) : "",
+      };
+    },
+    onFatal() {   // 上下文丢失等不可恢复故障：退回 2D 并禁用 3D 入口
+      hiveSceneDead = true;
+      hiveScene = null;
+      setHiveSceneMode("2d", { silent: true });
+      toast(t("3D 场景不可用，已切换 2D 列表"), true);
+    },
+  });
+  if (!hiveScene) hiveSceneDead = true;
+  return hiveScene;
+}
+
+async function openHiveMonitorLog(runId, rel, cell) {
+  if (!rel) { toast(t("该步骤无日志"), true); return; }
+  const dialog = $("hive-log-dialog"), title = $("hive-log-title"), meta = $("hive-log-meta"), pre = $("hive-log-text"), error = $("hive-log-error");
+  if (!dialog || !title || !meta || !pre) { hiveOpenLog(runId, rel); return; }
+  if (hiveDialogPoll) { clearInterval(hiveDialogPoll); hiveDialogPoll = null; }
+  hiveDialogKey = runId + "|" + rel;
+  title.textContent = cell && cell.role ? t(cell.role) : rdLogStepLabel(runId, rel);
+  const status = cell && cell.status ? t({ running: "运行中", done: "完成", queued: "排队中", failed: "失败", timeout: "超时", cancelled: "已取消" }[cell.status] || cell.status) : "";
+  meta.textContent = [status, cell && cell.displayAgent, cell && (cell.displayElapsed || cell.started_at)].filter(Boolean).join(" · ");
+  pre.textContent = t("加载日志中…");
+  if (error) error.textContent = "";
+  if (typeof dialog.showModal === "function") dialog.showModal(); else dialog.setAttribute("open", "");
+  const load = async () => {
+    try {
+      const r = await api("/api/runs/" + encodeURIComponent(runId) + "/log?step=" + encodeURIComponent(rel) + "&pretty=1");
+      if (hiveDialogKey !== runId + "|" + rel) return;
+      pre.textContent = r.log || (r.step_status === "running" ? t("（等待输出…）") : t("（无输出）"));
+      pre.scrollTop = pre.scrollHeight;
+      if (r.step_status !== "running" && hiveDialogPoll) { clearInterval(hiveDialogPoll); hiveDialogPoll = null; }
+    } catch (e) {
+      if (error) error.textContent = t("日志读取失败：") + (e && e.message ? e.message : "");
+    }
+  };
+  await load();
+  if (cell && cell.status === "running") hiveDialogPoll = setInterval(load, 2500);
+}
+
+function closeHiveMonitorLog() {
+  hiveDialogKey = "";
+  if (hiveDialogPoll) { clearInterval(hiveDialogPoll); hiveDialogPoll = null; }
+  const dialog = $("hive-log-dialog");
+  if (dialog && dialog.open) dialog.close();
+}
+
+function setHiveSceneMode(mode, opts) {
+  const viewport = $("rd-hive-viewport");
+  if (!viewport) return;
+  let is3d = mode !== "2d";
+  if (is3d) {
+    const sc = ensureHiveScene();
+    if (!sc) {
+      is3d = false;
+      if (!(opts && opts.silent)) toast(t("当前环境不支持 WebGL，已切换 2D 列表"), true);
+    }
+  }
+  hiveMode = is3d ? "3d" : "2d";
+  if (hiveScene) hiveScene.setActive(is3d);
+  viewport.classList.toggle("hive-mode-3d", is3d);
+  viewport.classList.toggle("hive-mode-2d", !is3d);
+  const tools = document.querySelector(".hive-scene-tools");
+  if (tools) tools.classList.toggle("hive-2d", !is3d);
+  setHiveSceneButtons(is3d);
+  try { localStorage.setItem("orch.hiveView", hiveMode); } catch (e) { /* 隐私模式等 */ }
+}
+
 function setupHiveSceneControls() {
   const viewport = $("rd-hive-viewport");
-  const scene = $("rd-hive-cells");
-  if (!viewport || !scene || viewport.dataset.controlsReady) return;
+  if (!viewport || viewport.dataset.controlsReady) return;
   viewport.dataset.controlsReady = "true";
-  updateHiveSceneTransform();
-
+  const hiveDialog = $("hive-log-dialog");
+  const hiveClose = $("hive-log-close");
+  if (hiveClose) hiveClose.addEventListener("click", closeHiveMonitorLog);
+  if (hiveDialog) hiveDialog.addEventListener("close", () => {
+    hiveDialogKey = "";
+    if (hiveDialogPoll) { clearInterval(hiveDialogPoll); hiveDialogPoll = null; }
+  });
   document.querySelectorAll("[data-hive-view]").forEach((button) => {
     button.addEventListener("click", () => setHiveSceneMode(button.dataset.hiveView));
   });
   document.querySelectorAll("[data-hive-scene-action]").forEach((button) => {
     button.addEventListener("click", () => {
-      if (button.dataset.hiveSceneAction === "reset") {
-        hiveSceneTransform.x = 0;
-        hiveSceneTransform.y = 0;
-        hiveSceneTransform.zoom = 1;
-      } else {
-        hiveSceneTransform.zoom = Math.max(.65, Math.min(1.55,
-          hiveSceneTransform.zoom + (button.dataset.hiveSceneAction === "zoom-in" ? .1 : -.1)));
-      }
-      updateHiveSceneTransform();
+      if (hiveMode !== "3d" || !hiveScene) return;
+      if (button.dataset.hiveSceneAction === "reset") hiveScene.resetView();
+      else hiveScene.zoomAt(button.dataset.hiveSceneAction === "zoom-in" ? 1 / 1.18 : 1.18);
     });
   });
-
-  let drag = null;
-  viewport.addEventListener("pointerdown", (event) => {
-    if (event.button !== 0 || event.target.closest(".hive-cell, button, a, input, textarea")) return;
-    drag = { id: event.pointerId, x: event.clientX, y: event.clientY,
-      originX: hiveSceneTransform.x, originY: hiveSceneTransform.y };
-    viewport.classList.add("is-dragging");
-    viewport.setPointerCapture(event.pointerId);
-  });
-  viewport.addEventListener("pointermove", (event) => {
-    if (!drag || drag.id !== event.pointerId) return;
-    hiveSceneTransform.x = drag.originX + event.clientX - drag.x;
-    hiveSceneTransform.y = drag.originY + event.clientY - drag.y;
-    updateHiveSceneTransform();
+  let saved = "3d";
+  try { saved = localStorage.getItem("orch.hiveView") || "3d"; } catch (e) { /* ignore */ }
+  setHiveSceneMode(saved === "2d" ? "2d" : "3d", { silent: true });
+}
+
+/* renderHive → 场景数据翻译：泳道=蜂巢塔的一层，格子按状态映射高度/颜色。
+ * 气泡卡 HTML 在这里用 esc() 拼好（场景端 innerHTML 直用，自己不转义）；
+ * 运行中格子的尾巴/思考行留空，由场景每 2Hz 经 cellRefresh 回填。 */
+function hiveSceneSync(run, lanes, byStage) {
+  hiveRunId = run.id;
+  for (const k of Object.keys(hiveLiveMeta)) delete hiveLiveMeta[k];
+  const model = { runId: run.id, lanes: [] };
+  lanes.forEach((stage, i) => {
+    const list = byStage[stage];
+    const hasRun = list.some((s) => s.status === "running");
+    const settled = list.filter((s) => !["running", "queued"].includes(s.status)).length;
+    model.lanes.push({
+      name: stage, count: list.length, settled, active: hasRun,
+      /* 工位悬停气泡（阶段级）：进度 + 最近落定步骤 */
+      tip:
+        '<b class="hg-tip-role">' + esc(stage) + "</b>" +
+        '<i class="hg-tip-who">' + esc(settled + " / " + list.length) +
+        (hasRun ? " · " + esc(t("进行中")) : "") + "</i>" +
+        '<p class="hg-tip-tail">' +
+        esc(list.filter((s) => !["running", "queued"].includes(s.status)).slice(-1).map((s) => s.role || "").join("")) +
+        "</p>" +
+        '<u class="hg-tip-meta">' + esc(t("点击工位看该阶段最新日志")) + "</u>",
+      cells: list.slice(-8).map((s) => {
+        const st = s.status === "queued" ? "queued"
+          : s.status === "running" ? "running"
+          : s.status === "failed" ? "failed"
+          : s.status === "cancelled" ? "cancelled"
+          : s.status === "timeout" ? "timeout" : "done";
+        const who = s.agent_label || s.agent || "";
+        const mdl = String(s.model || "").trim();
+        const whoShow = who + (mdl ? " · " + mdl : "");
+        const rel = s.log || "";
+        if (st === "running") hiveLiveMeta[rel] = { started_at: s.started_at || "" };
+        const concl = String(s.summary || "").replace(/\s+/g, " ").trim();
+        const elapsed = s.duration_s != null ? s.duration_s + "s" : hiveElapsed(s.started_at);
+        const stWord = { running: t("运行中"), done: t("完成"), failed: t("失败"),
+          timeout: t("超时"), cancelled: t("已取消"), queued: t("排队中") }[st] || s.status;
+        const metaBits = [stWord, elapsed, rel ? t("点击格子看日志") : ""].filter(Boolean).join(" · ");
+        const tip =
+          '<b class="hg-tip-role">' + esc(s.role || "") + "</b>" +
+          (whoShow ? '<i class="hg-tip-who">' + esc(whoShow) + "</i>" : "") +
+          '<p class="hg-tip-tail">' + (st === "running" ? "" : esc(concl)) + "</p>" +
+          '<em class="hg-tip-think"></em>' +
+          '<u class="hg-tip-meta">' + esc(metaBits) + "</u>";
+        return {
+          rel, role: s.role || "", status: st, tip,
+          displayTail: st === "running" ? "" : concl,
+          displayStatus: stWord,
+          displayElapsed: elapsed,
+          displayAgent: whoShow,
+        };
+      }),
+    });
   });
-  const endDrag = (event) => {
-    if (!drag || (event && drag.id !== event.pointerId)) return;
-    drag = null;
-    viewport.classList.remove("is-dragging");
-  };
-  viewport.addEventListener("pointerup", endDrag);
-  viewport.addEventListener("pointercancel", endDrag);
-  viewport.addEventListener("lostpointercapture", endDrag);
-  viewport.addEventListener("wheel", (event) => {
-    if (!scene.classList.contains("hive-3d")) return;
-    event.preventDefault();
-    hiveSceneTransform.zoom = Math.max(.65, Math.min(1.55,
-      hiveSceneTransform.zoom * (event.deltaY < 0 ? 1.08 : .92)));
-    updateHiveSceneTransform();
-  }, { passive: false });
+  const sc = ensureHiveScene();
+  if (!sc) return;
+  sc.sync(model);                    // 2D 模式也同步：切回 3D 时数据即 ready（画布未激活零 GPU 开销）
+  sc.setActive(hiveMode === "3d");
 }
 
 window.renderHive = function (run) {
   const box = $("rd-hive");
   if (!box) return;
   const steps = (run && run.steps) || [];
-  if (!run || !steps.length) { box.classList.add("hidden"); stopHiveTick(); return; }
+  if (!run || !steps.length) { box.classList.add("hidden"); stopHiveTick(); if (hiveScene) hiveScene.setActive(false); return; }
   box.classList.remove("hidden");
   setupHiveSceneControls();
   // 按步骤首次出现顺序分泳道（流水线天然有序）
@@ -8551,6 +8824,7 @@ window.renderHive = function (run) {
     if (cellsBox._hiveEnterT) clearTimeout(cellsBox._hiveEnterT);
     cellsBox._hiveEnterT = setTimeout(() => cellsBox.classList.remove("hive-enter"), 1400);
   }
+  hiveSceneSync(run, lanes, byStage);   // WebGL 蜂巢塔吃同一份泳道数据（内部自管激活）
   const live = running.length && (run.status === "running" || run.status === "queued");
   if (hiveClock) { clearInterval(hiveClock); hiveClock = null; }
   if (live) {