@deepseek-ai/dsh-plugin-manager 0.2.1-alpha.1 → 0.2.1-alpha.3

package/lib/index.js

@@ -1,13 +1,13 @@
 import { randomUUID } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, globSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { mkdir, mkdtemp, open, readFile, rm } from "node:fs/promises";
-import { isAbsolute, join, resolve } from "node:path";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 import z from "@deepseek-ai/schemastery";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { pluginEntryId, readPluginInventory } from "@deepseek-ai/dsh-host-plugin-inventory";
-import { OPTIONAL_BUNDLES, PROFILE_COMPATIBILITY_FILENAME, bundlePatchPaths, composeEntries, evaluatePluginCompatibility, loadOptionalPatches, loadOverlayPatches, pluginCompatibilityWarning, readPluginMeta, readProfileCompatibility, readProfileManifest, readProfilePatches, readProfileVersionExemptions, reconcileProfilePatches, resolveBundleDir, resolveProfileDir, setProfileVersionExemption } from "@deepseek-ai/dsh-app-boot";
+import { OFFICIAL_ON_DEMAND_CATALOG, OPTIONAL_BUNDLES, PROFILE_COMPATIBILITY_FILENAME, ResolutionRestartRequired, bundlePatchPaths, composeEntries, evaluatePluginCompatibility, getDshRuntimeVersion, loadOptionalPatches, loadOverlayPatches, pluginCompatibilityWarning, readBundlePatches, readPluginMeta, readProfileCompatibility, readProfileManifest, readProfilePatches, readProfileVersionExemptions, resolveBundleDir, resolveProfileDir, setProfileVersionExemption } from "@deepseek-ai/dsh-app-boot";
 import { once } from "node:events";
 import { execa } from "execa";
 import { scrubbedParentEnv } from "@deepseek-ai/dsh-subprocess";
@@ -234,6 +234,64 @@ function incompatiblePlugin(issue) {
 //#endregion
 //#region lib/types/operations.js
 /** Shared profile package operations used by dsh plugin and the running manager. */
+var __addDisposableResource = function(env, value, async) {
+	if (value !== null && value !== void 0) {
+		if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+		var dispose, inner;
+		if (async) {
+			if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+			dispose = value[Symbol.asyncDispose];
+		}
+		if (dispose === void 0) {
+			if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+			dispose = value[Symbol.dispose];
+			if (async) inner = dispose;
+		}
+		if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+		if (inner) dispose = function() {
+			try {
+				inner.call(this);
+			} catch (e) {
+				return Promise.reject(e);
+			}
+		};
+		env.stack.push({
+			value,
+			dispose,
+			async
+		});
+	} else if (async) env.stack.push({ async: true });
+	return value;
+};
+var __disposeResources = (function(SuppressedError) {
+	return function(env) {
+		function fail(e) {
+			env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+			env.hasError = true;
+		}
+		var r, s = 0;
+		function next() {
+			while (r = env.stack.pop()) try {
+				if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+				if (r.dispose) {
+					var result = r.dispose.call(r.value);
+					if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+						fail(e);
+						return next();
+					});
+				} else s |= 1;
+			} catch (e) {
+				fail(e);
+			}
+			if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+			if (env.hasError) throw env.error;
+		}
+		return next();
+	};
+})(typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+	var e = new Error(message);
+	return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
 /** Resolve relative package specs against the caller's directory.
 * @param argument One pnpm argument.
 * @param cwd Invocation directory, never the profile directory.
@@ -461,254 +519,268 @@ function bundleComponentManifests(manifest, dir, anchor) {
 * @param options Output, activation and cancellation policy.
 * @returns Exit status, whether the silence bound stopped the run, and the diagnostic path.
 * A compatibility denial returns exit code 1. Service output is bounded; CLI output uses inherited descriptors.
+* The diagnostic file is closed on return or rejection, including preparation and spawn failures.
 */
 async function runProfilePnpm(context, args, options) {
-	const dir = context.dir ?? resolveProfileDir(context.profile, context.home);
-	const active = await activeRecordedRun(dir);
-	const logRoot = join(dir, ".plugin-manager", "logs");
-	await mkdir(logRoot, {
-		recursive: true,
-		mode: 448
-	});
-	const logPath = join(await mkdtemp(join(logRoot, "operation-")), "pnpm.log");
-	const log = await open(logPath, "wx", 384);
-	if (active !== void 0) {
-		await log.write(active);
-		await log.close();
-		options.onOutput?.(active, "stderr");
-		const bytes = Buffer.from(active);
-		return {
-			exitCode: 1,
-			output: bytes.subarray(Math.max(0, bytes.length - options.outputBytes)).toString("utf8"),
-			truncated: bytes.length > options.outputBytes,
-			logPath
-		};
-	}
-	const before = readProfileManifest("dsh", dir);
-	const savedFiles = ["package.json", "pnpm-lock.yaml"].map((name) => ({
-		path: join(dir, name),
-		text: optionalFile(join(dir, name))
-	}));
-	const beforeDependencies = directDependencies(before);
-	const installedBefore = new Map(Object.keys(beforeDependencies).map((name) => [name, optionalFile(join(dir, "node_modules", name, "package.json"))]));
-	let output = Buffer.alloc(0);
-	let truncated = false;
-	const append = (bytes) => {
-		output = Buffer.concat([output, bytes]);
-		if (output.length > options.outputBytes) {
-			truncated = true;
-			output = output.subarray(output.length - options.outputBytes);
-		}
-	};
-	const environment = {
-		...options.execution === "cli" ? process.env : scrubbedParentEnv(),
-		...options.env
-	};
-	const restore = async () => {
-		for (const file of savedFiles) if (file.text === void 0) await rm(file.path, { force: true });
-		else await writeFileAtomic(file.path, file.text, { mode: 384 });
-	};
-	/** Packages a compatibility check refused; callers render them for their own surface. */
-	const incompatible = [];
-	const rejected = async (warnings, restoration) => {
-		const diagnostic = `\ndsh: installation rejected: ${warnings.join("\n")}\ndsh: ${restoration}.\n`;
-		await log.write(diagnostic);
-		options.onOutput?.(diagnostic, "stderr");
-		append(Buffer.from(diagnostic));
-		await log.close();
-		return {
-			exitCode: 1,
-			output: output.toString("utf8"),
-			truncated,
-			logPath,
-			incompatible
-		};
-	};
-	const preflight = [];
-	const exemptions = readProfileVersionExemptions(dir);
-	const registryFlags = args.filter((argument) => argument.startsWith("--registry="));
-	for (const raw of namedSpecs(args)) try {
-		const manifest = await namedSpecManifest(dir, anchorPathSpec(raw, context.cwd), options, environment, registryFlags);
-		if (manifest === void 0) continue;
-		const issue = evaluatePluginCompatibility(manifest, exemptions);
-		if (issue !== void 0 && !issue.exempted) {
-			preflight.push(pluginCompatibilityWarning(issue));
-			incompatible.push(incompatiblePlugin(issue));
-		}
-	} catch (error) {
-		continue;
-	}
-	if (preflight.length > 0) return rejected(preflight, "nothing was installed");
-	const cancellation = new AbortController();
-	const grouped = leadsOwnGroup(options.execution);
-	const child = execa(options.command ?? "pnpm", [...options.args ?? [], ...args.map((arg) => anchorPathSpec(arg, context.cwd))], {
-		cwd: dir,
-		env: environment,
-		extendEnv: false,
-		reject: false,
-		stdout: options.execution === "cli" ? "inherit" : "pipe",
-		stderr: options.execution === "cli" ? "inherit" : "pipe",
-		killDescendants: options.execution === "service",
-		buffer: false,
-		stdin: options.execution === "cli" ? "inherit" : "ignore",
-		cancelSignal: options.signal === void 0 ? cancellation.signal : AbortSignal.any([cancellation.signal, options.signal])
-	});
-	const exited = once(child.nodeChildProcess, "exit").catch(() => void 0);
-	let writes = Promise.resolve();
-	/** `settled` records that the process outcome is known; `stalled` that the silence bound stopped the run. */
-	const control = {
-		settled: false,
-		stalled: false
-	};
-	/** Set once this call cuts the reading short itself, so the close it causes is not read as a run failure. */
-	let cut = false;
-	/** The first failure a reading hit before that cut, which the run still reports. */
-	let failure;
-	let idleTimer;
-	/** The silence bound: a captured run that stops printing without exiting is terminated, never awaited. */
-	const armIdle = () => {
-		if (control.settled || options.idleTimeoutMs === void 0) return;
-		clearTimeout(idleTimer);
-		idleTimer = setTimeout(() => {
-			control.stalled = true;
-			child.kill();
-		}, options.idleTimeoutMs);
-	};
-	const collect = async (stream, kind) => {
-		try {
-			for await (const chunk of stream) {
-				armIdle();
-				const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-				writes = writes.then(async () => {
-					await log.write(bytes);
-				});
-				await writes;
-				options.onOutput?.(bytes.toString("utf8"), kind);
-				append(bytes);
-			}
-		} catch (error) {
-			if (!cut) {
-				failure ??= error instanceof Error ? error : new Error(String(error));
-				cancellation.abort();
-			}
-			throw error;
-		}
+	const env_1 = {
+		stack: [],
+		error: void 0,
+		hasError: false
 	};
-	const collectors = [...child.stdout === null ? [] : [collect(child.stdout, "stdout")], ...child.stderr === null ? [] : [collect(child.stderr, "stderr")]];
-	for (const collector of collectors) collector.catch(() => {});
-	if (collectors.length > 0) armIdle();
-	let exitCode;
 	try {
-		await recordRun(dir, {
-			pid: child.pid,
-			grouped
-		});
-		const settled = Promise.allSettled([child]);
-		await Promise.race([exited, settled]);
-		control.settled = true;
-		clearTimeout(idleTimer);
-		if (control.stalled) await awaitTreeGone({
-			pid: child.pid,
-			grouped
+		const dir = context.dir ?? resolveProfileDir(context.profile, context.home);
+		const active = await activeRecordedRun(dir);
+		const logRoot = join(dir, ".plugin-manager", "logs");
+		await mkdir(logRoot, {
+			recursive: true,
+			mode: 448
 		});
-		if (await drainWithin(collectors, DRAIN_AFTER_EXIT_MS)) {
-			for (const stream of await Promise.allSettled(collectors)) if (stream.status === "rejected") throw stream.reason;
-		} else {
-			cut = true;
-			child.stdout?.destroy();
-			child.stderr?.destroy();
-			const notice = "dsh: pnpm output was cut short after its process exited\n";
-			await log.write(notice);
-			if (failure !== void 0) throw failure;
-			options.onOutput?.(notice, "stderr");
-			append(Buffer.from(notice));
-		}
-		const [completion] = await settled;
-		if (completion.status === "rejected") throw completion.reason;
-		const result = completion.value;
-		exitCode = result.exitCode ?? (result.code === "ENOENT" ? 127 : 1);
-		if (control.stalled) {
-			const notice = `dsh: pnpm printed nothing for ${String(options.idleTimeoutMs)}ms and was terminated\n`;
-			await log.write(notice);
-			options.onOutput?.(notice, "stderr");
-			append(Buffer.from(notice));
+		const logPath = join(await mkdtemp(join(logRoot, "operation-")), "pnpm.log");
+		const log = __addDisposableResource(env_1, await open(logPath, "wx", 384), true);
+		if (active !== void 0) {
+			await log.write(active);
+			await log.close();
+			options.onOutput?.(active, "stderr");
+			const bytes = Buffer.from(active);
+			return {
+				exitCode: 1,
+				output: bytes.subarray(Math.max(0, bytes.length - options.outputBytes)).toString("utf8"),
+				truncated: bytes.length > options.outputBytes,
+				logPath
+			};
 		}
-		if (result.failed && output.length === 0) {
-			const diagnostic = result.shortMessage ?? "pnpm failed";
+		const before = readProfileManifest("dsh", dir);
+		const savedFiles = ["package.json", "pnpm-lock.yaml"].map((name) => ({
+			path: join(dir, name),
+			text: optionalFile(join(dir, name))
+		}));
+		const beforeDependencies = directDependencies(before);
+		const installedBefore = new Map(Object.keys(beforeDependencies).map((name) => [name, optionalFile(join(dir, "node_modules", name, "package.json"))]));
+		let output = Buffer.alloc(0);
+		let truncated = false;
+		const append = (bytes) => {
+			output = Buffer.concat([output, bytes]);
+			if (output.length > options.outputBytes) {
+				truncated = true;
+				output = output.subarray(output.length - options.outputBytes);
+			}
+		};
+		const environment = {
+			...options.execution === "cli" ? process.env : scrubbedParentEnv(),
+			...options.env
+		};
+		const restore = async () => {
+			for (const file of savedFiles) if (file.text === void 0) await rm(file.path, { force: true });
+			else await writeFileAtomic(file.path, file.text, { mode: 384 });
+		};
+		/** Packages a compatibility check refused; callers render them for their own surface. */
+		const incompatible = [];
+		const rejected = async (warnings, restoration) => {
+			const diagnostic = `\ndsh: installation rejected: ${warnings.join("\n")}\ndsh: ${restoration}.\n`;
 			await log.write(diagnostic);
-			truncated = Buffer.byteLength(diagnostic) > options.outputBytes;
-			output = Buffer.from(diagnostic).subarray(0, options.outputBytes);
+			options.onOutput?.(diagnostic, "stderr");
+			append(Buffer.from(diagnostic));
+			await log.close();
+			return {
+				exitCode: 1,
+				output: output.toString("utf8"),
+				truncated,
+				logPath,
+				incompatible
+			};
+		};
+		const preflight = [];
+		const exemptions = readProfileVersionExemptions(dir);
+		const registryFlags = args.filter((argument) => argument.startsWith("--registry="));
+		for (const raw of namedSpecs(args)) try {
+			const manifest = await namedSpecManifest(dir, anchorPathSpec(raw, context.cwd), options, environment, registryFlags);
+			if (manifest === void 0) continue;
+			const issue = evaluatePluginCompatibility(manifest, exemptions);
+			if (issue !== void 0 && !issue.exempted) {
+				preflight.push(pluginCompatibilityWarning(issue));
+				incompatible.push(incompatiblePlugin(issue));
+			}
+		} catch (error) {
+			continue;
 		}
-		if (exitCode === 0 && !control.stalled) {
-			const after = readProfileManifest("dsh", dir);
-			const warnings = [];
-			for (const [name, spec] of Object.entries(directDependencies(after))) {
-				const packageDir = join(dir, "node_modules", name);
-				const installed = optionalFile(join(packageDir, "package.json"));
-				if (installed === void 0) continue;
-				const untouched = beforeDependencies[name] === spec && installedBefore.get(name) === installed;
-				const found = [];
-				const issues = [];
-				try {
-					const manifest = readProfileManifest("dsh", packageDir);
-					for (const candidate of [manifest, ...bundleComponentManifests(manifest, packageDir, context.installAnchor)]) {
-						const issue = evaluatePluginCompatibility(candidate, readProfileVersionExemptions(dir));
-						if (issue !== void 0 && !issue.exempted) {
-							found.push(pluginCompatibilityWarning(issue));
-							issues.push(incompatiblePlugin(issue));
-						}
-					}
-				} catch (error) {
-					found.push(`Cannot validate installed package ${name}: ${String(error)}`);
+		if (preflight.length > 0) return await rejected(preflight, "nothing was installed");
+		const cancellation = new AbortController();
+		const grouped = leadsOwnGroup(options.execution);
+		const child = execa(options.command ?? "pnpm", [...options.args ?? [], ...args.map((arg) => anchorPathSpec(arg, context.cwd))], {
+			cwd: dir,
+			env: environment,
+			extendEnv: false,
+			reject: false,
+			stdout: options.execution === "cli" ? "inherit" : "pipe",
+			stderr: options.execution === "cli" ? "inherit" : "pipe",
+			killDescendants: options.execution === "service",
+			buffer: false,
+			stdin: options.execution === "cli" ? "inherit" : "ignore",
+			cancelSignal: options.signal === void 0 ? cancellation.signal : AbortSignal.any([cancellation.signal, options.signal])
+		});
+		const exited = once(child.nodeChildProcess, "exit").catch(() => void 0);
+		let writes = Promise.resolve();
+		/** `settled` records that the process outcome is known; `stalled` that the silence bound stopped the run. */
+		const control = {
+			settled: false,
+			stalled: false
+		};
+		/** Set once this call cuts the reading short itself, so the close it causes is not read as a run failure. */
+		let cut = false;
+		/** The first failure a reading hit before that cut, which the run still reports. */
+		let failure;
+		let idleTimer;
+		/** The silence bound: a captured run that stops printing without exiting is terminated, never awaited. */
+		const armIdle = () => {
+			if (control.settled || options.idleTimeoutMs === void 0) return;
+			clearTimeout(idleTimer);
+			idleTimer = setTimeout(() => {
+				control.stalled = true;
+				child.kill();
+			}, options.idleTimeoutMs);
+		};
+		const collect = async (stream, kind) => {
+			try {
+				for await (const chunk of stream) {
+					armIdle();
+					const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+					writes = writes.then(async () => {
+						await log.write(bytes);
+					});
+					await writes;
+					options.onOutput?.(bytes.toString("utf8"), kind);
+					append(bytes);
 				}
-				if (found.length === 0) continue;
-				if (!untouched) {
-					warnings.push(...found);
-					incompatible.push(...issues);
-				} else {
-					const notice = `\ndsh: warning: ${found.join("\n")}\ndsh: it stays installed but profile startup denies it until you grant an exemption for those exact versions.\n`;
-					await log.write(notice);
-					options.onOutput?.(notice, "stderr");
+			} catch (error) {
+				if (!cut) {
+					failure ??= error instanceof Error ? error : new Error(String(error));
+					cancellation.abort();
 				}
+				throw error;
 			}
-			if (warnings.length > 0) {
-				await restore();
-				const repair = ["install", savedFiles.some((file) => file.path.endsWith("pnpm-lock.yaml") && file.text !== void 0) ? "--frozen-lockfile" : "--config.lockfile=false"];
-				const repairing = execa(options.command ?? "pnpm", [...options.args ?? [], ...repair], {
-					cwd: dir,
-					env: environment,
-					extendEnv: false,
-					reject: false,
-					stdin: "ignore",
-					...options.idleTimeoutMs === void 0 ? {} : { timeout: options.idleTimeoutMs }
-				});
-				await recordRun(dir, {
-					pid: repairing.pid,
-					grouped: false
-				});
-				const repaired = await repairing;
-				exitCode = 1;
-				const restoration = repaired.exitCode === 0 ? "restored package.json, pnpm-lock.yaml, and node_modules" : "restored package.json and pnpm-lock.yaml, but node_modules could not be reinstalled; run 'dsh plugin install'";
-				const diagnostic = `\ndsh: installation rejected: ${warnings.join("\n")}\ndsh: ${restoration}.\n`;
+		};
+		const collectors = [...child.stdout === null ? [] : [collect(child.stdout, "stdout")], ...child.stderr === null ? [] : [collect(child.stderr, "stderr")]];
+		for (const collector of collectors) collector.catch(() => {});
+		if (collectors.length > 0) armIdle();
+		let exitCode;
+		try {
+			await recordRun(dir, {
+				pid: child.pid,
+				grouped
+			});
+			const settled = Promise.allSettled([child]);
+			await Promise.race([exited, settled]);
+			control.settled = true;
+			clearTimeout(idleTimer);
+			if (control.stalled) await awaitTreeGone({
+				pid: child.pid,
+				grouped
+			});
+			if (await drainWithin(collectors, DRAIN_AFTER_EXIT_MS)) {
+				for (const stream of await Promise.allSettled(collectors)) if (stream.status === "rejected") throw stream.reason;
+			} else {
+				cut = true;
+				child.stdout?.destroy();
+				child.stderr?.destroy();
+				const notice = "dsh: pnpm output was cut short after its process exited\n";
+				await log.write(notice);
+				if (failure !== void 0) throw failure;
+				options.onOutput?.(notice, "stderr");
+				append(Buffer.from(notice));
+			}
+			const [completion] = await settled;
+			if (completion.status === "rejected") throw completion.reason;
+			const result = completion.value;
+			exitCode = result.exitCode ?? (result.code === "ENOENT" ? 127 : 1);
+			if (control.stalled) {
+				const notice = `dsh: pnpm printed nothing for ${String(options.idleTimeoutMs)}ms and was terminated\n`;
+				await log.write(notice);
+				options.onOutput?.(notice, "stderr");
+				append(Buffer.from(notice));
+			}
+			if (result.failed && output.length === 0) {
+				const diagnostic = result.shortMessage ?? "pnpm failed";
 				await log.write(diagnostic);
-				options.onOutput?.(diagnostic, "stderr");
-				append(Buffer.from(diagnostic));
-			} else if (options.activateNewBundles !== false) await reconcile(before, dir, context.installAnchor, options);
+				truncated = Buffer.byteLength(diagnostic) > options.outputBytes;
+				output = Buffer.from(diagnostic).subarray(0, options.outputBytes);
+			}
+			if (exitCode === 0 && !control.stalled) {
+				const after = readProfileManifest("dsh", dir);
+				const warnings = [];
+				for (const [name, spec] of Object.entries(directDependencies(after))) {
+					const packageDir = join(dir, "node_modules", name);
+					const installed = optionalFile(join(packageDir, "package.json"));
+					if (installed === void 0) continue;
+					const untouched = beforeDependencies[name] === spec && installedBefore.get(name) === installed;
+					const found = [];
+					const issues = [];
+					try {
+						const manifest = readProfileManifest("dsh", packageDir);
+						for (const candidate of [manifest, ...bundleComponentManifests(manifest, packageDir, context.installAnchor)]) {
+							const issue = evaluatePluginCompatibility(candidate, readProfileVersionExemptions(dir));
+							if (issue !== void 0 && !issue.exempted) {
+								found.push(pluginCompatibilityWarning(issue));
+								issues.push(incompatiblePlugin(issue));
+							}
+						}
+					} catch (error) {
+						found.push(`Cannot validate installed package ${name}: ${String(error)}`);
+					}
+					if (found.length === 0) continue;
+					if (!untouched) {
+						warnings.push(...found);
+						incompatible.push(...issues);
+					} else {
+						const notice = `\ndsh: warning: ${found.join("\n")}\ndsh: it stays installed but profile startup denies it until you grant an exemption for those exact versions.\n`;
+						await log.write(notice);
+						options.onOutput?.(notice, "stderr");
+					}
+				}
+				if (warnings.length > 0) {
+					await restore();
+					const repair = ["install", savedFiles.some((file) => file.path.endsWith("pnpm-lock.yaml") && file.text !== void 0) ? "--frozen-lockfile" : "--config.lockfile=false"];
+					const repairing = execa(options.command ?? "pnpm", [...options.args ?? [], ...repair], {
+						cwd: dir,
+						env: environment,
+						extendEnv: false,
+						reject: false,
+						stdin: "ignore",
+						...options.idleTimeoutMs === void 0 ? {} : { timeout: options.idleTimeoutMs }
+					});
+					await recordRun(dir, {
+						pid: repairing.pid,
+						grouped: false
+					});
+					const repaired = await repairing;
+					exitCode = 1;
+					const restoration = repaired.exitCode === 0 ? "restored package.json, pnpm-lock.yaml, and node_modules" : "restored package.json and pnpm-lock.yaml, but node_modules could not be reinstalled; run 'dsh plugin install'";
+					const diagnostic = `\ndsh: installation rejected: ${warnings.join("\n")}\ndsh: ${restoration}.\n`;
+					await log.write(diagnostic);
+					options.onOutput?.(diagnostic, "stderr");
+					append(Buffer.from(diagnostic));
+				} else if (options.activateNewBundles !== false) await reconcile(before, dir, context.installAnchor, options);
+			}
+		} finally {
+			control.settled = true;
+			clearTimeout(idleTimer);
+			await rm(runRecordPath(dir), { force: true });
+			await log.close();
 		}
+		return {
+			exitCode,
+			output: output.toString("utf8"),
+			truncated,
+			logPath,
+			...control.stalled ? { timedOut: true } : {},
+			...incompatible.length > 0 ? { incompatible } : {}
+		};
+	} catch (e_1) {
+		env_1.error = e_1;
+		env_1.hasError = true;
 	} finally {
-		control.settled = true;
-		clearTimeout(idleTimer);
-		await rm(runRecordPath(dir), { force: true });
-		await log.close();
+		const result_1 = __disposeResources(env_1);
+		if (result_1) await result_1;
 	}
-	return {
-		exitCode,
-		output: output.toString("utf8"),
-		truncated,
-		logPath,
-		...control.stalled ? { timedOut: true } : {},
-		...incompatible.length > 0 ? { incompatible } : {}
-	};
 }
 /**
 * Read the registry pnpm's own configuration names in the profile: its `.npmrc` chain and workspace settings,
@@ -819,6 +891,48 @@ function classifyInstallFailure(facts) {
 	for (const [kind, pattern] of LOG_KINDS) if (pattern.test(facts.log)) return kind;
 	return "unknown";
 }
+//#endregion
+//#region lib/types/official-install-target.js
+/** Select Official bundle packages from the running installation without importing provider code. */
+function manifestAt(file) {
+	return JSON.parse(readFileSync(file, "utf8"));
+}
+/**
+* Offer a source checkout link or an exact published package version. Source installations are
+* identified by the real CLI manifest and its unpacked workspace dependencies, including Desktop's
+* development symlink. An incomplete checkout is an error, never a registry fallback.
+* @param name - Official catalog package name.
+* @param installAnchor - Running application's DSH package.json, possibly reached through a symlink.
+* @param version - Running DSH version used by its release family.
+* @returns An ordinary package-manager spec and its package version.
+* @throws when a source installation lacks its workspace package, bundle patch, or built runtime.
+*/
+function officialBundleInstallTarget(name, installAnchor, version) {
+	const anchor = realpathSync(installAnchor);
+	const installation = manifestAt(anchor);
+	if (!(installation.name === "@deepseek-ai/dsh" && Object.values(installation.dependencies ?? {}).some((value) => value.startsWith("workspace:")))) return {
+		spec: `${name}@${version}`,
+		version
+	};
+	const root = resolve(dirname(anchor), "../..");
+	if (anchor !== join(root, "apps", "cli", "package.json") || !existsSync(join(root, "package.json")) || manifestAt(join(root, "package.json")).name !== "@deepseek-ai/dsh-root") throw new Error(`Official bundle ${name}: source DSH installation ${anchor} requires its complete workspace checkout`);
+	const matches = globSync("packages/*/*/package.json", { cwd: root }).map((file) => ({
+		file: join(root, file),
+		manifest: manifestAt(join(root, file))
+	})).filter((entry) => entry.manifest.name === name);
+	const selected = matches[0];
+	if (matches.length !== 1 || selected === void 0) throw new Error(`Official bundle ${name}: expected one workspace package in ${root}, found ${matches.length}; restore the checkout and run pnpm install`);
+	const { file, manifest } = selected;
+	const directory = realpathSync(dirname(file));
+	if (manifest.version !== version || manifest.private === true || manifest.dsh?.bundle === void 0) throw new Error(`Official bundle ${name}: ${file} must declare a public bundle at DSH version ${version}`);
+	const main = typeof manifest.main === "string" ? resolve(directory, manifest.main) : void 0;
+	if (main === void 0 || !existsSync(main) || !statSync(main).isFile()) throw new Error(`Official bundle ${name}: built runtime is missing in ${directory}; run pnpm install and pnpm run build in ${root}`);
+	for (const patch of bundlePatchPaths(directory, manifest.dsh.bundle)) if (!existsSync(patch) || !statSync(patch).isFile()) throw new Error(`Official bundle ${name}: bundle patch ${patch} is missing; restore the checkout`);
+	return {
+		spec: `link:${directory}`,
+		version
+	};
+}
 /** Public npmmirror URL shared by the fallback configuration and public-registry comparison. */
 const NPMMIRROR_REGISTRY = "https://registry.npmmirror.com/";
 /**
@@ -897,15 +1011,25 @@ function attributeFailure(kind, log, spec) {
 }
 //#endregion
 //#region lib/types/patch.js
-/** Comment-preserving profile plugin enablement edits. */
-/** Replace the last matching override or append one after existing insertions.
-* @param filename Current profile patch file.
+/** Comment-preserving profile plugin enablement edits and the entry flattening they compare against. */
+/** Flatten only the groups addressable by the profile's patch composer.
+* @param rows Composed top-level entries.
+* @returns Entries in depth-first order.
+*/
+function flatten(rows) {
+	return rows.flatMap((row) => [row, ...row.group && Array.isArray(row.config) ? flatten(row.config) : []]);
+}
+/** Replace the last matching override or append one after existing insertions. An override that holds only `id` and
+* `disabled`, without anchors, is removed, or not appended, when the bundle layers and the remaining profile patches
+* already give the entry the requested literal `disabled` value; home patches and launch overlays are not consulted.
+* @param profile Profile whose patch file is edited and whose selected bundles supply the compared composition.
 * @param id Unique composition entry id.
 * @param name Module name used to match name-qualified overrides.
 * @param enabled Desired entry enablement.
 * @returns Whether the file changed.
 */
-async function writePluginEnabled(filename, id, name, enabled) {
+async function writePluginEnabled(profile, id, name, enabled) {
+	const filename = profile.patchPath;
 	let text;
 	try {
 		text = await readFile(filename, "utf8");
@@ -920,26 +1044,46 @@ async function writePluginEnabled(filename, id, name, enabled) {
 	const error = document.errors[0];
 	if (error !== void 0) throw error;
 	if (!isSeq(document.contents)) throw new Error("Profile patch must be a YAML sequence");
-	loadOptionalPatches("dsh", filename);
+	const patches = loadOptionalPatches("dsh", filename) ?? [];
+	const bundlePatches = readBundlePatches("dsh", profile);
 	const items = document.contents.items;
 	const target = items.findLast((item, index) => {
 		if (!isMap(item) || document.getIn([index, "id"]) !== id || item.has("insert")) return false;
 		const expectedName = document.getIn([index, "name"]);
 		return !expectedName || expectedName === name;
 	});
+	const implied = (index) => {
+		const row = flatten(composeEntries([[...bundlePatches, ...patches.toSpliced(index, 1)]])).findLast((entry) => entry.id === id);
+		return row !== void 0 && (row.disabled ?? false) === !enabled;
+	};
 	if (isMap(target)) {
-		if (document.getIn([items.indexOf(target), "disabled"]) === !enabled) return false;
-		document.setIn([items.indexOf(target), "disabled"], !enabled);
-	} else document.add({
-		id,
-		disabled: !enabled
-	});
+		const index = items.indexOf(target);
+		if (target.anchor === void 0 && target.items.every((pair) => isScalar(pair.key) && isScalar(pair.value) && pair.key.anchor === void 0 && pair.value.anchor === void 0 && (pair.key.value === "id" || pair.key.value === "disabled")) && implied(index)) {
+			document.deleteIn([index]);
+			const comment = target.commentBefore;
+			const next = items[index];
+			if (comment && isNode(next)) next.commentBefore = next.commentBefore ? `${comment}\n${next.commentBefore}` : comment;
+			else if (comment && items.length === 0) document.contents.commentBefore = comment;
+			else if (comment) document.comment = document.comment ? `${comment}\n${document.comment}` : comment;
+		} else if (document.getIn([index, "disabled"]) === !enabled) return false;
+		else document.setIn([index, "disabled"], !enabled);
+	} else {
+		if (implied(items.length)) return false;
+		document.add({
+			id,
+			disabled: !enabled
+		});
+	}
 	await writeFileAtomic(filename, String(document), { mode: 384 });
 	return true;
 }
 //#endregion
 //#region lib/types/build-approval.js
 /** Approve pnpm's pending dependency scripts in the current profile's workspace settings. */
+/** Value pnpm leaves for a build script that still needs a decision. */
+const UNDECIDED_BUILD = "set this to true or false";
+/** Where a non-interactive run names the build scripts it skipped. */
+const IGNORED_BUILDS = /\bIgnored build scripts: (.+)/;
 async function readPolicy(dir) {
 	let text;
 	try {
@@ -956,17 +1100,41 @@ async function readPolicy(dir) {
 	visit(builds ?? null, (_key, node) => {
 		if (isAlias(node) || isNode(node) && "anchor" in node && node.anchor) throw new Error("allowBuilds must not contain YAML anchors or aliases");
 	});
+	const keys = isMap(builds) ? builds.items.flatMap(({ key }) => isScalar(key) && typeof key.value === "string" ? [key.value] : []) : [];
 	return {
 		document,
-		pending: isMap(builds) ? builds.items.flatMap(({ key, value }) => isScalar(key) && typeof key.value === "string" && !/[*?]/.test(key.value) && isScalar(value) && value.value === "set this to true or false" ? [key.value] : []) : []
+		pending: isMap(builds) ? builds.items.flatMap(({ key, value }) => isScalar(key) && typeof key.value === "string" && !/[*?]/.test(key.value) && isScalar(value) && value.value === UNDECIDED_BUILD ? [key.value] : []) : [],
+		keys
 	};
 }
-/** Read package names left undecided by pnpm 11, including after installation cleanup.
+/**
+* Record the build scripts a failed run reported as ignored, then list every name awaiting a decision.
+*
+* pnpm writes those policy entries itself only when it can prompt, and the
+* manager always runs it non-interactively, so the run's own report is the
+* record that survives.
 * @param dir Current profile directory.
+* @param output Captured output of the failed run.
 * @returns Exact package names awaiting a build decision; wildcard rules are excluded.
 */
-async function readPendingBuilds(dir) {
-	return (await readPolicy(dir)).pending;
+async function recordPendingBuilds(dir, output) {
+	const { document, pending, keys } = await readPolicy(dir);
+	const known = new Set(keys);
+	const added = ignoredBuildNames(output).filter((name) => !known.has(name));
+	if (added.length === 0) return pending;
+	for (const name of added) document.setIn(["allowBuilds", name], UNDECIDED_BUILD);
+	await writeFileAtomic(join(dir, "pnpm-workspace.yaml"), String(document), { mode: 384 });
+	return [...pending, ...added];
+}
+/**
+* Read the package names a pnpm run reported as ignored build scripts.
+* @param output Captured output of the run.
+* @returns Exact names in report order; wildcard patterns are excluded.
+*/
+function ignoredBuildNames(output) {
+	const reported = IGNORED_BUILDS.exec(output)?.[1];
+	if (reported === void 0) return [];
+	return reported.split(",").map((name) => name.trim()).filter((name) => name !== "" && !/[*?]/.test(name));
 }
 /** Persist approval without running scripts; the caller holds the profile manifest lock.
 * @param dir Current profile directory.
@@ -1113,6 +1281,7 @@ const protectedModules = new Set([
 	"@deepseek-ai/dsh-host-plugin-inventory",
 	"@deepseek-ai/dsh-typert-registry",
 	"@deepseek-ai/dsh-api-remotes",
+	"@deepseek-ai/dsh-api-remote-access",
 	"@deepseek-ai/cordis-plugin-timer",
 	"@deepseek-ai/dsh-client-connection",
 	"@deepseek-ai/dsh-host-frontend-static",
@@ -1123,10 +1292,6 @@ const protectedModules = new Set([
 const RESTORED_FILES = ["package.json", "pnpm-lock.yaml"];
 /** pnpm's colour escapes, which a JSON answer may be wrapped in. */
 const ANSI_SEQUENCE = /\x1b\[[0-9;]*m/g;
-/** Flatten only the groups addressable by the profile's patch composer. */
-function flatten(rows) {
-	return rows.flatMap((row) => [row, ...row.group && Array.isArray(row.config) ? flatten(row.config) : []]);
-}
 /** Preserve the exact observed diagnostic, including non-Error failures. */
 function messageOf(error) {
 	return error instanceof Error ? error.message : String(error);
@@ -1192,6 +1357,33 @@ function printedError(printed) {
 	const { code, message } = error;
 	return [code, message].filter((part) => typeof part === "string").join("  ");
 }
+/** The bundles a profile manifest selects. */
+function bundleSelection(manifest) {
+	return manifest.dsh?.profile?.bundles ?? [];
+}
+/**
+* The package an installation spec names before pnpm runs: a registry name, a local directory's manifest name, or the
+* dependency saved with this git or tarball spec, compared as the plugin list shows saved specs.
+* @param spec The installation spec.
+* @param dependencies The profile's saved dependencies.
+* @param profileDir The profile directory saved local paths are relative to.
+* @returns The package name, or `undefined` when only the installation tells it.
+*/
+function specPackageName(spec, dependencies, profileDir) {
+	const parsed = parsedForRegistry(spec);
+	if (parsed.kind === "registry") return parsed.name;
+	if (parsed.kind === "path") return packageName(parsed.path);
+	const specs = parsed.kind === "tarball" && parsed.path !== void 0 ? [spec, `file:${parsed.path}`] : [spec];
+	return Object.entries(dependencies).find(([dependency, saved]) => specs.includes(dependencySpec(dependency, saved, profileDir)))?.[0];
+}
+/** The package name a local directory declares, or `undefined` without a readable manifest. */
+function packageName(dir) {
+	try {
+		return readProfileManifest("dsh", dir).name;
+	} catch (_error) {
+		return;
+	}
+}
 /** The spec's form, for deciding whether a failed attempt was the registry's; a form the parser refuses has no host of its own. */
 function parsedForRegistry(spec) {
 	try {
@@ -1389,6 +1581,11 @@ let PluginManager = (() => {
 		});
 		/** Management bundles remain protected if their files become unreadable. */
 		managementBundles = (__runInitializers(this, _instanceExtraInitializers), /* @__PURE__ */ new Set());
+		/**
+		* The registry each package was last installed from by this manager in this process. pnpm verifies lockfile tarball
+		* URLs against its default registry unless they belong to a named registry, so a later removal names it again.
+		*/
+		installedFrom = /* @__PURE__ */ new Map();
 		ownerEntryId;
 		packageOperations = /* @__PURE__ */ new Set();
 		profile;
@@ -1445,7 +1642,7 @@ let PluginManager = (() => {
 		setVersionExemption(packageVersion, runtimeVersion, enabled, acceptRisk) {
 			return this.change((result) => this.configure(async () => {
 				await setProfileVersionExemption(this.profile.dir, packageVersion, runtimeVersion, enabled, acceptRisk === true);
-				result.warnings = await this.reload();
+				Object.assign(result, await this.reload());
 			}), {
 				stage: "enable",
 				target: packageVersion,
@@ -1475,7 +1672,7 @@ let PluginManager = (() => {
 				};
 			});
 		}
-		/** Read the profile's installed bundles, the bundles this dsh installation supplies, and the selected names that are not bundles.
+		/** Read installed, installation-provided, and offline Official catalog bundles, plus selected non-bundle names.
 		* A dependency without a bundle patch is listed, as a `not-bundle` problem, only while it is selected.
 		* @returns Package versions, manifest descriptions, the installable spec of profile dependencies, rows, optional
 		* display metadata, activation selections, whether the installation offers the bundle, and removal availability.
@@ -1483,49 +1680,90 @@ let PluginManager = (() => {
 		listBundles() {
 			const manifest = readProfileManifest("dsh", this.profile.dir);
 			const exemptions = readProfileVersionExemptions(this.profile.dir);
-			const selected = manifest.dsh?.profile?.bundles ?? [];
+			const selected = bundleSelection(manifest);
 			const recorded = manifest.dependencies ?? {};
 			const dependencies = Object.keys(recorded);
 			const installation = JSON.parse(readFileSync(this.profile.installAnchor, "utf8"));
+			const catalog = new Map(OFFICIAL_ON_DEMAND_CATALOG.map((entry) => [entry.packageName, entry]));
 			const names = [...new Set([
 				...selected,
 				...dependencies,
-				...Object.keys(installation.dependencies ?? {})
+				...Object.keys(installation.dependencies ?? {}),
+				...catalog.keys()
 			])];
 			const bundles = [];
+			const runtimeVersion = getDshRuntimeVersion();
 			for (const name of names) {
 				const installed = dependencies.includes(name);
 				const optional = OPTIONAL_BUNDLES.includes(name);
 				const enabled = selected.includes(name);
 				const shipped = Object.hasOwn(installation.dependencies ?? {}, name);
+				const offered = catalog.get(name);
+				const official = optional || offered !== void 0;
+				let target = {};
+				let targetError;
+				if (offered !== void 0) try {
+					target = { installTarget: officialBundleInstallTarget(name, this.profile.installAnchor, runtimeVersion) };
+				} catch (error) {
+					targetError = managementError(error);
+				}
+				const catalogMeta = offered === void 0 ? {} : { meta: offered.meta };
+				if (offered !== void 0 && !installed && !shipped) {
+					bundles.push({
+						name,
+						official,
+						availability: "missing",
+						...catalogMeta,
+						...target,
+						enabled,
+						installed,
+						optional,
+						removable: enabled,
+						rows: [],
+						overrides: [],
+						...targetError !== void 0 ? { error: targetError } : enabled ? { error: { code: "not-bundle" } } : {}
+					});
+					continue;
+				}
 				const owned = installed && !shipped;
 				const removable = owned || enabled && !installed && !shipped;
 				const sourceOf = (packageName) => owned ? { source: dependencySpec(name, recorded[name], this.profile.dir, packageName) } : {};
 				const readOnlyReason = this.protectsManager(name) ? "management-required" : void 0;
+				let availability = "missing";
+				let version;
 				try {
 					const info = bundleManifest(name, this.profile.dir, this.profile.installAnchor);
+					availability = shipped ? "installation" : "profile";
 					if (info === void 0) {
-						if (enabled) bundles.push({
+						if (enabled || offered !== void 0) bundles.push({
 							name,
+							official,
+							availability,
+							...catalogMeta,
+							...target,
 							...sourceOf(),
 							enabled,
 							installed,
 							optional,
 							removable: removable && readOnlyReason === void 0,
 							...readOnlyReason === void 0 ? {} : { readOnlyReason },
-							error: { code: "not-bundle" },
+							error: targetError ?? { code: "not-bundle" },
 							rows: [],
 							overrides: []
 						});
 						continue;
 					}
+					version = info.version;
 					const compatibility = evaluatePluginCompatibility(info, exemptions);
 					if (compatibility !== void 0 && !compatibility.exempted) throw new ManagementFailure("incompatible-version", [incompatiblePlugin(compatibility)]);
 					const dir = resolveBundleDir("dsh", name, this.profile.installAnchor, this.profile.dir);
-					const meta = readPluginMeta(info.name ?? name, pathToFileURL(join(dir, "package.json")).href);
+					const meta = offered?.meta ?? readPluginMeta(info.name ?? name, pathToFileURL(join(dir, "package.json")).href);
 					bundles.push({
 						name,
-						...info.version === void 0 ? {} : { version: info.version },
+						official,
+						availability,
+						...target,
+						...version === void 0 ? {} : { version },
 						...info.description === void 0 || info.description === "" ? {} : { description: info.description },
 						...meta === void 0 ? {} : { meta },
 						...sourceOf(info.name),
@@ -1534,18 +1772,24 @@ let PluginManager = (() => {
 						optional,
 						removable: removable && readOnlyReason === void 0,
 						...readOnlyReason === void 0 ? {} : { readOnlyReason },
-						...this.declaredRows(name, info)
+						...this.declaredRows(name, info),
+						...targetError === void 0 ? {} : { error: targetError }
 					});
 				} catch (error) {
-					if (enabled || installed) bundles.push({
+					if (enabled || installed || optional || offered !== void 0) bundles.push({
 						name,
+						official,
+						availability,
+						...catalogMeta,
+						...target,
+						...version === void 0 ? {} : { version },
 						...sourceOf(),
 						enabled,
 						installed,
 						optional,
 						removable: removable && readOnlyReason === void 0,
 						...readOnlyReason === void 0 ? {} : { readOnlyReason },
-						error: managementError(error),
+						error: targetError ?? managementError(error),
 						rows: [],
 						overrides: []
 					});
@@ -1584,7 +1828,7 @@ let PluginManager = (() => {
 			const manifest = readProfileManifest("dsh", this.profile.dir);
 			const installation = JSON.parse(readFileSync(this.profile.installAnchor, "utf8"));
 			const known = new Set([
-				...manifest.dsh?.profile?.bundles ?? [],
+				...bundleSelection(manifest),
 				...Object.keys(manifest.dependencies ?? {}),
 				...Object.keys(installation.dependencies ?? {})
 			]);
@@ -1687,8 +1931,8 @@ let PluginManager = (() => {
 				const row = (await this.listPlugins()).find((item) => item.entryId === id);
 				if (row === void 0) throw new ManagementFailure("unknown-plugin");
 				if (row.readOnlyReason !== void 0) throw new ManagementFailure(row.readOnlyReason);
-				await writePluginEnabled(this.profile.patchPath, row.patchId, row.moduleName, enabled);
-				result.warnings = await this.reload(enabled ? [row.patchId] : []);
+				await writePluginEnabled(this.profile, row.patchId, row.moduleName, enabled);
+				Object.assign(result, await this.reload(enabled ? [row.patchId] : []));
 				return (await this.listPlugins()).find((item) => item.entryId === id)?.enabled !== enabled && this.ownerContext.get("hmr") !== void 0 ? "overridden" : void 0;
 			}), {
 				stage: "enable",
@@ -1704,9 +1948,7 @@ let PluginManager = (() => {
 		setBundleEnabled(name, enabled) {
 			return this.change((result) => this.configure(async () => {
 				await this.selectBundle(name, enabled);
-				if (enabled) await this.refreshPackages();
-				result.warnings = await this.reload(enabled ? this.bundleRows(name).map((row) => row.id) : []);
-				if (!enabled && this.ownerContext.get("hmr") !== void 0) await this.refreshPackages();
+				Object.assign(result, enabled ? await this.publishAndReload(this.bundleRows(name).map((row) => row.id)) : await this.reload());
 			}), {
 				stage: "enable",
 				target: name,
@@ -1721,7 +1963,7 @@ let PluginManager = (() => {
 		* `package.json` and `pnpm-lock.yaml` as they were; downloaded files can stay.
 		* @param spec One package spec, including local paths relative to the invocation directory.
 		* @param options Whether to activate the installed bundle (defaults to true), the request id a cancellation names,
-		* the pending build scripts to allow for this profile before pnpm runs, and the registry asked first.
+		* the pending build scripts to allow, whether to save an exact dependency, and the registry asked first.
 		* @returns Package-manager diagnostics, the registries asked, and the observed activation outcome.
 		*/
 		installBundle(spec, options) {
@@ -1743,12 +1985,14 @@ let PluginManager = (() => {
 			const result = this.change(async (result) => {
 				if (spec.trim() === "" || spec.startsWith("-")) throw new ManagementFailure("invalid-spec");
 				if (stopped()) throw new InstallCancelledError();
+				const before = readProfileManifest("dsh", this.profile.dir).dependencies ?? {};
+				const known = specPackageName(spec, before, this.profile.dir);
+				if (this.ownerContext.get("hmr") !== void 0 && known !== void 0 && Object.hasOwn(before, known)) throw new ManagementFailure("already-installed");
 				if (options?.approvedBuilds !== void 0) {
 					await approveBuilds(this.profile.dir, options.approvedBuilds);
 					result.approvedBuilds = options.approvedBuilds;
 				}
 				const files = await this.readRestoredFiles();
-				const before = readProfileManifest("dsh", this.profile.dir).dependencies ?? {};
 				let name;
 				let version;
 				try {
@@ -1774,10 +2018,12 @@ let PluginManager = (() => {
 					}
 					const plan = registryPlan(options?.registry, await this.registries());
 					let run;
+					let used = null;
 					for (const [index, registry] of plan.entries()) {
 						if (index > 0) await this.restoreFiles(files);
 						if (stopped()) throw new InstallCancelledError();
 						result.registries.push(registry);
+						used = registry;
 						announce("installing", {
 							registry,
 							index: index + 1,
@@ -1786,6 +2032,7 @@ let PluginManager = (() => {
 						run = await this.runPnpm([
 							"add",
 							spec,
+							...options?.saveExact === true ? ["--save-exact"] : [],
 							...registryArguments(registry)
 						], control.abort.signal, requestId);
 						result.packageResult = run;
@@ -1806,7 +2053,7 @@ let PluginManager = (() => {
 					if (succeeded) delete result.failedAt;
 					if (!succeeded) {
 						try {
-							result.pendingBuilds = await readPendingBuilds(this.profile.dir);
+							result.pendingBuilds = await recordPendingBuilds(this.profile.dir, run.output);
 						} catch (error) {
 							this.ownerContext.logger.warn("Could not read pending build approvals after pnpm failed", error);
 						}
@@ -1814,7 +2061,10 @@ let PluginManager = (() => {
 					}
 					const after = readProfileManifest("dsh", this.profile.dir).dependencies ?? {};
 					const installed = Object.keys(after).filter((name) => before[name] !== after[name]);
-					if (installed.length === 0) installed.push(...Object.keys(after).filter((name) => spec === name || spec.startsWith(`${name}@`)));
+					if (installed.length === 0) {
+						const local = specPackageName(spec, after, this.profile.dir);
+						if (local !== void 0 && Object.hasOwn(after, local)) installed.push(local);
+					}
 					const target = installed[0];
 					if (installed.length !== 1 || target === void 0) throw new ManagementFailure("ambiguous-install");
 					name = target;
@@ -1825,6 +2075,7 @@ let PluginManager = (() => {
 					if (compatibility !== void 0 && !compatibility.exempted) throw new ManagementFailure("incompatible-version", [incompatiblePlugin(compatibility)]);
 					for (const file of bundlePatchPaths(dir, manifest.dsh.bundle)) loadOverlayPatches("dsh", file);
 					version = manifest.version;
+					this.installedFrom.set(name, used);
 				} catch (error) {
 					await this.restoreFiles(files);
 					throw error;
@@ -1837,9 +2088,9 @@ let PluginManager = (() => {
 				result.stage = "enable";
 				return this.configure(async () => {
 					if (options?.enabled !== false) await this.selectBundle(name, true);
-					if (Object.hasOwn(before, name)) return "restart-required";
-					await this.refreshPackages();
-					if (options?.enabled !== false) result.warnings = await this.reload();
+					if (Object.hasOwn(before, name) && this.ownerContext.get("hmr") === void 0) return;
+					const selected = bundleSelection(readProfileManifest("dsh", this.profile.dir)).includes(name);
+					Object.assign(result, await this.publishAndReload(selected ? this.bundleRows(name).map((row) => row.id) : []));
 				});
 			}, {
 				stage: "install",
@@ -1891,14 +2142,20 @@ let PluginManager = (() => {
 					const contributions = bundle.error === void 0 ? this.bundleRows(name) : [];
 					if (bundle.enabled) {
 						await this.selectBundle(name, false);
-						result.warnings = await this.reload();
+						Object.assign(result, await this.reload());
 					}
 					if ([...this.ctx.loader.entries()].some((entry) => entry.fiber?.uid != null && contributions.some((row) => row.id === entry.options.id && row.name === entry.options.name))) throw new ManagementFailure("bundle-in-use");
 					return bundle.installed;
 				})) return;
-				result.packageResult = await this.runPnpm(["remove", name]);
+				const registry = this.installedFrom.has(name) ? this.installedFrom.get(name) : this.configuredRegistries.registry;
+				result.packageResult = await this.runPnpm([
+					"remove",
+					name,
+					...typeof registry === "string" ? [`--config.registry=${registry}`] : []
+				]);
 				if (result.packageResult.exitCode !== 0 || result.packageResult.timedOut === true) throw new Error(result.packageResult.output);
-				await this.configure(() => this.refreshPackages());
+				this.installedFrom.delete(name);
+				Object.assign(result, await this.configure(() => this.publishAndReload()));
 			}, {
 				stage: "remove",
 				target: name
@@ -1924,7 +2181,7 @@ let PluginManager = (() => {
 			const rows = [];
 			const packages = this.ctx.get("pluginPackages");
 			for (const row of flatten(composeEntries([patches.filter((item) => item.insert !== void 0)]))) {
-				if (typeof row.id !== "string" || typeof row.name !== "string") continue;
+				if (typeof row.id !== "string" || typeof row.name !== "string" || row.group === true) continue;
 				const active = live.get(row.id);
 				const entryId = active?.entryId;
 				const base = active?.baseUrl ?? pathToFileURL(join(dir, "package.json")).href;
@@ -2021,7 +2278,7 @@ let PluginManager = (() => {
 		}
 		async selectBundle(name, enabled) {
 			const manifest = readProfileManifest("dsh", this.profile.dir);
-			const previous = manifest.dsh?.profile?.bundles ?? [];
+			const previous = bundleSelection(manifest);
 			if (enabled || !previous.includes(name)) {
 				const metadata = bundleManifest(name, this.profile.dir, this.profile.installAnchor);
 				if (metadata === void 0) throw new ManagementFailure("not-bundle");
@@ -2071,16 +2328,46 @@ let PluginManager = (() => {
 			};
 			return hmr === void 0 ? apply() : hmr.runExclusive(apply);
 		}
+		/**
+		* Publish the profile's runtime resolution without HMR, unless a deselected startup bundle still runs and needs the
+		* current table. A publication that needs a restart waits for the restart the result already reports.
+		*/
 		async refreshPackages() {
-			if (this.ownerContext.get("hmr") === void 0) {
-				const selected = readProfileManifest("dsh", this.profile.dir).dsh?.profile?.bundles ?? [];
-				if (this.profile.startedBundles.some((name) => !selected.includes(name))) return;
+			const selected = bundleSelection(readProfileManifest("dsh", this.profile.dir));
+			if (this.profile.startedBundles.some((name) => !selected.includes(name))) return;
+			try {
+				const packages = this.ownerContext.get("pluginPackages");
+				if (packages?.resolution !== void 0) await packages.refresh();
+			} catch (error) {
+				if (!(error instanceof ResolutionRestartRequired)) throw error;
 			}
-			await this.ownerContext.get("pluginPackages")?.refresh();
 		}
+		/**
+		* Apply a package change: without HMR, publish the runtime resolution when that is safe, then {@link reload}.
+		* @param requiredIds Entry ids that must start.
+		* @returns The reload's outcome.
+		*/
+		async publishAndReload(requiredIds = []) {
+			if (this.ownerContext.get("hmr") === void 0) await this.refreshPackages();
+			return this.reload(requiredIds);
+		}
+		/**
+		* Apply the saved profile; with HMR it recomposes live, including the runtime resolution.
+		* @param requiredIds Entry ids that must start.
+		* @returns Warnings about entries that were already inactive, and why the change waits for a restart, if it does.
+		*/
 		async reload(requiredIds = []) {
-			if (this.ownerContext.get("hmr") === void 0) return [];
-			return reconcileProfilePatches(this.ownerContext.root, readProfilePatches("dsh", this.profile), "dsh", requiredIds);
+			const hmr = this.ownerContext.get("hmr");
+			if (hmr === void 0) {
+				composeEntries([readProfilePatches("dsh", this.profile)]);
+				return { warnings: [] };
+			}
+			const { warnings, pending, restartReason } = await hmr.reconcileProfile(requiredIds);
+			const restart = restartReason ?? pending[0]?.reason;
+			return restart === void 0 ? { warnings } : {
+				warnings,
+				restartReason: restart
+			};
 		}
 		async change(operation, request, reason) {
 			return withFileLock(join(this.profile.dir, "package.json"), async () => {
@@ -2089,10 +2376,15 @@ let PluginManager = (() => {
 				const result = {
 					...request,
 					changed: false,
-					application: this.ownerContext.get("hmr") !== void 0 ? "applied" : "restart-required"
+					...this.ownerContext.get("hmr") !== void 0 ? { application: "applied" } : {
+						application: "restart-required",
+						restartReason: "no-hmr"
+					}
 				};
 				try {
-					result.application = await operation(result) ?? result.application;
+					const outcome = await operation(result);
+					if (outcome !== void 0) result.application = outcome;
+					else if (result.application === "applied" && result.restartReason !== void 0) result.application = "restart-required";
 				} catch (error) {
 					if (error instanceof InstallCancelledError) result.application = "cancelled";
 					else {
@@ -2100,6 +2392,7 @@ let PluginManager = (() => {
 						result.error = managementError(error);
 					}
 				}
+				if (result.application !== "restart-required") delete result.restartReason;
 				result.changed = before !== this.diskState();
 				this.ownerContext.emit("plugin-manager/changed", { reason });
 				return result;