@cabane/companion 0.6.180 → 0.6.182

package/dist/cli.js

@@ -9367,7 +9367,7 @@ function fingerprintSessionState(state) {
   }
   return createHash2("sha256").update(opaqueId).digest("hex").slice(0, 16);
 }
-var PREPARING_TOOL_NAME, RUNTIME_UNAVAILABLE_PREFIX, NO_TURN_TOKEN_REASON, UNEXPECTED_ROLE_REASON, DEFAULT_PREPARING_ROW_DELAY_MS, DEFAULT_AGENT_IDLE_TIMEOUT_MS, DEFAULT_AGENT_TOTAL_TIMEOUT_MS, DEFAULT_LEASE_RENEWAL_MS, TurnConcluded, TurnExecution;
+var PREPARING_TOOL_NAME, HARNESS_UNAVAILABLE_NOTICE, NO_TURN_TOKEN_REASON, UNEXPECTED_ROLE_REASON, DEFAULT_PREPARING_ROW_DELAY_MS, DEFAULT_AGENT_IDLE_TIMEOUT_MS, DEFAULT_AGENT_TOTAL_TIMEOUT_MS, DEFAULT_LEASE_RENEWAL_MS, TurnConcluded, TurnExecution;
 var init_turn_execution = __esm({
   "src/turn-execution.ts"() {
     "use strict";
@@ -9396,7 +9396,7 @@ var init_turn_execution = __esm({
     init_dispatcher();
     init_sandbox_policy();
     PREPARING_TOOL_NAME = "preparing";
-    RUNTIME_UNAVAILABLE_PREFIX = "**This agent's runtime isn't available on this companion.** The model this agent uses needs a runtime this device isn't running, so I can't run this turn here. Details:";
+    HARNESS_UNAVAILABLE_NOTICE = "**This harness isn't available on the companion.** Check the harness on the device, or choose another harness in the agent's settings. Then reply to try again.";
     NO_TURN_TOKEN_REASON = "no_turn_token: the server issued no turn credential for this turn";
     UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
     DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
@@ -10082,7 +10082,7 @@ var init_turn_execution = __esm({
           );
           try {
             await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
-              body: `${RUNTIME_UNAVAILABLE_PREFIX} ${err.message}`,
+              body: HARNESS_UNAVAILABLE_NOTICE,
               kind: "runtime_notice",
               turnId,
               parentMessageId: payload.messageId,
@@ -12554,11 +12554,24 @@ function parseHarnessRuntime(raw) {
   if (key === "opencode") return "opencode";
   return null;
 }
-function advertisedRuntimes(detection) {
-  return usableRuntimes(detection);
+function stillRunnable(agent) {
+  return agent.state === "usable" || agent.state === "signed_out" || agent.state === "problem" && agent.check.status === "check_failed";
+}
+function rememberUsed(used, detection) {
+  const next = /* @__PURE__ */ new Set();
+  for (const runtime of ["claude-code", "codex"]) {
+    const agent = detection[runtime];
+    if (agent.state === "usable" || used.has(runtime) && stillRunnable(agent)) next.add(runtime);
+  }
+  return next;
+}
+function advertisedRuntimes(detection, used) {
+  return HARNESS_RUNTIMES.filter(
+    (runtime) => detection[runtime].state === "usable" || used.has(runtime) && stillRunnable(detection[runtime])
+  );
 }
 function deriveHarnessSnapshot(detection) {
-  const advertised = new Set(advertisedRuntimes(detection));
+  const advertised = new Set(usableRuntimes(detection));
   const harnesses = HARNESS_RUNTIMES.map(
     (runtime) => derive(runtime, detection[runtime], advertised.has(runtime))
   );
@@ -13533,7 +13546,7 @@ function turnFailureCopy(reason, runtime) {
   if (reason?.startsWith("runtime_incomplete:"))
     return `The agent installation is incomplete. ${repairAction()} Then restart the companion.`;
   if (/^(runtime|codex|opencode)_unavailable:/.test(reason ?? ""))
-    return "The harness is off on this device. Enable it here, or choose another harness or device in Cabane.";
+    return "This harness isn't available on the companion. Check the harness on this device, or choose another harness in the agent's settings in Cabane. Then reply in Cabane to try again.";
   if (reason?.startsWith("model_unavailable:"))
     return "The selected model is unavailable. Choose a different model in the agent settings in Cabane.";
   if (reason?.startsWith("prepare_failed:"))
@@ -16163,7 +16176,13 @@ var CompanionSupervisor = class {
   // control socket, so none can disagree with what is advertised. Null until
   // the first detection; a heartbeat spawns nothing and reads this.
   detection = null;
+  // The bundled harnesses a detection in this run found usable, which stay offered
+  // through a lapsed sign-in (`rememberUsed`). Empty until the first detection.
+  used = /* @__PURE__ */ new Set();
   detecting = null;
+  // Liveness may be acknowledged before discovery. Execution waits on this
+  // first look only, never on a periodic refresh of an established inventory.
+  initialHarnessReady = null;
   detectTimer = null;
   runHarnessCheck;
   probeOpencode;
@@ -16315,8 +16334,17 @@ var CompanionSupervisor = class {
       this.trackHeartbeat(this.sendHeartbeat(true));
     }
     const firstHeartbeat = this.inFlightHeartbeat;
-    const startupHarnessRefresh = this.detect();
-    void startupHarnessRefresh.then(async () => {
+    this.initialHarnessReady = this.detect().then(
+      () => {
+      },
+      (err) => {
+        this.log.warn(
+          { err: err instanceof Error ? err.message : String(err) },
+          "Couldn't check harnesses at startup. Turns may fail until the next check."
+        );
+      }
+    );
+    void this.initialHarnessReady.then(async () => {
       await firstHeartbeat;
       if (this.stopped) return;
       await this.heartbeatNow();
@@ -16395,8 +16423,7 @@ var CompanionSupervisor = class {
   async sendHeartbeat(first = false) {
     if (!this.deviceApi) return;
     try {
-      if (!first && this.detection && advertisedRuntimes(this.detection).length === 0)
-        await this.detect();
+      if (!first && this.detection && this.advertised().length === 0) await this.detect();
       const store = loadSecretStoreTolerant(
         (m) => this.log.warn({ err: m }, "Could not read the secrets file. Check ~/.cabane/secrets.json.")
       );
@@ -16730,11 +16757,15 @@ var CompanionSupervisor = class {
   bundledResolution(runtime) {
     return this.resolveBundled(runtime);
   }
-  // Does this device OFFER a runtime — found usable by the last detection? The
-  // ONE signal the heartbeat manifest, the adapter registry and the dispatcher
-  // read, so what the device advertises and what it can select can't disagree.
+  // Does this device OFFER a runtime — usable now, or used in this run and still
+  // runnable? The ONE signal the heartbeat manifest, the adapter registry and the
+  // dispatcher read, so what the device advertises and what it can select can't
+  // disagree.
   offered(runtime) {
-    return this.detection !== null && advertisedRuntimes(this.detection).includes(runtime);
+    return this.advertised().includes(runtime);
+  }
+  advertised() {
+    return this.detection ? advertisedRuntimes(this.detection, this.used) : [];
   }
   // The address an OpenCode turn runs against: the serve detection found, else
   // the configured one, for the model list a beat still asks for.
@@ -17173,6 +17204,8 @@ var CompanionSupervisor = class {
       return;
     this.recovering = true;
     try {
+      await this.initialHarnessReady;
+      if (this.stopped) return;
       const page = await this.deviceApi.getRuns(this.recoveryCursor);
       if (this.stopped) return;
       let assignmentsMissing = false;
@@ -17224,6 +17257,8 @@ var CompanionSupervisor = class {
   }
   // One turn: the skip-vs-resume dedupe, the dispatch, then the console summary.
   async runDispatch(wr, dispatchId, payload, agent, recoveredTurnId) {
+    await this.initialHarnessReady;
+    if (this.stopped) return;
     const workspaceId = wr.workspaceId;
     if (dispatchId && hasDispatched(workspaceId, dispatchId)) {
       if (hasCompleted(workspaceId, dispatchId)) {
@@ -17383,19 +17418,20 @@ var CompanionSupervisor = class {
   async detect() {
     if (this.detecting) return this.detecting;
     this.detecting = (async () => {
-      const previous = this.detection;
+      const previousOpencodeUrl = this.opencodeUrl();
       const detection = await detectHarnesses(this.config, {
         check: this.runHarnessCheck,
         ...this.probeOpencode ? { probeOpencode: this.probeOpencode } : {}
       });
       this.detection = detection;
+      this.used = rememberUsed(this.used, detection);
       this.logBundledTransitions();
       this.harnessVersions = {
         claudeCode: detectedVersion(detection["claude-code"]),
         opencode: detectedVersion(detection.opencode),
         codex: detectedVersion(detection.codex)
       };
-      if (previous && opencodeAddress(previous) !== opencodeAddress(detection)) {
+      if (previousOpencodeUrl !== this.opencodeUrl()) {
         this.rebuildDispatchers();
       }
       this.hub.setHarnesses(deriveHarnessSnapshot(detection).harnesses);
@@ -17443,7 +17479,7 @@ var CompanionSupervisor = class {
     const health = this.connectorHealth.reports();
     if (health.length === 0 || !this.detection) return health;
     const named = new Set(health.map((r) => r.runtime));
-    const bare = advertisedRuntimes(this.detection).filter((runtime) => !named.has(runtime)).map((runtime) => ({ runtime }));
+    const bare = this.advertised().filter((runtime) => !named.has(runtime)).map((runtime) => ({ runtime }));
     return [...health, ...bare];
   }
   // Beat NOW and wait for it to land. `start` calls this before asking the
@@ -17587,10 +17623,6 @@ function defaultReexec() {
     }
   });
 }
-function opencodeAddress(detection) {
-  const found = detection.opencode;
-  return found.state === "usable" ? found.url ?? DEFAULT_OPENCODE_SERVER_URL : null;
-}
 
 // src/runtime.ts
 init_version2();

package/dist/runtime.js

@@ -1893,7 +1893,7 @@ function turnFailureCopy(reason, runtime) {
   if (reason?.startsWith("runtime_incomplete:"))
     return `The agent installation is incomplete. ${repairAction()} Then restart the companion.`;
   if (/^(runtime|codex|opencode)_unavailable:/.test(reason ?? ""))
-    return "The harness is off on this device. Enable it here, or choose another harness or device in Cabane.";
+    return "This harness isn't available on the companion. Check the harness on this device, or choose another harness in the agent's settings in Cabane. Then reply in Cabane to try again.";
   if (reason?.startsWith("model_unavailable:"))
     return "The selected model is unavailable. Choose a different model in the agent settings in Cabane.";
   if (reason?.startsWith("prepare_failed:"))
@@ -9850,7 +9850,7 @@ async function absorbBundledLoss(ctx, aborted, outcome) {
 
 // src/turn-execution.ts
 var PREPARING_TOOL_NAME = "preparing";
-var RUNTIME_UNAVAILABLE_PREFIX = "**This agent's runtime isn't available on this companion.** The model this agent uses needs a runtime this device isn't running, so I can't run this turn here. Details:";
+var HARNESS_UNAVAILABLE_NOTICE = "**This harness isn't available on the companion.** Check the harness on the device, or choose another harness in the agent's settings. Then reply to try again.";
 var NO_TURN_TOKEN_REASON = "no_turn_token: the server issued no turn credential for this turn";
 var UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
 var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
@@ -10561,7 +10561,7 @@ var TurnExecution = class {
       );
       try {
         await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
-          body: `${RUNTIME_UNAVAILABLE_PREFIX} ${err.message}`,
+          body: HARNESS_UNAVAILABLE_NOTICE,
           kind: "runtime_notice",
           turnId,
           parentMessageId: payload.messageId,
@@ -13042,11 +13042,24 @@ function withTimeout(promise, fallback, timeoutMs) {
 }
 
 // src/harness-status.ts
-function advertisedRuntimes(detection) {
-  return usableRuntimes(detection);
+function stillRunnable(agent) {
+  return agent.state === "usable" || agent.state === "signed_out" || agent.state === "problem" && agent.check.status === "check_failed";
+}
+function rememberUsed(used, detection) {
+  const next = /* @__PURE__ */ new Set();
+  for (const runtime of ["claude-code", "codex"]) {
+    const agent = detection[runtime];
+    if (agent.state === "usable" || used.has(runtime) && stillRunnable(agent)) next.add(runtime);
+  }
+  return next;
+}
+function advertisedRuntimes(detection, used) {
+  return HARNESS_RUNTIMES.filter(
+    (runtime) => detection[runtime].state === "usable" || used.has(runtime) && stillRunnable(detection[runtime])
+  );
 }
 function deriveHarnessSnapshot(detection) {
-  const advertised = new Set(advertisedRuntimes(detection));
+  const advertised = new Set(usableRuntimes(detection));
   const harnesses = HARNESS_RUNTIMES.map(
     (runtime) => derive(runtime, detection[runtime], advertised.has(runtime))
   );
@@ -14095,7 +14108,13 @@ var CompanionSupervisor = class {
   // control socket, so none can disagree with what is advertised. Null until
   // the first detection; a heartbeat spawns nothing and reads this.
   detection = null;
+  // The bundled harnesses a detection in this run found usable, which stay offered
+  // through a lapsed sign-in (`rememberUsed`). Empty until the first detection.
+  used = /* @__PURE__ */ new Set();
   detecting = null;
+  // Liveness may be acknowledged before discovery. Execution waits on this
+  // first look only, never on a periodic refresh of an established inventory.
+  initialHarnessReady = null;
   detectTimer = null;
   runHarnessCheck;
   probeOpencode;
@@ -14247,8 +14266,17 @@ var CompanionSupervisor = class {
       this.trackHeartbeat(this.sendHeartbeat(true));
     }
     const firstHeartbeat = this.inFlightHeartbeat;
-    const startupHarnessRefresh = this.detect();
-    void startupHarnessRefresh.then(async () => {
+    this.initialHarnessReady = this.detect().then(
+      () => {
+      },
+      (err) => {
+        this.log.warn(
+          { err: err instanceof Error ? err.message : String(err) },
+          "Couldn't check harnesses at startup. Turns may fail until the next check."
+        );
+      }
+    );
+    void this.initialHarnessReady.then(async () => {
       await firstHeartbeat;
       if (this.stopped) return;
       await this.heartbeatNow();
@@ -14327,8 +14355,7 @@ var CompanionSupervisor = class {
   async sendHeartbeat(first = false) {
     if (!this.deviceApi) return;
     try {
-      if (!first && this.detection && advertisedRuntimes(this.detection).length === 0)
-        await this.detect();
+      if (!first && this.detection && this.advertised().length === 0) await this.detect();
       const store = loadSecretStoreTolerant(
         (m) => this.log.warn({ err: m }, "Could not read the secrets file. Check ~/.cabane/secrets.json.")
       );
@@ -14662,11 +14689,15 @@ var CompanionSupervisor = class {
   bundledResolution(runtime) {
     return this.resolveBundled(runtime);
   }
-  // Does this device OFFER a runtime — found usable by the last detection? The
-  // ONE signal the heartbeat manifest, the adapter registry and the dispatcher
-  // read, so what the device advertises and what it can select can't disagree.
+  // Does this device OFFER a runtime — usable now, or used in this run and still
+  // runnable? The ONE signal the heartbeat manifest, the adapter registry and the
+  // dispatcher read, so what the device advertises and what it can select can't
+  // disagree.
   offered(runtime) {
-    return this.detection !== null && advertisedRuntimes(this.detection).includes(runtime);
+    return this.advertised().includes(runtime);
+  }
+  advertised() {
+    return this.detection ? advertisedRuntimes(this.detection, this.used) : [];
   }
   // The address an OpenCode turn runs against: the serve detection found, else
   // the configured one, for the model list a beat still asks for.
@@ -15105,6 +15136,8 @@ var CompanionSupervisor = class {
       return;
     this.recovering = true;
     try {
+      await this.initialHarnessReady;
+      if (this.stopped) return;
       const page = await this.deviceApi.getRuns(this.recoveryCursor);
       if (this.stopped) return;
       let assignmentsMissing = false;
@@ -15156,6 +15189,8 @@ var CompanionSupervisor = class {
   }
   // One turn: the skip-vs-resume dedupe, the dispatch, then the console summary.
   async runDispatch(wr, dispatchId, payload, agent, recoveredTurnId) {
+    await this.initialHarnessReady;
+    if (this.stopped) return;
     const workspaceId = wr.workspaceId;
     if (dispatchId && hasDispatched(workspaceId, dispatchId)) {
       if (hasCompleted(workspaceId, dispatchId)) {
@@ -15315,19 +15350,20 @@ var CompanionSupervisor = class {
   async detect() {
     if (this.detecting) return this.detecting;
     this.detecting = (async () => {
-      const previous = this.detection;
+      const previousOpencodeUrl = this.opencodeUrl();
       const detection = await detectHarnesses(this.config, {
         check: this.runHarnessCheck,
         ...this.probeOpencode ? { probeOpencode: this.probeOpencode } : {}
       });
       this.detection = detection;
+      this.used = rememberUsed(this.used, detection);
       this.logBundledTransitions();
       this.harnessVersions = {
         claudeCode: detectedVersion(detection["claude-code"]),
         opencode: detectedVersion(detection.opencode),
         codex: detectedVersion(detection.codex)
       };
-      if (previous && opencodeAddress(previous) !== opencodeAddress(detection)) {
+      if (previousOpencodeUrl !== this.opencodeUrl()) {
         this.rebuildDispatchers();
       }
       this.hub.setHarnesses(deriveHarnessSnapshot(detection).harnesses);
@@ -15375,7 +15411,7 @@ var CompanionSupervisor = class {
     const health = this.connectorHealth.reports();
     if (health.length === 0 || !this.detection) return health;
     const named = new Set(health.map((r) => r.runtime));
-    const bare = advertisedRuntimes(this.detection).filter((runtime) => !named.has(runtime)).map((runtime) => ({ runtime }));
+    const bare = this.advertised().filter((runtime) => !named.has(runtime)).map((runtime) => ({ runtime }));
     return [...health, ...bare];
   }
   // Beat NOW and wait for it to land. `start` calls this before asking the
@@ -15519,10 +15555,6 @@ function defaultReexec() {
     }
   });
 }
-function opencodeAddress(detection) {
-  const found = detection.opencode;
-  return found.state === "usable" ? found.url ?? DEFAULT_OPENCODE_SERVER_URL : null;
-}
 
 // src/safety.ts
 var RECOVERABLE_CODES = /* @__PURE__ */ new Set([

package/package.json

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