dshmarket 1.66.14 → 1.66.15

package/client/client.js

@@ -642,6 +642,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			stateIncompatible: "已安装，与当前 dsh 不兼容",
 			stateInert: "已安装，未生效",
 			stateDependencyLibrary: "{0} 的依赖库",
+			stateLoadedByProfile: "由你的配置加载",
 			stateBroken: "已安装，校验未通过",
 			stateDisabled: "已停用",
 			phaseResolving: "准备依赖",
@@ -1338,6 +1339,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			stateIncompatible: "Installed — incompatible with this dsh",
 			stateInert: "Installed, not active",
 			stateDependencyLibrary: "Library for {0}",
+			stateLoadedByProfile: "Loaded by your setup",
 			stateBroken: "Installed, verification failed",
 			stateDisabled: "Disabled",
 			phaseResolving: "Preparing dependencies",
@@ -1917,15 +1919,19 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			return normalized;
 		}
 		/**
-		* Relevance within one field. Exact and prefix matches beat phrase matches;
-		* for a multi-word query every word must occur in the same field.
+		* Relevance within one field. Exact matches beat phrase matches, which beat
+		* words scattered through the field; for a multi-word query every word must
+		* occur in the same field. A prefix match is NOT ranked above a phrase match
+		* anywhere else in the field: most catalog names start with `dsh-`, so that
+		* distinction mostly punished the naming convention and overrode the sort
+		* the user picked (#815: `computer-use-vision` with 355 downloads above
+		* `dsh-computer-use` with 3.6k, under "downloads").
 		*/
 		function fieldRelevance(plugin, value, query, tokens, weight) {
 			if (!value) return 0;
 			const text = cachedPluginSearchText(plugin, value);
 			if (text === "" || !tokens.every((token) => text.includes(token))) return 0;
 			if (text === query) return weight + 300;
-			if (text.startsWith(query)) return weight + 250;
 			if (text.includes(query)) return weight + 200;
 			return weight + 150;
 		}
@@ -6321,7 +6327,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			});
 		}
 		/** The state label + dot for one activation result (P0-2). */
-		function activationMeta(state, t, dependencyOf) {
+		function activationMeta(state, t, dependencyOf, loadedByProfile) {
+			if (state === "inert" && loadedByProfile === true) return {
+				label: t("stateLoadedByProfile"),
+				dot: "done"
+			};
 			if (state === "inert" && dependencyOf !== void 0) return {
 				label: t("stateDependencyLibrary").replace("{0}", dependencyOf),
 				dot: "done"
@@ -9104,13 +9114,12 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 						return;
 					}
 					if (status === 200 && body.ok) {
-						sessionStorage.setItem("dshm-tab", "installed");
 						if (body.activation && typeof body.activation === "object") {
 							setActivations((prev) => ({
 								...prev,
 								...body.activation
 							}));
-							const warns = Object.entries(body.activation).filter(([, info]) => info.state !== "live" && info.state !== "missing").map(([name, info]) => ({
+							const warns = Object.entries(body.activation).filter(([, info]) => info.state !== "live" && info.state !== "missing" && info.loadedByProfile !== true).map(([name, info]) => ({
 								name,
 								info
 							}));
@@ -11891,7 +11900,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 									children: activationWarnings.map(({ name, info }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
 										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: name }),
 										" — ",
-										activationMeta(info.state, t, info.dependencyOf).label,
+										activationMeta(info.state, t, info.dependencyOf, info.loadedByProfile).label,
 										info.reasons.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 											className: Market_module_css_default.spec,
 											children: [
@@ -12845,11 +12854,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 											const entry = data === null ? void 0 : catalogEntryForInstalled(data.plugins, name, String(installed[name]), repoIdentities[name], repoHints[name]);
 											const off = effectiveDisabledSet.has(name);
 											const act = activations[name];
-											const meta = !off && act !== void 0 ? activationMeta(act.state, t, act.dependencyOf) : null;
+											const meta = !off && act !== void 0 ? activationMeta(act.state, t, act.dependencyOf, act.loadedByProfile) : null;
 											const note = notes[name];
 											const authored = entry?.description && (entry.description[lang] || entry.description.en) || "";
 											const shown = note ?? authored;
-											const stateLabel = off ? t("disabledState") : act?.state === "inert" && act.dependencyOf === void 0 ? t("groupStateInert") : act?.state === "restart" ? t("groupStateRestart") : act?.state === "broken" ? t("groupStateBroken") : meta?.label;
+											const stateLabel = off ? t("disabledState") : act?.state === "inert" && act.dependencyOf === void 0 && act.loadedByProfile !== true ? t("groupStateInert") : act?.state === "restart" ? t("groupStateRestart") : act?.state === "broken" ? t("groupStateBroken") : meta?.label;
 											const stateDot = off ? "warning" : meta?.dot === "error" ? "error" : meta?.dot === "warning" ? "warning" : "done";
 											const stateClass = stateDot === "error" ? Market_module_css_default.actBroken : stateDot === "warning" ? Market_module_css_default.actWarn : Market_module_css_default.actLive;
 											return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -12953,7 +12962,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 									const generation = status?.kind === "generation" || isGenerationSpec(String(spec));
 									const localDev = isLocalDev(String(spec), status);
 									const act = activations[name];
-									const meta = act !== void 0 ? activationMeta(act.state, t, act.dependencyOf) : null;
+									const meta = act !== void 0 ? activationMeta(act.state, t, act.dependencyOf, act.loadedByProfile) : null;
 									const version = status && status.version ? "v" + status.version : "";
 									const specText = String(spec);
 									const specRedundant = version !== "" && /^[\^~]?\d/.test(specText);

package/lib/index.js

@@ -300,6 +300,9 @@ export function apply(ctx, config) {
                 // capability bits report that, and an explicit profile directory no
                 // longer implies it (#639).
                 desktopHost: true,
+                // A shell that cannot be asked to replay still replays on its own,
+                // shortly after the install lands (#814): wait for it and adopt.
+                ...(desktopProfiles.pluginActivation === undefined ? { hostReplayWaitMs: 8000 } : {}),
                 // Relaunching a raw Electron process would bypass Desktop's launcher
                 // lifecycle. The shell remains responsible for restart in this mode.
                 allowRestart: false,

package/lib/pnpm-compat.js

@@ -147,6 +147,26 @@ function integrityViolators(diagnostic) {
  * @returns the classified failure, or null when unrecognized (raw output is then shown as-is).
  */
 export function classifyPnpmFailure(output, exitCode) {
+    // #817: the host's silence watchdog (@deepseek-ai/dsh-plugin-manager,
+    // `idleTimeoutMs`, 10 minutes by default) killed pnpm. Checked first: it is
+    // the last thing that happened, so whatever pnpm printed before is not the
+    // cause. The usual culprit is a dependency's install script downloading a
+    // binary from a host this network cannot reach — the reporter's cloudflared
+    // postinstall fetching from GitHub Releases — so the last lifecycle line
+    // pnpm printed names the package that went quiet.
+    const stalled = /printed nothing for (\d+)ms and was terminated/.exec(output);
+    if (stalled !== null) {
+        const minutes = Math.max(1, Math.round(Number(stalled[1]) / 60000));
+        const scripts = [...output.matchAll(/node_modules[\\/]((?:@[^\\/\s]+[\\/])?[^\\/\s]+) (?:pre|post)?install[:$]/g)];
+        const culprit = scripts.at(-1)?.[1]?.replace('\\', '/');
+        return {
+            code: 'pnpm-stalled',
+            recoverable: false,
+            message: culprit !== undefined
+                ? `依赖 ${culprit} 的安装脚本 ${minutes} 分钟没有任何输出，被终止了，什么都没装上。这类脚本通常在从网上下载文件，多半是当前网络连不上下载地址；插件本身没有问题。换个网络或开启代理后重试；仍然不行就联系插件作者。 / the install script of the dependency ${culprit} printed nothing for ${minutes} minutes and was stopped, so nothing was installed. Scripts like this usually download a file, and this network most likely cannot reach where it comes from; the plugin itself is not at fault. Try again on another network or through a proxy, and contact the plugin's author if it still fails.`
+                : `pnpm ${minutes} 分钟没有任何输出，被终止了，什么都没装上。通常是网络卡住了。检查网络后重试。 / pnpm printed nothing for ${minutes} minutes and was stopped, so nothing was installed. This usually means the network stalled. Check the connection and try again.`,
+        };
+    }
     if (output.includes('ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF')
         || output.includes('ERR_PNPM_VIRTUAL_STORE_DIR_MAX_LENGTH_DIFF')) {
         return {
@@ -456,6 +476,59 @@ export function classifyPnpmFailure(output, exitCode) {
                 : `插件声明的一个依赖版本范围在 registry 上没有可满足的版本${zh}，通常是该版本被弃用或从未发布 / a dependency of this plugin declared a version range with no matching release on the registry${en} — the range resolves to nothing (withdrawn or never published)`,
         };
     }
+    // #808 by @Tofu707: the profile's own pnpm-lock.yaml is what is wrong, in
+    // two shapes that pnpm reports with two codes and two different repairs, so
+    // they are classified apart rather than merged into one answer.
+    //
+    // `lockfile-outdated` is tested first, because its anchor is a code and
+    // nothing else. The sentence pnpm prints here also arrives WRAPPED across
+    // lines in the human reporter ("… is not up" / "to date with
+    // package.json."), so keying on that sentence instead of the code would miss
+    // the form users actually see.
+    //
+    // The two failures do not happen in a fixed order, so nothing here — and
+    // nothing in either message — claims which one a user meets first.
+    //
+    // `recoverable: false` on both: repeating the same command cannot help, the
+    // lockfile has to change first.
+    if (output.includes('ERR_PNPM_OUTDATED_LOCKFILE')) {
+        return {
+            code: 'lockfile-outdated',
+            recoverable: false,
+            message: 'profile 的 pnpm-lock.yaml 与 package.json 对不上：锁文件里记的 specifier 和 manifest 里声明的不是同一个，pnpm 因此在 frozen-lockfile 这一步直接拒绝，什么都没装。先备份一份 pnpm-lock.yaml，再在 profile 目录里重新生成锁文件（pnpm 最后一行会给出它自己那一版的命令；pnpm install --lockfile-only 也让锁文件与 package.json 对齐）后重试。这与「锁文件里缺条目」是两个不同的报错、对应两种不同的修法，两条命令不要互相套用（#808） / this profile\'s pnpm-lock.yaml does not match package.json: the specifier recorded in the lockfile is not the one the manifest declares, so pnpm refuses at the frozen-lockfile check and installs nothing. Back up pnpm-lock.yaml first, then regenerate the lockfile in the profile directory (pnpm\'s last line names the command for its own version; pnpm install --lockfile-only also realigns the lockfile with package.json) and retry. This is a different error with a different repair from a lockfile that is missing an entry — do not apply one repair to the other',
+        };
+    }
+    // `lockfile-broken` is the lockfile contradicting ITSELF: an importer names
+    // a dependency that has no entry under `packages:`. pnpm 11 and 12 word it
+    // identically and both carry the code, so the rule keys on the code and on
+    // pnpm's own phrase — and deliberately NOT on pnpm's closing `help:` line,
+    // which drifts: 11.24.0 offers `pnpm install --no-frozen-lockfile` for this
+    // failure while 12.8.1 offers `pnpm install --fix-lockfile` (and for the
+    // outdated failure above it offers a third command again, `--lockfile-only`).
+    // Measured 2026-10-08 against 11.24.0 and 12.8.1.
+    //
+    // Both shapes reach here whichever stream pnpm used. Market commands run with
+    // `--reporter=ndjson`, and in that same measurement 11.24.0 wrote the error
+    // record to stdout as one JSON line while 12.8.1 wrote nothing to stdout at
+    // all (0 bytes) and put the error block on stderr as plain text.
+    // withDecodedPnpmDiagnostics lifts the message out of the first form, and
+    // both forms then carry these two strings verbatim.
+    //
+    // The missing entry is named in the message but deliberately NOT put in
+    // `pkg`: callers read `pkg` as "the package this failure is about" and act on
+    // it (the #289 peer retry, the #65 ghost-entry advice), and neither applies —
+    // the repair is in the lockfile, not in the manifest entry.
+    if (output.includes('ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY') || /Broken lockfile/.test(output)) {
+        const broken = /no entry for '?([^'\s]+@[^'\s]+)'? in pnpm-lock\.yaml/i
+            .exec(withDecodedPnpmDiagnostics(output))?.[1];
+        const zh = broken === undefined ? '' : `（${broken}）`;
+        const en = broken === undefined ? '' : ` (${broken})`;
+        return {
+            code: 'lockfile-broken',
+            recoverable: false,
+            message: `profile 的 pnpm-lock.yaml 自相矛盾：有个依赖在 importers 里记着，packages 里却没有它的条目${zh}，pnpm 因此在真正写 node_modules 的那一步拒绝整个命令。先备份一份 pnpm-lock.yaml；在 importers 下删掉这个依赖的那条记录（它的名字、specifier、version 三行），再在 profile 目录里执行 pnpm install --no-frozen-lockfile --lockfile-only，然后重试。不要用 pnpm 提示的 --fix-lockfile：在 12.x 上它修不好这种状态（11.x 上能修，所以那条提示只在 12.x 的 help 里出现，照它走会把 12.x 用户送到一条一定失败的命令上）。不要删掉整个 pnpm-lock.yaml，那会把其余插件的版本一起重新解析（#808） / this profile\'s pnpm-lock.yaml contradicts itself: a dependency is recorded in importers but has no entry under packages${en}, so pnpm refuses the whole command at the step that actually writes node_modules. Back up pnpm-lock.yaml first; remove that dependency\'s record from importers (its name, specifier and version lines); then run pnpm install --no-frozen-lockfile --lockfile-only in the profile directory and retry. Do not use the --fix-lockfile that pnpm itself suggests: on 12.x it does not repair this state (it does on 11.x, which is why that suggestion only appears in 12.x\'s help, and following it sends a 12.x user to a command that always fails). Do not delete the whole pnpm-lock.yaml either: that re-resolves every other plugin\'s version too (#808)`,
+        };
+    }
     // #786 follow-up: pnpm could not replace one of the profile's own files —
     // `package.json`, `pnpm-lock.yaml` — or the lockfile it keeps INSIDE
     // `node_modules/.pnpm/lock.yaml`. None of these is a package directory.

package/lib/profile.js

@@ -1351,27 +1351,39 @@ export function mergeDuplicateReleaseAgeExcludes(profile, explicitDir) {
     catch {
         return [];
     }
-    // Block form only: `minimumReleaseAgeExclude:` then `- <entry>` lines.
-    const blockRe = /^minimumReleaseAgeExclude:[ \t]*\r?\n((?:[ \t]+-[^\r\n]*\r?\n?)*)/m;
+    // Block form only: `minimumReleaseAgeExclude:` then `- <entry>` lines, with
+    // comment lines allowed among them. Users annotate why a version is exempt,
+    // and a comment line used to end the block — or veto the whole repair — so
+    // the very profiles someone had tended by hand stayed broken (#816).
+    const blockRe = /^minimumReleaseAgeExclude:[ \t]*\r?\n((?:(?:[ \t]+-[^\r\n]*|[ \t]*#[^\r\n]*)\r?\n?)*)/m;
     const block = blockRe.exec(yaml);
     if (block === null)
         return [];
     const eol = /\r\n/.test(yaml) ? '\r\n' : '\n';
-    const indentMatch = /^([ \t]+)-/.exec(block[1]);
+    const indentMatch = /^([ \t]+)-/m.exec(block[1]);
     const indent = indentMatch === null ? '  ' : indentMatch[1];
-    const entries = [];
+    const items = [];
     for (const line of block[1].split(/\r?\n/)) {
         if (line.trim() === '')
             continue;
-        const m = /^[ \t]+-[ \t]*(.*?)[ \t]*$/.exec(line);
-        // A `#` on the line is a comment this cannot re-emit without losing it.
-        if (m === null || m[1].includes('#'))
+        if (/^[ \t]*#/.test(line)) {
+            items.push({ kind: 'comment', line });
+            continue;
+        }
+        const m = /^([ \t]+-[ \t]*)(.*?)[ \t]*$/.exec(line);
+        if (m === null)
             return [];
-        const rule = splitReleaseAgeExclude(m[1]);
+        const commentAt = /[ \t]+#/.exec(m[2]);
+        const value = commentAt === null ? m[2] : m[2].slice(0, commentAt.index);
+        const comment = commentAt === null ? null : m[2].slice(commentAt.index).trim();
+        if (value.includes('#'))
+            return [];
+        const rule = splitReleaseAgeExclude(value);
         if (rule === null)
             return [];
-        entries.push({ rule, quoted: /^['"]/.test(m[1]), line });
+        items.push({ kind: 'entry', rule, quoted: /^['"]/.test(value), bare: `${m[1]}${value}`, comment });
     }
+    const entries = items.flatMap(item => item.kind === 'entry' ? [{ ...item, line: item.bare }] : []);
     const byName = new Map();
     const order = [];
     for (const { rule, quoted, line } of entries) {
@@ -1418,7 +1430,18 @@ export function mergeDuplicateReleaseAgeExcludes(profile, explicitDir) {
     });
     if (rewritten.length === 0)
         return [];
-    const lines = order.map(produced);
+    // Each package's one line goes where its FIRST rule was. A later duplicate
+    // is dropped, but a comment it carried stays, as a comment line in its place.
+    const written = new Set();
+    const lines = items.flatMap(item => {
+        if (item.kind === 'comment')
+            return [item.line];
+        const suffix = item.comment === null ? '' : ` ${item.comment}`;
+        if (written.has(item.rule.name))
+            return item.comment === null ? [] : [`${indent}${item.comment}`];
+        written.add(item.rule.name);
+        return [`${produced(item.rule.name)}${suffix}`];
+    });
     const blockText = `minimumReleaseAgeExclude:${eol}${lines.join(eol)}${eol}`;
     // A function replacement: `$&` and friends in a string replacement would
     // be read as capture references.

package/lib/routes.js

@@ -42,7 +42,7 @@ import { checkUpdates, isUpdatablePlugin, compareVersions, fetchNpmLatest, inval
 import { createThemeManager } from './themes.js';
 import { readJsonBody, refuseUnadmitted, sameOrigin, sendJson } from './http.js';
 import { detectedDebugger, detectedSupervisor, restartAllowed, scheduleRestart, servingPort, trustedRestartRequest, trustedDownloadRequest, restartReachableFrom } from './restart.js';
-import { activationAfterReplace, brokenClientBundles, checkClientBundle, defaultHostRuntimeFacts, hasHostHalf, hostPeerGate, newlyBrokenBundles, peerGateRemedy, verifyActivation } from './verify.js';
+import { activationAfterReplace, brokenClientBundles, bundlePatchIsEmpty, checkClientBundle, defaultHostRuntimeFacts, hasHostHalf, hostPeerGate, newlyBrokenBundles, peerGateRemedy, verifyActivation } from './verify.js';
 import { carrierDisableIds, disableRow, enableRow, findUserPatchPath, foreignRowIds, isProtectedModule, packagePatchFlags, readUserPatchState, removeRowBlocks, rowIdsForPackage, userPatchPackageReferences, } from './patch.js';
 import { createProfileBackup, downloadWebdav, MAX_BACKUP_BYTES, mergeRestoreManifest, restoreProfileBackup, unportableDeps, uploadWebdav, } from './backup.js';
 import { createGist, fitsGistLimit, GistError, gistErrorCode, parseGistId, readGist, resolveGistTokenSource, updateGist, verifyGistToken, } from './gist.js';
@@ -2327,7 +2327,10 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup, ho
                     if (INBOX_BUNDLES.has(name) || composedBundles.has(name) || live.has(name))
                         return false;
                     const manifest = installedManifests.get(name);
-                    return typeof manifest === 'object' && manifest !== null && manifest.dsh?.bundle !== undefined;
+                    // A bundle whose own patch is empty loads nothing either way, so
+                    // its absence from the list says nothing about a switch (#813).
+                    return typeof manifest === 'object' && manifest !== null && manifest.dsh?.bundle !== undefined
+                        && !bundlePatchIsEmpty(join(activeProfileDir, 'node_modules', name));
                 });
                 for (const name of Object.keys(installed)) {
                     const result = activationAfterReplace(verifyActivation(config.profile, name, live, activeProfileDir, disabled.has(name) || patchFlags.disabled.includes(name) || unbundled.includes(name)), replacedWhileLive.has(name));
@@ -5903,10 +5906,24 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup, ho
                                         // inventory (live names and `#<id>`) is the fact
                                         // "already active this session", the same source
                                         // verifyActivation reads below.
-                                        const adopted = liveNames().has(name)
-                                            || liveNames().has(`#${name}`)
-                                            || bundlePatchInsertedIds(join(activeProfileDir, 'node_modules', name))
-                                                .some(id => liveNames().has(`#${id}`));
+                                        const isAdopted = () => {
+                                            const names = liveNames();
+                                            return names.has(name)
+                                                || names.has(`#${name}`)
+                                                || bundlePatchInsertedIds(join(activeProfileDir, 'node_modules', name))
+                                                    .some(id => names.has(`#${id}`));
+                                        };
+                                        let adopted = isAdopted();
+                                        // The replay lands after pnpm returns, not before (#814):
+                                        // give a host that replays on its own the time to do it.
+                                        const waitUntil = Date.now() + (config.hostReplayWaitMs ?? 0);
+                                        while (!adopted && Date.now() < waitUntil) {
+                                            await new Promise(resolve => setTimeout(resolve, 250));
+                                            adopted = isAdopted();
+                                        }
+                                        if (adopted && config.hostReplayWaitMs !== undefined) {
+                                            logEvent('info', 'install', `${name}: the host's own replay activated it; adopted instead of mounting a second copy (#814)`);
+                                        }
                                         let live = adopted;
                                         if (!adopted && !pluginCategories(entry).includes('theme')) {
                                             // #758: this fallback hot-mount bypasses the host's own

package/lib/types/pnpm-compat.d.ts

@@ -33,7 +33,7 @@ export declare function pluginArgsFor(profileDir: string, pluginArgs: string[]):
  */
 export declare const HOST_NAMESPACE_RE: RegExp;
 export interface PnpmFailure {
-    code: 'adding-to-root' | 'not-a-workspace' | 'hoist-pattern-diff' | 'pnpm-missing' | 'release-age-violation' | 'ignored-builds' | 'git-prepare-not-allowed' | 'git-prepare-failed' | 'tarball-url-mismatch' | 'fetch-404' | 'no-matching-version' | 'transient-network' | 'fetch-timeout' | 'unexpected-store' | 'patch-failed' | 'unused-patch' | 'missing-tarball-integrity' | 'windows-file-locked' | 'profile-file-locked' | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom' | 'ssh-auth-failed';
+    code: 'adding-to-root' | 'not-a-workspace' | 'hoist-pattern-diff' | 'pnpm-missing' | 'release-age-violation' | 'ignored-builds' | 'git-prepare-not-allowed' | 'git-prepare-failed' | 'tarball-url-mismatch' | 'fetch-404' | 'no-matching-version' | 'transient-network' | 'fetch-timeout' | 'unexpected-store' | 'patch-failed' | 'unused-patch' | 'missing-tarball-integrity' | 'windows-file-locked' | 'profile-file-locked' | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom' | 'ssh-auth-failed' | 'lockfile-broken' | 'lockfile-outdated' | 'pnpm-stalled';
     /** Bilingual, actionable message shown to the user instead of the raw wall of text. */
     message: string;
     /** True when re-running `pnpm install` in the profile is the documented recovery. */

package/lib/types/routes.d.ts

@@ -82,6 +82,15 @@ export interface MarketConfig {
      * no longer tells a desktop shell apart from an ordinary `dsh` run.
      */
     desktopHost?: boolean;
+    /**
+     * How long to wait for the host's own replay of a fresh install before
+     * hot-mounting it (#814). A desktop shell that watches the profile replays
+     * the composition itself, about two seconds after the manifest lands; one
+     * that does not publish `pluginActivation` gives the market no way to ask,
+     * and mounting first made the host's replay fail as a duplicate. Unset
+     * means no host replay is expected.
+     */
+    hostReplayWaitMs?: number;
     /** Detached self-restart is unsafe under systemd/launchd/pm2; operators can disable it (#14). */
     allowRestart?: boolean;
     /** Which release channel the market offers ITSELF from; other plugins never follow it. */

package/lib/types/verify.d.ts

@@ -41,7 +41,23 @@ export interface ActivationResult {
      * chose (#634). Only ever set on `inert`.
      */
     dependencyOf?: string;
+    /**
+     * Set on `inert` when the package's own bundle patch loads nothing but the
+     * user's own patch names it somewhere — an Agent preset's plugin row, say
+     * (#813). The market cannot see those trees, so it neither promises a
+     * restart nor calls the plugin off; it says where the plugin comes from.
+     */
+    loadedByProfile?: true;
 }
+/**
+ * Whether every bundle patch the package declares parses to an empty list.
+ *
+ * Such a bundle row loads nothing at boot: listing it in `dsh.profile.bundles`
+ * or taking it out changes nothing, so neither "restart to apply" nor the
+ * #696 "removed from bundles means off" inference applies to it (#813). A
+ * patch that is missing or unreadable is NOT empty — other verdicts own it.
+ */
+export declare function bundlePatchIsEmpty(packageDir: string): boolean;
 /**
  * What the running host is, for the #757 boot-gate prediction.
  *

package/lib/verify.js

@@ -32,9 +32,45 @@ import { join } from 'node:path';
 import { listHotMounts, parseSimplePatch } from './hot.js';
 import { userPatchPackageReferences } from './patch.js';
 import { nameMatchesPackage } from './entry-identity.js';
-import { bundlePatchInsertedIds, hasDshManifest, hasLoadableEntry, profileDir, readInstalled } from './profile.js';
-import { compareSemver, satisfiesRange } from './check.js';
+import { bundlePatchInsertedIds, declaredBundlePatchFiles, hasDshManifest, hasLoadableEntry, profileDir, readInstalled } from './profile.js';
+import { compareSemver, parsePatchFile, satisfiesRange } from './check.js';
 import { dshHostInfo } from './dsh-install.js';
+/**
+ * Whether every bundle patch the package declares parses to an empty list.
+ *
+ * Such a bundle row loads nothing at boot: listing it in `dsh.profile.bundles`
+ * or taking it out changes nothing, so neither "restart to apply" nor the
+ * #696 "removed from bundles means off" inference applies to it (#813). A
+ * patch that is missing or unreadable is NOT empty — other verdicts own it.
+ */
+export function bundlePatchIsEmpty(packageDir) {
+    const files = declaredBundlePatchFiles(packageDir);
+    return files.length > 0 && files.every(file => parsePatchFile(file)?.length === 0);
+}
+/**
+ * Whether the profile's own `cordis.patch.yml` names this package anywhere,
+ * at any depth — including rows nested in another plugin's config, such as
+ * an Agent preset's `plugins:` list, which never enter the host loader.
+ * Evidence of where the plugin comes from, not of whether it is running.
+ */
+function profilePatchMentions(activeProfileDir, name) {
+    const rows = parsePatchFile(join(activeProfileDir, 'cordis.patch.yml'));
+    if (rows === null)
+        return false;
+    const seen = new Set();
+    const visit = (value) => {
+        if (value === null || typeof value !== 'object' || seen.has(value))
+            return false;
+        seen.add(value);
+        if (Array.isArray(value))
+            return value.some(visit);
+        const row = value;
+        if (nameMatchesPackage(row.name, name))
+            return true;
+        return Object.values(row).some(visit);
+    };
+    return rows.some(visit);
+}
 /** The profile manifest's `dsh.profile.bundles` — what the CLI reconciled. */
 function readBundles(profile, explicitDir) {
     try {
@@ -329,6 +365,26 @@ export function verifyActivation(profile, name, live = new Set(listHotMounts()),
             hot: true,
         };
     }
+    // An empty bundle patch (#813): the bundle row brings nothing in, so a
+    // restart cannot change the verdict and "restart to apply" would stand
+    // forever. Say where the plugin comes from instead, when the profile's own
+    // patch names it; otherwise nothing loads it, and that is the truth.
+    if (dsh.client === undefined && bundlePatchIsEmpty(dir)) {
+        return profilePatchMentions(activeProfileDir, name)
+            ? {
+                state: 'inert',
+                loadedByProfile: true,
+                reasons: ['它自带的 bundle 补丁是空的，由你的配置（例如 Agent 预设）加载；市场看不到它是否正在运行 / its own bundle patch is empty, so your own setup (an Agent preset, for example) loads it; the market cannot see whether it is running'],
+                bundle: inBundles,
+                hot: false,
+            }
+            : {
+                state: 'inert',
+                reasons: ['它自带的 bundle 补丁是空的，你的配置里也没有引用它，所以不会加载 / its own bundle patch is empty and your setup does not reference it, so nothing loads it'],
+                bundle: inBundles,
+                hot: false,
+            };
+    }
     if (inBundles) {
         // #757: "restart to apply" is only honest when the next boot would
         // actually load the bundle. The host skips bundles whose dsh peer

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dshmarket",
   "description": "Visual plugin market inside DeepSeek Harness — browse, search, and one-click install community plugins. · DSH 可视化插件市场：逛一逛，点一下，装好。",
-  "version": "1.66.14",
+  "version": "1.66.15",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

package/src/client/MarketSection.tsx

@@ -137,7 +137,11 @@ function activationMeta(
   state: ActivationState,
   t: Translate,
   dependencyOf?: string,
+  loadedByProfile?: true,
 ): { label: string; dot: 'done' | 'warning' | 'error' } {
+  // Loaded by the user's own setup, out of the market's sight (#813): a fact
+  // about where it comes from, not a warning.
+  if (state === 'inert' && loadedByProfile === true) return { label: t('stateLoadedByProfile'), dot: 'done' }
   // A library another plugin pulled in is not a plugin that failed to start,
   // so it gets its own label and no warning dot (#634).
   if (state === 'inert' && dependencyOf !== undefined) {
@@ -3006,11 +3010,10 @@ export function MarketSection(props: MarketSectionProps) {
           return
         }
         if (status === 200 && body.ok) {
-          sessionStorage.setItem('dshm-tab', 'installed')
           if (body.activation && typeof body.activation === 'object') {
             setActivations(prev => ({ ...prev, ...body.activation }))
             const warns = Object.entries(body.activation as Record<string, ActivationInfo>)
-              .filter(([, info]) => info.state !== 'live' && info.state !== 'missing')
+              .filter(([, info]) => info.state !== 'live' && info.state !== 'missing' && info.loadedByProfile !== true)
               .map(([name, info]) => ({ name, info }))
             setActivationWarnings(warns)
           }
@@ -5726,7 +5729,7 @@ export function MarketSection(props: MarketSectionProps) {
             <span className={css.grow}>
               {activationWarnings.map(({ name, info }) => (
                 <div key={name}>
-                  <b>{name}</b> — {activationMeta(info.state, t, info.dependencyOf).label}
+                  <b>{name}</b> — {activationMeta(info.state, t, info.dependencyOf, info.loadedByProfile).label}
                   {info.reasons.length > 0 && <span className={css.spec}>（{localizeBilingualList(info.reasons, lang)}）</span>}
                 </div>
               ))}
@@ -6478,13 +6481,13 @@ export function MarketSection(props: MarketSectionProps) {
                                       const entry = data === null ? undefined : catalogEntryForInstalled(data.plugins, name, String(installed[name]), repoIdentities[name], repoHints[name])
                                       const off = effectiveDisabledSet.has(name)
                                       const act = activations[name]
-                                      const meta = !off && act !== undefined ? activationMeta(act.state, t, act.dependencyOf) : null
+                                      const meta = !off && act !== undefined ? activationMeta(act.state, t, act.dependencyOf, act.loadedByProfile) : null
                                       const note = notes[name]
                                       const authored = (entry?.description && (entry.description[lang] || entry.description.en)) || ''
                                       const shown = note ?? authored
                                       const stateLabel = off
                                         ? t('disabledState')
-                                        : act?.state === 'inert' && act.dependencyOf === undefined
+                                        : act?.state === 'inert' && act.dependencyOf === undefined && act.loadedByProfile !== true
                                           ? t('groupStateInert')
                                           : act?.state === 'restart'
                                             ? t('groupStateRestart')
@@ -6585,7 +6588,7 @@ export function MarketSection(props: MarketSectionProps) {
                             const generation = status?.kind === 'generation' || isGenerationSpec(String(spec))
                             const localDev = isLocalDev(String(spec), status)
                             const act = activations[name]
-                            const meta = act !== undefined ? activationMeta(act.state, t, act.dependencyOf) : null
+                            const meta = act !== undefined ? activationMeta(act.state, t, act.dependencyOf, act.loadedByProfile) : null
                             const version = status && status.version ? 'v' + status.version : ''
                             const specText = String(spec)
                             // A plain range beside the resolved version says the

package/src/client/locales.ts

@@ -451,6 +451,7 @@ export const zh = {
   stateIncompatible: '已安装，与当前 dsh 不兼容',
   stateInert: '已安装，未生效',
   stateDependencyLibrary: '{0} 的依赖库',
+  stateLoadedByProfile: '由你的配置加载',
   stateBroken: '已安装，校验未通过',
   stateDisabled: '已停用',
   phaseResolving: '准备依赖',
@@ -1161,6 +1162,7 @@ export const en: Record<MarketKey, string> = {
   stateIncompatible: 'Installed — incompatible with this dsh',
   stateInert: 'Installed, not active',
   stateDependencyLibrary: 'Library for {0}',
+  stateLoadedByProfile: 'Loaded by your setup',
   stateBroken: 'Installed, verification failed',
   stateDisabled: 'Disabled',
   phaseResolving: 'Preparing dependencies',

package/src/client/market-data.ts

@@ -302,6 +302,8 @@ export interface ActivationInfo {
   hot: boolean
   /** Set when this package is a library another installed plugin pulled in (#634). */
   dependencyOf?: string
+  /** Loaded by the user's own setup, which the market cannot see (#813). */
+  loadedByProfile?: true
 }
 
 /** The /dsh-market/installed payload (fields the market UI consumes). */
@@ -489,8 +491,13 @@ function cachedPluginSearchText(plugin: RegistryPlugin, value: string): string {
 }
 
 /**
- * Relevance within one field. Exact and prefix matches beat phrase matches;
- * for a multi-word query every word must occur in the same field.
+ * Relevance within one field. Exact matches beat phrase matches, which beat
+ * words scattered through the field; for a multi-word query every word must
+ * occur in the same field. A prefix match is NOT ranked above a phrase match
+ * anywhere else in the field: most catalog names start with `dsh-`, so that
+ * distinction mostly punished the naming convention and overrode the sort
+ * the user picked (#815: `computer-use-vision` with 355 downloads above
+ * `dsh-computer-use` with 3.6k, under "downloads").
  */
 function fieldRelevance(
   plugin: RegistryPlugin,
@@ -503,7 +510,6 @@ function fieldRelevance(
   const text = cachedPluginSearchText(plugin, value)
   if (text === '' || !tokens.every(token => text.includes(token))) return 0
   if (text === query) return weight + 300
-  if (text.startsWith(query)) return weight + 250
   if (text.includes(query)) return weight + 200
   return weight + 150
 }

package/src/index.ts

@@ -348,6 +348,9 @@ export function apply(ctx: Context, config?: Config): void {
         // capability bits report that, and an explicit profile directory no
         // longer implies it (#639).
         desktopHost: true,
+        // A shell that cannot be asked to replay still replays on its own,
+        // shortly after the install lands (#814): wait for it and adopt.
+        ...(desktopProfiles.pluginActivation === undefined ? { hostReplayWaitMs: 8000 } : {}),
         // Relaunching a raw Electron process would bypass Desktop's launcher
         // lifecycle. The shell remains responsible for restart in this mode.
         allowRestart: false,

package/src/pnpm-compat.ts

@@ -50,6 +50,7 @@ export interface PnpmFailure {
     | 'unexpected-store' | 'patch-failed' | 'unused-patch' | 'missing-tarball-integrity' | 'windows-file-locked'
     | 'profile-file-locked'
     | 'pnpm-unusable' | 'missing-local-dependency' | 'unparseable-build-key' | 'native-oom' | 'ssh-auth-failed'
+    | 'lockfile-broken' | 'lockfile-outdated' | 'pnpm-stalled'
   /** Bilingual, actionable message shown to the user instead of the raw wall of text. */
   message: string
   /** True when re-running `pnpm install` in the profile is the documented recovery. */
@@ -185,6 +186,26 @@ function integrityViolators(diagnostic: string): string[] {
  * @returns the classified failure, or null when unrecognized (raw output is then shown as-is).
  */
 export function classifyPnpmFailure(output: string, exitCode?: number | null): PnpmFailure | null {
+  // #817: the host's silence watchdog (@deepseek-ai/dsh-plugin-manager,
+  // `idleTimeoutMs`, 10 minutes by default) killed pnpm. Checked first: it is
+  // the last thing that happened, so whatever pnpm printed before is not the
+  // cause. The usual culprit is a dependency's install script downloading a
+  // binary from a host this network cannot reach — the reporter's cloudflared
+  // postinstall fetching from GitHub Releases — so the last lifecycle line
+  // pnpm printed names the package that went quiet.
+  const stalled = /printed nothing for (\d+)ms and was terminated/.exec(output)
+  if (stalled !== null) {
+    const minutes = Math.max(1, Math.round(Number(stalled[1]) / 60000))
+    const scripts = [...output.matchAll(/node_modules[\\/]((?:@[^\\/\s]+[\\/])?[^\\/\s]+) (?:pre|post)?install[:$]/g)]
+    const culprit = scripts.at(-1)?.[1]?.replace('\\', '/')
+    return {
+      code: 'pnpm-stalled',
+      recoverable: false,
+      message: culprit !== undefined
+        ? `依赖 ${culprit} 的安装脚本 ${minutes} 分钟没有任何输出，被终止了，什么都没装上。这类脚本通常在从网上下载文件，多半是当前网络连不上下载地址；插件本身没有问题。换个网络或开启代理后重试；仍然不行就联系插件作者。 / the install script of the dependency ${culprit} printed nothing for ${minutes} minutes and was stopped, so nothing was installed. Scripts like this usually download a file, and this network most likely cannot reach where it comes from; the plugin itself is not at fault. Try again on another network or through a proxy, and contact the plugin's author if it still fails.`
+        : `pnpm ${minutes} 分钟没有任何输出，被终止了，什么都没装上。通常是网络卡住了。检查网络后重试。 / pnpm printed nothing for ${minutes} minutes and was stopped, so nothing was installed. This usually means the network stalled. Check the connection and try again.`,
+    }
+  }
   if (output.includes('ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF')
     || output.includes('ERR_PNPM_VIRTUAL_STORE_DIR_MAX_LENGTH_DIFF')) {
     return {
@@ -494,6 +515,59 @@ export function classifyPnpmFailure(output: string, exitCode?: number | null): P
         : `插件声明的一个依赖版本范围在 registry 上没有可满足的版本${zh}，通常是该版本被弃用或从未发布 / a dependency of this plugin declared a version range with no matching release on the registry${en} — the range resolves to nothing (withdrawn or never published)`,
     }
   }
+  // #808 by @Tofu707: the profile's own pnpm-lock.yaml is what is wrong, in
+  // two shapes that pnpm reports with two codes and two different repairs, so
+  // they are classified apart rather than merged into one answer.
+  //
+  // `lockfile-outdated` is tested first, because its anchor is a code and
+  // nothing else. The sentence pnpm prints here also arrives WRAPPED across
+  // lines in the human reporter ("… is not up" / "to date with
+  // package.json."), so keying on that sentence instead of the code would miss
+  // the form users actually see.
+  //
+  // The two failures do not happen in a fixed order, so nothing here — and
+  // nothing in either message — claims which one a user meets first.
+  //
+  // `recoverable: false` on both: repeating the same command cannot help, the
+  // lockfile has to change first.
+  if (output.includes('ERR_PNPM_OUTDATED_LOCKFILE')) {
+    return {
+      code: 'lockfile-outdated',
+      recoverable: false,
+      message: 'profile 的 pnpm-lock.yaml 与 package.json 对不上：锁文件里记的 specifier 和 manifest 里声明的不是同一个，pnpm 因此在 frozen-lockfile 这一步直接拒绝，什么都没装。先备份一份 pnpm-lock.yaml，再在 profile 目录里重新生成锁文件（pnpm 最后一行会给出它自己那一版的命令；pnpm install --lockfile-only 也让锁文件与 package.json 对齐）后重试。这与「锁文件里缺条目」是两个不同的报错、对应两种不同的修法，两条命令不要互相套用（#808） / this profile\'s pnpm-lock.yaml does not match package.json: the specifier recorded in the lockfile is not the one the manifest declares, so pnpm refuses at the frozen-lockfile check and installs nothing. Back up pnpm-lock.yaml first, then regenerate the lockfile in the profile directory (pnpm\'s last line names the command for its own version; pnpm install --lockfile-only also realigns the lockfile with package.json) and retry. This is a different error with a different repair from a lockfile that is missing an entry — do not apply one repair to the other',
+    }
+  }
+  // `lockfile-broken` is the lockfile contradicting ITSELF: an importer names
+  // a dependency that has no entry under `packages:`. pnpm 11 and 12 word it
+  // identically and both carry the code, so the rule keys on the code and on
+  // pnpm's own phrase — and deliberately NOT on pnpm's closing `help:` line,
+  // which drifts: 11.24.0 offers `pnpm install --no-frozen-lockfile` for this
+  // failure while 12.8.1 offers `pnpm install --fix-lockfile` (and for the
+  // outdated failure above it offers a third command again, `--lockfile-only`).
+  // Measured 2026-10-08 against 11.24.0 and 12.8.1.
+  //
+  // Both shapes reach here whichever stream pnpm used. Market commands run with
+  // `--reporter=ndjson`, and in that same measurement 11.24.0 wrote the error
+  // record to stdout as one JSON line while 12.8.1 wrote nothing to stdout at
+  // all (0 bytes) and put the error block on stderr as plain text.
+  // withDecodedPnpmDiagnostics lifts the message out of the first form, and
+  // both forms then carry these two strings verbatim.
+  //
+  // The missing entry is named in the message but deliberately NOT put in
+  // `pkg`: callers read `pkg` as "the package this failure is about" and act on
+  // it (the #289 peer retry, the #65 ghost-entry advice), and neither applies —
+  // the repair is in the lockfile, not in the manifest entry.
+  if (output.includes('ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY') || /Broken lockfile/.test(output)) {
+    const broken = /no entry for '?([^'\s]+@[^'\s]+)'? in pnpm-lock\.yaml/i
+      .exec(withDecodedPnpmDiagnostics(output))?.[1]
+    const zh = broken === undefined ? '' : `（${broken}）`
+    const en = broken === undefined ? '' : ` (${broken})`
+    return {
+      code: 'lockfile-broken',
+      recoverable: false,
+      message: `profile 的 pnpm-lock.yaml 自相矛盾：有个依赖在 importers 里记着，packages 里却没有它的条目${zh}，pnpm 因此在真正写 node_modules 的那一步拒绝整个命令。先备份一份 pnpm-lock.yaml；在 importers 下删掉这个依赖的那条记录（它的名字、specifier、version 三行），再在 profile 目录里执行 pnpm install --no-frozen-lockfile --lockfile-only，然后重试。不要用 pnpm 提示的 --fix-lockfile：在 12.x 上它修不好这种状态（11.x 上能修，所以那条提示只在 12.x 的 help 里出现，照它走会把 12.x 用户送到一条一定失败的命令上）。不要删掉整个 pnpm-lock.yaml，那会把其余插件的版本一起重新解析（#808） / this profile\'s pnpm-lock.yaml contradicts itself: a dependency is recorded in importers but has no entry under packages${en}, so pnpm refuses the whole command at the step that actually writes node_modules. Back up pnpm-lock.yaml first; remove that dependency\'s record from importers (its name, specifier and version lines); then run pnpm install --no-frozen-lockfile --lockfile-only in the profile directory and retry. Do not use the --fix-lockfile that pnpm itself suggests: on 12.x it does not repair this state (it does on 11.x, which is why that suggestion only appears in 12.x\'s help, and following it sends a 12.x user to a command that always fails). Do not delete the whole pnpm-lock.yaml either: that re-resolves every other plugin\'s version too (#808)`,
+    }
+  }
   // #786 follow-up: pnpm could not replace one of the profile's own files —
   // `package.json`, `pnpm-lock.yaml` — or the lockfile it keeps INSIDE
   // `node_modules/.pnpm/lock.yaml`. None of these is a package directory.

package/src/profile.ts

@@ -1405,23 +1405,43 @@ export function mergeDuplicateReleaseAgeExcludes(profile: string, explicitDir?:
   const file = join(profileDir(profile, explicitDir), 'pnpm-workspace.yaml')
   let yaml: string
   try { yaml = readFileSync(file, 'utf8') } catch { return [] }
-  // Block form only: `minimumReleaseAgeExclude:` then `- <entry>` lines.
-  const blockRe = /^minimumReleaseAgeExclude:[ \t]*\r?\n((?:[ \t]+-[^\r\n]*\r?\n?)*)/m
+  // Block form only: `minimumReleaseAgeExclude:` then `- <entry>` lines, with
+  // comment lines allowed among them. Users annotate why a version is exempt,
+  // and a comment line used to end the block — or veto the whole repair — so
+  // the very profiles someone had tended by hand stayed broken (#816).
+  const blockRe = /^minimumReleaseAgeExclude:[ \t]*\r?\n((?:(?:[ \t]+-[^\r\n]*|[ \t]*#[^\r\n]*)\r?\n?)*)/m
   const block = blockRe.exec(yaml)
   if (block === null) return []
   const eol = /\r\n/.test(yaml) ? '\r\n' : '\n'
-  const indentMatch = /^([ \t]+)-/.exec(block[1])
+  const indentMatch = /^([ \t]+)-/m.exec(block[1])
   const indent = indentMatch === null ? '  ' : indentMatch[1]
-  const entries: { rule: ReleaseAgeExcludeRule; quoted: boolean; line: string }[] = []
+  /**
+   * The block in its original order. Comment lines are kept verbatim; an
+   * entry keeps its trailing ` # …` comment, which YAML only recognises after
+   * whitespace. A `#` anywhere else in an entry is not something this can
+   * read exactly, so the file is left alone.
+   */
+  type Item =
+    | { kind: 'comment'; line: string }
+    | { kind: 'entry'; rule: ReleaseAgeExcludeRule; quoted: boolean; bare: string; comment: string | null }
+  const items: Item[] = []
   for (const line of block[1].split(/\r?\n/)) {
     if (line.trim() === '') continue
-    const m = /^[ \t]+-[ \t]*(.*?)[ \t]*$/.exec(line)
-    // A `#` on the line is a comment this cannot re-emit without losing it.
-    if (m === null || m[1].includes('#')) return []
-    const rule = splitReleaseAgeExclude(m[1])
+    if (/^[ \t]*#/.test(line)) {
+      items.push({ kind: 'comment', line })
+      continue
+    }
+    const m = /^([ \t]+-[ \t]*)(.*?)[ \t]*$/.exec(line)
+    if (m === null) return []
+    const commentAt = /[ \t]+#/.exec(m[2])
+    const value = commentAt === null ? m[2] : m[2].slice(0, commentAt.index)
+    const comment = commentAt === null ? null : m[2].slice(commentAt.index).trim()
+    if (value.includes('#')) return []
+    const rule = splitReleaseAgeExclude(value)
     if (rule === null) return []
-    entries.push({ rule, quoted: /^['"]/.test(m[1]), line })
+    items.push({ kind: 'entry', rule, quoted: /^['"]/.test(value), bare: `${m[1]}${value}`, comment })
   }
+  const entries = items.flatMap(item => item.kind === 'entry' ? [{ ...item, line: item.bare }] : [])
   const byName = new Map<string, {
     selectors: Set<string>
     originals: string[]
@@ -1470,7 +1490,16 @@ export function mergeDuplicateReleaseAgeExcludes(profile: string, explicitDir?:
     return group.count > 1 || group.lines[0] !== produced(name)
   })
   if (rewritten.length === 0) return []
-  const lines = order.map(produced)
+  // Each package's one line goes where its FIRST rule was. A later duplicate
+  // is dropped, but a comment it carried stays, as a comment line in its place.
+  const written = new Set<string>()
+  const lines = items.flatMap(item => {
+    if (item.kind === 'comment') return [item.line]
+    const suffix = item.comment === null ? '' : ` ${item.comment}`
+    if (written.has(item.rule.name)) return item.comment === null ? [] : [`${indent}${item.comment}`]
+    written.add(item.rule.name)
+    return [`${produced(item.rule.name)}${suffix}`]
+  })
   const blockText = `minimumReleaseAgeExclude:${eol}${lines.join(eol)}${eol}`
   // A function replacement: `$&` and friends in a string replacement would
   // be read as capture references.

package/src/routes.ts

@@ -55,7 +55,7 @@ import { createThemeManager, type LoaderEntry } from './themes.ts'
 import { readJsonBody, refuseUnadmitted, sameOrigin, sendJson } from './http.ts'
 import { detectedDebugger, detectedSupervisor, restartAllowed, scheduleRestart, servingPort, trustedRestartRequest, trustedDownloadRequest, type RecoveryHandoffConfig, restartReachableFrom } from './restart.ts'
 import type { RecoveryPlugin } from './recovery.ts'
-import { activationAfterReplace, brokenClientBundles, checkClientBundle, defaultHostRuntimeFacts, hasHostHalf, hostPeerGate, newlyBrokenBundles, peerGateRemedy, verifyActivation } from './verify.ts'
+import { activationAfterReplace, brokenClientBundles, bundlePatchIsEmpty, checkClientBundle, defaultHostRuntimeFacts, hasHostHalf, hostPeerGate, newlyBrokenBundles, peerGateRemedy, verifyActivation } from './verify.ts'
 import {
   carrierDisableIds, disableRow, enableRow, findUserPatchPath, foreignRowIds, isProtectedModule, packagePatchFlags,
   readUserPatchState, removeRowBlocks, rowIdsForPackage, userPatchPackageReferences,
@@ -145,6 +145,15 @@ export interface MarketConfig {
    * no longer tells a desktop shell apart from an ordinary `dsh` run.
    */
   desktopHost?: boolean
+  /**
+   * How long to wait for the host's own replay of a fresh install before
+   * hot-mounting it (#814). A desktop shell that watches the profile replays
+   * the composition itself, about two seconds after the manifest lands; one
+   * that does not publish `pluginActivation` gives the market no way to ask,
+   * and mounting first made the host's replay fail as a duplicate. Unset
+   * means no host replay is expected.
+   */
+  hostReplayWaitMs?: number
   /** Detached self-restart is unsafe under systemd/launchd/pm2; operators can disable it (#14). */
   allowRestart?: boolean
   /** Which release channel the market offers ITSELF from; other plugins never follow it. */
@@ -2521,7 +2530,10 @@ export function mountMarketRoutes(
         const unbundled = Object.keys(installed).filter(name => {
           if (INBOX_BUNDLES.has(name) || composedBundles.has(name) || live.has(name)) return false
           const manifest = installedManifests.get(name) as { dsh?: { bundle?: unknown } } | null | undefined
+          // A bundle whose own patch is empty loads nothing either way, so
+          // its absence from the list says nothing about a switch (#813).
           return typeof manifest === 'object' && manifest !== null && manifest.dsh?.bundle !== undefined
+            && !bundlePatchIsEmpty(join(activeProfileDir, 'node_modules', name))
         })
         for (const name of Object.keys(installed)) {
           const result = activationAfterReplace(
@@ -6114,10 +6126,24 @@ sendJson(response, 200, { updates })
                     // inventory (live names and `#<id>`) is the fact
                     // "already active this session", the same source
                     // verifyActivation reads below.
-                    const adopted = liveNames().has(name)
-                      || liveNames().has(`#${name}`)
-                      || bundlePatchInsertedIds(join(activeProfileDir, 'node_modules', name))
-                        .some(id => liveNames().has(`#${id}`))
+                    const isAdopted = (): boolean => {
+                      const names = liveNames()
+                      return names.has(name)
+                        || names.has(`#${name}`)
+                        || bundlePatchInsertedIds(join(activeProfileDir, 'node_modules', name))
+                          .some(id => names.has(`#${id}`))
+                    }
+                    let adopted = isAdopted()
+                    // The replay lands after pnpm returns, not before (#814):
+                    // give a host that replays on its own the time to do it.
+                    const waitUntil = Date.now() + (config.hostReplayWaitMs ?? 0)
+                    while (!adopted && Date.now() < waitUntil) {
+                      await new Promise(resolve => setTimeout(resolve, 250))
+                      adopted = isAdopted()
+                    }
+                    if (adopted && config.hostReplayWaitMs !== undefined) {
+                      logEvent('info', 'install', `${name}: the host's own replay activated it; adopted instead of mounting a second copy (#814)`)
+                    }
                     let live = adopted
                     if (!adopted && !pluginCategories(entry).includes('theme')) {
                       // #758: this fallback hot-mount bypasses the host's own

package/src/verify.ts

@@ -33,8 +33,8 @@ import { join } from 'node:path'
 import { listHotMounts, parseSimplePatch } from './hot.ts'
 import { userPatchPackageReferences } from './patch.ts'
 import { nameMatchesPackage } from './entry-identity.ts'
-import { bundlePatchInsertedIds, hasDshManifest, hasLoadableEntry, profileDir, readInstalled } from './profile.ts'
-import { compareSemver, satisfiesRange } from './check.ts'
+import { bundlePatchInsertedIds, declaredBundlePatchFiles, hasDshManifest, hasLoadableEntry, profileDir, readInstalled } from './profile.ts'
+import { compareSemver, parsePatchFile, satisfiesRange } from './check.ts'
 import { dshHostInfo } from './dsh-install.ts'
 
 export type ActivationState = 'live' | 'restart' | 'incompatible' | 'inert' | 'broken' | 'missing' | 'disabled'
@@ -53,6 +53,47 @@ export interface ActivationResult {
    * chose (#634). Only ever set on `inert`.
    */
   dependencyOf?: string
+  /**
+   * Set on `inert` when the package's own bundle patch loads nothing but the
+   * user's own patch names it somewhere — an Agent preset's plugin row, say
+   * (#813). The market cannot see those trees, so it neither promises a
+   * restart nor calls the plugin off; it says where the plugin comes from.
+   */
+  loadedByProfile?: true
+}
+
+/**
+ * Whether every bundle patch the package declares parses to an empty list.
+ *
+ * Such a bundle row loads nothing at boot: listing it in `dsh.profile.bundles`
+ * or taking it out changes nothing, so neither "restart to apply" nor the
+ * #696 "removed from bundles means off" inference applies to it (#813). A
+ * patch that is missing or unreadable is NOT empty — other verdicts own it.
+ */
+export function bundlePatchIsEmpty(packageDir: string): boolean {
+  const files = declaredBundlePatchFiles(packageDir)
+  return files.length > 0 && files.every(file => parsePatchFile(file)?.length === 0)
+}
+
+/**
+ * Whether the profile's own `cordis.patch.yml` names this package anywhere,
+ * at any depth — including rows nested in another plugin's config, such as
+ * an Agent preset's `plugins:` list, which never enter the host loader.
+ * Evidence of where the plugin comes from, not of whether it is running.
+ */
+function profilePatchMentions(activeProfileDir: string, name: string): boolean {
+  const rows = parsePatchFile(join(activeProfileDir, 'cordis.patch.yml'))
+  if (rows === null) return false
+  const seen = new Set<unknown>()
+  const visit = (value: unknown): boolean => {
+    if (value === null || typeof value !== 'object' || seen.has(value)) return false
+    seen.add(value)
+    if (Array.isArray(value)) return value.some(visit)
+    const row = value as Record<string, unknown>
+    if (nameMatchesPackage(row.name, name)) return true
+    return Object.values(row).some(visit)
+  }
+  return rows.some(visit)
 }
 
 /** The profile manifest's `dsh.profile.bundles` — what the CLI reconciled. */
@@ -399,6 +440,27 @@ export function verifyActivation(
     }
   }
 
+  // An empty bundle patch (#813): the bundle row brings nothing in, so a
+  // restart cannot change the verdict and "restart to apply" would stand
+  // forever. Say where the plugin comes from instead, when the profile's own
+  // patch names it; otherwise nothing loads it, and that is the truth.
+  if (dsh.client === undefined && bundlePatchIsEmpty(dir)) {
+    return profilePatchMentions(activeProfileDir, name)
+      ? {
+          state: 'inert',
+          loadedByProfile: true,
+          reasons: ['它自带的 bundle 补丁是空的，由你的配置（例如 Agent 预设）加载；市场看不到它是否正在运行 / its own bundle patch is empty, so your own setup (an Agent preset, for example) loads it; the market cannot see whether it is running'],
+          bundle: inBundles,
+          hot: false,
+        }
+      : {
+          state: 'inert',
+          reasons: ['它自带的 bundle 补丁是空的，你的配置里也没有引用它，所以不会加载 / its own bundle patch is empty and your setup does not reference it, so nothing loads it'],
+          bundle: inBundles,
+          hot: false,
+        }
+  }
+
   if (inBundles) {
     // #757: "restart to apply" is only honest when the next boot would
     // actually load the bundle. The host skips bundles whose dsh peer