dsh-home-hosted 0.3.1 → 0.3.2

package/lib/index.js

@@ -170,12 +170,6 @@ function writeJsonAtomic(file, value, mode) {
   writeFileAtomic(file, `${JSON.stringify(value, null, 2)}
 `, mode);
 }
-function removeFile(file) {
-  try {
-    fs.rmSync(file, { force: true });
-  } catch {
-  }
-}
 
 // src/boot/common.ts
 function errorMessage(error) {
@@ -2114,7 +2108,7 @@ import { createRequire } from "node:module";
 import fs9 from "node:fs";
 import path8 from "node:path";
 import process5 from "node:process";
-var EXPECTED_RANGE = "^0.6.4";
+var EXPECTED_RANGE = "^0.6.6";
 var MIN_SUPPORTED_VERSION = "0.4.1";
 var MIN_KILL_VERSION = "0.6.0";
 var MIN_PERSISTENT_VERSION = "0.6.3";
@@ -3230,20 +3224,12 @@ async function enrollToken(options) {
   return { token, enrolled: true, detail: "enrolled a new panel API token" };
 }
 async function enrollFreshToken(options) {
-  const cleared = await runCli2(options.exec, ["--home", options.home, "set-token", "--clear"], {});
-  if (cleared.result === void 0) {
-    return {
-      token: null,
-      detail: `could not clear the old API token: ${cleared.failure ?? "the CLI did not answer"}`
-    };
-  }
   const token = generateToken();
   const enrolled = await runCli2(options.exec, ["--home", options.home, "set-token"], { HHOSTED_TOKEN: token });
   if (enrolled.result === void 0) {
-    removeFile(storedTokenPath(options.stateDir));
     return {
       token: null,
-      detail: `the old API token was cleared, but a new one could not be enrolled: ${enrolled.failure ?? "the CLI did not answer"}; retrying is safe`
+      detail: `could not enrol a fresh API token: ${enrolled.failure ?? "the CLI did not answer"}; the previously stored token was kept`
     };
   }
   storeToken(options.stateDir, token);
@@ -3253,6 +3239,7 @@ async function enrollFreshToken(options) {
 // src/service.ts
 var ENTRY_ID_PATTERN = /^[a-z0-9][a-z0-9_-]*$/;
 var TOKEN_PROBE_TIMEOUT_MS = 3e3;
+var ENTRY_RECOVERY_INTERVAL_MS = 3e4;
 function pluginRoot() {
   try {
     return path13.dirname(path13.dirname(fileURLToPath(import.meta.url)));
@@ -3277,6 +3264,8 @@ var HomeHostedService = class extends Service {
   /** The last token this service proved against a panel, so a poll does not re-probe it. */
   tokenProof = null;
   tokenDetail = "";
+  /** When a missing managed entry was last put back, so a poll cannot become a write loop. */
+  entryRecoveryAt = 0;
   snapshotsFile;
   async resolveDsh(dshHome2) {
     return await (this.options.resolveDsh ?? ((options) => resolveDshLaunch(options)))({
@@ -3421,26 +3410,30 @@ var HomeHostedService = class extends Service {
       writeVia,
       token,
       tokenVerified,
-      detail: answered ? token === "enrolled" ? this.tokenDetail || "the panel is answering and this plugin holds a token" : token === "stale" ? "the panel refused this plugin's API token, so writes go straight to servers.config.json; regenerate the token" : token === "present" ? "the panel is answering, but home-hosted already holds an API token this plugin does not have" : token === "absent" ? "the panel is answering; a token will be enrolled on the first write" : "the panel answered, but the plugin's token could not be checked" : runtime === null ? "no run.json: the panel is not running, so entries are written straight to servers.config.json" : reachable ? "the panel process is alive but is not answering" : "the panel is not running"
+      detail: answered ? token === "enrolled" ? this.tokenDetail || "the panel is answering and this plugin holds a token" : token === "stale" ? "the panel refused this plugin's API token, so writes go straight to servers.config.json; regenerate the token" : token === "present" ? "the panel is answering, but home-hosted already holds an API token this plugin does not have" : token === "absent" ? "the panel is answering but no API token is enrolled for it yet; writes go to servers.config.json until one is" : "the panel answered, but the plugin's token could not be checked" : runtime === null ? "no run.json: the panel is not running, so entries are written straight to servers.config.json" : token === "present" || token === "stale" ? "the panel process is up but does not answer with this plugin's API token, so this page cannot reach it" : "the panel process is alive but is not answering"
     };
   }
   /**
    * Replace the panel's API token with a fresh one and prove it.
    *
    * home-hosted keeps only a hash, so a token this plugin does not hold cannot
-   * be recovered: the old hash is cleared, a new token is enrolled through the
-   * CLI, and it is proved against the answering panel before being reported.
-   * Nothing is written when the CLI cannot run, and a panel that is not
-   * answering is refused up front rather than left with an unverifiable token.
+   * be recovered: a new token replaces the old hash in one CLI write, and it is
+   * proved against the answering panel before being reported.
+   *
+   * The panel is not required to be *answering*: a missing or refused token is a
+   * common reason it cannot be reached at all, and refusing the repair for that
+   * reason would leave no way out from the page. Only a panel that was never
+   * started is refused — there is nothing to enrol a token against yet.
    */
   async reclaimPanelToken() {
     const runtime = this.runtime();
-    if (runtime === null || !await probePanel(runtime.url)) {
+    if (runtime === null) {
       throw new HomeHostedError(
-        "the panel is not answering, so a regenerated token could not be verified; start the panel first",
+        "the panel has not been started, so there is nothing to enrol a token against; start it first",
         "PANEL_UNAVAILABLE"
       );
     }
+    const answering = await probePanel(runtime.url);
     const result = await reclaimToken({
       home: this.options.home,
       stateDir: this.options.stateDir,
@@ -3451,6 +3444,10 @@ var HomeHostedService = class extends Service {
     this.tokenDetail = result.detail;
     if (result.token === null)
       throw new HomeHostedError(result.detail, "TOKEN_RECLAIM_FAILED");
+    if (!answering) {
+      this.tokenDetail = `${result.detail}; the panel is not answering, so it could not be proved yet`;
+      return await this.status();
+    }
     const probe = await probeToken(runtime.url, result.token, TOKEN_PROBE_TIMEOUT_MS);
     if (probe !== "ok") {
       throw new HomeHostedError(
@@ -3650,8 +3647,9 @@ var HomeHostedService = class extends Service {
       entries.push(intent);
       this.options.settings.update({
         // The page's toggle reads this flag, so managing the harness has to record
-        // itself; restoring or removing that entry clears it again.
-        ...intent.id === this.options.defaultEntryId ? { manageDsh: true } : {},
+        // itself; restoring or removing that entry clears it again. A paused intent
+        // (`autostart: false`) is not management, or the toggle could never go off.
+        ...intent.id === this.options.defaultEntryId ? { manageDsh: intent.autostart } : {},
         entries
       });
     }
@@ -3958,6 +3956,36 @@ var HomeHostedService = class extends Service {
    * an explicit click or an approved tool call, not as a side effect of startup.
    */
   async reconcile() {
+    await this.ensureManagedEntry();
+    await this.repairBootEntry();
+  }
+  /**
+   * Put back a managed entry that no longer exists, while its intent still wants
+   * autostart. A paused intent is a deliberate stop and is left alone.
+   *
+   * Called from startup `reconcile()` as well as the status read, because a person
+   * who deletes the entry from the panel is looking at the page right then — not
+   * at the next plugin start. A failed attempt is not repeated for a while, so a
+   * config that cannot be written does not turn every poll into a write.
+   */
+  async ensureManagedEntry() {
+    const { settings } = this.options;
+    const id = this.options.defaultEntryId;
+    if (!settings.get().manageDsh || !settings.intentFor(id).autostart)
+      return;
+    const now = Date.now();
+    if (now - this.entryRecoveryAt < ENTRY_RECOVERY_INTERVAL_MS)
+      return;
+    this.entryRecoveryAt = now;
+    if ((await this.entriesStatus()).every((entry) => entry.intent.id !== id || entry.exists))
+      return;
+    try {
+      await this.writeOwned({ ...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)
       return;
     const status = await this.bootStatus();
@@ -4003,7 +4031,9 @@ var HomeHostedService = class extends Service {
       defaultEntryId: this.options.defaultEntryId,
       panel,
       boot: await this.bootStatus(),
-      entries: await this.entriesStatus(),
+      // 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()),
       servers,
       settings: this.options.settings.get(),
       cli,