dsh-home-hosted 0.2.0 → 0.2.2

package/lib/index.js

@@ -39,6 +39,8 @@ var DEFAULT_SETTINGS = {
   // Every tool on by default; the session's own permission mode is what gates them.
   agentTools: { enabled: true, allow: [...AGENT_TOOL_NAMES] },
   panel: { port: null },
+  authNotice: true,
+  uiStyle: "detailed",
   cli: { prefer: "pinned" }
 };
 
@@ -2179,18 +2181,20 @@ function defaultIntent(id, platform = process.platform) {
     id,
     autostart: true,
     onPortConflict: defaultOnPortConflict(platform),
-    stopKillPortHolders: true
+    stopKillPortHolders: true,
+    persistent: true
   };
 }
-function ownedPatch(intent, live) {
+function ownedPatch(intent, live, options = {}) {
   const stop = live?.stop ?? {};
   return {
     autostart: intent.autostart,
     onPortConflict: intent.onPortConflict,
+    ...options.persistent === false ? {} : { persistent: intent.persistent },
     stop: { ...stop, killPortHolders: intent.stopKillPortHolders }
   };
 }
-function ownedDrift(live, intent) {
+function ownedDrift(live, intent, options = {}) {
   if (live === null)
     return ["missing entry"];
   const drift = [];
@@ -2198,6 +2202,8 @@ function ownedDrift(live, intent) {
     drift.push("autostart");
   if (live.onPortConflict !== intent.onPortConflict)
     drift.push("onPortConflict");
+  if (options.persistent !== false && (live.persistent ?? false) !== intent.persistent)
+    drift.push("persistent");
   const killPortHolders = live.stop?.killPortHolders;
   if (killPortHolders !== intent.stopKillPortHolders)
     drift.push("stop.killPortHolders");
@@ -2209,6 +2215,7 @@ function snapshotOwned(live) {
     id: live.id,
     autostart: typeof live.autostart === "boolean" ? live.autostart : false,
     onPortConflict: isOnPortConflict(live.onPortConflict) ? live.onPortConflict : "block",
+    persistent: live.persistent === true,
     stop: { killPortHolders: typeof killPortHolders === "boolean" ? killPortHolders : false }
   };
 }
@@ -2218,6 +2225,7 @@ function restorePatch(live, snapshot) {
   return {
     autostart: snapshot?.autostart ?? false,
     onPortConflict: snapshot?.onPortConflict ?? "block",
+    persistent: snapshot?.persistent === true,
     stop: {
       ...stop,
       killPortHolders: typeof previous.killPortHolders === "boolean" ? previous.killPortHolders : false
@@ -2230,9 +2238,10 @@ import { createRequire } from "node:module";
 import fs9 from "node:fs";
 import path9 from "node:path";
 import process6 from "node:process";
-var EXPECTED_RANGE = "^0.6.1";
+var EXPECTED_RANGE = "^0.6.4";
 var MIN_SUPPORTED_VERSION = "0.4.1";
 var MIN_KILL_VERSION = "0.6.0";
+var MIN_PERSISTENT_VERSION = "0.6.3";
 function pinnedManifestPath() {
   try {
     return createRequire(import.meta.url).resolve("home-hosted/package.json");
@@ -2988,6 +2997,13 @@ var HomeHostedService = class extends Service {
   // -------------------------------------------------------------------------
   // Panel
   // -------------------------------------------------------------------------
+  /** The panel page showing this session's log, where its tokenised URL is. */
+  panelLogUrl() {
+    const url = this.runtime()?.url;
+    if (url === void 0 || url.length === 0)
+      return null;
+    return `${url.replace(/\/+$/, "")}/logs?server=${encodeURIComponent(this.options.defaultEntryId)}`;
+  }
   /** The port the panel's config holds, without touching a running panel. */
   configuredPort() {
     const control = readConfig(this.options.home).raw?.control;
@@ -3101,7 +3117,7 @@ var HomeHostedService = class extends Service {
       snapshots[intent.id] = live === null ? { id: intent.id } : snapshotOwned(live.config);
       this.saveSnapshots(snapshots);
     }
-    const patch = ownedPatch(intent, live?.config ?? null);
+    const patch = ownedPatch(intent, live?.config ?? null, { persistent: await this.supportsPersistent() });
     const client = await this.tryClient();
     if (client !== null) {
       if (live !== null) {
@@ -3153,6 +3169,11 @@ var HomeHostedService = class extends Service {
     const { resolution } = await this.cli();
     return resolution.status.version;
   }
+  /** Whether the panel whose schema parses our write knows `persistent`. */
+  async supportsPersistent() {
+    const version = await this.configVersion();
+    return version !== null && compareVersions(version, MIN_PERSISTENT_VERSION) >= 0;
+  }
   async assertPolicySupported(intent) {
     if (intent.onPortConflict !== "kill")
       return;
@@ -3180,7 +3201,8 @@ var HomeHostedService = class extends Service {
         id: raw.id,
         autostart: raw.autostart === true,
         onPortConflict: isOnPortConflict(requested) ? requested : fallback.onPortConflict,
-        stopKillPortHolders: raw.stopKillPortHolders ?? fallback.stopKillPortHolders
+        stopKillPortHolders: raw.stopKillPortHolders ?? fallback.stopKillPortHolders,
+        persistent: raw.persistent ?? fallback.persistent
       };
       await this.assertPolicySupported(intent);
       await this.writeOwned(intent);
@@ -3318,6 +3340,7 @@ var HomeHostedService = class extends Service {
     const settings = this.options.settings.get();
     const live = await this.liveEntries();
     const snapshots = this.snapshots();
+    const persistent = await this.supportsPersistent();
     const ids = /* @__PURE__ */ new Set([this.options.defaultEntryId, ...settings.entries.map((entry) => entry.id)]);
     return [...ids].map((id) => {
       const intent = this.options.settings.intentFor(id);
@@ -3326,7 +3349,7 @@ var HomeHostedService = class extends Service {
         intent,
         exists: entry !== null,
         managed: snapshots[id] !== void 0,
-        drift: entry === null ? ["missing entry"] : ownedDrift(entry.config, intent),
+        drift: entry === null ? ["missing entry"] : ownedDrift(entry.config, intent, { persistent }),
         live: entry?.view ?? null,
         snapshot: snapshots[id] ?? null
       };
@@ -3680,6 +3703,76 @@ function registerRpc(ctx, service) {
   });
 }
 
+// src/home-hosted/web-notice.ts
+var STOCK_UNAUTHORIZED = "dsh web authentication required; reopen the URL printed by dsh web.";
+function authNoticeBody(logUrl) {
+  if (logUrl === null)
+    return `${STOCK_UNAUTHORIZED}
+`;
+  return `${STOCK_UNAUTHORIZED}
+home-hosted: the URL with its token is in the dsh log at ${logUrl}. An authentication plugin can sign you in seamlessly instead.
+`;
+}
+function wrap(auth, logUrlOf) {
+  const original = auth.writeUnauthorized.bind(auth);
+  auth.writeUnauthorized = (req, res) => {
+    const response = res;
+    const end = response.end;
+    if (typeof end !== "function" || response.writableEnded === true) {
+      original(req, res);
+      return;
+    }
+    let restored = false;
+    const restore = () => {
+      if (restored) return;
+      restored = true;
+      try {
+        response.end = end;
+      } catch {
+      }
+    };
+    try {
+      response.end = (...args) => {
+        restore();
+        const [chunk, ...rest] = args;
+        let body = chunk;
+        if (typeof chunk === "string" && chunk.trim() === STOCK_UNAUTHORIZED) {
+          try {
+            body = authNoticeBody(logUrlOf());
+          } catch {
+            body = chunk;
+          }
+        }
+        return end.call(response, body, ...rest);
+      };
+    } catch {
+      original(req, res);
+      return;
+    }
+    try {
+      response.once?.("finish", restore);
+      response.once?.("close", restore);
+    } catch {
+    }
+    original(req, res);
+  };
+  return () => {
+    auth.writeUnauthorized = original;
+  };
+}
+function registerAuthNotice(ctx, logUrlOf) {
+  ctx.inject(["connection"], (scoped) => {
+    scoped.effect(() => {
+      const connection = scoped.get("connection");
+      const auth = connection?.browserAuth;
+      if (typeof auth?.writeUnauthorized !== "function")
+        return () => {
+        };
+      return wrap(auth, logUrlOf);
+    }, "dsh-home-hosted: sign-in notice");
+  });
+}
+
 // src/settings.ts
 function knownTool(value) {
   return typeof value === "string" && AGENT_TOOL_NAMES.includes(value);
@@ -3689,6 +3782,8 @@ function normalizeIntent(value, fallbackId) {
   return {
     id: base.id,
     autostart: typeof value?.autostart === "boolean" ? value.autostart : base.autostart,
+    // Absent means a stored intent from before persistence existed: it wants it.
+    persistent: typeof value?.persistent === "boolean" ? value.persistent : base.persistent,
     // Only a policy the panel's own schema parses may reach the config it boots from.
     onPortConflict: isOnPortConflict(value?.onPortConflict) ? value.onPortConflict : base.onPortConflict,
     stopKillPortHolders: typeof value?.stopKillPortHolders === "boolean" ? value.stopKillPortHolders : base.stopKillPortHolders
@@ -3735,6 +3830,8 @@ function normalize(raw, fallbackEntryId) {
       // and a value it cannot parse stops it booting at all.
       port: typeof raw?.panel?.port === "number" && Number.isInteger(raw.panel.port) && raw.panel.port >= 1 && raw.panel.port <= 65535 ? raw.panel.port : null
     },
+    authNotice: raw?.authNotice === void 0 ? DEFAULT_SETTINGS.authNotice : raw.authNotice === true,
+    uiStyle: raw?.uiStyle === "compact" ? "compact" : "detailed",
     agentTools: {
       // Absent means the default (on), and so does the pair the previous
       // release wrote for it; any other explicit false stays false.
@@ -3770,6 +3867,8 @@ var SettingsStore = class {
       manageDsh: patch.manageDsh ?? this.current.manageDsh,
       entries: patch.entries ?? this.current.entries,
       panel: { ...this.current.panel, ...patch.panel ?? {} },
+      authNotice: patch.authNotice ?? this.current.authNotice,
+      uiStyle: patch.uiStyle ?? this.current.uiStyle,
       agentTools: { ...this.current.agentTools, ...patch.agentTools ?? {} },
       cli: { ...this.current.cli, ...patch.cli ?? {} }
     }, this.fallbackEntryId);
@@ -3989,6 +4088,7 @@ function apply(ctx, config) {
   });
   registerRpc(ctx, service);
   registerAgentTools(ctx, service, settings);
+  registerAuthNotice(ctx, () => settings.get().authNotice ? service.panelLogUrl() : null);
   ctx.effect(() => {
     const timer = setTimeout(() => {
       void service.reconcile().catch(() => {