@cabane/companion 0.6.28 → 0.6.30

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, {
@@ -8760,6 +8807,7 @@ var SseSubscriber = class {
       try {
         await this.connect();
         backoff = 500;
+        if (!this.aborted) await sleep3(backoff);
       } catch (err) {
         if (this.aborted) return;
         if (err instanceof ApiError && (err.status === 401 || err.status === 403)) {
@@ -8785,8 +8833,8 @@ var SseSubscriber = class {
   }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
-    const query = this.lastEventId ? "" : "?replayPending=1";
-    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
+    const query = this.opts.path ? "" : this.lastEventId ? "" : "?replayPending=1";
+    const url = this.opts.path ? `${base}${this.opts.path}` : `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
     this.controller = new AbortController();
     const headers = {
       Authorization: `Bearer ${this.opts.token}`,
@@ -8878,6 +8926,7 @@ var CompanionSupervisor = class {
   reexecFn;
   dispatcherFactory;
   deviceApi = null;
+  deviceSub = null;
   heartbeatTimer = null;
   inFlightHeartbeat = null;
   pollTimer = null;
@@ -8931,6 +8980,24 @@ var CompanionSupervisor = class {
       baseUrl: this.config.baseUrl,
       deviceToken: this.config.deviceToken
     });
+    this.deviceSub = new SseSubscriber({
+      baseUrl: this.config.baseUrl,
+      workspaceId: "device-control",
+      path: "/api/companion/events",
+      token: this.config.deviceToken,
+      log: this.log,
+      lastEventId: null,
+      onMessage: async (ev) => {
+        if (ev.event === "assignments_changed") {
+          if (this.refreshing && this.inFlightRefresh) await this.inFlightRefresh;
+          await this.refreshAssignments();
+        }
+      },
+      onAuthFailure: () => {
+        this.log.error("companion: device control stream authentication failed");
+      }
+    });
+    this.deviceSub.start();
     await this.refreshAssignments();
     this.kickHeartbeat();
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
@@ -8943,7 +9010,10 @@ var CompanionSupervisor = class {
   // at least the loops keeping the event loop alive; the SSE promises let a
   // clean teardown resolve.
   finishedPromises() {
-    return [...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : []);
+    return [
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : [])
+    ];
   }
   // ---- device-level loops ----
   kickHeartbeat() {
@@ -9627,13 +9697,15 @@ var CompanionSupervisor = class {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    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(
-      [...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
-    );
+    await Promise.all([
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
+    ]);
   }
   async drainForRestart(graceMs) {
     this.restartPending = true;

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, {
@@ -7872,6 +7919,7 @@ var SseSubscriber = class {
       try {
         await this.connect();
         backoff = 500;
+        if (!this.aborted) await sleep2(backoff);
       } catch (err) {
         if (this.aborted) return;
         if (err instanceof ApiError && (err.status === 401 || err.status === 403)) {
@@ -7897,8 +7945,8 @@ var SseSubscriber = class {
   }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
-    const query = this.lastEventId ? "" : "?replayPending=1";
-    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
+    const query = this.opts.path ? "" : this.lastEventId ? "" : "?replayPending=1";
+    const url = this.opts.path ? `${base}${this.opts.path}` : `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
     this.controller = new AbortController();
     const headers = {
       Authorization: `Bearer ${this.opts.token}`,
@@ -7990,6 +8038,7 @@ var CompanionSupervisor = class {
   reexecFn;
   dispatcherFactory;
   deviceApi = null;
+  deviceSub = null;
   heartbeatTimer = null;
   inFlightHeartbeat = null;
   pollTimer = null;
@@ -8043,6 +8092,24 @@ var CompanionSupervisor = class {
       baseUrl: this.config.baseUrl,
       deviceToken: this.config.deviceToken
     });
+    this.deviceSub = new SseSubscriber({
+      baseUrl: this.config.baseUrl,
+      workspaceId: "device-control",
+      path: "/api/companion/events",
+      token: this.config.deviceToken,
+      log: this.log,
+      lastEventId: null,
+      onMessage: async (ev) => {
+        if (ev.event === "assignments_changed") {
+          if (this.refreshing && this.inFlightRefresh) await this.inFlightRefresh;
+          await this.refreshAssignments();
+        }
+      },
+      onAuthFailure: () => {
+        this.log.error("companion: device control stream authentication failed");
+      }
+    });
+    this.deviceSub.start();
     await this.refreshAssignments();
     this.kickHeartbeat();
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
@@ -8055,7 +8122,10 @@ var CompanionSupervisor = class {
   // at least the loops keeping the event loop alive; the SSE promises let a
   // clean teardown resolve.
   finishedPromises() {
-    return [...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : []);
+    return [
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : [])
+    ];
   }
   // ---- device-level loops ----
   kickHeartbeat() {
@@ -8739,13 +8809,15 @@ var CompanionSupervisor = class {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    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(
-      [...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
-    );
+    await Promise.all([
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
+    ]);
   }
   async drainForRestart(graceMs) {
     this.restartPending = true;

package/package.json

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