herdr-remote 0.2.15 → 0.2.17

package/dist/tui.mjs

@@ -90,7 +90,10 @@ var require_config = __commonJS({
       herdr: {
         socketPath: null,
         args: [],
-        cwd: os.homedir()
+        cwd: os.homedir(),
+        // Start Herdr's server when herdr-remote starts (at boot, under keep-alive).
+        // Off: Herdr starts when the user runs it, or confirms it from the WebUI.
+        autoStart: false
       },
       auth: {
         pairingTtlMs: 10 * 60 * 1e3,
@@ -251,6 +254,7 @@ var require_config = __commonJS({
       if (typeof config.herdr.cwd !== "string" || config.herdr.cwd.length === 0) {
         config.herdr.cwd = os.homedir();
       }
+      config.herdr.autoStart = config.herdr.autoStart === true;
       if (config.relay.mode === "remote" && !config.relay.remoteUrl) {
         config.relay.mode = "local";
       }
@@ -411,6 +415,9 @@ var require_updater = __commonJS({
       }
       return "npm";
     }
+    function updateChecksEnabled2(env = process.env) {
+      return env.HERDR_REMOTE_UPDATE_CHECK !== "0";
+    }
     function canSelfUpdate2() {
       return installKind2() === "npm";
     }
@@ -462,92 +469,173 @@ var require_updater = __commonJS({
       }
       return 0;
     }
-    async function askRegistry(registry, { timeoutMs, fetchImpl }) {
+    async function fetchJson(url, { timeoutMs, fetchImpl }) {
       const controller = new AbortController();
       const timer = setTimeout(() => controller.abort(), timeoutMs);
       try {
-        const response = await fetchImpl(`${registry}/${PACKAGE_NAME}/latest`, {
+        const response = await fetchImpl(url, {
           signal: controller.signal,
-          headers: { Accept: "application/vnd.npm.install-v1+json" }
+          headers: { Accept: "application/json", "Cache-Control": "no-cache" }
         });
         if (!response.ok) return { ok: false, message: `HTTP ${response.status ?? "?"}` };
-        const body = await response.json();
-        const latest = typeof body?.version === "string" ? body.version : null;
-        if (!latest) return { ok: false, message: "registry answered without a version" };
-        return { ok: true, latest };
+        return { ok: true, body: await response.json() };
       } catch (error) {
         return { ok: false, message: error?.name === "AbortError" ? "timed out" : String(error?.message || error) };
       } finally {
         clearTimeout(timer);
       }
     }
+    async function askRegistry(registry, { timeoutMs, fetchImpl }) {
+      const endpoints = [
+        { url: `${registry}/-/package/${PACKAGE_NAME}/dist-tags`, read: (body) => body?.latest },
+        { url: `${registry}/${PACKAGE_NAME}/latest`, read: (body) => body?.version }
+      ];
+      let message = null;
+      for (const endpoint of endpoints) {
+        const attempt = await fetchJson(endpoint.url, { timeoutMs, fetchImpl });
+        if (!attempt.ok) {
+          message = attempt.message;
+          continue;
+        }
+        const latest = endpoint.read(attempt.body);
+        if (typeof latest === "string" && latest) return { ok: true, latest };
+        message = "registry answered without a version";
+      }
+      return { ok: false, message };
+    }
     async function checkForUpdate2({
       timeoutMs = 6e3,
       fetchImpl = globalThis.fetch,
       registries = registryCandidates()
     } = {}) {
       const current = currentVersion();
-      const failures = [];
-      for (const registry of registries) {
-        const attempt = await askRegistry(registry, { timeoutMs, fetchImpl });
-        if (attempt.ok) {
-          return {
-            ok: true,
-            current,
-            latest: attempt.latest,
-            registry,
-            updateAvailable: compareVersions(attempt.latest, current) > 0
-          };
-        }
-        failures.push(`${registry}: ${attempt.message}`);
+      const attempts = await Promise.all(registries.map(async (registry) => ({
+        registry,
+        ...await askRegistry(registry, { timeoutMs, fetchImpl })
+      })));
+      const answers = attempts.filter((attempt) => attempt.ok);
+      if (answers.length === 0) {
+        return {
+          ok: false,
+          current,
+          errorKey: "update.errorNetwork",
+          message: attempts.map((attempt) => `${attempt.registry}: ${attempt.message}`).join("; "),
+          triedRegistries: registries
+        };
       }
+      const latest = answers.map((answer) => answer.latest).reduce((best, version) => compareVersions(version, best) > 0 ? version : best);
+      const sources = answers.filter((answer) => compareVersions(answer.latest, latest) === 0).map((answer) => answer.registry);
+      const behind = answers.filter((answer) => compareVersions(answer.latest, latest) < 0).map((answer) => ({ registry: answer.registry, version: answer.latest }));
       return {
-        ok: false,
+        ok: true,
         current,
-        errorKey: "update.errorNetwork",
-        message: failures.join("; "),
-        triedRegistries: registries
+        latest,
+        registry: sources[0],
+        sources,
+        behind,
+        updateAvailable: compareVersions(latest, current) > 0
       };
     }
-    function performUpdate2({
-      spawnImpl = spawn,
-      timeoutMs = 18e4,
-      // Seam for tests: the suite runs from a checkout, where the guard below is
-      // correctly the only reachable outcome.
-      installKindImpl = installKind2,
-      // The registry that just answered the version check. Installing from
-      // somewhere the machine has been shown to reach beats installing from a
-      // default it may have no route to. Empty means "whatever npm is configured
-      // with", which is the right answer when no check has run.
-      registry = ""
-    } = {}) {
+    function npmErrorSummary(output) {
+      const lines = String(output || "").split(/\r?\n/).map((line) => line.trim()).filter((line) => /^npm (error|ERR!)/.test(line) && !/complete log of this run/i.test(line)).map((line) => line.replace(/^npm (error|ERR!)\s*/, "")).filter(Boolean);
+      return (lines.length > 0 ? lines.slice(0, 3) : String(output || "").trim().split(/\r?\n/).slice(-3)).join(" ");
+    }
+    function isNotYetPublished(output) {
+      return /\bETARGET\b|notarget|No matching version found/i.test(String(output || ""));
+    }
+    function installedVersionOnDisk() {
+      try {
+        return JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, "package.json"), "utf8")).version;
+      } catch {
+        return null;
+      }
+    }
+    function runNpm(spawnImpl, args, timeoutMs) {
       return new Promise((resolve) => {
-        const kind = installKindImpl();
-        if (kind !== "npm") {
-          resolve({ ok: false, errorKey: `update.cannot.${kind}` });
+        let child;
+        try {
+          child = spawnImpl("npm", args, { timeout: timeoutMs });
+        } catch (error) {
+          resolve({ ok: false, spawnFailed: true, output: String(error?.message || error) });
           return;
         }
-        const args = ["install", "-g", `${PACKAGE_NAME}@latest`];
-        const normalizedRegistry = normalizeRegistry(registry);
-        if (normalizedRegistry) args.push("--registry", normalizedRegistry);
-        const child = spawnImpl("npm", args, {
-          encoding: "utf8",
-          timeout: timeoutMs
-        });
         let output = "";
+        let settled = false;
+        const finish = (result) => {
+          if (!settled) {
+            settled = true;
+            resolve(result);
+          }
+        };
         const collect = (chunk) => {
           output += String(chunk);
         };
         child.stdout?.on("data", collect);
         child.stderr?.on("data", collect);
-        child.on("error", (error) => {
-          resolve({ ok: false, errorKey: "update.errorFailed", output: error.message });
-        });
-        child.on("close", (code) => {
-          resolve({ ok: code === 0, output: output.trim().slice(-2e3) });
-        });
+        child.on("error", (error) => finish({ ok: false, spawnFailed: true, output: error.message }));
+        child.on("close", (code) => finish({ ok: code === 0, output: output.trim() }));
       });
     }
+    var VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
+    async function performUpdate2({
+      spawnImpl = spawn,
+      timeoutMs = 18e4,
+      // Seam for tests: the suite runs from a checkout, where the guard below is
+      // correctly the only reachable outcome.
+      installKindImpl = installKind2,
+      // The registries that reported `version`, preferred first. Empty means
+      // "whatever npm is configured with", which is right when no check has run.
+      registry = "",
+      sources = [],
+      version = null,
+      attempts = 3,
+      retryDelayMs = 15e3,
+      sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+      readInstalledVersion = installedVersionOnDisk,
+      onAttempt = () => {
+      }
+    } = {}) {
+      const kind = installKindImpl();
+      if (kind !== "npm") return { ok: false, errorKey: `update.cannot.${kind}` };
+      const target = typeof version === "string" && VERSION_PATTERN.test(version) ? version : null;
+      const spec = `${PACKAGE_NAME}@${target || "latest"}`;
+      const registries = [];
+      for (const candidate of [registry, ...sources]) {
+        const normalized = normalizeRegistry(candidate);
+        if (normalized && !registries.includes(normalized)) registries.push(normalized);
+      }
+      if (registries.length === 0) registries.push("");
+      let last = { output: "" };
+      let notYetPublished = false;
+      for (const source of registries) {
+        for (let attempt = 1; attempt <= attempts; attempt += 1) {
+          onAttempt({ registry: source, attempt });
+          const args = ["install", "-g", spec, "--prefer-online"];
+          if (source) args.push("--registry", source);
+          const result = await runNpm(spawnImpl, args, timeoutMs);
+          if (result.ok) {
+            const installed = readInstalledVersion();
+            if (target && installed && compareVersions(installed, target) < 0) {
+              return { ok: false, errorKey: "update.errorNotApplied", installed, output: result.output.slice(-2e3) };
+            }
+            return { ok: true, installed, output: result.output.slice(-2e3) };
+          }
+          last = result;
+          if (result.spawnFailed) {
+            return { ok: false, errorKey: "update.errorFailed", output: result.output, summary: result.output };
+          }
+          notYetPublished = isNotYetPublished(result.output);
+          if (!notYetPublished) break;
+          if (attempt < attempts) await sleep(retryDelayMs);
+        }
+      }
+      return {
+        ok: false,
+        errorKey: notYetPublished ? "update.errorNotYetPublished" : "update.errorFailed",
+        output: String(last.output || "").slice(-2e3),
+        summary: npmErrorSummary(last.output)
+      };
+    }
     module.exports = {
       PACKAGE_NAME,
       DEFAULT_REGISTRY,
@@ -557,8 +645,11 @@ var require_updater = __commonJS({
       compareVersions,
       currentVersion,
       installKind: installKind2,
+      installedVersionOnDisk,
+      npmErrorSummary,
       performUpdate: performUpdate2,
-      registryCandidates
+      registryCandidates,
+      updateChecksEnabled: updateChecksEnabled2
     };
   }
 });
@@ -659,7 +750,7 @@ var require_herdr_command = __commonJS({
       if (!version) return true;
       return compareVersions(version, minimum) >= 0;
     }
-    function herdrVersion({ command, timeout = 1e4, ...lookup } = {}) {
+    function herdrVersion2({ command, timeout = 1e4, ...lookup } = {}) {
       const resolved = command || resolveHerdrCommand(lookup);
       const unknown = { command: resolved, version: null, raw: null, supported: true, ok: false };
       let result;
@@ -692,7 +783,7 @@ var require_herdr_command = __commonJS({
       findHerdrCommand,
       herdrNotFoundMessage,
       herdrOutdatedMessage,
-      herdrVersion,
+      herdrVersion: herdrVersion2,
       meetsMinimum,
       parseHerdrVersion,
       resolveHerdrCommand,
@@ -839,14 +930,7 @@ var require_en = __commonJS({
       "herdr.title": "Herdr integration",
       "herdr.socketPath": "Socket path",
       "herdr.args": "Extra arguments",
-      "herdr.plugin": "Plugin registration",
-      "herdr.pluginRegistered": "Registered with Herdr.",
-      "herdr.pluginMissing": "Not registered with Herdr.",
-      "herdr.register": "Register as Herdr plugin",
-      "herdr.unregister": "Unregister plugin",
-      "herdr.registerDone": "Registered: {path}",
-      "herdr.unregisterDone": "Plugin unregistered.",
-      "herdr.registerFailed": "Registration failed: {message}",
+      "herdr.autoStartHint": "Off: Herdr starts only when you run it, or when you confirm it from a browser. On: herdr-remote also starts it every time it starts, at boot included. Takes effect the next time herdr-remote starts.",
       "herdr.cliMissing": "Command herdr not found. Set HERDR_BIN_PATH to its full path.",
       "herdr.version": "Herdr version",
       "herdr.versionOutdated": 'Herdr {version} is older than {minimum}. Run "herdr update": window titles, background machine activation and large pastes misbehave in browser windows before that release.',
@@ -883,6 +967,7 @@ var require_en = __commonJS({
       "field.publicUrl": "Browser URL override",
       "field.socketPath": "Herdr socket path",
       "field.herdrArgs": "Herdr arguments",
+      "field.herdrAutoStart": "Auto-start Herdr",
       "field.language": "Language",
       "field.keepalive": "Keep-alive manager",
       "placeholder.autoDiscovered": "auto-discovered",
@@ -912,16 +997,22 @@ var require_en = __commonJS({
       "hint.save": "s save",
       "hint.editing": "\u21B5 confirm \xB7 esc cancel",
       "update.title": "Updates",
+      "update.banner": "herdr-remote {latest} is out (running {current}). Press 7 and Enter on the update row to install.",
       "update.check": "Check for updates",
       "update.checking": "Checking npm\u2026",
       "update.upToDate": "Up to date ({version})",
       "update.available": "Update {version} available (press Enter to install)",
       "update.updating": "Installing {version}\u2026",
+      "update.updatingRetry": "Installing {version}\u2026 (npm has not caught up yet, attempt {attempt})",
       "update.done": "Updated to {version}",
       "update.restartHint": "Update installed. Restart herdr-remote to apply.",
       "update.errorNetwork": "Could not reach any npm registry",
       "update.errorNetworkDetail": "No registry answered: {message}",
-      "update.errorFailed": "Update failed. Run: npm install -g herdr-remote@latest",
+      "update.errorFailed": "Update failed. Run: npm install -g herdr-remote@{version} --prefer-online",
+      "update.errorFailedDetail": "npm: {message}",
+      "update.errorNotYetPublished": "npm has not caught up with {version} yet (common in the first minutes after a release). Press Enter to try again shortly.",
+      "update.errorNotApplied": "npm reported success, but {installed} is still installed",
+      "update.mirrorBehind": "{registries} still has an older version; installing from {source}",
       "update.cannot.source": "Source checkout \u2014 update with git",
       "update.cannot.linked": "Linked package \u2014 managed by npm link"
     };
@@ -1066,14 +1157,7 @@ var require_zh = __commonJS({
       "herdr.title": "Herdr \u96C6\u6210",
       "herdr.socketPath": "\u5957\u63A5\u5B57\u8DEF\u5F84",
       "herdr.args": "\u9644\u52A0\u53C2\u6570",
-      "herdr.plugin": "\u63D2\u4EF6\u6CE8\u518C",
-      "herdr.pluginRegistered": "\u5DF2\u6CE8\u518C\u5230 Herdr\u3002",
-      "herdr.pluginMissing": "\u5C1A\u672A\u6CE8\u518C\u5230 Herdr\u3002",
-      "herdr.register": "\u6CE8\u518C\u4E3A Herdr \u63D2\u4EF6",
-      "herdr.unregister": "\u53D6\u6D88\u6CE8\u518C",
-      "herdr.registerDone": "\u5DF2\u6CE8\u518C\uFF1A{path}",
-      "herdr.unregisterDone": "\u5DF2\u53D6\u6D88\u6CE8\u518C\u3002",
-      "herdr.registerFailed": "\u6CE8\u518C\u5931\u8D25\uFF1A{message}",
+      "herdr.autoStartHint": "\u5173\uFF1AHerdr \u53EA\u5728\u4F60\u624B\u52A8\u8FD0\u884C\uFF0C\u6216\u5728\u6D4F\u89C8\u5668\u91CC\u786E\u8BA4\u540E\u624D\u542F\u52A8\u3002\u5F00\uFF1Aherdr-remote \u6BCF\u6B21\u542F\u52A8\uFF08\u5305\u62EC\u5F00\u673A\uFF09\u65F6\u4E00\u5E76\u542F\u52A8 Herdr\u3002\u4E0B\u6B21 herdr-remote \u542F\u52A8\u65F6\u751F\u6548\u3002",
       "herdr.cliMissing": "\u672A\u627E\u5230 herdr \u547D\u4EE4\uFF0C\u53EF\u5C06 HERDR_BIN_PATH \u8BBE\u4E3A\u5176\u5B8C\u6574\u8DEF\u5F84\u3002",
       "herdr.version": "Herdr \u7248\u672C",
       "herdr.versionOutdated": "Herdr {version} \u4F4E\u4E8E {minimum}\uFF0C\u8BF7\u8FD0\u884C \u201Cherdr update\u201D\uFF1A\u5728\u8BE5\u7248\u672C\u4E4B\u524D\uFF0C\u6D4F\u89C8\u5668\u7A97\u53E3\u7684\u6807\u9898\u3001\u540E\u53F0\u673A\u5668\u6FC0\u6D3B\u4E0E\u5927\u6BB5\u7C98\u8D34\u90FD\u4F1A\u51FA\u95EE\u9898\u3002",
@@ -1110,6 +1194,7 @@ var require_zh = __commonJS({
       "field.publicUrl": "\u6D4F\u89C8\u5668\u5730\u5740\uFF08\u8986\u76D6\uFF09",
       "field.socketPath": "Herdr \u5957\u63A5\u5B57\u8DEF\u5F84",
       "field.herdrArgs": "Herdr \u53C2\u6570",
+      "field.herdrAutoStart": "\u968F\u670D\u52A1\u542F\u52A8 Herdr",
       "field.language": "\u8BED\u8A00",
       "field.keepalive": "\u4FDD\u6D3B\u7BA1\u7406\u65B9\u5F0F",
       "placeholder.autoDiscovered": "\u81EA\u52A8\u63A2\u6D4B",
@@ -1139,16 +1224,22 @@ var require_zh = __commonJS({
       "hint.save": "s \u4FDD\u5B58",
       "hint.editing": "\u21B5 \u786E\u8BA4 \xB7 esc \u53D6\u6D88",
       "update.title": "\u66F4\u65B0",
+      "update.banner": "herdr-remote {latest} \u5DF2\u53D1\u5E03\uFF08\u5F53\u524D {current}\uFF09\uFF0C\u6309 7 \u8FDB\u5165\u300C\u8BED\u8A00\u4E0E\u5173\u4E8E\u300D\uFF0C\u5728\u66F4\u65B0\u4E00\u884C\u6309 Enter \u5B89\u88C5\u3002",
       "update.check": "\u68C0\u67E5\u66F4\u65B0",
       "update.checking": "\u67E5\u8BE2 npm \u4E2D\u2026",
       "update.upToDate": "\u5DF2\u662F\u6700\u65B0\uFF08{version}\uFF09",
       "update.available": "\u65B0\u7248\u672C {version} \u53EF\u7528\uFF08\u6309 Enter \u5B89\u88C5\uFF09",
       "update.updating": "\u5B89\u88C5 {version} \u4E2D\u2026",
+      "update.updatingRetry": "\u5B89\u88C5 {version} \u4E2D\u2026\uFF08npm \u5C1A\u672A\u540C\u6B65\uFF0C\u7B2C {attempt} \u6B21\u5C1D\u8BD5\uFF09",
       "update.done": "\u5DF2\u66F4\u65B0\u81F3 {version}",
       "update.restartHint": "\u66F4\u65B0\u5DF2\u5B89\u88C5\uFF0C\u91CD\u542F herdr-remote \u751F\u6548\u3002",
       "update.errorNetwork": "\u6240\u6709 npm registry \u5747\u65E0\u6CD5\u8FDE\u63A5",
       "update.errorNetworkDetail": "\u65E0 registry \u5E94\u7B54\uFF1A{message}",
-      "update.errorFailed": "\u66F4\u65B0\u5931\u8D25\uFF0C\u53EF\u624B\u52A8\u6267\u884C\uFF1Anpm install -g herdr-remote@latest",
+      "update.errorFailed": "\u66F4\u65B0\u5931\u8D25\uFF0C\u53EF\u624B\u52A8\u6267\u884C\uFF1Anpm install -g herdr-remote@{version} --prefer-online",
+      "update.errorFailedDetail": "npm\uFF1A{message}",
+      "update.errorNotYetPublished": "npm \u8FD8\u6CA1\u540C\u6B65\u5230 {version}\uFF08\u521A\u53D1\u5E03\u7684\u51E0\u5206\u949F\u5185\u5E38\u89C1\uFF09\uFF0C\u7A0D\u540E\u6309 Enter \u91CD\u8BD5\u3002",
+      "update.errorNotApplied": "npm \u62A5\u544A\u6210\u529F\uFF0C\u4F46\u5B89\u88C5\u7684\u4ECD\u662F {installed}",
+      "update.mirrorBehind": "{registries} \u4ECD\u662F\u65E7\u7248\u672C\uFF0C\u5C06\u4ECE {source} \u5B89\u88C5",
       "update.cannot.source": "\u6E90\u7801\u76EE\u5F55\u8FD0\u884C\uFF0C\u8BF7\u4F7F\u7528 git \u66F4\u65B0",
       "update.cannot.linked": "npm link \u5DE5\u4F5C\u526F\u672C\uFF0C\u7531 npm link \u7BA1\u7406"
     };
@@ -1334,6 +1425,7 @@ var require_settings_model = __commonJS({
       { id: "publicUrl", kind: "text", labelKey: "field.publicUrl" },
       { id: "socketPath", kind: "text", labelKey: "field.socketPath" },
       { id: "herdrArgs", kind: "text", labelKey: "field.herdrArgs" },
+      { id: "herdrAutoStart", kind: "toggle", labelKey: "field.herdrAutoStart" },
       { id: "language", kind: "choice", choices: LANGUAGES, labelKey: "field.language" },
       { id: "keepaliveManager", kind: "choice", choices: KEEPALIVE_MANAGERS, labelKey: "field.keepalive" }
     ];
@@ -1371,6 +1463,8 @@ var require_settings_model = __commonJS({
           return draft.herdr.socketPath || EMPTY;
         case "herdrArgs":
           return (draft.herdr.args || []).join(" ");
+        case "herdrAutoStart":
+          return draft.herdr.autoStart ? "on" : "off";
         case "language":
           return draft.ui.language;
         case "keepaliveManager":
@@ -1464,6 +1558,13 @@ var require_settings_model = __commonJS({
           next.herdr.args = args;
           break;
         }
+        case "herdrAutoStart": {
+          if (value !== true && value !== false && value !== "on" && value !== "off") {
+            return { draft, errorKey: "error.unknownField" };
+          }
+          next.herdr.autoStart = value === true || value === "on";
+          break;
+        }
         case "language": {
           if (!LANGUAGES.includes(value)) return { draft, errorKey: "error.invalidLanguage" };
           next.ui.language = value;
@@ -1509,7 +1610,8 @@ var require_settings_model = __commonJS({
       merged.herdr = {
         ...current.herdr || {},
         socketPath: draft.herdr.socketPath,
-        args: draft.herdr.args
+        args: draft.herdr.args,
+        autoStart: draft.herdr.autoStart === true
       };
       if (!merged.herdr.socketPath) delete merged.herdr.socketPath;
       merged.keepalive = { ...current.keepalive || {}, manager: draft.keepalive.manager };
@@ -1758,7 +1860,12 @@ var require_socket_discovery = __commonJS({
         }
         return { ok: true, path: socketPath, uid: stat.uid, mode: stat.mode };
       } catch (error) {
-        return { ok: false, reason: error.code === "ENOENT" ? "socket does not exist" : error.message, path: socketPath };
+        return {
+          ok: false,
+          missing: error.code === "ENOENT",
+          reason: error.code === "ENOENT" ? "socket does not exist" : error.message,
+          path: socketPath
+        };
       }
     }
     function assertSocket(socketPath, options = {}) {
@@ -1810,7 +1917,7 @@ var require_service = __commonJS({
     } = require_terminal_palette();
     var { resolveSocketPath } = require_socket_discovery();
     var { preferredLanAddress: preferredLanAddress2 } = require_net_interfaces();
-    var { MIN_HERDR_VERSION: MIN_HERDR_VERSION2, findHerdrCommand, herdrVersion, resolveHerdrCommand } = require_herdr_command();
+    var { MIN_HERDR_VERSION: MIN_HERDR_VERSION2, findHerdrCommand, herdrVersion: herdrVersion2, resolveHerdrCommand } = require_herdr_command();
     var RUNTIME_VERSION = 2;
     function pidAlive(pid) {
       if (!Number.isInteger(pid) || pid <= 0) return false;
@@ -2117,7 +2224,7 @@ var require_service = __commonJS({
       }
       const socketPath = resolveSocketPath(config.herdr.socketPath);
       const herdr = findHerdrCommand();
-      const installed = herdr.found ? herdrVersion({ command: herdr.command }) : { version: null, supported: true };
+      const installed = herdr.found ? herdrVersion2({ command: herdr.command }) : { version: null, supported: true };
       return {
         ok: true,
         mode: config.relay.mode,
@@ -2580,8 +2687,8 @@ var require_lifecycle = __commonJS({
     function startAll2(config = loadConfig2()) {
       const managed = managerInUse(config);
       if (managed) {
-        keepalive2.restart(config);
-        return { ok: true, managed: true, manager: managed.manager };
+        if (!managed.active) keepalive2.restart(config);
+        return { ok: true, managed: true, manager: managed.manager, alreadyRunning: Boolean(managed.active) };
       }
       return { ...startServices(), managed: false };
     }
@@ -2613,116 +2720,11 @@ var require_lifecycle = __commonJS({
   }
 });
 
-// src/herdr-plugin.js
-var require_herdr_plugin = __commonJS({
-  "src/herdr-plugin.js"(exports, module) {
-    "use strict";
-    var fs = __require("node:fs");
-    var path = __require("node:path");
-    var { spawnSync } = __require("node:child_process");
-    var { PACKAGE_ROOT } = require_config();
-    var { herdrVersion, resolveHerdrCommand } = require_herdr_command();
-    var PLUGIN_ID = "herdr.remote.web";
-    var MANIFEST_NAME = "herdr-plugin.toml";
-    function manifestPath() {
-      return path.join(PACKAGE_ROOT, MANIFEST_NAME);
-    }
-    function herdrAvailable() {
-      return herdrVersion().ok;
-    }
-    function runHerdr(args, { timeout = 15e3 } = {}) {
-      const result = spawnSync(resolveHerdrCommand(), args, { encoding: "utf8", timeout });
-      if (result.error && result.error.code === "ENOENT") {
-        const error = new Error("herdr command not found");
-        error.code = "HERDR_NOT_FOUND";
-        throw error;
-      }
-      return result;
-    }
-    function parsePluginList(output) {
-      const plugins = [];
-      for (const line of String(output || "").split("\n")) {
-        const match = /^-\s+(\S+)\s+\((.*?)\)\s+(\S+)(?:\s+\[(.*)\])?/.exec(line.trim());
-        if (!match) continue;
-        const [, id, name, state, rawSource] = match;
-        const source = rawSource ? rawSource.split(";")[0].trim() : null;
-        plugins.push({
-          id,
-          name,
-          enabled: state === "enabled",
-          source,
-          warnings: rawSource && rawSource.includes(";") ? rawSource.slice(rawSource.indexOf(";") + 1).trim() : null,
-          localPath: source && source.startsWith("local:") ? source.slice("local:".length) : null
-        });
-      }
-      return plugins;
-    }
-    function registrationStatus() {
-      if (!fs.existsSync(manifestPath())) {
-        return { available: false, registered: false, reason: "manifest missing" };
-      }
-      const { version, supported } = herdrVersion();
-      const installed = { version, versionSupported: supported };
-      let result;
-      try {
-        result = runHerdr(["plugin", "list"]);
-      } catch (error) {
-        if (error.code === "HERDR_NOT_FOUND") return { available: false, registered: false, reason: "herdr not found" };
-        throw error;
-      }
-      if (result.status !== 0) {
-        return { available: true, registered: false, reason: String(result.stderr || "").trim(), ...installed };
-      }
-      const plugins = parsePluginList(result.stdout);
-      const entry = plugins.find((plugin) => plugin.id === PLUGIN_ID);
-      if (!entry) return { available: true, registered: false, packageRoot: PACKAGE_ROOT, ...installed };
-      return {
-        available: true,
-        registered: true,
-        enabled: entry.enabled,
-        linkedPath: entry.localPath,
-        // A stale link pointing at an old checkout is the main failure mode after
-        // switching from a source install to npm.
-        stale: Boolean(entry.localPath) && path.resolve(entry.localPath) !== path.resolve(PACKAGE_ROOT),
-        packageRoot: PACKAGE_ROOT,
-        ...installed
-      };
-    }
-    function register() {
-      const current = registrationStatus();
-      if (current.registered && current.stale) {
-        runHerdr(["plugin", "unlink", PLUGIN_ID]);
-      }
-      const result = runHerdr(["plugin", "link", PACKAGE_ROOT]);
-      if (result.status !== 0) {
-        throw new Error(String(result.stderr || result.stdout || "").trim() || "herdr plugin link failed");
-      }
-      return { ok: true, path: PACKAGE_ROOT, output: String(result.stdout || "").trim() };
-    }
-    function unregister() {
-      const result = runHerdr(["plugin", "unlink", PLUGIN_ID]);
-      if (result.status !== 0) {
-        throw new Error(String(result.stderr || result.stdout || "").trim() || "herdr plugin unlink failed");
-      }
-      return { ok: true, output: String(result.stdout || "").trim() };
-    }
-    module.exports = {
-      PLUGIN_ID,
-      manifestPath,
-      herdrAvailable,
-      parsePluginList,
-      registrationStatus,
-      register,
-      unregister
-    };
-  }
-});
-
 // tui/src/index.tsx
 import { render } from "ink";
 
 // tui/src/App.tsx
-import { useCallback as useCallback2, useEffect as useEffect6, useMemo as useMemo4, useRef as useRef3, useState as useState10 } from "react";
+import { useCallback as useCallback2, useEffect as useEffect7, useMemo as useMemo4, useRef as useRef3, useState as useState10 } from "react";
 import { Box as Box11, Text as Text11, useApp, useInput as useInput9 } from "ink";
 
 // tui/src/mouse/index.tsx
@@ -3026,7 +3028,6 @@ var import_settings_model = __toESM(require_settings_model());
 var import_service = __toESM(require_service());
 var import_lifecycle = __toESM(require_lifecycle());
 var keepalive = __toESM(require_keepalive());
-var herdrPlugin = __toESM(require_herdr_plugin());
 var import_updater = __toESM(require_updater());
 function detectLocale(options = {}) {
   return (0, import_i18n.detectLocale)(options);
@@ -3808,24 +3809,15 @@ import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
 function HerdrScreen({ ctx }) {
   const { t, draft, editingId } = ctx;
   const [selected, setSelected] = useState7("socketPath");
-  const [registration, setRegistration] = useState7(null);
-  const reloadRegistration = () => {
-    try {
-      setRegistration(herdrPlugin.registrationStatus());
-    } catch (error) {
-      ctx.notify(error.message, "error");
-    }
-  };
-  useEffect5(reloadRegistration, []);
+  const [installed, setInstalled] = useState7(null);
+  useEffect5(() => {
+    setInstalled((0, import_herdr_command.herdrVersion)());
+  }, []);
   const entries = [
     { id: "socketPath", kind: "field", label: t("herdr.socketPath") },
     { id: "herdrArgs", kind: "field", label: t("herdr.args") },
-    { id: "save", kind: "action", label: t("common.save") },
-    {
-      id: registration?.registered && !registration?.stale ? "unregister" : "register",
-      kind: "action",
-      label: registration?.registered && !registration?.stale ? t("herdr.unregister") : t("herdr.register")
-    }
+    { id: "herdrAutoStart", kind: "toggle", label: t("field.herdrAutoStart") },
+    { id: "save", kind: "action", label: t("common.save") }
   ];
   const applyField = (id, value) => {
     const result = (0, import_settings_model.setField)(draft, id, value);
@@ -3850,26 +3842,11 @@ function HerdrScreen({ ctx }) {
       ctx.setEditing(id);
       return;
     }
-    if (id === "save") {
-      save();
+    if (id === "herdrAutoStart") {
+      applyField(id, draft.herdr.autoStart ? "off" : "on");
       return;
     }
-    ctx.run(() => {
-      try {
-        if (id === "register") {
-          const result = herdrPlugin.register();
-          ctx.notify(t("herdr.registerDone", { path: result.path }), "success");
-        } else {
-          herdrPlugin.unregister();
-          ctx.notify(t("herdr.unregisterDone"), "success");
-        }
-      } catch (error) {
-        const failure = error;
-        throw new Error(failure.code === "HERDR_NOT_FOUND" ? t("herdr.cliMissing") : t("herdr.registerFailed", { message: failure.message }));
-      } finally {
-        reloadRegistration();
-      }
-    });
+    if (id === "save") save();
   };
   useInput6((input, key) => {
     const index = entries.findIndex((entry) => entry.id === selected);
@@ -3880,7 +3857,20 @@ function HerdrScreen({ ctx }) {
     else if (input === "s") save();
   }, { isActive: editingId === null });
   return /* @__PURE__ */ jsxs8(Panel, { title: t("herdr.title"), children: [
-    entries.map((entry) => entry.kind === "field" ? /* @__PURE__ */ jsx9(
+    entries.map((entry) => entry.kind === "toggle" ? /* @__PURE__ */ jsx9(
+      FieldRow,
+      {
+        label: entry.label,
+        selected: selected === entry.id,
+        onSelect: () => {
+          setSelected(entry.id);
+          activate(entry.id);
+        },
+        onHover: () => setSelected(entry.id),
+        children: /* @__PURE__ */ jsx9(Text8, { color: draft.herdr.autoStart ? theme.ok : theme.muted, children: draft.herdr.autoStart ? `[\xD7] ${t("common.on")}` : `[ ] ${t("common.off")}` })
+      },
+      entry.id
+    ) : entry.kind === "field" ? /* @__PURE__ */ jsx9(
       FieldRow,
       {
         label: entry.label,
@@ -3913,41 +3903,31 @@ function HerdrScreen({ ctx }) {
         children: entry.label
       }
     ) }, entry.id)),
+    selected === "herdrAutoStart" ? /* @__PURE__ */ jsx9(Box8, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text8, { color: theme.muted, children: t("herdr.autoStartHint") }) }) : null,
     ctx.dirty ? /* @__PURE__ */ jsx9(Box8, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text8, { color: theme.warn, children: t("hint.unsavedChanges") }) }) : null,
     /* @__PURE__ */ jsxs8(Box8, { marginTop: 1, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx9(Row, { label: t("herdr.plugin"), children: /* @__PURE__ */ jsxs8(Box8, { children: [
-        /* @__PURE__ */ jsx9(StatusDot, { level: registration?.registered && !registration?.stale ? "ok" : registration?.stale ? "warn" : "idle" }),
-        /* @__PURE__ */ jsxs8(Text8, { children: [
-          " ",
-          registration?.registered ? t("herdr.pluginRegistered") : t("herdr.pluginMissing")
-        ] })
-      ] }) }),
-      registration?.packageRoot ? /* @__PURE__ */ jsx9(Row, { label: "", children: /* @__PURE__ */ jsx9(Text8, { color: theme.muted, children: registration.packageRoot }) }) : null,
-      registration?.version ? /* @__PURE__ */ jsx9(Row, { label: t("herdr.version"), children: /* @__PURE__ */ jsxs8(Box8, { children: [
-        /* @__PURE__ */ jsx9(StatusDot, { level: registration.versionSupported === false ? "warn" : "ok" }),
-        /* @__PURE__ */ jsx9(Text8, { children: ` ${registration.version}` })
+      installed?.version ? /* @__PURE__ */ jsx9(Row, { label: t("herdr.version"), children: /* @__PURE__ */ jsxs8(Box8, { children: [
+        /* @__PURE__ */ jsx9(StatusDot, { level: installed.supported ? "ok" : "warn" }),
+        /* @__PURE__ */ jsx9(Text8, { children: ` ${installed.version}` })
       ] }) }) : null,
-      registration?.versionSupported === false ? /* @__PURE__ */ jsx9(Text8, { color: theme.warn, children: t("herdr.versionOutdated", { version: registration.version ?? "", minimum: import_herdr_command.MIN_HERDR_VERSION }) }) : null,
-      registration && !registration.available ? /* @__PURE__ */ jsx9(Text8, { color: theme.warn, children: t("herdr.cliMissing") }) : null,
-      registration?.stale && registration.linkedPath ? (
-        // A leftover link to an old source checkout is the usual state after
-        // switching to the npm install; re-registering repoints it.
-        /* @__PURE__ */ jsx9(Text8, { color: theme.warn, children: registration.linkedPath })
-      ) : null
+      installed?.version && !installed.supported ? /* @__PURE__ */ jsx9(Text8, { color: theme.warn, children: t("herdr.versionOutdated", { version: installed.version, minimum: import_herdr_command.MIN_HERDR_VERSION }) }) : null,
+      installed && !installed.ok ? /* @__PURE__ */ jsx9(Text8, { color: theme.warn, children: t("herdr.cliMissing") }) : null
     ] }),
     /* @__PURE__ */ jsx9(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? "info" })
   ] });
 }
 
 // tui/src/screens/About.tsx
-import { useState as useState8 } from "react";
+import { useEffect as useEffect6, useState as useState8 } from "react";
 import { Box as Box9, Text as Text9, useInput as useInput7 } from "ink";
 import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
+var registryHost = (registry) => registry.replace(/^https?:\/\//, "");
 function About({ ctx }) {
   const { t, draft } = ctx;
   const [selected, setSelected] = useState8("auto");
   const [update, setUpdate] = useState8({ phase: "idle" });
-  const registryRef = useState8(() => ({ current: "" }))[0];
+  const [sourceNote, setSourceNote] = useState8(null);
+  const checkRef = useState8(() => ({ current: { registry: "", sources: [] } }))[0];
   const detected = detectLocale({ preference: "auto" });
   const languageOptions = [
     { id: "auto", label: t("about.languageAuto", { detected }) },
@@ -3964,36 +3944,57 @@ function About({ ctx }) {
       case "available":
         return t("update.available", { version: update.latest });
       case "updating":
-        return t("update.updating", { version: update.latest });
+        return update.attempt > 1 ? t("update.updatingRetry", { version: update.latest, attempt: update.attempt }) : t("update.updating", { version: update.latest });
       case "done":
         return t("update.done", { version: update.latest });
       case "error":
-        return t(update.messageKey);
+        return t(update.messageKey, update.params);
       default:
         return t("update.check");
     }
   })();
   const options = [...languageOptions, { id: "update", label: updateLabel }];
+  const applyCheck = (result) => {
+    checkRef.current = { registry: result.registry ?? "", sources: result.sources ?? [] };
+    const behind = result.behind ?? [];
+    setSourceNote(result.updateAvailable && behind.length > 0 && result.registry ? t("update.mirrorBehind", {
+      registries: behind.map((entry) => `${registryHost(entry.registry)} ${entry.version ?? ""}`.trim()).join(", "),
+      source: registryHost(result.registry)
+    }) : null);
+    setUpdate(result.updateAvailable ? { phase: "available", latest: result.latest } : { phase: "current", latest: result.latest });
+  };
+  useEffect6(() => {
+    if (ctx.updateCheck?.ok && update.phase === "idle") applyCheck(ctx.updateCheck);
+  }, [ctx.updateCheck]);
   const runCheck = async () => {
     setUpdate({ phase: "checking" });
+    setSourceNote(null);
     const result = await (0, import_updater.checkForUpdate)();
     if (!result.ok) {
       setUpdate({ phase: "error", messageKey: result.errorKey ?? "update.errorNetwork" });
       if (result.message) ctx.notify(t("update.errorNetworkDetail", { message: result.message }), "error");
       return;
     }
-    registryRef.current = result.registry ?? "";
-    setUpdate(result.updateAvailable ? { phase: "available", latest: result.latest } : { phase: "current", latest: result.latest });
+    ctx.setUpdateCheck(result);
+    applyCheck(result);
   };
   const runUpdate = async (latest) => {
-    setUpdate({ phase: "updating", latest });
-    const result = await (0, import_updater.performUpdate)({ registry: registryRef.current });
+    setUpdate({ phase: "updating", latest, attempt: 1 });
+    const result = await (0, import_updater.performUpdate)({
+      registry: checkRef.current.registry,
+      sources: checkRef.current.sources,
+      version: latest,
+      onAttempt: ({ attempt }) => setUpdate({ phase: "updating", latest, attempt })
+    });
     if (!result.ok) {
-      setUpdate({ phase: "error", messageKey: result.errorKey ?? "update.errorFailed" });
-      ctx.notify(t("update.errorFailed"), "error");
+      const params = { version: latest, installed: result.installed ?? "" };
+      setUpdate({ phase: "error", messageKey: result.errorKey ?? "update.errorFailed", params });
+      ctx.notify(result.summary ? t("update.errorFailedDetail", { message: result.summary }) : t(result.errorKey ?? "update.errorFailed", params), "error");
       return;
     }
     setUpdate({ phase: "done", latest });
+    setSourceNote(null);
+    ctx.setUpdateCheck(null);
     ctx.notify(t("update.restartHint"), "success");
   };
   const activateUpdate = () => {
@@ -4052,19 +4053,22 @@ function About({ ctx }) {
       option.id
     )) }),
     /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("update.title") }),
-    /* @__PURE__ */ jsx10(Box9, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx10(
-      Selectable,
-      {
-        selected: selected === "update",
-        onSelect: () => {
-          setSelected("update");
-          activateUpdate();
-        },
-        onHover: () => setSelected("update"),
-        children: updateLabel
-      }
-    ) }),
-    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.15" }) }),
+    /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx10(
+        Selectable,
+        {
+          selected: selected === "update",
+          onSelect: () => {
+            setSelected("update");
+            activateUpdate();
+          },
+          onHover: () => setSelected("update"),
+          children: updateLabel
+        }
+      ),
+      sourceNote ? /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: `  ${sourceNote}` }) : null
+    ] }),
+    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.17" }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.configPath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.configPath)() }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.statePath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.stateDir)() }) }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("about.docs") }) }),
@@ -4381,7 +4385,11 @@ function Tab({ label, active, onSelect }) {
 function Footer({ hints }) {
   return /* @__PURE__ */ jsx12(Box11, { marginTop: 1, paddingX: 1, children: /* @__PURE__ */ jsx12(Text11, { color: theme.muted, children: hints.join("  \xB7  ") }) });
 }
-function App({ initialLanguage, needsWizard }) {
+function App({
+  initialLanguage,
+  needsWizard,
+  updateChecker = (0, import_updater.updateChecksEnabled)() ? import_updater.checkForUpdate : null
+}) {
   const { exit } = useApp();
   const mouse = useMouse();
   const [config, setConfig] = useState10(() => (0, import_config.loadConfig)());
@@ -4393,6 +4401,18 @@ function App({ initialLanguage, needsWizard }) {
   const [busy, setBusy] = useState10(false);
   const [editingId, setEditingId] = useState10(null);
   const [wizardDone, setWizardDone] = useState10(!needsWizard);
+  const [updateCheck, setUpdateCheck] = useState10(null);
+  useEffect7(() => {
+    if (!updateChecker) return void 0;
+    let cancelled = false;
+    updateChecker().then((result) => {
+      if (!cancelled && result?.ok) setUpdateCheck(result);
+    }).catch(() => {
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [updateChecker]);
   const locale = useMemo4(
     () => detectLocale({ preference: initialLanguage ?? draft.ui.language }),
     [initialLanguage, draft.ui.language]
@@ -4419,7 +4439,7 @@ function App({ initialLanguage, needsWizard }) {
       refresh();
     });
   }, [notify, refresh]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (!wizardDone) return void 0;
     refresh();
     const timer = setInterval(() => {
@@ -4428,7 +4448,7 @@ function App({ initialLanguage, needsWizard }) {
     return () => clearInterval(timer);
   }, [wizardDone, refresh, editingId]);
   const mouseChoice = useRef3(null);
-  useEffect6(() => {
+  useEffect7(() => {
     if (mouseChoice.current !== null) return;
     if (mouse.supported && !mouse.enabled) mouse.enable();
   }, [mouse.supported, mouse.enabled, mouse]);
@@ -4448,7 +4468,9 @@ function App({ initialLanguage, needsWizard }) {
     notify,
     run,
     refresh,
-    message
+    message,
+    updateCheck,
+    setUpdateCheck
   };
   useInput9((input, key) => {
     if (key.ctrl && input === "c") {
@@ -4508,9 +4530,12 @@ function App({ initialLanguage, needsWizard }) {
     t("hint.quit")
   ].filter(Boolean);
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [
-    /* @__PURE__ */ jsxs11(Box11, { marginBottom: 1, children: [
-      /* @__PURE__ */ jsx12(Text11, { bold: true, children: t("app.name") }),
-      /* @__PURE__ */ jsx12(Text11, { color: theme.muted, children: `  ${t("app.tagline")}` })
+    /* @__PURE__ */ jsxs11(Box11, { marginBottom: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs11(Box11, { children: [
+        /* @__PURE__ */ jsx12(Text11, { bold: true, children: t("app.name") }),
+        /* @__PURE__ */ jsx12(Text11, { color: theme.muted, children: `  ${t("app.tagline")}` })
+      ] }),
+      updateCheck?.updateAvailable ? /* @__PURE__ */ jsx12(Text11, { color: theme.warn, children: t("update.banner", { latest: updateCheck.latest ?? "", current: updateCheck.current }) }) : null
     ] }),
     /* @__PURE__ */ jsx12(Box11, { marginBottom: 1, children: TABS.map((entry, entryIndex) => /* @__PURE__ */ jsx12(
       Tab,