@cabane/companion 0.6.179 → 0.6.181

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,
@@ -12148,7 +12148,7 @@ var HARNESS_STATE_LABEL = {
   needs_sign_in: "needs sign-in",
   limited: "limited",
   problem: "problem",
-  off: "off",
+  off: "disabled",
   gone: "gone"
 };
 
@@ -12260,7 +12260,7 @@ function agentRowText(runtime, state, opts = {}) {
     case "not_running":
       return `${word} \u2014 not running`;
     case "off":
-      return `${word} \u2014 turned off in config`;
+      return `${word} \u2014 disabled in config`;
     case "problem":
       return runtime === "opencode" ? `${word} \u2014 not running` : `${word} \u2014 ${unusableReason(runtime, state.check) ?? "could not be checked"}`;
   }
@@ -13533,7 +13533,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:"))
@@ -16164,6 +16164,9 @@ var CompanionSupervisor = class {
   // the first detection; a heartbeat spawns nothing and reads this.
   detection = null;
   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 +16318,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();
@@ -17173,6 +17185,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 +17238,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,7 +17399,7 @@ 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 } : {}
@@ -17395,7 +17411,7 @@ var CompanionSupervisor = class {
         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);
@@ -17587,10 +17603,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,
@@ -14096,6 +14096,9 @@ var CompanionSupervisor = class {
   // the first detection; a heartbeat spawns nothing and reads this.
   detection = null;
   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 +14250,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();
@@ -15105,6 +15117,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 +15170,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,7 +15331,7 @@ 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 } : {}
@@ -15327,7 +15343,7 @@ var CompanionSupervisor = class {
         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);
@@ -15519,10 +15535,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.179",
+  "version": "0.6.181",
   "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",