@cabane/companion 0.6.41 → 0.6.43

package/dist/cli.js

@@ -7444,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)
@@ -7497,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;
@@ -7524,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);
   }
@@ -8160,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"](
@@ -8977,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;
@@ -9003,6 +9011,7 @@ var CompanionSupervisor = class {
   exitFn;
   reexecFn;
   dispatcherFactory;
+  unrunnableRetryDelaysMs;
   deviceApi = null;
   deviceSub = null;
   heartbeatTimer = null;
@@ -9035,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
@@ -9539,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 {
@@ -9842,12 +9851,14 @@ var CompanionSupervisor = class {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    const heartbeat = this.inFlightHeartbeat;
     this.deviceSub?.stop();
     for (const wr of this.workspaces.values()) {
       for (const a of wr.agents.values()) a.cancelDrain();
       if (wr.sub) wr.sub.stop();
     }
     await Promise.all([
+      ...heartbeat ? [heartbeat] : [],
       ...this.deviceSub ? [this.deviceSub.finished] : [],
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);

package/dist/runtime.js

@@ -6953,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)
@@ -7006,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;
@@ -7033,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);
   }
@@ -7669,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"](
@@ -8486,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;
@@ -8512,6 +8520,7 @@ var CompanionSupervisor = class {
   exitFn;
   reexecFn;
   dispatcherFactory;
+  unrunnableRetryDelaysMs;
   deviceApi = null;
   deviceSub = null;
   heartbeatTimer = null;
@@ -8544,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
@@ -9048,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 {
@@ -9351,12 +9360,14 @@ var CompanionSupervisor = class {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    const heartbeat = this.inFlightHeartbeat;
     this.deviceSub?.stop();
     for (const wr of this.workspaces.values()) {
       for (const a of wr.agents.values()) a.cancelDrain();
       if (wr.sub) wr.sub.stop();
     }
     await Promise.all([
+      ...heartbeat ? [heartbeat] : [],
       ...this.deviceSub ? [this.deviceSub.finished] : [],
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);

package/package.json

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