@agentproto/runtime 5.13.0 → 5.15.0

package/dist/index.mjs

@@ -7,7 +7,7 @@ import { ensureChromeDevtoolsMcp, resolveChrome, buildHeadlessBrowserMcpEntry, h
 import { selectPricingTier, getModelProvider, resolveContextWindow, formatTokens, splitContextWindowHint, resolvePricing, LLM_PRICING_CATALOG, resolvePricingExact, MODEL_ALIASES, isKnownLlmId } from '@agentproto/model-catalog/llm';
 import { resolveCustomRoute, registerCustomRoute, tryParseModelRef, resolveLlmModelRoute, formatModelRef, stripRouteSuffix, stripFixedNativeVendor } from '@agentproto/model-catalog/route-identity';
 import { randomBytes, createHmac, randomUUID, timingSafeEqual, createHash } from 'crypto';
-import { createReadStream, promises, readFileSync, mkdirSync, writeFileSync, renameSync, readdirSync, openSync, fstatSync, readSync, closeSync, existsSync, statSync, mkdtempSync, chmodSync, realpathSync, cpSync, appendFileSync, createWriteStream } from 'fs';
+import { createReadStream, promises, readFileSync, mkdirSync, writeFileSync, renameSync, readdirSync, openSync, fstatSync, readSync, closeSync, existsSync, statSync, mkdtempSync, chmodSync, writeSync, fsyncSync, unlinkSync, realpathSync, cpSync, appendFileSync, createWriteStream } from 'fs';
 import { createInterface } from 'readline';
 import * as providers_store_star from '@agentproto/providers-store';
 import { findAnthropicGatewayPreset, anthropicGatewayPresetList, getAnthropicGatewayPreset } from '@agentproto/provider-presets';
@@ -16,7 +16,7 @@ import { z, ZodError } from 'zod';
 import { listAuthProfiles, eligibleProfiles, getAuthProfile, createAuthProfile, AuthProfileValidationError, deleteAuthProfile, updateAuthProfile, KeychainStore, removeAuthProfile, addAuthProfile, setAuthProfileEnabled, setAuthProfileModels, refreshAuthProfileModels, credentialIdentity } from '@agentproto/auth';
 import { CatalogProviderSchema, getModelsByProvider, getStaticModelProvider } from '@agentproto/model-catalog';
 import { resolvePairPageUrl, DEFAULT_PAIR_PAGE } from '@agentproto/secrets/pairing/browser';
-import { ListToolsRequestSchema, CallToolRequestSchema, SUPPORTED_PROTOCOL_VERSIONS, LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/sdk/types.js';
+import { ListToolsRequestSchema, CallToolRequestSchema, McpError, ErrorCode, SUPPORTED_PROTOCOL_VERSIONS, LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/sdk/types.js';
 import { makeCredsStore, makeAdapterResolver, makeAdapterLister, discoverAdapterPackages, makeSetupLedger, makeListTool, makeSetupTool } from '@agentproto/provider-kit';
 import { syncPiModels, getConfiguredEndpoints, checkHarnessFit, connectorById } from '@agentproto/llm-endpoint';
 import { createServer, request as request$1 } from 'http';
@@ -38,6 +38,7 @@ import { createBrainManager, parseKnowledgeConfig } from '@agentproto/workspace-
 import { browserAdapters, getBrowserAdapter } from '@agentproto/adapter-browser';
 import { defineHttpDriver } from '@agentproto/driver-http';
 import matter2 from 'gray-matter';
+import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { WebSocketServer } from 'ws';
@@ -48,8 +49,8 @@ import { createReconnectLogGate } from '@agentproto/pairing-host';
 export { createReconnectLogGate } from '@agentproto/pairing-host';
 import { loadAppBundledTools, loadAppHandle, peekAppUi, unpackApp, safeId, versionSatisfies } from '@agentproto/app-kit';
 import { loadAgent } from '@agentproto/agent';
-import { normalizeToolId } from '@agentproto/driver';
-import { compileWorkflow, runWorkflow, isCompilableJsonSchema, validateAgainstJsonSchema, validateWorkflowInput, buildAgentStep, StepOutcomeError, MissingArtifactError } from '@agentproto/workflow-runtime';
+import { normalizeToolId, runTool } from '@agentproto/driver';
+import { compileWorkflow, runWorkflow, isCompilableJsonSchema, validateAgainstJsonSchema, validateWorkflowInput, buildAgentStep, AgentSessionLostError, StepOutcomeError, MissingArtifactError } from '@agentproto/workflow-runtime';
 import { loadWorkflowHandle } from '@agentproto/workflow-loader';
 import { Cron } from 'croner';
 import { brotliCompressSync, constants, gzipSync } from 'zlib';
@@ -145,15 +146,15 @@ function hasMarker(command, marker) {
   return false;
 }
 function listProcesses() {
-  return new Promise((resolve45) => {
+  return new Promise((resolve47) => {
     execFile("ps", ["-axo", "pid=,command="], { maxBuffer: 32 * 1024 * 1024 }, (err, stdout) => {
-      if (err) return resolve45([]);
+      if (err) return resolve47([]);
       const out = [];
       for (const line of stdout.split("\n")) {
         const m = line.match(/^\s*(\d+)\s+(.*)$/);
         if (m) out.push({ pid: Number(m[1]), command: m[2] ?? "" });
       }
-      resolve45(out);
+      resolve47(out);
     });
   });
 }
@@ -523,7 +524,7 @@ function resolveSessionPricing(model) {
 function tokenCost(tokens, pricePer1M) {
   return tokens === void 0 ? 0 : tokens * pricePer1M / 1e6;
 }
-function deriveSessionUsage(input, resolve45 = defaultResolver) {
+function deriveSessionUsage(input, resolve47 = defaultResolver) {
   const contextUsed = plausibleContextUsed(input.contextSize, input.contextUsed);
   const base = {
     ...input.model !== void 0 ? { model: input.model } : {},
@@ -538,7 +539,7 @@ function deriveSessionUsage(input, resolve45 = defaultResolver) {
   }
   const hasTokens = input.tokensIn !== void 0 || input.tokensOut !== void 0 || input.cacheReadTokens !== void 0 || input.cacheWriteTokens !== void 0;
   if (hasTokens) {
-    const basePricing = input.model !== void 0 ? resolve45(input.model) : void 0;
+    const basePricing = input.model !== void 0 ? resolve47(input.model) : void 0;
     if (!basePricing) {
       return { ...base, source: "no-pricing" };
     }
@@ -1045,8 +1046,8 @@ function createTranscriptWriter(opts) {
       const state = states.get(sessionId);
       if (!state) return Promise.resolve();
       flushBuffers(sessionId, state);
-      return new Promise((resolve45) => {
-        state.stream.write("", () => resolve45());
+      return new Promise((resolve47) => {
+        state.stream.write("", () => resolve47());
       });
     },
     close(sessionId) {
@@ -1054,8 +1055,8 @@ function createTranscriptWriter(opts) {
       if (!state) return Promise.resolve();
       flushBuffers(sessionId, state);
       states.delete(sessionId);
-      return new Promise((resolve45) => {
-        state.stream.end(() => resolve45());
+      return new Promise((resolve47) => {
+        state.stream.end(() => resolve47());
       });
     },
     closeAll() {
@@ -1064,7 +1065,7 @@ function createTranscriptWriter(opts) {
         const state = states.get(sessionId);
         if (!state) continue;
         flushBuffers(sessionId, state);
-        closings.push(new Promise((resolve45) => state.stream.end(() => resolve45())));
+        closings.push(new Promise((resolve47) => state.stream.end(() => resolve47())));
       }
       states.clear();
       return Promise.all(closings).then(() => void 0);
@@ -1225,9 +1226,9 @@ async function exportClaudeCodeSession(adapterSessionId, cwd, configDir) {
   let stream;
   try {
     stream = createReadStream(filePath, { encoding: "utf8" });
-    await new Promise((resolve45, reject) => {
+    await new Promise((resolve47, reject) => {
       stream.once("error", reject);
-      stream.once("open", resolve45);
+      stream.once("open", resolve47);
     });
   } catch (err) {
     const code = err.code;
@@ -1501,7 +1502,7 @@ async function discoverHermesSessions(cwd, since, expectedId) {
 }
 async function defaultHermesRunner(adapterSessionId) {
   const { spawn: spawn8 } = await import('child_process');
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     const chunks = [];
     const errChunks = [];
     const proc = spawn8(
@@ -1520,7 +1521,7 @@ async function defaultHermesRunner(adapterSessionId) {
           )
         );
       } else {
-        resolve45(Buffer.concat(chunks).toString("utf8"));
+        resolve47(Buffer.concat(chunks).toString("utf8"));
       }
     });
   });
@@ -1557,9 +1558,9 @@ async function exportDaemonEventsSession(sessionId, desc, baseDir) {
   let stream;
   try {
     stream = createReadStream(filePath, { encoding: "utf8" });
-    await new Promise((resolve45, reject) => {
+    await new Promise((resolve47, reject) => {
       stream.once("error", reject);
-      stream.once("open", resolve45);
+      stream.once("open", resolve47);
     });
   } catch (err) {
     const code = err.code;
@@ -1781,7 +1782,11 @@ async function readFirstJsonLine(path) {
 function codexHome() {
   return process.env.CODEX_HOME ?? join(homedir(), ".codex");
 }
-function codexSessionsDir() {
+function codexSessionsDir(configDir) {
+  if (configDir) {
+    const isolated = join(configDir, "sessions");
+    if (existsSync(isolated)) return isolated;
+  }
   return join(codexHome(), "sessions");
 }
 async function walkCodexRollouts(dir) {
@@ -1816,8 +1821,8 @@ function codexBlocksText(content) {
   }
   return acc;
 }
-async function findCodexRolloutFile(conversationId) {
-  const files = await walkCodexRollouts(codexSessionsDir());
+async function findCodexRolloutFile(conversationId, configDir) {
+  const files = await walkCodexRollouts(codexSessionsDir(configDir));
   const byName = files.find((f) => f.endsWith(`-${conversationId}.jsonl`));
   if (byName) return byName;
   for (const f of files) {
@@ -1834,11 +1839,11 @@ async function findCodexRolloutFile(conversationId) {
   }
   return void 0;
 }
-async function exportCodexSession(conversationId) {
-  const file = await findCodexRolloutFile(conversationId);
+async function exportCodexSession(conversationId, configDir) {
+  const file = await findCodexRolloutFile(conversationId, configDir);
   if (!file) {
     throw new Error(
-      `codex: no rollout file for conversation "${conversationId}" under ${codexSessionsDir()}.
+      `codex: no rollout file for conversation "${conversationId}" under ${codexSessionsDir(configDir)}.
 The session may predate persistence, or CODEX_HOME points elsewhere.`
     );
   }
@@ -2488,7 +2493,7 @@ var init_transcript_export = __esm({
         exportSession: (id) => exportHermesSession(id)
       },
       codex: {
-        exportSession: (id) => exportCodexSession(id)
+        exportSession: (id, _cwd, configDir) => exportCodexSession(id, configDir)
       },
       opencode: {
         exportSession: (id) => exportOpenCodeSession(id)
@@ -3907,8 +3912,8 @@ async function enrichWithRemainingQuota(rollup, opts) {
     })
   );
   const capMs = opts.timeoutMs ?? DEFAULT_ENRICH_CAP_MS;
-  const cap = new Promise((resolve45) => {
-    setTimeout(() => resolve45(null), capMs);
+  const cap = new Promise((resolve47) => {
+    setTimeout(() => resolve47(null), capMs);
   });
   const settled = await Promise.race([work, cap]);
   if (settled === null) return rollup;
@@ -3972,8 +3977,8 @@ async function enrichWithAccountCredits(rollup, opts) {
     })
   );
   const capMs = opts.timeoutMs ?? DEFAULT_ENRICH_CAP_MS;
-  const cap = new Promise((resolve45) => {
-    setTimeout(() => resolve45(null), capMs);
+  const cap = new Promise((resolve47) => {
+    setTimeout(() => resolve47(null), capMs);
   });
   const settled = await Promise.race([work, cap]);
   if (settled === null) return rollup;
@@ -4228,14 +4233,14 @@ function parseProcStat(statLine, cmdline, uid, ctx) {
   };
 }
 function execPs(platform, timeoutMs) {
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     execFile(
       "ps",
       psArgs(platform),
       // LC_ALL=C pins the decimal separator of `pcpu` to `.` regardless of the
       // operator's locale.
       { maxBuffer: 32 * 1024 * 1024, timeout: timeoutMs, env: { ...process.env, LC_ALL: "C" } },
-      (err, stdout) => err ? reject(new Error(`ps failed${err.killed ? " (timed out, host overloaded?)" : ""}: ${err.message.trim()}`)) : resolve45(stdout)
+      (err, stdout) => err ? reject(new Error(`ps failed${err.killed ? " (timed out, host overloaded?)" : ""}: ${err.message.trim()}`)) : resolve47(stdout)
     );
   });
 }
@@ -4539,8 +4544,8 @@ function parseVmStatAvailable(text13) {
   return total * Number(size[1]);
 }
 function execText(cmd, args) {
-  return new Promise((resolve45, reject) => {
-    execFile(cmd, args, { timeout: 3e3 }, (err, stdout) => err ? reject(err) : resolve45(stdout));
+  return new Promise((resolve47, reject) => {
+    execFile(cmd, args, { timeout: 3e3 }, (err, stdout) => err ? reject(err) : resolve47(stdout));
   });
 }
 function createProcessStatsService(opts = {}) {
@@ -4566,14 +4571,14 @@ function createProcessStatsService(opts = {}) {
       nowMs: now()
     }).claimedPids;
     const byPid = new Map(rows.map((r) => [r.pid, r]));
-    const keyOf2 = (pid) => `${pid}:${Math.floor((now() - (byPid.get(pid)?.elapsedSec ?? 0) * 1e3) / 2e3)}`;
+    const keyOf3 = (pid) => `${pid}:${Math.floor((now() - (byPid.get(pid)?.elapsedSec ?? 0) * 1e3) / 2e3)}`;
     const candidates = strayEnvCandidates(rows, claimed, uid);
-    const unread = candidates.filter((p) => !envMemo.has(keyOf2(p)));
+    const unread = candidates.filter((p) => !envMemo.has(keyOf3(p)));
     const read = await readEnv(unread);
-    for (const p of unread) envMemo.set(keyOf2(p), read.get(p) ?? null);
+    for (const p of unread) envMemo.set(keyOf3(p), read.get(p) ?? null);
     const envHints = /* @__PURE__ */ new Map();
     for (const p of candidates) {
-      const h = envMemo.get(keyOf2(p));
+      const h = envMemo.get(keyOf3(p));
       if (h) envHints.set(p, h);
     }
     if (envMemo.size > 4096) envMemo.clear();
@@ -5419,9 +5424,9 @@ async function readFirstTurn(sessionId) {
   let stream;
   try {
     stream = createReadStream(sessionEventsPath(sessionId), { encoding: "utf8" });
-    await new Promise((resolve45, reject) => {
+    await new Promise((resolve47, reject) => {
       stream.once("error", reject);
-      stream.once("open", resolve45);
+      stream.once("open", resolve47);
     });
   } catch {
     return null;
@@ -8935,7 +8940,7 @@ function boundaryMeta(b) {
   return { [APP_BOUNDARY_META_KEY]: encodeAppBoundary(b) };
 }
 function inAny(canon, zones) {
-  return zones.some((z61) => isPathWithin(canon, canonicalizePath(z61)));
+  return zones.some((z62) => isPathWithin(canon, canonicalizePath(z62)));
 }
 function resolveBoundaryPath(b, input, mode) {
   if (typeof input !== "string" || input.length === 0) {
@@ -9271,7 +9276,7 @@ async function* pollAgentOutputFallback(host, remoteSessionId, since) {
             `sandbox proxy: ${consecutivePollFailures} consecutive poll failures against the box daemon (session "${remoteSessionId}") \u2014 giving up. Last error: ${pollErr instanceof Error ? pollErr.message : String(pollErr)}`
           );
         }
-        await new Promise((resolve45) => setTimeout(resolve45, POLL_RETRY_DELAY_MS));
+        await new Promise((resolve47) => setTimeout(resolve47, POLL_RETRY_DELAY_MS));
         continue;
       }
       if (result.timedOut) continue;
@@ -9506,19 +9511,19 @@ async function startDeviceSandboxBridge(opts) {
     }
   }
   const port = await getFreePort();
-  await new Promise((resolve45, reject) => {
+  await new Promise((resolve47, reject) => {
     server.once("error", reject);
-    server.listen(port, "127.0.0.1", () => resolve45());
+    server.listen(port, "127.0.0.1", () => resolve47());
   });
   return {
     mcpUrl: `http://127.0.0.1:${port}/mcp`,
     async close() {
-      await new Promise((resolve45) => server.close(() => resolve45()));
+      await new Promise((resolve47) => server.close(() => resolve47()));
     }
   };
 }
 async function getFreePort() {
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     const srv = createServer$1();
     srv.once("error", reject);
     srv.listen(0, "127.0.0.1", () => {
@@ -9528,7 +9533,7 @@ async function getFreePort() {
         return;
       }
       const { port } = address;
-      srv.close(() => resolve45(port));
+      srv.close(() => resolve47(port));
     });
   });
 }
@@ -9673,7 +9678,7 @@ async function pollServeReady(url, opts) {
   for (; ; ) {
     if (await probe(url)) return true;
     if (Date.now() >= deadline) return false;
-    await new Promise((resolve45) => setTimeout(resolve45, intervalMs));
+    await new Promise((resolve47) => setTimeout(resolve47, intervalMs));
   }
 }
 async function seedAllowlist(client) {
@@ -9798,7 +9803,7 @@ var init_sandbox_app_serve = __esm({
   }
 });
 async function getFreePort2() {
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     const srv = createServer$1();
     srv.once("error", reject);
     srv.listen(0, "127.0.0.1", () => {
@@ -9808,7 +9813,7 @@ async function getFreePort2() {
         return;
       }
       const { port } = address;
-      srv.close(() => resolve45(port));
+      srv.close(() => resolve47(port));
     });
   });
 }
@@ -9821,7 +9826,7 @@ async function probeHealth(url, timeoutMs) {
     } catch {
     }
     if (Date.now() >= deadline) return false;
-    await new Promise((resolve45) => setTimeout(resolve45, POLL_INTERVAL_MS));
+    await new Promise((resolve47) => setTimeout(resolve47, POLL_INTERVAL_MS));
   }
 }
 var HEALTH_TIMEOUT_MS, POLL_INTERVAL_MS, localSandboxProvider;
@@ -11398,8 +11403,8 @@ async function spawnAgentSession(deps2, input) {
     }
     let resolveClaim;
     claims.set(key, {
-      result: new Promise((resolve45) => {
-        resolveClaim = resolve45;
+      result: new Promise((resolve47) => {
+        resolveClaim = resolve47;
       }),
       // An implicit claim expires sooner than an explicit one — see
       // `IMPLICIT_SPAWN_CLAIM_WINDOW_MS`'s docblock.
@@ -11958,13 +11963,13 @@ async function isSharedDirtyCwd(cwd) {
   const identity = resolveWorktreeIdentity(cwd);
   if (identity?.worktreeId !== void 0) return false;
   const { spawn: spawn8 } = await import('child_process');
-  return await new Promise((resolve45) => {
+  return await new Promise((resolve47) => {
     let stdout = "";
     let settled = false;
     const done = (v) => {
       if (!settled) {
         settled = true;
-        resolve45(v);
+        resolve47(v);
       }
     };
     const child = spawn8("git", ["-C", cwd, "status", "--porcelain"], {
@@ -11979,15 +11984,15 @@ async function isSharedDirtyCwd(cwd) {
 }
 async function resolveMcpCredentialHeaders(mcpServers) {
   if (!mcpServers || mcpServers.length === 0) return mcpServers;
-  const { resolveMcpCredentialHeaders: resolve45 } = getMcpCredentialDeps();
-  if (!resolve45) return mcpServers;
+  const { resolveMcpCredentialHeaders: resolve47 } = getMcpCredentialDeps();
+  if (!resolve47) return mcpServers;
   return Promise.all(
     mcpServers.map(async (entry) => {
       const ref = entry.credentialRef;
       if (!ref) return entry;
       let brokered;
       try {
-        brokered = await resolve45({ credentialRef: ref });
+        brokered = await resolve47({ credentialRef: ref });
       } catch (err) {
         console.warn(
           `[agent_start] credentialRef resolution failed for "${entry.name}" (${ref}): ${err instanceof Error ? err.message : String(err)}`
@@ -12083,7 +12088,7 @@ async function startDeviceSessionWithRetry(host, args, target) {
       lastErr = err;
       if (!isDeviceTransportError(err)) throw err;
       if (attempt < attempts) {
-        await new Promise((resolve45) => setTimeout(resolve45, DEVICE_SPAWN_RETRY_DELAY_MS));
+        await new Promise((resolve47) => setTimeout(resolve47, DEVICE_SPAWN_RETRY_DELAY_MS));
       }
     }
   }
@@ -12335,10 +12340,10 @@ function markFailedBootLedger(opts) {
   }
 }
 async function resolveSandboxSecret(slug) {
-  const { resolveSandboxSecret: resolve45 } = getMcpCredentialDeps();
-  if (!resolve45) return null;
+  const { resolveSandboxSecret: resolve47 } = getMcpCredentialDeps();
+  if (!resolve47) return null;
   try {
-    return await resolve45(slug);
+    return await resolve47(slug);
   } catch (err) {
     console.warn(
       `[agent_start] sandbox secret resolution failed for "${slug}": ${err instanceof Error ? err.message : String(err)}`
@@ -13044,8 +13049,8 @@ async function readLogTailSafe(dir, n) {
 async function resolveAppUiBuildState(input) {
   const { dir, uiPath } = input;
   const pending = peekInFlightBuild(uiPath) ?? ensureAppUiBuilt(input);
-  const timeout = new Promise((resolve45) => {
-    const timer = setTimeout(() => resolve45(RESOLVE_TIMEOUT), RESOLVE_FAST_PATH_MS);
+  const timeout = new Promise((resolve47) => {
+    const timer = setTimeout(() => resolve47(RESOLVE_TIMEOUT), RESOLVE_FAST_PATH_MS);
     timer.unref();
   });
   const raced = await Promise.race([pending, timeout]);
@@ -16402,8 +16407,8 @@ function createTerminalTranscriptWriter(opts) {
       const stream = streams.get(sessionId);
       if (!stream) return Promise.resolve();
       streams.delete(sessionId);
-      return new Promise((resolve45) => {
-        stream.end(() => resolve45());
+      return new Promise((resolve47) => {
+        stream.end(() => resolve47());
       });
     },
     closeAll() {
@@ -16412,8 +16417,8 @@ function createTerminalTranscriptWriter(opts) {
         const stream = streams.get(sessionId);
         if (!stream) continue;
         closings.push(
-          new Promise((resolve45) => {
-            stream.end(() => resolve45());
+          new Promise((resolve47) => {
+            stream.end(() => resolve47());
           })
         );
       }
@@ -16860,8 +16865,8 @@ function createRegistryHandoffAsker(registry, desc, baseDir) {
     const turn = registry.sendPrompt(sessionId, prompt, { source: HANDOFF_PROMPT_SOURCE });
     let timer;
     const timedOut = /* @__PURE__ */ Symbol("timeout");
-    const deadline = new Promise((resolve45) => {
-      timer = setTimeout(() => resolve45(timedOut), timeoutMs);
+    const deadline = new Promise((resolve47) => {
+      timer = setTimeout(() => resolve47(timedOut), timeoutMs);
     });
     try {
       const outcome = await Promise.race([turn, deadline]);
@@ -16876,7 +16881,7 @@ function createRegistryHandoffAsker(registry, desc, baseDir) {
     for (let attempt = 0; attempt < REPLY_POLL_ATTEMPTS; attempt++) {
       const reply = readLastAssistantTextSync(eventsPath2);
       if (reply && reply !== before) return reply;
-      await new Promise((resolve45) => setTimeout(resolve45, REPLY_POLL_MS));
+      await new Promise((resolve47) => setTimeout(resolve47, REPLY_POLL_MS));
     }
     throw new Error("source session produced no reply");
   };
@@ -16980,14 +16985,14 @@ function buildRecentDigest(messages) {
 }
 async function captureGitStatus(cwd) {
   if (!cwd) return void 0;
-  return new Promise((resolve45) => {
+  return new Promise((resolve47) => {
     execFile("git", ["status", "--porcelain"], { cwd }, (err, stdout) => {
       if (err) {
-        resolve45(void 0);
+        resolve47(void 0);
         return;
       }
       const trimmed = stdout.trim();
-      resolve45(trimmed || "(working tree clean)");
+      resolve47(trimmed || "(working tree clean)");
     });
   });
 }
@@ -19135,11 +19140,11 @@ function createSessionsRegistry(opts) {
   };
   const waitForTurnSettled = (rt, id, caller) => {
     if (!rt.busy) return Promise.resolve();
-    return new Promise((resolve45, reject) => {
+    return new Promise((resolve47, reject) => {
       const onBusy = (busy) => {
         if (busy) return;
         cleanup();
-        resolve45();
+        resolve47();
       };
       const cleanup = () => {
         clearTimeout(timer);
@@ -19217,9 +19222,9 @@ function createSessionsRegistry(opts) {
           );
           return;
         }
-        const answer = isChildPromptSource(next.source) ? void 0 : matchStructuredQuestionAnswer(liveRt, next.message);
-        if (answer) {
-          await answerStructuredQuestion(liveRt, answer);
+        const answer2 = isChildPromptSource(next.source) ? void 0 : matchStructuredQuestionAnswer(liveRt, next.message);
+        if (answer2) {
+          await answerStructuredQuestion(liveRt, answer2);
           return;
         }
         await runAgentTurn(
@@ -23034,14 +23039,14 @@ var init_pr_provenance_stamp = __esm({
     init_pr_provenance();
     defaultGhRunner = async (args, cwd) => {
       const { spawn: spawn8 } = await import('child_process');
-      return await new Promise((resolve45) => {
+      return await new Promise((resolve47) => {
         let stdout = "";
         const child = spawn8("gh", [...args], { cwd, shell: false });
         child.stdout?.on("data", (d) => {
           stdout += d.toString("utf8");
         });
-        child.on("error", () => resolve45({ exitCode: 1, stdout }));
-        child.on("close", (code) => resolve45({ exitCode: code ?? 1, stdout }));
+        child.on("error", () => resolve47({ exitCode: 1, stdout }));
+        child.on("close", (code) => resolve47({ exitCode: code ?? 1, stdout }));
       });
     };
   }
@@ -23575,6 +23580,19 @@ var init_command_tools = __esm({
   }
 });
 
+// src/liveness-tick-guard.ts
+function createLivenessTickGuard(intervalMs, graceMs, now = Date.now) {
+  let last = now();
+  return {
+    shouldSkip() {
+      const t = now();
+      const late = t - last - intervalMs;
+      last = t;
+      return late > graceMs;
+    }
+  };
+}
+
 // src/index.ts
 init_browser_mount();
 async function writeRuntimeMeta(workspace, meta) {
@@ -25319,10 +25337,10 @@ function sandboxAuthForBox(auth) {
   };
 }
 async function resolveSandboxSecretFromBroker(slug) {
-  const { resolveSandboxSecret: resolve45 } = getMcpCredentialDeps();
-  if (!resolve45) return null;
+  const { resolveSandboxSecret: resolve47 } = getMcpCredentialDeps();
+  if (!resolve47) return null;
   try {
-    return await resolve45(slug);
+    return await resolve47(slug);
   } catch (err) {
     console.warn(
       `[restartAgentSession] sandbox secret resolution failed for "${slug}": ${err instanceof Error ? err.message : String(err)}`
@@ -25916,6 +25934,12 @@ function createMcpObservationStore(opts = {}) {
       const obs = touch(sessionId);
       obs.httpError = { at: obs.lastSeenAt, status };
     },
+    recordResult(sessionId, method, message, clientProtocolVersion) {
+      try {
+        record2(sessionId, method, message, clientProtocolVersion);
+      } catch {
+      }
+    },
     get: (sessionId) => bySession.get(sessionId),
     delete: (sessionId) => {
       bySession.delete(sessionId);
@@ -26240,7 +26264,7 @@ async function runContinueOnBootPass(opts) {
 
 // src/session-tools.ts
 init_session_outcome();
-var defaultPsExecutor = () => new Promise((resolve45, reject) => {
+var defaultPsExecutor = () => new Promise((resolve47, reject) => {
   if (process.platform === "win32") {
     reject(new Error("processTreeRss: ps is not available on win32"));
     return;
@@ -26251,7 +26275,7 @@ var defaultPsExecutor = () => new Promise((resolve45, reject) => {
     { maxBuffer: 16 * 1024 * 1024 },
     (err, stdout) => {
       if (err) reject(err);
-      else resolve45(stdout);
+      else resolve47(stdout);
     }
   );
 });
@@ -26304,6 +26328,163 @@ async function processTreeRss(rootPids, exec = defaultPsExecutor) {
   }
   return result;
 }
+var SessionListFilterError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SessionListFilterError";
+  }
+};
+var SESSION_LIST_FILTER_KEYS = [
+  "q",
+  "excludeLabelPrefix",
+  "excludeLabels",
+  "excludeKinds",
+  "rootOnly",
+  "parentSessionId",
+  "updatedSince",
+  "startedSince",
+  "excludeNoise"
+];
+function pickSessionListFilters(input) {
+  const out = {};
+  for (const key of SESSION_LIST_FILTER_KEYS) {
+    if (input[key] !== void 0) out[key] = input[key];
+  }
+  return out;
+}
+var TIME_UNIT_MS = {
+  s: 1e3,
+  m: 6e4,
+  h: 36e5,
+  d: 864e5,
+  w: 6048e5
+};
+var RELATIVE_RE = /^(\d+(?:\.\d+)?)\s*([smhdw])$/i;
+function parseTimeBound(raw, field, now = Date.now()) {
+  const text13 = raw.trim();
+  const rel = RELATIVE_RE.exec(text13);
+  if (rel) {
+    const n = Number(rel[1]);
+    const unit = TIME_UNIT_MS[rel[2].toLowerCase()];
+    return now - n * unit;
+  }
+  const abs = text13 === "" ? Number.NaN : Date.parse(text13);
+  if (Number.isNaN(abs)) {
+    throw new SessionListFilterError(
+      `${field} must be an ISO-8601 time or a relative age like "30m", "24h", "7d", "2w"; got ${JSON.stringify(raw)}.`
+    );
+  }
+  return abs;
+}
+function toList(v) {
+  if (v === void 0) return [];
+  const parts = typeof v === "string" ? [v] : [...v];
+  return parts.flatMap((p) => p.split(",")).map((s) => s.trim()).filter((s) => s.length > 0);
+}
+var REVIEW_LABEL_PREFIX = "review:";
+var WORKFLOW_LABEL_PREFIX = "wf:";
+var NOISE_ORIGINS = /* @__PURE__ */ new Set(["review", "workflow"]);
+function isNoiseSession(s) {
+  const label = s.label ?? "";
+  if (label.startsWith(REVIEW_LABEL_PREFIX) || label.startsWith(WORKFLOW_LABEL_PREFIX)) return true;
+  if (s.origin !== void 0 && NOISE_ORIGINS.has(s.origin)) return true;
+  const ended = s.status === "exited" || s.status === "killed";
+  if (ended && (s.kind === "command" || s.kind === "terminal" && !s.adapterSlug)) return true;
+  return false;
+}
+function sessionActivityMs(s) {
+  const ms = Date.parse(s.lastActivityAt ?? s.startedAt);
+  return Number.isNaN(ms) ? 0 : ms;
+}
+function sortNewestActivityFirst(rows) {
+  return [...rows].sort((a, b) => sessionActivityMs(b) - sessionActivityMs(a) || a.id.localeCompare(b.id));
+}
+function hasSessionListFilters(input) {
+  return input.q !== void 0 && input.q.trim() !== "" || toList(input.excludeLabelPrefix).length > 0 || toList(input.excludeLabels).length > 0 || toList(input.excludeKinds).length > 0 || input.rootOnly === true || input.parentSessionId !== void 0 && input.parentSessionId !== "" || input.updatedSince !== void 0 && input.updatedSince.trim() !== "" || input.startedSince !== void 0 && input.startedSince.trim() !== "" || input.excludeNoise === true;
+}
+function compileSessionListFilters(input, now = Date.now()) {
+  const q = input.q?.trim().toLowerCase() ?? "";
+  const prefixes = toList(input.excludeLabelPrefix);
+  const labels = new Set(toList(input.excludeLabels));
+  const kinds = new Set(toList(input.excludeKinds));
+  const parentId = input.parentSessionId && input.parentSessionId !== "" ? input.parentSessionId : void 0;
+  const updatedSince = input.updatedSince && input.updatedSince.trim() !== "" ? parseTimeBound(input.updatedSince, "updatedSince", now) : void 0;
+  const startedSince = input.startedSince && input.startedSince.trim() !== "" ? parseTimeBound(input.startedSince, "startedSince", now) : void 0;
+  return (s) => {
+    if (q) {
+      const hit = [s.id, s.name, s.label, s.title, s.cwd].some((f) => f !== void 0 && f.toLowerCase().includes(q));
+      if (!hit) return false;
+    }
+    if (kinds.has(s.kind)) return false;
+    const label = s.label;
+    if (label !== void 0) {
+      if (labels.has(label)) return false;
+      if (prefixes.some((p) => label.startsWith(p))) return false;
+    }
+    if (input.rootOnly === true && s.parentSessionId) return false;
+    if (parentId !== void 0 && s.parentSessionId !== parentId) return false;
+    if (updatedSince !== void 0 && sessionActivityMs(s) < updatedSince) return false;
+    if (startedSince !== void 0) {
+      const started = Date.parse(s.startedAt);
+      if (Number.isNaN(started) || started < startedSince) return false;
+    }
+    if (input.excludeNoise === true && isNoiseSession(s)) return false;
+    return true;
+  };
+}
+function applySessionListFilters(rows, input, now = Date.now()) {
+  if (!hasSessionListFilters(input)) return [...rows];
+  return rows.filter(compileSessionListFilters(input, now));
+}
+function parseSessionListFilterParams(params) {
+  const flag = (k) => {
+    const v = params.get(k);
+    return v === null ? void 0 : v === "true" || v === "1";
+  };
+  const list = (k) => {
+    const all = params.getAll(k);
+    return all.length > 0 ? toList(all) : void 0;
+  };
+  const str3 = (k) => {
+    const v = params.get(k);
+    return v === null || v === "" ? void 0 : v;
+  };
+  const out = {};
+  const q = str3("q");
+  if (q !== void 0) out.q = q;
+  const prefix = list("excludeLabelPrefix");
+  if (prefix) out.excludeLabelPrefix = prefix;
+  const labels = list("excludeLabels");
+  if (labels) out.excludeLabels = labels;
+  const kinds = list("excludeKinds");
+  if (kinds) out.excludeKinds = kinds;
+  const rootOnly = flag("rootOnly");
+  if (rootOnly !== void 0) out.rootOnly = rootOnly;
+  const parent = str3("parentSessionId");
+  if (parent !== void 0) out.parentSessionId = parent;
+  const updatedSince = str3("updatedSince");
+  if (updatedSince !== void 0) out.updatedSince = updatedSince;
+  const startedSince = str3("startedSince");
+  if (startedSince !== void 0) out.startedSince = startedSince;
+  const noise = flag("excludeNoise");
+  if (noise !== void 0) out.excludeNoise = noise;
+  return out;
+}
+var mcpBool2 = z.preprocess((v) => v === "true" ? true : v === "false" ? false : v, z.boolean());
+var stringOrList = z.union([z.string(), z.array(z.string())]);
+var sessionListFilterShape = {
+  q: z.string().optional().describe("Case-insensitive substring over id, name, label, title, cwd."),
+  excludeLabelPrefix: stringOrList.optional().describe("Drop labels starting with any of these, e.g. ['review:','wf:']."),
+  excludeLabels: stringOrList.optional().describe("Drop labels exactly equal to any of these (as session_follow exclude.labels)."),
+  excludeKinds: stringOrList.optional().describe("Drop kinds: terminal | agent-cli | command."),
+  rootOnly: mcpBool2.optional().describe("Only sessions with no parent."),
+  parentSessionId: z.string().optional().describe("Only direct children of this session (id or name)."),
+  updatedSince: z.string().optional().describe("Activity at/after: ISO time or age like '30m','24h','7d'."),
+  startedSince: z.string().optional().describe("Started at/after: ISO time or age like '30m','24h','7d'."),
+  excludeNoise: mcpBool2.optional().describe(
+    'Drop review:*/wf:* sessions and ended command/plain-terminal runs. Details: tool_help {name:"session_list", topic:"excludeNoise"}'
+  )
+};
 
 // src/session-tools.ts
 init_transcript_writer();
@@ -26646,15 +26827,15 @@ function computeHostWarnings(input) {
 function createDefaultHostProbes() {
   const platform = process.platform;
   const own = /* @__PURE__ */ new Set();
-  const run = (cmd, args, timeoutMs) => new Promise((resolve45, reject) => {
+  const run = (cmd, args, timeoutMs) => new Promise((resolve47, reject) => {
     const child = execFile(
       cmd,
       args,
       { maxBuffer: 16 * 1024 * 1024, timeout: timeoutMs, env: { ...process.env, LC_ALL: "C" } },
       (err, stdout) => {
-        if (!err) return resolve45(stdout);
+        if (!err) return resolve47(stdout);
         if (err.killed) return reject(new Error(`${cmd} timed out after ${timeoutMs}ms`));
-        return stdout ? resolve45(stdout) : reject(err);
+        return stdout ? resolve47(stdout) : reject(err);
       }
     );
     if (child.pid !== void 0) own.add(child.pid);
@@ -27419,9 +27600,9 @@ async function callJevSystemOne(state, questions, opts) {
       const answers = {};
       const answerErrors = {};
       for (const [key, value] of Object.entries(parsed.data.answers)) {
-        const answer = jevChoiceAnswerSchema.safeParse(value);
-        if (answer.success) answers[key] = answer.data;
-        else answerErrors[key] = describeZodIssues(answer.error);
+        const answer2 = jevChoiceAnswerSchema.safeParse(value);
+        if (answer2.success) answers[key] = answer2.data;
+        else answerErrors[key] = describeZodIssues(answer2.error);
       }
       return {
         ok: true,
@@ -27505,24 +27686,24 @@ async function judgeSessionWithJev(input) {
     }
   );
   if (!outcome.ok) return fail4(outcome.error);
-  const answer = outcome.answers[VERDICT_QUESTION_KEY];
-  if (!answer) {
+  const answer2 = outcome.answers[VERDICT_QUESTION_KEY];
+  if (!answer2) {
     const why = outcome.answerErrors?.[VERDICT_QUESTION_KEY];
     return fail4(`response missing a valid verdict answer${why ? ` \u2014 ${why}` : ""}`);
   }
-  if (!WRAPUP_VERDICTS.includes(answer.choice)) {
-    return fail4(`unknown verdict choice '${answer.choice}'`);
+  if (!WRAPUP_VERDICTS.includes(answer2.choice)) {
+    return fail4(`unknown verdict choice '${answer2.choice}'`);
   }
-  const confidence = answer.confidence ?? answer.probabilities[answer.choice];
+  const confidence = answer2.confidence ?? answer2.probabilities[answer2.choice];
   if (typeof confidence !== "number" || !Number.isFinite(confidence) || confidence < 0 || confidence > 1) {
     return fail4("no usable confidence for the chosen verdict");
   }
   return {
     ok: true,
     sessionId: input.sessionId,
-    verdict: answer.choice,
+    verdict: answer2.choice,
     confidence,
-    probabilities: answer.probabilities,
+    probabilities: answer2.probabilities,
     model: outcome.model ?? model
   };
 }
@@ -27723,7 +27904,6 @@ function createBackgroundJobRegistry(opts) {
       jobId: job.id,
       status: "running",
       startedAt: job.startedAt,
-      resultPath: resultPathFor(job.id),
       followUp: { tool: followUp.tool, args: { jobId: job.id }, pollAfterMs: JOB_POLL_AFTER_MS, hint: followUp.hint }
     }),
     progressView: (job) => job.status === "failed" ? { jobId: job.id, status: job.status, endedAt: job.endedAt, error: job.error } : {
@@ -27731,22 +27911,86 @@ function createBackgroundJobRegistry(opts) {
       status: job.status,
       startedAt: job.startedAt,
       elapsedMs: Date.now() - job.startedMs,
-      resultPath: resultPathFor(job.id),
       followUp: { pollAfterMs: JOB_POLL_AFTER_MS }
     }
   };
 }
 function timedOutWaiting(promise, waitMs) {
-  return new Promise((resolve45) => {
-    const handle = setTimeout(() => resolve45(true), waitMs);
+  return new Promise((resolve47) => {
+    const handle = setTimeout(() => resolve47(true), waitMs);
     const settled = () => {
       clearTimeout(handle);
-      resolve45(false);
+      resolve47(false);
     };
     promise.then(settled, settled);
   });
 }
 
+// src/branch-gc.ts
+function summarizeBranchGcApply(result) {
+  const zero = () => ({ deleted: 0, skipped: 0, failed: 0 });
+  const byScope = { local: zero(), remote: zero(), orphan: zero() };
+  const totals = zero();
+  const byResult = {};
+  let aborted = 0;
+  for (const o of result.outcomes) {
+    byResult[o.result] = (byResult[o.result] ?? 0) + 1;
+    const bucket = o.result === "deleted" ? "deleted" : o.result === "failed" ? "failed" : "skipped";
+    byScope[o.kind][bucket]++;
+    totals[bucket]++;
+    if (o.result.startsWith("aborted-")) aborted++;
+  }
+  const status = totals.deleted === 0 ? totals.failed > 0 ? "failed" : "noop" : totals.failed > 0 || aborted > 0 ? "partial" : "ok";
+  return { status, totals, byScope, byResult, restoreLog: result.restoreLog ?? null };
+}
+function withBranchGcApplySummary(result) {
+  if (result.mode !== "apply") return result;
+  const applySummary = summarizeBranchGcApply(result);
+  return { ...result, status: applySummary.status, applySummary };
+}
+var BRANCH_GC_PAGE_DEFAULT = 100;
+var BRANCH_GC_PAGE_MAX = 500;
+var encodeOffset = (n) => Buffer.from(`o:${n}`).toString("base64url");
+function decodeOffset(cursor) {
+  const m = /^o:(\d+)$/.exec(Buffer.from(cursor, "base64url").toString("utf8"));
+  if (!m) throw new Error("branch_gc_status: invalid `cursor`");
+  return Number(m[1]);
+}
+function sliceBranchGcResult(result, opts) {
+  const section = opts.section ?? (result.mode === "apply" ? "outcomes" : "entries");
+  const scopeOk = (kind) => !opts.scopes?.length || opts.scopes.includes(kind);
+  let rows;
+  if (section === "outcomes") {
+    if (result.mode !== "apply") throw new Error("branch_gc_status: `section: outcomes` is only available on an apply result");
+    rows = result.outcomes.filter((o) => scopeOk(o.kind) && (!opts.results?.length || opts.results.includes(o.result)));
+  } else {
+    rows = result.plan.entries.filter(
+      (e) => scopeOk(e.kind) && (!opts.classes?.length || opts.classes.includes(e.class))
+    );
+  }
+  const limit = Math.min(Math.max(Math.trunc(opts.limit ?? BRANCH_GC_PAGE_DEFAULT), 1), BRANCH_GC_PAGE_MAX);
+  const start = opts.cursor !== void 0 ? decodeOffset(opts.cursor) : 0;
+  const pageRows = rows.slice(start, start + limit);
+  const next = start + limit;
+  const page = {
+    section,
+    total: rows.length,
+    returned: pageRows.length,
+    ...next < rows.length ? { nextCursor: encodeOffset(next) } : {}
+  };
+  const { plan, ...rest } = result;
+  const { entries: _entries, ...planMeta } = plan;
+  const { outcomes: _outcomes, ...restNoOutcomes } = rest;
+  return {
+    page,
+    result: {
+      ...restNoOutcomes,
+      plan: section === "entries" ? { ...planMeta, entries: pageRows } : planMeta,
+      ...section === "outcomes" ? { outcomes: pageRows } : {}
+    }
+  };
+}
+
 // src/session-tools.ts
 init_command_allowlist();
 init_agent_tools();
@@ -28245,7 +28489,7 @@ function buildSessionTree(sessions) {
   });
   return sessions.filter((s) => !s.parentSessionId || !idSet.has(s.parentSessionId)).sort((a, b) => a.startedAt.localeCompare(b.startedAt)).map(toNode);
 }
-var mcpBool2 = z.preprocess(
+var mcpBool3 = z.preprocess(
   (v) => v === "true" ? true : v === "false" ? false : v,
   z.boolean()
 );
@@ -28366,25 +28610,27 @@ var sessionWrapupApplyJobs = createBackgroundJobRegistry({
 var BACKGROUND_DEFAULT_WAIT_MS = 25e3;
 var branchGcBackgroundView = (job) => branchGcJobs.backgroundView(job, {
   tool: "branch_gc_status",
-  hint: "Running in the background; a plan on a large repo takes a few minutes. Call branch_gc_status with this jobId about every 30 s. When done it returns the summary; the full result is written to resultPath (pass full: true to get it inline)."
+  hint: "Running in the background; a plan on a large repo takes a few minutes. Call branch_gc_status with this jobId about every 30 s. When done it returns the summary and, once the file exists, a resultPath holding the full result (pass full: true to get a filtered/paged slice inline)."
 });
-var branchGcDoneView = (jobId, resultPath, result, full, endedAt) => ({
+var branchGcDoneView = (jobId, resultPath, result, slice, endedAt) => ({
   jobId,
   status: "done",
   ...endedAt !== void 0 ? { endedAt } : {},
-  resultPath,
+  ...resultPath !== void 0 ? { resultPath } : {},
   summary: result.summary,
-  // Apply results carry the restore log path and a per-outcome tally —
-  // exactly what a caller needs to decide "safe?" without fetching the
-  // full ~MB result with `full: true`.
+  // Apply results carry the restore log path, a per-outcome tally and the
+  // per-scope deleted/skipped/failed summary — exactly what a caller needs
+  // to decide "safe?" without fetching the full ~MB result with `full: true`.
+  // Result files written before `applySummary` existed are summarised here.
   ...result.mode === "apply" ? {
     restoreLog: result.restoreLog ?? null,
     outcomeCounts: result.outcomes.reduce((acc, o) => {
       acc[o.result] = (acc[o.result] ?? 0) + 1;
       return acc;
-    }, {})
+    }, {}),
+    applySummary: result.applySummary ?? summarizeBranchGcApply(result)
   } : {},
-  ...full ? { result } : {}
+  ...slice ? sliceBranchGcResult(result, slice) : {}
 });
 var worktreeGcBackgroundView = (job) => worktreeGcJobs.backgroundView(job, {
   tool: "worktree_gc_status",
@@ -28424,7 +28670,7 @@ var backgroundStatusResult = async (toolName, jobs, jobId) => {
           jobId: job.id,
           status: "done",
           endedAt: job.endedAt,
-          resultPath: jobs.resultPathFor(job.id),
+          ...job.resultPath !== void 0 ? { resultPath: job.resultPath } : {},
           result: job.result
         })
       }
@@ -28471,35 +28717,29 @@ function registerSessionTools(rawServer, opts) {
           project: args.project,
           keyOf: args.keyOf,
           maxLimit: 200,
-          itemKey: args.itemKey
+          itemKey: args.itemKey,
+          ...args.defaultLimit !== void 0 ? { defaultLimit: args.defaultLimit } : {}
         })
       ]
     });
   };
   registerAgentTools(server, opts);
   const sessionListSchema = z.object({
-    kind: z.enum(["terminal", "agent-cli", "command", "all"]).optional().describe(
-      "Filter by session kind. `all` (default) returns every live-able kind (terminal + agent-cli) but excludes `command` unless `includeCommands` is set. Use `terminal` to list only PTY sessions, `agent-cli` for structured ACP agents, or `command` to list only raw shell-command runs."
-    ),
-    includeCommands: z.boolean().optional().describe(
-      "When true and `kind` is unset/`all`, also include `kind:'command'` rows in the result (they're excluded by default \u2014 see `kind`). No effect when `kind` is set explicitly. Default false."
-    ),
+    kind: z.enum(["terminal", "agent-cli", "command", "all"]).optional().describe("Filter by kind. `all` (default) = terminal + agent-cli, without `command` unless `includeCommands`."),
+    includeCommands: z.boolean().optional().describe("With kind unset/`all`, also include `kind:'command'` rows. Default false."),
     onlyAlive: z.boolean().optional().describe("When true, only running/starting sessions. Default false."),
     status: z.enum(["starting", "running", "exited", "killed", "error"]).optional().describe("Filter by exact status (overrides onlyAlive)."),
-    includeArchived: z.boolean().optional().describe(
-      "When true, also include archived sessions (hidden from every other view by `session_archive`). Default false."
-    ),
-    withMemory: z.boolean().optional().describe(
-      "When true, add `rssBytes` (summed RSS in bytes of the process tree, via `ps`) to every live session that has a pid. Default false \u2014 a distinct opt-in from `full`/`compact` since it costs one `ps` spawn per call; omitted otherwise, so a plain listing never pays for it."
-    ),
+    includeArchived: z.boolean().optional().describe("Also include archived sessions. Default false."),
+    withMemory: z.boolean().optional().describe("Add `rssBytes` (process-tree RSS) to live sessions with a pid; one `ps` per call. Default false."),
     stats: statsParamSchema.describe(
-      'Resource stats per live session - process-tree RSS, %CPU, process count and the top commands by RSS (normalized: `pnpm install`, `vitest`, `tsc`, `git`, \u2026), under each row\'s `stats`. `true` = summary; `"full"` = also every process (pid, ppid, command, RSS, CPU, elapsed). Sampled on demand and cached ~3s; rows with no live process carry no `stats`. Use `session_stats` for the host-level view (daemon / provisioning / orphan buckets, load, free memory).'
+      'Per-live-session RSS, %CPU, process count and top commands under `stats`; `true` = summary, `"full"` = every process. Cached ~3s. Host-level view: `session_stats`.'
     ),
+    ...sessionListFilterShape,
     ...pageParamsShape
   });
   registerBuiltinTool(server, {
     id: "session_list",
-    description: "List sessions tracked by the daemon \u2014 agent-CLI sessions (claude-code, hermes, \u2026) and terminal/PTY sessions (claude TUI, bash, \u2026). Each entry includes `kind`, `pty` (true for real PTYs), `name` (when set at spawn), `status`, `command`, age + exit code. Use this when you need to know what's already running before spawning anything new, or to discover a session id by name. COMPACT BY DEFAULT: each entry is a slim projection (id/kind/name/label/status/command/cwd/model/busy/awaitingInput/blockedOn/lastActivityAt/depth/parentSessionId/continuedFrom/lastTurnErroredAt/interrupted); `interrupted: true` marks a session a daemon restart cut off mid-turn (see `session_continue_interrupted`); pass `full: true` (or `compact: false`) for the complete, unprojected per-session record. Raw shell-command runs (`kind:'command'`) are a log, not a resumable session, so they're excluded from the default view \u2014 pass `kind:'command'` or `includeCommands:true` to see them, or use `command_list`.",
+    description: "List sessions tracked by the daemon (agent-CLI and terminal/PTY). Use it to see what's already running before spawning, or to find a session id by name. NARROW BEFORE YOU READ: hundreds of sessions are mostly noise and without `limit` all come back. Filter (`q`, `excludeNoise`, `rootOnly`, `updatedSince`, \u2026) and/or pass `limit`; rows are newest-activity first, `total` is the filtered count. E.g. `{q:'X', excludeNoise:true, limit:10}`. Rows are COMPACT by default (`fields:[\u2026]` picks keys, `full:true` returns everything). Detail: tool_help {name:\"session_list\"}; ranked text search: `session_search`.",
     inputSchema: sessionListSchema,
     handler: async (input) => {
       let rows = registry.list({ includeArchived: true });
@@ -28522,6 +28762,12 @@ function registerSessionTools(rawServer, opts) {
           (s) => s.status === "running" || s.status === "starting"
         );
       }
+      const { parentSessionId, ...filterRest } = pickSessionListFilters(input);
+      rows = applySessionListFilters(rows, {
+        ...filterRest,
+        ...parentSessionId ? { parentSessionId: registry.findByIdOrName(parentSessionId)?.id ?? parentSessionId } : {}
+      });
+      rows = sortNewestActivityFirst(rows);
       if (input.withMemory) {
         const live = rows.filter(
           (s) => typeof s.pid === "number" && (s.status === "running" || s.status === "starting")
@@ -28546,11 +28792,13 @@ function registerSessionTools(rawServer, opts) {
       return rows.map(publicSessionDescriptor);
     },
     transformers: [
+      catchErrors(),
       paginated({
         project: compactSessionItem,
         keyOf: (s) => s.id,
         maxLimit: 200,
-        itemKey: "sessions"
+        itemKey: "sessions",
+        includeTotal: true
       })
     ]
   });
@@ -28620,7 +28868,7 @@ function registerSessionTools(rawServer, opts) {
     description: 'Resource usage per session, sampled from the OS process table: RSS bytes, %CPU, process count and top commands by RSS for every live session, sorted by RSS (each row labelled with the session\'s `label`/`name`), plus `daemon` (the daemon process + its own children), `provisioning` (worktree setup work such as `pnpm install` not yet attached to a session, with `inFlight` provisions), `orphans` (processes that look agentproto-owned but belong to no live session - reported only, never killed), `totals`, and `host` (load average, free/total memory). `detail:"full"` adds every process (pid, command, RSS, CPU, elapsed) per row. Cached ~3s; `fresh:true` forces a new sample. A subtree-scoped caller sees only its own sessions (no daemon/provisioning/orphan buckets).',
     inputSchema: z.object({
       detail: z.enum(["summary", "full"]).optional().describe('Default "summary".'),
-      fresh: mcpBool2.optional().describe("Bypass the ~3s cache and sample now.")
+      fresh: mcpBool3.optional().describe("Bypass the ~3s cache and sample now.")
     }),
     handler: async (input) => {
       const all = registry.list({ includeArchived: true });
@@ -28640,7 +28888,7 @@ function registerSessionTools(rawServer, opts) {
     description: 'Host-level load report: load average vs core count, CPU user/sys/idle, RAM (used/wired/compressor/free) and swap, per-disk transfers/s + MB/s, the top 10 processes by CPU and by memory footprint (compressed pages included on macOS) each tagged with its owning session (`session`/`daemon`/`provisioning`/`orphan`/`system`/`other`), and `warnings` (swap > 50%, orphaned processes older than 30 min that are busy or serving, deleted-cwd processes, filesystem-wide `find`/`bfs`/`du` scans, several servers on one port, load > 4x cores). `detail:"full"` adds a per-session rollup and every process. Bounded to ~2s: a probe that is slow or unavailable is named in `partial` and the rest still ships (raise `budgetMs` to give the macOS `top` footprint probe longer on a saturated host). Cached ~2s; `fresh:true` resamples. Never needs sudo. A subtree-scoped caller sees host metrics plus only its own sessions\' processes.',
     inputSchema: z.object({
       detail: z.enum(["summary", "full"]).optional().describe('Default "summary".'),
-      fresh: mcpBool2.optional().describe("Bypass the ~2s cache and sample now."),
+      fresh: mcpBool3.optional().describe("Bypass the ~2s cache and sample now."),
       budgetMs: z.coerce.number().int().min(300).max(6e4).optional().describe("Time budget for the sample in ms (default 1900).")
     }),
     handler: async (input) => {
@@ -28659,7 +28907,7 @@ function registerSessionTools(rawServer, opts) {
     "session_continue_interrupted",
     "List the sessions the LAST daemon restart cut off mid-turn (`interrupted: true`) and \u2014 with `dryRun: false` \u2014 send each a one-shot \"continue\" prompt (the interrupted prompt itself is never re-run). Goes through the normal prompt path, so a dead-but-resumable session resumes in place first. Skips sessions that aren't interrupted, were interrupted by an older restart, aren't resumable, hit the resume attempt cap, are already busy, or whose cwd no longer exists. Returns a per-session outcome (`eligible` on a dry run, else `sent`/`skipped` with a reason/`failed`).",
     {
-      dryRun: mcpBool2.optional().describe("Default true: only report what would be sent. Pass false to send."),
+      dryRun: mcpBool3.optional().describe("Default true: only report what would be sent. Pass false to send."),
       ids: z.array(z.string().min(1)).optional().describe(
         "Restrict to these sessions (id or name). Omitted \u21D2 every session interrupted by the last restart."
       ),
@@ -29218,7 +29466,7 @@ function registerSessionTools(rawServer, opts) {
   });
   registerPaginatedListTool({
     id: "terminal_sessions_list",
-    description: "List terminal/PTY sessions tracked by the daemon. Equivalent to `session_list({kind: 'terminal'})`. Each entry includes `kind`, `pty`, `status`, age, etc. Use this when you only want the terminal subset. COMPACT BY DEFAULT: each entry is session_list's slim projection; pass `full: true` (or `compact: false`) for the complete, unprojected per-session record.",
+    description: "List terminal/PTY sessions tracked by the daemon. Equivalent to `session_list({kind: 'terminal'})`. Each entry includes `kind`, `pty`, `status`, age, etc. Use this when you only want the terminal subset. COMPACT BY DEFAULT: each entry is session_list's slim projection; pass `full: true` (or `compact: false`) for the complete, unprojected per-session record. Without `limit`/`cursor` at most 50 rows come back; when there are more the reply carries `total`, `truncated: true` and a `nextCursor` \u2014 pass it as `cursor` (with a `limit`) for the rest, or filter with `onlyAlive` / `status`.",
     schema: terminalSessionsListSchema,
     body: async (input) => {
       let rows = registry.list({ includeArchived: true });
@@ -29242,7 +29490,10 @@ function registerSessionTools(rawServer, opts) {
     },
     project: compactSessionItemWithProvenance,
     keyOf: (s) => s.id,
-    itemKey: "sessions"
+    itemKey: "sessions",
+    // Dead terminals pile up: an unpaged call used to return every row
+    // (65k+ chars, over the MCP output cap). Cap it and say so.
+    defaultLimit: 50
   });
   const commandListSchema = z.object({
     kind: z.enum(["terminal", "agent-cli", "command", "all"]).optional().describe(
@@ -29974,7 +30225,7 @@ function registerSessionTools(rawServer, opts) {
     workspaceSlug: z.string().optional().describe(
       "Workspace slug from `agentproto workspace list`. Resolves the repo root via the active workspace when omitted."
     ),
-    openOnly: mcpBool2.optional().describe(
+    openOnly: mcpBool3.optional().describe(
       "When true, only return worktrees whose `pr.state` is `open`. Default false."
     ),
     sessionId: z.string().optional().describe(
@@ -30025,19 +30276,19 @@ function registerSessionTools(rawServer, opts) {
       workspaceSlug: z.string().optional().describe(
         "Workspace slug from `agentproto workspace list`. Resolves the repo root via the active workspace when omitted."
       ),
-      apply: mcpBool2.optional().describe(
+      apply: mcpBool3.optional().describe(
         "When true, EXECUTE the plan (reclaim/salvage). Default false \u2014 a dry run that returns the plan and mutates nothing."
       ),
-      salvageDirty: mcpBool2.optional().describe(
+      salvageDirty: mcpBool3.optional().describe(
         "When true, archive (snapshot-then-remove) every `salvage`-class worktree during `apply`. Default false \u2014 salvage entries are left untouched. Ignored on a dry run."
       ),
-      includeDetached: mcpBool2.optional().describe(
+      includeDetached: mcpBool3.optional().describe(
         "When true, a clean, idle detached worktree is reclaimed instead of held. Default false. This is the only flag that can promote an entry toward reclaim; no flag ever weakens a hold otherwise."
       ),
       noisePaths: z.array(z.string()).optional().describe(
         "Worktree-relative paths whose dirt is known noise (a worktree dirty ONLY on these counts as clean). Default `.opencode/package-lock.json`; pass [] to disable."
       ),
-      wait: mcpBool2.optional().describe(
+      wait: mcpBool3.optional().describe(
         "false \u21D2 return a jobId immediately; poll `worktree_gc_status`. true \u21D2 block until the gc finishes (no background fallback). Default: wait up to `waitMs`, then fall back to background."
       ),
       waitMs: mcpNumber.optional().describe(
@@ -30124,19 +30375,19 @@ function registerSessionTools(rawServer, opts) {
   const branchGcKind = z.enum(["local", "remote", "orphan"]);
   server.tool(
     "branch_gc",
-    "Garbage-collect a repo's branches. DEFAULTS TO A DRY RUN: returns a plan classifying every local branch, base-remote branch and orphan tracking ref (refs/remotes/<ns>/* of a removed remote) as `reclaim` (work provably in base: the head commit of a merged PR, merged, squash-merged, patch-merged or content-merged), `review` (unmerged, old enough, not protected \u2014 carries coverage + the files not provably in base for a reviewer), or `hold` (base/protected, checked out in a worktree or its remote twin, open PR head, PR check unavailable, or younger than `minAgeDays`). `apply: true` (requires explicit `scopes`) deletes only `reclaim` entries, re-classifying each right before deleting it, and returns the path of a restore log (sha + re-create command per deleted ref). A plan can take minutes on a big repo: as an MCP caller, pass `wait: false` (or `waitMs: 40000`) and poll `branch_gc_status` with the returned jobId instead of blocking. A `wait: false` (or `waitMs` timed-out) response returns a jobId plus a `followUp` block naming the poll tool and cadence \u2014 poll `branch_gc_status` with that jobId.",
+    "Garbage-collect a repo's branches. DEFAULTS TO A DRY RUN: returns a plan classifying every local branch, base-remote branch and orphan tracking ref (refs/remotes/<ns>/* of a removed remote) as `reclaim` (work provably in base: the head commit of a merged PR, merged, squash-merged, patch-merged or content-merged), `review` (unmerged, old enough, not protected \u2014 carries coverage + the files not provably in base for a reviewer), or `hold` (base/protected, checked out in a worktree or its remote twin, open PR head, PR check unavailable, or younger than `minAgeDays`). `apply: true` (requires explicit `scopes`) deletes only `reclaim` entries, re-classifying each right before deleting it, and returns the path of a restore log (sha + re-create command per deleted ref) plus a top-level `status` and an `applySummary` (deleted / skipped / failed counts per scope, and the restore log path). A plan can take minutes on a big repo: as an MCP caller, pass `wait: false` (or `waitMs: 40000`) and poll `branch_gc_status` with the returned jobId instead of blocking. A `wait: false` (or `waitMs` timed-out) response returns a jobId plus a `followUp` block naming the poll tool and cadence \u2014 poll `branch_gc_status` with that jobId.",
     {
       repoRoot: z.string().optional().describe("Absolute path to the git repo. Wins over `workspaceSlug`."),
       workspaceSlug: z.string().optional().describe("Workspace slug from `agentproto workspace list`. The active workspace when omitted."),
       base: z.string().optional().describe("Base ref the work must be in. Default `origin/main`."),
       scopes: z.array(branchGcKind).optional().describe("Ref kinds to consider: local, remote, orphan. Default all three for a plan; REQUIRED for apply."),
       minAgeDays: mcpNumber.optional().describe("Unmerged refs younger than this many days are held. Default 3."),
-      includeReviewed: mcpBool2.optional().describe(
+      includeReviewed: mcpBool3.optional().describe(
         "When true, a `review` ref whose stored verdict (branch_gc_verdict) has gate.agree=true for the SAME tip sha becomes `reclaim` (`reviewed`). Default false."
       ),
       anchor: z.string().optional().describe("Explicit anchor commit for a re-rooted base. Auto-detected when omitted."),
-      apply: mcpBool2.optional().describe("When true, EXECUTE the plan for `scopes`. Default false \u2014 a dry run."),
-      wait: mcpBool2.optional().describe("Block until the gc finishes (default true \u2014 today's behaviour). false \u21D2 return a jobId immediately; poll `branch_gc_status`."),
+      apply: mcpBool3.optional().describe("When true, EXECUTE the plan for `scopes`. Default false \u2014 a dry run."),
+      wait: mcpBool3.optional().describe("Block until the gc finishes (default true \u2014 today's behaviour). false \u21D2 return a jobId immediately; poll `branch_gc_status`."),
       waitMs: mcpNumber.optional().describe('Block at most this many milliseconds, then fall back to background: returns `{ jobId, status: "running" }` to poll with `branch_gc_status`. Only meaningful with the default `wait: true`.')
     },
     async (input) => {
@@ -30174,7 +30425,7 @@ function registerSessionTools(rawServer, opts) {
           ...input.minAgeDays !== void 0 ? { minAgeDays: input.minAgeDays } : {},
           ...input.anchor ? { anchor: input.anchor } : {}
         };
-        const { job, promise } = branchGcJobs.start(() => runBranchGc(runInput));
+        const { job, promise } = branchGcJobs.start(async () => withBranchGcApplySummary(await runBranchGc(runInput)));
         if (input.wait === false) {
           return { content: [{ type: "text", text: JSON.stringify(branchGcBackgroundView(job)) }] };
         }
@@ -30193,12 +30444,36 @@ function registerSessionTools(rawServer, opts) {
   );
   server.tool(
     "branch_gc_status",
-    "Poll a branch_gc run started with `wait: false` (or one that fell back to the background via `waitMs`). While running: status + elapsed time. When done: the plan's own summary, the path of the full result saved on disk (`resultPath`), and \u2014 with `full: true` \u2014 the full result itself. While running the view also carries `followUp.pollAfterMs` (poll every 30 s). When failed: the error.",
+    'Poll a branch_gc run started with `wait: false` (or one that fell back to the background via `waitMs`). While running: status + elapsed time. When done: the plan\'s own summary (plus, for an apply, `applySummary` \u2014 deleted/skipped/failed per scope and the restore log path) and the path of the full result saved on disk (`resultPath`). The full result is too big to return whole, so `full: true` (or any of `section`, `classes`, `scopes`, `results`, `limit`, `cursor`) returns ONE filtered page of it: `result` (summary + plan metadata + the selected list) and `page { section, total, returned, nextCursor }` \u2014 default 100 rows, pass `nextCursor` back as `cursor` for the next page. Use `classes: ["reclaim"]` to see only what an apply would delete. While running the view carries `followUp.pollAfterMs` (poll every 30 s). When failed: the error.',
     {
       jobId: z.string().describe("Job id returned by `branch_gc` (`bgc_\u2026`)."),
-      full: mcpBool2.optional().describe("Include the full result JSON, not just the summary. Default false.")
+      full: mcpBool3.optional().describe("Include a filtered/paged slice of the full result (see description). Implied by any other slice param. Default false."),
+      section: z.enum(["entries", "outcomes"]).optional().describe("Which list to return: plan `entries` or apply `outcomes`. Default `entries` for a plan, `outcomes` for an apply."),
+      classes: z.array(z.enum(["reclaim", "review", "hold"])).optional().describe('Entries only: keep these classes (e.g. ["reclaim"]).'),
+      scopes: z.array(branchGcKind).optional().describe("Keep these ref kinds (local, remote, orphan)."),
+      results: z.array(
+        z.enum(["deleted", "held", "skipped-review", "aborted-moved", "aborted-vanished", "aborted-reclassified", "failed"])
+      ).optional().describe("Outcomes only: keep these outcome results."),
+      limit: mcpNumber.optional().describe(`Rows per page. Default 100, max ${BRANCH_GC_PAGE_MAX}.`),
+      cursor: z.string().optional().describe("`page.nextCursor` from the previous page.")
     },
     async (input) => {
+      const wantsSlice = input.full === true || input.section !== void 0 || input.classes !== void 0 || input.scopes !== void 0 || input.results !== void 0 || input.limit !== void 0 || input.cursor !== void 0;
+      const slice = wantsSlice ? {
+        ...input.section ? { section: input.section } : {},
+        ...input.classes ? { classes: input.classes } : {},
+        ...input.scopes ? { scopes: input.scopes } : {},
+        ...input.results ? { results: input.results } : {},
+        ...input.limit !== void 0 ? { limit: input.limit } : {},
+        ...input.cursor !== void 0 ? { cursor: input.cursor } : {}
+      } : void 0;
+      const doneView = (...args) => {
+        try {
+          return { content: [{ type: "text", text: JSON.stringify(branchGcDoneView(...args)) }] };
+        } catch (err) {
+          return { content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }], isError: true };
+        }
+      };
       const job = branchGcJobs.get(input.jobId);
       if (!job) {
         const parsed = await branchGcJobs.readResultFile(input.jobId);
@@ -30213,14 +30488,12 @@ function registerSessionTools(rawServer, opts) {
             isError: true
           };
         }
-        const view3 = branchGcDoneView(input.jobId, branchGcJobs.resultPathFor(input.jobId), parsed, input.full === true);
-        return { content: [{ type: "text", text: JSON.stringify(view3) }] };
+        return doneView(input.jobId, branchGcJobs.resultPathFor(input.jobId), parsed, slice);
       }
       if (job.status !== "done") {
         return { content: [{ type: "text", text: JSON.stringify(branchGcJobs.progressView(job)) }] };
       }
-      const view2 = branchGcDoneView(job.id, branchGcJobs.resultPathFor(job.id), job.result, input.full === true, job.endedAt);
-      return { content: [{ type: "text", text: JSON.stringify(view2) }] };
+      return doneView(job.id, job.resultPath, job.result, slice, job.endedAt);
     }
   );
   const branchVerdictEnum = z.enum(["obsolete", "superseded", "salvage", "in-progress", "unclear"]);
@@ -30239,7 +30512,7 @@ function registerSessionTools(rawServer, opts) {
         salvage: z.string().optional().describe("What is worth keeping, if anything.")
       }),
       gate: z.object({
-        agree: mcpBool2.describe("true only if deleting the branch loses nothing of value"),
+        agree: mcpBool3.describe("true only if deleting the branch loses nothing of value"),
         verdict: branchVerdictEnum,
         reason: z.string(),
         evidence: z.array(z.string()).describe("Concrete shas/paths. Required non-empty when agree is true.")
@@ -30852,10 +31125,10 @@ function registerSessionTools(rawServer, opts) {
     "DRY RUN, mutates nothing \u2014 classify every idle agent-cli session for the session steward: `close` (safe to auto-close: idle past `idleMinutes` AND the session's worktree merged or its parent already ended, with no tool call pending, and not `keepAlive`), `stuck` (stuck in `status:'starting'` with no pid for 10+ minutes \u2014 closing it is free, it never ran), `judge` (idle-enough but ambiguous \u2014 no merge/parent-ended signal, a pending tool call, or a `keepAlive` session that would otherwise close, since `keepAlive` can only ever reach `judge`, never `close`), or `keep` (not idle long enough yet, or busy/awaitingInput/awaitingPermission/archived/pinned/has busy children/has a live parent/is the caller's own session \u2014 NEVER eligible for `session_wrapup_apply`; omitted here unless `includeKeep` is set). Also reports `rssBytes` (process-tree RSS) per entry and summed per class in `totals`. Feed `close`/`stuck` ids straight to `session_wrapup_apply`; `judge` ids need a judge's verdict first (FIX-9B). Computing worktree merge status can take minutes: this call waits up to 25 s (`waitMs`), then returns `{ jobId, status: \"running\", followUp }` \u2014 poll `session_wrapup_status` with that jobId.",
     {
       idleMinutes: z.number().int().positive().optional().describe("Idle threshold in minutes a `close` candidate must clear. Default 20."),
-      includeKeep: mcpBool2.optional().describe(
+      includeKeep: mcpBool3.optional().describe(
         "Include `keep`-class entries too. Default false \u2014 `keep` rows are never acted on, so they're omitted to keep the plan focused on what the steward might actually do."
       ),
-      wait: mcpBool2.optional().describe(
+      wait: mcpBool3.optional().describe(
         "false \u21D2 return a jobId immediately; poll `session_wrapup_status`. true \u21D2 block until the plan is computed. Default: wait up to `waitMs`, then fall back to background."
       ),
       waitMs: mcpNumber.optional().describe("Block at most this many milliseconds, then fall back to background. Default 25000.")
@@ -30921,7 +31194,7 @@ function registerSessionTools(rawServer, opts) {
       judgedBy: z.string().optional().describe(
         "A judge session id. When set, the outcome's `source` is `'judged'` and a `judge`-class session also becomes eligible (not just `close`/`stuck`). Omitted \u21D2 `source:'declared'`, `judgedBy:'steward-rules'`, and only `close`/`stuck` are eligible."
       ),
-      wait: mcpBool2.optional().describe(
+      wait: mcpBool3.optional().describe(
         "false \u21D2 return a jobId immediately; poll `session_wrapup_status`. true \u21D2 block until done. Default: wait up to `waitMs`, then fall back to background (the apply keeps running)."
       ),
       waitMs: mcpNumber.optional().describe("Block at most this many milliseconds, then fall back to background. Default 25000.")
@@ -31372,7 +31645,7 @@ function registerSessionTools(rawServer, opts) {
     "Set or clear a session's idle-reaper exemption. When `keepAlive` is true, the idle-reaper (`isReapable`) never auto-retires this session no matter how long it sits idle \u2014 for a supervisor that legitimately parks waiting on a child or a scheduled wake, which otherwise looks identical to a finished session. Set false to clear the exemption. Persists across daemon restarts. Does NOT touch the running agent.",
     {
       idOrName: z.string().min(1).describe("Session id or name to update \u2014 from `session_list`."),
-      keepAlive: mcpBool2.describe(
+      keepAlive: mcpBool3.describe(
         "true to exempt this session from the idle-reaper, false to clear the exemption."
       )
     },
@@ -31434,7 +31707,7 @@ function registerSessionTools(rawServer, opts) {
     "Set or clear a session's list-visibility pin. When `pinned` is true, the session sorts to the top of `agentproto sessions` and the VS Code sessions webview's dedicated Pinned group. Set false to clear it. Persists across daemon restarts. Purely a sort/display flag \u2014 does NOT touch the idle-reaper, keepAlive, or emit any notification, and does NOT touch the running agent.",
     {
       idOrName: z.string().min(1).describe("Session id or name to update \u2014 from `session_list`."),
-      pinned: mcpBool2.describe(
+      pinned: mcpBool3.describe(
         "true to pin this session to the top of the list, false to unpin it."
       )
     },
@@ -31719,7 +31992,7 @@ function registerSessionTools(rawServer, opts) {
     {
       idOrName: z.string().min(1).describe("Session id or name \u2014 from `session_list`."),
       key: z.string().min(1).describe("Artifact key, from `session_artifact_list`."),
-      pinned: mcpBool2.describe("true to pin, false to unpin.")
+      pinned: mcpBool3.describe("true to pin, false to unpin.")
     },
     async (input) => {
       const prev = registry.findByIdOrName(input.idOrName);
@@ -31940,7 +32213,7 @@ function registerSessionTools(rawServer, opts) {
       lastBytes: z.number().int().min(1).max(64 * 1024).optional().describe(
         "Max bytes from the tail. Default 4096; the full ~64 KiB ring remains reachable by passing `lastBytes: 65536` explicitly."
       ),
-      clean: mcpBool2.optional().describe(
+      clean: mcpBool3.optional().describe(
         "Strip ANSI codes, returning human-readable text (as `text` instead of `b64`). Default false = raw base64."
       )
     },
@@ -32032,7 +32305,7 @@ function registerSessionTools(rawServer, opts) {
 
 // src/index.ts
 init_agent_tools();
-var mcpBool3 = z.preprocess(
+var mcpBool4 = z.preprocess(
   (v) => v === "true" ? true : v === "false" ? false : v,
   z.boolean()
 );
@@ -32117,10 +32390,10 @@ function registerBrainTools(server, opts) {
     {
       workspace: z.string().optional().describe("Workspace slug. Omit to use the calling session's workspace."),
       sessionId: z.string().optional().describe("Ingest one specific session (sess_xxx) instead of the backlog."),
-      reindex: mcpBool3.optional().describe(
+      reindex: mcpBool4.optional().describe(
         'When `sessionId` is set and it was already ingested, force a re-ingest from the current transcript. Default false. Pass `true` or the string "true" to enable.'
       ),
-      reindexStale: mcpBool3.optional().describe(
+      reindexStale: mcpBool4.optional().describe(
         'When `sessionId` is NOT set (backlog mode), also force-reingest every already-indexed session whose pipeline version is older than the code running now. Default false. Pass `true` or the string "true" to enable.'
       )
     },
@@ -32318,7 +32591,7 @@ function createWorkspaceBrainSubscriber(opts) {
     }
   };
 }
-function makeBrowserHandle(entry, resolve45) {
+function makeBrowserHandle(entry, resolve47) {
   return {
     slug: entry.id,
     name: entry.name,
@@ -32329,7 +32602,7 @@ function makeBrowserHandle(entry, resolve45) {
     // check() is available for on-demand health probes but is never called
     // by the lister (kit invariant OQ-5). Returns true when the adapter
     // is present in the injected resolver map, false otherwise.
-    check: async () => resolve45 ? resolve45(entry.id) != null : true
+    check: async () => resolve47 ? resolve47(entry.id) != null : true
   };
 }
 var noopLedger = {
@@ -34936,7 +35209,7 @@ function startHeartbeat(opts) {
   let timer = null;
   let currentEveryMs = null;
   let firing = false;
-  async function load() {
+  async function load2() {
     if (!existsSync(path)) return null;
     let source;
     try {
@@ -34967,7 +35240,7 @@ function startHeartbeat(opts) {
     firing = true;
     let agentId;
     try {
-      const hb = await load();
+      const hb = await load2();
       if (!hb || !hb.enabled) return;
       agentId = hb.agent;
       const agent = await opts.buildAgent(hb.agent);
@@ -35055,7 +35328,7 @@ function startHeartbeat(opts) {
   return {
     start() {
       if (timer) return;
-      void load().then((hb) => {
+      void load2().then((hb) => {
         const everyMs = hb?.everyMs ?? 6e4;
         reschedule(everyMs);
       });
@@ -35104,6 +35377,356 @@ function preview(text13, max = 120) {
 // src/http-server.ts
 init_process_stats();
 init_browser_mount();
+
+// src/mcp-modern/constants.ts
+var MODERN_PROTOCOL_VERSION = "2026-07-28";
+var DEFAULT_SUPPORTED_VERSIONS = [MODERN_PROTOCOL_VERSION];
+var META_PROTOCOL_VERSION = "io.modelcontextprotocol/protocolVersion";
+var META_CLIENT_INFO = "io.modelcontextprotocol/clientInfo";
+var META_CLIENT_CAPABILITIES = "io.modelcontextprotocol/clientCapabilities";
+var META_SERVER_INFO = "io.modelcontextprotocol/serverInfo";
+var ERR_PARSE = -32700;
+var ERR_INVALID_REQUEST = -32600;
+var ERR_METHOD_NOT_FOUND = -32601;
+var ERR_INVALID_PARAMS = -32602;
+var ERR_INTERNAL = -32603;
+var ERR_HEADER_MISMATCH = -32020;
+var ERR_UNSUPPORTED_VERSION = -32022;
+var FORWARDED_METHODS = /* @__PURE__ */ new Set([
+  "tools/list",
+  "tools/call",
+  "events/list",
+  "events/subscribe",
+  "events/unsubscribe",
+  "resources/list",
+  "resources/templates/list",
+  "resources/read",
+  "prompts/list",
+  "prompts/get"
+]);
+var ALLOWED_METHODS = /* @__PURE__ */ new Set([...FORWARDED_METHODS, "server/discover"]);
+var CACHE_HINT_METHODS = /* @__PURE__ */ new Set([
+  "server/discover",
+  "tools/list",
+  "prompts/list",
+  "resources/list",
+  "resources/templates/list",
+  "resources/read"
+]);
+var NAME_HEADER_SOURCE = /* @__PURE__ */ new Map([
+  ["tools/call", "name"],
+  ["prompts/get", "name"],
+  ["resources/read", "uri"]
+]);
+
+// src/mcp-modern/bridge.ts
+var HANDSHAKE_VERSION = "2025-11-25";
+var BridgeError = class extends Error {
+  code;
+  data;
+  constructor(code, message, data) {
+    super(message);
+    this.code = code;
+    this.data = data;
+  }
+};
+function forwardParams(params) {
+  const { _meta, ...rest } = params;
+  if (typeof _meta !== "object" || _meta === null || Array.isArray(_meta)) return rest;
+  const handshake = /* @__PURE__ */ new Set([META_PROTOCOL_VERSION, META_CLIENT_INFO, META_CLIENT_CAPABILITIES]);
+  const kept = Object.fromEntries(Object.entries(_meta).filter(([key]) => !handshake.has(key)));
+  return Object.keys(kept).length > 0 ? { ...rest, _meta: kept } : rest;
+}
+var isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+async function openBridge(server) {
+  const [clientSide, serverSide] = InMemoryTransport.createLinkedPair();
+  const pending = /* @__PURE__ */ new Map();
+  let nextId = 1;
+  clientSide.onmessage = (message) => {
+    if (!("id" in message) || typeof message.id !== "number") return;
+    const entry = pending.get(message.id);
+    if (!entry) return;
+    if ("error" in message) {
+      pending.delete(message.id);
+      entry.reject(new BridgeError(message.error.code, message.error.message, message.error.data));
+    } else if ("result" in message) {
+      pending.delete(message.id);
+      entry.resolve(isRecord7(message.result) ? message.result : {});
+    }
+  };
+  const close = async () => {
+    for (const entry of pending.values()) entry.reject(new Error("bridge closed"));
+    pending.clear();
+    await clientSide.close().catch(() => {
+    });
+    await server.close().catch(() => {
+    });
+  };
+  const call = (method, params, signal) => new Promise((resolve47, reject) => {
+    if (signal?.aborted) {
+      reject(signal.reason ?? new Error("aborted"));
+      return;
+    }
+    const id = nextId++;
+    const onAbort = () => {
+      pending.delete(id);
+      void clientSide.send({ jsonrpc: "2.0", method: "notifications/cancelled", params: { requestId: id, reason: "client disconnected" } }).catch(() => {
+      });
+      reject(signal?.reason ?? new Error("aborted"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    pending.set(id, {
+      resolve: (value) => {
+        signal?.removeEventListener("abort", onAbort);
+        resolve47(value);
+      },
+      reject: (error) => {
+        signal?.removeEventListener("abort", onAbort);
+        reject(error);
+      }
+    });
+    clientSide.send({ jsonrpc: "2.0", id, method, params }).catch((error) => {
+      pending.delete(id);
+      signal?.removeEventListener("abort", onAbort);
+      reject(error);
+    });
+  });
+  try {
+    await server.connect(serverSide);
+    await clientSide.start();
+    const init = await call("initialize", {
+      protocolVersion: HANDSHAKE_VERSION,
+      capabilities: {},
+      clientInfo: { name: "agentproto-modern-bridge", version: "0.0.1" }
+    });
+    await clientSide.send({ jsonrpc: "2.0", method: "notifications/initialized" });
+    const info = isRecord7(init.serverInfo) ? init.serverInfo : {};
+    return {
+      capabilities: isRecord7(init.capabilities) ? { ...init.capabilities } : {},
+      serverInfo: {
+        name: typeof info.name === "string" ? info.name : "agentproto",
+        version: typeof info.version === "string" ? info.version : "0"
+      },
+      instructions: typeof init.instructions === "string" ? init.instructions : void 0,
+      request: call,
+      close
+    };
+  } catch (error) {
+    await close();
+    throw error;
+  }
+}
+
+// src/mcp-modern/validate.ts
+var isRecord8 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+function normalizeHeaders(raw) {
+  const out = {};
+  for (const [name, value] of Object.entries(raw)) {
+    if (value === void 0) continue;
+    const joined = (Array.isArray(value) ? value.join(", ") : value).trim();
+    const key = name.toLowerCase();
+    const previous = out[key];
+    out[key] = previous === void 0 ? joined : `${previous}, ${joined}`;
+  }
+  return out;
+}
+function acceptsJson(accept) {
+  if (accept === void 0) return false;
+  return accept.split(",").some((part) => {
+    const type = (part.split(";")[0] ?? "").trim().toLowerCase();
+    return type === "application/json" || type === "application/*" || type === "*/*";
+  });
+}
+function isJsonContentType(contentType) {
+  if (contentType === void 0) return false;
+  return (contentType.split(";")[0] ?? "").trim().toLowerCase() === "application/json";
+}
+function decodeHeaderValue(raw) {
+  const match = /^=\?base64\?(.*)\?=$/.exec(raw);
+  if (!match) return raw;
+  return Buffer.from(match[1] ?? "", "base64").toString("utf8");
+}
+function parseBody(body) {
+  const fail4 = (status, code, message) => ({ ok: false, error: { status, code, message, id: null } });
+  let value;
+  try {
+    value = JSON.parse(body);
+  } catch {
+    return fail4(400, ERR_PARSE, "Parse error");
+  }
+  if (Array.isArray(value)) return fail4(400, ERR_INVALID_REQUEST, "Batch requests are not supported");
+  if (!isRecord8(value)) return fail4(400, ERR_INVALID_REQUEST, "The body must be a single JSON-RPC request or notification");
+  const method = value.method;
+  if (typeof method !== "string" && ("result" in value || "error" in value)) {
+    return fail4(400, ERR_INVALID_REQUEST, "JSON-RPC responses must not be sent to the server");
+  }
+  if (value.jsonrpc !== "2.0" || typeof method !== "string") return fail4(400, ERR_INVALID_REQUEST, "Not a JSON-RPC 2.0 request");
+  const hasId = "id" in value;
+  const id = value.id;
+  if (hasId && typeof id !== "string" && typeof id !== "number") return fail4(400, ERR_INVALID_REQUEST, "`id` must be a string or a number");
+  if (value.params !== void 0 && !isRecord8(value.params)) return fail4(400, ERR_INVALID_PARAMS, "`params` must be an object");
+  return {
+    ok: true,
+    request: {
+      id: hasId ? id : void 0,
+      method,
+      params: isRecord8(value.params) ? value.params : {}
+    }
+  };
+}
+function validateRequest(request3, headers, supported, allowed) {
+  const id = request3.id ?? null;
+  const err = (status, code, message, data) => ({
+    status,
+    code,
+    message,
+    id,
+    ...data !== void 0 ? { data } : {}
+  });
+  const { method, params } = request3;
+  if (method === "initialize") {
+    const requested = typeof params.protocolVersion === "string" ? params.protocolVersion : "unknown";
+    return err(404, ERR_METHOD_NOT_FOUND, "Method not found: initialize (this endpoint is stateless, send server/discover)", {
+      supported: [...supported],
+      requested
+    });
+  }
+  const meta = params._meta;
+  const missing = [];
+  if (!isRecord8(meta) || typeof meta[META_PROTOCOL_VERSION] !== "string") missing.push(META_PROTOCOL_VERSION);
+  if (!isRecord8(meta) || !isRecord8(meta[META_CLIENT_CAPABILITIES])) missing.push(META_CLIENT_CAPABILITIES);
+  if (!isRecord8(meta) || missing.length > 0) return err(400, ERR_INVALID_PARAMS, `Missing required _meta field(s): ${missing.join(", ")}`);
+  const version = String(meta[META_PROTOCOL_VERSION]);
+  if (!supported.includes(version)) {
+    return err(400, ERR_UNSUPPORTED_VERSION, "Unsupported protocol version", { supported: [...supported], requested: version });
+  }
+  const headerVersion = headers["mcp-protocol-version"];
+  if (headerVersion === void 0) return err(400, ERR_HEADER_MISMATCH, "Header mismatch: MCP-Protocol-Version header is missing");
+  if (headerVersion !== version) {
+    return err(400, ERR_HEADER_MISMATCH, `Header mismatch: MCP-Protocol-Version ${headerVersion} does not match _meta ${version}`);
+  }
+  const headerMethod = headers["mcp-method"];
+  if (headerMethod === void 0) return err(400, ERR_HEADER_MISMATCH, "Header mismatch: Mcp-Method header is missing");
+  if (headerMethod !== method) {
+    return err(400, ERR_HEADER_MISMATCH, `Header mismatch: Mcp-Method ${headerMethod} does not match body ${method}`);
+  }
+  const source = NAME_HEADER_SOURCE.get(method);
+  if (source !== void 0) {
+    const expected = params[source];
+    if (typeof expected !== "string") return err(400, ERR_INVALID_PARAMS, `Missing required params.${source}`);
+    const rawName = headers["mcp-name"];
+    if (rawName === void 0) return err(400, ERR_HEADER_MISMATCH, "Header mismatch: Mcp-Name header is missing");
+    if (decodeHeaderValue(rawName) !== expected) {
+      return err(400, ERR_HEADER_MISMATCH, `Header mismatch: Mcp-Name does not match params.${source}`);
+    }
+  }
+  if (!allowed.has(method)) return err(404, ERR_METHOD_NOT_FOUND, `Method not found: ${method}`);
+  return null;
+}
+
+// src/mcp-modern/index.ts
+var DEFAULT_CACHE_POLICY = () => ({ ttlMs: 0, cacheScope: "private" });
+var JSON_HEADERS = { "content-type": "application/json" };
+function errorResponse(error, extraHeaders = {}) {
+  return {
+    status: error.status,
+    headers: { ...JSON_HEADERS, ...extraHeaders },
+    body: JSON.stringify({
+      jsonrpc: "2.0",
+      id: error.id,
+      error: { code: error.code, message: error.message, ...error.data !== void 0 ? { data: error.data } : {} }
+    })
+  };
+}
+function okResponse(id, result) {
+  return { status: 200, headers: { ...JSON_HEADERS }, body: JSON.stringify({ jsonrpc: "2.0", id, result }) };
+}
+function decorate(method, result, serverInfo, hints) {
+  const meta = typeof result._meta === "object" && result._meta !== null && !Array.isArray(result._meta) ? result._meta : {};
+  const resultType = typeof result.resultType === "string" ? result.resultType : "complete";
+  const decorated = {
+    ...result,
+    resultType,
+    _meta: { ...meta, [META_SERVER_INFO]: meta[META_SERVER_INFO] ?? serverInfo }
+  };
+  if (resultType === "complete" && CACHE_HINT_METHODS.has(method)) {
+    decorated.ttlMs = typeof result.ttlMs === "number" ? result.ttlMs : hints.ttlMs;
+    decorated.cacheScope = typeof result.cacheScope === "string" ? result.cacheScope : hints.cacheScope;
+  }
+  return decorated;
+}
+function fromThrown(error, id) {
+  if (error instanceof BridgeError) {
+    const message = error.message.replace(/^(?:MCP error -?\d+: )+/, "");
+    const status = error.code === ERR_METHOD_NOT_FOUND ? 404 : 200;
+    return errorResponse({ status, code: error.code, message, id, ...error.data !== void 0 ? { data: error.data } : {} });
+  }
+  return errorResponse({ status: 500, code: ERR_INTERNAL, message: "Internal error", id });
+}
+async function answer(request3, bridge, supported, hints, signal) {
+  if (request3.method === "server/discover") {
+    const capabilities = { ...bridge.capabilities };
+    delete capabilities.logging;
+    return decorate(
+      "server/discover",
+      {
+        supportedVersions: [...supported],
+        capabilities,
+        ...bridge.instructions ? { instructions: bridge.instructions } : {}
+      },
+      bridge.serverInfo,
+      hints
+    );
+  }
+  return decorate(request3.method, await bridge.request(request3.method, forwardParams(request3.params), signal), bridge.serverInfo, hints);
+}
+async function handleModernRequest(input, deps2) {
+  const supported = deps2.supportedVersions ?? DEFAULT_SUPPORTED_VERSIONS;
+  const cachePolicy = deps2.cachePolicy ?? DEFAULT_CACHE_POLICY;
+  const headers = normalizeHeaders(input.headers);
+  if (input.method !== "POST") {
+    return errorResponse({ status: 405, code: ERR_INVALID_REQUEST, message: "Only POST is supported", id: null }, { allow: "POST" });
+  }
+  if (!acceptsJson(headers["accept"])) {
+    return errorResponse({ status: 406, code: ERR_INVALID_REQUEST, message: "Accept must allow application/json", id: null });
+  }
+  if (!isJsonContentType(headers["content-type"])) {
+    return errorResponse({ status: 415, code: ERR_INVALID_REQUEST, message: "Content-Type must be application/json", id: null });
+  }
+  const parsed = parseBody(input.body);
+  if (!parsed.ok) return errorResponse(parsed.error);
+  const request3 = parsed.request;
+  if (request3.id === void 0) return { status: 202, headers: {} };
+  const invalid = validateRequest(request3, headers, supported, ALLOWED_METHODS);
+  if (invalid) return errorResponse(invalid);
+  const id = request3.id;
+  let bridge;
+  try {
+    bridge = await openBridge(await deps2.createServer());
+    const result = await answer({ ...request3, id }, bridge, supported, cachePolicy(request3.method), deps2.signal);
+    if (deps2.signal?.aborted) return { status: 499, headers: {} };
+    const response = okResponse(id, result);
+    if ((request3.method === "server/discover" || request3.method === "tools/list") && deps2.onObserved) {
+      try {
+        deps2.onObserved(request3.method, { jsonrpc: "2.0", id, result });
+      } catch {
+      }
+    }
+    return response;
+  } catch (error) {
+    if (deps2.signal?.aborted) return { status: 499, headers: {} };
+    const response = fromThrown(error, id);
+    if ((request3.method === "server/discover" || request3.method === "tools/list") && deps2.onObserved && response.body) {
+      try {
+        deps2.onObserved(request3.method, JSON.parse(response.body));
+      } catch {
+      }
+    }
+    return response;
+  } finally {
+    await bridge?.close();
+  }
+}
 init_sessions();
 init_session_retirement();
 init_session_message();
@@ -35795,7 +36418,7 @@ function createSentinelStore(opts) {
   const persist = opts?.persist ?? opts?.filePath !== void 0;
   let persistTimer = null;
   let secretsPersistTimer = null;
-  const load = () => {
+  const load2 = () => {
     const out = /* @__PURE__ */ new Map();
     if (!persist) return out;
     let raw;
@@ -35819,7 +36442,7 @@ function createSentinelStore(opts) {
     }
     return out;
   };
-  const sentinels = load();
+  const sentinels = load2();
   const loadSecrets = () => {
     const out = /* @__PURE__ */ new Map();
     if (!persist) return out;
@@ -36039,6 +36662,15 @@ function createSentinelStore(opts) {
 function singleMatch(subject, types) {
   return [{ subject, ...types ? { types } : {} }];
 }
+var SentinelBackingExpiredError = class extends Error {
+  code = "backing_subscription_expired";
+  remoteId;
+  constructor(message, remoteId) {
+    super(message);
+    this.name = "SentinelBackingExpiredError";
+    if (remoteId !== void 0) this.remoteId = remoteId;
+  }
+};
 function deliveryPreferenceFor(provider, intervalMs) {
   if (provider.preferredDelivery) return provider.preferredDelivery(intervalMs);
   return provider.capabilities.poll ? { mode: "poll", intervalMs } : { mode: "push" };
@@ -36602,7 +37234,7 @@ function compactPrState(snapshot, extra) {
   const slim = snapshot.state !== "open" && extra.closedEmitted ? { fetchedAt: snapshot.fetchedAt, state: snapshot.state, reviews: [], checks: [] } : snapshot;
   return { snapshot: slim, ...extra };
 }
-function decorate(events, pr) {
+function decorate2(events, pr) {
   const title = pr.title.length > 80 ? `${pr.title.slice(0, 77)}...` : pr.title;
   return events.map((e) => ({
     ...e,
@@ -36666,7 +37298,7 @@ function diffRepoPr(prev, pr, repo) {
     closedEmitted = true;
   }
   return {
-    events: decorate(events, pr),
+    events: decorate2(events, pr),
     next: compactPrState(now, { draft: pr.draft, closedEmitted, ...ciReported ? { ciReported } : {} })
   };
 }
@@ -36698,7 +37330,7 @@ function diffRepo(cursor, prs, repo, fetchedAt) {
           })
         ];
         if (closed) fresh.push(closedEvent(pr.snapshot, { repo, number: pr.number, subject }, false));
-        events.push(...decorate(fresh, pr));
+        events.push(...decorate2(fresh, pr));
       }
       const settled = verdict === "success" || verdict === "failure" || verdict === "neutral";
       next[key] = compactPrState(pr.snapshot, {
@@ -37636,11 +38268,11 @@ function verifySignatureV2(secret, headers, body, nowMs, skewMs = SIGNATURE_V2_S
   if (a.length !== b.length || !timingSafeEqual(a, b)) return { ok: false, reason: "signature_mismatch" };
   return { ok: true, timestampSec };
 }
-var isRecord7 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var isRecord9 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function toSentinelEvent(raw, seq) {
-  if (!isRecord7(raw)) return null;
+  if (!isRecord9(raw)) return null;
   const { id, source, type, subject, time, data, summary, subjects, terminal, consumerref } = raw;
-  if (raw.specversion !== "1.0" || typeof id !== "string" || id === "" || typeof source !== "string" || typeof type !== "string" || type === "" || typeof subject !== "string" || subject === "" || typeof time !== "string" || !isRecord7(data) || typeof summary !== "string" || !Array.isArray(subjects) || !subjects.every((s) => typeof s === "string") || typeof terminal !== "boolean") {
+  if (raw.specversion !== "1.0" || typeof id !== "string" || id === "" || typeof source !== "string" || typeof type !== "string" || type === "" || typeof subject !== "string" || subject === "" || typeof time !== "string" || !isRecord9(data) || typeof summary !== "string" || !Array.isArray(subjects) || !subjects.every((s) => typeof s === "string") || typeof terminal !== "boolean") {
     return null;
   }
   const envSeq = typeof raw.seq === "number" ? raw.seq : seq;
@@ -37686,9 +38318,36 @@ function stateOf(handle) {
     mode: s.mode === "push" ? "push" : "poll",
     ...typeof s.consumerRef === "string" ? { consumerRef: s.consumerRef } : {},
     ...typeof s.hookKey === "string" ? { hookKey: s.hookKey } : {},
-    ...typeof s.callbackSecret === "string" ? { callbackSecret: s.callbackSecret } : {}
+    ...typeof s.callbackSecret === "string" ? { callbackSecret: s.callbackSecret } : {},
+    ...s.signature === "v2" ? { signature: "v2" } : {}
   };
 }
+function excerptOf(envelope) {
+  if (!isRecord9(envelope)) return void 0;
+  const cap = (v) => typeof v === "string" ? v.slice(0, 200) : void 0;
+  const out = {};
+  const id = cap(envelope.id);
+  const type = cap(envelope.type);
+  const subject = cap(envelope.subject);
+  const source = cap(envelope.source);
+  if (id !== void 0) out.id = id;
+  if (type !== void 0) out.type = type;
+  if (subject !== void 0) out.subject = subject;
+  if (source !== void 0) out.source = source;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function whyNotEnvelope(envelope) {
+  if (envelope === void 0 || envelope === null) return "item has no envelope";
+  if (!isRecord9(envelope)) return "envelope is not a JSON object";
+  const missing = [];
+  if (envelope.specversion !== "1.0") missing.push("specversion");
+  for (const k of ["id", "type", "subject"]) if (typeof envelope[k] !== "string" || envelope[k] === "") missing.push(k);
+  for (const k of ["source", "time", "summary"]) if (typeof envelope[k] !== "string") missing.push(k);
+  if (!isRecord9(envelope.data)) missing.push("data");
+  if (!Array.isArray(envelope.subjects) || !envelope.subjects.every((x) => typeof x === "string")) missing.push("subjects");
+  if (typeof envelope.terminal !== "boolean") missing.push("terminal");
+  return `envelope failed validation (invalid or missing: ${missing.join(", ") || "unknown"})`;
+}
 var SUBJECT_SCHEME_RE = /^([A-Za-z][A-Za-z0-9_-]*):/;
 function defaultTypesFor(subject) {
   return subject.startsWith("github:") ? [...GITHUB_DEFAULT_PR_TYPES] : ["*"];
@@ -37746,7 +38405,7 @@ function agentpushSentinelProvider(opts = {}) {
       json3 = void 0;
     }
     if (!res.ok) {
-      const detail = isRecord7(json3) && typeof json3.error === "string" ? json3.error : text13.slice(0, 200);
+      const detail = isRecord9(json3) && typeof json3.error === "string" ? json3.error : text13.slice(0, 200);
       throw new AgentpushHttpError(res.status, `agentpush ${method} ${path} \u2192 HTTP ${res.status}${detail ? `: ${detail}` : ""}`);
     }
     return json3;
@@ -37779,6 +38438,7 @@ function agentpushSentinelProvider(opts = {}) {
     // Credentials come from `setup_sentinel_provider` OR an imported alias, so
     // "set up" is decided by `readiness()`, not the kit's ledger/creds check.
     requiresSetup: false,
+    exclusiveRemote: true,
     capabilities: {
       subjects: ["*"],
       push: true,
@@ -37832,7 +38492,7 @@ function agentpushSentinelProvider(opts = {}) {
           ...push ? { callback_url: callbackUrl2(delivery.callbackUrl, hookKey), callback_secret: callbackSecret } : {}
         }
       });
-      const id = isRecord7(json3) && isRecord7(json3.subscription) ? json3.subscription.id : void 0;
+      const id = isRecord9(json3) && isRecord9(json3.subscription) ? json3.subscription.id : void 0;
       if (typeof id !== "string" || id === "") throw new Error("agentpush: create returned no subscription id");
       return {
         provider: AGENTPUSH_SLUG,
@@ -37841,6 +38501,7 @@ function agentpushSentinelProvider(opts = {}) {
         state: {
           mode: push ? "push" : "poll",
           consumerRef,
+          signature: "v2",
           ...push ? { hookKey, callbackSecret } : {}
         }
       };
@@ -37859,7 +38520,7 @@ function agentpushSentinelProvider(opts = {}) {
       let sub;
       try {
         const json3 = await api("GET", subPath(handle));
-        sub = isRecord7(json3) && isRecord7(json3.subscription) ? json3.subscription : void 0;
+        sub = isRecord9(json3) && isRecord9(json3.subscription) ? json3.subscription : void 0;
       } catch (err) {
         if (isHttp(err, 404)) {
           throw new Error(`agentpush subscription ${handle.remoteId} no longer exists \u2014 re-create the sentinel`);
@@ -37887,10 +38548,34 @@ function agentpushSentinelProvider(opts = {}) {
         if (!isHttp(err, 404)) throw err;
       }
     },
+    /**
+     * Extend the remote subscription's lifetime. `PATCH` accepts `until`
+     * without rejecting an already-expired row, so the returned `status` is
+     * checked: anything but `active` (or a 404) means the backing subscription
+     * is gone and must be recreated — never silently re-provisioned here.
+     */
+    async renew(handle, until) {
+      if (!handle.remoteId) throw new SentinelBackingExpiredError("agentpush: handle has no subscription id");
+      let json3;
+      try {
+        json3 = await api("PATCH", subPath(handle), { body: { until } });
+      } catch (err) {
+        if (isHttp(err, 404)) {
+          throw new SentinelBackingExpiredError(`the agentpush subscription ${handle.remoteId} was deleted`, handle.remoteId);
+        }
+        throw err;
+      }
+      const sub = isRecord9(json3) && isRecord9(json3.subscription) ? json3.subscription : void 0;
+      const status = sub && typeof sub.status === "string" ? sub.status : void 0;
+      if (status === "expired" || status === "deleted") {
+        throw new SentinelBackingExpiredError(`the agentpush subscription ${handle.remoteId} is ${status}`, handle.remoteId);
+      }
+      return { ...handle };
+    },
     async status(handle) {
       try {
         const json3 = await api("GET", subPath(handle));
-        const sub = isRecord7(json3) && isRecord7(json3.subscription) ? json3.subscription : void 0;
+        const sub = isRecord9(json3) && isRecord9(json3.subscription) ? json3.subscription : void 0;
         const status = sub && typeof sub.status === "string" ? sub.status : "unknown";
         if (status === "active") return { ok: true };
         return { ok: false, detail: `the agentpush subscription is ${status}` };
@@ -37902,18 +38587,35 @@ function agentpushSentinelProvider(opts = {}) {
       const after = handle.cursor ?? "0";
       if (stateOf(handle).mode === "push") return { events: [], cursor: after };
       const json3 = await api("GET", `${subPath(handle)}/events`, { query: { after, limit: Math.max(1, Math.min(limit, 1e3)) } });
-      const items = isRecord7(json3) && Array.isArray(json3.items) ? json3.items : [];
+      const items = isRecord9(json3) && Array.isArray(json3.items) ? json3.items : [];
       const events = [];
+      const malformed = [];
       let cursor = Number(after);
       if (!Number.isFinite(cursor)) cursor = 0;
       for (const item of items) {
-        if (!isRecord7(item)) continue;
-        const seq = typeof item.seq === "number" ? item.seq : void 0;
+        const seq = isRecord9(item) && typeof item.seq === "number" ? item.seq : void 0;
         if (seq !== void 0 && seq > cursor) cursor = seq;
-        const event = toSentinelEvent(item.envelope, seq);
-        if (event) events.push(event);
+        const envelope = isRecord9(item) ? item.envelope : void 0;
+        const event = toSentinelEvent(envelope, seq);
+        if (event) {
+          events.push(event);
+          continue;
+        }
+        let serialized = "";
+        try {
+          serialized = JSON.stringify(item) ?? "";
+        } catch {
+        }
+        const excerpt = excerptOf(envelope);
+        malformed.push({
+          ...seq !== void 0 ? { seq } : {},
+          ...isRecord9(item) && typeof item.delivery_id === "string" ? { remoteDeliveryId: item.delivery_id } : {},
+          error: isRecord9(item) ? whyNotEnvelope(envelope) : "poll item is not a JSON object",
+          ...excerpt ? { excerpt } : {},
+          ...serialized ? { digest: createHash("sha256").update(serialized).digest("hex"), bytes: Buffer.byteLength(serialized) } : {}
+        });
       }
-      return { events, cursor: String(cursor) };
+      return { events, cursor: String(cursor), ...malformed.length > 0 ? { malformed } : {} };
     },
     /** Called by the runtime after a polled batch is delivered. Nothing new
      *  (cursor unchanged) is a no-op — no request on an empty tick. */
@@ -37930,6 +38632,7 @@ function agentpushSentinelProvider(opts = {}) {
       const signature = headerValue3(req.headers, "x-agentpush-signature");
       if (!signature || signature.trim() === "") return { ok: false, reason: "missing_signature" };
       if (signature.trim().startsWith("sha256=")) {
+        if (st.signature === "v2") return { ok: false, reason: "legacy_signature_rejected" };
         const legacy = verifyInboundSignature("agentpush", {
           rawBody: req.rawBody,
           headers: req.headers,
@@ -38360,6 +39063,13 @@ async function createSentinelWatch(deps2, input) {
 async function cancelSentinelWatch(deps2, id) {
   const sentinel = deps2.store.get(id);
   if (!sentinel) return false;
+  if (deps2.tombstones) {
+    try {
+      await deps2.tombstones.cancel(sentinel.handle, () => deps2.store.remove(id));
+      return true;
+    } catch {
+    }
+  }
   const provider = await deps2.resolveProvider(sentinel.provider);
   if (provider) {
     try {
@@ -38392,6 +39102,9 @@ function sentinelView(s) {
     ...s.lastError ? { lastError: s.lastError } : {}
   };
 }
+function sentinelViewWithDelivery(s, deliveryStatus) {
+  return deliveryStatus ? { ...sentinelView(s), deliveryStatus } : sentinelView(s);
+}
 var ok2 = (body) => ({
   content: [{ type: "text", text: JSON.stringify({ ok: true, ...body }) }]
 });
@@ -38402,7 +39115,7 @@ var fail2 = (code, message) => ({
 var urgencyField2 = z.enum(MESSAGE_URGENCIES);
 var untilField = z.enum(["subject_terminal", "never"]);
 function registerSentinelTools(server, opts) {
-  const { store, runtime, resolveProvider, isSessionAlive, callerSessionId, activeIntervalMs } = opts;
+  const { store, runtime, resolveProvider, isSessionAlive, callerSessionId, activeIntervalMs, tombstones } = opts;
   server.tool(
     "sentinel_watch",
     "Watch a subject \u2014 a GitHub PR/repo (default) or ANOTHER SESSION's own lifecycle \u2014 and deliver matching events as a `system`/`notice` message into a session's AIP-46 inbox. Provide either `prUrl` (sugar: `https://github.com/o/r/pull/N` -> subject `github:o/r#N`, the default PR type set, and `until: subject_terminal`) or a raw `subject`: a GitHub one (`github:o/r#N`, `github:o/r`), or `session:<id>` to watch another session \u2014 woken on its turn-end, awaiting-input, or exit, even if it never calls `message_parent`, with the watch self-expiring once it exits (`until` defaults to `subject_terminal` for this scheme too). Prefer this over `session_follow` for a single, known target that should auto-expire on exit; prefer `session_follow` for a broad selector (`all`/`cwdPrefix`) with coalesced digests across many sessions. `sessionId` (the DELIVERY target) defaults to the calling session \u2014 distinct from the `<id>` inside a `session:<id>` subject (the WATCHED session). `provider` picks the backend: `local-gh` (poll every ~15-60s over the host's authenticated `gh` CLI, zero infra), `webhook` (near-real-time push via a GitHub repo hook; needs a public daemon URL \u2014 a named tunnel or AGENTPROTO_PUBLIC_URL \u2014 and a `gh` token with admin:repo_hook), `agentpush` (hosted, durable subscription: events queue server-side across daemon downtime; needs an agentpush API key; one subject per sentinel) or `session` (in-process, zero infra, no credentials \u2014 the only backend that understands a `session:<id>` subject, and picked automatically for one); see `list_sentinel_adapters` for readiness. Omitted for a GitHub subject, it defaults to `agentpush` when set up, else `webhook` when a stable public URL exists and webhook is ready, else `local-gh`.",
@@ -38425,16 +39138,16 @@ function registerSentinelTools(server, opts) {
   );
   server.tool(
     "sentinel_list",
-    "List every sentinel this daemon is tracking, with status, match clauses, target, and event counters. Credentials are never returned.",
+    "List every sentinel this daemon is tracking, with status, match clauses, target, and event counters (webhook targets also report `deliveryStatus`). Credentials are never returned.",
     {},
-    async () => ok2({ sentinels: store.list().map(sentinelView) })
+    async () => ok2({ sentinels: store.list().map((s) => sentinelViewWithDelivery(s, opts.deliveryStatus?.(s.id))) })
   );
   server.tool(
     "sentinel_unwatch",
     "Stop a sentinel: best-effort cancels the provider-side watch, then removes the record. Idempotent-ish: an unknown id is reported, not thrown.",
     { id: z.string().describe("Sentinel id (sen_...).") },
     async ({ id }) => {
-      const removed = await cancelSentinelWatch({ store, resolveProvider }, id);
+      const removed = await cancelSentinelWatch({ store, resolveProvider, ...tombstones ? { tombstones } : {} }, id);
       if (!removed) return fail2("not_found", `sentinel_unwatch: no sentinel "${id}"`);
       return ok2({ removed: true, id });
     }
@@ -38495,7 +39208,7 @@ function createSessionFollowStore(opts) {
   const debounceMs = opts?.debounceMs ?? PERSIST_DEBOUNCE_MS4;
   const persist = opts?.persist ?? true;
   let persistTimer = null;
-  const load = () => {
+  const load2 = () => {
     const out = /* @__PURE__ */ new Map();
     if (!persist) return out;
     let raw;
@@ -38521,7 +39234,7 @@ function createSessionFollowStore(opts) {
     }
     return out;
   };
-  const follows = load();
+  const follows = load2();
   const snapshot = () => {
     const out = {};
     for (const [id, follow] of follows.entries()) out[id] = follow;
@@ -38803,7 +39516,7 @@ function createHostRegistry(deps2) {
   let probesRunning = 0;
   const probeWaiters = [];
   async function withProbeSlot(fn) {
-    if (probesRunning >= probeConcurrency) await new Promise((resolve45) => probeWaiters.push(resolve45));
+    if (probesRunning >= probeConcurrency) await new Promise((resolve47) => probeWaiters.push(resolve47));
     probesRunning++;
     try {
       return await fn();
@@ -39342,7 +40055,7 @@ function createHostRegistry(deps2) {
   };
 }
 async function awaitTunnelHello(client, sink, record2, closeReason) {
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     if (!sink.isOpen) {
       reject(
         new Error(
@@ -39361,7 +40074,7 @@ async function awaitTunnelHello(client, sink, record2, closeReason) {
     client.ready().then(
       () => {
         offClose();
-        resolve45();
+        resolve47();
       },
       (err) => {
         offClose();
@@ -39406,13 +40119,13 @@ function isLegacyJoinedShape(rec) {
   return rec.addedVia === void 0 && rec.name === rec.fingerprint && rec.provider === void 0 && rec.sandboxId === void 0 && rec.labels === void 0 && rec.lastSeen === rec.createdAt;
 }
 function withTimeout(p, ms, what) {
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     const timer = setTimeout(() => reject(new Error(`${what} timed out after ${ms}ms`)), ms);
     if (typeof timer.unref === "function") timer.unref();
     p.then(
       (v) => {
         clearTimeout(timer);
-        resolve45(v);
+        resolve47(v);
       },
       (e) => {
         clearTimeout(timer);
@@ -39641,7 +40354,7 @@ function isValidPrompt(prompt) {
   return prompt !== null && typeof prompt === "object";
 }
 function sleep(ms) {
-  return new Promise((resolve45) => setTimeout(resolve45, ms));
+  return new Promise((resolve47) => setTimeout(resolve47, ms));
 }
 function httpErrorMessage(body) {
   const raw = Buffer.from(body).toString("utf8");
@@ -40374,10 +41087,12 @@ init_transcript_export();
 init_spawn_defaults();
 init_app_boundary();
 var WORKFLOW_PROMPT_SOURCE = "workflow:agent-step";
+var TRANSPORT_END_REASONS = /* @__PURE__ */ new Set([void 0, "crashed", "daemon-restart"]);
+var TRANSPORT_CLOSED_RE = /\bACP connection closed\b/i;
 function withReviewWorktreeZones(boundary, cwd) {
   const zones = reviewWorktreeReadZones(cwd);
   if (!zones) return boundary;
-  const extra = [zones.worktree, zones.gitCommonDir].filter((z61) => !boundary.readOnly.includes(z61));
+  const extra = [zones.worktree, zones.gitCommonDir].filter((z62) => !boundary.readOnly.includes(z62));
   return extra.length === 0 ? boundary : { ...boundary, readOnly: [...boundary.readOnly, ...extra] };
 }
 function agentStepMcpServers(input) {
@@ -40681,7 +41396,35 @@ var SessionsRegistryAgentHost = class {
    * synchronously, before the event bus can fire the rejection asynchronously.
    */
   async sendPromptAndWait(sessionId, prompt) {
-    await Promise.all([this.waitTurnEnd(sessionId), this.registry.sendPrompt(sessionId, prompt, { source: WORKFLOW_PROMPT_SOURCE })]);
+    await Promise.all([
+      this.waitTurnEnd(sessionId),
+      this.registry.sendPrompt(sessionId, prompt, { source: WORKFLOW_PROMPT_SOURCE }).catch((err) => {
+        throw this.classifyPromptFailure(sessionId, err);
+      })
+    ]);
+  }
+  /** True when `sessionId` dying (with `reason`) is the session's transport
+   *  failing under the step — not this host's own cancel/release, and not a
+   *  deliberate end (see {@link TRANSPORT_END_REASONS}). */
+  diedUnderStep(sessionId, reason) {
+    if (this.opts?.signal?.aborted) return false;
+    if (!this.unreleased.has(sessionId)) return false;
+    return TRANSPORT_END_REASONS.has(reason);
+  }
+  /** The error a wait rejects with when the session ends mid-turn. */
+  sessionEndedError(sessionId, status, reason) {
+    const message = `session ${sessionId} ended with status '${status}'${reason ? ` (${reason})` : ""}`;
+    return this.diedUnderStep(sessionId, reason) ? new AgentSessionLostError(sessionId, message) : new Error(message);
+  }
+  /** `registry.sendPrompt` rejected: a closed ACP connection or an already-
+   *  dead session is a transport loss ({@link AgentSessionLostError});
+   *  anything else propagates unchanged. */
+  classifyPromptFailure(sessionId, err) {
+    if (!(err instanceof Error)) return err;
+    const desc = this.registry.get(sessionId);
+    const dead = err instanceof SessionNotAliveError || TRANSPORT_CLOSED_RE.test(err.message) || desc?.status === "killed" || desc?.status === "error";
+    if (!dead || !this.diedUnderStep(sessionId, desc?.endedReason)) return err;
+    return new AgentSessionLostError(sessionId, `session ${sessionId} lost before its turn ended \u2014 ${err.message}`, err);
   }
   resolveByLabel(stepId) {
     return this.sessionsByLabel.get(stepId);
@@ -40769,15 +41512,15 @@ var SessionsRegistryAgentHost = class {
   }
   // ── Internal helpers ──────────────────────────────────────────────────
   waitTurnEnd(sessionId) {
-    return new Promise((resolve45, reject) => {
+    return new Promise((resolve47, reject) => {
       const unsubs = [];
       const done = () => {
         for (const u of unsubs) u();
-        resolve45();
+        resolve47();
       };
       const fail4 = (reason) => {
         for (const u of unsubs) u();
-        reject(new Error(reason));
+        reject(typeof reason === "string" ? new Error(reason) : reason);
       };
       unsubs.push(
         this.sessionEvents.on("session:turn-end", (ev) => {
@@ -40804,7 +41547,7 @@ var SessionsRegistryAgentHost = class {
         this.sessionEvents.on("session:exited", (ev) => {
           if (ev.sessionId !== sessionId) return;
           if (ev.status === "killed" || ev.status === "error") {
-            fail4(`session ${sessionId} ended with status '${ev.status}'`);
+            fail4(this.sessionEndedError(sessionId, ev.status, ev.reason));
           } else {
             done();
           }
@@ -40814,7 +41557,7 @@ var SessionsRegistryAgentHost = class {
       if (desc?.status === "exited" || desc?.awaitingInput === true) {
         done();
       } else if (desc?.status === "killed" || desc?.status === "error") {
-        fail4(`session ${sessionId} ended with status '${desc.status}'`);
+        fail4(this.sessionEndedError(sessionId, desc.status, desc.endedReason));
       }
     });
   }
@@ -40824,11 +41567,11 @@ function sanitize(cacheKey) {
   const cleaned = cacheKey.replace(/[^a-zA-Z0-9._-]/g, "_");
   return cleaned.length > 0 ? cleaned : "default";
 }
-function isRecord8(v) {
+function isRecord10(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function isEntry2(v) {
-  return isRecord8(v) && typeof v.resolvedInputHash === "string" && "output" in v;
+  return isRecord10(v) && typeof v.resolvedInputHash === "string" && "output" in v;
 }
 function createFileStepCache(cacheKey, opts) {
   const dir = opts?.dir ?? DEFAULT_CACHE_DIR();
@@ -40841,7 +41584,7 @@ function createFileStepCache(cacheKey, opts) {
     } catch {
       return {};
     }
-    if (!isRecord8(parsed)) return {};
+    if (!isRecord10(parsed)) return {};
     const out = {};
     for (const [k, v] of Object.entries(parsed)) if (isEntry2(v)) out[k] = v;
     return out;
@@ -41137,6 +41880,7 @@ function findStepDef(defs, stepId) {
 var DEFAULT_PERSIST_PATH2 = () => join(homedir(), ".agentproto", "workflow-runs.json");
 var DEFAULT_LEASE_TTL_MS = 6e4;
 var DEFAULT_HEARTBEAT_INTERVAL_MS = 15e3;
+var DEFAULT_PERSIST_MIN_INTERVAL_MS = 2e3;
 function cancelledStageStatus(stage) {
   return stage.steps.some((s) => s.status === "failed") ? "failed" : "cancelled";
 }
@@ -41228,9 +41972,7 @@ function saveRuns(runs, persistPath) {
   try {
     mkdirSync(dirname(persistPath), { recursive: true });
     const payload = JSON.stringify(
-      Array.from(runs.values()).map((s) => s.run),
-      null,
-      2
+      Array.from(runs.values()).map((s) => s.run)
     ) + "\n";
     const tmp = `${persistPath}.tmp.${process.pid}`;
     writeFileSync(tmp, payload, "utf8");
@@ -41306,7 +42048,7 @@ function createOnEscalate(state, persist) {
     state.run.status = "awaiting-input";
     persist();
     try {
-      return await new Promise((resolve45, reject) => {
+      return await new Promise((resolve47, reject) => {
         const timeoutMs = policy.timeoutMs ?? 3e5;
         const timer = setTimeout(() => {
           state.pendingResolve = void 0;
@@ -41318,7 +42060,7 @@ function createOnEscalate(state, persist) {
           resolver: (response) => {
             clearTimeout(timer);
             state.pendingResolve = void 0;
-            resolve45(response);
+            resolve47(response);
           }
         };
       });
@@ -41454,7 +42196,7 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
       // `resolveApproval` (wired to `workflow_escalation_resolve`'s approval
       // form); the decision lands on the app ledger (`kind: "approval"`,
       // `by: "human"`) per the trame rule.
-      approve: (req) => new Promise((resolve45) => {
+      approve: (req) => new Promise((resolve47) => {
         const approvalId = `wfappr_${randomUUID()}`;
         const requestedAt = (/* @__PURE__ */ new Date()).toISOString();
         state.run.status = "awaiting-approval";
@@ -41511,7 +42253,7 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
               runId: state.run.runId
             }
           });
-          resolve45(decision);
+          resolve47(decision);
         };
         if (req.timeoutMs !== void 0) {
           timer = setTimeout(() => {
@@ -41528,7 +42270,7 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
       // resumes through `resumeSuspend` (workflow_escalation_resolve's
       // suspend form); after a daemon restart the run stays suspended and
       // the pending entry is re-registered below.
-      resume: (req) => new Promise((resolve45) => {
+      resume: (req) => new Promise((resolve47) => {
         const since = (/* @__PURE__ */ new Date()).toISOString();
         state.run.status = "awaiting-input";
         state.run.awaitingSuspend = {
@@ -41566,7 +42308,7 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
           });
           eventLog?.append({ stepId: req.stepId, type: "step.resumed", data: {} });
           eventLog?.append({ type: "run.resumed", data: { stepId: req.stepId } });
-          resolve45(payload);
+          resolve47(payload);
         };
         signal.addEventListener("abort", onAbort, { once: true });
         state.pendingSuspend = { stepId: req.stepId, resolve: finish };
@@ -41582,7 +42324,7 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
       // read of the turn's text). On resume, `execAgentStep` sends the
       // validated payload back to the SAME session as its next prompt and
       // re-applies the outcome rule — this hook only parks and resolves.
-      onInputRequired: (req) => new Promise((resolve45) => {
+      onInputRequired: (req) => new Promise((resolve47) => {
         const since = (/* @__PURE__ */ new Date()).toISOString();
         const suspend = {
           reason: "input-required",
@@ -41635,7 +42377,7 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
           });
           eventLog?.append({ stepId: req.stepId, type: "step.resumed", data: {} });
           eventLog?.append({ type: "run.resumed", data: { stepId: req.stepId } });
-          resolve45(payload);
+          resolve47(payload);
         };
         signal.addEventListener("abort", onAbort, { once: true });
         state.pendingSuspend = { stepId: req.stepId, resolve: finish };
@@ -41671,6 +42413,19 @@ async function executeRunWorkflow(state, runtimeWf, agents, signal, sessionEvent
           }
         }
       },
+      onAgentRetry: (ev) => {
+        eventLog?.append({
+          stepId: ev.stepId,
+          type: "step.retrying",
+          data: {
+            attempt: ev.attempt,
+            maxAttempts: ev.maxAttempts,
+            error: ev.error,
+            delayMs: ev.delayMs,
+            ...ev.sessionId !== void 0 ? { sessionId: ev.sessionId } : {}
+          }
+        });
+      },
       onStepStart: (stepId, info) => {
         const cached = info?.cached === true;
         if (nonLeafStepIds.has(stepId)) return;
@@ -41974,8 +42729,44 @@ function createWorkflowRunner(opts) {
     });
   };
   const runs = shouldPersist ? loadRuns(persistPath, runsRoot) : /* @__PURE__ */ new Map();
+  const persistMinIntervalMs = opts.persistMinIntervalMs ?? DEFAULT_PERSIST_MIN_INTERVAL_MS;
+  let lastFlushAt = 0;
+  let lastStatusSig = "";
+  let trailingFlush;
+  let dirty = false;
+  const flushRuns = () => {
+    if (trailingFlush) {
+      clearTimeout(trailingFlush);
+      trailingFlush = void 0;
+    }
+    dirty = false;
+    lastFlushAt = Date.now();
+    saveRuns(runs, persistPath);
+  };
+  const statusSig = () => {
+    let sig = "";
+    for (const st of runs.values()) sig += `${st.run.runId}:${st.run.status}|`;
+    return sig;
+  };
+  if (shouldPersist && persistMinIntervalMs > 0) {
+    process.once("exit", () => {
+      if (dirty) flushRuns();
+    });
+  }
   const persist = () => {
-    if (shouldPersist) saveRuns(runs, persistPath);
+    if (!shouldPersist) return;
+    if (persistMinIntervalMs <= 0) return flushRuns();
+    const sig = statusSig();
+    const wait = lastFlushAt + persistMinIntervalMs - Date.now();
+    if (sig !== lastStatusSig || wait <= 0) {
+      lastStatusSig = sig;
+      return flushRuns();
+    }
+    dirty = true;
+    if (!trailingFlush) {
+      trailingFlush = setTimeout(flushRuns, wait);
+      trailingFlush.unref?.();
+    }
   };
   const newEventLog = (runId) => shouldPersist ? createRunEventLog(runId, runsRoot) : void 0;
   const workspaceRunsRoot = () => shouldPersist ? runsRoot : void 0;
@@ -43628,14 +44419,14 @@ function createSupervisorTaskGateRunner(opts) {
   const { supervisor, registry, workspace } = opts;
   const exec = opts.runCommand ?? runCommand;
   const settleTimeoutMs = opts.settleTimeoutMs ?? DEFAULT_VERIFY_SETTLE_TIMEOUT_MS;
-  const waitForSettle = (policyId) => new Promise((resolve45) => {
+  const waitForSettle = (policyId) => new Promise((resolve47) => {
     let settled = false;
     const finish = (outcome) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
       unsub();
-      resolve45(outcome);
+      resolve47(outcome);
     };
     const read = () => {
       const state = supervisor.getStatus(policyId);
@@ -44643,9 +45434,17 @@ function policyToActivities(policy) {
   return records;
 }
 var STALE_TURN_AFTER_MS = 10 * 6e4;
+var TURN_NAME_MAX = 60;
+function sessionDisplayName(session) {
+  const name = session.title?.trim() || session.label?.trim();
+  if (!name) return session.id;
+  const clipped = name.length > TURN_NAME_MAX ? `${name.slice(0, TURN_NAME_MAX - 1).trimEnd()}\u2026` : name;
+  return `"${clipped}"`;
+}
 function turnToActivities(session, opts = {}) {
   if (session.kind !== "agent-cli") return [];
   const completed = session.turnsCompleted ?? 0;
+  const name = sessionDisplayName(session);
   const base = (turn, title) => ({
     id: `turn:${session.id}:${turn}`,
     kind: "turn",
@@ -44659,20 +45458,20 @@ function turnToActivities(session, opts = {}) {
   if (terminal) {
     if (session.killedMidTurn === true) {
       const rec = record(
-        base(completed + 1, `Turn ${completed + 1} interrupted on ${session.id}`),
+        base(completed + 1, `Turn ${completed + 1} interrupted on ${name}`),
         session.status === "error" ? "failed" : "cancelled"
       );
       return [{ ...rec, ...session.lastActivityAt ? { endedAt: session.lastActivityAt } : {} }];
     }
     if (completed > 0) {
-      const rec = record(base(completed, `Turn ${completed} completed on ${session.id}`), "done");
+      const rec = record(base(completed, `Turn ${completed} completed on ${name}`), "done");
       return [{ ...rec, ...session.lastActivityAt ? { endedAt: session.lastActivityAt } : {} }];
     }
     return [];
   }
   if (session.awaitingPermission === true) {
     return [
-      pendingRecord(base(completed + 1, `Turn ${completed + 1} on ${session.id} held on a permission`), {
+      pendingRecord(base(completed + 1, `Turn ${completed + 1} on ${name} held on a permission`), {
         kind: "human-ack",
         refs: [session.id],
         detail: "permission request parked for permissions_respond"
@@ -44680,7 +45479,7 @@ function turnToActivities(session, opts = {}) {
     ];
   }
   if (session.busy === true) {
-    const rec = record(base(completed + 1, `Turn ${completed + 1} running on ${session.id}`), "active");
+    const rec = record(base(completed + 1, `Turn ${completed + 1} running on ${name}`), "active");
     if (opts.now && session.lastActivityAt) {
       const nowMs = Date.parse(opts.now);
       const lastMs = Date.parse(session.lastActivityAt);
@@ -44692,7 +45491,7 @@ function turnToActivities(session, opts = {}) {
   }
   if (session.awaitingInput === true) {
     return [
-      pendingRecord(base(completed + 1, `Awaiting human input on ${session.id}`), {
+      pendingRecord(base(completed + 1, `Awaiting human input on ${name}`), {
         kind: "human-ack",
         refs: [session.id],
         detail: "session asked a question; next turn needs a human prompt"
@@ -44700,7 +45499,7 @@ function turnToActivities(session, opts = {}) {
     ];
   }
   if (completed > 0) {
-    const rec = record(base(completed, `Turn ${completed} completed on ${session.id}`), "done");
+    const rec = record(base(completed, `Turn ${completed} completed on ${name}`), "done");
     return [{ ...rec, ...session.lastActivityAt ? { endedAt: session.lastActivityAt } : {} }];
   }
   return [];
@@ -44982,7 +45781,7 @@ async function monitorSessionWait(opts) {
       };
     }
   }
-  return new Promise((resolve45) => {
+  return new Promise((resolve47) => {
     const unsubs = [];
     let settled = false;
     const watcherLabel = callerScope?.ownerSessionId ? registry.get(callerScope.ownerSessionId)?.label ?? registry.get(callerScope.ownerSessionId)?.title : void 0;
@@ -45022,7 +45821,7 @@ async function monitorSessionWait(opts) {
           ts: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
-      resolve45(result);
+      resolve47(result);
     };
     const relevantTypes = targetEvent === "any" ? ["session:turn-end", "session:awaiting-input", "session:exited"] : targetEvent === "turn-end" ? ["session:turn-end", "session:awaiting-input"] : targetEvent === "awaiting-input" ? ["session:awaiting-input"] : ["session:exited"];
     const idSet = new Set(resolvedIds);
@@ -45063,13 +45862,13 @@ async function monitorPolicyWait(opts) {
   if (isSettledStatus(initial.status)) {
     return { timedOut: false, state: initial };
   }
-  return new Promise((resolve45) => {
+  return new Promise((resolve47) => {
     let settled = false;
     const timer = setTimeout(() => {
       if (settled) return;
       settled = true;
       unsub();
-      resolve45({ timedOut: true });
+      resolve47({ timedOut: true });
     }, timeoutMs);
     const unsub = supervisor.onSettle((id) => {
       if (id !== policyId) return;
@@ -45079,7 +45878,7 @@ async function monitorPolicyWait(opts) {
       settled = true;
       clearTimeout(timer);
       unsub();
-      resolve45({ timedOut: false, state });
+      resolve47({ timedOut: false, state });
     });
   });
 }
@@ -46944,16 +47743,34 @@ var FIRST_PARTY_CATALOG_ENTRIES = [
     "description": "View and continue any agentproto daemon session's conversation in the Agentik chat UI (assistant-ui based). Pick a session from the live/recent list or deep-link with ?session=<id>; the page replays the session's full transcript, then follows it live over SSE, and lets you send follow-up prompts into the same session. Built on @agstudio/react-agentproto (SSE transcript projection, permission approval, thread list) and @agstudio/chat-starter's assistant-ui shell, reused almost as-is.",
     "source": {
       "kind": "agentapp",
-      "url": "https://github.com/agentproto/apps/releases/download/session-chat%400.1.0/session-chat-0.1.0.agentapp",
-      "sha256": "12216f65fa3cff9bfb9fcd49c46c9166eb68a790d278d466e07e0a95df5f4eef",
-      "version": "0.1.0",
-      "size": 518621
+      "url": "https://github.com/agentproto/apps/releases/download/session-chat%400.1.1/session-chat-0.1.1.agentapp",
+      "sha256": "e8084a125e335cbc408b0e8dd3371711191f6aa0019dad4907f26b19ec9f344b",
+      "version": "0.1.1",
+      "size": 516437
     },
-    "version": "0.1.0",
+    "icon": "https://raw.githubusercontent.com/agentproto/apps/main/media/@agentik/session-chat/0.1.1/icon.svg",
+    "version": "0.1.1",
     "tier": "bundle",
+    "publisher": "Agentik",
     "license": {
       "kind": "free"
-    }
+    },
+    "tagline": "Read and continue any agentproto session as a chat thread.",
+    "longDescription": "Session Chat turns any agentproto session into a chat thread you can read and continue.\n\nPick a running or recent session, or open one directly with `?session=<id>`. The page replays the full transcript, then follows the session live as the agent works, and lets you send follow-up prompts into the same session.\n\n## What you get\n\n- **Transcript replay and live follow**: the whole conversation, then new turns as they stream in.\n- **Tool activity at a glance**: file reads, commands and edits grouped under each reply, with the files an agent changed.\n- **Reply into the session**: send a follow-up, interrupt a running turn, queue prompts while the agent works.\n- **Approvals**: answer the agent's permission requests from the thread.\n- **Session list**: running and recent sessions, grouped by workspace, with search and pins.\n- **Start a session**: pick a harness and model and start a new chat from the same page.\n\n## Requirements\n\nSession Chat talks to your local agentproto daemon. Its bundled agent runs on the `mastra-agent` adapter: install it first with `agentproto install mastra-agent`.",
+    "screenshots": [
+      {
+        "url": "https://raw.githubusercontent.com/agentproto/apps/main/media/@agentik/session-chat/0.1.1/conversation.png",
+        "alt": "A finished session replayed as a chat thread, with a markdown table in the agent's reply and the composer below",
+        "width": 1280,
+        "height": 800
+      }
+    ],
+    "categories": [
+      "chat",
+      "sessions",
+      "developer-tools"
+    ],
+    "homepage": "https://agentproto.sh/apps/session-chat"
   }
 ];
 
@@ -46994,7 +47811,7 @@ async function waitForSessionTerminal(registry, sessionId) {
   for (let attempt = 0; attempt < MAX_SEQUENTIAL_POLLS; attempt++) {
     const status = registry.get(sessionId)?.status;
     if (isSessionTerminal(status)) return;
-    await new Promise((resolve45) => setTimeout(resolve45, SEQUENTIAL_POLL_INTERVAL_MS));
+    await new Promise((resolve47) => setTimeout(resolve47, SEQUENTIAL_POLL_INTERVAL_MS));
   }
 }
 var MODEL_ROUTED_ADAPTER = "claude-code";
@@ -47160,7 +47977,7 @@ function buildAppInstallPreview(args) {
     runsBuildCommand: !isAgentapp && args.allowBuild === true
   };
 }
-async function dispatchAllowlistedAppTool(declaredAllowlist, input, deps2) {
+async function dispatchAllowlistedAppTool(declaredAllowlist, input, deps2, appDir) {
   const effectiveAllowlist = [...declaredAllowlist, ...APP_UI_DISCOVERY_TOOLS];
   if (!effectiveAllowlist.includes(input.tool)) {
     return errorResult2(
@@ -47168,8 +47985,14 @@ async function dispatchAllowlistedAppTool(declaredAllowlist, input, deps2) {
     );
   }
   const args = input.args ?? {};
-  if (input.tool === "app_install" && appInstallConfirmationClass(args)?.confirmed === false) {
-    return textResult2(buildAppInstallPreview(args));
+  let dispatchArgs = args;
+  if (input.tool === "app_install") {
+    const cls = appInstallConfirmationClass(args);
+    if (cls?.confirmed === false) return textResult2(buildAppInstallPreview(args));
+    if (cls?.confirmed === true) {
+      const { confirm: _confirmNonce, ...rest } = args;
+      dispatchArgs = rest;
+    }
   }
   try {
     if (input.tool.startsWith("imported:")) {
@@ -47181,11 +48004,19 @@ async function dispatchAllowlistedAppTool(declaredAllowlist, input, deps2) {
           `app_tool_call: malformed imported tool id "${input.tool}" \u2014 expected "imported:<alias>/<toolName>".`
         );
       }
-      const result2 = await deps2.callImportedTool(rest.slice(0, slash), rest.slice(slash + 1), args);
+      const result2 = await deps2.callImportedTool(rest.slice(0, slash), rest.slice(slash + 1), dispatchArgs);
       return textResult2(result2);
     }
+    if (appDir !== void 0) {
+      const bundled = await loadAppBundledTools(appDir);
+      const bundledTool = bundled.tools.find((t) => t.id === input.tool);
+      if (bundledTool) {
+        const output = await runTool({ tool: bundledTool, candidates: bundled.drivers, input: args });
+        return textResult2(output);
+      }
+    }
     if (!deps2.dispatchTool) return notEnabled("app_tool_call");
-    const result = await deps2.dispatchTool(input.tool, args);
+    const result = await deps2.dispatchTool(input.tool, dispatchArgs);
     return textResult2(result);
   } catch (err) {
     return errorResult2(`app_tool_call: ${err instanceof Error ? err.message : String(err)}`);
@@ -47196,7 +48027,7 @@ async function performAppToolCall(appRegistry, input, deps2) {
   if (!installed || !installed.ui) {
     return errorResult2(`app_tool_call: app "${input.appId}" is not installed or has no UI.`);
   }
-  return dispatchAllowlistedAppTool(installed.ui.tools ?? [], input, deps2);
+  return dispatchAllowlistedAppTool(installed.ui.tools ?? [], input, deps2, installed.dir);
 }
 async function performBuiltinPanelToolCall(tools, input, deps2) {
   if (tools === void 0) {
@@ -47323,7 +48154,7 @@ async function performAppCall(appRegistry, input, deps2) {
         error: `app_call: workflow "${input.workflow}" on "${input.appId}" did not finish within ${timeoutMs}ms (run ${run.runId} still ${status?.status ?? "unknown"}).`
       };
     }
-    await new Promise((resolve45) => setTimeout(resolve45, APP_CALL_POLL_INTERVAL_MS));
+    await new Promise((resolve47) => setTimeout(resolve47, APP_CALL_POLL_INTERVAL_MS));
   }
 }
 function refIdOf(ref) {
@@ -48709,12 +49540,12 @@ async function readBody2(req) {
   }
   return { raw: Buffer.concat(chunks).toString("utf8") };
 }
-var isRecord9 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var isRecord11 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function parseParts(raw) {
   if (!Array.isArray(raw)) throw new RpcFailure(JSON_RPC_ERROR.invalidParams, "message.parts must be an array");
   const parts = [];
   for (const p of raw) {
-    if (!isRecord9(p)) throw new RpcFailure(JSON_RPC_ERROR.invalidParams, "each message part must be an object");
+    if (!isRecord11(p)) throw new RpcFailure(JSON_RPC_ERROR.invalidParams, "each message part must be an object");
     if ("text" in p) {
       if (typeof p.text !== "string") throw new RpcFailure(JSON_RPC_ERROR.invalidParams, "part.text must be a string");
       parts.push({ text: p.text });
@@ -48747,13 +49578,13 @@ async function handleA2aTaskRequest(req, res, path, deps2) {
     send(res, 200, { jsonrpc: "2.0", id: null, error: { code: JSON_RPC_ERROR.parse, message: "parse error: body is not valid JSON" } });
     return true;
   }
-  if (!isRecord9(rpc) || rpc.jsonrpc !== "2.0" || typeof rpc.method !== "string") {
+  if (!isRecord11(rpc) || rpc.jsonrpc !== "2.0" || typeof rpc.method !== "string") {
     send(res, 200, { jsonrpc: "2.0", id: null, error: { code: JSON_RPC_ERROR.invalidRequest, message: 'invalid request: expected a JSON-RPC 2.0 object with a string "method" (batches are not supported)' } });
     return true;
   }
   const id = typeof rpc.id === "string" || typeof rpc.id === "number" ? rpc.id : null;
   const method = rpc.method;
-  const params = isRecord9(rpc.params) ? rpc.params : {};
+  const params = isRecord11(rpc.params) ? rpc.params : {};
   const requested = negotiateVersion(
     typeof req.headers["a2a-version"] === "string" ? req.headers["a2a-version"] : void 0,
     new URL(req.url ?? "/", "http://localhost").searchParams.get("version")
@@ -48811,14 +49642,14 @@ async function handleA2aTaskRequest(req, res, path, deps2) {
           throw new RpcFailure(JSON_RPC_ERROR.unsupportedOperation, `method "SendMessage" is not allowed for app "${appId}": its manifest does not declare accepts.tasks: true`);
         }
         const rawMessage = params.message;
-        if (!isRecord9(rawMessage) || rawMessage.role !== "ROLE_USER") {
+        if (!isRecord11(rawMessage) || rawMessage.role !== "ROLE_USER") {
           throw new RpcFailure(JSON_RPC_ERROR.invalidParams, 'params.message must be an object with role "ROLE_USER"');
         }
         const parts = parseParts(rawMessage.parts);
         const { skill, prompt } = extractSkillRequest(
-          { parts, ...isRecord9(rawMessage.metadata) ? { metadata: rawMessage.metadata } : {} },
+          { parts, ...isRecord11(rawMessage.metadata) ? { metadata: rawMessage.metadata } : {} },
           appId,
-          isRecord9(params.metadata) ? params.metadata : void 0
+          isRecord11(params.metadata) ? params.metadata : void 0
         );
         if (!skill) {
           throw new RpcFailure(JSON_RPC_ERROR.invalidParams, 'no skill requested: set message.metadata.skill or start the first text part with "skill:<id>"');
@@ -49828,6 +50659,7 @@ async function startHttpServer(opts) {
     const auth = readAuth();
     if (auth.mode !== "bearer") return true;
     if (path === "/health") return true;
+    if (opts.eventsMcp && path.startsWith("/mcp/events/")) return true;
     if (/^\/inbound\/[^/]+$/.test(path)) return true;
     if (isAppUiShellRequest(method, path)) return true;
     const header = req.headers.authorization;
@@ -50094,6 +50926,47 @@ async function startHttpServer(opts) {
     const server2 = await opts.orchestratorMcpServerFactory(scope);
     await serveMcp(req, res, server2);
   }
+  const EVENTS_BODY_CAP = 1024 * 1024;
+  async function handleEventsMcp(req, res, presented) {
+    const cfg = opts.eventsMcp;
+    const send2 = (status, headers, body) => {
+      res.writeHead(status, { "cache-control": "no-store", ...headers });
+      res.end(body);
+    };
+    if (!cfg) return send2(404, { "content-type": "application/json" }, JSON.stringify({ error: "not_found" }));
+    const want = Buffer.from(cfg.secret);
+    const got = Buffer.from(presented);
+    if (got.length !== want.length || !timingSafeEqual(got, want)) {
+      return send2(404, { "content-type": "application/json" }, JSON.stringify({ error: "not_found" }));
+    }
+    const origin = req.headers.origin;
+    if (typeof origin === "string" && !(cfg.allowedOrigins ?? []).includes(origin)) {
+      return send2(403, { "content-type": "application/json" }, JSON.stringify({ error: "origin_not_allowed" }));
+    }
+    const chunks = [];
+    let size = 0;
+    for await (const chunk of req) {
+      const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+      size += buf.length;
+      if (size > EVENTS_BODY_CAP) {
+        return send2(413, { "content-type": "application/json" }, JSON.stringify({ error: "body_too_large" }));
+      }
+      chunks.push(buf);
+    }
+    const controller = new AbortController();
+    res.on("close", () => {
+      if (!res.writableEnded) controller.abort();
+    });
+    const out = await handleModernRequest(
+      {
+        method: req.method ?? "GET",
+        headers: req.headers,
+        body: Buffer.concat(chunks).toString("utf8")
+      },
+      { createServer: cfg.createServer, signal: controller.signal }
+    );
+    send2(out.status, out.headers, out.body);
+  }
   async function handleImportedMcp(req, res, importId) {
     if (!authorizeMcp(req, res)) return;
     if (!opts.mcpProxy) {
@@ -50360,7 +51233,7 @@ async function startHttpServer(opts) {
           });
         }
         applyCors(req, res);
-        if (req.method === "OPTIONS") {
+        if (req.method === "OPTIONS" && !(opts.eventsMcp && path.startsWith("/mcp/events/"))) {
           res.writeHead(204);
           res.end();
           return;
@@ -50387,6 +51260,21 @@ async function startHttpServer(opts) {
           handleEvents(req, res);
           return;
         }
+        if (path.startsWith("/mcp/events/")) {
+          let presented;
+          try {
+            presented = decodeURIComponent(path.slice("/mcp/events/".length));
+          } catch (error) {
+            if (!(error instanceof URIError)) throw error;
+          }
+          if (presented === void 0) {
+            res.writeHead(404, { "content-type": "application/json", "cache-control": "no-store" });
+            res.end(JSON.stringify({ error: "not_found" }));
+            return;
+          }
+          await handleEventsMcp(req, res, presented);
+          return;
+        }
         if (path === "/mcp/orchestrator") {
           await handleOrchestratorMcp(req, res);
           return;
@@ -50994,15 +51882,17 @@ async function startHttpServer(opts) {
           try {
             const base = str3("base");
             const anchor = str3("anchor");
-            const result = await opts.runBranchGc({
-              repoRoot: resolved.repoRoot,
-              apply,
-              includeReviewed: bool3("includeReviewed"),
-              ...base ? { base } : {},
-              ...scopes?.length ? { scopes } : {},
-              ...minAgeDays !== void 0 && Number.isFinite(minAgeDays) ? { minAgeDays } : {},
-              ...anchor ? { anchor } : {}
-            });
+            const result = withBranchGcApplySummary(
+              await opts.runBranchGc({
+                repoRoot: resolved.repoRoot,
+                apply,
+                includeReviewed: bool3("includeReviewed"),
+                ...base ? { base } : {},
+                ...scopes?.length ? { scopes } : {},
+                ...minAgeDays !== void 0 && Number.isFinite(minAgeDays) ? { minAgeDays } : {},
+                ...anchor ? { anchor } : {}
+              })
+            );
             res.writeHead(200, { "content-type": "application/json" });
             res.end(JSON.stringify(result));
           } catch (err) {
@@ -52074,16 +52964,16 @@ async function startHttpServer(opts) {
     });
   });
   const bind = opts.bind ?? "127.0.0.1";
-  await new Promise((resolve45, reject) => {
+  await new Promise((resolve47, reject) => {
     server.once("error", reject);
-    server.listen(opts.port, bind, () => resolve45());
+    server.listen(opts.port, bind, () => resolve47());
   });
   return {
     url: `http://${bind}:${opts.port}`,
     async stop() {
       wss.close();
       server.closeAllConnections();
-      await new Promise((resolve45) => server.close(() => resolve45()));
+      await new Promise((resolve47) => server.close(() => resolve47()));
     }
   };
 }
@@ -52292,9 +53182,9 @@ async function currentTranscriptSeq(id) {
   let stream;
   try {
     stream = createReadStream(filePath, { encoding: "utf8" });
-    await new Promise((resolve45, reject) => {
+    await new Promise((resolve47, reject) => {
       stream.once("error", reject);
-      stream.once("open", resolve45);
+      stream.once("open", resolve47);
     });
   } catch (err) {
     if (err.code === "ENOENT") return 0;
@@ -52319,9 +53209,9 @@ async function* transcriptDiskRecords(id) {
   let stream;
   try {
     stream = createReadStream(filePath, { encoding: "utf8" });
-    await new Promise((resolve45, reject) => {
+    await new Promise((resolve47, reject) => {
       stream.once("error", reject);
-      stream.once("open", resolve45);
+      stream.once("open", resolve47);
     });
   } catch (err) {
     if (err.code === "ENOENT") return;
@@ -52823,8 +53713,45 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
       if (kindParam && kindParam !== "all") return s.kind === kindParam;
       return includeCommands || s.kind !== "command";
     };
+    const listFilters = parseSessionListFilterParams(params);
+    if (listFilters.parentSessionId) {
+      listFilters.parentSessionId = registry.findByIdOrName(listFilters.parentSessionId)?.id ?? listFilters.parentSessionId;
+    }
+    const statusParam = params.get("status");
+    const onlyAlive = params.get("onlyAlive") === "true";
+    const limitParam = params.get("limit");
+    const limit = limitParam === null ? void 0 : Number.parseInt(limitParam, 10);
+    if (limit !== void 0 && (!Number.isInteger(limit) || limit < 1)) {
+      json3(400, {
+        error: "invalid_limit",
+        message: `?limit must be a positive integer, got ${JSON.stringify(limitParam)}.`
+      });
+      return true;
+    }
+    const narrowed = hasSessionListFilters(listFilters) || statusParam !== null || onlyAlive || limit !== void 0;
+    let narrow;
+    try {
+      const keep = compileSessionListFilters(listFilters);
+      narrow = (list) => list.filter((s) => {
+        if (statusParam) {
+          if (s.status !== statusParam) return false;
+        } else if (onlyAlive && s.status !== "running" && s.status !== "starting") {
+          return false;
+        }
+        return keep(s);
+      });
+    } catch (err) {
+      if (err instanceof SessionListFilterError) {
+        json3(400, { error: "invalid_filter", message: err.message });
+        return true;
+      }
+      throw err;
+    }
     let rows = registry.list({ includeArchived });
-    rows = rows.filter(matchesFilter);
+    rows = narrow(rows.filter(matchesFilter));
+    if (narrowed) rows = sortNewestActivityFirst(rows);
+    const total = rows.length;
+    if (limit !== void 0 && sinceParam === null) rows = rows.slice(0, limit);
     let body;
     if (sinceParam !== null) {
       const sinceMs = Date.parse(sinceParam);
@@ -52840,11 +53767,14 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
         return Number.isNaN(ts) || ts >= sinceMs;
       });
       const removed = includeArchived ? [] : registry.list({ includeArchived: true }).filter(
-        (s) => s.archived && matchesFilter(s) && (s.archivedAt === void 0 || Date.parse(s.archivedAt) >= sinceMs)
+        (s) => s.archived && matchesFilter(s) && narrow([s]).length > 0 && (s.archivedAt === void 0 || Date.parse(s.archivedAt) >= sinceMs)
       ).map((s) => s.id);
       body = { sessions: changed.map((s) => projectSessionForHttp(s, fields)), removed };
     } else {
-      body = { sessions: rows.map((s) => projectSessionForHttp(s, fields)) };
+      body = {
+        sessions: rows.map((s) => projectSessionForHttp(s, fields)),
+        ...narrowed ? { total } : {}
+      };
     }
     const serialized = JSON.stringify(body);
     const etag = strongEtag(serialized);
@@ -54077,9 +55007,9 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
     let fileStream;
     try {
       fileStream = createReadStream(filePath, { encoding: "utf8" });
-      await new Promise((resolve45, reject) => {
+      await new Promise((resolve47, reject) => {
         fileStream.once("error", reject);
-        fileStream.once("open", resolve45);
+        fileStream.once("open", resolve47);
       });
     } catch (err) {
       const code = err.code;
@@ -54135,9 +55065,9 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
     let fileStream;
     try {
       fileStream = createReadStream(filePath, { encoding: "utf8" });
-      await new Promise((resolve45, reject) => {
+      await new Promise((resolve47, reject) => {
         fileStream.once("error", reject);
-        fileStream.once("open", resolve45);
+        fileStream.once("open", resolve47);
       });
     } catch (err) {
       const code = err.code;
@@ -54527,7 +55457,7 @@ async function handleSentinels(req, res, path, deps2) {
     res.end(JSON.stringify(body));
   };
   if (path === "/sentinels" && req.method === "GET") {
-    json3(200, { sentinels: deps2.store.list().map(sentinelView) });
+    json3(200, { sentinels: deps2.store.list().map((s) => sentinelViewWithDelivery(s, deps2.deliveryStatus?.(s.id))) });
     return true;
   }
   if (path === "/sentinels" && req.method === "POST") {
@@ -54581,7 +55511,10 @@ async function handleSentinels(req, res, path, deps2) {
     return true;
   }
   if (req.method === "DELETE") {
-    const removed = await cancelSentinelWatch({ store: deps2.store, resolveProvider: deps2.resolveProvider }, id);
+    const removed = await cancelSentinelWatch(
+      { store: deps2.store, resolveProvider: deps2.resolveProvider, ...deps2.tombstones ? { tombstones: deps2.tombstones } : {} },
+      id
+    );
     if (!removed) {
       json3(404, { error: "sentinel_not_found", id });
       return true;
@@ -56891,7 +57824,7 @@ function createTransmitterBindingStore(opts) {
   const nowMs = Date.now;
   const debounceMs = PERSIST_DEBOUNCE_MS6;
   let persistTimer = null;
-  const load = () => {
+  const load2 = () => {
     const out = /* @__PURE__ */ new Map();
     let raw;
     try {
@@ -56916,7 +57849,7 @@ function createTransmitterBindingStore(opts) {
     }
     return out;
   };
-  const bindings = load();
+  const bindings = load2();
   const snapshot = () => {
     const out = {};
     for (const [key, binding] of bindings.entries()) out[key] = binding;
@@ -56976,7 +57909,7 @@ function createInboundEndpointStore(opts) {
   const debounceMs = opts?.debounceMs ?? PERSIST_DEBOUNCE_MS7;
   const persist = opts?.persist ?? opts?.filePath !== void 0;
   let persistTimer = null;
-  const load = () => {
+  const load2 = () => {
     const out = /* @__PURE__ */ new Map();
     if (!persist) return out;
     let raw;
@@ -57002,7 +57935,7 @@ function createInboundEndpointStore(opts) {
     }
     return out;
   };
-  const endpoints = load();
+  const endpoints = load2();
   const seen = /* @__PURE__ */ new Map();
   let totalSeen = 0;
   const snapshot = () => {
@@ -57165,6 +58098,299 @@ init_session_message();
 init_sessions();
 init_session_end_reason();
 init_session_retirement();
+var tmpSeq6 = 0;
+var tmpPathFor2 = (filePath) => `${filePath}.tmp.${process.pid}.${++tmpSeq6}`;
+function isDirSyncUnsupported(err) {
+  const code = err.code;
+  return code === "EINVAL" || code === "EPERM" || code === "EISDIR" || code === "ENOTSUP";
+}
+async function writeFileDurable(filePath, data, opts = {}) {
+  const mode = opts.mode ?? 384;
+  const dir = dirname(filePath);
+  await promises.mkdir(dir, { recursive: true });
+  const tmp = tmpPathFor2(filePath);
+  try {
+    const fh = await promises.open(tmp, "w", mode);
+    try {
+      await fh.writeFile(data);
+      await fh.chmod(mode);
+      await fh.sync();
+    } finally {
+      await fh.close();
+    }
+    if (opts.commitIf && !opts.commitIf()) {
+      await promises.unlink(tmp).catch(() => void 0);
+      return;
+    }
+    await promises.rename(tmp, filePath);
+  } catch (err) {
+    await promises.unlink(tmp).catch(() => void 0);
+    throw err;
+  }
+  try {
+    const dh = await promises.open(dir, "r");
+    try {
+      await dh.sync();
+    } finally {
+      await dh.close();
+    }
+  } catch (err) {
+    if (!isDirSyncUnsupported(err)) throw err;
+  }
+}
+function writeFileDurableSync(filePath, data, mode = 384) {
+  const dir = dirname(filePath);
+  mkdirSync(dir, { recursive: true });
+  const tmp = tmpPathFor2(filePath);
+  try {
+    const fd = openSync(tmp, "w", mode);
+    try {
+      writeSync(fd, data);
+      fsyncSync(fd);
+    } finally {
+      closeSync(fd);
+    }
+    renameSync(tmp, filePath);
+  } catch (err) {
+    try {
+      unlinkSync(tmp);
+    } catch {
+    }
+    throw err;
+  }
+  try {
+    const dfd = openSync(dir, "r");
+    try {
+      fsyncSync(dfd);
+    } finally {
+      closeSync(dfd);
+    }
+  } catch (err) {
+    if (!isDirSyncUnsupported(err)) throw err;
+  }
+}
+function appendLineDurableSync(filePath, line, mode = 384) {
+  mkdirSync(dirname(filePath), { recursive: true });
+  const existed = (() => {
+    try {
+      closeSync(openSync(filePath, "r"));
+      return true;
+    } catch {
+      return false;
+    }
+  })();
+  const fd = openSync(filePath, "a", mode);
+  try {
+    appendFileSync(fd, line.endsWith("\n") ? line : `${line}
+`);
+    fsyncSync(fd);
+  } finally {
+    closeSync(fd);
+  }
+  if (!existed) {
+    try {
+      const dfd = openSync(dirname(filePath), "r");
+      try {
+        fsyncSync(dfd);
+      } finally {
+        closeSync(dfd);
+      }
+    } catch (err) {
+      if (!isDirSyncUnsupported(err)) throw err;
+    }
+  }
+}
+
+// src/sentinel-cancel-tombstones.ts
+function defaultCancelTombstonePath() {
+  return resolve(process.env.AGENTPROTO_HOME ?? join(homedir(), ".agentproto"), "sentinel-cancel-tombstones.json");
+}
+var SECRETISH = /secret|token|key|password|credential|authorization/i;
+function stripSecrets(handle) {
+  const state = {};
+  for (const [k, v] of Object.entries(handle.state ?? {})) if (!SECRETISH.test(k)) state[k] = v;
+  return {
+    provider: handle.provider,
+    ...handle.remoteId !== void 0 ? { remoteId: handle.remoteId } : {},
+    ...handle.cursor !== void 0 ? { cursor: handle.cursor } : {},
+    ...Object.keys(state).length > 0 ? { state } : {}
+  };
+}
+var keyOf2 = (provider, remoteId) => `${provider}|${remoteId}`;
+function load(filePath) {
+  try {
+    const parsed = JSON.parse(readFileSync(filePath, "utf8"));
+    if (!Array.isArray(parsed.tombstones)) return [];
+    return parsed.tombstones.filter(
+      (t) => typeof t === "object" && t !== null && typeof t.key === "string"
+    );
+  } catch {
+    return [];
+  }
+}
+function createCancelTombstoneStore(opts) {
+  const nowMs = opts.nowMs ?? Date.now;
+  const log = opts.log ?? ((line) => console.warn(line));
+  const base = opts.baseBackoffMs ?? 3e4;
+  const max = opts.maxBackoffMs ?? 60 * 60 * 1e3;
+  const rows = /* @__PURE__ */ new Map();
+  if (opts.filePath) for (const t of load(opts.filePath)) rows.set(t.key, t);
+  let writeTail = Promise.resolve();
+  function persist() {
+    if (!opts.filePath) return Promise.resolve();
+    const filePath = opts.filePath;
+    const run = () => writeFileDurable(filePath, JSON.stringify({ version: 1, tombstones: [...rows.values()] }, null, 2));
+    const next = writeTail.then(run, run);
+    writeTail = next.catch(() => void 0);
+    return next;
+  }
+  const inFlight2 = /* @__PURE__ */ new Map();
+  async function attempt(t, explicit = false) {
+    const running = inFlight2.get(t.key);
+    if (running) return running;
+    const p = (async () => {
+      if (!explicit && opts.isRemoteInUse?.(t.provider, t.remoteId)) {
+        rows.delete(t.key);
+        await persist().catch((err) => log(`[sentinel-tombstones] persist failed: ${String(err)}`));
+        return true;
+      }
+      const provider = await opts.resolveProvider(t.provider);
+      let error;
+      if (!provider) error = `unknown sentinel provider "${t.provider}"`;
+      else {
+        try {
+          await provider.cancel(t.handle);
+        } catch (err) {
+          error = err instanceof Error ? err.message : String(err);
+        }
+      }
+      const live = rows.get(t.key);
+      if (error === void 0) {
+        if (live) rows.delete(t.key);
+        await persist().catch((err) => log(`[sentinel-tombstones] persist failed: ${String(err)}`));
+        return true;
+      }
+      if (live) {
+        live.attempts += 1;
+        live.lastAttemptAt = nowMs();
+        live.lastError = error.slice(0, 300);
+        live.nextAttemptAt = nowMs() + Math.min(max, base * 2 ** Math.min(live.attempts, 20));
+        await persist().catch((err) => log(`[sentinel-tombstones] persist failed: ${String(err)}`));
+      }
+      return false;
+    })().finally(() => inFlight2.delete(t.key));
+    inFlight2.set(t.key, p);
+    return p;
+  }
+  return {
+    async cancel(handle, afterRecorded) {
+      const provider = await opts.resolveProvider(handle.provider);
+      if (!handle.remoteId || !provider?.exclusiveRemote) {
+        afterRecorded?.();
+        let converged2 = true;
+        try {
+          await provider?.cancel(handle);
+        } catch {
+          converged2 = false;
+        }
+        return { converged: converged2 };
+      }
+      const key = keyOf2(handle.provider, handle.remoteId);
+      let t = rows.get(key);
+      if (!t) {
+        const now = nowMs();
+        t = {
+          key,
+          provider: handle.provider,
+          remoteId: handle.remoteId,
+          handle: stripSecrets(handle),
+          createdAt: now,
+          attempts: 0,
+          nextAttemptAt: now
+        };
+        rows.set(key, t);
+        try {
+          await persist();
+        } catch (err) {
+          rows.delete(key);
+          throw err;
+        }
+      }
+      afterRecorded?.();
+      const converged = await attempt(t, true);
+      const remaining = rows.get(key);
+      return { converged, ...remaining ? { tombstone: remaining } : {} };
+    },
+    async sweep() {
+      const now = nowMs();
+      const due = [...rows.values()].filter((t) => t.nextAttemptAt <= now);
+      let converged = 0;
+      for (const t of due) if (await attempt(t)) converged++;
+      return { attempted: due.length, converged, remaining: rows.size };
+    },
+    list: () => [...rows.values()],
+    has: (provider, remoteId) => rows.has(keyOf2(provider, remoteId))
+  };
+}
+function defaultSentinelQuarantinePath() {
+  return resolve(process.env.AGENTPROTO_HOME ?? join(homedir(), ".agentproto"), "sentinel-quarantine.jsonl");
+}
+function keyFor(sentinelId, provider, item) {
+  const identity = item.remoteDeliveryId ?? (item.seq !== void 0 ? `seq:${item.seq}` : "");
+  return [sentinelId, provider, identity, item.digest ?? ""].join("|");
+}
+function loadFile(filePath) {
+  if (!existsSync(filePath)) return [];
+  const out = [];
+  for (const line of readFileSync(filePath, "utf8").split("\n")) {
+    if (line.trim() === "") continue;
+    try {
+      const rec = JSON.parse(line);
+      if (rec && typeof rec.key === "string") out.push(rec);
+    } catch {
+    }
+  }
+  return out;
+}
+function createSentinelQuarantine(opts = {}) {
+  const nowMs = opts.nowMs ?? Date.now;
+  const records = /* @__PURE__ */ new Map();
+  let loaded = false;
+  function ensureLoaded() {
+    if (loaded) return;
+    if (opts.filePath) for (const rec of loadFile(opts.filePath)) records.set(rec.key, rec);
+    loaded = true;
+  }
+  return {
+    record({ sentinelId, provider, remoteId, item }) {
+      ensureLoaded();
+      const key = keyFor(sentinelId, provider, item);
+      const existing = records.get(key);
+      if (existing) return existing;
+      const rec = {
+        key,
+        quarantinedAt: new Date(nowMs()).toISOString(),
+        sentinelId,
+        provider,
+        ...remoteId !== void 0 ? { remoteId } : {},
+        ...item.seq !== void 0 ? { seq: item.seq } : {},
+        ...item.remoteDeliveryId !== void 0 ? { remoteDeliveryId: item.remoteDeliveryId } : {},
+        error: item.error,
+        ...item.excerpt ? { excerpt: item.excerpt } : {},
+        ...item.digest !== void 0 ? { digest: item.digest } : {},
+        ...item.bytes !== void 0 ? { bytes: item.bytes } : {}
+      };
+      if (opts.filePath) appendLineDurableSync(opts.filePath, JSON.stringify(rec));
+      records.set(key, rec);
+      return rec;
+    },
+    list(filter) {
+      ensureLoaded();
+      const all = [...records.values()];
+      return filter?.sentinelId ? all.filter((r) => r.sentinelId === filter.sentinelId) : all;
+    }
+  };
+}
 
 // src/webhook-egress/delivery.ts
 init_signing();
@@ -57352,7 +58578,7 @@ function finalHeaders(headers, hostname6, port) {
   return { ...headers, Host: port === 443 ? hostname6 : `${hostname6}:${port}` };
 }
 function rawPost(args) {
-  return new Promise((resolve45, reject) => {
+  return new Promise((resolve47, reject) => {
     const req = request({
       // Connect to the PRE-VALIDATED address; keep the original hostname in
       // `servername` so SNI and the certificate check never loosen.
@@ -57376,7 +58602,7 @@ function rawPost(args) {
     const ok4 = (status, body) => {
       if (settled) return;
       settled = true;
-      resolve45({ status, body });
+      resolve47({ status, body });
     };
     req.setTimeout(args.timeoutMs, () => fail4("timeout", `no response within ${args.timeoutMs}ms`));
     req.on("error", (err) => {
@@ -57411,6 +58637,23 @@ function rawPost(args) {
 }
 
 // src/webhook-egress/delivery.ts
+function callbackHost(url) {
+  try {
+    return new URL(url).host;
+  } catch {
+    return "invalid-url";
+  }
+}
+function redactUrls(text13) {
+  return text13.replace(/https?:\/\/[^\s'"<>)]+/gi, (m) => {
+    try {
+      const u = new URL(m);
+      return `${u.protocol}//${u.host}`;
+    } catch {
+      return "<url>";
+    }
+  });
+}
 var CLAMP_LIMIT_BYTES = 262144;
 var MAX_ATTEMPTS = 5;
 var BACKOFF_BASE_MS = 250;
@@ -57442,6 +58685,12 @@ async function deliverEventEnvelope(replay, event, deps2 = {}) {
   const sleep3 = deps2.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const fetcher = deps2.fetch ?? ((url, init) => ssrfFetch(url, init));
   const { bytes: payloadBytes } = envelopeClampedBytes(event);
+  const note = (info) => {
+    try {
+      deps2.onAttempt?.(info);
+    } catch {
+    }
+  };
   const delivery = { attempts: 0 };
   for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
     if (attempt > 0) await sleep3(deliveryBackoffDelay(attempt));
@@ -57453,30 +58702,40 @@ async function deliverEventEnvelope(replay, event, deps2 = {}) {
       signed = signWebhook({ msgId: event.eventId, timestamp, payload: payloadBytes, secrets: replay.secrets });
     } catch (err) {
       delivery.lastError = `signing failed: ${err.message}`;
+      note({ attempt: delivery.attempts, error: "invalid_secret", outcome: "dead" });
       return { ok: false, reason: "invalid_secret", delivery };
     }
     let response;
     try {
       response = await fetcher(replay.callbackUrl, {
         method: "POST",
-        headers: { ...signed, "content-type": "application/json" },
+        headers: { ...signed, "content-type": "application/json", "X-MCP-Subscription-Id": replay.subId },
         body: payloadBytes,
         timeoutMs: 15e3
         // delivery default (challenge uses 10_000)
       });
     } catch (err) {
-      delivery.lastError = err instanceof Error ? err.message : String(err);
-      if (attempt < MAX_ATTEMPTS - 1) continue;
+      delivery.lastError = redactUrls(err instanceof Error ? err.message : String(err));
+      const last = attempt >= MAX_ATTEMPTS - 1;
+      note({ attempt: delivery.attempts, error: delivery.lastError, outcome: last ? "dead" : "retry" });
+      if (!last) continue;
       return { ok: false, reason: "network", delivery };
     }
     if (response.status >= 200 && response.status <= 299) {
+      note({ attempt: delivery.attempts, status: response.status, outcome: "delivered" });
       return { ok: true, delivery };
     }
     if (TERMINAL_NO_RETRY_STATUSES.has(response.status)) {
       delivery.lastError = `terminal status ${response.status}`;
+      note({ attempt: delivery.attempts, status: response.status, outcome: "dead" });
       return { ok: false, reason: `http_${response.status}`, delivery };
     }
     delivery.lastError = `retryable status ${response.status}`;
+    note({
+      attempt: delivery.attempts,
+      status: response.status,
+      outcome: attempt >= MAX_ATTEMPTS - 1 ? "dead" : "retry"
+    });
   }
   return { ok: false, reason: "retries_exhausted", delivery };
 }
@@ -57891,13 +59150,16 @@ function invalidParams(reason, detail) {
 function callbackEndpointError(reason, detail) {
   return new McpEventsError(-32015, `CallbackEndpointError: ${detail}`, { reason });
 }
+function backingSubscriptionError(reason, detail, subscriptionId2) {
+  return new McpEventsError(-32016, `BackingSubscriptionError: ${detail}`, { reason, subscriptionId: subscriptionId2 });
+}
 var mutationChain = Promise.resolve();
 function withSubscribeMutex(fn) {
   const run = mutationChain.then(fn, fn);
   mutationChain = run.catch(() => void 0);
   return run;
 }
-function isRecord10(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var LIST_PAGE_DEFAULT = 50;
@@ -57918,7 +59180,7 @@ function decodeListCursor(cursor) {
   }
 }
 function requireWebhookDelivery(delivery) {
-  if (!isRecord10(delivery) || delivery.mode !== "webhook") {
+  if (!isRecord12(delivery) || delivery.mode !== "webhook") {
     throw invalidParams("unsupported_delivery_mode", 'delivery.mode must be "webhook"');
   }
   if (typeof delivery.url !== "string" || delivery.url.length === 0) {
@@ -57927,7 +59189,7 @@ function requireWebhookDelivery(delivery) {
   return { mode: "webhook", url: delivery.url, ...typeof delivery.secret === "string" ? { secret: delivery.secret } : {} };
 }
 function validateArgsOrThrow(name, registration, args) {
-  if (!isRecord10(args)) throw invalidParams("invalid_arguments", "`arguments` must be an object");
+  if (!isRecord12(args)) throw invalidParams("invalid_arguments", "`arguments` must be an object");
   const schemaCheck = validateAgainstInputSchema(registration.definition.inputSchema, args);
   if (!schemaCheck.ok) {
     throw invalidParams("invalid_arguments", `arguments for "${name}": ${schemaCheck.reason}`);
@@ -57983,10 +59245,30 @@ async function eventsSubscribe(input, ctx) {
       if (target.kind !== "webhook") {
         throw invalidParams("identity_conflict", `subscription ${id} exists with a non-webhook target`);
       }
+      let handle2 = existing.handle;
+      const provider2 = await ctx.resolveProvider(existing.provider);
+      if (provider2?.renew) {
+        try {
+          handle2 = await provider2.renew(existing.handle, until);
+        } catch (err) {
+          if (err instanceof SentinelBackingExpiredError) {
+            throw backingSubscriptionError(
+              "backing_subscription_expired",
+              `${err.message}; unsubscribe and subscribe again`,
+              id
+            );
+          }
+          throw backingSubscriptionError(
+            "backing_renew_failed",
+            err instanceof Error ? err.message : String(err),
+            id
+          );
+        }
+      }
       const ref = ctx.store.materializeWebhookTargetRef(target);
       if (ref !== void 0) ctx.store.putSentinelSecret(ref, { secret });
-      ctx.store.update(id, { spec: { ...existing.spec, until }, status: "active" });
-      return { id, refreshBefore: computeRefreshBefore(until), cursor: null };
+      ctx.store.update(id, { spec: { ...existing.spec, until }, handle: handle2, status: "active" });
+      return { id, refreshBefore: computeRefreshBefore(until), cursor: null, truncated: false };
     }
     const provider = await ctx.resolveProvider(mapped.providerSlug);
     if (!provider) {
@@ -58002,7 +59284,7 @@ async function eventsSubscribe(input, ctx) {
       sentinelId: id
     });
     ctx.store.create({ id, spec, provider: mapped.providerSlug, handle });
-    return { id, refreshBefore: computeRefreshBefore(until), cursor: null };
+    return { id, refreshBefore: computeRefreshBefore(until), cursor: null, truncated: false };
   });
 }
 async function eventsUnsubscribe(input, ctx) {
@@ -58022,6 +59304,13 @@ async function eventsUnsubscribe(input, ctx) {
   await withSubscribeMutex(async () => {
     const existing = ctx.store.get(id);
     if (!existing) return;
+    if (ctx.tombstones) {
+      try {
+        await ctx.tombstones.cancel(existing.handle, () => ctx.store.remove(id));
+        return;
+      } catch {
+      }
+    }
     const provider = await ctx.resolveProvider(existing.provider);
     if (provider) {
       try {
@@ -58051,7 +59340,6 @@ var PERSIST_DEBOUNCE_MS8 = 1500;
 var DELIVERED_REAP_MS = 24 * 60 * 60 * 1e3;
 var PENDING_AGE_OUT_MS = 7 * 24 * 60 * 60 * 1e3;
 var ROW_CAP = 2e3;
-var tmpSeq6 = 0;
 function webhookRequestId(sentinelId, eventId) {
   const digest = createHash("sha256").update(`${sentinelId}:${eventId}`).digest("hex");
   return `sub_${digest.slice(0, 32)}`;
@@ -58065,9 +59353,22 @@ function createSentinelWebhookOutbox(opts) {
   const debounceMs = opts.debounceMs ?? PERSIST_DEBOUNCE_MS8;
   const log = opts.log ?? ((line) => console.warn(line));
   const persist = opts.persist ?? opts.filePath !== void 0;
-  const deliverEvent = opts.deliverEvent ?? (async (input) => deliverEventEnvelope(input.replay, input.row.envelope));
+  const deliveryLog = (row, host, detail) => {
+    log(`[sentinel-webhook-outbox] sentinel=${row.sentinelId} event=${row.eventId} host=${host} ${detail}`);
+  };
+  const deliverEvent = opts.deliverEvent ?? (async (input) => {
+    const host = callbackHost(input.replay.callbackUrl);
+    return deliverEventEnvelope(input.replay, input.row.envelope, {
+      ...opts.deliverDeps,
+      onAttempt: (a) => deliveryLog(
+        input.row,
+        host,
+        `attempt=${a.attempt} ${a.status !== void 0 ? `http=${a.status}` : `error="${a.error ?? "unknown"}"`} ${a.outcome}`
+      )
+    });
+  });
   const rowKey = (sentinelId, eventId) => `${sentinelId}::${eventId}`;
-  const load = () => {
+  const load2 = () => {
     const out = /* @__PURE__ */ new Map();
     if (!persist) return out;
     let raw;
@@ -58091,28 +59392,34 @@ function createSentinelWebhookOutbox(opts) {
     }
     return out;
   };
-  const rows = load();
+  const rows = load2();
   const snapshot = () => {
     const out = {};
     for (const [key, row] of rows.entries()) out[key] = row;
     return out;
   };
   let persistTimer = null;
+  let writeTail = Promise.resolve();
+  let syncGeneration = 0;
+  const persistNow = () => {
+    if (!persist) return Promise.resolve();
+    const run = async () => {
+      const generation = syncGeneration;
+      const body = JSON.stringify(snapshot(), null, 2) + "\n";
+      await writeFileDurable(filePath, body, { commitIf: () => generation === syncGeneration });
+    };
+    const next = writeTail.then(run, run);
+    writeTail = next.catch(() => void 0);
+    return next;
+  };
   const schedulePersist = () => {
     if (!persist) return;
     if (persistTimer) clearTimeout(persistTimer);
     persistTimer = setTimeout(() => {
-      void (async () => {
-        try {
-          await promises.mkdir(dirname(filePath), { recursive: true });
-          const tmp = `${filePath}.tmp.${process.pid}.${++tmpSeq6}`;
-          await promises.writeFile(tmp, JSON.stringify(snapshot(), null, 2) + "\n", { mode: 384 });
-          await promises.chmod(tmp, 384);
-          await promises.rename(tmp, filePath);
-        } catch (err) {
-          log(`[sentinel-webhook-outbox] persist failed: ${err instanceof Error ? err.message : String(err)}`);
-        }
-      })();
+      persistTimer = null;
+      persistNow().catch((err) => {
+        log(`[sentinel-webhook-outbox] persist failed: ${err instanceof Error ? err.message : String(err)}`);
+      });
     }, debounceMs);
   };
   const flushSync = () => {
@@ -58121,12 +59428,9 @@ function createSentinelWebhookOutbox(opts) {
       clearTimeout(persistTimer);
       persistTimer = null;
     }
+    syncGeneration++;
     try {
-      mkdirSync(dirname(filePath), { recursive: true });
-      const tmp = `${filePath}.tmp.${process.pid}.${++tmpSeq6}`;
-      writeFileSync(tmp, JSON.stringify(snapshot(), null, 2) + "\n", { mode: 384 });
-      chmodSync(tmp, 384);
-      renameSync(tmp, filePath);
+      writeFileDurableSync(filePath, JSON.stringify(snapshot(), null, 2) + "\n");
     } catch {
     }
   };
@@ -58173,14 +59477,19 @@ function createSentinelWebhookOutbox(opts) {
         row.failReason = outcome.reason;
       }
       row.terminalAt = nowMs();
+      deliveryLog(
+        row,
+        callbackHost(replay.callbackUrl),
+        `final=${row.status} attempts=${outcome.delivery.attempts}` + (outcome.ok ? "" : ` reason=${outcome.reason}`)
+      );
     } catch (err) {
       row.deliveryState = {
         ...row.deliveryState ?? { attempts: 0 },
-        lastError: err instanceof Error ? err.message : String(err),
+        lastError: redactUrls(err instanceof Error ? err.message : String(err)),
         lastAt: new Date(nowMs()).toISOString()
       };
       row.status = "pending";
-      log(`[sentinel-webhook-outbox] dispatch failed, row left pending: ${row.sentinelId} ${row.eventId}`);
+      deliveryLog(row, callbackHost(replay.callbackUrl), "dispatch failed, row left pending");
     }
     schedulePersist();
     if (row.status === "delivered" || row.status === "dead") {
@@ -58203,7 +59512,14 @@ function createSentinelWebhookOutbox(opts) {
       const key = rowKey(sentinelId, event.id);
       const existing = rows.get(key);
       if (existing) {
-        if (existing.status !== "pending") opts.onTerminal(sentinelId, existing);
+        if (existing.status !== "pending") {
+          opts.onTerminal(sentinelId, existing);
+          return void 0;
+        }
+        await writeTail;
+        if (rows.get(key) !== existing) {
+          throw new Error(`webhook outbox row ${key} was not persisted`);
+        }
         return void 0;
       }
       const envelope = toWebhookEnvelope(event);
@@ -58219,12 +59535,23 @@ function createSentinelWebhookOutbox(opts) {
         envelope,
         event
       };
+      let evicted;
       if (rows.size >= ROW_CAP) {
         const oldest = oldestTerminalRowKey();
-        if (oldest) rows.delete(oldest);
+        const evictedRow = oldest ? rows.get(oldest) : void 0;
+        if (oldest && evictedRow) {
+          evicted = [oldest, evictedRow];
+          rows.delete(oldest);
+        }
       }
       rows.set(key, row);
-      schedulePersist();
+      try {
+        await persistNow();
+      } catch (err) {
+        if (rows.get(key) === row) rows.delete(key);
+        if (evicted && !rows.has(evicted[0])) rows.set(evicted[0], evicted[1]);
+        throw err;
+      }
       enqueueDispatch();
       return row;
     },
@@ -58257,6 +59584,27 @@ function createSentinelWebhookOutbox(opts) {
     rows() {
       return Array.from(rows.values());
     },
+    deliveryStatus(sentinelId) {
+      let latest;
+      let active = false;
+      let dead = 0;
+      for (const row of rows.values()) {
+        if (row.sentinelId !== sentinelId) continue;
+        if (row.status === "pending") active = true;
+        if (row.status === "dead") dead++;
+        if (!latest || (row.terminalAt ?? row.createdAt) >= (latest.terminalAt ?? latest.createdAt)) latest = row;
+      }
+      if (!latest) return void 0;
+      const lastError = latest.deliveryState.lastError ?? latest.failReason ?? latest.deadReason;
+      return {
+        active,
+        ...latest.deliveryState.lastAt ? { lastDeliveryAt: latest.deliveryState.lastAt } : {},
+        lastStatus: latest.status,
+        ...lastError && latest.status !== "delivered" ? { lastError: redactUrls(lastError) } : {},
+        attempts: latest.deliveryState.attempts,
+        dead
+      };
+    },
     flushSync
   };
 }
@@ -58354,14 +59702,27 @@ function createSentinelRuntime(opts) {
     if (store.get(sentinel.id)?.status !== "expired") {
       store.update(sentinel.id, { status: "expired" });
     }
-    const provider = await opts.resolveProvider(sentinel.provider);
-    if (!provider) return;
     try {
-      await provider.cancel(sentinel.handle);
+      await cancelTombstones.cancel(sentinel.handle);
     } catch (err) {
       log(`[sentinel-runtime] expiry cancel failed for ${sentinel.id}: ${describeError(err)}`);
     }
   }
+  const outboxPersistent = opts.outboxPersist ?? (opts.outboxPath !== void 0 || opts.deliverEvent === void 0);
+  const quarantinePath = opts.quarantinePath ?? (outboxPersistent ? defaultSentinelQuarantinePath() : void 0);
+  const quarantine = createSentinelQuarantine({
+    ...quarantinePath !== void 0 ? { filePath: quarantinePath } : {},
+    nowMs
+  });
+  const cancelTombstonePath = opts.cancelTombstonePath ?? (outboxPersistent ? defaultCancelTombstonePath() : void 0);
+  const cancelTombstones = createCancelTombstoneStore({
+    ...cancelTombstonePath !== void 0 ? { filePath: cancelTombstonePath } : {},
+    resolveProvider: opts.resolveProvider,
+    // A live local watch that owns the remote makes the tombstone stale.
+    isRemoteInUse: (provider, remoteId) => store.list().some((s) => s.provider === provider && s.handle.remoteId === remoteId && s.status !== "expired"),
+    nowMs,
+    log
+  });
   const outbox = createSentinelWebhookOutbox({
     ...opts.outboxPath !== void 0 ? { filePath: opts.outboxPath } : {},
     nowMs,
@@ -58383,7 +59744,7 @@ function createSentinelRuntime(opts) {
       if (stored.prevSecret && stored.rotatedAt !== void 0 && nowMs() - stored.rotatedAt < windowMs) {
         secretsOut.push(stored.prevSecret);
       }
-      const subId = `sub_${createHash("sha256").update(`${sentinelId}:${target.url}`).digest("hex").slice(0, 32)}`;
+      const subId = sentinelId;
       return { subId, callbackUrl: target.url, secrets: secretsOut };
     },
     /** Expiry gate consulted BEFORE every dispatch (plan §4 W-B task 2b). */
@@ -58578,13 +59939,21 @@ function createSentinelRuntime(opts) {
   }
   async function processEvents(sentinelId, provider, events) {
     let haltedOnError = false;
+    let stoppedEarly = false;
     let delivered = 0;
     for (const event of events) {
       const current = store.get(sentinelId);
-      if (!current) break;
-      if (!POLLABLE_STATUSES.has(current.status)) break;
+      if (!current) {
+        stoppedEarly = true;
+        break;
+      }
+      if (!POLLABLE_STATUSES.has(current.status)) {
+        stoppedEarly = true;
+        break;
+      }
       if (isExpiredSpec(current)) {
         await expireSentinel(current);
+        stoppedEarly = true;
         break;
       }
       if (store.isSeen(current.id, event.id)) continue;
@@ -58623,7 +59992,7 @@ function createSentinelRuntime(opts) {
       });
       if (updated) await applyLifetime(updated, event, provider);
     }
-    return { haltedOnError, delivered };
+    return { haltedOnError, delivered, stoppedEarly };
   }
   async function pollSentinel(sentinel) {
     const provider = await opts.resolveProvider(sentinel.provider);
@@ -58635,19 +60004,35 @@ function createSentinelRuntime(opts) {
       store.update(sentinel.id, { lastError: describeError(err) });
       return;
     }
-    const { haltedOnError } = await processEvents(sentinel.id, provider, result.events);
-    if (!haltedOnError) {
-      const latest = store.get(sentinel.id);
-      if (latest) {
-        if (provider.ack) {
-          try {
-            await provider.ack(latest.handle, result.cursor);
-          } catch (err) {
-            log(`[sentinel-runtime] ack failed for ${sentinel.id}: ${describeError(err)}`);
-          }
+    let quarantineFailed = false;
+    for (const item of result.malformed ?? []) {
+      try {
+        quarantine.record({
+          sentinelId: sentinel.id,
+          provider: sentinel.provider,
+          ...sentinel.handle.remoteId !== void 0 ? { remoteId: sentinel.handle.remoteId } : {},
+          item
+        });
+      } catch (err) {
+        quarantineFailed = true;
+        log(`[sentinel-runtime] quarantine write failed for ${sentinel.id}: ${describeError(err)}`);
+      }
+    }
+    const { haltedOnError, stoppedEarly } = await processEvents(sentinel.id, provider, result.events);
+    if (haltedOnError || stoppedEarly || quarantineFailed) {
+      if (quarantineFailed) store.update(sentinel.id, { lastError: "quarantine write failed; batch not acknowledged" });
+      return;
+    }
+    const latest = store.get(sentinel.id);
+    if (latest) {
+      if (provider.ack) {
+        try {
+          await provider.ack(latest.handle, result.cursor);
+        } catch (err) {
+          log(`[sentinel-runtime] ack failed for ${sentinel.id}: ${describeError(err)}`);
         }
-        store.update(sentinel.id, { handle: { ...latest.handle, cursor: result.cursor } });
       }
+      store.update(sentinel.id, { handle: { ...latest.handle, cursor: result.cursor } });
     }
   }
   async function pollOnce() {
@@ -58655,6 +60040,7 @@ function createSentinelRuntime(opts) {
     inFlight2 = true;
     try {
       await sweepExpiredSentinels();
+      await cancelTombstones.sweep().catch((err) => log(`[sentinel-runtime] tombstone sweep failed: ${describeError(err)}`));
       outbox.sweep();
       const pollable = store.list().filter((s) => POLLABLE_STATUSES.has(s.status));
       for (const sentinel of pollable) {
@@ -58724,6 +60110,7 @@ function createSentinelRuntime(opts) {
     async start() {
       await reattachAll();
       await sweepExpiredSentinels();
+      await cancelTombstones.sweep().catch((err) => log(`[sentinel-runtime] tombstone sweep failed: ${describeError(err)}`));
       await outbox.dispatch();
       if (!timer) scheduleNext();
     },
@@ -58735,7 +60122,9 @@ function createSentinelRuntime(opts) {
     },
     pollOnce,
     deliverPushed,
-    webhookOutbox: outbox
+    webhookOutbox: outbox,
+    quarantine,
+    cancelTombstones
   };
 }
 var BUILTIN_SENTINEL_PROVIDERS = {
@@ -58812,7 +60201,7 @@ async function spawnCloudflaredUntil(argv, opts) {
   };
   let settled = false;
   let forwardedLen = 0;
-  return await new Promise((resolve45, reject) => {
+  return await new Promise((resolve47, reject) => {
     const poll = setInterval(() => {
       const text13 = readAll();
       if (opts.onLog) {
@@ -58830,7 +60219,7 @@ async function spawnCloudflaredUntil(argv, opts) {
       if (m) {
         settled = true;
         clearTimeout(timer);
-        resolve45({ proc, match: m[0], stopTail: () => clearInterval(poll) });
+        resolve47({ proc, match: m[0], stopTail: () => clearInterval(poll) });
       }
     }, POLL_INTERVAL_MS2);
     if (poll.unref) poll.unref();
@@ -58967,15 +60356,15 @@ function quickTunnelProvider() {
         }
       }, 3e3);
       timer.unref();
-      await new Promise((resolve45) => {
+      await new Promise((resolve47) => {
         if (proc.exitCode !== null) {
           clearTimeout(timer);
-          resolve45();
+          resolve47();
           return;
         }
         proc.once("exit", () => {
           clearTimeout(timer);
-          resolve45();
+          resolve47();
         });
       });
     }
@@ -59128,15 +60517,15 @@ function namedTunnelProvider(cfg) {
         }
       }, 3e3);
       timer.unref();
-      await new Promise((resolve45) => {
+      await new Promise((resolve47) => {
         if (proc.exitCode !== null) {
           clearTimeout(timer);
-          resolve45();
+          resolve47();
           return;
         }
         proc.once("exit", () => {
           clearTimeout(timer);
-          resolve45();
+          resolve47();
         });
       });
     }
@@ -59260,7 +60649,7 @@ function ngrokTunnelProvider(opts) {
       };
       proc.stderr?.on("data", forwardLogs);
       proc.stdout?.on("data", forwardLogs);
-      const url = await new Promise((resolve45, reject) => {
+      const url = await new Promise((resolve47, reject) => {
         let settled = false;
         const timer = setTimeout(() => {
           if (settled) return;
@@ -59288,7 +60677,7 @@ function ngrokTunnelProvider(opts) {
                 settled = true;
                 clearTimeout(timer);
                 if (apiPollHandle) clearInterval(apiPollHandle);
-                resolve45(pubUrl);
+                resolve47(pubUrl);
               }
             } catch {
             }
@@ -59303,7 +60692,7 @@ function ngrokTunnelProvider(opts) {
             settled = true;
             clearTimeout(timer);
             if (apiPollHandle) clearInterval(apiPollHandle);
-            resolve45(reMatch[1]);
+            resolve47(reMatch[1]);
             return;
           }
           for (const line of text13.split(/\r?\n/)) {
@@ -59314,7 +60703,7 @@ function ngrokTunnelProvider(opts) {
                 settled = true;
                 clearTimeout(timer);
                 if (apiPollHandle) clearInterval(apiPollHandle);
-                resolve45(parsed.url);
+                resolve47(parsed.url);
                 return;
               }
             } catch {
@@ -59361,15 +60750,15 @@ function ngrokTunnelProvider(opts) {
         }
       }, 3e3);
       timer.unref();
-      await new Promise((resolve45) => {
+      await new Promise((resolve47) => {
         if (proc.exitCode !== null) {
           clearTimeout(timer);
-          resolve45();
+          resolve47();
           return;
         }
         proc.once("exit", () => {
           clearTimeout(timer);
-          resolve45();
+          resolve47();
         });
       });
     }
@@ -59581,7 +60970,7 @@ function sameCollapseGroup(a, b) {
   if ((a.key ?? "") !== (b.key ?? "")) return false;
   return a.event === b.event || TURN_FAMILY.has(a.event) && TURN_FAMILY.has(b.event);
 }
-function excerptOf(text13) {
+function excerptOf2(text13) {
   if (!text13) return void 0;
   const flat = text13.replace(/\s+/g, " ").trim();
   if (!flat) return void 0;
@@ -59596,7 +60985,7 @@ function formatFollowDigest(entries, resolveText, desc) {
     const cwd = d?.cwd ?? entry.cwd;
     const parts = [`[session-follow] ${who} ${entry.event}`];
     if (cwd) parts.push(basename(cwd) || cwd);
-    const text13 = excerptOf(resolveText(entry));
+    const text13 = excerptOf2(resolveText(entry));
     if (text13) parts.push(text13);
     return parts.join(" \u2014 ");
   });
@@ -59872,6 +61261,31 @@ function createSentinelAutoLinker(opts) {
     linkNow: link
   };
 }
+function isSubscriptionPermitted(params, repoAllowlist) {
+  const args = params.arguments;
+  if (typeof args !== "object" || args === null || Array.isArray(args)) return false;
+  const repo = args.repo;
+  return typeof repo === "string" && repoAllowlist.includes(repo);
+}
+function createEventsSurfaceServer(opts) {
+  const server = new McpServer({ name: "agentproto-events", version: opts.version }, { capabilities: { tools: {} } });
+  server.registerTool(
+    "events_ping",
+    { description: "Liveness probe for the events surface. Returns ok.", inputSchema: {} },
+    async () => ({ content: [{ type: "text", text: "ok" }] })
+  );
+  registerEventsMethods(server, {
+    list: (params) => opts.handlers.list(params),
+    subscribe: async (params) => {
+      if (!isSubscriptionPermitted(params, opts.repoAllowlist)) {
+        throw new McpError(ErrorCode.InvalidParams, "subscription not permitted");
+      }
+      return opts.handlers.subscribe(params);
+    },
+    unsubscribe: (params) => opts.handlers.unsubscribe(params)
+  });
+  return server;
+}
 var TELEGRAM_BOT_CREDS_FAMILY = "telegram-bot";
 function makeTelegramBotCredsStore(home) {
   const store = makeCredsStore({
@@ -60350,12 +61764,12 @@ function canonicalJson(value) {
 }
 function isToolAppVisible(tool) {
   const meta = tool._meta;
-  const ui = isRecord11(meta?.ui) ? meta.ui : void 0;
+  const ui = isRecord13(meta?.ui) ? meta.ui : void 0;
   const visibility = ui?.visibility;
   if (!Array.isArray(visibility)) return true;
   return visibility.includes("app");
 }
-function isRecord11(v) {
+function isRecord13(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function buildUiToolIndex(tools) {
@@ -60880,19 +62294,19 @@ function classifyMcpError(err) {
   return { status: "unreachable", error };
 }
 function uiMetaOf(meta) {
-  if (!isRecord12(meta) || !isRecord12(meta.ui)) return {};
+  if (!isRecord14(meta) || !isRecord14(meta.ui)) return {};
   const ui = meta.ui;
   const csp = cspOf(ui.csp);
   return {
     ...csp ? { csp } : {},
-    ...isRecord12(ui.permissions) ? { permissions: ui.permissions } : {},
+    ...isRecord14(ui.permissions) ? { permissions: ui.permissions } : {},
     ...typeof ui.prefersBorder === "boolean" ? { prefersBorder: ui.prefersBorder } : {},
     ...typeof ui.domain === "string" ? { domain: ui.domain } : {}
   };
 }
 var CSP_DOMAIN_KEYS = ["connectDomains", "resourceDomains", "frameDomains", "baseUriDomains"];
 function cspOf(raw) {
-  if (!isRecord12(raw)) return void 0;
+  if (!isRecord14(raw)) return void 0;
   const csp = {};
   for (const key of CSP_DOMAIN_KEYS) {
     const value = raw[key];
@@ -60902,7 +62316,7 @@ function cspOf(raw) {
   }
   return Object.keys(csp).length > 0 ? csp : void 0;
 }
-function isRecord12(v) {
+function isRecord14(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function errorMessage(err) {
@@ -63139,14 +64553,14 @@ function createActivityProjector(opts) {
       if (current && isTerminalActivityState(current.state)) {
         return Promise.resolve(current);
       }
-      return new Promise((resolve45) => {
+      return new Promise((resolve47) => {
         let settled = false;
         const finish = (value) => {
           if (settled) return;
           settled = true;
           clearTimeout(timer);
           unsubscribeWait();
-          resolve45(value);
+          resolve47(value);
         };
         const timer = setTimeout(() => finish(null), timeoutMs);
         const unsubscribeWait = opts.sessionEvents.on("activity:changed", (ev) => {
@@ -63308,7 +64722,7 @@ function createApprovalsEngine(opts) {
     const list2 = waiters.get(record2.id);
     if (!list2) return;
     waiters.delete(record2.id);
-    for (const resolve45 of list2) resolve45(record2);
+    for (const resolve47 of list2) resolve47(record2);
   };
   const emit = (type, record2) => {
     const ts = (/* @__PURE__ */ new Date()).toISOString();
@@ -63378,17 +64792,17 @@ function createApprovalsEngine(opts) {
     const current = liveGet(id);
     if (!current) return Promise.resolve(void 0);
     if (current.status !== "pending") return Promise.resolve(current);
-    return new Promise((resolve45) => {
+    return new Promise((resolve47) => {
       const list2 = waiters.get(id) ?? [];
-      list2.push(resolve45);
+      list2.push(resolve47);
       waiters.set(id, list2);
       const timer = setTimeout(() => {
         const list22 = waiters.get(id);
         if (!list22) return;
-        const idx = list22.indexOf(resolve45);
+        const idx = list22.indexOf(resolve47);
         if (idx >= 0) list22.splice(idx, 1);
         if (list22.length === 0) waiters.delete(id);
-        resolve45(liveGet(id));
+        resolve47(liveGet(id));
       }, timeoutMs);
       timer.unref?.();
     });
@@ -63551,7 +64965,7 @@ function humanizeKey(key) {
   const words = key.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_\-.]+/g, " ").replace(/\s+/g, " ").trim().toLowerCase();
   return words.length === 0 ? "Value" : words.charAt(0).toUpperCase() + words.slice(1);
 }
-function isRecord13(value) {
+function isRecord15(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function scalarText(value) {
@@ -63581,7 +64995,7 @@ function flattenRows(value, label, depth, out) {
     });
     return;
   }
-  if (isRecord13(value)) {
+  if (isRecord15(value)) {
     if (depth >= MAX_DEPTH) return;
     for (const [key, child] of Object.entries(value)) {
       flattenRows(child, label ? `${label} / ${humanizeKey(key)}` : humanizeKey(key), depth + 1, out);
@@ -63603,7 +65017,7 @@ function renderMail(preview2) {
   const cc = addressList(preview2.cc);
   const subject = scalarText(preview2.subject) ?? "";
   const body = scalarText(preview2.body) ?? "";
-  const attachments = Array.isArray(preview2.attachments) ? preview2.attachments.filter(isRecord13).map((a) => {
+  const attachments = Array.isArray(preview2.attachments) ? preview2.attachments.filter(isRecord15).map((a) => {
     const name = scalarText(a.fileName) ?? "";
     const size = typeof a.sizeBytes === "number" ? humanSize(a.sizeBytes) : "";
     return size ? `${name} (${size})` : name;
@@ -63618,9 +65032,9 @@ function renderMail(preview2) {
 }
 function renderPreview(record2) {
   const preview2 = record2.preview;
-  if (isRecord13(preview2) && preview2.kind === "mail") return renderMail(preview2);
+  if (isRecord15(preview2) && preview2.kind === "mail") return renderMail(preview2);
   const rows = [];
-  if (isRecord13(preview2)) {
+  if (isRecord15(preview2)) {
     for (const [key, value] of Object.entries(preview2)) flattenRows(value, humanizeKey(key), 1, rows);
   } else {
     flattenRows(preview2, "Details", 1, rows);
@@ -65717,9 +67131,9 @@ async function* readEventRecords(path) {
   let stream;
   try {
     stream = createReadStream(path, { encoding: "utf8" });
-    await new Promise((resolve45, reject) => {
+    await new Promise((resolve47, reject) => {
       stream.once("error", reject);
-      stream.once("open", resolve45);
+      stream.once("open", resolve47);
     });
   } catch (err) {
     if (err.code === "ENOENT") return;
@@ -66177,13 +67591,13 @@ function createLinkGuard(opts) {
   return {
     async start() {
       server = createServer(onRequest);
-      return new Promise((resolve45, reject) => {
+      return new Promise((resolve47, reject) => {
         server.once("error", reject);
         server.listen(0, "127.0.0.1", () => {
           log(
             `[link-guard] listening on 127.0.0.1:${currentPort()} -> ${opts.target.host}:${opts.target.port}`
           );
-          resolve45(handle());
+          resolve47(handle());
         });
       });
     },
@@ -66191,8 +67605,8 @@ function createLinkGuard(opts) {
       if (!server) return;
       const toClose = server;
       server = null;
-      await new Promise((resolve45, reject) => {
-        toClose.close((err) => err ? reject(err) : resolve45());
+      await new Promise((resolve47, reject) => {
+        toClose.close((err) => err ? reject(err) : resolve47());
       });
     },
     revoke() {
@@ -68203,13 +69617,13 @@ function createJoinTokenRegistry(deps2) {
   return { create, list, revoke, startAutoconnect, shutdown };
 }
 function sleep2(ms, signal) {
-  return new Promise((resolve45) => {
-    if (signal.aborted) return resolve45();
-    const timer = setTimeout(resolve45, ms);
+  return new Promise((resolve47) => {
+    if (signal.aborted) return resolve47();
+    const timer = setTimeout(resolve47, ms);
     if (typeof timer.unref === "function") timer.unref();
     signal.addEventListener("abort", () => {
       clearTimeout(timer);
-      resolve45();
+      resolve47();
     });
   });
 }
@@ -68899,7 +70313,14 @@ async function createGateway(opts) {
     registry: sessions,
     followStore: sessionFollowStore,
     sentinelStore,
-    cancelSentinel: (id) => cancelSentinelWatch({ store: sentinelStore, resolveProvider: resolveSentinelProviderResolved }, id)
+    cancelSentinel: (id) => cancelSentinelWatch(
+      {
+        store: sentinelStore,
+        resolveProvider: resolveSentinelProviderResolved,
+        tombstones: sentinelRuntime.cancelTombstones
+      },
+      id
+    )
   });
   const inboundWatcher = opts.resolveAgentAdapter ? createInboundWatcher({
     mcpProxy,
@@ -69281,6 +70702,8 @@ async function createGateway(opts) {
     registerSentinelTools(server, {
       store: sentinelStore,
       runtime: sentinelRuntime,
+      tombstones: sentinelRuntime.cancelTombstones,
+      deliveryStatus: (id) => sentinelRuntime.webhookOutbox.deliveryStatus(id),
       resolveProvider: resolveSentinelProviderResolved,
       isSessionAlive,
       ...callerSessionId ? { callerSessionId } : {}
@@ -69310,11 +70733,39 @@ async function createGateway(opts) {
       unsubscribe: (params) => eventsUnsubscribe(params, {
         principal: eventsPrincipal,
         store: sentinelStore,
-        resolveProvider: resolveSentinelProviderResolved
+        resolveProvider: resolveSentinelProviderResolved,
+        tombstones: sentinelRuntime.cancelTombstones
       })
     });
     return server;
   };
+  const eventsSecret = process.env.AGENTPROTO_MCP_EVENTS_SECRET ?? "";
+  const eventsRepos = (process.env.AGENTPROTO_MCP_EVENTS_REPOS ?? "").split(",").map((s) => s.trim()).filter(Boolean);
+  const eventsMcp = eventsSecret.length >= 32 ? {
+    secret: eventsSecret,
+    allowedOrigins: (process.env.AGENTPROTO_MCP_EVENTS_ORIGINS ?? "").split(",").map((s) => s.trim()).filter(Boolean),
+    createServer: async () => {
+      const principal = sessionPrincipal("mcp-events-origin");
+      return createEventsSurfaceServer({
+        version: opts.version ?? "0.1.0-alpha",
+        repoAllowlist: eventsRepos,
+        handlers: {
+          list: (params) => eventsList(params, { principal }),
+          subscribe: (params) => eventsSubscribe(params, {
+            principal,
+            store: sentinelStore,
+            resolveProvider: resolveSentinelProviderResolved
+          }),
+          unsubscribe: (params) => eventsUnsubscribe(params, {
+            principal,
+            store: sentinelStore,
+            resolveProvider: resolveSentinelProviderResolved,
+            tombstones: sentinelRuntime.cancelTombstones
+          })
+        }
+      });
+    }
+  } : void 0;
   let internalToolServerPromise;
   dispatchToolBox.fn = async (name, inputs) => {
     if (!internalToolServerPromise) internalToolServerPromise = mcpServerFactory();
@@ -69385,6 +70836,7 @@ async function createGateway(opts) {
     },
     mcpServerFactory,
     orchestratorMcpServerFactory,
+    ...eventsMcp ? { eventsMcp } : {},
     verifyOrchestratorScope: scopeTokens.verify,
     conversations,
     events,
@@ -69402,7 +70854,9 @@ async function createGateway(opts) {
       store: sentinelStore,
       resolveProvider: resolveSentinelProviderResolved,
       isSessionAlive,
-      runtime: sentinelRuntime
+      runtime: sentinelRuntime,
+      tombstones: sentinelRuntime.cancelTombstones,
+      deliveryStatus: (id) => sentinelRuntime.webhookOutbox.deliveryStatus(id)
     },
     follows: {
       store: sessionFollowStore,
@@ -69595,7 +71049,12 @@ async function createGateway(opts) {
   }, pendingPromptSweepMs);
   pendingPromptTimer.unref?.();
   const livenessSweepIntervalMs = 3e4;
+  const livenessTickGuard = createLivenessTickGuard(livenessSweepIntervalMs, 5e3);
   const livenessSweepTimer = setInterval(() => {
+    if (livenessTickGuard.shouldSkip()) {
+      console.warn("[liveness-sweep] tick fired late (event loop starved) \u2014 skipping this sweep");
+      return;
+    }
     try {
       const orphanedRuns = workflowRunner?.sweep().orphaned ?? [];
       if (orphanedRuns.length > 0) {
@@ -69746,6 +71205,6 @@ var export_readPairingsSnapshot = pairing_registry_exports.readPairingsSnapshot;
 var export_removeProviderKey = providers_store_exports.removeProviderKey;
 var export_setProviderKey = providers_store_exports.setProviderKey;
 
-export { AnthropicRemainingQuotaReader, AuthResolutionError, BUCKETS_ROOT, CLAMP_LIMIT_BYTES, CLAUDE_CODE_OAUTH_SOURCE, CONTINUE_PROMPT_SOURCE, DEAD_SESSION_STATUSES, DEFAULT_ALWAYS_ON_TOOLS, DEFAULT_BUCKET, DEFAULT_CONTINUE_PROMPT, DEFAULT_HOST_LOAD_BUDGET_MS, DEFAULT_HOST_LOAD_THRESHOLDS, DEFAULT_MODEL_ROLES, DEFAULT_ORCHESTRATOR_TOOLS, DEFAULT_TTL_MS, DEFAULT_WORKTREE_ISOLATION, DEFAULT_WORKTREE_PROVISION_CONCURRENCY, DEVICE_PROMPT_PATH_PREFIX, EVENT_REGISTRY, FOLLOW_EVENTS, GC_REAPABLE_STATES, GITHUB_SCHEME, HOSTS_VERSION, HOST_HANDSHAKE_REMEDIATION_HINT, HOST_SCOPE_HEADER, HarnessPresetValidationError, INBOUND_PROVIDERS, INDEX_DEFAULT_LIMIT, INDEX_MAX_OUTPUT, INDEX_MAX_PROMPT, INDEX_TAIL_BYTES, JOIN_TOKENS_VERSION, LEGACY_SESSIONS_FILE, MAX_ATTEMPTS, MAX_AUTO_CONTINUE_ATTEMPTS, MAX_MESSAGE_DATA_BYTES, MAX_TTL_MS, MCP_APP_BRIDGE_SCRIPT, MESSAGE_KINDS, MESSAGE_PREAMBLE, MESSAGE_TAG, MESSAGE_URGENCIES, MIN_TTL_MS, MODEL_ROLE_REF_PREFIX, McpEventsError, NO_OUTPUT_STALL_TURN_ERROR, export_PAIRINGS_VERSION as PAIRINGS_VERSION, POSTURE_NATIVE_ALIASES, POSTURE_PREAMBLES, export_PROVIDER_ENV_VARS as PROVIDER_ENV_VARS, PrLookupError, ResumeDisabledError, SESSION_END_REASONS, SESSION_ID_ENV, SIGN_NAMESPACE, SessionRetiredError, SsrfFetchError, SubscriptionSourceError, TASK_STATUSES, WORKSPACE_SLUG_ENV, WORKTREE_ISOLATION_ENV, WORKTREE_PROVISION_CONCURRENCY_ENV, activityCounts, addHarnessPreset, allowedSignersLine, appendConversationRecord, attachSandbox, backfillSessionIndexes, bucketDir, bucketSessionsFile, bucketTranscriptDir, buildCatalogModels, buildCatalogProviderModels, buildHostLoadReport, buildMcpConfigSnippet, buildRouteAwareLaunchConfig, buildSessionRecap, canonicalForModeId, canonicalizeJcs, challengeCacheSize, challengeReasonForSsrf, claudeProjectSlug, collectGcCandidates, collectHostSample, compactOutcome, composeMode, composeSessionObservers, composedFromRangeSha, computeHostWarnings, computeRefreshBefore, continueInterruptedSessions, continueSkipReason, conversationIndexPath, createActivityProjector, createDaemonReviewerHost, createDefaultHostProbes, createDeviceRegistry, createFileStepCache, createGateway, createHostLoadService, createHostRegistry, createInboundEndpointStore, createJoinTokenRegistry, createOrchestratorInjector, createOrchestratorMcpServerFactory, export_createPairingRegistry as createPairingRegistry, createPrProvenanceReconciler, createProcessStatsService, createReviewLaneExecutor, createReviewLedger, createReviewPackLoader, createReviewRunner, createScopeTokenRegistry, createSentinelWebhookOutbox, createSessionFollowStore, createSessionMessage, createSupervisorTaskGateRunner, createTaskLedger, createWorkspaceBrainSubscriber, createWorkspaceBrains, createWorkspaceFs, credentialFingerprint, daemonBearerPrincipal, daemonRegistryDir, decideWorktreeIsolation, declaredPresetToProviderPreset, decodeWhsecSecret, decomposeMode, defaultBrowserAdapterIds, defaultBrowserAdapterResolution, defaultReviewKeysDir, defaultReviewLedgerRoot, defaultReviewPackCacheDir, defaultTranscriptBaseDir, defineBraveSearchHttpDriver, defineSerperHttpDriver, deleteUserPreset, deliverEventEnvelope, deliveryBackoffDelay, deriveIndexFromTranscript, deriveSessionOutcome, deriveSessionUsage, describeOwner, encodeWhsecSecret, enrichRollupWithProviderQuota, enrichWithRemainingQuota, ensureReviewSigningKey, envelopeClampedBytes, escapeHumanPrompt, escapeMessageBody, evaluateCostBudget, eventsList, eventsSubscribe, eventsUnsubscribe, execGh, extractHelpSection, fetchHostTurns, fetchPrStatus, fileConversationStore, fileExists3 as fileExists, filterActivities, findComposeCandidate, findConversationRecord, findEventDefinition, findNativeMode, findPrForCommit, formatToolCall, formatToolResult, getDefaultHarnessPreset, getHarnessPreset, getHostLoadService, getMcpCredentialDeps, getProcessStatsService, export_getProviderKey as getProviderKey, getToolHelp, getUserPreset, githubRepoOf, harnessPresetsPath, hostPlaceholders, hostRecordToMirrorRecord, indexEntryFromDescriptor, injectMcpAppBridge, export_injectProviderKeysIntoEnv as injectProviderKeysIntoEnv, isAgentCliAuthConfigured, isAutomatedPromptSource, isClosedTaskStatus, isKnownSessionEndReason, isMessageAllowed, isNoSessionPromptFailure, isProviderLimitError, isPubliclyRoutable, isRetired, isSafeBucketSlug, isTerminalActivityState, listBuckets, listHarnessPresets, listModelRoles, listPresets, listToolHelpTopics, listUserPresets, loadHarnessPresets, export_loadProviders as loadProviders, loadQuotaStore, loadUserPresets, loadWorkspaceModelRoles, loadWorktreeIsolation, locateConversationByNativePath, locateConversationBySessionId, makeBrowserAdapterLister, makeRestartForRouting, makeSandboxCredsStore, makeSandboxResolver, matchesMessageFilter, matchesSessionQuery, measureTool, measureToolList, messageFrom, migrateLegacySessionsFile, migrationMarkerPath, mintMessageId, mirrorCursorForSession, monitorPolicyWait, monitorSessionWait, narrowOrchestratorTools, normalizeCallbackUrl, normalizeCommand, normalizeInbound, normalizeModeId, normalizeRemote, normalizeSkillsOption, normalizeWorktreeField, parseAnthropicRateLimitHeaders, parseDuration, parseModelRoleRef, parsePrUrl, parseTaskStatus, parseWindow, parseWorktreeIsolationMode, pickUsageDetail, policyToActivities, policyWatchesSession, prHeadSha, prToActivities, projectBrowserTools, projectSessionUsage, promptDeviceSession, promptHostSession, export_providerEnvVar as providerEnvVar, export_providersPath as providersPath, readAllSessionIndexes, readConversationIndex, readDaemonRegistry, readHostsSnapshot, export_readPairingsSnapshot as readPairingsSnapshot, readProfileQuota, readRegisteredSlugs, readRuntimeMeta, readSandboxLedger, readSessionForBrain, readSessionIndex, readTranscriptTail, readUsageSnapshots, reapGcEntry, reapOrphanedDescendants, reconcileSandboxLedger, recordProfileQuota, recordSandboxBoot, recordSandboxLiveness, recordSandboxOrigin, recordSandboxState, registerBrainTools, registerBuiltinRoutes, registerDeviceTools, registerPairingTools, registerReviewTools, registerSandboxAttachTool, registerWebSearchTools, removeHarnessPreset, export_removeProviderKey as removeProviderKey, removeSandboxLedgerEntry, renderInboxDigest, renderSessionMessage, renderSessionMessages, repoSlug, resetChallengeCacheForTests, resolveAuthSpec, resolveBucketSlug, resolveDeferredToolsGatewayOption, resolveDevicePromptMapping, resolveEffectiveLlmEndpointFlag, resolveModelRole, resolveNativeLink, resolvePosture, resolvePrincipal, resolveRelation, resolveReuseFromLedger, resolveReviewerPreset, resolveSpawnDefaults, resolveSubscriptionCredential, resolveSuccessor, rollupSessionSubtree, rollupUsage, runContinueOnBootPass, runCrashDetectPass, runEagerResumePass, runIdleReapPass, runShellLane, runStallWatchdogPass, sandboxLedgerPath, sanitizeLabel, saveUserPreset, searchSessionIndexes, seedWalkForTranscript, serializeEnvelope, sessionEventsPath, sessionIndexPath, sessionPrincipal, sessionTranscriptDir, setDefaultPreset, setDefaultSessionsBaseDir, setEgressDispatcherForTests, setMcpCredentialDeps, export_setProviderKey as setProviderKey, signAttestation, signWebhook, ssrfFetch, subscriptionId, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, syncDeviceMirror, tenantScope, toMcpEvent, toWebhookEnvelope, toWorktreeStatusView, trackWorktreeProvision, turnToActivities, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, untilForTtl, updateHarnessPreset, upsertSandboxLedger, userPresetsPath, validateAgainstInputSchema, verifyCallback, verifyInboundSignature, verifySignedAttestation, webSearchTool, webhookRequestId, wireSessionFollow, withPr, withPrStatus, workflowToActivities, writeDaemonRegistryEntry, writeSessionIndex };
+export { AnthropicRemainingQuotaReader, AuthResolutionError, BUCKETS_ROOT, CLAMP_LIMIT_BYTES, CLAUDE_CODE_OAUTH_SOURCE, CONTINUE_PROMPT_SOURCE, DEAD_SESSION_STATUSES, DEFAULT_ALWAYS_ON_TOOLS, DEFAULT_BUCKET, DEFAULT_CONTINUE_PROMPT, DEFAULT_HOST_LOAD_BUDGET_MS, DEFAULT_HOST_LOAD_THRESHOLDS, DEFAULT_MODEL_ROLES, DEFAULT_ORCHESTRATOR_TOOLS, DEFAULT_TTL_MS, DEFAULT_WORKTREE_ISOLATION, DEFAULT_WORKTREE_PROVISION_CONCURRENCY, DEVICE_PROMPT_PATH_PREFIX, EVENT_REGISTRY, FOLLOW_EVENTS, GC_REAPABLE_STATES, GITHUB_SCHEME, HOSTS_VERSION, HOST_HANDSHAKE_REMEDIATION_HINT, HOST_SCOPE_HEADER, HarnessPresetValidationError, INBOUND_PROVIDERS, INDEX_DEFAULT_LIMIT, INDEX_MAX_OUTPUT, INDEX_MAX_PROMPT, INDEX_TAIL_BYTES, JOIN_TOKENS_VERSION, LEGACY_SESSIONS_FILE, MAX_ATTEMPTS, MAX_AUTO_CONTINUE_ATTEMPTS, MAX_MESSAGE_DATA_BYTES, MAX_TTL_MS, MCP_APP_BRIDGE_SCRIPT, MESSAGE_KINDS, MESSAGE_PREAMBLE, MESSAGE_TAG, MESSAGE_URGENCIES, MIN_TTL_MS, MODEL_ROLE_REF_PREFIX, McpEventsError, NO_OUTPUT_STALL_TURN_ERROR, export_PAIRINGS_VERSION as PAIRINGS_VERSION, POSTURE_NATIVE_ALIASES, POSTURE_PREAMBLES, export_PROVIDER_ENV_VARS as PROVIDER_ENV_VARS, PrLookupError, ResumeDisabledError, SESSION_END_REASONS, SESSION_ID_ENV, SESSION_LIST_FILTER_KEYS, SIGN_NAMESPACE, SentinelBackingExpiredError, SessionListFilterError, SessionRetiredError, SsrfFetchError, SubscriptionSourceError, TASK_STATUSES, WORKSPACE_SLUG_ENV, WORKTREE_ISOLATION_ENV, WORKTREE_PROVISION_CONCURRENCY_ENV, activityCounts, addHarnessPreset, allowedSignersLine, appendConversationRecord, applySessionListFilters, attachSandbox, backfillSessionIndexes, bucketDir, bucketSessionsFile, bucketTranscriptDir, buildCatalogModels, buildCatalogProviderModels, buildHostLoadReport, buildMcpConfigSnippet, buildRouteAwareLaunchConfig, buildSessionRecap, canonicalForModeId, canonicalizeJcs, challengeCacheSize, challengeReasonForSsrf, claudeProjectSlug, collectGcCandidates, collectHostSample, compactOutcome, compileSessionListFilters, composeMode, composeSessionObservers, composedFromRangeSha, computeHostWarnings, computeRefreshBefore, continueInterruptedSessions, continueSkipReason, conversationIndexPath, createActivityProjector, createDaemonReviewerHost, createDefaultHostProbes, createDeviceRegistry, createFileStepCache, createGateway, createHostLoadService, createHostRegistry, createInboundEndpointStore, createJoinTokenRegistry, createOrchestratorInjector, createOrchestratorMcpServerFactory, export_createPairingRegistry as createPairingRegistry, createPrProvenanceReconciler, createProcessStatsService, createReviewLaneExecutor, createReviewLedger, createReviewPackLoader, createReviewRunner, createScopeTokenRegistry, createSentinelWebhookOutbox, createSessionFollowStore, createSessionMessage, createSupervisorTaskGateRunner, createTaskLedger, createWorkspaceBrainSubscriber, createWorkspaceBrains, createWorkspaceFs, credentialFingerprint, daemonBearerPrincipal, daemonRegistryDir, decideWorktreeIsolation, declaredPresetToProviderPreset, decodeWhsecSecret, decomposeMode, defaultBrowserAdapterIds, defaultBrowserAdapterResolution, defaultReviewKeysDir, defaultReviewLedgerRoot, defaultReviewPackCacheDir, defaultTranscriptBaseDir, defineBraveSearchHttpDriver, defineSerperHttpDriver, deleteUserPreset, deliverEventEnvelope, deliveryBackoffDelay, deriveIndexFromTranscript, deriveSessionOutcome, deriveSessionUsage, describeOwner, encodeWhsecSecret, enrichRollupWithProviderQuota, enrichWithRemainingQuota, ensureReviewSigningKey, envelopeClampedBytes, escapeHumanPrompt, escapeMessageBody, evaluateCostBudget, eventsList, eventsSubscribe, eventsUnsubscribe, execGh, extractHelpSection, fetchHostTurns, fetchPrStatus, fileConversationStore, fileExists3 as fileExists, filterActivities, findComposeCandidate, findConversationRecord, findEventDefinition, findNativeMode, findPrForCommit, formatToolCall, formatToolResult, getDefaultHarnessPreset, getHarnessPreset, getHostLoadService, getMcpCredentialDeps, getProcessStatsService, export_getProviderKey as getProviderKey, getToolHelp, getUserPreset, githubRepoOf, harnessPresetsPath, hasSessionListFilters, hostPlaceholders, hostRecordToMirrorRecord, indexEntryFromDescriptor, injectMcpAppBridge, export_injectProviderKeysIntoEnv as injectProviderKeysIntoEnv, isAgentCliAuthConfigured, isAutomatedPromptSource, isClosedTaskStatus, isKnownSessionEndReason, isMessageAllowed, isNoSessionPromptFailure, isNoiseSession, isProviderLimitError, isPubliclyRoutable, isRetired, isSafeBucketSlug, isTerminalActivityState, listBuckets, listHarnessPresets, listModelRoles, listPresets, listToolHelpTopics, listUserPresets, loadHarnessPresets, export_loadProviders as loadProviders, loadQuotaStore, loadUserPresets, loadWorkspaceModelRoles, loadWorktreeIsolation, locateConversationByNativePath, locateConversationBySessionId, makeBrowserAdapterLister, makeRestartForRouting, makeSandboxCredsStore, makeSandboxResolver, matchesMessageFilter, matchesSessionQuery, measureTool, measureToolList, messageFrom, migrateLegacySessionsFile, migrationMarkerPath, mintMessageId, mirrorCursorForSession, monitorPolicyWait, monitorSessionWait, narrowOrchestratorTools, normalizeCallbackUrl, normalizeCommand, normalizeInbound, normalizeModeId, normalizeRemote, normalizeSkillsOption, normalizeWorktreeField, parseAnthropicRateLimitHeaders, parseDuration, parseModelRoleRef, parsePrUrl, parseSessionListFilterParams, parseTaskStatus, parseTimeBound, parseWindow, parseWorktreeIsolationMode, pickSessionListFilters, pickUsageDetail, policyToActivities, policyWatchesSession, prHeadSha, prToActivities, projectBrowserTools, projectSessionUsage, promptDeviceSession, promptHostSession, export_providerEnvVar as providerEnvVar, export_providersPath as providersPath, readAllSessionIndexes, readConversationIndex, readDaemonRegistry, readHostsSnapshot, export_readPairingsSnapshot as readPairingsSnapshot, readProfileQuota, readRegisteredSlugs, readRuntimeMeta, readSandboxLedger, readSessionForBrain, readSessionIndex, readTranscriptTail, readUsageSnapshots, reapGcEntry, reapOrphanedDescendants, reconcileSandboxLedger, recordProfileQuota, recordSandboxBoot, recordSandboxLiveness, recordSandboxOrigin, recordSandboxState, registerBrainTools, registerBuiltinRoutes, registerDeviceTools, registerPairingTools, registerReviewTools, registerSandboxAttachTool, registerWebSearchTools, removeHarnessPreset, export_removeProviderKey as removeProviderKey, removeSandboxLedgerEntry, renderInboxDigest, renderSessionMessage, renderSessionMessages, repoSlug, resetChallengeCacheForTests, resolveAuthSpec, resolveBucketSlug, resolveDeferredToolsGatewayOption, resolveDevicePromptMapping, resolveEffectiveLlmEndpointFlag, resolveModelRole, resolveNativeLink, resolvePosture, resolvePrincipal, resolveRelation, resolveReuseFromLedger, resolveReviewerPreset, resolveSpawnDefaults, resolveSubscriptionCredential, resolveSuccessor, rollupSessionSubtree, rollupUsage, runContinueOnBootPass, runCrashDetectPass, runEagerResumePass, runIdleReapPass, runShellLane, runStallWatchdogPass, sandboxLedgerPath, sanitizeLabel, saveUserPreset, searchSessionIndexes, seedWalkForTranscript, serializeEnvelope, sessionActivityMs, sessionEventsPath, sessionIndexPath, sessionListFilterShape, sessionPrincipal, sessionTranscriptDir, setDefaultPreset, setDefaultSessionsBaseDir, setEgressDispatcherForTests, setMcpCredentialDeps, export_setProviderKey as setProviderKey, signAttestation, signWebhook, sortNewestActivityFirst, ssrfFetch, subscriptionId, summarizeBranchGcApply, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, syncDeviceMirror, tenantScope, toMcpEvent, toWebhookEnvelope, toWorktreeStatusView, trackWorktreeProvision, turnToActivities, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, untilForTtl, updateHarnessPreset, upsertSandboxLedger, userPresetsPath, validateAgainstInputSchema, verifyCallback, verifyInboundSignature, verifySignedAttestation, webSearchTool, webhookRequestId, wireSessionFollow, withBranchGcApplySummary, withPr, withPrStatus, workflowToActivities, writeDaemonRegistryEntry, writeSessionIndex };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map