dsh-home-hosted 0.4.1 → 0.4.3

package/docs/DESIGN.md

@@ -62,10 +62,27 @@ merely offers `lib/bin.js` (a clone), which beats a `dsh` on PATH. A clone has
 no manifest, so it is found by that build-file name — a guess that must never
 outrank a real install.
 
-The row's stored command is repaired to that launcher while the plugin runs
-(`launcherRepair`), including a row that names a bare `dsh`: PATH is exactly what
-pointed at the copy that stopped working. An entry that runs a different absolute
-dsh is somebody's deliberate choice and is never rewritten.
+The row's stored command is repaired while the plugin runs (`launcherRepair`),
+including a row that names a bare `dsh`: PATH is exactly what pointed at the copy
+that stopped working. A row this plugin created has its command replaced; an
+adopted row that deliberately runs a different absolute dsh is left alone.
+
+### A project that depends on dsh keeps it, by name
+
+The launcher is the fallback, not the common case. `home-hosted` resolves a bare
+command itself (`resolveCommand(command, cwd, projectDir)` in its process
+provider) by checking `node_modules/.bin/<command>` under the row's cwd and then
+its own project directory, and only then PATH. So a row whose project installed
+dsh as a dependency is written as a bare `dsh` with that project as its cwd: it
+runs the copy the project's own lockfile chose, through the shim its own package
+manager wrote, with nothing absolute to move when the project or the store does.
+
+That is also why this plugin never shells out to a package manager for it:
+`npx dsh` falls back to the registry and to a global when the local bin is
+missing, `pnpm dsh` needs pnpm on the boot PATH, and `nlx --local` would add a
+global tool to a boot path for a lookup the panel already performs. The launcher
+is still what a row gets when a bare name would *not* reach the pinned image —
+a clone run without its own `.bin`, or a global-only machine.
 
 ## One panel root and one boot artifact per state root
 
@@ -78,7 +95,10 @@ explicit `$HHOSTED_HOME` still wins, and a panel already living at
 every server look like it vanished), but otherwise the root is the instance's own
 `<stateDir>/panel`. Only a root with a `servers.config.json` counts, or a
 `run.json` whose pid is alive — a killed panel leaves a runtime file behind, and
-adopting on that would point a fresh install at somebody's dead root.
+adopting on that would point a fresh install at somebody's dead root. Adoption is
+also limited to an instance that already exists: the machine's own harness home,
+or a state dir that already holds settings. A scratch `DSH_HOME` or a test
+project must not reach over and drive the panel some other install owns.
 
 The boot artifact name follows the state root too, but keyed on the *machine*
 default: `home-hosted` only for `~/.dsh/dsh-home-hosted`, `home-hosted-<hash>`

package/lib/index.js

@@ -1989,10 +1989,20 @@ function resolveHomeHostedHome(stateDir, env = process.env, homeDir = os3.homedi
   const configured = env.HHOSTED_HOME?.trim();
   if (configured)
     return { home: resolveUnder(configured, homeDir), source: "env" };
+  const state = resolveUnder(stateDir, homeDir);
   const legacy = path6.join(homeDir, ".home-hosted");
-  if (hasLivePanel(legacy))
+  if (isEstablishedInstance(state, homeDir) && hasLivePanel(legacy))
     return { home: legacy, source: "legacy" };
-  return { home: path6.join(resolveUnder(stateDir, homeDir), "panel"), source: "instance" };
+  return { home: path6.join(state, "panel"), source: "instance" };
+}
+function isEstablishedInstance(stateDir, homeDir) {
+  if (stateDir === path6.join(homeDir, ".dsh", "dsh-home-hosted"))
+    return true;
+  try {
+    return fs7.statSync(path6.join(stateDir, "settings.json")).isFile();
+  } catch {
+    return false;
+  }
 }
 function hasLivePanel(home) {
   try {
@@ -2851,10 +2861,48 @@ function readdirNames(dir) {
     return [];
   }
 }
+function projectDshEntry(dir, depth = 4) {
+  let current = resolveDir(dir);
+  for (let hop = 0; hop <= depth; hop += 1) {
+    const shim = path10.join(current, "node_modules", ".bin", "dsh");
+    const shimmed = resolveShimmedCli(shim, process7.execPath);
+    if (shimmed?.cliEntry != null && isEntry(shimmed.cliEntry))
+      return shimmed.cliEntry;
+    const found = dshCandidatesUnder(current).map((entry) => ({ entry, version: versionOf(entry) })).sort((a, b) => compareVersions(b.version ?? "0.0.0", a.version ?? "0.0.0"));
+    if (found[0] !== void 0)
+      return found[0].entry;
+    const parent = path10.dirname(current);
+    if (parent === current)
+      break;
+    current = parent;
+  }
+  return null;
+}
+function resolveDir(dir) {
+  try {
+    return fs12.realpathSync(dir);
+  } catch {
+    return path10.resolve(dir);
+  }
+}
 async function resolveDshLaunch(options = {}) {
   const argv1 = options.argv1 === void 0 ? process7.argv[1] : options.argv1;
   const dshHome2 = options.dshHome ?? dshHome();
   const stateDir = options.stateDir ?? pluginStateDir();
+  const projectDir = options.projectDir === void 0 ? process7.cwd() : options.projectDir;
+  const declared = projectDir === null || projectDir.trim().length === 0 ? null : projectDshEntry(projectDir);
+  if (declared !== null && realPath(declared) !== realPath(launcherFor(stateDir, declared))) {
+    const launcher = writeDshLauncher({
+      stateDir,
+      dshHome: dshHome2,
+      resolvedEntry: declared,
+      pinnedEntry: declared,
+      repin: true,
+      entryExtension: path10.extname(declared),
+      searchRoots: [dshSearchRoot(declared), projectDir].filter((root) => typeof root === "string" && root.length > 0)
+    });
+    return { program: process7.execPath, args: [declared], cliEntry: declared, shimPath: null, source: "entry", launcherPath: launcher.path };
+  }
   const local = typeof argv1 === "string" && argv1.length > 0 ? launchedEntry(argv1) : null;
   if (local !== null && realPath(local) !== realPath(dshLauncherPath(stateDir, path10.extname(local)))) {
     const launcher = writeDshLauncher({
@@ -2895,6 +2943,9 @@ async function resolveDshLaunch(options = {}) {
   const launch = resolveShimmedCli(found, process7.execPath);
   return launch === null ? null : { ...launch, launcherPath: null };
 }
+function launcherFor(stateDir, entry) {
+  return dshLauncherPath(stateDir, path10.extname(entry));
+}
 function buildCommand(launch, launcherPath2) {
   if (launcherPath2 !== null && launcherPath2.length > 0)
     return { command: process7.execPath, entryArgs: [launcherPath2] };
@@ -2909,13 +2960,24 @@ function entryScript(config) {
   const rest = config.args ?? [];
   return rest.find((arg) => path10.isAbsolute(arg)) ?? program;
 }
-function pinnedScriptFor(launch) {
+function localDshCommand(projectDir, entry) {
+  if (typeof projectDir !== "string" || projectDir.trim().length === 0 || entry === null)
+    return null;
+  const shim = resolveShimmedCli(path10.join(projectDir, "node_modules", ".bin", "dsh"))?.cliEntry ?? null;
+  if (shim === null)
+    return null;
+  return realPath(shim) === realPath(entry) ? "dsh" : null;
+}
+function pinnedScriptFor(launch, projectDir) {
   if (launch === null)
     return null;
+  const entry = launch.cliEntry ?? launch.args.find((arg) => path10.isAbsolute(arg)) ?? null;
+  if (localDshCommand(projectDir, entry) === "dsh")
+    return "dsh";
   const launcher = launch.launcherPath;
   if (launcher !== null && launcher.length > 0)
     return launcher;
-  return launch.cliEntry ?? launch.args.find((arg) => path10.isAbsolute(arg)) ?? null;
+  return entry;
 }
 function isBareCommand(stored) {
   return !/[/\\]/.test(stored) && (stored === "dsh" || /^dsh\.(?:cmd|exe)$/i.test(stored));
@@ -2930,23 +2992,24 @@ function needsLauncherRepair(config) {
     return true;
   return (config.args ?? []).some((arg) => path10.isAbsolute(arg));
 }
-function launcherRepair(config, launch) {
-  const pinned = pinnedScriptFor(launch);
+function launcherRepair(config, launch, options = {}) {
+  const pinned = pinnedScriptFor(launch, options.projectDir);
   if (pinned === null || launch === null)
     return null;
+  const targetBare = pinned === "dsh";
+  const storedBare = isBareCommand(entryScript(config) ?? "");
   const stored = entryScript(config);
   if (stored === null || stored === pinned)
     return null;
-  const bare = isBareCommand(stored);
-  if (!bare) {
+  if (!storedBare && options.ownedCommand !== true) {
     const target = resolveShimmedCli(stored, process7.execPath)?.cliEntry ?? stored;
-    if (target !== pinned && target !== launch.cliEntry)
+    if (target !== launch.cliEntry && target !== pinned)
       return null;
   }
   const args = config.args ?? [];
-  const inline = bare ? -1 : args.findIndex((arg) => path10.isAbsolute(arg));
-  const rest = inline === -1 ? args : args.filter((_, index) => index !== inline);
-  return { command: process7.execPath, args: [pinned, ...rest] };
+  const script = storedBare ? -1 : args.findIndex((arg) => path10.isAbsolute(arg) || arg === pinned);
+  const rest = script === -1 ? args : args.filter((_, index) => index !== script);
+  return targetBare ? { command: "dsh", args: rest, ...typeof options.projectDir === "string" && options.projectDir.length > 0 ? { cwd: options.projectDir } : {} } : { command: process7.execPath, args: [pinned, ...rest] };
 }
 function buildDshEntry(facts) {
   const launch = facts.launch;
@@ -2964,7 +3027,9 @@ function buildDshEntry(facts) {
     );
   }
   const launcherArgs = profile === "web" ? ["web"] : ["--profile", profile];
-  const generated = launch === null ? { command: "dsh", entryArgs: [] } : buildCommand(launch, facts.launcherPath ?? null);
+  const projectDir = facts.projectDir === void 0 || facts.projectDir === null ? process7.cwd() : facts.projectDir;
+  const local = launch === null ? null : localDshCommand(projectDir, launch.cliEntry);
+  const generated = launch === null || local === "dsh" ? { command: "dsh", entryArgs: [] } : buildCommand(launch, facts.launcherPath ?? null);
   return {
     id: facts.id,
     label: "DSH web",
@@ -2974,7 +3039,7 @@ function buildDshEntry(facts) {
     args: [...generated.entryArgs, ...launcherArgs, ...appArgs],
     bind: "local",
     port: facts.port,
-    cwd: process7.cwd(),
+    cwd: projectDir,
     env: {},
     dataEnvs: { DSH_HOME: facts.dshHome },
     onPortConflict: "kill",
@@ -3205,6 +3270,11 @@ function ownedDrift(live, intent) {
     drift.push("stop.killPortHolders");
   return drift;
 }
+function isCreatedEntry(snapshot) {
+  if (snapshot === void 0)
+    return false;
+  return Object.keys(snapshot).length === 1 && typeof snapshot.id === "string";
+}
 function snapshotOwned(live) {
   const killPortHolders = live.stop?.killPortHolders;
   return {
@@ -3588,13 +3658,19 @@ var HomeHostedService = class extends Service {
   tokenDetail = "";
   /** When a missing managed entry was last put back, so a poll cannot become a write loop. */
   entryRecoveryAt = 0;
+  /** When a managed row was last re-pointed at the pinned dsh, for the same reason. */
+  commandRepairAt = 0;
   /** The last panel inventory, so a model-step assembly never reads the disk. */
   instanceCache = null;
   snapshotsFile;
-  async resolveDsh(dshHome2) {
+  projectDir() {
+    return this.options.projectDir ?? process10.cwd();
+  }
+  async resolveDsh(dshHome2, projectDir = this.projectDir()) {
     return await (this.options.resolveDsh ?? ((options) => resolveDshLaunch(options)))({
       dshHome: dshHome2,
-      stateDir: this.options.stateDir
+      stateDir: this.options.stateDir,
+      projectDir
     });
   }
   // -------------------------------------------------------------------------
@@ -4030,7 +4106,8 @@ var HomeHostedService = class extends Service {
       profile: detectProfile(process10.argv, process10.env),
       dshHome: harnessHome,
       launch: dsh,
-      launcherPath: dsh?.launcherPath ?? null
+      launcherPath: dsh?.launcherPath ?? null,
+      projectDir: this.projectDir()
     });
     return { ...generated, ...patch };
   }
@@ -4045,7 +4122,8 @@ var HomeHostedService = class extends Service {
       return null;
     const harnessHome = process10.env.DSH_HOME ?? dshHome();
     const dsh = await this.resolveDsh(harnessHome);
-    return launcherRepair(live, dsh);
+    const owned = isCreatedEntry(this.snapshots()[live.id]);
+    return launcherRepair(live, dsh, { ownedCommand: owned, projectDir: this.projectDir() });
   }
   async writeOwned(intent) {
     const live = (await this.liveEntries()).get(intent.id) ?? null;
@@ -4477,6 +4555,7 @@ var HomeHostedService = class extends Service {
    */
   async reconcile() {
     await this.ensureManagedEntry();
+    await this.repairManagedCommand();
     await this.repairBootEntry();
     await this.migrateBootEntryName();
   }
@@ -4525,6 +4604,34 @@ var HomeHostedService = class extends Service {
     } catch {
     }
   }
+  /**
+   * Re-point a managed `dsh` row that runs the wrong dsh.
+   *
+   * A row created before the launcher existed, or by an older release that took
+   * whatever PATH answered, keeps starting that copy — and no click would fix
+   * it, because the plugin only writes the row when the toggle is applied. So
+   * the drift is repaired where the entry's existence is already checked, under
+   * the same throttle, and only for a row this plugin owns.
+   */
+  async repairManagedCommand() {
+    const id = this.options.defaultEntryId;
+    if (!this.options.settings.get().manageDsh || !this.options.settings.intentFor(id).autostart)
+      return;
+    const now = Date.now();
+    if (now - this.commandRepairAt < ENTRY_RECOVERY_INTERVAL_MS)
+      return;
+    const live = (await this.liveEntries()).get(id)?.config ?? null;
+    if (live === null || this.snapshots()[id] === void 0 || !needsLauncherRepair(live))
+      return;
+    const repair = await this.dshCommandRepair(live);
+    if (repair === null)
+      return;
+    this.commandRepairAt = now;
+    try {
+      await this.writeOwned({ ...this.options.settings.intentFor(id), autostart: true });
+    } catch {
+    }
+  }
   /** Re-assert the boot entry when the OS still has it but it stopped working. */
   async repairBootEntry() {
     if (!this.options.settings.get().autostart.enabled)
@@ -4578,7 +4685,7 @@ var HomeHostedService = class extends Service {
       boot: await this.bootStatus(),
       // A deleted managed entry is put back here as well as at startup: whoever
       // deleted it is looking at the page that reports it missing.
-      entries: await this.ensureManagedEntry().then(async () => await this.entriesStatus()),
+      entries: await this.ensureManagedEntry().then(async () => await this.repairManagedCommand()).then(async () => await this.entriesStatus()),
       servers,
       settings: this.options.settings.get(),
       cli,