@cabane/companion 0.6.29 → 0.6.30

package/dist/cli.js

@@ -8807,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)) {
@@ -8832,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}`,
@@ -8925,6 +8926,7 @@ var CompanionSupervisor = class {
   reexecFn;
   dispatcherFactory;
   deviceApi = null;
+  deviceSub = null;
   heartbeatTimer = null;
   inFlightHeartbeat = null;
   pollTimer = null;
@@ -8978,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);
@@ -8990,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() {
@@ -9674,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

@@ -7919,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)) {
@@ -7944,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}`,
@@ -8037,6 +8038,7 @@ var CompanionSupervisor = class {
   reexecFn;
   dispatcherFactory;
   deviceApi = null;
+  deviceSub = null;
   heartbeatTimer = null;
   inFlightHeartbeat = null;
   pollTimer = null;
@@ -8090,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);
@@ -8102,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() {
@@ -8786,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.29",
+  "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",