@schoolai/shipyard 3.11.0 → 3.11.1

package/dist/{serve-D5GKV2RU.js → serve-P3U2C5YH.js}

@@ -12,7 +12,7 @@ import {
   guardedSubscribe,
   makeInitialAttemptState,
   shutdownFileWatcherGuard
-} from "./chunk-L7ELOV3S.js";
+} from "./chunk-FVZ5BDZS.js";
 import {
   TRAILER_SCHEMA_VERSION,
   appendTrailerToMessage,
@@ -25,10 +25,10 @@ import {
 } from "./chunk-WN5Q6WBU.js";
 import {
   loadAuthToken
-} from "./chunk-3WEEGJJN.js";
+} from "./chunk-X5KCX6ZS.js";
 import {
   getDaemonVersion
-} from "./chunk-ZRJTZLRF.js";
+} from "./chunk-QKJNVVQ3.js";
 import {
   getRecentWasmPanicMessages
 } from "./chunk-7H34LI75.js";
@@ -146,12 +146,12 @@ import {
   translateWarningNotification,
   unresolveReviewThread,
   writeCursorApiKeyToVault
-} from "./chunk-C6QOTETH.js";
+} from "./chunk-5LWD5W7O.js";
 import {
   buildNodeSpawnEnv,
   nodeSpawnEnvOverlay,
   rewriteElectronNodeScriptSpawn
-} from "./chunk-GM6MH4CD.js";
+} from "./chunk-XIEOWUPV.js";
 import {
   TIMEOUT_MS,
   addWorktreeToCache,
@@ -164,7 +164,7 @@ import {
   removeWorktreeFromCache,
   run,
   runWithTimeout
-} from "./chunk-6LINHACK.js";
+} from "./chunk-Y5UWRARP.js";
 import {
   gitExecSafe
 } from "./chunk-4T2OQAVL.js";
@@ -182,7 +182,7 @@ import {
   redactEnv,
   resolveEnabledMcpServers,
   resolveStdioEnv
-} from "./chunk-RW2OTTUA.js";
+} from "./chunk-KYLYGFMH.js";
 import {
   atomicWriteFile,
   findProjectRoot,
@@ -193,13 +193,13 @@ import {
 } from "./chunk-RR6V6SNM.js";
 import {
   classifySkill
-} from "./chunk-2EQOL57Z.js";
+} from "./chunk-TFRYQDDG.js";
 import {
   createOneShotPool
 } from "./chunk-ZFKJAYAN.js";
 import {
   parseRunnerToDaemon
-} from "./chunk-A2UK6TW2.js";
+} from "./chunk-LZSMNUAI.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -229,7 +229,7 @@ import {
   COMMENT_ADD_TOOL,
   COMMENT_LIST_TOOL,
   COMMENT_READ_THREAD_TOOL,
-  COMPACT_TIMEOUT_MS,
+  COMPACTION_SILENCE_TIMEOUT_MS,
   CREATE_TASK_TOOL,
   CREDENTIAL_STORE_VERSION,
   CanvasRepository,
@@ -270,6 +270,7 @@ import {
   LSP_FIND_REFERENCES_TOOL,
   LSP_GO_TO_DEFINITION_TOOL,
   LSP_RENAME_SYMBOL_TOOL,
+  MERMAID_SECURITY_LEVEL,
   Mark,
   MarkType,
   MarkdownParser,
@@ -399,7 +400,7 @@ import {
   unsafeAssertSourceId,
   vizFileExtension,
   withPreferredRuntimeAuthMethod
-} from "./chunk-YXPPZQBJ.js";
+} from "./chunk-VL5RUCRF.js";
 import {
   AuthGitHubCallbackRequestSchema,
   AuthGitHubCallbackResponseSchema,
@@ -455,7 +456,7 @@ import {
   createChildLogger,
   flushLogger,
   logger
-} from "./chunk-QJP7JCIS.js";
+} from "./chunk-LRNGLC4V.js";
 import {
   getShipyardHome,
   getStallProfilerConfig,
@@ -463,7 +464,7 @@ import {
   isVanillaAgentMode,
   resolveNodeExecPath,
   validateEnv
-} from "./chunk-Z37T5W6S.js";
+} from "./chunk-P2HZDIN7.js";
 import {
   external_exports
 } from "./chunk-CNR7O5YH.js";
@@ -472,7 +473,7 @@ import "./chunk-2H7UOFLK.js";
 // src/services/serve.ts
 import { mkdir as mkdir44, realpath as realpath3 } from "fs/promises";
 import { homedir as homedir14 } from "os";
-import { join as join86 } from "path";
+import { join as join87 } from "path";
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
 // ../../node_modules/.pnpm/@logtape+logtape@1.3.7/node_modules/@logtape/logtape/dist/level.js
@@ -10130,11 +10131,11 @@ async function runCapabilityDetectorWithFallback(opts) {
     );
   }
   const cleanupGraceMs = opts.cleanupGraceMs ?? CAPABILITY_DETECTOR_WORKER_CLEANUP_GRACE_MS;
-  const spawn15 = opts.spawn ?? defaultSpawn;
+  const spawn16 = opts.spawn ?? defaultSpawn;
   const log = opts.log ?? (() => {
   });
   const startedAt = Date.now();
-  const worker = spawn15();
+  const worker = spawn16();
   worker.unref?.();
   return new Promise((resolve10) => {
     let resultSettled = false;
@@ -13134,7 +13135,7 @@ function nanoid(size2 = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.11.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.11.1" : "unknown";
 function createDaemonSignaling(config) {
   const agentId = config.agentId ?? nanoid();
   function send(msg) {
@@ -14307,7 +14308,7 @@ function runTaskSearch(args) {
 }
 
 // src/services/channels/control-channel-wiring.ts
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 
 // src/shared/type-utils.ts
 function narrow(value) {
@@ -16561,10 +16562,10 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
       respondError2(requestId, formatError(err3));
     }
   }
-  const execFileAsync5 = promisify4(execFile4);
+  const execFileAsync4 = promisify4(execFile4);
   async function handleGitStatus(requestId) {
     try {
-      const { stdout } = await execFileAsync5("git", ["status", "--porcelain=v1", "-z", "-u"], {
+      const { stdout } = await execFileAsync4("git", ["status", "--porcelain=v1", "-z", "-u"], {
         cwd,
         maxBuffer: 5 * 1024 * 1024
       });
@@ -16646,7 +16647,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
         });
         return;
       }
-      const { stdout } = await execFileAsync5(
+      const { stdout } = await execFileAsync4(
         "git",
         ["diff", "--name-status", `${mergeBase}..HEAD`],
         { cwd, maxBuffer: 10 * 1024 * 1024 }
@@ -16736,7 +16737,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
   }
   async function handleGitStageFile(requestId, safeRelPath) {
     try {
-      await execFileAsync5("git", ["add", "--", safeRelPath], { cwd });
+      await execFileAsync4("git", ["add", "--", safeRelPath], { cwd });
       respond({ type: "git_stage_result", requestId });
     } catch (err3) {
       respondError2(requestId, formatError(err3));
@@ -16744,7 +16745,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
   }
   async function handleGitUnstageFile(requestId, safeRelPath) {
     try {
-      await execFileAsync5("git", ["restore", "--staged", "--", safeRelPath], { cwd });
+      await execFileAsync4("git", ["restore", "--staged", "--", safeRelPath], { cwd });
       respond({ type: "git_unstage_result", requestId });
     } catch (err3) {
       respondError2(requestId, formatError(err3));
@@ -16754,7 +16755,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
     try {
       const indexContent = await readGitObject(`:${safeRelPath}`);
       if (indexContent === null) {
-        await execFileAsync5("git", ["add", "--", safeRelPath], { cwd });
+        await execFileAsync4("git", ["add", "--", safeRelPath], { cwd });
         respond({ type: "git_stage_result", requestId });
         return;
       }
@@ -16789,12 +16790,12 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
     const relPath = relative(cwd, absPath);
     if (!await validateMutationTarget(requestId, relPath, absPath)) return;
     try {
-      await execFileAsync5("git", ["checkout", "--", relPath], { cwd });
+      await execFileAsync4("git", ["checkout", "--", relPath], { cwd });
       respond({ type: "git_discard_file_result", requestId });
     } catch {
       try {
         await unlink5(absPath);
-        await execFileAsync5("git", ["reset", "HEAD", "--", relPath], { cwd }).catch(
+        await execFileAsync4("git", ["reset", "HEAD", "--", relPath], { cwd }).catch(
           (resetErr) => {
             log({ event: "git_reset_head_failed", path: relPath, error: formatError(resetErr) });
           }
@@ -16807,7 +16808,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
   }
   async function readGitObject(ref) {
     try {
-      const { stdout } = await execFileAsync5("git", ["show", ref], {
+      const { stdout } = await execFileAsync4("git", ["show", ref], {
         cwd,
         maxBuffer: 10 * 1024 * 1024
       });
@@ -16818,7 +16819,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
   }
   async function getFileMode(safeRelPath) {
     try {
-      const { stdout } = await execFileAsync5("git", ["ls-files", "-s", "--", safeRelPath], { cwd });
+      const { stdout } = await execFileAsync4("git", ["ls-files", "-s", "--", safeRelPath], { cwd });
       const match = /^(\d+)\s/.exec(stdout);
       if (match?.[1]) return match[1];
     } catch {
@@ -16830,7 +16831,7 @@ function handleFileIOChannel(initialCwd, send, log, deps) {
     const mode = isNew ? "100644" : await getFileMode(safeRelPath);
     const args = ["update-index", "--cacheinfo", `${mode},${blobHash},${safeRelPath}`];
     if (isNew) args.splice(1, 0, "--add");
-    await execFileAsync5("git", args, { cwd });
+    await execFileAsync4("git", args, { cwd });
   }
   function gitHashObject(content, pathHint) {
     return new Promise((resolve10, reject) => {
@@ -17960,7 +17961,7 @@ body { min-height: 100vh; display: flex; align-items: center; justify-content: c
 <script type="module">
 import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
 const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-mermaid.initialize({ startOnLoad: true, theme: prefersDark ? 'dark' : 'default', securityLevel: 'strict' });
+mermaid.initialize({ startOnLoad: true, theme: prefersDark ? 'dark' : 'default', securityLevel: '${MERMAID_SECURITY_LEVEL}' });
 </script>
 </body>
 </html>
@@ -20399,6 +20400,13 @@ var TELEMETERED_EVENT_NAMES = [
   "harness_mcp_registration_failed",
   "codex_auth_divergence_detected",
   "cursor_auth_divergence_detected",
+  /**
+   * A Codex remote-compact cycle failed with a 401 "Missing bearer" error —
+   * the app-server lost its in-memory token during refresh-token rotation.
+   * Emitted once per compact attempt (not per retry) so fleet dashboards can
+   * surface the storm rate without log amplification.
+   */
+  "codex_compact_auth_failure",
   "event_loop_stall",
   "machine_sleep_artifact",
   /**
@@ -20410,7 +20418,16 @@ var TELEMETERED_EVENT_NAMES = [
    */
   "electron_app_metrics",
   /** Electron main cleared a wedged Squirrel.Mac staged install on launch. */
-  "squirrel_install_stuck_recovered"
+  "squirrel_install_stuck_recovered",
+  /**
+   * An ALO control-channel entry exhausted its maxDeliver retry budget
+   * without receiving an ack. Payload: { attempts: number, channel: 'control' }.
+   * Emitted via the `onDeadLetter` callback in control-channel-wiring.ts.
+   * Complements the `alo_resend_exhausted` ERROR log event emitted by the
+   * shell itself; this telemetry path routes it to D1 for fleet-wide
+   * observability so silent resend exhaustion is detectable in aggregate.
+   */
+  "alo_resend_exhausted"
 ];
 var TELEMETERED_EVENTS = new Set(TELEMETERED_EVENT_NAMES);
 var sink = null;
@@ -22428,8 +22445,54 @@ function withListWorktreeContext(context) {
     ...context?.reason !== void 0 && { reason: context.reason }
   };
 }
+function logWorktreePollDegraded(logAdapter, repoPath, err3, requestContext) {
+  const repoExists = existsSync2(repoPath);
+  if (err3 instanceof GitExecError) {
+    const { code, signal, killed, stderr, durationMs } = err3.info;
+    logAdapter({
+      event: "worktree_poll_degraded",
+      repoPath,
+      code,
+      signal,
+      killed,
+      stderr,
+      durationMs,
+      repoExists,
+      permanent: !repoExists,
+      ...requestContext
+    });
+    return;
+  }
+  const error = err3 instanceof Error ? err3.message : String(err3);
+  logAdapter({
+    event: "worktree_poll_degraded",
+    repoPath,
+    error,
+    repoExists,
+    permanent: !repoExists,
+    ...requestContext
+  });
+}
+function handleWorktreeListError(err3, repoPath, degradedRepos, logAdapter, requestContext) {
+  if (err3 instanceof CircuitOpenError) {
+    if (!degradedRepos.has(repoPath)) {
+      degradedRepos.add(repoPath);
+      logAdapter({ event: "worktree_poll_degraded", repoPath, reason: "circuit_open" });
+    }
+    return true;
+  }
+  if (err3 instanceof BackoffWaitError) {
+    return true;
+  }
+  if (!degradedRepos.has(repoPath)) {
+    degradedRepos.add(repoPath);
+    logWorktreePollDegraded(logAdapter, repoPath, err3, requestContext);
+  }
+  return false;
+}
 function buildWorktreeHandlers(deps) {
   const { daemon, logAdapter, worktreeRunner } = deps;
+  const degradedRepos = /* @__PURE__ */ new Set();
   return {
     onCreateWorktree: (requestId, sourceRepoPath, branchName, baseRef, setupScript, mode) => {
       logAdapter({ event: "worktree_create_requested", requestId, sourceRepoPath, branchName });
@@ -22458,54 +22521,26 @@ function buildWorktreeHandlers(deps) {
       const requestContext = withListWorktreeContext(context);
       logAdapter({ event: "worktree_list_requested", repoPath, ...requestContext });
       listWorktrees2(repoPath).then((worktrees) => {
+        if (degradedRepos.has(repoPath)) {
+          degradedRepos.delete(repoPath);
+          logAdapter({ event: "worktree_poll_recovered", repoPath });
+        }
         deps.controlHandler().sendControl({ type: "worktree_list", repoPath, worktrees });
       }).catch((err3) => {
-        if (err3 instanceof CircuitOpenError) {
-          logAdapter({
-            event: "worktree_list_skipped_circuit_open",
-            repoPath,
-            ...requestContext
-          });
-          return;
-        }
-        if (err3 instanceof BackoffWaitError) {
-          logAdapter({
-            event: "worktree_list_skipped_backoff",
-            repoPath,
-            waitMs: err3.waitMs,
-            ...requestContext
-          });
-          return;
-        }
-        const msg = err3 instanceof Error ? err3.message : String(err3);
-        const repoExists = existsSync2(repoPath);
-        if (err3 instanceof GitExecError) {
-          const { code, signal, killed, stderr, durationMs } = err3.info;
-          logAdapter({
-            event: "worktree_list_failed",
-            repoPath,
-            error: msg,
-            code,
-            signal,
-            killed,
-            stderr,
-            durationMs,
-            repoExists,
-            ...requestContext
-          });
-        } else {
-          logAdapter({
-            event: "worktree_list_failed",
-            repoPath,
-            error: msg,
-            repoExists,
-            ...requestContext
+        const suppress = handleWorktreeListError(
+          err3,
+          repoPath,
+          degradedRepos,
+          logAdapter,
+          requestContext
+        );
+        if (!suppress) {
+          const msg = err3 instanceof Error ? err3.message : String(err3);
+          deps.controlHandler().sendControl({
+            type: "error",
+            error: `Failed to list worktrees: ${msg}`
           });
         }
-        deps.controlHandler().sendControl({
-          type: "error",
-          error: `Failed to list worktrees: ${msg}`
-        });
       });
     },
     onRemoveWorktree: (worktreePath) => {
@@ -23188,7 +23223,7 @@ async function refreshPluginCapabilities(daemon, tokenStore) {
   const userSettings = await daemon.userSettingsStore.getSettings();
   const [updatedMarketplace, updatedMcp, updatedSkills] = await Promise.all([
     detectMarketplacePlugins(daemon.capabilities.marketplacePlugins),
-    import("./mcp-servers-ICHOWXZB.js").then(
+    import("./mcp-servers-OAPQNDA7.js").then(
       (m2) => m2.detectMCPServers(
         daemon.capabilities.environments,
         tokenStore,
@@ -23197,7 +23232,7 @@ async function refreshPluginCapabilities(daemon, tokenStore) {
         readPreferredClaudeAuthMethod(userSettings)
       )
     ),
-    import("./skills-W2Y6TWHA.js").then(
+    import("./skills-2UBVHFQ5.js").then(
       (m2) => m2.detectSkills(daemon.capabilities.environments)
     )
   ]);
@@ -25666,7 +25701,7 @@ function spawnCodexLogout(callbacks) {
 
 // src/services/serve-factory-helpers.ts
 import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 
 // src/shared/capabilities/runtime/rate-limit-account-key.ts
 function providerForProfile(profile) {
@@ -27337,6 +27372,19 @@ function matchCollabQueueCorrelationIds(messages, queueEntries) {
   return claimedIds;
 }
 
+// src/services/session/codex-home-isolation.ts
+import { join as join27 } from "path";
+var ISOLATED_CODEX_HOME_DIR = "codex-isolated";
+function getIsolatedCodexHome() {
+  return join27(getShipyardHome(), ISOLATED_CODEX_HOME_DIR);
+}
+function buildAgentSubprocessCodexHomeEnv() {
+  return { CODEX_HOME: getIsolatedCodexHome() };
+}
+function buildCodexShellCodexHomeConfigOverride() {
+  return { "shell_environment_policy.set.CODEX_HOME": getIsolatedCodexHome() };
+}
+
 // src/services/session/mcp-settle.ts
 var STATUSES_STILL_STARTING = /* @__PURE__ */ new Set(["starting", "pending", "connecting"]);
 async function waitForMcpServersToSettle(opts) {
@@ -27687,6 +27735,13 @@ var AnthropicAgentSubprocess = class _AnthropicAgentSubprocess {
   #onEvent;
   #spawnMcpServers;
   #harnessTaskIdSetter = null;
+  /**
+   * The epoch bound to this subprocess's in-process harness server at spawn
+   * time (installed by serve-factory immediately after `setHarnessEpoch`).
+   * Surfaced via the `harnessEpoch` getter so the pre-warm adoption handshake
+   * writes the SAME epoch to the registry that the harness fence checks.
+   */
+  #harnessEpoch = null;
   /**
    * Mutable slot for the CwdChanged handler. The SDK hook is registered
    * unconditionally at spawn time and reads through this slot on each
@@ -27745,6 +27800,18 @@ var AnthropicAgentSubprocess = class _AnthropicAgentSubprocess {
   installHarnessTaskIdSetter(setter) {
     this.#harnessTaskIdSetter = setter;
   }
+  /**
+   * Record the epoch serve-factory minted and bound to this subprocess's
+   * in-process harness server (called right after `setHarnessEpoch`). The
+   * pre-warm manager reads it back via `harnessEpoch` so adoption registers
+   * the same epoch the fence will check — never a second, divergent UUID.
+   */
+  installHarnessEpoch(epoch) {
+    this.#harnessEpoch = epoch;
+  }
+  get harnessEpoch() {
+    return this.#harnessEpoch;
+  }
   setHarnessTaskId(taskId) {
     if (!this.#harnessTaskIdSetter) {
       throw new Error("setHarnessTaskId called before installHarnessTaskIdSetter");
@@ -27903,7 +27970,8 @@ var AnthropicAgentSubprocess = class _AnthropicAgentSubprocess {
           ...process.env,
           ...options.env,
           DISABLE_AUTO_COMPACT: "1",
-          CLAUDE_CODE_ENTRYPOINT: "shipyard"
+          CLAUDE_CODE_ENTRYPOINT: "shipyard",
+          ...buildAgentSubprocessCodexHomeEnv()
         },
         disallowedTools: options.disallowedTools,
         skills: options.skills,
@@ -28389,7 +28457,7 @@ import { homedir as homedir4 } from "os";
 
 // src/shared/capabilities/capabilities-cache.ts
 import { mkdir as mkdir13, readFile as readFile18, rename as rename11, unlink as unlink8, writeFile as writeFile14 } from "fs/promises";
-import { dirname as dirname15, join as join27 } from "path";
+import { dirname as dirname15, join as join28 } from "path";
 var CAPABILITIES_CACHE_VERSION = 1;
 var GitRepoInfoCacheSchema = external_exports.object({
   path: external_exports.string(),
@@ -28423,7 +28491,7 @@ var CacheFileSchema = external_exports.object({
   mcpServers: external_exports.array(MCPServerInfoCacheSchema)
 });
 function cacheFilePath() {
-  return join27(getShipyardHome(), "data", "capabilities-cache.json");
+  return join28(getShipyardHome(), "data", "capabilities-cache.json");
 }
 var EMPTY_ENVIRONMENTS = [];
 var EMPTY_MCP_SERVERS = [];
@@ -28689,7 +28757,7 @@ function appendDynamicPrompt(base2, appendix) {
 ${appendix}` : base2;
 }
 function rehydrateVizRegistry(registry, vizWatcher, resolvedTaskId, vizDir, log) {
-  const registryPath = join28(vizDir, resolvedTaskId, "registry.json");
+  const registryPath = join29(vizDir, resolvedTaskId, "registry.json");
   if (!existsSync3(registryPath)) return Promise.resolve();
   try {
     const raw = readFileSync4(registryPath, "utf-8");
@@ -28926,7 +28994,7 @@ async function initializeVaultSync(vaultKey, deps, credentialsVaultStore, oauthS
   });
 }
 function buildDefaultRepo(dataDir, identity) {
-  const storage = new FileStorageAdapter(join28(dataDir, "loro"));
+  const storage = new FileStorageAdapter(join29(dataDir, "loro"));
   return {
     repo: new Repo({
       identity,
@@ -29168,6 +29236,9 @@ function buildRejectionStubSubprocess(input) {
     stopBackgroundTask: noop3,
     setHarnessTaskId() {
     },
+    get harnessEpoch() {
+      return null;
+    },
     setOnCwdChanged() {
     },
     async rollback(_numTurns) {
@@ -29712,12 +29783,12 @@ function createBestEffortSender(deps) {
 
 // src/services/comments/github-ingest-pipeline.ts
 import { readFile as readFile20 } from "fs/promises";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 
 // src/services/harness/comment-server.ts
 import { randomUUID as randomUUID9 } from "crypto";
 import { access as access4, readFile as readFile19 } from "fs/promises";
-import { join as join29, relative as relative5 } from "path";
+import { join as join30, relative as relative5 } from "path";
 
 // src/shared/xml-utils.ts
 function escapeXmlAttr(text) {
@@ -30606,7 +30677,7 @@ async function resolveDiffScopeForFile(cwd, normalizedPath) {
 }
 async function handleDiffComment(ctx, filePath, lineNumber, comment) {
   const normalizedPath = normalizeToWorkspaceRelative(filePath, ctx.environmentKey);
-  const absolutePath = join29(ctx.environmentKey, normalizedPath);
+  const absolutePath = join30(ctx.environmentKey, normalizedPath);
   const fileExists2 = await access4(absolutePath).then(
     () => true,
     () => false
@@ -30893,7 +30964,7 @@ function prCommentToAnnotation(prComment, ctx) {
 // src/services/comments/github-ingest-pipeline.ts
 async function readLocalFileContent(cwd, path5) {
   try {
-    return await readFile20(join30(cwd, path5), "utf-8");
+    return await readFile20(join31(cwd, path5), "utf-8");
   } catch {
     return getFileAtRef(cwd, path5, "HEAD");
   }
@@ -31701,12 +31772,12 @@ function createPRPoller(callbacks, log, resolveTopLevel = getGitTopLevel) {
 
 // src/services/roi/commit-sweep.ts
 import { stat as stat11 } from "fs/promises";
-import { join as join32 } from "path";
+import { join as join33 } from "path";
 
 // src/services/git-checkpoint.ts
 import { execFile as execFileCb2 } from "child_process";
 import { readFile as readFile21, stat as stat10, unlink as unlink9, writeFile as writeFile15 } from "fs/promises";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 import { promisify as promisify7 } from "util";
 var execFile9 = promisify7(execFileCb2);
 var NOT_A_GIT_REPO = "Not a git repository";
@@ -31718,10 +31789,10 @@ async function resolveGitPaths(repoDir, taskId) {
   try {
     const { stdout } = await execFile9("git", ["rev-parse", "--git-dir"], { cwd: repoDir });
     const gitDir = stdout.trim();
-    const absoluteGitDir = gitDir.startsWith("/") ? gitDir : join31(repoDir, gitDir);
+    const absoluteGitDir = gitDir.startsWith("/") ? gitDir : join32(repoDir, gitDir);
     return {
       gitDir: absoluteGitDir,
-      shadowIndex: join31(absoluteGitDir, `shipyard-index-${taskId}`)
+      shadowIndex: join32(absoluteGitDir, `shipyard-index-${taskId}`)
     };
   } catch {
     return null;
@@ -31816,7 +31887,7 @@ async function rewindToCheckpointImpl(repoDir, taskId, turnNo) {
     const untrackedFiles = untrackedRaw.trim().split("\n").filter((f2) => f2.length > 0);
     for (const file of untrackedFiles) {
       try {
-        const fullPath = join31(repoDir, file);
+        const fullPath = join32(repoDir, file);
         const s2 = await stat10(fullPath);
         if (s2.isFile()) {
           await unlink9(fullPath);
@@ -32083,7 +32154,7 @@ async function revertSingleFile(repoDir, file, restoreCommit, mode) {
   const isDeletedByAgent = file.status === "deleted";
   const shouldDelete = mode === "revert" && isAddedByAgent || mode === "unrevert" && isDeletedByAgent;
   if (shouldDelete) {
-    await unlink9(join31(repoDir, file.path)).catch((err3) => {
+    await unlink9(join32(repoDir, file.path)).catch((err3) => {
       if (!isEnoent(err3)) throw err3;
     });
     await execFile9("git", ["reset", "HEAD", "--", file.path], { cwd: repoDir }).catch(() => {
@@ -32095,7 +32166,7 @@ async function revertSingleFile(repoDir, file, restoreCommit, mode) {
     maxBuffer: 10 * 1024 * 1024,
     encoding: "buffer"
   });
-  await writeFile15(join31(repoDir, file.path), stdout);
+  await writeFile15(join32(repoDir, file.path), stdout);
   await execFile9("git", ["reset", "HEAD", "--", file.path], { cwd: repoDir }).catch(() => {
   });
   return true;
@@ -32188,7 +32259,7 @@ async function diffCheckpointToWorkingTreeImpl(repoDir, taskId, fromTurnNo, scop
         if (!line || statusMap.has(line)) continue;
         let ins = 0;
         try {
-          ins = countLines(await readFile21(join31(repoDir, line), "utf-8"));
+          ins = countLines(await readFile21(join32(repoDir, line), "utf-8"));
         } catch {
         }
         entries.push({ path: line, status: "added", insertions: ins, deletions: 0 });
@@ -32208,7 +32279,7 @@ async function getFileVsWorkingTreeImpl(repoDir, taskId, fromTurnNo, filePath) {
   if (from2 === "error") return null;
   let modifiedContent;
   try {
-    modifiedContent = await readFile21(join31(repoDir, filePath), "utf-8");
+    modifiedContent = await readFile21(join32(repoDir, filePath), "utf-8");
   } catch {
     modifiedContent = "";
   }
@@ -32489,7 +32560,7 @@ async function isGitBinaryMissing() {
 }
 async function isGitWorkingTree(cwd) {
   try {
-    await stat11(join32(cwd, ".git"));
+    await stat11(join33(cwd, ".git"));
     return true;
   } catch {
     return false;
@@ -33453,7 +33524,7 @@ async function sweepOrphanedNotifications(taskStateStore, log) {
 
 // src/services/loro-recovery.ts
 import { access as access5, mkdir as mkdir14, rename as rename12, rm as rm6 } from "fs/promises";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 var DEFAULT_RECOVERY_TTL_MS = 6e4;
 function createLoroRecoveryService(deps) {
   const disabled = validateEnv().SHIPYARD_DISABLE_LORO_RECOVERY;
@@ -33504,9 +33575,9 @@ function createLoroRecoveryService(deps) {
   }
   async function quarantineAndSweep(docId, isoTs) {
     const encDocId = encodeURIComponent(docId);
-    const sourcePath = join33(deps.dataDir, "loro", encDocId);
-    const quarantineRoot = join33(deps.dataDir, "loro-quarantine", isoTs);
-    const quarantinePath = join33(quarantineRoot, encDocId);
+    const sourcePath = join34(deps.dataDir, "loro", encDocId);
+    const quarantineRoot = join34(deps.dataDir, "loro-quarantine", isoTs);
+    const quarantinePath = join34(quarantineRoot, encDocId);
     const sourceExists = await pathExists3(sourcePath);
     if (!sourceExists) return "";
     await mkdir14(quarantineRoot, { recursive: true, mode: 448 });
@@ -33515,7 +33586,7 @@ function createLoroRecoveryService(deps) {
   }
   async function postDeleteSweep(docId) {
     const encDocId = encodeURIComponent(docId);
-    const sourcePath = join33(deps.dataDir, "loro", encDocId);
+    const sourcePath = join34(deps.dataDir, "loro", encDocId);
     if (await pathExists3(sourcePath)) {
       try {
         await rm6(sourcePath, { recursive: true, force: true });
@@ -35342,7 +35413,7 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
   const aloStreamId = controlChannelStreamId(deps.peerSourceId);
   const aloOutboxChannelName = controlChannelOutboxChannel("daemon", deps.peerSourceId);
   const channelEpoch = registerControlChannelEpoch(controlPeerId);
-  const dataDir = join34(deps?.shipyardHome ?? getShipyardHome(), "data");
+  const dataDir = join35(deps?.shipyardHome ?? getShipyardHome(), "data");
   const aloOutbox = new JsonDocOutbox({
     dataDir,
     channel: aloOutboxChannelName,
@@ -35467,6 +35538,9 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
     onOrphanReaped: () => {
       handleControlChannelTerminal("orphan_reaped");
     },
+    onDeadLetter: (_entry, attempts) => {
+      telemeter("alo_resend_exhausted", { attempts, channel: "control" });
+    },
     log: logAdapter
   });
   const aloReady = aloShell.initialize().catch((err3) => {
@@ -35766,7 +35840,7 @@ function createPeerRoleRegistry() {
 
 // src/services/epoch-pruning.ts
 import { readdir as readdir14, rm as rm7 } from "fs/promises";
-import { join as join35 } from "path";
+import { join as join36 } from "path";
 var LEGACY_PREFIXES = [
   "task-meta",
   "task-conv",
@@ -35806,7 +35880,7 @@ async function pruneOldEpochData(dataDir, currentEpoch, log) {
     }
     if (!shouldPrune(decoded, currentEpoch)) continue;
     removals.push(
-      rm7(join35(dataDir, entry.name), { recursive: true }).then(() => {
+      rm7(join36(dataDir, entry.name), { recursive: true }).then(() => {
         pruned++;
       }).catch((err3) => {
         log({
@@ -38031,7 +38105,7 @@ function onConnection(ws, deps, peers) {
 
 // src/services/local-direct/local-direct-token.ts
 import { chmod as chmod2, mkdir as mkdir15, rename as rename13, rm as rm8, writeFile as writeFile16 } from "fs/promises";
-import { dirname as dirname17, join as join36 } from "path";
+import { dirname as dirname17, join as join37 } from "path";
 var ADVERTISEMENT_FILE = "local-direct.json";
 var ADVERTISEMENT_MODE = 384;
 var ADVERTISEMENT_DIR_MODE = 448;
@@ -38040,7 +38114,7 @@ function generateLocalDirectToken() {
   return nanoid(TOKEN_LENGTH);
 }
 function advertisementPath(shipyardHome) {
-  return join36(shipyardHome, "data", ADVERTISEMENT_FILE);
+  return join37(shipyardHome, "data", ADVERTISEMENT_FILE);
 }
 async function writeAdvertisement(shipyardHome, ad) {
   const target = advertisementPath(shipyardHome);
@@ -38307,7 +38381,7 @@ async function setupPluginEventWiring(deps) {
 import { exec as execCb2 } from "child_process";
 import { existsSync as existsSync5 } from "fs";
 import { readdir as readdir15, readFile as readFile22, stat as stat12 } from "fs/promises";
-import { basename as basename7, dirname as dirname18, join as join37 } from "path";
+import { basename as basename7, dirname as dirname18, join as join38 } from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
 import { promisify as promisify8 } from "util";
 
@@ -38442,7 +38516,7 @@ var PluginFileWatcher = class {
     }
     const loaded = [];
     for (const entry of entries) {
-      const pluginDir = join37(dir, entry);
+      const pluginDir = join38(dir, entry);
       let stats;
       try {
         stats = await stat12(pluginDir);
@@ -38457,7 +38531,7 @@ var PluginFileWatcher = class {
     this.#reconcile(loaded);
   }
   async #loadPlugin(id, pluginDir) {
-    const manifestPath = join37(pluginDir, "plugin.json");
+    const manifestPath = join38(pluginDir, "plugin.json");
     let manifestRaw;
     try {
       manifestRaw = await readFile22(manifestPath, "utf-8");
@@ -38494,7 +38568,7 @@ var PluginFileWatcher = class {
       return null;
     }
     let template = "";
-    const templatePath = join37(pluginDir, "template.html");
+    const templatePath = join38(pluginDir, "template.html");
     try {
       template = await readFile22(templatePath, "utf-8");
     } catch {
@@ -38509,7 +38583,7 @@ var PluginFileWatcher = class {
     };
   }
   async #loadAndRegisterHandler(id, pluginDir, title, manifest) {
-    const handlerPath = join37(pluginDir, "handler.mjs");
+    const handlerPath = join38(pluginDir, "handler.mjs");
     const loaded = await this.#resolveHandler(id, handlerPath);
     const { handlerFn, provideResourcesFn } = loaded;
     if (manifest.provideResources && provideResourcesFn && this.#config.resourceResolver) {
@@ -38636,14 +38710,20 @@ var PluginFileWatcher = class {
   get plugins() {
     return this.#currentPlugins;
   }
-  dispose() {
+  async dispose() {
     this.#disposed = true;
     if (this.#debounceTimer) {
       clearTimeout(this.#debounceTimer);
       this.#debounceTimer = null;
     }
-    void this.#dirWatcher?.unsubscribe();
+    const sub = this.#dirWatcher;
     this.#dirWatcher = null;
+    await sub?.unsubscribe().catch((err3) => {
+      this.#config.log({
+        event: "plugin_watcher_dispose_unsubscribe_failed",
+        error: err3 instanceof Error ? err3.message : String(err3)
+      });
+    });
     for (const id of this.#registeredIds) {
       unregisterPlugin(id);
       this.#config.eventBus?.unregisterAll(id);
@@ -38667,7 +38747,7 @@ async function findNativeDependencyMarker(pluginDir) {
 }
 async function scanNativeDependencyDir(dir, stack) {
   for (const entry of await readNativeScanEntries(dir)) {
-    const fullPath = join37(dir, entry.name);
+    const fullPath = join38(dir, entry.name);
     if (isNativeDependencyMarker(entry, dir)) return fullPath;
     if (shouldDescendForNativeScan(entry)) stack.push(fullPath);
   }
@@ -38692,7 +38772,7 @@ function isNodeBuildReleaseDir(dir) {
 
 // src/services/port-detection.ts
 import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname19, join as join38 } from "path";
+import { dirname as dirname19, join as join39 } from "path";
 var LSOF_TIMEOUT_MS = 8e3;
 var LSOF_TTL_MS = 5e3;
 var DEFAULT_POLL_INTERVAL_MS = 5e3;
@@ -38875,7 +38955,7 @@ function hasStringName(val) {
 function resolveProjectRoot(cwd) {
   let dir = cwd;
   while (true) {
-    const candidate = join38(dir, "package.json");
+    const candidate = join39(dir, "package.json");
     if (existsSync6(candidate)) {
       let packageName;
       try {
@@ -38999,7 +39079,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync2
 } from "fs";
-import { join as join39 } from "path";
+import { join as join40 } from "path";
 function isEnoent6(err3) {
   return err3 instanceof Error && Reflect.get(err3, "code") === "ENOENT";
 }
@@ -39009,7 +39089,7 @@ function atomicWriteSync(filePath, content) {
   renameSync(tmpPath, filePath);
 }
 function recordFilePath2(rootDir, taskId, elementId) {
-  return join39(rootDir, taskId, `${elementId}.json`);
+  return join40(rootDir, taskId, `${elementId}.json`);
 }
 function parseRecord2(filePath, logger2) {
   let raw;
@@ -39049,7 +39129,7 @@ function createPreviewStateStore(opts) {
     return taskMap;
   }
   function scanTaskDir(taskId) {
-    const taskPath = join39(rootDir, taskId);
+    const taskPath = join40(rootDir, taskId);
     let files;
     try {
       files = readdirSync4(taskPath);
@@ -39058,7 +39138,7 @@ function createPreviewStateStore(opts) {
     }
     for (const file of files) {
       if (!file.endsWith(".json")) continue;
-      const record = parseRecord2(join39(taskPath, file), logger2);
+      const record = parseRecord2(join40(taskPath, file), logger2);
       if (record) getTaskMap(taskId).set(record.elementId, record);
     }
   }
@@ -39084,7 +39164,7 @@ function createPreviewStateStore(opts) {
   function writeToDisk(taskId, state) {
     const filePath = recordFilePath2(rootDir, taskId, state.elementId);
     try {
-      mkdirSync3(join39(rootDir, taskId), { recursive: true });
+      mkdirSync3(join40(rootDir, taskId), { recursive: true });
       atomicWriteSync(filePath, JSON.stringify(state));
     } catch (err3) {
       logger2.warn(
@@ -41425,7 +41505,7 @@ function wireThreadErrorFallback(daemon, dc, taskId, threadId, channelId, log) {
 }
 
 // src/services/terminal-handler.ts
-import { join as join40 } from "path";
+import { join as join41 } from "path";
 
 // src/shared/pty-manager.ts
 import { accessSync, chmodSync, constants as constants2, createWriteStream } from "fs";
@@ -41514,7 +41594,7 @@ function createPtyManager() {
     if (exitSink) exitSink(exitCode3, signal);
     for (const cb of exitCallbacks) cb(exitCode3, signal);
   }
-  function spawn15(options) {
+  function spawn16(options) {
     if (isAlive) {
       throw new Error("PTY already spawned. Call kill() or dispose() first.");
     }
@@ -41690,7 +41770,7 @@ function createPtyManager() {
     get originTaskId() {
       return originTaskId;
     },
-    spawn: spawn15,
+    spawn: spawn16,
     write,
     resize,
     onData,
@@ -41706,7 +41786,7 @@ function createPtyManager() {
 // src/services/terminal-handler.ts
 var MAX_PTYS_DEFAULT = 20;
 function terminalLogPathFor(dir, terminalId) {
-  return join40(dir, `${terminalId}.log`);
+  return join41(dir, `${terminalId}.log`);
 }
 function handleTerminalChannel(taskId, terminalId, cwd, send, log, deps) {
   const maxPtys = deps.maxPtys ?? MAX_PTYS_DEFAULT;
@@ -42316,7 +42396,7 @@ function buildCollabRoomManager(deps) {
 // src/services/serve-factory.ts
 import { randomUUID as randomUUID25 } from "crypto";
 import { mkdir as mkdir36 } from "fs/promises";
-import { join as join78 } from "path";
+import { join as join79 } from "path";
 
 // src/shared/capabilities/cursor-boot-auth.ts
 async function mergeCursorAuthFromVault(caps, detect, log) {
@@ -42357,12 +42437,12 @@ async function mergeCursorAuthFromVault(caps, detect, log) {
 
 // src/shared/capabilities/cursor-hook-shim-path.ts
 import { statSync as statSync3 } from "fs";
-import { join as join41 } from "path";
+import { join as join42 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getCursorHookShimPath() {
   const resourcesPath = Reflect.get(process, "resourcesPath");
   if (typeof resourcesPath === "string" && resourcesPath.length > 0) {
-    return join41(resourcesPath, "daemon", "cursor-hook-shim.js");
+    return join42(resourcesPath, "daemon", "cursor-hook-shim.js");
   }
   return fileURLToPath2(new URL("./cursor-hook-shim.js", import.meta.url));
 }
@@ -42597,7 +42677,7 @@ function resolveRuntimeAuthIdentity(runtimeAuth, runtimeId) {
 // src/shared/capabilities/spinner-verbs-reader.ts
 import { readFile as readFile23 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { join as join42 } from "path";
+import { join as join43 } from "path";
 var ClaudeSpinnerVerbsSchema = external_exports.object({
   mode: external_exports.enum(["append", "replace"]),
   verbs: external_exports.array(external_exports.string())
@@ -42622,8 +42702,8 @@ function toPersistedVerbs(resolved, defaults2) {
   return resolved.every((v2, i) => v2 === defaults2[i]) ? [] : [...resolved];
 }
 async function readSpinnerVerbs() {
-  const claudeDir = join42(homedir5(), ".claude");
-  const paths = [join42(claudeDir, "settings.json"), join42(claudeDir, "settings.local.json")];
+  const claudeDir = join43(homedir5(), ".claude");
+  const paths = [join43(claudeDir, "settings.json"), join43(claudeDir, "settings.local.json")];
   const parsed = await Promise.all(
     paths.map(async (p2) => {
       try {
@@ -42665,7 +42745,7 @@ async function reimportSpinnerVerbs(store, log) {
 
 // src/shared/mcp/oauth-state-store.ts
 import { readFile as readFile24 } from "fs/promises";
-import { join as join43 } from "path";
+import { join as join44 } from "path";
 import {
   OAuthClientInformationFullSchema as OAuthClientInformationFullSchema2,
   OAuthClientInformationSchema as OAuthClientInformationSchema2,
@@ -42711,7 +42791,7 @@ var MCPOAuthStateStore = class {
     this.#shipyardHome = shipyardHome;
   }
   #filePath() {
-    return join43(this.#shipyardHome, STATE_FILE);
+    return join44(this.#shipyardHome, STATE_FILE);
   }
   #lockPath() {
     return `${this.#filePath()}.lock`;
@@ -42810,11 +42890,11 @@ function getShipyardSubagentCatalog() {
 
 // src/services/bootstrap/rehydrate.ts
 import { readFile as readFile26, rename as rename16, writeFile as writeFile18 } from "fs/promises";
-import { join as join45 } from "path";
+import { join as join46 } from "path";
 
 // src/services/collab/collab-queue-persistence.ts
 import { appendFile as appendFile2, mkdir as mkdir16, readdir as readdir16, readFile as readFile25, rename as rename15, rm as rm9, writeFile as writeFile17 } from "fs/promises";
-import { join as join44 } from "path";
+import { join as join45 } from "path";
 var PersistedQueueEntrySchema = external_exports.object({
   content: external_exports.array(ContentBlockSchema),
   settings: DaemonSettingsSchema.optional(),
@@ -42838,9 +42918,9 @@ function parsePersistedLine(line) {
   };
 }
 function buildCollabQueuePersistence(dataDir) {
-  const queuesDir = join44(dataDir, "collab-queues");
+  const queuesDir = join45(dataDir, "collab-queues");
   function queuePath(queueKey) {
-    return join44(queuesDir, `${queueKey}.jsonl`);
+    return join45(queuesDir, `${queueKey}.jsonl`);
   }
   async function ensureDir() {
     await mkdir16(queuesDir, { recursive: true });
@@ -42933,7 +43013,7 @@ function buildCollabQueuePersistence(dataDir) {
       }
       for (const name of names) {
         if (!name.includes(".tmp-")) continue;
-        await rm9(join44(queuesDir, name), { force: true }).catch(() => {
+        await rm9(join45(queuesDir, name), { force: true }).catch(() => {
         });
       }
     }
@@ -43252,7 +43332,7 @@ async function stripPinnedFieldFromTasksFile(tasksPath, envelope, records) {
   }
 }
 async function migratePinnedToFavoriteTasks(dataDir, userSettingsStore, log) {
-  const tasksPath = join45(dataDir, "tasks.json");
+  const tasksPath = join46(dataDir, "tasks.json");
   const parsed = await readRawTasksEnvelope(tasksPath);
   if (!parsed) return;
   const { records, envelope, fromMigrated } = parsed;
@@ -43368,7 +43448,7 @@ async function sweepStaleTasks(taskStateStore, taskManager, log) {
 
 // src/services/bootstrap/update-status.ts
 import { readFile as readFile27, unlink as unlink11 } from "fs/promises";
-import { join as join46 } from "path";
+import { join as join47 } from "path";
 var UPDATE_STATUS_FILENAME = "update-status.json";
 var RAW_LOG_MAX_CHARS = 500;
 var UpdateStatusSchema = external_exports.object({
@@ -43381,7 +43461,7 @@ var UpdateStatusSchema = external_exports.object({
   rolledBack: external_exports.boolean()
 });
 async function readAndClearUpdateStatus(shipyardHome, log) {
-  const path5 = join46(shipyardHome, UPDATE_STATUS_FILENAME);
+  const path5 = join47(shipyardHome, UPDATE_STATUS_FILENAME);
   let raw;
   try {
     raw = await readFile27(path5, "utf-8");
@@ -43468,11 +43548,11 @@ function wireUpdateStatusForwarding(report, sink2, onMessage, log) {
 
 // src/services/bootstrap/updates-cleanup.ts
 import { readdir as readdir17, rm as rm10, stat as stat14, unlink as unlink13 } from "fs/promises";
-import { join as join48 } from "path";
+import { join as join49 } from "path";
 
 // src/services/bootstrap/self-update-lock.ts
 import { mkdir as mkdir17, readFile as readFile28, stat as stat13, unlink as unlink12, writeFile as writeFile19 } from "fs/promises";
-import { dirname as dirname21, join as join47 } from "path";
+import { dirname as dirname21, join as join48 } from "path";
 var LOCK_FILENAME = ".lock";
 var STALE_LOCK_MS = 10 * 60 * 1e3;
 var LockFileSchema = external_exports.object({
@@ -43480,7 +43560,7 @@ var LockFileSchema = external_exports.object({
   startedAt: external_exports.number()
 });
 function lockPath(shipyardHome) {
-  return join47(shipyardHome, "updates", LOCK_FILENAME);
+  return join48(shipyardHome, "updates", LOCK_FILENAME);
 }
 function isStaleLock(lock, now, isProcessAlive2) {
   const age = now - lock.startedAt;
@@ -43603,7 +43683,7 @@ async function cleanupUpdatesDir(shipyardHome, deps = {}) {
   const now = deps.now ?? Date.now;
   const isProcessAlive2 = deps.isProcessAlive ?? defaultIsProcessAlive;
   const log = deps.log;
-  const updatesDir = join48(shipyardHome, "updates");
+  const updatesDir = join49(shipyardHome, "updates");
   const empty2 = {
     tarballsKept: [],
     tarballsDeleted: [],
@@ -43727,7 +43807,7 @@ async function sortByMtimeDesc(baseDir, names, log) {
   const rows = [];
   for (const name of names) {
     try {
-      const s2 = await stat14(join48(baseDir, name));
+      const s2 = await stat14(join49(baseDir, name));
       rows.push({ name, mtimeMs: s2.mtimeMs });
     } catch (err3) {
       log?.info({ err: err3, entry: name }, "updates cleanup: stat failed, skipping entry");
@@ -43740,7 +43820,7 @@ async function filterOlderThan(baseDir, names, nowMs, thresholdMs, log) {
   const out = [];
   for (const name of names) {
     try {
-      const s2 = await stat14(join48(baseDir, name));
+      const s2 = await stat14(join49(baseDir, name));
       if (nowMs - s2.mtimeMs > thresholdMs) {
         out.push(name);
       }
@@ -43754,7 +43834,7 @@ async function deleteFiles(baseDir, names, log) {
   const deleted = [];
   for (const name of names) {
     try {
-      await unlink13(join48(baseDir, name));
+      await unlink13(join49(baseDir, name));
       deleted.push(name);
     } catch (err3) {
       if (isEnoent(err3)) {
@@ -43770,7 +43850,7 @@ async function deleteDirs(baseDir, names, log) {
   const deleted = [];
   for (const name of names) {
     try {
-      await rm10(join48(baseDir, name), { recursive: true, force: true });
+      await rm10(join49(baseDir, name), { recursive: true, force: true });
       deleted.push(name);
     } catch (err3) {
       log?.info({ err: err3, entry: name }, "updates cleanup: rm -rf failed");
@@ -43779,7 +43859,7 @@ async function deleteDirs(baseDir, names, log) {
   return deleted;
 }
 async function maybeClearLock(shipyardHome, nowMs, isProcessAlive2, log) {
-  const lockFilePath = join48(shipyardHome, "updates", LOCK_FILENAME);
+  const lockFilePath = join49(shipyardHome, "updates", LOCK_FILENAME);
   const outcome = await readLockFileWithOutcome(shipyardHome);
   switch (outcome.kind) {
     case "absent":
@@ -45080,7 +45160,7 @@ function wireDevServersAndTerminalsResolvers(deps) {
 
 // src/services/file-resource-resolver.ts
 import { readFile as readFile29, stat as stat15 } from "fs/promises";
-import { basename as basename8, join as join49, normalize as normalize4, sep as sep3 } from "path";
+import { basename as basename8, join as join50, normalize as normalize4, sep as sep3 } from "path";
 var MAX_FILE_SIZE = 10 * 1024 * 1024;
 var MIME_BY_EXT2 = {
   ".ts": "text/typescript",
@@ -45149,7 +45229,7 @@ function createFileResourceResolver(deps) {
       const { taskId, relativePath } = parseFileUri2(uri);
       const cwd = deps.getTaskCwd(taskId) ?? deps.workspaceRoot;
       const normalizedCwd = normalize4(cwd);
-      const absolutePath = normalize4(join49(cwd, relativePath));
+      const absolutePath = normalize4(join50(cwd, relativePath));
       const cwdPrefix = normalizedCwd.endsWith(sep3) ? normalizedCwd : `${normalizedCwd}${sep3}`;
       if (!absolutePath.startsWith(cwdPrefix) && absolutePath !== normalizedCwd) {
         throw new Error(`Path traversal rejected: ${relativePath}`);
@@ -45217,7 +45297,7 @@ function unregisterSubprocessEpoch(taskId, registry = subprocessEpochs) {
 // src/services/harness/deliverable-server.ts
 import { randomUUID as randomUUID12 } from "crypto";
 import { copyFile, rm as fsRm, stat as fsStat3, mkdir as mkdir18 } from "fs/promises";
-import { basename as basename9, extname as extname2, join as join50, resolve as resolve8, sep as sep4 } from "path";
+import { basename as basename9, extname as extname2, join as join51, resolve as resolve8, sep as sep4 } from "path";
 var TOOL_DESCRIPTION2 = [
   "Register a proof-of-work deliverable for this task. Call this after producing an artifact (screenshot, video, log, markdown document, AX tree, DOM snapshot) so reviewers can see verifiable evidence of what the agent produced.",
   "",
@@ -45277,7 +45357,7 @@ var RegisterDeliverableInput = {
 };
 var COPY_MAX_BYTES = 50 * 1024 * 1024;
 function isInternedFile(dataDir, filePath) {
-  const internBase = resolve8(join50(dataDir, "deliverable-files")) + sep4;
+  const internBase = resolve8(join51(dataDir, "deliverable-files")) + sep4;
   return resolve8(filePath).startsWith(internBase);
 }
 async function internDeliverableFile(deliverableId, taskId, filePath, storedSizeBytes, dataDir, prevInternedPath) {
@@ -45301,8 +45381,8 @@ async function internDeliverableFile(deliverableId, taskId, filePath, storedSize
     };
   }
   const ext = extname2(filePath);
-  const destDir = join50(dataDir, "deliverable-files", taskId);
-  const destPath = join50(destDir, `${deliverableId}${ext}`);
+  const destDir = join51(dataDir, "deliverable-files", taskId);
+  const destPath = join51(destDir, `${deliverableId}${ext}`);
   try {
     await mkdir18(destDir, { recursive: true });
     await copyFile(filePath, destPath);
@@ -45728,7 +45808,7 @@ function createDeliverableTools(ctx) {
 
 // src/services/harness/plugin-server.ts
 import { mkdir as mkdir19, writeFile as writeFile20 } from "fs/promises";
-import { join as join51 } from "path";
+import { join as join52 } from "path";
 
 // src/services/harness/sandbox-docs.ts
 var SANDBOX_HTML_RULES = `## HTML Rules
@@ -46346,14 +46426,14 @@ ${addendum}`;
             events: input.events,
             provideResources: input.provideResources
           });
-          const pluginDir = join51(ctx.pluginsDir, input.pluginId);
+          const pluginDir = join52(ctx.pluginsDir, input.pluginId);
           await mkdir19(pluginDir, { recursive: true });
-          await writeFile20(join51(pluginDir, "template.html"), input.template, "utf-8");
+          await writeFile20(join52(pluginDir, "template.html"), input.template, "utf-8");
           if (input.handler) {
-            await writeFile20(join51(pluginDir, "handler.mjs"), input.handler, "utf-8");
+            await writeFile20(join52(pluginDir, "handler.mjs"), input.handler, "utf-8");
           }
           await writeFile20(
-            join51(pluginDir, "plugin.json"),
+            join52(pluginDir, "plugin.json"),
             JSON.stringify(manifest, null, 2),
             "utf-8"
           );
@@ -55026,124 +55106,6 @@ function validateHtml(html) {
 
 // src/services/harness/mermaid-validator.ts
 import { Window } from "happy-dom";
-
-// src/services/harness/mermaid-label-length.ts
-var MERMAID_MAX_LABEL_SEGMENT_CHARS = 40;
-var BR_TAG_SPLIT = /<br\s*\/?>/gi;
-var QUOTED_LABEL_PATTERNS = [
-  /\[\(\s*(["'])((?:\\.|(?!\1).)*)\1\s*\)\]/g,
-  /\(\[\s*(["'])((?:\\.|(?!\1).)*)\1\s*\]\)/g,
-  /\[\[\s*(["'])((?:\\.|(?!\1).)*)\1\s*\]\]/g,
-  /\{\{\s*(["'])((?:\\.|(?!\1).)*)\1\s*\}\}/g,
-  /\[\s*(["'])((?:\\.|(?!\1).)*)\1\s*\]/g,
-  /\(\(\s*(["'])((?:\\.|(?!\1).)*)\1\s*\)\)/g,
-  /\(\s*(["'])((?:\\.|(?!\1).)*)\1\s*\)/g,
-  /\{\s*(["'])((?:\\.|(?!\1).)*)\1\s*\}/g
-];
-var UNQUOTED_LABEL_PATTERNS = [
-  /\[\(\s*([^)"'\n]+?)\s*\)\]/g,
-  /\(\[\s*([^)"'\n]+?)\s*\]\)/g,
-  /\[\[\s*([^\]"\n]+?)\s*\]\]/g,
-  /\[\s*([^\]"(<\n]+?)\s*\]/g,
-  /\(\(\s*([^)"'\n]+?)\s*\)\)/g,
-  /\(\s*([^)"'\n]+?)\s*\)/g,
-  /\{\s*([^}"'\n]+?)\s*\}/g
-];
-function stripMermaidFrontmatter(code) {
-  return code.replace(/^%%\{[\s\S]*?\}%%\s*/m, "");
-}
-function consumeQuotedSegment(line, start, quote) {
-  let text = "";
-  for (let i = start; i < line.length; i++) {
-    const ch = line[i];
-    if (ch === "\\" && i + 1 < line.length) {
-      text += ch + line[i + 1];
-      i++;
-      continue;
-    }
-    text += ch;
-    if (i > start && ch === quote) return { text, nextIndex: i };
-  }
-  return { text, nextIndex: line.length - 1 };
-}
-function stripMermaidCommentFromLine(line) {
-  let result = "";
-  for (let i = 0; i < line.length; i++) {
-    const ch = line[i];
-    if (ch === '"' || ch === "'") {
-      const consumed = consumeQuotedSegment(line, i, ch);
-      result += consumed.text;
-      i = consumed.nextIndex;
-      continue;
-    }
-    if (ch === "%" && line[i + 1] === "%") break;
-    result += ch;
-  }
-  return result;
-}
-function stripMermaidComments(code) {
-  return code.split("\n").map(stripMermaidCommentFromLine).join("\n");
-}
-function extractMermaidNodeLabels(code) {
-  const stripped = stripMermaidComments(stripMermaidFrontmatter(code));
-  const labels = [];
-  const matchedRanges = [];
-  function overlaps(start, end) {
-    return matchedRanges.some(([s2, e]) => start < e && end > s2);
-  }
-  function record(start, end, text) {
-    if (!overlaps(start, end)) {
-      matchedRanges.push([start, end]);
-      labels.push(text);
-    }
-  }
-  for (const pattern of QUOTED_LABEL_PATTERNS) {
-    pattern.lastIndex = 0;
-    let match = pattern.exec(stripped);
-    while (match !== null) {
-      const text = match[2];
-      if (text !== void 0) {
-        record(match.index, match.index + match[0].length, text);
-      }
-      match = pattern.exec(stripped);
-    }
-  }
-  for (const pattern of UNQUOTED_LABEL_PATTERNS) {
-    pattern.lastIndex = 0;
-    let match = pattern.exec(stripped);
-    while (match !== null) {
-      const text = match[1]?.trim();
-      if (text) {
-        record(match.index, match.index + match[0].length, text);
-      }
-      match = pattern.exec(stripped);
-    }
-  }
-  return labels;
-}
-function checkMermaidLabelSegmentLengths(code, maxChars = MERMAID_MAX_LABEL_SEGMENT_CHARS) {
-  const labels = extractMermaidNodeLabels(code);
-  const warnings = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const label of labels) {
-    const segments = label.split(BR_TAG_SPLIT);
-    for (const segment of segments) {
-      const trimmed = segment.trim();
-      if (trimmed.length > maxChars) {
-        const key = `${trimmed}:${trimmed.length}`;
-        if (!seen.has(key)) {
-          seen.add(key);
-          warnings.push(
-            `Label too long (${trimmed.length} > ${maxChars} chars): "${trimmed}" \u2014 abbreviate or split with <br/>.`
-          );
-        }
-      }
-    }
-  }
-  return warnings;
-}
-
-// src/services/harness/mermaid-validator.ts
 var domInstalled = false;
 function installDom() {
   if (domInstalled) return;
@@ -55185,7 +55147,7 @@ function getMermaid() {
     mermaidPromise = (async () => {
       installDom();
       const mod = await import("mermaid");
-      mod.default.initialize({ startOnLoad: false, securityLevel: "antiscript" });
+      mod.default.initialize({ startOnLoad: false, securityLevel: MERMAID_SECURITY_LEVEL });
       return mod;
     })().catch((err3) => {
       mermaidPromise = null;
@@ -55201,8 +55163,7 @@ async function validateMermaid(code) {
   try {
     const { default: mermaid } = await getMermaid();
     const result = await mermaid.parse(code);
-    const warnings = checkMermaidLabelSegmentLengths(code);
-    return { valid: true, diagramType: result?.diagramType ?? "unknown", warnings };
+    return { valid: true, diagramType: result?.diagramType ?? "unknown" };
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     return { valid: false, error: message };
@@ -55940,7 +55901,7 @@ async function validateContent(type, content) {
   switch (type) {
     case "mermaid": {
       const result = await validateMermaid(content);
-      if (result.valid) return { ok: true, warnings: result.warnings };
+      if (result.valid) return { ok: true, warnings: [] };
       return { ok: false, error: result.error };
     }
     case "html": {
@@ -56544,7 +56505,7 @@ import { pathToFileURL as pathToFileURL3 } from "url";
 // src/services/lsp/language-server-registry.ts
 import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
 import { createRequire as createRequire3 } from "module";
-import { dirname as dirname22, isAbsolute as isAbsolute4, join as join52 } from "path";
+import { dirname as dirname22, isAbsolute as isAbsolute4, join as join53 } from "path";
 function decideTypescriptServer(d) {
   if (d.hasAngular || d.hasNest || d.hasTsserverPlugins) return "vtsls";
   return "tsgo";
@@ -56634,11 +56595,11 @@ function isRecord7(value) {
   return typeof value === "object" && value !== null;
 }
 function gatherTsDetection(cwd, deps) {
-  const pkg = deps.readJsonFile(join52(cwd, "package.json"));
+  const pkg = deps.readJsonFile(join53(cwd, "package.json"));
   const depNames = isRecord7(pkg) ? [...keysOf(pkg.dependencies), ...keysOf(pkg.devDependencies)] : [];
-  const hasAngular = depNames.includes("@angular/core") || deps.fileExists(join52(cwd, "angular.json"));
-  const hasNest = depNames.includes("@nestjs/core") || deps.fileExists(join52(cwd, "nest-cli.json"));
-  const tsconfig = deps.readJsonFile(join52(cwd, "tsconfig.json"));
+  const hasAngular = depNames.includes("@angular/core") || deps.fileExists(join53(cwd, "angular.json"));
+  const hasNest = depNames.includes("@nestjs/core") || deps.fileExists(join53(cwd, "nest-cli.json"));
+  const tsconfig = deps.readJsonFile(join53(cwd, "tsconfig.json"));
   const compilerOptions = isRecord7(tsconfig) ? tsconfig.compilerOptions : void 0;
   const plugins2 = isRecord7(compilerOptions) ? compilerOptions.plugins : void 0;
   const hasTsserverPlugins = Array.isArray(plugins2) && plugins2.length > 0;
@@ -56653,11 +56614,11 @@ function detectPythonVenv(cwd, deps) {
   if (envVenv && isAbsolute4(envVenv) && deps.fileExists(envVenv)) {
     candidates.push(envVenv);
   }
-  candidates.push(join52(cwd, ".venv"), join52(cwd, "venv"));
+  candidates.push(join53(cwd, ".venv"), join53(cwd, "venv"));
   const isWin = deps.platform === "win32";
   for (const root of candidates) {
-    const python = isWin ? join52(root, "Scripts", "python.exe") : join52(root, "bin", "python");
-    const python3 = isWin ? python : join52(root, "bin", "python3");
+    const python = isWin ? join53(root, "Scripts", "python.exe") : join53(root, "bin", "python");
+    const python3 = isWin ? python : join53(root, "bin", "python3");
     if (deps.fileExists(python) || deps.fileExists(python3)) return root;
   }
   return null;
@@ -56690,8 +56651,8 @@ function resolveTsgoBinaryPath(req) {
       `Unable to resolve ${platformPkg}: ${err3 instanceof Error ? err3.message : String(err3)}`
     );
   }
-  const exeDir = join52(dirname22(pkgJsonPath), "lib");
-  const exe = process.platform === "win32" ? join52(exeDir, "tsgo.exe") : join52(exeDir, "tsgo");
+  const exeDir = join53(dirname22(pkgJsonPath), "lib");
+  const exe = process.platform === "win32" ? join53(exeDir, "tsgo.exe") : join53(exeDir, "tsgo");
   if (!existsSync7(exe)) {
     throw new Error(`tsgo native binary not found: ${exe}`);
   }
@@ -56704,7 +56665,7 @@ function resolveBinViaPackageJson(pkg, binName, req) {
   const named = isRecord7(binField) ? binField[binName] : void 0;
   const bin = typeof binField === "string" ? binField : typeof named === "string" ? named : void 0;
   if (!bin) throw new Error(`package '${pkg}' has no bin entry '${binName}'`);
-  return join52(dirname22(pkgJsonPath), bin);
+  return join53(dirname22(pkgJsonPath), bin);
 }
 function errorMessage3(err3) {
   return err3 instanceof Error ? err3.message : String(err3);
@@ -57393,7 +57354,7 @@ function getPeerSubscriptionSynchronizer(repo) {
 }
 function repoHasPeerSubscription(repo, docId) {
   const synchronizer = getPeerSubscriptionSynchronizer(repo);
-  if (!synchronizer) return false;
+  if (!synchronizer) return true;
   return synchronizer.getPeers().some((peer) => peer.subscriptions.has(docId));
 }
 
@@ -59567,7 +59528,7 @@ import { execFile as execFileCb3 } from "child_process";
 import { createHash as createHash3 } from "crypto";
 import { readFile as readFile31 } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { join as join53 } from "path";
+import { join as join54 } from "path";
 import { promisify as promisify9 } from "util";
 var execFile10 = promisify9(execFileCb3);
 var CodexCredentialsEntrySchema = external_exports.object({
@@ -59628,10 +59589,10 @@ async function readKeychainStore() {
     return null;
   }
 }
-async function readCodexMcpCredentials(serverName, serverUrl, codexHome = join53(homedir6(), ".codex")) {
+async function readCodexMcpCredentials(serverName, serverUrl, codexHome = join54(homedir6(), ".codex")) {
   if (!serverUrl) return null;
   try {
-    const raw = await readFile31(join53(codexHome, FALLBACK_FILENAME), "utf-8");
+    const raw = await readFile31(join54(codexHome, FALLBACK_FILENAME), "utf-8");
     const fileResult = CodexCredentialsFileSchema.safeParse(JSON.parse(raw));
     if (fileResult.success) {
       const entry = findEntry2(fileResult.data, serverName, serverUrl);
@@ -61828,7 +61789,7 @@ var HealthMetrics = class {
 // src/services/metrics/stall-profiler.ts
 import { mkdir as mkdir20, readdir as readdir18, unlink as unlink14, writeFile as writeFile21 } from "fs/promises";
 import { Session as Session2 } from "inspector/promises";
-import { join as join54 } from "path";
+import { join as join55 } from "path";
 import { monitorEventLoopDelay as monitorEventLoopDelay3 } from "perf_hooks";
 function hasProfile2(value) {
   return typeof value === "object" && value !== null && "profile" in value;
@@ -61938,7 +61899,7 @@ var StallProfiler = class {
       const isoTs = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
       const stallRounded = Math.round(stallMs);
       const filename = `stall-${isoTs}-${stallRounded}ms.cpuprofile`;
-      const profilePath = join54(this.#outDir, filename);
+      const profilePath = join55(this.#outDir, filename);
       await mkdir20(this.#outDir, { recursive: true });
       await writeFile21(profilePath, JSON.stringify(stopResult.profile));
       this.#log({
@@ -61972,7 +61933,7 @@ var StallProfiler = class {
       const entries = await readdir18(this.#outDir);
       const toDelete = planProfileEviction(entries, this.#maxProfiles, STALL_PROFILE_PREFIX);
       if (toDelete.length === 0) return;
-      const results = await Promise.allSettled(toDelete.map((f2) => unlink14(join54(this.#outDir, f2))));
+      const results = await Promise.allSettled(toDelete.map((f2) => unlink14(join55(this.#outDir, f2))));
       const failures = results.filter((r) => r.status === "rejected").length;
       if (failures > 0) {
         this.#log({
@@ -63031,7 +62992,7 @@ function joinPoint(doc2, pos, dir = -1) {
     pos = dir < 0 ? $pos.before(d) : $pos.after(d);
   }
 }
-function join55(tr2, pos, depth) {
+function join56(tr2, pos, depth) {
   let convertNewlines = null;
   let { linebreakReplacement } = tr2.doc.type.schema;
   let $before = tr2.doc.resolve(pos - depth), beforeType = $before.node().type;
@@ -63717,7 +63678,7 @@ var Transform = class {
   last and first siblings are also joined, and so on.
   */
   join(pos, depth = 1) {
-    join55(this, pos, depth);
+    join56(this, pos, depth);
     return this;
   }
   /**
@@ -84131,10 +84092,11 @@ var PreWarmManager = class {
   #cwd = null;
   #generation = 0;
   /**
-   * Per-spawn epoch UUID — minted alongside each `#generation` increment in
-   * `#spawn()`. Surfaced on `PreWarmClaim` so the adopting Thread can register
-   * it with the subprocess-epoch registry (AGENTS.md Invariant #2b). Reset to
-   * `null` on `#teardown()` / `dispose()`.
+   * The harness-bound epoch captured from `subprocess.harnessEpoch` after the
+   * spawn dispatcher minted+bound it (NOT minted here). Surfaced on
+   * `PreWarmClaim` so the adopting Thread registers the SAME epoch the harness
+   * fence checks (AGENTS.md Invariant #2b). Reset to `null` on
+   * `#teardown()` / `dispose()`.
    */
   #epoch = null;
   #disposed = false;
@@ -84358,7 +84320,7 @@ var PreWarmManager = class {
     this.#canUseToolSlot = null;
     if (this.#epoch === null) {
       throw new Error(
-        `PreWarmManager.claim() invariant violated: warm subprocess has no #epoch (status=${this.#status}, cwd=${cwd})`
+        `PreWarmManager.claim() invariant violated: warm subprocess has no harness epoch (status=${this.#status}, cwd=${cwd})`
       );
     }
     const epoch = this.#epoch;
@@ -84402,7 +84364,7 @@ var PreWarmManager = class {
       return;
     }
     const generation = ++this.#generation;
-    this.#epoch = crypto.randomUUID();
+    this.#epoch = null;
     this.#cwd = cwd;
     this.#status = "spawning";
     const slot = createEventSlot();
@@ -84440,6 +84402,7 @@ var PreWarmManager = class {
       settings,
       cwd
     );
+    this.#epoch = this.#subprocess.harnessEpoch;
     emitStep("spawn_call", performance.now() - tSpawnCall);
     this.#startWarmTimer(generation);
   }
@@ -90542,6 +90505,7 @@ function buildCodexThreadConfigOverrides(writableRoots = []) {
   const sandboxWorkspaceWrite = writableRoots.length > 0 ? { network_access: true, writable_roots: [...writableRoots] } : { network_access: true };
   return {
     ...CODEX_THREAD_CONFIG_OVERRIDES,
+    ...buildCodexShellCodexHomeConfigOverride(),
     sandbox_workspace_write: sandboxWorkspaceWrite
   };
 }
@@ -91907,6 +91871,10 @@ var CodexAgentSubprocess = class _CodexAgentSubprocess {
       reason: "Codex prewarm not supported; taskId is set at thread/start only."
     });
   }
+  /** Codex fences its harness MCP via the HTTP `x-shipyard-generation` header / per-runner bearer, not an in-process epoch. */
+  get harnessEpoch() {
+    return null;
+  }
   setOnCwdChanged(handler) {
     this.#cwdHandler = handler;
   }
@@ -92424,6 +92392,10 @@ function createCodexSubprocessFacade(options, log) {
       }
       pending.push({ kind: "setHarnessTaskId", taskId });
     },
+    /** Codex fences via HTTP header / per-runner bearer — always null (delegated for forward-compat). */
+    get harnessEpoch() {
+      return inner ? inner.harnessEpoch : null;
+    },
     setOnCwdChanged(handler) {
       cwdHandler = handler;
       if (inner) {
@@ -92502,6 +92474,10 @@ function createCodexFacadeApiBuilder(d) {
       reconnectMcpServer: (serverName) => codexFacadeReconnectMcpServer(state, serverName),
       stopBackgroundTask: (taskId) => codexFacadeStopBackgroundTask(state, taskId),
       setHarnessTaskId: (taskId) => codexFacadeSetHarnessTaskId(state, taskId),
+      /** Codex fences its harness via HTTP header / per-runner bearer — delegate (always null today). */
+      get harnessEpoch() {
+        return state.inner?.harnessEpoch ?? null;
+      },
       setOnCwdChanged: (handler) => codexFacadeSetOnCwdChanged(state, handler),
       getContextUsage: () => state.inner?.getContextUsage() ?? Promise.resolve(null),
       restartWithExtendedSandbox: (grant) => codexFacadeRestartWithExtendedSandbox(state, grant),
@@ -92962,15 +92938,15 @@ function bindToolToMcpServer(server, tool) {
 
 // src/services/serve-factory/pure-helpers.ts
 function buildCodexSpawnArgs(args) {
-  const spawn15 = rewriteElectronNodeScriptSpawn({
+  const spawn16 = rewriteElectronNodeScriptSpawn({
     binary: args.binary,
     argv: args.argv,
     env: args.env
   });
   return {
-    binary: spawn15.binary,
-    argv: spawn15.argv,
-    ...spawn15.env !== void 0 ? { env: spawn15.env } : {},
+    binary: spawn16.binary,
+    argv: spawn16.argv,
+    ...spawn16.env !== void 0 ? { env: spawn16.env } : {},
     stripEnv: args.stripEnv
   };
 }
@@ -93107,14 +93083,14 @@ function createCodexFacadeSubsystem(d) {
     const engine = new CodexEngineSingleton({
       resolveSpawnConfig: async () => {
         const binaryPath = await codexProfile.spawn.binaryResolver() ?? "codex";
-        const spawn15 = rewriteElectronNodeScriptSpawn({
+        const spawn16 = rewriteElectronNodeScriptSpawn({
           binary: binaryPath,
           argv: ["app-server"]
         });
         return {
-          binaryPath: spawn15.binary,
-          args: spawn15.argv,
-          ...spawn15.env !== void 0 ? { env: spawn15.env } : {},
+          binaryPath: spawn16.binary,
+          args: spawn16.argv,
+          ...spawn16.env !== void 0 ? { env: spawn16.env } : {},
           stripEnv: codexProfile.spawn.envStrip
         };
       },
@@ -93616,12 +93592,12 @@ function handleTaskStoreBroadcast(deps, event) {
 }
 
 // src/services/serve-factory/viz-preview.ts
-import { join as join58 } from "path";
+import { join as join59 } from "path";
 
 // src/services/harness/visualization-file-watcher.ts
 import { randomUUID as randomUUID16 } from "crypto";
 import { mkdir as mkdir21, readFile as readFile32, rename as rename17, writeFile as writeFile22 } from "fs/promises";
-import { basename as basename10, dirname as dirname23, join as join56 } from "path";
+import { basename as basename10, dirname as dirname23, join as join57 } from "path";
 var PREVIEW_DEFAULT_W = 1200;
 var PREVIEW_DEFAULT_H = 800;
 function previewDataToLoroValue(data) {
@@ -93832,7 +93808,7 @@ var VisualizationFileWatcher = class {
       }
       case "persist_registry":
         await atomicWrite2(
-          join56(this.#deps.vizDir, effect.taskId, "registry.json"),
+          join57(this.#deps.vizDir, effect.taskId, "registry.json"),
           JSON.stringify(effect.data, null, 2)
         );
         break;
@@ -94100,7 +94076,7 @@ var VisualizationFileWatcher = class {
 
 // src/services/harness/visualization-registry.ts
 import { createHash as createHash5 } from "crypto";
-import { join as join57 } from "path";
+import { join as join58 } from "path";
 function hashContent(content) {
   return createHash5("sha256").update(content).digest("hex");
 }
@@ -94114,7 +94090,7 @@ var VisualizationRegistry = class {
       return null;
     }
     const ext = vizFileExtension(vizType);
-    const filePath = join57(vizDir, taskId, `${slug}${ext}`);
+    const filePath = join58(vizDir, taskId, `${slug}${ext}`);
     const contentHash3 = hashContent(content);
     const viz = {
       slug,
@@ -94265,7 +94241,7 @@ var VisualizationRegistry = class {
 // src/services/serve-factory/viz-preview.ts
 function createVizPreviewRegistry(deps) {
   const { canvasRepo } = deps;
-  const vizDir = join58(deps.dataDir, "visualizations");
+  const vizDir = join59(deps.dataDir, "visualizations");
   const vizWatchers = /* @__PURE__ */ new Map();
   function getOrCreateVizWatcher(taskId) {
     const existing = vizWatchers.get(taskId);
@@ -95196,6 +95172,9 @@ import { fork } from "child_process";
 import { randomUUID as cryptoRandomUUID } from "crypto";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
+// src/services/session/agent-subprocess.ts
+var RUN_STATUS_ERROR_SUBTYPE = "run_status_error";
+
 // src/services/session/cursor-event-translator.ts
 function createCursorTranslatorCtx(generation) {
   return {
@@ -95445,7 +95424,7 @@ function classifyStatusErrorText(text) {
     return {
       type: "sdk_error",
       error: "Cursor run error (status: ERROR)",
-      errorSubtype: "run_status_error"
+      errorSubtype: RUN_STATUS_ERROR_SUBTYPE
     };
   }
   const lower = text.toLowerCase();
@@ -95458,7 +95437,7 @@ function classifyStatusErrorText(text) {
   if (lower.includes("payment") || lower.includes("billing") || lower.includes("insufficient credits") || lower.includes("subscription")) {
     return { type: "billing_error" };
   }
-  return { type: "sdk_error", error: text, errorSubtype: "run_status_error" };
+  return { type: "sdk_error", error: text, errorSubtype: RUN_STATUS_ERROR_SUBTYPE };
 }
 function translateStatusMessage(msg) {
   if (msg.status !== "ERROR") return [];
@@ -95611,6 +95590,9 @@ function buildCursorCompactionCompleted(preTokens) {
     ...preTokens !== void 0 ? { preTokens } : {}
   };
 }
+function toolExecutionSubprocessEvent(phase) {
+  return { type: phase === "started" ? "tool_execution_started" : "tool_execution_settled" };
+}
 
 // src/services/session/cursor-run-result.ts
 var RunGitBranchInfoSchema = external_exports.object({
@@ -96475,6 +96457,10 @@ var CursorAgentSubprocess = class {
       token: this.#harnessToken
     });
   }
+  /** Cursor fences its harness MCP via the HTTP `x-shipyard-generation` header / per-runner bearer, not an in-process epoch. */
+  get harnessEpoch() {
+    return null;
+  }
   setOnCwdChanged(_handler) {
   }
   async rollback(_numTurns) {
@@ -96528,7 +96514,7 @@ var CursorAgentSubprocess = class {
        * (connectrpc streaming requires HTTP/2), so the agent reaches the model
        * and then errors mid-run. Default HTTP/2 is correct; the run completes.
        */
-      env: buildNodeSpawnEnv(process.env)
+      env: { ...buildNodeSpawnEnv(process.env), ...buildAgentSubprocessCodexHomeEnv() }
     });
     this.#child = child;
     const tracker = this.#pidTracker;
@@ -96916,6 +96902,9 @@ var CursorAgentSubprocess = class {
       case "stream_activity":
         this.#onEvent({ type: msg.kind });
         return;
+      case "tool_execution":
+        this.#onEvent(toolExecutionSubprocessEvent(msg.phase));
+        return;
       case "user_message_persisted": {
         logger.info({
           event: "cursor_user_message_persisted",
@@ -97742,7 +97731,7 @@ function createShipyardResolver() {
 
 // src/services/stack-detection.ts
 import { access as access6 } from "fs/promises";
-import { join as join60 } from "path";
+import { join as join61 } from "path";
 var STACK_TIMEOUT_MS = TIMEOUT_MS;
 async function defaultIsCommandAvailable(command2) {
   try {
@@ -97784,7 +97773,7 @@ async function detectStack(cwd, currentBranch, deps = {}) {
 async function detectGraphite(cwd, currentBranch, isCommandAvailable, fileExists2, exec, getDefaultBranch2) {
   const gtAvailable = await isCommandAvailable("gt");
   if (!gtAvailable) return null;
-  const markerPresent = await fileExists2(join60(cwd, ".git", ".graphite_repo_config"));
+  const markerPresent = await fileExists2(join61(cwd, ".git", ".graphite_repo_config"));
   if (!markerPresent) return null;
   const ancestor = await exec("gt", ["parent"], cwd).then((s2) => normalizeBranchName(s2)).catch(() => null);
   const childrenRaw = await exec("gt", ["children"], cwd).then((s2) => s2).catch(() => "");
@@ -97797,7 +97786,7 @@ async function detectGraphite(cwd, currentBranch, isCommandAvailable, fileExists
   return { ancestor: resolvedAncestor, descendants };
 }
 async function detectJujutsu(cwd, fileExists2, exec) {
-  const jjPresent = await fileExists2(join60(cwd, ".jj"));
+  const jjPresent = await fileExists2(join61(cwd, ".jj"));
   if (!jjPresent) return null;
   const ancestorRaw = await exec(
     "jj",
@@ -97846,7 +97835,7 @@ function parseJjLines(raw) {
 
 // src/services/storage/annotation-store.ts
 import { mkdir as mkdir22, readFile as readFile34 } from "fs/promises";
-import { dirname as dirname25, join as join61 } from "path";
+import { dirname as dirname25, join as join62 } from "path";
 var LegacyBaseFields = external_exports.object({
   commentId: external_exports.string(),
   body: external_exports.string(),
@@ -97873,7 +97862,7 @@ var LegacyPlanStoreSchema = external_exports.object({
   versions: external_exports.array(PlanVersionZodSchema)
 });
 function buildAnnotationStore(dataDir) {
-  const baseDir = join61(dataDir, "annotations");
+  const baseDir = join62(dataDir, "annotations");
   const cache2 = /* @__PURE__ */ new Map();
   const listeners = /* @__PURE__ */ new Set();
   const writeQueues = /* @__PURE__ */ new Map();
@@ -97886,7 +97875,7 @@ function buildAnnotationStore(dataDir) {
     }
   }
   function filePath(taskId) {
-    return join61(baseDir, `${taskId}.json`);
+    return join62(baseDir, `${taskId}.json`);
   }
   function emptyData() {
     return {
@@ -97951,9 +97940,9 @@ function buildAnnotationStore(dataDir) {
   }
   async function migrateLegacyFiles(taskId) {
     const [diffRaw, previewRaw, planRaw] = await Promise.all([
-      readLegacyFile(join61(dataDir, "diff-review", `${taskId}.json`)),
-      readLegacyFile(join61(dataDir, "preview-annotations", `${taskId}.json`)),
-      readLegacyFile(join61(dataDir, "plan-comments", `${taskId}.json`))
+      readLegacyFile(join62(dataDir, "diff-review", `${taskId}.json`)),
+      readLegacyFile(join62(dataDir, "preview-annotations", `${taskId}.json`)),
+      readLegacyFile(join62(dataDir, "plan-comments", `${taskId}.json`))
     ]);
     if (diffRaw === null && previewRaw === null && planRaw === null) {
       return null;
@@ -98156,7 +98145,7 @@ function buildAnnotationStore(dataDir) {
 
 // src/services/storage/asset-store.ts
 import { mkdir as mkdir23, readFile as readFile35, rename as rename18, writeFile as writeFile23 } from "fs/promises";
-import { join as join62 } from "path";
+import { join as join63 } from "path";
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function isValidAssetId(id) {
   return UUID_RE.test(id);
@@ -98182,10 +98171,10 @@ function buildAssetStore(assetsDir) {
     }
   }
   function binaryPath(assetId) {
-    return join62(assetsDir, `${assetId}.bin`);
+    return join63(assetsDir, `${assetId}.bin`);
   }
   function metaPath(assetId) {
-    return join62(assetsDir, `${assetId}.meta.json`);
+    return join63(assetsDir, `${assetId}.meta.json`);
   }
   function parseMeta(raw) {
     return AssetMetadataSchema.parse(JSON.parse(raw));
@@ -98209,8 +98198,8 @@ function buildAssetStore(assetsDir) {
         size: data.byteLength,
         createdAt: Date.now()
       };
-      const tmpBin = join62(assetsDir, `${assetId}.bin.tmp`);
-      const tmpMeta = join62(assetsDir, `${assetId}.meta.tmp`);
+      const tmpBin = join63(assetsDir, `${assetId}.bin.tmp`);
+      const tmpMeta = join63(assetsDir, `${assetId}.meta.tmp`);
       await writeFile23(tmpBin, data);
       await writeFile23(tmpMeta, JSON.stringify(metadata), "utf-8");
       await rename18(tmpBin, binaryPath(assetId));
@@ -98435,7 +98424,7 @@ function buildCredentialsVaultStore(filePath, corruptionLogger) {
 
 // src/services/storage/deliverable-store.ts
 import { mkdir as mkdir25, readFile as readFile37 } from "fs/promises";
-import { dirname as dirname27, join as join63 } from "path";
+import { dirname as dirname27, join as join64 } from "path";
 var DELIVERABLE_STORE_VERSION = 1;
 var DeliverableStoreSchema = external_exports.object({
   schemaVersion: external_exports.number(),
@@ -98449,7 +98438,7 @@ function migrateDeliverableStore(raw) {
   return { schemaVersion: DELIVERABLE_STORE_VERSION, records: [] };
 }
 function buildDeliverableStore(dataDir) {
-  const baseDir = join63(dataDir, "deliverables");
+  const baseDir = join64(dataDir, "deliverables");
   const cache2 = /* @__PURE__ */ new Map();
   const listeners = /* @__PURE__ */ new Set();
   const writeQueues = /* @__PURE__ */ new Map();
@@ -98462,7 +98451,7 @@ function buildDeliverableStore(dataDir) {
     }
   }
   function filePath(taskId) {
-    return join63(baseDir, `${taskId}.json`);
+    return join64(baseDir, `${taskId}.json`);
   }
   function emptyData() {
     return { schemaVersion: DELIVERABLE_STORE_VERSION, records: [] };
@@ -98602,7 +98591,7 @@ function buildDeliverableStore(dataDir) {
 
 // src/services/storage/jsonl-conversation-store.ts
 import { appendFile as appendFile3, mkdir as mkdir26, open, readFile as readFile38, stat as stat16 } from "fs/promises";
-import { join as join64 } from "path";
+import { join as join65 } from "path";
 var StoredMessageSchema = MessageSchema.omit({ seqNo: true, channelId: true });
 function logPerf(entry) {
   try {
@@ -98612,12 +98601,12 @@ function logPerf(entry) {
   }
 }
 function buildJsonlConversationStore(dataDir, opts = {}) {
-  const channelsDir = join64(dataDir, "channels");
+  const channelsDir = join65(dataDir, "channels");
   const seqCounters = /* @__PURE__ */ new Map();
   const channelQueues = /* @__PURE__ */ new Map();
   const readCache = /* @__PURE__ */ new Map();
   function channelPath(channelId) {
-    return join64(channelsDir, `${channelId}.jsonl`);
+    return join65(channelsDir, `${channelId}.jsonl`);
   }
   async function ensureDir() {
     await mkdir26(channelsDir, { recursive: true });
@@ -99389,7 +99378,7 @@ function buildProjectsStore(filePath) {
 
 // src/services/storage/rate-limit-store.ts
 import { mkdir as mkdir28, readFile as readFile40 } from "fs/promises";
-import { dirname as dirname29, join as join65 } from "path";
+import { dirname as dirname29, join as join66 } from "path";
 var RATE_LIMIT_STORE_VERSION = 4;
 var RateLimitRecordSchema = external_exports.object({
   info: RateLimitInfoSchema,
@@ -99428,7 +99417,7 @@ function isWindowKey(x2) {
   return x2 !== void 0 && WINDOW_KEYS.has(x2);
 }
 async function buildRateLimitStore(dataDir, opts) {
-  const filePath = join65(dataDir, "rate-limits.json");
+  const filePath = join66(dataDir, "rate-limits.json");
   const lockPath2 = `${filePath}.lock`;
   const initial = await loadStoreFile(filePath, opts.logger);
   const records = { ...initial.records };
@@ -99681,7 +99670,7 @@ async function atomicWrite4(filePath, data) {
 }
 
 // src/services/storage/schedule-store.ts
-import { join as join66 } from "path";
+import { join as join67 } from "path";
 
 // src/services/storage/json-document-store.ts
 import { mkdir as mkdir29, readFile as readFile41 } from "fs/promises";
@@ -99872,7 +99861,7 @@ function buildScheduleStore(dataDir) {
   const store = buildJsonDocumentStore({
     storeName: "schedules",
     docType: "schedule",
-    filePath: join66(dataDir, "schedules.json"),
+    filePath: join67(dataDir, "schedules.json"),
     recordSchema: ScheduleRecordSchema,
     currentVersion: SCHEDULE_STORE_VERSION,
     migrate(raw) {
@@ -99911,7 +99900,7 @@ function buildScheduleStore(dataDir) {
 
 // src/services/storage/session-persistence.ts
 import { mkdir as mkdir30, readdir as readdir19, readFile as readFile42, rm as rm12 } from "fs/promises";
-import { join as join67 } from "path";
+import { join as join68 } from "path";
 var PersistedSessionSchema = external_exports.object({
   sessionId: external_exports.string(),
   channelId: external_exports.string(),
@@ -99968,9 +99957,9 @@ async function loadOneSessionFile(originalPath, corruptionLogger) {
   }
 }
 function buildSessionPersistence(dataDir, corruptionLogger) {
-  const channelsDir = join67(dataDir, "channels");
+  const channelsDir = join68(dataDir, "channels");
   function sessionPath(channelId) {
-    return join67(channelsDir, `${channelId}.session.json`);
+    return join68(channelsDir, `${channelId}.session.json`);
   }
   async function ensureDir() {
     await mkdir30(channelsDir, { recursive: true });
@@ -100028,7 +100017,7 @@ function buildSessionPersistence(dataDir, corruptionLogger) {
           if (i >= sessionEntries.length) return;
           const entry = sessionEntries[i];
           if (!entry) return;
-          results[i] = await loadOneSessionFile(join67(channelsDir, entry), corruptionLogger);
+          results[i] = await loadOneSessionFile(join68(channelsDir, entry), corruptionLogger);
         }
       }
       const workers = Array.from(
@@ -100042,12 +100031,12 @@ function buildSessionPersistence(dataDir, corruptionLogger) {
 }
 
 // src/services/storage/template-store.ts
-import { join as join68 } from "path";
+import { join as join69 } from "path";
 function buildTemplateStore(dataDir) {
   const store = buildJsonDocumentStore({
     storeName: "templates",
     docType: "template",
-    filePath: join68(dataDir, "templates.json"),
+    filePath: join69(dataDir, "templates.json"),
     recordSchema: TaskTemplateRecordSchema,
     currentVersion: TEMPLATE_STORE_VERSION,
     migrate(raw) {
@@ -102743,6 +102732,20 @@ function emitSessionDeath(b2, event, _origin) {
 function isCleanExit(event) {
   return event.exitCode === 0 && (event.signal === null || event.signal === void 0);
 }
+function stallHeartbeatEffect(event) {
+  switch (event.type) {
+    case "step_progress":
+      return { type: "reset_stall_timer", firstStep: true, toolExecution: "none" };
+    case "stream_activity":
+      return { type: "reset_stall_timer", firstStep: false, toolExecution: "none" };
+    case "tool_execution_started":
+      return { type: "reset_stall_timer", firstStep: false, toolExecution: "latch" };
+    case "tool_execution_settled":
+      return { type: "reset_stall_timer", firstStep: false, toolExecution: "unlatch" };
+    default:
+      return null;
+  }
+}
 function handleSpawning(snapshot, event) {
   const b2 = createEffectBuilder();
   if (event.type === "init_received") {
@@ -102833,8 +102836,9 @@ function handleSpawning(snapshot, event) {
       effects: b2.effects
     };
   }
-  if (event.type === "step_progress" || event.type === "stream_activity") {
-    b2.effects.push({ type: "reset_stall_timer", firstStep: event.type === "step_progress" });
+  const heartbeat = stallHeartbeatEffect(event);
+  if (heartbeat) {
+    b2.effects.push(heartbeat);
     return {
       state: "spawning",
       sessionId: snapshot.sessionId,
@@ -102862,6 +102866,28 @@ function handleSpawning(snapshot, event) {
   }
   return noop2(snapshot);
 }
+function runningStallTimeout(sessionId, event) {
+  const b2 = createEffectBuilder();
+  b2.log("running", "resumable_idle", event.type);
+  b2.effects.push({ type: "clear_pending_inputs" });
+  b2.effects.push({ type: "clear_queue" });
+  if (!event.recoveryArmed) {
+    b2.taskStatus("input_required");
+    b2.emitError(
+      "Cursor stopped responding mid-run. Send a message to try again.",
+      "sdk_error",
+      "run_stall_timeout"
+    );
+  }
+  b2.effects.push({ type: "kill_runner" });
+  return {
+    state: "resumable_idle",
+    sessionId,
+    rewindAtMessageId: null,
+    awaitingSetup: false,
+    effects: b2.effects
+  };
+}
 function handleRunning(snapshot, event) {
   const { sessionId } = snapshot;
   const b2 = createEffectBuilder();
@@ -102987,8 +103013,9 @@ function handleRunning(snapshot, event) {
       effects: b2.effects
     };
   }
-  if (event.type === "step_progress" || event.type === "stream_activity") {
-    b2.effects.push({ type: "reset_stall_timer", firstStep: event.type === "step_progress" });
+  const heartbeat = stallHeartbeatEffect(event);
+  if (heartbeat) {
+    b2.effects.push(heartbeat);
     return {
       state: "running",
       sessionId,
@@ -102998,23 +103025,7 @@ function handleRunning(snapshot, event) {
     };
   }
   if (event.type === "run_stall_timeout") {
-    b2.log("running", "resumable_idle", event.type);
-    b2.effects.push({ type: "clear_pending_inputs" });
-    b2.effects.push({ type: "clear_queue" });
-    b2.taskStatus("input_required");
-    b2.emitError(
-      "Cursor stopped responding mid-run. Send a message to try again.",
-      "sdk_error",
-      "run_stall_timeout"
-    );
-    b2.effects.push({ type: "kill_runner" });
-    return {
-      state: "resumable_idle",
-      sessionId,
-      rewindAtMessageId: null,
-      awaitingSetup: false,
-      effects: b2.effects
-    };
+    return runningStallTimeout(sessionId, event);
   }
   return noop2(snapshot);
 }
@@ -103175,6 +103186,21 @@ var AgentSessionManager = class {
    * reset can only make the watchdog fire sooner, never mask a hang.
    */
   #lastStreamActivityAt = null;
+  /**
+   * True while a Cursor tool call is in flight (between `tool_execution_started`
+   * and `tool_execution_settled` FSM events). When true, `#chooseStallTimeoutMs`
+   * returns `toolExecutionStallTimeoutMs` (if non-null) instead of the shorter
+   * mid-run window. Cleared explicitly in three places: the `spawn` effect
+   * case (a fresh subprocess generation starts unlatched), the `kill_runner`
+   * effect case (a stall death must not leave stale latch state), and
+   * `#manageTimers`'s leaving-active branch (a turn whose final tool never
+   * settled must not leak the long window into a warm-resume turn).
+   *
+   * IMPORTANT: do NOT clear inside `#clearStallTimer` / `#restartStallTimer` —
+   * `#restartStallTimer` calls `#clearStallTimer` before re-arming, so clearing
+   * the latch there would wipe it on every timer reset.
+   */
+  #toolExecutionInFlight = false;
   constructor(config, initialSnapshot2) {
     this.#config = config;
     if (initialSnapshot2) {
@@ -103325,6 +103351,21 @@ var AgentSessionManager = class {
   notifyStepProgress() {
     this.#dispatch({ type: "step_progress" });
   }
+  /**
+   * Notify the session manager of a tool-execution liveness edge. Phase
+   * `'started'` arms the extended per-tool stall window (0→1 transition);
+   * `'settled'` reverts to the shorter mid-run window (1→0 transition).
+   * No-op when the watchdog is disabled (Claude/Codex set
+   * `toolExecutionStallTimeoutMs: null`).
+   */
+  notifyToolExecution(phase) {
+    if (this.#config.toolExecutionStallTimeoutMs === null) {
+      return;
+    }
+    this.#dispatch(
+      phase === "started" ? { type: "tool_execution_started" } : { type: "tool_execution_settled" }
+    );
+  }
   /**
    * Heartbeat for streamed output (assistant/thinking/tool deltas) that proves
    * the run is alive mid-step. Resets the stall watchdog WITHOUT retiring the
@@ -103398,6 +103439,7 @@ var AgentSessionManager = class {
           this.#lastSpawnAtMs = Date.now();
           this.#firstStepReceived = false;
           this.#lastStreamActivityAt = null;
+          this.#toolExecutionInFlight = false;
           this.#config.onSpawn(effect.reason, initial?.content ?? []);
           break;
         }
@@ -103447,12 +103489,10 @@ var AgentSessionManager = class {
           }
           break;
         case "reset_stall_timer":
-          if (effect.firstStep) {
-            this.#firstStepReceived = true;
-          }
-          this.#restartStallTimer();
+          this.#applyResetStallTimer(effect);
           break;
         case "kill_runner":
+          this.#toolExecutionInFlight = false;
           this.#clearStallTimer();
           this.#config.onKillRunner();
           break;
@@ -103463,13 +103503,45 @@ var AgentSessionManager = class {
       }
     }
   }
+  /**
+   * `firstStep` (a completed step boundary from `step_progress`) means the
+   * cold start succeeded and we're in the mid-run cadence from now on — flip
+   * the latch so `#chooseStallTimeoutMs` picks the mid-run budget for
+   * subsequent arms. A `stream_activity` heartbeat (`firstStep: false`) only
+   * proves liveness mid-step, so it resets the timer but leaves the cold
+   * window in force until a real step lands.
+   *
+   * `toolExecution` updates the in-flight latch BEFORE restarting the timer
+   * so the new window is chosen with the updated latch state: `'latch'` arms
+   * the extended per-tool window, `'unlatch'` reverts to the mid-run window,
+   * `'none'` leaves it unchanged (heartbeats like `step_progress` /
+   * `stream_activity` must NOT unlatch mid-tool).
+   */
+  #applyResetStallTimer(effect) {
+    if (effect.firstStep) {
+      this.#firstStepReceived = true;
+    }
+    if (effect.toolExecution === "latch") {
+      this.#toolExecutionInFlight = true;
+    } else if (effect.toolExecution === "unlatch") {
+      this.#toolExecutionInFlight = false;
+    }
+    this.#restartStallTimer();
+  }
+  /**
+   * Effect-ordering dependency: `log_transition` is emitted BEFORE
+   * `kill_runner` in the `run_stall_timeout` effect list, so the latch (and
+   * `#firstStepReceived`) are still in their at-fire values when this reads
+   * them. Reordering those effects would silently misattribute `stallPhase`.
+   */
   #telemeterRunStallTimeout(effect) {
     if (effect.trigger !== "run_stall_timeout") return;
+    const stallPhase = this.#toolExecutionInFlight ? "tool_execution" : this.#firstStepReceived ? "mid_run" : "first_step";
     telemeter("run_stall_timeout", {
       taskId: this.#config.taskId,
       from: effect.from,
       to: effect.to,
-      stallPhase: this.#firstStepReceived ? "mid_run" : "first_step",
+      stallPhase,
       stallTimeoutMs: this.#chooseStallTimeoutMs()
     });
   }
@@ -103510,16 +103582,21 @@ var AgentSessionManager = class {
       }
     } else {
       this.#clearStallTimer();
+      this.#toolExecutionInFlight = false;
     }
   }
   /**
-   * Pick the active stall timeout. Before the first step, the cold-start
-   * budget (if configured) wins; after it, the mid-run budget takes over.
-   * The cold-start field falls back to the mid-run value so a profile that
-   * only sets `stallTimeoutMs` keeps its prior single-window behavior.
+   * Pick the active stall timeout. Priority order:
+   * 1. Tool-execution latch active → `toolExecutionStallTimeoutMs` (if non-null).
+   * 2. Before first step → `firstStepStallTimeoutMs` (if configured, else falls
+   *    back to `stallTimeoutMs`).
+   * 3. After first step → `stallTimeoutMs`.
    * Returns `null` to disable the watchdog entirely (Claude/Codex today).
    */
   #chooseStallTimeoutMs() {
+    if (this.#toolExecutionInFlight && this.#config.toolExecutionStallTimeoutMs !== null) {
+      return this.#config.toolExecutionStallTimeoutMs;
+    }
     const mid = this.#config.stallTimeoutMs;
     if (!this.#firstStepReceived) {
       const cold = this.#config.firstStepStallTimeoutMs;
@@ -103549,8 +103626,12 @@ var AgentSessionManager = class {
         this.#manageTimers();
         return;
       }
-      this.#config.onStallTimeout?.();
-      this.#dispatch({ type: "run_stall_timeout" });
+      let recoveryArmed = false;
+      try {
+        recoveryArmed = this.#config.onStallTimeout?.() ?? false;
+      } finally {
+        this.#dispatch({ type: "run_stall_timeout", recoveryArmed });
+      }
     }, timeoutMs);
   }
   #restartStallTimer() {
@@ -103578,10 +103659,12 @@ var AgentSessionManager = class {
 // src/services/conversation/cursor-recovery-controller.ts
 var MAX_SIGNAL_DEATH_RETRIES = 1;
 var MAX_STALL_RESUME_RETRIES = 1;
+var MAX_CRASH_DEATH_RETRIES = 1;
 var CursorRecoveryController = class {
   #signalDeathRetries = 0;
   #stallResumeRetries = 0;
   #stallResumeArmed = false;
+  #crashDeathRetries = 0;
   #deps;
   constructor(deps) {
     this.#deps = deps;
@@ -103591,6 +103674,7 @@ var CursorRecoveryController = class {
     this.#signalDeathRetries = 0;
     this.#stallResumeRetries = 0;
     this.#stallResumeArmed = false;
+    this.#crashDeathRetries = 0;
   }
   /**
    * Fired by the manager when the stall watchdog expires, BEFORE the
@@ -103599,10 +103683,14 @@ var CursorRecoveryController = class {
    * banner and strands the orphaned turn until the user returns. Arm a one-shot
    * resume so the imminent `kill_runner` death is resumed instead of surfaced.
    * On repeat (cap exceeded) stay armed-off and let the existing banner run.
+   *
+   * Returns true when a recovery was armed — the manager passes this as
+   * `recoveryArmed` on the `run_stall_timeout` FSM event so the FSM suppresses
+   * the user-facing error banner during the 5-second self-heal (Fix B2).
    */
   onStallTimeout() {
-    if (this.#deps.getState() !== "running") return;
-    if (this.#deps.getAgentSystem() !== AGENT_SYSTEM_CURSOR) return;
+    if (this.#deps.getState() !== "running") return false;
+    if (this.#deps.getAgentSystem() !== AGENT_SYSTEM_CURSOR) return false;
     this.#stallResumeRetries++;
     if (this.#stallResumeRetries > MAX_STALL_RESUME_RETRIES) {
       this.#deps.log({
@@ -103611,7 +103699,7 @@ var CursorRecoveryController = class {
         retries: this.#stallResumeRetries
       });
       this.#stallResumeRetries = 0;
-      return;
+      return false;
     }
     this.#deps.log({
       event: "thread_cursor_stall_resume_armed",
@@ -103619,6 +103707,7 @@ var CursorRecoveryController = class {
       retries: this.#stallResumeRetries
     });
     this.#stallResumeArmed = true;
+    return true;
   }
   /**
    * Consume an armed stall resume on the `kill_runner` death. By now the FSM is
@@ -103633,6 +103722,48 @@ var CursorRecoveryController = class {
     this.#deps.respawnForResume();
     return true;
   }
+  /**
+   * One-shot resume on a Cursor transport-crash death (exit codes 2 or 3).
+   *
+   * Exit 3 = `unhandledRejection` (e.g. NGHTTP2_REFUSED_STREAM /
+   * ENHANCE_YOUR_CALM from the Cursor backend's HTTP/2 rate-limiter escaping
+   * @cursor/sdk). Exit 2 = `uncaughtException` (native or SDK throw). Both
+   * indicate the runner crashed due to a transient transport fault — not a
+   * controlled teardown. One silent auto-retry lets the session resume; a
+   * second failure in the same turn surfaces normally so a deterministic bug
+   * cannot loop.
+   *
+   * Exits 0 (clean) and 1 (parent-disconnect) are never retried here — they
+   * surface as today. Signal deaths are covered by `trySignalDeathRetry`.
+   */
+  tryCrashDeathRetry(event) {
+    if (this.#deps.getState() !== "running") return false;
+    if (this.#deps.getAgentSystem() !== AGENT_SYSTEM_CURSOR) return false;
+    if (event.forceKilled === true) return false;
+    if (event.signal !== null && event.signal !== void 0) return false;
+    if (event.exitCode !== 2 && event.exitCode !== 3) return false;
+    this.#crashDeathRetries++;
+    if (this.#crashDeathRetries > MAX_CRASH_DEATH_RETRIES) {
+      this.#deps.log({
+        event: "thread_cursor_crash_death_retry_cap_exceeded",
+        threadId: this.#deps.threadId,
+        exitCode: event.exitCode,
+        retries: this.#crashDeathRetries
+      });
+      this.#crashDeathRetries = 0;
+      return false;
+    }
+    this.#deps.log({
+      event: "thread_cursor_crash_death_auto_retry",
+      threadId: this.#deps.threadId,
+      exitCode: event.exitCode,
+      retries: this.#crashDeathRetries
+    });
+    this.#deps.clearSubprocess();
+    this.#deps.notifyAbortRetry();
+    this.#deps.respawnForResume();
+    return true;
+  }
   /**
    * One-shot resume on a natural Cursor signal death (#4060). Skips forced,
    * SIGKILL/SIGABRT, signal-less, and repeated deaths. Returns true when it
@@ -103853,6 +103984,7 @@ function rewriteSpawnError(error) {
 var MAX_CONSECUTIVE_RETRIES = 2;
 var MAX_EDE_DIAGNOSTIC_RETRIES = 2;
 var MAX_REQUEST_ABORTED_RETRIES = 1;
+var MAX_RUN_STATUS_ERROR_RETRIES = 1;
 var REQUEST_ABORTED_PHRASES = ["Request was aborted", "request was aborted"];
 var SessionRecoveryController = class {
   #deps;
@@ -103884,6 +104016,13 @@ var SessionRecoveryController = class {
   #sawResumeFailure = false;
   /** Consecutive transient "Request was aborted" retries; reset on turn_complete, cap-surface, and new user turn. */
   #requestAbortedRetries = 0;
+  /**
+   * Consecutive Cursor `run_status_error` (backend run marked ERROR) retries;
+   * reset on turn_complete, cap-surface, and new user turn — NOT on
+   * init_received, since the retry respawn itself fires init_received and an
+   * early reset would let a persistently-erroring backend loop forever.
+   */
+  #runStatusErrorRetries = 0;
   /**
    * Counts consecutive ede_diagnostic session invalidations. Reset on a
    * successful turn_complete. If this exceeds MAX_EDE_DIAGNOSTIC_RETRIES the
@@ -103941,9 +104080,11 @@ var SessionRecoveryController = class {
   resetRetriesOnTurnComplete() {
     this.#edeDiagnosticRetries = 0;
     this.#requestAbortedRetries = 0;
+    this.#runStatusErrorRetries = 0;
   }
   noteNewUserTurn() {
     this.#requestAbortedRetries = 0;
+    this.#runStatusErrorRetries = 0;
   }
   noteToolUseStarted(toolName, toolUseId) {
     this.#lastToolUseName = toolName;
@@ -104058,7 +104199,8 @@ var SessionRecoveryController = class {
    *
    * A consecutive retry counter prevents infinite loops as a safety net.
    */
-  handleSdkError(error) {
+  handleSdkError(error, errorSubtype) {
+    const isRetrying = error.startsWith("Codex (retrying):");
     this.#deps.log({
       event: "thread_sdk_error",
       threadId: this.#deps.threadId,
@@ -104068,7 +104210,8 @@ var SessionRecoveryController = class {
        * error column. Using `error` causes the SDK message to be dropped
        * from log triage (3,329 silent failures observed in one window).
        */
-      err: error
+      err: error,
+      ...isRetrying ? { level: "info" } : {}
     });
     if (error.includes("[ede_diagnostic]")) {
       this.#edeDiagnosticRetries++;
@@ -104104,6 +104247,7 @@ var SessionRecoveryController = class {
         effectiveSpawnMode: this.#effectiveSpawnMode.kind
       });
     }
+    if (this.#tryRunStatusErrorRetry(error, errorSubtype)) return;
     if (this.#tryRequestAbortedRetry(error)) return;
     if (this.#tryForkFailedRetry(error)) return;
     if (this.#tryStaleResumeRetry(error)) return;
@@ -104115,6 +104259,43 @@ var SessionRecoveryController = class {
     }
     this.#deps.notifySdkError(surfaceMsg);
   }
+  /**
+   * One-shot resume when Cursor's backend marks a run `status: ERROR`
+   * (translator subtype `run_status_error`). The message is opaque server
+   * state with no text — observed in production 1ms before an
+   * NGHTTP2_ENHANCE_YOUR_CALM stream rejection from the same runner, i.e.
+   * backend rate-limiting, not a session problem (#4229). The session JSONL
+   * is intact, so a silent resume absorbs the blip; the cap surfaces a
+   * persistent backend failure with actionable copy instead of the bare
+   * "(status: ERROR)" string.
+   */
+  #tryRunStatusErrorRetry(error, errorSubtype) {
+    if (errorSubtype !== RUN_STATUS_ERROR_SUBTYPE) return false;
+    if (this.#deps.getState() !== "running") return false;
+    this.#runStatusErrorRetries++;
+    if (this.#runStatusErrorRetries > MAX_RUN_STATUS_ERROR_RETRIES) {
+      this.#deps.log({
+        event: "thread_run_status_error_retry_cap_exceeded",
+        threadId: this.#deps.threadId,
+        retries: this.#runStatusErrorRetries,
+        error
+      });
+      this.#runStatusErrorRetries = 0;
+      const surfaceMsg = "Cursor's backend errored this run twice in a row \u2014 it may be rate-limiting this machine. Wait a moment, then send a message to retry.";
+      this.#deps.persistError(surfaceMsg);
+      this.#deps.notifySdkError(surfaceMsg);
+      return true;
+    }
+    this.#deps.log({
+      event: "thread_run_status_error_auto_retry",
+      threadId: this.#deps.threadId,
+      retries: this.#runStatusErrorRetries,
+      error
+    });
+    this.#deps.notifyAbortRetry();
+    this.#deps.respawnForResume();
+    return true;
+  }
   /**
    * Retry path 1: the first spawn used a fork/resume from parent and the SDK
    * rejected the session (stale/expired). Retry with a fresh session.
@@ -104526,7 +104707,8 @@ var Thread = class {
         log: config.log,
         onSessionStateChange: (newState, prevState) => this.#notifyStateChange(newState, prevState),
         stallTimeoutMs: config.stallTimeoutMs ?? null,
-        firstStepStallTimeoutMs: config.firstStepStallTimeoutMs ?? null
+        firstStepStallTimeoutMs: config.firstStepStallTimeoutMs ?? null,
+        toolExecutionStallTimeoutMs: config.toolExecutionStallTimeoutMs ?? null
       },
       this.#buildInitialSnapshot(config)
     );
@@ -105427,6 +105609,7 @@ var Thread = class {
     this.#streamDelta.resetForTurn();
     if (this.#cursorRecovery.consumeStallResumeOnDeath()) return;
     if (this.#cursorRecovery.trySignalDeathRetry(event)) return;
+    if (this.#cursorRecovery.tryCrashDeathRetry(event)) return;
     this.#manager.notifySubprocessDied({
       exitCode: event.exitCode ?? null,
       signal: event.signal ?? null
@@ -105451,7 +105634,7 @@ var Thread = class {
         this.#manager.notifyTurnComplete();
         break;
       case "sdk_error":
-        this.#recovery.handleSdkError(event.error);
+        this.#recovery.handleSdkError(event.error, event.errorSubtype);
         break;
       case "subprocess_died":
         this.#handleSubprocessDiedEvent(event);
@@ -105568,6 +105751,12 @@ var Thread = class {
       /** Handled in #enqueueSubprocessEvent (off-queue heartbeat); unreachable here. */
       case "stream_activity":
         return;
+      case "tool_execution_started":
+        this.#manager.notifyToolExecution("started");
+        return;
+      case "tool_execution_settled":
+        this.#manager.notifyToolExecution("settled");
+        return;
       default: {
         const _exhaustive = event;
         throw new Error(`Unhandled subprocess event: ${JSON.stringify(_exhaustive)}`);
@@ -105582,11 +105771,14 @@ import { randomUUID as randomUUID21 } from "crypto";
 import { existsSync as existsSync10, readdirSync as readdirSync5, statSync as statSync4 } from "fs";
 import { mkdir as mkdir32, readFile as readFile45, writeFile as writeFile25 } from "fs/promises";
 import { homedir as homedir9 } from "os";
-import { dirname as dirname33, join as join70 } from "path";
+import { dirname as dirname33, join as join71 } from "path";
 
 // src/services/plan/plan-detection-policy.ts
 function decidePlanDetection(trigger, snapshot) {
   if (snapshot.approvalReceived) return { type: "noop" };
+  if (snapshot.priorPlanApproved && snapshot.triggerIsNewPlan) {
+    return decideNewCycle(trigger, snapshot);
+  }
   switch (trigger.kind) {
     /**
      * Both entry triggers share logic; they differ only in whether an
@@ -105604,6 +105796,20 @@ function decidePlanDetection(trigger, snapshot) {
       return assertNever(trigger);
   }
 }
+function decideNewCycle(trigger, snapshot) {
+  switch (trigger.kind) {
+    case "file_tracked":
+      return snapshot.fileAvailable ? { type: "reset_and_detect" } : { type: "start_watch", failOnExhaust: false };
+    case "exit_plan_mode":
+      return snapshot.fileAvailable ? { type: "reset_and_detect" } : { type: "start_watch", failOnExhaust: true };
+    case "watch_resolved":
+      if (trigger.matched) return { type: "reset_and_detect" };
+      if (trigger.failOnExhaust) return { type: "report_no_plan" };
+      return { type: "noop" };
+    default:
+      return assertNever(trigger);
+  }
+}
 function decideEntry(snapshot, failOnExhaust) {
   if (snapshot.hasDetection) return { type: "noop" };
   if (snapshot.fileAvailable) return { type: "detect" };
@@ -106209,8 +106415,8 @@ function greedyLCS(a, b2) {
 // src/services/plan/plan-file-watcher.ts
 import { existsSync as existsSync9 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join69 } from "path";
-var DEFAULT_PLANS_DIR = join69(homedir8(), ".claude", "plans");
+import { join as join70 } from "path";
+var DEFAULT_PLANS_DIR = join70(homedir8(), ".claude", "plans");
 var PLAN_WATCH_TIMEOUT_MS = 1e4;
 var PLAN_WATCH_DEBOUNCE_MS = 250;
 function createPlanFileWatcher(deps) {
@@ -106337,9 +106543,7 @@ function createPlanFileWatcher(deps) {
   return { stop };
 }
 
-// src/services/plan/plan-handler.ts
-var PLAN_PUBLISHED_DENY_MESSAGE = `Your plan has been published to the Shipyard canvas for collaborative review. Reviewers can comment, edit, and approve your plan in real-time. You will receive feedback as <${XML_TAGS.COMMENT}> children of the <plan> resource and plan edits as <${XML_TAGS.PLAN_UPDATE}> diffs. Wait for <${XML_TAGS.PLAN_REVIEW} decision="approve"> before calling ExitPlanMode again.`;
-var PLAN_STILL_UNDER_REVIEW_MESSAGE = `Your plan is still under review. Wait for <${XML_TAGS.PLAN_REVIEW} decision="approve"> before calling ExitPlanMode again.`;
+// src/services/plan/plan-handler-helpers.ts
 function parseAllowedPrompts(input) {
   if (input === null || input === void 0 || typeof input !== "object" || Array.isArray(input))
     return [];
@@ -106375,6 +106579,149 @@ function mergeCommentSources(crdtComments, browserComments) {
   }
   return result;
 }
+
+// src/services/plan/plan-review-resolution.ts
+async function injectDecisionMessage(ctx, decision, feedback) {
+  const reviewer = ctx.getHumanParticipantName();
+  ctx.onPlanReviewEnded?.();
+  if (decision === "approve") {
+    ctx.setApprovalReceived(true);
+    const feedbackNote = feedback ? ` Feedback: ${feedback}` : "";
+    ctx.pushSyntheticMessageAndWake([
+      {
+        type: "text",
+        text: `Plan approved by ${reviewer}.${feedbackNote} Continue with the implementation.`
+      }
+    ]);
+  } else {
+    ctx.setApprovalReceived(false);
+  }
+  ctx.setPlanReviewState({
+    decision,
+    reviewer,
+    feedback: feedback ?? null,
+    decidedAt: Date.now()
+  });
+  ctx.notifyPlanChange();
+  ctx.appendMessage({
+    channelId: ctx.channelId,
+    messageId: `review-decision-${ctx.taskId}-${Date.now()}`,
+    participantId: ctx.humanParticipantId,
+    senderKind: "human",
+    content: [{ type: "review_decision", decision, feedback, reviewer }],
+    timestamp: Date.now(),
+    isSynthetic: false
+  }).catch((err3) => {
+    ctx.log({
+      event: "plan_decision_append_failed",
+      taskId: ctx.taskId,
+      decision,
+      error: err3 instanceof Error ? err3.message : String(err3)
+    });
+  });
+  broadcastPlanReview(ctx, decision, feedback, reviewer);
+}
+function broadcastPlanReview(ctx, decision, feedback, reviewer) {
+  ctx.getSendControlMessage()?.({
+    type: "plan_review",
+    taskId: ctx.taskId,
+    decision,
+    feedback,
+    reviewer
+  });
+}
+async function gatherMergedComments(ctx, browserComments) {
+  const allUndelivered = await ctx.annotationStore.getUndeliveredAnnotations(ctx.taskId);
+  const storeComments = allUndelivered.filter(
+    (a) => a.annotationType === "plan-text"
+  ).map((a) => ({
+    commentId: a.commentId,
+    anchorText: a.anchorText,
+    body: a.body,
+    authorName: a.authorName
+  }));
+  return mergeCommentSources(storeComments, browserComments);
+}
+async function resolveLastAgentVersion(ctx) {
+  const versions = await ctx.annotationStore.getPlanVersions(ctx.taskId);
+  return findLastAgentVersion(versions);
+}
+async function preparePlanForResolution(ctx, toolUseId, browserComments) {
+  const currentContent = ctx.planRepo.getContent(ctx.taskId);
+  const mergedComments = await gatherMergedComments(ctx, browserComments);
+  ctx.log({
+    event: "plan_review_context",
+    taskId: ctx.taskId,
+    commentCount: mergedComments.length,
+    browserCommentCount: browserComments.length,
+    contentLength: currentContent.length
+  });
+  if (currentContent.length > 0) {
+    const existingVersions = await ctx.annotationStore.getPlanVersions(ctx.taskId);
+    const lastVersion = existingVersions[existingVersions.length - 1];
+    const contentChanged = !lastVersion || lastVersion.markdown !== currentContent;
+    if (contentChanged) {
+      const humanVersion = {
+        markdown: currentContent,
+        timestamp: Date.now(),
+        source: "human",
+        toolUseId
+      };
+      await ctx.annotationStore.addPlanVersion(ctx.taskId, humanVersion);
+      ctx.getSendControlMessage()?.({
+        type: "annotation_version_added",
+        taskId: ctx.taskId,
+        version: humanVersion
+      });
+    }
+  }
+  if (mergedComments.length > 0) {
+    await deliverPlanAnnotations(ctx, mergedComments);
+  }
+}
+async function deliverPlanAnnotations(ctx, mergedComments) {
+  try {
+    const lastAgentVersion = await resolveLastAgentVersion(ctx);
+    const currentContent = ctx.planRepo.getContent(ctx.taskId);
+    const parts = [];
+    if (lastAgentVersion?.markdown && lastAgentVersion.markdown !== currentContent) {
+      const diff = computeUnifiedDiff(lastAgentVersion.markdown, currentContent);
+      if (diff) {
+        const participant = ctx.humanParticipantId;
+        parts.push(
+          `<${XML_TAGS.PLAN_UPDATE} participant="${escapeXmlAttr(participant)}">
+--- original (agent)
++++ reviewed (${escapeXmlAttr(participant)})
+${diff}
+</${XML_TAGS.PLAN_UPDATE}>`
+        );
+      }
+    }
+    if (parts.length > 0) {
+      ctx.pushSyntheticMessageAndWake([{ type: "text", text: parts.join("\n\n") }]);
+    }
+    const deliveredIds = mergedComments.map((c) => c.commentId);
+    await ctx.annotationStore.markDelivered(ctx.taskId, deliveredIds);
+    ctx.notifyPlanChange();
+    ctx.log({
+      event: "plan_annotations_delivered",
+      taskId: ctx.taskId,
+      commentCount: mergedComments.length,
+      hasPlanDiff: parts.length > 0
+    });
+  } catch (err3) {
+    const msg = err3 instanceof Error ? err3.message : String(err3);
+    ctx.log({
+      event: "plan_annotations_delivery_failed",
+      taskId: ctx.taskId,
+      error: msg
+    });
+  }
+}
+
+// src/services/plan/plan-handler.ts
+var PLAN_PUBLISHED_DENY_MESSAGE = `Your plan has been published to the Shipyard canvas for collaborative review. Reviewers can comment, edit, and approve your plan in real-time. You will receive feedback as <${XML_TAGS.COMMENT}> children of the <plan> resource and plan edits as <${XML_TAGS.PLAN_UPDATE}> diffs. Wait for <${XML_TAGS.PLAN_REVIEW} decision="approve"> before calling ExitPlanMode again.`;
+var PLAN_STILL_UNDER_REVIEW_MESSAGE = `Your plan is still under review. Wait for <${XML_TAGS.PLAN_REVIEW} decision="approve"> before calling ExitPlanMode again.`;
 var PlanHandler = class {
   #deps;
   #planFileBridge = null;
@@ -106659,7 +107006,7 @@ var PlanHandler = class {
    * Called when a Write tool result mentions a file in ~/.claude/plans/.
    */
   trackCreatedFile(filePath) {
-    const plansDir = join70(homedir9(), ".claude", "plans");
+    const plansDir = join71(homedir9(), ".claude", "plans");
     if (filePath.startsWith(plansDir) && filePath.endsWith(".md")) {
       this.#createdPlanFiles.add(filePath);
       this.#deps.log({
@@ -106691,7 +107038,7 @@ var PlanHandler = class {
   }
   async #runHandleCodexPlanReady(content) {
     if (this.#deps.isDisposed()) return;
-    const filePath = join70(getShipyardHome(), "plans", `${this.#deps.taskId}.md`);
+    const filePath = join71(getShipyardHome(), "plans", `${this.#deps.taskId}.md`);
     try {
       await mkdir32(dirname33(filePath), { recursive: true });
       await writeFile25(filePath, content, "utf-8");
@@ -106808,8 +107155,9 @@ var PlanHandler = class {
       decision
     });
     this.#deps.enqueueAsync(async () => {
+      const ctx = this.#reviewResolutionContext();
       try {
-        await this.#preparePlanForResolution(toolUseId, opts?.comments ?? []);
+        await preparePlanForResolution(ctx, toolUseId, opts?.comments ?? []);
         this.#applyPermissionMode(opts?.permissionMode);
       } catch (err3) {
         this.#deps.log({
@@ -106820,7 +107168,7 @@ var PlanHandler = class {
           error: err3 instanceof Error ? err3.message : String(err3)
         });
       }
-      await this.#injectDecisionMessage(decision, feedback);
+      await injectDecisionMessage(ctx, decision, feedback);
     });
   }
   detectPlanEvents(content) {
@@ -106914,21 +107262,39 @@ var PlanHandler = class {
     }
     return this.#proactiveToolUseId;
   }
-  #detectionSnapshot(fileAvailable) {
+  #detectionSnapshot(fileAvailable, toolUseId, matchPath) {
+    const priorPlanApproved = this.#lastPlanDetection?.approved === true;
     return {
       approvalReceived: this.#approvalReceived,
       hasDetection: this.#lastPlanDetection !== null || this.#detectionInFlight,
-      fileAvailable
+      fileAvailable,
+      priorPlanApproved,
+      /**
+       * New-plan signal (#4498): a different plan than the one already detected —
+       * an unprocessed toolUseId, or a tracked file differing from the bridge's
+       * (Claude mints a fresh UUID + file per plan). Only meaningful once a prior
+       * plan was approved, so it is gated on `priorPlanApproved`: on the FIRST
+       * detection `#processedPlanToolUseIds` is empty (every id reads as "new"),
+       * and conflating that with a new cycle would be a latent trap if a future
+       * caller read this flag independently of `priorPlanApproved`.
+       */
+      triggerIsNewPlan: priorPlanApproved && (!this.#processedPlanToolUseIds.has(toolUseId) || matchPath !== null && matchPath !== this.#planFileBridge?.filePath)
     };
   }
-  /** Snapshot → policy → execute; #4075/#3488 logic is table-tested in `plan-detection-policy.test.ts`. */
+  /** Snapshot → policy → execute; #4075/#3488/#4498 logic is table-tested in `plan-detection-policy.test.ts`. */
   #ensurePlanDetection(trigger, toolUseId) {
     const match = this.#findTaskPlanFile();
-    const action = decidePlanDetection(trigger, this.#detectionSnapshot(match !== null));
+    const action = decidePlanDetection(
+      trigger,
+      this.#detectionSnapshot(match !== null, toolUseId, match)
+    );
     switch (action.type) {
       case "detect":
         if (match) this.#handlePlanDetected(toolUseId, match);
         return;
+      case "reset_and_detect":
+        if (match) this.#resetForNewPlanCycle(toolUseId, match);
+        return;
       case "start_watch":
         this.#startPlanWatch(toolUseId, action.failOnExhaust);
         return;
@@ -106943,6 +107309,35 @@ var PlanHandler = class {
       }
     }
   }
+  /**
+   * Begin a new plan cycle for a later phase in the SAME task (#4498). Without
+   * this the new plan is silently dropped (hasDetection stays true) and the UI
+   * keeps showing the stale approved plan. Narrow subset of `resetForRewind`
+   * that preserves `#processedPlanToolUseIds`; a reused processed id gets a
+   * fresh synthetic id so dedup does not skip the new plan.
+   */
+  #resetForNewPlanCycle(toolUseId, filePath) {
+    const detectToolUseId = this.#processedPlanToolUseIds.has(toolUseId) ? `plan_new_cycle_${this.#deps.taskId}_${randomUUID21()}` : toolUseId;
+    this.#deps.log({
+      event: "plan_new_cycle_detected",
+      taskId: this.#deps.taskId,
+      toolUseId: detectToolUseId,
+      filePath
+    });
+    this.#approvalReceived = false;
+    this.#planPublished = false;
+    this.#proactiveToolUseId = null;
+    this.#stopPlanWatch();
+    this.#detectionInFlight = false;
+    const hadReviewState = this.#planReviewState !== null;
+    this.#planReviewState = null;
+    this.#deps.onPlanReviewEnded?.();
+    if (hadReviewState) this.#deps.notifyPlanChange();
+    this.#lastPlanDetection = null;
+    this.#planFileBridge?.dispose();
+    this.#planFileBridge = null;
+    this.#handlePlanDetected(detectToolUseId, filePath);
+  }
   /**
    * Subscribe to the plans directory via `@parcel/watcher`. `failOnExhaust`
    * decides whether a 10s exhaust surfaces an explicit no-plan state
@@ -106970,12 +107365,15 @@ var PlanHandler = class {
   #applyWatchResolution(toolUseId, matched, failOnExhaust, filePath) {
     const action = decidePlanDetection(
       { kind: "watch_resolved", matched, failOnExhaust },
-      this.#detectionSnapshot(filePath !== null)
+      this.#detectionSnapshot(filePath !== null, toolUseId, filePath)
     );
     switch (action.type) {
       case "detect":
         if (filePath) this.#handlePlanDetected(toolUseId, filePath);
         return;
+      case "reset_and_detect":
+        if (filePath) this.#resetForNewPlanCycle(toolUseId, filePath);
+        return;
       case "report_no_plan":
         this.#reportNoPlan(toolUseId);
         return;
@@ -107071,12 +107469,12 @@ var PlanHandler = class {
       }).filter((f2) => f2 !== null).sort((a, b2) => b2.mtime - a.mtime)[0];
       return newest?.path ?? null;
     }
-    const plansDir = join70(homedir9(), ".claude", "plans");
+    const plansDir = join71(homedir9(), ".claude", "plans");
     if (!existsSync10(plansDir)) return null;
     try {
       const files = readdirSync5(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
-        path: join70(plansDir, f2),
-        mtime: statSync4(join70(plansDir, f2)).mtimeMs
+        path: join71(plansDir, f2),
+        mtime: statSync4(join71(plansDir, f2)).mtimeMs
       })).sort((a, b2) => b2.mtime - a.mtime);
       const recent = files[0];
       if (recent && Date.now() - recent.mtime < 3e4) return recent.path;
@@ -107225,161 +107623,33 @@ var PlanHandler = class {
     if (!permissionMode) return;
     this.#deps.applyTaskSettings({ permissionMode });
   }
-  async #injectDecisionMessage(decision, feedback) {
-    const reviewer = this.#deps.getHumanParticipantName();
-    this.#deps.onPlanReviewEnded?.();
-    if (decision === "approve") {
-      this.#approvalReceived = true;
-      const feedbackNote = feedback ? ` Feedback: ${feedback}` : "";
-      this.#deps.pushSyntheticMessageAndWake([
-        {
-          type: "text",
-          text: `Plan approved by ${reviewer}.${feedbackNote} Continue with the implementation.`
-        }
-      ]);
-    } else {
-      this.#approvalReceived = false;
-    }
-    this.#planReviewState = {
-      decision,
-      reviewer,
-      feedback: feedback ?? null,
-      decidedAt: Date.now()
-    };
-    this.#deps.notifyPlanChange();
-    this.#deps.appendMessage({
-      channelId: this.#deps.channelId,
-      messageId: `review-decision-${this.#deps.taskId}-${Date.now()}`,
-      participantId: this.#deps.humanParticipantId,
-      senderKind: "human",
-      content: [{ type: "review_decision", decision, feedback, reviewer }],
-      timestamp: Date.now(),
-      isSynthetic: false
-    }).catch((err3) => {
-      this.#deps.log({
-        event: "plan_decision_append_failed",
-        taskId: this.#deps.taskId,
-        decision,
-        error: err3 instanceof Error ? err3.message : String(err3)
-      });
-    });
-    this.#broadcastPlanReview(decision, feedback, reviewer);
-  }
-  #broadcastPlanReview(decision, feedback, reviewer) {
-    this.#deps.getSendControlMessage()?.({
-      type: "plan_review",
-      taskId: this.#deps.taskId,
-      decision,
-      feedback,
-      reviewer
-    });
-  }
   /**
-   * Gather undelivered comments from file-backed store and browser,
-   * merging both sources and deduplicating by commentId.
+   * Build the narrow Context for the review-resolution free functions. State
+   * (`#approvalReceived`, `#planReviewState`) is read broadly across this class,
+   * so it stays here and is mutated through narrow setters — see
+   * `plan-review-resolution.ts`.
    */
-  async #gatherMergedComments(browserComments) {
-    const allUndelivered = await this.#deps.annotationStore.getUndeliveredAnnotations(
-      this.#deps.taskId
-    );
-    const storeComments = allUndelivered.filter(
-      (a) => a.annotationType === "plan-text"
-    ).map((a) => ({
-      commentId: a.commentId,
-      anchorText: a.anchorText,
-      body: a.body,
-      authorName: a.authorName
-    }));
-    return mergeCommentSources(storeComments, browserComments);
-  }
-  /** Resolve the best agent version from file-backed store. */
-  async #resolveLastAgentVersion() {
-    const versions = await this.#deps.annotationStore.getPlanVersions(this.#deps.taskId);
-    return findLastAgentVersion(versions);
-  }
-  async #preparePlanForResolution(toolUseId, browserComments) {
-    const currentContent = this.#deps.planRepo.getContent(this.#deps.taskId);
-    const mergedComments = await this.#gatherMergedComments(browserComments);
-    this.#deps.log({
-      event: "plan_review_context",
+  #reviewResolutionContext() {
+    return {
       taskId: this.#deps.taskId,
-      commentCount: mergedComments.length,
-      browserCommentCount: browserComments.length,
-      contentLength: currentContent.length
-    });
-    if (currentContent.length > 0) {
-      const existingVersions = await this.#deps.annotationStore.getPlanVersions(this.#deps.taskId);
-      const lastVersion = existingVersions[existingVersions.length - 1];
-      const contentChanged = !lastVersion || lastVersion.markdown !== currentContent;
-      if (contentChanged) {
-        const humanVersion = {
-          markdown: currentContent,
-          timestamp: Date.now(),
-          source: "human",
-          toolUseId
-        };
-        await this.#deps.annotationStore.addPlanVersion(this.#deps.taskId, humanVersion);
-        this.#deps.getSendControlMessage()?.({
-          type: "annotation_version_added",
-          taskId: this.#deps.taskId,
-          version: humanVersion
-        });
-      }
-    }
-    if (mergedComments.length > 0) {
-      await this.#deliverPlanAnnotations(mergedComments);
-    }
-  }
-  /**
-   * Deliver review comments and plan edit diff. Plan-anchored comments are
-   * no longer pushed as a top-level `<review-comment surface="plan">`
-   * synthetic — the `<plan>` resource projection now embeds them inline as
-   * `<comment>` children. Instead we mark the comments delivered and notify
-   * the resource resolver so it re-projects.
-   *
-   * The `<plan-update>` patch (showing human edits over the agent's
-   * baseline) is still emitted synchronously here so the agent sees the
-   * diff in the same turn the decision lands. Resource-level lineage
-   * patches will continue to surface ongoing CRDT mutations independently.
-   */
-  async #deliverPlanAnnotations(mergedComments) {
-    try {
-      const lastAgentVersion = await this.#resolveLastAgentVersion();
-      const currentContent = this.#deps.planRepo.getContent(this.#deps.taskId);
-      const parts = [];
-      if (lastAgentVersion?.markdown && lastAgentVersion.markdown !== currentContent) {
-        const diff = computeUnifiedDiff(lastAgentVersion.markdown, currentContent);
-        if (diff) {
-          const participant = this.#deps.humanParticipantId;
-          parts.push(
-            `<${XML_TAGS.PLAN_UPDATE} participant="${escapeXmlAttr(participant)}">
---- original (agent)
-+++ reviewed (${escapeXmlAttr(participant)})
-${diff}
-</${XML_TAGS.PLAN_UPDATE}>`
-          );
-        }
-      }
-      if (parts.length > 0) {
-        this.#deps.pushSyntheticMessageAndWake([{ type: "text", text: parts.join("\n\n") }]);
+      channelId: this.#deps.channelId,
+      humanParticipantId: this.#deps.humanParticipantId,
+      planRepo: this.#deps.planRepo,
+      annotationStore: this.#deps.annotationStore,
+      log: this.#deps.log,
+      getSendControlMessage: this.#deps.getSendControlMessage,
+      pushSyntheticMessageAndWake: this.#deps.pushSyntheticMessageAndWake,
+      appendMessage: this.#deps.appendMessage,
+      getHumanParticipantName: this.#deps.getHumanParticipantName,
+      notifyPlanChange: this.#deps.notifyPlanChange,
+      onPlanReviewEnded: this.#deps.onPlanReviewEnded,
+      setApprovalReceived: (value) => {
+        this.#approvalReceived = value;
+      },
+      setPlanReviewState: (state) => {
+        this.#planReviewState = state;
       }
-      const deliveredIds = mergedComments.map((c) => c.commentId);
-      await this.#deps.annotationStore.markDelivered(this.#deps.taskId, deliveredIds);
-      this.#deps.notifyPlanChange();
-      this.#deps.log({
-        event: "plan_annotations_delivered",
-        taskId: this.#deps.taskId,
-        commentCount: mergedComments.length,
-        hasPlanDiff: parts.length > 0
-      });
-    } catch (err3) {
-      const msg = err3 instanceof Error ? err3.message : String(err3);
-      this.#deps.log({
-        event: "plan_annotations_delivery_failed",
-        taskId: this.#deps.taskId,
-        error: msg
-      });
-    }
+    };
   }
 };
 
@@ -107716,7 +107986,7 @@ function tryBeginBridge(ctx) {
 function endBridge(ctx) {
   ctx.setBridgeInFlight(false);
 }
-async function compactSelfForHandoff(ctx, timeoutMs = COMPACT_TIMEOUT_MS) {
+async function compactSelfForHandoff(ctx, startSilenceMs = COMPACTION_SILENCE_TIMEOUT_MS) {
   const triggered = await ctx.forceCompact();
   if (!triggered) {
     ctx.log({
@@ -107725,14 +107995,23 @@ async function compactSelfForHandoff(ctx, timeoutMs = COMPACT_TIMEOUT_MS) {
     });
     return false;
   }
-  const deadline = Date.now() + timeoutMs;
+  const startDeadline = Date.now() + startSilenceMs;
   const pollIntervalMs = 250;
   let leftIdleOnce = false;
-  while (Date.now() < deadline) {
+  while (true) {
     await new Promise((resolve10) => setTimeout(resolve10, pollIntervalMs));
     const kind = ctx.getCompactionStateKind();
     if (!leftIdleOnce) {
-      if (kind !== "idle") leftIdleOnce = true;
+      if (kind !== "idle") {
+        leftIdleOnce = true;
+      } else if (Date.now() >= startDeadline) {
+        ctx.log({
+          event: "compact_self_for_handoff_start_silence_timeout",
+          taskId: ctx.taskId,
+          startSilenceMs
+        });
+        return false;
+      }
       continue;
     }
     if (kind === "idle") return true;
@@ -107741,13 +108020,6 @@ async function compactSelfForHandoff(ctx, timeoutMs = COMPACT_TIMEOUT_MS) {
       return false;
     }
   }
-  ctx.log({
-    event: "compact_self_for_handoff_timeout",
-    taskId: ctx.taskId,
-    timeoutMs,
-    leftIdleOnce
-  });
-  return false;
 }
 function consumePendingNeutralHandoff(ctx, destProvider) {
   const pending = ctx.getPendingNeutralHandoff();
@@ -109417,7 +109689,7 @@ var RewindCheckpointHandler = class {
 
 // src/services/task/side-thread-registry.ts
 import { mkdir as mkdir33, readFile as readFile46, rename as rename20, writeFile as writeFile26 } from "fs/promises";
-import { dirname as dirname34, join as join71 } from "path";
+import { dirname as dirname34, join as join72 } from "path";
 var ThreadFileSchema = external_exports.object({
   threads: external_exports.record(external_exports.string(), ThreadMetadataSchema)
 });
@@ -109793,7 +110065,7 @@ var SideThreadRegistry = class {
   }
   /** Persistence */
   #filePath() {
-    return join71(this.#deps.dataDir, "threads", `${this.#deps.taskId}.json`);
+    return join72(this.#deps.dataDir, "threads", `${this.#deps.taskId}.json`);
   }
   async #ensureLoaded() {
     if (this.#loadedFromDisk.has(this.#deps.taskId)) return;
@@ -110046,15 +110318,15 @@ function buildHandlers(deps) {
           deps.dispatchToSelf({ kind: "flash_timer_elapsed" });
         });
       } else {
-        deps.setCompactTimeoutTimer(durationMs, () => {
-          deps.dispatchToSelf({ kind: "compact_timeout", now: Date.now() });
+        deps.setCompactSilenceTimer(durationMs, () => {
+          deps.dispatchToSelf({ kind: "compact_silence_timeout", now: Date.now() });
         });
       }
     },
     clearTimer: (timerKind) => {
       if (timerKind === "pre-warn") deps.clearPreWarnTimer();
       else if (timerKind === "flash") deps.clearFlashTimer();
-      else deps.clearCompactTimeoutTimer();
+      else deps.clearCompactSilenceTimer();
     },
     callProfileForceCompact: (instructions) => {
       const opts = instructions !== void 0 ? { instructions } : void 0;
@@ -110096,23 +110368,10 @@ function enrichTelemetryPayload(event, deps) {
   switch (event.kind) {
     case "compaction_started":
       return base2;
-    case "compaction_completed": {
-      const { priorMessageCount, postMessageCount } = deps.getMessageCounts();
-      const enriched = { ...base2, durationMs: event.durationMs };
-      if (event.preTokens !== void 0) enriched.preTokens = event.preTokens;
-      if (event.postTokens !== void 0) enriched.postTokens = event.postTokens;
-      if (event.tokensReclaimed !== void 0) enriched.tokensReclaimed = event.tokensReclaimed;
-      if (priorMessageCount !== void 0) enriched.priorMessageCount = priorMessageCount;
-      if (postMessageCount !== void 0) enriched.postMessageCount = postMessageCount;
-      return enriched;
-    }
+    case "compaction_completed":
+      return enrichCompletedPayload(base2, event, deps);
     case "compaction_failed":
-      return {
-        ...base2,
-        durationMs: event.durationMs,
-        reason: event.reason,
-        errorMessage: truncateError(event.error)
-      };
+      return enrichFailedPayload(base2, event);
     case "compaction_subprocess_died":
       return {
         ...base2,
@@ -110123,6 +110382,26 @@ function enrichTelemetryPayload(event, deps) {
       return assertNever7(event);
   }
 }
+function enrichCompletedPayload(base2, event, deps) {
+  const { priorMessageCount, postMessageCount } = deps.getMessageCounts();
+  const enriched = { ...base2, durationMs: event.durationMs };
+  if (event.preTokens !== void 0) enriched.preTokens = event.preTokens;
+  if (event.postTokens !== void 0) enriched.postTokens = event.postTokens;
+  if (event.tokensReclaimed !== void 0) enriched.tokensReclaimed = event.tokensReclaimed;
+  if (priorMessageCount !== void 0) enriched.priorMessageCount = priorMessageCount;
+  if (postMessageCount !== void 0) enriched.postMessageCount = postMessageCount;
+  return enriched;
+}
+function enrichFailedPayload(base2, event) {
+  const enriched = {
+    ...base2,
+    durationMs: event.durationMs,
+    reason: event.reason,
+    errorMessage: truncateError(event.error)
+  };
+  if (event.silenceMs !== void 0) enriched.silenceMs = event.silenceMs;
+  return enriched;
+}
 function mapSmStatusToWire(status) {
   switch (status) {
     case "pre-warn":
@@ -110241,7 +110520,7 @@ async function buildCompactionSnapshot(deps, instructions) {
   };
 }
 function buildCompactionShellHandlers(ctx) {
-  let compactTimeoutHandle = null;
+  let compactSilenceHandle = null;
   const shellDeps = {
     /** Late-bound: every effect invocation reads the current subprocess. */
     get subprocess() {
@@ -110317,19 +110596,19 @@ function buildCompactionShellHandlers(ctx) {
     },
     clearFlashTimer: () => {
     },
-    setCompactTimeoutTimer: (durationMs, onElapsed) => {
-      if (compactTimeoutHandle !== null) {
-        clearTimeout(compactTimeoutHandle);
+    setCompactSilenceTimer: (durationMs, onElapsed) => {
+      if (compactSilenceHandle !== null) {
+        clearTimeout(compactSilenceHandle);
       }
-      compactTimeoutHandle = setTimeout(() => {
-        compactTimeoutHandle = null;
+      compactSilenceHandle = setTimeout(() => {
+        compactSilenceHandle = null;
         onElapsed();
       }, durationMs);
     },
-    clearCompactTimeoutTimer: () => {
-      if (compactTimeoutHandle !== null) {
-        clearTimeout(compactTimeoutHandle);
-        compactTimeoutHandle = null;
+    clearCompactSilenceTimer: () => {
+      if (compactSilenceHandle !== null) {
+        clearTimeout(compactSilenceHandle);
+        compactSilenceHandle = null;
       }
     },
     dispatchToSelf: (event) => {
@@ -110353,8 +110632,7 @@ function buildCompactionShellHandlers(ctx) {
     },
     /**
      * Live-read every dispatch so a cross-runtime switch between dispatches
-     * picks up the destination's capability. The shell uses this to gate
-     * arming the compact-timeout watchdog.
+     * picks up the destination's capability.
      */
     get runtimeFailureReporting() {
       return ctx.getRuntimeFailureReporting();
@@ -110545,6 +110823,7 @@ function decideByMessageCount(params) {
   return { kind: "noop" };
 }
 function handleMainThreadEvent(ctx, event) {
+  maybeDispatchCompactionActivity(ctx, event);
   switch (event.type) {
     case "init_received":
       ctx.onInitReceived(event.metadata);
@@ -110675,12 +110954,60 @@ function handleMainThreadEvent(ctx, event) {
       break;
     case "stream_activity":
       break;
+    case "tool_execution_started":
+    case "tool_execution_settled":
+      break;
     default: {
       const _exhaustive = event;
       throw new Error(`Unhandled subprocess event: ${JSON.stringify(_exhaustive)}`);
     }
   }
 }
+function maybeDispatchCompactionActivity(ctx, event) {
+  if (ctx.getCompactionStateKind() !== "compacting") return;
+  if (!isCompactionActivityEvent(event)) return;
+  ctx.dispatchCompactionEvent({ kind: "compact_activity", now: Date.now() });
+}
+function isCompactionActivityEvent(event) {
+  switch (event.type) {
+    case "assistant_message":
+    case "background_agent_completed":
+    case "background_agent_result":
+    case "background_agent_started":
+    case "codex_token_snapshot":
+    case "cumulative_usage_snapshot":
+    case "informational_notice":
+    case "memory_recall":
+    case "mcp_mid_thread_reload_needed":
+    case "plan_content_ready":
+    case "step_progress":
+    case "stream_activity":
+    case "stream_delta":
+    case "subagent_progress":
+    case "tool_execution_settled":
+    case "tool_execution_started":
+    case "tool_result_echo":
+    case "tool_use_started":
+    case "tool_use_summary":
+    case "turn_complete":
+    case "user_message_echo":
+    case "api_usage_snapshot":
+      return true;
+    case "auth_not_logged_in":
+    case "billing_error":
+    case "compaction_completed":
+    case "compaction_failed":
+    case "compaction_started":
+    case "init_received":
+    case "rate_limit":
+    case "rate_limit_error":
+    case "sdk_error":
+    case "subprocess_died":
+      return false;
+    default:
+      return assertNever(event);
+  }
+}
 function handleAssistantMessage(ctx, event) {
   ctx.log({
     event: "debug_assistant_message",
@@ -110804,6 +111131,9 @@ function handleTurnComplete(ctx, event) {
     });
   }
 }
+function isCodexMissingBearer401(runtimeId, error) {
+  return runtimeId === "codex" && /missing\s+bearer/i.test(error) && error.includes("401");
+}
 function handleSdkError(ctx, event) {
   ctx.collabQueueTurnComplete();
   ctx.pushManagerTurnEnd();
@@ -110820,6 +111150,13 @@ function handleSdkError(ctx, event) {
       now: Date.now(),
       error: event.error
     });
+    if (isCodexMissingBearer401(ctx.getRuntimeId(), event.error)) {
+      ctx.onAuthNotLoggedIn(ctx.getRuntimeId());
+      telemeter("codex_compact_auth_failure", {
+        taskId: ctx.taskId,
+        runtimeId: ctx.getRuntimeId()
+      });
+    }
   }
 }
 function handleBillingOrRateLimitError(ctx, kind) {
@@ -111709,7 +112046,9 @@ var CompactionController = class {
     this.#dispatchCompactionEventAndPersist(event);
   }
   #dispatchCompactionEventAndPersist(event) {
+    const previousState = this.#compactionState;
     const result = transition(this.#compactionState, event);
+    if (result.newState === previousState && result.effects.length === 0) return;
     this.#compactionState = result.newState;
     this.#deps.persistCompactionRuntimeState(
       result.newState.kind === "idle" ? null : result.newState
@@ -112628,7 +112967,7 @@ async function resolveTaskListPrepend(ctx) {
 // src/services/task/cc-task-file-store.ts
 import { readdir as readdir20, readFile as readFile47 } from "fs/promises";
 import { homedir as homedir10 } from "os";
-import { basename as basename12, dirname as dirname35, join as join72 } from "path";
+import { basename as basename12, dirname as dirname35, join as join73 } from "path";
 var VALID_STATUSES = /* @__PURE__ */ new Set(["pending", "in_progress", "completed"]);
 var IDLE_DETACH_MS = 5 * 60 * 1e3;
 var IDLE_SWEEP_INTERVAL_MS = 6e4;
@@ -112644,7 +112983,7 @@ function isCCTaskFile(value) {
 }
 function createCCTaskFileWatcher(listId, log) {
   const sanitizedId = sanitize(listId);
-  const dir = join72(homedir10(), ".claude", "tasks", sanitizedId);
+  const dir = join73(homedir10(), ".claude", "tasks", sanitizedId);
   const targetDirName = basename12(dir);
   const parentDir = dirname35(dir);
   const watchState = {
@@ -112680,7 +113019,7 @@ function createCCTaskFileWatcher(listId, log) {
     return tasks;
   }
   async function readTask(taskId) {
-    const filePath = join72(dir, `${taskId}.json`);
+    const filePath = join73(dir, `${taskId}.json`);
     try {
       const raw = await readFile47(filePath, "utf-8");
       const parsed = JSON.parse(raw);
@@ -112747,7 +113086,7 @@ function createCCTaskFileWatcher(listId, log) {
         watchState.parentSub = null;
         return;
       }
-      if (ev.path.endsWith(targetDirName) || ev.path === join72(parentDir, targetDirName)) {
+      if (ev.path.endsWith(targetDirName) || ev.path === join73(parentDir, targetDirName)) {
         void ensureDirWatcher();
         break;
       }
@@ -112863,7 +113202,7 @@ function createCCTaskFileWatcher(listId, log) {
 // src/services/task/cc-task-file-writer.ts
 import { createHash as createHash10 } from "crypto";
 import { mkdir as mkdir34, readdir as readdir21, rename as rename21, unlink as unlink15, writeFile as writeFile27 } from "fs/promises";
-import { join as join73 } from "path";
+import { join as join74 } from "path";
 function contentHash2(data) {
   return createHash10("sha256").update(data).digest("hex").slice(0, 16);
 }
@@ -112879,7 +113218,7 @@ async function writeTasks(dir, tasks, hashes) {
     const json = JSON.stringify(structuredTaskToCCFile(task), null, 2);
     const hash = contentHash2(json);
     if (hashes.get(id) === hash) continue;
-    await atomicWriteFile2(join73(dir, `${id}.json`), json);
+    await atomicWriteFile2(join74(dir, `${id}.json`), json);
     hashes.set(id, hash);
   }
   return targetIds;
@@ -112895,7 +113234,7 @@ async function removeStaleFiles(dir, targetIds, hashes) {
     if (!entry.endsWith(".json")) continue;
     const id = entry.slice(0, -".json".length);
     if (!targetIds.has(id) && hashes.has(id)) {
-      await unlink15(join73(dir, entry)).catch(() => {
+      await unlink15(join74(dir, entry)).catch(() => {
       });
       hashes.delete(id);
     }
@@ -113497,10 +113836,10 @@ var StructuredTaskTracker = class {
 import { unwatchFile, watchFile } from "fs";
 import { open as open2 } from "fs/promises";
 import { homedir as homedir11 } from "os";
-import { join as join74 } from "path";
+import { join as join75 } from "path";
 function computeTranscriptPath(cwd, sessionId, taskId) {
   const cwdSlug = cwd.replace(/[^a-zA-Z0-9]/g, "-").slice(0, 200);
-  return join74(
+  return join75(
     homedir11(),
     ".claude",
     "projects",
@@ -114210,14 +114549,59 @@ function trackPlanFileCreation(content, onPlanFile) {
 }
 
 // src/services/token-counter.ts
-import { execFile as execFile11 } from "child_process";
+import { spawn as spawn13 } from "child_process";
 import { createHash as createHash11 } from "crypto";
 import { unlink as unlink16, writeFile as writeFile28 } from "fs/promises";
 import { createRequire as createRequire4 } from "module";
 import { tmpdir } from "os";
-import { join as join75 } from "path";
-import { promisify as promisify10 } from "util";
-var execFileAsync4 = promisify10(execFile11);
+import { join as join76 } from "path";
+function spawnCollect(bin, args, opts) {
+  return new Promise((resolve10, reject) => {
+    const child = spawn13(bin, args, {
+      cwd: opts.cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: opts.env
+    });
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+    child.stdout?.on("data", (d) => {
+      stdout += d.toString("utf-8");
+    });
+    child.stderr?.on("data", (d) => {
+      stderr += d.toString("utf-8");
+    });
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      child.kill("SIGTERM");
+      reject(
+        new Error(`Token count timed out after ${opts.timeout}ms. stderr: ${stderr.slice(0, 200)}`)
+      );
+    }, opts.timeout);
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      if (settled) return;
+      settled = true;
+      if (code === 0) {
+        resolve10(stdout);
+      } else {
+        reject(
+          new Error(
+            `Command exited ${code ?? "null"}: ${bin} ${args.slice(0, 3).join(" ")}... stderr: ${stderr.trim().slice(0, 300)}`
+          )
+        );
+      }
+    });
+    child.on("error", (err3) => {
+      clearTimeout(timer);
+      if (settled) return;
+      settled = true;
+      reject(err3);
+    });
+  });
+}
+var _spawnImpl = null;
 function resolveDaemonNodeModules(log) {
   try {
     const thisDir = new URL(".", import.meta.url);
@@ -114228,7 +114612,7 @@ function resolveDaemonNodeModules(log) {
   } catch {
   }
   try {
-    const cwdRequire = createRequire4(join75(process.cwd(), "package.json"));
+    const cwdRequire = createRequire4(join76(process.cwd(), "package.json"));
     const sdkPath = cwdRequire.resolve("@modelcontextprotocol/sdk/server/mcp.js");
     const idx = sdkPath.lastIndexOf("node_modules");
     if (idx >= 0) return sdkPath.slice(0, idx + "node_modules".length);
@@ -114238,7 +114622,7 @@ function resolveDaemonNodeModules(log) {
       error: err3 instanceof Error ? err3.message : String(err3)
     });
   }
-  return join75(process.cwd(), "node_modules");
+  return join76(process.cwd(), "node_modules");
 }
 function planTokenCount(systemPrompt, metadata, cwd, model, mcpServers) {
   return {
@@ -114263,6 +114647,8 @@ function hashPlan(plan) {
 }
 var MAX_CACHE_SIZE = 50;
 var CACHE_TTL_MS = 15 * 60 * 1e3;
+var FAILURE_BACKOFF_MS = 5 * 60 * 1e3;
+var failureBackoffUntilMs = 0;
 var activeCount = 0;
 var cache = /* @__PURE__ */ new Map();
 function evictOldest() {
@@ -114435,7 +114821,7 @@ async function serializeMcpConfig(servers, allToolNames, daemonNodeModules, rese
     if (isReservedMcpServerName(serverName, reservedServerNames)) continue;
     const script = buildStubServerScript(serverName, tools);
     if (!script) continue;
-    const stubPath = join75(tmpdir(), `shipyard-mcp-stub-${serverName}-${Date.now()}.cjs`);
+    const stubPath = join76(tmpdir(), `shipyard-mcp-stub-${serverName}-${Date.now()}.cjs`);
     await writeFile28(stubPath, script, "utf-8");
     stubPaths.push(stubPath);
     mcpServers[serverName] = {
@@ -114461,11 +114847,37 @@ async function prepareTokenCountArgs(plan, log, reservedServerNames = SDK_RESERV
     reservedServerNames
   );
   if (!serialized.config) return { args, mcpConfigPath: null, stubPaths: serialized.stubPaths };
-  const mcpConfigPath = join75(tmpdir(), `shipyard-mcp-${Date.now()}.json`);
+  const mcpConfigPath = join76(tmpdir(), `shipyard-mcp-${Date.now()}.json`);
   await writeFile28(mcpConfigPath, JSON.stringify(serialized.config), "utf-8");
   args.push("--mcp-config", mcpConfigPath);
   return { args, mcpConfigPath, stubPaths: serialized.stubPaths };
 }
+async function runWithRetry(bin, plan, log, cleanupPaths) {
+  const invokeSpawn = _spawnImpl ?? spawnCollect;
+  const runAttempt = async (reservedServerNames) => {
+    const attemptPrepared = await prepareTokenCountArgs(plan, log, reservedServerNames);
+    cleanupPaths.push(...attemptPrepared.stubPaths);
+    if (attemptPrepared.mcpConfigPath) cleanupPaths.push(attemptPrepared.mcpConfigPath);
+    const stdout = await invokeSpawn(bin, attemptPrepared.args, {
+      cwd: plan.cwd,
+      timeout: 6e4,
+      env: process.env
+    });
+    return { stdout, stubCount: attemptPrepared.stubPaths.length };
+  };
+  try {
+    return await runAttempt(SDK_RESERVED_MCP_SERVER_NAMES);
+  } catch (err3) {
+    const reservedServerName = parseReservedMcpServerName(
+      err3 instanceof Error ? err3.message : String(err3)
+    );
+    if (!reservedServerName) throw err3;
+    log({ event: "token_count_reserved_mcp_retry", serverName: reservedServerName });
+    const retryNames = new Set(SDK_RESERVED_MCP_SERVER_NAMES);
+    retryNames.add(reservedServerName);
+    return await runAttempt(retryNames);
+  }
+}
 async function executeTokenCount(plan, log) {
   const key = hashPlan(plan);
   const cached = getCached(key);
@@ -114473,51 +114885,39 @@ async function executeTokenCount(plan, log) {
     log({ event: "token_count_cache_hit", cacheSize: cache.size });
     return cached;
   }
+  const now = Date.now();
+  if (now < failureBackoffUntilMs) {
+    log({ event: "token_count_skipped_backoff", backoffRemainingMs: failureBackoffUntilMs - now });
+    return null;
+  }
   if (activeCount >= 1) {
     log({ event: "token_count_skipped_concurrent", activeCount });
     return null;
   }
+  const claudeBin = resolveClaudeBinaryPath(log);
+  if (!claudeBin) return null;
   const cleanupPaths = [];
   activeCount++;
   try {
     const t0 = Date.now();
-    log({ event: "token_count_started", cwd: plan.cwd, cacheSize: cache.size });
-    const claudeBin = resolveClaudeBinaryPath(log);
-    if (!claudeBin) return null;
-    const runAttempt = async (reservedServerNames) => {
-      const attemptPrepared = await prepareTokenCountArgs(plan, log, reservedServerNames);
-      cleanupPaths.push(...attemptPrepared.stubPaths);
-      if (attemptPrepared.mcpConfigPath) cleanupPaths.push(attemptPrepared.mcpConfigPath);
-      const { stdout } = await execFileAsync4(claudeBin, attemptPrepared.args, {
-        cwd: plan.cwd,
-        encoding: "utf-8",
-        timeout: 6e4,
-        env: process.env
-      });
-      return { stdout, stubCount: attemptPrepared.stubPaths.length };
-    };
-    let attempt;
-    try {
-      attempt = await runAttempt(SDK_RESERVED_MCP_SERVER_NAMES);
-    } catch (err3) {
-      const reservedServerName = parseReservedMcpServerName(
-        err3 instanceof Error ? err3.message : String(err3)
-      );
-      if (!reservedServerName) throw err3;
-      log({ event: "token_count_reserved_mcp_retry", serverName: reservedServerName });
-      const retryReservedServerNames = new Set(SDK_RESERVED_MCP_SERVER_NAMES);
-      retryReservedServerNames.add(reservedServerName);
-      attempt = await runAttempt(retryReservedServerNames);
-    }
+    log({
+      event: "token_count_started",
+      cwd: plan.cwd,
+      cacheSize: cache.size,
+      binaryPath: claudeBin
+    });
+    const attempt = await runWithRetry(claudeBin, plan, log, cleanupPaths);
     const parsed = JSON.parse(attempt.stdout);
     const resultText = parsed.result ?? "";
     if (!resultText) {
+      failureBackoffUntilMs = Date.now() + FAILURE_BACKOFF_MS;
       log({ event: "token_count_empty_result" });
       return null;
     }
     const result = parseContextOutput(resultText, plan.shipyardSystemPrompt);
     evictOldest();
     cache.set(key, { result, expiry: Date.now() + CACHE_TTL_MS });
+    failureBackoffUntilMs = 0;
     log({
       event: "token_count_complete",
       durationMs: Date.now() - t0,
@@ -114533,7 +114933,13 @@ async function executeTokenCount(plan, log) {
     return result;
   } catch (err3) {
     const errorMessage5 = err3 instanceof Error ? err3.message : String(err3);
-    log({ event: "token_count_failed", error: errorMessage5 });
+    failureBackoffUntilMs = Date.now() + FAILURE_BACKOFF_MS;
+    log({
+      event: "token_count_failed",
+      error: errorMessage5,
+      binaryPath: claudeBin,
+      backoffUntilMs: failureBackoffUntilMs
+    });
     return null;
   } finally {
     activeCount--;
@@ -114812,8 +115218,8 @@ var Task = class {
    * The wire `handoff_status.mode` the daemon actually ran for the most recent
    * cross-runtime switch (Wave 2b). Stamped by `applyCrossRuntimeSwitch` from
    * the orchestration layer's real decision (compact-then-bridge that actually
-   * compacted, direct when the compact arm timed out, cursor-source-lossy for a
-   * text-only source). Read at the destination spawn site so the broadcast
+   * compacted, direct when source compaction could not start or failed,
+   * cursor-source-lossy for a text-only source). Read at the destination spawn site so the broadcast
    * `handoff_status` reflects ground truth instead of the browser's same-
    * threshold prediction. null until the first switch lands.
    */
@@ -115339,7 +115745,8 @@ var Task = class {
          * to avoid an extra `??` in this already-at-budget constructor.
          */
         stallTimeoutMs: deps.stallTimeoutMs,
-        firstStepStallTimeoutMs: deps.firstStepStallTimeoutMs
+        firstStepStallTimeoutMs: deps.firstStepStallTimeoutMs,
+        toolExecutionStallTimeoutMs: deps.toolExecutionStallTimeoutMs
       },
       this.#buildMainThreadCallbacks(deps)
     );
@@ -115595,12 +116002,15 @@ var Task = class {
    * OUT of idle before treating return-to-idle as success: `forceCompact()`
    * returns sync but the SM only enters `compacting` LATER on the
    * subprocess's `compaction_started`. Without the latch, poll #1 sees
-   * idle and returns true before any compaction. Returns false on
-   * failed/timeout/no-subprocess — caller falls through to direct
-   * bridging and the destination's native compactor handles overflow.
+   * idle and returns true before any compaction. Once compaction starts, this
+   * waits for the SM to settle rather than enforcing a total wall-clock
+   * deadline; the SM's activity-reset silence watchdog handles runtime
+   * liveness. Returns false on failure, no subprocess, or silence before the
+   * compaction starts — caller falls through to direct bridging and the
+   * destination's native compactor handles overflow.
    */
-  async compactSelfForHandoff(timeoutMs = COMPACT_TIMEOUT_MS) {
-    return compactSelfForHandoff(this.#crossRuntimeCtx(), timeoutMs);
+  async compactSelfForHandoff(startSilenceMs = COMPACTION_SILENCE_TIMEOUT_MS) {
+    return compactSelfForHandoff(this.#crossRuntimeCtx(), startSilenceMs);
   }
   /** Current working directory. May be undefined during early bootstrap before EnterWorktree. */
   get cwd() {
@@ -117599,6 +118009,23 @@ function handlePlanContinueInTask(tasks, log, taskId, toolUseId, decision, feedb
   task.orchestrator.handlePlanContinue(toolUseId, decision, feedback, opts);
 }
 
+// src/services/task/manager/task-manager-stall-budgets.ts
+function resolveStallBudgets(agentSystem) {
+  if (!isKnownAgentProvider(agentSystem)) {
+    return {
+      stallTimeoutMs: null,
+      firstStepStallTimeoutMs: null,
+      toolExecutionStallTimeoutMs: null
+    };
+  }
+  const profile = profileRegistry.get(agentSystem);
+  return {
+    stallTimeoutMs: profile.stallTimeoutMs ?? null,
+    firstStepStallTimeoutMs: profile.firstStepStallTimeoutMs ?? null,
+    toolExecutionStallTimeoutMs: profile.toolExecutionStallTimeoutMs
+  };
+}
+
 // src/services/task/manager/task-manager-threads.ts
 function createThreadInTask(tasks, userId, params) {
   const task = tasks.get(params.taskId);
@@ -119715,8 +120142,7 @@ var TaskManager = class {
       initialOriginalCwd: opts?.initialOriginalCwd,
       taskStateStore: this.#deps.taskStateStore,
       ownerUserId: this.#deps.userId,
-      stallTimeoutMs: isKnownAgentProvider(opts.agentSystem) ? profileRegistry.get(opts.agentSystem).stallTimeoutMs ?? null : null,
-      firstStepStallTimeoutMs: isKnownAgentProvider(opts.agentSystem) ? profileRegistry.get(opts.agentSystem).firstStepStallTimeoutMs ?? null : null
+      ...resolveStallBudgets(opts.agentSystem)
     });
   }
 };
@@ -119730,11 +120156,11 @@ function pathExistsForLog2(path5) {
 }
 
 // src/services/task/manager/task-state-store.ts
-import { join as join77 } from "path";
+import { join as join78 } from "path";
 
 // src/services/storage/directory-record-store.ts
 import { mkdir as mkdir35, readdir as readdir22, readFile as readFile48, rename as rename22, stat as stat17, unlink as unlink17 } from "fs/promises";
-import { join as join76 } from "path";
+import { join as join77 } from "path";
 var SCHEMA_VERSION_FILENAME = "__schema-version";
 var RECORD_SUFFIX = ".json";
 var SAFE_ID_RE = /^[A-Za-z0-9_-][A-Za-z0-9_.-]*$/;
@@ -119754,7 +120180,7 @@ function buildDirectoryRecordStore(opts) {
   let writeQueue = Promise.resolve();
   function recordPath(id) {
     assertSafeRecordId(id);
-    return join76(dataDir, `${id}${RECORD_SUFFIX}`);
+    return join77(dataDir, `${id}${RECORD_SUFFIX}`);
   }
   function notify(event) {
     for (const listener of listeners) {
@@ -119769,7 +120195,7 @@ function buildDirectoryRecordStore(opts) {
   }
   async function readSchemaVersion() {
     try {
-      const raw = await readFile48(join76(dataDir, SCHEMA_VERSION_FILENAME), "utf-8");
+      const raw = await readFile48(join77(dataDir, SCHEMA_VERSION_FILENAME), "utf-8");
       const parsed = Number.parseInt(raw.trim(), 10);
       return Number.isFinite(parsed) ? parsed : null;
     } catch (err3) {
@@ -119778,7 +120204,7 @@ function buildDirectoryRecordStore(opts) {
     }
   }
   async function writeSchemaVersion(version) {
-    const path5 = join76(dataDir, SCHEMA_VERSION_FILENAME);
+    const path5 = join77(dataDir, SCHEMA_VERSION_FILENAME);
     await atomicWriteFile(path5, String(version));
   }
   async function legacyFileExists() {
@@ -119883,7 +120309,7 @@ function buildDirectoryRecordStore(opts) {
     for (const entry of entries) {
       if (!entry.endsWith(RECORD_SUFFIX)) continue;
       const id = entry.slice(0, -RECORD_SUFFIX.length);
-      const record = await loadOneRecord(join76(dataDir, entry), entry);
+      const record = await loadOneRecord(join77(dataDir, entry), entry);
       if (record !== null) records.set(id, record);
     }
     return records;
@@ -120184,8 +120610,8 @@ function computePaginatedPage(all, capturedVersion, opts) {
 }
 function buildTaskStateStore(dataDir) {
   const store = buildDirectoryRecordStore({
-    dataDir: join77(dataDir, "tasks"),
-    legacyFilePath: join77(dataDir, "tasks.json"),
+    dataDir: join78(dataDir, "tasks"),
+    legacyFilePath: join78(dataDir, "tasks.json"),
     recordSchema: TaskRecordSchema,
     currentVersion: TASK_STORE_VERSION,
     migrate(raw) {
@@ -121269,7 +121695,7 @@ async function createDaemon(deps) {
   const annotationStore = buildAnnotationStore(deps.dataDir);
   const deliverableStore = buildDeliverableStore(deps.dataDir);
   const resourceRegistry = createResourceRegistry();
-  const assetStore = buildAssetStore(join78(deps.dataDir, "assets"));
+  const assetStore = buildAssetStore(join79(deps.dataDir, "assets"));
   const shipyardResolver = createShipyardResolver();
   shipyardResolver.addSubResolver("asset", createAssetResolver(assetStore));
   const pluginResourceResolver = new PluginResourceResolver(deps.log);
@@ -121278,10 +121704,10 @@ async function createDaemon(deps) {
   const capabilitiesRef = { current: null };
   const rateLimitStoreRef = { current: null };
   const gitCheckpoint = createGitCheckpointService();
-  const userSettingsStore = buildUserSettingsStore(join78(deps.dataDir, "user-settings.json"));
-  const projectsStore = buildProjectsStore(join78(deps.dataDir, "projects.json"));
+  const userSettingsStore = buildUserSettingsStore(join79(deps.dataDir, "user-settings.json"));
+  const projectsStore = buildProjectsStore(join79(deps.dataDir, "projects.json"));
   const credentialsVaultStore = buildCredentialsVaultStore(
-    join78(deps.dataDir, "credentials-vault.json")
+    join79(deps.dataDir, "credentials-vault.json")
   );
   const cursorVaultKeyRef = { current: null };
   let resolveCursorVaultKey;
@@ -121727,7 +122153,7 @@ async function createDaemon(deps) {
       taskId: args.taskId,
       agentSystem: args.agentSystem,
       environmentKey: args.cwd,
-      pluginsDir: join78(deps.shipyardHome, "plugins"),
+      pluginsDir: join79(deps.shipyardHome, "plugins"),
       vizWatcher: getOrCreateVizWatcher(args.taskId).watcher,
       mode: "task",
       previewProxy: deps.previewProxy,
@@ -121820,7 +122246,7 @@ async function createDaemon(deps) {
       /** Claude in-process harness — Codex uses the HTTP path with 'codex' above. */
       agentSystem: AGENT_SYSTEM_CLAUDE_CODE,
       environmentKey: args.cwd,
-      pluginsDir: join78(deps.shipyardHome, "plugins"),
+      pluginsDir: join79(deps.shipyardHome, "plugins"),
       vizWatcher: args.vizWatcher,
       mode: args.mode ?? "task",
       previewProxy: deps.previewProxy,
@@ -121907,6 +122333,7 @@ async function createDaemon(deps) {
       deps.log
     );
     subprocess.installHarnessTaskIdSetter(setHarnessTaskId);
+    subprocess.installHarnessEpoch(epoch);
     return subprocess;
   }
   const lastUsageLimitBroadcastByTask = /* @__PURE__ */ new Map();
@@ -122146,7 +122573,7 @@ async function createDaemon(deps) {
     if (!cwd) return null;
     try {
       const { gitExecSafe: gitExecSafe2 } = await import("./git-pool-V73Q53NX.js");
-      const { getRepoDefaultBranch: getRepoDefaultBranch2 } = await import("./git-repo-QNGPCJLI.js");
+      const { getRepoDefaultBranch: getRepoDefaultBranch2 } = await import("./git-repo-CTZJS3ER.js");
       const branch = await gitExecSafe2(cwd, ["rev-parse", "--abbrev-ref", "HEAD"]) ?? "";
       if (!branch || branch === "HEAD") return null;
       const pr = branchPrStateCache.get(taskId)?.currentBranchPR;
@@ -122834,7 +123261,7 @@ async function createDaemon(deps) {
   const stallProfilerConfig = getStallProfilerConfig();
   const stallProfiler = new StallProfiler({
     log: deps.log,
-    outDir: join78(deps.dataDir, "stall-profiles"),
+    outDir: join79(deps.dataDir, "stall-profiles"),
     thresholdMs: stallProfilerConfig.thresholdMs,
     captureMs: stallProfilerConfig.captureMs,
     rateLimitMs: stallProfilerConfig.rateLimitMs
@@ -123434,10 +123861,10 @@ async function createDaemon(deps) {
 import { existsSync as existsSync12 } from "fs";
 
 // src/services/bootstrap/self-update.ts
-import { execFile as execFile12, spawn as spawn13 } from "child_process";
+import { execFile as execFile11, spawn as spawn14 } from "child_process";
 import { createHash as createHash12 } from "crypto";
 import { chmod as chmod3, mkdir as mkdir37, readFile as readFile49, rename as rename23, unlink as unlink18, writeFile as writeFile29 } from "fs/promises";
-import { join as join79 } from "path";
+import { join as join80 } from "path";
 
 // src/services/bootstrap/self-update-installer-scripts.ts
 function buildPosixInstallerScript(params) {
@@ -123810,7 +124237,7 @@ function parseNpmViewOutput(stdout) {
 }
 async function defaultResolveVersion(pkg, tag) {
   return new Promise((resolve10, reject) => {
-    execFile12(
+    execFile11(
       "npm",
       ["view", `${pkg}@${tag}`, "version", "dist.tarball", "dist.shasum", "--json"],
       { timeout: NPM_VIEW_TIMEOUT_MS, encoding: "utf-8" },
@@ -123839,7 +124266,7 @@ async function downloadTarball(url, destPath, fetchFn) {
       throw new Error(`download failed: HTTP ${response.status} ${response.statusText}`);
     }
     const bytes = new Uint8Array(await response.arrayBuffer());
-    await mkdir37(join79(destPath, ".."), { recursive: true });
+    await mkdir37(join80(destPath, ".."), { recursive: true });
     try {
       await writeFile29(tmpPath, bytes);
       await rename23(tmpPath, destPath);
@@ -123869,7 +124296,7 @@ async function verifyChecksum(path5, expectedHash) {
   }
 }
 async function stageInstallerScript(scriptPath, params) {
-  await mkdir37(join79(scriptPath, ".."), { recursive: true });
+  await mkdir37(join80(scriptPath, ".."), { recursive: true });
   const body = process.platform === "win32" ? buildWindowsInstallerScript(params) : buildPosixInstallerScript(params);
   await writeFile29(scriptPath, body);
   await chmod3(scriptPath, 493);
@@ -123919,16 +124346,16 @@ function buildInstallerParams(state, deps) {
     targetVersion: state.resolved.version,
     previousVersion: deps.currentVersion,
     parentPid: deps.pid,
-    statusFilePath: join79(deps.shipyardHome, "update-status.json"),
-    pidFilePath: join79(deps.shipyardHome, "daemon.pid"),
-    logPath: join79(deps.shipyardHome, "updates", `install-${deps.pid}.log`),
-    snapshotPath: join79(deps.shipyardHome, "updates", `rollback-${deps.currentVersion}`),
+    statusFilePath: join80(deps.shipyardHome, "update-status.json"),
+    pidFilePath: join80(deps.shipyardHome, "daemon.pid"),
+    logPath: join80(deps.shipyardHome, "updates", `install-${deps.pid}.log`),
+    snapshotPath: join80(deps.shipyardHome, "updates", `rollback-${deps.currentVersion}`),
     npmBin: "npm"
   };
 }
 function tarballPathFor(shipyardHome, version, shasum) {
   const shaPrefix = shasum.slice(0, 12);
-  return join79(shipyardHome, "updates", `${version}-${shaPrefix}.tgz`);
+  return join80(shipyardHome, "updates", `${version}-${shaPrefix}.tgz`);
 }
 async function runResolveStep(step, state, deps) {
   const resolver = deps.resolveVersion ?? defaultResolveVersion;
@@ -123960,7 +124387,7 @@ async function runStageScriptStep(step, state, deps) {
   );
   await stageInstallerScript(step.scriptPath, params);
 }
-var defaultSpawnCommand = (cmd, args, opts) => spawn13(cmd, [...args], opts ?? {});
+var defaultSpawnCommand = (cmd, args, opts) => spawn14(cmd, [...args], opts ?? {});
 function runSpawnStep(step, state, deps) {
   const spawnFn = deps.spawnCommand ?? defaultSpawnCommand;
   spawnInstaller(step.scriptPath, step.logPath, spawnFn);
@@ -124150,26 +124577,27 @@ var WARN_EVENTS = /* @__PURE__ */ new Set([
   "webrtc_offer_handshake_failed",
   "webrtc_initiate_handshake_failed",
   /**
-   * At-least-once delivery retry signals. A healthy connection sees zero
-   * resends; sustained `alo_resend` traffic means the wire is sick. At L30
-   * (info) these were invisible to error-filtered dashboards — the May 4-5
-   * storm (1.21M events/day peak) was caught only by log volume, not by
-   * level. Promote to L40 (warn) so the next storm trips the same filters
-   * an operator already watches. `alo_dead_letter` and the orphan reaper
-   * are stronger failure signals (entry permanently dropped / channel
-   * wedged) and warrant warn for the same reason.
+   * At-least-once delivery health summary. Replaces per-event `alo_resend`
+   * warn noise (411K lines / 25-day corpus). One summary per stream per 30s
+   * with pending count, resend count, drop count, and oldest message age.
+   * `alo_dead_letter` and the orphan reaper are stronger failure signals
+   * (entry permanently dropped / channel wedged) and remain at warn.
+   *
+   * `alo_resend` per-event lines are demoted to debug (see DEBUG_EVENTS
+   * below); `alo_resend_exhausted` is an explicit error emitted by the shell
+   * when an entry exceeds maxDeliver — the shell carries `{level:'error'}` so
+   * classifyLogLevel honours it without needing it in WARN_EVENTS.
    */
-  "alo_resend",
+  "alo_health",
   "alo_dead_letter",
   "alo_shell_orphan_reaped",
   /**
-   * Memory/health heartbeats. These are pure-info by nature, but the packaged
-   * Electron app runs the daemon at the default `LOG_LEVEL=warn` (env.ts), so at
-   * info they never reach the on-disk log — the exact reason a 50GB-RAM incident
-   * had ZERO daemon memory samples in its logs (sessions also died sub-10s, but
-   * even the healthy days after were warn-only). Memory observability must not be
-   * defeated by the default level. Promote so RSS/heap curves are always on disk;
-   * the D1 telemetry path (metricsCollector.capture) is already level-independent.
+   * Memory/health heartbeats promoted to WARN for observability: a 50GB-RAM incident
+   * had ZERO daemon memory samples in its logs (sessions died sub-10s, and even
+   * healthy post-incident days were warn-only under the old default). Keeping them at
+   * WARN ensures RSS/heap curves appear even in environments where LOG_LEVEL is
+   * explicitly set to warn; the D1 telemetry path (metricsCollector.capture) is
+   * already level-independent and always fires regardless.
    */
   "health_snapshot",
   "browser_metrics_sample"
@@ -124208,11 +124636,17 @@ var DEBUG_EVENTS = /* @__PURE__ */ new Set([
    * occasionally carries an error will get silently demoted to debug.
    * Only demote events that are pure happy-path counters with no error
    * field. `msg_received` is intentionally EXCLUDED because it can carry
-   * a parse error; `alo_resend` is intentionally LEFT IN `WARN_EVENTS`
-   * above because sustained resend traffic is a sick-wire signal.
+   * a parse error.
+   *
+   * `alo_resend` per-event lines are demoted here (#4511). The shell
+   * carries `{level:'debug'}` on every event; this belt-and-suspenders
+   * entry ensures classifyLogLevel agrees even if the level field is ever
+   * removed. The `alo_health` periodic summary in WARN_EVENTS is the
+   * intended production-visible signal for retry pressure.
    */
   "channel_send",
   "alo_ack_received",
+  "alo_resend",
   "dc_buffered_sample",
   "control_message_handled"
 ]);
@@ -124295,7 +124729,7 @@ function routeSignalingMessage(peerManager, signalingHandle, log) {
 }
 
 // src/services/lsp/lsp-bridge.ts
-import { spawn as spawn14 } from "child_process";
+import { spawn as spawn15 } from "child_process";
 
 // src/services/lsp/lsp-server-supervisor.ts
 var SHUTDOWN_GRACE_MS = 5e3;
@@ -124571,7 +125005,7 @@ function handleLSPChannel(cwd, send, log, languageId) {
       serverId: server.serverId
     }),
     log,
-    spawn: spawn14,
+    spawn: spawn15,
     now: () => Date.now(),
     setTimeoutFn: (fn, ms) => setTimeout(fn, ms),
     clearTimeoutFn: (timer) => {
@@ -125003,7 +125437,7 @@ function buildLocalDirectChannelCallbacks(deps) {
 
 // src/services/skills-cache/codex-skills-cache.ts
 import { mkdir as mkdir38, readFile as readFile50, rename as rename24, writeFile as writeFile30 } from "fs/promises";
-import { dirname as dirname37, join as join80 } from "path";
+import { dirname as dirname37, join as join81 } from "path";
 var CACHE_FILENAME = "codex-skills-cache.json";
 var SkillInfoCacheEntrySchema = external_exports.object({
   name: external_exports.string(),
@@ -125020,7 +125454,7 @@ var CodexSkillsCacheFileSchema = external_exports.object({
   skills: external_exports.array(SkillInfoCacheEntrySchema)
 });
 function defaultCodexSkillsCachePath(shipyardHome) {
-  return join80(shipyardHome, "state", CACHE_FILENAME);
+  return join81(shipyardHome, "state", CACHE_FILENAME);
 }
 async function loadCodexSkillsCache(path5) {
   let raw;
@@ -125084,11 +125518,11 @@ async function saveCodexSkillsCache(path5, cache2) {
 // src/services/skills-mirror/manager.ts
 import { lstat, mkdir as mkdir40, readlink, stat as stat18, symlink, unlink as unlink20 } from "fs/promises";
 import { homedir as homedir13 } from "os";
-import { dirname as dirname39, join as join82 } from "path";
+import { dirname as dirname39, join as join83 } from "path";
 
 // src/services/skills-mirror/manifest.ts
 import { mkdir as mkdir39, readFile as readFile51, rename as rename25, unlink as unlink19, writeFile as writeFile31 } from "fs/promises";
-import { dirname as dirname38, join as join81 } from "path";
+import { dirname as dirname38, join as join82 } from "path";
 var MANIFEST_VERSION = 1;
 var ManifestEntrySchema = external_exports.object({
   /** Display name of the skill (e.g. `qa`, or `plugin:name` when namespaced). */
@@ -125108,7 +125542,7 @@ function emptyManifest() {
   return { version: MANIFEST_VERSION, entries: [] };
 }
 function defaultManifestPath(shipyardHome) {
-  return join81(shipyardHome, "state", "skill-mirror-manifest.json");
+  return join82(shipyardHome, "state", "skill-mirror-manifest.json");
 }
 async function loadManifest(path5) {
   try {
@@ -125139,15 +125573,15 @@ async function deleteManifest(path5) {
 function defaultPaths() {
   const home = homedir13();
   return {
-    claudeSkillsDir: join82(home, ".claude", "skills"),
-    codexSkillsDir: join82(home, ".agents", "skills"),
+    claudeSkillsDir: join83(home, ".claude", "skills"),
+    codexSkillsDir: join83(home, ".agents", "skills"),
     manifestPath: defaultManifestPath(getShipyardHome())
   };
 }
 function plannedSymlinkPath(skill, paths) {
   const linkName = skill.namespace ? `${skill.namespace}:${skill.name}` : skill.name;
-  if (skill.sourceAgent === "claude-code") return join82(paths.codexSkillsDir, linkName);
-  if (skill.sourceAgent === "codex") return join82(paths.claudeSkillsDir, linkName);
+  if (skill.sourceAgent === "claude-code") return join83(paths.codexSkillsDir, linkName);
+  if (skill.sourceAgent === "codex") return join83(paths.claudeSkillsDir, linkName);
   return null;
 }
 function isPermissionError(err3) {
@@ -125360,7 +125794,7 @@ async function ensureMirror(skills, config, paths = defaultPaths()) {
 
 // src/services/skills-mirror/prefs.ts
 import { mkdir as mkdir41, readFile as readFile52, rename as rename26, writeFile as writeFile32 } from "fs/promises";
-import { dirname as dirname40, join as join83 } from "path";
+import { dirname as dirname40, join as join84 } from "path";
 var SkillsMirrorPrefsSchema = external_exports.object({
   enabled: external_exports.boolean().default(true)
 });
@@ -125369,7 +125803,7 @@ function defaultSkillsMirrorPrefs() {
   return { enabled: true };
 }
 function prefsPath(dataDir) {
-  return join83(dataDir, FILENAME);
+  return join84(dataDir, FILENAME);
 }
 async function loadSkillsMirrorPrefs(dataDir) {
   try {
@@ -125418,7 +125852,7 @@ async function reconcileSkillsMirror(args) {
 // src/services/storage/daemon-settings-store.ts
 import { createHash as createHash13 } from "crypto";
 import { mkdir as mkdir42, readFile as readFile53 } from "fs/promises";
-import { join as join84 } from "path";
+import { join as join85 } from "path";
 var ProjectSettingsSchema = external_exports.object({
   disabledMcpServers: external_exports.array(external_exports.string()).optional(),
   previewMigrationV36Done: external_exports.boolean().default(false)
@@ -125427,9 +125861,9 @@ function hashProjectPath(projectPath) {
   return createHash13("sha256").update(projectPath).digest("hex").slice(0, 16);
 }
 function buildDaemonSettingsStore(dataDir) {
-  const settingsDir = join84(dataDir, "settings");
+  const settingsDir = join85(dataDir, "settings");
   function settingsPath(projectPath) {
-    return join84(settingsDir, `${hashProjectPath(projectPath)}.json`);
+    return join85(settingsDir, `${hashProjectPath(projectPath)}.json`);
   }
   async function ensureDir() {
     await mkdir42(settingsDir, { recursive: true });
@@ -125454,12 +125888,12 @@ function buildDaemonSettingsStore(dataDir) {
 
 // src/services/storage/plugin-config-store.ts
 import { mkdir as mkdir43, readFile as readFile54 } from "fs/promises";
-import { join as join85 } from "path";
+import { join as join86 } from "path";
 function buildPluginConfigStore(pluginsDir) {
   const cache2 = /* @__PURE__ */ new Map();
   const writeQueues = /* @__PURE__ */ new Map();
   function configPath(pluginId) {
-    return join85(pluginsDir, pluginId, "config.json");
+    return join86(pluginsDir, pluginId, "config.json");
   }
   async function readConfigFromDisk(pluginId) {
     const fp = configPath(pluginId);
@@ -125513,7 +125947,7 @@ function buildPluginConfigStore(pluginsDir) {
           const fresh = await readConfigFromDisk(pluginId);
           fresh[key] = value;
           cache2.set(pluginId, fresh);
-          await mkdir43(join85(pluginsDir, pluginId), { recursive: true });
+          await mkdir43(join86(pluginsDir, pluginId), { recursive: true });
           await atomicWriteFile(configPath(pluginId), JSON.stringify(fresh, null, 2));
         })
       );
@@ -125759,7 +126193,7 @@ async function serve(options = {}) {
 }
 async function runServeBody(options, captureRefs) {
   const shipyardHome = options.shipyardHome ?? getShipyardHome();
-  const dataDir = join86(shipyardHome, options.isDev ? "data-dev" : "data");
+  const dataDir = join87(shipyardHome, options.isDev ? "data-dev" : "data");
   const log = createChildLogger({ mode: "serve" });
   log.info(
     { event: "daemon_start", version: getDaemonVersion(), pid: process.pid },
@@ -125767,7 +126201,7 @@ async function runServeBody(options, captureRefs) {
   );
   const { workspaceRoot, unscopedWorkspace, unscopedReason } = await resolveWorkspaceScope();
   registerBuiltinPlugins();
-  const pluginConfigStore = buildPluginConfigStore(join86(dataDir, "plugins"));
+  const pluginConfigStore = buildPluginConfigStore(join87(dataDir, "plugins"));
   await mkdir44(dataDir, { recursive: true });
   log.info(
     {
@@ -125860,9 +126294,9 @@ async function runServeBody(options, captureRefs) {
   await bootstrapPhase("pid_sweep_orphans", () => pidTracker.sweepOrphans(logAdapter));
   await bootstrapPhase(
     "legacy_epoch_prune",
-    () => pruneOldEpochData(join86(dataDir, "loro"), LEGACY_EPOCH, logAdapter)
+    () => pruneOldEpochData(join87(dataDir, "loro"), LEGACY_EPOCH, logAdapter)
   );
-  const storage = new FileStorageAdapter(join86(dataDir, "loro"));
+  const storage = new FileStorageAdapter(join87(dataDir, "loro"));
   const personalWebrtcAdapter = new WebRtcDataChannelAdapter();
   const peerRoleRegistry = createPeerRoleRegistry();
   const presencePoolRef = { pool: {} };
@@ -125970,14 +126404,14 @@ async function runServeBody(options, captureRefs) {
     current: []
   };
   const terminalPtys = /* @__PURE__ */ new Map();
-  const terminalLogsDir = join86(shipyardHome, "data", "terminals");
+  const terminalLogsDir = join87(shipyardHome, "data", "terminals");
   await mkdir44(terminalLogsDir, { recursive: true, mode: 448 });
   const publishedArtifactStore = createPublishedArtifactStore({
-    rootDir: join86(dataDir, "published"),
+    rootDir: join87(dataDir, "published"),
     log: logAdapter
   });
   const previewStateStore = createPreviewStateStore({
-    rootDir: join86(dataDir, "preview-state"),
+    rootDir: join87(dataDir, "preview-state"),
     logger: log
   });
   let codexSkillsApplyScopedPatchRef = null;
@@ -126056,7 +126490,7 @@ async function runServeBody(options, captureRefs) {
   daemon.healthMetrics.start();
   publishedArtifactStore.setSendControlMessage((msg) => daemon.taskManager.broadcastControl(msg));
   previewStateStore.setSendControlMessage((msg) => daemon.taskManager.broadcastControl(msg));
-  const pluginsDir = join86(shipyardHome, "plugins");
+  const pluginsDir = join87(shipyardHome, "plugins");
   await mkdir44(pluginsDir, { recursive: true });
   let loadedPlugins = [];
   const loadedPluginsRef = {
@@ -126458,7 +126892,9 @@ async function runServeBody(options, captureRefs) {
     }, delay2);
     capabilityBackstopTimer.unref();
   };
-  scheduleCapabilityBackstop();
+  void daemon.capabilityDetectionReady.then(() => {
+    if (!disposed) scheduleCapabilityBackstop();
+  });
   lifecycle.onShutdown(async () => {
     disposed = true;
     if (capabilityBackstopTimer) clearTimeout(capabilityBackstopTimer);
@@ -126581,4 +127017,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-D5GKV2RU.js.map
+//# sourceMappingURL=serve-P3U2C5YH.js.map