@dsh-workbench/core 0.2.6 → 0.2.8

package/dist/client/index.js

@@ -1384,6 +1384,7 @@ var en = {
 	"panels.market.lead": "Installed on this machine, shared by every project.",
 	"panels.market.install": "Install",
 	"panels.market.update": "Update",
+	"panels.market.swapSlow": "Not swapped yet — maybe a slow or failed download. Press Update again; if it stays like this, restart dsh.",
 	"panels.market.uninstall": "Uninstall",
 	"panels.market.uninstallLabel": "Uninstall {name}",
 	"panels.market.installing": "Installing…",
@@ -1635,7 +1636,7 @@ var en = {
 	"panel.conversation": "Conversation",
 	"panels.label": "Global panels",
 	"configSync.nav": "Config sync",
-	"configSync.lead": "Bring over the rows another profile configures explicitly — pick any profile as the source. A restart applies them.",
+	"configSync.lead": "Bring over the rows another profile configures explicitly — pick any profile as the source.",
 	"configSync.source": "Source",
 	"configSync.sourceBroken": "its config is unreadable",
 	"configSync.sourceRows": "{name}: {count} rows are new or different for the workbench",
@@ -1659,7 +1660,7 @@ var en = {
 	"configSync.apply": "Sync {count} selected",
 	"configSync.applyNone": "Pick some rows first",
 	"configSync.applying": "Writing…",
-	"configSync.applied": "Written to the workbench config · restart to apply",
+	"configSync.applied": "Written to the workbench config · applied",
 	"configSync.appliedIds": "Written this time: {ids}",
 	"configSync.skippedIds": "Left alone (already here): {ids}",
 	"configSync.nothing": "Nothing to sync",
@@ -1778,6 +1779,7 @@ var zh = {
 	"panels.market.lead": "装在这台机器上，所有项目共用。",
 	"panels.market.install": "安装",
 	"panels.market.update": "更新",
+	"panels.market.swapSlow": "还没换上：可能网慢或没装上。再点一次「更新」；一直这样就把 dsh 重启一遍。",
 	"panels.market.uninstall": "卸载",
 	"panels.market.uninstallLabel": "卸载 {name}",
 	"panels.market.installing": "正在安装…",
@@ -2029,7 +2031,7 @@ var zh = {
 	"panel.conversation": "对话",
 	"panels.label": "全局面板",
 	"configSync.nav": "配置同步",
-	"configSync.lead": "把另一个 profile 里显式配过的行搬过来 —— 来源随你选。搬完要重启工作台才生效。",
+	"configSync.lead": "把另一个 profile 里显式配过的行搬过来 —— 来源随你选。",
 	"configSync.source": "来源",
 	"configSync.sourceBroken": "读不到它的配置",
 	"configSync.sourceRows": "{name} 这份里你有 {count} 行可搬",
@@ -2053,7 +2055,7 @@ var zh = {
 	"configSync.apply": "同步选中的 {count} 行",
 	"configSync.applyNone": "先勾几行",
 	"configSync.applying": "正在写入…",
-	"configSync.applied": "已写入工作台配置 · 重启工作台后生效",
+	"configSync.applied": "已写入工作台配置 · 已生效",
 	"configSync.appliedIds": "这次写进去：{ids}",
 	"configSync.skippedIds": "这几行工作台自己已有，没动：{ids}",
 	"configSync.nothing": "没有需要同步的内容",
@@ -2883,6 +2885,38 @@ function holdBack(installed, roster, active, previous) {
 	const fresh = previous === null ? [] : pending.filter((unit) => !previous.has(unit));
 	return pending.filter((unit) => active.has(unit) || fresh.includes(unit));
 }
+var WORKBENCH_SWAP_MS = 18e4;
+function swapLanded(until, installed) {
+	return until !== void 0 && installed === until;
+}
+function swapUntil(action, application, latest) {
+	if (action !== "update-workbench" || application !== "restart-required") return void 0;
+	return latest;
+}
+var READ_BACK_ACTIONS = /* @__PURE__ */ new Set(["update", "update-bundle"]);
+function awaitsReadBack(action, application, version) {
+	return application === "applied" && version !== void 0 && READ_BACK_ACTIONS.has(action);
+}
+function readBackDone(input) {
+	if (input.action === "update") return !input.outdated;
+	if (input.entry === void 0 || input.entry.local === true || input.entry.latest === void 0) return true;
+	if (input.entry.latest === input.entry.installed) return true;
+	if (input.clicked === void 0) return true;
+	return input.entry.installed !== input.clicked;
+}
+function settleLanded(input) {
+	if (input.until !== void 0) return swapLanded(input.until, input.installed);
+	if (input.readBack !== true) return true;
+	return readBackDone({
+		action: input.action,
+		entry: input.entry,
+		clicked: input.clicked,
+		outdated: input.outdated
+	});
+}
+function holdWindowMs(until) {
+	return until === void 0 ? MODULE_SETTLE_MS : WORKBENCH_SWAP_MS;
+}
 //#endregion
 //#region src/app/layouts/rightbar/market-installed-mock.ts
 function installedMocks(input) {
@@ -4015,6 +4049,7 @@ function workbenchRow(version) {
 		key: "panels.market.workbenchLocal",
 		params: {}
 	} : void 0;
+	const stale = !local && version.running !== void 0 && version.running !== version.installed;
 	return {
 		id: WORKBENCH_ROW_ID,
 		titleKey: WORKBENCH_TITLE_KEY,
@@ -4024,6 +4059,7 @@ function workbenchRow(version) {
 		canUpdate: update !== void 0,
 		canUninstall: false,
 		...note === void 0 ? {} : { note },
+		...stale ? { hint: "panels.market.moduleRestartHint" } : {},
 		version: {
 			installed: version.installed,
 			...latest === void 0 ? {} : { latest }
@@ -4086,6 +4122,10 @@ function mergeTitles(known, manifests) {
 	}
 	return next ?? known;
 }
+function installedIdSet(installed) {
+	if (installed === void 0) return null;
+	return new Set(installed.map((item) => item.unit));
+}
 function installedRows(modules, manifests, listed, known, defaults = /* @__PURE__ */ new Set(), changed = {}) {
 	const titles = new Map(manifests.map((manifest) => [manifest.id, manifest.card?.titleKey]));
 	const rows = [];
@@ -4148,6 +4188,9 @@ function isOutdated(capability) {
 	if (capability === void 0) return false;
 	return capability.status === "missing-commands";
 }
+function capabilityOutdated(capabilities, unit) {
+	return isOutdated(capabilities?.[unit]);
+}
 function envNameOf(source) {
 	if (source === void 0) return "";
 	if (source.kind === "local") return source.env;
@@ -4209,6 +4252,12 @@ 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");
+		return byTitle === 0 ? left.id.localeCompare(right.id) : byTitle;
+	});
+}
 function marketSections(rows) {
 	const installed = rows.filter((row) => isOnMachine(row.state));
 	const rest = rows.filter((row) => !isOnMachine(row.state));
@@ -4346,6 +4395,74 @@ function useVisibleBusy(active, floorMs) {
 	return busyView(active, visible);
 }
 //#endregion
+//#region src/app/layouts/rightbar/market-settle-hold.ts
+function useSettleHold(input) {
+	const { pending, landed, t, onChanged, setPending, setFailed } = input;
+	const until = pending?.until;
+	const id = pending?.id ?? "";
+	const watching = pending !== null && (pending.until !== void 0 || pending.readBack === true);
+	const sinceRef = useRef(0);
+	useEffect(() => {
+		if (!watching || !landed) return;
+		setPending(null);
+	}, [
+		watching,
+		landed,
+		setPending
+	]);
+	useEffect(() => {
+		if (!watching) {
+			sinceRef.current = 0;
+			return;
+		}
+		if (sinceRef.current === 0) sinceRef.current = Date.now();
+		const deadline = sinceRef.current + holdWindowMs(until);
+		const tick = window.setInterval(() => {
+			onChanged();
+			if (Date.now() < deadline) return;
+			window.clearInterval(tick);
+			setPending(null);
+			setFailed({
+				id,
+				message: t("panels.market.swapSlow")
+			});
+		}, 800);
+		return () => window.clearInterval(tick);
+	}, [
+		watching,
+		landed,
+		until,
+		id,
+		onChanged,
+		setPending,
+		setFailed,
+		t
+	]);
+}
+//#endregion
+//#region src/app/layouts/rightbar/market-transient-state.ts
+function useMarketTransient(input) {
+	const { mock, onPending } = input;
+	const [pending, setPending] = useState(mock?.pending ?? null);
+	const [confirming, setConfirming] = useState(mock?.confirming ?? null);
+	const [failed, setFailed] = useState(mock?.failure ?? null);
+	const [notice, setNotice] = useState(mock?.notice ?? null);
+	useEffect(() => {
+		onPending?.(pending !== null);
+		return () => onPending?.(false);
+	}, [pending, onPending]);
+	return {
+		pending,
+		setPending,
+		confirming,
+		setConfirming,
+		failed,
+		setFailed,
+		notice,
+		setNotice
+	};
+}
+//#endregion
 //#region src/app/layouts/rightbar/market-plugin-rows.ts
 function installedPluginKept(value) {
 	if (typeof value !== "object" || value === null) return void 0;
@@ -4508,6 +4625,80 @@ var ACTION_LABEL_KEY = {
 	"uninstall-plugin": "panels.market.uninstall",
 	"update-workbench": "panels.market.update"
 };
+function holdOf(pending, application) {
+	if (pending === null || pending.row === void 0) return void 0;
+	if (application !== "applied") return void 0;
+	return {
+		id: pending.id,
+		row: pending.row
+	};
+}
+function pendingLanded(pending, updates, capabilities, installed) {
+	if (pending === null) return true;
+	return settleLanded({
+		action: pending.action,
+		until: pending.until,
+		readBack: pending.readBack,
+		installed,
+		entry: updates[pending.id],
+		clicked: pending.version,
+		outdated: capabilityOutdated(capabilities, pending.id)
+	});
+}
+function holdExpired(held, backInRoster, elapsedMs) {
+	if (held === void 0) return true;
+	return backInRoster || elapsedMs >= 15e3;
+}
+function heldIdOf(pending, held) {
+	return pending?.id ?? held?.id ?? null;
+}
+function pinnedRowOf(pending, held) {
+	return pending?.row ?? held?.row;
+}
+function withPinnedRow(rows, pinned) {
+	if (pinned === void 0) return [...rows];
+	if (!rows.some((row) => row.id === pinned.id)) return [...rows, pinned];
+	return rows.map((row) => row.id === pinned.id ? pinned : row);
+}
+function marketFootVisible(shown, installed) {
+	return shown.length > 0 || installed.length > 0;
+}
+function useMarketTitles(manifests, mocked) {
+	const [titles, setTitles] = useState(/* @__PURE__ */ new Map());
+	useEffect(() => {
+		if (!mocked) setTitles((known) => mergeTitles(known, manifests));
+	}, [manifests, mocked]);
+	return titles;
+}
+function useHeldRow(pending, backInRoster) {
+	const [held, setHeld] = useState(void 0);
+	const heldAtRef = useRef(0);
+	const hold = useCallback((next) => {
+		if (next !== void 0) heldAtRef.current = Date.now();
+		setHeld(next);
+	}, []);
+	const back = held === void 0 ? false : backInRoster(held.id);
+	useEffect(() => {
+		if (held === void 0) return;
+		if (holdExpired(held, back, Date.now() - heldAtRef.current)) {
+			setHeld(void 0);
+			return;
+		}
+		const timer = setTimeout(() => setHeld(void 0), MODULE_SETTLE_MS);
+		return () => clearTimeout(timer);
+	}, [held, back]);
+	useEffect(() => {
+		if (pending !== null) setHeld(void 0);
+	}, [pending]);
+	return {
+		held,
+		hold
+	};
+}
+function removingIdOf(pending, failed) {
+	if (pending === null || pending.action !== "remove-bundle") return null;
+	return failed?.id === pending.id ? null : pending.id;
+}
 function pendingRowOf(input) {
 	const { pending, removing } = input;
 	if (removing === null || pending === null) return void 0;
@@ -4904,18 +5095,21 @@ function changeFailure(change, t) {
 }
 //#endregion
 //#region src/app/layouts/rightbar/market-act.ts
+var STEADY_ACTIONS = /* @__PURE__ */ new Set(["update", "update-bundle"]);
 function marketActOf(options) {
 	const { t, mocked, rowOf, seats, send, onChanged } = options;
 	return async (id, action) => {
 		if (mocked) return;
 		const row = rowOf(id);
-		seats.setPending({
+		const next = {
 			id,
 			action,
 			...row?.titleKey === void 0 ? {} : { titleKey: row.titleKey },
 			...row?.pkg === void 0 ? {} : { pkg: row.pkg },
-			...row?.version?.installed === void 0 ? {} : { version: row.version.installed }
-		});
+			...row?.version?.installed === void 0 ? {} : { version: row.version.installed },
+			...row === void 0 || !STEADY_ACTIONS.has(action) ? {} : { row }
+		};
+		seats.setPending(next);
 		seats.setConfirming(null);
 		seats.setFailed(null);
 		if (action !== "uninstall-plugin") seats.setNotice(null);
@@ -4929,8 +5123,9 @@ function marketActOf(options) {
 			action,
 			unit: id
 		});
-		seats.setPending(null);
 		if (!outcome.ok) {
+			seats.setPending(null);
+			seats.setHeld(void 0);
 			onChanged();
 			seats.setFailed({
 				id,
@@ -4938,8 +5133,17 @@ function marketActOf(options) {
 			});
 			return;
 		}
+		const change = changeOf(outcome.value);
+		const until = swapUntil(action, change?.application, row?.version?.latest);
+		const readBack = awaitsReadBack(action, change?.application, next.version);
+		seats.setPending(until === void 0 && !readBack ? null : {
+			...next,
+			...until === void 0 ? {} : { until },
+			...readBack ? { readBack: true } : {}
+		});
+		seats.setHeld(readBack ? void 0 : holdOf(next, change?.application));
 		if (action === "uninstall-plugin") seats.setNotice(installedPluginNotice(outcome.value, t));
-		const reason = changeFailure(changeOf(outcome.value), t);
+		const reason = changeFailure(change, t);
 		onChanged();
 		if (reason !== void 0) seats.setFailed({
 			id,
@@ -4982,6 +5186,7 @@ function ConfirmUninstall({ t, name, onConfirm, onCancel }) {
 }
 function MarketBody({ t, self, shown, pluginList, installedList, shared, pending, failed, notice, act, onConfirming, setDefault, boardBusy }) {
 	const failureOf = (id) => failed?.id === id ? failed.message : null;
+	const foot = marketFootVisible(shown, installedList);
 	return /* @__PURE__ */ h(Fragment, null, notice === null ? null : /* @__PURE__ */ h("div", { className: MarketPage_module_default.marketNote }, notice), /* @__PURE__ */ h(MarketSection, {
 		t,
 		rows: self === void 0 ? [] : [self],
@@ -4995,7 +5200,7 @@ function MarketBody({ t, self, shown, pluginList, installedList, shared, pending
 	}), self === void 0 ? null : /* @__PURE__ */ h("div", {
 		className: MarketPage_module_default.marketSelfDivider,
 		"aria-hidden": "true"
-	}), marketSections([...shown, ...installedList]).map((section) => /* @__PURE__ */ h(MarketSection, {
+	}), marketSections(marketOrder([...shown, ...installedList], (row) => marketRowTitle(row, t))).map((section) => /* @__PURE__ */ h(MarketSection, {
 		key: section.id,
 		t,
 		titleKey: section.titleKey,
@@ -5020,10 +5225,10 @@ function MarketBody({ t, self, shown, pluginList, installedList, shared, pending
 		act,
 		confirmActions: CONFIRM_UNINSTALL,
 		onConfirming
-	}), /* @__PURE__ */ h(PanelFoot, {
+	}), foot ? /* @__PURE__ */ h(PanelFoot, {
 		size: "md",
 		text: t("panels.market.foot")
-	}), /* @__PURE__ */ h(SharedSection, {
+	}) : null, /* @__PURE__ */ h(SharedSection, {
 		t,
 		rows: shared,
 		pending,
@@ -5032,22 +5237,19 @@ function MarketBody({ t, self, shown, pluginList, installedList, shared, pending
 	}));
 }
 function MarketView({ t, manifests, installable, capabilities, freshness, onChanged, onPending, updates, installed, installedRead, workbench, plugins, settling, mock, defaults = [], changed = {} }) {
-	const [titles, setTitles] = useState(/* @__PURE__ */ new Map());
-	useEffect(() => {
-		if (mock === void 0) setTitles((known) => mergeTitles(known, manifests));
-	}, [manifests, mock]);
+	const titles = useMarketTitles(manifests, mock !== void 0);
 	const catalog = mock?.manifests ?? manifests;
 	const marketable = mock === void 0 ? marketCatalog(manifests, installable) : catalog;
 	const effective = mock === void 0 ? capabilities : mock.capabilities;
-	const source = liveManifests(marketable, effective, mock === void 0 && installed !== void 0 ? new Set(installed.map((item) => item.unit)) : null);
+	const source = liveManifests(marketable, effective, installedIdSet(mock === void 0 ? installed : void 0));
 	const byDefault = new Set(defaults);
-	const rows = marketRows(source, effective, mock?.updates ?? updates ?? {}, byDefault, changed);
+	const updateMap = mock?.updates ?? updates ?? {};
+	const rows = marketRows(source, effective, updateMap, byDefault, changed);
 	const shared = sharedRows(source, effective);
-	const [pending, setPending] = useState(mock?.pending ?? null);
-	useEffect(() => {
-		onPending?.(pending !== null);
-		return () => onPending?.(false);
-	}, [pending, onPending]);
+	const { pending, setPending, confirming, setConfirming, failed, setFailed, notice, setNotice } = useMarketTransient({
+		mock,
+		onPending
+	});
 	const provision = useHostWrite({
 		channel: "provision",
 		networkText: t("panels.failed")
@@ -5075,19 +5277,19 @@ function MarketView({ t, manifests, installable, capabilities, freshness, onChan
 			setNotice(t("panels.failed"));
 		}
 	};
-	const [confirming, setConfirming] = useState(mock?.confirming ?? null);
-	const [failed, setFailed] = useState(mock?.failure ?? null);
-	const [notice, setNotice] = useState(mock?.notice ?? null);
-	const removing = pending !== null && pending.action === "remove-bundle" && failed?.id !== pending.id ? pending.id : null;
-	const installedList = installedRows((mock?.installed ?? installed ?? []).filter((module) => !(settling?.has(module.unit) ?? false) && module.unit !== removing), catalog, new Set(rows.map((row) => row.id)), titles, byDefault, changed);
+	const removing = removingIdOf(pending, failed);
+	const steady = useHeldRow(pending, (id) => catalog.some((manifest) => manifest.id === id));
+	const pinned = pinnedRowOf(pending, steady.held);
+	const installedList = installedRows((mock?.installed ?? installed ?? []).filter((module) => module.unit !== pinned?.id && (!(settling?.has(module.unit) ?? false) || module.unit === heldIdOf(pending, steady.held)) && module.unit !== removing), catalog, new Set(rows.map((row) => row.id)), titles, byDefault, changed);
 	const pendingRow = pendingRowOf({
 		pending,
 		removing,
 		rows,
 		titles
 	});
-	const shown = pendingRow === void 0 ? rows : [...rows, pendingRow];
-	const self = workbenchRow(mock === void 0 ? workbench : mock.workbench);
+	const selfRow = workbenchRow(mock === void 0 ? workbench : mock.workbench);
+	const shown = withPinnedRow(pendingRow === void 0 ? rows : [...rows, pendingRow], pinned);
+	const self = selfRow;
 	const pluginList = installedPluginRows(mock?.plugins ?? plugins ?? [], byDefault, changed);
 	const rowById = new Map([
 		...shown,
@@ -5096,19 +5298,29 @@ function MarketView({ t, manifests, installable, capabilities, freshness, onChan
 		...pluginList
 	].map((row) => [row.id, row]));
 	const confirmingRow = confirming === null ? void 0 : rowById.get(confirming);
+	const seats = {
+		setPending,
+		setHeld: steady.hold,
+		setConfirming,
+		setFailed,
+		setNotice
+	};
 	const act = marketActOf({
 		t,
 		mocked: mock !== void 0,
 		rowOf: (id) => rowById.get(id),
-		seats: {
-			setPending,
-			setConfirming,
-			setFailed,
-			setNotice
-		},
+		seats,
 		send: (body) => provision.send(body),
 		onChanged
 	});
+	useSettleHold({
+		pending,
+		landed: pendingLanded(pending, updateMap, effective, workbench?.installed),
+		t,
+		onChanged,
+		setPending,
+		setFailed
+	});
 	const settled = marketSettled(freshness, installedRead);
 	const nothing = shown.length === 0 && self === void 0 && installedList.length === 0 && pluginList.length === 0;
 	if (!settled || (settling?.size ?? 0) > 0 && shown.length === 0 && installedList.length === 0) return /* @__PURE__ */ h(MarketChecking, { t });
@@ -6867,6 +7079,10 @@ function ConfigSyncSection({ t }) {
 	}) : null, rows.length > 0 ? /* @__PURE__ */ h("div", { className: ConfigSyncSection_module_default.foot }, /* @__PURE__ */ h(Button, {
 		variant: "primary",
 		size: "md",
+		icon: /* @__PURE__ */ h(IconRefreshOutlineRegular, {
+			size: 16,
+			"aria-hidden": "true"
+		}),
 		disabled: chosen.length === 0 || busy.busy,
 		onClick: apply
 	}, chosen.length === 0 ? t("configSync.applyNone") : busy.busy ? t("configSync.applying") : t("configSync.apply", { count: chosen.length }))) : null) : null));