@sparkelf/dsh-plus 0.1.0-rc.29 → 0.1.0-rc.31

package/lib/bin.js

@@ -3,9 +3,10 @@ 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, rmSync, symlinkSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, posix, resolve, win32 } from "node:path";
 import { homedir } from "node:os";
 import semver from "semver";
+import { fileURLToPath } from "node:url";
 import { createServer } from "node:net";
 //#region lib/types/registry-versions.js
 /**
@@ -231,6 +232,27 @@ function resolveHome(env = process.env) {
 	return configured === void 0 || configured === "" ? join(homedir(), ".dsh") : resolve(configured);
 }
 /**
+* Whether one absolute path is the other or sits beneath it.
+*
+* A path outside the parent has a relative form starting with `..`, which every
+* platform answers the same way. Comparing the text against a literal separator is
+* not: Windows separates with a backslash, so a nested path never matched its own
+* ancestor and every Windows installation reported the distribution as sitting
+* outside its own tree.
+*
+* @param candidate - absolute path to test.
+* @param parent - absolute path that may contain it.
+* @param platform - separating convention, injectable so the Windows answer is
+* testable where the suite runs on a POSIX host.
+* @returns true when the candidate is the parent or inside it.
+*/
+function isWithin(candidate, parent, platform = process.platform) {
+	if (candidate === parent) return true;
+	const path = platform === "win32" ? win32 : posix;
+	const inside = path.relative(parent, candidate);
+	return inside !== "" && !inside.startsWith("..") && !inside.startsWith(path.sep + "..");
+}
+/**
 * Resolve the installed distribution directory from one requiring anchor.
 *
 * The anchor must be a path inside the consumer's own tree. Resolving from this
@@ -247,9 +269,14 @@ function resolveDistributionDirectory(anchor) {
 	} catch {
 		throw new Error("@sparkelf/dsh-plus is not installed in " + dirname(anchor) + "; run this command from the directory that installed it");
 	}
-	const consumerRoot = resolve(dirname(anchor));
-	if (!resolved.startsWith(consumerRoot + "/")) throw new Error("@sparkelf/dsh-plus resolved outside " + consumerRoot + " (found " + resolved + "); run this command from the directory that installed it");
-	return resolved;
+	let current = resolve(dirname(anchor));
+	for (;;) {
+		if (isWithin(resolved, current)) return resolved;
+		const parent = dirname(current);
+		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");
 }
 /** The reviewed bundle order and pins the installed distribution declares. */
 function readDistributionProfile(distributionDirectory) {
@@ -425,6 +452,34 @@ function parseStartOptions(argv) {
 		foreground
 	};
 }
+/**
+* Where the installation that owns this command keeps its packages.
+*
+* A global install places the command in a shared prefix and a local install places
+* it in a project; neither has anything to do with the directory the user happens to
+* be in. The search therefore starts at this module own file and climbs to the tree
+* npm laid out around it.
+*
+* The test is the launcher, not the distribution: inside a workspace the package
+* resolves its own name, so looking for the distribution would stop at the package
+* rather than at the tree that owns every dependency.
+*
+* @returns absolute path to the installation root.
+*/
+function installationRoot() {
+	const here = dirname(fileURLToPath(import.meta.url));
+	let current = here;
+	for (;;) {
+		if (existsSync(join(current, "node_modules", "@deepseek-ai", "dsh"))) return current;
+		const parent = dirname(current);
+		if (parent === current) return here;
+		current = parent;
+	}
+}
+/** The package.json this installation resolves its dependencies from. */
+function installationAnchor() {
+	return join(installationRoot(), "package.json");
+}
 /** The launcher entry this installation must drive. */
 function launcherEntry(anchor) {
 	return createRequire(anchor).resolve("@deepseek-ai/dsh/lib/bin.js");
@@ -445,9 +500,9 @@ function runForeground(entry, port, host, open) {
 }
 async function start(argv) {
 	const options = parseStartOptions(argv);
-	const anchor = join(process.cwd(), "package.json");
+	const anchor = installationAnchor();
 	const paths = resolvePaths(anchor);
-	const created = ensureProfile(paths, process.cwd());
+	const created = ensureProfile(paths, installationRoot());
 	console.log(created ? "Created the plus profile at " + paths.profileDirectory : "Using the existing plus profile");
 	const entry = launcherEntry(anchor);
 	if (options.foreground) return runForeground(entry, options.port, options.host, options.open);
@@ -506,7 +561,7 @@ async function startDetached(home, entry, options) {
 	return 0;
 }
 async function stop() {
-	const { home } = resolvePaths(join(process.cwd(), "package.json"));
+	const { home } = resolvePaths(installationAnchor());
 	const state = readState(home);
 	if (state === void 0) {
 		clearState(home);
@@ -527,7 +582,7 @@ async function stop() {
 	return 0;
 }
 function status() {
-	const state = readState(resolvePaths(join(process.cwd(), "package.json")).home);
+	const state = readState(resolvePaths(installationAnchor()).home);
 	if (state === void 0) {
 		console.log("Plus is not running.");
 		console.log("Start it with: dsh-plus start");
@@ -548,7 +603,7 @@ function status() {
 async function update(argv) {
 	const checkOnly = argv.includes("--check");
 	const assumeYes = argv.includes("--yes");
-	const paths = resolvePaths(join(process.cwd(), "package.json"));
+	const paths = resolvePaths(installationAnchor());
 	const distribution = readDistributionProfile(paths.distributionDirectory);
 	const installed = distribution.version;
 	const newer = newerVersion(distribution.name, installed);
@@ -600,7 +655,7 @@ function confirm(question) {
 	});
 }
 async function doctor() {
-	const paths = resolvePaths(join(process.cwd(), "package.json"));
+	const paths = resolvePaths(installationAnchor());
 	let failures = 0;
 	const check = (ok, line) => {
 		console.log((ok ? "ok   " : "FAIL ") + line);

package/lib/types/standalone-cli.js

@@ -10,7 +10,8 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { newerVersion } from "./registry-versions.js";
 import { DEFAULT_PORT, STOP_GRACE_MILLISECONDS, choosePort, clearState, isRunning, portAvailable, readState, spawnServer, stateDirectory, waitForServer, writeState, } from "./standalone-server.js";
 import { STANDALONE_PROFILE, ensureProfile, readDistributionProfile, resolvePaths, } from "./standalone-profile.js";
@@ -51,6 +52,38 @@ function parseStartOptions(argv) {
     }
     return { port, host, open, foreground };
 }
+/**
+ * Where the installation that owns this command keeps its packages.
+ *
+ * A global install places the command in a shared prefix and a local install places
+ * it in a project; neither has anything to do with the directory the user happens to
+ * be in. The search therefore starts at this module own file and climbs to the tree
+ * npm laid out around it.
+ *
+ * The test is the launcher, not the distribution: inside a workspace the package
+ * resolves its own name, so looking for the distribution would stop at the package
+ * rather than at the tree that owns every dependency.
+ *
+ * @returns absolute path to the installation root.
+ */
+function installationRoot() {
+    const here = dirname(fileURLToPath(import.meta.url));
+    let current = here;
+    for (;;) {
+        if (existsSync(join(current, 'node_modules', '@deepseek-ai', 'dsh')))
+            return current;
+        const parent = dirname(current);
+        // A tree npm did not lay out has no such ancestor; the module own directory
+        // keeps the failure message pointing at the installation that was searched.
+        if (parent === current)
+            return here;
+        current = parent;
+    }
+}
+/** The package.json this installation resolves its dependencies from. */
+function installationAnchor() {
+    return join(installationRoot(), 'package.json');
+}
 /** The launcher entry this installation must drive. */
 function launcherEntry(anchor) {
     return createRequire(anchor).resolve('@deepseek-ai/dsh/lib/bin.js');
@@ -65,9 +98,9 @@ function runForeground(entry, port, host, open) {
 }
 async function start(argv) {
     const options = parseStartOptions(argv);
-    const anchor = join(process.cwd(), 'package.json');
+    const anchor = installationAnchor();
     const paths = resolvePaths(anchor);
-    const created = ensureProfile(paths, process.cwd());
+    const created = ensureProfile(paths, installationRoot());
     console.log(created
         ? 'Created the ' + STANDALONE_PROFILE + ' profile at ' + paths.profileDirectory
         : 'Using the existing ' + STANDALONE_PROFILE + ' profile');
@@ -111,7 +144,7 @@ async function startDetached(home, entry, options) {
     return 0;
 }
 async function stop() {
-    const anchor = join(process.cwd(), 'package.json');
+    const anchor = installationAnchor();
     const { home } = resolvePaths(anchor);
     const state = readState(home);
     if (state === undefined) {
@@ -133,7 +166,7 @@ async function stop() {
     return 0;
 }
 function status() {
-    const anchor = join(process.cwd(), 'package.json');
+    const anchor = installationAnchor();
     const paths = resolvePaths(anchor);
     const state = readState(paths.home);
     if (state === undefined) {
@@ -156,7 +189,7 @@ function status() {
 async function update(argv) {
     const checkOnly = argv.includes('--check');
     const assumeYes = argv.includes('--yes');
-    const anchor = join(process.cwd(), 'package.json');
+    const anchor = installationAnchor();
     const paths = resolvePaths(anchor);
     const distribution = readDistributionProfile(paths.distributionDirectory);
     const installed = distribution.version;
@@ -210,7 +243,7 @@ function confirm(question) {
     });
 }
 async function doctor() {
-    const anchor = join(process.cwd(), 'package.json');
+    const anchor = installationAnchor();
     const paths = resolvePaths(anchor);
     let failures = 0;
     const check = (ok, line) => {

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

@@ -21,6 +21,22 @@ export interface StandalonePaths {
 }
 /** Resolve the DSH home, honouring the environment override the launcher itself reads. */
 export declare function resolveHome(env?: NodeJS.ProcessEnv): string;
+/**
+ * Whether one absolute path is the other or sits beneath it.
+ *
+ * A path outside the parent has a relative form starting with `..`, which every
+ * platform answers the same way. Comparing the text against a literal separator is
+ * not: Windows separates with a backslash, so a nested path never matched its own
+ * ancestor and every Windows installation reported the distribution as sitting
+ * outside its own tree.
+ *
+ * @param candidate - absolute path to test.
+ * @param parent - absolute path that may contain it.
+ * @param platform - separating convention, injectable so the Windows answer is
+ * testable where the suite runs on a POSIX host.
+ * @returns true when the candidate is the parent or inside it.
+ */
+export declare function isWithin(candidate: string, parent: string, platform?: NodeJS.Platform): boolean;
 /**
  * Resolve the installed distribution directory from one requiring anchor.
  *

package/lib/types/standalone-profile.js

@@ -11,7 +11,7 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, symlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join, posix, resolve, win32 } from 'node:path';
 /** Profile name a standalone installation owns. */
 export const STANDALONE_PROFILE = 'plus';
 function requireRecord(value, label) {
@@ -29,6 +29,28 @@ export function resolveHome(env = process.env) {
     const configured = env.DSH_HOME;
     return configured === undefined || configured === '' ? join(homedir(), '.dsh') : resolve(configured);
 }
+/**
+ * Whether one absolute path is the other or sits beneath it.
+ *
+ * A path outside the parent has a relative form starting with `..`, which every
+ * platform answers the same way. Comparing the text against a literal separator is
+ * not: Windows separates with a backslash, so a nested path never matched its own
+ * ancestor and every Windows installation reported the distribution as sitting
+ * outside its own tree.
+ *
+ * @param candidate - absolute path to test.
+ * @param parent - absolute path that may contain it.
+ * @param platform - separating convention, injectable so the Windows answer is
+ * testable where the suite runs on a POSIX host.
+ * @returns true when the candidate is the parent or inside it.
+ */
+export function isWithin(candidate, parent, platform = process.platform) {
+    if (candidate === parent)
+        return true;
+    const path = platform === 'win32' ? win32 : posix;
+    const inside = path.relative(parent, candidate);
+    return inside !== '' && !inside.startsWith('..') && !inside.startsWith(path.sep + '..');
+}
 /**
  * Resolve the installed distribution directory from one requiring anchor.
  *
@@ -49,11 +71,19 @@ export function resolveDistributionDirectory(anchor) {
     }
     // 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.
-    const consumerRoot = resolve(dirname(anchor));
-    if (!resolved.startsWith(consumerRoot + '/')) {
-        throw new Error('@sparkelf/dsh-plus resolved outside ' + consumerRoot + ' (found ' + resolved + '); run this command from the directory that installed it');
+    // The comparison walks up from the anchor because the resolved package sits under the
+    // anchor's \`node_modules\`, not beside it: requiring \`<root>/package.json\` legitimately
+    // reports \`<root>/node_modules/@sparkelf/dsh-plus\`.
+    let current = resolve(dirname(anchor));
+    for (;;) {
+        if (isWithin(resolved, current))
+            return resolved;
+        const parent = dirname(current);
+        if (parent === current)
+            break;
+        current = parent;
     }
-    return resolved;
+    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. */
 export function readDistributionProfile(distributionDirectory) {

package/package.json

@@ -138,5 +138,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.1.0-rc.29"
+  "version": "0.1.0-rc.31"
 }