@cabane/companion 0.6.42 → 0.6.44

package/dist/cli.js

@@ -8974,6 +8974,7 @@ var COMPANION_VERSION = pkg.version;
 
 // src/supervisor.ts
 var HEARTBEAT_INTERVAL_MS = 3e4;
+var SHUTDOWN_HEARTBEAT_WAIT_MS = 1e3;
 function positiveIntEnv(name) {
   const raw = process.env[name];
   if (!raw) return void 0;
@@ -9054,7 +9055,8 @@ var CompanionSupervisor = class {
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
       "companion: starting"
     );
-    void this.refreshHarnessStatuses();
+    const startupHarnessRefresh = this.refreshHarnessStatuses();
+    this.trackHeartbeat(startupHarnessRefresh);
     if (!this.config.deviceToken) {
       this.log.warn("companion: not paired (no device token) \u2014 run `cabane-companion pair`");
       process.stdout.write(
@@ -9085,7 +9087,11 @@ var CompanionSupervisor = class {
     });
     this.deviceSub.start();
     await this.refreshAssignments();
-    this.kickHeartbeat();
+    const firstHeartbeat = startupHarnessRefresh.then(async () => {
+      if (this.stopped) return;
+      await this.sendHeartbeat();
+    });
+    this.trackHeartbeat(firstHeartbeat);
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
     this.heartbeatTimer.unref?.();
     this.pollTimer = setInterval(() => void this.refreshAssignments(), ASSIGNMENTS_POLL_MS);
@@ -9103,8 +9109,10 @@ var CompanionSupervisor = class {
   }
   // ---- device-level loops ----
   kickHeartbeat() {
-    if (this.inFlightHeartbeat) return;
-    const pending = this.sendHeartbeat();
+    if (this.stopped || this.inFlightHeartbeat) return;
+    this.trackHeartbeat(this.sendHeartbeat());
+  }
+  trackHeartbeat(pending) {
     this.inFlightHeartbeat = pending;
     void pending.finally(() => {
       if (this.inFlightHeartbeat === pending) this.inFlightHeartbeat = null;
@@ -9851,12 +9859,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 ? [waitForBoundedHeartbeat(heartbeat)] : [],
       ...this.deviceSub ? [this.deviceSub.finished] : [],
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
@@ -9869,6 +9879,18 @@ var CompanionSupervisor = class {
     this.reexecFn();
   }
 };
+async function waitForBoundedHeartbeat(heartbeat) {
+  let timer = null;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(resolve, SHUTDOWN_HEARTBEAT_WAIT_MS);
+    timer.unref?.();
+  });
+  try {
+    await Promise.race([heartbeat, timeout]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 function defaultReexec() {
   clearRuntimeState();
   void import("child_process").then(({ spawn: spawn6 }) => {

package/dist/runtime.js

@@ -8483,6 +8483,7 @@ var COMPANION_VERSION = pkg.version;
 
 // src/supervisor.ts
 var HEARTBEAT_INTERVAL_MS = 3e4;
+var SHUTDOWN_HEARTBEAT_WAIT_MS = 1e3;
 function positiveIntEnv(name) {
   const raw = process.env[name];
   if (!raw) return void 0;
@@ -8563,7 +8564,8 @@ var CompanionSupervisor = class {
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
       "companion: starting"
     );
-    void this.refreshHarnessStatuses();
+    const startupHarnessRefresh = this.refreshHarnessStatuses();
+    this.trackHeartbeat(startupHarnessRefresh);
     if (!this.config.deviceToken) {
       this.log.warn("companion: not paired (no device token) \u2014 run `cabane-companion pair`");
       process.stdout.write(
@@ -8594,7 +8596,11 @@ var CompanionSupervisor = class {
     });
     this.deviceSub.start();
     await this.refreshAssignments();
-    this.kickHeartbeat();
+    const firstHeartbeat = startupHarnessRefresh.then(async () => {
+      if (this.stopped) return;
+      await this.sendHeartbeat();
+    });
+    this.trackHeartbeat(firstHeartbeat);
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
     this.heartbeatTimer.unref?.();
     this.pollTimer = setInterval(() => void this.refreshAssignments(), ASSIGNMENTS_POLL_MS);
@@ -8612,8 +8618,10 @@ var CompanionSupervisor = class {
   }
   // ---- device-level loops ----
   kickHeartbeat() {
-    if (this.inFlightHeartbeat) return;
-    const pending = this.sendHeartbeat();
+    if (this.stopped || this.inFlightHeartbeat) return;
+    this.trackHeartbeat(this.sendHeartbeat());
+  }
+  trackHeartbeat(pending) {
     this.inFlightHeartbeat = pending;
     void pending.finally(() => {
       if (this.inFlightHeartbeat === pending) this.inFlightHeartbeat = null;
@@ -9360,12 +9368,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 ? [waitForBoundedHeartbeat(heartbeat)] : [],
       ...this.deviceSub ? [this.deviceSub.finished] : [],
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
@@ -9378,6 +9388,18 @@ var CompanionSupervisor = class {
     this.reexecFn();
   }
 };
+async function waitForBoundedHeartbeat(heartbeat) {
+  let timer = null;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(resolve, SHUTDOWN_HEARTBEAT_WAIT_MS);
+    timer.unref?.();
+  });
+  try {
+    await Promise.race([heartbeat, timeout]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 function defaultReexec() {
   clearRuntimeState();
   void import("child_process").then(({ spawn: spawn5 }) => {

package/package.json

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