@sparkelf/dsh-plus 0.2.1-rc.2.4 → 0.2.2-alpha.2.10

package/lib/types/standalone-profile.js

@@ -9,11 +9,13 @@
  * 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';
+import { readPatchSet } from "./patch-set.js";
 /** Profile name a standalone installation owns when its package declares none. */
 export const STANDALONE_PROFILE = 'plus';
 /**
@@ -97,6 +99,12 @@ function requireStringArray(value, label) {
         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. */
 export function resolveHome(env = process.env) {
     const configured = env.DSH_HOME;
@@ -135,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.
@@ -156,21 +167,14 @@ 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;
 }
-/** The reviewed bundle order and pins the installed distribution declares. */
 export 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 rawDependencies = requireRecord(profile.dependencies, 'dshPlus.profile.dependencies');
+    const dependencies = requireDependencyMap(requireRecord(profile.dependencies, 'dshPlus.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')
@@ -189,6 +193,16 @@ export function readDistributionProfile(distributionDirectory) {
             throw new Error('dshPlus.profile.overrides.' + name + ' must be a non-empty string');
         overrides[name] = spec;
     }
+    const editions = {};
+    const rawEditions = plus.editions === undefined ? {} : 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),
@@ -196,10 +210,21 @@ export 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.
  *
@@ -221,7 +246,12 @@ export function readDistributionProfile(distributionDirectory) {
 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)) {
@@ -246,10 +276,18 @@ 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',
             shell: process.platform === 'win32',
+            // A registry that accepts the connection but never answers would otherwise hold the
+            // first start for pnpm's full retry budget before the fallback got a chance.
+            timeout: 5 * 60_000,
         });
         if (result.error !== undefined)
             throw result.error;
@@ -312,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
@@ -430,12 +472,113 @@ export 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.
  */
-export function ensureProfile(paths, consumerDirectory) {
+export function ensureProfile(paths, consumerDirectory, edition) {
     const manifestPath = join(paths.profileDirectory, 'package.json');
     const distribution = readDistributionProfile(paths.distributionDirectory);
+    const composition = edition === undefined ? undefined : distribution.editions[edition];
+    if (edition !== undefined && composition === undefined) {
+        const offered = Object.keys(distribution.editions);
+        throw new Error('unknown edition "' + edition + '"; this release offers '
+            + (offered.length === 0 ? '(none)' : offered.join(', ')));
+    }
+    // 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, ...compositionPackages };
+            manifest.dsh = {
+                ...manifest.dsh,
+                profile: {
+                    ...manifest.dsh?.profile,
+                    bundles: [...compositionBundles],
+                    ...(edition === undefined ? {} : { plusEdition: edition }),
+                },
+            };
+            writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
+        }
         // The workspace carries decisions the distribution owns — overrides and the build
         // script allowlist — and a distribution release changes them. Rewriting on every
         // start is what lets an upgraded installation receive the new values; a profile
@@ -449,18 +592,12 @@ export function ensureProfile(paths, consumerDirectory) {
         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,
-        },
+        dependencies: compositionPackages,
         dsh: {
             profile: {
-                bundles: distribution.bundles,
+                bundles: [...compositionBundles],
                 patchReload: 'live',
+                ...(edition === undefined ? {} : { plusEdition: edition }),
             },
         },
     };
@@ -505,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. */
@@ -536,34 +673,20 @@ function git(root, args, acceptFailure = false) {
  */
 export function applyProfileNpmPatches(distributionDirectory, profileDirectory) {
     const manifest = requireRecord(JSON.parse(readFileSync(join(distributionDirectory, 'package.json'), 'utf8')), 'Plus distribution manifest');
-    const plus = requireRecord(manifest.dshPlus, 'dshPlus');
-    const names = plus.patchPackages;
-    if (!Array.isArray(names))
-        throw new Error('dshPlus.patchPackages must be an array');
+    const patchSet = readPatchSet(distributionDirectory, manifest);
     const applied = [];
-    for (const value of names) {
-        if (typeof value !== 'string' || value === '')
-            throw new Error('dshPlus.patchPackages entries must be non-empty strings');
-        const patchPackage = resolveInstalledPackage(distributionDirectory, value);
-        const declaration = requireRecord(patchPackage.manifest.dshPatch, value + ' dshPatch');
-        const variants = declaration.variants;
-        if (!Array.isArray(variants))
-            throw new Error(value + ' dshPatch.variants must be an array');
-        for (const entry of variants) {
-            const variant = requireRecord(entry, value + ' variant');
-            const target = requireRecord(variant.target, value + ' variant target');
-            // Only npm targets reach an installed package; a source target needs the
-            // official checkout, which a standalone installation does not have.
-            if (target.kind !== 'npm')
-                continue;
-            const targetName = String(target.name);
-            const patched = resolveInstalledPackage(profileDirectory, targetName);
-            const file = resolve(patchPackage.directory, String(variant.file));
-            if (git(patched.directory, ['apply', '--reverse', '--check', file], true) !== undefined)
-                continue;
-            git(patched.directory, ['apply', file]);
-            applied.push(value + ' -> ' + targetName);
-        }
+    for (const entry of [...patchSet.entries, ...patchSet.thirdPartyPatches]) {
+        // Only npm targets reach an installed package; a source target needs the
+        // official checkout, which a standalone installation does not have.
+        if (entry.target.kind !== 'npm')
+            continue;
+        const targetName = entry.target.name;
+        const patched = resolveInstalledPackage(profileDirectory, targetName);
+        const file = resolve(distributionDirectory, entry.file);
+        if (git(patched.directory, ['apply', '--reverse', '--check', file], true) !== undefined)
+            continue;
+        git(patched.directory, ['apply', file]);
+        applied.push(entry.id + ' -> ' + targetName);
     }
     return applied;
 }
@@ -575,7 +698,22 @@ function resolveInstalledPackage(from, packageName) {
         manifestPath = requireFrom.resolve(packageName + '/package.json');
     }
     catch {
-        throw new Error(packageName + ' is not installed under ' + from);
+        // Some packages do not export `./package.json`; resolve the entry module instead and walk
+        // up to the directory that holds the manifest.
+        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');
     }
     const manifest = requireRecord(JSON.parse(readFileSync(manifestPath, 'utf8')), packageName + ' manifest');
     return { name: packageName, version: String(manifest.version), directory: dirname(manifestPath), manifest };