@dsh-workbench/core 0.3.2 → 0.3.3

package/dist/client/index.js

@@ -1812,6 +1812,7 @@ var en = {
 	"panels.dragHint": "Drag to reorder",
 	"panels.unknownStep": "No suite provides this view",
 	"panels.labelWithHint": "{label} ({hint})",
+	"panels.hintJoin": "; ",
 	"panels.dep.failed": "⚠ failed to start",
 	"panels.dep.missingPlugin": "⚠ not ready yet",
 	"panels.dep.missingCommands": "⚠ needs an update",
@@ -1826,6 +1827,7 @@ var en = {
 	"panels.market.notUsable": "unusable",
 	"panels.market.broken": "broken",
 	"panels.market.hasNew": "New version",
+	"panels.market.hasProblem": "Module problem",
 	"panels.market.missing": "not installed",
 	"panels.market.unchecked": "unknown",
 	"panels.market.checking": "checking",
@@ -2237,6 +2239,7 @@ var zh = {
 	"panels.dragHint": "拖动调整顺序",
 	"panels.unknownStep": "这一层没有套件提供",
 	"panels.labelWithHint": "{label}（{hint}）",
+	"panels.hintJoin": "；",
 	"panels.dep.failed": "⚠ 起不来",
 	"panels.dep.missingPlugin": "⚠ 还没装好",
 	"panels.dep.missingCommands": "⚠ 需要更新",
@@ -2251,6 +2254,7 @@ var zh = {
 	"panels.market.notUsable": "不可用",
 	"panels.market.broken": "装坏了",
 	"panels.market.hasNew": "有新版本",
+	"panels.market.hasProblem": "模块异常",
 	"panels.market.missing": "未装",
 	"panels.market.unchecked": "状态未知",
 	"panels.market.checking": "检测中",
@@ -3516,8 +3520,15 @@ var devSurface = {
 //#region src/app/layouts/panel-hint.ts
 var hints = /* @__PURE__ */ new Map();
 var listeners$3 = /* @__PURE__ */ new Set();
+function sameHint(left, right) {
+	if (left === null || right === null) return left === right;
+	if (left.labelKey !== right.labelKey || left.tone !== right.tone) return false;
+	const leftMore = left.moreKeys ?? [];
+	const rightMore = right.moreKeys ?? [];
+	return leftMore.length === rightMore.length && leftMore.every((key, index) => key === rightMore[index]);
+}
 function publishPanelHint(id, hint) {
-	if ((hints.get(id)?.labelKey ?? null) === (hint?.labelKey ?? null)) return;
+	if (sameHint(hints.get(id) ?? null, hint)) return;
 	if (hint === null) hints.delete(id);
 	else hints.set(id, hint);
 	for (const listener of [...listeners$3]) listener();
@@ -3538,7 +3549,7 @@ function panelRowName(label, hint, t) {
 	if (hint === null) return label;
 	return t("panels.labelWithHint", {
 		label,
-		hint: t(hint.labelKey)
+		hint: [hint.labelKey, ...hint.moreKeys ?? []].map((key) => t(key)).join(t("panels.hintJoin"))
 	});
 }
 //#endregion
@@ -3689,39 +3700,6 @@ function sharedRows(manifests, capabilities) {
 	return rows;
 }
 //#endregion
-//#region src/app/layouts/rightbar/market-workbench-row.ts
-var WORKBENCH_ROW_ID = "workbench:self";
-var WORKBENCH_TITLE_KEY = "panels.market.workbenchName";
-function workbenchRow(version) {
-	if (version === null || version === void 0 || version.installed === "") return void 0;
-	const local = version.local === true;
-	const latest = local ? void 0 : version.latest;
-	const update = latest !== void 0 && latest !== version.installed ? {
-		installed: version.installed,
-		latest
-	} : void 0;
-	const note = local ? {
-		key: "panels.market.workbenchLocal",
-		params: {}
-	} : void 0;
-	return {
-		id: WORKBENCH_ROW_ID,
-		titleKey: WORKBENCH_TITLE_KEY,
-		workbench: true,
-		state: !local && version.running !== void 0 && version.running !== version.installed ? "pending-restart" : update === void 0 ? "installed" : "outdated",
-		canInstall: false,
-		canUpdate: update !== void 0,
-		canUninstall: false,
-		...note === void 0 ? {} : { note },
-		version: {
-			installed: version.installed,
-			...latest === void 0 ? {} : { latest }
-		},
-		...update === void 0 ? {} : { moduleUpdate: update },
-		pkg: version.pkg
-	};
-}
-//#endregion
 //#region src/app/layouts/rightbar/market-rows.ts
 var MARKET_STATE_KEY = {
 	checking: "panels.market.checking",
@@ -3903,10 +3881,6 @@ function marketUpdatesOf(modules) {
 	}
 	return next;
 }
-function marketHintVisible(manifests, capabilities, modules, workbench) {
-	const self = workbenchRow(workbench);
-	return marketHasUpdates([...marketRows(manifests, capabilities, marketUpdatesOf(modules)), ...self === void 0 ? [] : [self]], sharedRows(manifests, capabilities));
-}
 function marketOrder(rows, titleOf) {
 	return [...rows].sort((left, right) => {
 		const byTitle = titleOf(left).localeCompare(titleOf(right), "zh-Hans-CN");
@@ -3962,6 +3936,152 @@ function marketRows(manifests, capabilities, updates = {}, defaults = /* @__PURE
 	return rows;
 }
 //#endregion
+//#region src/app/layouts/rightbar/market-plugin-rows.ts
+function installedPluginKept(value) {
+	if (typeof value !== "object" || value === null) return void 0;
+	const kept = value.kept;
+	if (typeof kept !== "object" || kept === null) return void 0;
+	const kind = kept.kind;
+	if (kind === "held") return { key: "panels.market.pluginKeptHeld" };
+	if (kind === "unnamed") return { key: "panels.market.pluginKeptUnnamed" };
+	if (kind === "unsure") return { key: "panels.market.pluginKeptUnsure" };
+	if (kind !== "claimed") return void 0;
+	const raw = kept.by;
+	const names = Array.isArray(raw) ? raw.filter((item) => typeof item === "string") : [];
+	return names.length === 0 ? { key: "panels.market.pluginKeptUnsure" } : {
+		key: "panels.market.pluginKeptInUse",
+		names
+	};
+}
+function installedPluginNotice(value, t) {
+	const kept = installedPluginKept(value);
+	if (kept === void 0) return null;
+	return t(kept.key, kept.names === void 0 ? {} : { names: kept.names.join(t("panels.market.listSeparator")) });
+}
+function noteOf(plugin) {
+	if (plugin.broken === true) return {
+		key: "panels.market.pluginBroken",
+		params: {},
+		tone: "alert"
+	};
+	if (plugin.local === true) return void 0;
+}
+function installedPluginRows(plugins, defaults = /* @__PURE__ */ new Set(), changed = {}) {
+	return plugins.map((plugin) => {
+		const id = `plugin:${plugin.pkg}`;
+		const name = plugin.name ?? plugin.pkg;
+		const outdated = plugin.installed !== void 0 && plugin.latest !== void 0 && plugin.latest !== plugin.installed;
+		const note = noteOf(plugin);
+		return {
+			id,
+			titleKey: plugin.pkg,
+			label: name,
+			plugin: true,
+			state: outdated ? "outdated" : plugin.broken === true ? "broken" : "installed",
+			canInstall: false,
+			canUpdate: outdated,
+			canUninstall: true,
+			...plugin.local === true ? { local: true } : {},
+			...plugin.broken === true ? { broken: true } : {},
+			defaultShown: defaults.has(id),
+			defaultChanged: changed[id] ?? 0,
+			...note === void 0 ? {} : { note },
+			...plugin.installed === void 0 ? {} : { versionLabel: `${plugin.pkg}@${plugin.installed}` },
+			pkg: plugin.pkg,
+			...plugin.installed === void 0 ? {} : { version: {
+				installed: plugin.installed,
+				...plugin.latest === void 0 ? {} : { latest: plugin.latest }
+			} }
+		};
+	});
+}
+//#endregion
+//#region src/app/layouts/rightbar/market-workbench-row.ts
+var WORKBENCH_ROW_ID = "workbench:self";
+var WORKBENCH_TITLE_KEY = "panels.market.workbenchName";
+function workbenchRow(version) {
+	if (version === null || version === void 0 || version.installed === "") return void 0;
+	const local = version.local === true;
+	const latest = local ? void 0 : version.latest;
+	const update = latest !== void 0 && latest !== version.installed ? {
+		installed: version.installed,
+		latest
+	} : void 0;
+	const note = local ? {
+		key: "panels.market.workbenchLocal",
+		params: {}
+	} : void 0;
+	return {
+		id: WORKBENCH_ROW_ID,
+		titleKey: WORKBENCH_TITLE_KEY,
+		workbench: true,
+		state: !local && version.running !== void 0 && version.running !== version.installed ? "pending-restart" : update === void 0 ? "installed" : "outdated",
+		canInstall: false,
+		canUpdate: update !== void 0,
+		canUninstall: false,
+		...note === void 0 ? {} : { note },
+		version: {
+			installed: version.installed,
+			...latest === void 0 ? {} : { latest }
+		},
+		...update === void 0 ? {} : { moduleUpdate: update },
+		pkg: version.pkg
+	};
+}
+//#endregion
+//#region src/app/layouts/rightbar/market-hint.ts
+var PROBLEM_KEY = "panels.market.hasProblem";
+var RESTART_KEY = "panels.market.pendingRestart";
+var UPDATES_KEY = "panels.market.hasNew";
+function isProblem(row) {
+	return row.broken === true || row.state === "broken" || row.state === "unusable" || row.note?.key === "panels.market.moduleRefused";
+}
+function isRestart(row) {
+	return row.state === "inactive" || row.state === "pending-restart";
+}
+function awaitsRestart(input) {
+	const loaded = new Set(input.manifests.map((manifest) => manifest.id));
+	return (input.installed ?? []).some((module) => !loaded.has(module.unit) && refusalReasons(module.refused, module.clientRefused).length === 0);
+}
+function marketHintOf(input) {
+	const marketable = marketCatalog(input.manifests, input.installable);
+	const catalog = marketRows(marketable, input.capabilities, marketUpdatesOf(input.modules));
+	const listed = new Set(catalog.map((row) => row.id));
+	const self = workbenchRow(input.workbench);
+	const rows = [
+		...catalog,
+		...installedRows(input.installed ?? [], input.manifests, listed),
+		...installedPluginRows(input.plugins ?? []),
+		...self === void 0 ? [] : [self]
+	];
+	const problem = rows.some(isProblem);
+	const restart = rows.some(isRestart) || awaitsRestart(input);
+	const updates = marketHasUpdates(rows, sharedRows(marketable, input.capabilities));
+	const more = [];
+	if (problem) {
+		if (restart) more.push(RESTART_KEY);
+		if (updates) more.push(UPDATES_KEY);
+		return {
+			labelKey: PROBLEM_KEY,
+			tone: "danger",
+			...more.length === 0 ? {} : { moreKeys: more }
+		};
+	}
+	if (restart) {
+		if (updates) more.push(UPDATES_KEY);
+		return {
+			labelKey: RESTART_KEY,
+			tone: "warning",
+			...more.length === 0 ? {} : { moreKeys: more }
+		};
+	}
+	if (updates) return {
+		labelKey: UPDATES_KEY,
+		tone: "warning"
+	};
+	return null;
+}
+//#endregion
 //#region src/shared/hooks/use-host-write.ts
 var use_host_write_exports = /* @__PURE__ */ __exportAll({ useHostWrite: () => useHostWrite });
 function useHostWrite(options) {
@@ -4117,66 +4237,6 @@ function useMarketTransient(input) {
 		setNotice
 	};
 }
-//#endregion
-//#region src/app/layouts/rightbar/market-plugin-rows.ts
-function installedPluginKept(value) {
-	if (typeof value !== "object" || value === null) return void 0;
-	const kept = value.kept;
-	if (typeof kept !== "object" || kept === null) return void 0;
-	const kind = kept.kind;
-	if (kind === "held") return { key: "panels.market.pluginKeptHeld" };
-	if (kind === "unnamed") return { key: "panels.market.pluginKeptUnnamed" };
-	if (kind === "unsure") return { key: "panels.market.pluginKeptUnsure" };
-	if (kind !== "claimed") return void 0;
-	const raw = kept.by;
-	const names = Array.isArray(raw) ? raw.filter((item) => typeof item === "string") : [];
-	return names.length === 0 ? { key: "panels.market.pluginKeptUnsure" } : {
-		key: "panels.market.pluginKeptInUse",
-		names
-	};
-}
-function installedPluginNotice(value, t) {
-	const kept = installedPluginKept(value);
-	if (kept === void 0) return null;
-	return t(kept.key, kept.names === void 0 ? {} : { names: kept.names.join(t("panels.market.listSeparator")) });
-}
-function noteOf(plugin) {
-	if (plugin.broken === true) return {
-		key: "panels.market.pluginBroken",
-		params: {},
-		tone: "alert"
-	};
-	if (plugin.local === true) return void 0;
-}
-function installedPluginRows(plugins, defaults = /* @__PURE__ */ new Set(), changed = {}) {
-	return plugins.map((plugin) => {
-		const id = `plugin:${plugin.pkg}`;
-		const name = plugin.name ?? plugin.pkg;
-		const outdated = plugin.installed !== void 0 && plugin.latest !== void 0 && plugin.latest !== plugin.installed;
-		const note = noteOf(plugin);
-		return {
-			id,
-			titleKey: plugin.pkg,
-			label: name,
-			plugin: true,
-			state: outdated ? "outdated" : plugin.broken === true ? "broken" : "installed",
-			canInstall: false,
-			canUpdate: outdated,
-			canUninstall: true,
-			...plugin.local === true ? { local: true } : {},
-			...plugin.broken === true ? { broken: true } : {},
-			defaultShown: defaults.has(id),
-			defaultChanged: changed[id] ?? 0,
-			...note === void 0 ? {} : { note },
-			...plugin.installed === void 0 ? {} : { versionLabel: `${plugin.pkg}@${plugin.installed}` },
-			pkg: plugin.pkg,
-			...plugin.installed === void 0 ? {} : { version: {
-				installed: plugin.installed,
-				...plugin.latest === void 0 ? {} : { latest: plugin.latest }
-			} }
-		};
-	});
-}
 var MarketPage_module_default = {
 	marketList: "_marketList_csyus_1",
 	marketRow: "_marketRow_csyus_10",
@@ -5174,7 +5234,7 @@ function attentionSessionIdOf(input) {
 	let bestRank = -1;
 	for (const summary of sessionRows(workspace.sessionIds, input.sessions, input.archivedIds)) {
 		const ofSession = attentionOfSession(summary, input.statusById, input.sessions);
-		if (ofSession === void 0 || ofSession === "ongoing") continue;
+		if (ofSession === void 0) continue;
 		const rank = RANK[ofSession];
 		if (best === void 0 || rank > bestRank || rank === bestRank && isLater(summary, best)) {
 			best = summary;
@@ -5975,12 +6035,22 @@ function makeMarketEntryIcon(units) {
 		const manifests = useLiveManifests(units);
 		const installable = useInstallableUnits(units);
 		const { capabilities } = useCapabilityMap(0);
-		const { modules, workbench } = useModuleVersions();
-		const hasUpdates = marketHintVisible(marketCatalog(manifests, installable), capabilities, modules, workbench);
+		const { modules, plugins, workbench } = useModuleVersions();
+		const hint = marketHintOf({
+			manifests,
+			installable,
+			capabilities,
+			modules,
+			installed: modules === null ? void 0 : withClientRefusals(modules, units.refusals()),
+			plugins,
+			workbench
+		});
 		useEffect(() => {
-			publishPanelHint(MARKET_PANEL_ID, hasUpdates ? { labelKey: "panels.market.hasNew" } : null);
-			return () => publishPanelHint(MARKET_PANEL_ID, null);
-		}, [hasUpdates]);
+			publishPanelHint(MARKET_PANEL_ID, hint);
+		}, [hint]);
+		useEffect(() => () => {
+			publishPanelHint(MARKET_PANEL_ID, null);
+		}, []);
 		return /* @__PURE__ */ h(IconModules, { size });
 	};
 }
@@ -9044,10 +9114,10 @@ function PanelRow({ id, label, active, wide, onSelect, fallbackGlyph, renderEntr
 		className: "wb-panelGlyph",
 		"aria-hidden": "true"
 	}, glyph, hint !== null && !wide ? /* @__PURE__ */ h("span", { className: "wb-panelDot" }, /* @__PURE__ */ h(StateDot, {
-		state: "warning",
+		state: hint.tone === "danger" ? "error" : "warning",
 		size: 9
 	})) : null), wide ? /* @__PURE__ */ h("span", { className: "wb-panelTitle" }, label) : null, hint === null || !wide ? null : /* @__PURE__ */ h(Tag, {
-		tone: "warning",
+		tone: hint.tone,
 		className: "wb-panelTag"
 	}, t(hint.labelKey))));
 }