@noob-stupid/dsh-plugin-console 0.3.65 → 0.3.67

package/README.md

@@ -336,4 +336,4 @@ The layered-refactor preview lives in its **own repository**: [**`Noob-stupid/ds
 - **What it is**: the monolithic `lib/index.js` (8547 lines) split into layers — `lib/index.js` **141 lines** + `lib/server/**` **38 modules**; **feature-equivalent to `0.3.57`**, maintainability only;
 - **Verified**: 19 test suites green · 8 architecture-guard assertions · **route inventory identical** (`status` + response fields) against the stable build;
 - **Not yet exercised**: real framework upgrade / rollback, restart guardian, component start/stop, real AI run, Gitee OAuth (~10–25% long-tail risk, subjective);
-- **For everyday use** stick to npm `@noob-stupid/dsh-plugin-console@0.3.65`, or `main` of this repo.
+- **For everyday use** stick to npm `@noob-stupid/dsh-plugin-console@0.3.67`, or `main` of this repo.

package/README.zh.md

@@ -300,5 +300,5 @@ MIT
 - **已验证**：19 套测试全绿 · 8 条架构守卫断言 · 与稳定版逐条对打**路由清单一致**（`status` + 响应字段）；
 - **已实测**（2026-09-20 真装真卸演练）：普通插件 / bundle 插件 / 无 npm 仓库 / 套装 / 技能 / 聚合仓库子包 / 仓库落地 / 服务器组件启停；
 - **尚未实测**：真框架升级 / 真回滚、重启守护链路、AI 真跑、Gitee OAuth 回调（长尾风险主观估计 **10%~25%**）；
-- **日常使用请继续用**：npm `@noob-stupid/dsh-plugin-console@0.3.65`，或本仓库 `main`。
+- **日常使用请继续用**：npm `@noob-stupid/dsh-plugin-console@0.3.67`，或本仓库 `main`。
 - 请多反馈问题

package/lib/client.js

@@ -143,6 +143,15 @@ window.__ModuleLoader__.load({
 			gateModalTitle: "门控（兼容门总开关）",
 			gatePendingInfo: "当前待适配：{n} 行（升级预扫或启动失败隔离记下的，更新插件后可一键解锁）",
 			gatePendingNone: "当前没有待适配的行",
+			gateListPending: "待适配明细（{n} 行）",
+			gateListAdopted: "已适配解锁（{n} 行，历史上被拦过、现已放行）",
+			gateListMore: "展开全部 {n} 行",
+			gateListFold: "收起列表",
+			gateRowReason: "原因：{reason}",
+			gateRowFromBoot: "来源：启动失败隔离",
+			gateRowFromUpgrade: "来源：框架升级预扫",
+			gateRowAt: " · {t}",
+			gateRowAdoptable: " · 已通过源码扫描，可解锁",
 			fwFailedButUpgraded: "框架本体其实已经升到 {v} 并已生效——失败的只是脚本最后「重启服务」那一步。可点「重启服务」确认，或必要时回滚。",
 			fwPanelBtn: "框架",
 			fwPanelTitle: "框架升级 / 回滚",
@@ -463,6 +472,12 @@ window.__ModuleLoader__.load({
 			frameworkPatchSkipped: "无需应用",
 			frameworkUpgradeBtn: "框架升级",
 			frameworkUpgradeTitle: "框架升级：自动打包备份现有配置 → 停止并重启 DSH 服务 → npm 升级框架与配套包（失败自动回滚）→ 拉起服务并适配",
+			frameworkUpgradeTarget: "升级目标",
+			frameworkUpgradePick: "选择要升级到的版本（列出所有比当前新的版本，含预发布；latest 为稳定版）",
+			frameworkUpgradeMore: "展开全部可选版本（{n}）",
+			frameworkUpgradeFold: "收起版本列表",
+			frameworkUpgradeChannelStable: "稳定版",
+			frameworkUpgradeChannelPre: "预发布",
 			frameworkUpgradeConfirm: "确认升级？（服务将自动重启）",
 			frameworkUpgradeDone: "框架升级流程已执行",
 			frameworkRollbackBtn: "回滚到上一版",
@@ -540,6 +555,15 @@ window.__ModuleLoader__.load({
 			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",
+			gateListPending: "Pending rows ({n})",
+			gateListAdopted: "Adapted & unlocked ({n} — blocked at some point, now allowed)",
+			gateListMore: "Show all {n} rows",
+			gateListFold: "Collapse list",
+			gateRowReason: "Reason: {reason}",
+			gateRowFromBoot: "Source: boot-failure quarantine",
+			gateRowFromUpgrade: "Source: framework upgrade pre-scan",
+			gateRowAt: " · {t}",
+			gateRowAdoptable: " · passed the source scan, can be unlocked",
 			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",
@@ -860,6 +884,12 @@ window.__ModuleLoader__.load({
 			frameworkPatchSkipped: "not needed",
 			frameworkUpgradeBtn: "Framework upgrade",
 			frameworkUpgradeTitle: "Framework upgrade: backup config → stop & restart DSH service → npm upgrade framework + official packages (auto rollback on failure) → relaunch and adapt",
+			frameworkUpgradeTarget: "Upgrade target",
+			frameworkUpgradePick: "Pick a version to upgrade to (every version newer than the current one, pre-releases included; latest = stable channel)",
+			frameworkUpgradeMore: "Show all available versions ({n})",
+			frameworkUpgradeFold: "Collapse version list",
+			frameworkUpgradeChannelStable: "stable",
+			frameworkUpgradeChannelPre: "pre-release",
 			frameworkUpgradeConfirm: "Confirm upgrade? (service will restart)",
 			frameworkUpgradeDone: "Framework upgrade flow executed",
 			frameworkUpgradeUpToDate: " (already latest)",
@@ -1353,6 +1383,15 @@ window.__ModuleLoader__.load({
 			const [fwCheck, setFwCheck] = react.useState(null);
 			const [fwCheckBusy, setFwCheckBusy] = react.useState(false);
 			const [fwConfirmPanel, setFwConfirmPanel] = react.useState(false);
+			// 可选升级版本列表（用户 2026-09-23 要求）：默认收起；选中项优先用户选择 → latest → 原 target
+			const [fwPicking, setFwPicking] = react.useState(false);
+			const [fwPickAll, setFwPickAll] = react.useState(false);
+			const [fwSelectedVersion, setFwSelectedVersion] = react.useState(null);
+			const fwVersions = Array.isArray(fwCheck && fwCheck.versions) ? fwCheck.versions : [];
+			const fwSelected = fwSelectedVersion !== null && fwVersions.some((v) => v.version === fwSelectedVersion)
+				? fwSelectedVersion
+				: (fwCheck && fwCheck.tagDefault) || (fwCheck && fwCheck.target) || (fwVersions[0] ? fwVersions[0].version : null);
+			const fwChannelLabel = (v) => (v && v.isLatest === true ? t("frameworkUpgradeChannelStable") + " · latest" : (v && typeof v.channel === "string" && v.channel !== "" ? t("frameworkUpgradeChannelPre") + " · " + v.channel : t("frameworkUpgradeChannelPre")));
 			// 面板里的状态刷新：**无视**「终态已关闭」标记——卡片可以被永久关掉，面板必须永远能查到真相
 			const fwStatusRefresh = () => {
 				call("/plugin-console/framework-upgrade-status").then(
@@ -2840,7 +2879,8 @@ window.__ModuleLoader__.load({
 			/** 框架升级：Hub 打包备份现有配置 + 版本检测 + 升级脚本（脚本会自行停止/拉起服务，无需手动重启）。 */
 			const doFrameworkUpgrade = () => {
 				setFrameworkUpgrading(true);
-				call("/plugin-console/framework-upgrade", {}).then(
+				// 用户选了版本就带上（宿主端按候选列表校验：只接受比当前新的真实版本）
+				call("/plugin-console/framework-upgrade", fwSelected ? { version: fwSelected } : {}).then(
 					(data) => {
 						setFrameworkUpgrading(false);
 						setConfirmFrameworkUpgrade(false);
@@ -3515,6 +3555,10 @@ window.__ModuleLoader__.load({
 			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;
+			// 门控明细清单（用户 2026-09-24 要求：面板要显示"是哪些插件"，不只是数量）
+			const [gateShowAll, setGateShowAll] = react.useState(false);
+			const gateRows = gateReady ? (state.data.gating ?? null) : null;
+			const gateTime = (ms) => (typeof ms === "number" && ms > 0 ? new Date(ms).toLocaleString() : "—");
 			// 「功能包 → 框架」按钮角标：升级进行中 ⟳ / 上次失败 ✕ / 有可用更新 ↑（优先级从高到低）
 			const fwRunning = frameworkStatus !== null
 				&& frameworkStatus.status !== "idle" && frameworkStatus.status !== "done" && frameworkStatus.status !== "failed";
@@ -3584,10 +3628,25 @@ window.__ModuleLoader__.load({
 							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 ?? "—") + "）")
+									? el("p", { className: styles.status, "data-pending": "true" }, t("fwPanelAvailable").replace("{v}", fwSelected ?? fwCheck.target) + "（latest " + (fwCheck.latest ?? "—") + " · next " + (fwCheck.next ?? "—") + (fwCheck.alpha ? " · alpha " + fwCheck.alpha : "") + "）")
 									: 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 ?? "—")),
+							el("p", { className: styles.status }, t("frameworkUpgradePick")),
+							fwPicking
+								? el("div", { style: { flexDirection: "column", gap: 6, display: "flex", flexBasis: "100%" } },
+									(fwPickAll ? fwVersions : fwVersions.slice(0, 6)).map((v) => el("button", {
+										key: v.version, type: "button", className: styles.toggle, disabled: frameworkUpgrading,
+										title: v.version + "（" + fwChannelLabel(v) + "）",
+										style: { justifyContent: "space-between", display: "flex", width: "100%" },
+										"data-active": v.version === fwSelected ? "true" : undefined,
+										onClick: () => { setFwSelectedVersion(v.version); setFwPicking(false); },
+									}, el("span", null, (v.version === fwSelected ? "● " : "○ ") + v.version), el("span", { className: styles.status }, fwChannelLabel(v)))),
+									fwVersions.length > 6
+										? el("button", { type: "button", className: styles.toggle, onClick: () => setFwPickAll((x) => !x) }, fwPickAll ? t("frameworkUpgradeFold") : t("frameworkUpgradeMore").replace("{n}", String(fwVersions.length)))
+										: null)
+								: null,
+							el("button", { type: "button", className: styles.toggle, disabled: frameworkUpgrading || fwVersions.length === 0, title: t("frameworkUpgradePick"), "data-active": fwPicking ? "true" : undefined, onClick: () => setFwPicking((x) => !x) }, t("frameworkUpgradeTarget") + "：" + (fwSelected ?? "—") + (fwPicking ? " ▴" : " ▾")),
 							// ② 上次/当前升级记录（卡片可被永久关闭，这里是常驻的真相入口）
 							frameworkStatus !== null && frameworkStatus.status !== "idle"
 								? el("div", { style: { flexDirection: "column", gap: 8, display: "flex" } },
@@ -3613,7 +3672,7 @@ window.__ModuleLoader__.load({
 											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))
+										: el("button", { type: "button", className: styles.toggle, disabled: frameworkUpgrading, title: t("frameworkUpgradeTitle"), onClick: () => setFwConfirmPanel(true) }, t("frameworkUpgradeBtn") + " → v" + (fwSelected ?? fwCheck.target)))
 									: null,
 								rollbackUsable
 									? el("button", { type: "button", className: styles.toggle, title: t("frameworkRollbackTitle"), disabled: frameworkUpgrading, onClick: doFrameworkRollback }, t("frameworkRollbackBtn") + " → " + (rollbackInfo.from ?? "?"))
@@ -3656,7 +3715,35 @@ window.__ModuleLoader__.load({
 									}, 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")))))
+									gatePendingCount > 0 ? t("gatePendingInfo").replace("{n}", String(gatePendingCount)) : t("gatePendingNone")),
+								// 明细清单（2026-09-24 用户要求：面板要能看到是哪些插件，有列表数据）
+								gateRows !== null && gateRows.pendingCount + gateRows.adoptedCount > 0
+									? el("div", { style: { flexDirection: "column", gap: 6, display: "flex" } },
+										el("strong", { className: styles.name }, t("gateListPending").replace("{n}", String(gateRows.pendingCount))),
+										gateRows.pending.length === 0
+											? el("p", { className: styles.status }, t("gatePendingNone"))
+											: null,
+										(gateShowAll ? gateRows.pending : gateRows.pending.slice(0, 8)).map((r) => el("div", {
+											key: "p-" + String(r.rowId),
+											style: { flexDirection: "column", gap: 2, display: "flex", padding: "4px 0" },
+										},
+											el("span", { className: styles.name }, (r.enabled === false ? "⛔ " : "• ") + String(r.name) + (r.version ? "  v" + r.version : "")),
+											el("span", { className: styles.status }, t("gateRowReason").replace("{reason}", String(r.note ?? "—"))),
+											el("span", { className: styles.status },
+												(r.source === "boot-quarantine" ? t("gateRowFromBoot") : t("gateRowFromUpgrade"))
+												+ (r.forcedAt ? t("gateRowAt").replace("{t}", gateTime(r.forcedAt)) : "")
+												+ (r.adoptable ? t("gateRowAdoptable") : "")))),
+										gateRows.pendingCount > 8
+											? el("button", { type: "button", className: styles.toggle, onClick: () => setGateShowAll((v) => !v) },
+												gateShowAll ? t("gateListFold") : t("gateListMore").replace("{n}", String(gateRows.pendingCount)))
+											: null,
+										gateRows.adoptedCount > 0
+											? el("div", { style: { flexDirection: "column", gap: 2, display: "flex" } },
+												el("strong", { className: styles.name }, t("gateListAdopted").replace("{n}", String(gateRows.adoptedCount))),
+												gateRows.adopted.slice(0, 8).map((r) => el("span", { key: "a-" + String(r.rowId), className: styles.status },
+													"✓ " + String(r.name) + (r.version ? "  v" + r.version : "") + (r.adoptedAt ? "  · " + gateTime(r.adoptedAt) : ""))))
+											: null)
+									: null)))
 					: null,
 				aiOpen
 					? el("div", { className: styles.modalBackdrop },

package/lib/index.js

@@ -1180,6 +1180,34 @@ function queuedWrite(fn) {
   return run
 }
 
+/**
+ * 解析"这次要升到哪个版本"（2026-09-23 抽出：原先 framework-check 与 framework-upgrade 各写了一份，
+ * 加了「用户自选版本」后两份逻辑必须完全一致，索性收成一处）。
+ *
+ * @param {object} p
+ * @param {string|null} p.current 当前框架版本
+ * @param {string|null} p.latest  dist-tags.latest
+ * @param {string|null} p.next    dist-tags.next
+ * @param {string} [p.wanted]     用户在面板里显式选的版本（空串 = 没选）
+ * @param {Array<{version: string}>} [p.candidates] 可选候选列表（有 wanted 时必须提供，用作白名单校验）
+ * @returns {{ target: string|null, rejected: string|null }} rejected 非空 = 用户选的版本非法
+ */
+function pickFrameworkTarget({ current, latest, next, wanted = '', candidates = [] }) {
+  const want = typeof wanted === 'string' ? wanted.trim() : ''
+  if (want !== '') {
+    const hit = candidates.find((v) => v.version === want)
+    return hit === undefined ? { target: null, rejected: want } : { target: hit.version, rejected: null }
+  }
+  return {
+    // 稳定版 latest 优先；latest 不高于当前而 next（预发布渠道）确实更新时，目标取 next。
+    // 必须用版本号比较而不是字符串不等（避免 current=0.1.1 稳定版时被 next=0.1.1-rc.3 反向降级）。
+    target: latest !== null && current !== null && isFrameworkVersionNewer(latest, current)
+      ? latest
+      : (next !== null && current !== null && isFrameworkVersionNewer(next, current) ? next : null),
+    rejected: null,
+  }
+}
+
 /** 解析 DSH 框架版本号为可比较对象；正式版（无预发布段）视为 rc.∞。 */
 function parseFrameworkVersion(value) {
   const m = String(value ?? '').match(/^(\d+)\.(\d+)\.(\d+)(?:-(?:[a-z]+\.)?(\d+))?$/iu)
@@ -1204,6 +1232,49 @@ function isFrameworkVersionNewer(candidate, current) {
   return a.rc > b.rc
 }
 
+/**
+ * 框架升级候选列表（2026-09-23 用户要求：「有的版本都加上，测试版也可以有列表」）。
+ *
+ * 为什么需要它：升级面板原先只有**一个**目标（`latest` 优先、否则 `next`），用户看到
+ * 「可升级到 0.1.5-rc.3（latest 0.1.5-rc.3 · next 0.1.7-rc.1）」却**没法自己选**——
+ * 想上 0.1.7-rc.1 或某个 alpha 只能手敲 pnpm 命令。
+ *
+ * 规则（安全边界，都在这里钉死）：
+ *   · 只收 **严格比 current 新** 的版本（用 `compareSemverText`，保留完整 prerelease 语义：
+ *     0.1.5-rc.3 < 0.1.6-alpha.1 < 0.1.7-alpha.1 < 0.1.7-rc.1 < 0.1.7 正式版）；
+ *     等于或低于当前的**一律不进列表**——降级另有「回滚到上一版」那条路，不从这里走。
+ *   · 注册表顺序（按发布时间）不可信，这里按语义版本**降序**排（最新在最前）；
+ *   · `latest` / `next` / `beta` / `alpha` 等 dist-tag 命中的版本带 `channel` 标注，
+ *     供前端打「稳定版 / 预发布」标签；`latest` 同时作为 `tagDefault`（默认选中项，保持原行为）。
+ *
+ * @param {object|null|undefined} meta registry 元数据（{ 'dist-tags', versions }）
+ * @param {string|null} current 当前已装框架版本
+ * @returns {{ versions: Array<{version: string, channel: string|null, isLatest: boolean}>, tagDefault: string|null }}
+ */
+function frameworkUpgradeCandidates(meta, current) {
+  const tags = meta !== null && typeof meta === 'object' && meta['dist-tags'] !== null && typeof meta['dist-tags'] === 'object'
+    ? meta['dist-tags']
+    : {}
+  const cur = parseSemverText(current)
+  const all = meta !== null && typeof meta === 'object' && meta.versions !== null && typeof meta.versions === 'object'
+    ? Object.keys(meta.versions)
+    : []
+  const newer = []
+  for (const v of all) {
+    const parsed = parseSemverText(v)
+    if (parsed === null) continue
+    if (cur !== null && compareSemverText(parsed, cur) <= 0) continue
+    newer.push(v)
+  }
+  newer.sort((a, b) => compareSemverText(parseSemverText(b), parseSemverText(a)))
+  const tagDefault = typeof tags.latest === 'string' && newer.includes(tags.latest) ? tags.latest : null
+  const versions = newer.map((v) => {
+    const channel = Object.keys(tags).find((name) => tags[name] === v) ?? null
+    return { version: v, channel, isLatest: channel === 'latest' }
+  })
+  return { versions, tagDefault }
+}
+
 /** 默认 profile 用户补丁层路径（无 include 条目可推导时的兜底）。 */
 function defaultPatchPath() {
   const home = dshHome()
@@ -1477,6 +1548,8 @@ function logQuarantineMergeError(error) {
  *  顺序很关键（v0.3.44）：**先写清单并校验成功，再归档移除记录**。反过来的话，
  *  任何解析/写入意外都会"记录没了、清单也没进"，用户只看到一个没有理由的【停用】。
  *  导出仅供测试直接驱动（避免测试为了跑它而 apply 整个插件）。 */
+export { frameworkUpgradeCandidates, pickFrameworkTarget }
+
 export function mergeQuarantineRecord(ctx) {
   const file = join(dshHome(), 'plugin-console', 'fw-quarantine.json')
   if (!existsSync(file)) return null
@@ -1570,6 +1643,72 @@ function markPendingAdopted(pending, rowId, by, meta) {
  *   ② 记录还是 pending、但这一行**当前已经启用**（用户手动启用过 / 补丁被清过）→ 转 adopted。
  *  不这么做就会出现用户实测的那种矛盾：**已启用的行，重启后仍挂着【待适配】**。
  *  返回 { backfilled, adopted } 供日志/测试核对；无变化则不写盘。 */
+/**
+ * 门控面板要的「明细清单」（2026-09-24 用户要求：门控面板应该能显示是哪些插件，有列表数据）。
+ *
+ * 此前面板只有两个总开关 + 一句「当前待适配：N 行」——用户看得到数量，看不到**是谁**：
+ * 待适配清单 compat-pending.json 里有 rowId / moduleName / version / checkNote / 来源 / 时间，
+ * 但只有 pending 那部分被下发，且没有「已适配（adopted）」那半边，也没把 rowId 补成可读模块名。
+ *
+ * 这里产出面板直接可渲染的两组明细：
+ *   pending  —— 当前被拦下/待解锁的行（含原因、来源、是否已通过源码扫描可解锁）
+ *   adopted  —— 曾经被拦、现已适配解锁的行（留着让用户能核对"到底动过哪些行"）
+ * 身份补全：清单里很多行只有 rowId（隔离脚本写的），按当前 loader 反查 moduleName/version。
+ */
+function gatingSummary(ctx, compatPending, ctxEntries = null) {
+  const rec = compatPending ?? { frameworkVersion: null, upgradeFrom: null, pending: [] }
+  const all = Array.isArray(rec.pending) ? rec.pending : []
+  let info = new Map()
+  try {
+    info = rowIdModuleMap(ctx)
+  } catch {}
+  const byRow = new Map()
+  for (const e of Array.isArray(ctxEntries) ? ctxEntries : []) {
+    if (typeof e?.rowId === 'string' && e.rowId !== '') byRow.set(e.rowId, e)
+  }
+  const row = (p) => {
+    const meta = info.get(p.rowId) ?? null
+    const entry = byRow.get(p.rowId) ?? null
+    const moduleName = p.moduleName ?? meta?.moduleName ?? entry?.moduleName ?? null
+    // 界面上的"名字"：优先可读模块名，其次是 loader 里的条目，最后才是 raw rowId
+    const name = moduleName ?? (entry === null ? null : entry.moduleName) ?? p.rowId ?? '（未知行）'
+    return {
+      rowId: p.rowId ?? null,
+      name,
+      shortName: typeof name === 'string' && name.includes('/') ? name.slice(name.lastIndexOf('/') + 1) : name,
+      moduleName,
+      version: p.version ?? meta?.version ?? entry?.version ?? null,
+      status: p.status ?? 'pending',
+      check: p.check ?? null,
+      note: p.checkNote ?? null,
+      source: p.source ?? null,
+      adoptedAt: p.adoptedAt ?? null,
+      forcedAt: p.forcedAt ?? null,
+      adoptedBy: p.adoptedBy ?? null,
+      enabled: entry === null ? null : entry.enabled === true,
+    }
+  }
+  const isPending = (p) => (p.status ?? 'pending') === 'pending'
+  const pendingRows = all.filter(isPending).map(row)
+  const adoptedRows = all.filter((p) => !isPending(p)).map(row)
+  // 可解锁提示：仅对 pending 行算（detectAdoptablePending 是只读检测，不写盘）
+  let adoptable = new Map()
+  try {
+    adoptable = detectAdoptablePending(ctx)
+  } catch {}
+  for (const r of pendingRows) r.adoptable = adoptable.get(r.rowId) ?? null
+  return {
+    version: rec.frameworkVersion ?? null,
+    upgradeFrom: rec.upgradeFrom ?? null,
+    quarantineAt: rec.quarantineAt ?? null,
+    quarantineLines: Array.isArray(rec.quarantineLines) ? rec.quarantineLines.slice(0, 5) : [],
+    pendingCount: pendingRows.length,
+    adoptedCount: adoptedRows.length,
+    pending: pendingRows,
+    adopted: adoptedRows,
+  }
+}
+
 export function reconcileCompatPending(ctx) {
   const pending = readCompatPending()
   if (pending === null || !Array.isArray(pending.pending)) return { backfilled: 0, adopted: 0 }
@@ -6666,7 +6805,7 @@ async function handle(ctx, req, res) {
       const selfPkg = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json'), 'utf8'))
       selfVersion = typeof selfPkg.version === 'string' ? selfPkg.version : null
     } catch {}
-    sendJson(res, 200, { ok: true, entries, patchPath, compat, installJobs: jobs, recentFailures, pendingRestart, github: { loggedIn: auth.loggedIn, login: auth.login }, patch: { disables: patch.disables, forced: patch.forced, inserts: patch.inserts }, framework, patchHeal: patchHeal === null ? null : { healed: patchHeal.healed ?? [], autoDisabled: patchHeal.autoDisabled ?? [], healedAt: patchHeal.healedAt ?? 0 }, compatPending: compatPending === null ? null : { frameworkVersion: compatPending.frameworkVersion ?? null, upgradeFrom: compatPending.upgradeFrom ?? null, pending: (compatPending.pending ?? []).filter((p) => (p.status ?? 'pending') === 'pending').map((p) => ({ rowId: p.rowId, moduleName: p.moduleName, version: p.version ?? null, checkNote: p.checkNote ?? null, check: p.check ?? null, riskyApprovedAt: p.riskyApprovedAt ?? null, adoptable: adoptable.get(p.rowId) ?? null })) }, compatGate, rollback: rollbackRec, selfVersion, components: findComponents().map((c) => ({ id: c.id, name: c.name, kind: c.kind ?? 'server', pid: c.pid ?? null, port: c.port ?? null, healthUrl: c.healthUrl ?? null, uiUrl: compUiUrl(c), autoStart: c.autoStart === true })) })
+    sendJson(res, 200, { ok: true, entries, patchPath, compat, installJobs: jobs, recentFailures, pendingRestart, github: { loggedIn: auth.loggedIn, login: auth.login }, patch: { disables: patch.disables, forced: patch.forced, inserts: patch.inserts }, framework, patchHeal: patchHeal === null ? null : { healed: patchHeal.healed ?? [], autoDisabled: patchHeal.autoDisabled ?? [], healedAt: patchHeal.healedAt ?? 0 }, gating: gatingSummary(ctx, compatPending, entries), compatPending: compatPending === null ? null : { frameworkVersion: compatPending.frameworkVersion ?? null, upgradeFrom: compatPending.upgradeFrom ?? null, pending: (compatPending.pending ?? []).filter((p) => (p.status ?? 'pending') === 'pending').map((p) => ({ rowId: p.rowId, moduleName: p.moduleName, version: p.version ?? null, checkNote: p.checkNote ?? null, check: p.check ?? null, riskyApprovedAt: p.riskyApprovedAt ?? null, adoptable: adoptable.get(p.rowId) ?? null })) }, compatGate, rollback: rollbackRec, selfVersion, components: findComponents().map((c) => ({ id: c.id, name: c.name, kind: c.kind ?? 'server', pid: c.pid ?? null, port: c.port ?? null, healthUrl: c.healthUrl ?? null, uiUrl: compUiUrl(c), autoStart: c.autoStart === true })) })
     return
   }
 
@@ -7868,26 +8007,33 @@ async function handle(ctx, req, res) {
     // body.refresh === true 强制重查——面板是常驻入口，不能每次打开都打 registry。
     const now = Date.now()
     if (body.refresh === true || fwCheckCache === null || now - fwCheckCache.at > 300000) {
+      // 当前版本先从本地包读出来——候选列表要拿它做「只收更新的」过滤
+      let current = null
+      try {
+        const localRequire = createRequire(ctx.baseUrl ?? 'file:///')
+        const pkg = JSON.parse(readFileSync(localRequire.resolve('@deepseek-ai/dsh/package.json'), 'utf8'))
+        current = typeof pkg.version === 'string' ? pkg.version : null
+      } catch {}
       let latest = null
       let next = null
+      let alpha = null
+      let versions = []
+      let tagDefault = null
       let registryError = null
       try {
         const data = await fetchJsonUrl('https://registry.npmmirror.com/@deepseek-ai%2fdsh')
         latest = data?.['dist-tags']?.latest ?? null
         next = data?.['dist-tags']?.next ?? null
+        alpha = data?.['dist-tags']?.alpha ?? null
+        // 可选升级目标列表（用户 2026-09-23 要求：所有比当前新的版本都列出来，测试版也列）
+        const cand = frameworkUpgradeCandidates(data, current)
+        versions = cand.versions
+        tagDefault = cand.tagDefault
       } catch (error) {
         registryError = error instanceof Error ? error.message : String(error)
       }
-      let current = null
-      try {
-        const localRequire = createRequire(ctx.baseUrl ?? 'file:///')
-        const pkg = JSON.parse(readFileSync(localRequire.resolve('@deepseek-ai/dsh/package.json'), 'utf8'))
-        current = typeof pkg.version === 'string' ? pkg.version : null
-      } catch {}
-      const target = latest !== null && current !== null && isFrameworkVersionNewer(latest, current)
-        ? latest
-        : (next !== null && current !== null && isFrameworkVersionNewer(next, current) ? next : null)
-      fwCheckCache = { at: now, data: { current, latest, next, target, registryError } }
+      const target = pickFrameworkTarget({ current, latest, next }).target
+      fwCheckCache = { at: now, data: { current, latest, next, alpha, target, versions, tagDefault, registryError } }
     }
     sendJson(res, 200, { ok: true, ...fwCheckCache.data, checkedAt: fwCheckCache.at })
     return
@@ -8187,20 +8333,31 @@ async function handle(ctx, req, res) {
     }
     let latest = null
     let next = null
+    let alpha = null
+    let versions = []
+    let tagDefault = null
     let registryError = null
     try {
       const data = await fetchJsonUrl('https://registry.npmmirror.com/@deepseek-ai%2fdsh')
       latest = data?.['dist-tags']?.latest ?? null
       next = data?.['dist-tags']?.next ?? null
+      alpha = data?.['dist-tags']?.alpha ?? null
+      const cand = frameworkUpgradeCandidates(data, current)
+      versions = cand.versions
+      tagDefault = cand.tagDefault
     } catch (error) {
       // 网络黑洞/超时：区分「检测失败」与「无更新」，避免误导用户以为已是最新
       registryError = error instanceof Error ? error.message : String(error)
     }
-    // 升级目标：稳定版 latest 优先；latest 不高于当前而 next（预发布渠道）确实更新时，目标取 next。
-    // 必须用版本号比较而不是字符串不等（避免 current=0.1.1 稳定版时被 next=0.1.1-rc.3 反向降级）。
-    const target = latest !== null && current !== null && isFrameworkVersionNewer(latest, current)
-      ? latest
-      : (next !== null && current !== null && isFrameworkVersionNewer(next, current) ? next : null)
+    // 升级目标：① 用户在面板里显式选了版本（body.version）→ 以候选列表为准校验
+    //（只接受"比当前新"的真实发布版本；乱填/降级/不存在的版本一律 400，不生成升级脚本）；
+    // ② 没选 → 沿用原行为（helper 内注释说明：latest 优先，否则 next）。
+    const picked = pickFrameworkTarget({ current, latest, next, wanted: body.version, candidates: versions })
+    if (picked.rejected !== null) {
+      sendJson(res, 400, { ok: false, error: `升级目标 ${picked.rejected} 不在可选列表内（只接受比当前 ${current} 更新的已发布版本；降级请用「回滚到上一版」）` })
+      return
+    }
+    const target = picked.target
     const profileDir = dirname(findPatchPath(ctx))
     // 1) 升级前打包备份现有配置（patch / profile package.json / 插件清单）
     let backupDir = null
@@ -8265,7 +8422,7 @@ async function handle(ctx, req, res) {
       // 避免"kill 后升级/拉起双双失败，服务永久 down"
       if (!existsSync(corepackJs) || binPath === null || !existsSync(binPath)) {
         steps.push(`升级已取消：无法定位 ${!existsSync(corepackJs) ? 'corepack（pnpm 通道）' : 'dsh bin.js'}（框架安装可能不完整），服务保持运行；请先修复框架再升级`)
-        sendJson(res, 200, { ok: true, current, latest, next, target, hasUpdate, upgraded: false, backupDir, configMigrations, preflight, steps, hints: steps })
+        sendJson(res, 200, { ok: true, current, latest, next, alpha, target, versions, tagDefault, hasUpdate, upgraded: false, backupDir, configMigrations, preflight, steps, hints: steps })
         return
       }
       const profileDir2 = profileDir
@@ -8458,6 +8615,29 @@ async function handle(ctx, req, res) {
         `      if ($v -ne '${target}') { Log ('pnpm 退出码 0 但顶层可见版本未更新（顶层 ' + $v + '，目标 ${target}），按失败处理'); $code = 1 }`,
         `    } catch { Log 'pnpm 退出码 0 但无法读取顶层版本，按失败处理'; $code = 1 }`,
         `  }`,
+  // 安装后「结构完整性」校验（2026-09-24 事故后补）：版本号对 ≠ 装完整。
+  // 当天真实事故：一次 0.1.7-rc.1 升级的 pnpm 安装被中断，顶层 @deepseek-ai\dsh 整个目录消失、
+  // .pnpm 实体只剩 lib 里几个硬链接、package.json 没了。更隐蔽的形态（package.json 写成功但
+  // lib 文件没落全）会骗过"只对版本号"的校验，等下次重启才发现服务起不来 —— 所以逐项验结构：
+  // package.json / lib/bin.js 都在 + CLI 自报版本等于目标；任一不过 = 本次升级失败 → 走回滚。
+`  if ($code -eq 0) {`,
+`    try {`,
+`      $fwDsh = ${ps(join(fwRoot, '@deepseek-ai', 'dsh'))}`,
+`      $binA = Join-Path $fwDsh 'lib\\bin.js'`,
+`      $binB = $null`,
+`      $ent = Get-ChildItem -Path (Join-Path ${ps(fwRoot)} '.pnpm') -Directory -Filter '@deepseek-ai+dsh@${target}*' -ErrorAction SilentlyContinue | Select-Object -First 1`,
+`      if ($ent) { $binB = Join-Path $ent.FullName 'node_modules\\@deepseek-ai\\dsh\\lib\\bin.js' }`,
+`      $bin = $null`,
+`      if (Test-Path -LiteralPath $binA) { $bin = $binA } elseif ($binB -and (Test-Path -LiteralPath $binB)) { $bin = $binB }`,
+`      if (-not (Test-Path -LiteralPath (Join-Path $fwDsh 'package.json'))) { Log '结构校验失败：顶层 @deepseek-ai\\dsh\\package.json 不存在（安装不完整）'; $code = 1 }`,
+`      elseif (-not $bin) { Log '结构校验失败：找不到 dsh 的 lib/bin.js（顶层与 .pnpm 都没有）——装完也拉不起来，按失败处理'; $code = 1 }`,
+`      else {`,
+`        $probe = (& ${ps(nodePath)} $bin --version 2>&1 | Out-String).Trim()`,
+`        if ($probe -ne '${target}') { Log ('结构校验失败：CLI 自报版本 ' + $probe + '，目标 ${target}（安装不完整或被其它副本顶替），按失败处理'); $code = 1 }`,
+`        else { Log ('结构校验通过：package.json + bin.js 就位，CLI 自报 ' + $probe) }`,
+`      }`,
+`    } catch { Log ('结构校验异常，按失败处理：' + $_.Exception.Message); $code = 1 }`,
+`  }`,
         `  return $code`,
         `}`,
         // 回滚函数（2026-09-04 事故后升级为「全树优先」）：robocopy 支持长路径（Copy-Item 对 >260
@@ -8802,7 +8982,7 @@ async function handle(ctx, req, res) {
       '升级完成后请重启 DSH 服务生效——重启后 Hub 自动：备份新版本配置快照、重打框架补丁（issue #5 容错）、给出适配提示。',
       '官方配套组件（@deepseek-ai/*）随框架一起升级，请勿在市场单独更新。',
     ]
-    sendJson(res, 200, { ok: true, current, latest, next, target, hasUpdate, upgraded, backupDir, registryError, configMigrations, preflight, steps, hints })
+    sendJson(res, 200, { ok: true, current, latest, next, alpha, target, versions, tagDefault, hasUpdate, upgraded, backupDir, registryError, configMigrations, preflight, steps, hints })
     return
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noob-stupid/dsh-plugin-console",
-  "version": "0.3.65",
+  "version": "0.3.67",
   "description": "DSH 框架升级安全与插件升级门控：一键升级、失败自动回滚、升级后回滚上版、旧插件不适配自动禁用；内置多源插件市场为发现层，插件源全部可自定义，可指向公司内网私有源 / 私有索引 / 本地 Git 仓库，纯内网离线可用 | Framework upgrade safety & plugin version gating for DSH, with a customizable multi-source plugin market: point every source at internal mirrors or a local file:// repo for intranet-only, offline installs.",
   "repository": {
     "type": "git",