@cabane/companion 0.6.28 → 0.6.29

package/dist/cli.js

@@ -7200,6 +7200,9 @@ var TurnCommitter = class {
 
 // src/workspace-readiness.ts
 var CLASSIC_REQUIRED = ["read", "list", "search", "write", "edit"];
+var INITIALIZE_RETRY_DELAYS_MS = [250, 750, 1500];
+var INITIALIZE_ATTEMPT_TIMEOUT_MS = 4e3;
+var INITIALIZE_RETRY_BUDGET_MS = 1e4;
 async function proveWorkspaceTools(req, runtime, opts = {}) {
   const base = {
     ok: false,
@@ -7225,7 +7228,7 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     "x-cabane-active-conversation": req.cabane.activeConversationId
   };
   try {
-    const initialized = await rpc(fetchImpl, req.cabane.mcpUrl, headers, {
+    const initialized = await initializeWithRetry(fetchImpl, req.cabane.mcpUrl, headers, {
       jsonrpc: "2.0",
       id: 1,
       method: "initialize",
@@ -7237,6 +7240,8 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     });
     if (initialized.status === 401 || initialized.status === 403)
       return fail(base, "authentication_failed", `initialize returned HTTP ${initialized.status}`);
+    if (initialized.transient)
+      return fail(base, "workspace_endpoint_unreachable", initialized.detail);
     if (!initialized.ok) return fail(base, "initialization_failed", initialized.detail);
     base.initialized = true;
     base.authenticated = true;
@@ -7271,11 +7276,47 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
   } catch (error) {
     return fail(
       base,
-      "initialization_failed",
+      "workspace_endpoint_unreachable",
       error instanceof Error ? error.message : String(error)
     );
   }
 }
+async function initializeWithRetry(fetchImpl, url, headers, body) {
+  let lastFailure = null;
+  const deadline = Date.now() + INITIALIZE_RETRY_BUDGET_MS;
+  for (let attempt = 0; attempt <= INITIALIZE_RETRY_DELAYS_MS.length; attempt += 1) {
+    try {
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) break;
+      const result = await rpc(
+        fetchImpl,
+        url,
+        headers,
+        body,
+        Math.min(INITIALIZE_ATTEMPT_TIMEOUT_MS, remainingMs)
+      );
+      if (result.status === 401 || result.status === 403 || result.ok) return result;
+      if (result.status < 500) return result;
+      lastFailure = { ...result, transient: true };
+    } catch (error) {
+      lastFailure = {
+        ok: false,
+        status: 0,
+        sessionId: null,
+        value: null,
+        detail: error instanceof Error ? error.message : String(error),
+        transient: true
+      };
+    }
+    const retryDelayMs = INITIALIZE_RETRY_DELAYS_MS[attempt];
+    if (retryDelayMs === void 0 || Date.now() + retryDelayMs >= deadline) break;
+    await delay(retryDelayMs);
+  }
+  return lastFailure;
+}
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function fail(proof, capability, detail) {
   proof.failedCapability = capability;
   proof.detail = detail.slice(0, 300);
@@ -7289,8 +7330,13 @@ function safeEndpoint(value) {
     return null;
   }
 }
-async function rpc(fetchImpl, url, headers, body) {
-  const response = await fetchImpl(url, { method: "POST", headers, body: JSON.stringify(body) });
+async function rpc(fetchImpl, url, headers, body, timeoutMs) {
+  const response = await fetchImpl(url, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body),
+    ...timeoutMs ? { signal: AbortSignal.timeout(timeoutMs) } : {}
+  });
   const text = await response.text();
   const value = parseRpcBody(text);
   return {
@@ -7927,7 +7973,8 @@ ${reason}`,
         );
       }
       if (!proof.ok) {
-        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
+        const recovery = proof.failedCapability === "workspace_endpoint_unreachable" ? "the Cabane workspace endpoint was unreachable; retry this dispatch" : "restart the connector after restoring the Cabane workspace tool mount";
+        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd}; runtime=${adapter.name}; recovery=${recovery}`;
         closeTurnReceipt(false, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {

package/dist/runtime.js

@@ -6312,6 +6312,9 @@ var TurnCommitter = class {
 
 // src/workspace-readiness.ts
 var CLASSIC_REQUIRED = ["read", "list", "search", "write", "edit"];
+var INITIALIZE_RETRY_DELAYS_MS = [250, 750, 1500];
+var INITIALIZE_ATTEMPT_TIMEOUT_MS = 4e3;
+var INITIALIZE_RETRY_BUDGET_MS = 1e4;
 async function proveWorkspaceTools(req, runtime, opts = {}) {
   const base = {
     ok: false,
@@ -6337,7 +6340,7 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     "x-cabane-active-conversation": req.cabane.activeConversationId
   };
   try {
-    const initialized = await rpc(fetchImpl, req.cabane.mcpUrl, headers, {
+    const initialized = await initializeWithRetry(fetchImpl, req.cabane.mcpUrl, headers, {
       jsonrpc: "2.0",
       id: 1,
       method: "initialize",
@@ -6349,6 +6352,8 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
     });
     if (initialized.status === 401 || initialized.status === 403)
       return fail(base, "authentication_failed", `initialize returned HTTP ${initialized.status}`);
+    if (initialized.transient)
+      return fail(base, "workspace_endpoint_unreachable", initialized.detail);
     if (!initialized.ok) return fail(base, "initialization_failed", initialized.detail);
     base.initialized = true;
     base.authenticated = true;
@@ -6383,11 +6388,47 @@ async function proveWorkspaceTools(req, runtime, opts = {}) {
   } catch (error) {
     return fail(
       base,
-      "initialization_failed",
+      "workspace_endpoint_unreachable",
       error instanceof Error ? error.message : String(error)
     );
   }
 }
+async function initializeWithRetry(fetchImpl, url, headers, body) {
+  let lastFailure = null;
+  const deadline = Date.now() + INITIALIZE_RETRY_BUDGET_MS;
+  for (let attempt = 0; attempt <= INITIALIZE_RETRY_DELAYS_MS.length; attempt += 1) {
+    try {
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) break;
+      const result = await rpc(
+        fetchImpl,
+        url,
+        headers,
+        body,
+        Math.min(INITIALIZE_ATTEMPT_TIMEOUT_MS, remainingMs)
+      );
+      if (result.status === 401 || result.status === 403 || result.ok) return result;
+      if (result.status < 500) return result;
+      lastFailure = { ...result, transient: true };
+    } catch (error) {
+      lastFailure = {
+        ok: false,
+        status: 0,
+        sessionId: null,
+        value: null,
+        detail: error instanceof Error ? error.message : String(error),
+        transient: true
+      };
+    }
+    const retryDelayMs = INITIALIZE_RETRY_DELAYS_MS[attempt];
+    if (retryDelayMs === void 0 || Date.now() + retryDelayMs >= deadline) break;
+    await delay(retryDelayMs);
+  }
+  return lastFailure;
+}
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function fail(proof, capability, detail) {
   proof.failedCapability = capability;
   proof.detail = detail.slice(0, 300);
@@ -6401,8 +6442,13 @@ function safeEndpoint(value) {
     return null;
   }
 }
-async function rpc(fetchImpl, url, headers, body) {
-  const response = await fetchImpl(url, { method: "POST", headers, body: JSON.stringify(body) });
+async function rpc(fetchImpl, url, headers, body, timeoutMs) {
+  const response = await fetchImpl(url, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body),
+    ...timeoutMs ? { signal: AbortSignal.timeout(timeoutMs) } : {}
+  });
   const text = await response.text();
   const value = parseRpcBody(text);
   return {
@@ -7039,7 +7085,8 @@ ${reason}`,
         );
       }
       if (!proof.ok) {
-        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
+        const recovery = proof.failedCapability === "workspace_endpoint_unreachable" ? "the Cabane workspace endpoint was unreachable; retry this dispatch" : "restart the connector after restoring the Cabane workspace tool mount";
+        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd}; runtime=${adapter.name}; recovery=${recovery}`;
         closeTurnReceipt(false, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {

package/package.json

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