@inventec/dsh-copilot-auth 1.2.12 → 1.2.14

package/README.md

@@ -33,7 +33,9 @@
 
 | 本插件 | DSH 实测版本 | authorization 服务 | 说明 |
 |---|---|---|---|
-| v1.2.12+ | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | **交互打磨**：「补充模型」的全选按钮在全选中切换为「取消全选」（任一取消勾选即恢复「全选」）；「重建」风险提示精简为一行；成功路径的「技术详情」计数移除（与弹窗增删列表重复），技术详情仅在真实失败时展示。其余同 v1.2.11 |
+| v1.2.14+ | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | **消除弹窗上下弹跳**：「拉取预览中…」物化指示改为**常驻占位行**（visibility 显隐，不插入/移除节点）——v1.2.13 固定高度解决了整卡伸缩，本版消除指示条插入/移除引起的垂直位移。其余同 v1.2.13 |
+| v1.2.13 | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | **修复模型弹窗勾选闪烁**：勾选/全选触发的物化期间弹窗保持挂载（历史实现切回 `previewing` 导致弹窗整体卸载重挂——卡片闪现「拉取预览中」、滚动位置丢失，实测探针元素直接从 DOM 消失）；弹窗改固定高度三段式（头部/内部滚动/常驻操作栏），尺寸不再随增删列表变化；勾选走本地乐观更新（服务端回显到达后对齐）。其余同 v1.2.12 |
+| v1.2.12 | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | **交互打磨**：「补充模型」的全选按钮在全选中切换为「取消全选」（任一取消勾选即恢复「全选」）；「重建」风险提示精简为一行；成功路径的「技术详情」计数移除（与弹窗增删列表重复），技术详情仅在真实失败时展示。其余同 v1.2.11 |
 | v1.2.11 | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | **界面收敛：移除「重新授权」按钮与 `capabilities.reauthorize` 能力位**（逻辑冗余——已登录只需退出登录，未登录入口本就是「授权登录」；换号/重授权＝先退出再登录两步）。其余同 v1.2.10 |
 | v1.2.10 | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | **退出登录正式可用**：无进行中授权尝试且无未核实风险（风险锁存）时，经确认弹窗清除凭据并**删除后立即复核**（凭据未消失则如实报「退出未完成」）；授权尝试进行中（begin 晚写窗口）与撤回/超时未核实期一律拒绝退出。`/status` 的 `authorization.capabilities.logout` 按可用性动态返回。经主人 2026-10-05 裁决替代 v1.2.8 D-01「退出全禁」策略 |
 | v1.2.9 | `0.1.7-rc.2`+（`0.2.0-rc.1` web 与 `0.2.0-rc.2` desktop 已实测） | runtime 内置，插件不挂载 | **修复 v1.2.8 授权页显示回归**：授权状态机漏接 `fetch`，页面恒显「未登录」、点「授权登录」恒「失败」且请求根本不发出（2026-10-04 实机实证，nginx 全量零 `POST /copilot-auth/start`）。另加：/status 加载失败退避自愈重试（60 秒转手动＋「查询状态」）、失败原因分层展示（网络/网关/响应，不再裸「失败」）、已登录时服务端拒绝替换性授权（409 `already-configured`）且客户端自动恢复已登录视图 |

package/lib/client.js

@@ -193,11 +193,11 @@ function reduce(state, event) {
       const p = state.preview;
       if (event.type === "select") {
         return [{
-          name: "previewing",
+          name: "confirming",
           flags: state.flags ?? initial.flags,
-          operation: p.operation,
-          catalogSource: p.catalogSource,
-          stale: false
+          preview: p,
+          materializing: true,
+          staleNotice: state.staleNotice
         }, {
           type: "preview",
           operation: p.operation,
@@ -207,12 +207,19 @@ function reduce(state, event) {
           confirmEmpty: event.confirmEmpty === true
         }];
       }
+      if (event.type === "preview-ok") {
+        return [{ name: "confirming", flags: state.flags ?? initial.flags, preview: event.preview, staleNotice: state.stale === true, materializing: false }, null];
+      }
+      if (event.type === "preview-fail") {
+        return [{ name: "failed", flags: state.flags ?? initial.flags, error: event.error }, null];
+      }
       if (event.type === "start") {
         return [{
-          name: "previewing",
-          operation: event.operation === "rebuild" ? "rebuild" : p.operation,
-          catalogSource: event.catalogSource,
-          stale: false
+          name: "confirming",
+          flags: state.flags ?? initial.flags,
+          preview: p,
+          materializing: true,
+          staleNotice: state.staleNotice
         }, {
           type: "preview",
           operation: event.operation === "rebuild" ? "rebuild" : p.operation,
@@ -220,6 +227,7 @@ function reduce(state, event) {
         }];
       }
       if (event.type === "confirm") {
+        if (state.materializing) return [state, null];
         const isRebuild = p.operation === "rebuild";
         const emptyTarget = isRebuild && (p.diff?.targetView?.models ?? []).length === 0;
         if (isRebuild && event.second !== true) return [state, null];
@@ -853,13 +861,21 @@ function sampleThemeSurface() {
   const bg = m ? `rgb(${m[1].split(",").slice(0, 3).join(",")})` : "#fff";
   return { bg, fg: cs.color || "inherit" };
 }
-function RefreshModal({ t, flow, onSelect, onConfirm, onCancel, onOverlay }) {
+function RefreshModal({ t, flow, materializing, onSelect, onConfirm, onCancel, onOverlay }) {
   const p = flow.preview;
   const diff = p.diff ?? {};
   const isRebuild = p.operation === "rebuild";
   const emptyTarget = isRebuild && (diff.targetView?.models ?? []).length === 0;
   const candidates = diff.candidates ?? [];
-  const selectedIds = new Set(diff.added ?? []);
+  const [localSel, setLocalSel] = (0, import_react.useState)(null);
+  (0, import_react.useEffect)(() => {
+    setLocalSel(null);
+  }, [p.diff]);
+  const selectedIds = new Set(localSel ?? (diff.added ?? []));
+  const emitSel = (ids) => {
+    setLocalSel(new Set(ids));
+    onSelect(ids);
+  };
   const [stage, setStage] = (0, import_react.useState)(0);
   const cancelRef = (0, import_react.useRef)(null);
   const surface = (0, import_react.useRef)(null);
@@ -894,114 +910,122 @@ function RefreshModal({ t, flow, onSelect, onConfirm, onCancel, onOverlay }) {
     p.catalogSource === "latest" ? t("srcLatest") : p.catalogSource === "overlay" ? t("srcOverlay") : t("srcLocal")
   ].filter(Boolean).join(" \xB7 ");
   const list = (items, style, render) => items.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { opacity: 0.6 }, children: t("none") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { style: styles.diffList, children: items.map((x, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { style: { ...style, ...styles.mono }, children: render ? render(x) : x }, x?.id ?? x ?? i)) });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.modalMask, role: "dialog", "aria-modal": "true", onKeyDown: escCancel, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { ...styles.modal, background: surface.current.bg, color: surface.current.fg }, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h4", { style: styles.modalTitle, children: t(isRebuild ? "rebuildTitle" : "supplementTitle") }),
-    flow.staleNotice && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
-      "\u26A0 ",
-      t("previewStale")
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.modalText, children: sourceLine }),
-    p.evidence?.stale === true && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
-      "\u26A0 ",
-      t("srcStale")
-    ] }),
-    !isRebuild && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("candidates") }),
-        "\uFF08",
-        candidates.length,
-        "\uFF09",
-        candidates.length > 0 && (() => {
-          const allSelected = candidates.every((id) => selectedIds.has(id));
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, height: 24, marginLeft: 10, fontSize: 12 }, onClick: () => onSelect(allSelected ? [] : candidates), children: allSelected ? t("selectNone") : t("selectAll") });
-        })()
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.modalMask, role: "dialog", "aria-modal": "true", onKeyDown: escCancel, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { ...styles.modal, background: surface.current.bg, color: surface.current.fg, height: "min(80vh, 680px)", padding: 0, overflow: "hidden" }, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { padding: "18px 20px 6px" }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h4", { style: styles.modalTitle, children: t(isRebuild ? "rebuildTitle" : "supplementTitle") }),
+      flow.staleNotice && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
+        "\u26A0 ",
+        t("previewStale")
       ] }),
-      list(candidates, styles.added, (id) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center" }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked: selectedIds.has(id), onChange: () => {
-          const next = new Set(selectedIds);
-          if (next.has(id)) next.delete(id);
-          else next.add(id);
-          onSelect([...next]);
-        } }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: id })
-      ] })),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.modalText, children: sourceLine }),
+      p.evidence?.stale === true && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
         "\u26A0 ",
-        t("supplementRisk")
+        t("srcStale")
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: { ...styles.banner, minHeight: 20, visibility: materializing ? "visible" : "hidden" }, children: [
+        "\u24D8 ",
+        t("refreshing")
       ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("addedModels") }),
-      "\uFF08",
-      (diff.added ?? []).length,
-      "\uFF09"
-    ] }),
-    list(diff.added ?? [], styles.added),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("removedModels") }),
-      "\uFF08",
-      (diff.removed ?? []).length,
-      "\uFF09"
-    ] }),
-    list(diff.removed ?? [], styles.removed, (x) => `${x.id} \u2014 ${t(x.reason === "unresolvable" ? "removedUnresolvable" : "removedAccount")}`),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("keptModels") }),
-      "\uFF08",
-      (diff.kept ?? []).length,
-      "\uFF09"
-    ] }),
-    (diff.warnings ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { flex: 1, overflowY: "auto", minHeight: 0, scrollbarGutter: "stable", padding: "0 20px", opacity: materializing ? 0.55 : 1, pointerEvents: materializing ? "none" : "auto" }, children: [
+      !isRebuild && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("candidates") }),
+          "\uFF08",
+          candidates.length,
+          "\uFF09",
+          candidates.length > 0 && (() => {
+            const allSelected = candidates.every((id) => selectedIds.has(id));
+            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, height: 24, marginLeft: 10, fontSize: 12 }, onClick: () => emitSel(allSelected ? [] : candidates), children: allSelected ? t("selectNone") : t("selectAll") });
+          })()
+        ] }),
+        list(candidates, styles.added, (id) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center" }, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked: selectedIds.has(id), onChange: () => {
+            const next = new Set(selectedIds);
+            if (next.has(id)) next.delete(id);
+            else next.add(id);
+            emitSel([...next]);
+          } }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: id })
+        ] })),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+          "\u26A0 ",
+          t("supplementRisk")
+        ] })
+      ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("warnings") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("addedModels") }),
         "\uFF08",
-        diff.warnings.length,
+        (diff.added ?? []).length,
         "\uFF09"
       ] }),
-      list(diff.warnings, styles.skipped, (w) => `${w.id ?? ""} \u2014 ${w.reason ?? ""}`)
-    ] }),
-    isRebuild && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-      "\u26A0 ",
-      t("rebuildRisk")
-    ] }),
-    emptyTarget && stage >= 1 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-      "\u26A0 ",
-      t("clearRisk")
-    ] }),
-    stage === 1 && !emptyTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-      "\u26A0 ",
-      t("secondConfirm")
-    ] }),
-    (p.skipped ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("summary", { children: [
-        t("skippedModels"),
+      list(diff.added ?? [], styles.added),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("removedModels") }),
         "\uFF08",
-        p.skipped.length,
+        (diff.removed ?? []).length,
         "\uFF09"
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { style: styles.diffList, children: p.skipped.map((s) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { style: styles.skipped, children: [
-        s.id,
-        " \u2014 ",
-        s.reason
-      ] }, s.id)) })
-    ] }),
-    p.catalogError && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("summary", { children: t("techDetails") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { ...styles.mono, fontSize: 12 }, children: p.catalogError })
+      list(diff.removed ?? [], styles.removed, (x) => `${x.id} \u2014 ${t(x.reason === "unresolvable" ? "removedUnresolvable" : "removedAccount")}`),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("keptModels") }),
+        "\uFF08",
+        (diff.kept ?? []).length,
+        "\uFF09"
+      ] }),
+      (diff.warnings ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("warnings") }),
+          "\uFF08",
+          diff.warnings.length,
+          "\uFF09"
+        ] }),
+        list(diff.warnings, styles.skipped, (w) => `${w.id ?? ""} \u2014 ${w.reason ?? ""}`)
+      ] }),
+      isRebuild && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+        "\u26A0 ",
+        t("rebuildRisk")
+      ] }),
+      emptyTarget && stage >= 1 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+        "\u26A0 ",
+        t("clearRisk")
+      ] }),
+      stage === 1 && !emptyTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+        "\u26A0 ",
+        t("secondConfirm")
+      ] }),
+      (p.skipped ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("summary", { children: [
+          t("skippedModels"),
+          "\uFF08",
+          p.skipped.length,
+          "\uFF09"
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { style: styles.diffList, children: p.skipped.map((s) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { style: styles.skipped, children: [
+          s.id,
+          " \u2014 ",
+          s.reason
+        ] }, s.id)) })
+      ] }),
+      p.catalogError && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("summary", { children: t("techDetails") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { ...styles.mono, fontSize: 12 }, children: p.catalogError })
+      ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.modalActions, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { padding: "8px 20px 16px" }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.modalActions, children: [
       p.catalogSource === "local" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, marginRight: "auto" }, onClick: onOverlay, children: t("overlayBtn") }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { ref: cancelRef, type: "button", style: { ...styles.button, ...styles.secondary }, onClick: onCancel, children: t("cancel") }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         "button",
         {
           type: "button",
-          style: { ...styles.button, ...styles.primary, ...p.evidence?.stale === true ? { opacity: 0.5, cursor: "not-allowed" } : null },
-          disabled: p.evidence?.stale === true,
+          style: { ...styles.button, ...styles.primary, ...p.evidence?.stale === true || materializing ? { opacity: 0.5, cursor: "not-allowed" } : null },
+          disabled: p.evidence?.stale === true || materializing,
           onClick: confirmClick,
           children: t("applyChanges")
         }
       )
-    ] })
+    ] }) })
   ] }) });
 }
 function RetireDialog({ t, onConfirm, onCancel }) {
@@ -1246,6 +1270,7 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
       {
         t,
         flow,
+        materializing: flow.materializing === true,
         onSelect: (selectedIds) => drive({ type: "select", selectedIds }),
         onConfirm: (opts) => drive({ type: "confirm", ...opts }),
         onCancel: () => drive({ type: "cancel" }),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inventec/dsh-copilot-auth",
-  "version": "1.2.12",
-  "description": "为内置 Copilot 提供方补设备码登录设置页，预置开箱路由；凭据入内置凭据库，模型目录兜底不覆盖定制。v1.2.12：补充模型全选/取消全选互斥切换、重建风险提示精简一行、成功路径技术详情移除（失败诊断保留）。v1.2.10：退出登录正式可用（协议 v2）。适配 DSH 0.1.7+（≤0.1.5 请用 1.1.x）。",
+  "version": "1.2.14",
+  "description": "为内置 Copilot 提供方补设备码登录设置页，预置开箱路由；凭据入内置凭据库，模型目录兜底不覆盖定制。v1.2.14：物化指示改常驻占位行（显隐不挤占布局），消除弹窗上下弹跳。v1.2.13：修复勾选闪烁（弹窗保持挂载＋固定高度）。适配 DSH 0.1.7+（≤0.1.5 请用 1.1.x）。",
   "type": "module",
   "license": "MIT",
   "author": "iasi",

package/src/refresh-flow.mjs

@@ -95,13 +95,15 @@ export function reduce(state, event) {
     case "confirming": {
       const p = state.preview;
       if (event.type === "select") {
-        // 选择变化：从原快照 materialize（服务端重算，沿用原有效期，不重新取数）
+        // 选择变化：从原快照 materialize（服务端重算，沿用原有效期，不重新取数）。
+        // 留在 confirming＋materializing 标记——弹窗保持挂载、不卸载重挂；
+        // 历史实现切回 previewing 导致弹窗整体关闭再打开（勾选闪烁的根因，2026-10-05）。
         return [{
-          name: "previewing",
+          name: "confirming",
           flags: state.flags ?? initial.flags,
-          operation: p.operation,
-          catalogSource: p.catalogSource,
-          stale: false,
+          preview: p,
+          materializing: true,
+          staleNotice: state.staleNotice,
         }, {
           type: "preview",
           operation: p.operation,
@@ -111,13 +113,22 @@ export function reduce(state, event) {
           confirmEmpty: event.confirmEmpty === true,
         }];
       }
+      if (event.type === "preview-ok") {
+        // materialize/切源完成：预览原位替换（新 previewId 绑定新选择）
+        return [{ name: "confirming", flags: state.flags ?? initial.flags, preview: event.preview, staleNotice: state.stale === true, materializing: false }, null];
+      }
+      if (event.type === "preview-fail") {
+        return [{ name: "failed", flags: state.flags ?? initial.flags, error: event.error }, null];
+      }
       if (event.type === "start") {
-        // 显式切源（overlay/local）或切换操作：生成全新预览（不隐式降级，Q7）
+        // 显式切源（overlay/local）或切换操作：生成全新预览（不隐式降级，Q7）。
+        // 同 select：留在 confirming 保持弹窗挂载。
         return [{
-          name: "previewing",
-          operation: event.operation === "rebuild" ? "rebuild" : p.operation,
-          catalogSource: event.catalogSource,
-          stale: false,
+          name: "confirming",
+          flags: state.flags ?? initial.flags,
+          preview: p,
+          materializing: true,
+          staleNotice: state.staleNotice,
         }, {
           type: "preview",
           operation: event.operation === "rebuild" ? "rebuild" : p.operation,
@@ -125,6 +136,7 @@ export function reduce(state, event) {
         }];
       }
       if (event.type === "confirm") {
+        if (state.materializing) return [state, null]; // 物化中不得用旧 previewId 应用
         const isRebuild = p.operation === "rebuild";
         const emptyTarget = isRebuild && (p.diff?.targetView?.models ?? []).length === 0;
         if (isRebuild && event.second !== true) return [state, null]; // 重建需二次确认