@cabane/companion 0.6.39 → 0.6.40

package/dist/cli.js

@@ -2676,9 +2676,6 @@ var DeviceApi = class {
   getAssignments() {
     return this.request("GET", "/api/companion/assignments");
   }
-  beginDrain() {
-    return this.request("POST", "/api/companion/drain", {});
-  }
   // CT1146: report that a dispatch addressed to THIS device can't be run, because
   // the agent isn't one this device runs (and still wasn't after a forced
   // assignments refresh). The server clears the Working flag, retires the dispatch
@@ -9018,8 +9015,6 @@ var CompanionSupervisor = class {
   pollTimer = null;
   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;
@@ -9103,7 +9098,7 @@ var CompanionSupervisor = class {
   }
   // ---- device-level loops ----
   kickHeartbeat() {
-    if (this.draining || this.inFlightHeartbeat) return;
+    if (this.inFlightHeartbeat) return;
     const pending = this.sendHeartbeat();
     this.inFlightHeartbeat = pending;
     void pending.finally(() => {
@@ -9151,8 +9146,7 @@ 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.restartPending ? { restarting: true } : {}
+        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9508,7 +9502,6 @@ var CompanionSupervisor = class {
       if (ev.id) wr.cursor.settle(ev.id);
       return;
     }
-    if (this.draining) return;
     const payload = {
       type: "device:dispatch_requested",
       ...wire.payload
@@ -9870,50 +9863,6 @@ var CompanionSupervisor = class {
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
   }
-  async drainForRestart(graceMs) {
-    this.restartPending = true;
-    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
-    if (!this.deviceApi) throw new Error("cannot establish deploy drain before pairing");
-    await this.sendHeartbeat();
-    const drainStartedAt = Date.now();
-    const deadline = Date.now() + Math.max(0, graceMs);
-    let timedOut = false;
-    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(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())
-      )
-    );
-    await this.shutdown();
-    return { drained: !timedOut };
-  }
   async requestStop() {
     await this.shutdown();
     this.exitFn(0);
@@ -10145,14 +10094,7 @@ async function createCompanionRuntime(opts = {}) {
       stop: stop2,
       heartbeatNow: () => supervisor.heartbeatNow(),
       harnesses: () => hub.statusJson().harnesses ?? [],
-      connectHarness,
-      drainForRestart: async (graceMs) => {
-        clearRuntimeStateIfOurs(instanceId);
-        const result = await supervisor.drainForRestart(graceMs);
-        await closeSurfaces(control, dashboard);
-        stopped = true;
-        return result;
-      }
+      connectHarness
     }
   };
 }
@@ -10281,8 +10223,6 @@ function defaultSpawnDetached(args) {
 
 // src/commands/start.ts
 var FORCE_EXIT_MS = 4e3;
-var DEPLOY_REEXEC_EXIT = 75;
-var DEPLOY_GRACE_MS = 6.5 * 60 * 60 * 1e3;
 var MAX_CODES = 3;
 async function start(opts = {}) {
   const interactive = isInteractive();
@@ -10521,31 +10461,6 @@ companion: received ${signal}, shutting down\u2026
     };
     process.on("SIGINT", () => void shutdown("SIGINT"));
     process.on("SIGTERM", () => void shutdown("SIGTERM"));
-    process.on("SIGUSR2", () => {
-      if (shuttingDown) return;
-      shuttingDown = true;
-      const configuredGrace = Number.parseInt(
-        process.env.CABANE_COMPANION_DEPLOY_GRACE_MS ?? String(DEPLOY_GRACE_MS),
-        10
-      );
-      const graceMs = Number.isFinite(configuredGrace) ? configuredGrace : DEPLOY_GRACE_MS;
-      process.stdout.write(`
-companion: deploy drain requested (${graceMs}ms grace)\u2026
-`);
-      void runtime.drainForRestart(graceMs).then(({ drained }) => {
-        process.stdout.write(
-          drained ? "companion: deploy drain complete; re-execing onto the new dist.\n" : "companion: deploy grace expired; re-execing \u2014 unfinished turns resume after restart.\n"
-        );
-        resolve();
-        process.exit(DEPLOY_REEXEC_EXIT);
-      }).catch((err) => {
-        process.stderr.write(
-          `companion: deploy drain failed: ${err instanceof Error ? err.message : String(err)}
-`
-        );
-        process.exit(DEPLOY_REEXEC_EXIT);
-      });
-    });
   });
 }
 

package/dist/runtime.js

@@ -2104,9 +2104,6 @@ var DeviceApi = class {
   getAssignments() {
     return this.request("GET", "/api/companion/assignments");
   }
-  beginDrain() {
-    return this.request("POST", "/api/companion/drain", {});
-  }
   // CT1146: report that a dispatch addressed to THIS device can't be run, because
   // the agent isn't one this device runs (and still wasn't after a forced
   // assignments refresh). The server clears the Working flag, retires the dispatch
@@ -8525,8 +8522,6 @@ var CompanionSupervisor = class {
   pollTimer = null;
   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;
@@ -8610,7 +8605,7 @@ var CompanionSupervisor = class {
   }
   // ---- device-level loops ----
   kickHeartbeat() {
-    if (this.draining || this.inFlightHeartbeat) return;
+    if (this.inFlightHeartbeat) return;
     const pending = this.sendHeartbeat();
     this.inFlightHeartbeat = pending;
     void pending.finally(() => {
@@ -8658,8 +8653,7 @@ 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.restartPending ? { restarting: true } : {}
+        ...this.harnessSignals ? { detectedRuntimes: detectedRuntimesFor(deriveHarnessSnapshot(this.harnessSignals)) } : {}
       });
       this.hub.setDevice({ deviceId: res.deviceId });
       this.deviceId = res.deviceId;
@@ -9015,7 +9009,6 @@ var CompanionSupervisor = class {
       if (ev.id) wr.cursor.settle(ev.id);
       return;
     }
-    if (this.draining) return;
     const payload = {
       type: "device:dispatch_requested",
       ...wire.payload
@@ -9377,50 +9370,6 @@ var CompanionSupervisor = class {
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
   }
-  async drainForRestart(graceMs) {
-    this.restartPending = true;
-    if (this.inFlightHeartbeat) await this.inFlightHeartbeat;
-    if (!this.deviceApi) throw new Error("cannot establish deploy drain before pairing");
-    await this.sendHeartbeat();
-    const drainStartedAt = Date.now();
-    const deadline = Date.now() + Math.max(0, graceMs);
-    let timedOut = false;
-    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(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())
-      )
-    );
-    await this.shutdown();
-    return { drained: !timedOut };
-  }
   async requestStop() {
     await this.shutdown();
     this.exitFn(0);
@@ -9652,14 +9601,7 @@ async function createCompanionRuntime(opts = {}) {
       stop,
       heartbeatNow: () => supervisor.heartbeatNow(),
       harnesses: () => hub.statusJson().harnesses ?? [],
-      connectHarness,
-      drainForRestart: async (graceMs) => {
-        clearRuntimeStateIfOurs(instanceId);
-        const result = await supervisor.drainForRestart(graceMs);
-        await closeSurfaces(control, dashboard);
-        stopped = true;
-        return result;
-      }
+      connectHarness
     }
   };
 }

package/package.json

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