@sparkelf/dsh-plus 0.2.2-alpha.2.29 → 0.2.2-alpha.2.30

package/lib/apply.js

@@ -1,2 +1,2 @@
-import { n as parseOfficialWorkspacePackages, r as runApply, t as materializeOfficialPackageScope } from "./apply-08huHfLG.js";
+import { n as parseOfficialWorkspacePackages, r as runApply, t as materializeOfficialPackageScope } from "./apply-e0aMC4B4.js";
 export { materializeOfficialPackageScope, parseOfficialWorkspacePackages, runApply };

package/lib/bin.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { i as readPatchSet, r as runApply } from "./apply-08huHfLG.js";
+import { r as runApply } from "./apply-e0aMC4B4.js";
 import { createRequire } from "node:module";
 import { execFileSync, spawn, spawnSync } from "node:child_process";
 import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
-import { dirname, join, posix, resolve, win32 } from "node:path";
+import { dirname, isAbsolute, join, posix, relative, resolve, win32 } from "node:path";
 import { homedir } from "node:os";
-import semver from "semver";
+import semver, { validRange } from "semver";
 import { parseDocument } from "yaml";
 import { fileURLToPath } from "node:url";
 import { createServer } from "node:net";
@@ -790,6 +790,125 @@ async function waitForAuthenticatedUrl(logPath, timeoutMilliseconds) {
 	}
 }
 //#endregion
+//#region lib/types/patch-set.js
+/**
+* Read the Plus distribution's embedded patch set.
+*
+* The distribution owns one patch set for official DSH and, separately, the patches it
+* carries for third-party packages. Both live inside the distribution package: the
+* manifest declares entries, and each entry's payload is a file under `patches/`. A
+* consumer resolves no independently published patch package.
+*
+* The two lists are governed differently. A Plus entry must target an official package
+* that the profile republishes and overrides; a third-party entry must name its upstream
+* and a retirement condition, and never becomes part of the official patch set.
+*/
+function object(value, label) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) throw new Error(label + " must be an object");
+	return value;
+}
+function string(value, label) {
+	if (typeof value !== "string" || value === "") throw new Error(label + " must be a non-empty string");
+	return value;
+}
+function range(value, label) {
+	const text = string(value, label);
+	if (validRange(text) === null) throw new Error(label + " is not a semantic-version range: " + text);
+	return text;
+}
+/** A payload stays inside the distribution package it is declared by. */
+function patchFile(distributionDirectory, declared, label) {
+	const absolute = resolve(distributionDirectory, declared);
+	const local = relative(distributionDirectory, absolute);
+	if (local === "" || isAbsolute(local) || local === ".." || local.startsWith("../")) throw new Error(label + " must stay inside the distribution package: " + declared);
+	if (!existsSync(absolute)) throw new Error(label + " does not exist: " + absolute);
+	return local.replaceAll("\\", "/");
+}
+function sourceTarget(value, sourceBaseRevision, label) {
+	const target = object(value, label);
+	if (target.kind !== "dsh-source") throw new Error(label + ".kind must be dsh-source");
+	if (!Array.isArray(target.paths) || target.paths.length === 0) throw new Error(label + ".paths must be a non-empty array");
+	const paths = target.paths.map((entry, index) => {
+		const path = string(entry, label + ".paths[" + String(index) + "]");
+		if (!path.endsWith("/")) throw new Error(label + ".paths entries must be repository directory prefixes");
+		return path;
+	});
+	if (!Array.isArray(target.packages) || target.packages.length === 0) throw new Error(label + ".packages must be a non-empty array");
+	return {
+		kind: "dsh-source",
+		baseRevision: sourceBaseRevision,
+		packages: target.packages.map((entry, index) => {
+			const name = string(entry, label + ".packages[" + String(index) + "]");
+			if (!name.startsWith("@deepseek-ai/")) throw new Error(label + ".packages entries must be official package names");
+			return name;
+		}),
+		paths
+	};
+}
+function npmTarget(value, label) {
+	const target = object(value, label);
+	if (target.kind !== "npm") throw new Error(label + ".kind must be npm");
+	return {
+		kind: "npm",
+		name: string(target.name, label + ".name"),
+		range: range(target.range, label + ".range")
+	};
+}
+function entry(value, scope, sourceBaseRevision, distributionDirectory, label) {
+	const record = object(value, label);
+	const id = string(record.id, label + ".id");
+	const dsh = range(record.dsh, label + ".dsh");
+	const file = patchFile(distributionDirectory, string(record.file, label + ".file"), label + ".file");
+	const retireWhen = string(record.retireWhen, label + ".retireWhen");
+	const targetLabel = label + ".target";
+	const target = scope === "plus" ? object(record.target, targetLabel).kind === "dsh-source" ? sourceTarget(record.target, sourceBaseRevision, targetLabel) : npmTarget(record.target, targetLabel) : npmTarget(record.target, targetLabel);
+	if (scope === "third-party") return {
+		id,
+		scope,
+		dsh,
+		file,
+		retireWhen,
+		upstreamUrl: string(record.upstreamUrl, label + ".upstreamUrl"),
+		target
+	};
+	return {
+		id,
+		scope,
+		dsh,
+		file,
+		retireWhen,
+		target
+	};
+}
+/**
+* Read and validate the embedded patch set from an installed distribution.
+* @param distributionDirectory - installed `@sparkelf/dsh-plus` directory.
+* @param manifest - its parsed package manifest.
+* @returns the ordered Plus entries, third-party entries, and the exact source base.
+*/
+function readPatchSet(distributionDirectory, manifest) {
+	const plus = object(manifest.dshPlus, "dshPlus");
+	const sourceBaseRevision = string(object(plus.sourceBase, "dshPlus.sourceBase").revision, "dshPlus.sourceBase.revision");
+	const declaration = object(plus.patchSet, "dshPlus.patchSet");
+	if (declaration.formatVersion !== 1) throw new Error("dshPlus.patchSet.formatVersion must be 1");
+	if (!Array.isArray(declaration.entries) || declaration.entries.length === 0) throw new Error("dshPlus.patchSet.entries must be a non-empty array");
+	const entries = declaration.entries.map((value, index) => entry(value, "plus", sourceBaseRevision, distributionDirectory, "dshPlus.patchSet.entries[" + String(index) + "]"));
+	const thirdPartyRaw = plus.thirdPartyPatches;
+	const thirdParty = thirdPartyRaw === void 0 ? [] : Array.isArray(thirdPartyRaw) ? thirdPartyRaw.map((value, index) => entry(value, "third-party", sourceBaseRevision, distributionDirectory, "dshPlus.thirdPartyPatches[" + String(index) + "]")) : (() => {
+		throw new Error("dshPlus.thirdPartyPatches must be an array");
+	})();
+	const ids = /* @__PURE__ */ new Set();
+	for (const item of [...entries, ...thirdParty]) {
+		if (ids.has(item.id)) throw new Error("duplicate patch entry id: " + item.id);
+		ids.add(item.id);
+	}
+	return {
+		entries,
+		thirdPartyPatches: thirdParty,
+		sourceBaseRevision
+	};
+}
+//#endregion
 //#region lib/types/standalone-profile.js
 /**
 * Runtime paths and profile composition for a standalone Plus installation.
@@ -858,11 +977,6 @@ function requireStringArray(value, label) {
 	if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) throw new Error(label + " must be a string array");
 	return value;
 }
-/** Read one non-empty string field. */
-function requireString(value, label) {
-	if (typeof value !== "string" || value.trim() === "") throw new Error(label + " must be a non-empty string");
-	return value;
-}
 /** Resolve the DSH home, honouring the environment override the launcher itself reads. */
 function resolveHome(env = process.env) {
 	const configured = env.DSH_HOME;
@@ -900,12 +1014,11 @@ function isWithin(candidate, parent, platform = process.platform) {
 * @returns absolute path to the installed distribution.
 */
 function resolveDistributionDirectory(anchor) {
-	const ownDirectory = dirname(dirname(fileURLToPath(import.meta.url)));
 	let resolved;
 	try {
 		resolved = dirname(createRequire(anchor).resolve("@sparkelf/dsh-plus/package.json"));
 	} catch {
-		return ownDirectory;
+		throw new Error("@sparkelf/dsh-plus is not installed in " + dirname(anchor) + "; run this command from the directory that installed it");
 	}
 	let current = resolve(dirname(anchor));
 	for (;;) {
@@ -914,14 +1027,20 @@ function resolveDistributionDirectory(anchor) {
 		if (parent === current) break;
 		current = parent;
 	}
-	return ownDirectory;
+	throw new Error("@sparkelf/dsh-plus resolved outside " + resolve(dirname(anchor)) + " (found " + resolved + "); run this command from the directory that installed it");
 }
+/** The reviewed bundle order and pins the installed distribution declares. */
 function readDistributionProfile(distributionDirectory) {
 	const manifest = requireRecord(JSON.parse(readFileSync(join(distributionDirectory, "package.json"), "utf8")), "Plus distribution manifest");
 	const plus = requireRecord(manifest.dshPlus, "dshPlus");
 	const profile = requireRecord(plus.profile, "dshPlus.profile");
-	const dependencies = requireDependencyMap(requireRecord(profile.dependencies, "dshPlus.profile.dependencies"), "dshPlus.profile.dependencies");
+	const rawDependencies = requireRecord(profile.dependencies, "dshPlus.profile.dependencies");
 	const rawAllowBuilds = requireRecord(profile.allowBuilds, "dshPlus.profile.allowBuilds");
+	const dependencies = {};
+	for (const [name, spec] of Object.entries(rawDependencies)) {
+		if (typeof spec !== "string" || spec === "") throw new Error("dshPlus.profile.dependencies." + name + " must be a non-empty string");
+		dependencies[name] = spec;
+	}
 	const allowBuilds = {};
 	for (const [name, allowed] of Object.entries(rawAllowBuilds)) {
 		if (typeof allowed !== "boolean") throw new Error("dshPlus.profile.allowBuilds." + name + " must be a boolean");
@@ -933,16 +1052,6 @@ function readDistributionProfile(distributionDirectory) {
 		if (typeof spec !== "string" || spec === "") throw new Error("dshPlus.profile.overrides." + name + " must be a non-empty string");
 		overrides[name] = spec;
 	}
-	const editions = {};
-	const rawEditions = plus.editions === void 0 ? {} : requireRecord(plus.editions, "dshPlus.editions");
-	for (const [id, value] of Object.entries(rawEditions)) {
-		const edition = requireRecord(value, "dshPlus.editions." + id);
-		editions[id] = {
-			label: requireString(edition.label, "dshPlus.editions." + id + ".label"),
-			bundles: requireStringArray(edition.bundles, "dshPlus.editions." + id + ".bundles"),
-			packages: requireDependencyMap(requireRecord(edition.packages, "dshPlus.editions." + id + ".packages"), "dshPlus.editions." + id + ".packages")
-		};
-	}
 	const compatibility = requireRecord(plus.compatibility, "dshPlus.compatibility");
 	return {
 		name: String(manifest.name),
@@ -950,20 +1059,10 @@ function readDistributionProfile(distributionDirectory) {
 		dependencies,
 		allowBuilds,
 		overrides,
-		editions,
 		dshRange: String(compatibility.dsh),
 		version: String(manifest.version)
 	};
 }
-/** Read one package-name-to-spec map, rejecting empty entries. */
-function requireDependencyMap(value, label) {
-	const dependencies = {};
-	for (const [name, spec] of Object.entries(value)) {
-		if (typeof spec !== "string" || spec === "") throw new Error(label + "." + name + " must be a non-empty string");
-		dependencies[name] = spec;
-	}
-	return dependencies;
-}
 /**
 * Give the profile its own installed tree, built from the distribution's declarations.
 *
@@ -983,11 +1082,7 @@ function requireDependencyMap(value, label) {
 * @param consumerDirectory - directory whose `node_modules` holds the installation.
 */
 function installProfilePackages(paths, consumerDirectory) {
-	if (!existsSync(join(consumerDirectory, "node_modules"))) {
-		installWithRegistryFallback(paths);
-		alignReplacedPackageNames(join(paths.profileDirectory, "node_modules"));
-		return;
-	}
+	if (!existsSync(join(consumerDirectory, "node_modules"))) throw new Error("no node_modules in " + consumerDirectory + "; run npm install there first");
 	const profileModules = join(paths.profileDirectory, "node_modules");
 	if (existsSync(profileModules)) {
 		linkNestedBundles(paths, profileModules);
@@ -1009,7 +1104,6 @@ function installProfilePackages(paths, consumerDirectory) {
 function installWithRegistryFallback(paths) {
 	const registries = registryOrder();
 	for (const [index, registry] of registries.entries()) {
-		if (index > 0) rmSync(join(paths.profileDirectory, "pnpm-lock.yaml"), { force: true });
 		const result = spawnSync("pnpm", [
 			"install",
 			"--no-frozen-lockfile",
@@ -1018,8 +1112,7 @@ function installWithRegistryFallback(paths) {
 		], {
 			cwd: paths.profileDirectory,
 			stdio: "inherit",
-			shell: process.platform === "win32",
-			timeout: 5 * 6e4
+			shell: process.platform === "win32"
 		});
 		if (result.error !== void 0) throw result.error;
 		if (result.status === 0) return;
@@ -1078,7 +1171,7 @@ const MAINLAND_REGISTRY = "https://registry.npmmirror.com";
 */
 function registryOrder() {
 	const configured = process.env.DSH_PLUS_INSTALL_REGISTRY;
-	if (configured !== void 0 && configured !== "") return [configured, configured === MAINLAND_REGISTRY ? OFFICIAL_REGISTRY : MAINLAND_REGISTRY];
+	if (configured !== void 0 && configured !== "") return [configured, MAINLAND_REGISTRY];
 	const locale = [
 		process.env.LANG,
 		process.env.LC_ALL,
@@ -1179,85 +1272,12 @@ function resolvePaths(anchor, env = process.env) {
 *
 * @param paths - resolved standalone paths.
 * @param consumerDirectory - directory whose `node_modules` holds the installed packages.
-* @param edition - edition id whose package list to install, or undefined for the default.
 * @returns whether this call created the manifest.
 */
-function ensureProfile(paths, consumerDirectory, edition) {
+function ensureProfile(paths, consumerDirectory) {
 	const manifestPath = join(paths.profileDirectory, "package.json");
 	const distribution = readDistributionProfile(paths.distributionDirectory);
-	const composition = edition === void 0 ? void 0 : distribution.editions[edition];
-	if (edition !== void 0 && composition === void 0) {
-		const offered = Object.keys(distribution.editions);
-		throw new Error("unknown edition \"" + edition + "\"; this release offers " + (offered.length === 0 ? "(none)" : offered.join(", ")));
-	}
-	for (const name of Object.keys(composition?.packages ?? {})) if (name.startsWith("@deepseek-ai/")) throw new Error("edition \"" + String(edition) + "\" lists the official package " + name + "; editions contain only third-party or self-developed plugins");
-	const runtime = distribution.dshRange.replace(/^>=?/u, "");
-	const baseBundles = composition === void 0 ? distribution.bundles : distribution.bundles.filter((bundle) => bundle.startsWith("@deepseek-ai/") || bundle === "@sparkelf/dsh-plus");
-	const basePackages = composition === void 0 ? distribution.dependencies : {
-		"@deepseek-ai/dsh": distribution.dshRange,
-		"@sparkelf/dsh-plus": distribution.version,
-		"@deepseek-ai/cordis": "^4.0.6-alpha.1",
-		"@deepseek-ai/cordis-plugin-group": "^1.0.6-alpha.1",
-		"@deepseek-ai/cordis-plugin-include": "^1.0.11-alpha.1",
-		"@deepseek-ai/cordis-plugin-loader": "^1.0.7-alpha.1",
-		"@deepseek-ai/dsh-home-paths": runtime,
-		"@deepseek-ai/dsh-launch-environment": runtime,
-		"@deepseek-ai/dsh-agent": runtime,
-		"@deepseek-ai/dsh-llm": runtime,
-		"@deepseek-ai/dsh-scope": runtime,
-		"@deepseek-ai/dsh-session": runtime,
-		"@deepseek-ai/dsh-system-prompt": runtime,
-		"@deepseek-ai/dsh-user-approval": runtime,
-		"@deepseek-ai/dsh-attachment": runtime,
-		"@deepseek-ai/dsh-compaction": runtime,
-		"@deepseek-ai/dsh-fs": runtime,
-		"@deepseek-ai/dsh-shell": runtime,
-		"@deepseek-ai/dsh-spill": runtime,
-		"@deepseek-ai/dsh-sandbox": runtime,
-		"@deepseek-ai/dsh-ptc-runtime": runtime,
-		"@deepseek-ai/dsh-llm-deepseek": runtime,
-		"@deepseek-ai/dsh-deepseek-account": runtime,
-		"@deepseek-ai/dsh-anonymous-user-id": runtime,
-		"@deepseek-ai/dsh-bash-local": runtime,
-		"@deepseek-ai/dsh-client-store": runtime,
-		"@deepseek-ai/dsh-jobs": runtime,
-		"@deepseek-ai/dsh-sdk-protocol": runtime,
-		"@deepseek-ai/dsh-session-persistence": runtime,
-		"@deepseek-ai/dsh-session-telemetry": runtime,
-		"@deepseek-ai/dsh-session-title-llm": runtime,
-		"@deepseek-ai/dsh-util-workspace-path": runtime,
-		"@deepseek-ai/dsh-workflow": runtime,
-		...Object.fromEntries(baseBundles.filter((bundle) => bundle.startsWith("@deepseek-ai/dsh-")).map((bundle) => [bundle, runtime]))
-	};
-	const compositionPackages = composition === void 0 ? basePackages : {
-		...basePackages,
-		...composition.packages
-	};
-	for (const [alias, target] of Object.entries({
-		"dsh-better-sidebar": "@sparkelf/dsh-better-sidebar",
-		"dsh-sql-workbench": "@sparkelf/dsh-sql-workbench"
-	})) {
-		const spec = compositionPackages[target];
-		if (spec !== void 0 && compositionPackages[alias] === void 0) compositionPackages[alias] = "npm:" + target + "@" + spec;
-	}
-	const compositionBundles = composition === void 0 ? baseBundles : [...baseBundles, ...composition.bundles];
 	if (existsSync(manifestPath)) {
-		if (composition !== void 0) {
-			const manifest = requireRecord(JSON.parse(readFileSync(manifestPath, "utf8")), "Plus profile manifest");
-			manifest.dependencies = {
-				...manifest.dependencies,
-				...compositionPackages
-			};
-			manifest.dsh = {
-				...manifest.dsh,
-				profile: {
-					...manifest.dsh?.profile,
-					bundles: [...compositionBundles],
-					...edition === void 0 ? {} : { plusEdition: edition }
-				}
-			};
-			writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n");
-		}
 		writeProfileOverrides(paths.profileDirectory, distribution.overrides, distribution.allowBuilds, paths.omittedPackages);
 		installProfilePackages(paths, consumerDirectory);
 		return false;
@@ -1267,11 +1287,14 @@ function ensureProfile(paths, consumerDirectory, edition) {
 		name: "dsh-profile-plus",
 		private: true,
 		type: "module",
-		dependencies: compositionPackages,
+		dependencies: {
+			"@sparkelf/dsh-plus": distribution.version,
+			"@deepseek-ai/dsh": distribution.dshRange,
+			...distribution.dependencies
+		},
 		dsh: { profile: {
-			bundles: [...compositionBundles],
-			patchReload: "live",
-			...edition === void 0 ? {} : { plusEdition: edition }
+			bundles: distribution.bundles,
+			patchReload: "live"
 		} }
 	};
 	writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n");
@@ -1299,7 +1322,7 @@ function writeProfileOverrides(profileDirectory, overrides, allowBuilds, omitted
 	for (const [name, spec] of Object.entries(omittedPackages)) document.setIn(["overrides", name], spec);
 	for (const [name, allowed] of Object.entries(allowBuilds)) document.setIn(["allowBuilds", name], allowed);
 	if (document.get("nodeLinker") === void 0) document.set("nodeLinker", "hoisted");
-	if (document.get("autoInstallPeers") === void 0) document.set("autoInstallPeers", true);
+	if (document.get("autoInstallPeers") === void 0) document.set("autoInstallPeers", false);
 	writeFileSync(workspacePath, String(document));
 }
 /** Run git in one directory, returning undefined instead of throwing when asked to. */
@@ -1355,18 +1378,7 @@ function resolveInstalledPackage(from, packageName) {
 	try {
 		manifestPath = requireFrom.resolve(packageName + "/package.json");
 	} catch {
-		let directory;
-		try {
-			directory = dirname(requireFrom.resolve(packageName));
-		} catch {
-			throw new Error(packageName + " is not installed under " + from);
-		}
-		while (!existsSync(resolve(directory, "package.json"))) {
-			const parent = dirname(directory);
-			if (parent === directory) throw new Error(packageName + " has no resolvable package manifest under " + from);
-			directory = parent;
-		}
-		manifestPath = resolve(directory, "package.json");
+		throw new Error(packageName + " is not installed under " + from);
 	}
 	const manifest = requireRecord(JSON.parse(readFileSync(manifestPath, "utf8")), packageName + " manifest");
 	return {
@@ -1396,7 +1408,6 @@ function parseStartOptions(argv) {
 	let host = "127.0.0.1";
 	let open = true;
 	let foreground = false;
-	let edition;
 	let capabilities;
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
@@ -1422,13 +1433,6 @@ function parseStartOptions(argv) {
 			foreground = true;
 			continue;
 		}
-		if (token === "--edition") {
-			const value = argv[index + 1];
-			if (value === void 0 || value === "") throw new Error("--edition requires a value");
-			edition = value;
-			index += 1;
-			continue;
-		}
 		if (token === "--capabilities") {
 			const value = argv[index + 1];
 			if (value === void 0) throw new Error("--capabilities requires a comma-separated list, or an empty string for none");
@@ -1446,7 +1450,6 @@ function parseStartOptions(argv) {
 		host,
 		open,
 		foreground,
-		edition,
 		capabilities
 	};
 }
@@ -1532,56 +1535,6 @@ function runForeground(entry, profileName, port, host, open) {
 	if (!open) args.push("--no-open");
 	return spawnSync(process.execPath, args, { stdio: "inherit" }).status ?? 1;
 }
-/** Parse the install command's edition selection. */
-function parseInstallOptions(argv) {
-	let edition;
-	let profile;
-	for (let index = 0; index < argv.length; index += 1) {
-		const token = argv[index];
-		if (token === "--edition") {
-			const value = argv[index + 1];
-			if (value === void 0 || value === "") throw new Error("--edition requires a value");
-			edition = value;
-			index += 1;
-			continue;
-		}
-		if (token === "--profile") {
-			const value = argv[index + 1];
-			if (value === void 0 || value === "") throw new Error("--profile requires a value");
-			profile = value;
-			index += 1;
-			continue;
-		}
-		throw new Error("unknown option: " + String(token));
-	}
-	if (edition === void 0) throw new Error("install requires --edition personal or --edition team");
-	return {
-		edition,
-		profile
-	};
-}
-/**
-* Install one edition's package manifest into the profile.
-*
-* The profile's `package.json` is the install artifact; there is no separate standalone
-* package. A later `start` uses the same manifest, so changing the edition is a new
-* install rather than a second product.
-*
-* @param argv - arguments after `install`.
-* @returns the process exit code.
-*/
-function install(argv) {
-	const { edition, profile } = parseInstallOptions(argv);
-	const base = resolvePaths(declarationAnchor());
-	const paths = profile === void 0 ? base : {
-		...base,
-		profileName: profile,
-		profileDirectory: join(base.home, "profiles", profile)
-	};
-	ensureProfile(paths, installationRoot(), edition);
-	console.log("Installed the " + edition + " edition into " + paths.profileDirectory);
-	return 0;
-}
 async function start(argv) {
 	const options = parseStartOptions(argv);
 	const anchor = installationAnchor();
@@ -1615,9 +1568,8 @@ async function start(argv) {
 		}
 		console.log("pnpm installed.");
 	}
-	const created = ensureProfile(paths, installationRoot(), options.edition);
+	const created = ensureProfile(paths, installationRoot());
 	console.log(created ? "Created the " + paths.profileName + " profile at " + paths.profileDirectory : "Using the existing " + paths.profileName + " profile");
-	if (options.edition !== void 0) console.log("Edition: " + options.edition);
 	for (const label of applyProfileNpmPatches(paths.distributionDirectory, paths.profileDirectory)) console.log("Applied the reviewed patch " + label);
 	const answers = created || !existsSync(join(paths.home, "capabilities.json")) ? options.capabilities === void 0 ? await interviewCapabilities(true) : selectCapabilities(options.capabilities) : void 0;
 	if (answers !== void 0) {
@@ -1960,23 +1912,6 @@ async function doctor() {
 	const record = readCapabilityRecord(paths.home);
 	const drifted = record === void 0 ? [] : CAPABILITIES.filter((capability) => record.enabled.includes(capability.id) !== actual.mounted.includes(capability.id));
 	check(drifted.length === 0, drifted.length === 0 ? "capabilities: " + (actual.mounted.length === 0 ? "(none enabled)" : actual.mounted.join(", ")) : "capabilities disagree with capabilities.json: " + drifted.map((capability) => capability.id).join(", ") + " (run dsh-plus capabilities)");
-	const profileManifestPath = join(paths.profileDirectory, "package.json");
-	if (existsSync(profileManifestPath)) {
-		const profileManifest = JSON.parse(readFileSync(profileManifestPath, "utf8"));
-		const editionId = profileManifest.dsh?.profile?.plusEdition;
-		if (editionId !== void 0) {
-			const edition = readDistributionProfile(paths.distributionDirectory).editions[editionId];
-			if (edition === void 0) check(false, "edition \"" + editionId + "\" is not declared by this distribution");
-			else {
-				const bundles = new Set(profileManifest.dsh?.profile?.bundles ?? []);
-				const missingBundles = edition.bundles.filter((bundle) => !bundles.has(bundle));
-				const packageNames = Object.keys(edition.packages);
-				const missingPackages = packageNames.filter((name) => !existsSync(join(paths.profileDirectory, "node_modules", ...name.split("/"), "package.json")));
-				check(missingBundles.length === 0, "edition " + editionId + ": " + String(edition.bundles.length - missingBundles.length) + "/" + String(edition.bundles.length) + " bundles mounted" + (missingBundles.length === 0 ? "" : " (missing " + missingBundles.join(", ") + ")"));
-				check(missingPackages.length === 0, "edition " + editionId + ": " + String(packageNames.length - missingPackages.length) + "/" + String(packageNames.length) + " packages installed" + (missingPackages.length === 0 ? "" : " (missing " + missingPackages.join(", ") + ")"));
-			}
-		}
-	}
 	console.log(failures === 0 ? "No problems found." : String(failures) + " problem(s) found.");
 	return failures === 0 ? 0 : 1;
 }
@@ -1984,7 +1919,6 @@ const USAGE = [
 	"Usage: dsh-plus <command> [options]",
 	"",
 	"Commands:",
-	"  install       install an edition package manifest into the profile",
 	"  start         start the server (first run creates the profile)",
 	"  stop          stop the server",
 	"  status        report whether the server is running",
@@ -1997,11 +1931,6 @@ const USAGE = [
 	"  --host <h>     interface to bind (default 127.0.0.1)",
 	"  --no-open      do not open a browser",
 	"  --foreground   run in this terminal instead of in the background",
-	"  --edition <id> install the named edition manifest (personal or team)",
-	"",
-	"install options:",
-	"  --edition <id>  package manifest to install (personal or team)",
-	"  --profile <n>   profile name to install into (default: this installation)",
 	"",
 	"capabilities options:",
 	"  --enable <ids>   enable the comma-separated capability ids",
@@ -2024,7 +1953,6 @@ async function runStandaloneCli(argv) {
 		console.log(USAGE);
 		return 0;
 	}
-	if (command === "install") return install(rest);
 	if (command === "start") return await start(rest);
 	if (command === "stop") return stop();
 	if (command === "status") return status();

package/lib/types/apply.d.ts

@@ -1,4 +1,4 @@
-/** Materialize the Plus distribution's embedded patch set without Desktop. */
+/** Materialize the Plus distribution's independent patch packages without Desktop. */
 /** One official workspace package available as a profile peer dependency. */
 export interface OfficialWorkspacePackage {
     name: string;