dshmarket 1.66.46 → 1.66.47

package/client/client.js

@@ -348,6 +348,9 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			empty: "没有匹配的插件",
 			clearFilters: "清除筛选",
 			installedEmpty: "尚未安装社区插件，可前往「发现」页浏览",
+			marketGoneTitle: "插件市场已停止运行",
+			marketGoneBody: "DSH 重新加载插件时把市场一起卸载了。重启 DSH 即可恢复；刚才的操作可能已经完成。",
+			marketGoneRecord: "市场已从 DSH 卸载，这次操作没有结果。重启 DSH 后可在「已安装」里确认。",
 			loadFail: "插件目录加载失败，请稍后重试",
 			loadRetry: "重试",
 			installFail: "安装失败",
@@ -1092,6 +1095,9 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			empty: "No plugins match",
 			clearFilters: "Clear filters",
 			installedEmpty: "No community plugins yet — browse the Discover tab",
+			marketGoneTitle: "The plugin market stopped running",
+			marketGoneBody: "DSH unloaded the market while reloading plugins. Restart DSH to bring it back. The last operation may already have finished.",
+			marketGoneRecord: "The market was unloaded from DSH, so this operation has no result. After restarting, check Installed.",
 			loadFail: "The plugin catalog failed to load. Try again later.",
 			loadRetry: "Retry",
 			installFail: "Install failed",
@@ -8519,6 +8525,16 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const themeSnap = (0, react.useSyncExternalStore)(props.themeStore.subscribe, props.themeStore.getSnapshot);
 			const [data, setData] = (0, react.useState)(cachedRegistry);
 			const [loadError, setLoadError] = (0, react.useState)(null);
+			/**
+			* The host answered 404 on one of the market's own routes (#962).
+			*
+			* That is not a failed request: it means DSH reloaded its plugins and did
+			* not mount the market again, so nothing on this page can reach the host —
+			* not the catalog, not the operation lock, not the restart route. The page
+			* already on screen keeps rendering (it is a client-side app), which is
+			* exactly why it owes the user this sentence instead of a spinner.
+			*/
+			const [marketGone, setMarketGone] = (0, react.useState)(false);
 			const [installed, setInstalledState] = (0, react.useState)(cachedInstalled ?? {});
 			const setInstalled = (0, react.useCallback)((value) => {
 				cachedInstalled = value;
@@ -9239,10 +9255,50 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				window.addEventListener("keydown", onKey, true);
 				return () => window.removeEventListener("keydown", onKey, true);
 			}, [lightbox, themesFullscreen]);
+			/**
+			* The host is no longer serving the market's routes (#962).
+			*
+			* Only a 404 says this: any other status means the route ran and answered.
+			* When it happens mid-operation, the response that would have settled the
+			* install was lost with the routes, so the spinner has to be released and
+			* the row told what became of it — otherwise it turns until DSH restarts,
+			* with the user left to guess whether the plugin landed.
+			*/
+			const noteMarketGone = (0, react.useCallback)(() => {
+				setMarketGone(true);
+				setBusyUrl(null);
+				setUpdatingName(null);
+				setRemovingName(null);
+				setRecords((list) => list.map((record) => record.state === "running" || record.state === "queued" ? {
+					...record,
+					state: "failed",
+					reason: t("marketGoneRecord")
+				} : record));
+				try {
+					sessionStorage.removeItem("dshm-pending");
+					sessionStorage.removeItem("dshm-updating");
+				} catch {}
+			}, [t]);
+			/**
+			* The status payload, or `null` when the route answered 404 (#962). Every
+			* poll that reads this stops on the null: the market is no longer mounted,
+			* so there is no status to read and nothing left to poll for.
+			*/
+			const readMarketStatus = (0, react.useCallback)(async (res) => {
+				if (res.status === 404) {
+					noteMarketGone();
+					return null;
+				}
+				return await res.json();
+			}, [noteMarketGone]);
 			const loadCatalog = (0, react.useCallback)(() => {
 				setLoadError(null);
 				return fetch(api("/dsh-market/registry"), { cache: "no-store" }).then(async (res) => {
 					const body = await res.json().catch(() => ({}));
+					if (res.status === 404) {
+						noteMarketGone();
+						throw new Error(t("marketGoneTitle"));
+					}
 					if (!res.ok) throw new Error(typeof body.error === "string" ? body.error : `HTTP ${String(res.status)}`);
 					return body;
 				}).then((body) => {
@@ -9260,7 +9316,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				}).catch((error) => {
 					setLoadError(error instanceof Error ? error.message : String(error));
 				});
-			}, []);
+			}, [noteMarketGone, t]);
 			const loadHostCompatibility = (0, react.useCallback)(async (names) => {
 				const unique = [...new Set(names)].filter((name) => {
 					if (name === "" || hostCompatibilitySettled(name) || hostCompatibilityInFlight.has(name)) return false;
@@ -9308,7 +9364,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			}, [setHostVersion]);
 			(0, react.useEffect)(() => {
 				loadCatalog();
-				fetch(api("/dsh-market/status"), { cache: "no-store" }).then((res) => res.json()).then((status) => {
+				fetch(api("/dsh-market/status"), { cache: "no-store" }).then(readMarketStatus).then((status) => {
+					if (status === null) return;
 					statusRef.current = {
 						busy: status.busy === true,
 						runningAgents: Array.isArray(status.runningAgents) ? status.runningAgents.map(String) : []
@@ -9329,7 +9386,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					if (typeof status.version === "string" && status.version !== "") setVersion(status.version);
 				}).catch(() => {});
 				refreshInstalled();
-			}, [refreshInstalled, loadCatalog]);
+			}, [
+				refreshInstalled,
+				loadCatalog,
+				readMarketStatus
+			]);
 			(0, react.useEffect)(() => {
 				if (bootId === null) return;
 				const saved = readSession("dshm-restart");
@@ -9433,7 +9494,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					return;
 				}
 				const timer = setInterval(() => {
-					fetch(api("/dsh-market/status"), { cache: "no-store" }).then((res) => res.json()).then((status) => {
+					fetch(api("/dsh-market/status"), { cache: "no-store" }).then(readMarketStatus).then((status) => {
+						if (status === null) return;
 						statusRef.current = {
 							busy: status.busy === true,
 							runningAgents: Array.isArray(status.runningAgents) ? status.runningAgents.map(String) : []
@@ -10887,8 +10949,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					if (drainingRef.current) return;
 					if (operationInFlight()) return;
 					if (!recordsRef.current.some((record) => record.state === "queued")) return;
-					fetch(api("/dsh-market/status"), { cache: "no-store" }).then((res) => res.json()).then((status) => {
-						if (disposed) return;
+					fetch(api("/dsh-market/status"), { cache: "no-store" }).then(readMarketStatus).then((status) => {
+						if (disposed || status === null) return;
 						const runningAgents = Array.isArray(status.runningAgents) ? status.runningAgents.map(String) : [];
 						const busy = status.busy === true;
 						statusRef.current = {
@@ -10916,7 +10978,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					disposed = true;
 					clearInterval(timer);
 				};
-			}, []);
+			}, [readMarketStatus]);
 			/** A queued record's "run now": retry immediately instead of waiting for idle. */
 			const runQueuedNow = (0, react.useCallback)((record, confirmAgentsRunning = false) => {
 				if (!recordsRef.current.some((item) => item.id === record.id && item.state === "queued")) return;
@@ -12733,7 +12795,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconQuestionOutline14, { size: 14 })
 										})
 									}),
-									restartEnabled && restartReachable && debuggerLatch === null && recovery === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									restartEnabled && restartReachable && debuggerLatch === null && recovery === null && !marketGone && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 										variant: "primary",
 										size: "sm",
 										disabled: restarting || hostBusy || busyUrl !== null || updatingName !== null || removingName !== null,
@@ -12937,7 +12999,14 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							setGroupMenuFor(null);
 							setAssignFor(null);
 						},
-						children: tab === "backup" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						children: marketGone ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: Market_module_css_default.empty,
+							role: "alert",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: t("marketGoneTitle") }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: Market_module_css_default.spec,
+								children: t("marketGoneBody")
+							})]
+						}) : tab === "backup" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: Market_module_css_default.backupGrid,
 							children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {

package/lib/index.js

@@ -10,6 +10,16 @@ import { setRequestGateSource, setTrustedHostsSource } from './http.js';
 import { mountMarketRoutes } from './routes.js';
 import { installDesktopMarketSettings, installMarketSettings } from './settings.js';
 export const name = 'dsh-market';
+/**
+ * How long after the market mounts an interrupted update is repaired.
+ *
+ * The market mounts while the composition is still starting its entries, and
+ * an install at that moment would reconcile the profile underneath the boot.
+ * The desktop host's own replay wait is the same order of magnitude (8 s), so
+ * this waits that long once, then fixes what a previous start left behind
+ * (#928). Nothing happens when the journal is empty, which is the normal case.
+ */
+const PENDING_UPDATE_REPAIR_DELAY_MS = 8_000;
 /**
  * Register the market against the host context.
  * @param ctx - Host context that may acquire webServer and shell services.
@@ -232,7 +242,16 @@ export function apply(ctx, config) {
                 host.effect(() => {
                     const restoreTrustedHosts = useTrustedHosts(ctx);
                     const disposeRoutes = mountMarketRoutes(host, resolved, runtime, agentsLookupOf(ctx));
+                    const repairTimer = setTimeout(() => {
+                        void runtime.repairPendingUpdates().then(report => {
+                            if (report.reinstalled.length === 0 && report.failed.length === 0)
+                                return;
+                            console.warn(`dsh-market: ${report.reinstalled.length} interrupted update(s) reinstalled, ${report.failed.length} still pending`);
+                        });
+                    }, PENDING_UPDATE_REPAIR_DELAY_MS);
+                    repairTimer.unref?.();
                     return async () => {
+                        clearTimeout(repairTimer);
                         disposeRoutes();
                         restoreTrustedHosts();
                         await runtime.dispose();

package/lib/official-desktop.js

@@ -1,7 +1,22 @@
 /** The official Electron profile is owned by DSH's in-process plugin manager. */
 import { randomUUID } from 'node:crypto';
 import { progress, TARGET_RE } from './dsh-cli.js';
+import { DeadlineExceeded, PendingUpdateJournal, repairInterruptedUpdates, withDeadline, } from './pending-updates.js';
+import { profileDir, readInstalledVersion } from './profile.js';
 import { activeRegion, DEFAULT_NPM_REGISTRY, routesFor } from './regions.js';
+/**
+ * How long the desktop manager gets before the market stops waiting.
+ *
+ * The host's reconciliation has no deadline of its own; when a plugin's
+ * teardown or start never settles, `removeBundle`/`installBundle` never
+ * resolve and the operation stays "updating" forever while holding the
+ * profile's write lock. These deadlines cannot cancel the host, but they end
+ * the market's wait, and the journal (`./pending-updates.ts`) makes the next
+ * start finish the job. Removal is the short step (pnpm unlink + unload);
+ * installation may legitimately download and build, so it gets the longer one.
+ */
+const REMOVE_DEADLINE_MS = 90_000;
+const INSTALL_DEADLINE_MS = 300_000;
 /**
  * What a user can actually do when the market cannot perform an operation on
  * the official Desktop profile: the app's own Plugins page runs the same
@@ -95,6 +110,10 @@ const REFUSAL_COPY = {
         zh: '这个版本与当前 DSH 不兼容，宿主拒绝安装',
         en: 'this version is not compatible with the running DSH, so the host refused it',
     },
+    'update-incomplete': {
+        zh: '桌面端没有在限定时间内完成这次更新：插件可能已经被移除，新版本却还没装上。重新打开 DSH 后市场会自动补装；也可以现在从「设置 → 插件」重试',
+        en: 'the desktop app did not finish this update in time: the plugin may already be removed while its replacement never installed. Reopen DSH and the market will finish the install, or retry from Settings → Plugins now',
+    },
 };
 /**
  * The market's own package names. A desktop profile installs it from npm as
@@ -164,6 +183,18 @@ export function registryNameOf(spec) {
     const name = at === -1 ? spec : spec.slice(0, at);
     return /^(@[A-Za-z0-9._~-]+\/)?[A-Za-z0-9._~-]+$/.test(name) ? name : undefined;
 }
+/** Exact version from a registry spec, or '' when the spec is a range or tag. */
+function targetVersionOf(spec) {
+    if (registryNameOf(spec) === undefined)
+        return '';
+    const at = spec.indexOf('@', 1);
+    const version = at === -1 ? '' : spec.slice(at + 1);
+    return /^\d+\.\d+\.\d+(?:[-+].*)?$/.test(version) ? version : '';
+}
+/** A manager call that never settled: the profile may be half-updated. */
+function interrupted() {
+    return { application: 'failed', error: { code: 'update-incomplete' }, repairOnRestart: true };
+}
 /**
  * Install a spec, and when the manager refuses it because that package is
  * already in the profile, remove the installed copy first and install again.
@@ -174,8 +205,13 @@ export function registryNameOf(spec) {
  * `removeBundle` then install — because its manager has no in-place update.
  * Without this the market could not update ANY installed plugin on that host,
  * itself included: users stuck on a broken build could not fetch the fix.
+ *
+ * The two steps are not atomic and the first one writes the profile, so the
+ * pair is journaled before it starts and bounded by a deadline (#928). If the
+ * host never answers, the market stops waiting and the next start finishes or
+ * undoes the removal from that record instead of leaving the plugin gone.
  */
-async function installOrReinstall(manager, spec, options) {
+async function installOrReinstall(manager, spec, options, context) {
     const install = () => manager.installBundle(spec, options);
     let first;
     try {
@@ -197,12 +233,63 @@ async function installOrReinstall(manager, spec, options) {
     if (SELF_NAMES.has(name)) {
         return { application: 'failed', error: { code: 'market-self-update', message: selfUpdateMessage(spec) } };
     }
+    const record = context === undefined
+        ? undefined
+        : context.journal.begin({
+            profile: context.profile,
+            name,
+            from: readInstalledVersion(context.profile, name, context.profileDirectory) ?? '',
+            to: targetVersionOf(spec),
+            spec,
+        });
     progress.lastLine = 'Removing the installed copy so the desktop app can install the new version';
-    const removed = await manager.removeBundle(name);
-    if (removed.application === 'failed' || removed.application === 'cancelled')
+    let removed;
+    try {
+        removed = await withDeadline(manager.removeBundle(name), REMOVE_DEADLINE_MS, `remove ${name}`);
+    }
+    catch (error) {
+        if (error instanceof DeadlineExceeded)
+            return interrupted();
+        if (record !== undefined)
+            context?.journal.finish(record.id);
+        throw error;
+    }
+    if (removed.application === 'failed' || removed.application === 'cancelled') {
+        // Nothing was unloaded, so there is nothing for a later start to repair.
+        if (record !== undefined)
+            context?.journal.finish(record.id);
         return removed;
+    }
+    if (record !== undefined)
+        context?.journal.mark(record.id, 'installing');
     progress.lastLine = 'Installing the new version';
-    return install();
+    try {
+        const installed = await withDeadline(install(), INSTALL_DEADLINE_MS, `install ${spec}`);
+        if (installed.application === 'failed' || installed.application === 'cancelled') {
+            // The replacement did not land; the record stays so the next start can
+            // put it back rather than leaving the package gone.
+            return installed;
+        }
+        if (record !== undefined)
+            context?.journal.finish(record.id);
+        return installed;
+    }
+    catch (error) {
+        if (error instanceof DeadlineExceeded)
+            return interrupted();
+        throw error;
+    }
+}
+/** Resolve the profile directory without making an invalid name a construction failure. */
+function safeProfileDirectory(profile, explicit) {
+    if (explicit !== undefined)
+        return explicit;
+    try {
+        return profileDir(profile);
+    }
+    catch {
+        return undefined;
+    }
 }
 /**
  * Never fall back to `dsh plugin --profile desktop`.
@@ -220,13 +307,21 @@ export function createOfficialDesktopRuntime(managerLookup, profileName,
 // that names this profile, with no launcher directory to go with it (#744).
 _profileDirectory) {
     let disposed = false;
+    let repairing = false;
     let active;
+    const directory = safeProfileDirectory(profileName, _profileDirectory);
+    const journal = directory === undefined ? undefined : PendingUpdateJournal.forProfile(directory);
+    const updateContext = directory === undefined || journal === undefined
+        ? undefined
+        : { profile: profileName, profileDirectory: directory, journal };
     const runPlugin = (profile, argv) => {
         if (disposed)
             return Promise.resolve(failure('official desktop plugin runtime is disposed', 127));
         if (profile !== profileName)
             return Promise.resolve(failure('refusing to change a different profile', 127));
-        if (active !== undefined)
+        // A repair uses the same manager; overlapping the two would race the
+        // profile's write lock and the route's single-operation rule.
+        if (active !== undefined || repairing)
             return Promise.resolve({ ...failure('another plugin operation is running', 127), busy: true });
         const manager = managerLookup();
         if (manager === undefined
@@ -275,9 +370,13 @@ _profileDirectory) {
             // The default route leaves the host's own npm configuration in charge.
             const registry = routesFor(activeRegion()).npmRegistry;
             const options = { requestId, ...(registry === DEFAULT_NPM_REGISTRY ? {} : { registry }) };
+            // An explicit uninstall supersedes an interrupted update for the same
+            // package: the journal must not put back what the user just removed.
+            if (command === 'remove')
+                updateContext?.journal.forget(profileName, target);
             operation = command === 'remove'
                 ? manager.removeBundle(target)
-                : installOrReinstall(manager, spec, options);
+                : installOrReinstall(manager, spec, options, updateContext);
         }
         catch (error) {
             progress.active = false;
@@ -300,6 +399,10 @@ _profileDirectory) {
             const message = ok ? '' : detail(result.error);
             if (!ok)
                 progress.error = message;
+            // The manager never settled: the profile may be half-updated, so this
+            // is neither "nothing happened" nor something the route can restore
+            // through the same stuck manager (#928).
+            const repairOnRestart = !ok && result.repairOnRestart === true;
             return {
                 // `||`, not `??`: a failure at stage `enable` follows a SUCCESSFUL
                 // pnpm step, so packageResult.exitCode is 0 there — and every route
@@ -313,7 +416,8 @@ _profileDirectory) {
                 // profile is untouched, and the route must not try to "restore" it.
                 // A pre-install host check (#912) is the same shape even when the
                 // manager attached a package result to its refusal.
-                wroteNothing: !ok && (result.packageResult === undefined || prePnpmHostFailure(result)),
+                wroteNothing: !ok && !repairOnRestart && (result.packageResult === undefined || prePnpmHostFailure(result)),
+                ...(repairOnRestart ? { repairOnRestart: true } : {}),
                 // The manager's own code, kept machine-readable (#909): a client can
                 // tell a self-update refusal from an ordinary failure.
                 ...(ok ? {} : { refusalCode: managementCode(result.error) }),
@@ -334,8 +438,28 @@ _profileDirectory) {
         });
         return current.done;
     };
+    const repairPendingUpdates = async () => {
+        const empty = { reinstalled: [], finished: [], failed: [] };
+        if (disposed || repairing || active !== undefined)
+            return empty;
+        const manager = managerLookup();
+        if (manager === undefined || directory === undefined || journal === undefined)
+            return empty;
+        repairing = true;
+        try {
+            return await repairInterruptedUpdates({ profile: profileName, profileDirectory: directory, manager, journal });
+        }
+        catch (error) {
+            console.warn('dsh-market: could not repair an interrupted update', error);
+            return empty;
+        }
+        finally {
+            repairing = false;
+        }
+    };
     return {
         runPlugin,
+        repairPendingUpdates,
         probePnpm: async () => managerLookup() !== undefined,
         provisionPnpm: async () => ({ ok: managerLookup() !== undefined, hint: 'Use the official desktop plugin manager' }),
         cancelActive: () => {