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

package/README.md

@@ -9,7 +9,7 @@ English | [中文](README.zh.md)
 
 ## Summary
 
-This distribution composes official `@deepseek-ai/dsh-base` and `@deepseek-ai/dsh-web-app` with selected Office, MinerU, mobile, market, GenUI, and Supervisor packages, four in-repository Plus capability packages, and one embedded patch set over official DSH. It owns ordered composition, minimum compatibility metadata, dependency closure, explicit materialization, and the credential-free deployment lock; the patch set carries every accepted official delta, while capability behavior stays in its owning plugin.
+This distribution composes official `@deepseek-ai/dsh-base` and `@deepseek-ai/dsh-web-app` with selected Office, MinerU, mobile, market, GenUI, and Supervisor packages, four in-repository Plus capability packages, and twelve independent patch packages. It owns only ordered composition, minimum compatibility metadata, dependency closure, explicit materialization, and the credential-free deployment lock; capability behavior and patch payloads stay in their owning packages.
 
 ## Table of Contents
 
@@ -23,17 +23,15 @@ This distribution composes official `@deepseek-ai/dsh-base` and `@deepseek-ai/ds
 <a id="use-this-package"></a>
 ## Use this package
 
-Install one edition into a profile:
+Install and materialize Plus without Desktop or the tray:
 
 ```bash
-npm install -g @sparkelf/dsh-plus
-dsh-plus install --edition personal   # or --edition team
+dsh plugin --profile plus add @sparkelf/dsh-plus
+dsh plugin --profile plus exec dsh-plus apply --dsh-root /path/to/official-dsh
 dsh --profile plus
 ```
 
-The CLI writes the profile's `package.json` from `dshPlus.editions`; there is no separate standalone package. The personal and team editions are different package manifests over the same patch set: personal carries the individual workflow, and team adds the shared plugins and defaults a team deployment needs. The DataOps container installs the team edition.
-
-For a source checkout, the explicit apply step requires the exact official revision declared by `dshPlus.sourceBase.revision`, applies the embedded `dshPlus.patchSet` to that checkout, configures the npm patches the set declares, and writes `.dsh-plus/patchset.lock.json` with mode `0600`. Patched official source workspaces always replace clean CLI packages in the profile scope. The profile resolves its pinned third-party and Plus capability packages from npm. Version conflicts, source mismatches, missing bundles, and runtime closure drift stop promotion.
+The explicit rc24 apply step requires official revision `fb2c4b9e698e30edb738bca4cf0618587db7d203`, applies every pending source payload, configures exact npm patches, removes retired Plus-owned entries, and writes `.dsh-plus/patchset.lock.json` with mode `0600`. Patched official source workspaces always replace clean CLI packages in the profile scope. The profile resolves SQL Workbench 0.5.0, Workbench Vault 0.1.1, SSH Manager 0.7.0, API Client 0.5.0, Supervisor 0.1.4, GenUI 0.9.9, dshmarket 1.45.1, OfficeCLI 0.1.1, MinerU 0.1.1, and Mobile Bridge 0.2.11 from npm. Version conflicts, source mismatches, missing bundles, and runtime closure drift stop promotion.
 
 Official DSH supplies Sidebar navigation, file and text preview, Session search, generic file upload, durable attachment cards, read-only model paths, onboarding, Workspace selection, Session export, and Turn folding. Plus configures the official SQLite Session query provider to open on first search with a durable derived index at `$DSH_HOME/storages/session-query.sqlite`; canonical compressed JSONL remains the history source. Plus adds an OfficeCLI tool for original DOCX/XLSX/PPTX production and a MinerU PDF tool that consumes the official uploaded-file path without a prompt hook. It replaces mixed English `Session` wording in the Simplified-Chinese export UI, places the desktop Session-log action immediately before Trajectory search while retaining its Header position on phones, and keeps composer permission and model popovers inside the center column with 12px horizontal clearance. `@changfenhuang/dsh-genui@0.9.9` now contains the previously patched streaming EChart behavior. The registry-pinned Supervisor manages the materialized runtime and restores Sessions interrupted by its own restart. DataOps and MinerU mount only when their endpoint environment variables exist. Agent Teams remains excluded because official shipped profiles disable those private experimental packages.
 

package/README.zh.md

@@ -9,7 +9,7 @@ kind: "package-bundle"
 
 ## 概述
 
-该distribution把official `@deepseek-ai/dsh-base`及`@deepseek-ai/dsh-web-app`与selected Office、MinerU、mobile、market、GenUI及Supervisor packages、四个in-repository Plus capability packages及一个内嵌于发行包的官方DSH patch set组合起来。它持有ordered composition、minimum compatibility metadata、dependency closure、explicit materialization及credential-free deployment lock；patch set承载每条已接受的官方增量，capability behavior仍属于各自插件。
+该distribution把official `@deepseek-ai/dsh-base`及`@deepseek-ai/dsh-web-app`与selected Office、MinerU、mobile、market、GenUI及Supervisor packages、四个in-repository Plus capability packages及十二个independent patch packages组合起来。它只持有ordered composition、minimum compatibility metadata、dependency closure、explicit materialization及credential-free deployment lock；capability behavior和patch payloads仍属于各自package。
 
 ## 目录
 
@@ -23,17 +23,15 @@ kind: "package-bundle"
 <a id="use-this-package"></a>
 ## 使用此软件包
 
-安装一个版本到 profile：
+无需Desktop或tray即可安装并materialize Plus：
 
 ```bash
-npm install -g @sparkelf/dsh-plus
-dsh-plus install --edition personal   # 或 --edition team
+dsh plugin --profile plus add @sparkelf/dsh-plus
+dsh plugin --profile plus exec dsh-plus apply --dsh-root /path/to/official-dsh
 dsh --profile plus
 ```
 
-CLI 按 `dshPlus.editions` 写 profile 的`package.json`；不再有单独的 standalone 包。personal 与 team 是同一 patch set 上的两套包清单：personal 承载个人工作流，team 增加团队部署需要的共享插件与默认值。DataOps 容器按 team edition 安装。
-
-source checkout 的显式 apply 步骤要求`dshPlus.sourceBase.revision`声明的精确official revision，把内嵌的`dshPlus.patchSet`应用到该checkout，配置patch set声明的npm patches，并以`0600` mode写入`.dsh-plus/patchset.lock.json`。profile中的patched official source workspaces始终覆盖clean CLI packages。profile从npm解析其pinned third-party与Plus capability packages。version conflict、source mismatch、bundle缺失和runtime closure drift都会阻止promotion。
+rc24 explicit apply步骤固定official revision `fb2c4b9e698e30edb738bca4cf0618587db7d203`，一次应用全部pending source payloads，配置exact npm patches，删除retired Plus-owned entries，并以`0600` mode写入`.dsh-plus/patchset.lock.json`。profile中的patched official source workspaces始终覆盖clean CLI packages。profile从npm解析SQL Workbench 0.5.0、Workbench Vault 0.1.1、SSH Manager 0.7.0、API Client 0.5.0、Supervisor 0.1.4、GenUI 0.9.9、dshmarket 1.45.1、OfficeCLI 0.1.1、MinerU 0.1.1及Mobile Bridge 0.2.11。version conflict、source mismatch、bundle缺失和runtime closure drift都会阻止promotion。
 
 Official DSH提供Sidebar navigation、file与text preview、Session search、generic file upload、durable attachment cards、model-visible readonly paths、onboarding、Workspace selection、Session export及Turn folding。Plus把official SQLite Session query provider配置为首次搜索时打开，持久派生索引位于`$DSH_HOME/storages/session-query.sqlite`，canonical compressed JSONL仍为history source。Plus增加用于生成原始DOCX/XLSX/PPTX的OfficeCLI工具，以及无需prompt hook、直接消费official uploaded-file path的MinerU PDF工具；同时把简体中文导出界面中混用的英文`Session`替换为中文，在桌面端把会话日志操作放到Trajectory搜索框紧邻左侧，在手机上保留其Header位置，并让composer permission与model popover保持在center column内且水平边缘各留12px间距。`@changfenhuang/dsh-genui@0.9.9`已内含此前patch的streaming EChart behavior。registry-pinned Supervisor管理materialized runtime并恢复被自身restart中断的Sessions。DataOps和MinerU仅在对应endpoint environment variables存在时mount。Agent Teams仍被排除，因为official shipped profiles禁用这些private experimental packages。
 

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,47 +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,
-		...Object.fromEntries(baseBundles.filter((bundle) => bundle.startsWith("@deepseek-ai/dsh-")).map((bundle) => [bundle, runtime]))
-	};
-	const compositionPackages = composition === void 0 ? basePackages : {
-		...basePackages,
-		...composition.packages
-	};
-	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;
@@ -1229,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");
@@ -1317,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 {
@@ -1358,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];
@@ -1384,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");
@@ -1408,7 +1450,6 @@ function parseStartOptions(argv) {
 		host,
 		open,
 		foreground,
-		edition,
 		capabilities
 	};
 }
@@ -1494,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();
@@ -1577,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) {
@@ -1922,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;
 }
@@ -1946,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",
@@ -1959,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",
@@ -1986,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;