@noob-stupid/dsh-plugin-console 0.5.59 → 0.5.60

package/lib/client.js

@@ -1578,6 +1578,14 @@ window.__ModuleLoader__.load({
 		}
 		// <<<update-pick:end>>>
 		const el = react.createElement;
+// ★ 0.5.60：被跳过 bundle 的签名（包名+版本）。关掉提示时记下它；清单变了就重新出现。
+//   模块级 —— 上一版把辅助函数放子组件里、主面板误用，导致整块面板空白。
+function skippedSignature(skipped) {
+	try {
+		if (skipped === null || skipped === undefined || !Array.isArray(skipped.items)) return "0";
+		return skipped.items.map((x) => String(x.packageName) + "@" + String(x.version ?? "?")).join("|");
+	} catch { return "0"; }
+}
 // ★ 0.5.59：健康问题的**签名**（类别+条数）。关掉提示时记下它；签名一变说明问题变了，提示重新出现。
 //   刻意放在模块级（不放组件内）—— 上一版就是因为把辅助函数放在子组件里、主面板误用而整块空白。
 function healthSignature(health) {
@@ -1938,6 +1946,11 @@ function healthSignature(health) {
 			const [healthClosed, setHealthClosed] = react.useState(() => {
 				try { return localStorage.getItem("pc-health-closed") ?? ""; } catch { return ""; }
 			});
+			// ★ 0.5.60：被跳过 bundle 的提示也可以关掉（用户 2026-10-18「不是说这个可以关闭吗」）。
+			//   同样记"签名"（包名+版本），清单变了会重新出现 —— 关掉不等于永远看不见。
+			const [skippedClosed, setSkippedClosed] = react.useState(() => {
+				try { return localStorage.getItem("pc-skipped-closed") ?? ""; } catch { return ""; }
+			});
 			const [busy, setBusy] = react.useState(null);
 			const [adaptUnlocking, setAdaptUnlocking] = react.useState(null);
 			// 待适配行「强行启用」的风险确认态：{ entryId, moduleName, frameworkVersion, checkNote } | null
@@ -4670,9 +4683,21 @@ function healthSignature(health) {
 					&& state.data.skippedBundles.reliable === true
 					&& Array.isArray(state.data.skippedBundles.items)
 					&& state.data.skippedBundles.items.length > 0
+					&& skippedSignature(state.data.skippedBundles) !== skippedClosed
 					? el("div", { className: styles.message, "data-error": "true", style: { marginTop: "8px" } },
 							el("p", null,
-								t("skippedBundlesTitle").replace("{n}", String(state.data.skippedBundles.items.length))),
+								t("skippedBundlesTitle").replace("{n}", String(state.data.skippedBundles.items.length)),
+								" ",
+								el("button", {
+									type: "button",
+									style: { marginLeft: "8px", cursor: "pointer" },
+									title: t("healthDismissTitle"),
+									onClick: () => {
+										const sig = skippedSignature(state.data.skippedBundles);
+										try { localStorage.setItem("pc-skipped-closed", sig); } catch {}
+										setSkippedClosed(sig);
+									},
+								}, t("healthDismissBtn"))),
 							...state.data.skippedBundles.items.map((b) => el("p", { key: b.packageName, title: b.hint ?? undefined, style: { margin: "4px 0 0 12px" } },
 								"• " + b.packageName + (b.version ? " v" + b.version : "") + " — " + b.reason,
 								// ★ 0.5.56：把提示里的"三条出路"之一真正做成可点的动作。

package/lib/server/domain/market.js

@@ -389,7 +389,13 @@ function summarizeReadme(text) {
 async function readPluginDetails(moduleName, baseUrl, profileDir) {
   if (typeof moduleName !== 'string' || moduleName.startsWith('cordis:')) return { meta: null, readme: null }
   try {
-    const pkgPath = resolvePackageJson(moduleName, baseDirOf(baseUrl), profileDir ?? null)
+    // ★ 0.5.60（真机 2026-10-18）：与 entryPkgMeta 同一口径 —— **profile 优先、安装锚点兜底**。
+    //   详情卡片过去读 app.asar 那份（0.2.1-rc.2），于是显示"已是最新"、更新按钮永远点不动，
+    //   而真正被加载的是 profile 里那份 0.2.0-rc.2（正是被 peer 否决的那份）。
+    const hasProfile = typeof profileDir === 'string' && profileDir !== ''
+    const pkgPath = hasProfile
+      ? resolvePackageJson(moduleName, profileDir, baseDirOf(baseUrl))
+      : resolvePackageJson(moduleName, baseDirOf(baseUrl), null)
     if (pkgPath === null) throw new Error('not found')
     const pkg = JSON.parse(await readFile(pkgPath, 'utf8'))
     const meta = {

package/lib/server/infra/paths.js

@@ -180,7 +180,15 @@ function entryPkgMeta(moduleName, baseUrl, profileDir) {
   if (hit !== undefined && Date.now() - hit.at < PKG_META_TTL) return hit
   const meta = { at: Date.now(), installDate: null, version: null, repository: null }
   try {
-    const pkgPath = resolvePackageJson(moduleName, baseDirOf(baseUrl), profileDir ?? null)
+    // ★ 0.5.60（真机 2026-10-18）：**profile 优先、安装锚点兜底**。
+  //   过去是反的（asar 优先），导致"徽标显示 0.2.1-rc.2（最新）→ 检测更新无更新可点 →
+  //   但实际加载的是 profile 里 0.2.0-rc.2 → peer 永远不匹配"的死局。
+  //   loader 是从 profile 上下文解析模块名的，所以要显示/要比对的必须是 profile 那份；
+  //   只有 profile 里没有该包时（纯内置插件）才回落到安装锚点。
+  const hasProfile = typeof profileDir === 'string' && profileDir !== ''
+  const pkgPath = hasProfile
+    ? resolvePackageJson(moduleName, profileDir, baseDirOf(baseUrl))
+    : resolvePackageJson(moduleName, baseDirOf(baseUrl), null)
     if (pkgPath === null) throw new Error('not found')
     const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
     // 安装日期：优先 curl 通道写入的 .dsh-installed-at 标记（真实安装时刻）；

package/lib/server/routes/state.js

@@ -163,6 +163,41 @@ async function routeStateGet(req, res, rc) {
       const shape = detectHostShape()
       host = { hosted: shape.hosted === true, kind: shape.kind, notice: shape.hosted === true ? shape.notice : null }
     } catch {}
+    // ★ 0.5.60 加法（真机 2026-10-18）：**为被 bundle 级跳过的插件合成虚拟行**。
+    //   为什么必须做：bundle 层被跳过 ⇒ 它要插的 loader 行**根本不存在** ⇒ 列表里没有位置可挂，
+    //   用户只能看到一条横幅，无法像别的插件那样"看到它、更新它、再启用它"。
+    //   合成后它出现在列表里，显示为「已停用 / 未加载」+ 否决原因；toggleable=false 表示
+    //   **没有真实行可开关**（开关自动置灰），但「详情 → 检测更新」照常可用 —— 更新到兼容版本后
+    //   重启，bundle 才会真正装载并出现真实行，那时才谈得上"启用"。
+    const realModuleNames = new Set(entries.map((e) => e.moduleName))
+    const virtualEntries = skippedBundles.reliable === true && Array.isArray(skippedBundles.items)
+      ? skippedBundles.items
+        .filter((b) => b !== null && b !== undefined && typeof b.packageName === 'string' && !realModuleNames.has(b.packageName))
+        .map((b) => ({
+          entryId: `bundle-skipped:${b.packageName}`,
+          rowId: null,
+          moduleName: b.packageName,
+          enabled: false,
+          fiberPhase: null,
+          protected: false,
+          toggleable: false,
+          userDisabled: false,
+          userForced: false,
+          extra: false,
+          installDate: null,
+          version: b.version ?? null,
+          repository: null,
+          pendingCompat: false,
+          compatRescinded: false,
+          compatVerdict: null,
+          adoptable: null,
+          // 复用既有的 veto 通道：卡片会照常渲染原因 + 出路（tooltip），无需新 UI。
+          veto: { reason: b.reason ?? null, hint: b.hint ?? null, kind: b.kind ?? null, judged: b.judged ?? null },
+          virtual: true,
+        }))
+      : []
+    const allEntries = virtualEntries.length === 0 ? entries : [...entries, ...virtualEntries]
+
     // ★ 0.5.55 加法：把已经算好的各块**折成一行健康摘要**（不新增 IO、不新增判据）。
     //   面板 176 个按钮、信息散在六处，用户没有一个地方能回答"整体健康吗、我该先处理哪件"。
     let health = { issues: 0, items: [] }
@@ -174,7 +209,7 @@ async function routeStateGet(req, res, rc) {
         patchUncertain: patchHeal === null ? [] : (patchHeal.uncertain ?? []),
       })
     } catch {}
-    sendJson(res, 200, { ok: true, entries, skippedBundles, host, health, 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, written: patchHeal.written === true, writeError: patchHeal.writeError ?? null, skippedFrameworkOwned: (patchHeal.skipped ?? []).map((s) => s.id ?? null), uncertain: (patchHeal.uncertain ?? []).map((u) => u.id ?? null) }, gating: gatingSummary(ctx, compatPending, entries, compatVerdicts), 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, verdict: compatVerdicts.get(p.rowId) ?? null })), verdictRefresh: pendingState.refresh === null ? null : { version: pendingState.refresh.version ?? null, updated: pendingState.refresh.updated ?? [], unchanged: pendingState.refresh.unchanged ?? [], unresolved: pendingState.refresh.unresolved ?? [], wrote: pendingState.refresh.wrote === true, writeError: pendingState.refresh.writeError ?? 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: allEntries, skippedBundles, host, health, 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, written: patchHeal.written === true, writeError: patchHeal.writeError ?? null, skippedFrameworkOwned: (patchHeal.skipped ?? []).map((s) => s.id ?? null), uncertain: (patchHeal.uncertain ?? []).map((u) => u.id ?? null) }, gating: gatingSummary(ctx, compatPending, entries, compatVerdicts), 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, verdict: compatVerdicts.get(p.rowId) ?? null })), verdictRefresh: pendingState.refresh === null ? null : { version: pendingState.refresh.version ?? null, updated: pendingState.refresh.updated ?? [], unchanged: pendingState.refresh.unchanged ?? [], unresolved: pendingState.refresh.unresolved ?? [], wrote: pendingState.refresh.wrote === true, writeError: pendingState.refresh.writeError ?? 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
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noob-stupid/dsh-plugin-console",
-  "version": "0.5.59",
+  "version": "0.5.60",
   "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",