@cabane/companion 0.6.25 → 0.6.26

package/dist/cli.js

@@ -8377,6 +8377,7 @@ var CompanionSupervisor = class {
   refreshing = false;
   stopped = false;
   draining = false;
+  restartPending = false;
   // CT484: latch so the companion/server version-skew warning is logged once, not
   // on every 30s heartbeat.
   versionSkewWarned = false;
@@ -8487,7 +8488,8 @@ var CompanionSupervisor = class {
         // actually landed (`harnessSignals` non-null) — an absent field means "we
         // didn't look this beat" and leaves the server's stored suggestion alone,
         // the same fail-soft contract `models` keeps.
-        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {}
+        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {},
+        ...this.restartPending ? { restarting: true } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9125,32 +9127,41 @@ var CompanionSupervisor = class {
     );
   }
   async drainForRestart(graceMs) {
-    this.draining = true;
-    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
-    if (this.pollTimer) clearInterval(this.pollTimer);
+    this.restartPending = true;
     if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
     if (!this.deviceApi) throw new Error("cannot establish deploy drain before pairing");
-    await this.deviceApi.beginDrain();
-    for (const wr of this.workspaces.values()) wr.sub?.stop();
-    const turns = [...this.workspaces.values()].flatMap((wr) => [...wr.chains.values()]);
+    await this.sendHeartbeat();
+    const drainStartedAt = Date.now();
+    const deadline = Date.now() + Math.max(0, graceMs);
     let timedOut = false;
-    if (turns.length > 0) {
+    while (true) {
+      const turns = [...this.workspaces.values()].flatMap((wr) => [...wr.chains.values()]);
+      if (turns.length === 0) break;
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) {
+        timedOut = true;
+        break;
+      }
       let timer;
       await Promise.race([
         Promise.allSettled(turns),
         new Promise((resolve) => {
-          timer = setTimeout(
-            () => {
-              timedOut = true;
-              resolve();
-            },
-            Math.max(0, graceMs)
-          );
+          timer = setTimeout(resolve, remainingMs);
           timer.unref?.();
         })
       ]);
       if (timer) clearTimeout(timer);
     }
+    this.log.info(
+      { waitedMs: Date.now() - drainStartedAt, timedOut },
+      timedOut ? "companion: deploy drain grace elapsed; fencing admission for restart" : "companion: deploy drain reached a quiet point; fencing admission for restart"
+    );
+    this.draining = true;
+    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
+    if (this.pollTimer) clearInterval(this.pollTimer);
+    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
+    await this.deviceApi.beginDrain();
+    for (const wr of this.workspaces.values()) wr.sub?.stop();
     await Promise.allSettled(
       [...this.workspaces.values()].flatMap(
         (wr) => [...wr.agents.values()].map((agent) => agent.api.drainOutbox())

package/dist/runtime.js

@@ -7996,6 +7996,7 @@ var CompanionSupervisor = class {
   refreshing = false;
   stopped = false;
   draining = false;
+  restartPending = false;
   // CT484: latch so the companion/server version-skew warning is logged once, not
   // on every 30s heartbeat.
   versionSkewWarned = false;
@@ -8106,7 +8107,8 @@ var CompanionSupervisor = class {
         // actually landed (`harnessSignals` non-null) — an absent field means "we
         // didn't look this beat" and leaves the server's stored suggestion alone,
         // the same fail-soft contract `models` keeps.
-        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {}
+        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {},
+        ...this.restartPending ? { restarting: true } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -8744,32 +8746,41 @@ var CompanionSupervisor = class {
     );
   }
   async drainForRestart(graceMs) {
-    this.draining = true;
-    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
-    if (this.pollTimer) clearInterval(this.pollTimer);
+    this.restartPending = true;
     if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
     if (!this.deviceApi) throw new Error("cannot establish deploy drain before pairing");
-    await this.deviceApi.beginDrain();
-    for (const wr of this.workspaces.values()) wr.sub?.stop();
-    const turns = [...this.workspaces.values()].flatMap((wr) => [...wr.chains.values()]);
+    await this.sendHeartbeat();
+    const drainStartedAt = Date.now();
+    const deadline = Date.now() + Math.max(0, graceMs);
     let timedOut = false;
-    if (turns.length > 0) {
+    while (true) {
+      const turns = [...this.workspaces.values()].flatMap((wr) => [...wr.chains.values()]);
+      if (turns.length === 0) break;
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) {
+        timedOut = true;
+        break;
+      }
       let timer;
       await Promise.race([
         Promise.allSettled(turns),
         new Promise((resolve) => {
-          timer = setTimeout(
-            () => {
-              timedOut = true;
-              resolve();
-            },
-            Math.max(0, graceMs)
-          );
+          timer = setTimeout(resolve, remainingMs);
           timer.unref?.();
         })
       ]);
       if (timer) clearTimeout(timer);
     }
+    this.log.info(
+      { waitedMs: Date.now() - drainStartedAt, timedOut },
+      timedOut ? "companion: deploy drain grace elapsed; fencing admission for restart" : "companion: deploy drain reached a quiet point; fencing admission for restart"
+    );
+    this.draining = true;
+    if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
+    if (this.pollTimer) clearInterval(this.pollTimer);
+    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
+    await this.deviceApi.beginDrain();
+    for (const wr of this.workspaces.values()) wr.sub?.stop();
     await Promise.allSettled(
       [...this.workspaces.values()].flatMap(
         (wr) => [...wr.agents.values()].map((agent) => agent.api.drainOutbox())

package/package.json

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