@cabane/companion 0.6.39 → 0.6.41

package/dist/cli.js

@@ -819,7 +819,7 @@ async function warnAboutHarnessReadiness(cfg, deps = {}) {
 var HARNESS_LABELS = {
   "claude-code": "Claude Code",
   codex: "Codex",
-  opencode: "opencode"
+  opencode: "OpenCode"
 };
 var LABELS = HARNESS_LABELS;
 var OFFER_ORDER = ["claude-code", "codex", "opencode"];
@@ -949,9 +949,6 @@ function deriveOpencode(signals, manifestHas) {
     enable: "opencode"
   };
 }
-function detectedRuntimesFor(snapshot) {
-  return snapshot.harnesses.filter((h) => h.state === "detected_not_exposed").map((h) => ({ runtime: h.runtime, version: h.version }));
-}
 var PROBE_TIMEOUT_MS = 4e3;
 async function probeHarnessSignals(cfg, deps = {}) {
   const probeClaudePresence = deps.probeClaudePresence ?? claudeOnPath;
@@ -1198,8 +1195,6 @@ function blank() {
   process.stdout.write("\n");
 }
 var tick = (rest) => `${pc.green("\u2713")} ${rest}`;
-var arrow = (rest) => `${pc.yellow("\u2192")} ${rest}`;
-var bang = (rest) => `${pc.yellow("!")} ${rest}`;
 function tildePath(path) {
   const home = homedir2();
   if (home && path.startsWith(home + "/")) return `~${path.slice(home.length)}`;
@@ -2676,9 +2671,6 @@ var DeviceApi = class {
   getAssignments() {
     return this.request("GET", "/api/companion/assignments");
   }
-  beginDrain() {
-    return this.request("POST", "/api/companion/drain", {});
-  }
   // CT1146: report that a dispatch addressed to THIS device can't be run, because
   // the agent isn't one this device runs (and still wasn't after a forced
   // assignments refresh). The server clears the Working flag, retires the dispatch
@@ -9018,8 +9010,6 @@ var CompanionSupervisor = class {
   pollTimer = null;
   refreshing = false;
   stopped = false;
-  draining = false;
-  restartPending = false;
   // CT484: latch so the companion/server version-skew warning is logged once, not
   // on every 30s heartbeat.
   versionSkewWarned = false;
@@ -9103,7 +9093,7 @@ var CompanionSupervisor = class {
   }
   // ---- device-level loops ----
   kickHeartbeat() {
-    if (this.draining || this.inFlightHeartbeat) return;
+    if (this.inFlightHeartbeat) return;
     const pending = this.sendHeartbeat();
     this.inFlightHeartbeat = pending;
     void pending.finally(() => {
@@ -9145,14 +9135,7 @@ var CompanionSupervisor = class {
         // CT584: include enumerated models only when the probe SUCCEEDED (non-null).
         // A null (probe failed / no opencode) omits the field, and the server then
         // leaves this device's stored availability untouched.
-        ...opencodeModels !== null ? { models: opencodeModels } : {},
-        // CT1082: what this machine has that the user hasn't connected, so the web
-        // UI can offer it without a companion round-trip. Sent only once a probe has
-        // actually landed (`harnessSignals` non-null) — an absent field means "we
-        // didn't look this beat" and leaves the server's stored suggestion alone,
-        // the same fail-soft contract `models` keeps.
-        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {},
-        ...this.restartPending ? { restarting: true } : {}
+        ...opencodeModels !== null ? { models: opencodeModels } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9508,7 +9491,6 @@ var CompanionSupervisor = class {
       if (ev.id) wr.cursor.settle(ev.id);
       return;
     }
-    if (this.draining) return;
     const payload = {
       type: "device:dispatch_requested",
       ...wire.payload
@@ -9870,50 +9852,6 @@ var CompanionSupervisor = class {
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
   }
-  async drainForRestart(graceMs) {
-    this.restartPending = true;
-    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
-    if (!this.deviceApi) throw new Error("cannot establish deploy drain before pairing");
-    await this.sendHeartbeat();
-    const drainStartedAt = Date.now();
-    const deadline = Date.now() + Math.max(0, graceMs);
-    let timedOut = false;
-    while (true) {
-      const turns = [...this.workspaces.values()].flatMap((wr) => [...wr.chains.values()]);
-      if (turns.length === 0) break;
-      const remainingMs = deadline - Date.now();
-      if (remainingMs <= 0) {
-        timedOut = true;
-        break;
-      }
-      let timer;
-      await Promise.race([
-        Promise.allSettled(turns),
-        new Promise((resolve) => {
-          timer = setTimeout(resolve, remainingMs);
-          timer.unref?.();
-        })
-      ]);
-      if (timer) clearTimeout(timer);
-    }
-    this.log.info(
-      { waitedMs: Date.now() - drainStartedAt, timedOut },
-      timedOut ? "companion: deploy drain grace elapsed; fencing admission for restart" : "companion: deploy drain reached a quiet point; fencing admission for restart"
-    );
-    this.draining = true;
-    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
-    if (this.pollTimer) clearInterval(this.pollTimer);
-    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
-    await this.deviceApi.beginDrain();
-    for (const wr of this.workspaces.values()) wr.sub?.stop();
-    await Promise.allSettled(
-      [...this.workspaces.values()].flatMap(
-        (wr) => [...wr.agents.values()].map((agent) => agent.api.drainOutbox())
-      )
-    );
-    await this.shutdown();
-    return { drained: !timedOut };
-  }
   async requestStop() {
     await this.shutdown();
     this.exitFn(0);
@@ -10145,14 +10083,7 @@ async function createCompanionRuntime(opts = {}) {
       stop: stop2,
       heartbeatNow: () => supervisor.heartbeatNow(),
       harnesses: () => hub.statusJson().harnesses ?? [],
-      connectHarness,
-      drainForRestart: async (graceMs) => {
-        clearRuntimeStateIfOurs(instanceId);
-        const result = await supervisor.drainForRestart(graceMs);
-        await closeSurfaces(control, dashboard);
-        stopped = true;
-        return result;
-      }
+      connectHarness
     }
   };
 }
@@ -10281,8 +10212,6 @@ function defaultSpawnDetached(args) {
 
 // src/commands/start.ts
 var FORCE_EXIT_MS = 4e3;
-var DEPLOY_REEXEC_EXIT = 75;
-var DEPLOY_GRACE_MS = 6.5 * 60 * 60 * 1e3;
 var MAX_CODES = 3;
 async function start(opts = {}) {
   const interactive = isInteractive();
@@ -10301,6 +10230,7 @@ async function startScript(opts, interactive) {
     return;
   }
   blank();
+  const held = !isDevicePaired() ? await collectHarnessChoices(interactive) : [];
   let paired = null;
   if (!isDevicePaired()) {
     paired = await pairHere(opts, interactive);
@@ -10322,12 +10252,18 @@ async function startScript(opts, interactive) {
     return;
   }
   const runtime = result.runtime;
+  const connected = [];
+  for (const choice of held) {
+    if (!choice.accepted) continue;
+    const outcome = await runtime.connectHarness(choice.runtime, choice.serverUrl);
+    if (outcome.ok) connected.push(HARNESS_LABELS[choice.runtime]);
+    else write(`${INDENT}${outcome.error}`);
+  }
   await runtime.heartbeatNow();
-  const offered = await runConnectorOffer(runtime, { interactive, justPaired });
   if (interactive && !opts.foreground) {
     await handOffToBackground(runtime, {
       justPaired,
-      spaceAbove: justPaired || offered.printedSomething
+      connected
     });
     return;
   }
@@ -10339,7 +10275,7 @@ async function startScript(opts, interactive) {
     write(`${INDENT}Listening for messages\u2026`);
     setConsoleLogging(true);
   } else {
-    if (!offered.printedSomething) blank();
+    blank();
     write(
       `${INDENT}Cabane companion is running. No terminal attached, so it stays in the foreground.`
     );
@@ -10361,11 +10297,60 @@ function reportAlreadyRunning(pid) {
   write("Stop it first with `cabane-companion stop` if you want to relaunch.");
   write("Connect a harness to the running companion: cabane-companion connect claude-code");
 }
+async function collectHarnessChoices(interactive) {
+  const opencodeUrl = "http://127.0.0.1:4096";
+  const [claudePresent, claudeVersion, codexVersion, opencodeVersion] = await Promise.all([
+    claudeOnPath().catch(() => false),
+    probeCliVersion("claude").catch(() => null),
+    probeCliVersion("codex").catch(() => null),
+    probeOpencodeVersion(opencodeUrl).catch(() => null)
+  ]);
+  const found = [
+    ...claudePresent ? [{ runtime: "claude-code", version: claudeVersion }] : [],
+    ...codexVersion ? [{ runtime: "codex", version: codexVersion }] : [],
+    ...opencodeVersion ? [{ runtime: "opencode", version: opencodeVersion, serverUrl: opencodeUrl }] : []
+  ].sort((a, b) => OFFER_ORDER.indexOf(a.runtime) - OFFER_ORDER.indexOf(b.runtime));
+  if (found.length === 0) {
+    write(
+      `${INDENT}No coding agent found on this machine yet \u2014 you can pair now and add one later.`
+    );
+    blank();
+    return [];
+  }
+  write(`${INDENT}Welcome to Cabane. Let's set up this machine \u2014 two steps, both right here:`);
+  blank();
+  write(`${DATA_INDENT}1. Choose which coding agents Cabane can use on this machine`);
+  write(`${DATA_INDENT}2. Pair this machine with your Cabane account`);
+  blank();
+  const choices = [];
+  for (const harness of found) {
+    const phrase = prePairFoundPhrase(harness);
+    if (!interactive) {
+      write(`${INDENT}${phrase}. Add it with: ${connectCommand(harness.runtime)}`);
+      choices.push({ ...harness, accepted: false });
+      continue;
+    }
+    const accepted = await confirm(`${phrase}. Make it available in Cabane?`);
+    choices.push({ ...harness, accepted });
+    if (accepted) {
+      write(
+        INDENT + tick(`${HARNESS_LABELS[harness.runtime]} \u2014 available once this device is paired.`)
+      );
+    } else {
+      write(`${INDENT}Skipped. Add it any time with: ${connectCommand(harness.runtime)}`);
+    }
+    blank();
+  }
+  return choices;
+}
+function prePairFoundPhrase(harness) {
+  if (harness.runtime === "opencode") return `We found OpenCode at ${harness.serverUrl}`;
+  const label = HARNESS_LABELS[harness.runtime];
+  return harness.version ? `We found ${label} on this machine (${harness.version})` : `We found ${label} on this machine`;
+}
 async function pairHere(opts, interactive) {
   const baseUrl = resolvePairBaseUrl(opts.server);
   const label = deviceLabelFromHostname(hostname2());
-  write(`${INDENT}Not paired yet.`);
-  blank();
   const aborter = new AbortController();
   const onSigint = () => aborter.abort();
   process.on("SIGINT", onSigint);
@@ -10378,7 +10363,7 @@ async function pairHere(opts, interactive) {
       if (attempt === 1) printFirstCode(code);
       else printFreshCode(code);
       spinner.start(
-        `Waiting for you to confirm it in Cabane\u2026 (the code is good for ${minutes} minutes)`
+        `Waiting for you to confirm in Cabane\u2026 (the code is good for ${minutes} minutes)`
       );
       try {
         const device = await awaitEnrollment(baseUrl, code, { signal: aborter.signal });
@@ -10388,7 +10373,7 @@ async function pairHere(opts, interactive) {
         if (err instanceof EnrollmentCancelledError) {
           spinner.clear();
           blank();
-          write(`${INDENT}Pairing cancelled. Run \`cabane-companion start\` when you're ready.`);
+          write(`${INDENT}Pairing cancelled. Run cabane-companion start when you're ready.`);
           return null;
         }
         if (!(err instanceof EnrollmentExpiredError)) throw err;
@@ -10399,8 +10384,9 @@ async function pairHere(opts, interactive) {
         }
         spinner.freeze();
         blank();
-        write(`${INDENT}Still not confirmed after ${minutesWaited} minutes \u2014 stopping here.`);
-        write(`${INDENT}Run \`cabane-companion start\` again when you're ready.`);
+        write(
+          `${INDENT}Still not confirmed after ${minutesWaited} minutes \u2014 stopping here. Run cabane-companion start again when you're ready.`
+        );
         return null;
       }
     }
@@ -10410,11 +10396,11 @@ async function pairHere(opts, interactive) {
   }
 }
 function printFirstCode(code) {
-  write(`${INDENT}Enter this code in Cabane:`);
+  write(`${INDENT}Now let's pair this machine. Enter this code in Cabane:`);
   blank();
   write(`${DATA_INDENT}${code.userCode}`);
   blank();
-  write(`${INDENT}or open this link:`);
+  write(`${INDENT}or, if Cabane isn\u2019t open:`);
   blank();
   write(`${DATA_INDENT}${code.verificationUriComplete}`);
   blank();
@@ -10429,54 +10415,6 @@ function printFreshCode(code) {
 function possessive(ownerName) {
   return ownerName ? `${ownerName}'s` : "your Cabane";
 }
-async function runConnectorOffer(runtime, ctx) {
-  const snapshot = runtime.harnesses();
-  const detected = OFFER_ORDER.map((r) => snapshot.find((h) => h.runtime === r)).filter(
-    (h) => !!h && h.state === "detected_not_exposed"
-  );
-  if (detected.length === 0) {
-    if (!ctx.justPaired) return { printedSomething: false };
-    blank();
-    write(
-      INDENT + bang(
-        "No coding agent found on this machine yet \u2014 install Claude Code, Codex or opencode and sign in,"
-      )
-    );
-    write(`${INDENT}  then: cabane-companion connect claude-code   (or codex, or opencode)`);
-    return { printedSomething: true };
-  }
-  blank();
-  if (!ctx.interactive) {
-    for (const h of detected) {
-      write(
-        `${INDENT}${foundPhrase(h, runtime.config)} but it isn't connected. Connect it: ${connectCommand(h.runtime)}`
-      );
-    }
-    return { printedSomething: true };
-  }
-  for (const h of detected) {
-    const yes = await confirm(`${foundPhrase(h, runtime.config)}. Connect it to Cabane?`);
-    if (!yes) {
-      write(`${INDENT}Skipped. Connect it later with: ${connectCommand(h.runtime)}`);
-      continue;
-    }
-    const outcome = await runtime.connectHarness(h.runtime);
-    if (!outcome.ok) {
-      write(`${INDENT}${outcome.error}`);
-      continue;
-    }
-    write(INDENT + tick(outcome.message));
-  }
-  return { printedSomething: true };
-}
-function foundPhrase(h, cfg) {
-  const label = HARNESS_LABELS[h.runtime];
-  if (h.runtime === "opencode") {
-    const url = cfg.opencode?.serverUrl;
-    return url ? `We found ${label} at ${url}` : `We found ${label} on this machine`;
-  }
-  return h.version ? `We found ${label} on this machine (${h.version})` : `We found ${label} on this machine`;
-}
 function connectCommand(runtime) {
   return `cabane-companion connect ${runtime}`;
 }
@@ -10486,12 +10424,22 @@ async function handOffToBackground(runtime, ctx) {
   if (!outcome.started) {
     return;
   }
-  if (ctx.spaceAbove) blank();
+  if (ctx.justPaired) {
+    for (const label of ctx.connected) write(INDENT + tick(`${label} connected.`));
+    if (ctx.connected.length === 0) {
+      write(
+        `${INDENT}Add a coding agent any time: cabane-companion connect claude-code (or codex, or opencode)`
+      );
+    }
+  }
   write(INDENT + tick("Cabane companion is running in the background."));
   write(`    Stop:  cabane-companion stop        Logs:  ${tildePath(companionLogPath())}`);
   if (ctx.justPaired) {
     blank();
-    write(INDENT + arrow("Head back to Cabane to finish up."));
+    write(`${INDENT}! It won't restart on its own \u2014 after a reboot, or if it ever stops,`);
+    write(`${INDENT}  just run cabane-companion start again.`);
+    blank();
+    write(`${INDENT}All set on this side. Finish up in Cabane.`);
   }
 }
 async function runAttached(runtime) {
@@ -10521,31 +10469,6 @@ companion: received ${signal}, shutting down\u2026
     };
     process.on("SIGINT", () => void shutdown("SIGINT"));
     process.on("SIGTERM", () => void shutdown("SIGTERM"));
-    process.on("SIGUSR2", () => {
-      if (shuttingDown) return;
-      shuttingDown = true;
-      const configuredGrace = Number.parseInt(
-        process.env.CABANE_COMPANION_DEPLOY_GRACE_MS ?? String(DEPLOY_GRACE_MS),
-        10
-      );
-      const graceMs = Number.isFinite(configuredGrace) ? configuredGrace : DEPLOY_GRACE_MS;
-      process.stdout.write(`
-companion: deploy drain requested (${graceMs}ms grace)\u2026
-`);
-      void runtime.drainForRestart(graceMs).then(({ drained }) => {
-        process.stdout.write(
-          drained ? "companion: deploy drain complete; re-execing onto the new dist.\n" : "companion: deploy grace expired; re-execing \u2014 unfinished turns resume after restart.\n"
-        );
-        resolve();
-        process.exit(DEPLOY_REEXEC_EXIT);
-      }).catch((err) => {
-        process.stderr.write(
-          `companion: deploy drain failed: ${err instanceof Error ? err.message : String(err)}
-`
-        );
-        process.exit(DEPLOY_REEXEC_EXIT);
-      });
-    });
   });
 }
 

package/dist/runtime.js

@@ -1297,7 +1297,7 @@ async function warnAboutHarnessReadiness(cfg, deps = {}) {
 var HARNESS_LABELS = {
   "claude-code": "Claude Code",
   codex: "Codex",
-  opencode: "opencode"
+  opencode: "OpenCode"
 };
 var LABELS = HARNESS_LABELS;
 function deriveHarnessSnapshot(signals) {
@@ -1419,9 +1419,6 @@ function deriveOpencode(signals, manifestHas) {
     enable: "opencode"
   };
 }
-function detectedRuntimesFor(snapshot) {
-  return snapshot.harnesses.filter((h) => h.state === "detected_not_exposed").map((h) => ({ runtime: h.runtime, version: h.version }));
-}
 var PROBE_TIMEOUT_MS = 4e3;
 async function probeHarnessSignals(cfg, deps = {}) {
   const probeClaudePresence = deps.probeClaudePresence ?? claudeOnPath;
@@ -2104,9 +2101,6 @@ var DeviceApi = class {
   getAssignments() {
     return this.request("GET", "/api/companion/assignments");
   }
-  beginDrain() {
-    return this.request("POST", "/api/companion/drain", {});
-  }
   // CT1146: report that a dispatch addressed to THIS device can't be run, because
   // the agent isn't one this device runs (and still wasn't after a forced
   // assignments refresh). The server clears the Working flag, retires the dispatch
@@ -8525,8 +8519,6 @@ var CompanionSupervisor = class {
   pollTimer = null;
   refreshing = false;
   stopped = false;
-  draining = false;
-  restartPending = false;
   // CT484: latch so the companion/server version-skew warning is logged once, not
   // on every 30s heartbeat.
   versionSkewWarned = false;
@@ -8610,7 +8602,7 @@ var CompanionSupervisor = class {
   }
   // ---- device-level loops ----
   kickHeartbeat() {
-    if (this.draining || this.inFlightHeartbeat) return;
+    if (this.inFlightHeartbeat) return;
     const pending = this.sendHeartbeat();
     this.inFlightHeartbeat = pending;
     void pending.finally(() => {
@@ -8652,14 +8644,7 @@ var CompanionSupervisor = class {
         // CT584: include enumerated models only when the probe SUCCEEDED (non-null).
         // A null (probe failed / no opencode) omits the field, and the server then
         // leaves this device's stored availability untouched.
-        ...opencodeModels !== null ? { models: opencodeModels } : {},
-        // CT1082: what this machine has that the user hasn't connected, so the web
-        // UI can offer it without a companion round-trip. Sent only once a probe has
-        // actually landed (`harnessSignals` non-null) — an absent field means "we
-        // didn't look this beat" and leaves the server's stored suggestion alone,
-        // the same fail-soft contract `models` keeps.
-        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {},
-        ...this.restartPending ? { restarting: true } : {}
+        ...opencodeModels !== null ? { models: opencodeModels } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9015,7 +9000,6 @@ var CompanionSupervisor = class {
       if (ev.id) wr.cursor.settle(ev.id);
       return;
     }
-    if (this.draining) return;
     const payload = {
       type: "device:dispatch_requested",
       ...wire.payload
@@ -9377,50 +9361,6 @@ var CompanionSupervisor = class {
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
   }
-  async drainForRestart(graceMs) {
-    this.restartPending = true;
-    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
-    if (!this.deviceApi) throw new Error("cannot establish deploy drain before pairing");
-    await this.sendHeartbeat();
-    const drainStartedAt = Date.now();
-    const deadline = Date.now() + Math.max(0, graceMs);
-    let timedOut = false;
-    while (true) {
-      const turns = [...this.workspaces.values()].flatMap((wr) => [...wr.chains.values()]);
-      if (turns.length === 0) break;
-      const remainingMs = deadline - Date.now();
-      if (remainingMs <= 0) {
-        timedOut = true;
-        break;
-      }
-      let timer;
-      await Promise.race([
-        Promise.allSettled(turns),
-        new Promise((resolve) => {
-          timer = setTimeout(resolve, remainingMs);
-          timer.unref?.();
-        })
-      ]);
-      if (timer) clearTimeout(timer);
-    }
-    this.log.info(
-      { waitedMs: Date.now() - drainStartedAt, timedOut },
-      timedOut ? "companion: deploy drain grace elapsed; fencing admission for restart" : "companion: deploy drain reached a quiet point; fencing admission for restart"
-    );
-    this.draining = true;
-    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
-    if (this.pollTimer) clearInterval(this.pollTimer);
-    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
-    await this.deviceApi.beginDrain();
-    for (const wr of this.workspaces.values()) wr.sub?.stop();
-    await Promise.allSettled(
-      [...this.workspaces.values()].flatMap(
-        (wr) => [...wr.agents.values()].map((agent) => agent.api.drainOutbox())
-      )
-    );
-    await this.shutdown();
-    return { drained: !timedOut };
-  }
   async requestStop() {
     await this.shutdown();
     this.exitFn(0);
@@ -9652,14 +9592,7 @@ async function createCompanionRuntime(opts = {}) {
       stop,
       heartbeatNow: () => supervisor.heartbeatNow(),
       harnesses: () => hub.statusJson().harnesses ?? [],
-      connectHarness,
-      drainForRestart: async (graceMs) => {
-        clearRuntimeStateIfOurs(instanceId);
-        const result = await supervisor.drainForRestart(graceMs);
-        await closeSurfaces(control, dashboard);
-        stopped = true;
-        return result;
-      }
+      connectHarness
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.39",
+  "version": "0.6.41",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding 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",