dsh-home-hosted 0.4.0 → 0.4.2

package/lib/index.js

@@ -1974,39 +1974,53 @@ function expandHome(value) {
     return path6.join(os3.homedir(), value.slice(2));
   return value;
 }
+function resolveUnder(value, homeDir) {
+  if (value === "~")
+    return path6.resolve(homeDir);
+  if (value.startsWith("~/") || value.startsWith("~\\"))
+    return path6.resolve(path6.join(homeDir, value.slice(2)));
+  return path6.isAbsolute(value) ? path6.resolve(value) : path6.resolve(homeDir, value);
+}
 function dshHome() {
   const configured = process.env.DSH_HOME?.trim();
   return configured ? path6.resolve(expandHome(configured)) : path6.join(os3.homedir(), ".dsh");
 }
-function homeHostedHome() {
-  const configured = process.env.HHOSTED_HOME?.trim();
-  return configured ? path6.resolve(expandHome(configured)) : path6.join(os3.homedir(), ".home-hosted");
-}
 function resolveHomeHostedHome(stateDir, env = process.env, homeDir = os3.homedir()) {
   const configured = env.HHOSTED_HOME?.trim();
   if (configured)
-    return { home: path6.resolve(expandHome(configured)), source: "env" };
-  if (hasPanelState(path6.join(homeDir, ".home-hosted")))
-    return { home: path6.join(homeDir, ".home-hosted"), source: "legacy" };
-  return { home: path6.join(path6.resolve(expandHome(stateDir)), "panel"), source: "instance" };
+    return { home: resolveUnder(configured, homeDir), source: "env" };
+  const legacy = path6.join(homeDir, ".home-hosted");
+  if (hasLivePanel(legacy))
+    return { home: legacy, source: "legacy" };
+  return { home: path6.join(resolveUnder(stateDir, homeDir), "panel"), source: "instance" };
 }
-function hasPanelState(home) {
-  return ["servers.config.json", "run.json"].some((file) => {
-    try {
-      return fs7.statSync(path6.join(home, file)).isFile();
-    } catch {
+function hasLivePanel(home) {
+  try {
+    if (fs7.statSync(path6.join(home, "servers.config.json")).isFile())
+      return true;
+  } catch {
+  }
+  try {
+    const raw = JSON.parse(fs7.readFileSync(path6.join(home, "run.json"), "utf8"));
+    if (typeof raw.pid !== "number")
       return false;
-    }
-  });
+    process.kill(raw.pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
 }
 function bootUnitName(stateDir) {
-  if (isDefaultStateDir(stateDir))
+  if (isMachineDefaultStateDir(stateDir))
     return "home-hosted";
-  return `home-hosted-${crypto.createHash("sha256").update(path6.resolve(stateDir)).digest("hex").slice(0, 8)}`;
+  const key = path6.resolve(expandHome(stateDir?.trim() ?? ""));
+  return `home-hosted-${crypto.createHash("sha256").update(key).digest("hex").slice(0, 8)}`;
 }
-function isDefaultStateDir(stateDir) {
+function isMachineDefaultStateDir(stateDir) {
   const bare = stateDir?.trim();
-  return bare === void 0 || bare.length === 0 || path6.resolve(expandHome(bare)) === path6.join(dshHome(), "dsh-home-hosted");
+  if (bare === void 0 || bare.length === 0)
+    return true;
+  return path6.resolve(expandHome(bare)) === path6.join(os3.homedir(), ".dsh", "dsh-home-hosted");
 }
 function pluginStateDir(override) {
   const configured = override?.trim();
@@ -2014,13 +2028,13 @@ function pluginStateDir(override) {
     return path6.resolve(expandHome(configured));
   return path6.join(dshHome(), "dsh-home-hosted");
 }
-function runtimeFile(home = homeHostedHome()) {
+function runtimeFile(home) {
   return path6.join(home, "run.json");
 }
-function secretsFile(home = homeHostedHome()) {
+function secretsFile(home) {
   return path6.join(home, ".control-secrets.json");
 }
-function configFile(home = homeHostedHome()) {
+function configFile(home) {
   return path6.join(home, "servers.config.json");
 }
 
@@ -2081,6 +2095,7 @@ import process7 from "node:process";
 import fs9 from "node:fs";
 import path7 from "node:path";
 import process4 from "node:process";
+var LEGACY_BOOT_UNIT_NAME = "home-hosted";
 async function which(command) {
   const probe = process4.platform === "win32" ? "where.exe" : "which";
   const result = await run(probe, [command], { timeoutMs: 5e3 });
@@ -2138,8 +2153,8 @@ function buildHomeHostedBootSpec(facts, launch, options) {
     env: homeHostedEnv(facts, launch),
     marker: options.marker ?? "managed by dsh-home-hosted",
     // One artifact per state root, so two plugin instances cannot overwrite or
-    // delete each other's entry. The default install keeps the historical name.
-    unitName: bootUnitName(options.stateDir),
+    // delete each other's entry. The machine-default install keeps the old name.
+    unitName: options.unitName ?? bootUnitName(options.stateDir),
     label: "home-hosted control panel",
     logDir
   };
@@ -2836,10 +2851,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({
@@ -2880,6 +2933,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] };
@@ -2894,13 +2950,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));
@@ -2915,23 +2982,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;
@@ -2949,7 +3017,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",
@@ -2959,7 +3029,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",
@@ -3190,6 +3260,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 {
@@ -3231,7 +3306,7 @@ async function runCli(deps, command) {
     return await deps.exec(args, deps.env);
   const launch = deps.launch;
   if (launch === null)
-    return { code: null, stdout: "", stderr: "no home-hosted CLI is available" };
+    return { code: null, stdout: "", stderr: "no home-hosted CLI is available", error: null };
   return await run(launch.program, args, {
     env: deps.env,
     timeoutMs: deps.timeoutMs ?? 9e4
@@ -3249,7 +3324,7 @@ async function startPanel(deps) {
 async function stopPanel(deps) {
   const result = await runCli(deps, "down");
   if (result.code !== 0) {
-    const detail = result.stderr.trim() || result.stdout.trim() || `the CLI exited ${String(result.code)}`;
+    const detail = result.error ?? (result.stderr.trim() || result.stdout.trim() || `the CLI exited ${String(result.code)}`);
     return { ok: false, detail: `the panel did not stop: ${detail}` };
   }
   return { ok: true, detail: "the panel stopped; the servers it supervised stopped with it" };
@@ -3573,13 +3648,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
     });
   }
   // -------------------------------------------------------------------------
@@ -4015,7 +4096,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 };
   }
@@ -4030,7 +4112,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;
@@ -4270,7 +4353,7 @@ var HomeHostedService = class extends Service {
         version: runtime?.version ?? null
       },
       launch,
-      { stateDir: this.options.stateDir }
+      { stateDir: this.options.stateDir, unitName: bootUnitName(this.options.stateDir) }
     );
     if (launcher !== null) {
       const cliArgs2 = spec.args.slice(launch.args.length);
@@ -4310,6 +4393,8 @@ var HomeHostedService = class extends Service {
     if (spec === null)
       throw new HomeHostedError((await this.cli()).resolution.status.detail, "CLI_NOT_FOUND");
     const result = await this.ladder().install(spec, mechanism);
+    if (result.ok)
+      await this.retireLegacyBootEntry(spec, mechanism);
     const current = this.options.settings.get().autostart;
     this.options.settings.update({
       autostart: {
@@ -4334,6 +4419,8 @@ var HomeHostedService = class extends Service {
     if (spec === null)
       throw new HomeHostedError((await this.cli()).resolution.status.detail, "CLI_NOT_FOUND");
     const result = await this.ladder().uninstall(spec, mechanism);
+    if (result.ok)
+      await this.retireLegacyBootEntry(spec, mechanism);
     const current = this.options.settings.get().autostart;
     this.options.settings.update({
       autostart: {
@@ -4351,6 +4438,28 @@ var HomeHostedService = class extends Service {
     });
     return { result, status: await this.bootStatus(mechanism) };
   }
+  /**
+   * Remove the pre-per-instance artifact once this state root has its own.
+   *
+   * An install that used to write `home-hosted` now writes `home-hosted-<hash>`,
+   * and a machine left with both would autostart the panel twice — or keep
+   * starting it from an entry the page no longer reports. Only an artifact
+   * carrying this plugin's marker is touched, so somebody else's unit survives.
+   */
+  async retireLegacyBootEntry(spec, mechanism) {
+    if (spec.unitName === LEGACY_BOOT_UNIT_NAME)
+      return;
+    const legacy = { ...spec, unitName: LEGACY_BOOT_UNIT_NAME };
+    try {
+      const status = await this.ladder().status(legacy, mechanism);
+      if (status.unitPath === null || status.state === "not-installed" || status.state === "unsupported")
+        return;
+      if (!fs15.existsSync(status.unitPath))
+        return;
+      await this.ladder().uninstall(legacy, status.mechanism ?? mechanism);
+    } catch {
+    }
+  }
   // -------------------------------------------------------------------------
   // Panel lifecycle
   // -------------------------------------------------------------------------
@@ -4436,7 +4545,29 @@ var HomeHostedService = class extends Service {
    */
   async reconcile() {
     await this.ensureManagedEntry();
+    await this.repairManagedCommand();
     await this.repairBootEntry();
+    await this.migrateBootEntryName();
+  }
+  /**
+   * An upgrade from a release that named every artifact `home-hosted` leaves
+   * that one behind while this state root now writes its own name. Once our own
+   * artifact is in place, the old one is retired — otherwise the machine
+   * autostarts the panel twice, or from an entry the page no longer reports.
+   */
+  async migrateBootEntryName() {
+    if (!this.options.settings.get().autostart.enabled)
+      return;
+    const spec = await this.bootSpec();
+    if (spec === null || spec.unitName === LEGACY_BOOT_UNIT_NAME)
+      return;
+    try {
+      const own = await this.bootStatus();
+      if (own.state !== "enabled-running" && own.state !== "enabled-failing" && own.state !== "installed-disabled")
+        return;
+      await this.retireLegacyBootEntry(spec, own.mechanism ?? void 0);
+    } catch {
+    }
   }
   /**
    * Put back a managed entry that no longer exists, while its intent still wants
@@ -4463,6 +4594,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)
@@ -4516,7 +4675,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,