@noob-stupid/dsh-plugin-console 0.3.33 → 0.3.46

package/README.md

@@ -1,5 +1,12 @@
 > **English**: [README.md](README.md) | **中文**: [README.zh.md](README.zh.md)
 
+> **📢 npm release delayed to Sep 15, 2026**
+>
+> npm still serves **0.3.33** of `@noob-stupid/dsh-plugin-console`; **the latest (v0.3.46) will be published on 2026-09-15**.
+> Until then, get it straight from this repo / the [v0.3.46 release](https://github.com/Noob-stupid/dsh-plugin-hub/releases/tag/v0.3.46):
+> copy `lib/` and `package.json` into `~/.dsh/profiles/<profile>/node_modules/@noob-stupid/dsh-plugin-console/` and restart DSH (identical to the npm package).
+> After Sep 15: 「检测更新 → 更新并适配」 in the console, or `dsh plugin add @noob-stupid/dsh-plugin-console`.
+
 ---
 
 <img width="1170" height="609" alt="image" src="https://github.com/user-attachments/assets/b802d606-14ba-4151-9956-ff642ed12b0a" />
@@ -299,3 +306,14 @@ See [CHANGELOG.md](CHANGELOG.md).
 ## License
 
 MIT
+
+---
+
+## Community
+
+<img src="./community-group.png" alt="Scan to join the dsh-plugin-hub community group" width="240">
+
+Scan to join the **dsh-plugin-hub community group** (QQ) — usage questions, bug reports, plugin recommendations, and framework-upgrade war stories are all welcome.
+
+> Field reports about the framework upgrade / rollback module (version spans, whether a rollback was clean, config-migration issues) are especially welcome — in the group or in [Discussions](https://github.com/Noob-stupid/dsh-plugin-hub/discussions). Every incident becomes a regression test.
+

package/README.zh.md

@@ -1,5 +1,12 @@
 > **English**: [README.md](README.md) | **中文**: [README.zh.md](README.zh.md)
 
+> **📢 npm 版本顺延到 9 月 15 日发布**
+>
+> npm 上 `@noob-stupid/dsh-plugin-console` 目前仍是 **0.3.33**；**最新版（v0.3.46）将于 2026-09-15 发布到 npm**。
+> 这几天想用新版，直接从本仓库 / [v0.3.46 Release](https://github.com/Noob-stupid/dsh-plugin-hub/releases/tag/v0.3.46) 取源码：
+> 把 `lib/` 与 `package.json` 放进 `~/.dsh/profiles/<profile>/node_modules/@noob-stupid/dsh-plugin-console/` 后重启 DSH 即可（内容与 npm 包一致）。
+> 9/15 之后在控制台点「检测更新 → 更新并适配」，或 `dsh plugin add @noob-stupid/dsh-plugin-console`。
+
 ---
 
 <img width="1170" height="609" alt="image" src="https://github.com/user-attachments/assets/b802d606-14ba-4151-9956-ff642ed12b0a" />
@@ -266,3 +273,14 @@ git clone https://github.com/Noob-stupid/dsh-plugin-hub /tmp/dsh-plugin-console
 ## License
 
 MIT
+
+---
+
+## 交流群
+
+<img src="./community-group.png" alt="扫码加入 dsh-plugin-hub 交流群" width="240">
+
+扫码加入 **dsh-plugin-hub 交流群** —— 使用问题、Bug 反馈、插件推荐、框架升级踩坑，都欢迎在群里聊。
+
+> 框架升级/回滚模块的实测反馈（版本跨度、回滚是否干净、配置迁移问题）也欢迎在 [Discussions](https://github.com/Noob-stupid/dsh-plugin-hub/discussions) 或群里说——每一个事故和异常都会变成一条回归测试。
+

package/lib/client.js

@@ -124,6 +124,34 @@ window.__ModuleLoader__.load({
 			adaptUnlockBtn: "已适配，立即解锁",
 			adaptUnlockHint: "已安装版本经源码扫描确认适配当前框架：立即移除禁用块并解锁启用",
 			adaptUnlockDone: "已适配解锁：刷新后该行可正常启用",
+			riskyEnableTitle: "强行启用不适配插件？",
+			riskyEnableBody: "该插件在当前框架下被判为不适配（框架升级时已被自动禁用）。强行启用后，DSH 下次启动可能失败、需要手动处理。确认强行启用？",
+			riskyEnableConfirm: "确认强行启用",
+			riskyEnableCancel: "取消",
+			adoptableDetected: "检测到已适配：当前版本 {version} 已通过源码扫描，点「已适配，立即解锁」即可启用（不会自动开启）",
+			compatGateLabel: "兼容门",
+			compatGateAutoDisable: "升级时自动禁用不适配插件",
+			compatGateAutoDetect: "打开时自动检测已适配（仅提示）",
+			compatGateHint: "关掉即回到纯手动：升级只提示、不动你的开关；检测也不提示，由你自己判断",
+			compatGateSaved: "兼容门设置已保存",
+			gateBtn: "门控",
+			gateTitle: "门控：升级时自动禁用不适配插件、打开时自动检测已适配",
+			gateModalTitle: "门控（兼容门总开关）",
+			gatePendingInfo: "当前待适配：{n} 行（升级预扫或启动失败隔离记下的，更新插件后可一键解锁）",
+			gatePendingNone: "当前没有待适配的行",
+			fwFailedButUpgraded: "框架本体其实已经升到 {v} 并已生效——失败的只是脚本最后「重启服务」那一步。可点「重启服务」确认，或必要时回滚。",
+			fwPanelBtn: "框架",
+			fwPanelTitle: "框架升级 / 回滚",
+			fwPanelCurrent: "当前版本",
+			fwPanelAvailable: "可升级到 {v}",
+			fwPanelUpToDate: "已是最新（latest {latest} · next {next}）",
+			fwPanelCheckFailed: "版本检查失败：{err}",
+			fwPanelChecking: "检查中…",
+			fwPanelRecheck: "重新检查版本",
+			fwPanelRefreshStatus: "刷新进度",
+			fwPanelNoRecord: "还没有升级记录（这里会常驻显示最近一次升级/回滚的每一步）",
+			fwPanelConfirmBody: "确认升级到 {v}？脚本会自动：备份配置 → 预扫禁用不适配行 → 停服 → 装新版 → 拉起服务；起不来会先隔离重试，最后才整包回滚。",
+			fwRollbackDone: "已回滚到 {v}（当前就是快照版本，没有更早的可回）",
 			migrateTip: "项目已迁移（适配当前框架）",
 			migrateBtn: "迁移并适配",
 			aiEmpowerFrameworkCheck: "框架适配检测",
@@ -467,6 +495,34 @@ window.__ModuleLoader__.load({
 			adaptUnlockBtn: "Adapted - unlock now",
 			adaptUnlockHint: "Installed version passed the source scan for the current framework: unlock immediately",
 			adaptUnlockDone: "Unlocked: refresh and the row is enabled",
+			riskyEnableTitle: "Force-enable an incompatible plugin?",
+			riskyEnableBody: "This plugin is judged incompatible with the current framework (auto-disabled during the upgrade). Force-enabling it may make the next DSH start fail and require manual recovery. Force-enable?",
+			riskyEnableConfirm: "Force enable",
+			riskyEnableCancel: "Cancel",
+			adoptableDetected: "Now compatible: version {version} passed the source scan — click \"Adapted - unlock now\" to enable it (never auto-enabled)",
+			compatGateLabel: "Compat gate",
+			compatGateAutoDisable: "Auto-disable incompatible plugins on upgrade",
+			compatGateAutoDetect: "Detect adapted plugins on open (hint only)",
+			compatGateHint: "Turn off to go fully manual: the upgrade only warns and never touches your switches, and no detection hints are shown",
+			compatGateSaved: "Compat gate settings saved",
+			gateBtn: "Gating",
+			gateTitle: "Gating: auto-disable incompatible plugins on upgrade, detect adapted ones on open",
+			gateModalTitle: "Gating (compat gate master switches)",
+			gatePendingInfo: "Pending adaptation: {n} row(s) — recorded by the upgrade pre-scan or boot quarantine; unlock them after updating the plugin",
+			gatePendingNone: "No rows pending adaptation",
+			fwFailedButUpgraded: "The framework itself is already on {v} and active — only the final \"restart service\" step failed. Use Restart service to confirm, or roll back if needed.",
+			fwPanelBtn: "Framework",
+			fwPanelTitle: "Framework upgrade / rollback",
+			fwPanelCurrent: "Installed",
+			fwPanelAvailable: "Upgrade available: {v}",
+			fwPanelUpToDate: "Up to date (latest {latest} · next {next})",
+			fwPanelCheckFailed: "Version check failed: {err}",
+			fwPanelChecking: "checking…",
+			fwPanelRecheck: "Re-check version",
+			fwPanelRefreshStatus: "Refresh progress",
+			fwPanelNoRecord: "No upgrade record yet (the last upgrade/rollback steps will always be shown here)",
+			fwPanelConfirmBody: "Upgrade to {v}? The script will back up config, pre-disable incompatible rows, stop the service, install the new version and relaunch it; if it fails to start it quarantines and retries first, and only then rolls back the whole tree.",
+			fwRollbackDone: "Already rolled back to {v} (this is the snapshot version; nothing earlier to restore)",
 			migrateTip: "Project migrated (adapted to the current framework)",
 			migrateBtn: "Migrate & adapt",
 			aiEmpowerFrameworkCheck: "Framework compat check",
@@ -813,7 +869,10 @@ window.__ModuleLoader__.load({
 				data = await response.json();
 			} catch {}
 			if (!response.ok || (data !== null && data.ok === false)) {
-				throw new Error(data !== null && typeof data.error === "string" ? data.error : "HTTP " + response.status);
+				const error = new Error(data !== null && typeof data.error === "string" ? data.error : "HTTP " + response.status);
+				// 结构化错误码随错误对象带回（如适配门软禁的 compat-confirm → 前端要弹风险确认）
+				if (data !== null && data.details !== undefined) error.details = data.details;
+				throw error;
 			}
 			return data;
 		}
@@ -1071,6 +1130,8 @@ window.__ModuleLoader__.load({
 			const [state, setState] = react.useState({ status: "loading" });
 			const [busy, setBusy] = react.useState(null);
 			const [adaptUnlocking, setAdaptUnlocking] = react.useState(null);
+			// 待适配行「强行启用」的风险确认态：{ entryId, moduleName, frameworkVersion, checkNote } | null
+			const [riskyConfirm, setRiskyConfirm] = react.useState(null);
 			const [message, setMessage] = react.useState(null);
 			const [reloadHint, setReloadHint] = react.useState(false);
 			const [restartHint, setRestartHint] = react.useState(false);
@@ -1229,18 +1290,79 @@ window.__ModuleLoader__.load({
 					);
 				}, 3000);
 			};
+			// 功能包 → [框架] 常驻面板（用户要求：卡片被关掉后就找不回来了，框架升级/回滚要常驻可入口）
+			const [fwPanelOpen, setFwPanelOpen] = react.useState(false);
+			const [fwCheck, setFwCheck] = react.useState(null);
+			const [fwCheckBusy, setFwCheckBusy] = react.useState(false);
+			const [fwConfirmPanel, setFwConfirmPanel] = react.useState(false);
+			// 面板里的状态刷新：**无视**「终态已关闭」标记——卡片可以被永久关掉，面板必须永远能查到真相
+			const fwStatusRefresh = () => {
+				call("/plugin-console/framework-upgrade-status").then(
+					(data) => {
+						if (data && typeof data.status === "string") {
+							setFrameworkStatus(data);
+							if (data.status !== "done" && data.status !== "failed") pollFrameworkStatus();
+						}
+					},
+					() => {},
+				);
+			};
+			const fwCheckRefresh = (refresh) => {
+				setFwCheckBusy(true);
+				call("/plugin-console/framework-check", refresh === true ? { refresh: true } : {}).then(
+					(data) => { setFwCheckBusy(false); if (data && data.ok === true) setFwCheck(data); },
+					(error) => { setFwCheckBusy(false); setMessage(t("failed") + "：" + friendlyGithubError(error).message); },
+				);
+			};
+			const doFrameworkRollback = () => {
+				setFrameworkUpgrading(true);
+				call("/plugin-console/framework-rollback", {}).then(
+					(data) => {
+						setFrameworkUpgrading(false);
+						setMessage(t("frameworkRollbackDone").replace("{from}", String(data?.from ?? "?")));
+						setFrameworkStatus({ status: "rollback", message: t("frameworkRollbackDone").replace("{from}", String(data?.from ?? "?")) });
+						pollFrameworkStatus();
+					},
+					(error) => { setFrameworkUpgrading(false); setMessage(t("failed") + "：" + friendlyGithubError(error).message); },
+				);
+			};
+			// 回滚按钮可用性：已经处在「回滚目标版本」时不再提供回滚（点了等于恢复现状）。
+			// v0.3.41：客户端**自己算**一遍，不只信服务端的 applicable ——
+			// 服务端 0.3.38 还没这个字段时（用户实测「明明版本对了回滚还亮着」），
+			// 只要 /state 里已有 framework.version 与 rollback.from 就能判定，刷新页面即生效。
+			const rollbackInfo = state.status === "ready" ? state.data.rollback : null;
+			const curFwVersion = state.status === "ready" && typeof state.data.framework?.version === "string" ? state.data.framework.version : null;
+			const rollbackUsable = rollbackInfo !== null && rollbackInfo !== undefined
+				&& rollbackInfo.applicable !== false
+				&& !(curFwVersion !== null && rollbackInfo.from !== null && rollbackInfo.from !== undefined && curFwVersion === rollbackInfo.from);
+			// 升级步骤视图（卡片与常驻面板共用；失败时按 stage 标已完成步骤，不整列红叉）
+			const fwStepsView = (st) => {
+				const cur = FW_STEPS.findIndex((s) => s.key === st.status);
+				const failedStage = st.status === "failed"
+					? (st.stage ?? (st.frameworkAtTarget ? "relaunching" : null))
+					: null;
+				const stageIdx = failedStage ? FW_STEPS.findIndex((s) => s.key === failedStage) : -1;
+				return el("ul", { className: styles.market }, FW_STEPS.map((step, idx) => {
+					const state2 = st.status === "done"
+						? "ok"
+						: st.status === "failed"
+							? (stageIdx >= 0 ? (idx < stageIdx ? "ok" : (idx === stageIdx ? "fail" : "wait")) : "fail")
+							: (idx < cur ? "ok" : (idx === cur ? "cur" : "wait"));
+					return el("li", { key: step.key, className: styles.item },
+						el("div", { className: styles.itemTop },
+							el("code", { className: styles.name }, (state2 === "ok" ? "✓ " : state2 === "cur" ? "⟳ " : state2 === "fail" ? "✕ " : "· ") + step.label),
+							state2 === "cur" ? el("span", { className: styles.spinner }) : null));
+				}));
+			};
 			// 挂载/重连后恢复升级进度（若上次升级仍在进行/刚完成）
 			react.useEffect(() => {
 				call("/plugin-console/framework-upgrade-status").then(
 					(data) => {
+						// 状态照收（[框架] 按钮角标与常驻面板都要用）；**卡片是否显示**由 fwShowCard 统一决定，
+						// 不再在这里用 localStorage 标记把状态整个吞掉（那会让角标也瞎掉）。
 						if (data && typeof data.status === "string" && data.status !== "idle") {
-							// 终态（done/failed）且用户此前点过叉号关闭：永久不再恢复显示（localStorage 持久化）
-							let dismissedTerminal = null;
-							try { dismissedTerminal = localStorage.getItem("pc-fw-dismiss-terminal"); } catch {}
-							if (data.status !== dismissedTerminal) {
-								setFrameworkStatus(data);
-								if (data.status !== "done" && data.status !== "failed") pollFrameworkStatus();
-							}
+							setFrameworkStatus(data);
+							if (data.status !== "done" && data.status !== "failed") pollFrameworkStatus();
 						}
 					},
 					() => {},
@@ -1300,6 +1422,8 @@ window.__ModuleLoader__.load({
 			const [toolbarOpen, setToolbarOpen] = react.useState(() => {
 				try { return localStorage.getItem("pc-toolbar-open") === "1"; } catch { return false; }
 			});
+			// 门控面板（用户要求：总开关收进「功能包」里的 [门控] 按钮，不再占已安装列表的表头）
+			const [gateOpen, setGateOpen] = react.useState(false);
 			// 功能包位置:长按拖动,持久化 localStorage(每次打开沿用上次位置)
 			const [toolbarPos, setToolbarPos] = react.useState(() => {
 				try {
@@ -1797,18 +1921,39 @@ window.__ModuleLoader__.load({
 					(error) => setUpdateCheck({ status: "ready", latest: null, source: "npm", error: friendlyGithubError(error).message }),
 				);
 			};
-			const toggle = (entry, enabled) => {
+			const toggle = (entry, enabled, confirmRisky = false) => {
 				setBusy(entry.entryId);
 				setMessage(null);
-				call("/plugin-console/toggle", { entryId: entry.entryId, enabled }).then(
+				call("/plugin-console/toggle", { entryId: entry.entryId, enabled, confirmRisky }).then(
 					() => {
+						setRiskyConfirm(null);
 						setMessage(t(enabled ? "toggledOn" : "toggledOff") + "：" + entry.entryId + "。" + t("autoReload"));
 						// HMR 应用补丁后自动强刷页面，让客户端插件的挂载/卸载即时可见
 						window.setTimeout(() => window.location.reload(), 1500);
 					},
-					(error) => setMessage(t("failed") + "：" + friendlyGithubError(error).message),
+					(error) => {
+						// 适配门软禁（用户定案）：服务端不直接拒绝，而是要求确认 → 弹风险提示，由你决定开不开
+						const details = error !== null && typeof error === "object" ? error.details : null;
+						if (details !== null && details !== undefined && details.code === "compat-confirm") {
+							setRiskyConfirm({ entryId: entry.entryId, moduleName: details.moduleName ?? entry.moduleName ?? null, frameworkVersion: details.frameworkVersion ?? null, checkNote: details.checkNote ?? null });
+							return;
+						}
+						setMessage(t("failed") + "：" + friendlyGithubError(error).message);
+					},
 				).finally(() => setBusy(null));
 			};
+			/** 兼容门总开关：autoDisable（升级时自动禁用不适配）/ autoDetect（打开时自动检测已适配）。 */
+			const setCompatGate = (patch) => {
+				call("/plugin-console/compat-gate", patch).then(
+					(data) => {
+						setState((prev) => (prev !== null && prev.status === "ready"
+							? { ...prev, data: { ...prev.data, compatGate: data.compatGate } }
+							: prev));
+						setMessage(t("compatGateSaved"));
+					},
+					(error) => setMessage(t("failed") + "：" + friendlyGithubError(error).message),
+				);
+			};
 			const levenshtein = (a, b) => {
 				const m = a.length, n = b.length;
 				if (m === 0) return n;
@@ -2469,8 +2614,8 @@ window.__ModuleLoader__.load({
 						setFrameworkUpgrading(false);
 						setConfirmFrameworkUpgrade(false);
 						if (data && data.ok === true) {
-							// 新一轮升级开始：清除上次终态关闭标记（卡片恢复显示）
-							try { localStorage.removeItem("pc-fw-dismiss-terminal"); } catch {}
+							// 新一轮升级开始：让卡片恢复显示（清掉"本次会话隐藏"，运行身份由时间戳自然区分）
+							setFwStatusDismissed(false);
 							setMessage(t("frameworkUpgradeDone")
 								+ (data.hasUpdate === true ? "：" + (data.current ?? "?") + " → " + (data.target ?? data.latest ?? "?") : (data.registryError ? t("frameworkUpgradeCheckFailed") : t("frameworkUpgradeUpToDate")))
 								+ "。备份：" + (data.backupDir ?? "") + "。" + (Array.isArray(data.hints) ? data.hints.join(" ") : ""));
@@ -2561,7 +2706,10 @@ window.__ModuleLoader__.load({
 							detailPanel = el("div", { className: styles.detail },
 								meta !== null ? el("p", { className: styles.desc }, meta.description ?? t("noDetail")) : null,
 								entry.pendingCompat === true
-									? el("p", { className: styles.status, "data-pending": "true" }, t("pendingCompatHint") + (compatInfo && compatInfo.checkNote ? "；已知校验：" + compatInfo.checkNote : ""))
+									? el("p", { className: styles.status, "data-pending": entry.adoptable ? "false" : "true" },
+										entry.adoptable
+											? t("adoptableDetected").replace("{version}", String(entry.adoptable.version ?? "?")).replace("{prev}", String(compatInfo?.version ?? "?"))
+											: t("pendingCompatHint") + (compatInfo && compatInfo.checkNote ? "；已知校验：" + compatInfo.checkNote : ""))
 									: null,
 								meta !== null && meta.version ? el("div", { className: styles.rowTop },
 									el("p", { className: styles.status }, t("versionLabel") + "：" + meta.version),
@@ -3062,13 +3210,29 @@ window.__ModuleLoader__.load({
 					);
 				}
 			}
-			// 升级卡片显示条件：非 idle 且未被关闭。关闭语义——
-			// 终态（done/failed）点叉号 = 永久关闭（localStorage 记录，刷新/重进不再出现）；
-			// 非终态（升级进行中）点叉号 = 仅本次会话隐藏，刷新/重进后仍恢复显示（保持开启卡片）
-			const fwTerminalDismissed = frameworkStatus !== null
-				&& (frameworkStatus.status === "done" || frameworkStatus.status === "failed")
-				&& (() => { try { return localStorage.getItem("pc-fw-dismiss-terminal") === frameworkStatus.status; } catch { return false; } })();
-			const fwShowCard = frameworkStatus !== null && frameworkStatus.status !== "idle" && !fwStatusDismissed && !fwTerminalDismissed;
+			// 升级卡片显示条件（v0.3.40 明确化，2026-09-11 用户连问两次「卡片为什么还在」）：
+			//  - 升级/回滚**进行中** → 显示（实时进度）；
+			//  - 结果**是自愈出来的**（脚本被强杀后按现实判定，用户根本没看着它跑）→ 不弹卡片，
+			//    结果常驻在「功能包 → 框架」里，不打扰人；
+			//  - 结束的卡片点过叉号 → 只关闭**那一次**（按状态文件时间戳认身份），
+			//    下次升级时间戳变了才会再弹；旧实现按 status 字符串记，导致"关了 failed 又冒出 done"。
+			const fwRunKey = frameworkStatus !== null ? String(frameworkStatus.at ?? "") : "";
+			const fwDismissedRun = (() => {
+				try { return frameworkStatus !== null && localStorage.getItem("pc-fw-dismiss-at") === fwRunKey; } catch { return false; }
+			})();
+			const fwTerminal = frameworkStatus !== null && (frameworkStatus.status === "done" || frameworkStatus.status === "failed");
+			const fwShowCard = frameworkStatus !== null && frameworkStatus.status !== "idle" && !fwStatusDismissed
+				&& !fwDismissedRun
+				&& !(fwTerminal && frameworkStatus.reconciled !== undefined);
+			// 门控（兼容门总开关）取值：state 未就绪时按默认「都开」，与服务端默认一致
+			const gateReady = state !== null && state.status === "ready";
+			const gateAutoDisable = !gateReady || (state.data.compatGate ?? {}).autoDisable !== false;
+			const gateAutoDetect = !gateReady || (state.data.compatGate ?? {}).autoDetect !== false;
+			const gatePendingCount = gateReady ? (state.data.compatPending?.pending ?? []).length : 0;
+			// 「功能包 → 框架」按钮角标：升级进行中 ⟳ / 上次失败 ✕ / 有可用更新 ↑（优先级从高到低）
+			const fwRunning = frameworkStatus !== null
+				&& frameworkStatus.status !== "idle" && frameworkStatus.status !== "done" && frameworkStatus.status !== "failed";
+			const fwBadge = fwRunning ? " ⟳" : (frameworkStatus?.status === "failed" ? " ✕" : (fwCheck?.target ? " ↑" : ""));
 			return el("section", { ref: sectionRef, className: styles.section, "aria-busy": state.status === "loading" },
 				state.status === "ready" && state.data.compat && !state.data.compat.supported
 					? el("p", { className: styles.message, "data-error": "true" }, state.data.compat.notice)
@@ -3121,6 +3285,93 @@ window.__ModuleLoader__.load({
 									el("button", { type: "button", className: styles.toggle, disabled: compBusy === c.id, onClick: () => compStatusOne(c.id) }, t("compStatus")),
 									el("button", { type: "button", className: styles.toggle, disabled: !c.uiUrl, title: c.uiUrl ?? "", onClick: () => { if (c.uiUrl) window.open(c.uiUrl, "_blank", "noopener"); } }, t("compOpen"))))))
 					: null,
+				fwPanelOpen
+					? el("div", { className: styles.modalBackdrop, onClick: (event) => { if (event.target === event.currentTarget) { setFwPanelOpen(false); setFwConfirmPanel(false); } } },
+						el("div", { className: styles.modalCard, style: { maxWidth: 560 } },
+							el("div", { className: styles.rowTop, style: { justifyContent: "space-between" } },
+								el("strong", { className: styles.name }, t("fwPanelTitle")),
+								el("button", { type: "button", className: styles.trashBtn, style: { fontSize: 14, padding: "4px 8px" }, title: t("closeModal"), "aria-label": t("closeModal"), onClick: () => { setFwPanelOpen(false); setFwConfirmPanel(false); } }, "✕")),
+							// ① 版本信息：当前 / 可用更新
+							el("p", { className: styles.status },
+								t("fwPanelCurrent") + "：" + (fwCheck?.current ?? (state.status === "ready" ? state.data.framework?.version : null) ?? "?")
+								+ (fwCheckBusy ? "（" + t("fwPanelChecking") + "）" : "")),
+							fwCheck === null
+								? null
+								: fwCheck.target
+									? el("p", { className: styles.status, "data-pending": "true" }, t("fwPanelAvailable").replace("{v}", fwCheck.target) + "（latest " + (fwCheck.latest ?? "—") + " · next " + (fwCheck.next ?? "—") + "）")
+									: fwCheck.registryError
+										? el("p", { className: styles.message, "data-error": "true" }, t("fwPanelCheckFailed").replace("{err}", fwCheck.registryError))
+										: el("p", { className: styles.status }, t("fwPanelUpToDate").replace("{latest}", fwCheck.latest ?? "—").replace("{next}", fwCheck.next ?? "—")),
+							// ② 上次/当前升级记录（卡片可被永久关闭，这里是常驻的真相入口）
+							frameworkStatus !== null && frameworkStatus.status !== "idle"
+								? el("div", { style: { flexDirection: "column", gap: 8, display: "flex" } },
+									el("strong", { className: styles.name }, t("frameworkUpgradeBtn") + " " + (frameworkStatus.status === "done" ? "✓" : (frameworkStatus.status === "failed" ? "✕" : "⟳"))),
+									fwStepsView(frameworkStatus),
+									frameworkStatus.status === "failed" && frameworkStatus.frameworkAtTarget
+										? el("p", { className: styles.status }, t("fwFailedButUpgraded").replace("{v}", frameworkStatus.frameworkAtTarget))
+										: null,
+									frameworkStatus.reconciled
+										? el("p", { className: styles.status, "data-pending": "true" }, "⚠ " + frameworkStatus.reconciled.note)
+										: null,
+									frameworkStatus.stalled && frameworkStatus.note
+										? el("p", { className: styles.message, "data-warn": "true" }, "⚠ " + frameworkStatus.note)
+										: null,
+									frameworkStatus.message ? el("p", { className: styles.status, "data-error": frameworkStatus.status === "failed" ? "true" : undefined }, frameworkStatus.message) : null)
+								: el("p", { className: styles.status }, t("fwPanelNoRecord")),
+							// ③ 操作：升级（两步确认）/ 回滚 / 重启 / 重新检查
+							el("div", { className: styles.rowTop, style: { flexWrap: "wrap" } },
+								fwCheck?.target
+									? (fwConfirmPanel
+										? el("div", { style: { flexDirection: "column", gap: 8, display: "flex", flexBasis: "100%" } },
+											el("p", { className: styles.message, "data-warn": "true" }, t("fwPanelConfirmBody").replace("{v}", fwCheck.target)),
+											el("div", { className: styles.rowTop },
+												el("button", { type: "button", className: styles.toggle, disabled: frameworkUpgrading, onClick: () => { setFwConfirmPanel(false); doFrameworkUpgrade(); } }, frameworkUpgrading ? t("installingLocal") : t("frameworkUpgradeConfirm")),
+												el("button", { type: "button", className: styles.toggle, onClick: () => setFwConfirmPanel(false) }, t("closeModal"))))
+										: el("button", { type: "button", className: styles.toggle, disabled: frameworkUpgrading, title: t("frameworkUpgradeTitle"), onClick: () => setFwConfirmPanel(true) }, t("frameworkUpgradeBtn") + " → v" + fwCheck.target))
+									: null,
+								rollbackUsable
+									? el("button", { type: "button", className: styles.toggle, title: t("frameworkRollbackTitle"), disabled: frameworkUpgrading, onClick: doFrameworkRollback }, t("frameworkRollbackBtn") + " → " + (rollbackInfo.from ?? "?"))
+									: (rollbackInfo !== null && rollbackInfo !== undefined
+										? el("span", { className: styles.status }, t("fwRollbackDone").replace("{v}", String(rollbackInfo.from ?? "?")))
+										: null),
+								el("button", { type: "button", className: styles.toggle, onClick: fwStatusRefresh }, t("fwPanelRefreshStatus")),
+								el("button", { type: "button", className: styles.toggle, disabled: fwCheckBusy, onClick: () => fwCheckRefresh(true) }, fwCheckBusy ? t("fwPanelChecking") : t("fwPanelRecheck"))),
+							el("div", { className: styles.rowTop },
+								el("button", { type: "button", className: styles.toggle, onClick: () => { setMessage(t("restarting")); call("/plugin-console/restart", {}).then(() => { window.setTimeout(() => window.location.reload(), 12000); }, () => {}); } }, t("restartService")))))
+					: null,
+				gateOpen
+					? el("div", { className: styles.modalBackdrop, onClick: (event) => { if (event.target === event.currentTarget) setGateOpen(false); } },
+						el("div", { className: styles.modalCard, style: { maxWidth: 520 } },
+							el("div", { className: styles.rowTop, style: { justifyContent: "space-between" } },
+								el("strong", { className: styles.name }, t("gateModalTitle")),
+								el("button", { type: "button", className: styles.trashBtn, style: { fontSize: 14, padding: "4px 8px" }, title: t("closeModal"), "aria-label": t("closeModal"), onClick: () => setGateOpen(false) }, "✕")),
+							el("div", { style: { flexDirection: "column", gap: 12, display: "flex" } },
+								el("div", { className: styles.rowTop, style: { justifyContent: "space-between", gap: 12 } },
+									el("span", { className: styles.status, style: { flex: 1 } }, t("compatGateAutoDisable")),
+									el("div", {
+										className: styles.pcSwitch,
+										"data-on": gateAutoDisable ? "true" : "false",
+										role: "switch",
+										"aria-checked": gateAutoDisable ? "true" : "false",
+										"aria-label": t("compatGateAutoDisable"),
+										title: t("compatGateHint"),
+										onClick: () => setCompatGate({ autoDisable: !gateAutoDisable }),
+									}, el("div", { className: styles.pcSwitchKnob }))),
+								el("div", { className: styles.rowTop, style: { justifyContent: "space-between", gap: 12 } },
+									el("span", { className: styles.status, style: { flex: 1 } }, t("compatGateAutoDetect")),
+									el("div", {
+										className: styles.pcSwitch,
+										"data-on": gateAutoDetect ? "true" : "false",
+										role: "switch",
+										"aria-checked": gateAutoDetect ? "true" : "false",
+										"aria-label": t("compatGateAutoDetect"),
+										title: t("compatGateHint"),
+										onClick: () => setCompatGate({ autoDetect: !gateAutoDetect }),
+									}, el("div", { className: styles.pcSwitchKnob }))),
+								el("p", { className: styles.message }, t("compatGateHint")),
+								el("p", { className: styles.status, "data-pending": gatePendingCount > 0 ? "true" : undefined },
+									gatePendingCount > 0 ? t("gatePendingInfo").replace("{n}", String(gatePendingCount)) : t("gatePendingNone")))))
+					: null,
 				aiOpen
 					? el("div", { className: styles.modalBackdrop },
 						el("div", { className: styles.modalCard, style: { maxWidth: 560 } },
@@ -3247,44 +3498,55 @@ window.__ModuleLoader__.load({
 						el("div", { className: styles.rowTop },
 							el("strong", { className: styles.name }, t("frameworkUpgradeBtn") + " " + (frameworkStatus.status === "done" ? "✓" : (frameworkStatus.status === "failed" ? "✕" : t("installingLocal")))),
 							el("button", { type: "button", className: styles.trashBtn, title: t("closeModal"), "aria-label": t("closeModal"), onClick: () => {
-								// 终态关闭 = 永久（localStorage 持久化）；非终态关闭 = 会话内临时隐藏
-								if (frameworkStatus !== null && (frameworkStatus.status === "done" || frameworkStatus.status === "failed")) {
-									try { localStorage.setItem("pc-fw-dismiss-terminal", frameworkStatus.status); } catch {}
+								// 结束的卡片关闭 = 只关这一次（按运行时间戳认身份）；进行中的关闭 = 仅本会话隐藏
+								if (fwTerminal) {
+									try { localStorage.setItem("pc-fw-dismiss-at", fwRunKey); } catch {}
 								}
 								setFwStatusDismissed(true);
 							} }, "✕")),
-						el("ul", { className: styles.market }, FW_STEPS.map((step, idx) => {
-							const cur = FW_STEPS.findIndex((s) => s.key === frameworkStatus.status);
-							const state2 = frameworkStatus.status === "done" ? "ok" : (frameworkStatus.status === "failed" ? "fail" : (idx < cur ? "ok" : (idx === cur ? "cur" : "wait")));
-							return el("li", { key: step.key, className: styles.item },
-								el("div", { className: styles.itemTop },
-									el("code", { className: styles.name }, (state2 === "ok" ? "✓ " : state2 === "cur" ? "⟳ " : state2 === "fail" ? "✕ " : "· ") + step.label),
-									state2 === "cur" ? el("span", { className: styles.spinner }) : null));
-						})),
+						fwStepsView(frameworkStatus),
+						frameworkStatus.status === "failed" && frameworkStatus.frameworkAtTarget
+							? el("p", { className: styles.status }, t("fwFailedButUpgraded").replace("{v}", frameworkStatus.frameworkAtTarget))
+							: null,
+						frameworkStatus.reconciled
+							? el("p", { className: styles.status, "data-pending": "true" }, "⚠ " + frameworkStatus.reconciled.note)
+							: null,
+						frameworkStatus.stalled && frameworkStatus.note
+							? el("p", { className: styles.message, "data-warn": "true" }, "⚠ " + frameworkStatus.note)
+							: null,
 						frameworkStatus.message ? el("p", { className: styles.status, "data-error": frameworkStatus.status === "failed" ? "true" : undefined }, frameworkStatus.message) : null,
-						(state.status === "ready" && state.data.rollback)
+						rollbackUsable
 							? el("div", { className: styles.rowTop },
 								el("button", {
 									type: "button",
 									className: styles.toggle,
 									title: t("frameworkRollbackTitle"),
 									disabled: frameworkUpgrading,
-									onClick: () => {
-										setFrameworkUpgrading(true);
-										call("/plugin-console/framework-rollback", {}).then(
-											(data) => {
-												setFrameworkUpgrading(false);
-												setMessage(t("frameworkRollbackDone").replace("{from}", String(data?.from ?? "?")));
-												setFrameworkStatus({ status: "rollback", message: t("frameworkRollbackDone").replace("{from}", String(data?.from ?? "?")) });
-												pollFrameworkStatus();
-											},
-											(error) => { setFrameworkUpgrading(false); setMessage(t("failed") + "：" + friendlyGithubError(error).message); },
-										);
-									},
-								}, t("frameworkRollbackBtn") + " → " + (state.data.rollback.from ?? "?")))
+									onClick: doFrameworkRollback,
+								}, t("frameworkRollbackBtn") + " → " + (rollbackInfo.from ?? "?")))
 							: null)
 					: null,
 				message !== null ? el("div", { className: styles.messageRow }, el("p", { className: styles.message }, message), reloadHint ? el("button", { type: "button", className: styles.toggle, onClick: () => window.location.reload() }, t("reloadPage")) : null, restartHint ? el("button", { type: "button", className: styles.toggle, onClick: () => { setMessage(t("restarting")); call("/plugin-console/restart", {}).then(() => { window.setTimeout(() => window.location.reload(), 12000); }, () => {}); } }, t("restartService")) : null) : null,
+				// 适配门「软禁」的风险确认（用户定案：自动禁用，但允许手动强行启用）
+				riskyConfirm !== null
+					? el("div", { className: styles.detail, "data-risky": "true" },
+						el("strong", { className: styles.name, "data-pending": "true" }, t("riskyEnableTitle") + "（" + riskyConfirm.entryId + "）"),
+						el("p", { className: styles.status, "data-pending": "true" }, t("riskyEnableBody")
+							+ (riskyConfirm.frameworkVersion ? "（框架 " + riskyConfirm.frameworkVersion + "）" : "")
+							+ (riskyConfirm.checkNote ? "；判定依据：" + riskyConfirm.checkNote : "")),
+						el("div", { className: styles.rowTop },
+							el("button", {
+								type: "button",
+								className: styles.toggle,
+								disabled: busy === riskyConfirm.entryId,
+								onClick: () => {
+									const target = (state.status === "ready" ? state.data.entries : []).find((e) => e.entryId === riskyConfirm.entryId) ?? null;
+									if (target === null) { setRiskyConfirm(null); return; }
+									toggle(target, true, true);
+								},
+							}, t("riskyEnableConfirm")),
+							el("button", { type: "button", className: styles.toggle, onClick: () => setRiskyConfirm(null) }, t("riskyEnableCancel"))))
+					: null,
 				el("div", { className: styles.marketHead },
 					el("h3", null, mode === "skills"
 						? (searchSource === "github"
@@ -3460,6 +3722,30 @@ setMessage(t("failed") + "：" + (data?.reason ?? "未知"));
 							"aria-label": t("sourcesBtn"),
 							onClick: openSources,
 						}, t("sourcesBtn")),
+						el("button", {
+							type: "button",
+							className: styles.toolItem,
+							"data-active": gateOpen ? "true" : "false",
+							title: t("gateTitle"),
+							"aria-label": t("gateBtn"),
+							onClick: () => setGateOpen((v) => !v),
+						}, t("gateBtn") + (gatePendingCount > 0 ? " " + gatePendingCount : "")),
+						el("button", {
+							type: "button",
+							className: styles.toolItem,
+							"data-active": fwPanelOpen ? "true" : "false",
+							"data-mode": fwRunning ? "true" : "false",
+							title: t("fwPanelTitle"),
+							"aria-label": t("fwPanelBtn"),
+							onClick: () => {
+								setFwPanelOpen((v) => {
+									const next = !v;
+									// 打开时拉一次真实状态（无视卡片的「已关闭」标记）+ 版本检查
+									if (next) { fwStatusRefresh(); if (fwCheck === null) fwCheckRefresh(false); }
+									return next;
+								});
+							},
+						}, t("fwPanelBtn") + fwBadge),
 						el("button", {
 							type: "button",
 							className: styles.toolItem,