@sparkelf/dsh-plus 0.2.2-alpha.2.1 → 0.2.2-alpha.2.10

package/lib/bin.js

@@ -900,11 +900,12 @@ 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 {
-		throw new Error("@sparkelf/dsh-plus is not installed in " + dirname(anchor) + "; run this command from the directory that installed it");
+		return ownDirectory;
 	}
 	let current = resolve(dirname(anchor));
 	for (;;) {
@@ -913,7 +914,7 @@ function resolveDistributionDirectory(anchor) {
 		if (parent === current) break;
 		current = parent;
 	}
-	throw new Error("@sparkelf/dsh-plus resolved outside " + resolve(dirname(anchor)) + " (found " + resolved + "); run this command from the directory that installed it");
+	return ownDirectory;
 }
 function readDistributionProfile(distributionDirectory) {
 	const manifest = requireRecord(JSON.parse(readFileSync(join(distributionDirectory, "package.json"), "utf8")), "Plus distribution manifest");
@@ -982,7 +983,11 @@ function requireDependencyMap(value, label) {
 * @param consumerDirectory - directory whose `node_modules` holds the installation.
 */
 function installProfilePackages(paths, consumerDirectory) {
-	if (!existsSync(join(consumerDirectory, "node_modules"))) throw new Error("no node_modules in " + consumerDirectory + "; run npm install there first");
+	if (!existsSync(join(consumerDirectory, "node_modules"))) {
+		installWithRegistryFallback(paths);
+		alignReplacedPackageNames(join(paths.profileDirectory, "node_modules"));
+		return;
+	}
 	const profileModules = join(paths.profileDirectory, "node_modules");
 	if (existsSync(profileModules)) {
 		linkNestedBundles(paths, profileModules);
@@ -1004,6 +1009,7 @@ 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",
@@ -1072,7 +1078,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, MAINLAND_REGISTRY];
+	if (configured !== void 0 && configured !== "") return [configured, configured === MAINLAND_REGISTRY ? OFFICIAL_REGISTRY : MAINLAND_REGISTRY];
 	const locale = [
 		process.env.LANG,
 		process.env.LC_ALL,
@@ -1184,20 +1190,70 @@ function ensureProfile(paths, consumerDirectory, edition) {
 		const offered = Object.keys(distribution.editions);
 		throw new Error("unknown edition \"" + edition + "\"; this release offers " + (offered.length === 0 ? "(none)" : offered.join(", ")));
 	}
-	const editionPackages = composition?.packages ?? {};
-	const editionBundles = composition?.bundles ?? distribution.bundles;
+	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,
-				...editionPackages
+				...compositionPackages
 			};
 			manifest.dsh = {
 				...manifest.dsh,
 				profile: {
 					...manifest.dsh?.profile,
-					bundles: [...editionBundles]
+					bundles: [...compositionBundles],
+					...edition === void 0 ? {} : { plusEdition: edition }
 				}
 			};
 			writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n");
@@ -1211,15 +1267,11 @@ function ensureProfile(paths, consumerDirectory, edition) {
 		name: "dsh-profile-plus",
 		private: true,
 		type: "module",
-		dependencies: {
-			"@sparkelf/dsh-plus": distribution.version,
-			"@deepseek-ai/dsh": distribution.dshRange,
-			...distribution.dependencies,
-			...editionPackages
-		},
+		dependencies: compositionPackages,
 		dsh: { profile: {
-			bundles: [...editionBundles],
-			patchReload: "live"
+			bundles: [...compositionBundles],
+			patchReload: "live",
+			...edition === void 0 ? {} : { plusEdition: edition }
 		} }
 	};
 	writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n");
@@ -1247,7 +1299,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", false);
+	if (document.get("autoInstallPeers") === void 0) document.set("autoInstallPeers", true);
 	writeFileSync(workspacePath, String(document));
 }
 /** Run git in one directory, returning undefined instead of throwing when asked to. */
@@ -1483,6 +1535,7 @@ function runForeground(entry, profileName, port, host, open) {
 /** 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") {
@@ -1492,10 +1545,20 @@ function parseInstallOptions(argv) {
 			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 };
+	return {
+		edition,
+		profile
+	};
 }
 /**
 * Install one edition's package manifest into the profile.
@@ -1508,8 +1571,13 @@ function parseInstallOptions(argv) {
 * @returns the process exit code.
 */
 function install(argv) {
-	const { edition } = parseInstallOptions(argv);
-	const paths = resolvePaths(declarationAnchor());
+	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;
@@ -1892,6 +1960,23 @@ 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;
 }
@@ -1916,6 +2001,7 @@ const USAGE = [
 	"",
 	"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",

package/lib/types/standalone-cli.js

@@ -169,6 +169,7 @@ function runForeground(entry, profileName, port, host, open) {
 /** 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') {
@@ -179,11 +180,19 @@ function parseInstallOptions(argv) {
             index += 1;
             continue;
         }
+        if (token === '--profile') {
+            const value = argv[index + 1];
+            if (value === undefined || value === '')
+                throw new Error('--profile requires a value');
+            profile = value;
+            index += 1;
+            continue;
+        }
         throw new Error('unknown option: ' + String(token));
     }
     if (edition === undefined)
         throw new Error('install requires --edition personal or --edition team');
-    return { edition };
+    return { edition, profile };
 }
 /**
  * Install one edition's package manifest into the profile.
@@ -196,8 +205,11 @@ function parseInstallOptions(argv) {
  * @returns the process exit code.
  */
 function install(argv) {
-    const { edition } = parseInstallOptions(argv);
-    const paths = resolvePaths(declarationAnchor());
+    const { edition, profile } = parseInstallOptions(argv);
+    const base = resolvePaths(declarationAnchor());
+    const paths = profile === undefined
+        ? 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;
@@ -628,6 +640,30 @@ async function doctor() {
         ? 'capabilities: ' + (actual.mounted.length === 0 ? '(none enabled)' : actual.mounted.join(', '))
         : 'capabilities disagree with ' + CAPABILITY_RECORD + ': ' + 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 !== undefined) {
+            const distribution = readDistributionProfile(paths.distributionDirectory);
+            const edition = distribution.editions[editionId];
+            if (edition === undefined) {
+                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;
 }
@@ -652,6 +688,7 @@ const USAGE = [
     '',
     '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',

package/lib/types/standalone-profile.js

@@ -9,8 +9,9 @@
  * bundle's own list.
  */
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, symlinkSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
 import { dirname, join, posix, resolve, win32 } from 'node:path';
 import { parseDocument } from 'yaml';
@@ -142,12 +143,15 @@ export function isWithin(candidate, parent, platform = process.platform) {
  * @returns absolute path to the installed distribution.
  */
 export 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 {
-        throw new Error('@sparkelf/dsh-plus is not installed in ' + dirname(anchor) + '; run this command from the directory that installed it');
+        // `npx @sparkelf/dsh-plus ...` runs the CLI from a temporary install, so the consumer
+        // tree has no copy to resolve. The running module's own package is the distribution.
+        return ownDirectory;
     }
     // A resolution that leaves the consumer tree means the module answered from its own
     // installation, which reports health for a distribution the consumer never installed.
@@ -163,7 +167,7 @@ export function resolveDistributionDirectory(anchor) {
             break;
         current = parent;
     }
-    throw new Error('@sparkelf/dsh-plus resolved outside ' + resolve(dirname(anchor)) + ' (found ' + resolved + '); run this command from the directory that installed it');
+    return ownDirectory;
 }
 export function readDistributionProfile(distributionDirectory) {
     const manifest = requireRecord(JSON.parse(readFileSync(join(distributionDirectory, 'package.json'), 'utf8')), 'Plus distribution manifest');
@@ -242,7 +246,12 @@ function requireDependencyMap(value, label) {
 export function installProfilePackages(paths, consumerDirectory) {
     const consumerModules = join(consumerDirectory, 'node_modules');
     if (!existsSync(consumerModules)) {
-        throw new Error('no node_modules in ' + consumerDirectory + '; run npm install there first');
+        // `npx @sparkelf/dsh-plus` runs from a temporary package tree that has no launcher
+        // beside it. The profile installs its own tree, so there is nothing to link from
+        // the caller; only the profile's packages matter.
+        installWithRegistryFallback(paths);
+        alignReplacedPackageNames(join(paths.profileDirectory, 'node_modules'));
+        return;
     }
     const profileModules = join(paths.profileDirectory, 'node_modules');
     if (existsSync(profileModules)) {
@@ -267,6 +276,11 @@ export function installProfilePackages(paths, consumerDirectory) {
 function installWithRegistryFallback(paths) {
     const registries = registryOrder();
     for (const [index, registry] of registries.entries()) {
+        // A lockfile written against the previous registry keeps its resolved URLs, so the
+        // second attempt would fetch from the registry that just failed. Drop it and resolve
+        // against the registry being tried.
+        if (index > 0)
+            rmSync(join(paths.profileDirectory, 'pnpm-lock.yaml'), { force: true });
         const result = spawnSync('pnpm', ['install', '--no-frozen-lockfile', '--registry', registry], {
             cwd: paths.profileDirectory,
             stdio: 'inherit',
@@ -336,8 +350,12 @@ const MAINLAND_REGISTRY = 'https://registry.npmmirror.com';
  */
 export function registryOrder() {
     const configured = process.env.DSH_PLUS_INSTALL_REGISTRY;
-    if (configured !== undefined && configured !== '')
-        return [configured, MAINLAND_REGISTRY];
+    if (configured !== undefined && configured !== '') {
+        // The fallback must be the other registry, not the configured one again: an override
+        // set to the mirror used to fall back to the same mirror and fail twice.
+        const fallback = configured === MAINLAND_REGISTRY ? OFFICIAL_REGISTRY : MAINLAND_REGISTRY;
+        return [configured, fallback];
+    }
     // Intl reports the system locale on every platform. The POSIX variables are empty on
     // Windows, so reading them alone classified every Windows console as non-mainland and
     // reached the origin first — measured in a consumer's log, which showed npmjs failing
@@ -466,17 +484,98 @@ export function ensureProfile(paths, consumerDirectory, edition) {
         throw new Error('unknown edition "' + edition + '"; this release offers '
             + (offered.length === 0 ? '(none)' : offered.join(', ')));
     }
-    const editionPackages = composition?.packages ?? {};
-    const editionBundles = composition?.bundles ?? distribution.bundles;
+    // An edition lists only third-party, fork, and self-developed plugins. The official
+    // runtime is the CLI's responsibility and must not be duplicated in that list.
+    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 === undefined
+        ? distribution.bundles
+        : distribution.bundles.filter(bundle => bundle.startsWith('@deepseek-ai/') || bundle === '@sparkelf/dsh-plus');
+    const basePackages = composition === undefined
+        ? distribution.dependencies
+        : {
+            '@deepseek-ai/dsh': distribution.dshRange,
+            '@sparkelf/dsh-plus': distribution.version,
+            // `dsh-app-boot` declares its launcher as peer dependencies, and pnpm does not
+            // install a profile's transitive peers. Without these the boot loader resolves
+            // `@deepseek-ai/cordis-plugin-group` and fails before any plugin mounts.
+            '@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,
+            // `dsh-session` / `dsh-tools` declare the rest of the runtime as peers; pnpm leaves
+            // them out of a profile install for the same reason as the launcher peers above.
+            '@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,
+            // Capability packages that the official plugins import but declare only as peers.
+            // A profile install leaves them out and boot then fails inside an otherwise
+            // healthy plugin's import with ERR_MODULE_NOT_FOUND.
+            '@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 === undefined
+        ? basePackages
+        : { ...basePackages, ...composition.packages };
+    // Official cordis rows name the historical unscoped packages. The fork ships under
+    // `@sparkelf/*`, so the row would fail to resolve unless the profile also carries the
+    // historical name as an alias to the same version.
+    const rowAliases = {
+        'dsh-better-sidebar': '@sparkelf/dsh-better-sidebar',
+        'dsh-sql-workbench': '@sparkelf/dsh-sql-workbench',
+    };
+    for (const [alias, target] of Object.entries(rowAliases)) {
+        const spec = compositionPackages[target];
+        if (spec !== undefined && compositionPackages[alias] === undefined) {
+            compositionPackages[alias] = 'npm:' + target + '@' + spec;
+        }
+    }
+    const compositionBundles = composition === undefined
+        ? baseBundles
+        : [...baseBundles, ...composition.bundles];
     if (existsSync(manifestPath)) {
         // A selected edition is an explicit install choice, so its packages and bundle order
         // replace the profile's rather than being ignored. Other profile decisions stay.
         if (composition !== undefined) {
             const manifest = requireRecord(JSON.parse(readFileSync(manifestPath, 'utf8')), 'Plus profile manifest');
-            manifest.dependencies = { ...manifest.dependencies, ...editionPackages };
+            manifest.dependencies = { ...manifest.dependencies, ...compositionPackages };
             manifest.dsh = {
                 ...manifest.dsh,
-                profile: { ...manifest.dsh?.profile, bundles: [...editionBundles] },
+                profile: {
+                    ...manifest.dsh?.profile,
+                    bundles: [...compositionBundles],
+                    ...(edition === undefined ? {} : { plusEdition: edition }),
+                },
             };
             writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
         }
@@ -493,19 +592,12 @@ export function ensureProfile(paths, consumerDirectory, edition) {
         name: 'dsh-profile-' + STANDALONE_PROFILE,
         private: true,
         type: 'module',
-        dependencies: {
-            '@sparkelf/dsh-plus': distribution.version,
-            // The launcher's own tree supplies every service package the bundles mount. A
-            // profile that lists only the distribution's plugins installs a partial tree and
-            // fails at load with a module the launcher would have carried.
-            '@deepseek-ai/dsh': distribution.dshRange,
-            ...distribution.dependencies,
-            ...editionPackages,
-        },
+        dependencies: compositionPackages,
         dsh: {
             profile: {
-                bundles: [...editionBundles],
+                bundles: [...compositionBundles],
                 patchReload: 'live',
+                ...(edition === undefined ? {} : { plusEdition: edition }),
             },
         },
     };
@@ -550,7 +642,7 @@ function writeProfileOverrides(profileDirectory, overrides, allowBuilds, omitted
     if (document.get('nodeLinker') === undefined)
         document.set('nodeLinker', 'hoisted');
     if (document.get('autoInstallPeers') === undefined)
-        document.set('autoInstallPeers', false);
+        document.set('autoInstallPeers', true);
     writeFileSync(workspacePath, String(document));
 }
 /** Run git in one directory, returning undefined instead of throwing when asked to. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sparkelf/dsh-plus",
   "description": "DeepSeek Harness Plus official-base Web distribution profile and ranged compatibility patchset",
-  "version": "0.2.2-alpha.2.1",
+  "version": "0.2.2-alpha.2.10",
   "publishConfig": {
     "access": "public"
   },
@@ -132,7 +132,8 @@
         "@deepseek-ai/dsh-client-ui-schedule": "npm:@sparkelf/dsh-client-ui-schedule@0.2.2-alpha.2",
         "@deepseek-ai/dsh-client-ui-sidebar-right": "npm:@sparkelf/dsh-client-ui-sidebar-right@0.2.2-alpha.2",
         "@deepseek-ai/dsh-atomic-write": "npm:@sparkelf/dsh-atomic-write@0.2.2-alpha.2",
-        "@deepseek-ai/dsh-tool-executor-ptc": "npm:@sparkelf/dsh-tool-executor-ptc@0.2.2-alpha.2"
+        "@deepseek-ai/dsh-tool-executor-ptc": "npm:@sparkelf/dsh-tool-executor-ptc@0.2.2-alpha.2",
+        "@deepseek-ai/dsh-client-ui-slots": "0.2.2-alpha.2"
       },
       "standaloneVariants": {
         "dataops": {
@@ -553,20 +554,15 @@
       "personal": {
         "label": "个人版",
         "bundles": [
-          "@deepseek-ai/dsh-base",
-          "@deepseek-ai/dsh-experimental-agent-team-profile",
-          "@deepseek-ai/dsh-web-app",
-          "@deepseek-ai/dsh-experimental-auto-review",
           "@sparkelf/dsh-mineru",
           "@sparkelf/dsh-officecli",
           "dshmarket",
-          "dsh-better-sidebar",
+          "@sparkelf/dsh-better-sidebar",
           "@sparkelf/dsh-office-viewer-fonts",
           "dsh-video-preview",
           "@sparkelf/dsh-genui",
           "@sparkelf/dsh-plugin-supervisor",
-          "@sparkelf/dsh-plus",
-          "dsh-sql-workbench",
+          "@sparkelf/dsh-sql-workbench",
           "@sparkelf/dsh-ssh-manager",
           "@sparkelf/dsh-api-client",
           "dsh-right-bg-anim",
@@ -575,89 +571,71 @@
           "@sparkelf/dsh-client-ui-diagram-viewer"
         ],
         "packages": {
-          "@deepseek-ai/dsh": "0.2.2-alpha.2",
-          "@deepseek-ai/dsh-base": "0.2.2-alpha.2",
-          "@deepseek-ai/dsh-web-app": "0.2.2-alpha.2",
-          "@sparkelf/dsh-plus": "0.2.2-alpha.2.1",
           "@sparkelf/dsh-mineru": "0.1.4",
           "@sparkelf/dsh-officecli": "0.1.4",
           "@sparkelf/dsh-plugin-supervisor": "0.1.9",
-          "dsh-sql-workbench": "0.5.3",
           "@sparkelf/dsh-workbench-vault": "0.1.2",
-          "@sparkelf/dsh-ssh-manager": "0.7.4",
+          "@sparkelf/dsh-ssh-manager": "0.7.5",
           "@sparkelf/dsh-api-client": "0.5.3",
-          "dsh-better-sidebar": "0.28.0",
-          "@sparkelf/dsh-office-viewer-fonts": "0.1.5",
+          "@sparkelf/dsh-office-viewer-fonts": "0.1.6",
           "dsh-video-preview": "0.1.4",
           "dsh-right-bg-anim": "1.1.0",
-          "@deepseek-ai/dsh-experimental-agent-team-profile": ">=0.2.2-alpha.2",
           "@sparkelf/dsh-mobile-bridge": "0.2.18",
           "@sparkelf/dsh-quant": "0.91.0-sparkelf.13",
-          "@deepseek-ai/dsh-experimental-auto-review": "0.2.2-alpha.2",
-          "@sparkelf/dsh-genui": "0.13.0-sparkelf.3",
-          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28"
+          "@sparkelf/dsh-genui": "0.15.0-sparkelf.1",
+          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28",
+          "@sparkelf/dsh-sql-workbench": "0.5.4-sparkelf.1",
+          "@sparkelf/dsh-better-sidebar": "0.29.0-sparkelf.2"
         }
       },
       "team": {
         "label": "团队版",
         "bundles": [
-          "@deepseek-ai/dsh-base",
-          "@deepseek-ai/dsh-experimental-agent-team-profile",
-          "@deepseek-ai/dsh-web-app",
-          "@deepseek-ai/dsh-experimental-auto-review",
           "@sparkelf/dsh-mineru",
           "@sparkelf/dsh-officecli",
           "dshmarket",
-          "dsh-better-sidebar",
           "@sparkelf/dsh-office-viewer-fonts",
           "@sparkelf/dsh-genui",
           "@sparkelf/dsh-plugin-supervisor",
-          "@sparkelf/dsh-plus",
-          "dsh-sql-workbench",
+          "@sparkelf/dsh-sql-workbench",
           "@sparkelf/dsh-ssh-manager",
           "@sparkelf/dsh-api-client",
           "dsh-right-bg-anim",
           "@sparkelf/dsh-client-ui-diagram-viewer",
           "@sparkelf/dsh-dataops-managed",
           "@sparkelf/dsh-query-result-analysis",
-          "@sparkelf/dsh-knowledge-base",
+          "@sparkelf/dsh-better-sidebar",
           "@sparkelf/dsh-credential-manager",
+          "@sparkelf/dsh-knowledge-base",
           "@sparkelf/dsh-group-chat",
+          "@sparkelf/dsh-ocr",
+          "@sparkelf/dsh-dataops-account",
           "@sparkelf/dsh-kb-citation",
           "@sparkelf/dsh-task-bus"
         ],
         "packages": {
-          "@deepseek-ai/dsh": "0.2.2-alpha.2",
-          "@sparkelf/dsh-plus": "0.2.2-alpha.2.1",
+          "@sparkelf/dsh-api-client": "0.5.3",
+          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28",
+          "@sparkelf/dsh-dataops-managed": "0.3.21",
+          "@sparkelf/dsh-genui": "0.15.0-sparkelf.1",
+          "@sparkelf/dsh-knowledge-base": "0.1.21",
           "@sparkelf/dsh-mineru": "0.1.4",
+          "@sparkelf/dsh-office-viewer-fonts": "0.1.6",
           "@sparkelf/dsh-officecli": "0.1.4",
           "@sparkelf/dsh-plugin-supervisor": "0.1.9",
-          "dsh-sql-workbench": "0.5.3",
+          "@sparkelf/dsh-ssh-manager": "0.7.5",
           "@sparkelf/dsh-workbench-vault": "0.1.2",
-          "@sparkelf/dsh-ssh-manager": "0.7.4",
-          "@sparkelf/dsh-api-client": "0.5.3",
-          "dsh-better-sidebar": "0.28.0",
-          "@sparkelf/dsh-office-viewer-fonts": "0.1.5",
           "dsh-right-bg-anim": "1.1.0",
-          "@deepseek-ai/dsh-experimental-agent-team-profile": ">=0.2.2-alpha.2",
-          "@deepseek-ai/dsh-experimental-auto-review": "0.2.2-alpha.2",
-          "@sparkelf/dsh-genui": "0.13.0-sparkelf.3",
-          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28",
-          "@deepseek-ai/dsh-tool-session-query": "0.2.2-alpha.2",
-          "@sparkelf/dsh-client-ui-skill-center": "0.2.1-rc.2.4",
-          "@sparkelf/dsh-image-hoist": ">=0.1.3",
-          "@sparkelf/dsh-plugin-backup": "0.2.1-rc.2.4",
-          "@sparkelf/dsh-plugin-mcp-credentials": "0.2.1-rc.2.6",
-          "dshmarket": ">=1.66.7",
-          "semver": ">=7.7.3",
-          "yaml": ">=2.9.0",
-          "@sparkelf/dsh-dataops-managed": "0.3.21",
-          "@sparkelf/dsh-query-result-analysis": "0.1.4",
-          "@sparkelf/dsh-knowledge-base": "0.1.21",
-          "@sparkelf/dsh-credential-manager": "0.1.0",
+          "@sparkelf/dsh-task-bus": "0.1.0",
+          "@sparkelf/dsh-credential-manager": "0.1.1",
+          "@sparkelf/dsh-dataops-account": "0.2.0",
           "@sparkelf/dsh-group-chat": "0.5.1",
           "@sparkelf/dsh-kb-citation": "0.1.3",
-          "@sparkelf/dsh-task-bus": "0.1.0"
+          "@sparkelf/dsh-ocr": "0.1.0",
+          "@sparkelf/dsh-query-result-analysis": "0.1.4",
+          "@sparkelf/dsh-better-sidebar": "0.29.0-sparkelf.3",
+          "dsh-video-preview": "0.1.4",
+          "@sparkelf/dsh-sql-workbench": "0.5.4-sparkelf.1"
         }
       }
     }