@sparkelf/dsh-plus 0.1.0-rc.34 → 0.1.0-rc.35

package/lib/bin.js

@@ -6,6 +6,7 @@ import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, rm
 import { dirname, join, posix, resolve, win32 } from "node:path";
 import { homedir } from "node:os";
 import semver from "semver";
+import { parseDocument } from "yaml";
 import { fileURLToPath } from "node:url";
 import { createServer } from "node:net";
 //#region lib/types/registry-versions.js
@@ -319,11 +320,18 @@ function readDistributionProfile(distributionDirectory) {
 		if (typeof allowed !== "boolean") throw new Error("dshPlus.profile.allowBuilds." + name + " must be a boolean");
 		allowBuilds[name] = allowed;
 	}
+	const overrides = {};
+	const rawOverrides = profile.overrides === void 0 ? {} : requireRecord(profile.overrides, "dshPlus.profile.overrides");
+	for (const [name, spec] of Object.entries(rawOverrides)) {
+		if (typeof spec !== "string" || spec === "") throw new Error("dshPlus.profile.overrides." + name + " must be a non-empty string");
+		overrides[name] = spec;
+	}
 	return {
 		name: String(manifest.name),
 		bundles: requireStringArray(profile.bundles, "dshPlus.profile.bundles"),
 		dependencies,
 		allowBuilds,
+		overrides,
 		version: String(manifest.version)
 	};
 }
@@ -424,8 +432,30 @@ function ensureProfile(paths, consumerDirectory) {
 		} }
 	};
 	writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n");
+	writeProfileOverrides(paths.profileDirectory, distribution.overrides);
 	return true;
 }
+/**
+* Record the distribution's package substitutions in the profile workspace.
+*
+* pnpm reads \`overrides\` from \`pnpm-workspace.yaml\` since version 10 and ignores the
+* same key in \`package.json\`, so a profile that carried it in the manifest would
+* silently install the official package the override meant to replace.
+*
+* @param profileDirectory - the standalone profile directory.
+* @param overrides - official package name to published replacement spec.
+*/
+function writeProfileOverrides(profileDirectory, overrides) {
+	const workspacePath = join(profileDirectory, "pnpm-workspace.yaml");
+	const document = parseDocument(existsSync(workspacePath) ? readFileSync(workspacePath, "utf8") : "");
+	const [documentError] = document.errors;
+	if (documentError !== void 0) throw new Error("Plus profile workspace is not valid YAML", { cause: documentError });
+	if (document.get("packages") === void 0) document.set("packages", ["."]);
+	for (const [name, spec] of Object.entries(overrides)) document.setIn(["overrides", name], spec);
+	if (document.get("nodeLinker") === void 0) document.set("nodeLinker", "hoisted");
+	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. */
 function git(root, args, acceptFailure = false) {
 	const result = spawnSync("git", args, {

package/lib/types/standalone-profile.d.ts

@@ -54,6 +54,7 @@ export declare function readDistributionProfile(distributionDirectory: string):
     readonly bundles: readonly string[];
     readonly dependencies: Readonly<Record<string, string>>;
     readonly allowBuilds: Readonly<Record<string, boolean>>;
+    readonly overrides: Readonly<Record<string, string>>;
     readonly version: string;
 };
 /**

package/lib/types/standalone-profile.js

@@ -13,6 +13,7 @@ import { existsSync, mkdirSync, readdirSync, readFileSync, symlinkSync, writeFil
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { dirname, join, posix, resolve, win32 } from 'node:path';
+import { parseDocument } from 'yaml';
 /** Profile name a standalone installation owns. */
 export const STANDALONE_PROFILE = 'plus';
 function requireRecord(value, label) {
@@ -105,11 +106,24 @@ export function readDistributionProfile(distributionDirectory) {
             throw new Error('dshPlus.profile.allowBuilds.' + name + ' must be a boolean');
         allowBuilds[name] = allowed;
     }
+    // An override substitutes our republished build for an official package by name: the
+    // built code imports the official specifier, so the installed location has to keep
+    // that name while its contents come from ours.
+    const overrides = {};
+    const rawOverrides = profile.overrides === undefined
+        ? {}
+        : requireRecord(profile.overrides, 'dshPlus.profile.overrides');
+    for (const [name, spec] of Object.entries(rawOverrides)) {
+        if (typeof spec !== 'string' || spec === '')
+            throw new Error('dshPlus.profile.overrides.' + name + ' must be a non-empty string');
+        overrides[name] = spec;
+    }
     return {
         name: String(manifest.name),
         bundles: requireStringArray(profile.bundles, 'dshPlus.profile.bundles'),
         dependencies,
         allowBuilds,
+        overrides,
         version: String(manifest.version),
     };
 }
@@ -222,8 +236,37 @@ export function ensureProfile(paths, consumerDirectory) {
         },
     };
     writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
+    writeProfileOverrides(paths.profileDirectory, distribution.overrides);
     return true;
 }
+/**
+ * Record the distribution's package substitutions in the profile workspace.
+ *
+ * pnpm reads \`overrides\` from \`pnpm-workspace.yaml\` since version 10 and ignores the
+ * same key in \`package.json\`, so a profile that carried it in the manifest would
+ * silently install the official package the override meant to replace.
+ *
+ * @param profileDirectory - the standalone profile directory.
+ * @param overrides - official package name to published replacement spec.
+ */
+function writeProfileOverrides(profileDirectory, overrides) {
+    const workspacePath = join(profileDirectory, 'pnpm-workspace.yaml');
+    const document = parseDocument(existsSync(workspacePath) ? readFileSync(workspacePath, 'utf8') : '');
+    const [documentError] = document.errors;
+    if (documentError !== undefined)
+        throw new Error('Plus profile workspace is not valid YAML', { cause: documentError });
+    if (document.get('packages') === undefined)
+        document.set('packages', ['.']);
+    for (const [name, spec] of Object.entries(overrides))
+        document.setIn(['overrides', name], spec);
+    // The profile resolves bundles from this directory, so peers the official tree would
+    // supply have to come from what the consumer installed.
+    if (document.get('nodeLinker') === undefined)
+        document.set('nodeLinker', 'hoisted');
+    if (document.get('autoInstallPeers') === undefined)
+        document.set('autoInstallPeers', false);
+    writeFileSync(workspacePath, String(document));
+}
 /** Run git in one directory, returning undefined instead of throwing when asked to. */
 function git(root, args, acceptFailure = false) {
     const result = spawnSync('git', args, { cwd: root, encoding: 'utf8' });

package/package.json

@@ -98,6 +98,28 @@
         "dsh-better-sidebar": "0.19.1",
         "dsh-sql-workbench": "0.5.1",
         "dsh-video-preview": "0.1.4"
+      },
+      "overrides": {
+        "@deepseek-ai/dsh-agent-presets": "npm:@sparkelf/dsh-agent-presets@0.1.5-rc.2",
+        "@deepseek-ai/dsh-api-gateway": "npm:@sparkelf/dsh-api-gateway@0.1.5-rc.2",
+        "@deepseek-ai/dsh-api-session-controller": "npm:@sparkelf/dsh-api-session-controller@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-connection": "npm:@sparkelf/dsh-client-connection@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-agent-preset": "npm:@sparkelf/dsh-client-ui-agent-preset@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-conversation": "npm:@sparkelf/dsh-client-ui-conversation@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-deliverables": "npm:@sparkelf/dsh-client-ui-deliverables@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-layout": "npm:@sparkelf/dsh-client-ui-layout@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-model-selection": "npm:@sparkelf/dsh-client-ui-model-selection@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-primitives": "npm:@sparkelf/dsh-client-ui-primitives@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-settings-models": "npm:@sparkelf/dsh-client-ui-settings-models@0.1.5-rc.2",
+        "@deepseek-ai/dsh-client-ui-trajectory": "npm:@sparkelf/dsh-client-ui-trajectory@0.1.5-rc.2",
+        "@deepseek-ai/dsh-host-frontend-static": "npm:@sparkelf/dsh-host-frontend-static@0.1.5-rc.2",
+        "@deepseek-ai/dsh-host-webserver": "npm:@sparkelf/dsh-host-webserver@0.1.5-rc.2",
+        "@deepseek-ai/dsh-llm-pi-ai": "npm:@sparkelf/dsh-llm-pi-ai@0.1.5-rc.2",
+        "@deepseek-ai/dsh-session-log-export": "npm:@sparkelf/dsh-session-log-export@0.1.5-rc.2",
+        "@deepseek-ai/dsh-tools": "npm:@sparkelf/dsh-tools@0.1.5-rc.2",
+        "@deepseek-ai/dsh-web-app": "npm:@sparkelf/dsh-web-app@0.1.5-rc.2",
+        "@deepseek-ai/dsh-web-frontend": "npm:@sparkelf/dsh-web-frontend@0.1.5-rc.2",
+        "@deepseek-ai/dsh-workspace": "npm:@sparkelf/dsh-workspace@0.1.5-rc.2"
       }
     },
     "sourceBase": {
@@ -140,5 +162,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.1.0-rc.34"
+  "version": "0.1.0-rc.35"
 }