@cabane/companion 0.6.187 → 0.6.189

package/dist/runtime.js

@@ -295,7 +295,15 @@ var companionConfigSchema = z2.object({
   // and an agent with no folder of its own and no prepare hook works there
   // (`turn-execution.ts`, `prepareEnvironment`). Default `~/.cabane/work`: hidden, so pairing a
   // laptop creates no new visible folder; set it to make the work visible.
-  root: z2.string().min(1).refine(isRootPath, { message: "must be an absolute path, or start with ~/" }).optional()
+  root: z2.string().min(1).refine(isRootPath, { message: "must be an absolute path, or start with ~/" }).optional(),
+  // An argv prefix the operator puts in front of every turn's runner: the companion starts
+  // `<prefix…> <its own run-turn command…>` instead of the runner bare. What the prefix does
+  // is the operator's (a box of their own making, ENG225); the companion knows nothing of it
+  // beyond handing the runner over, with the turn's inputs in its environment and the
+  // credential and secrets on its stdin (`runner/launch.ts`, `boxed`).
+  runner: z2.object({
+    command: z2.array(z2.string().min(1)).min(1)
+  }).strict().optional()
 });
 function workRoot(cfg) {
   const root = cfg.root;
@@ -2344,14 +2352,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 +2404,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 {
@@ -7436,7 +7453,8 @@ var dispatchSchema = z14.object({
   episode: z14.number().int().optional()
 });
 var credentialsSchema = z14.object({
-  credential: z14.string().startsWith("cabrn_")
+  credential: z14.string().startsWith("cabrn_"),
+  secrets: z14.record(z14.string(), z14.string()).optional()
 });
 function runnerEnv(input) {
   return {
@@ -7448,7 +7466,10 @@ function runnerEnv(input) {
   };
 }
 function runnerStdin(input) {
-  return `${JSON.stringify({ credential: input.credential })}
+  return `${JSON.stringify({
+    credential: input.credential,
+    ...input.secrets ? { secrets: input.secrets } : {}
+  })}
 `;
 }
 function encodeLauncherMessage(message) {
@@ -7473,6 +7494,29 @@ function selfRunnerCommand() {
   if (!script) throw new Error("runner: cannot tell which script started this companion");
   return [process.execPath, ...process.execArgv, script, "run-turn"];
 }
+function wrappedRunnerCommand(prefix, own) {
+  return [...prefix ?? [], ...own];
+}
+var BOXED_ENV_DROPPED = [
+  "ANTHROPIC_API_KEY",
+  "CLAUDE_CODE_OAUTH_TOKEN",
+  "CODEX_API_KEY",
+  "GH_TOKEN",
+  "GITHUB_TOKEN",
+  "DBUS_SESSION_BUS_ADDRESS",
+  "XDG_RUNTIME_DIR"
+];
+var BOXED_ENV_DROPPED_PREFIX = "CABANE_GATE_";
+function runnerExecEnv(base, boxed) {
+  const env = {};
+  for (const [k, v] of Object.entries(base)) {
+    if (v === void 0) continue;
+    if (boxed && (BOXED_ENV_DROPPED.includes(k) || k.startsWith(BOXED_ENV_DROPPED_PREFIX)))
+      continue;
+    env[k] = v;
+  }
+  return env;
+}
 function healthSnapshot(store) {
   const out = {};
   for (const r of store?.reports() ?? []) {
@@ -7677,13 +7721,12 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     return { ok: false, durationMs: durationMs2, reason: reason2 };
   }
   try {
-    const env = {};
-    for (const [k, v] of Object.entries(launch.env ?? process.env)) {
-      if (v !== void 0) env[k] = v;
-    }
+    const boxed = launch.boxed === true;
+    const env = runnerExecEnv(launch.env ?? process.env, boxed);
     const input = {
       baseUrl: opts.baseUrl,
       credential: minted.credential,
+      ...boxed ? { secrets: launch.secrets?.() ?? {} } : {},
       dispatch: payload,
       turnId,
       resumed: handleOpts.resumed,
@@ -7755,7 +7798,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
           locks?.release(lockOwner(event.id));
           return;
         case "process_group":
-          groups.push(event.pgid);
+          if (!boxed) groups.push(event.pgid);
           return;
         case "remote_session":
           remote.push({ serverUrl: event.serverUrl, sessionId: event.sessionId });
@@ -7776,7 +7819,8 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
   }
   if (result) return result;
   const durationMs = Date.now() - startedAt;
-  const reason = thrown !== void 0 ? `runner_failed: ${thrown}` : `runner_exited: ${code}`;
+  const stopped = controller.signal.aborted && thrown === void 0;
+  const reason = stopped ? "cancelled" : thrown !== void 0 ? `runner_failed: ${thrown}` : `runner_exited: ${code}`;
   await child?.reap(groups);
   const reaped = await (launch.reapTurn ?? reapTurnScopes)(turnId).catch((err) => ({
     failures: [err instanceof Error ? err.message : String(err)]
@@ -7791,8 +7835,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     await opts.api.setActiveRun(opts.workspaceId, payload.conversationId, payload.agentId, {
       activeRunStartedAt: null,
       turnId,
-      outcome: "failed",
-      errorReason: reason.slice(0, ERROR_REASON_MAX),
+      ...stopped ? { outcome: "interrupted" } : { outcome: "failed", errorReason: reason.slice(0, ERROR_REASON_MAX) },
       readThrough: payload.messageId
     });
   } catch (err) {
@@ -7810,7 +7853,8 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     reason: "exited"
   });
   if (thrown !== void 0) throw new Error(thrown);
-  log.warn({ turnId, code }, "runner: exited without reporting a result");
+  if (stopped) log.info({ turnId, code }, "runner: stopped before it could report");
+  else log.warn({ turnId, code }, "runner: exited without reporting a result");
   duties.notifyEnd({ id: payload.messageId, ok: false, durationMs, reason });
   return { ok: false, durationMs, reason };
 }
@@ -7872,9 +7916,9 @@ function secretsPath() {
   return join18(cabaneDir(), "secrets.json");
 }
 var secretStoreSchema = z16.record(z16.string(), z16.string());
-function loadSecretStore() {
+function loadSecretValues() {
   const path = secretsPath();
-  if (!existsSync10(path)) return makeStore({});
+  if (!existsSync10(path)) return {};
   let raw;
   try {
     raw = readFileSync8(path, "utf8");
@@ -7883,7 +7927,7 @@ function loadSecretStore() {
       `couldn't read ${path}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
-  if (raw.trim().length === 0) return makeStore({});
+  if (raw.trim().length === 0) return {};
   let parsed;
   try {
     parsed = JSON.parse(raw);
@@ -7898,14 +7942,17 @@ function loadSecretStore() {
       `${path} must be a flat object mapping secret names to string values (e.g. { "GITHUB_TOKEN": "ghp_\u2026" }).`
     );
   }
-  return makeStore(result.data);
+  return result.data;
 }
 function loadSecretStoreTolerant(onWarn) {
+  return makeStore(loadSecretValuesTolerant(onWarn));
+}
+function loadSecretValuesTolerant(onWarn) {
   try {
-    return loadSecretStore();
+    return loadSecretValues();
   } catch (err) {
     onWarn?.(err instanceof Error ? err.message : String(err));
-    return makeStore({});
+    return {};
   }
 }
 function makeStore(map) {
@@ -7930,6 +7977,130 @@ function requiredSecretNames(mcpServers) {
   return [...names].sort();
 }
 
+// src/harness-usable.ts
+import { spawn as spawn4 } from "child_process";
+
+// src/harness-versions.ts
+var EMPTY = { claudeCode: null, opencode: null, codex: null };
+function parseVersionToken(raw) {
+  if (!raw) return null;
+  const m = raw.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/);
+  return m ? m[0] : null;
+}
+async function probeOpencodeVersion(serverUrl, fetchImpl = fetch) {
+  try {
+    const base = serverUrl.endsWith("/") ? serverUrl.slice(0, -1) : serverUrl;
+    const res = await fetchImpl(`${base}/global/health`, {
+      headers: { accept: "application/json" }
+    });
+    if (!res.ok) return null;
+    return extractOpencodeVersion(await res.json());
+  } catch {
+    return null;
+  }
+}
+function extractOpencodeVersion(json) {
+  if (!json || typeof json !== "object") return null;
+  const obj = json;
+  const candidates = [obj.version];
+  for (const v of Object.values(obj)) {
+    if (v && typeof v === "object") candidates.push(v.version);
+  }
+  for (const c of candidates) {
+    if (typeof c === "string") {
+      const parsed = parseVersionToken(c);
+      if (parsed) return parsed;
+    }
+  }
+  return null;
+}
+function emptyHarnessVersions() {
+  return { ...EMPTY };
+}
+
+// src/harness-usable.ts
+var API_KEY_VARIABLES = {
+  "claude-code": ["ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN"],
+  codex: ["CODEX_API_KEY"]
+};
+function apiKeyVariable(runtime, env = process.env) {
+  return API_KEY_VARIABLES[runtime].find((name) => !!env[name]?.trim()) ?? null;
+}
+var CHECK_TIMEOUT_MS = 5e3;
+async function checkHarnessUsable(runtime, deps = {}) {
+  const env = deps.env ?? process.env;
+  const resolveBundled = deps.resolveBundled ?? ((r) => resolveBundledBinary(r));
+  const run = deps.run ?? runBounded;
+  const resolution = resolveBundled(runtime);
+  if (resolution.status !== "present" || !resolution.path) {
+    return {
+      status: "bundle_missing",
+      bundled: resolution.status === "present" ? "executable_missing" : resolution.status
+    };
+  }
+  const path = resolution.path;
+  const version = run(path, ["--version"], env).then(
+    (r) => r.code === 0 ? parseVersionToken(r.output) : null
+  );
+  const variable = apiKeyVariable(runtime, env);
+  if (variable) return { status: "api_key", variable, version: await version };
+  const statusArgs = runtime === "codex" ? ["login", "status"] : ["auth", "status", "--json"];
+  const [answer, v] = await Promise.all([run(path, statusArgs, env), version]);
+  if (answer.error) return { status: "check_failed", reason: answer.error };
+  const signedIn = runtime === "codex" ? readCodexStatus(answer) : readClaudeStatus(answer);
+  if (typeof signedIn === "string") return { status: "check_failed", reason: signedIn };
+  return signedIn ? { status: "signed_in", version: v } : { status: "signed_out", version: v };
+}
+function readClaudeStatus(answer) {
+  const start = answer.output.indexOf("{");
+  const end = answer.output.lastIndexOf("}");
+  if (start < 0 || end < start) return "unreadable";
+  try {
+    const parsed = JSON.parse(answer.output.slice(start, end + 1));
+    const loggedIn = parsed?.loggedIn;
+    return typeof loggedIn === "boolean" ? loggedIn : "unreadable";
+  } catch {
+    return "unreadable";
+  }
+}
+function readCodexStatus(answer) {
+  if (answer.code === 0) return true;
+  if (/not logged in/i.test(answer.output)) return false;
+  if (/config/i.test(answer.output)) return "config";
+  return "unreadable";
+}
+function runBounded(path, args, env) {
+  return new Promise((resolve) => {
+    let settled = false;
+    let out = "";
+    const done = (result) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve(result);
+    };
+    let child;
+    try {
+      child = spawn4(path, args, { stdio: ["ignore", "pipe", "pipe"], env });
+    } catch {
+      resolve({ code: null, output: "", error: "spawn" });
+      return;
+    }
+    const capture = (chunk) => {
+      if (out.length < 8192) out += chunk.toString();
+    };
+    child.stdout?.on("data", capture);
+    child.stderr?.on("data", capture);
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      done({ code: null, output: out, error: "timeout" });
+    }, CHECK_TIMEOUT_MS);
+    timer.unref?.();
+    child.once("error", () => done({ code: null, output: out, error: "spawn" }));
+    child.once("close", (code) => done({ code, output: out }));
+  });
+}
+
 // src/transcript-writer.ts
 import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync8, readdirSync, rmSync as rmSync6 } from "fs";
 import { basename as basename3, dirname as dirname7, join as join19 } from "path";
@@ -8074,7 +8245,7 @@ function hostReport() {
 }
 
 // src/providers/local-process.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 import { constants as constants2 } from "os";
 var DEFAULT_KILL_GRACE_MS = 3e4;
 var DEFAULT_REAP_GRACE_MS = 3e3;
@@ -8085,7 +8256,7 @@ function exitCode(code, signal) {
 }
 function createLocalProcessProvider(opts = {}) {
   const killGraceMs = opts.killGraceMs ?? DEFAULT_KILL_GRACE_MS;
-  const spawnFn = opts.spawnFn ?? spawn4;
+  const spawnFn = opts.spawnFn ?? spawn5;
   const reapGraceMs = opts.reapGraceMs ?? DEFAULT_REAP_GRACE_MS;
   const killFn = opts.killFn ?? ((pid, signal) => process.kill(pid, signal));
   const groupAlive = (pgid) => {
@@ -8287,44 +8458,6 @@ function checkReason(check) {
   }
 }
 
-// src/harness-versions.ts
-var EMPTY = { claudeCode: null, opencode: null, codex: null };
-function parseVersionToken(raw) {
-  if (!raw) return null;
-  const m = raw.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/);
-  return m ? m[0] : null;
-}
-async function probeOpencodeVersion(serverUrl, fetchImpl = fetch) {
-  try {
-    const base = serverUrl.endsWith("/") ? serverUrl.slice(0, -1) : serverUrl;
-    const res = await fetchImpl(`${base}/global/health`, {
-      headers: { accept: "application/json" }
-    });
-    if (!res.ok) return null;
-    return extractOpencodeVersion(await res.json());
-  } catch {
-    return null;
-  }
-}
-function extractOpencodeVersion(json) {
-  if (!json || typeof json !== "object") return null;
-  const obj = json;
-  const candidates = [obj.version];
-  for (const v of Object.values(obj)) {
-    if (v && typeof v === "object") candidates.push(v.version);
-  }
-  for (const c of candidates) {
-    if (typeof c === "string") {
-      const parsed = parseVersionToken(c);
-      if (parsed) return parsed;
-    }
-  }
-  return null;
-}
-function emptyHarnessVersions() {
-  return { ...EMPTY };
-}
-
 // src/harness-copy.ts
 import { homedir as homedir8 } from "os";
 import { join as join21 } from "path";
@@ -8360,90 +8493,6 @@ function spaced(sentence) {
   return sentence ? ` ${sentence}` : "";
 }
 
-// src/harness-usable.ts
-import { spawn as spawn5 } from "child_process";
-var API_KEY_VARIABLES = {
-  "claude-code": ["ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN"],
-  codex: ["CODEX_API_KEY"]
-};
-function apiKeyVariable(runtime, env = process.env) {
-  return API_KEY_VARIABLES[runtime].find((name) => !!env[name]?.trim()) ?? null;
-}
-var CHECK_TIMEOUT_MS = 5e3;
-async function checkHarnessUsable(runtime, deps = {}) {
-  const env = deps.env ?? process.env;
-  const resolveBundled = deps.resolveBundled ?? ((r) => resolveBundledBinary(r));
-  const run = deps.run ?? runBounded;
-  const resolution = resolveBundled(runtime);
-  if (resolution.status !== "present" || !resolution.path) {
-    return {
-      status: "bundle_missing",
-      bundled: resolution.status === "present" ? "executable_missing" : resolution.status
-    };
-  }
-  const path = resolution.path;
-  const version = run(path, ["--version"], env).then(
-    (r) => r.code === 0 ? parseVersionToken(r.output) : null
-  );
-  const variable = apiKeyVariable(runtime, env);
-  if (variable) return { status: "api_key", variable, version: await version };
-  const statusArgs = runtime === "codex" ? ["login", "status"] : ["auth", "status", "--json"];
-  const [answer, v] = await Promise.all([run(path, statusArgs, env), version]);
-  if (answer.error) return { status: "check_failed", reason: answer.error };
-  const signedIn = runtime === "codex" ? readCodexStatus(answer) : readClaudeStatus(answer);
-  if (typeof signedIn === "string") return { status: "check_failed", reason: signedIn };
-  return signedIn ? { status: "signed_in", version: v } : { status: "signed_out", version: v };
-}
-function readClaudeStatus(answer) {
-  const start = answer.output.indexOf("{");
-  const end = answer.output.lastIndexOf("}");
-  if (start < 0 || end < start) return "unreadable";
-  try {
-    const parsed = JSON.parse(answer.output.slice(start, end + 1));
-    const loggedIn = parsed?.loggedIn;
-    return typeof loggedIn === "boolean" ? loggedIn : "unreadable";
-  } catch {
-    return "unreadable";
-  }
-}
-function readCodexStatus(answer) {
-  if (answer.code === 0) return true;
-  if (/not logged in/i.test(answer.output)) return false;
-  if (/config/i.test(answer.output)) return "config";
-  return "unreadable";
-}
-function runBounded(path, args, env) {
-  return new Promise((resolve) => {
-    let settled = false;
-    let out = "";
-    const done = (result) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      resolve(result);
-    };
-    let child;
-    try {
-      child = spawn5(path, args, { stdio: ["ignore", "pipe", "pipe"], env });
-    } catch {
-      resolve({ code: null, output: "", error: "spawn" });
-      return;
-    }
-    const capture = (chunk) => {
-      if (out.length < 8192) out += chunk.toString();
-    };
-    child.stdout?.on("data", capture);
-    child.stderr?.on("data", capture);
-    const timer = setTimeout(() => {
-      child.kill("SIGKILL");
-      done({ code: null, output: out, error: "timeout" });
-    }, CHECK_TIMEOUT_MS);
-    timer.unref?.();
-    child.once("error", () => done({ code: null, output: out, error: "spawn" }));
-    child.once("close", (code) => done({ code, output: out }));
-  });
-}
-
 // src/harness-detect.ts
 var DEFAULT_OPENCODE_SERVER_URL = "http://127.0.0.1:4096";
 var DEFAULT_OPENCODE_PROBE_MS = 1e3;
@@ -9623,6 +9672,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 +9718,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 +9803,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 +9916,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 +9940,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 +9953,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 +9985,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 +9997,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 },
@@ -10233,7 +10294,16 @@ var CompanionSupervisor = class {
       },
       runner: {
         provider: this.runnerProvider,
-        command: this.runnerCommand ?? selfRunnerCommand(),
+        command: wrappedRunnerCommand(
+          this.config.runner?.command,
+          this.runnerCommand ?? selfRunnerCommand()
+        ),
+        ...this.config.runner?.command ? {
+          boxed: true,
+          secrets: () => loadSecretValuesTolerant(
+            (m) => this.log.warn({ err: m }, "Could not read the secrets file for a boxed turn.")
+          )
+        } : {},
         ...this.runnerEnv ? { env: this.runnerEnv } : {},
         reportRunnerGone: (report) => this.reportRunnerGone(report),
         connectorHealth: this.connectorHealth,
@@ -10815,6 +10885,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 +11161,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 +11211,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 +11229,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 +11241,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 +11259,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,