@noob-stupid/dsh-plugin-console 0.3.26 → 0.3.28

package/lib/client.js

@@ -104,6 +104,21 @@ window.__ModuleLoader__.load({
 			pendingCompatTag: "待适配",
 			pendingCompatHint: "框架升级后被强制禁用：先点「检测更新」，如有新版按钮会变为「更新并适配」，点击后更新完成自动校验通过即解锁启用",
 			updateAndAdapt: "更新并适配",
+			familyTag: "全家桶",
+			familySubs: "子包",
+			familyUnlockAll: "一键启用已适配",
+			familyUnlockAllTip: "对全家桶内所有源码扫描通过（已适配）的子包批量解锁启用；未通过的保持禁用",
+			familyUnlockAllConfirm: "将对全家桶内所有已适配（源码扫描通过）的子包一键解锁启用？未通过的将保持禁用。",
+			familyUnlockAllDone: "已批量适配解锁",
+			familyExpand: "展开",
+			familyCollapse: "收起",
+			familyUpdate: "全家桶版本检测",
+			familyCheckUpdate: "批量检测更新",
+			adaptUnlockBtn: "已适配，立即解锁",
+			adaptUnlockHint: "已安装版本经源码扫描确认适配当前框架：立即移除禁用块并解锁启用",
+			adaptUnlockDone: "已适配解锁：刷新后该行可正常启用",
+			migrateTip: "项目已迁移（适配当前框架）",
+			migrateBtn: "迁移并适配",
 			aiEmpowerFrameworkCheck: "框架适配检测",
 			userForcedTag: "补丁强制启用",
 			protectedTag: "受保护",
@@ -404,6 +419,21 @@ window.__ModuleLoader__.load({
 			pendingCompatTag: "Pending adapt",
 			pendingCompatHint: "Force-disabled after framework upgrade: click Check update first; if a newer version exists the button becomes Update & adapt - click it and it unlocks automatically after the compat check",
 			updateAndAdapt: "Update & adapt",
+			familyTag: "Family bundle",
+			familySubs: "sub packages",
+			familyUnlockAll: "Unlock all adapted",
+			familyUnlockAllTip: "Batch-unlock every sub package in this family whose source scan passed; failed ones stay disabled",
+			familyUnlockAllConfirm: "Unlock all adapted (source-scan passed) sub packages in this family? Failed ones stay disabled.",
+			familyUnlockAllDone: "Family batch unlock done",
+			familyExpand: "Expand",
+			familyCollapse: "Collapse",
+			familyUpdate: "Family version check",
+			familyCheckUpdate: "Check all",
+			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",
+			migrateTip: "Project migrated (adapted to the current framework)",
+			migrateBtn: "Migrate & adapt",
 			aiEmpowerFrameworkCheck: "Framework compat check",
 			userForcedTag: "Forced on by patch",
 			protectedTag: "Protected",
@@ -971,10 +1001,12 @@ window.__ModuleLoader__.load({
 		function PluginConsoleTab({ t }) {
 			const [state, setState] = react.useState({ status: "loading" });
 			const [busy, setBusy] = react.useState(null);
+			const [adaptUnlocking, setAdaptUnlocking] = react.useState(null);
 			const [message, setMessage] = react.useState(null);
 			const [reloadHint, setReloadHint] = react.useState(false);
 			const [restartHint, setRestartHint] = react.useState(false);
 			const [jobs, setJobs] = react.useState({});
+			const [familyCollapsed, setFamilyCollapsed] = react.useState({});
 			const [query, setQuery] = react.useState(() => {
 				try { return localStorage.getItem("pc-market-query") ?? ""; } catch { return ""; }
 			});
@@ -2239,13 +2271,31 @@ window.__ModuleLoader__.load({
 					: ((searchSourcesList !== null ? searchSourcesList.find((s) => s.id === source)?.name : undefined) ?? source);
 			const extraIds = new Set((state.status === "ready" ? state.data.patch?.inserts ?? [] : []));
 			const extraCount = state.status === "ready" ? state.data.entries.filter((entry) => entry.extra === true || extraIds.has(entry.rowId)).length : 0;
-			const rows = state.status === "ready"
+			const pkgRootOf = (m) => { const mm = String(m ?? ""); const x = mm.match(/^(@[^/]+\/[^/]+)(?:\/.*)?$/u); return x ? x[1] : mm; };
+			const filteredEntries = state.status === "ready"
 				? state.data.entries.filter((entry) => {
 					if (extraOnly && !(entry.extra === true || extraIds.has(entry.rowId))) return false;
 					if (installedQueryNorm === "") return true;
 					return [entry.moduleName, entry.entryId, entry.rowId]
 						.some((value) => String(value ?? "").toLowerCase().includes(installedQueryNorm));
-				}).map((entry) => {
+				})
+				: [];
+			// 聚合包分组：仅「同根包 + 子路径导出」（web-all 0.3.14 式，moduleName=pkg/sub）→ 全家桶组；
+			// 经典多子包聚合（每子包独立名）不归组。组头与子包卡片一律置于列表【最底部】。
+			const famRootOf = (entry) => {
+				const m = String(entry.moduleName ?? "");
+				if (m.startsWith("@deepseek-ai/")) return null;
+				return pkgRootOf(m);
+			};
+			const familyCounts = new Map();
+			for (const entry of (state.status === "ready" ? state.data.entries : [])) {
+				const root = famRootOf(entry);
+				if (root === null) continue;
+				familyCounts.set(root, (familyCounts.get(root) ?? 0) + 1);
+			}
+			const familyCards = filteredEntries.map((entry) => {
+					const familyRoot = String(entry.moduleName ?? "").startsWith("@deepseek-ai/") ? null : pkgRootOf(entry.moduleName);
+					void familyRoot;
 					const open = details !== null && details.entryId === entry.entryId;
 					let detailPanel = null;
 					if (open) {
@@ -2258,10 +2308,13 @@ window.__ModuleLoader__.load({
 						} else {
 							const meta = details.data.meta;
 							const readme = details.data.readme;
+							const compatInfo = state.status === "ready" && state.data.compatPending
+								? (state.data.compatPending.pending ?? []).find((p) => p.rowId === entry.rowId) ?? null
+								: null;
 							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"))
+									? el("p", { className: styles.status, "data-pending": "true" }, 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),
@@ -2276,7 +2329,38 @@ window.__ModuleLoader__.load({
 										className: styles.toggle,
 										title: t("aiEmpowerTitle"),
 										onClick: () => openAiFor(String(entry.moduleName ?? entry.repo ?? "")),
-									}, t("aiEmpowerLabel"))) : null,
+									}, t("aiEmpowerLabel")),
+									entry.pendingCompat === true
+										? el("button", {
+											type: "button",
+											className: styles.toggle,
+											"data-pending": "true",
+											title: t("adaptUnlockHint"),
+											disabled: installing === entry.moduleName || adaptUnlocking === entry.entryId,
+											onClick: () => {
+												setAdaptUnlocking(entry.entryId);
+												call("/plugin-console/adapt-unlock", { rowId: entry.rowId }).then(
+													() => {
+														setAdaptUnlocking(null);
+														setMessage(t("adaptUnlockDone"));
+														window.setTimeout(() => window.location.reload(), 1200);
+													},
+													(error) => { setAdaptUnlocking(null); setMessage(t("failed") + "：" + friendlyGithubError(error).message); },
+												);
+											},
+										}, adaptUnlocking === entry.entryId ? t("loadingPhase") : t("adaptUnlockBtn"))
+										: null) : null,
+								updateCheck !== null && updateCheck.status === "ready" && updateCheck.migrate && updateCheck.migrate.compatible
+									? el("div", null,
+										el("div", { className: styles.rowTop },
+											el("p", { className: styles.status }, t("migrateTip") + "：" + String(updateCheck.migrate.to ?? "") + (updateCheck.migrate.latest ? " v" + updateCheck.migrate.latest : "")),
+											el("button", {
+												type: "button",
+												className: styles.toggle,
+												disabled: installing === entry.moduleName,
+												onClick: () => startJob("", updateCheck.migrate.to, "github", "plugin", false),
+											}, installing === entry.moduleName ? t("installing") : t("migrateBtn"))))
+									: null,
 								updateCheck !== null && updateCheck.status === "ready"
 									? (updateCheck.error
 										? el("p", { className: styles.status, "data-error": "true" }, t("updateCheckFailed") + "：" + updateCheck.error)
@@ -2314,7 +2398,13 @@ window.__ModuleLoader__.load({
 					}
 					return el("li", { key: entry.entryId, className: styles.row },
 						el("div", { className: styles.rowTop },
-							el("strong", { className: styles.name, title: entry.moduleName }, moduleShortName(entry.moduleName)),
+							el("strong", { className: styles.name, title: entry.moduleName }, (() => {
+								const famRoot = famRootOf(entry);
+								const mn = String(entry.moduleName ?? "");
+								return famRoot !== null && (familyCounts.get(famRoot) ?? 0) > 1 && mn.startsWith(famRoot + "/")
+									? mn.slice(famRoot.length + 1)
+									: moduleShortName(entry.moduleName);
+							})()),
 							el("span", { className: styles.tag, "data-enabled": entry.enabled ? "true" : "false" },
 								t(entry.enabled ? "enabledTag" : "disabledTag")),
 							entry.extra === true ? el("span", { className: styles.tag, "data-user": "true" }, t("extraTag")) : null,
@@ -2360,7 +2450,7 @@ window.__ModuleLoader__.load({
 															setMessage(t("deleteBundleNote") + "：" + (data.packageName ?? "") + (data.uninstallError ? "（包卸载警告：" + data.uninstallError + "）" : ""));
 															setRestartHint(true);
 														} else {
-															setMessage(t("deleteNote") + "：" + (data.packageName ?? "") + (data.uninstallError ? "（包卸载警告：" + data.uninstallError + "）" : ""));
+															setMessage(t("deleteNote") + "：" + (data.packageName ?? "") + (data.note ? "；" + data.note : "") + (data.uninstallError ? "（包卸载警告：" + data.uninstallError + "）" : ""));
 															setTimeout(refresh, 1500);
 														}
 													},
@@ -2388,8 +2478,72 @@ window.__ModuleLoader__.load({
 						),
 						detailPanel,
 					);
-				})
-				: [];
+				});
+			// 全家桶组头：聚合包（同根包 ≥2 行）合并展示为一个「web 包」卡片
+			const familyHeaders = [];
+			const familySeen = new Set();
+			for (const entry of filteredEntries) {
+				const root = famRootOf(entry);
+				if (root === null || (familyCounts.get(root) ?? 0) <= 1 || familySeen.has(root)) continue;
+				familySeen.add(root);
+				familyHeaders.push(el("div", { key: "family-" + root, className: styles.detail, style: { border: "1px solid var(--dsw-alias-state-business-primary)", borderRadius: 10, padding: "8px 12px", gridColumn: "1 / -1" } },
+					el("div", { className: styles.rowTop, style: { alignItems: "center" } },
+						el("strong", { className: styles.name, style: { flex: "0 1 auto", minWidth: 0, whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }, title: root }, root.replace(/^@[^/]+\//u, "").replace(/^dsh-/u, "")),
+						el("span", { className: styles.tag, "data-user": "true" }, t("familyTag") + " · " + (familyCounts.get(root) ?? 0) + " " + t("familySubs")),
+						el("button", {
+							type: "button",
+							className: styles.toggle,
+							style: { whiteSpace: "nowrap", flexShrink: 0 },
+							onClick: () => setFamilyCollapsed((prev) => ({ ...prev, [root]: prev[root] !== true })),
+						}, familyCollapsed[root] === true ? "▸ " + t("familyExpand") : "▾ " + t("familyCollapse")),
+						el("button", {
+							type: "button",
+							className: styles.toggle,
+							style: { whiteSpace: "nowrap", flexShrink: 0 },
+							onClick: () => {
+								setMessage(t("checkingUpdate"));
+								call("/plugin-console/check-update", { packageName: root }).then(
+									(d) => setMessage(t("familyUpdate") + "：" + root + " " + (d?.latest ?? "?") + (d?.migrate && d.migrate.compatible ? " → " + d.migrate.to + " v" + d.migrate.latest : "") + (d?.error ? "（" + d.error + "）" : "")),
+									(e) => setMessage(t("failed") + "：" + friendlyGithubError(e).message),
+								);
+							},
+						}, t("familyCheckUpdate")),
+						el("button", {
+							type: "button",
+							className: styles.toggle,
+							style: { whiteSpace: "nowrap", flexShrink: 0 },
+							title: t("familyUnlockAllTip"),
+							onClick: () => {
+								if (!window.confirm(t("familyUnlockAllConfirm"))) return;
+								call("/plugin-console/adapt-unlock-all", { root }).then(
+									(d) => {
+										setMessage(t("familyUnlockAllDone") + "：" + (d.unlocked ?? []).length + " 行" + (Array.isArray(d.kept) && d.kept.length > 0 ? "；保留 " + d.kept.length + " 行（未通过校验）" : ""));
+										window.setTimeout(() => window.location.reload(), 1500);
+									},
+									(e) => setMessage(t("failed") + "：" + friendlyGithubError(e).message),
+								);
+							},
+						}, t("familyUnlockAll")))
+				));
+			}
+			// 组头放到最底部：普通条目在前，全家桶（组头+子包卡片）整体在后
+			const nonFamilyCards = [];
+			const familySections = new Map();
+			familyCards.forEach((card, i) => {
+				const e = filteredEntries[i];
+				if (e === undefined) { nonFamilyCards.push(card); return; }
+				const root = famRootOf(e);
+				if (root === null || (familyCounts.get(root) ?? 0) <= 1) { nonFamilyCards.push(card); return; }
+				if (!familySections.has(root)) familySections.set(root, { head: familyHeaders.find((h) => h && h.key === "family-" + root) ?? null, cards: [] });
+				familySections.get(root).cards.push(card);
+			});
+			const familySectionEls = [];
+			for (const [, section] of familySections) {
+				if (section.head !== null) familySectionEls.push(section.head);
+				const root = section.head !== null ? section.head.key.slice("family-".length) : null;
+				if (root === null || familyCollapsed[root] !== true) familySectionEls.push(...section.cards);
+			}
+			const rows = state.status === "ready" ? [...nonFamilyCards, ...familySectionEls] : [];
 			const marketShown = market === null || market.status !== "ready"
 				? []
 				: officialOnly