duaer-spec 0.27.2 → 0.27.3

package/web/live-dev/app.js

@@ -10,6 +10,7 @@ import {
   setLocale,
   applyDomI18n,
 } from "./i18n.js";
+import { getTheme, initTheme, toggleTheme } from "./theme.mjs";
 import { structuredHtml, escapeHtml, reqEditModel, serializeReqEdit } from "./structured-html.mjs";
 import {
   deriveProjectDeliveryStatus,
@@ -110,6 +111,8 @@ const state = {
   dispatchGraphReady: false,
   dispatchGraphBuilding: false,
   dispatchGraphUrl: null,
+  /** True after at least one successful graph build this desk session (regen copy). */
+  dispatchGraphBuiltOnce: false,
   /** Latest /api/status progress.tasks for dispatch-graph run colors. */
   lastJobProgress: null,
   recommendedWorkerCount: 1,
@@ -231,9 +234,6 @@ const el = {
   settingsClose: document.getElementById("settingsClose"),
   desk: document.getElementById("desk"),
   log: document.getElementById("log"),
-  chatQuickNav: document.getElementById("chatQuickNav"),
-  chatQuickNavMenu: document.getElementById("chatQuickNavMenu"),
-  chatQuickNavWrap: document.getElementById("chatQuickNavWrap"),
   chatEmpty: document.getElementById("chatEmpty"),
   form: document.getElementById("composer"),
   input: document.getElementById("input"),
@@ -448,6 +448,8 @@ const el = {
   cardPanel: document.querySelector(".card-panel"),
   updateNotice: document.getElementById("updateNotice"),
   langSelect: document.getElementById("langSelect"),
+  themeToggle: document.getElementById("themeToggle"),
+  themeToggleLabel: document.getElementById("themeToggleLabel"),
   historyToggle: document.getElementById("historyToggle"),
   employeeToggle: document.getElementById("employeeToggle"),
   employeePanel: document.getElementById("employeePanel"),
@@ -592,69 +594,6 @@ function scrollChatToLatest() {
   el.log.scrollTop = el.log.scrollHeight;
 }
 
-function setChatQuickNavOpen(open) {
-  if (!el.chatQuickNav || !el.chatQuickNavMenu) return;
-  el.chatQuickNav.setAttribute("aria-expanded", open ? "true" : "false");
-  el.chatQuickNavMenu.hidden = !open;
-}
-
-function quickNavTarget(kind) {
-  if (kind === "chat") return el.log;
-  if (kind === "card") {
-    if (el.revisePanel && !el.revisePanel.hidden) return el.revisePanel;
-    return el.confirm || el.cardPanel;
-  }
-  if (kind === "result") {
-    if (el.previewPanel && !el.previewPanel.hidden) return el.previewPanel;
-    if (el.revisePanel && !el.revisePanel.hidden) return el.revisePanel;
-    return el.confirm || el.cardPanel;
-  }
-  if (kind === "progress") {
-    return activeProgressFocusEl() || el.progressCol;
-  }
-  return null;
-}
-
-function jumpQuickNav(kind) {
-  setChatQuickNavOpen(false);
-  if (kind === "chat") {
-    clearPanelUserScroll(el.log);
-    scrollChatToLatest();
-    return;
-  }
-  const target = quickNavTarget(kind);
-  if (!target) return;
-  if (kind === "progress") {
-    clearPanelUserScroll(el.progressCol);
-    scrollPanelToTarget(el.progressCol, target, { smooth: true, force: true });
-    return;
-  }
-  clearPanelUserScroll(el.cardPanel);
-  scrollPanelToTarget(el.cardPanel, target, { smooth: true, force: true });
-}
-
-function wireChatQuickNav() {
-  if (!el.chatQuickNav || el.chatQuickNav.dataset.bound === "1") return;
-  el.chatQuickNav.dataset.bound = "1";
-  el.chatQuickNav.addEventListener("click", (ev) => {
-    ev.stopPropagation();
-    const open = el.chatQuickNav.getAttribute("aria-expanded") !== "true";
-    setChatQuickNavOpen(open);
-  });
-  el.chatQuickNavMenu?.addEventListener("click", (ev) => {
-    const btn = ev.target?.closest?.("[data-nav]");
-    if (!btn) return;
-    ev.preventDefault();
-    jumpQuickNav(btn.getAttribute("data-nav"));
-  });
-  document.addEventListener("click", (ev) => {
-    if (!el.chatQuickNavWrap?.contains(ev.target)) setChatQuickNavOpen(false);
-  });
-  document.addEventListener("keydown", (ev) => {
-    if (ev.key === "Escape") setChatQuickNavOpen(false);
-  });
-}
-
 function syncChatPlaceholder() {
   if (!el.input) return;
   el.input.placeholder =
@@ -888,7 +827,21 @@ function explainChatBlocked() {
   addBubble("bot", msg);
 }
 
+function syncThemeToggleUi() {
+  const theme = getTheme();
+  if (el.themeToggle) {
+    el.themeToggle.dataset.theme = theme;
+    el.themeToggle.setAttribute("aria-pressed", theme === "dark" ? "true" : "false");
+    el.themeToggle.setAttribute("aria-label", t("theme.aria"));
+  }
+  if (el.themeToggleLabel) {
+    el.themeToggleLabel.textContent =
+      theme === "dark" ? t("theme.toLight") : t("theme.toDark");
+  }
+}
+
 function syncDynamicI18n() {
+  syncThemeToggleUi();
   for (const p of state.providers) {
     if (p.id === "custom") p.label = t("provider.custom");
   }
@@ -1019,7 +972,8 @@ function renderModuleTabs() {
   if (!el.moduleTabs) return;
   ensureModulesSeed();
   const list = state.modules;
-  el.moduleTabs.hidden = state.deskKind === "bug" || list.length < 1;
+  // Keep tabs visible in bug mode so prior requirement modules stay reachable.
+  el.moduleTabs.hidden = list.length < 1;
   el.moduleTabs.replaceChildren();
   for (const m of list) {
     const btn = document.createElement("button");
@@ -1031,20 +985,24 @@ function renderModuleTabs() {
     btn.setAttribute("aria-selected", active ? "true" : "false");
     if (active) btn.classList.add("is-active");
     if (m.status === "confirmed") btn.classList.add("is-confirmed");
+    if (m.id === "bug") btn.classList.add("is-bug");
     btn.textContent = `${m.title} · ${statusLabel(m.status)}`;
     btn.addEventListener("click", () => {
       if (m.id === state.activeModuleId) return;
       syncActiveModuleCardFromFields();
       state.activeModuleId = m.id;
       applyActiveModuleToFields();
+      applyConfirmCardChrome();
       resetValidateGate();
       setConfirmFieldsReadonly(
-        m.status === "confirmed" || modulesAllConfirmedLocal(),
+        m.status === "confirmed" ||
+          (modulesAllConfirmedLocal() && m.id !== "bug"),
       );
       renderModuleTabs();
       syncConfirmEnabled();
       if (
         m.status !== "confirmed" &&
+        !(state.deskKind === "bug" && m.id !== "bug") &&
         !modulesAllConfirmedLocal() &&
         state.mode !== "revise"
       ) {
@@ -1082,18 +1040,21 @@ function mergeModulesFromChatPayload(data) {
       externalDeps: String(data.externalDeps || data.modules?.[0]?.card?.externalDeps || activeModule()?.card?.externalDeps || ""),
       perfBudget: String(data.perfBudget || data.modules?.[0]?.card?.perfBudget || activeModule()?.card?.perfBudget || ""),
     };
-    const prev = activeModule();
+    const kept = (state.modules || []).filter((m) => m.id !== "bug");
+    const prevBug = (state.modules || []).find((m) => m.id === "bug");
+    const bugConfirmed = prevBug?.status === "confirmed";
     state.modules = [
+      ...kept,
       {
         id: "bug",
         title: t("card.bugModuleTitle"),
-        status: prev?.status === "confirmed" ? "confirmed" : "draft",
-        card: prev?.status === "confirmed" ? prev.card : card,
+        status: bugConfirmed ? "confirmed" : "draft",
+        card: bugConfirmed ? prevBug.card : card,
         dependsOn: [],
       },
     ];
     state.activeModuleId = "bug";
-    if (prev?.status !== "confirmed") applyActiveModuleToFields();
+    if (!bugConfirmed) applyActiveModuleToFields();
     renderModuleTabs();
     return;
   }
@@ -1268,25 +1229,81 @@ function renderTaskPoolList(tasks) {
   }
 }
 
-function syncOpenTaskGraphButton() {
-  if (!el.openTaskGraph) return;
-  el.openTaskGraph.disabled = !state.dispatchGraphReady;
+function syncConfirmWorkersGraphButton() {
+  const btn = el.confirmWorkersGraph;
+  if (!btn) return;
+  const busy = Boolean(state.dispatchGraphBuilding);
+  const locked = Boolean(state.dispatchGraphReady);
+  const regen =
+    !locked &&
+    !busy &&
+    Boolean(state.dispatchGraphBuiltOnce);
+  btn.disabled = busy || locked;
+  btn.setAttribute("aria-busy", busy ? "true" : "false");
+  btn.classList.toggle("is-busy", busy);
+  btn.classList.toggle("is-locked", locked && !busy);
+  btn.classList.toggle("is-regen", regen);
+  if (busy) {
+    btn.textContent = t("dispatch.graphBuilding");
+  } else if (locked) {
+    btn.textContent = t("dispatch.confirmWorkersLocked");
+  } else if (regen) {
+    btn.textContent = t("dispatch.regenWorkersGraph");
+  } else {
+    btn.textContent = t("dispatch.confirmWorkersGraph");
+  }
 }
 
-function markDispatchGraphStale() {
-  if (!state.dispatchGraphReady) {
-    syncOpenTaskGraphButton();
-    return;
+function syncOpenTaskGraphButton() {
+  if (el.openTaskGraph) {
+    el.openTaskGraph.disabled = !state.dispatchGraphReady;
   }
+  syncConfirmWorkersGraphButton();
+}
+
+/**
+ * Drop the current 派工图 so the operator must confirm+build again.
+ * @param {{ silent?: boolean, hidePanel?: boolean }} [opts]
+ */
+function clearDispatchGraphState(opts = {}) {
+  const silent = Boolean(opts.silent);
+  const hidePanel = Boolean(opts.hidePanel);
   state.dispatchGraphReady = false;
+  state.dispatchGraphBuilding = false;
+  state.dispatchGraphUrl = null;
+  if (hidePanel && el.dispatch) el.dispatch.hidden = true;
   syncOpenTaskGraphButton();
-  if (el.dispatchErr) {
+  renderWorkerCountList();
+  if (!silent && el.dispatchErr && state.dispatchGraphBuiltOnce) {
     el.dispatchErr.hidden = false;
     el.dispatchErr.textContent = t("dispatch.graphStale");
   }
   schedulePersistProjectDesk();
 }
 
+/**
+ * Start a new kickoff wave: fresh task pool + new 派工图 required.
+ * @param {{ hidePanel?: boolean, silent?: boolean }} [opts]
+ */
+function resetDispatchGraphForNewWave(opts = {}) {
+  state.taskPool = null;
+  if (el.taskPoolList) el.taskPoolList.replaceChildren();
+  if (el.taskPoolEmpty) el.taskPoolEmpty.hidden = false;
+  clearDispatchGraphState({
+    silent: opts.silent !== false,
+    hidePanel: Boolean(opts.hidePanel),
+  });
+}
+
+function markDispatchGraphStale() {
+  if (!state.dispatchGraphReady && !state.dispatchGraphUrl) {
+    syncOpenTaskGraphButton();
+    renderWorkerCountList();
+    return;
+  }
+  clearDispatchGraphState({ silent: false, hidePanel: false });
+}
+
 function applyRecommendedWorkerCount(tasks) {
   const rec = recommendWorkerCount(tasks, { max: 4 });
   state.recommendedWorkerCount = rec;
@@ -1304,12 +1321,15 @@ function renderWorkerCountList() {
   el.workerCountList.replaceChildren();
   const cur = Math.max(1, Math.min(4, Number(state.workerCount) || 1));
   state.workerCount = cur;
+  const chipsLocked =
+    Boolean(state.dispatchGraphReady) || Boolean(state.dispatchGraphBuilding);
   for (let n = 1; n <= 4; n += 1) {
     const b = document.createElement("button");
     b.type = "button";
     b.className = "worker-count-chip";
     b.setAttribute("aria-pressed", n === cur ? "true" : "false");
     b.setAttribute("aria-label", String(n));
+    b.disabled = chipsLocked;
     const num = document.createElement("span");
     num.textContent = String(n);
     b.appendChild(num);
@@ -1323,6 +1343,7 @@ function renderWorkerCountList() {
     sub.textContent = label;
     b.appendChild(sub);
     b.addEventListener("click", () => {
+      if (chipsLocked) return;
       if (state.workerCount !== n) {
         state.workerCount = n;
         markDispatchGraphStale();
@@ -1333,9 +1354,19 @@ function renderWorkerCountList() {
   }
 }
 
-function decomposeTasksFromModules() {
+function confirmedModulesForPool() {
   ensureModulesSeed();
   const confirmed = state.modules.filter((m) => m.status === "confirmed");
+  if (state.deskKind === "bug") {
+    const bug = confirmed.filter((m) => m.id === "bug");
+    return bug.length ? bug : confirmed.slice(0, 1);
+  }
+  return confirmed.filter((m) => m.id !== "bug");
+}
+
+function decomposeTasksFromModules() {
+  ensureModulesSeed();
+  const confirmed = confirmedModulesForPool();
   if (!confirmed.length) {
     state.taskPool = null;
     renderTaskPoolList([]);
@@ -1350,9 +1381,7 @@ function decomposeTasksFromModules() {
   applyRecommendedWorkerCount(annotated);
   renderWorkerCountList();
   renderTaskPoolList(annotated);
-  state.dispatchGraphReady = false;
-  syncOpenTaskGraphButton();
-  schedulePersistProjectDesk();
+  clearDispatchGraphState({ silent: true, hidePanel: false });
   return state.taskPool;
 }
 
@@ -1363,7 +1392,7 @@ function syncTaskPoolPreview() {
 async function syncTaskPoolPreviewAsync() {
   if (!el.taskPoolPreview) return;
   ensureModulesSeed();
-  const confirmed = state.modules.filter((m) => m.status === "confirmed");
+  const confirmed = confirmedModulesForPool();
   if (!confirmed.length || !state.locked || !state.architecture?.confirmed) {
     if (el.taskPoolEmpty) el.taskPoolEmpty.hidden = false;
     renderTaskPoolList([]);
@@ -1378,20 +1407,14 @@ async function syncTaskPoolPreviewAsync() {
 }
 
 function setConfirmWorkersGraphBusy(busy) {
-  const btn = el.confirmWorkersGraph;
-  if (!btn) return;
-  btn.disabled = Boolean(busy);
-  btn.setAttribute("aria-busy", busy ? "true" : "false");
-  btn.classList.toggle("is-busy", Boolean(busy));
-  if (busy) {
-    btn.textContent = t("dispatch.graphBuilding");
-  } else {
-    btn.textContent = t("dispatch.confirmWorkersGraph");
-  }
+  state.dispatchGraphBuilding = Boolean(busy);
+  syncConfirmWorkersGraphButton();
+  renderWorkerCountList();
 }
 
 async function confirmWorkersAndBuildGraph() {
   if (state.dispatchGraphBuilding) return;
+  if (state.dispatchGraphReady) return;
   ensureModulesSeed();
   if (!state.architecture?.confirmed) {
     if (el.dispatchErr) {
@@ -1439,13 +1462,16 @@ async function confirmWorkersAndBuildGraph() {
     }
     state.dispatchGraphUrl = String(data.url || "").trim() || null;
     state.dispatchGraphReady = true;
+    state.dispatchGraphBuiltOnce = true;
     syncOpenTaskGraphButton();
+    renderWorkerCountList();
     schedulePersistProjectDesk();
     addBubble("bot", t("dispatch.graphBuilt", { n: String(workerCount) }));
   } catch (err) {
     state.dispatchGraphReady = false;
     state.dispatchGraphUrl = null;
     syncOpenTaskGraphButton();
+    renderWorkerCountList();
     const msg =
       err instanceof Error ? err.message : t("dispatch.graphBuildFail");
     if (el.dispatchErr) {
@@ -1508,12 +1534,7 @@ async function openDispatchGraphPresent() {
 }
 
 function invalidateDispatchAfterArchChange() {
-  state.dispatchGraphReady = false;
-  state.dispatchGraphBuilding = false;
-  state.dispatchGraphUrl = null;
-  setConfirmWorkersGraphBusy(false);
-  syncOpenTaskGraphButton();
-  if (el.dispatch) el.dispatch.hidden = true;
+  clearDispatchGraphState({ silent: true, hidePanel: true });
 }
 
 function openDispatchCenterPage(projectPath) {
@@ -2048,9 +2069,9 @@ function restoreConfirmCardFromOriginal() {
   syncReqSections();
 }
 
-/** Top confirm card chrome never becomes 改进卡. */
+/** Top confirm card chrome never becomes 改进卡. Labels follow the active tab. */
 function applyConfirmCardChrome() {
-  const bug = state.deskKind === "bug";
+  const bug = activeModule()?.id === "bug";
   if (el.cardMark) el.cardMark.textContent = t(bug ? "card.bugMark" : "card.mark");
   if (el.cardTitle) el.cardTitle.textContent = t(bug ? "card.bugTitle" : "card.title");
   if (el.lblGoal) el.lblGoal.textContent = t(bug ? "card.bugGoal" : "card.goal");
@@ -2122,6 +2143,52 @@ function syncStartBugFixButtons() {
   }
 }
 
+function ensureBugModuleOnDesk() {
+  let kept = (state.modules || []).filter((m) => m && m.id !== "bug");
+  // Recover a readonly requirement tab when an older wipe left only `bug`.
+  if (
+    !kept.length &&
+    state.originalCard &&
+    (state.originalCard.goal || state.originalCard.acceptance)
+  ) {
+    kept = [
+      {
+        id: "main",
+        title: "Main",
+        status: "confirmed",
+        card: {
+          goal: String(state.originalCard.goal || ""),
+          outOfScope: String(state.originalCard.outOfScope || ""),
+          acceptance: String(state.originalCard.acceptance || ""),
+          assumptions: String(state.originalCard.assumptions || ""),
+          deviceMatrix: String(state.originalCard.deviceMatrix || ""),
+          criticalPaths: String(state.originalCard.criticalPaths || ""),
+          exceptionCases: String(state.originalCard.exceptionCases || ""),
+          apiContract: String(state.originalCard.apiContract || ""),
+          envChecklist: String(state.originalCard.envChecklist || ""),
+          dataPrecheck: String(state.originalCard.dataPrecheck || ""),
+          externalDeps: String(state.originalCard.externalDeps || ""),
+          perfBudget: String(state.originalCard.perfBudget || ""),
+        },
+        dependsOn: [],
+      },
+    ];
+  }
+  let bug = (state.modules || []).find((m) => m?.id === "bug");
+  if (!bug) {
+    bug = {
+      id: "bug",
+      title: t("card.bugModuleTitle"),
+      status: "draft",
+      card: { goal: "", outOfScope: "", acceptance: "", assumptions: "" },
+      dependsOn: [],
+    };
+  }
+  state.modules = [...kept, bug];
+  state.activeModuleId = "bug";
+  return bug;
+}
+
 function beginBugFixFromCta() {
   if (state.busy || state.reviseDispatching) return;
   if (!state.projectPath) {
@@ -2131,13 +2198,16 @@ function beginBugFixFromCta() {
   const fromDelivery = Boolean(state.locked || state.lastDeliveryAccepted);
   if (fromDelivery) {
     // Fresh defect card on this project (same spirit as「再改一版」).
+    // Keep prior requirement modules — append a bug tab instead of wiping them.
     state.locked = false;
     state.lastDeliveryAccepted = false;
     state.jobId = null;
     state.dispatchPhase = null;
     state.taskPool = null;
     state.dispatchGraphReady = false;
+    state.dispatchGraphBuilding = false;
     state.dispatchGraphUrl = null;
+    state.dispatchGraphBuiltOnce = false;
     state.reviseLocked = false;
     state.revisePlanConfirmed = false;
     state.architecture = {
@@ -2154,16 +2224,14 @@ function beginBugFixFromCta() {
     if (el.dispatch) el.dispatch.hidden = true;
     setConfirmFieldsReadonly(false);
     state.deskKind = "bug";
-    state.modules = [
-      {
-        id: "bug",
-        title: t("card.bugModuleTitle"),
-        status: "draft",
-        card: { goal: "", outOfScope: "", acceptance: "", assumptions: "" },
-        dependsOn: [],
-      },
-    ];
-    state.activeModuleId = "bug";
+    ensureModulesSeed();
+    ensureBugModuleOnDesk();
+    const bug = state.modules.find((m) => m.id === "bug");
+    if (bug) {
+      bug.status = "draft";
+      bug.card = { goal: "", outOfScope: "", acceptance: "", assumptions: "" };
+      bug.title = t("card.bugModuleTitle");
+    }
     applyActiveModuleToFields();
     applyConfirmCardChrome();
     renderModuleTabs();
@@ -2199,45 +2267,47 @@ function isFeatureIntentText(text) {
 function enterDeskKind(kind) {
   const next = kind === "bug" ? "bug" : "feature";
   if (state.deskKind === next && next === "bug" && !state.locked) {
+    ensureModulesSeed();
+    ensureBugModuleOnDesk();
+    applyActiveModuleToFields();
+    applyConfirmCardChrome();
+    renderModuleTabs();
     syncStartBugFixButtons();
     return;
   }
   if (state.locked && next !== "bug") return;
   state.deskKind = next;
   if (next === "bug") {
-    const card = activeModule()?.card || {
-      goal: "",
-      outOfScope: "",
-      acceptance: "",
-      assumptions: "",
-    };
-    state.modules = [
-      {
-        id: "bug",
-        title: t("card.bugModuleTitle"),
-        status: "draft",
-        card: state.locked
-          ? { goal: "", outOfScope: "", acceptance: "", assumptions: "" }
-          : card,
-        dependsOn: [],
-      },
-    ];
-    state.activeModuleId = "bug";
+    ensureModulesSeed();
+    ensureBugModuleOnDesk();
+    const bug = state.modules.find((m) => m.id === "bug");
+    if (bug && bug.status !== "confirmed") {
+      if (state.locked) {
+        bug.card = { goal: "", outOfScope: "", acceptance: "", assumptions: "" };
+      }
+      bug.title = t("card.bugModuleTitle");
+    }
     applyActiveModuleToFields();
-  } else if (
-    state.modules.length === 1 &&
-    state.modules[0]?.id === "bug"
-  ) {
-    state.modules = [
-      {
-        id: "main",
-        title: "Main",
-        status: "draft",
-        card: { ...state.modules[0].card },
-        dependsOn: [],
-      },
-    ];
-    state.activeModuleId = "main";
+  } else {
+    // Leave bug mode: keep requirement modules; drop the defect tab.
+    const kept = (state.modules || []).filter((m) => m && m.id !== "bug");
+    if (kept.length) {
+      state.modules = kept;
+      if (!kept.some((m) => m.id === state.activeModuleId)) {
+        state.activeModuleId = kept[0].id;
+      }
+    } else {
+      state.modules = [
+        {
+          id: "main",
+          title: "Main",
+          status: "draft",
+          card: { goal: "", outOfScope: "", acceptance: "", assumptions: "" },
+          dependsOn: [],
+        },
+      ];
+      state.activeModuleId = "main";
+    }
     applyActiveModuleToFields();
   }
   applyConfirmCardChrome();
@@ -2986,6 +3056,7 @@ async function persistProjectChat() {
         bugHotfix: Boolean(state.bugHotfix),
         dispatchGraphReady: Boolean(state.dispatchGraphReady),
         dispatchGraphUrl: state.dispatchGraphUrl || null,
+        dispatchGraphBuiltOnce: Boolean(state.dispatchGraphBuiltOnce),
         reviseCard: reviseCardValues(),
         reviseCards: cardsLite,
         bugCards: bugCardsLite,
@@ -3127,6 +3198,7 @@ function clearDeskWorkspace() {
   state.dispatchGraphReady = false;
   state.dispatchGraphBuilding = false;
   state.dispatchGraphUrl = null;
+  state.dispatchGraphBuiltOnce = false;
   state.recommendedWorkerCount = 1;
   state.mode = "specify";
   if (el.moduleTabs) {
@@ -3377,8 +3449,20 @@ async function loadProjectChatIntoUi(projectPath) {
     state.workerCount = Number(data.workerCount) > 0 ? Number(data.workerCount) : 1;
     state.deskKind = data.deskKind === "bug" ? "bug" : "feature";
     state.bugHotfix = Boolean(data.bugHotfix);
+    if (state.deskKind === "bug") {
+      ensureBugModuleOnDesk();
+      if (data.activeModuleId) {
+        const want = String(data.activeModuleId);
+        if (state.modules.some((m) => m.id === want)) {
+          state.activeModuleId = want;
+        }
+      }
+    }
     state.dispatchGraphReady = Boolean(data.dispatchGraphReady);
     state.dispatchGraphUrl = String(data.dispatchGraphUrl || "").trim() || null;
+    state.dispatchGraphBuiltOnce = Boolean(
+      data.dispatchGraphBuiltOnce || data.dispatchGraphReady || data.dispatchGraphUrl,
+    );
     if (state.taskPool?.tasks?.length) {
       state.recommendedWorkerCount = recommendWorkerCount(state.taskPool.tasks, {
         max: 4,
@@ -3782,15 +3866,25 @@ function setSettingsOpen(open) {
     }
   }
   el.settingsPanel.hidden = !want;
+  el.settingsPanel.setAttribute("aria-hidden", want ? "false" : "true");
   if (el.cfgOpen) {
     el.cfgOpen.setAttribute("aria-expanded", want ? "true" : "false");
   }
   if (el.settingsClose) {
     el.settingsClose.hidden = false;
+    el.settingsClose.disabled = false;
   }
   syncDrawerBackdrop();
 }
 
+function closeSettingsDrawer(ev) {
+  if (ev) {
+    ev.preventDefault();
+    ev.stopPropagation();
+  }
+  setSettingsOpen(false);
+}
+
 function fillAliyunFields(cfg) {
   if (el.cfgAliyunId) {
     el.cfgAliyunId.value = "";
@@ -3882,7 +3976,10 @@ function showSetup(cfg) {
   applyProvider(id, { fillEmptyOnly: Boolean(cfg?.baseUrl || cfg?.model) });
   // Always show the desk; open Settings so the operator can fill the model.
   if (el.desk) el.desk.hidden = false;
-  state.ready = false;
+  // Re-open from the gear must not clear an already-ready session.
+  if (!cfg?.ready) {
+    state.ready = false;
+  }
   syncComposerEnabled();
   setSettingsOpen(true);
   if (el.meta) {
@@ -4376,21 +4473,30 @@ el.clearAwsCfg?.addEventListener("click", () => {
 });
 
 el.cfgOpen?.addEventListener("click", () => {
-  const open = el.settingsPanel?.hidden !== false;
-  if (open) {
+  if (el.settingsPanel?.hidden) {
     showSetup({
       ...(state.lastCfg || {}),
       providers: state.providers,
       provider: state.providerId || state.lastCfg?.provider,
     });
-  } else if (state.ready) {
-    setSettingsOpen(false);
+  } else {
+    closeSettingsDrawer();
   }
 });
 
-el.settingsClose?.addEventListener("click", () => {
-  if (state.ready) setSettingsOpen(false);
-});
+el.settingsClose?.addEventListener("click", closeSettingsDrawer);
+// Capture-phase backup: sticky head / overlays must not swallow 关闭.
+el.settingsPanel?.addEventListener(
+  "click",
+  (ev) => {
+    const t = ev.target;
+    if (!(t instanceof Element)) return;
+    if (t.id === "settingsClose" || t.closest?.("#settingsClose")) {
+      closeSettingsDrawer(ev);
+    }
+  },
+  true,
+);
 
 el.form.addEventListener("submit", (e) => {
   e.preventDefault();
@@ -4875,7 +4981,7 @@ async function autoHandleFromGate(kind, btn) {
 
 async function applyConfirmSuccess(data) {
   if (Array.isArray(data.modules) && data.modules.length) {
-    state.modules = data.modules.map((m) => ({
+    const mapped = data.modules.map((m) => ({
       id: String(m.id),
       title: String(m.title || m.id),
       status: m.status === "confirmed" ? "confirmed" : String(m.status || "draft"),
@@ -4895,6 +5001,29 @@ async function applyConfirmSuccess(data) {
       },
       dependsOn: Array.isArray(m.dependsOn) ? m.dependsOn.map(String) : [],
     }));
+    const bugConfirm =
+      state.deskKind === "bug" ||
+      data.deskKind === "bug" ||
+      mapped.some((m) => m.id === "bug");
+    if (bugConfirm) {
+      // Never let a bug-only server payload wipe prior requirement modules.
+      const kept = (state.modules || []).filter((m) => m && m.id !== "bug");
+      const byId = new Map(kept.map((m) => [m.id, m]));
+      for (const m of mapped) {
+        if (m.id === "bug") continue;
+        byId.set(m.id, m);
+      }
+      const bug = mapped.find((m) => m.id === "bug") || mapped[0];
+      state.modules = bug
+        ? [...byId.values()].filter((m) => m.id !== "bug").concat([
+            bug.id === "bug"
+              ? bug
+              : { ...bug, id: "bug", title: bug.title || t("card.bugModuleTitle") },
+          ])
+        : [...byId.values()];
+    } else {
+      state.modules = mapped;
+    }
   }
   if (data.activeModuleId || data.moduleId) {
     state.activeModuleId = String(data.activeModuleId || data.moduleId);
@@ -4920,7 +5049,11 @@ async function applyConfirmSuccess(data) {
     }
     applyActiveModuleToFields();
   }
-  const allDone = Boolean(data.modulesAllConfirmed) || modulesAllConfirmedLocal();
+  const allDone =
+    Boolean(data.modulesAllConfirmed) ||
+    (state.deskKind === "bug"
+      ? Boolean(state.modules?.some((m) => m.id === "bug" && m.status === "confirmed"))
+      : modulesAllConfirmedLocal());
   state.locked = allDone;
   // Brief is written at kickoff — do not set jobId from module confirm.
   if (data.jobId) state.jobId = data.jobId;
@@ -5709,7 +5842,8 @@ function confirmArchitecture() {
   schedulePersistProjectDesk();
   addBubble("bot", t("arch.hintConfirmed"));
   // Decompose → recommend workers → confirm graph, then launch (incl. revise).
-  void showDispatchPanel();
+  // Always start a new 派工图 wave after architecture confirm.
+  void showDispatchPanel({ forceNewWave: true });
 }
 
 async function autoFixAccept(btn, issues, kind = "confirm") {
@@ -5863,7 +5997,8 @@ async function tryRecoverDispatchDone() {
   }
 }
 
-async function showDispatchPanel() {
+async function showDispatchPanel(opts = {}) {
+  const forceNewWave = Boolean(opts.forceNewWave);
   el.dispatch.hidden = false;
   el.dispatchErr.hidden = true;
   el.dispatchStatus.hidden = true;
@@ -5872,7 +6007,9 @@ async function showDispatchPanel() {
   if (state.projectPath && el.repoPath) {
     el.repoPath.value = state.projectPath;
   }
-  if (!state.taskPool?.tasks?.length) {
+  // Each architecture-confirm wave needs a fresh pool + new 派工图.
+  if (forceNewWave || !state.taskPool?.tasks?.length) {
+    resetDispatchGraphForNewWave({ silent: true, hidePanel: false });
     decomposeTasksFromModules();
   } else {
     applyRecommendedWorkerCount(state.taskPool.tasks);
@@ -6190,7 +6327,7 @@ function openBaselineChange() {
     confirmed: false,
     status: state.architecture.url ? "preview" : "idle",
   };
-  state.dispatchGraphReady = false;
+  clearDispatchGraphState({ silent: true, hidePanel: false });
   if (el.baselineChangeReason) el.baselineChangeReason.value = "";
   if (el.baselineSigner) el.baselineSigner.value = "";
   applyActiveModuleToFields();
@@ -7878,6 +8015,8 @@ function enterReviseMode() {
   state.reviseLocked = false;
   state.reviseDispatching = false;
   state.revisePlanConfirmed = false;
+  // New improve wave — prior 派工图 must not stay locked/ready.
+  resetDispatchGraphForNewWave({ silent: true, hidePanel: true });
   // Keep prior revise dialogue history (do not wipe reviseMessages).
   // Advance to the next iteration card — never overwrite prior reviseCards.
   const nextRev = nextReviseRevisionNumber();
@@ -8271,7 +8410,7 @@ async function confirmReviseAndDispatch() {
       el.reviseErr.hidden = false;
       el.reviseErr.textContent = t("dispatch.needGraphConfirm");
     }
-    void showDispatchPanel();
+    void showDispatchPanel({ forceNewWave: !state.taskPool?.tasks?.length });
     return;
   }
   await dispatchReviseAgent();
@@ -8603,6 +8742,18 @@ document.addEventListener("keydown", (ev) => {
   if (ev.key !== "Escape") return;
   if (el.deployPicker && !el.deployPicker.hidden) {
     closeDeployPicker();
+    return;
+  }
+  if (el.settingsPanel && !el.settingsPanel.hidden) {
+    closeSettingsDrawer();
+    return;
+  }
+  if (el.employeePanel && !el.employeePanel.hidden) {
+    setEmployeeOpen(false);
+    return;
+  }
+  if (el.historyPanel && !el.historyPanel.hidden) {
+    setHistoryOpen(false);
   }
 });
 
@@ -8717,10 +8868,6 @@ function setHistoryOpen(open) {
   if (!el.historyPanel) return;
   const want = Boolean(open);
   if (want && el.settingsPanel && !el.settingsPanel.hidden) {
-    if (!state.ready) {
-      // Cannot open projects over mandatory first-time settings.
-      return;
-    }
     el.settingsPanel.hidden = true;
     if (el.cfgOpen) el.cfgOpen.setAttribute("aria-expanded", "false");
   }
@@ -9121,8 +9268,15 @@ if (el.openTaskGraph) {
 }
 if (el.redecomposeTasks) {
   el.redecomposeTasks.addEventListener("click", () => {
+    const hadGraph =
+      state.dispatchGraphReady ||
+      Boolean(state.dispatchGraphUrl) ||
+      state.dispatchGraphBuiltOnce;
     decomposeTasksFromModules();
-    markDispatchGraphStale();
+    if (hadGraph && el.dispatchErr) {
+      el.dispatchErr.hidden = false;
+      el.dispatchErr.textContent = t("dispatch.graphStale");
+    }
   });
 }
   if (el.confirmWorkersGraph) {
@@ -9154,7 +9308,7 @@ if (el.historyClose) {
 if (el.historyBackdrop) {
   el.historyBackdrop.addEventListener("click", () => {
     if (el.settingsPanel && !el.settingsPanel.hidden) {
-      if (state.ready) setSettingsOpen(false);
+      closeSettingsDrawer();
       return;
     }
     if (el.employeePanel && !el.employeePanel.hidden) {
@@ -9239,6 +9393,14 @@ onLocaleChange(() => {
 });
 
 const initialLocale = initI18n();
+initTheme();
+syncThemeToggleUi();
+if (el.themeToggle) {
+  el.themeToggle.addEventListener("click", () => {
+    toggleTheme();
+    syncThemeToggleUi();
+  });
+}
 if (el.langSelect) {
   el.langSelect.value = initialLocale;
   el.langSelect.addEventListener("change", () => {
@@ -9246,13 +9408,13 @@ if (el.langSelect) {
   });
 }
 applyDomI18n();
+syncThemeToggleUi();
 syncChatPlaceholder();
 wireReqSections();
 syncComposerEnabled();
 renderWorkerCountList();
 wirePanelScrollHold(el.cardPanel);
 wirePanelScrollHold(el.progressCol);
-wireChatQuickNav();
 
 if (el.autoFixCard) {
   el.autoFixCard.addEventListener("click", () => {