herdr-remote 0.2.14 → 0.2.16

package/config.example.json

@@ -15,7 +15,8 @@
   },
   "herdr": {
     "socketPath": null,
-    "args": []
+    "args": [],
+    "autoStart": false
   },
   "keepalive": {
     "manager": "auto"

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";
       }
@@ -659,7 +663,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 +696,7 @@ var require_herdr_command = __commonJS({
       findHerdrCommand,
       herdrNotFoundMessage,
       herdrOutdatedMessage,
-      herdrVersion,
+      herdrVersion: herdrVersion2,
       meetsMinimum,
       parseHerdrVersion,
       resolveHerdrCommand,
@@ -839,14 +843,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 +880,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",
@@ -1066,14 +1064,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 +1101,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",
@@ -1334,6 +1326,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 +1364,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 +1459,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 +1511,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 +1761,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 +1818,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 +2125,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 +2588,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,111 +2621,6 @@ 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";
 
@@ -3026,7 +2929,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 +3710,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 +3743,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 +3758,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,27 +3804,15 @@ 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" })
   ] });
@@ -4064,7 +3943,7 @@ function About({ ctx }) {
         children: updateLabel
       }
     ) }),
-    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.14" }) }),
+    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.16" }) }),
     /* @__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") }) }),

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.14"
+version = "0.2.16"
 min_herdr_version = "0.9.1"
 description = "Browser access to Herdr workspaces via local or self-hosted relay"
 platforms = ["linux", "macos"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "repository": {

package/src/agent-status.js

@@ -56,13 +56,21 @@ function emptyCounts() {
  */
 function summarizeAgents(snapshot) {
   const entries = Array.isArray(snapshot?.agents) ? snapshot.agents : [];
-  const focusedPaneId = typeof snapshot?.focused_pane_id === 'string' ? snapshot.focused_pane_id : null;
-  const focusedPane = focusedPaneId && Array.isArray(snapshot?.panes)
-    ? snapshot.panes.find((pane) => pane?.pane_id === focusedPaneId)
-    : null;
-  const focusedAgentEntry = focusedPaneId
-    ? entries.find((entry) => entry?.pane_id === focusedPaneId)
+  const panes = Array.isArray(snapshot?.panes) ? snapshot.panes : [];
+  const reportedFocusId = typeof snapshot?.focused_pane_id === 'string' && snapshot.focused_pane_id
+    ? snapshot.focused_pane_id
     : null;
+  // `focused_pane_id` is the primary signal in Herdr snapshots. The focused
+  // flags are a fallback for snapshots where that top-level field is absent.
+  const focusedPane = (reportedFocusId
+    ? panes.find((pane) => pane?.pane_id === reportedFocusId)
+    : panes.find((pane) => pane?.focused === true)) || null;
+  const focusedAgentEntry = (reportedFocusId
+    ? entries.find((entry) => entry?.pane_id === reportedFocusId)
+    : entries.find((entry) => entry?.focused === true)) || null;
+  const focusedPaneId = reportedFocusId
+    || (typeof focusedPane?.pane_id === 'string' ? focusedPane.pane_id : null)
+    || (typeof focusedAgentEntry?.pane_id === 'string' ? focusedAgentEntry.pane_id : null);
   const focusedAgent = typeof focusedPane?.agent === 'string'
     ? focusedPane.agent
     : typeof focusedAgentEntry?.agent === 'string'

package/src/config.js

@@ -77,6 +77,9 @@ const DEFAULTS = {
     socketPath: null,
     args: [],
     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 * 1000,
@@ -288,6 +291,7 @@ function validate(config) {
   if (typeof config.herdr.cwd !== 'string' || config.herdr.cwd.length === 0) {
     config.herdr.cwd = os.homedir();
   }
+  config.herdr.autoStart = config.herdr.autoStart === true;
 
   // A "remote" config without a relay URL cannot reach anything; fall back to
   // local rather than silently starting a host connector that dials nowhere.

package/src/herdr-server.js

@@ -0,0 +1,201 @@
+'use strict';
+
+// Whether Herdr's server is running on this workstation, and starting it when
+// the user asked for that.
+//
+// herdr-remote never starts Herdr on its own initiative. It starts one when a
+// browser paired to this workstation asks for it, or at service start when the
+// user switched that on — and both go through here.
+//
+// Two traps shape this file:
+//
+// - A socket file is not a server. Herdr leaves `herdr.sock` behind when it dies
+//   without cleaning up (a crash, a power cut), and a `herdr` client pointed at
+//   a dead socket quietly starts a server of its own. So "running" means a
+//   connection was accepted, not that the path exists.
+// - A server started from inside herdr-remote's systemd service lives in that
+//   service's cgroup, and `systemctl restart herdr-remote` — an update, a keep-
+//   alive restart, Herdr's own plugin startup hook — would kill it along with
+//   every agent in it. Under a service it is therefore started in a transient
+//   scope of its own, the same place it would live had the user started it
+//   from a terminal.
+
+const fs = require('node:fs');
+const net = require('node:net');
+const path = require('node:path');
+const { spawn } = require('node:child_process');
+const { inspectSocket } = require('./socket-discovery');
+const { ensureDir } = require('./state');
+
+/** A Unix socket either accepts at once or is dead; this only guards a hang. */
+const PROBE_TIMEOUT_MS = 1_000;
+/** Herdr restores the saved session before its API socket opens. */
+const START_TIMEOUT_MS = 20_000;
+const START_POLL_MS = 200;
+
+/**
+ * Is Herdr's server answering on `socketPath`?
+ *
+ * Resolves `{ state }`: `running`, `stopped` (no socket, or a socket nothing is
+ * listening on), or `unavailable` with a `reason` — a path that is not a socket
+ * or belongs to another user. That last one is never "stopped": the socket may
+ * well be live, just not ours to use, and starting a second server beside it
+ * would be starting somebody else's Herdr.
+ */
+function probeHerdrServer(socketPath, { connect = net.connect, timeout = PROBE_TIMEOUT_MS } = {}) {
+  const info = inspectSocket(socketPath);
+  if (!info.ok) {
+    return Promise.resolve(info.missing ? { state: 'stopped' } : { state: 'unavailable', reason: info.reason });
+  }
+  return new Promise((resolve) => {
+    let socket;
+    const finish = (result) => {
+      clearTimeout(timer);
+      if (socket) {
+        socket.removeAllListeners();
+        socket.on('error', () => {});
+        socket.destroy();
+      }
+      resolve(result);
+    };
+    // A socket that neither accepts nor refuses has a listener behind it that
+    // is slow, not absent; starting another server would only fight it.
+    const timer = setTimeout(() => finish({ state: 'running' }), timeout);
+    if (typeof timer.unref === 'function') timer.unref();
+    socket = connect(socketPath);
+    socket.once('connect', () => finish({ state: 'running' }));
+    socket.once('error', (error) => finish(
+      error.code === 'ECONNREFUSED' || error.code === 'ENOENT'
+        ? { state: 'stopped', stale: true }
+        : { state: 'unavailable', reason: error.message },
+    ));
+  });
+}
+
+/**
+ * True when this process is a systemd service (herdr-remote's keep-alive), so
+ * anything it starts would be killed with it.
+ */
+function runningInSystemdService({ platform = process.platform, readCgroup = () => fs.readFileSync('/proc/self/cgroup', 'utf8') } = {}) {
+  if (platform !== 'linux') return false;
+  try {
+    const unified = readCgroup().split('\n').find((line) => line.startsWith('0::'));
+    return Boolean(unified) && /\.service$/.test(unified.trim());
+  } catch {
+    return false;
+  }
+}
+
+/** The server's environment: the one a Herdr pane would give its client. */
+function serverEnv(socketPath, env = process.env) {
+  const next = { ...env };
+  for (const key of Object.keys(next)) {
+    if (key.startsWith('HERDR_')) delete next[key];
+  }
+  if (socketPath) next.HERDR_SOCKET_PATH = socketPath;
+  return next;
+}
+
+/**
+ * The argv that starts Herdr's server: Herdr's own global arguments (a
+ * `--session`, say) followed by `server`, wrapped in `systemd-run --scope` when
+ * the caller is a systemd service.
+ */
+function serverCommand({ command, args = [], inService = runningInSystemdService() }) {
+  const herdr = [command, ...args, 'server'];
+  if (!inService) return { file: herdr[0], args: herdr.slice(1) };
+  return {
+    file: 'systemd-run',
+    args: ['--user', '--scope', '--quiet', '--collect', '--description=Herdr server started by herdr-remote', '--', ...herdr],
+  };
+}
+
+/**
+ * Start Herdr's server in the background. Detached from this process, with its
+ * output appended to `logPath` rather than piped here: a pipe would break the
+ * moment herdr-remote exits and take the server with it.
+ */
+function launchHerdrServer({ command, args = [], socketPath, cwd, logPath, spawnProcess = spawn, inService }) {
+  const { file, args: argv } = serverCommand({ command, args, inService });
+  ensureDir(path.dirname(logPath));
+  const out = fs.openSync(logPath, 'a');
+  let child;
+  try {
+    child = spawnProcess(file, argv, {
+      cwd,
+      env: serverEnv(socketPath),
+      detached: true,
+      stdio: ['ignore', out, out],
+    });
+  } finally {
+    fs.closeSync(out);
+  }
+  child.on('error', () => {});
+  child.unref();
+  return child;
+}
+
+function readLogTail(logPath, bytes = 2_000) {
+  try {
+    const text = fs.readFileSync(logPath, 'utf8');
+    return text.slice(-bytes).trim();
+  } catch {
+    return '';
+  }
+}
+
+/**
+ * Make sure Herdr's server is running, starting it if it is not.
+ *
+ * Resolves `{ started }`, or rejects with a message that says what happened:
+ * the socket belongs to someone else, the server exited, or it never opened
+ * its socket. The last lines Herdr printed ride along, because "did not start"
+ * with no reason is a message nobody can act on.
+ */
+async function ensureHerdrServer({
+  command,
+  args = [],
+  socketPath,
+  cwd,
+  logPath,
+  probe = probeHerdrServer,
+  launch = launchHerdrServer,
+  timeout = START_TIMEOUT_MS,
+  interval = START_POLL_MS,
+}) {
+  const before = await probe(socketPath);
+  if (before.state === 'running') return { started: false };
+  if (before.state === 'unavailable') {
+    throw new Error(`Herdr socket at ${socketPath} cannot be used: ${before.reason}`);
+  }
+
+  const child = launch({ command, args, socketPath, cwd, logPath });
+  let exit = null;
+  child.once('exit', (code, signal) => { exit = { code, signal }; });
+
+  const deadline = Date.now() + timeout;
+  for (;;) {
+    await new Promise((resolve) => setTimeout(resolve, interval));
+    const now = await probe(socketPath);
+    if (now.state === 'running') return { started: true };
+    const tail = readLogTail(logPath);
+    const detail = tail ? `\n${tail}` : '';
+    if (exit) {
+      throw new Error(`Herdr server exited (${exit.signal || `code ${exit.code}`}) before opening ${socketPath}.${detail}`);
+    }
+    if (Date.now() >= deadline) {
+      throw new Error(`Herdr server did not open ${socketPath} within ${Math.round(timeout / 1000)}s.${detail}`);
+    }
+  }
+}
+
+module.exports = {
+  PROBE_TIMEOUT_MS,
+  START_TIMEOUT_MS,
+  probeHerdrServer,
+  runningInSystemdService,
+  serverEnv,
+  serverCommand,
+  launchHerdrServer,
+  ensureHerdrServer,
+};

package/src/host-connector.js

@@ -30,6 +30,7 @@ const { requestHerdr, subscribeHerdr } = require('./herdr-api');
 const { sameSummary, summarizeAgents } = require('./agent-status');
 const { EXIT_REPLACED, EXIT_AUTH_FAILED } = require('./exit-codes');
 const { savePastedFile, cleanPastedDir } = require('./pasted-files');
+const { ensureHerdrServer, probeHerdrServer } = require('./herdr-server');
 
 /** How often the agent summary is re-read while a browser is watching. */
 const AGENT_STATUS_POLL_MS = 5_000;
@@ -118,6 +119,16 @@ class HostConnector {
     this.sessions = new Map();
     this.streamIndexToId = new Map();
     this.PtySession = options.PtySession || PtySession;
+    /** Is Herdr's server answering, and how to start it; injectable for tests. */
+    this.probeHerdr = options.probeHerdr || probeHerdrServer;
+    this.ensureHerdr = options.ensureHerdr || ensureHerdrServer;
+    this.herdrLogPath = options.herdrLogPath || path.join(stateDir(), 'herdr-server.log');
+    /** Windows whose session waits on a Herdr that is not running, by stream. */
+    this.waitingForHerdr = new Map();
+    /** Session starts between their liveness check and their PTY, by stream. */
+    this.probingStarts = new Map();
+    /** One start at a time, however many windows asked for it. */
+    this.herdrLaunch = null;
     /** The side channel that answers "does anything need me?"; see startAgentStatus. */
     this.requestHerdr = options.requestHerdr || requestHerdr;
     this.subscribeHerdr = options.subscribeHerdr || subscribeHerdr;
@@ -190,6 +201,12 @@ class HostConnector {
     this.acquireLock();
     this.stopping = false;
     this.connect();
+    // Off unless the user switched it on: Herdr is theirs to start.
+    if (this.config.herdr?.autoStart) {
+      this.startHerdr().catch((error) => {
+        process.stderr.write(`herdr-remote host connector: could not start Herdr: ${error.message}\n`);
+      });
+    }
   }
 
   stop() {
@@ -342,8 +359,9 @@ class HostConnector {
       this.setClientCount(message.clientCount);
       return;
     }
-    if (message.type === 'session_start') this.startSession(message);
-    else if (message.type === 'session_stop') this.stopSession(message.clientId || message.streamId);
+    if (message.type === 'session_start') return this.startSession(message);
+    if (message.type === 'herdr_start') return this.handleHerdrStart(message);
+    if (message.type === 'session_stop') this.stopSession(message.clientId || message.streamId);
     else if (message.type === 'resize') this.resizeSession(message);
     else if (message.type === 'paste_file') this.handlePasteFile(message);
   }
@@ -394,20 +412,103 @@ class HostConnector {
 
   startSession(message) {
     const streamId = typeof message.streamId === 'string' ? message.streamId : message.clientId;
-    if (!streamId) return;
+    if (!streamId) return undefined;
     this.stopSession(streamId);
-    const streamIndex = typeof message.streamIndex === 'number' ? message.streamIndex : null;
     const missingHerdr = this.ensureHerdrCommand();
     if (missingHerdr) {
       process.stderr.write(`herdr-remote host connector: ${missingHerdr}\n`);
       sendJson(this.ws, { type: 'error', clientId: streamId, code: 'herdr_not_found', message: missingHerdr });
-      return;
+      return undefined;
     }
     const socketInfo = inspectSocket(this.socketPath);
-    if (!socketInfo.ok) {
+    if (!socketInfo.ok && !socketInfo.missing) {
       sendJson(this.ws, { type: 'error', clientId: streamId, code: 'herdr_socket_unavailable', message: socketInfo.reason });
+      return undefined;
+    }
+    if (!socketInfo.ok) {
+      this.waitForHerdr(streamId, message);
+      return undefined;
+    }
+    // The socket file alone proves nothing: a `herdr` client pointed at a dead
+    // one starts a server of its own, inside this process's service, where the
+    // next restart of herdr-remote would kill it. Only a server that accepts a
+    // connection gets a client.
+    const pending = { message };
+    this.probingStarts.set(streamId, pending);
+    return this.probeHerdr(this.socketPath).then((probe) => {
+      // Stopped, or started again, while the answer was in flight.
+      if (this.probingStarts.get(streamId) !== pending) return;
+      this.probingStarts.delete(streamId);
+      if (probe.state === 'running') this.spawnSession(pending.message);
+      else if (probe.state === 'stopped') this.waitForHerdr(streamId, pending.message);
+      else sendJson(this.ws, { type: 'error', clientId: streamId, code: 'herdr_socket_unavailable', message: probe.reason });
+    });
+  }
+
+  /**
+   * Hold a window's session until Herdr runs, and ask the browser whether it
+   * should be started. Nothing starts until somebody says yes.
+   */
+  waitForHerdr(streamId, message) {
+    this.waitingForHerdr.set(streamId, message);
+    sendJson(this.ws, {
+      type: 'error',
+      clientId: streamId,
+      code: 'herdr_not_running',
+      message: `Herdr is not running on this workstation (${this.socketPath}).`,
+    });
+  }
+
+  /**
+   * Start this workstation's Herdr server, once, however many windows or
+   * callers ask at the same time.
+   */
+  startHerdr() {
+    if (!this.herdrLaunch) {
+      this.herdrLaunch = Promise.resolve()
+        .then(() => {
+          const missing = this.ensureHerdrCommand();
+          if (missing) throw new Error(missing);
+          return this.ensureHerdr({
+            command: this.herdrCommand,
+            args: this.herdrArgs,
+            socketPath: this.socketPath,
+            cwd: this.cwd,
+            logPath: this.herdrLogPath,
+          });
+        })
+        .finally(() => { this.herdrLaunch = null; });
+    }
+    return this.herdrLaunch;
+  }
+
+  /**
+   * A browser said yes. The relay only ever routes this from a window paired
+   * to *this* workstation, so what starts is this user's own Herdr, at the
+   * socket this connector is configured for — never one named by the message.
+   * Once it runs, every window waiting on it gets its session.
+   */
+  async handleHerdrStart(message) {
+    const streamId = typeof message.streamId === 'string' ? message.streamId : message.clientId;
+    try {
+      const result = await this.startHerdr();
+      if (result.started) process.stderr.write('herdr-remote host connector: started Herdr at a browser\'s request\n');
+    } catch (error) {
+      process.stderr.write(`herdr-remote host connector: could not start Herdr: ${error.message}\n`);
+      if (streamId) {
+        sendJson(this.ws, { type: 'error', clientId: streamId, code: 'herdr_start_failed', message: error.message });
+      }
       return;
     }
+    const waiting = [...this.waitingForHerdr.values()];
+    this.waitingForHerdr.clear();
+    for (const held of waiting) this.spawnSession(held);
+  }
+
+  /** Start the PTY for a window once Herdr is known to be running. */
+  spawnSession(message) {
+    const streamId = typeof message.streamId === 'string' ? message.streamId : message.clientId;
+    const streamIndex = typeof message.streamIndex === 'number' ? message.streamIndex : null;
     const pty = new this.PtySession({
       command: this.herdrCommand,
       args: this.herdrArgs,
@@ -516,6 +617,8 @@ class HostConnector {
   }
 
   stopSession(streamId) {
+    this.waitingForHerdr.delete(streamId);
+    this.probingStarts.delete(streamId);
     const session = this.sessions.get(streamId);
     if (!session) return;
     this.sessions.delete(streamId);
@@ -676,6 +779,12 @@ class HostConnector {
 
   resizeSession(message) {
     const id = message.clientId || message.streamId;
+    // A window still waiting on Herdr starts at the size it has by then.
+    const held = this.waitingForHerdr.get(id) || this.probingStarts.get(id)?.message;
+    if (held) {
+      if (Number.isInteger(message.cols)) held.cols = message.cols;
+      if (Number.isInteger(message.rows)) held.rows = message.rows;
+    }
     const session = this.sessions.get(id);
     if (!session) return;
     session.cols = Number.isInteger(message.cols) ? Math.min(500, Math.max(2, message.cols)) : session.cols;
@@ -716,6 +825,8 @@ class HostConnector {
     }
     this.sessions.clear();
     this.streamIndexToId.clear();
+    this.waitingForHerdr.clear();
+    this.probingStarts.clear();
   }
 
   sendHeartbeat(force = false) {

package/src/i18n/en.js

@@ -146,14 +146,7 @@ module.exports = {
   '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.',
@@ -193,6 +186,7 @@ module.exports = {
   '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',
 

package/src/i18n/zh.js

@@ -145,14 +145,7 @@ module.exports = {
   'herdr.title': 'Herdr 集成',
   'herdr.socketPath': '套接字路径',
   'herdr.args': '附加参数',
-  'herdr.plugin': '插件注册',
-  'herdr.pluginRegistered': '已注册到 Herdr。',
-  'herdr.pluginMissing': '尚未注册到 Herdr。',
-  'herdr.register': '注册为 Herdr 插件',
-  'herdr.unregister': '取消注册',
-  'herdr.registerDone': '已注册：{path}',
-  'herdr.unregisterDone': '已取消注册。',
-  'herdr.registerFailed': '注册失败：{message}',
+  'herdr.autoStartHint': '关：Herdr 只在你手动运行，或在浏览器里确认后才启动。开：herdr-remote 每次启动（包括开机）时一并启动 Herdr。下次 herdr-remote 启动时生效。',
   'herdr.cliMissing': '未找到 herdr 命令，可将 HERDR_BIN_PATH 设为其完整路径。',
   'herdr.version': 'Herdr 版本',
   'herdr.versionOutdated': 'Herdr {version} 低于 {minimum}，请运行 “herdr update”：在该版本之前，浏览器窗口的标题、后台机器激活与大段粘贴都会出问题。',
@@ -192,6 +185,7 @@ module.exports = {
   'field.publicUrl': '浏览器地址（覆盖）',
   'field.socketPath': 'Herdr 套接字路径',
   'field.herdrArgs': 'Herdr 参数',
+  'field.herdrAutoStart': '随服务启动 Herdr',
   'field.language': '语言',
   'field.keepalive': '保活管理方式',
 

package/src/lifecycle.js

@@ -19,8 +19,12 @@ function managerInUse(config) {
 function startAll(config = loadConfig()) {
   const managed = managerInUse(config);
   if (managed) {
-    keepalive.restart(config);
-    return { ok: true, managed: true, manager: managed.manager };
+    // Start means "make it run", not "restart it". Herdr runs this through the
+    // plugin's startup hook every time a Herdr server starts, and a restart
+    // there dropped every browser attached to the workstation — including the
+    // one that had just asked for that Herdr to be started.
+    if (!managed.active) keepalive.restart(config);
+    return { ok: true, managed: true, manager: managed.manager, alreadyRunning: Boolean(managed.active) };
   }
   return { ...startServices(), managed: false };
 }

package/src/settings-model.js

@@ -35,6 +35,7 @@ const FIELDS = [
   { 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' },
 ];
@@ -94,6 +95,8 @@ function getField(draft, id) {
       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':
@@ -211,6 +214,13 @@ function setField(draft, id, rawValue) {
       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;
@@ -273,6 +283,7 @@ function saveDraft(draft) {
     ...(current.herdr || {}),
     socketPath: draft.herdr.socketPath,
     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 };

package/src/socket-discovery.js

@@ -32,7 +32,12 @@ function inspectSocket(socketPath, options = {}) {
     }
     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,
+    };
   }
 }