@byok-sdk/client 0.4.0 → 0.4.2

package/dist/index.js

@@ -1,4 +1,4 @@
-import { execFile, spawn, spawnSync } from 'child_process';
+import { execFile, spawn } from 'child_process';
 import { createHash, randomUUID, sign, createPrivateKey, generateKeyPairSync, randomBytes, timingSafeEqual, createHmac } from 'crypto';
 import { promises, mkdirSync, existsSync, renameSync, writeFileSync, chmodSync, statSync, readdirSync, linkSync, fstatSync, lstatSync, unlinkSync, constants, readFileSync, realpathSync } from 'fs';
 import path17, { join, isAbsolute } from 'path';
@@ -834,12 +834,12 @@ function resolvePiBin() {
     }
   } catch (cause) {
     throw new Error(
-      `Required ${PI_PACKAGE_NAME} could not be resolved; install @byok-sdk/client dependencies or set BYOK_PI_BIN to a Node 22.19+ pi sidecar`,
+      `Required ${PI_PACKAGE_NAME} could not be resolved; install @byok-sdk/client dependencies or set BYOK_PI_BIN to a Node 22.22+ pi sidecar`,
       { cause }
     );
   }
   throw new Error(
-    `Required ${PI_PACKAGE_NAME} does not expose the pi CLI; reinstall the pinned dependency or set BYOK_PI_BIN to a Node 22.19+ pi sidecar`
+    `Required ${PI_PACKAGE_NAME} does not expose the pi CLI; reinstall the pinned dependency or set BYOK_PI_BIN to a Node 22.22+ pi sidecar`
   );
 }
 
@@ -878,6 +878,24 @@ function mapPermissionPolicyToPiArgs(policy) {
 }
 
 // src/adapters/pi/events.ts
+function requireToolCallId(msg) {
+  if (typeof msg.toolCallId === "string" && msg.toolCallId.trim().length > 0) return msg.toolCallId;
+  throw new RuntimeExecutionFailure({
+    phase: "run",
+    category: "authority",
+    retry: "non-retryable",
+    reason: `pi ${msg.type} frame had no authoritative tool call id`
+  });
+}
+function requireToolResultOutcome(msg) {
+  if (typeof msg.isError === "boolean") return msg.isError;
+  throw new RuntimeExecutionFailure({
+    phase: "run",
+    category: "authority",
+    retry: "non-retryable",
+    reason: "pi tool_execution_end frame had no authoritative isError outcome"
+  });
+}
 function mapPiMessageToAgentEvent(msg) {
   switch (msg.type) {
     case "message_update": {
@@ -888,16 +906,22 @@ function mapPiMessageToAgentEvent(msg) {
       return void 0;
     }
     case "tool_execution_start": {
+      const toolCallId = requireToolCallId(msg);
       if (typeof msg.toolName !== "string") return void 0;
-      return { type: "tool_use", tool: msg.toolName, input: msg.args };
+      return { type: "tool_use", tool: msg.toolName, input: msg.args, toolCallId };
     }
     case "tool_execution_end": {
+      const toolCallId = requireToolCallId(msg);
+      const isError = requireToolResultOutcome(msg);
       if (typeof msg.toolName !== "string") return void 0;
-      return {
+      const event = {
         type: "tool_result",
         tool: msg.toolName,
-        output: { result: msg.result, isError: msg.isError === true }
+        output: { result: msg.result },
+        toolCallId,
+        isError
       };
+      return event;
     }
     case "agent_settled":
       return { type: "turn_end" };
@@ -1044,11 +1068,54 @@ var AsyncQueue = class {
     };
   }
 };
+
+// src/adapters/taskkill-pid-set.ts
+var INTEGER_PATTERN = /\d+/g;
+function isCandidatePid(value) {
+  return Number.isSafeInteger(value) && value > 0;
+}
+function walkTaskkillPidSet(text, rootPid, excludedPids = []) {
+  const excluded = new Set(excludedPids);
+  const accepted = /* @__PURE__ */ new Set();
+  if (isCandidatePid(rootPid)) accepted.add(rootPid);
+  const lines = text.split(/\r?\n/).map((line) => {
+    const pids = [];
+    for (const match of line.matchAll(INTEGER_PATTERN)) {
+      const pid = Number(match[0]);
+      if (isCandidatePid(pid) && !excluded.has(pid)) pids.push(pid);
+    }
+    return pids;
+  });
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const pids of lines) {
+      if (!pids.some((pid) => accepted.has(pid))) continue;
+      for (const pid of pids) {
+        if (accepted.has(pid)) continue;
+        accepted.add(pid);
+        changed = true;
+      }
+    }
+  }
+  return accepted;
+}
+
+// src/adapters/process-tree.ts
 var DEFAULT_TERM_GRACE_MS = 750;
 var DEFAULT_KILL_GRACE_MS = 2e3;
 var POLL_MS = 20;
-var terminationRequested = /* @__PURE__ */ new WeakSet();
-var terminationRequestFailed = /* @__PURE__ */ new WeakSet();
+var terminationState = /* @__PURE__ */ new WeakMap();
+function stateFor(child) {
+  const existing = terminationState.get(child);
+  if (existing) return existing;
+  const created = { requested: false, acceptedPids: /* @__PURE__ */ new Set() };
+  terminationState.set(child, created);
+  return created;
+}
+function defaultKill(pid, signal) {
+  process.kill(pid, signal);
+}
 function withOwnedProcessTree(options) {
   return {
     ...options,
@@ -1066,9 +1133,9 @@ function positivePid(child, label) {
   }
   return pid;
 }
-function groupExists(pid, label) {
+function groupExists(pid, label, kill) {
   try {
-    process.kill(-pid, 0);
+    kill(-pid, 0);
     return true;
   } catch (cause) {
     const code = cause.code;
@@ -1080,9 +1147,23 @@ function groupExists(pid, label) {
     }, { cause });
   }
 }
-function signalGroup(pid, signal, label) {
+function processExists(pid, label, kill) {
   try {
-    process.kill(-pid, signal);
+    kill(pid, 0);
+    return true;
+  } catch (cause) {
+    const code = cause.code;
+    if (code === "ESRCH") return false;
+    if (code === "EPERM") return true;
+    throw new RuntimeDisposalFailure({
+      stage: "quiescence",
+      reason: `${label} runtime process ${pid} state could not be verified`
+    }, { cause });
+  }
+}
+function signalGroup(pid, signal, label, kill) {
+  try {
+    kill(-pid, signal);
   } catch (cause) {
     const code = cause.code;
     if (code === "ESRCH" || code === "EPERM") return;
@@ -1092,6 +1173,39 @@ function signalGroup(pid, signal, label) {
     }, { cause });
   }
 }
+async function runTaskkill(pid, options) {
+  const spawnFn = options.spawnFn ?? spawn;
+  return new Promise((resolve, reject) => {
+    const signalFailure = (cause) => {
+      reject(new RuntimeDisposalFailure({
+        stage: "signal",
+        reason: `${options.label} runtime process tree termination could not be requested`
+      }, { cause }));
+    };
+    let taskkill;
+    try {
+      taskkill = spawnFn("taskkill", ["/PID", String(pid), "/T", "/F"], {
+        windowsHide: true,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+    } catch (cause) {
+      signalFailure(cause);
+      return;
+    }
+    const chunks = [];
+    taskkill.stdout?.on("data", (chunk) => chunks.push(chunk));
+    taskkill.stderr?.on("data", (chunk) => chunks.push(chunk));
+    taskkill.once("error", signalFailure);
+    taskkill.once("close", () => resolve(Buffer.concat(chunks).toString("latin1")));
+  });
+}
+function liveAcceptedPids(accepted, label, kill) {
+  const live = [];
+  for (const pid of accepted) {
+    if (processExists(pid, label, kill)) live.push(pid);
+  }
+  return live;
+}
 async function waitUntil(predicate, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   while (predicate()) {
@@ -1129,29 +1243,27 @@ async function waitWithDeadline(promise, timeoutMs) {
     );
   });
 }
-function requestOwnedProcessTreeTermination(options) {
-  if (options.isClosed()) return;
+async function requestOwnedProcessTreeTermination(options) {
+  const platform = options.platform ?? process.platform;
+  if (platform !== "win32" && options.isClosed()) return;
   const pid = positivePid(options.child, options.label);
   if (pid === void 0) return;
-  if (process.platform === "win32") {
-    const result = spawnSync("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true });
-    if (result.error) {
-      throw new RuntimeDisposalFailure({
-        stage: "signal",
-        reason: `${options.label} runtime process tree could not be terminated`
-      }, { cause: result.error });
-    }
-    terminationRequested.add(options.child);
-    if (result.status !== 0) terminationRequestFailed.add(options.child);
+  if (platform === "win32") {
+    const output = await runTaskkill(pid, options);
+    const state = stateFor(options.child);
+    for (const walked of walkTaskkillPidSet(output, pid, [process.pid])) state.acceptedPids.add(walked);
+    state.requested = true;
     return;
   }
-  signalGroup(pid, "SIGTERM", options.label);
-  terminationRequested.add(options.child);
+  signalGroup(pid, "SIGTERM", options.label, options.killFn ?? defaultKill);
+  stateFor(options.child).requested = true;
 }
 async function disposeOwnedProcessTree(options) {
   const pid = positivePid(options.child, options.label);
   const termGraceMs = options.termGraceMs ?? DEFAULT_TERM_GRACE_MS;
   const killGraceMs = options.killGraceMs ?? DEFAULT_KILL_GRACE_MS;
+  const platform = options.platform ?? process.platform;
+  const kill = options.killFn ?? defaultKill;
   if (pid === void 0) {
     if (await waitWithDeadline(options.waitClosed(), killGraceMs)) return;
     throw new RuntimeDisposalFailure({
@@ -1159,27 +1271,50 @@ async function disposeOwnedProcessTree(options) {
       reason: `${options.label} runtime process did not settle after spawn failure`
     });
   }
-  if (process.platform === "win32") {
-    if (!options.isClosed() && !terminationRequested.has(options.child)) requestOwnedProcessTreeTermination(options);
-    if (await waitWithDeadline(options.waitClosed(), killGraceMs)) return;
-    if (terminationRequestFailed.has(options.child)) {
+  if (platform === "win32") {
+    if (!terminationState.get(options.child)?.requested) {
+      await requestOwnedProcessTreeTermination(options);
+    }
+    const accepted = terminationState.get(options.child)?.acceptedPids ?? /* @__PURE__ */ new Set();
+    const deadline = Date.now() + killGraceMs;
+    const resweepAt = Date.now() + Math.floor(killGraceMs / 2);
+    let reswept = false;
+    let live = liveAcceptedPids(accepted, options.label, kill);
+    while (live.length > 0) {
+      if (Date.now() >= deadline) {
+        throw new RuntimeDisposalFailure({
+          stage: "quiescence",
+          reason: `${options.label} runtime process tree did not quiesce: ${live.length} of ${accepted.size} walked process ids were still alive at the disposal deadline`
+        });
+      }
+      if (!reswept && Date.now() >= resweepAt) {
+        reswept = true;
+        for (const livePid of live) {
+          for (const walked of walkTaskkillPidSet(await runTaskkill(livePid, options), livePid, [process.pid])) {
+            accepted.add(walked);
+          }
+        }
+      }
+      await new Promise((resolve) => {
+        setTimeout(resolve, POLL_MS);
+      });
+      live = liveAcceptedPids(accepted, options.label, kill);
+    }
+    if (!await waitWithDeadline(options.waitClosed(), killGraceMs)) {
       throw new RuntimeDisposalFailure({
-        stage: "signal",
-        reason: `${options.label} runtime process tree could not be terminated`
+        stage: "quiescence",
+        reason: `${options.label} runtime root did not emit close after its process tree quiesced`
       });
     }
-    throw new RuntimeDisposalFailure({
-      stage: "quiescence",
-      reason: `${options.label} runtime process tree did not close before the disposal deadline`
-    });
+    return;
   }
-  if (groupExists(pid, options.label) && !terminationRequested.has(options.child)) {
-    signalGroup(pid, "SIGTERM", options.label);
-    terminationRequested.add(options.child);
+  if (groupExists(pid, options.label, kill) && !terminationState.get(options.child)?.requested) {
+    signalGroup(pid, "SIGTERM", options.label, kill);
+    stateFor(options.child).requested = true;
   }
-  if (!await waitUntil(() => groupExists(pid, options.label), termGraceMs)) {
-    signalGroup(pid, "SIGKILL", options.label);
-    if (!await waitUntil(() => groupExists(pid, options.label), killGraceMs)) {
+  if (!await waitUntil(() => groupExists(pid, options.label, kill), termGraceMs)) {
+    signalGroup(pid, "SIGKILL", options.label, kill);
+    if (!await waitUntil(() => groupExists(pid, options.label, kill), killGraceMs)) {
       throw new RuntimeDisposalFailure({
         stage: "quiescence",
         reason: `${options.label} runtime process group remained live after SIGKILL`
@@ -1277,9 +1412,16 @@ var PiRpcClient = class {
       );
     }
   }
-  /** Immediate process-tree termination request. `dispose()` is the settlement receipt. */
+  /**
+   * Immediate process-tree termination request. `dispose()` is the settlement
+   * receipt, so this stays fire-and-forget: an interrupt must not block on a
+   * terminator. A request that could not be spawned is left unrecorded, so
+   * `dispose()` re-issues it and raises the typed `stage:'signal'` failure —
+   * swallowing it here loses nothing.
+   */
   kill() {
-    requestOwnedProcessTreeTermination(this.processTreeOptions());
+    void requestOwnedProcessTreeTermination(this.processTreeOptions()).catch(() => {
+    });
   }
   waitClosed() {
     return this.closedPromise;
@@ -1791,6 +1933,17 @@ function subtractDenied(tools, denyTools) {
 function createToolUseCorrelation() {
   return { toolNameByUseId: /* @__PURE__ */ new Map() };
 }
+function missingToolCallIdFailure(frame) {
+  return new RuntimeExecutionFailure({
+    phase: "run",
+    category: "authority",
+    retry: "non-retryable",
+    reason: `claude ${frame} frame had no authoritative tool call id`
+  });
+}
+function isAuthoritativeToolCallId(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
 var ROUTINE_CLAUDE_SYSTEM_SUBTYPES = /* @__PURE__ */ new Set([
   "init",
   "hook_started",
@@ -1834,9 +1987,12 @@ function mapAssistant(msg, correlation) {
         }
         break;
       case "tool_use":
-        if (typeof block.id === "string" && typeof block.name === "string") {
+        if (!isAuthoritativeToolCallId(block.id)) {
+          return { events: [], terminalFailure: missingToolCallIdFailure("tool_use") };
+        }
+        if (typeof block.name === "string") {
           correlation.toolNameByUseId.set(block.id, block.name);
-          events.push({ type: "tool_use", tool: block.name, input: block.input });
+          events.push({ type: "tool_use", tool: block.name, input: block.input, toolCallId: block.id });
         }
         break;
       // Deliberately NOT mapped to `progress` — mirrors pi's own choice to
@@ -1872,11 +2028,20 @@ function mapUser(msg, correlation, options) {
       unmappedLabel = unmappedLabel ?? `user-block:${String(block.type)}`;
       continue;
     }
-    const toolUseId = typeof block.tool_use_id === "string" ? block.tool_use_id : void 0;
-    const tool = toolUseId && correlation.toolNameByUseId.get(toolUseId) || "unknown";
-    const isError = block.is_error === true;
-    events.push({ type: "tool_result", tool, output: { content: block.content, isError } });
-    if (!isError && FILE_WRITING_TOOLS.has(tool)) {
+    if (!isAuthoritativeToolCallId(block.tool_use_id)) {
+      return { events: [], terminalFailure: missingToolCallIdFailure("tool_result") };
+    }
+    const tool = correlation.toolNameByUseId.get(block.tool_use_id) ?? "unknown";
+    const isError = typeof block.is_error === "boolean" ? block.is_error : void 0;
+    const event = {
+      type: "tool_result",
+      tool,
+      output: { content: block.content },
+      toolCallId: block.tool_use_id
+    };
+    if (isError !== void 0) event.isError = isError;
+    events.push(event);
+    if (isError === false && FILE_WRITING_TOOLS.has(tool)) {
       const artifact = tryBuildArtifactEvent(msg, options.workspaceDir);
       if (artifact) events.push(artifact);
     }
@@ -2082,9 +2247,16 @@ var ClaudeProcessClient = class {
       );
     }
   }
-  /** Immediate process-tree termination request. `dispose()` is the settlement receipt. */
+  /**
+   * Immediate process-tree termination request. `dispose()` is the settlement
+   * receipt, so this stays fire-and-forget: an interrupt must not block on a
+   * terminator. A request that could not be spawned is left unrecorded, so
+   * `dispose()` re-issues it and raises the typed `stage:'signal'` failure —
+   * swallowing it here loses nothing.
+   */
   kill() {
-    requestOwnedProcessTreeTermination(this.processTreeOptions());
+    void requestOwnedProcessTreeTermination(this.processTreeOptions()).catch(() => {
+    });
   }
   waitClosed() {
     return this.closedPromise;
@@ -2492,8 +2664,8 @@ var ClaudeSession = class {
             for (; ; ) {
               const buffered = pending.shift();
               if (buffered) return { value: buffered, done: false };
+              if (terminalFailure) throw terminalFailure;
               if (turnSettled) {
-                if (terminalFailure) throw terminalFailure;
                 return { value: void 0, done: true };
               }
               let raw;
@@ -2695,6 +2867,15 @@ function extractCodexUsageEvent(rawUsage) {
 function toNonNegativeInt2(value) {
   return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : void 0;
 }
+function requireToolCallId2(item) {
+  if (typeof item.id === "string" && item.id.trim().length > 0) return item.id;
+  throw new RuntimeExecutionFailure({
+    phase: "run",
+    category: "authority",
+    retry: "non-retryable",
+    reason: "codex tool item had no authoritative tool call id"
+  });
+}
 function mapItem(rawItem, phase, workspaceDir) {
   if (!rawItem || typeof rawItem !== "object") return [];
   const item = rawItem;
@@ -2705,9 +2886,10 @@ function mapItem(rawItem, phase, workspaceDir) {
       return typeof item.text === "string" ? [{ type: "progress", text: item.text }] : [];
     }
     case "command_execution": {
+      const toolCallId = requireToolCallId2(item);
       const command = typeof item.command === "string" ? item.command : void 0;
       if (phase === "started") {
-        return command !== void 0 ? [{ type: "tool_use", tool: "command_execution", input: { command } }] : [];
+        return command !== void 0 ? [{ type: "tool_use", tool: "command_execution", input: { command }, toolCallId }] : [];
       }
       return [
         {
@@ -2718,17 +2900,19 @@ function mapItem(rawItem, phase, workspaceDir) {
             aggregatedOutput: item.aggregated_output,
             exitCode: item.exit_code,
             status: item.status
-          }
+          },
+          toolCallId
         }
       ];
     }
     case "file_change": {
+      const toolCallId = requireToolCallId2(item);
       const changes = Array.isArray(item.changes) ? item.changes : [];
       if (phase === "started") {
-        return [{ type: "tool_use", tool: "file_change", input: { changes } }];
+        return [{ type: "tool_use", tool: "file_change", input: { changes }, toolCallId }];
       }
       return [
-        { type: "tool_result", tool: "file_change", output: { changes, status: item.status } },
+        { type: "tool_result", tool: "file_change", output: { changes, status: item.status }, toolCallId },
         ...extractArtifactEvents(changes, workspaceDir)
       ];
     }
@@ -2849,9 +3033,15 @@ var CodexProcessRunner = class {
    * cleanly resumable afterward via `codex exec resume` (no corruption from
    * killing mid-turn). `taskkill /T /F` on Windows, mirroring
    * `../pi/rpc-client.ts`'s own cross-platform convention.
+   *
+   * Fire-and-forget by design: an interrupt must not block on a terminator,
+   * and `dispose()` is the settlement receipt. A request that could not be
+   * spawned is left unrecorded, so `dispose()` re-issues it and raises the
+   * typed `stage:'signal'` failure — swallowing it here loses nothing.
    */
   kill() {
-    requestOwnedProcessTreeTermination(this.processTreeOptions());
+    void requestOwnedProcessTreeTermination(this.processTreeOptions()).catch(() => {
+    });
   }
   dispose() {
     if (!this.disposalAttempt) {
@@ -3145,7 +3335,15 @@ async function runCodexTurn(params) {
           }
           return;
         }
-        const mapped = mapCodexEventToAgentEvents(evt, params.workspaceDir);
+        let mapped;
+        try {
+          mapped = mapCodexEventToAgentEvents(evt, params.workspaceDir);
+        } catch (cause) {
+          if (!isRuntimeExecutionFailure(cause)) throw cause;
+          params.terminal.failure = cause;
+          params.queue.end();
+          return;
+        }
         for (const agentEvent of mapped) {
           if (agentEvent.type === "turn_end") turnEnded = true;
           params.queue.push(agentEvent);
@@ -4631,14 +4829,17 @@ function parseLooseEventsPollResponse(raw) {
   if (typeof raw !== "object" || raw === null) {
     throw new Error("events poll response is not an object");
   }
-  const { events, cursor } = raw;
+  const { events, cursor, capabilities } = raw;
   if (!Array.isArray(events)) {
     throw new Error("events poll response.events is not an array");
   }
   if (typeof cursor !== "number" || !Number.isInteger(cursor)) {
     throw new Error("events poll response.cursor is not an integer");
   }
-  return { events, cursor };
+  if (capabilities !== void 0 && (!Array.isArray(capabilities) || capabilities.some((flag) => typeof flag !== "string"))) {
+    throw new Error("events poll response.capabilities is not an array of strings");
+  }
+  return { events, cursor, capabilities: capabilities ?? [] };
 }
 function extractSkippableSeq(raw) {
   if (typeof raw !== "object" || raw === null) return void 0;
@@ -4718,12 +4919,14 @@ var LongPollClient = class {
         if (cursor !== void 0) url.searchParams.set("cursor", String(cursor));
         const res = await authedFetch(url, { method: "GET" }, this.opts.auth);
         if (!res.ok) {
+          this.opts.onServerCapabilities?.([]);
           this.opts.onOperationalOutcome?.("failure");
           const baseMs = this.opts.retryDelayMs ?? 2e3;
           await sleep(this.opts.retryDelayForAttempt?.(retryAttempt++, baseMs) ?? baseMs);
           continue;
         }
         const parsed = parseLooseEventsPollResponse(await res.json());
+        this.opts.onServerCapabilities?.(parsed.capabilities);
         let hadValidationFailureThisBatch = false;
         for (const raw of parsed.events) {
           let envelope;
@@ -4767,6 +4970,7 @@ var LongPollClient = class {
           this.opts.onOperationalOutcome?.("success");
         }
       } catch (err) {
+        this.opts.onServerCapabilities?.([]);
         if (err instanceof DeviceRevokedError) {
           this.running = false;
           this.opts.onRevoked?.();
@@ -5002,6 +5206,9 @@ var ConnectionManager = class {
       // re-attempted.
       getCursor: () => this.dedupWatermark(),
       onEnvelope: (envelope) => this.deliver(envelope),
+      onServerCapabilities: (capabilities) => {
+        if (this.mode === "long-poll") this.serverCapabilities = capabilities;
+      },
       onRevoked: () => this.enterRevoked(),
       // M4 Phase 4 (version-negotiation drill fix): a batch entry
       // LongPollClient couldn't parse into a known Envelope at all (an
@@ -5133,25 +5340,24 @@ var ConnectionManager = class {
    */
   cancelPendingDrainRetry;
   /**
-   * The capabilities the CURRENTLY connected server advertised in its
-   * `conn.ack` — untyped `string[]` (forward-compat: a server may advertise
-   * a flag this build doesn't recognize yet), populated by {@link onAcked}
-   * and read by {@link getServerCapabilities}. Empty until the very first
-   * successful handshake.
+   * The capabilities the CURRENT transport's server advertised — untyped
+   * `string[]` for forward compatibility. WS populates it from `conn.ack`;
+   * long-poll populates it from each successful events response. Empty until
+   * the active transport supplies an advertisement.
    *
    * Finding R2 (cross-model re-review — was P1): strictly PER-CONNECTION,
    * not per-daemon-lifetime. Cleared to `[]` the instant the acked WS
    * connection ends for ANY reason — an ordinary disconnect (`onWsOutcome`'s
    * `acked` branch), `stop()`, or a transport switch to long-poll
-   * (`enterLongPoll`) — and only ever repopulated by a FRESH `conn.ack`.
+   * (`enterLongPoll`) — and only repopulated by a fresh advertisement from
+   * the transport that is still current.
    * The previous version of this doc comment claimed long-poll mode simply
    * "stays at whatever the last real WS `conn.ack` said" — that was the bug:
    * a daemon that once learned e.g. `approval_resolved` from an earlier WS
    * session kept believing it applied to whatever it's connected to NOW,
    * even after a disconnect/degrade where nothing has actually confirmed
    * that's still true (a reconnect could land on a DIFFERENT server behind a
-   * load balancer; long-poll fallback itself never performs an equivalent
-   * handshake at all). Concretely, `TaskRunner.sendApprovalResolved` gates
+   * load balancer). Concretely, `TaskRunner.sendApprovalResolved` gates
    * `task.approval_resolved` on this list — sending it to a server that
    * doesn't actually understand it over the long-poll path would get a
    * batch-level 400 from `MessagesSendRequestSchema` (protocol §8.2), which
@@ -5271,13 +5477,10 @@ var ConnectionManager = class {
     return this.mode === "long-poll";
   }
   /**
-   * The capabilities the CURRENTLY connected server advertised in its
-   * `conn.ack` — e.g. lets a caller gate a daemon->server message on whether
-   * THIS server understands it before sending (see `task-runner.ts`'s
-   * `sendApprovalResolved`, gated on `approval_resolved`). Empty before the
-   * first handshake completes, AND (finding R2) once again empty after any
-   * disconnect/degrade — see `serverCapabilities`'s own doc comment for why
-   * this is strictly per-connection rather than "sticky" across one.
+   * The capabilities the CURRENT transport's server advertised: from
+   * `conn.ack` on WS, or the latest successful `GET /byok/events` response
+   * on long-poll. Empty before either transport has supplied its current
+   * advertisement, and cleared across disconnect/switch boundaries.
    */
   getServerCapabilities() {
     return this.serverCapabilities;
@@ -9647,9 +9850,9 @@ var TaskRunner = class {
   /**
    * Whether the CURRENTLY connected server advertised `result-document` —
    * read fresh on every call, never captured, because the answer changes
-   * across a reconnect (`ConnectionManager.getServerCapabilities` returns
-   * `[]` from the moment an acked connection closes until a fresh
-   * `conn.ack` repopulates it). An absent `getServerCapabilities` seam is
+   * across a reconnect or transport switch (`ConnectionManager` clears the
+   * old advertisement at the boundary, then repopulates it from a fresh WS
+   * ack or successful poll response). An absent `getServerCapabilities` seam is
    * "no capabilities", the fail-closed reading.
    */
   hasResultDocumentCapability() {