dshmarket 1.27.0 → 1.28.1

package/client/client.js

@@ -35,7 +35,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 		/** zh/en dictionaries for the Market settings section and install toast. */
 		const zh = {
 			nav: "插件市场",
-			setCardDesc: "查看版本、更新或移除插件市场。",
+			setCardDesc: "查看插件市场版本与设置。",
 			setSelfUpToDate: "已是最新版本",
 			setSelfUpdateReady: "有新版本",
 			setSelfUpdateHint: "更新会下载新版本，重启后生效。",
@@ -479,7 +479,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 		};
 		const en = {
 			nav: "Plugin Market",
-			setCardDesc: "See the version, update, or remove the plugin market.",
+			setCardDesc: "View the plugin market version and settings.",
 			setSelfUpToDate: "Up to date",
 			setSelfUpdateReady: "New version available:",
 			setSelfUpdateHint: "Updating downloads the new version; it takes effect after a restart.",
@@ -923,6 +923,28 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 		};
 		//#endregion
 		//#region src/client/market-data.ts
+		/** Category ids for one entry, de-duplicated in declaration order. */
+		function pluginCategories(plugin) {
+			const values = Array.isArray(plugin.category) ? plugin.category : [plugin.category];
+			const categories = [];
+			const seen = /* @__PURE__ */ new Set();
+			for (const value of values) {
+				if (typeof value !== "string" || value === "" || seen.has(value)) continue;
+				seen.add(value);
+				categories.push(value);
+			}
+			return categories;
+		}
+		/**
+		* Add active profile Bundles as presence-only catalog entries.
+		*
+		* The returned map is for catalog matching only. Update and uninstall flows
+		* must keep using the dependency-only map because a Bundle supplied by the
+		* dsh installation is not owned by the profile package manager.
+		*/
+		function installedForCatalog(installed, bundles) {
+			return Object.fromEntries([...bundles.map((name) => [name, "*"]), ...Object.entries(installed)]);
+		}
 		function groupSwitchState(members, disabled) {
 			const list = members ?? [];
 			if (list.length === 0) return "empty";
@@ -976,18 +998,24 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 		}
 		/**
 		* The discover list: category filter, then the published-within window, then
-		* search across name / owner / localized description, then the selected sort.
+		* search across name / owner / localized description / category ids and
+		* localized category labels, then the selected sort.
 		* Pure — the section renders exactly this.
 		*/
 		function visiblePlugins(plugins, options) {
 			const query = options.query.trim().toLowerCase();
 			const list = plugins.filter((p) => {
 				if (isMarketItself(p)) return false;
-				if (options.category !== "all" && p.category !== options.category) return false;
+				const categories = pluginCategories(p);
+				if (options.category !== "all" && !categories.includes(options.category)) return false;
 				if (options.sinceDays !== void 0 && !withinDays(p.added, options.sinceDays)) return false;
 				if (query === "") return true;
 				const desc = p.description && (p.description[options.lang] || p.description.en) || "";
-				return p.name.toLowerCase().includes(query) || p.owner.toLowerCase().includes(query) || desc.toLowerCase().includes(query);
+				const categoryMatches = categories.some((category) => {
+					if (category.toLowerCase().includes(query)) return true;
+					return Object.values(options.categories?.[category] ?? {}).some((label) => typeof label === "string" && label.toLowerCase().includes(query));
+				});
+				return p.name.toLowerCase().includes(query) || p.owner.toLowerCase().includes(query) || desc.toLowerCase().includes(query) || categoryMatches;
 			});
 			const hasDownloads = (p) => typeof p.downloads === "number";
 			if (options.sort === "downloads-desc") return [...list].sort((a, b) => {
@@ -1010,7 +1038,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 		}
 		/** The themes tab listing: theme category only, most-starred first. */
 		function themePlugins(plugins) {
-			return plugins.filter((p) => p.category === "theme").sort((a, b) => (b.stars || 0) - (a.stars || 0));
+			return plugins.filter((p) => pluginCategories(p).includes("theme")).sort((a, b) => (b.stars || 0) - (a.stars || 0));
 		}
 		/**
 		* Category chip order: collapsed with an active non-'all' chip that would
@@ -2339,7 +2367,13 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 												onClick: props.onRefresh,
 												children: t("refresh")
 											}),
-											record.state === "failed" && props.onRetry !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+											record.state === "failed" && (record.blockedBuilds ?? []).length > 0 && props.onApproveBuilds !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+												variant: "primary",
+												size: "sm",
+												onClick: () => props.onApproveBuilds?.(record),
+												children: t("approveBuilds")
+											}),
+											record.state === "failed" && (record.blockedBuilds ?? []).length === 0 && props.onRetry !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 												variant: "outline",
 												size: "sm",
 												onClick: () => props.onRetry?.(record),
@@ -5278,6 +5312,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				}).catch(() => {});
 				fetch("/dsh-market/updates" + (force === true ? "?force=1" : ""), { cache: "no-store" }).then((res) => res.json()).then((body) => setUpdates(body.updates || {})).catch(() => {});
 			}, []);
+			/** Active Bundles count as installed in Discover without becoming package-manager targets. */
+			const catalogInstalled = (0, react.useMemo)(() => installedForCatalog(installed, installedBundles), [installed, installedBundles]);
 			(0, react.useMemo)(() => new Set(disabledNames), [disabledNames]);
 			/** Effective switch state: market disable list ∪ user-patch-layer disables. */
 			const effectiveDisabledSet = (0, react.useMemo)(() => /* @__PURE__ */ new Set([...disabledNames, ...patchDisabledNames]), [disabledNames, patchDisabledNames]);
@@ -5468,6 +5504,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				category: cat,
 				query: q,
 				lang,
+				categories: data.categories,
 				sort: `${sortField}-${sortDir}`,
 				sinceDays: timeRange === "all" ? void 0 : TIME_RANGE_DAYS[timeRange]
 			}), [
@@ -5491,6 +5528,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				category: "theme",
 				query: qThemes,
 				lang,
+				categories: data.categories,
 				sort: `${themeSortField}-${themeSortDir}`,
 				sinceDays: themeTimeRange === "all" ? void 0 : TIME_RANGE_DAYS[themeTimeRange]
 			}), [
@@ -5582,7 +5620,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				}))).then(({ status, body }) => {
 					setBusyUrl(null);
 					sessionStorage.removeItem("dshm-pending");
-					if (status === 200 && body.ok && body.hot && plugin.category === "theme") {
+					if (status === 200 && body.ok && body.hot && pluginCategories(plugin).includes("theme")) {
 						sessionStorage.setItem("dshm-toast", JSON.stringify([plugin.name]));
 						sessionStorage.setItem("dshm-tab", "themes");
 						location.reload();
@@ -5639,15 +5677,17 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							setOperationsOpen(true);
 							return;
 						}
-						if (Array.isArray(body.ignoredBuilds) && body.ignoredBuilds.length > 0) setBuildsSkipped({
+						const blocked = Array.isArray(body.ignoredBuilds) ? body.ignoredBuilds.map(String) : [];
+						if (blocked.length > 0) setBuildsSkipped({
 							plugin,
-							names: body.ignoredBuilds.map(String)
+							names: blocked
 						});
 						const text = (v) => typeof v === "string" ? v : v && typeof v.text === "string" ? v.text : v == null ? "" : JSON.stringify(v);
 						const detail = text(body.error) || humanOutput([text(body.stderr), text(body.stdout)].filter(Boolean).join("\n")) || "exit " + body.exitCode;
 						setRecords((list) => patch(list, recordId, {
 							state: "failed",
-							reason: detail.trim().slice(-600)
+							reason: detail.trim().slice(-600),
+							...blocked.length > 0 ? { blockedBuilds: blocked } : {}
 						}));
 						setOperationsOpen(true);
 					}
@@ -6022,6 +6062,17 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				setGroupPayload,
 				t
 			]);
+			/** Approve the build scripts pnpm refused, then rerun what was blocked. */
+			const approveAndRetry = (0, react.useCallback)((names, resume) => {
+				fetch("/dsh-market/approve-builds", {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify({ packages: names })
+				}).then((res) => res.json()).then((body) => {
+					if (!body.ok) setInstallError(String(body.error || "approve failed"));
+					else resume();
+				}).catch((error) => setInstallError(String(error)));
+			}, []);
 			const doGroupToggle = (0, react.useCallback)((name, enabled) => {
 				return doGroupAction({
 					action: "toggle",
@@ -6357,7 +6408,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const pluginCard = (p) => {
 				const desc = p.description && (p.description[lang] || p.description.en) || "";
 				const done = doneUrls.includes(p.url) || hotUrls.includes(p.url);
-				const already = isInstalled(p, installed, repoIdentities, data?.plugins, repoHints);
+				const already = isInstalled(p, catalogInstalled, repoIdentities, data?.plugins, repoHints);
 				const busy = busyUrl === p.url;
 				const replacement = replacementOf(p);
 				const record = recordForUrl(records, p.url);
@@ -6473,10 +6524,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: Market_module_css_default.foot,
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							children: [pluginCategories(p).map((category) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: Market_module_css_default.tag,
-								children: data.categories[p.category] && (data.categories[p.category][lang] || data.categories[p.category].en) || p.category
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: Market_module_css_default.grow })]
+								children: data.categories[category] && (data.categories[category][lang] || data.categories[category].en) || category
+							}, category)), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: Market_module_css_default.grow })]
 						}),
 						busy && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: Market_module_css_default.progress,
@@ -6818,7 +6869,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				if (data === null) return names;
 				for (const [name, spec] of Object.entries(installed)) {
 					const entry = entryForDep(data.plugins, name, String(spec), repoIdentities[name], repoHints[name]);
-					if (entry !== void 0 && entry.category === "theme") names.add(name);
+					if (entry !== void 0 && pluginCategories(entry).includes("theme")) names.add(name);
 				}
 				return names;
 			}, [
@@ -6953,7 +7004,17 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 										onCancel: () => doCancel(),
 										onDismiss: (record) => setRecords((list) => drop(list, record.id)),
 										onRefresh: () => location.reload(),
-										onResolveConflict: resolveConflict
+										onResolveConflict: resolveConflict,
+										onApproveBuilds: (record) => {
+											const names = record.blockedBuilds ?? [];
+											if (names.length === 0) return;
+											setRecords((list) => drop(list, record.id));
+											const plugin = record.url === void 0 ? void 0 : data?.plugins.find((p) => p.url === record.url);
+											approveAndRetry(names, () => {
+												if (plugin !== void 0) doInstall(plugin);
+												else doUpdate(record.name, false, false);
+											});
+										}
 									})
 								]
 							}),
@@ -7150,15 +7211,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 								onClick: () => {
 									const { plugin, updateName, names, restore } = buildsSkipped;
 									setBuildsSkipped(null);
-									fetch("/dsh-market/approve-builds", {
-										method: "POST",
-										headers: { "content-type": "application/json" },
-										body: JSON.stringify({ packages: names })
-									}).then((res) => res.json()).then((body) => {
-										if (!body.ok) setInstallError(String(body.error || "approve failed"));
-										else if (plugin !== void 0) doInstall(plugin);
+									approveAndRetry(names, () => {
+										if (plugin !== void 0) doInstall(plugin);
 										else if (updateName !== void 0) doUpdate(updateName, false, restore === true);
-									}).catch((error) => setInstallError(String(error)));
+									});
 								},
 								children: t("approveBuilds")
 							})
@@ -8136,7 +8192,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 															setTab("discover");
 														},
 														children: t("viewReplacement")
-													}), !isInstalled(replacement, installed, repoIdentities, data?.plugins, repoHints) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+													}), !isInstalled(replacement, catalogInstalled, repoIdentities, data?.plugins, repoHints) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 														variant: "outline",
 														size: "sm",
 														onClick: () => setConfirming(replacement),
@@ -8269,10 +8325,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 										})
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: Market_module_css_default.grow }),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									pluginCategories(confirming).map((category) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										className: Market_module_css_default.tag,
-										children: data.categories[confirming.category] && (data.categories[confirming.category][lang] || data.categories[confirming.category].en) || confirming.category
-									})
+										children: data.categories[category] && (data.categories[category][lang] || data.categories[category].en) || category
+									}, category))
 								]
 							}),
 							confirming.added && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -8484,8 +8540,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 		/**
 		* The market's card on the plugin configuration page (dsh >= 0.1.0-rc.7).
 		*
-		* It manages the market ITSELF — version, update, remove. That is the whole
-		* scope on purpose: this page is where a user goes to deal with a plugin,
+		* It manages the market ITSELF — version, update, remove — when the current
+		* profile owns the dependency. A host-provided market keeps only its version
+		* display and download-region controls. This page is where a user goes to deal
+		* with a plugin,
 		* and "which version am I on / update it / get rid of it" is the part of
 		* that anybody can act on without knowing how DSH is put together.
 		*
@@ -8558,7 +8616,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				channels: offered.length > 0 ? offered : ["stable", "beta"],
 				region: asRegion(body.region) ?? "global",
 				regions: regions.length > 0 ? regions : REGIONS,
-				regionAuto: body.regionAuto === true
+				regionAuto: body.regionAuto === true,
+				selfManaged: body.selfManaged !== false
 			};
 		}
 		function readUpdate(own) {
@@ -8614,7 +8673,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							channels: ["stable", "beta"],
 							region: "global",
 							regions: REGIONS,
-							regionAuto: false
+							regionAuto: false,
+							selfManaged: true
 						});
 					}
 					try {
@@ -8757,7 +8817,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			}, [post, t]);
 			/** One label + hint block with an optional action, the host's row shape. */
 			const row = (label, hint, action) => (0, react.createElement)("div", { className: Market_module_css_default.setRow }, (0, react.createElement)("div", { className: Market_module_css_default.setLabelBox }, (0, react.createElement)("div", { className: Market_module_css_default.setLabel }, label), (0, react.createElement)("div", { className: Market_module_css_default.setHint }, hint)), action);
-			const body = phase === "removed" ? row(t("setSelfRemoved"), t("setSelfRemovedHint"), null) : (0, react.createElement)(react.Fragment, null, row(update?.updateAvailable === true && update.latest !== null ? `${t("setSelfUpdateReady")} ${update.latest}` : update?.channelSwitch != null ? `${t("setChannelSwitch")} ${update.channelSwitch}` : t("setSelfUpToDate"), phase === "updated" ? t("setSelfUpdatedHint") : update?.channelSwitch != null ? t("setChannelSwitchHint") : update?.updateAvailable === true ? t("setSelfUpdateHint") : t("setSelfUpToDateHint"), phase === "updated" ? null : update?.updateAvailable === true ? (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+			const body = phase === "removed" ? row(t("setSelfRemoved"), t("setSelfRemovedHint"), null) : (0, react.createElement)(react.Fragment, null, status?.selfManaged === true ? row(update?.updateAvailable === true && update.latest !== null ? `${t("setSelfUpdateReady")} ${update.latest}` : update?.channelSwitch != null ? `${t("setChannelSwitch")} ${update.channelSwitch}` : t("setSelfUpToDate"), phase === "updated" ? t("setSelfUpdatedHint") : update?.channelSwitch != null ? t("setChannelSwitchHint") : update?.updateAvailable === true ? t("setSelfUpdateHint") : t("setSelfUpToDateHint"), phase === "updated" ? null : update?.updateAvailable === true ? (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 				variant: "primary",
 				size: "sm",
 				disabled: busy,
@@ -8767,7 +8827,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				size: "sm",
 				disabled: busy,
 				onClick: () => onUpdate()
-			}, t("setChannelSwitch")) : null), row(t("setChannel"), t(CHANNEL_HINT[status?.channel ?? "stable"]), (0, react.createElement)("div", { className: Market_module_css_default.setSeg }, (status?.channels ?? ["stable", "beta"]).map((id) => (0, react.createElement)("button", {
+			}, t("setChannelSwitch")) : null) : null, status?.selfManaged === true ? row(t("setChannel"), t(CHANNEL_HINT[status.channel]), (0, react.createElement)("div", { className: Market_module_css_default.setSeg }, (status?.channels ?? ["stable", "beta"]).map((id) => (0, react.createElement)("button", {
 				key: id,
 				type: "button",
 				className: status?.channel === id ? `${Market_module_css_default.setSegBtn} ${Market_module_css_default.setSegOn}` : Market_module_css_default.setSegBtn,
@@ -8776,7 +8836,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				onClick: () => {
 					onChannel(id);
 				}
-			}, t(CHANNEL_LABEL[id]))))), row(t("setRegion"), status?.regionAuto === true ? `${t(REGION_HINT[status.region])} ${t("setRegionAuto")}` : t(REGION_HINT[status?.region ?? "global"]), (0, react.createElement)("div", { className: Market_module_css_default.setSeg }, (status?.regions ?? REGIONS).map((id) => (0, react.createElement)("button", {
+			}, t(CHANNEL_LABEL[id]))))) : null, row(t("setRegion"), status?.regionAuto === true ? `${t(REGION_HINT[status.region])} ${t("setRegionAuto")}` : t(REGION_HINT[status?.region ?? "global"]), (0, react.createElement)("div", { className: Market_module_css_default.setSeg }, (status?.regions ?? REGIONS).map((id) => (0, react.createElement)("button", {
 				key: id,
 				type: "button",
 				className: status?.region === id ? `${Market_module_css_default.setSegBtn} ${Market_module_css_default.setSegOn}` : Market_module_css_default.setSegBtn,
@@ -8784,7 +8844,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				onClick: () => {
 					onRegion(id);
 				}
-			}, t(REGION_LABEL[id]))))), row(t("setSelfRemove"), t("setSelfRemoveHint"), phase === "confirming" || busy ? null : (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+			}, t(REGION_LABEL[id]))))), status?.selfManaged === true ? row(t("setSelfRemove"), t("setSelfRemoveHint"), phase === "confirming" || busy ? null : (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 				variant: "outline",
 				size: "sm",
 				className: Market_module_css_default.setDanger,
@@ -8792,7 +8852,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				onClick: () => {
 					setPhase("confirming");
 				}
-			}, t("setSelfRemove"))), phase === "confirming" || busy ? (0, react.createElement)("div", { className: Market_module_css_default.setConfirm }, (0, react.createElement)("div", { className: Market_module_css_default.setHint }, t("setSelfConfirm")), (0, react.createElement)("label", { className: Market_module_css_default.setCheck }, (0, react.createElement)("input", {
+			}, t("setSelfRemove"))) : null, status?.selfManaged === true && (phase === "confirming" || busy) ? (0, react.createElement)("div", { className: Market_module_css_default.setConfirm }, (0, react.createElement)("div", { className: Market_module_css_default.setHint }, t("setSelfConfirm")), (0, react.createElement)("label", { className: Market_module_css_default.setCheck }, (0, react.createElement)("input", {
 				type: "checkbox",
 				checked: purge,
 				onChange: () => {