@cabane/companion 0.6.187 → 0.6.188

package/dist/cli.js

@@ -12420,14 +12420,19 @@ var DeviceApi = class {
     return parsed;
   }
   // Pull the agents this device should run, across all the owner's workspaces.
-  getAssignments() {
-    return this.request("GET", "/api/companion/assignments");
+  getAssignments(signal) {
+    return this.request("GET", "/api/companion/assignments", void 0, requestSignal(signal));
   }
   // Ask again for the credential of an agent assigned to this device, when the saved copy is
   // gone. The previous credential stops working; any agent not assigned here is a 404, and a
   // second ask inside a minute a 429.
-  reissueAgentCredential(agentId) {
-    return this.request("POST", `/api/companion/agents/${encodeURIComponent(agentId)}/credential`);
+  reissueAgentCredential(agentId, signal) {
+    return this.request(
+      "POST",
+      `/api/companion/agents/${encodeURIComponent(agentId)}/credential`,
+      void 0,
+      requestSignal(signal, 3e4)
+    );
   }
   getRuns(cursor) {
     const query = new URLSearchParams({ limit: "100", order: "asc" });
@@ -12467,6 +12472,10 @@ function errorMessage2(status2, body) {
   if (typeof body === "string" && body.length > 0) return `${status2} ${body.slice(0, 200)}`;
   return `${status2} error`;
 }
+function requestSignal(signal, timeoutMs = 5e3) {
+  const deadline = AbortSignal.timeout(timeoutMs);
+  return signal ? AbortSignal.any([signal, deadline]) : deadline;
+}
 
 // src/supervisor.ts
 init_config();
@@ -13842,6 +13851,7 @@ var CompanionSupervisor = class {
   pollTimer = null;
   refreshing = false;
   stopped = false;
+  reconciliationAbort = new AbortController();
   // The version-skew warning is logged once, not every heartbeat.
   versionSkewWarned = false;
   // This device's id, captured from the heartbeat / assignments response. The SSE
@@ -13887,6 +13897,7 @@ var CompanionSupervisor = class {
   // heartbeat + poll loops. A companion with no device token (logged out) does
   // nothing but say so.
   async start() {
+    if (this.stopped) return;
     this.log.info(
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
       `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname2()}`
@@ -13971,6 +13982,7 @@ var CompanionSupervisor = class {
     });
     this.updater.start();
     await this.refreshAssignments();
+    if (this.stopped) return;
     this.deviceSub.start();
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
     this.heartbeatTimer.unref?.();
@@ -14083,10 +14095,12 @@ var CompanionSupervisor = class {
         let items;
         let device;
         try {
-          const resp = await this.deviceApi.getAssignments();
+          const resp = await this.deviceApi.getAssignments(this.reconciliationAbort.signal);
+          if (this.stopped) return;
           items = resp.assignments;
           device = resp.device;
         } catch (err) {
+          if (this.stopped) return;
           this.log.error(
             { ...apiErrorLogFields(err) },
             "Couldn't load the assigned agents. Check that this device is active in Cabane; trying again shortly."
@@ -14105,6 +14119,7 @@ var CompanionSupervisor = class {
           if (it.credential) setCredential(device.id, it.agentId, it.credential);
         }
         items = await this.restoreMissingCredentials(device.id, items);
+        if (this.stopped) return;
         this.uncredentialed = new Set(
           items.filter((it) => !it.credential && !getCredential(device.id, it.agentId)).map((it) => `${it.workspaceId}|${it.agentId}`)
         );
@@ -14117,6 +14132,7 @@ var CompanionSupervisor = class {
         for (const wsId of [...this.workspaces.keys()]) {
           if (!byWorkspace.has(wsId)) await this.removeWorkspace(wsId);
         }
+        if (this.stopped) return;
         for (const [wsId, list] of byWorkspace) this.reconcileWorkspace(device.id, wsId, list);
         const pruned = pruneCredentials(
           device.id,
@@ -14148,6 +14164,7 @@ var CompanionSupervisor = class {
   async restoreMissingCredentials(deviceId, items) {
     const restored = [];
     for (const it of items) {
+      if (this.stopped) return restored;
       if (it.credential || getCredential(deviceId, it.agentId)) {
         restored.push(it);
         continue;
@@ -14159,7 +14176,11 @@ var CompanionSupervisor = class {
         continue;
       }
       try {
-        const { credential } = await this.deviceApi.reissueAgentCredential(it.agentId);
+        const { credential } = await this.deviceApi.reissueAgentCredential(
+          it.agentId,
+          this.reconciliationAbort.signal
+        );
+        if (this.stopped) return restored;
         setCredential(deviceId, it.agentId, credential);
         this.log.info(
           { agentId: it.agentId, agentName: it.agentDisplayName },
@@ -15034,6 +15055,7 @@ var CompanionSupervisor = class {
   // ---- control actions ----
   async shutdown() {
     this.stopped = true;
+    this.reconciliationAbort.abort();
     this.updater?.stop();
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.detectTimer) clearInterval(this.detectTimer);
@@ -15311,33 +15333,46 @@ async function createCompanionRuntime(opts = {}) {
   });
   let restartForUpdate = async () => {
   };
-  const supervisor = new CompanionSupervisor({
-    config: cfg,
-    log: log2,
-    hub,
-    ...opts.checkHarness ? { checkHarness: opts.checkHarness } : {},
-    ...embeddedRunner({
-      electron: Boolean(process.versions.electron),
-      execPath: process.execPath,
-      moduleUrl: import.meta.url,
-      env: process.env
-    }) ?? {},
-    restartForUpdate: () => restartForUpdate()
-  });
-  await supervisor.start();
+  let supervisor;
   let control = null;
   let dashboard = null;
+  let stopped = false;
+  const stop2 = async () => {
+    if (stopped) return;
+    stopped = true;
+    clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
+    await Promise.allSettled([
+      ...supervisor ? [supervisor.shutdown()] : [],
+      ...control ? [control.close()] : [],
+      ...dashboard ? [dashboard.close()] : []
+    ]);
+  };
   try {
+    supervisor = new CompanionSupervisor({
+      config: cfg,
+      log: log2,
+      hub,
+      ...opts.checkHarness ? { checkHarness: opts.checkHarness } : {},
+      ...embeddedRunner({
+        electron: Boolean(process.versions.electron),
+        execPath: process.execPath,
+        moduleUrl: import.meta.url,
+        env: process.env
+      }) ?? {},
+      restartForUpdate: () => restartForUpdate()
+    });
+    const active2 = supervisor;
     control = await startControlServer({
       status: () => ({
         ...hub.statusJson(),
-        ...supervisor.lastHeartbeat(),
-        detection: supervisor.currentDetection()
+        ...active2.lastHeartbeat(),
+        detection: active2.currentDetection()
       }),
-      detect: () => supervisor.redetect(),
-      allow: (runtime) => supervisor.allowHarness(runtime),
-      update: (auto) => supervisor.update(auto),
-      stop: () => void supervisor.requestStop()
+      detect: () => active2.redetect(),
+      allow: (runtime) => active2.allowHarness(runtime),
+      update: (auto) => active2.update(auto),
+      stop: () => void stop2().then(() => active2.requestStop())
     });
     if (opts.dashboard) {
       const preferredPort = opts.port ?? cfg.dashboardPort;
@@ -15348,6 +15383,7 @@ async function createCompanionRuntime(opts = {}) {
       });
       hub.setDashboardUrl(dashboard.url);
     }
+    if (stopped) throw new Error("The companion was stopped during startup.");
     writeRuntimeState({
       pid: process.pid,
       socket: control.path,
@@ -15365,7 +15401,7 @@ async function createCompanionRuntime(opts = {}) {
     clearRuntimeStateIfOurs(instanceId);
     process.removeListener("exit", clearRuntimeOnExit);
     await Promise.allSettled([
-      supervisor.shutdown(),
+      ...supervisor ? [supervisor.shutdown()] : [],
       ...control ? [control.close()] : [],
       ...dashboard ? [dashboard.close()] : []
     ]);
@@ -15377,22 +15413,17 @@ async function createCompanionRuntime(opts = {}) {
     });
     throw err;
   }
-  let stopped = false;
-  const stop2 = async () => {
-    if (stopped) return;
-    stopped = true;
-    clearRuntimeStateIfOurs(instanceId);
-    process.removeListener("exit", clearRuntimeOnExit);
-    try {
-      await supervisor.shutdown();
-      await closeSurfaces(control, dashboard);
-    } catch {
-    }
-  };
+  const active = supervisor;
   restartForUpdate = async () => {
     await stop2();
     process.exit(0);
   };
+  void active.start().catch(async (err) => {
+    log2.error({ err }, "Couldn't initialize the companion.");
+    recordCrash({ reason: String(err), origin: "startup", at: (/* @__PURE__ */ new Date()).toISOString() });
+    await stop2();
+    process.exitCode = 1;
+  });
   return {
     ok: true,
     runtime: {
@@ -15400,15 +15431,38 @@ async function createCompanionRuntime(opts = {}) {
       socketPath: control.path,
       config: cfg,
       stop: stop2,
-      heartbeatNow: () => supervisor.heartbeatNow(),
+      heartbeatNow: () => active.heartbeatNow(),
       harnesses: () => hub.statusJson().harnesses ?? [],
-      detect: () => supervisor.redetect()
+      detect: () => active.redetect()
     }
   };
 }
-async function closeSurfaces(control, dashboard) {
-  await control.close();
-  if (dashboard) await dashboard.close();
+
+// src/start-observation.ts
+init_cabane_command();
+async function observeStart(deps = {}) {
+  const read2 = deps.readState ?? readLiveRuntimeState;
+  const verify = deps.verify ?? verifyRuntime;
+  const now = deps.now ?? Date.now;
+  const sleep3 = deps.sleep ?? ((ms) => new Promise((resolve2) => setTimeout(resolve2, ms)));
+  const deadline = now() + 8e3;
+  for (; ; ) {
+    const state = await read2();
+    if (state?.socket && await verify(state) === "ours") return state;
+    if (now() >= deadline) return null;
+    await sleep3(Math.min(150, Math.max(0, deadline - now())));
+  }
+}
+function markLaunchRequester() {
+  process.title = "cabane-launcher";
+}
+function unconfirmedStartLines(service2) {
+  return [
+    "Cabane's start was requested, but readiness isn't confirmed yet. It may still finish starting in the background.",
+    `Check: ${cabane("status")}`,
+    ...service2 ? [`Service: ${cabane("service status")}`] : [],
+    `Log: ${cabane("logs")}`
+  ];
 }
 
 // src/commands/start.ts
@@ -15817,15 +15871,11 @@ init_config();
 import { spawn as spawn7 } from "child_process";
 import { closeSync as closeSync3, mkdirSync as mkdirSync17, openSync as openSync4 } from "fs";
 init_config();
-var STARTUP_TIMEOUT_MS = 8e3;
-var POLL_INTERVAL_MS = 150;
 async function startDaemon(opts = {}, deps = {}) {
   const ensureRuntime = deps.ensureRuntime ?? warnAboutHarnessReadiness;
   const readState = deps.readState ?? readLiveRuntimeState;
   const verify = deps.verify ?? ((s) => verifyRuntime(s));
   const spawnDetached = deps.spawnDetached ?? defaultSpawnDetached;
-  const sleep3 = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-  const now = deps.now ?? (() => Date.now());
   const quiet = opts.report === "failures" || opts.report === "silent";
   const cfg = (deps.requireCfg ?? requireConfig)();
   ensureRuntime(cfg, {
@@ -15837,7 +15887,18 @@ async function startDaemon(opts = {}, deps = {}) {
   });
   const existing = readState();
   if (existing) {
-    if (await verify(existing) !== "stale") {
+    const verdict = await verify(existing);
+    if (verdict !== "stale") {
+      if (verdict !== "ours") {
+        const state2 = await observeStart({ ...deps, readState, verify });
+        if (!state2) {
+          if (opts.report !== "silent")
+            process.stdout.write(unconfirmedStartLines(false).join("\n") + "\n");
+          process.exitCode = 1;
+          return { started: false, state: null, unconfirmed: true };
+        }
+        return { started: false, state: state2 };
+      }
       if (opts.report !== "silent")
         process.stdout.write(alreadyRunningLines(existing.pid).join("\n") + "\n");
       return { started: false, state: existing };
@@ -15855,28 +15916,21 @@ async function startDaemon(opts = {}, deps = {}) {
     spawned.unref();
     return spawned;
   };
-  const ready = (s) => !!s && !!s.socket;
-  const waitForReady = async () => {
-    const deadline = now() + STARTUP_TIMEOUT_MS;
-    let seen = readState();
-    while (!ready(seen) && now() < deadline) {
-      await sleep3(POLL_INTERVAL_MS);
-      seen = readState();
-    }
-    return ready(seen) ? seen : null;
-  };
+  markLaunchRequester();
   const child = launchDetached();
-  const state = await waitForReady();
+  const state = await observeStart({ ...deps, readState, verify });
   if (!state) {
-    const error = `The background process (pid ${child?.pid ?? "?"}) did not report ready within ${STARTUP_TIMEOUT_MS / 1e3}s.`;
+    const error = child.failure?.();
+    if (error) {
+      if (opts.report !== "silent") process.stdout.write(`Cabane couldn't start: ${error}
+`);
+      process.exitCode = 1;
+      return { started: false, state: null, error };
+    }
     if (opts.report !== "silent")
-      process.stdout.write(
-        `Cabane Companion was launched (pid ${child?.pid ?? "?"}) but didn't report ready within ${STARTUP_TIMEOUT_MS / 1e3}s.
-Check ${companionLogPath()} for errors, or run \`${cabane("status")}\`.
-`
-      );
+      process.stdout.write(unconfirmedStartLines(false).join("\n") + "\n");
     process.exitCode = 1;
-    return { started: false, state: null, error };
+    return { started: false, state: null, unconfirmed: true };
   }
   if (quiet) return { started: true, state };
   process.stdout.write(
@@ -15896,11 +15950,19 @@ function defaultSpawnDetached(args) {
   mkdirSync17(cabaneDir(), { recursive: true });
   const logFd = openSync4(companionLogPath(), "a");
   try {
-    return spawn7(process.execPath, [cliPath, ...args], {
+    const child = spawn7(process.execPath, [cliPath, ...args], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
       env: { ...process.env, CABANE_COMPANION_DAEMON: "1" }
     });
+    let failure;
+    child.once("error", (err) => {
+      failure = err.message;
+    });
+    child.once("exit", (code, signal) => {
+      failure = `The background process exited (${signal ?? code}). Check cabane logs.`;
+    });
+    return { pid: child.pid, unref: () => child.unref(), failure: () => failure };
   } finally {
     closeSync3(logFd);
   }
@@ -16020,8 +16082,10 @@ async function start(opts = {}, deps = {}) {
   try {
     return await startScript(opts, deps);
   } catch (err) {
-    for (const line of startFailure(err instanceof Error ? err.message : String(err), reloadLine()))
-      write(line);
+    const reason = err instanceof Error ? err.message : String(err);
+    if (process.env.CABANE_COMPANION_SUPERVISED === "1")
+      getLogger().error({ err }, `Cabane couldn't start: ${reason}`);
+    for (const line of startFailure(reason, reloadLine())) write(line);
     process.exitCode = 1;
     return null;
   } finally {
@@ -16057,23 +16121,41 @@ async function startScript(opts, deps) {
         mode = "attached";
       }
     } else if (installed) {
-      const result = await startService();
-      if (!result.ok) throw new Error(result.lines.join(" "));
-      const deadline = Date.now() + 8e3;
-      while (!running?.socket && Date.now() < deadline) {
-        running = await (deps.live ?? liveCompanionState)();
-        if (!running?.socket) await new Promise((resolve2) => setTimeout(resolve2, 150));
+      markLaunchRequester();
+      const before = await serviceState();
+      if (!serviceLaunchPending(before)) {
+        const result = await startService();
+        if (!result.ok) {
+          running = await observeStart({ ...deps, readState: deps.live });
+          const current2 = await serviceState();
+          if (!running && !serviceLaunchPending(current2)) throw new Error(result.lines.join(" "));
+        }
       }
-      if (!running?.socket) throw new Error("The service did not report ready within 8s.");
-      mode = "service";
+      running ??= await observeStart({ ...deps, readState: deps.live });
+      if (!running) {
+        const current2 = await serviceState();
+        if (!current2.nodeOk || current2.state === "failed")
+          throw new Error(
+            !current2.nodeOk ? "The service Node executable is missing." : "The service failed. Check cabane logs."
+          );
+        return reportUnconfirmed(true);
+      }
+      const current = await serviceState();
+      mode = current.state === "running" && current.pid === running.pid ? "service" : "existing";
     } else {
       const result = await startDaemon({ ...opts, report: "silent" });
+      if (result.unconfirmed) return reportUnconfirmed(false);
       if (!result.state)
         throw new Error(result.error ?? "The background process did not report ready.");
       running = result.state;
       mode = result.started ? "background" : "existing";
     }
   }
+  if (!runtime && mode === "existing") {
+    running = await observeStart({ ...deps, readState: deps.live });
+    if (!running) return reportUnconfirmed(installed);
+  }
+  const attached = runtime ? runAttached(runtime) : null;
   const socket = runtime?.socketPath ?? running?.socket;
   let status2 = await (deps.waitAck ?? waitForAcknowledgement)(socket);
   let detection = status2.detection ?? null;
@@ -16087,6 +16169,26 @@ async function startScript(opts, deps) {
     const latest = await readTerminalStatus(socket);
     if (latest.lastHeartbeatAckAt || latest.lastHeartbeatRefused) status2 = latest;
   }
+  if (!runtime) {
+    const current = await (deps.live ?? liveCompanionState)();
+    if (!current || await (deps.verify ?? verifyRuntime)(current) !== "ours") {
+      if (installed) {
+        const service2 = await serviceState();
+        if (!service2.pid && ["not loaded", "dead", "inactive", "failed"].includes(service2.state))
+          throw new Error("The service stopped before startup completed.");
+      }
+      return reportUnconfirmed(installed);
+    }
+    if (current.pid !== running?.pid || current.instanceId !== running?.instanceId) {
+      status2 = await readTerminalStatus(current.socket);
+      detection = status2.detection ?? null;
+    }
+    running = current;
+    if (mode === "service") {
+      const service2 = await serviceState();
+      if (service2.state !== "running" || service2.pid !== current.pid) mode = "existing";
+    }
+  }
   const personalUrl = `${cfg.baseUrl.replace(/\/$/, "")}/settings/devices`;
   const address = opts.pairing ? opts.pairing.devicesUrl : personalUrl;
   if (!daemon)
@@ -16103,10 +16205,18 @@ async function startScript(opts, deps) {
       write(line);
   if (runtime) {
     setConsoleLogging(true);
-    await runAttached(runtime);
+    await attached;
   }
   return detection;
 }
+function serviceLaunchPending(state) {
+  return !!state.pid || ["running", "activating", "auto-restart"].includes(state.state) || state.platform === "launchd" && state.installed && !["not loaded", "unknown", "failed"].includes(state.state);
+}
+function reportUnconfirmed(service2) {
+  for (const line of unconfirmedStartLines(service2)) write(line);
+  process.exitCode = 1;
+  return null;
+}
 async function detectOverSocket(socket) {
   const body = await controlRequest(socket, { cmd: "detect" }, 15e3);
   return body.detection;
@@ -16480,7 +16590,7 @@ init_term();
 
 // src/commands/stop.ts
 var TERM_GRACE_MS = 6e3;
-var POLL_INTERVAL_MS2 = 150;
+var POLL_INTERVAL_MS = 150;
 async function stop(deps = {}) {
   if ((deps.serviceInstalled ?? serviceInstalled)()) {
     const outcome = await (deps.stopService ?? stopService)();
@@ -16526,7 +16636,7 @@ async function stop(deps = {}) {
       process.stdout.write("companion: stopped.\n");
       return;
     }
-    await sleep3(POLL_INTERVAL_MS2);
+    await sleep3(POLL_INTERVAL_MS);
   }
   process.stdout.write(
     `companion: didn't exit within ${TERM_GRACE_MS / 1e3}s, sending SIGKILL.
@@ -16683,7 +16793,10 @@ function row2(label, value) {
 async function status(deps = {}) {
   const out = (line) => void process.stdout.write(`${line}
 `);
-  const running = await liveState();
+  const candidate = readLiveRuntimeState({ sweep: false });
+  const verdict = candidate ? await verifyRuntime(candidate) : null;
+  const running = verdict === "stale" ? null : candidate;
+  const service2 = await serviceState();
   for (const line of pathLines(reloadLine())) out(line);
   const strays = strayStatusLines(running, deps.strays);
   out(`  ${versionLine()}`);
@@ -16705,7 +16818,7 @@ async function status(deps = {}) {
   out(row2("Paired with", `${cfg.baseUrl}${cfg.deviceLabel ? ` as ${cfg.deviceLabel}` : ""}`));
   let detection = null;
   if (running) {
-    const mode = running.daemon ? "in the background" : "in a terminal";
+    const mode = verdict !== "ours" ? "identity unconfirmed" : runningMode(running, service2);
     const uptime = formatUptime(running.startedAt);
     out(row2("Running", `${mode} (pid ${running.pid}${uptime ? `, up ${uptime}` : ""})`));
     detection = await runningDetection(running);
@@ -16723,7 +16836,6 @@ async function status(deps = {}) {
     )
   );
   for (const line of strays) out(line);
-  const service2 = await serviceState();
   for (const line of serviceRows(service2)) out(line);
   for (const line of updateRows(readUpdateState(), cfg.update?.auto, {
     version: false,
@@ -16793,10 +16905,13 @@ function otherInstall(install, own) {
   const ownAlias = own ? real(join30(dirname13(own), "cabane-companion")) : null;
   return real(found) === ownAlias ? null : dirname13(found);
 }
-async function liveState() {
-  const running = readLiveRuntimeState({ sweep: false });
-  if (running && await verifyRuntime(running) === "stale") return null;
-  return running;
+function runningMode(running, service2) {
+  if (service2.installed) {
+    if (service2.state === "running" && service2.pid === running.pid) return "as a service";
+    if (service2.state === "unknown" || service2.pid === running.pid || service2.state === "running" && !service2.pid)
+      return "run mode unconfirmed";
+  }
+  return running.daemon ? "in the background" : "in a terminal";
 }
 async function runningDetection(running) {
   if (!running.socket) return null;

package/dist/runtime.js

@@ -2344,14 +2344,19 @@ var DeviceApi = class {
     return parsed;
   }
   // Pull the agents this device should run, across all the owner's workspaces.
-  getAssignments() {
-    return this.request("GET", "/api/companion/assignments");
+  getAssignments(signal) {
+    return this.request("GET", "/api/companion/assignments", void 0, requestSignal(signal));
   }
   // Ask again for the credential of an agent assigned to this device, when the saved copy is
   // gone. The previous credential stops working; any agent not assigned here is a 404, and a
   // second ask inside a minute a 429.
-  reissueAgentCredential(agentId) {
-    return this.request("POST", `/api/companion/agents/${encodeURIComponent(agentId)}/credential`);
+  reissueAgentCredential(agentId, signal) {
+    return this.request(
+      "POST",
+      `/api/companion/agents/${encodeURIComponent(agentId)}/credential`,
+      void 0,
+      requestSignal(signal, 3e4)
+    );
   }
   getRuns(cursor) {
     const query = new URLSearchParams({ limit: "100", order: "asc" });
@@ -2391,6 +2396,10 @@ function errorMessage2(status, body) {
   if (typeof body === "string" && body.length > 0) return `${status} ${body.slice(0, 200)}`;
   return `${status} error`;
 }
+function requestSignal(signal, timeoutMs = 5e3) {
+  const deadline = AbortSignal.timeout(timeoutMs);
+  return signal ? AbortSignal.any([signal, deadline]) : deadline;
+}
 
 // src/credentials.ts
 import {
@@ -9623,6 +9632,7 @@ var CompanionSupervisor = class {
   pollTimer = null;
   refreshing = false;
   stopped = false;
+  reconciliationAbort = new AbortController();
   // The version-skew warning is logged once, not every heartbeat.
   versionSkewWarned = false;
   // This device's id, captured from the heartbeat / assignments response. The SSE
@@ -9668,6 +9678,7 @@ var CompanionSupervisor = class {
   // heartbeat + poll loops. A companion with no device token (logged out) does
   // nothing but say so.
   async start() {
+    if (this.stopped) return;
     this.log.info(
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
       `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname2()}`
@@ -9752,6 +9763,7 @@ var CompanionSupervisor = class {
     });
     this.updater.start();
     await this.refreshAssignments();
+    if (this.stopped) return;
     this.deviceSub.start();
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
     this.heartbeatTimer.unref?.();
@@ -9864,10 +9876,12 @@ var CompanionSupervisor = class {
         let items;
         let device;
         try {
-          const resp = await this.deviceApi.getAssignments();
+          const resp = await this.deviceApi.getAssignments(this.reconciliationAbort.signal);
+          if (this.stopped) return;
           items = resp.assignments;
           device = resp.device;
         } catch (err) {
+          if (this.stopped) return;
           this.log.error(
             { ...apiErrorLogFields(err) },
             "Couldn't load the assigned agents. Check that this device is active in Cabane; trying again shortly."
@@ -9886,6 +9900,7 @@ var CompanionSupervisor = class {
           if (it.credential) setCredential(device.id, it.agentId, it.credential);
         }
         items = await this.restoreMissingCredentials(device.id, items);
+        if (this.stopped) return;
         this.uncredentialed = new Set(
           items.filter((it) => !it.credential && !getCredential(device.id, it.agentId)).map((it) => `${it.workspaceId}|${it.agentId}`)
         );
@@ -9898,6 +9913,7 @@ var CompanionSupervisor = class {
         for (const wsId of [...this.workspaces.keys()]) {
           if (!byWorkspace.has(wsId)) await this.removeWorkspace(wsId);
         }
+        if (this.stopped) return;
         for (const [wsId, list] of byWorkspace) this.reconcileWorkspace(device.id, wsId, list);
         const pruned = pruneCredentials(
           device.id,
@@ -9929,6 +9945,7 @@ var CompanionSupervisor = class {
   async restoreMissingCredentials(deviceId, items) {
     const restored = [];
     for (const it of items) {
+      if (this.stopped) return restored;
       if (it.credential || getCredential(deviceId, it.agentId)) {
         restored.push(it);
         continue;
@@ -9940,7 +9957,11 @@ var CompanionSupervisor = class {
         continue;
       }
       try {
-        const { credential } = await this.deviceApi.reissueAgentCredential(it.agentId);
+        const { credential } = await this.deviceApi.reissueAgentCredential(
+          it.agentId,
+          this.reconciliationAbort.signal
+        );
+        if (this.stopped) return restored;
         setCredential(deviceId, it.agentId, credential);
         this.log.info(
           { agentId: it.agentId, agentName: it.agentDisplayName },
@@ -10815,6 +10836,7 @@ var CompanionSupervisor = class {
   // ---- control actions ----
   async shutdown() {
     this.stopped = true;
+    this.reconciliationAbort.abort();
     this.updater?.stop();
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.detectTimer) clearInterval(this.detectTimer);
@@ -11090,33 +11112,46 @@ async function createCompanionRuntime(opts = {}) {
   });
   let restartForUpdate = async () => {
   };
-  const supervisor = new CompanionSupervisor({
-    config: cfg,
-    log,
-    hub,
-    ...opts.checkHarness ? { checkHarness: opts.checkHarness } : {},
-    ...embeddedRunner({
-      electron: Boolean(process.versions.electron),
-      execPath: process.execPath,
-      moduleUrl: import.meta.url,
-      env: process.env
-    }) ?? {},
-    restartForUpdate: () => restartForUpdate()
-  });
-  await supervisor.start();
+  let supervisor;
   let control = null;
   let dashboard = null;
+  let stopped = false;
+  const stop = async () => {
+    if (stopped) return;
+    stopped = true;
+    clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
+    await Promise.allSettled([
+      ...supervisor ? [supervisor.shutdown()] : [],
+      ...control ? [control.close()] : [],
+      ...dashboard ? [dashboard.close()] : []
+    ]);
+  };
   try {
+    supervisor = new CompanionSupervisor({
+      config: cfg,
+      log,
+      hub,
+      ...opts.checkHarness ? { checkHarness: opts.checkHarness } : {},
+      ...embeddedRunner({
+        electron: Boolean(process.versions.electron),
+        execPath: process.execPath,
+        moduleUrl: import.meta.url,
+        env: process.env
+      }) ?? {},
+      restartForUpdate: () => restartForUpdate()
+    });
+    const active2 = supervisor;
     control = await startControlServer({
       status: () => ({
         ...hub.statusJson(),
-        ...supervisor.lastHeartbeat(),
-        detection: supervisor.currentDetection()
+        ...active2.lastHeartbeat(),
+        detection: active2.currentDetection()
       }),
-      detect: () => supervisor.redetect(),
-      allow: (runtime) => supervisor.allowHarness(runtime),
-      update: (auto) => supervisor.update(auto),
-      stop: () => void supervisor.requestStop()
+      detect: () => active2.redetect(),
+      allow: (runtime) => active2.allowHarness(runtime),
+      update: (auto) => active2.update(auto),
+      stop: () => void stop().then(() => active2.requestStop())
     });
     if (opts.dashboard) {
       const preferredPort = opts.port ?? cfg.dashboardPort;
@@ -11127,6 +11162,7 @@ async function createCompanionRuntime(opts = {}) {
       });
       hub.setDashboardUrl(dashboard.url);
     }
+    if (stopped) throw new Error("The companion was stopped during startup.");
     writeRuntimeState({
       pid: process.pid,
       socket: control.path,
@@ -11144,7 +11180,7 @@ async function createCompanionRuntime(opts = {}) {
     clearRuntimeStateIfOurs(instanceId);
     process.removeListener("exit", clearRuntimeOnExit);
     await Promise.allSettled([
-      supervisor.shutdown(),
+      ...supervisor ? [supervisor.shutdown()] : [],
       ...control ? [control.close()] : [],
       ...dashboard ? [dashboard.close()] : []
     ]);
@@ -11156,22 +11192,17 @@ async function createCompanionRuntime(opts = {}) {
     });
     throw err;
   }
-  let stopped = false;
-  const stop = async () => {
-    if (stopped) return;
-    stopped = true;
-    clearRuntimeStateIfOurs(instanceId);
-    process.removeListener("exit", clearRuntimeOnExit);
-    try {
-      await supervisor.shutdown();
-      await closeSurfaces(control, dashboard);
-    } catch {
-    }
-  };
+  const active = supervisor;
   restartForUpdate = async () => {
     await stop();
     process.exit(0);
   };
+  void active.start().catch(async (err) => {
+    log.error({ err }, "Couldn't initialize the companion.");
+    recordCrash({ reason: String(err), origin: "startup", at: (/* @__PURE__ */ new Date()).toISOString() });
+    await stop();
+    process.exitCode = 1;
+  });
   return {
     ok: true,
     runtime: {
@@ -11179,16 +11210,12 @@ async function createCompanionRuntime(opts = {}) {
       socketPath: control.path,
       config: cfg,
       stop,
-      heartbeatNow: () => supervisor.heartbeatNow(),
+      heartbeatNow: () => active.heartbeatNow(),
       harnesses: () => hub.statusJson().harnesses ?? [],
-      detect: () => supervisor.redetect()
+      detect: () => active.redetect()
     }
   };
 }
-async function closeSurfaces(control, dashboard) {
-  await control.close();
-  if (dashboard) await dashboard.close();
-}
 export {
   createCompanionRuntime,
   embeddedRunner,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.187",
+  "version": "0.6.188",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",