@cabane/companion 0.6.43 → 0.6.45

package/dist/cli.js

@@ -6678,7 +6678,6 @@ var SUMMON_AGENT_TOOL = "summon_agent";
 var SUMMON_AGENT_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${SUMMON_AGENT_TOOL}`;
 var COMPANION_LOCAL_TOOL_GLOB = `mcp__${COMPANION_LOCAL_MCP_SERVER}__*`;
 var SKIP_TURN_TOOL = "skip_turn";
-var SKIP_TURN_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${SKIP_TURN_TOOL}`;
 var ASK_TOOL = "ask";
 var ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${ASK_TOOL}`;
 var SUB_AGENT_TOOL = "sub_agent";
@@ -8828,11 +8827,7 @@ var mcpSseServerSchema = z15.object({
   url: z15.string().url(),
   headers: z15.record(z15.string(), z15.string()).optional()
 });
-var mcpServerDefSchema = z15.union([
-  mcpHttpServerSchema,
-  mcpSseServerSchema,
-  mcpStdioServerSchema
-]);
+var mcpServerDefSchema = z15.union([mcpHttpServerSchema, mcpSseServerSchema, mcpStdioServerSchema]);
 var thinkingConfigSchema = z15.discriminatedUnion("type", [
   z15.object({ type: z15.literal("adaptive") }),
   z15.object({ type: z15.literal("enabled"), budgetTokens: z15.number().int().positive().optional() }),
@@ -8974,6 +8969,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 +9050,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 +9082,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 +9104,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;
@@ -9858,7 +9861,7 @@ var CompanionSupervisor = class {
       if (wr.sub) wr.sub.stop();
     }
     await Promise.all([
-      ...heartbeat ? [heartbeat] : [],
+      ...heartbeat ? [waitForBoundedHeartbeat(heartbeat)] : [],
       ...this.deviceSub ? [this.deviceSub.finished] : [],
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
@@ -9871,6 +9874,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

@@ -6187,7 +6187,6 @@ var SUMMON_AGENT_TOOL = "summon_agent";
 var SUMMON_AGENT_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${SUMMON_AGENT_TOOL}`;
 var COMPANION_LOCAL_TOOL_GLOB = `mcp__${COMPANION_LOCAL_MCP_SERVER}__*`;
 var SKIP_TURN_TOOL = "skip_turn";
-var SKIP_TURN_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${SKIP_TURN_TOOL}`;
 var ASK_TOOL = "ask";
 var ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${ASK_TOOL}`;
 var SUB_AGENT_TOOL = "sub_agent";
@@ -8337,11 +8336,7 @@ var mcpSseServerSchema = z15.object({
   url: z15.string().url(),
   headers: z15.record(z15.string(), z15.string()).optional()
 });
-var mcpServerDefSchema = z15.union([
-  mcpHttpServerSchema,
-  mcpSseServerSchema,
-  mcpStdioServerSchema
-]);
+var mcpServerDefSchema = z15.union([mcpHttpServerSchema, mcpSseServerSchema, mcpStdioServerSchema]);
 var thinkingConfigSchema = z15.discriminatedUnion("type", [
   z15.object({ type: z15.literal("adaptive") }),
   z15.object({ type: z15.literal("enabled"), budgetTokens: z15.number().int().positive().optional() }),
@@ -8483,6 +8478,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 +8559,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 +8591,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 +8613,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;
@@ -9367,7 +9370,7 @@ var CompanionSupervisor = class {
       if (wr.sub) wr.sub.stop();
     }
     await Promise.all([
-      ...heartbeat ? [heartbeat] : [],
+      ...heartbeat ? [waitForBoundedHeartbeat(heartbeat)] : [],
       ...this.deviceSub ? [this.deviceSub.finished] : [],
       ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
     ]);
@@ -9380,6 +9383,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.43",
+  "version": "0.6.45",
   "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",