@schoolai/shipyard 3.10.0 → 3.11.0-rc.20260610.0

package/dist/{serve-HVLR5UQ7.js → serve-MSZSF5JT.js}

@@ -12,7 +12,7 @@ import {
   guardedSubscribe,
   makeInitialAttemptState,
   shutdownFileWatcherGuard
-} from "./chunk-AEUTFH76.js";
+} from "./chunk-L7ELOV3S.js";
 import {
   TRAILER_SCHEMA_VERSION,
   appendTrailerToMessage,
@@ -28,7 +28,7 @@ import {
 } from "./chunk-3WEEGJJN.js";
 import {
   getDaemonVersion
-} from "./chunk-4THTCNVI.js";
+} from "./chunk-ZRJTZLRF.js";
 import {
   getRecentWasmPanicMessages
 } from "./chunk-7H34LI75.js";
@@ -146,7 +146,7 @@ import {
   translateWarningNotification,
   unresolveReviewThread,
   writeCursorApiKeyToVault
-} from "./chunk-EI4HMJ54.js";
+} from "./chunk-C6QOTETH.js";
 import {
   buildNodeSpawnEnv,
   nodeSpawnEnvOverlay,
@@ -399,7 +399,7 @@ import {
   unsafeAssertSourceId,
   vizFileExtension,
   withPreferredRuntimeAuthMethod
-} from "./chunk-VKCGK333.js";
+} from "./chunk-YXPPZQBJ.js";
 import {
   AuthGitHubCallbackRequestSchema,
   AuthGitHubCallbackResponseSchema,
@@ -444,7 +444,7 @@ import {
   VaultKeyPutRequestSchema,
   VaultKeyPutResponseSchema,
   classifyClaudeCodeCompatibility
-} from "./chunk-4PBXNWJV.js";
+} from "./chunk-RMLQ5DRP.js";
 import {
   external_exports as external_exports2
 } from "./chunk-EHQITHQX.js";
@@ -472,7 +472,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
@@ -12998,6 +12998,7 @@ async function writePeerIdAtomic(target, peerId) {
 import { readFile as readFile6, writeFile as writeFile7 } from "fs/promises";
 import { join as join12 } from "path";
 var PID_FILE = "children.pid";
+var GRACE_TERM_TO_KILL_MS = 2e3;
 function buildPidTracker(shipyardHome) {
   const filePath = join12(shipyardHome, PID_FILE);
   let queue = Promise.resolve();
@@ -13043,14 +13044,10 @@ function buildPidTracker(shipyardHome) {
       return enqueue(async () => {
         const pids = await readPids();
         if (pids.length === 0) return 0;
-        let killed = 0;
-        for (const pid of pids) {
-          try {
-            process.kill(pid, "SIGTERM");
-            killed++;
-            log({ event: "orphan_killed", pid });
-          } catch {
-          }
+        const killed = sendSigtermToEach(pids, log);
+        if (killed > 0) {
+          await new Promise((resolve10) => setTimeout(resolve10, GRACE_TERM_TO_KILL_MS));
+          escalateSigkillToSurvivors(pids, log);
         }
         await writePids([]);
         log({ event: "orphan_sweep_complete", found: pids.length, killed });
@@ -13059,6 +13056,28 @@ function buildPidTracker(shipyardHome) {
     }
   };
 }
+function sendSigtermToEach(pids, log) {
+  let killed = 0;
+  for (const pid of pids) {
+    try {
+      process.kill(pid, "SIGTERM");
+      killed++;
+      log({ event: "orphan_killed", pid, signal: "SIGTERM" });
+    } catch {
+    }
+  }
+  return killed;
+}
+function escalateSigkillToSurvivors(pids, log) {
+  for (const pid of pids) {
+    try {
+      process.kill(pid, 0);
+      process.kill(pid, "SIGKILL");
+      log({ event: "orphan_killed", pid, signal: "SIGKILL" });
+    } catch {
+    }
+  }
+}
 
 // src/services/bootstrap/repo-reload.ts
 function buildGetDocDiagnostics(repoRef) {
@@ -13115,7 +13134,7 @@ function nanoid(size2 = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.10.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.11.0" : "unknown";
 function createDaemonSignaling(config) {
   const agentId = config.agentId ?? nanoid();
   function send(msg) {
@@ -14288,7 +14307,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) {
@@ -25647,7 +25666,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) {
@@ -26940,6 +26959,7 @@ async function healGlobalDefault(settingsStore, workspaceRoot, detectedCount, lo
 
 // src/services/session/anthropic-adapter.ts
 import { spawn as spawn9 } from "child_process";
+import { join as join27 } from "path";
 
 // src/shared/strip-ansi.ts
 function stripAnsi(text) {
@@ -26981,6 +27001,7 @@ var PREFIX_FALLBACK_CONTEXT_WINDOWS = [
   { prefix: "claude-opus-4-8", contextWindow: 1e6 },
   { prefix: "claude-opus-4-7", contextWindow: 1e6 },
   { prefix: "claude-opus-4-6", contextWindow: 1e6 },
+  { prefix: "claude-fable-5", contextWindow: 1e6 },
   { prefix: "claude-opus-4", contextWindow: 2e5 },
   { prefix: "claude-sonnet-4", contextWindow: 2e5 },
   { prefix: "claude-haiku-4", contextWindow: 2e5 },
@@ -27055,7 +27076,12 @@ function prefsToFraction(prefs, maxTokens) {
   if (maxTokens <= 0) return void 0;
   return prefs.thresholdTokens / maxTokens;
 }
-var ONE_M_SPAWN_PREFIXES = ["claude-opus-4-8", "claude-opus-4-7", "claude-opus-4-6"];
+var ONE_M_SPAWN_PREFIXES = [
+  "claude-opus-4-8",
+  "claude-opus-4-7",
+  "claude-opus-4-6",
+  "claude-fable-5"
+];
 function resolveSpawnModel(model) {
   if (!model) return model;
   if (model.includes("[1m]")) return model;
@@ -27278,6 +27304,12 @@ function hasActiveCollaborators(participants) {
 function shouldClearPersistence(status) {
   return status === "completed" || status === "canceled";
 }
+function isRefusalStopReason(stopReason) {
+  return stopReason === "refusal";
+}
+function refusalBannerMessage() {
+  return "The model declined this request (safety classifier).";
+}
 function classifyRoiTransition(nextStatus, roiEverRan) {
   if (nextStatus === "completed" || nextStatus === "canceled") return "emit-ended";
   if (nextStatus === "input_required" && roiEverRan) return "emit-ended";
@@ -27572,6 +27604,11 @@ function hasErrorCode(err3, code) {
   const record = err3;
   return record.code === code;
 }
+function errnoCode(err3) {
+  if (typeof err3 !== "object" || err3 === null || !("code" in err3)) return void 0;
+  const record = err3;
+  return typeof record.code === "string" ? record.code : void 0;
+}
 function isCliFlagEffort(effort) {
   switch (effort) {
     case "low":
@@ -27651,6 +27688,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
@@ -27709,6 +27753,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");
@@ -27867,7 +27923,24 @@ var AnthropicAgentSubprocess = class _AnthropicAgentSubprocess {
           ...process.env,
           ...options.env,
           DISABLE_AUTO_COMPACT: "1",
-          CLAUDE_CODE_ENTRYPOINT: "shipyard"
+          CLAUDE_CODE_ENTRYPOINT: "shipyard",
+          /**
+           * Isolate every `codex` binary the agent invokes (via Bash/shell
+           * tool) from the user's real `~/.codex/auth.json`. The primary
+           * codex engine (daemon-internal, spawned by `codex-facade.ts`'s
+           * `getOrCreateCodexEngine`) reads `~/.codex` directly through its
+           * own `resolveSpawnConfig` path and is NOT affected by this env.
+           *
+           * Value is keyed off `SHIPYARD_HOME` so in E2E tests it resolves
+           * to the per-test isolated home (`${shipyardHome}/codex-isolated`),
+           * and in the primary daemon it resolves to
+           * `~/.shipyard/codex-isolated` — distinct from `~/.codex`.
+           *
+           * Must come AFTER the spread of `options.env` and `process.env`
+           * so it always wins, preventing an ambient `CODEX_HOME` from the
+           * developer's shell from leaking through to the agent subprocess.
+           */
+          CODEX_HOME: join27(getShipyardHome(), "codex-isolated")
         },
         disallowedTools: options.disallowedTools,
         skills: options.skills,
@@ -27944,9 +28017,17 @@ var AnthropicAgentSubprocess = class _AnthropicAgentSubprocess {
   forceKill() {
     this.#forceKilled = true;
     if (this.#pidRef.current != null) {
+      const pid = this.#pidRef.current;
       try {
-        process.kill(this.#pidRef.current, "SIGKILL");
-      } catch {
+        process.kill(-pid, "SIGKILL");
+      } catch (err3) {
+        const code = errnoCode(err3);
+        if (code === "EPERM" || code === "EINVAL") {
+          try {
+            process.kill(pid, "SIGKILL");
+          } catch {
+          }
+        }
       }
       this.#pidRef.current = null;
     }
@@ -28261,7 +28342,15 @@ function createChildSpawner(stderrCallback, pidRef, onChildSpawned, onChildExite
       stdio: ["pipe", "pipe", stderrCallback ? "pipe" : "ignore"],
       signal: spawnOpts.signal,
       env: { ...spawnOpts.env, CLAUDECODE: void 0, NODE_OPTIONS: nodeOptions },
-      windowsHide: true
+      windowsHide: true,
+      /**
+       * detached: true makes the child the leader of its own process group.
+       * Combined with the process-group kill in forceKill() (`kill(-pid)`)
+       * this ensures the agent's subprocesses (bash, gh, git, npx) are
+       * reaped when we abort — they would otherwise be orphaned to launchd.
+       * POSIX only (macOS + Linux); Windows is not shipped.
+       */
+      detached: true
     });
     if (!child.stdin || !child.stdout) {
       throw new Error("Failed to create stdio pipes for Claude subprocess");
@@ -28337,7 +28426,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(),
@@ -28371,7 +28460,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 = [];
@@ -28637,7 +28726,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");
@@ -28874,7 +28963,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,
@@ -29116,6 +29205,9 @@ function buildRejectionStubSubprocess(input) {
     stopBackgroundTask: noop3,
     setHarnessTaskId() {
     },
+    get harnessEpoch() {
+      return null;
+    },
     setOnCwdChanged() {
     },
     async rollback(_numTurns) {
@@ -29660,12 +29752,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) {
@@ -30554,7 +30646,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
@@ -30841,7 +30933,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");
   }
@@ -31649,12 +31741,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";
@@ -31666,10 +31758,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;
@@ -31764,7 +31856,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);
@@ -32031,7 +32123,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(() => {
@@ -32043,7 +32135,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;
@@ -32136,7 +32228,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 });
@@ -32156,7 +32248,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 = "";
   }
@@ -32437,7 +32529,7 @@ async function isGitBinaryMissing() {
 }
 async function isGitWorkingTree(cwd) {
   try {
-    await stat11(join32(cwd, ".git"));
+    await stat11(join33(cwd, ".git"));
     return true;
   } catch {
     return false;
@@ -33401,7 +33493,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;
@@ -33452,9 +33544,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 });
@@ -33463,7 +33555,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 });
@@ -35290,7 +35382,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,
@@ -35714,7 +35806,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",
@@ -35754,7 +35846,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({
@@ -37979,7 +38071,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;
@@ -37988,7 +38080,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);
@@ -38255,7 +38347,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";
 
@@ -38390,7 +38482,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);
@@ -38405,7 +38497,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");
@@ -38442,7 +38534,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 {
@@ -38457,7 +38549,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) {
@@ -38615,7 +38707,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);
   }
@@ -38640,7 +38732,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;
@@ -38823,7 +38915,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 {
@@ -38947,7 +39039,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";
 }
@@ -38957,7 +39049,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;
@@ -38997,7 +39089,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);
@@ -39006,7 +39098,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);
     }
   }
@@ -39032,7 +39124,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(
@@ -41373,7 +41465,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";
@@ -41654,7 +41746,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;
@@ -42264,7 +42356,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) {
@@ -42305,12 +42397,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));
 }
@@ -42545,7 +42637,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())
@@ -42570,8 +42662,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 {
@@ -42613,7 +42705,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,
@@ -42659,7 +42751,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`;
@@ -42758,11 +42850,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(),
@@ -42786,9 +42878,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 });
@@ -42881,7 +42973,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(() => {
         });
       }
     }
@@ -43200,7 +43292,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;
@@ -43316,7 +43408,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({
@@ -43329,7 +43421,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");
@@ -43416,11 +43508,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({
@@ -43428,7 +43520,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;
@@ -43551,7 +43643,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: [],
@@ -43675,7 +43767,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");
@@ -43688,7 +43780,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);
       }
@@ -43702,7 +43794,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)) {
@@ -43718,7 +43810,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");
@@ -43727,7 +43819,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":
@@ -45028,7 +45120,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",
@@ -45097,7 +45189,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}`);
@@ -45142,10 +45234,30 @@ function createFileResourceResolver(deps) {
 // src/services/harness/harness-server.ts
 import { createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
 
+// src/services/session/subprocess-epoch-registry.ts
+var subprocessEpochs = /* @__PURE__ */ new Map();
+function registerSubprocessEpoch(taskId, registry = subprocessEpochs) {
+  const epoch = crypto.randomUUID();
+  registry.set(taskId, epoch);
+  return epoch;
+}
+function setSubprocessEpoch(taskId, epoch, registry = subprocessEpochs) {
+  registry.set(taskId, epoch);
+}
+function currentSubprocessEpoch(taskId, registry = subprocessEpochs) {
+  return registry.get(taskId);
+}
+function isLiveSubprocessEpoch(taskId, epoch, registry = subprocessEpochs) {
+  return registry.get(taskId) === epoch;
+}
+function unregisterSubprocessEpoch(taskId, registry = subprocessEpochs) {
+  registry.delete(taskId);
+}
+
 // 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.",
   "",
@@ -45205,7 +45317,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) {
@@ -45229,8 +45341,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);
@@ -45656,7 +45768,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
@@ -46274,14 +46386,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"
           );
@@ -56329,6 +56441,7 @@ var LSP_TOOL_NAMES = [
 ];
 function buildHarnessTools(ctx) {
   const taskIdRef = { current: ctx.taskId };
+  const epochRef = { current: null };
   const deliverableCtx = {
     deliverableStore: ctx.deliverableStore,
     taskId: taskIdRef,
@@ -56407,21 +56520,59 @@ function buildHarnessTools(ctx) {
     const tool = builtByName.get(spec.name);
     if (tool) tools.push(tool);
   }
+  function wrapWithEpochGate(tool) {
+    const originalHandler = tool.handler;
+    return {
+      ...tool,
+      // biome-ignore lint/suspicious/noExplicitAny: args is typed per-tool by the generic; widening to any here matches the per-request HTTP path which also widened at the binding seam.
+      handler: async (args, extra) => {
+        const epoch = epochRef.current;
+        if (epoch === null) {
+          return originalHandler(args, extra);
+        }
+        if (!isLiveSubprocessEpoch(taskIdRef.current, epoch)) {
+          ctx.log({
+            event: "subprocess_epoch_mismatch",
+            taskId: taskIdRef.current,
+            bound: epoch,
+            current: currentSubprocessEpoch(taskIdRef.current),
+            runtime: "in-process",
+            kind: "task",
+            tool: tool.name
+          });
+          return {
+            content: [
+              {
+                type: "text",
+                text: "subprocess epoch mismatch: this runtime has been superseded"
+              }
+            ],
+            isError: true
+          };
+        }
+        return originalHandler(args, extra);
+      }
+    };
+  }
+  const wrappedTools = tools.map(wrapWithEpochGate);
   return {
-    tools,
+    tools: wrappedTools,
     setTaskId: (taskId) => {
       taskIdRef.current = taskId;
+    },
+    setEpoch: (epoch) => {
+      epochRef.current = epoch;
     }
   };
 }
 function createHarnessMcpServer(ctx) {
-  const { tools, setTaskId } = buildHarnessTools(ctx);
+  const { tools, setTaskId, setEpoch } = buildHarnessTools(ctx);
   const server = createSdkMcpServer({
     name: HARNESS_SERVER_NAME,
     version: "1.0.0",
     tools
   });
-  return { server, setTaskId };
+  return { server, setTaskId, setEpoch };
 }
 
 // src/services/harness/lsp-agent-client.ts
@@ -56433,7 +56584,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";
@@ -56523,11 +56674,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;
@@ -56542,11 +56693,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;
@@ -56579,8 +56730,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}`);
   }
@@ -56593,7 +56744,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);
@@ -59456,7 +59607,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({
@@ -59517,10 +59668,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);
@@ -61717,7 +61868,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;
@@ -61827,7 +61978,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({
@@ -61861,7 +62012,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({
@@ -62920,7 +63071,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;
@@ -63606,7 +63757,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;
   }
   /**
@@ -84019,6 +84170,14 @@ var PreWarmManager = class {
   #subprocess = null;
   #cwd = null;
   #generation = 0;
+  /**
+   * 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;
   /** Per-spawn event slot — each spawn gets its own, never shared. */
   #eventSlot = null;
@@ -84238,6 +84397,13 @@ var PreWarmManager = class {
     this.#subprocess = null;
     this.#eventSlot = null;
     this.#canUseToolSlot = null;
+    if (this.#epoch === null) {
+      throw new Error(
+        `PreWarmManager.claim() invariant violated: warm subprocess has no harness epoch (status=${this.#status}, cwd=${cwd})`
+      );
+    }
+    const epoch = this.#epoch;
+    this.#epoch = null;
     this.#deps.log({ event: "prewarm_claimed", cwd });
     return {
       subprocess,
@@ -84246,7 +84412,8 @@ var PreWarmManager = class {
       },
       redirectCanUseTool: (handler) => {
         canUseToolSlot.current = handler;
-      }
+      },
+      epoch
     };
   }
   kill() {
@@ -84276,6 +84443,7 @@ var PreWarmManager = class {
       return;
     }
     const generation = ++this.#generation;
+    this.#epoch = null;
     this.#cwd = cwd;
     this.#status = "spawning";
     const slot = createEventSlot();
@@ -84313,6 +84481,7 @@ var PreWarmManager = class {
       settings,
       cwd
     );
+    this.#epoch = this.#subprocess.harnessEpoch;
     emitStep("spawn_call", performance.now() - tSpawnCall);
     this.#startWarmTimer(generation);
   }
@@ -84342,6 +84511,7 @@ var PreWarmManager = class {
     }
     this.#status = "idle";
     this.#cwd = null;
+    this.#epoch = null;
   }
   /** ---------------------------------------------------------------- */
   /** Private: own event handler (during pre-warm phase)                */
@@ -91093,6 +91263,16 @@ var CodexAgentSubprocess = class _CodexAgentSubprocess {
       ...opts.spawnArgs.stripEnv !== void 0 ? { stripEnv: opts.spawnArgs.stripEnv } : {}
     };
     const initializeResponse = await client.connect(connectArgs);
+    const tracker = opts.pidTracker;
+    if (tracker !== void 0) {
+      const pid = client.transport.pid;
+      if (pid !== void 0) {
+        void tracker.add(pid);
+        client.transport.once("close", () => {
+          void tracker.remove(pid);
+        });
+      }
+    }
     const compat = classifyCodexAppServerCompatibility(initializeResponse.userAgent);
     opts.log({
       event: "codex_app_server_version",
@@ -91769,6 +91949,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;
   }
@@ -92286,6 +92470,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) {
@@ -92364,6 +92552,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),
@@ -92496,6 +92688,7 @@ import { randomUUID as randomUUID15 } from "crypto";
 import { createServer as createServer4 } from "http";
 import { McpServer as McpServer2 } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StreamableHTTPServerTransport as StreamableHTTPServerTransport2 } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+var SHIPYARD_GENERATION_HEADER = "x-shipyard-generation";
 async function createHarnessHttpServer(opts = {}) {
   const log = opts.log ?? (() => {
   });
@@ -92576,6 +92769,29 @@ async function createHarnessHttpServer(opts = {}) {
       await rejectAuth(req, res, 401, JSON_RPC_ERROR_UNAUTHORIZED, "unauthorized");
       return null;
     }
+    const headerEpochRunner = req.headers[SHIPYARD_GENERATION_HEADER];
+    if (typeof headerEpochRunner === "string" && headerEpochRunner.length > 0) {
+      if (!isLiveSubprocessEpoch(runnerEntry.currentTaskId, headerEpochRunner)) {
+        log({
+          event: "subprocess_epoch_mismatch",
+          taskId: runnerEntry.currentTaskId,
+          /*
+           * `bound` = the epoch the subprocess was given at spawn time
+           *           (here it arrived via the `x-shipyard-generation` header).
+           * `current` = the live value the registry holds (the most recent
+           *             spawn's epoch). Same fields on the in-process path
+           *             (harness-server.ts) so log triage can query both
+           *             transports with one schema.
+           */
+          bound: headerEpochRunner,
+          current: currentSubprocessEpoch(runnerEntry.currentTaskId),
+          runtime: "http",
+          kind: "runner"
+        });
+        await respondError(req, res, 410, JSON_RPC_ERROR_GONE, "task_epoch_stale");
+        return null;
+      }
+    }
     return { entry: runnerEntry, scope: { kind: "runner", runnerId } };
   }
   async function resolveTaskEntry(token, req, res) {
@@ -92598,6 +92814,22 @@ async function createHarnessHttpServer(opts = {}) {
       await rejectAuth(req, res, 401, JSON_RPC_ERROR_UNAUTHORIZED, "unauthorized");
       return null;
     }
+    const headerEpoch = req.headers[SHIPYARD_GENERATION_HEADER];
+    if (typeof headerEpoch === "string" && headerEpoch.length > 0) {
+      if (!isLiveSubprocessEpoch(tokenTaskId, headerEpoch)) {
+        log({
+          event: "subprocess_epoch_mismatch",
+          taskId: tokenTaskId,
+          /** See `kind: 'runner'` block above for the bound vs current field semantics. */
+          bound: headerEpoch,
+          current: currentSubprocessEpoch(tokenTaskId),
+          runtime: "http",
+          kind: "task"
+        });
+        await respondError(req, res, 410, JSON_RPC_ERROR_GONE, "task_epoch_stale");
+        return null;
+      }
+    }
     return { entry, scope: { kind: "task", taskId: tokenTaskId } };
   }
   function logRequestEntry(req) {
@@ -92758,6 +92990,7 @@ var JSON_RPC_ERROR_INTERNAL = -32603;
 var JSON_RPC_ERROR_UNAUTHORIZED = -32001;
 var JSON_RPC_ERROR_FORBIDDEN = -32002;
 var JSON_RPC_ERROR_NOT_FOUND = -32004;
+var JSON_RPC_ERROR_GONE = -32005;
 async function respondError(req, res, status, code, message) {
   sendJsonRpcHttpError(res, status, code, message, await readRequestId(req));
 }
@@ -92855,6 +93088,16 @@ function compactionPrefsChanged(a, b2) {
 }
 
 // src/services/serve-factory/codex-facade.ts
+async function bailoutIfOuterClosed(state, input) {
+  if (!state.outerClosed) return false;
+  await input.harnessHttp.unregisterTask(input.args.taskId).catch(() => {
+  });
+  return true;
+}
+function pickPidTrackerForFacade(useSharedEngine, daemonPidTracker) {
+  if (useSharedEngine) return void 0;
+  return daemonPidTracker;
+}
 function createCodexFacadeSubsystem(d) {
   const { deps, taskManager, taskStateStore, store, userSettingsStore, proxyRef } = d;
   const harnessHttpServer = d.harnessHttpServer;
@@ -92880,6 +93123,7 @@ function createCodexFacadeSubsystem(d) {
       reasonKind: args.reason.kind,
       resumeSessionId: args.reason.kind === "resume" ? args.reason.sessionId : null
     });
+    registerSubprocessEpoch(args.taskId);
     return buildCodexOuterFacade({ args, harnessHttp: localHarnessHttp });
   }
   function buildCodexOuterFacade(input) {
@@ -93007,11 +93251,7 @@ function createCodexFacadeSubsystem(d) {
         agentSystem: AGENT_SYSTEM_CODEX
       })
     );
-    if (state.outerClosed) {
-      await input.harnessHttp.unregisterTask(input.args.taskId).catch(() => {
-      });
-      return;
-    }
+    if (await bailoutIfOuterClosed(state, input)) return;
     await verifyCodexHarnessRegistration({
       taskId: input.args.taskId,
       harnessUrl: `http://127.0.0.1:${input.harnessHttp.port}/mcp`,
@@ -93019,11 +93259,7 @@ function createCodexFacadeSubsystem(d) {
       unregisterTask: (taskId) => input.harnessHttp.unregisterTask(taskId),
       log: deps.log
     });
-    if (state.outerClosed) {
-      await input.harnessHttp.unregisterTask(input.args.taskId).catch(() => {
-      });
-      return;
-    }
+    if (await bailoutIfOuterClosed(state, input)) return;
     const stashRequestedPaths = (taskId, itemId, raw) => {
       const grant = codexProfile.sandboxExtensionFlow?.parseRequestedPaths(raw) ?? null;
       if (grant !== null) {
@@ -93250,6 +93486,7 @@ function createCodexFacadeSubsystem(d) {
     });
     const codexPendingNeutral = taskManager.getOrchestrator(input.args.taskId)?.consumePendingNeutralHandoff("codex") ?? void 0;
     const useSharedEngine = validateEnv().SHIPYARD_CODEX_SHARED_ENGINE;
+    const pidTrackerForFacade = pickPidTrackerForFacade(useSharedEngine, deps.pidTracker);
     const facade = createCodexSubprocessFacade(
       {
         spawnArgs,
@@ -93354,7 +93591,8 @@ function createCodexFacadeSubsystem(d) {
           workspaceMcpServers: input.args.workspaceMcpServers,
           workspaceMcpProxyBridges
         }),
-        ...deps.onCodexCapabilitiesDiscovered !== void 0 ? { onCodexCapabilitiesDiscovered: deps.onCodexCapabilitiesDiscovered } : {}
+        ...deps.onCodexCapabilitiesDiscovered !== void 0 ? { onCodexCapabilitiesDiscovered: deps.onCodexCapabilitiesDiscovered } : {},
+        pidTracker: pidTrackerForFacade
       },
       deps.log
     );
@@ -93432,12 +93670,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) {
@@ -93648,7 +93886,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;
@@ -93916,7 +94154,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");
 }
@@ -93930,7 +94168,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,
@@ -94081,7 +94319,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);
@@ -95837,6 +96075,11 @@ var CursorAgentSubprocess = class {
    * unhealthy way (kill, do not pool). Null when no pooled close is in flight.
    */
   #pooledIdleState = null;
+  /**
+   * Optional PID tracker — registers the forked runner PID on spawn and
+   * removes it on exit so sweepOrphans can reap it if the daemon crashes.
+   */
+  #pidTracker;
   constructor(opts) {
     this.#harnessTaskId = opts.taskId;
     this.#cwd = opts.cwd;
@@ -95855,6 +96098,7 @@ var CursorAgentSubprocess = class {
     this.#harnessRunnerId = opts.adoptChild?.runnerId ?? opts.harnessRunnerId ?? "";
     this.#onReleaseToPool = opts.onReleaseToPool ?? null;
     this.#onRunnerExited = opts.onRunnerExited;
+    this.#pidTracker = opts.pidTracker ?? null;
     this.#translatorCtx = createCursorTranslatorCtx(0);
     this.#translatorCtx.collaborationMode = this.#collaborationMode;
     this.#maybeLogFastModeApplied();
@@ -96285,6 +96529,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) {
@@ -96341,6 +96589,13 @@ var CursorAgentSubprocess = class {
       env: buildNodeSpawnEnv(process.env)
     });
     this.#child = child;
+    const tracker = this.#pidTracker;
+    if (child.pid !== void 0 && tracker !== null) {
+      void tracker.add(child.pid);
+      child.once("exit", () => {
+        if (child.pid !== void 0) void tracker.remove(child.pid);
+      });
+    }
     attachCursorRunnerStdoutCapture(child, this.#harnessRunnerId);
     attachCursorRunnerStderrCapture(child, this.#harnessRunnerId);
     this.#attachChildListeners(child);
@@ -97545,7 +97800,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 {
@@ -97587,7 +97842,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(() => "");
@@ -97600,7 +97855,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",
@@ -97649,7 +97904,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(),
@@ -97676,7 +97931,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();
@@ -97689,7 +97944,7 @@ function buildAnnotationStore(dataDir) {
     }
   }
   function filePath(taskId) {
-    return join61(baseDir, `${taskId}.json`);
+    return join62(baseDir, `${taskId}.json`);
   }
   function emptyData() {
     return {
@@ -97754,9 +98009,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;
@@ -97959,7 +98214,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);
@@ -97985,10 +98240,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));
@@ -98012,8 +98267,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));
@@ -98238,7 +98493,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(),
@@ -98252,7 +98507,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();
@@ -98265,7 +98520,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: [] };
@@ -98405,7 +98660,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 {
@@ -98415,12 +98670,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 });
@@ -99192,7 +99447,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,
@@ -99231,7 +99486,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 };
@@ -99484,7 +99739,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";
@@ -99675,7 +99930,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) {
@@ -99714,7 +99969,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(),
@@ -99771,9 +100026,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 });
@@ -99831,7 +100086,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(
@@ -99845,12 +100100,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) {
@@ -102735,7 +102990,7 @@ function handleRunning(snapshot, event) {
       effects: b2.effects
     };
   }
-  if (event.type === "sdk_error" || event.type === "subprocess_died") {
+  if (event.type === "subprocess_died") {
     b2.log("running", "resumable_idle", event.type);
     b2.effects.push({ type: "clear_pending_inputs" });
     b2.effects.push({ type: "clear_queue" });
@@ -102749,10 +103004,26 @@ function handleRunning(snapshot, event) {
       effects: b2.effects
     };
   }
+  if (event.type === "sdk_error") {
+    b2.log("running", "resumable_idle", event.type);
+    b2.effects.push({ type: "clear_pending_inputs" });
+    b2.effects.push({ type: "clear_queue" });
+    b2.taskStatus("input_required");
+    emitSessionDeath(b2, event, "running");
+    b2.effects.push({ type: "force_kill" });
+    return {
+      state: "resumable_idle",
+      sessionId,
+      rewindAtMessageId: null,
+      awaitingSetup: false,
+      effects: b2.effects
+    };
+  }
   if (event.type === "abort_retry") {
     b2.log("running", "resumable_idle", event.type);
     b2.effects.push({ type: "clear_pending_inputs" });
     b2.effects.push({ type: "clear_queue" });
+    b2.effects.push({ type: "force_kill" });
     return {
       state: "resumable_idle",
       sessionId,
@@ -104354,6 +104625,7 @@ var Thread = class {
     config.adoptedSubprocess.redirectEvents(
       (event) => this.#enqueueSubprocessEvent(event, generation)
     );
+    setSubprocessEpoch(this.#config.threadId, config.adoptedSubprocess.epoch);
     if (config.onCwdChanged) {
       this.#subprocess.setOnCwdChanged(config.onCwdChanged);
     }
@@ -105019,11 +105291,13 @@ var Thread = class {
     this.#subprocess?.close();
     this.#subprocess = null;
     this.#appliedToSubprocess = {};
+    unregisterSubprocessEpoch(this.#config.threadId);
   }
   #handleForceKill() {
     this.#subprocess?.forceKill();
     this.#subprocess = null;
     this.#appliedToSubprocess = {};
+    unregisterSubprocessEpoch(this.#config.threadId);
   }
   /**
    * Persist a FINAL SDK error to the chat JSONL as an inline assistant
@@ -105366,7 +105640,7 @@ 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) {
@@ -105993,8 +106267,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) {
@@ -106443,7 +106717,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({
@@ -106475,7 +106749,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");
@@ -106855,12 +107129,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;
@@ -109201,7 +109475,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)
 });
@@ -109577,7 +109851,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;
@@ -110579,6 +110853,14 @@ function handleTurnComplete(ctx, event) {
   ctx.telemetryCaptureTurnComplete(event.result);
   ctx.telemetryResetTurn();
   ctx.enqueueCheckpoint();
+  if (isRefusalStopReason(event.result.stopReason)) {
+    ctx.broadcast({
+      type: "task_error",
+      taskId: ctx.taskId,
+      error: refusalBannerMessage(),
+      errorKind: "sdk_error"
+    });
+  }
 }
 function handleSdkError(ctx, event) {
   ctx.collabQueueTurnComplete();
@@ -112404,7 +112686,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;
@@ -112420,7 +112702,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 = {
@@ -112456,7 +112738,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);
@@ -112523,7 +112805,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;
       }
@@ -112639,7 +112921,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);
 }
@@ -112655,7 +112937,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;
@@ -112671,7 +112953,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);
     }
@@ -113273,10 +113555,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",
@@ -113991,7 +114273,7 @@ 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 { join as join76 } from "path";
 import { promisify as promisify10 } from "util";
 var execFileAsync4 = promisify10(execFile11);
 function resolveDaemonNodeModules(log) {
@@ -114004,7 +114286,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);
@@ -114014,7 +114296,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 {
@@ -114211,7 +114493,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] = {
@@ -114237,7 +114519,7 @@ 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 };
@@ -115338,6 +115620,7 @@ var Task = class {
    * compaction occurred on those.
    */
   applyCrossRuntimeSwitch(newRuntimeId, pendingHandoff, mode) {
+    this.#deps.onCrossRuntimeSwitch?.(this.#deps.taskId, this.#runtimeId, newRuntimeId);
     applyCrossRuntimeSwitch(this.#crossRuntimeCtx(), newRuntimeId, pendingHandoff, mode);
   }
   /**
@@ -119390,6 +119673,9 @@ var TaskManager = class {
       resolveMcpServers: this.#deps.resolveMcpServers,
       notifyTaskMetadataChange: this.#deps.notifyTaskMetadataChange,
       notifyPlanResourceChange: this.#deps.notifyPlanResourceChange,
+      ...this.#deps.onCrossRuntimeSwitch && {
+        onCrossRuntimeSwitch: this.#deps.onCrossRuntimeSwitch
+      },
       onSubprocessReady: (tid) => {
         const task = this.#tasks.get(tid);
         if (!task) return;
@@ -119502,11 +119788,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_.-]*$/;
@@ -119526,7 +119812,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) {
@@ -119541,7 +119827,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) {
@@ -119550,7 +119836,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() {
@@ -119655,7 +119941,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;
@@ -119956,8 +120242,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) {
@@ -121041,7 +121327,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);
@@ -121050,10 +121336,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;
@@ -121254,6 +121540,7 @@ async function createDaemon(deps) {
       });
       return null;
     }
+    registerSubprocessEpoch(args.taskId);
     deps.log({
       event: "cursor_spawn_dispatch",
       taskId: args.taskId,
@@ -121443,7 +121730,8 @@ async function createDaemon(deps) {
         content,
         capabilitiesRef.current?.skills ?? [],
         deps.log
-      )
+      ),
+      ...deps.pidTracker !== void 0 && { pidTracker: deps.pidTracker }
     });
     void initAsync.then(async (resolved) => {
       try {
@@ -121497,7 +121785,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,
@@ -121577,7 +121865,11 @@ async function createDaemon(deps) {
     }
   }
   function spawnClaudeTaskSubprocess(args) {
-    const { server: harnessServer, setTaskId: setHarnessTaskId } = createHarnessMcpServer({
+    const {
+      server: harnessServer,
+      setTaskId: setHarnessTaskId,
+      setEpoch: setHarnessEpoch
+    } = createHarnessMcpServer({
       annotationStore,
       deliverableStore,
       dataDir: deps.dataDir,
@@ -121586,7 +121878,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,
@@ -121663,6 +121955,8 @@ async function createDaemon(deps) {
     if (pendingNeutral !== null) {
       applyClaudePendingNeutralHandoff(pendingNeutral, options, args.taskId);
     }
+    const epoch = registerSubprocessEpoch(args.taskId);
+    setHarnessEpoch(epoch);
     const subprocess = AnthropicAgentSubprocess.spawn(
       deps.queryFn,
       args.initialContent,
@@ -121671,6 +121965,7 @@ async function createDaemon(deps) {
       deps.log
     );
     subprocess.installHarnessTaskIdSetter(setHarnessTaskId);
+    subprocess.installHarnessEpoch(epoch);
     return subprocess;
   }
   const lastUsageLimitBroadcastByTask = /* @__PURE__ */ new Map();
@@ -122115,7 +122410,28 @@ async function createDaemon(deps) {
     templateStore: templateStoreEarly,
     getDefaultComposerSettings,
     getCompactionPrefs: (runtime) => cachedCompactionByRuntime.get(runtime) ?? null,
-    resolveProfileForModel: (modelId) => profileRegistry.findByModelId(modelId)?.id ?? null
+    resolveProfileForModel: (modelId) => profileRegistry.findByModelId(modelId)?.id ?? null,
+    /**
+     * ST9: Tear down HTTP MCP bearers from the source runtime when a
+     * cross-runtime switch fires. Called before `stopPrimary()` so the
+     * source identity is still unambiguous. Codex uses per-task bearer
+     * (`unregisterTask`); Cursor uses per-runner bearer (`unregisterRunner`
+     * is handled by its own `onRunnerExited` path — Cursor teardown is
+     * runner-scoped, not task-scoped, so `unregisterTask` is a no-op for
+     * Cursor but safe to call). Only fires when `harnessHttpServer` is
+     * active (Codex / Cursor require it).
+     */
+    onCrossRuntimeSwitch: (taskId, sourceRuntimeId, _destRuntimeId) => {
+      if (sourceRuntimeId !== "codex") return;
+      if (!harnessHttpServer) return;
+      void harnessHttpServer.unregisterTask(taskId).catch(() => {
+      });
+      deps.log({
+        event: "cross_runtime_http_bearer_unregistered",
+        taskId,
+        sourceRuntimeId
+      });
+    }
   });
   const vizPreview = createVizPreviewRegistry({
     dataDir: deps.dataDir,
@@ -122577,7 +122893,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
@@ -123180,7 +123496,7 @@ import { existsSync as existsSync12 } from "fs";
 import { execFile as execFile12, spawn as spawn13 } 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) {
@@ -123582,7 +123898,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);
@@ -123612,7 +123928,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);
@@ -123662,16 +123978,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;
@@ -124746,7 +125062,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(),
@@ -124763,7 +125079,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;
@@ -124827,11 +125143,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). */
@@ -124851,7 +125167,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 {
@@ -124882,15 +125198,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) {
@@ -125103,7 +125419,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)
 });
@@ -125112,7 +125428,7 @@ function defaultSkillsMirrorPrefs() {
   return { enabled: true };
 }
 function prefsPath(dataDir) {
-  return join83(dataDir, FILENAME);
+  return join84(dataDir, FILENAME);
 }
 async function loadSkillsMirrorPrefs(dataDir) {
   try {
@@ -125161,7 +125477,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)
@@ -125170,9 +125486,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 });
@@ -125197,12 +125513,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);
@@ -125256,7 +125572,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));
         })
       );
@@ -125502,7 +125818,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 },
@@ -125510,7 +125826,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(
     {
@@ -125603,9 +125919,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: {} };
@@ -125713,14 +126029,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;
@@ -125799,7 +126115,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 = {
@@ -126324,4 +126640,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-HVLR5UQ7.js.map
+//# sourceMappingURL=serve-MSZSF5JT.js.map