@cabane/companion 0.6.157 → 0.6.159

package/dist/runtime.js

@@ -4288,6 +4288,196 @@ function dedupe(xs) {
   return [...new Set(xs)];
 }
 
+// packages/agent-runtime/src/claude-code/failure-evidence.ts
+function createFailureEvidence() {
+  const signals = { sawRejectedLimit: false };
+  return {
+    observe(msg) {
+      if (msg.type === "assistant" || msg.type === "auth_status") {
+        const error = msg.error;
+        if (typeof error === "string" && error.length > 0) {
+          if (msg.type === "assistant") signals.lastAssistantError = error;
+          else signals.authError = error;
+        }
+      } else if (msg.type === "rate_limit_event") {
+        const info = msg.rate_limit_info;
+        if (info?.status === "rejected") {
+          signals.sawRejectedLimit = true;
+          signals.rateLimitResetIso = resetsAtToIso(info.resetsAt) ?? signals.rateLimitResetIso;
+          if (typeof info.rateLimitType === "string") signals.rateLimitType = info.rateLimitType;
+        }
+      }
+    },
+    preInitReason(msg) {
+      const failure = msg ? classifyPreInitFrame(msg, signals) : classifyFailure(signals, { text: "" });
+      return failure ? encodeFailureReason(failure) : "session_start_failed";
+    },
+    failedResultReason(msg) {
+      const failure = classifyResultFailure(msg, signals);
+      const resultText = msg.result ?? "";
+      const isError = msg.is_error === true;
+      return failure ? encodeFailureReason(failure) : isError ? `error:${resultText.slice(0, 200) || "unknown"}` : `result_error:${msg.subtype}`;
+    },
+    thrownFailure(message2, initReceived) {
+      return initReceived ? classifyErrorText(message2) : classifyFailure(signals, { text: message2 });
+    }
+  };
+}
+function classifyFailure(s, frame) {
+  const rejectedIsCap = s.sawRejectedLimit && (s.rateLimitResetIso !== void 0 || isSubscriptionWindow(s.rateLimitType));
+  if (rejectedIsCap || frame.terminalReason === "blocking_limit")
+    return {
+      kind: "usage_capped",
+      ...s.rateLimitResetIso ? { resetsAt: s.rateLimitResetIso } : {}
+    };
+  return classifyAssistantError(s.lastAssistantError) ?? classifyErrorText([s.authError, frame.text].filter(Boolean).join(" "));
+}
+function classifyResultFailure(msg, s) {
+  const resultText = msg.result ?? "";
+  const terminalReason = msg.terminal_reason;
+  const errors = msg.errors;
+  const text = [resultText, ...Array.isArray(errors) ? errors.map(String) : []].join(" ");
+  return classifyFailure(s, { terminalReason, text });
+}
+function classifyPreInitFrame(msg, s) {
+  if (msg.type === "result") {
+    const isError = msg.is_error === true;
+    if (msg.subtype === "success" && !isError) return classifyFailure(s, { text: "" });
+    return classifyResultFailure(msg, s);
+  }
+  if (msg.type !== "assistant") return classifyFailure(s, { text: "" });
+  const text = contentBlocks(msg).flatMap((b) => b.type === "text" && typeof b.text === "string" ? [b.text] : []).join(" ");
+  return classifyFailure(s, { text });
+}
+function preInitToolActivity(msg) {
+  const kind = msg.type === "assistant" ? "tool_use" : msg.type === "user" ? "tool_result" : null;
+  return kind !== null && contentBlocks(msg).some((b) => b.type === kind);
+}
+function contentBlocks(msg) {
+  const content = msg.message?.content;
+  return Array.isArray(content) ? content : [];
+}
+function isSubscriptionWindow(value) {
+  return value === "five_hour" || value === "seven_day" || value === "seven_day_opus" || value === "seven_day_sonnet" || value === "overage";
+}
+
+// packages/agent-runtime/src/claude-code/context-usage.ts
+function createContextUsage() {
+  let resolvedModel;
+  let lastRequestContextTokens;
+  const compactions = [];
+  return {
+    get resolvedModel() {
+      return resolvedModel;
+    },
+    recordInit(msg) {
+      const model = msg.model;
+      if (typeof model === "string" && model.length > 0) resolvedModel = model;
+    },
+    recordCompaction(msg) {
+      const compaction = readCompaction(msg);
+      if (compaction) compactions.push(compaction);
+    },
+    recordRequest(msg) {
+      const tokens = readRequestContextTokens(msg);
+      if (tokens !== void 0) lastRequestContextTokens = tokens;
+    },
+    async resultUsage(msg, readContextUsage) {
+      const usage = readSdkUsage(msg.usage);
+      if (usage) {
+        if (lastRequestContextTokens !== void 0) usage.contextTokens = lastRequestContextTokens;
+        const window = readContextWindow(msg, resolvedModel);
+        if (window !== void 0) usage.contextWindow = window;
+        if (compactions.length > 0) usage.contextCompactions = compactions;
+        const reading = await readHarnessContext(readContextUsage);
+        if (reading) Object.assign(usage, reading);
+      }
+      return usage;
+    }
+  };
+}
+function readSdkUsage(usage) {
+  if (!usage || typeof usage !== "object") return void 0;
+  const fields = usage;
+  const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+  const cacheReadTokens = num(fields.cache_read_input_tokens);
+  const cacheCreationTokens = num(fields.cache_creation_input_tokens);
+  const inputTokens = num(fields.input_tokens) + cacheCreationTokens + cacheReadTokens;
+  const outputTokens = num(fields.output_tokens);
+  return { inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens };
+}
+function readRequestContextTokens(msg) {
+  return readSdkUsage(msg.message?.usage)?.inputTokens;
+}
+var CONTEXT_READING_TIMEOUT_MS = 2e3;
+async function readHarnessContext(read) {
+  if (!read) return void 0;
+  let timer;
+  const timeout = new Promise((resolve2) => {
+    timer = setTimeout(() => resolve2(void 0), CONTEXT_READING_TIMEOUT_MS);
+  });
+  try {
+    return parseContextUsage(await Promise.race([read(), timeout]));
+  } catch {
+    return void 0;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+var CATEGORY_KINDS = /* @__PURE__ */ new Set(["used", "free", "buffer", "deferred"]);
+function parseContextUsage(response) {
+  const r = response;
+  if (!r || typeof r !== "object") return void 0;
+  const total = readContextCount(r.totalTokens);
+  const window = readContextCount(r.maxTokens);
+  if (total === void 0 || window === void 0 || window === 0) return void 0;
+  const categories = [];
+  for (const c of Array.isArray(r.categories) ? r.categories : []) {
+    const row = c;
+    const tokens = readContextCount(row?.tokens);
+    if (typeof row?.name === "string" && tokens !== void 0 && typeof row.kind === "string" && CATEGORY_KINDS.has(row.kind)) {
+      categories.push({ name: row.name, tokens, kind: row.kind });
+    }
+  }
+  const buffer = categories.filter((c) => c.kind === "buffer").reduce((sum, c) => sum + c.tokens, 0);
+  return {
+    contextTokens: total,
+    contextWindow: window,
+    ...buffer > 0 && buffer < window ? { contextCompactAt: window - buffer } : {},
+    ...categories.length > 0 ? { contextCategories: categories } : {}
+  };
+}
+function readCompaction(msg) {
+  const meta = msg.compact_metadata;
+  const preTokens = readContextCount(meta?.pre_tokens);
+  if (!meta || preTokens === void 0) return void 0;
+  if (meta.trigger !== "manual" && meta.trigger !== "auto") return void 0;
+  const postTokens = readContextCount(meta.post_tokens);
+  return {
+    trigger: meta.trigger,
+    preTokens,
+    ...postTokens !== void 0 ? { postTokens } : {}
+  };
+}
+function readContextWindow(msg, resolvedModel) {
+  const modelUsage = msg.modelUsage;
+  if (!modelUsage || typeof modelUsage !== "object") return void 0;
+  const pos = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : void 0;
+  if (resolvedModel) {
+    const direct = pos(modelUsage[resolvedModel]?.contextWindow);
+    if (direct !== void 0) return direct;
+  }
+  let max;
+  for (const entry of Object.values(modelUsage)) {
+    const w = pos(entry?.contextWindow);
+    if (w !== void 0 && (max === void 0 || w > max)) max = w;
+  }
+  return max;
+}
+function readContextCount(v) {
+  return typeof v === "number" && Number.isFinite(v) && v >= 0 ? Math.round(v) : void 0;
+}
+
 // packages/agent-runtime/src/claude-code/loop.ts
 async function* decodeSdkStream(iter, ctx2) {
   const pending = /* @__PURE__ */ new Map();
@@ -4303,17 +4493,15 @@ async function* decodeSdkStream(iter, ctx2) {
   let resultReason;
   let sawResult = false;
   let usage;
-  const compactions = [];
-  let lastRequestContextTokens;
-  let resolvedModel;
-  const signals = { sawRejectedLimit: false };
+  const contextUsage = createContextUsage();
+  const failureEvidence = createFailureEvidence();
   let preInitNotice = null;
   try {
     for await (const msg of iter) {
       if (ctx2.signal.aborted) return;
+      failureEvidence.observe(msg);
       if (msg.type === "system" && msg.subtype === "init") {
-        const initModel = msg.model;
-        if (typeof initModel === "string" && initModel.length > 0) resolvedModel = initModel;
+        contextUsage.recordInit(msg);
         mcpInventory = readMcpInventory(msg);
         workspaceProven = provesWorkspaceTools(msg);
         if (!workspaceProven) {
@@ -4330,63 +4518,35 @@ async function* decodeSdkStream(iter, ctx2) {
           };
         }
       } else if (msg.type === "system" && msg.subtype === "compact_boundary") {
-        const compaction = readCompaction(msg);
-        if (compaction) compactions.push(compaction);
+        contextUsage.recordCompaction(msg);
       } else if (!workspaceProven && (msg.type === "assistant" || msg.type === "user" || msg.type === "result")) {
         if (preInitToolActivity(msg) && ctx2.startEvidence) ctx2.startEvidence.toolActivity = true;
-        const failure = classifyPreInitFrame(msg, signals);
-        resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
+        resultReason = failureEvidence.preInitReason(msg);
         if (msg.type === "assistant" && isHarnessAuthored(msg))
           preInitNotice = harnessNoticeText(msg);
         break;
       } else if (msg.type === "assistant") {
-        const assistantErr = msg.error;
-        if (typeof assistantErr === "string" && assistantErr.length > 0) {
-          signals.lastAssistantError = assistantErr;
-        }
         if (isHarnessAuthored(msg)) {
           await emitHarnessMessage(msg, emit, pending, buffer);
           yield* drain(out);
           continue;
         }
-        const reqContext = readRequestContextTokens(msg);
-        if (reqContext !== void 0) lastRequestContextTokens = reqContext;
+        contextUsage.recordRequest(msg);
         await processAssistantMessage(msg, emit, pending, buffer);
         yield* drain(out);
       } else if (msg.type === "user") {
         await emitToolResults(msg, emit, pending);
         yield* drain(out);
-      } else if (msg.type === "rate_limit_event") {
-        const info = msg.rate_limit_info;
-        if (info?.status === "rejected") {
-          signals.sawRejectedLimit = true;
-          signals.rateLimitResetIso = resetsAtToIso(info.resetsAt) ?? signals.rateLimitResetIso;
-          if (typeof info.rateLimitType === "string") signals.rateLimitType = info.rateLimitType;
-        }
-      } else if (msg.type === "auth_status") {
-        const err = msg.error;
-        if (typeof err === "string" && err.length > 0) signals.authError = err;
       } else if (msg.type === "result") {
         const origin = msg.origin;
         if (origin?.kind === "task-notification") continue;
         sawResult = true;
-        usage = readSdkUsage(msg);
-        if (usage) {
-          if (lastRequestContextTokens !== void 0)
-            usage.contextTokens = lastRequestContextTokens;
-          const window = readContextWindow(msg, resolvedModel);
-          if (window !== void 0) usage.contextWindow = window;
-          if (compactions.length > 0) usage.contextCompactions = compactions;
-          const reading = await readHarnessContext(ctx2.readContextUsage);
-          if (reading) Object.assign(usage, reading);
-        }
+        usage = await contextUsage.resultUsage(msg, ctx2.readContextUsage);
         const isError = msg.is_error === true;
         if (msg.subtype === "success" && !isError) {
           ok = true;
         } else {
-          const resultText = msg.result ?? "";
-          const failure = classifyResultFailure(msg, signals);
-          resultReason = failure ? encodeFailureReason(failure) : isError ? `error:${resultText.slice(0, 200) || "unknown"}` : `result_error:${msg.subtype}`;
+          resultReason = failureEvidence.failedResultReason(msg);
           ok = false;
         }
         break;
@@ -4395,7 +4555,7 @@ async function* decodeSdkStream(iter, ctx2) {
   } catch (err) {
     if (ctx2.signal.aborted) throw err;
     const message2 = err instanceof Error ? err.message : String(err);
-    const failure = mcpInventory.initReceived ? classifyErrorText(message2) : classifyFailure(signals, { text: message2 });
+    const failure = failureEvidence.thrownFailure(message2, mcpInventory.initReceived);
     if (!failure && (mcpInventory.initReceived || ctx2.resumedSessionId === null)) throw err;
     ok = false;
     if (failure) {
@@ -4410,8 +4570,7 @@ async function* decodeSdkStream(iter, ctx2) {
   if (!workspaceProven) {
     ok = false;
     if (resultReason === void 0) {
-      const failure = classifyFailure(signals, { text: "" });
-      resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
+      resultReason = failureEvidence.preInitReason();
     }
     if (preInitNotice) yield { type: "runtime_notice", body: preInitNotice };
   }
@@ -4429,7 +4588,7 @@ async function* decodeSdkStream(iter, ctx2) {
     ok,
     ...resultReason ? { reason: resultReason } : {},
     ...usage ? { usage } : {},
-    ...resolvedModel ? { resolvedModel } : {},
+    ...contextUsage.resolvedModel ? { resolvedModel: contextUsage.resolvedModel } : {},
     mcpInventory
   };
 }
@@ -4448,38 +4607,6 @@ function provesWorkspaceTools(msg) {
   const tools = msg.tools;
   return Array.isArray(tools) && tools.includes("mcp__cabane__query");
 }
-function classifyFailure(s, frame) {
-  const rejectedIsCap = s.sawRejectedLimit && (s.rateLimitResetIso !== void 0 || isSubscriptionWindow(s.rateLimitType));
-  if (rejectedIsCap || frame.terminalReason === "blocking_limit")
-    return {
-      kind: "usage_capped",
-      ...s.rateLimitResetIso ? { resetsAt: s.rateLimitResetIso } : {}
-    };
-  return classifyAssistantError(s.lastAssistantError) ?? classifyErrorText([s.authError, frame.text].filter(Boolean).join(" "));
-}
-function classifyResultFailure(msg, s) {
-  const resultText = msg.result ?? "";
-  const terminalReason = msg.terminal_reason;
-  const errors = msg.errors;
-  const text = [resultText, ...Array.isArray(errors) ? errors.map(String) : []].join(" ");
-  return classifyFailure(s, { terminalReason, text });
-}
-function classifyPreInitFrame(msg, s) {
-  if (msg.type === "result") {
-    const isError = msg.is_error === true;
-    if (msg.subtype === "success" && !isError) return classifyFailure(s, { text: "" });
-    return classifyResultFailure(msg, s);
-  }
-  if (msg.type !== "assistant") return classifyFailure(s, { text: "" });
-  const error = msg.error;
-  const signals = typeof error === "string" && error.length > 0 ? { ...s, lastAssistantError: error } : s;
-  const text = contentBlocks(msg).flatMap((b) => b.type === "text" && typeof b.text === "string" ? [b.text] : []).join(" ");
-  return classifyFailure(signals, { text });
-}
-function preInitToolActivity(msg) {
-  const kind = msg.type === "assistant" ? "tool_use" : msg.type === "user" ? "tool_result" : null;
-  return kind !== null && contentBlocks(msg).some((b) => b.type === kind);
-}
 function isHarnessAuthored(msg) {
   const error = msg.error;
   if (typeof error === "string" && error.length > 0) return true;
@@ -4504,99 +4631,9 @@ async function emitHarnessMessage(msg, emit, pending, buffer) {
     );
   }
 }
-function contentBlocks(msg) {
-  const content = msg.message?.content;
-  return Array.isArray(content) ? content : [];
-}
-function isSubscriptionWindow(value) {
-  return value === "five_hour" || value === "seven_day" || value === "seven_day_opus" || value === "seven_day_sonnet" || value === "overage";
-}
 function* drain(out) {
   while (out.length > 0) yield out.shift();
 }
-function readSdkUsage(msg) {
-  const usage = msg.usage;
-  if (!usage || typeof usage !== "object") return void 0;
-  const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
-  const cacheReadTokens = num(usage.cache_read_input_tokens);
-  const cacheCreationTokens = num(usage.cache_creation_input_tokens);
-  const inputTokens = num(usage.input_tokens) + cacheCreationTokens + cacheReadTokens;
-  const outputTokens = num(usage.output_tokens);
-  return { inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens };
-}
-function readRequestContextTokens(msg) {
-  const usage = msg.message?.usage;
-  if (!usage || typeof usage !== "object") return void 0;
-  const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
-  return num(usage.input_tokens) + num(usage.cache_read_input_tokens) + num(usage.cache_creation_input_tokens);
-}
-var CONTEXT_READING_TIMEOUT_MS = 2e3;
-async function readHarnessContext(read) {
-  if (!read) return void 0;
-  let timer;
-  const timeout = new Promise((resolve2) => {
-    timer = setTimeout(() => resolve2(void 0), CONTEXT_READING_TIMEOUT_MS);
-  });
-  try {
-    return parseContextUsage(await Promise.race([read(), timeout]));
-  } catch {
-    return void 0;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-var CATEGORY_KINDS = /* @__PURE__ */ new Set(["used", "free", "buffer", "deferred"]);
-function parseContextUsage(response) {
-  const r = response;
-  if (!r || typeof r !== "object") return void 0;
-  const count = (v) => typeof v === "number" && Number.isFinite(v) && v >= 0 ? Math.round(v) : void 0;
-  const total = count(r.totalTokens);
-  const window = count(r.maxTokens);
-  if (total === void 0 || window === void 0 || window === 0) return void 0;
-  const categories = [];
-  for (const c of Array.isArray(r.categories) ? r.categories : []) {
-    const row = c;
-    const tokens = count(row?.tokens);
-    if (typeof row?.name === "string" && tokens !== void 0 && typeof row.kind === "string" && CATEGORY_KINDS.has(row.kind)) {
-      categories.push({ name: row.name, tokens, kind: row.kind });
-    }
-  }
-  const buffer = categories.filter((c) => c.kind === "buffer").reduce((sum, c) => sum + c.tokens, 0);
-  return {
-    contextTokens: total,
-    contextWindow: window,
-    ...buffer > 0 && buffer < window ? { contextCompactAt: window - buffer } : {},
-    ...categories.length > 0 ? { contextCategories: categories } : {}
-  };
-}
-function readCompaction(msg) {
-  const meta = msg.compact_metadata;
-  const count = (v) => typeof v === "number" && Number.isFinite(v) && v >= 0 ? Math.round(v) : void 0;
-  const preTokens = count(meta?.pre_tokens);
-  if (!meta || preTokens === void 0) return void 0;
-  if (meta.trigger !== "manual" && meta.trigger !== "auto") return void 0;
-  const postTokens = count(meta.post_tokens);
-  return {
-    trigger: meta.trigger,
-    preTokens,
-    ...postTokens !== void 0 ? { postTokens } : {}
-  };
-}
-function readContextWindow(msg, resolvedModel) {
-  const modelUsage = msg.modelUsage;
-  if (!modelUsage || typeof modelUsage !== "object") return void 0;
-  const pos = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : void 0;
-  if (resolvedModel) {
-    const direct = pos(modelUsage[resolvedModel]?.contextWindow);
-    if (direct !== void 0) return direct;
-  }
-  let max;
-  for (const entry of Object.values(modelUsage)) {
-    const w = pos(entry?.contextWindow);
-    if (w !== void 0 && (max === void 0 || w > max)) max = w;
-  }
-  return max;
-}
 
 // packages/agent-runtime/src/claude-code/prompt-input.ts
 function buildQueryPrompt(req, openUntil) {
@@ -13244,6 +13281,8 @@ var SseSubscriber = class {
   opts;
   aborted = false;
   controller = null;
+  // Ends the reconnect backoff early, so a stop never waits out a sleep of up to 30 s.
+  wake = null;
   lastEventId;
   // Set after `start()`; resolved when the subscriber loop exits (either
   // because `stop()` was called or because an auth failure tore it down).
@@ -13254,12 +13293,7 @@ var SseSubscriber = class {
   stop() {
     this.aborted = true;
     this.controller?.abort();
-  }
-  // Connect again after a `stop()`, once its loop has exited.
-  async resume() {
-    await this.finished;
-    this.aborted = false;
-    this.start();
+    this.wake?.();
   }
   setCursor(eventId) {
     this.lastEventId = eventId;
@@ -13272,7 +13306,7 @@ var SseSubscriber = class {
         backoff = 500;
         if (!this.aborted) {
           this.opts.log.warn("Lost the connection to Cabane; reconnecting");
-          await sleep3(backoff);
+          await this.backoff(backoff);
         }
       } catch (err) {
         if (this.aborted) return;
@@ -13292,11 +13326,21 @@ var SseSubscriber = class {
           },
           "Lost the connection to Cabane; reconnecting"
         );
-        await sleep3(backoff);
+        await this.backoff(backoff);
         backoff = Math.min(backoff * 2, MAX_BACKOFF_MS);
       }
     }
   }
+  backoff(ms) {
+    return new Promise((resolve2) => {
+      const timer = setTimeout(done, ms);
+      this.wake = done;
+      function done() {
+        clearTimeout(timer);
+        resolve2();
+      }
+    });
+  }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
     const url = `${base}${this.opts.path}`;
@@ -13343,9 +13387,6 @@ var SseSubscriber = class {
     }
   }
 };
-function sleep3(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
 
 // src/updater.ts
 import { spawn as spawn8 } from "child_process";
@@ -13517,7 +13558,7 @@ function updateMode(env = process.env) {
   return env.CABANE_COMPANION_SUPERVISED === "1" ? "supervised" : "attached";
 }
 var STAGE_RETRY_MS = 60 * 6e4;
-var SWAP_DRAIN_MS = 1e4;
+var SWAP_WAIT_MS = 10 * 6e4;
 var SOURCE_BUILD_VERSION = "0.0.0";
 function versionToStage(input) {
   const { own, state, now, force } = input;
@@ -13667,6 +13708,8 @@ var CompanionUpdater = class {
   deps;
   staging = null;
   ready = null;
+  // When `ready` verified; `SWAP_WAIT_MS` counts from here.
+  readyAt = 0;
   swapping = false;
   watchdog = null;
   now;
@@ -13765,7 +13808,7 @@ var CompanionUpdater = class {
       return { ok: true, message: `Cabane ${this.deps.own} is up to date.` };
     if (state.pending?.to === latest) return { ok: true, message: this.waitingMessage(latest) };
     if (this.ready === latest) {
-      void this.trySwap();
+      void this.trySwap(true);
       return { ok: true, message: this.waitingMessage(latest) };
     }
     this.maybeStage(true);
@@ -13781,13 +13824,14 @@ var CompanionUpdater = class {
         message: failed?.kind === "failed" && failed.to === latest ? `Couldn't update to ${latest}: ${failed.reason ?? "see cabane logs"}.` : `Couldn't update to ${latest}. cabane logs says why.`
       };
     }
-    void this.trySwap();
+    void this.trySwap(true);
     return { ok: true, message: this.waitingMessage(latest) };
   }
+  // Only the person's `cabane update` asks, and that swaps at once.
   waitingMessage(version) {
     if (this.deps.mode === "attached")
       return `Cabane ${version} is installed. It runs from the next  cabane start.`;
-    return this.deps.isIdle() ? `Updating to ${version} now.` : `Updating to ${version} once the turns running now finish.`;
+    return this.deps.isIdle() ? `Updating to ${version} now.` : `Updating to ${version} now. The turns running now carry on after the restart.`;
   }
   maybeStage(force) {
     if (this.staging) return;
@@ -13805,6 +13849,7 @@ var CompanionUpdater = class {
       const outcome = await stage(version, this.deps.harnesses());
       if (outcome.ok) {
         this.ready = version;
+        this.readyAt = this.now();
         updateUpdateState((s) => {
           const { failed: _failed, ...rest } = s;
           return rest;
@@ -13843,8 +13888,10 @@ var CompanionUpdater = class {
     });
     void this.staging.then(() => this.trySwap());
   }
-  // Swap into the ready version once nothing is running. Called on each heartbeat until it can.
-  async trySwap() {
+  // Swap into the ready version: when nothing is running, when it has waited `SWAP_WAIT_MS` for
+  // that, when this version is below the server's minimum, or `now` (the person asked). Called on
+  // each heartbeat until it does.
+  async trySwap(now = false) {
     const to = this.ready;
     if (!to || this.swapping) return;
     if (readUpdateState().pending) return;
@@ -13853,18 +13900,9 @@ var CompanionUpdater = class {
       this.deps.log.info({ version: to }, `Cabane ${to} is installed; it runs from the next start`);
       return;
     }
-    if (!this.deps.isIdle()) return;
+    if (!now && !this.deps.isIdle() && !this.waitedLongEnough() && !this.belowMinimum()) return;
     this.swapping = true;
     try {
-      await this.deps.pauseStream();
-      const sleep4 = this.deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-      const deadline = this.now() + SWAP_DRAIN_MS;
-      await sleep4(250);
-      while (!this.deps.isIdle() && this.now() < deadline) await sleep4(250);
-      if (!this.deps.isIdle()) {
-        this.deps.resumeStream();
-        return;
-      }
       this.select(to);
       this.deps.log.info({ from: this.deps.own, to }, `Restarting into Cabane ${to}`);
       await this.deps.restart();
@@ -13872,6 +13910,14 @@ var CompanionUpdater = class {
       this.swapping = false;
     }
   }
+  waitedLongEnough() {
+    return this.now() - this.readyAt >= SWAP_WAIT_MS;
+  }
+  // Cabane refuses this version's turns: waiting would only turn them away.
+  belowMinimum() {
+    const minimum = readUpdateState().server?.minimum;
+    return !!minimum && compareVersions(this.deps.own, minimum) < 0;
+  }
   // Record the swap and point `current` at `to`, leaving the guard that counts its starts.
   select(to) {
     const fromRoot = currentRoot() ?? ownPackageRoot();
@@ -13899,6 +13945,7 @@ var COMPANION_VERSION = pkg.version;
 // src/supervisor.ts
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var ARCHIVE_PRUNE_MS = 24 * 60 * 6e4;
+var FORCE_EXIT_MS = 4e3;
 var SHUTDOWN_HEARTBEAT_WAIT_MS = 1e3;
 function positiveIntEnv(name) {
   const raw = process.env[name];
@@ -14119,14 +14166,7 @@ var CompanionSupervisor = class {
       autoUpdate: () => this.config.update?.auto === true,
       harnesses: () => this.connectedBundledHarnesses(),
       isIdle: () => this.idle(),
-      pauseStream: async () => {
-        const sub = this.deviceSub;
-        if (!sub) return;
-        sub.stop();
-        await sub.finished;
-      },
-      resumeStream: () => void this.deviceSub?.resume(),
-      restart: () => this.restartForUpdate(),
+      restart: () => this.restartBounded(),
       log: this.log
     });
     this.updater.start();
@@ -15248,8 +15288,22 @@ var CompanionSupervisor = class {
       );
     }
   }
+  // The update's restart, held to the same `FORCE_EXIT_MS` a signal's stop gets. Exit 0: the
+  // swap is recorded and `current` names the new version, so the service starts it either way.
+  async restartBounded() {
+    const force = setTimeout(() => {
+      this.log.warn({ ms: FORCE_EXIT_MS }, "Restarting for the update: shutdown took too long");
+      this.exitFn(0);
+    }, FORCE_EXIT_MS);
+    force.unref?.();
+    try {
+      await this.restartForUpdate();
+    } finally {
+      clearTimeout(force);
+    }
+  }
   // Nothing running and nothing about to: no dispatch claimed, no turn chained, no recovery
-  // in progress. What a self-update swap waits for.
+  // in progress. What a self-update swap waits for, up to `SWAP_WAIT_MS`.
   idle() {
     if (this.claims.size > 0 || this.recovering) return false;
     for (const wr of this.workspaces.values()) if (wr.chains.size > 0) return false;
@@ -15271,7 +15325,7 @@ var CompanionSupervisor = class {
       if (auto) this.kickHeartbeat();
       return {
         ok: true,
-        message: auto ? "Cabane will keep itself up to date. Updates install between turns and roll back if they fail." : "Cabane won't update itself. Run  cabane update  to update."
+        message: auto ? "Cabane will keep itself up to date. Updates install between turns when they can, and roll back if they fail." : "Cabane won't update itself. Run  cabane update  to update."
       };
     }
     if (!this.updater) return { ok: false, message: "This computer isn't paired yet." };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.157",
+  "version": "0.6.159",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an 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",