dsh-plugin-shop 0.7.5-beta.0 → 0.8.0-beta.0

package/lib/client.js

@@ -4324,6 +4324,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		});
 		const dsh_plugin_shop_shop_installed_result$schema = array(object({
 			"name": string(),
+			"source": union([literal("npm"), literal("github")]),
+			"repo": union([_undefined(), string()]).optional(),
+			"subdir": union([_undefined(), string()]).optional(),
 			"installed": string(),
 			"latest": string(),
 			"outdated": boolean(),
@@ -4336,7 +4339,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				_undefined(),
 				literal(false),
 				literal(true)
-			]).optional()
+			]).optional(),
+			"source": union([
+				_undefined(),
+				literal("npm"),
+				literal("github")
+			]).optional(),
+			"repo": union([_undefined(), string()]).optional(),
+			"subdir": union([_undefined(), string()]).optional()
 		});
 		const dsh_plugin_shop_shop_installStart_result$schema = union([object({
 			"ok": literal(true),
@@ -4348,7 +4358,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				literal("denied"),
 				literal("version-mismatch"),
 				literal("needs-acknowledgement"),
-				literal("tarball-integrity")
+				literal("tarball-integrity"),
+				literal("ambiguous-identity")
 			]),
 			"detail": string()
 		})]);
@@ -4437,7 +4448,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 623,
+						"line": 678,
 						"column": 9
 					}
 				},
@@ -4455,7 +4466,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 809,
+						"line": 863,
 						"column": 9
 					}
 				},
@@ -4483,7 +4494,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 674,
+						"line": 726,
 						"column": 9
 					}
 				},
@@ -4510,7 +4521,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 798,
+						"line": 852,
 						"column": 3
 					}
 				},
@@ -4528,7 +4539,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 959,
+						"line": 1021,
 						"column": 9
 					}
 				},
@@ -4555,7 +4566,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 515,
+						"line": 535,
 						"column": 9
 					}
 				},
@@ -4583,7 +4594,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 901,
+						"line": 956,
 						"column": 9
 					}
 				},
@@ -4610,7 +4621,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 1027,
+						"line": 1106,
 						"column": 9
 					}
 				},
@@ -4628,7 +4639,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-plugin-shop/src/host/index.ts",
-						"line": 1010,
+						"line": 1089,
 						"column": 9
 					}
 				}
@@ -4709,6 +4720,16 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return hasPlugin || SHOP_KEYWORDS.includes(segments.at(-1));
 		}
 		//#endregion
+		//#region src/shared/identity.ts
+		/** The registry's uniqueness rule, shared with the presentation layer. */
+		function identityKey(identity) {
+			return identity.source === "npm" ? `npm:${identity.name}` : `github:${identity.repo ?? identity.name}#${identity.subdir ?? ""}`;
+		}
+		/** `owner/slug`, lowercased, or null when this is not a repository reference. */
+		const REPO = "([\\w.-]+)\\/([\\w.-]+?)";
+		new RegExp(`^github:${REPO}(?:[#&].*)?$`);
+		new RegExp(`^(?:git\\+)?https?:\\/\\/(?:www\\.)?github\\.com\\/${REPO}(?:\\.git)?(?:[\\/?#].*)?$`);
+		//#endregion
 		//#region src/client/present.ts
 		/** Hot-mount reason code → locale key, so the notice reads in the language
 		* the person set in dsh. An absent (or unrecognized) reason keeps the generic
@@ -4733,9 +4754,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		}
 		/** The peers the Host said this installation does not provide, or none when it
 		* said nothing — a plugin that runs here and one the Host could not judge are
-		* both rendered as no warning at all. */
-		function missingPeersOf(incompatible, name) {
-			return incompatible[name] ?? [];
+		* both rendered as no warning at all. The map is keyed by install identity,
+		* never by name, because two entries can share a name. */
+		function missingPeersOf(incompatible, key) {
+			return incompatible[key] ?? [];
 		}
 		/** Spec §9.3 verbatim — the community-tier acknowledgement. The zh dictionary
 		* states the same facts in its own register; never soften this wording. */
@@ -4751,6 +4773,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				case "version-mismatch": return "versionMismatchCode";
 				case "needs-acknowledgement": return "needsAcknowledgementCode";
 				case "tarball-integrity": return "tarballIntegrityCode";
+				case "ambiguous-identity": return "ambiguousIdentityCode";
 			}
 		}
 		/** The version a card displays: full for npm, the short commit for github. */
@@ -4934,7 +4957,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* This mirrors the registry's identity verbatim; the two must not drift.
 		*/
 		function entryKey(entry) {
-			return entry.source === "npm" ? `npm:${entry.name}` : `github:${entry.repo ?? entry.name}#${entry.subdir ?? ""}`;
+			return identityKey(entry);
 		}
 		/**
 		* One entry's star count from the sidecar, or undefined when it has none.
@@ -4951,8 +4974,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* repo, one the catalog never even listed.
 		*/
 		function starsOf(entry, stars) {
-			return stars[entry.repo ?? entry.name];
-		}
+			const key = entry.repo ?? entry.name;
+			if (!Object.hasOwn(stars, key)) return void 0;
+			return stars[key];
+		}
+		/** One collator for the whole shelf. Passing an options object to
+		* localeCompare creates a collator per comparison, which dominates the sort
+		* for a catalog with thousands of entries. */
+		const NAME_COLLATOR = new Intl.Collator(void 0, { sensitivity: "base" });
 		/** Sort the shelf: stars descending, un-starred entries last, name ascending
 		* (case-insensitive) on ties (spec 2026-08-26-github-stars-design.md D1).
 		* Display-time only — the catalog's own name sort is untouched. */
@@ -4961,7 +4990,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return [...entries].sort((a, b) => {
 				const byStars = count(b) - count(a);
 				if (byStars !== 0) return byStars;
-				return a.name.localeCompare(b.name, void 0, { sensitivity: "base" });
+				return NAME_COLLATOR.compare(a.name, b.name);
 			});
 		}
 		/** 999 → "999"; 1000 → "1k"; 1234 → "1.2k"; 1500 → "1.5k"; 99999 → "100k". */
@@ -5030,6 +5059,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			versionMismatchCode: "版本不匹配",
 			needsAcknowledgementCode: "需要确认",
 			tarballIntegrityCode: "压缩包完整性校验失败",
+			ambiguousIdentityCode: "无法确定是哪一个条目",
 			npmSource: "npm 包",
 			githubSource: "源码在 GitHub",
 			installedSection: "已安装",
@@ -5119,6 +5149,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			versionMismatchCode: "Version mismatch",
 			needsAcknowledgementCode: "Acknowledgement required",
 			tarballIntegrityCode: "tarball integrity check failed",
+			ambiguousIdentityCode: "Ambiguous entry",
 			npmSource: "npm package",
 			githubSource: "source on GitHub",
 			installedSection: "Installed",
@@ -5176,42 +5207,93 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				installStatus
 			]);
 		}
-		/** Drive one install: rejections, the polling loop at INSTALL_POLL_MS, and
-		* terminal states. The interval is cleared on unmount and whenever the view
-		* leaves `running`, so a done/failed/rejected install never polls again. */
-		function useInstall(install, installStatus) {
-			const [view, setView] = (0, react.useState)({ kind: "idle" });
-			const start = (0, react.useCallback)(async (args) => {
-				setView({ kind: "idle" });
+		/**
+		* Install flows owned by the tab and keyed by install identity. Keeping the
+		* state above individual cards preserves a running operation when filtering
+		* unmounts its card, and makes the shelf and Outdated panels agree.
+		*/
+		function useInstallFlows(install, installStatus, onSettled) {
+			const [views, setViews] = (0, react.useState)(() => /* @__PURE__ */ new Map());
+			const settled = (0, react.useRef)(onSettled);
+			settled.current = onSettled;
+			const put = (0, react.useCallback)((key, view) => {
+				setViews((current) => {
+					const next = new Map(current);
+					next.set(key, view);
+					return next;
+				});
+			}, []);
+			const apply = (0, react.useCallback)((key, event) => {
+				setViews((current) => {
+					const before = current.get(key) ?? { kind: "idle" };
+					const after = reduceInstall(before, event);
+					if (after === before) return current;
+					const next = new Map(current);
+					next.set(key, after);
+					return next;
+				});
+			}, []);
+			const start = (0, react.useCallback)(async (key, args) => {
+				put(key, { kind: "idle" });
 				try {
 					const result = await install(args);
 					if (!result.ok) {
-						setView({
+						put(key, {
 							kind: "rejected",
 							code: result.code,
 							detail: result.detail
 						});
 						return;
 					}
-					setView({
+					put(key, {
 						kind: "running",
 						installId: result.installId,
 						log: []
 					});
 				} catch {
-					setView({
+					put(key, {
 						kind: "failed",
 						detail: "",
 						log: []
 					});
 				}
-			}, [install]);
-			usePollStatus(view, setView, installStatus);
-			return {
-				view,
+			}, [install, put]);
+			const reset = (0, react.useCallback)((key) => {
+				setViews((current) => {
+					if (!current.has(key)) return current;
+					const next = new Map(current);
+					next.delete(key);
+					return next;
+				});
+			}, []);
+			(0, react.useEffect)(() => {
+				const running = [];
+				for (const [key, view] of views) if (view.kind === "running") running.push([key, view.installId]);
+				if (running.length === 0) return;
+				const timer = setInterval(() => {
+					for (const [key, installId] of running) installStatus({ installId }).then((status) => {
+						apply(key, {
+							type: "status",
+							status
+						});
+						if (status.found && status.state !== "running") settled.current?.(key);
+					}, () => {});
+				}, INSTALL_POLL_MS);
+				return () => clearInterval(timer);
+			}, [
+				views,
+				installStatus,
+				apply
+			]);
+			return { flowFor: (0, react.useCallback)((key) => ({
+				view: views.get(key) ?? { kind: "idle" },
+				start: (args) => start(key, args),
+				reset: () => reset(key)
+			}), [
+				views,
 				start,
-				reset: (0, react.useCallback)(() => setView({ kind: "idle" }), [])
-			};
+				reset
+			]) };
 		}
 		//#endregion
 		//#region src/client/useUninstall.ts
@@ -5433,13 +5515,25 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* install controls. An installed plugin's card carries its installed row:
 		* current → the non-interactive installed label, behind → the update button;
 		* uninstalled → the install button. */
-		const EntryCard = (0, react.memo)(function EntryCard({ entry, stars, installed, missing, t, install, installStatus, uninstall, restart, restartSupported, setEnabled }) {
+		const EntryCard = (0, react.memo)(function EntryCard({ entry, stars, installed, missing, t, flowFor, installStatus, uninstall, restart, restartSupported, setEnabled, onSettled }) {
 			const [open, setOpen] = (0, react.useState)(false);
 			const detailId = (0, react.useId)();
 			const summary = entry.catalog?.summary;
 			const npmUrl = npmPageUrl(entry);
 			const author = authorOf(entry);
 			const category = entry.catalog?.category ?? "other";
+			const installTarget = {
+				name: entry.name,
+				version: entry.version,
+				source: entry.source,
+				repo: entry.repo,
+				subdir: entry.subdir
+			};
+			const flow = flowFor(entryKey(entry));
+			const uninstallSettled = (0, react.useCallback)(() => {
+				flow.reset();
+				onSettled();
+			}, [flow, onSettled]);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: _dsh_plugin_shop_css_e3675a89_default.card,
 				"data-shop-entry": entry.name,
@@ -5589,27 +5683,23 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						className: _dsh_plugin_shop_css_e3675a89_default.cardActions,
 						"data-shop-actions": true,
 						children: [installed === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(InstallPanel, {
-							name: entry.name,
-							version: entry.version,
+							target: installTarget,
 							tier: entry.tier,
 							missing,
 							missingStated: true,
+							flow,
 							t,
-							install,
-							installStatus,
 							restart,
 							restartSupported
 						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-							installed.outdated ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(InstallPanel, {
-								name: entry.name,
-								version: entry.version,
+							installed.outdated || flow.view.kind !== "idle" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(InstallPanel, {
+								target: installTarget,
 								tier: entry.tier,
-								variant: "update",
+								variant: installed.outdated ? "update" : "install",
 								missing,
 								missingStated: true,
+								flow,
 								t,
-								install,
-								installStatus,
 								restart,
 								restartSupported
 							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -5631,7 +5721,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 								uninstall,
 								installStatus,
 								restart,
-								restartSupported
+								restartSupported,
+								onSettled: uninstallSettled
 							})
 						] }), author !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: _dsh_plugin_shop_css_e3675a89_default.author,
@@ -5665,9 +5756,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* failure detail, rejection detail — driven by `useInstall`. Shared by the
 		* catalog cards (`variant: 'install'`) and the outdated rows' update button
 		* (`variant: 'update'`, which drives the same install flow for `name@latest`). */
-		function InstallPanel({ name, version, tier, missing, missingStated = false, variant = "install", t, install, installStatus, restart, restartSupported }) {
+		function InstallPanel({ target, tier, missing, missingStated = false, variant = "install", flow, t, restart, restartSupported }) {
 			const [gateOpen, setGateOpen] = (0, react.useState)(false);
-			const { view, start } = useInstall(install, installStatus);
+			const { view, start } = flow;
 			if (view.kind === "running") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: _dsh_plugin_shop_css_e3675a89_default.installPanel,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -5755,8 +5846,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							onClick: () => {
 								setGateOpen(false);
 								start({
-									name,
-									version,
+									...target,
 									acknowledged: true
 								});
 							},
@@ -5777,8 +5867,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				...update ? { "data-shop-update": true } : { "data-shop-install": true },
 				onClick: () => {
 					if (tier === "verified") start({
-						name,
-						version,
+						...target,
 						acknowledged: void 0
 					});
 					else setGateOpen(true);
@@ -5795,8 +5884,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* §9.3 is about granting. A business failure (not in the catalog / not
 		* installed) lands in the failed view with the host's published detail; a
 		* transport failure carries the empty detail and the localized fallback. */
-		function UninstallPanel({ name, t, uninstall, installStatus, restart, restartSupported }) {
+		function UninstallPanel({ name, t, uninstall, installStatus, restart, restartSupported, onSettled }) {
 			const { view, start } = useUninstall(uninstall, installStatus);
+			const settled = (0, react.useRef)(onSettled);
+			settled.current = onSettled;
+			(0, react.useEffect)(() => {
+				if (view.kind === "done") settled.current();
+			}, [view.kind]);
 			if (view.kind === "running") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: _dsh_plugin_shop_css_e3675a89_default.installPanel,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -6024,7 +6118,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		/** One outdated install row (§7.3): the name, the installed and latest
 		* versions, the hot enable/disable switch, and the update button (the
 		* install flow for `name@latest`, reusing `InstallPanel`). */
-		function OutdatedRow({ row, tier, source, missing, t, setEnabled, install, installStatus, restart, restartSupported }) {
+		function OutdatedRow({ row, tier, missing, t, setEnabled, flowFor, restart, restartSupported }) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: _dsh_plugin_shop_css_e3675a89_default.outdatedRow,
 				"data-shop-outdated-entry": row.name,
@@ -6035,7 +6129,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						children: row.name
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 						className: _dsh_plugin_shop_css_e3675a89_default.outdatedVersions,
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("installedVersion", { version: source === "github" ? row.installed.slice(0, 7) : row.installed }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("latestVersion", { version: row.latest }) })]
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("installedVersion", { version: row.source === "github" ? row.installed.slice(0, 7) : row.installed }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("latestVersion", { version: row.latest }) })]
 					})]
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: _dsh_plugin_shop_css_e3675a89_default.outdatedActions,
@@ -6044,14 +6138,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						t,
 						setEnabled
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(InstallPanel, {
-						name: row.name,
-						version: row.latest,
+						target: {
+							name: row.name,
+							version: row.latest,
+							source: row.source,
+							repo: row.repo,
+							subdir: row.subdir
+						},
 						tier,
 						variant: "update",
 						missing,
+						flow: flowFor(identityKey(row)),
 						t,
-						install,
-						installStatus,
 						restart,
 						restartSupported
 					})]
@@ -6065,7 +6163,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* tier for the update gate is looked up from the catalog by name (community →
 		* acknowledgement); an entry absent from the catalog defaults to the
 		* community gate (the safer read). */
-		function OutdatedSection({ state, tiers, sources, missingByName, t, setEnabled, install, installStatus, restart, restartSupported }) {
+		function OutdatedSection({ state, entriesByKey, missingByKey, t, setEnabled, flowFor, restart, restartSupported }) {
 			if (state.kind === "loading") return null;
 			if (state.kind === "error") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				className: _dsh_plugin_shop_css_e3675a89_default.stateLine,
@@ -6084,16 +6182,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					className: _dsh_plugin_shop_css_e3675a89_default.outdatedList,
 					children: outdated.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(OutdatedRow, {
 						row,
-						tier: tiers.get(row.name) ?? "community",
-						source: sources.get(row.name) ?? "npm",
-						missing: missingByName.get(row.name) ?? [],
+						tier: entriesByKey.get(identityKey(row))?.tier ?? "community",
+						missing: missingByKey.get(identityKey(row)) ?? [],
 						t,
 						setEnabled,
-						install,
-						installStatus,
+						flowFor,
 						restart,
 						restartSupported
-					}) }, row.name))
+					}) }, identityKey(row)))
 				})]
 			});
 		}
@@ -6108,6 +6204,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const [selfRestartGate, setSelfRestartGate] = (0, react.useState)(false);
 			const selfUpdate = useUpdateSelf(updateStart, installStatus);
 			const [request, setRequest] = (0, react.useState)({ kind: "initial" });
+			const [mutations, setMutations] = (0, react.useState)(0);
+			const noteMutation = (0, react.useCallback)(() => {
+				setMutations((current) => current + 1);
+			}, []);
+			const flows = useInstallFlows(install, installStatus, noteMutation);
 			const [reloading, setReloading] = (0, react.useState)(false);
 			const [reloadFailed, setReloadFailed] = (0, react.useState)(false);
 			const [query, setQuery] = (0, react.useState)("");
@@ -6188,10 +6289,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				return () => {
 					cancelled = true;
 				};
-			}, [installed, request]);
-			const installedByName = (0, react.useMemo)(() => {
+			}, [
+				installed,
+				request,
+				mutations
+			]);
+			const installedByKey = (0, react.useMemo)(() => {
 				const map = /* @__PURE__ */ new Map();
-				if (installedState.kind === "ready") for (const entry of installedState.entries) map.set(entry.name, entry);
+				if (installedState.kind === "ready") for (const entry of installedState.entries) map.set(identityKey(entry), entry);
 				return map;
 			}, [installedState]);
 			const browsable = (0, react.useMemo)(() => {
@@ -6199,11 +6304,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				const cleared = new Set(catalogState.result.notAShop ?? []);
 				return catalogState.result.plugins.filter((entry) => cleared.has(entry.name) || !isShopLike(entry.name) && (entry.repo === void 0 || !isShopLike(entry.repo)));
 			}, [catalogState]);
+			const stars = (0, react.useMemo)(() => catalogState.kind === "ready" ? catalogState.result.stars : {}, [catalogState]);
+			const sortedBrowsable = (0, react.useMemo)(() => sortByStars(browsable, stars), [browsable, stars]);
 			const filtered = (0, react.useMemo)(() => {
 				const q = query.trim().toLowerCase();
-				return browsable.filter((entry) => {
+				return sortedBrowsable.filter((entry) => {
 					if (category === "installed") {
-						if (!installedByName.has(entry.name)) return false;
+						if (!installedByKey.has(entryKey(entry))) return false;
 					} else if (category !== null && categoryKey(entry) !== categoryLocaleKey(category)) return false;
 					if (q === "") return true;
 					const summaryEn = entry.catalog?.summary.en ?? "";
@@ -6211,14 +6318,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					return entry.name.toLowerCase().includes(q) || summaryEn.toLowerCase().includes(q) || summaryZh.toLowerCase().includes(q);
 				});
 			}, [
-				browsable,
+				sortedBrowsable,
 				query,
 				category,
-				installedByName
+				installedByKey
 			]);
 			filteredLenRef.current = filtered.length;
-			const stars = catalogState.kind === "ready" ? catalogState.result.stars : {};
-			const sorted = (0, react.useMemo)(() => sortByStars(filtered, stars), [filtered, stars]);
 			(0, react.useEffect)(() => {
 				if (!incremental) return;
 				const node = sentinelRef.current;
@@ -6233,7 +6338,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				visibleCount,
 				filtered.length
 			]);
-			const visible = incremental ? sorted.slice(0, visibleCount) : sorted;
+			const visible = incremental ? filtered.slice(0, visibleCount) : filtered;
 			const categoryCounts = (0, react.useMemo)(() => {
 				const counts = /* @__PURE__ */ new Map();
 				for (const entry of browsable) {
@@ -6247,19 +6352,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				if (installedState.kind !== "ready") return 0;
 				return installedState.entries.filter((entry) => !isShopLike(entry.name)).length;
 			}, [installedState]);
-			const tiers = (0, react.useMemo)(() => {
+			const entriesByKey = (0, react.useMemo)(() => {
 				const map = /* @__PURE__ */ new Map();
-				if (catalogState.kind === "ready") for (const entry of catalogState.result.plugins) map.set(entry.name, entry.tier);
+				if (catalogState.kind === "ready") for (const entry of catalogState.result.plugins) map.set(entryKey(entry), entry);
 				return map;
 			}, [catalogState]);
-			const sources = (0, react.useMemo)(() => {
+			const missingByKey = (0, react.useMemo)(() => {
 				const map = /* @__PURE__ */ new Map();
-				if (catalogState.kind === "ready") for (const entry of catalogState.result.plugins) map.set(entry.name, entry.source);
-				return map;
-			}, [catalogState]);
-			const missingByName = (0, react.useMemo)(() => {
-				const map = /* @__PURE__ */ new Map();
-				if (catalogState.kind === "ready") for (const entry of catalogState.result.plugins) map.set(entry.name, missingPeersOf(catalogState.result.incompatible, entry.name));
+				if (catalogState.kind === "ready") for (const entry of catalogState.result.plugins) map.set(entryKey(entry), missingPeersOf(catalogState.result.incompatible, entryKey(entry)));
 				return map;
 			}, [catalogState]);
 			if (catalogState.kind === "loading") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -6522,15 +6622,16 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						children: [visible.map((entry) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(EntryCard, {
 							entry,
 							stars: starsOf(entry, stars),
-							installed: installedByName.get(entry.name),
-							missing: missingByName.get(entry.name) ?? [],
+							installed: installedByKey.get(entryKey(entry)),
+							missing: missingByKey.get(entryKey(entry)) ?? [],
 							t,
-							install,
+							flowFor: flows.flowFor,
 							installStatus,
 							uninstall,
 							restart,
 							restartSupported,
-							setEnabled
+							setEnabled,
+							onSettled: noteMutation
 						}) }, entryKey(entry))), incremental && visibleCount < filtered.length && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
 							ref: sentinelRef,
 							className: _dsh_plugin_shop_css_e3675a89_default.cardsSentry,
@@ -6547,13 +6648,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					})] }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(OutdatedSection, {
 						state: installedState,
-						tiers,
-						sources,
-						missingByName,
+						entriesByKey,
+						missingByKey,
 						t,
 						setEnabled,
-						install,
-						installStatus,
+						flowFor: flows.flowFor,
 						restart,
 						restartSupported
 					})
@@ -6564,13 +6663,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		//#region src/client/index.ts
 		/** Dictionary namespace owned by this plugin. */
 		const NS = "settings.shop";
+		/** How long a stashed catalog may satisfy a plain open. The host applies the
+		* same five-minute freshness window, so the client stash must not outlive it. */
+		const WARM_TTL_MS = 3e5;
 		/** The boot-time warm fetch: the catalog the tab wants on its first open.
 		* Started in apply — the client bundle boots with the web app, long before
 		* the user reaches Settings — so the host's slow network fetch runs while
 		* nobody is looking at the shop, and the tab's mount consumes this promise
 		* instead of starting its own fetch. A rejection stays stored (the injected
 		* catalog falls back to a fresh call); the extra catch keeps the
-		* fire-and-forget from surfacing as an unhandled rejection. */
+		* fire-and-forget from surfacing as an unhandled rejection. Every later
+		* result, including an explicit refresh, replaces this timestamped stash. */
 		let warmCatalog = null;
 		/** Services required by the tab registration and the Remote mount.
 		*
@@ -6602,19 +6705,33 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				return result.value;
 			};
 			warmCatalog = null;
-			warmCatalog = Promise.resolve(ns.catalog(void 0)).then((result) => unwrap(result));
-			warmCatalog.catch(() => {});
+			const warmed = Promise.resolve(ns.catalog(void 0)).then((result) => unwrap(result));
+			warmCatalog = {
+				at: Date.now(),
+				result: warmed
+			};
+			warmed.catch(() => {});
 			Promise.resolve(ns.installed()).then((result) => unwrap(result)).catch(() => {});
 			Promise.resolve(ns.version()).then((result) => unwrap(result)).catch(() => {});
 			const injected = () => ({
 				catalog: async (args) => {
-					if (args?.refresh === true) return unwrap(await ns.catalog(args));
+					if (args?.refresh === true) {
+						const refreshed = unwrap(await ns.catalog(args));
+						warmCatalog = {
+							at: Date.now(),
+							result: Promise.resolve(refreshed)
+						};
+						return refreshed;
+					}
 					const warm = warmCatalog;
-					if (warm !== null) try {
-						return await warm;
+					if (warm !== null && Date.now() - warm.at < 3e5) try {
+						return await warm.result;
 					} catch {}
 					const fresh = unwrap(await ns.catalog(args));
-					warmCatalog = Promise.resolve(fresh);
+					warmCatalog = {
+						at: Date.now(),
+						result: Promise.resolve(fresh)
+					};
 					return fresh;
 				},
 				install: async (args) => unwrap(await ns.installStart(args)),
@@ -6637,6 +6754,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		}
 		//#endregion
 		exports.NS = NS;
+		exports.WARM_TTL_MS = WARM_TTL_MS;
 		exports.apply = apply;
 		exports.inject = inject;
 		return module.exports;