@cabane/companion 0.6.49 → 0.6.51

package/dist/cli.js

@@ -5,7 +5,7 @@ import { Command, Option } from "commander";
 
 // src/control-socket.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync2, rmSync as rmSync2, mkdirSync as mkdirSync2 } from "fs";
+import { chmodSync as chmodSync2, existsSync as existsSync2, rmSync as rmSync2, mkdirSync as mkdirSync2 } from "fs";
 import { createServer, connect } from "net";
 import { join as join2 } from "path";
 
@@ -495,13 +495,18 @@ function deleteConfig() {
 
 // src/control-socket.ts
 var CONTROL_TIMEOUT_MS = 1e3;
+var MAX_UNIX_SOCKET_PATH_BYTES = 103;
 function controlSocketPath() {
   const dir2 = cabaneDir();
+  const key = createHash("sha256").update(dir2).digest("hex").slice(0, 16);
   if (process.platform === "win32") {
-    const key = createHash("sha256").update(dir2).digest("hex").slice(0, 16);
     return `\\\\.\\pipe\\cabane-companion-${key}`;
   }
-  return join2(dir2, "companion.sock");
+  const besideRuntime = join2(dir2, "companion.sock");
+  if (Buffer.byteLength(besideRuntime) <= MAX_UNIX_SOCKET_PATH_BYTES) return besideRuntime;
+  const filename = `cabane-companion-${key}.sock`;
+  const xdgPath = process.env.XDG_RUNTIME_DIR && existsSync2(process.env.XDG_RUNTIME_DIR) ? join2(process.env.XDG_RUNTIME_DIR, filename) : null;
+  return xdgPath && Buffer.byteLength(xdgPath) <= MAX_UNIX_SOCKET_PATH_BYTES ? xdgPath : join2("/tmp", filename);
 }
 async function startControlServer(handlers) {
   const path = controlSocketPath();
@@ -522,6 +527,18 @@ async function startControlServer(handlers) {
       resolve();
     });
   });
+  if (process.platform !== "win32") {
+    try {
+      chmodSync2(path, 384);
+    } catch (err) {
+      await new Promise((resolve) => server.close(() => resolve()));
+      try {
+        rmSync2(path, { force: true });
+      } catch {
+      }
+      throw err;
+    }
+  }
   server.on("error", () => {
   });
   return {
@@ -644,40 +661,58 @@ async function ping(path) {
 }
 
 // src/harness-check.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 
 // src/harness-versions.ts
 import { spawn as spawn2 } from "child_process";
 var EMPTY = { claudeCode: null, opencode: null, codex: null };
+var CLI_PROBE_TIMEOUT_MS = 4e3;
 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 probeCliVersion(command, spawnImpl = spawn2) {
+function probeCliPresence(command, spawnImpl = spawn2) {
   return new Promise((resolve) => {
     let settled = false;
-    const done = (v) => {
+    let timer = null;
+    const done = (result) => {
       if (!settled) {
         settled = true;
-        resolve(v);
+        if (timer) clearTimeout(timer);
+        resolve(result);
       }
     };
     let child;
     try {
       child = spawnImpl(command, ["--version"], { stdio: ["ignore", "pipe", "ignore"] });
     } catch {
-      done(null);
+      done({ status: "absent" });
       return;
     }
     let out = "";
     child.stdout?.on("data", (chunk) => {
       if (out.length < 4096) out += chunk.toString();
     });
-    child.once("error", () => done(null));
-    child.once("exit", (code) => done(code === 0 ? parseVersionToken(out) : null));
+    timer = setTimeout(() => {
+      child.kill?.("SIGKILL");
+      done({ status: "unusable" });
+    }, CLI_PROBE_TIMEOUT_MS);
+    timer.unref?.();
+    child.once("error", () => done({ status: "absent" }));
+    child.once("exit", (code) => {
+      const version = code === 0 ? parseVersionToken(out) : null;
+      done(version ? { status: "present", version } : { status: "unusable" });
+    });
   });
 }
+function probeHarnessPresence(runtime, spawnImpl = spawn2) {
+  return probeCliPresence(runtime === "codex" ? "codex" : "claude", spawnImpl);
+}
+async function probeCliVersion(command, spawnImpl = spawn2) {
+  const result = await probeCliPresence(command, spawnImpl);
+  return result.status === "present" ? result.version : null;
+}
 async function probeOpencodeVersion(serverUrl, fetchImpl = fetch) {
   try {
     const base = serverUrl.endsWith("/") ? serverUrl.slice(0, -1) : serverUrl;
@@ -741,81 +776,6 @@ function buildCompanionManifest(opts) {
   return { runtimes, capabilities: { ...DEVICE_MANIFEST.capabilities } };
 }
 
-// src/prereqs.ts
-import { spawn as spawn3 } from "child_process";
-async function claudeOnPath() {
-  return new Promise((resolve) => {
-    let settled = false;
-    const child = spawn3("claude", ["--version"], { stdio: "ignore" });
-    child.once("error", () => {
-      if (!settled) {
-        settled = true;
-        resolve(false);
-      }
-    });
-    child.once("exit", (code) => {
-      if (!settled) {
-        settled = true;
-        resolve(code === 0);
-      }
-    });
-  });
-}
-var CODEX_PROBE_TIMEOUT_MS = 4e3;
-async function codexOnPath() {
-  const version = await Promise.race([
-    probeCliVersion("codex"),
-    new Promise((resolve) => {
-      const timer = setTimeout(() => resolve(null), CODEX_PROBE_TIMEOUT_MS);
-      timer.unref?.();
-    })
-  ]);
-  return version !== null;
-}
-async function requireStartConfig(deps = {}) {
-  const requireCfg = deps.requireCfg ?? requireConfig;
-  const probeClaude = deps.probeClaude ?? claudeOnPath;
-  const save2 = deps.save ?? saveConfig;
-  const cfg = requireCfg();
-  const claudeOnPathResult = await probeClaude();
-  const migrated = migrateConnectedHarnesses(cfg, claudeOnPathResult);
-  if (!migrated) return { cfg, claudeOnPath: claudeOnPathResult };
-  save2(migrated);
-  deps.onMigrated?.(migrated, claudeOnPathResult);
-  return { cfg: migrated, claudeOnPath: claudeOnPathResult };
-}
-async function warnAboutHarnessReadiness(cfg, deps = {}) {
-  const probeClaude = deps.probeClaude ?? claudeOnPath;
-  const probeCodex = deps.probeCodex ?? codexOnPath;
-  const warn = deps.warn ?? ((message) => process.stderr.write(`${message}
-`));
-  const connected = [
-    ...isClaudeCodeConnected(cfg) ? ["Claude Code"] : [],
-    ...isCodexEnabled(cfg) ? ["Codex"] : [],
-    ...cfg.opencode ? ["opencode"] : []
-  ];
-  if (connected.length > 0) {
-    if (isClaudeCodeConnected(cfg) && !await probeClaude()) {
-      warn(
-        "warning: Claude Code is connected on this device but `claude` isn\u2019t on your PATH, so it advertises nothing and a Claude-model agent won\u2019t be routed here. Install it (`npm i -g @anthropic-ai/claude-code`) and log in, or disconnect it."
-      );
-    }
-    return;
-  }
-  const [claudeInstalled, codexInstalled] = await Promise.all([probeClaude(), probeCodex()]);
-  const installed = [
-    ...claudeInstalled ? ["Claude Code"] : [],
-    ...codexInstalled ? ["Codex"] : []
-  ];
-  const connectCommands = [
-    ...claudeInstalled ? ["`cabane-companion connect claude-code`"] : [],
-    ...codexInstalled ? ["`cabane-companion connect codex`"] : []
-  ];
-  warn(
-    "No harness is connected on this device yet, so no agent turn can run here. " + (installed.length > 0 ? `We found ${installed.join(" and ")} on this machine \u2014 connect ${installed.length > 1 ? "one with " : "it with "}${connectCommands.join(" or ")} and turns start routing here.` : "Install a harness and sign in \u2014 Claude Code (`npm i -g @anthropic-ai/claude-code`), the Codex CLI (`codex login`), or `opencode serve` \u2014 then connect it with `cabane-companion connect <harness>` (pass `--url <url>` for opencode).")
-  );
-}
-
 // src/harness-status.ts
 var HARNESS_LABELS = {
   "claude-code": "Claude Code",
@@ -976,20 +936,19 @@ async function resolveOpencodeServerUrl(configuredServerUrl, requestedServerUrl,
   return await probeDefault() !== null ? DEFAULT_OPENCODE_SERVER_URL : null;
 }
 async function probeHarnessSignals(cfg, deps = {}) {
-  const probeClaudePresence = deps.probeClaudePresence ?? claudeOnPath;
-  const probeClaudeVersion = deps.probeClaudeVersion ?? (() => probeCliVersion("claude"));
-  const probeCodexVersion = deps.probeCodexVersion ?? (() => probeCliVersion("codex"));
+  const probePresence = deps.probePresence ?? probeHarnessPresence;
   const probeOpencode = deps.probeOpencode ?? ((url) => probeOpencodeVersion(url));
   const configuredServerUrl = cfg.opencode?.serverUrl;
   const opencodeProbeUrl = configuredServerUrl ?? DEFAULT_OPENCODE_SERVER_URL;
-  const [claudeOnPathResult, claudeVersion, codexVersion, opencodeVersion] = await Promise.all([
-    withTimeout(probeClaudePresence(), false),
-    withTimeout(probeClaudeVersion(), null),
-    withTimeout(probeCodexVersion(), null),
+  const [claudePresence, codexPresence, opencodeVersion] = await Promise.all([
+    deps.presence?.["claude-code"] ?? withTimeout(probePresence("claude-code"), { status: "absent" }),
+    deps.presence?.codex ?? withTimeout(probePresence("codex"), { status: "absent" }),
     configuredServerUrl ? withTimeout(probeOpencode(opencodeProbeUrl), null) : probeDefaultOpencodeVersion(probeOpencode)
   ]);
+  const claudeVersion = claudePresence.status === "present" ? claudePresence.version : null;
+  const codexVersion = codexPresence.status === "present" ? codexPresence.version : null;
   return {
-    claudeOnPath: claudeOnPathResult,
+    claudeOnPath: claudePresence.status === "present",
     claudeVersion,
     // CT1082: the user's opt-in. Presence alone exposes nothing now, so this is
     // the manifest gate and the probe above is only a suggestion.
@@ -1041,16 +1000,13 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
       if (!url) return "absent";
       return await probeOpencode(url) !== null ? "ok" : "failed";
     }
-    const { auth, presence } = runtime === "codex" ? {
-      auth: ["codex", ["login", "status"]],
-      presence: ["codex", ["--version"]]
+    const { auth } = runtime === "codex" ? {
+      auth: ["codex", ["login", "status"]]
     } : {
-      auth: ["claude", ["auth", "status"]],
-      presence: ["claude", ["--version"]]
+      auth: ["claude", ["auth", "status"]]
     };
-    const presenceRun = await run(presence[0], [...presence[1]]);
-    if (presenceRun.error === "spawn") return "absent";
-    if (presenceRun.code !== 0) return "unverified";
+    const presence = deps.presence ?? await (deps.probePresence ?? probeHarnessPresence)(runtime);
+    if (presence.status !== "present") return presence.status;
     const authRun = await run(auth[0], [...auth[1]]);
     if (authRun.code === 0) return "ok";
     if (looksUnsupported(authRun.output)) {
@@ -1062,7 +1018,9 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
   }
 }
 function connectedLine(runtime, verdict) {
-  if (verdict === "absent") throw new Error("an absent harness cannot be connected");
+  if (verdict === "absent" || verdict === "unusable") {
+    throw new Error("an unavailable harness cannot be connected");
+  }
   const label = HARNESS_LABELS[runtime];
   if (verdict !== "failed") return `${label} connected.`;
   return `${label} connected \u2014 ${FAILED_SUFFIX[runtime]}`;
@@ -1072,13 +1030,18 @@ var FAILED_SUFFIX = {
   codex: "it doesn\u2019t look signed in yet. Run `codex login` once, then it\u2019s ready.",
   opencode: "its server isn\u2019t answering. Start `opencode serve`, then it\u2019s ready."
 };
-function absentLine(runtime) {
+function presenceReason(runtime, status2) {
   if (runtime === "opencode") {
     return "No opencode server is configured \u2014 run `opencode serve` and connect with `--url`.";
   }
   const label = HARNESS_LABELS[runtime];
-  const login = runtime === "codex" ? "`codex login`" : "`claude`";
-  return `${label} isn\u2019t installed on this machine \u2014 install it and sign in (${login}), then run this again.`;
+  return status2 === "absent" ? `${label} isn't installed on this machine.` : `${label} is installed here but didn't report a version Cabane can read.`;
+}
+var CLI_PRESENCE_ACTION = "Install it and run this again.";
+var DASHBOARD_PRESENCE_ACTION = "Install it, then refresh.";
+function presenceRefusal(runtime, status2, action) {
+  const reason = presenceReason(runtime, status2);
+  return runtime === "opencode" ? reason : `${reason} ${action}`;
 }
 function looksUnsupported(output) {
   return /unrecognized|unknown (sub)?command|unexpected argument|invalid (sub)?command|no such (sub)?command|usage:|did you mean/i.test(
@@ -1096,7 +1059,7 @@ function runBounded(command, args) {
     };
     let child;
     try {
-      child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn3(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     } catch {
       resolve({ code: null, output: "", error: "spawn" });
       return;
@@ -1299,18 +1262,31 @@ async function confirm(question) {
 }
 
 // src/commands/connect.ts
-async function connect2(raw, opts = {}) {
+async function connect2(raw, opts = {}, deps = {}) {
   const runtime = parseHarnessRuntime(raw);
   if (!runtime) {
     throw new CompanionError(
       `unknown harness "${raw}". Connectable harnesses are: claude-code, codex, opencode.`
     );
   }
-  const live = await liveSocket();
+  const loadConfig2 = deps.loadConfig ?? requireConfig;
+  const request = deps.request ?? controlRequest;
+  const save2 = deps.save ?? saveConfig;
+  const output = deps.output ?? write;
+  const probePresence = deps.probePresence ?? probeHarnessPresence;
+  const shakeOut = deps.shakeOut ?? shakeOutHarness;
+  const resolveServerUrl = deps.resolveServerUrl ?? resolveOpencodeServerUrl;
+  const probeOpencode = deps.probeOpencode ?? probeOpencodeVersion;
+  const cfg = loadConfig2();
+  if (!opts.serverUrl?.trim() && alreadyConnected(runtime, cfg)) {
+    output(`${INDENT}${HARNESS_LABELS[runtime]} is already connected on this device.`);
+    return;
+  }
+  const live = await (deps.findLiveSocket ?? liveSocket)();
   if (live) {
     let result;
     try {
-      result = await controlRequest(
+      result = await request(
         live,
         {
           cmd: "connect",
@@ -1326,42 +1302,38 @@ async function connect2(raw, opts = {}) {
       );
     }
     if (!result.ok) throw new CompanionError(result.message);
-    write(INDENT + tick(result.message));
-    return;
-  }
-  const cfg = requireConfig();
-  if (alreadyConnected(runtime, cfg)) {
-    write(`${INDENT}${HARNESS_LABELS[runtime]} is already connected on this device.`);
+    output(INDENT + tick(result.message));
     return;
   }
-  if (runtime === "claude-code" && !await claudeOnPath()) {
-    throw new CompanionError(
-      "Couldn\u2019t find `claude` on this machine\u2019s PATH. Install Claude Code (`npm i -g @anthropic-ai/claude-code`) and sign in, then connect it."
-    );
-  }
   let next = cfg;
+  const presence = runtime === "opencode" ? void 0 : await probePresence(runtime);
+  if (presence && presence.status !== "present") {
+    throw new CompanionError(presenceRefusal(runtime, presence.status, CLI_PRESENCE_ACTION));
+  }
   if (runtime === "claude-code") next = { ...cfg, claudeCode: { enabled: true } };
   else if (runtime === "codex") next = { ...cfg, codex: { enabled: true } };
   else {
     const requestedServerUrl = opts.serverUrl?.trim();
-    const serverUrl = await resolveOpencodeServerUrl(void 0, requestedServerUrl);
+    const serverUrl = await resolveServerUrl(cfg.opencode?.serverUrl, requestedServerUrl);
     if (!serverUrl) {
       throw new CompanionError(
         "opencode is addressed by URL \u2014 pass it: `cabane-companion connect opencode --url http://127.0.0.1:4096`."
       );
     }
-    if (requestedServerUrl && await probeOpencodeVersion(serverUrl) === null) {
+    if (requestedServerUrl && await probeOpencode(serverUrl) === null) {
       throw new CompanionError(
         `Couldn\u2019t reach an opencode server at ${serverUrl}. Start \`opencode serve\` and check the URL.`
       );
     }
     next = { ...cfg, opencode: { serverUrl } };
   }
-  const verdict = await shakeOutHarness(runtime, next);
-  if (verdict === "absent") throw new CompanionError(absentLine(runtime));
-  saveConfig(next);
-  write(INDENT + tick(connectedLine(runtime, verdict)));
-  write(`${INDENT}Not running yet \u2014 start it with: cabane-companion start`);
+  const verdict = await shakeOut(runtime, next, { ...presence ? { presence } : {} });
+  if (verdict === "absent" || verdict === "unusable") {
+    throw new CompanionError(presenceRefusal(runtime, verdict, CLI_PRESENCE_ACTION));
+  }
+  save2(next);
+  output(INDENT + tick(connectedLine(runtime, verdict)));
+  output(`${INDENT}Not running yet \u2014 start it with: cabane-companion start`);
 }
 async function liveSocket() {
   const state = readLiveRuntimeState();
@@ -1393,7 +1365,7 @@ import { confirm as confirm2 } from "@inquirer/prompts";
 
 // src/credentials.ts
 import {
-  chmodSync as chmodSync2,
+  chmodSync as chmodSync3,
   existsSync as existsSync4,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync3,
@@ -1428,14 +1400,14 @@ function save(map) {
   const path = credentialsPath();
   mkdirSync4(dirname2(path), { recursive: true });
   try {
-    chmodSync2(cabaneDir(), 448);
+    chmodSync3(cabaneDir(), 448);
   } catch {
   }
   const tmp = `${path}.${process.pid}.tmp`;
   try {
     writeFileSync3(tmp, JSON.stringify(map, null, 2) + "\n", { mode: 384 });
     try {
-      chmodSync2(tmp, 384);
+      chmodSync3(tmp, 384);
     } catch {
     }
     renameSync2(tmp, path);
@@ -2082,12 +2054,18 @@ function registerRoutes(app, deps) {
     const runtime = body.runtime;
     if (runtime === "claude-code") {
       const result = await supervisor.enableHarness({ runtime: "claude-code" });
-      if (!result.ok) return c.json({ error: result.error }, 400);
+      if (!result.ok) {
+        const error = result.presence ? `${result.error} ${DASHBOARD_PRESENCE_ACTION}` : result.error;
+        return c.json({ error }, 400);
+      }
       return c.json({ ok: true, status: hub.statusJson() });
     }
     if (runtime === "codex") {
       const result = await supervisor.enableHarness({ runtime: "codex" });
-      if (!result.ok) return c.json({ error: result.error }, 400);
+      if (!result.ok) {
+        const error = result.presence ? `${result.error} ${DASHBOARD_PRESENCE_ACTION}` : result.error;
+        return c.json({ error }, 400);
+      }
       return c.json({ ok: true, status: hub.statusJson() });
     }
     if (runtime === "opencode") {
@@ -2246,6 +2224,57 @@ function resolveStaticDir() {
   return join7(dirname4(fileURLToPath(import.meta.url)), "static");
 }
 
+// src/prereqs.ts
+async function claudeOnPath() {
+  return (await probeHarnessPresence("claude-code")).status === "present";
+}
+async function codexOnPath() {
+  return (await probeHarnessPresence("codex")).status === "present";
+}
+async function requireStartConfig(deps = {}) {
+  const requireCfg = deps.requireCfg ?? requireConfig;
+  const probeClaude = deps.probeClaude ?? claudeOnPath;
+  const save2 = deps.save ?? saveConfig;
+  const cfg = requireCfg();
+  const claudeOnPathResult = await probeClaude();
+  const migrated = migrateConnectedHarnesses(cfg, claudeOnPathResult);
+  if (!migrated) return { cfg, claudeOnPath: claudeOnPathResult };
+  save2(migrated);
+  deps.onMigrated?.(migrated, claudeOnPathResult);
+  return { cfg: migrated, claudeOnPath: claudeOnPathResult };
+}
+async function warnAboutHarnessReadiness(cfg, deps = {}) {
+  const probeClaude = deps.probeClaude ?? claudeOnPath;
+  const probeCodex = deps.probeCodex ?? codexOnPath;
+  const warn = deps.warn ?? ((message) => process.stderr.write(`${message}
+`));
+  const connected = [
+    ...isClaudeCodeConnected(cfg) ? ["Claude Code"] : [],
+    ...isCodexEnabled(cfg) ? ["Codex"] : [],
+    ...cfg.opencode ? ["opencode"] : []
+  ];
+  if (connected.length > 0) {
+    if (isClaudeCodeConnected(cfg) && !await probeClaude()) {
+      warn(
+        "warning: Claude Code is connected on this device but `claude` isn\u2019t on your PATH, so it advertises nothing and a Claude-model agent won\u2019t be routed here. Install it (`npm i -g @anthropic-ai/claude-code`) and log in, or disconnect it."
+      );
+    }
+    return;
+  }
+  const [claudeInstalled, codexInstalled] = await Promise.all([probeClaude(), probeCodex()]);
+  const installed = [
+    ...claudeInstalled ? ["Claude Code"] : [],
+    ...codexInstalled ? ["Codex"] : []
+  ];
+  const connectCommands = [
+    ...claudeInstalled ? ["`cabane-companion connect claude-code`"] : [],
+    ...codexInstalled ? ["`cabane-companion connect codex`"] : []
+  ];
+  warn(
+    "No harness is connected on this device yet, so no agent turn can run here. " + (installed.length > 0 ? `We found ${installed.join(" and ")} on this machine \u2014 connect ${installed.length > 1 ? "one with " : "it with "}${connectCommands.join(" or ")} and turns start routing here.` : "Install a harness and sign in \u2014 Claude Code (`npm i -g @anthropic-ai/claude-code`), the Codex CLI (`codex login`), or `opencode serve` \u2014 then connect it with `cabane-companion connect <harness>` (pass `--url <url>` for opencode).")
+  );
+}
+
 // src/api.ts
 var RETRY_BACKOFF_MS = [250, 750];
 var ACTIVE_RUN_OUTBOX_SEQ = 0;
@@ -7176,7 +7205,7 @@ function resolveMcpSecrets(mcpServers, store) {
 }
 
 // src/transcript-writer.ts
-import { appendFileSync, chmodSync as chmodSync3, copyFileSync, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync6 } from "fs";
+import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync6 } from "fs";
 import { basename, dirname as dirname5, join as join13 } from "path";
 function transcriptsDir() {
   return join13(cabaneDir(), "transcripts");
@@ -7193,7 +7222,7 @@ var TranscriptWriter = class {
     try {
       mkdirSync9(dir2, { recursive: true });
       try {
-        chmodSync3(dir2, 448);
+        chmodSync4(dir2, 448);
       } catch {
       }
       pruneOld(dir2, RETAIN);
@@ -7220,10 +7249,10 @@ var TranscriptWriter = class {
     try {
       const dir2 = join13(dirname5(this.path), "anomalies");
       mkdirSync9(dir2, { recursive: true, mode: 448 });
-      chmodSync3(dir2, 448);
+      chmodSync4(dir2, 448);
       const target = join13(dir2, basename(this.path));
       copyFileSync(this.path, target);
-      chmodSync3(target, 384);
+      chmodSync4(target, 384);
       pruneOld(dir2, ANOMALY_RETAIN);
     } catch (err) {
       this.fail(err);
@@ -9065,11 +9094,9 @@ var CompanionSupervisor = class {
   // can never disagree with what the manifest advertises. Null until the first
   // probe (the heartbeat then falls back to the boot `claudeCode`).
   harnessSignals = null;
-  // CT1082: the fresh PATH probe the claude-code connect vets with. Deliberately
-  // NOT the cached beat signal — someone connecting right after installing Claude
-  // Code shouldn't be refused by a snapshot up to a heartbeat old.
-  probeClaudePresence;
-  probeCodexPresence;
+  // Fresh per attempt, never the cached heartbeat signal: installing a harness
+  // between attempts must be observed immediately.
+  probePresence;
   exitFn;
   reexecFn;
   dispatcherFactory;
@@ -9101,8 +9128,7 @@ var CompanionSupervisor = class {
     this.log = opts.log;
     this.hub = opts.hub;
     this.claudeCode = opts.claudeCode ?? true;
-    this.probeClaudePresence = opts.probeClaudePresence ?? claudeOnPath;
-    this.probeCodexPresence = opts.probeCodexPresence ?? codexOnPath;
+    this.probePresence = opts.probePresence ?? probeHarnessPresence;
     this.harnessVersions = opts.harnessVersions ?? emptyHarnessVersions();
     this.exitFn = opts.exit ?? ((code) => process.exit(code));
     this.reexecFn = opts.reexec ?? defaultReexec;
@@ -9800,10 +9826,11 @@ var CompanionSupervisor = class {
   // over SSE). Fail-soft by construction — `probeHarnessSignals` never throws — but
   // wrapped anyway so a harness refresh can never take a heartbeat down. Called on
   // the heartbeat cadence (fresh presence for the manifest + UI) and on demand.
-  async refreshHarnessStatuses() {
+  async refreshHarnessStatuses(presence = {}) {
     try {
       const signals = await probeHarnessSignals(this.config, {
-        probeClaudePresence: this.probeClaudePresence
+        probePresence: this.probePresence,
+        presence
       });
       this.harnessSignals = signals;
       this.harnessVersions = {
@@ -9860,18 +9887,24 @@ var CompanionSupervisor = class {
   // reachable/valid input).
   async enableHarness(input) {
     let next;
+    let checkedPresence = null;
     if (input.runtime === "claude-code") {
-      if (!await this.probeClaudePresence()) {
+      const presence = input.presence ?? await this.probePresence("claude-code");
+      if (presence.status !== "present") {
         return {
           ok: false,
-          error: "Couldn\u2019t find `claude` on this machine\u2019s PATH. Install Claude Code (`npm i -g @anthropic-ai/claude-code`) and sign in, then connect it."
+          error: presenceReason("claude-code", presence.status),
+          presence: true
         };
       }
+      checkedPresence = { runtime: "claude-code", result: presence };
       next = { ...this.config, claudeCode: { enabled: true } };
     } else if (input.runtime === "codex") {
-      if (!await this.probeCodexPresence()) {
-        return { ok: false, error: absentLine("codex") };
+      const presence = input.presence ?? await this.probePresence("codex");
+      if (presence.status !== "present") {
+        return { ok: false, error: presenceReason("codex", presence.status), presence: true };
       }
+      checkedPresence = { runtime: "codex", result: presence };
       next = { ...this.config, codex: { enabled: true } };
     } else {
       const serverUrl = input.serverUrl.trim();
@@ -9895,7 +9928,9 @@ var CompanionSupervisor = class {
     this.config = next;
     saveConfig(next);
     this.rebuildDispatchers();
-    await this.refreshHarnessStatuses();
+    await this.refreshHarnessStatuses(
+      checkedPresence ? { [checkedPresence.runtime]: checkedPresence.result } : {}
+    );
     this.kickHeartbeat();
     return { ok: true };
   }
@@ -9959,9 +9994,9 @@ async function waitForBoundedHeartbeat(heartbeat) {
 }
 function defaultReexec() {
   clearRuntimeState();
-  void import("child_process").then(({ spawn: spawn6 }) => {
+  void import("child_process").then(({ spawn: spawn5 }) => {
     try {
-      const child = spawn6(process.execPath, process.argv.slice(1), {
+      const child = spawn5(process.execPath, process.argv.slice(1), {
         stdio: "inherit",
         detached: false
       });
@@ -10102,7 +10137,8 @@ async function createCompanionRuntime(opts = {}) {
   if (!claim.acquired) {
     return { ok: false, reason: "already-running", existing: claim.existing ?? null };
   }
-  process.on("exit", () => clearRuntimeStateIfOurs(instanceId));
+  const clearRuntimeOnExit = () => clearRuntimeStateIfOurs(instanceId);
+  process.on("exit", clearRuntimeOnExit);
   const hub = new CompanionStateHub({
     // CT29: one device, one base URL — the cabane instance this device is paired
     // with. The dashboard's connection line shows it.
@@ -10124,49 +10160,73 @@ async function createCompanionRuntime(opts = {}) {
     const currentConfig = supervisor.currentConfig();
     const resolvedServerUrl = runtime === "opencode" ? await resolveOpencodeServerUrl(currentConfig.opencode?.serverUrl, serverUrl) : null;
     const candidate = runtime === "opencode" ? { ...currentConfig, opencode: { serverUrl: resolvedServerUrl ?? "" } } : currentConfig;
-    const verdict = await shakeOutHarness(runtime, candidate);
-    if (verdict === "absent") return { ok: false, error: absentLine(runtime) };
+    const presence = runtime === "opencode" ? void 0 : await probeHarnessPresence(runtime);
+    const verdict = await shakeOutHarness(runtime, candidate, {
+      ...presence ? { presence } : {}
+    });
+    if (verdict === "absent" || verdict === "unusable") {
+      return { ok: false, error: presenceRefusal(runtime, verdict, CLI_PRESENCE_ACTION) };
+    }
     const result = await supervisor.enableHarness(
-      runtime === "opencode" ? { runtime: "opencode", serverUrl: resolvedServerUrl ?? "" } : { runtime }
+      runtime === "opencode" ? { runtime: "opencode", serverUrl: resolvedServerUrl ?? "" } : { runtime, presence }
     );
     if (!result.ok) return { ok: false, error: result.error };
     return { ok: true, message: connectedLine(runtime, verdict) };
   };
-  const control = await startControlServer({
-    status: () => hub.statusJson(),
-    connect: async (runtime, serverUrl) => {
-      const result = await connectHarness(runtime, serverUrl);
-      return result.ok ? { ok: true, message: result.message } : { ok: false, message: result.error };
-    },
-    stop: () => void supervisor.requestStop()
-  });
+  let control = null;
   let dashboard = null;
-  if (opts.dashboard) {
-    const preferredPort = opts.port ?? cfg.dashboardPort;
-    dashboard = await startDashboard({
-      supervisor,
-      hub,
-      ...preferredPort !== void 0 ? { port: preferredPort } : {}
+  try {
+    control = await startControlServer({
+      status: () => hub.statusJson(),
+      connect: async (runtime, serverUrl) => {
+        const result = await connectHarness(runtime, serverUrl);
+        return result.ok ? { ok: true, message: result.message } : { ok: false, message: result.error };
+      },
+      stop: () => void supervisor.requestStop()
+    });
+    if (opts.dashboard) {
+      const preferredPort = opts.port ?? cfg.dashboardPort;
+      dashboard = await startDashboard({
+        supervisor,
+        hub,
+        ...preferredPort !== void 0 ? { port: preferredPort } : {}
+      });
+      hub.setDashboardUrl(dashboard.url);
+    }
+    writeRuntimeState({
+      pid: process.pid,
+      socket: control.path,
+      ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
+      startedAt,
+      // SJ495: the daemon launcher sets this env on the detached child, so the
+      // marker records whether this companion is backgrounded (foreground start
+      // leaves it unset → false).
+      daemon: process.env.CABANE_COMPANION_DAEMON === "1",
+      instanceId
+    });
+    clearCrash();
+  } catch (err) {
+    clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
+    await Promise.allSettled([
+      supervisor.shutdown(),
+      ...control ? [control.close()] : [],
+      ...dashboard ? [dashboard.close()] : []
+    ]);
+    recordCrash({
+      reason: err instanceof Error ? err.message : String(err),
+      ...errorCode(err) ? { code: errorCode(err) } : {},
+      origin: "startup",
+      at: (/* @__PURE__ */ new Date()).toISOString()
     });
-    hub.setDashboardUrl(dashboard.url);
+    throw err;
   }
-  writeRuntimeState({
-    pid: process.pid,
-    socket: control.path,
-    ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
-    startedAt,
-    // SJ495: the daemon launcher sets this env on the detached child, so the
-    // marker records whether this companion is backgrounded (foreground start
-    // leaves it unset → false).
-    daemon: process.env.CABANE_COMPANION_DAEMON === "1",
-    instanceId
-  });
-  clearCrash();
   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);
@@ -10192,7 +10252,7 @@ async function closeSurfaces(control, dashboard) {
 }
 
 // src/commands/daemon.ts
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { closeSync as closeSync3, mkdirSync as mkdirSync13, openSync as openSync3 } from "fs";
 
 // src/cli-entry.ts
@@ -10299,7 +10359,7 @@ function defaultSpawnDetached(args) {
   mkdirSync13(cabaneDir(), { recursive: true });
   const logFd = openSync3(companionLogPath(), "a");
   try {
-    return spawn5(process.execPath, [cliPath, ...args], {
+    return spawn4(process.execPath, [cliPath, ...args], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
       env: { ...process.env, CABANE_COMPANION_DAEMON: "1" }
@@ -10397,14 +10457,15 @@ function reportAlreadyRunning(pid) {
   write("Connect a harness to the running companion: cabane-companion connect claude-code");
 }
 async function collectHarnessChoices(interactive) {
-  const [claudePresent, claudeVersion, codexVersion, opencodeVersion] = await Promise.all([
-    claudeOnPath().catch(() => false),
-    probeCliVersion("claude").catch(() => null),
-    probeCliVersion("codex").catch(() => null),
+  const [claudePresence, codexPresence, opencodeVersion] = await Promise.all([
+    probeHarnessPresence("claude-code").catch(() => ({ status: "absent" })),
+    probeHarnessPresence("codex").catch(() => ({ status: "absent" })),
     probeDefaultOpencodeVersion()
   ]);
+  const claudeVersion = claudePresence.status === "present" ? claudePresence.version : null;
+  const codexVersion = codexPresence.status === "present" ? codexPresence.version : null;
   const found = [
-    ...claudePresent ? [{ runtime: "claude-code", version: claudeVersion }] : [],
+    ...claudeVersion ? [{ runtime: "claude-code", version: claudeVersion }] : [],
     ...codexVersion ? [{ runtime: "codex", version: codexVersion }] : [],
     ...opencodeVersion ? [
       {