@cabane/companion 0.6.40 → 0.6.42

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)}`;
@@ -7449,16 +7444,22 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     "x-cabane-active-conversation": req.cabane.activeConversationId
   };
   try {
-    const initialized = await initializeWithRetry(fetchImpl, req.cabane.mcpUrl, headers, {
-      jsonrpc: "2.0",
-      id: 1,
-      method: "initialize",
-      params: {
-        protocolVersion: "2025-03-26",
-        capabilities: {},
-        clientInfo: { name: "cabane-companion-readiness", version: "1" }
-      }
-    });
+    const initialized = await initializeWithRetry(
+      fetchImpl,
+      req.cabane.mcpUrl,
+      headers,
+      {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-03-26",
+          capabilities: {},
+          clientInfo: { name: "cabane-companion-readiness", version: "1" }
+        }
+      },
+      opts.retryDelaysMs ?? INITIALIZE_RETRY_DELAYS_MS
+    );
     if (initialized.status === 401 || initialized.status === 403)
       return fail(base, "authentication_failed", `initialize returned HTTP ${initialized.status}`);
     if (initialized.transient)
@@ -7502,10 +7503,10 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     );
   }
 }
-async function initializeWithRetry(fetchImpl, url, headers, body) {
+async function initializeWithRetry(fetchImpl, url, headers, body, retryDelaysMs) {
   let lastFailure = null;
   const deadline = Date.now() + INITIALIZE_RETRY_BUDGET_MS;
-  for (let attempt = 0; attempt <= INITIALIZE_RETRY_DELAYS_MS.length; attempt += 1) {
+  for (let attempt = 0; attempt <= retryDelaysMs.length; attempt += 1) {
     try {
       const remainingMs = deadline - Date.now();
       if (remainingMs <= 0) break;
@@ -7529,7 +7530,7 @@ async function initializeWithRetry(fetchImpl, url, headers, body) {
         transient: true
       };
     }
-    const retryDelayMs = INITIALIZE_RETRY_DELAYS_MS[attempt];
+    const retryDelayMs = retryDelaysMs[attempt];
     if (retryDelayMs === void 0 || Date.now() + retryDelayMs >= deadline) break;
     await delay(retryDelayMs);
   }
@@ -8165,6 +8166,7 @@ ${reason}`,
       }
       const proof = await proveWorkspaceTools(request, adapter.name, {
         ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
+        ...this.opts.workspaceProofRetryDelaysMs ? { retryDelaysMs: this.opts.workspaceProofRetryDelaysMs } : {},
         harnessFingerprint: turnContext.runtime
       });
       turnLog[proof.ok ? "info" : "error"](
@@ -8982,6 +8984,7 @@ var ASSIGNMENTS_POLL_MS = 6e4;
 var DRAIN_BASE_MS = 1e3;
 var DRAIN_MAX_MS = 3e4;
 var DRAIN_IDLE_MS = 15e3;
+var DEFAULT_UNRUNNABLE_RETRY_DELAYS_MS = [0, 1e3, 3e3];
 var CompanionSupervisor = class {
   workspaces = /* @__PURE__ */ new Map();
   config;
@@ -9008,6 +9011,7 @@ var CompanionSupervisor = class {
   exitFn;
   reexecFn;
   dispatcherFactory;
+  unrunnableRetryDelaysMs;
   deviceApi = null;
   deviceSub = null;
   heartbeatTimer = null;
@@ -9040,6 +9044,7 @@ var CompanionSupervisor = class {
     this.exitFn = opts.exit ?? ((code) => process.exit(code));
     this.reexecFn = opts.reexec ?? defaultReexec;
     this.dispatcherFactory = opts.dispatcherFactory;
+    this.unrunnableRetryDelaysMs = opts.unrunnableRetryDelaysMs ?? DEFAULT_UNRUNNABLE_RETRY_DELAYS_MS;
   }
   // Stand up the data plane: pair check, initial assignments pull, then the
   // heartbeat + poll loops. A companion with no device token (logged out) does
@@ -9140,13 +9145,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)) } : {}
+        ...opencodeModels !== null ? { models: opencodeModels } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9550,9 +9549,8 @@ var CompanionSupervisor = class {
   // wedge the workspace's whole stream.
   async reportUnrunnableDispatch(wr, payload) {
     if (!this.deviceApi) return false;
-    const backoffMs = [0, 1e3, 3e3];
     let lastErr;
-    for (const wait of backoffMs) {
+    for (const wait of this.unrunnableRetryDelaysMs) {
       if (this.stopped) return false;
       if (wait > 0) await new Promise((r) => setTimeout(r, wait));
       try {
@@ -10241,6 +10239,7 @@ async function startScript(opts, interactive) {
     return;
   }
   blank();
+  const held = !isDevicePaired() ? await collectHarnessChoices(interactive) : [];
   let paired = null;
   if (!isDevicePaired()) {
     paired = await pairHere(opts, interactive);
@@ -10262,12 +10261,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;
   }
@@ -10279,7 +10284,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.`
     );
@@ -10301,11 +10306,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);
@@ -10318,7 +10372,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 });
@@ -10328,7 +10382,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;
@@ -10339,8 +10393,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;
       }
     }
@@ -10350,11 +10405,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();
@@ -10369,54 +10424,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}`;
 }
@@ -10426,12 +10433,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) {

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;
@@ -6956,16 +6953,22 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     "x-cabane-active-conversation": req.cabane.activeConversationId
   };
   try {
-    const initialized = await initializeWithRetry(fetchImpl, req.cabane.mcpUrl, headers, {
-      jsonrpc: "2.0",
-      id: 1,
-      method: "initialize",
-      params: {
-        protocolVersion: "2025-03-26",
-        capabilities: {},
-        clientInfo: { name: "cabane-companion-readiness", version: "1" }
-      }
-    });
+    const initialized = await initializeWithRetry(
+      fetchImpl,
+      req.cabane.mcpUrl,
+      headers,
+      {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-03-26",
+          capabilities: {},
+          clientInfo: { name: "cabane-companion-readiness", version: "1" }
+        }
+      },
+      opts.retryDelaysMs ?? INITIALIZE_RETRY_DELAYS_MS
+    );
     if (initialized.status === 401 || initialized.status === 403)
       return fail(base, "authentication_failed", `initialize returned HTTP ${initialized.status}`);
     if (initialized.transient)
@@ -7009,10 +7012,10 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     );
   }
 }
-async function initializeWithRetry(fetchImpl, url, headers, body) {
+async function initializeWithRetry(fetchImpl, url, headers, body, retryDelaysMs) {
   let lastFailure = null;
   const deadline = Date.now() + INITIALIZE_RETRY_BUDGET_MS;
-  for (let attempt = 0; attempt <= INITIALIZE_RETRY_DELAYS_MS.length; attempt += 1) {
+  for (let attempt = 0; attempt <= retryDelaysMs.length; attempt += 1) {
     try {
       const remainingMs = deadline - Date.now();
       if (remainingMs <= 0) break;
@@ -7036,7 +7039,7 @@ async function initializeWithRetry(fetchImpl, url, headers, body) {
         transient: true
       };
     }
-    const retryDelayMs = INITIALIZE_RETRY_DELAYS_MS[attempt];
+    const retryDelayMs = retryDelaysMs[attempt];
     if (retryDelayMs === void 0 || Date.now() + retryDelayMs >= deadline) break;
     await delay(retryDelayMs);
   }
@@ -7672,6 +7675,7 @@ ${reason}`,
       }
       const proof = await proveWorkspaceTools(request, adapter.name, {
         ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
+        ...this.opts.workspaceProofRetryDelaysMs ? { retryDelaysMs: this.opts.workspaceProofRetryDelaysMs } : {},
         harnessFingerprint: turnContext.runtime
       });
       turnLog[proof.ok ? "info" : "error"](
@@ -8489,6 +8493,7 @@ var ASSIGNMENTS_POLL_MS = 6e4;
 var DRAIN_BASE_MS = 1e3;
 var DRAIN_MAX_MS = 3e4;
 var DRAIN_IDLE_MS = 15e3;
+var DEFAULT_UNRUNNABLE_RETRY_DELAYS_MS = [0, 1e3, 3e3];
 var CompanionSupervisor = class {
   workspaces = /* @__PURE__ */ new Map();
   config;
@@ -8515,6 +8520,7 @@ var CompanionSupervisor = class {
   exitFn;
   reexecFn;
   dispatcherFactory;
+  unrunnableRetryDelaysMs;
   deviceApi = null;
   deviceSub = null;
   heartbeatTimer = null;
@@ -8547,6 +8553,7 @@ var CompanionSupervisor = class {
     this.exitFn = opts.exit ?? ((code) => process.exit(code));
     this.reexecFn = opts.reexec ?? defaultReexec;
     this.dispatcherFactory = opts.dispatcherFactory;
+    this.unrunnableRetryDelaysMs = opts.unrunnableRetryDelaysMs ?? DEFAULT_UNRUNNABLE_RETRY_DELAYS_MS;
   }
   // Stand up the data plane: pair check, initial assignments pull, then the
   // heartbeat + poll loops. A companion with no device token (logged out) does
@@ -8647,13 +8654,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)) } : {}
+        ...opencodeModels !== null ? { models: opencodeModels } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9057,9 +9058,8 @@ var CompanionSupervisor = class {
   // wedge the workspace's whole stream.
   async reportUnrunnableDispatch(wr, payload) {
     if (!this.deviceApi) return false;
-    const backoffMs = [0, 1e3, 3e3];
     let lastErr;
-    for (const wait of backoffMs) {
+    for (const wait of this.unrunnableRetryDelaysMs) {
       if (this.stopped) return false;
       if (wait > 0) await new Promise((r) => setTimeout(r, wait));
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.40",
+  "version": "0.6.42",
   "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",