@cortexkit/aft-pi 0.63.5 → 0.65.0

package/dist/index.js

@@ -7871,7 +7871,7 @@ var require_src2 = __commonJS(function(exports, module) {
 });
 
 // src/index.ts
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 
 // ../aft-bridge/dist/active-logger.js
 var ACTIVE_LOGGER_SYMBOL = Symbol.for("aft-bridge-active-logger");
@@ -8082,7 +8082,14 @@ var TERMINAL_BASH_STATUSES = new Set(TERMINAL_BG_TASK_STATUSES);
 function isTerminalBashStatus(status, compatibilityAliases = false) {
   return typeof status === "string" && (TERMINAL_BASH_STATUSES.has(status) || compatibilityAliases && (status === "cancelled" || status === "timeout"));
 }
+
 // ../aft-bridge/dist/bash-format.js
+function formatUnknownPtyExit(taskId, data) {
+  if (data.status !== "fate_unknown" || data.status_reason !== "AFT could not read how it ended") {
+    return;
+  }
+  return `Task ${taskId}: exit status unknown (AFT could not read how it ended)`;
+}
 function isTerminalStatus(status) {
   return isTerminalBashStatus(status);
 }
@@ -8114,6 +8121,79 @@ function relativePathEscapesRoot(rel, platform = process.platform) {
   return rel === ".." || rel.startsWith("../") || platform === "win32" && rel.startsWith("..\\") || (platform === "win32" ? win32.isAbsolute(rel) : posix.isAbsolute(rel));
 }
 
+// ../aft-bridge/dist/wait-clock.js
+var SUSPEND_SKEW_MS = 1000;
+var RESUME_ALLOWANCE_MS = 1e4;
+var DEADLINE_POLL_MS = 250;
+
+class WaitClock {
+  wallNow;
+  awakeNow;
+  wall;
+  awake;
+  skew = 0;
+  elapsed;
+  suspendCount = 0;
+  lastSuspendEnd = Number.NEGATIVE_INFINITY;
+  constructor(wallNow = Date.now, awakeNow = () => performance.now()) {
+    this.wallNow = wallNow;
+    this.awakeNow = awakeNow;
+    this.wall = wallNow();
+    this.awake = awakeNow();
+    this.elapsed = this.awake;
+  }
+  now() {
+    const wall = this.wallNow();
+    const awake = this.awakeNow();
+    const active = Math.max(0, awake - this.awake);
+    this.skew = Math.max(0, this.skew + wall - this.wall - active);
+    this.elapsed += active;
+    if (this.skew >= SUSPEND_SKEW_MS) {
+      this.elapsed += this.skew;
+      this.lastSuspendEnd = this.elapsed;
+      this.skew = 0;
+      this.suspendCount++;
+    }
+    this.wall = wall;
+    this.awake = awake;
+    return this.elapsed;
+  }
+}
+
+class RequestDeadline {
+  clock;
+  allowResume;
+  deadline;
+  suspendCount;
+  resumed = false;
+  constructor(clock, timeoutMs, allowResume = true) {
+    this.clock = clock;
+    this.allowResume = allowResume;
+    this.deadline = clock.now() + timeoutMs;
+    this.suspendCount = clock.suspendCount;
+  }
+  remaining() {
+    const now = this.clock.now();
+    if (now >= this.deadline && this.allowResume && !this.resumed && this.clock.suspendCount > this.suspendCount && this.clock.lastSuspendEnd >= this.deadline) {
+      this.resumed = true;
+      this.deadline = now + RESUME_ALLOWANCE_MS;
+    }
+    return Math.max(0, this.deadline - now);
+  }
+}
+function deadlineTimer(scheduler, remaining, expired) {
+  let timer;
+  const check = () => {
+    const left = remaining();
+    if (left <= 0)
+      expired();
+    else
+      timer = scheduler.setTimeout(check, Math.min(left, DEADLINE_POLL_MS));
+  };
+  check();
+  return () => scheduler.clearTimeout(timer);
+}
+
 // ../aft-bridge/dist/bash-hints.js
 var DEFAULT_PRIMARY_WATCH_TIMEOUT_MS = 30000;
 var MAX_WATCH_TIMEOUT_MS = 1800000;
@@ -8141,7 +8221,8 @@ function watchPollDelayMs(elapsedMs) {
   return 1000;
 }
 var watchClock = {
-  now: () => performance.now(),
+  source: new WaitClock,
+  now: () => watchClock.source.now(),
   sleep: abortableSleep
 };
 function abortableSleep(ms, signal) {
@@ -8287,6 +8368,7 @@ var GREP_SEARCH_AFT_SEARCH_HINT = "DO NOT search code by running grep/rg in bash
 var GREP_SEARCH_GREP_HINT = "DO NOT search code by running grep/rg in bash — it is unindexed, unranked, and serial. Use the `grep` tool instead (indexed and ranked).";
 var GREP_SEARCH_HINT_PREFIX = "DO NOT search code by running grep/rg in bash —";
 var GREP_SEARCH_FRESHNESS_WINDOW_MS = 60000;
+var MTIME_CLOCK_SLACK_MS = 1;
 function maybeAppendConflictsHint(output) {
   if (!output.includes("Automatic merge failed; fix conflicts"))
     return output;
@@ -8294,15 +8376,15 @@ function maybeAppendConflictsHint(output) {
     return output;
   return output + CONFLICT_HINT;
 }
-function commandInvokesCodeSearch(command) {
-  const statements = splitTopLevelStatements(command);
+function commandInvokesCodeSearch(command, platform = process.platform) {
+  const statements = splitTopLevelStatements(command, platform);
   if (statements === null)
     return false;
   for (const statement of statements) {
-    const firstStage = firstPipelineStage(statement);
+    const firstStage = firstPipelineStage(statement, platform);
     if (firstStage === null)
       continue;
-    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0));
+    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0), platform);
     if (firstToken === null)
       continue;
     if (firstToken.token === "grep" || firstToken.token === "rg")
@@ -8310,42 +8392,43 @@ function commandInvokesCodeSearch(command) {
   }
   return false;
 }
-function maybeAppendGrepSearchHint(output, command, aftSearchRegistered, projectRoot) {
+function maybeAppendGrepSearchHint(output, command, aftSearchRegistered, projectRoot, platform = process.platform, workdir) {
   if (output === "")
     return output;
-  if (!commandInvokesCodeSearch(command))
+  if (!commandInvokesCodeSearch(command, platform))
     return output;
   if (output.includes(GREP_SEARCH_HINT_PREFIX))
     return output;
-  if (shouldSuppressGrepSearchHint(command, projectRoot))
+  if (shouldSuppressGrepSearchHint(command, projectRoot, platform, workdir))
     return output;
   const hint = aftSearchRegistered ? GREP_SEARCH_AFT_SEARCH_HINT : GREP_SEARCH_GREP_HINT;
   return `${output}
 
 ${hint}`;
 }
-function shouldSuppressGrepSearchHint(command, projectRoot) {
-  const statements = splitTopLevelStatements(command);
+function shouldSuppressGrepSearchHint(command, projectRoot, platform, workdir) {
+  const statements = splitTopLevelStatements(command, platform);
   if (statements === null)
     return false;
-  if (allSearchPathOperandsAreDynamic(statements))
+  if (allSearchPathOperandsAreDynamic(statements, platform))
     return true;
   const root = projectRoot?.trim();
   if (!root)
     return false;
-  const resolvedRoot = path.resolve(root);
-  let effectiveCwd = resolvedRoot;
+  const paths = platform === "win32" ? path.win32 : path.posix;
+  const resolvedRoot = paths.resolve(root);
+  let effectiveCwd = paths.resolve(resolvedRoot, workdir ?? ".");
   let sawCodeSearchStatement = false;
   for (const statement of statements) {
-    const firstStage = firstPipelineStage(statement);
+    const firstStage = firstPipelineStage(statement, platform);
     if (firstStage === null)
       continue;
-    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0));
+    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0), platform);
     if (firstToken === null)
       continue;
     const head = firstToken.token;
     if (head === "cd") {
-      effectiveCwd = nextCwdAfterCd(effectiveCwd, firstStage, firstToken.end);
+      effectiveCwd = nextCwdAfterCd(effectiveCwd, firstStage, firstToken.end, platform);
       continue;
     }
     if (head !== "grep" && head !== "rg")
@@ -8353,20 +8436,23 @@ function shouldSuppressGrepSearchHint(command, projectRoot) {
     sawCodeSearchStatement = true;
     if (effectiveCwd === null)
       continue;
-    if (!isDirInsideProject(resolvedRoot, effectiveCwd))
+    if (!isDirInsideProject(resolvedRoot, effectiveCwd, platform))
       continue;
-    const operands = collectPathOperands(firstStage, firstToken.end);
+    const operands = collectPathOperands(firstStage, firstToken.end, platform);
     if (operands.length === 0)
       return false;
     let sawInProjectOperand = false;
     for (const operand of operands) {
       if (isDynamicPathOperand(operand))
         continue;
-      const resolvedOperand = resolvePathOperand(effectiveCwd, operand);
-      if (!isPathInsideProject(resolvedRoot, effectiveCwd, operand))
+      const resolvedOperand = resolvePathOperand(effectiveCwd, operand, platform);
+      if (!isPathInsideProject(resolvedRoot, effectiveCwd, operand, platform))
+        continue;
+      const suppress = shouldSuppressResolvedPath(resolvedOperand);
+      if (suppress === undefined)
         continue;
       sawInProjectOperand = true;
-      if (shouldSuppressResolvedPath(resolvedOperand))
+      if (suppress)
         return true;
     }
     if (sawInProjectOperand)
@@ -8374,19 +8460,19 @@ function shouldSuppressGrepSearchHint(command, projectRoot) {
   }
   return sawCodeSearchStatement;
 }
-function allSearchPathOperandsAreDynamic(statements) {
+function allSearchPathOperandsAreDynamic(statements, platform) {
   let sawDynamicOnlySearch = false;
   for (const statement of statements) {
-    const firstStage = firstPipelineStage(statement);
+    const firstStage = firstPipelineStage(statement, platform);
     if (firstStage === null)
       continue;
-    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0));
+    const firstToken = readShellToken(firstStage, skipSpaces(firstStage, 0), platform);
     if (firstToken === null)
       continue;
     const head = firstToken.token;
     if (head !== "grep" && head !== "rg")
       continue;
-    const operands = collectPathOperands(firstStage, firstToken.end);
+    const operands = collectPathOperands(firstStage, firstToken.end, platform);
     if (operands.length === 0)
       return false;
     if (operands.some((operand) => !isDynamicPathOperand(operand)))
@@ -8395,11 +8481,12 @@ function allSearchPathOperandsAreDynamic(statements) {
   }
   return sawDynamicOnlySearch;
 }
-function nextCwdAfterCd(currentCwd, firstStage, afterCd) {
+function nextCwdAfterCd(currentCwd, firstStage, afterCd, platform) {
+  const paths = platform === "win32" ? path.win32 : path.posix;
   let index = skipSpaces(firstStage, afterCd);
   let target = null;
   while (index < firstStage.length) {
-    const tokenResult = readShellToken(firstStage, index);
+    const tokenResult = readShellToken(firstStage, index, platform);
     if (tokenResult === null)
       break;
     const { token, end } = tokenResult;
@@ -8414,28 +8501,29 @@ function nextCwdAfterCd(currentCwd, firstStage, afterCd) {
     break;
   }
   if (target === null)
-    return path.resolve(os.homedir());
+    return paths.resolve(os.homedir());
   if (target.includes("$") || target.includes("`"))
     return null;
-  const expanded = expandTilde(target);
-  if (path.isAbsolute(expanded))
-    return path.resolve(expanded);
+  const expanded = expandTilde(target, platform);
+  if (paths.isAbsolute(expanded))
+    return paths.resolve(expanded);
   if (currentCwd === null)
     return null;
-  return path.resolve(currentCwd, expanded);
+  return paths.resolve(currentCwd, expanded);
 }
-function isDirInsideProject(resolvedRoot, dir) {
-  const rel = path.relative(resolvedRoot, path.resolve(dir));
-  return !relativePathEscapesRoot(rel);
+function isDirInsideProject(resolvedRoot, dir, platform) {
+  const paths = platform === "win32" ? path.win32 : path.posix;
+  const rel = paths.relative(resolvedRoot, paths.resolve(dir));
+  return !relativePathEscapesRoot(rel, platform);
 }
-function collectPathOperands(firstStage, startAfterCommand) {
+function collectPathOperands(firstStage, startAfterCommand, platform) {
   const operands = [];
   let index = skipSpaces(firstStage, startAfterCommand);
   let sawPattern = false;
   let optionsEnded = false;
   let optionValue;
   while (index < firstStage.length) {
-    const tokenResult = readShellToken(firstStage, index);
+    const tokenResult = readShellToken(firstStage, index, platform);
     if (tokenResult === null)
       break;
     const { token, end } = tokenResult;
@@ -8494,22 +8582,25 @@ function collectPathOperands(firstStage, startAfterCommand) {
 function isDynamicPathOperand(token) {
   return token.startsWith("~") || token.includes("$") || token.includes("`");
 }
-function expandTilde(target) {
+function expandTilde(target, platform) {
   if (!target.startsWith("~"))
     return target;
   if (target === "~" || target.startsWith("~/")) {
-    return path.join(os.homedir(), target.slice(1));
+    const paths = platform === "win32" ? path.win32 : path.posix;
+    return paths.join(os.homedir(), target.slice(1));
   }
   return target;
 }
-function resolvePathOperand(projectRoot, operand) {
-  const expanded = expandTilde(operand);
-  return path.isAbsolute(expanded) ? path.resolve(expanded) : path.resolve(projectRoot, expanded);
+function resolvePathOperand(projectRoot, operand, platform) {
+  const paths = platform === "win32" ? path.win32 : path.posix;
+  const expanded = expandTilde(operand, platform);
+  return paths.isAbsolute(expanded) ? paths.resolve(expanded) : paths.resolve(projectRoot, expanded);
 }
-function isPathInsideProject(resolvedRoot, baseCwd, operand) {
-  const resolved = resolvePathOperand(baseCwd, operand);
-  const rel = path.relative(resolvedRoot, resolved);
-  return !relativePathEscapesRoot(rel);
+function isPathInsideProject(resolvedRoot, baseCwd, operand, platform) {
+  const paths = platform === "win32" ? path.win32 : path.posix;
+  const resolved = resolvePathOperand(baseCwd, operand, platform);
+  const rel = paths.relative(resolvedRoot, resolved);
+  return !relativePathEscapesRoot(rel, platform);
 }
 function shouldSuppressResolvedPath(resolved) {
   try {
@@ -8517,12 +8608,12 @@ function shouldSuppressResolvedPath(resolved) {
     if (stats.isFile())
       return true;
     const ageMs = Date.now() - stats.mtimeMs;
-    return ageMs >= 0 && ageMs < GREP_SEARCH_FRESHNESS_WINDOW_MS;
+    return ageMs > -MTIME_CLOCK_SLACK_MS && ageMs < GREP_SEARCH_FRESHNESS_WINDOW_MS;
   } catch {
-    return false;
+    return;
   }
 }
-function splitTopLevelStatements(command) {
+function splitTopLevelStatements(command, platform = process.platform) {
   const statements = [];
   let start = 0;
   let quote = "none";
@@ -8541,7 +8632,7 @@ function splitTopLevelStatements(command) {
       continue;
     }
     if (quote === "double") {
-      if (ch === "\\")
+      if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform))
         escaped = true;
       else if (ch === '"')
         quote = "none";
@@ -8552,7 +8643,7 @@ function splitTopLevelStatements(command) {
         inBacktick = false;
       continue;
     }
-    if (ch === "\\") {
+    if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform)) {
       escaped = true;
       continue;
     }
@@ -8595,7 +8686,7 @@ function splitTopLevelStatements(command) {
   statements.push(command.slice(start));
   return statements;
 }
-function firstPipelineStage(command) {
+function firstPipelineStage(command, platform = process.platform) {
   let quote = "none";
   let firstPipeIndex;
   for (let index = 0;index < command.length; index++) {
@@ -8608,7 +8699,7 @@ function firstPipelineStage(command) {
     if (quote === "double") {
       if (ch === '"') {
         quote = "none";
-      } else if (ch === "\\") {
+      } else if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform)) {
         index++;
       } else if (ch === "`") {
         return null;
@@ -8619,7 +8710,7 @@ function firstPipelineStage(command) {
       quote = "single";
     } else if (ch === '"') {
       quote = "double";
-    } else if (ch === "\\") {
+    } else if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform)) {
       index++;
     } else if (ch === "`") {
       return null;
@@ -8635,7 +8726,7 @@ function firstPipelineStage(command) {
     return null;
   return command.slice(0, firstPipeIndex ?? command.length).trim();
 }
-function readShellToken(command, start) {
+function readShellToken(command, start, platform = process.platform) {
   let quote = "none";
   let token = "";
   let index = start;
@@ -8652,9 +8743,11 @@ function readShellToken(command, start) {
     if (quote === "double") {
       if (ch === '"') {
         quote = "none";
-      } else if (ch === "\\") {
+      } else if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform)) {
         index++;
-        token += command[index] ?? "\\";
+        if (command[index] !== `
+`)
+          token += command[index];
       } else if (ch === "`") {
         return null;
       } else {
@@ -8670,7 +8763,7 @@ function readShellToken(command, start) {
       quote = "single";
     } else if (ch === '"') {
       quote = "double";
-    } else if (ch === "\\") {
+    } else if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform)) {
       index++;
       token += command[index] ?? "\\";
     } else if (ch === "`") {
@@ -8683,6 +8776,11 @@ function readShellToken(command, start) {
     return null;
   return { token, end: index };
 }
+function backslashEscapesNext(next, quote, platform) {
+  if (quote === "double")
+    return next !== undefined && '$`"\\\n'.includes(next);
+  return platform !== "win32";
+}
 function isTokenBoundary(ch) {
   return ch === "|" || ch === ";" || ch === "&" || ch === "<" || ch === ">";
 }
@@ -8694,7 +8792,7 @@ function skipSpaces(input, start) {
 }
 // ../aft-bridge/dist/bash-host-fallback.js
 import { existsSync } from "node:fs";
-import { join as join4 } from "node:path";
+import { join as join3 } from "node:path";
 
 // ../aft-bridge/dist/child-process.js
 import { execFile as nodeExecFile, execFileSync as nodeExecFileSync, execSync as nodeExecSync, spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "node:child_process";
@@ -8702,7 +8800,7 @@ import { execFile as nodeExecFile, execFileSync as nodeExecFileSync, execSync as
 // ../aft-bridge/dist/test-child-environment.js
 import { mkdirSync, realpathSync } from "node:fs";
 import { homedir as homedir3, tmpdir } from "node:os";
-import { dirname, isAbsolute as isAbsolute2, join as join2, relative as relative2, resolve as resolve2 } from "node:path";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 var DIRECTORIES = [
   "HOME",
   "USERPROFILE",
@@ -8722,8 +8820,8 @@ function toolchainHomes(inherited) {
   if (!global[TOOLCHAINS]) {
     const home = process.platform === "win32" ? inherited.USERPROFILE || inherited.HOME || homedir3() : inherited.HOME || homedir3();
     global[TOOLCHAINS] = {
-      RUSTUP_HOME: inherited.RUSTUP_HOME || join2(home, ".rustup"),
-      CARGO_HOME: inherited.CARGO_HOME || join2(home, ".cargo")
+      RUSTUP_HOME: inherited.RUSTUP_HOME || join(home, ".rustup"),
+      CARGO_HOME: inherited.CARGO_HOME || join(home, ".cargo")
     };
   }
   return global[TOOLCHAINS];
@@ -8750,31 +8848,31 @@ function isolatedAftEnvironment(root, inherited = process.env) {
     "aft-cache"
   ];
   for (const [index, key] of DIRECTORIES.entries()) {
-    env[key] = join2(root, names[index]);
+    env[key] = join(root, names[index]);
     mkdirSync(env[key], { recursive: true });
   }
   delete env.AFT_ALLOW_PRODUCTION_MIGRATION;
-  createdRoots().add(resolve2(root));
+  createdRoots().add(resolve(root));
   return env;
 }
 function canonical(path) {
-  let ancestor = resolve2(path);
+  let ancestor = resolve(path);
   const tail = [];
   while (true) {
     try {
-      return join2(realpathSync(ancestor), ...tail);
+      return join(realpathSync(ancestor), ...tail);
     } catch {
       const parent = dirname(ancestor);
       if (parent === ancestor)
-        return resolve2(path);
-      tail.unshift(relative2(parent, ancestor));
+        return resolve(path);
+      tail.unshift(relative(parent, ancestor));
       ancestor = parent;
     }
   }
 }
 function within(path, root) {
-  const tail = relative2(canonical(root), canonical(path));
-  return tail === "" || !tail.startsWith("..") && !isAbsolute2(tail);
+  const tail = relative(canonical(root), canonical(path));
+  return tail === "" || !tail.startsWith("..") && !isAbsolute(tail);
 }
 function testChildEnvironment(env) {
   const root = process.env.AFT_TEST_ISOLATION_ROOT;
@@ -8850,7 +8948,7 @@ function withPathPrepended(env, dir, platform = process.platform) {
 
 // ../aft-bridge/dist/storage-paths.js
 import { homedir as homedir4, tmpdir as tmpdir2 } from "node:os";
-import { join as join3, resolve as resolve3 } from "node:path";
+import { join as join2, resolve as resolve2 } from "node:path";
 function environmentValue(context, name) {
   const value = (context.lookup ?? ((key) => process.env[key]))(name);
   return value !== undefined && value.length > 0 ? value : undefined;
@@ -8872,21 +8970,21 @@ function resolveDataHome(context = {}) {
       return localAppData;
     const userProfile = environmentValue(context, "USERPROFILE");
     if (userProfile)
-      return join3(userProfile, "AppData", "Local");
+      return join2(userProfile, "AppData", "Local");
   }
   const home = environmentValue(context, "HOME");
   if (home)
-    return join3(home, ".local", "share");
-  return join3(".local", "share");
+    return join2(home, ".local", "share");
+  return join2(".local", "share");
 }
 function resolveStoragePath(raw, context = {}) {
   let expanded = raw;
   if (raw === "~") {
     expanded = homeDir(context);
   } else if (raw.startsWith("~/") || raw.startsWith("~\\")) {
-    expanded = join3(homeDir(context), raw.slice(2));
+    expanded = join2(homeDir(context), raw.slice(2));
   }
-  return resolve3(context.currentDirectory ?? process.cwd(), expanded);
+  return resolve2(context.currentDirectory ?? process.cwd(), expanded);
 }
 function resolveCortexKitStorageRoot(context = {}) {
   const override = environmentValue(context, "AFT_STORAGE_DIR");
@@ -8894,8 +8992,8 @@ function resolveCortexKitStorageRoot(context = {}) {
     return resolveStoragePath(override, context);
   const legacyCache = environmentValue(context, "AFT_CACHE_DIR");
   if (legacyCache)
-    return join3(resolveStoragePath(legacyCache, context), "aft");
-  return resolveStoragePath(join3(resolveDataHome(context), "cortexkit", "aft"), context);
+    return join2(resolveStoragePath(legacyCache, context), "aft");
+  return resolveStoragePath(join2(resolveDataHome(context), "cortexkit", "aft"), context);
 }
 function resolveAftStorageRoot(configuredRoot, context = {}) {
   if (environmentValue(context, "AFT_STORAGE_DIR")) {
@@ -8906,14 +9004,14 @@ function resolveAftStorageRoot(configuredRoot, context = {}) {
   return resolveCortexKitStorageRoot(context);
 }
 function resolveAftLogPath(filename, configuredRoot, context = {}) {
-  return join3(resolveAftStorageRoot(configuredRoot, context), "logs", filename);
+  return join2(resolveAftStorageRoot(configuredRoot, context), "logs", filename);
 }
 function isTestEnvironment(context = {}) {
   return environmentValue(context, "BUN_TEST") === "1" || environmentValue(context, "NODE_ENV") === "test";
 }
 function resolvePluginLogPath(context = {}) {
   if (isTestEnvironment(context)) {
-    return join3(environmentValue(context, "TMPDIR") ?? tmpdir2(), `aft-plugin-tests-${process.pid}`, "logs", "aft-plugin-test.log");
+    return join2(environmentValue(context, "TMPDIR") ?? tmpdir2(), `aft-plugin-tests-${process.pid}`, "logs", "aft-plugin-test.log");
   }
   return resolveAftLogPath("aft-plugin.log", undefined, context);
 }
@@ -8923,9 +9021,10 @@ var BASH_HOST_FALLBACK_BANNER = "[AFT host fallback - module transport down; no
 var BASH_HOST_FALLBACK_MAX_OUTPUT_BYTES = 100 * 1024;
 var BASH_HOST_FALLBACK_MAX_TIMEOUT_MS = 10 * 60 * 1000;
 var BASH_HOST_FALLBACK_REFUSAL = "AFT module connection is down";
-var BASH_RUNON_DESCRIPTION = 'Run on a remote build server: `linux` (2 vCPUs), or `linux,Nc` for N vCPUs such as `linux,8c`; add ",net" for outbound internet (offline by default). `windows` runs the command in Git Bash on a Windows build machine (no vCPU or network options). `macos` sends the command to a macOS machine for builds and tests that need macOS (no vCPU or network options).';
-var BASH_RETURN_PATHS_DESCRIPTION = "With runon: up to 64 files to copy back from the build server after the command, as paths relative to workdir inside the project (10 MiB in total). Each verified file replaces the local file at the same path; the result lists every path as returned or not returned, with the reason.";
-var BASH_RUNON_GUIDANCE = 'When remote runs are available, put `runon: "linux"` on build and test lines (cargo, bun test), including chains and pipes. Keep git, gh, interactive and file-editing commands local, and keep a line local if it needs this machine\'s own operating system or hardware (its sandbox, code signing, service manager, permission prompts or GUI frameworks) or runs a binary that already exists on this machine; a build or test that needs only macOS (its sandbox, code signing or file watching) can use runon: "macos" instead; building and testing still go remote, and a remote build leaves no binaries or target/ output in the local worktree. Add `,Nc` to request N vCPUs (`linux,4c`); without it the job gets 2 vCPUs. The job sees exactly the CPUs it gets, so ask for what the command uses: 2c (the default) for a single test binary or script, 4c for `cargo check`/clippy on one crate, 8c for a workspace test suite, and 16c for a large release build.';
+var BASH_RUNON_MEMORY_DESCRIPTION = "On Linux, add `,Ngb` to ask for N GiB of memory, for example `linux,2c,16gb` for a Rust build.";
+var BASH_RUNON_DESCRIPTION = 'Run on a remote build server: `linux` (2 vCPUs), or `linux,Nc` for N vCPUs such as `linux,8c`; add ",net" for outbound internet (offline by default). `windows` runs the command in Git Bash on a Windows build machine (no vCPU or network options). `macos` sends the command to a macOS machine for builds and tests that need macOS (no vCPU or network options).' + ` ${BASH_RUNON_MEMORY_DESCRIPTION}`;
+var BASH_RETURN_PATHS_DESCRIPTION = "With runon: up to 64 files to copy back from the build server after the command, as paths relative to workdir inside the project (up to 128 MiB in total). Each verified file replaces the local file at the same path; the result lists every path as returned or not returned, with the reason.";
+var BASH_RUNON_GUIDANCE = 'When remote runs are available, put `runon: "linux"` on build and test lines (cargo, bun test), including chains and pipes. A runon job\'s file changes are not copied back; only output, the exit code and return_paths files return. Edit locally first; name a file in return_paths to regenerate it remotely. Keep git, gh, interactive and file-editing commands local, and keep a line local if it needs this machine\'s own operating system or hardware (its sandbox, code signing, service manager, permission prompts or GUI frameworks) or runs a binary that already exists on this machine; a build or test that needs only macOS (its sandbox, code signing or file watching) can use runon: "macos" instead; building and testing still go remote, and a remote build leaves no binaries or target/ output in the local worktree. Add `,Nc` to request N vCPUs (`linux,4c`); without it the job gets 2 vCPUs. The job sees exactly the CPUs it gets, so ask for what the command uses: 2c (the default) for a single test binary or script, 4c for `cargo check`/clippy on one crate, 8c for a workspace test suite, and 16c for a large release build.';
 function pathKeyForPlatform(env, platform) {
   return platform === "win32" ? Object.keys(env).find((key) => key.toLowerCase() === "path") : "PATH";
 }
@@ -8947,8 +9046,8 @@ function hostFallbackEnvWithShims(env, platform) {
   const pathKey = pathKeyForPlatform(normalized, platform);
   const inherited = pathKey === undefined ? undefined : normalized[pathKey];
   const storageRoot = normalized.AFT_STORAGE_DIR ? resolveStoragePath(normalized.AFT_STORAGE_DIR) : resolveCortexKitStorageRoot();
-  const shimsDir = join4(storageRoot, "shims");
-  if (!existsSync(join4(shimsDir, platform === "win32" ? "gh.cmd" : "gh")))
+  const shimsDir = join3(storageRoot, "shims");
+  if (!existsSync(join3(shimsDir, platform === "win32" ? "gh.cmd" : "gh")))
     return normalized;
   const separator = platform === "win32" ? ";" : ":";
   const entries = (inherited ?? "").split(separator).filter((entry) => entry.length > 0);
@@ -9180,6 +9279,7 @@ function bashAcksConfirmed(response, targets) {
 }
 // ../aft-bridge/dist/bash-permissions.js
 var BASH_PERMISSION_NOT_SETTLED = "bash permission not settled after {rounds} rounds: still asking for {kind} {path} (operation: {operation}; granted already: {granted})";
+var BASH_PERMISSION_DENIED = "Permission denied for this shell command: {parts} ({host reason}). The parts are checked together, so one denied part denies the whole command; run the allowed parts in a separate call.";
 
 class BashPermissionLoopError extends Error {
 }
@@ -9197,6 +9297,10 @@ ${ask.command ?? ""}
 Working directory:
 ${ask.cwd ?? ""}`;
 }
+function permissionAskPath(ask) {
+  const paths = ask.patterns?.length ? ask.patterns : bashPermissionRetryGrants(ask);
+  return ask.kind === "escalation" && ask.command ? `${ask.command}${ask.cwd ? ` @ ${ask.cwd}` : ""}` : paths.length ? paths.join(", ") : "<no asks returned>";
+}
 async function withBashPermissionLoop(options) {
   const granted = new Set;
   const alreadyGranted = (ask) => {
@@ -9218,20 +9322,22 @@ async function withBashPermissionLoop(options) {
         already_granted: alreadyGranted(ask)
       }))
     });
-    const unsettled = (cause) => {
+    const unsettled = () => {
       const message = (asks.length ? asks : [{}]).map((ask) => {
-        const paths = ask.patterns?.length ? ask.patterns : bashPermissionRetryGrants(ask);
-        const path = ask.kind === "escalation" && ask.command ? `${ask.command}${ask.cwd ? ` @ ${ask.cwd}` : ""}` : paths.length ? paths.join(", ") : "<no asks returned>";
-        return BASH_PERMISSION_NOT_SETTLED.replace("{rounds}", String(round)).replace("{kind}", ask.kind ?? "unknown").replace("{operation}", ask.operation ?? options.operation ?? "bash").replace("{granted}", alreadyGranted(ask) ? "yes" : "no").replace("{path}", () => path);
+        return BASH_PERMISSION_NOT_SETTLED.replace("{rounds}", String(round)).replace("{kind}", ask.kind ?? "unknown").replace("{operation}", ask.operation ?? options.operation ?? "bash").replace("{granted}", alreadyGranted(ask) ? "yes" : "no").replace("{path}", () => permissionAskPath(ask));
       }).join("; ");
-      return new BashPermissionLoopError(cause instanceof Error ? `${message}: ${cause.message}` : message, { cause });
+      return new BashPermissionLoopError(message);
     };
     if (asks.length === 0 || asks.every(alreadyGranted) || round >= 8)
       throw unsettled();
+    const pendingAsks = asks.filter((ask) => !alreadyGranted(ask));
     try {
-      await options.approve(asks.filter((ask) => !alreadyGranted(ask)));
+      await options.approve(pendingAsks);
     } catch (error) {
-      throw unsettled(error);
+      const parts = pendingAsks.map(permissionAskPath).join(", ");
+      const reason = error instanceof Error && error.message ? error.message.trim().replace(/\.$/, "") : "";
+      const message = reason ? BASH_PERMISSION_DENIED.replace("{host reason}", () => reason) : BASH_PERMISSION_DENIED.replace(" ({host reason})", "");
+      throw new BashPermissionLoopError(message.replace("{parts}", () => parts), { cause: error });
     }
     for (const ask of asks) {
       for (const grant of bashPermissionRetryGrants(ask))
@@ -9700,7 +9806,7 @@ async function cachedFileSha256(path) {
 }
 // ../aft-bridge/dist/bridge.js
 import { homedir as homedir5 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join4 } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 
 // ../aft-bridge/dist/command-timeouts.js
@@ -9838,6 +9944,7 @@ function compareSemver(a, b) {
 }
 var SYSTEM_CLOCK = {
   now: () => Date.now(),
+  awakeNow: () => performance.now(),
   setTimeout: (callback, ms) => setTimeout(callback, ms),
   clearTimeout: (timer) => clearTimeout(timer)
 };
@@ -9954,6 +10061,7 @@ class BinaryBridge {
   hangWindowMinMs;
   hangProbeTimeoutMs;
   clock;
+  waitClock;
   lateShellReplyGraceMs;
   maxRestarts;
   configured = false;
@@ -9990,6 +10098,7 @@ class BinaryBridge {
     this.hangWindowMinMs = options?.hangWindowMinMs ?? DEFAULT_MIN_HANG_WINDOW_MS;
     this.hangProbeTimeoutMs = options?.hangProbeTimeoutMs ?? DEFAULT_HANG_PROBE_TIMEOUT_MS;
     this.clock = options?.clock ?? SYSTEM_CLOCK;
+    this.waitClock = new WaitClock(() => this.clock.now(), () => this.clock.awakeNow?.() ?? this.clock.now());
     this.lateShellReplyGraceMs = options?.lateShellReplyGraceMs ?? DEFAULT_LATE_SHELL_REPLY_GRACE_MS;
     this.maxRestarts = options?.maxRestarts ?? 3;
     this.errorPrefix = options?.errorPrefix ?? "[aft-bridge]";
@@ -10356,11 +10465,17 @@ class BinaryBridge {
       const keepBridgeOnTimeout = passive || command === "bash_drain_completions" || options?.keepBridgeOnTimeout === true;
       const child = this.process;
       const response = await new Promise((resolve, reject) => {
-        const timer = this.clock.setTimeout(() => {
+        const deadline = new RequestDeadline(this.waitClock, effectiveTimeoutMs);
+        const expire = () => {
           const entry = this.pending.get(id);
           if (!entry)
             return;
-          if (keepBridgeOnTimeout && this.holdForLateShellReply(id, entry, effectiveTimeoutMs, requestSessionId)) {
+          const remaining = deadline.remaining();
+          if (remaining > 0) {
+            entry.timer = this.clock.setTimeout(expire, Math.min(remaining, DEADLINE_POLL_MS));
+            return;
+          }
+          if (keepBridgeOnTimeout && !deadline.resumed && this.holdForLateShellReply(id, entry, effectiveTimeoutMs, requestSessionId)) {
             return;
           }
           this.pending.delete(id);
@@ -10373,11 +10488,12 @@ class BinaryBridge {
             this.warnVia(timeoutMsg);
           }
           if (keepBridgeOnTimeout) {
-            entry.reject(new BridgeTransportTimeoutError(command, effectiveTimeoutMs, `${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
+            entry.reject(new BridgeTransportTimeoutError(command, effectiveTimeoutMs, `${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`, deadline.resumed && SHELL_TASK_COMMANDS.has(command) ? { kind: "unknown" } : undefined));
             return;
           }
           entry.reject(new Error(`${this.errorPrefix} request "${command}" timed out after ${effectiveTimeoutMs}ms (bridge busy/under load); bridge kept warm — retry. A timed-out mutation may still complete; inspect before repeating it.`));
-        }, effectiveTimeoutMs);
+        };
+        const timer = this.clock.setTimeout(expire, Math.min(effectiveTimeoutMs, DEADLINE_POLL_MS));
         const entry = {
           resolve,
           reject,
@@ -10608,11 +10724,11 @@ class BinaryBridge {
     })();
     const useFastembedBackend = semanticBackend === undefined || semanticBackend === "fastembed" || semanticBackend === "";
     const ortDir = typeof this.configOverrides._ort_dylib_dir === "string" && useFastembedBackend ? this.configOverrides._ort_dylib_dir : null;
-    const ortLibraryPath = ortDir == null ? null : join5(ortDir, this.platform === "win32" ? "onnxruntime.dll" : this.platform === "darwin" ? "libonnxruntime.dylib" : "libonnxruntime.so");
+    const ortLibraryPath = ortDir == null ? null : join4(ortDir, this.platform === "win32" ? "onnxruntime.dll" : this.platform === "darwin" ? "libonnxruntime.dylib" : "libonnxruntime.so");
     const env = { ...process.env };
     this.logVia(`bridge.spawnProcess: useFastembedBackend=${useFastembedBackend}, ` + `parentORT=${process.env.ORT_DYLIB_PATH ?? "(unset)"}, ` + `ortLibraryPath=${ortLibraryPath ?? "(none)"}`);
     if (useFastembedBackend) {
-      env.FASTEMBED_CACHE_DIR = process.env.FASTEMBED_CACHE_DIR || (typeof this.configOverrides.storage_dir === "string" ? join5(this.configOverrides.storage_dir, "semantic", "models") : join5(homedir5() || "", ".cache", "fastembed"));
+      env.FASTEMBED_CACHE_DIR = process.env.FASTEMBED_CACHE_DIR || (typeof this.configOverrides.storage_dir === "string" ? join4(this.configOverrides.storage_dir, "semantic", "models") : join4(homedir5() || "", ".cache", "fastembed"));
       if (process.env.ORT_DYLIB_PATH) {
         this.logVia(`ORT_DYLIB_PATH inherited from parent env: ${process.env.ORT_DYLIB_PATH}`);
       } else if (ortLibraryPath) {
@@ -10933,14 +11049,21 @@ class BinaryBridge {
     };
     entry.resolve = (response) => settle(shellOutcomeFromLateReply(response));
     this.clock.clearTimeout(entry.timer);
-    entry.timer = this.clock.setTimeout(() => {
+    const deadline = new RequestDeadline(this.waitClock, graceMs, false);
+    const expire = () => {
       if (this.pending.get(id) !== entry)
         return;
+      const remaining = deadline.remaining();
+      if (remaining > 0) {
+        entry.timer = this.clock.setTimeout(expire, Math.min(remaining, DEADLINE_POLL_MS));
+        return;
+      }
       this.pending.delete(id);
       entry.onSettled?.();
       this.warnVia(`Request "${entry.command}" (id=${id}) got no reply within ${graceMs}ms after its deadline`);
       settle({ kind: "unknown" });
-    }, graceMs);
+    };
+    entry.timer = this.clock.setTimeout(expire, Math.min(graceMs, DEADLINE_POLL_MS));
     return true;
   }
   accountForBashTaskResponse(command, response) {
@@ -11188,7 +11311,7 @@ class BinaryBridge {
 }
 // ../aft-bridge/dist/cache-paths.js
 import { homedir as homedir6 } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join5 } from "node:path";
 function homeDir2(env) {
   return (process.platform === "win32" ? env.USERPROFILE || env.HOME : env.HOME) || homedir6();
 }
@@ -11196,20 +11319,20 @@ function getAftCacheRoot(env = process.env) {
   if (env.AFT_CACHE_DIR)
     return env.AFT_CACHE_DIR;
   if (process.platform === "win32") {
-    const base = env.LOCALAPPDATA || env.APPDATA || join6(homeDir2(env), "AppData", "Local");
-    return join6(base, "aft");
+    const base = env.LOCALAPPDATA || env.APPDATA || join5(homeDir2(env), "AppData", "Local");
+    return join5(base, "aft");
   }
-  const base = env.XDG_CACHE_HOME || join6(homeDir2(env), ".cache");
-  return join6(base, "aft");
+  const base = env.XDG_CACHE_HOME || join5(homeDir2(env), ".cache");
+  return join5(base, "aft");
 }
 function getAftBinaryCacheDir(env = process.env) {
-  return join6(getAftCacheRoot(env), "bin");
+  return join5(getAftCacheRoot(env), "bin");
 }
 function getAftLspPackagesDir(env = process.env) {
-  return join6(getAftCacheRoot(env), "lsp-packages");
+  return join5(getAftCacheRoot(env), "lsp-packages");
 }
 function getAftLspBinariesDir(env = process.env) {
-  return join6(getAftCacheRoot(env), "lsp-binaries");
+  return join5(getAftCacheRoot(env), "lsp-binaries");
 }
 // ../aft-bridge/dist/callgraph-format.js
 var UNRESOLVED_SUMMARY_NAME_LIMIT = 10;
@@ -11309,15 +11432,57 @@ function hubSummaryLine(response, theme) {
   const message = summary ? asString(summary.message) : undefined;
   return message ? theme.fg("warning", message) : undefined;
 }
+var ROOT_KINDS = ["main", "test", "attribute", "public_api", "no_caller_found"];
+var ROOT_LABELS = {
+  main: "main",
+  test: "test",
+  attribute: "attribute",
+  public_api: "public API",
+  no_caller_found: "no caller found"
+};
+function rootCounted(kind, count) {
+  const plural = count === 1 ? "" : "s";
+  switch (kind) {
+    case "main":
+      return count === 1 ? "main" : `${count} main functions`;
+    case "test":
+      return `${count} test${plural}`;
+    case "attribute":
+      return `${count} function${plural} with an entry attribute`;
+    case "public_api":
+      return `${count} public API function${plural}`;
+    default:
+      return `${count} function${plural} with no caller found`;
+  }
+}
+function rootSummary(record) {
+  const counts = asRecord(record.root_counts);
+  if (!counts)
+    return;
+  const parts = ROOT_KINDS.flatMap((kind) => {
+    const count = asNumber(counts[kind]);
+    return count && count > 0 ? [rootCounted(kind, count)] : [];
+  });
+  return parts.length > 0 ? parts.join(", ") : undefined;
+}
+function rootTag(record) {
+  const kind = asString(record.root);
+  const label = kind ? ROOT_LABELS[kind] : undefined;
+  if (!kind || !label)
+    return;
+  const attribute = asString(record.attribute);
+  return kind === "attribute" && attribute ? `[root: attribute ${attribute}]` : `[root: ${label}]`;
+}
 function renderTracePath(path, index, lines, theme) {
   lines.push(`Path ${index + 1}`);
+  const root = rootTag(path);
   asRecords(path.hops).forEach((hop, hopIndex) => {
     const symbol = asString(hop.symbol) ?? "(unknown)";
     const file = shortenHomePath(asString(hop.file) ?? "(unknown file)");
     const line = asNumber(hop.line);
-    const entry = hop.is_entry_point === true ? " [entry]" : "";
+    const tag = hopIndex === 0 ? root ? ` ${theme.fg("warning", root)}` : "" : hop.exported === true ? " [exported]" : "";
     const nameMatch = nameMatchEdgeMarker(hop, theme);
-    lines.push(treeLine(hopIndex + 1, `${symbol}${entry} ${line !== undefined ? `[${file}:${line}]` : `[${file}]`}${nameMatch}`));
+    lines.push(treeLine(hopIndex + 1, `${symbol}${tag} ${line !== undefined ? `[${file}:${line}]` : `[${file}]`}${nameMatch}`));
   });
 }
 function renderCallersGroupLines(group, theme, callbackLabel) {
@@ -11422,18 +11587,18 @@ function formatCallgraphSections(op, response, theme = PLAIN_CALLGRAPH_THEME, op
     const hubSummary = hubSummaryLine(record, theme);
     const totalPaths = asNumber(record.total_paths) ?? paths.length;
     const totalPathsIsLowerBound = asBoolean(record.total_paths_is_lower_bound) ?? false;
-    const entryPoints = asNumber(record.entry_points_found) ?? 0;
+    const roots = rootSummary(record);
     const sections = [
       joinNonEmpty([
         theme.fg("success", `${totalPathsIsLowerBound ? "at least " : ""}${totalPaths} path${totalPaths === 1 ? "" : "s"}`),
-        theme.fg("muted", `${entryPoints} entry point${entryPoints === 1 ? "" : "s"}`),
+        roots ? theme.fg("muted", `roots: ${roots}`) : undefined,
         warning
       ])
     ];
     if (hubSummary)
       sections.push(hubSummary);
     if (paths.length === 0)
-      sections.push(theme.fg("muted", "No entry paths found."));
+      sections.push(theme.fg("muted", "No paths found."));
     paths.forEach((path, index) => {
       const lines = [];
       renderTracePath(path, index, lines, theme);
@@ -11466,13 +11631,17 @@ function formatCallgraphSections(op, response, theme = PLAIN_CALLGRAPH_THEME, op
       sections.unshift(theme.fg("warning", testFilterNote));
     if (hubSummary)
       sections.push(hubSummary);
+    const roots = rootSummary(record);
+    if (roots)
+      sections.push(theme.fg("muted", `Reaches ${roots}`));
     if (callers.length === 0)
       sections.push(theme.fg("muted", "No impacted callers found."));
     callers.forEach((caller) => {
       const file = shortenHomePath(asString(caller.caller_file) ?? "(unknown file)");
       const symbol = asString(caller.caller_symbol) ?? "(unknown)";
       const line = asNumber(caller.line) ?? 0;
-      const entry = caller.is_entry_point === true ? ` ${theme.fg("warning", "[entry]")}` : "";
+      const root = rootTag(caller);
+      const entry = root ? ` ${theme.fg("warning", root)}` : "";
       const nameMatch = nameMatchEdgeMarker(caller, theme);
       const reference = caller.relation === "callback_reference" ? asString(record.callback_reference_label) ?? "" : "";
       const expression = asString(caller.call_expression);
@@ -11652,7 +11821,7 @@ function isFindReplaceOnlyEdit(args) {
 }
 // ../aft-bridge/dist/config-error.js
 import { homedir as homedir7 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join7 } from "node:path";
+import { isAbsolute as isAbsolute2, join as join6 } from "node:path";
 var CONFIG_ERROR_RESTART_NOTE = "AFT reads its config only at startup, so restart the host after fixing it.";
 function formatConfigErrorMessage(detail) {
   const trimmed = detail.trim();
@@ -11662,10 +11831,10 @@ function formatConfigErrorMessage(detail) {
 function resolveSubcConnectionFilePath(raw, home = homedir7()) {
   const trimmed = raw.trim();
   if (trimmed.startsWith("~"))
-    return join7(home, trimmed.slice(1).replace(/^[/\\]/, ""));
-  if (isAbsolute3(trimmed))
+    return join6(home, trimmed.slice(1).replace(/^[/\\]/, ""));
+  if (isAbsolute2(trimmed))
     return trimmed;
-  return join7(home, trimmed);
+  return join6(home, trimmed);
 }
 function formatSubcConnectionMissingMessage(raw, resolved) {
   return `subc.connection_file is set to "${raw.trim()}" (resolved: ${resolved}) but no subc ` + `connection file exists there. Start the Subconscious daemon, correct the path, ` + `or remove subc.connection_file from your user config to use the standalone bridge.`;
@@ -11726,7 +11895,7 @@ function stripHarnessSpecificConfigKeys(value, keys) {
 }
 // ../aft-bridge/dist/config-tiers.js
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve3 } from "node:path";
 function readConfigTiers(opts) {
   const tiers = [];
   try {
@@ -11734,7 +11903,7 @@ function readConfigTiers(opts) {
       const doc = readFileSync2(opts.userConfigPath, "utf-8");
       tiers.push({
         tier: "user",
-        source: resolve4(opts.userConfigPath),
+        source: resolve3(opts.userConfigPath),
         doc
       });
     }
@@ -11744,7 +11913,7 @@ function readConfigTiers(opts) {
       const doc = readFileSync2(opts.projectConfigPath, "utf-8");
       tiers.push({
         tier: "project",
-        source: resolve4(opts.projectConfigPath),
+        source: resolve3(opts.projectConfigPath),
         doc
       });
     }
@@ -11758,8 +11927,9 @@ function formatDroppedKeyWarnings(dropped) {
   return dropped.map((item) => `Ignoring ${item.key} from ${item.tier} config (${item.reason})`);
 }
 // ../aft-bridge/dist/config-watch.js
-import { readFileSync as readFileSync3, statSync as statSync3, watch } from "node:fs";
-import { basename, dirname as dirname2 } from "node:path";
+import { createHash as createHash2 } from "node:crypto";
+import { closeSync as closeSync2, fstatSync, openSync as openSync2, readFileSync as readFileSync3, readSync as readSync2, realpathSync as realpathSync2, statSync as statSync3, watch } from "node:fs";
+import { basename, dirname as dirname2, resolve as resolve4 } from "node:path";
 var CONFIG_WATCH_DEBOUNCE_MS = 150;
 var CONFIG_LIVE_KEEP_NOTE = "AFT keeps using the last valid configuration until the file is fixed.";
 function pathKey(name) {
@@ -11813,8 +11983,8 @@ function aftLiveConfigKeys(resolveBash) {
     pathKey("restrict_to_project_root"),
     pathKey("revision_reads"),
     pathKey("inspect.diagnostics_timeout_ms"),
-    pathKey("inspect.tier2_idle_minutes"),
     pathKey("lsp.idle_minutes"),
+    pathKey("lsp.max_servers"),
     ...[
       "diagnostics",
       "todos",
@@ -11885,6 +12055,29 @@ function readTextOrNull(path) {
 var CONFIG_WATCH_REVALIDATE_MS = 2000;
 var CONFIG_WATCH_REJECTED_RETRIES = 3;
 var CONFIG_WATCH_MAX_DELAY_MS = 1000;
+var CONFIG_READ_LIMIT = 1024 * 1024;
+function contentFingerprint(path) {
+  let fd;
+  try {
+    fd = openSync2(path, "r");
+    const metadata = fstatSync(fd, { bigint: true });
+    const bytes = Buffer.alloc(Math.min(Number(metadata.size), CONFIG_READ_LIMIT));
+    let offset = 0;
+    while (offset < bytes.length) {
+      const read = readSync2(fd, bytes, offset, bytes.length - offset, null);
+      if (read === 0)
+        break;
+      offset += read;
+    }
+    const hash = createHash2("sha256").update(bytes.subarray(0, offset)).digest("hex");
+    return `${metadata.size}:${metadata.mtimeNs}:${hash}`;
+  } catch {
+    return null;
+  } finally {
+    if (fd !== undefined)
+      closeSync2(fd);
+  }
+}
 function identityOf(dir) {
   try {
     const stat = statSync3(dir, { bigint: true });
@@ -11900,6 +12093,13 @@ function watchDirFor(file) {
     dir = dirname2(dir);
   return dir;
 }
+function canonicalDirectory(dir) {
+  try {
+    return realpathSync2(dir);
+  } catch {
+    return resolve4(dir);
+  }
+}
 function watchAftConfigFiles(options) {
   const debounceMs = options.debounceMs ?? CONFIG_WATCH_DEBOUNCE_MS;
   const lastSeen = new Map;
@@ -11913,8 +12113,11 @@ function watchAftConfigFiles(options) {
   let firstPendingAt = null;
   let stopped = false;
   const watchers = new Map;
+  const targets = new Map;
+  const fallbackSeen = new Map;
   const watchImpl = options.watchImpl ?? watch;
   let rejectedRetries = 0;
+  let recheckAfterArming = false;
   const check = () => {
     if (retryTimer)
       clearTimeout(retryTimer);
@@ -11923,7 +12126,8 @@ function watchAftConfigFiles(options) {
     firstPendingAt = null;
     if (stopped)
       return;
-    revalidate();
+    if (revalidate())
+      recheckAfterArming = true;
     const seen = new Map;
     for (const path of options.paths) {
       const text = readTextOrNull(path);
@@ -11966,8 +12170,34 @@ function watchAftConfigFiles(options) {
     timer.unref?.();
   };
   function revalidate() {
-    const wanted = new Set(options.paths.map(watchDirFor));
+    const wanted = new Set;
+    const wantedCanonical = new Set;
+    const wantDirectory = (dir) => {
+      const canonical = canonicalDirectory(dir);
+      if (wantedCanonical.has(canonical))
+        return;
+      wantedCanonical.add(canonical);
+      wanted.add(dir);
+    };
+    for (const path of options.paths)
+      wantDirectory(watchDirFor(path));
     let moved = false;
+    for (const path of options.paths) {
+      try {
+        const resolved = realpathSync2(path);
+        const target = resolved === resolve4(path) ? undefined : resolved;
+        if (targets.get(path) !== target) {
+          if (target)
+            targets.set(path, target);
+          else
+            targets.delete(path);
+          fallbackSeen.delete(path);
+          moved = true;
+        }
+      } catch {}
+    }
+    for (const target of targets.values())
+      wantDirectory(watchDirFor(target));
     for (const [dir, entry] of watchers) {
       if (!wanted.has(dir) || entry.stale || identityOf(dir) !== entry.identity) {
         entry.watcher.close();
@@ -12006,14 +12236,29 @@ function watchAftConfigFiles(options) {
         moved = true;
       } catch {}
     }
+    const watchedCanonical = new Set(Array.from(watchers.keys(), canonicalDirectory));
+    for (const [path, target] of targets) {
+      if (watchedCanonical.has(canonicalDirectory(dirname2(target)))) {
+        fallbackSeen.delete(path);
+        continue;
+      }
+      const fingerprint = contentFingerprint(path);
+      if (!fallbackSeen.has(path) || fallbackSeen.get(path) !== fingerprint)
+        moved = true;
+      fallbackSeen.set(path, fingerprint);
+    }
     return moved;
   }
-  revalidate();
+  recheckAfterArming = revalidate();
   if (options.checkAtStart)
     check();
   const revalidateTimer = setInterval(() => {
-    if (!stopped && revalidate())
+    if (stopped)
+      return;
+    const moved = revalidate();
+    if (moved || recheckAfterArming)
       schedule();
+    recheckAfterArming = moved;
   }, CONFIG_WATCH_REVALIDATE_MS);
   revalidateTimer.unref?.();
   return () => {
@@ -12056,6 +12301,10 @@ function aftLiveSecurityKeys(keys) {
         return minutes(next) > minutes(current);
       }
     },
+    {
+      key: pick("lsp.max_servers"),
+      loosens: (current, next) => (typeof next === "number" ? next : 8) > (typeof current === "number" ? current : 8)
+    },
     ...[
       "diagnostics",
       "todos",
@@ -12162,10 +12411,10 @@ function startLiveConfigReload(options) {
   return { reload, stop };
 }
 // ../aft-bridge/dist/downloader.js
-import { createHash as createHash2, randomUUID } from "node:crypto";
-import { chmodSync, closeSync as closeSync2, copyFileSync, createWriteStream, existsSync as existsSync3, mkdirSync as mkdirSync2, openSync as openSync2, readdirSync, readFileSync as readFileSync4, renameSync as renameSync2, rmSync, statSync as statSync4, unlinkSync as unlinkSync2, writeSync } from "node:fs";
+import { createHash as createHash3, randomUUID } from "node:crypto";
+import { chmodSync, closeSync as closeSync3, copyFileSync, createWriteStream, existsSync as existsSync3, mkdirSync as mkdirSync2, openSync as openSync3, readdirSync, readFileSync as readFileSync4, renameSync as renameSync2, rmSync, statSync as statSync4, unlinkSync as unlinkSync2, writeSync } from "node:fs";
 import { hostname } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 
@@ -12281,7 +12530,7 @@ function getBinaryName() {
 function getCachedBinaryPath(version) {
   if (!version)
     return null;
-  const binaryPath = join8(getAftBinaryCacheDir(), version, getBinaryName());
+  const binaryPath = join7(getAftBinaryCacheDir(), version, getBinaryName());
   return existsSync3(binaryPath) ? binaryPath : null;
 }
 async function downloadBinary(version) {
@@ -12298,16 +12547,16 @@ async function downloadBinary(version) {
     return null;
   }
   const tag = rawTag.startsWith("v") ? rawTag : `v${rawTag}`;
-  const versionedCacheDir = join8(getAftBinaryCacheDir(), tag);
+  const versionedCacheDir = join7(getAftBinaryCacheDir(), tag);
   const binaryName = getBinaryName();
-  const binaryPath = join8(versionedCacheDir, binaryName);
+  const binaryPath = join7(versionedCacheDir, binaryName);
   if (existsSync3(binaryPath) && await isExpectedCachedBinary(binaryPath, tag)) {
     return binaryPath;
   }
   const downloadUrl = `https://github.com/${REPO}/releases/download/${tag}/${assetName}`;
   const checksumUrl = `https://github.com/${REPO}/releases/download/${tag}/checksums.sha256`;
   log(`Downloading AFT binary (${tag}) for ${platformKey}...`);
-  const lockPath = join8(versionedCacheDir, ".download.lock");
+  const lockPath = join7(versionedCacheDir, ".download.lock");
   let releaseLock = null;
   let binaryController = null;
   let checksumController = null;
@@ -12381,7 +12630,7 @@ async function downloadBinary(version) {
       warn(`Checksum verification failed: checksums.sha256 found but no entry for ${assetName}. ` + "Binary download aborted for security reasons.");
       return null;
     }
-    const hash = createHash2("sha256");
+    const hash = createHash3("sha256");
     let bytesWritten = 0;
     const guard = new TransformStream({
       transform(chunk, controller) {
@@ -12533,7 +12782,7 @@ function sweepStaleDownloadTemps(versionedCacheDir, binaryName) {
       if (!entry.isFile() || !entry.name.startsWith(tempPrefix) || !entry.name.endsWith(".tmp")) {
         continue;
       }
-      const tempPath = join8(versionedCacheDir, entry.name);
+      const tempPath = join7(versionedCacheDir, entry.name);
       const ageMs = Date.now() - statSync4(tempPath).mtimeMs;
       if (Math.abs(ageMs) > DOWNLOAD_LOCK_STALE_MS)
         unlinkSync2(tempPath);
@@ -12548,11 +12797,11 @@ async function acquireDownloadLock(lockPath, timing = {}) {
   while (true) {
     try {
       const owner = createDownloadLockOwner();
-      const fd = openSync2(lockPath, "wx");
+      const fd = openSync3(lockPath, "wx");
       try {
         writeSync(fd, owner);
       } finally {
-        closeSync2(fd);
+        closeSync3(fd);
       }
       return () => {
         try {
@@ -12623,8 +12872,8 @@ import { appendFile, lstat, mkdir, open, rename, rm, stat } from "node:fs/promis
 import { dirname as dirname3 } from "node:path";
 
 // ../aft-bridge/dist/private-storage.js
-import { closeSync as closeSync3, constants, copyFileSync as copyFileSync2, fchmodSync, fstatSync, lstatSync, mkdirSync as mkdirSync3, openSync as openSync3, readSync as readSync2, writeSync as writeSync2 } from "node:fs";
-import { isAbsolute as isAbsolute4, join as join9, parse, relative as relative3, resolve as resolve5, sep } from "node:path";
+import { closeSync as closeSync4, constants, copyFileSync as copyFileSync2, fchmodSync, fstatSync as fstatSync2, lstatSync, mkdirSync as mkdirSync3, openSync as openSync4, readSync as readSync3, writeSync as writeSync2 } from "node:fs";
+import { isAbsolute as isAbsolute3, join as join8, parse, relative as relative2, resolve as resolve5, sep } from "node:path";
 var PRIVATE_FILE_MODE = 384;
 var PRIVATE_DIRECTORY_MODE = 448;
 function privateMkdirSync(path, recursive = true) {
@@ -12638,13 +12887,13 @@ function privateCopyFileSync(source, destination) {
     copyFileSync2(source, destination);
     return;
   }
-  const input = openSync3(source, "r");
+  const input = openSync4(source, "r");
   let output;
   try {
-    output = openSync3(destination, "wx", PRIVATE_FILE_MODE);
+    output = openSync4(destination, "wx", PRIVATE_FILE_MODE);
     const buffer = Buffer.allocUnsafe(64 * 1024);
     for (;; ) {
-      const bytes = readSync2(input, buffer);
+      const bytes = readSync3(input, buffer);
       if (bytes === 0)
         break;
       let offset = 0;
@@ -12652,9 +12901,9 @@ function privateCopyFileSync(source, destination) {
         offset += writeSync2(output, buffer, offset, bytes - offset);
     }
   } finally {
-    closeSync3(input);
+    closeSync4(input);
     if (output !== undefined)
-      closeSync3(output);
+      closeSync4(output);
   }
 }
 var warned = new Set;
@@ -12663,21 +12912,21 @@ function openPrivateStorageDir(root, path = root) {
   if (!root || base === parse(base).root) {
     throw new Error(`refusing filesystem root as private storage: ${base}`);
   }
-  const rel = relative3(base, resolve5(path));
-  if (rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute4(rel))
+  const rel = relative2(base, resolve5(path));
+  if (rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute3(rel))
     return;
   privateMkdirSync(path);
   if (process.platform === "win32")
     return;
   let current = base;
   for (const component of ["", ...rel.split(sep).filter(Boolean)]) {
-    current = join9(current, component);
+    current = join8(current, component);
     let fd;
     try {
       if (lstatSync(current).isSymbolicLink())
         return;
-      fd = openSync3(current, constants.O_RDONLY | constants.O_DIRECTORY | constants.O_NOFOLLOW);
-      if ((fstatSync(fd).mode & 63) !== 0)
+      fd = openSync4(current, constants.O_RDONLY | constants.O_DIRECTORY | constants.O_NOFOLLOW);
+      if ((fstatSync2(fd).mode & 63) !== 0)
         fchmodSync(fd, PRIVATE_DIRECTORY_MODE);
     } catch (error) {
       if (!warned.has(current)) {
@@ -12688,7 +12937,7 @@ function openPrivateStorageDir(root, path = root) {
       return;
     } finally {
       if (fd !== undefined)
-        closeSync3(fd);
+        closeSync4(fd);
     }
   }
 }
@@ -12924,21 +13173,23 @@ ${reflowText}`;
   }
   return " Auto-formatted.";
 }
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/client.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/client.js
 import { promises as fs3 } from "node:fs";
+import { createHash as createHash4 } from "node:crypto";
 import { debuglog } from "node:util";
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/auth.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/auth.js
 import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/socket.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/socket.js
 import net from "node:net";
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/envelope.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/envelope.js
 var PROTOCOL_VERSION = 2;
 var HEADER_LEN = 21;
 var FROZEN_PREFIX_LEN = 5;
 var MAX_FRAME_BODY_LEN = 64 * 1024 * 1024;
+var MAX_DELIVERED_FRAME_LEN = 4 * 1024 * 1024;
 var FrameType;
 (function(FrameType) {
   FrameType[FrameType["Request"] = 0] = "Request";
@@ -12976,6 +13227,8 @@ var FLAG_PRIORITY_SHIFT = 1;
 var FLAG_LAST = 8;
 var FLAG_ADMISSION_MASK = 48;
 var FLAG_ADMISSION_SHIFT = 4;
+var DAEMON_ORIGIN_FLAG = 64;
+var SUBSCRIPTION_FLAG = 128;
 var FLAG_RESERVED_MASK = 0;
 function buildFlags(binary, priority, last, admissionClass = AdmissionClass.Normal) {
   let flags = 0;
@@ -13110,7 +13363,7 @@ function encodeFrame(frame) {
   return output;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/socket.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/socket.js
 class SocketClosedError extends Error {
 }
 
@@ -13160,14 +13413,12 @@ class SubcSocket {
     sock.on("data", (chunk) => {
       this.chunks.push(chunk);
       this.buffered += chunk.length;
-      if (this.waiter) {
+      if (this.waiter && this.waiter.extendOnProgress && this.buffered < this.waiter.need) {
         if (this.waiter.immediate) {
           clearImmediate(this.waiter.immediate);
           this.waiter.immediate = null;
         }
-        if (this.waiter.extendOnProgress && this.buffered < this.waiter.need) {
-          this.armWaiterTimer(this.waiter);
-        }
+        this.armWaiterTimer(this.waiter);
       }
       this.tryServe();
     });
@@ -13184,12 +13435,18 @@ class SubcSocket {
     return this.sock.localPort ?? null;
   }
   static connect(host, port, deadlineMs) {
+    return SubcSocket.connectTo({ host, port }, `${host}:${port}`, deadlineMs);
+  }
+  static connectLocal(path, deadlineMs) {
+    return SubcSocket.connectTo({ path }, path, deadlineMs);
+  }
+  static connectTo(options, endpoint, deadlineMs) {
     return new Promise((resolve, reject) => {
-      const sock = net.connect({ host, port });
+      const sock = net.connect(options);
       sock.setNoDelay(true);
       const timer = setTimeout(() => {
         sock.destroy();
-        reject(new SocketTimeoutError(`timed out connecting to ${host}:${port}`));
+        reject(new SocketTimeoutError(`timed out connecting to ${endpoint}`));
       }, Math.max(0, deadlineMs - Date.now()));
       sock.once("connect", () => {
         clearTimeout(timer);
@@ -13406,7 +13663,7 @@ class SubcSocket {
   }
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/auth.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/auth.js
 var NONCE_LEN = 32;
 var MAX_AUTH_MESSAGE_LEN = 4096;
 var SERVER_PROOF_DOMAIN = "subc-server-v1";
@@ -13480,7 +13737,7 @@ async function authenticateClient(sock, conn, deadlineMs) {
   await writeMessage(sock, { client_auth: Array.from(clientAuth) }, deadlineMs);
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/connection-file.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/connection-file.js
 import { promises as fs2 } from "node:fs";
 var SCHEMA_VERSION = 1;
 var MIN_KEY_LEN = 32;
@@ -13527,7 +13784,10 @@ function verifyOwnerOnly(path, stat, expectedUid) {
 async function readConnectionFile(path) {
   return readConnectionFileForUid(path, process.geteuid?.());
 }
-async function readConnectionFileForUid(path, expectedUid) {
+async function readConnectionFileWithLocalEndpoint(path) {
+  return readConnectionFileForUid(path, process.geteuid?.(), true);
+}
+async function readConnectionFileForUid(path, expectedUid, includeLocalEndpoint = false) {
   const handle = await fs2.open(path, "r");
   let raw;
   try {
@@ -13566,13 +13826,26 @@ async function readConnectionFileForUid(path, expectedUid) {
     daemonVer: parsed.daemon_ver ?? ""
   };
   validate(info);
+  if (includeLocalEndpoint && parsed.local_endpoint != null) {
+    const endpoint = parsed.local_endpoint;
+    if (endpoint.kind === "unix" && typeof endpoint.path === "string" && endpoint.path.length > 0) {
+      info.localEndpoint = { kind: "unix", path: endpoint.path };
+    } else if (endpoint.kind === "pipe" && typeof endpoint.name === "string" && endpoint.name.length > 0) {
+      info.localEndpoint = { kind: "pipe", name: endpoint.name };
+    } else {
+      throw new ConnectionFileError("connection file local_endpoint must name a unix path or pipe name");
+    }
+  }
   return info;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/launch-nonce.js
-import { closeSync as closeSync4, fstatSync as fstatSync2, readSync as readSync3 } from "node:fs";
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/launch-nonce.js
+import { closeSync as closeSync5, fstatSync as fstatSync3, readSync as readSync4 } from "node:fs";
+import { connect } from "node:net";
 var SUBC_LAUNCH_NONCE_ENV = "SUBC_LAUNCH_NONCE";
 var SUBC_LAUNCH_NONCE_FD_ENV = "SUBC_LAUNCH_NONCE_FD";
+var SUBC_LAUNCH_NONCE_PIPE_ENV = "SUBC_LAUNCH_NONCE_PIPE";
+var SUBC_LAUNCH_NONCE_PIPE_FALLBACK_ENV = "SUBC_LAUNCH_NONCE_PIPE_FALLBACK";
 class LaunchNonceError extends Error {
   name = "LaunchNonceError";
   kind;
@@ -13591,9 +13864,21 @@ class LaunchNonceError extends Error {
     this.foundInode = details.foundInode;
   }
 }
-function launchNonceOrUndefined() {
-  const result = processCell().result();
-  return result.ok ? result.nonce ?? undefined : undefined;
+function isLaunchNonceError(error) {
+  return error instanceof Error && error.name === "LaunchNonceError" && typeof error.kind === "string";
+}
+async function launchNonceAsync() {
+  const cell = processCell();
+  return unwrap(await (cell.resultAsync?.() ?? cell.result()));
+}
+async function launchNonceOrUndefinedAsync() {
+  try {
+    return await launchNonceAsync();
+  } catch (error) {
+    if (isLaunchNonceError(error))
+      return;
+    throw error;
+  }
 }
 var PROCESS_CELL_KEY = Symbol.for("@cortexkit/subc-client/launch-nonce/v1");
 function processCell() {
@@ -13613,20 +13898,60 @@ function unwrap(result) {
 
 class LaunchNonceCell {
   cached;
+  pending;
   descriptorReads = 0;
   lookup;
   platform;
   stat;
-  constructor(lookup, platform = process.platform, stat = (fd) => fstatSync2(fd, { bigint: true })) {
+  pipeReader;
+  constructor(lookup, platform = process.platform, stat = (fd) => fstatSync3(fd, { bigint: true }), pipeReader = readLaunchNoncePipe) {
     this.lookup = lookup;
     this.platform = platform;
     this.stat = stat;
+    this.pipeReader = pipeReader;
   }
   result() {
+    if (this.cached === undefined && this.platform === "win32" && this.lookup(SUBC_LAUNCH_NONCE_PIPE_ENV) !== undefined) {
+      const fallback = this.permittedPipeFallback();
+      if (fallback === undefined) {
+        throw new LaunchNonceError("PipeNeedsAsync", "call launchNonceAsync() before the synchronous reader when SUBC_LAUNCH_NONCE_PIPE is set");
+      }
+      this.cached = { ok: true, nonce: fallback };
+    }
     if (this.cached === undefined)
       this.cached = this.read();
     return this.cached;
   }
+  async resultAsync() {
+    if (this.cached !== undefined)
+      return this.cached;
+    if (this.pending !== undefined)
+      return this.pending;
+    const named = this.platform === "win32" ? this.lookup(SUBC_LAUNCH_NONCE_PIPE_ENV) : undefined;
+    if (named === undefined)
+      return this.result();
+    const fallback = this.permittedPipeFallback();
+    this.pending = this.pipeReader(named).then((nonce) => ({ ok: true, nonce: fallback !== undefined && nonce.value !== fallback.value ? fallback : nonce }), (error) => {
+      if (fallback !== undefined)
+        return { ok: true, nonce: fallback };
+      if (!isLaunchNonceError(error))
+        throw error;
+      return { ok: false, error };
+    }).then((result) => {
+      this.cached ??= result;
+      return this.cached;
+    });
+    return this.pending;
+  }
+  permittedPipeFallback() {
+    if (this.lookup(SUBC_LAUNCH_NONCE_PIPE_FALLBACK_ENV) !== "env")
+      return;
+    const value = this.lookup(SUBC_LAUNCH_NONCE_ENV);
+    return value ? makeLaunchNonce(value, "env") : undefined;
+  }
+  async getAsync() {
+    return unwrap(await this.resultAsync());
+  }
   get() {
     return unwrap(this.result());
   }
@@ -13665,7 +13990,7 @@ class LaunchNonceCell {
     const chunk = Buffer.alloc(256);
     let got;
     try {
-      got = readSync3(fd, chunk, 0, chunk.length, null);
+      got = readSync4(fd, chunk, 0, chunk.length, null);
     } catch (error) {
       if (isWouldBlock(error))
         throw emptyError(fd);
@@ -13677,7 +14002,7 @@ class LaunchNonceCell {
     const parts = [Buffer.from(chunk.subarray(0, got))];
     try {
       for (;; ) {
-        const n = readSync3(fd, chunk, 0, chunk.length, null);
+        const n = readSync4(fd, chunk, 0, chunk.length, null);
         if (n === 0)
           break;
         parts.push(Buffer.from(chunk.subarray(0, n)));
@@ -13754,11 +14079,201 @@ function errnoOf(error) {
 }
 function closeQuietly(fd) {
   try {
-    closeSync4(fd);
+    closeSync5(fd);
   } catch {}
 }
+async function readLaunchNoncePipe(name, connector = (path) => connect(path), openWindowMs = 500, readWindowMs = 2000) {
+  const deadline = Date.now() + openWindowMs;
+  for (;; ) {
+    try {
+      const bytes = await pipeAttempt(name, connector, Math.max(1, deadline - Date.now()), readWindowMs);
+      if (bytes.length === 0)
+        throw new LaunchNonceError("PipeEmpty", "the launch nonce named pipe is empty");
+      let value;
+      try {
+        value = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+      } catch {
+        throw new LaunchNonceError("PipeNotUtf8", "the launch nonce named pipe held bytes that are not UTF-8");
+      }
+      return makeLaunchNonce(value, "pipe");
+    } catch (error) {
+      if (isLaunchNonceError(error))
+        throw error;
+      const busy = error?.code === "EBUSY" || errnoOf(error) === 231;
+      if (!busy || Date.now() >= deadline) {
+        throw new LaunchNonceError("PipeNotOpen", "SUBC_LAUNCH_NONCE_PIPE names a pipe that could not be opened", { errno: errnoOf(error) });
+      }
+      await new Promise((resolve) => setTimeout(resolve, Math.min(10, Math.max(1, deadline - Date.now()))));
+    }
+  }
+}
+function pipeAttempt(name, connector, openWindowMs, readWindowMs) {
+  return new Promise((resolve, reject) => {
+    let socket;
+    try {
+      socket = connector(name);
+    } catch (error) {
+      reject(error);
+      return;
+    }
+    let connected = false;
+    let settled = false;
+    let size = 0;
+    const chunks = [];
+    let timer = setTimeout(() => finish(new LaunchNonceError("PipeNotOpen", "launch nonce pipe open timed out")), openWindowMs);
+    function finish(error) {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      socket.destroy();
+      if (error !== undefined)
+        reject(error);
+      else
+        resolve(Buffer.concat(chunks));
+    }
+    socket.once("connect", () => {
+      connected = true;
+      clearTimeout(timer);
+      timer = setTimeout(() => finish(new LaunchNonceError("PipeUnreadable", "launch nonce pipe read timed out")), readWindowMs);
+    });
+    socket.on("data", (chunk) => {
+      size += chunk.length;
+      if (size > 4096) {
+        finish(new LaunchNonceError("PipeUnreadable", "launch nonce pipe exceeded its byte limit"));
+        return;
+      }
+      chunks.push(Buffer.from(chunk));
+    });
+    socket.once("end", () => finish());
+    socket.once("error", (error) => finish(connected ? new LaunchNonceError("PipeUnreadable", "could not read the launch nonce from the named pipe", { errno: errnoOf(error) }) : error));
+    socket.once("close", () => {
+      if (!settled)
+        finish(new LaunchNonceError("PipeUnreadable", "launch nonce pipe closed before EOF"));
+    });
+  });
+}
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/route-handle.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/request-gate.js
+class Lane {
+  limit;
+  used = 0;
+  waiters = [];
+  failure;
+  constructor(limit) {
+    this.limit = limit;
+  }
+  acquire(timeoutMs, signal) {
+    if (this.failure)
+      return Promise.reject(this.failure);
+    if (signal?.aborted)
+      return Promise.reject(new Error("request cancelled before write"));
+    if (timeoutMs !== undefined && timeoutMs <= 0)
+      return Promise.reject(new Error("request deadline elapsed waiting for a slot"));
+    if (this.used < this.limit && this.waiters.length === 0) {
+      this.used++;
+      return Promise.resolve(this.releaser());
+    }
+    return new Promise((resolve, reject) => {
+      let timer;
+      const clean = () => {
+        if (timer !== undefined)
+          clearTimeout(timer);
+        signal?.removeEventListener("abort", abort);
+      };
+      const waiter = {
+        grant: () => {
+          clean();
+          resolve(this.releaser());
+        },
+        fail: (error) => {
+          clean();
+          reject(error);
+        }
+      };
+      const abort = () => {
+        const index = this.waiters.indexOf(waiter);
+        if (index < 0)
+          return;
+        this.waiters.splice(index, 1);
+        waiter.fail(new Error("request cancelled before write"));
+      };
+      this.waiters.push(waiter);
+      signal?.addEventListener("abort", abort, { once: true });
+      if (timeoutMs !== undefined)
+        timer = setTimeout(() => {
+          const index = this.waiters.indexOf(waiter);
+          if (index < 0)
+            return;
+          this.waiters.splice(index, 1);
+          waiter.fail(new Error("request deadline elapsed waiting for a slot"));
+        }, timeoutMs);
+    });
+  }
+  close(error) {
+    this.failure = error;
+    for (const waiter of this.waiters.splice(0))
+      waiter.fail(error);
+  }
+  releaser() {
+    let released = false;
+    return () => {
+      if (released)
+        return;
+      released = true;
+      const waiter = this.waiters.shift();
+      if (waiter)
+        waiter.grant();
+      else
+        this.used--;
+    };
+  }
+}
+
+class RequestGate {
+  total;
+  watches;
+  slots = new Set;
+  closed = new AbortController;
+  get signal() {
+    return this.closed.signal;
+  }
+  constructor(requestWindow, watchWindow) {
+    this.total = new Lane(requestWindow);
+    if (watchWindow !== undefined)
+      this.watches = new Lane(watchWindow);
+  }
+  async acquire(watch, timeoutMs, signal) {
+    const deadline = timeoutMs === undefined ? undefined : Date.now() + timeoutMs;
+    const watchRelease = watch && this.watches ? await this.watches.acquire(timeoutMs, signal) : undefined;
+    try {
+      const totalRelease = await this.total.acquire(deadline === undefined ? undefined : deadline - Date.now(), signal);
+      const slot = {
+        inFlight: false,
+        release: () => {
+          if (!this.slots.delete(slot))
+            return;
+          totalRelease();
+          watchRelease?.();
+        }
+      };
+      this.slots.add(slot);
+      return slot;
+    } catch (error) {
+      watchRelease?.();
+      throw error;
+    }
+  }
+  close(error) {
+    this.total.close(error);
+    this.watches?.close(error);
+    this.closed.abort(error);
+    for (const slot of this.slots)
+      slot.release();
+  }
+}
+
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/route-handle.js
 var connectionToken = new WeakMap;
 var reverseRequests = new WeakMap;
 
@@ -13851,10 +14366,13 @@ function sameRouteHandle(left, right) {
   return left === right;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.21.2/node_modules/@cortexkit/subc-client/dist/client.js
+// ../../node_modules/.bun/@cortexkit+subc-client@0.24.5/node_modules/@cortexkit/subc-client/dist/client.js
 var debug = debuglog("subc-client");
 var DEFAULT_HANDSHAKE_TIMEOUT_MS = 1e4;
 var DEFAULT_REQUEST_TIMEOUT_MS = 30000;
+var DEFAULT_SLEEP_GRACE_MS = 15000;
+var SLEEP_DETECTION_THRESHOLD_MS = 2000;
+var MIN_REQUEST_BUDGET_MS = 1;
 var TIMEOUT_ARBITRATION_GRACE_MS = 50;
 var LIVENESS_PROBE_WINDOW_MS = 2000;
 var REQUEST_DEADLINE_MARKER = "request_deadline";
@@ -13890,6 +14408,14 @@ class SubcCallError extends Error {
   }
 }
 
+class DaemonUnavailableError extends SubcCallError {
+  recovery = "user_action_required";
+  constructor(cause) {
+    super("not_sent", "CortexKit's daemon is not running or can't be reached on this computer, so this tool call was not sent. Retrying won't start it. Stop calling CortexKit tools and ask the user to start the daemon (run `ck setup`, or restart the CortexKit service), then try again after they confirm it is running.", errorCode(cause), cause);
+    this.name = "DaemonUnavailableError";
+  }
+}
+
 class SubcError extends Error {
   code;
   detail;
@@ -14014,6 +14540,14 @@ class SubcClient {
   reconnecting = null;
   generation = 1;
   routeOpenGateInstance;
+  requestGates;
+  wireSlots;
+  get gates() {
+    return this.requestGates ??= new Map;
+  }
+  get slots() {
+    return this.wireSlots ??= new Map;
+  }
   readerActive = false;
   constructor(sock, currentConn, opts) {
     this.sock = sock;
@@ -14029,8 +14563,15 @@ class SubcClient {
   }
   static async connect(opts) {
     const normalized = normalizeConnectOptions(opts);
-    const opened = await SubcClient.openConnection(normalized);
-    return new SubcClient(opened.sock, opened.conn, normalized);
+    try {
+      const opened = await SubcClient.openConnection(normalized);
+      return new SubcClient(opened.sock, opened.conn, normalized);
+    } catch (err) {
+      if (errorCode(err) === "ENOENT" || errorCode(err) === "ECONNREFUSED") {
+        throw new DaemonUnavailableError(err);
+      }
+      throw err;
+    }
   }
   async catalogList(moduleId) {
     const body = this.encode(moduleId === undefined ? { op: "catalog.list" } : { op: "catalog.list", module_id: moduleId });
@@ -14066,17 +14607,23 @@ class SubcClient {
   }
   async sendRouteOpen(target, identity, opts = {}) {
     const scope = validatedRouteScope(opts.scope);
-    const consumerIdentity = routeOpenConsumerIdentity(opts);
+    const consumerIdentity = await routeOpenConsumerIdentity(opts);
     const reverseRequests = opts.reverseRequests ?? new ReverseRequestRegistry;
     reverseRequests.seal();
     const consumerCapabilities = reverseRequests.capabilities();
     const body = this.encode({
       op: "route.open",
+      busy_refusals: true,
       target,
       identity,
       ...consumerIdentity ? { consumer_identity: consumerIdentity } : {},
       ...consumerCapabilities.length > 0 ? { consumer_capabilities: consumerCapabilities } : {},
-      ...scope ? { scope: { owner: scope.owner, ref: scope.ref, scope_epoch: scope.scopeEpoch } } : {}
+      ...scope ? { scope: {
+        owner: scope.owner,
+        ref: scope.ref,
+        scope_epoch: scope.scopeEpoch,
+        ...scope.bindProof !== undefined ? { bind_proof: scope.bindProof } : {}
+      } } : {}
     });
     let installed = null;
     const install = (frame) => {
@@ -14087,6 +14634,8 @@ class SubcClient {
         throw new SubcError(`route.open returned no route handle: ${JSON.stringify(parsed)}`);
       }
       installed = this.installRoute(parsed.route_channel, parsed.route_epoch, reverseRequests);
+      if (parsed.request_window !== undefined)
+        this.gates.set(installed, new RequestGate(parsed.request_window, parsed.watch_window));
       this.routeModules.set(parsed.route_channel, target.module_id);
       return true;
     };
@@ -14116,7 +14665,7 @@ class SubcClient {
     const bytes = binary ? requireBinaryBody(body) : body instanceof Uint8Array ? body : this.encode(body);
     const priority = opts.priority ?? Priority.Interactive;
     const admission = opts.admissionClass ?? AdmissionClass.Normal;
-    const reply = await this.send(handle, bytes, priority, admission, opts.timeoutMs, opts.onProgress, undefined, undefined, binary, opts.signal);
+    const reply = await this.send(handle, bytes, priority, admission, opts.timeoutMs, opts.onProgress, undefined, undefined, binary, opts.signal, validatedSleepGraceMs(opts.sleepGraceMs ?? this.opts.sleepGraceMs ?? DEFAULT_SLEEP_GRACE_MS));
     return this.decodeReply(reply);
   }
   async call(moduleId, method, params, opts = {}) {
@@ -14132,10 +14681,12 @@ class SubcClient {
   }
   async managedCall(moduleId, body, opts) {
     let retriedUnknownChannel = false;
+    const startedAt = opts.timeoutMs === undefined ? undefined : this.opts.now();
+    let attemptOpts = opts;
     for (;; ) {
-      const routeHandle = await this.cachedRouteHandle(moduleId, opts);
+      const routeHandle = await this.cachedRouteHandle(moduleId, attemptOpts);
       try {
-        return await this.managedRequest(routeHandle, body, opts);
+        return await this.managedRequest(routeHandle, body, attemptOpts);
       } catch (err) {
         if (!(err instanceof SubcCallError))
           throw this.terminalCallError("managed call failed", err);
@@ -14145,6 +14696,15 @@ class SubcClient {
           this.evictRouteHandle(routeHandle);
           continue;
         }
+        if (isDataPlaneDrainRefusal(err.code) && !retriedUnknownChannel && !this.closeStarted && !opts.signal?.aborted) {
+          const remainingMs = opts.timeoutMs === undefined || startedAt === undefined ? undefined : opts.timeoutMs - (this.opts.now() - startedAt);
+          if (remainingMs === undefined || remainingMs > 0) {
+            retriedUnknownChannel = true;
+            this.evictRouteHandle(routeHandle);
+            attemptOpts = remainingMs === undefined ? opts : { ...opts, timeoutMs: remainingMs };
+            continue;
+          }
+        }
         if (deadBindCode && retriedUnknownChannel) {
           this.evictRouteHandle(routeHandle);
         }
@@ -14174,6 +14734,8 @@ class SubcClient {
   }
   subscribe(handle, body, onEvent, opts = {}) {
     this.assertLiveHandle(handle);
+    if (this.gates.has(handle))
+      return this.subscribeGated(handle, body, onEvent, opts);
     const bytes = body instanceof Uint8Array ? body : this.encode(body);
     const priority = opts.priority ?? Priority.Interactive;
     const admission = opts.admissionClass ?? AdmissionClass.Normal;
@@ -14181,22 +14743,43 @@ class SubcClient {
     const key = pendingKey(handle, corr);
     let subscriptionPending = null;
     let resolveClosed = null;
+    let resolveEnded;
+    const ended = new Promise((resolve) => {
+      resolveEnded = resolve;
+    });
+    const endFailure = (err, frame) => {
+      if (frame?.header.ty === FrameType.Error) {
+        const error = err;
+        resolveEnded({ kind: "error", code: error.code, message: error.message, detail: error.detail });
+      } else if (err instanceof SubcError && err.closeReason && err.closeReason !== "connection_lost") {
+        resolveEnded({ kind: "route_closed", reason: err.closeReason });
+      } else {
+        resolveEnded({ kind: "connection_lost" });
+      }
+    };
     const closed = new Promise((resolve, reject) => {
       if (this.closedErr) {
+        endFailure(this.closedErr);
         reject(this.closedErr);
         return;
       }
       resolveClosed = resolve;
       subscriptionPending = {
         handle,
-        resolve: () => resolve(),
-        reject,
+        resolve: (frame) => {
+          resolveEnded(frame.header.ty === FrameType.Response ? { kind: "response", body: frame.body } : { kind: "stream_end" });
+          resolve();
+        },
+        reject: (err, frame) => {
+          endFailure(err, frame);
+          reject(err);
+        },
         onProgress: onEvent,
         timer: null,
         subscription: true
       };
       this.pending.set(key, subscriptionPending);
-      const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false, admission), handle.channel, handle.epoch, corr, bytes);
+      const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false, admission) | SUBSCRIPTION_FLAG, handle.channel, handle.epoch, corr, bytes);
       writeBorrowed(this.sock, encodeFrame(frame), Date.now() + DEFAULT_REQUEST_TIMEOUT_MS).catch((err) => {
         const pending = this.pending.get(key);
         if (pending)
@@ -14209,11 +14792,14 @@ class SubcClient {
         return;
       cancelled = true;
       if (subscriptionPending && resolveClosed)
-        this.settle(key, subscriptionPending, resolveClosed);
+        this.settle(key, subscriptionPending, () => {
+          resolveEnded({ kind: "cancelled" });
+          resolveClosed?.();
+        });
       if (this.isLiveHandle(handle))
         this.cancel(handle, corr, priority);
     };
-    return { unsubscribe, closed };
+    return { unsubscribe, closed, ended };
   }
   attachCancelSignal(signal, key, handle, corr, priority) {
     if (!handle)
@@ -14279,7 +14865,7 @@ class SubcClient {
     this.sendRouteGoodbye(handle);
   }
   async closeManagedRoute(target, identity, opts = {}) {
-    const key = routeCacheKey(target, identity, routeOpenConsumerIdentity(opts), (opts.reverseRequests ?? new ReverseRequestRegistry).capabilities(), validatedRouteScope(opts.scope));
+    const key = routeCacheKey(target, identity, await routeOpenConsumerIdentity(opts), (opts.reverseRequests ?? new ReverseRequestRegistry).capabilities(), validatedRouteScope(opts.scope));
     const cached = this.routes.get(key);
     if (!cached)
       return;
@@ -14332,10 +14918,21 @@ class SubcClient {
     });
   }
   static async openConnection(opts) {
-    const conn = await readConnectionFile(opts.connectionFile);
+    const conn = opts.transport === "local" ? await readConnectionFileWithLocalEndpoint(opts.connectionFile) : await readConnectionFile(opts.connectionFile);
     const deadline = Date.now() + (opts.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS);
     const endpoint = conn.endpoints[0];
-    const sock = await SubcSocket.connect(endpoint.host, endpoint.port, deadline);
+    let sock;
+    if (opts.transport === "local") {
+      const local = conn.localEndpoint;
+      if (!local)
+        throw new SubcError("connection file has no local_endpoint", "local_endpoint_absent");
+      if (local.kind === "unix" !== (process.platform !== "win32")) {
+        throw new SubcError("unsupported local endpoint kind on this platform", "local_endpoint_unsupported");
+      }
+      sock = await SubcSocket.connectLocal(local.kind === "unix" ? local.path : local.name, deadline);
+    } else {
+      sock = await SubcSocket.connect(endpoint.host, endpoint.port, deadline);
+    }
     try {
       await authenticateClient(sock, conn, deadline);
     } catch (err) {
@@ -14347,7 +14944,125 @@ class SubcClient {
   async controlRpc(body, acceptFrame, onLateResponse) {
     return this.send(null, body, Priority.Interactive, AdmissionClass.Normal, undefined, undefined, acceptFrame, onLateResponse);
   }
-  send(handle, body, priority, admission, timeoutMs, onProgress, acceptFrame, onLateResponse, binary = false, signal) {
+  send(...args) {
+    const [handle, body, priority, admission, timeoutMs, onProgress, acceptFrame, onLateResponse, binary, signal, sleepGraceMs] = args;
+    if (!handle || !this.gates.has(handle))
+      return this.sendAttempt(...args);
+    return this.gatedRequest(handle, false, timeoutMs, signal, (slot, remaining) => this.sendAttempt(handle, body, priority, admission, remaining, onProgress, acceptFrame, onLateResponse, binary, signal, sleepGraceMs, slot));
+  }
+  async gatedRequest(handle, watch, timeoutMs, signal, attempt) {
+    const gate = this.gates.get(handle);
+    const deadline = this.opts.now() + (timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS);
+    let slot;
+    try {
+      slot = await gate.acquire(watch, deadline - this.opts.now(), signal);
+    } catch (error) {
+      throw this.notSentCallError("request was not sent while waiting for a route slot", error);
+    }
+    let delay = 25;
+    let busyDeadlineError;
+    try {
+      for (;; ) {
+        if (gate.signal.aborted)
+          throw gate.signal.reason;
+        if (signal?.aborted)
+          throw this.notSentCallError("request cancelled before write", signal.reason);
+        this.assertLiveHandle(handle);
+        const budget = deadline - this.opts.now();
+        if (budget < MIN_REQUEST_BUDGET_MS)
+          throw busyDeadlineError ?? this.notSentCallError("request deadline elapsed before write", new Error("less than 1ms remains before the request deadline"));
+        try {
+          return await attempt(slot, budget);
+        } catch (error) {
+          const refusal = error instanceof SubcError ? error : error instanceof SubcCallError && error.cause instanceof SubcError ? error.cause : undefined;
+          if (!refusal || !isRouteBusyRetryable(errorFrameFlags.get(refusal) ?? 0, refusal.code, this.gates.get(handle) === gate))
+            throw error;
+          const exhausted = () => new SubcCallError("not_sent", `daemon refused before forwarding: ${refusal.message}`, "route_busy", refusal);
+          busyDeadlineError = exhausted();
+          const remaining = deadline - this.opts.now();
+          if (remaining <= 0 || signal?.aborted)
+            throw exhausted();
+          const ms = Math.min(remaining, delay * (0.5 + this.opts.random() * 0.5));
+          delay = Math.min(1000, delay * 2);
+          const proceed = await this.busySleep(ms, gate.signal, signal);
+          if (gate.signal.aborted)
+            throw gate.signal.reason;
+          if (!proceed || this.opts.now() >= deadline)
+            throw exhausted();
+        }
+      }
+    } finally {
+      if (!slot.inFlight)
+        slot.release();
+    }
+  }
+  async busySleep(ms, closed, signal) {
+    if (closed.aborted || signal?.aborted)
+      return false;
+    let abort;
+    const cancelled = new Promise((resolve) => {
+      abort = () => resolve(false);
+    });
+    closed.addEventListener("abort", abort, { once: true });
+    signal?.addEventListener("abort", abort, { once: true });
+    try {
+      return await Promise.race([this.opts.sleep(ms).then(() => true), cancelled]);
+    } finally {
+      closed.removeEventListener("abort", abort);
+      signal?.removeEventListener("abort", abort);
+    }
+  }
+  subscribeGated(handle, body, onEvent, opts) {
+    const bytes = body instanceof Uint8Array ? body : this.encode(body);
+    const priority = opts.priority ?? Priority.Interactive;
+    const admission = opts.admissionClass ?? AdmissionClass.Normal;
+    const abort = new AbortController;
+    let current;
+    let cancelled = false;
+    let resolveClosed;
+    let rejectClosed;
+    let resolveEnded;
+    const closed = new Promise((resolve, reject) => {
+      resolveClosed = resolve;
+      rejectClosed = reject;
+    });
+    const ended = new Promise((resolve) => {
+      resolveEnded = resolve;
+    });
+    this.gatedRequest(handle, true, undefined, abort.signal, (slot, remaining) => this.sendAttempt(handle, bytes, priority, admission, remaining, onEvent, undefined, undefined, false, undefined, undefined, slot, true, (key, pending, corr) => {
+      current = { key, pending, corr };
+    })).then((frame) => {
+      if (cancelled)
+        return;
+      resolveEnded(frame.header.ty === FrameType.Response ? { kind: "response", body: frame.body } : { kind: "stream_end" });
+      resolveClosed();
+    }, (error) => {
+      if (cancelled)
+        return;
+      if (error instanceof SubcError && error.closeReason)
+        resolveEnded(error.closeReason === "connection_lost" ? { kind: "connection_lost" } : { kind: "route_closed", reason: error.closeReason });
+      else if (error instanceof SubcError || error instanceof SubcCallError)
+        resolveEnded({ kind: "error", code: error.code, message: error.message, detail: error.detail });
+      else
+        resolveEnded({ kind: "connection_lost" });
+      rejectClosed(error);
+    });
+    return { closed, ended, unsubscribe: () => {
+      if (cancelled)
+        return;
+      cancelled = true;
+      abort.abort();
+      if (current && this.pending.get(current.key) === current.pending) {
+        const { key, pending, corr } = current;
+        this.settle(key, pending, () => pending.reject(new SubcError("subscription cancelled")));
+        if (this.isLiveHandle(handle))
+          this.cancel(handle, corr, priority);
+      }
+      resolveEnded({ kind: "cancelled" });
+      resolveClosed();
+    } };
+  }
+  sendAttempt(handle, body, priority, admission, timeoutMs, onProgress, acceptFrame, onLateResponse, binary = false, signal, sleepGraceMs = this.opts.sleepGraceMs ?? DEFAULT_SLEEP_GRACE_MS, slot, subscription = false, registered) {
     if (handle)
       this.assertLiveHandle(handle);
     if (this.closedErr)
@@ -14361,7 +15076,7 @@ class SubcClient {
     const key = pendingKey(handle, corr);
     const channel = handle?.channel ?? 0;
     const epoch = handle?.epoch ?? 0;
-    const frame = buildFrame(FrameType.Request, buildFlags(binary, priority, false, admission), channel, epoch, corr, body);
+    const frame = buildFrame(FrameType.Request, buildFlags(binary, priority, false, admission) | (subscription ? SUBSCRIPTION_FLAG : 0), channel, epoch, corr, body);
     return new Promise((resolve, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
@@ -14371,11 +15086,27 @@ class SubcClient {
         onProgress,
         timer: null,
         acceptFrame,
-        onLateResponse
+        onLateResponse,
+        slot,
+        subscription
       };
-      pending.timer = setTimeout(() => this.arbitrateTimeout(key, pending, channel, corr, ms), ms);
+      if (!subscription)
+        this.armRequestTimeout(key, pending, channel, corr, ms, sleepGraceMs);
       this.pending.set(key, pending);
-      writeBorrowed(this.sock, encodeFrame(frame), Date.now() + ms).catch((error) => {
+      registered?.(key, pending, corr);
+      if (slot && handle) {
+        slot.inFlight = true;
+        this.slots.set(key, { handle, slot });
+      }
+      const write = writeTrackedBorrowed(this.sock, encodeFrame(frame), Date.now() + ms);
+      if (slot && !write.queued) {
+        this.slots.delete(key);
+        slot.inFlight = false;
+        slot.release();
+      }
+      write.completed.catch((error) => {
+        if (error instanceof SocketWriteNotQueuedError || error instanceof SocketWriteQueuedError)
+          error = error.cause ?? error;
         const current = this.pending.get(key);
         if (current)
           this.rejectPending(key, current, error instanceof Error ? error : new SubcError(String(error)));
@@ -14384,10 +15115,16 @@ class SubcClient {
         this.attachCancelSignal(signal, key, handle, corr, priority);
     });
   }
+  armRequestTimeout(key, pending, channel, corr, ms, sleepGraceMs) {
+    pending.sleepGrace = { wallStartMs: Date.now(), awakeStartMs: performance.now(), ms: sleepGraceMs, used: false };
+    pending.timer = setTimeout(() => this.arbitrateTimeout(key, pending, channel, corr, ms), ms);
+  }
   arbitrateTimeout(key, pending, channel, corr, ms) {
     const settleAsTimeout = () => {
       if (pending.onLateResponse)
         this.lateResponses.set(key, pending.onLateResponse);
+      if (pending.slot?.inFlight && pending.handle && this.isLiveHandle(pending.handle))
+        this.cancel(pending.handle, corr);
       this.rejectPending(key, pending, new SubcError(this.timeoutMessage(channel, corr, ms), REQUEST_DEADLINE_MARKER));
     };
     const graceDeadline = Date.now() + this.opts.timeoutArbitrationGraceMs;
@@ -14399,6 +15136,17 @@ class SubcClient {
         setImmediate(arbitrate);
         return;
       }
+      const sleep = pending.sleepGrace;
+      if (sleep && !sleep.used && sleep.ms > 0) {
+        const wallElapsed = Date.now() - sleep.wallStartMs;
+        const awakeElapsed = performance.now() - sleep.awakeStartMs;
+        const sleptMs = wallElapsed - awakeElapsed;
+        if (sleptMs > SLEEP_DETECTION_THRESHOLD_MS) {
+          sleep.used = true;
+          pending.timer = setTimeout(() => this.arbitrateTimeout(key, pending, channel, corr, ms), sleep.ms);
+          return;
+        }
+      }
       settleAsTimeout();
     };
     setImmediate(arbitrate);
@@ -14409,7 +15157,7 @@ class SubcClient {
     const priority = opts.priority ?? Priority.Interactive;
     const admission = opts.admissionClass ?? AdmissionClass.Normal;
     try {
-      const reply = await this.sendManaged(handle, bytes, priority, admission, opts.timeoutMs, opts.onProgress, binary, opts.signal);
+      const reply = await this.sendManaged(handle, bytes, priority, admission, opts.timeoutMs, opts.onProgress, binary, opts.signal, validatedSleepGraceMs(opts.sleepGraceMs ?? this.opts.sleepGraceMs ?? DEFAULT_SLEEP_GRACE_MS));
       return this.decodeReply(reply);
     } catch (error) {
       if (error instanceof SubcCallError)
@@ -14417,7 +15165,13 @@ class SubcClient {
       throw this.terminalCallError("managed call failed", error);
     }
   }
-  sendManaged(handle, body, priority, admission, timeoutMs, onProgress, binary = false, signal) {
+  sendManaged(...args) {
+    const [handle, body, priority, admission, timeoutMs, onProgress, binary, signal, sleepGraceMs] = args;
+    if (!this.gates.has(handle))
+      return this.sendManagedAttempt(...args);
+    return this.gatedRequest(handle, false, timeoutMs, signal, (slot, remaining) => this.sendManagedAttempt(handle, body, priority, admission, remaining, onProgress, binary, signal, sleepGraceMs, slot));
+  }
+  sendManagedAttempt(handle, body, priority, admission, timeoutMs, onProgress, binary = false, signal, sleepGraceMs = this.opts.sleepGraceMs ?? DEFAULT_SLEEP_GRACE_MS, slot) {
     try {
       this.assertLiveHandle(handle);
     } catch (error) {
@@ -14451,12 +15205,22 @@ class SubcClient {
         reject,
         onProgress,
         timer: null,
-        classifyFailure
+        classifyFailure,
+        slot
       };
-      pending.timer = setTimeout(() => this.arbitrateTimeout(key, pending, handle.channel, corr, ms), ms);
+      this.armRequestTimeout(key, pending, handle.channel, corr, ms, sleepGraceMs);
       this.pending.set(key, pending);
+      if (slot) {
+        slot.inFlight = true;
+        this.slots.set(key, { handle, slot });
+      }
       const write = writeTrackedBorrowed(this.sock, encodeFrame(frame), Date.now() + ms);
       handedToSocket = write.queued;
+      if (slot && !write.queued) {
+        this.slots.delete(key);
+        slot.inFlight = false;
+        slot.release();
+      }
       write.completed.catch((error) => {
         const current = this.pending.get(key);
         if (current)
@@ -14473,7 +15237,7 @@ class SubcClient {
       throw new SubcCallError("terminal", "managed call requires a BindIdentity in SubcClient.connect({ identity }) or call(..., { identity })", "missing_identity");
     }
     const target = { kind: opts.targetKind ?? this.opts.targetKind, module_id: moduleId };
-    const consumerIdentity = routeOpenConsumerIdentity(opts);
+    const consumerIdentity = await routeOpenConsumerIdentity(opts);
     const reverseRequests = opts.reverseRequests ?? new ReverseRequestRegistry;
     reverseRequests.seal();
     const key = routeCacheKey(target, identity, consumerIdentity, reverseRequests.capabilities(), scope);
@@ -14558,6 +15322,7 @@ class SubcClient {
       if ("handle" in outcome) {
         const { handle } = outcome;
         if (cached.closed) {
+          this.failHandle(handle, new SubcError("route closed during route.open", "route_closed", undefined, "closed_by_caller"));
           this.liveRoutes.delete(handle.channel);
           this.sendRouteGoodbye(handle);
           throw this.routeClosedDuringOpen();
@@ -14681,6 +15446,9 @@ class SubcClient {
         return;
       } catch (err) {
         if (!isConsumerReconnectTransient(err) || attempt >= this.opts.reconnectBackoff.maxAttempts) {
+          if (isConsumerReconnectTransient(err) && !(err instanceof AuthError)) {
+            throw new DaemonUnavailableError(err);
+          }
           if (err instanceof AuthError && attempt > 1) {
             throw new AuthError(`reconnect gave up after ${attempt} attempts: ${err.message} — the connection file and the daemon's key disagree persistently ` + `(daemon restarting in a loop, split connection-file paths, or a genuinely foreign daemon on this port); ` + `check the daemon, then restart this host app`);
           }
@@ -14803,6 +15571,16 @@ class SubcClient {
     }
     const key = pendingKey(handle, frame.header.corr);
     const pending = this.pending.get(key);
+    if (frame.header.ty === FrameType.Response || frame.header.ty === FrameType.Error || frame.header.ty === FrameType.StreamEnd) {
+      const record = this.slots.get(key);
+      if (record) {
+        this.slots.delete(key);
+        record.slot.inFlight = false;
+        const busy = frame.header.ty === FrameType.Error && pending?.slot === record.slot && isRouteBusyRetryable(frame.header.flags, this.errorFromFrame(frame).code, !!handle && this.gates.has(handle));
+        if (!busy)
+          record.slot.release();
+      }
+    }
     if (pending) {
       if (pending.acceptFrame && !pending.acceptFrame(frame))
         return;
@@ -14818,7 +15596,7 @@ class SubcClient {
           this.settle(key, pending, () => pending.resolve(frame));
           return;
         case FrameType.Error:
-          this.settle(key, pending, () => pending.reject(this.errorFromFrame(frame)));
+          this.settle(key, pending, () => pending.reject(this.errorFromFrame(frame), frame));
           return;
         default:
           return;
@@ -14955,6 +15733,14 @@ class SubcClient {
     return this.legacyChannelReasons.get(channel) ?? "unknown";
   }
   failHandle(handle, error) {
+    this.gates.get(handle)?.close(error);
+    this.gates.delete(handle);
+    for (const [key, record] of this.slots) {
+      if (sameRouteHandle(record.handle, handle)) {
+        record.slot.release();
+        this.slots.delete(key);
+      }
+    }
     for (const [key, pending] of this.pending) {
       if (pending.handle && sameRouteHandle(pending.handle, handle))
         this.rejectPending(key, pending, error);
@@ -14964,6 +15750,10 @@ class SubcClient {
     const routeError = err instanceof SubcError && err.closeReason ? err : new SubcError(err.message, errorCode(err), undefined, this.closeStarted ? "closed_by_caller" : "connection_lost");
     if (!this.closedErr)
       this.closedErr = err;
+    for (const gate of this.gates.values())
+      gate.close(routeError);
+    this.gates.clear();
+    this.slots.clear();
     this.routeEndReasons.clear();
     this.legacyChannelReasons.clear();
     this.routeModules.clear();
@@ -14997,6 +15787,9 @@ class SubcClient {
     return this.ingressEpochDropCount;
   }
   installRoute(channel, epoch, reverseRequests = new ReverseRequestRegistry) {
+    const previous = this.liveRoutes.get(channel);
+    if (previous && this.gates.has(previous))
+      this.failHandle(previous, new SubcError("route replaced", "route_closed", undefined, "closed_by_caller"));
     const handle = createRouteHandle(channel, epoch, this.connectionToken, reverseRequests);
     this.routeEndReasons.delete(channel);
     this.legacyChannelReasons.delete(channel);
@@ -15067,9 +15860,15 @@ function isRetryableRouteOpenCode(code) {
     return false;
   if (code === "target_flow_unsupported")
     return false;
+  if (code === "target_federated_unsupported")
+    return false;
   if (code === "target_agent_run_unsupported")
     return false;
-  return code === "module_reloading" || code === "module_warming" || code === "target_unavailable" || code === "module_timeout" || code === "scope_not_synced" || code === "scope_changed";
+  if (code === "scope_bind_proof_required" || code === "scope_bind_proof_mismatch")
+    return false;
+  if (code === "scope_epoch_in_use")
+    return false;
+  return code === "module_reloading" || code === "module_warming" || code === "target_unavailable" || code === "module_timeout" || code === "scope_not_synced" || code === "scope_changed" || code === "session_address_unavailable" || code === "bind_busy";
 }
 function equalJitter(delayMs, random) {
   const half = delayMs / 2;
@@ -15106,6 +15905,12 @@ var STALE_ROUTE_EPOCH = "stale_route_epoch";
 function isEstablishedRouteDead(_flags, code) {
   return code === UNKNOWN_CHANNEL || code === STALE_ROUTE_EPOCH;
 }
+function isRouteBusyRetryable(flags, code, routeOptedIn) {
+  return routeOptedIn && (flags & DAEMON_ORIGIN_FLAG) !== 0 && code === "route_busy";
+}
+function isDataPlaneDrainRefusal(code) {
+  return code === "module_reloading";
+}
 async function connectionFileExists(path) {
   try {
     await fs3.access(path);
@@ -15117,6 +15922,7 @@ async function connectionFileExists(path) {
 function normalizeConnectOptions(opts) {
   return {
     connectionFile: opts.connectionFile,
+    transport: opts.transport ?? "tcp",
     handshakeTimeoutMs: opts.handshakeTimeoutMs,
     identity: opts.identity,
     targetKind: opts.targetKind ?? DEFAULT_MANAGED_TARGET_KIND,
@@ -15126,11 +15932,18 @@ function normalizeConnectOptions(opts) {
     random: opts.random ?? Math.random,
     routeOpenRetryDeadlineMs: opts.routeOpenRetryDeadlineMs ?? ROUTE_OPEN_RETRY_DEADLINE_MS,
     timeoutArbitrationGraceMs: opts.timeoutArbitrationGraceMs ?? TIMEOUT_ARBITRATION_GRACE_MS,
+    sleepGraceMs: validatedSleepGraceMs(opts.sleepGraceMs ?? DEFAULT_SLEEP_GRACE_MS),
     bodyReadTimeoutMs: opts.bodyReadTimeoutMs,
     livenessProbeWindowMs: opts.livenessProbeWindowMs ?? LIVENESS_PROBE_WINDOW_MS,
     onControlPush: opts.onControlPush
   };
 }
+function validatedSleepGraceMs(ms) {
+  if (!Number.isFinite(ms) || ms < 0 || ms > 2147483647) {
+    throw new RangeError("sleepGraceMs must be finite and in 0..2147483647 milliseconds");
+  }
+  return ms;
+}
 function isValidCapabilityIdentifier(identifier) {
   if (/\s/u.test(identifier))
     return false;
@@ -15153,7 +15966,13 @@ function isValidCapabilityIdentifier(identifier) {
 function routeCacheKey(target, identity, consumerIdentity, consumerCapabilities, scope) {
   const consumerPart = consumerIdentity ? `${consumerIdentity.module_id}\x00${consumerIdentity.launch_nonce}` : "";
   const capabilitiesPart = [...consumerCapabilities].sort().join("\x00");
-  const scopePart = scope ? JSON.stringify([scope.owner.kind, scope.owner.kind === "reserved" ? scope.owner.module_id : null, scope.ref, scope.scopeEpoch]) : "";
+  const scopePart = scope ? JSON.stringify([
+    scope.owner.kind,
+    scope.owner.kind === "reserved" ? scope.owner.module_id : null,
+    scope.ref,
+    scope.scopeEpoch,
+    scope.bindProof === undefined ? null : createHash4("sha256").update(scope.bindProof).digest("hex")
+  ]) : "";
   return `${target.kind}\x00${target.module_id}\x00${identity.project_root}\x00${identity.harness}\x00${identity.session}\x00${consumerPart}\x00${capabilitiesPart}\x00${scopePart}`;
 }
 function validatedRouteScope(scope) {
@@ -15171,13 +15990,18 @@ function validatedRouteScope(scope) {
   if (!Number.isSafeInteger(scope.scopeEpoch) || scope.scopeEpoch < 0) {
     throw new SubcError("scope.scopeEpoch must be a safe non-negative integer", "invalid_scope");
   }
-  return { owner: { ...scope.owner }, ref: scope.ref, scopeEpoch: scope.scopeEpoch };
+  return {
+    owner: { ...scope.owner },
+    ref: scope.ref,
+    scopeEpoch: scope.scopeEpoch,
+    ...scope.bindProof !== undefined ? { bindProof: scope.bindProof } : {}
+  };
 }
-function routeOpenConsumerIdentity(opts = {}) {
+async function routeOpenConsumerIdentity(opts = {}) {
   if (opts.consumerIdentity !== undefined)
     return opts.consumerIdentity ?? undefined;
   const moduleId = process.env[SUBC_MODULE_ID_ENV];
-  const launchNonce = launchNonceOrUndefined()?.value;
+  const launchNonce = (await launchNonceOrUndefinedAsync())?.value;
   if (!moduleId || !launchNonce)
     return;
   return { module_id: moduleId, launch_nonce: launchNonce };
@@ -15629,20 +16453,20 @@ function getLifecycleRegistry() {
 }
 
 // ../aft-bridge/dist/project-identity.js
-import { realpathSync as realpathSync2 } from "node:fs";
-import { posix as posix2, resolve as resolve6, win32 as win322 } from "node:path";
+import { realpathSync as realpathSync3 } from "node:fs";
+import { posix as posix3, resolve as resolve6, win32 as win323 } from "node:path";
 function canonicalizeProjectRoot(dir) {
   const trimmed = trimProjectRootSeparators(dir);
   let canonical;
   try {
-    canonical = realpathSync2(trimmed);
+    canonical = realpathSync3(trimmed);
   } catch {
     canonical = resolve6(trimmed);
   }
   return normalizeWindowsRoot(canonical);
 }
 function trimProjectRootSeparators(dir, platform = process.platform) {
-  const root = (platform === "win32" ? win322 : posix2).parse(dir).root;
+  const root = (platform === "win32" ? win323 : posix3).parse(dir).root;
   const trimmed = dir.replace(/[/\\]+$/, "");
   return trimmed.length < root.length ? root : trimmed;
 }
@@ -16441,6 +17265,8 @@ class SubcTransportPool {
   harness;
   connectionFile;
   handshakeTimeoutMs;
+  clock;
+  waitClock;
   consumerIdentity;
   hostScopes;
   hostScopeCache = new Map;
@@ -16483,6 +17309,13 @@ class SubcTransportPool {
   editSlotSurvives;
   editSlotSurvivesCaptured = false;
   constructor(options) {
+    this.clock = options.clock ?? {
+      now: () => Date.now(),
+      awakeNow: () => performance.now(),
+      setTimeout: (callback, ms) => setTimeout(callback, ms),
+      clearTimeout: (timer) => clearTimeout(timer)
+    };
+    this.waitClock = new WaitClock(() => this.clock.now(), () => this.clock.awakeNow?.() ?? this.clock.now());
     this.connectionFile = options.connectionFile;
     this.harness = options.harness;
     this.handshakeTimeoutMs = options.handshakeTimeoutMs;
@@ -17109,11 +17942,12 @@ class SubcTransportPool {
     this.stopUnusedHostScopeRetry(record.identity.session);
   }
   async routeRequest(identity, body, timeoutMs, onProgress, expectedGeneration, abortSignal) {
-    const callStartedAt = performance.now();
+    const callStartedAt = this.waitClock.now();
     const callDeadlineMs = timeoutMs ?? SUBC_DEFAULT_REQUEST_TIMEOUT_MS;
+    const deadline = new RequestDeadline(this.waitClock, callDeadlineMs);
     let scheduledDelayMs = 0;
-    const spentMs = () => Math.max(performance.now() - callStartedAt, scheduledDelayMs);
-    const remainingMs = () => callDeadlineMs - spentMs();
+    const spentMs = () => Math.max(this.waitClock.now() - callStartedAt, scheduledDelayMs);
+    const remainingMs = () => deadline.remaining() - Math.max(0, scheduledDelayMs - (this.waitClock.now() - callStartedAt));
     const root = asCanonicalRootPath(identity.project_root);
     let generation = expectedGeneration;
     if (this.lifecycleEnabled()) {
@@ -17134,12 +17968,12 @@ class SubcTransportPool {
           const remaining = remainingMs();
           if (remaining <= 0)
             throw keyChanged ?? callDeadlinePassedError(undefined, callDeadlineMs);
-          let timer;
+          let cancelTimer;
           try {
             const acquired = await Promise.race([
               this.ensureClient(),
               new Promise((resolve) => {
-                timer = setTimeout(() => resolve(CALL_DEADLINE_EXPIRED), remaining);
+                cancelTimer = deadlineTimer(this.clock, remainingMs, () => resolve(CALL_DEADLINE_EXPIRED));
               })
             ]);
             if (acquired === CALL_DEADLINE_EXPIRED) {
@@ -17154,22 +17988,22 @@ class SubcTransportPool {
             if (spentMs() + this.nextRouteReopenDelayMs() >= callDeadlineMs)
               throw error;
           } finally {
-            clearTimeout(timer);
+            cancelTimer?.();
           }
           const { delayMs, wait } = this.waitForRouteReopenBackoff();
           scheduledDelayMs = spentMs() + delayMs;
-          let retryTimer;
+          let cancelRetryTimer;
           try {
             const waited = await Promise.race([
               wait,
               new Promise((resolve) => {
-                retryTimer = setTimeout(() => resolve(CALL_DEADLINE_EXPIRED), callDeadlineMs - (performance.now() - callStartedAt));
+                cancelRetryTimer = deadlineTimer(this.clock, remainingMs, () => resolve(CALL_DEADLINE_EXPIRED));
               })
             ]);
             if (waited === CALL_DEADLINE_EXPIRED)
               throw keyChanged;
           } finally {
-            clearTimeout(retryTimer);
+            cancelRetryTimer?.();
           }
         }
         this.assertRecordLive(record);
@@ -17212,9 +18046,9 @@ class SubcTransportPool {
         const remaining = remainingMs();
         if (remaining <= 0)
           throw callDeadlinePassedError(lastRefusal, callDeadlineMs);
-        let timer;
+        let cancelTimer;
         const expired = new Promise((resolve) => {
-          timer = setTimeout(() => resolve(CALL_DEADLINE_EXPIRED), remaining);
+          cancelTimer = deadlineTimer(this.clock, remainingMs, () => resolve(CALL_DEADLINE_EXPIRED));
         });
         try {
           const opened = await Promise.race([openRoute(), expired]);
@@ -17223,7 +18057,7 @@ class SubcTransportPool {
           }
           return opened;
         } finally {
-          clearTimeout(timer);
+          cancelTimer?.();
         }
       };
       const openRouteAfterReloadWindow = async () => {
@@ -17302,6 +18136,7 @@ class SubcTransportPool {
           try {
             request = client.request(route, body, {
               timeoutMs: Math.ceil(requestTimeoutMs),
+              ...deadline.resumed ? { sleepGraceMs: 0 } : {},
               onProgress
             });
           } catch (error) {
@@ -17429,6 +18264,7 @@ class SubcTransportPool {
     this.connecting = this.connectFn({
       connectionFile: this.connectionFile,
       handshakeTimeoutMs: this.handshakeTimeoutMs,
+      sleepGraceMs: RESUME_ALLOWANCE_MS,
       onControlPush: (push) => {
         if (owner && this.client === owner)
           this.onScopeRouteClose(push);
@@ -17617,7 +18453,9 @@ class SubcTransportPool {
         });
         retry = state.bindPending;
       } else {
-        retry = this.hostScope(client, record.identity);
+        retry = this.hostScope(client, record.identity).finally(() => {
+          this.scheduleHostScopeRetry(session, state);
+        });
       }
       retry.catch((error) => {
         warn(`subc head scope: session=${session} background retry failed code=${error instanceof Error ? error.name : "Error"}`);
@@ -17785,12 +18623,18 @@ class SubcTransportPool {
     }
     return this.openScopedHostToolRoute(client, identity, record, entry, channel);
   }
-  bindHostToolRoute(client, identity, channel, reason, scope) {
+  async bindHostToolRoute(client, identity, channel, reason, scope) {
     log(`subc head scope: session=${identity.session} bind=${scope ? "scoped" : "unscoped"} channel=${channel} root=${identity.project_root} reason=${reason}` + (scope ? ` ref=${scope.ref.slice(0, 8)} epoch=${scope.scopeEpoch}` : ""));
-    return client.routeOpen({ kind: "tool_provider", module_id: AFT_MODULE_ID }, identity, {
+    const route = await client.routeOpen({ kind: "tool_provider", module_id: AFT_MODULE_ID }, identity, {
       consumerIdentity: this.consumerIdentity,
       ...scope ? { scope } : {}
     });
+    const state = this.hostScopeCache.get(identity.session);
+    if (scope && state?.unscopedReason && state.answer?.result === "scope" && state.answer.scope === scope) {
+      log(`subc head scope: session=${identity.session} route=upgraded from=unscoped ref=${scope.ref.slice(0, 8)} epoch=${scope.scopeEpoch}`);
+      state.unscopedReason = undefined;
+    }
+    return route;
   }
   async openScopedHostToolRoute(client, identity, record, entry, channel = "tool") {
     const decision = await this.hostScope(client, identity);
@@ -18422,7 +19266,8 @@ function taskIdFromError(error) {
   return;
 }
 // ../aft-bridge/dist/feature-config.js
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
+import { createRequire } from "node:module";
 var CANONICAL_TOOLS = [
   "aft_callgraph",
   "aft_conflicts",
@@ -18472,23 +19317,115 @@ var REMOVED_OPENCODE_PATHS = [
   "opencode.server_url",
   "opencode.server_password_env"
 ];
-function removedConfigKeyErrors(value) {
+var REMOVED_DATA_LAYER_PATHS = [
+  "views.callgraph_copies",
+  "views.enabled",
+  "worktree.ram_overlay"
+];
+var RETIRED_IDLE_CHECKOUT_HOURS = [
+  "views.idle_checkout_hours",
+  "idle.checkout_hours"
+];
+var DATA_LAYER_KEYS_REFUSED_FROM = [0, 65];
+var DATA_LAYER_RETIRED_PATHS = ["views.idle_checkout_hours"];
+var IDLE_CHECKOUT_HOURS_DEFAULT = 168;
+var IDLE_CHECKOUT_HOURS_MIN = 1;
+var IDLE_CHECKOUT_HOURS_MAX = 24 * 365;
+function parseRelease(version) {
+  const match = /^(\d+)\.(\d+)(?:\.|$)/.exec(version);
+  return match ? [Number(match[1]), Number(match[2])] : undefined;
+}
+var AFT_PACKAGE_NAMES = new Set([
+  "@cortexkit/aft-bridge",
+  "@cortexkit/aft-opencode",
+  "@cortexkit/aft-pi",
+  "@cortexkit/aft"
+]);
+function readRunningRelease() {
+  const req = createRequire(import.meta.url);
+  for (const candidate of ["../package.json", "../../package.json", "../../../package.json"]) {
+    try {
+      const manifest = req(candidate);
+      if (manifest.name && AFT_PACKAGE_NAMES.has(manifest.name) && manifest.version) {
+        return parseRelease(manifest.version) ?? [0, 0];
+      }
+    } catch {}
+  }
+  return [0, 0];
+}
+var runningRelease;
+var runningReleaseOverrideForTest;
+function getRunningRelease() {
+  if (runningReleaseOverrideForTest)
+    return runningReleaseOverrideForTest;
+  runningRelease ??= readRunningRelease();
+  return runningRelease;
+}
+function releaseAtLeast(release, floor) {
+  return release[0] !== floor[0] ? release[0] > floor[0] : release[1] >= floor[1];
+}
+function refusedFromVersion() {
+  return `${DATA_LAYER_KEYS_REFUSED_FROM[0]}.${DATA_LAYER_KEYS_REFUSED_FROM[1]}.0`;
+}
+function removedConfigKeyErrors(value, release = getRunningRelease(), refuseRetired = true) {
   if (!isRecord2(value))
     return [];
-  const errors = removedOpencodeKeyErrors(value);
+  const errors = removedBlockKeyErrors(value, release, refuseRetired);
   if (isRecord2(value.harnesses)) {
     for (const [name, block] of Object.entries(value.harnesses)) {
       if (!isRecord2(block))
         continue;
-      for (const error of removedOpencodeKeyErrors(block)) {
+      for (const error of removedBlockKeyErrors(block, release, refuseRetired)) {
         errors.push(error.replace("removed_config_key:", `removed_config_key:harnesses.${name}.`));
       }
     }
   }
   return errors;
 }
-function removedOpencodeKeyErrors(value) {
-  return REMOVED_OPENCODE_PATHS.filter((path) => hasPath(value, path)).map((path) => `removed_config_key:${path}; run aft doctor --fix`);
+function removedBlockKeyErrors(value, release, refuseRetired) {
+  const paths = REMOVED_OPENCODE_PATHS.filter((path) => hasPath(value, path));
+  if (refuseRetired)
+    paths.push(...refusedRetiredNames(value));
+  if (refuseRetired && releaseAtLeast(release, DATA_LAYER_KEYS_REFUSED_FROM))
+    paths.push(...DATA_LAYER_RETIRED_PATHS.filter((path) => hasPath(value, path)));
+  return paths.map((path) => `removed_config_key:${path}; run npx @cortexkit/aft doctor --fix`);
+}
+var REFUSED_RETIRED_PATHS = [
+  "sandbox.enabled",
+  "tool_surface",
+  "hoist_builtin_tools",
+  "enabled",
+  "search_index",
+  "experimental_search_index",
+  "semantic_search",
+  "experimental_semantic_search",
+  "callgraph_store",
+  "github.enabled",
+  "gh_read",
+  "gh_shim.enabled",
+  "experimental_lsp_ty",
+  "experimental_bash_rewrite",
+  "experimental_bash_compress",
+  "experimental_bash_background",
+  "experimental.bash",
+  "idle.lsp_ttl_minutes",
+  "inspect.tier2_soft_deadline_ms",
+  "inspect.max_drill_down_items",
+  "views.callgraph_copies",
+  "views.enabled",
+  "worktree.ram_overlay"
+];
+function refusedRetiredNames(block) {
+  const names = REFUSED_RETIRED_PATHS.filter((path) => hasPath(block, path));
+  if (Array.isArray(block.disabled_tools)) {
+    for (const name of block.disabled_tools) {
+      if (typeof name !== "string" || !Object.hasOwn(LEGACY_TOOL_ALIASES, name))
+        continue;
+      if (!names.includes(name))
+        names.push(name);
+    }
+  }
+  return names;
 }
 var RETIRED_PATHS = [
   ["sandbox.enabled", "sandbox.profile"],
@@ -18643,7 +19580,10 @@ function translateInspectLspPaths(map, prefix, out) {
       recordRetired(out, prefix, `inspect.${leaf}`);
   }
 }
-var REMOVED_NO_EFFECT_PATHS = ["bridge.hang_threshold"];
+var REMOVED_NO_EFFECT_PATHS = [
+  "bridge.hang_threshold",
+  "inspect.tier2_idle_minutes"
+];
 function dropNoEffectPaths(map, prefix, out) {
   for (const path of REMOVED_NO_EFFECT_PATHS) {
     const [container, leaf] = path.split(".");
@@ -18652,6 +19592,30 @@ function dropNoEffectPaths(map, prefix, out) {
     }
   }
 }
+function retiredIdleCheckoutHours(value) {
+  const raw = typeof value === "number" && Number.isSafeInteger(value) ? value : IDLE_CHECKOUT_HOURS_DEFAULT;
+  return Math.min(IDLE_CHECKOUT_HOURS_MAX, Math.max(IDLE_CHECKOUT_HOURS_MIN, raw));
+}
+function translateDataLayerPaths(map, prefix, out) {
+  const [retired, replacement] = RETIRED_IDLE_CHECKOUT_HOURS;
+  const hours = takeNested(map, "views", "idle_checkout_hours");
+  if (hours.found) {
+    recordRetired(out, prefix, retired);
+    if (isRecord2(map.idle) && map.idle.checkout_hours !== undefined) {
+      superseded(out, `${prefix}${retired}`, `${retired} is ignored because ${replacement} is set`);
+    } else {
+      if (!Object.hasOwn(map, "idle"))
+        map.idle = {};
+      if (isRecord2(map.idle))
+        map.idle.checkout_hours = retiredIdleCheckoutHours(hours.value);
+    }
+  }
+  for (const path of REMOVED_DATA_LAYER_PATHS) {
+    const [container, leaf] = path.split(".");
+    if (container && leaf && takeNested(map, container, leaf).found)
+      recordRetired(out, prefix, path);
+  }
+}
 function translateExperimentalPaths(map, prefix, out) {
   for (const [oldKey, leaf] of [
     ["experimental_lsp_ty", "lsp_ty"],
@@ -18684,23 +19648,25 @@ function translateExperimentalPaths(map, prefix, out) {
   const experimental = map.experimental;
   const legacy = experimental.bash;
   if (isRecord2(legacy)) {
-    if (!["rewrite", "compress", "background"].some((leaf) => Object.hasOwn(legacy, leaf)))
-      return;
+    if (Object.keys(legacy).length === 0)
+      recordRetired(out, prefix, "experimental.bash");
     for (const leaf of Object.keys(legacy))
       recordRetired(out, prefix, `experimental.bash.${leaf}`);
     if (Object.hasOwn(map, "bash")) {
       superseded(out, "experimental.bash", 'experimental.bash is ignored because top-level "bash" is already set');
     } else {
-      const bash = {
-        rewrite: legacy.rewrite === true,
-        compress: legacy.compress === true,
-        background: legacy.background === true
-      };
+      const bash = {};
+      if (["rewrite", "compress", "background"].some((leaf) => Object.hasOwn(legacy, leaf))) {
+        bash.rewrite = legacy.rewrite === true;
+        bash.compress = legacy.compress === true;
+        bash.background = legacy.background === true;
+      }
       for (const leaf of ["long_running_reminder_enabled", "long_running_reminder_interval_ms"]) {
         if (Object.hasOwn(legacy, leaf))
           bash[leaf] = legacy[leaf];
       }
-      map.bash = bash;
+      if (Object.keys(bash).length > 0)
+        map.bash = bash;
     }
   } else {
     recordRetired(out, prefix, "experimental.bash");
@@ -18713,6 +19679,7 @@ function translateBlock(map, userBase, blockLabel, out) {
   const prefix = blockLabel === "base" ? "" : `${blockLabel}.`;
   translateGithubAliases(map, prefix, out);
   translateInspectLspPaths(map, prefix, out);
+  translateDataLayerPaths(map, prefix, out);
   dropNoEffectPaths(map, prefix, out);
   translateExperimentalPaths(map, prefix, out);
   if (isRecord2(map.sandbox) && Object.hasOwn(map.sandbox, "enabled")) {
@@ -18751,8 +19718,6 @@ function translateBlock(map, userBase, blockLabel, out) {
     });
   }
   for (const [path] of RETIRED_PATHS) {
-    if (path === "experimental.bash")
-      continue;
     if (hasPath(map, path))
       recordRetired(out, prefix, path);
   }
@@ -18888,13 +19853,38 @@ var NO_EFFECT_RETIRED_NOTES = [
     "inspect.max_drill_down_items",
     "inspect.max_drill_down_items never had an effect, so the setting can be removed."
   ],
+  [
+    "inspect.tier2_idle_minutes",
+    "inspect.tier2_idle_minutes no longer does anything: AFT runs whole-repository analyses only when aft_inspect is called, so the setting can be removed."
+  ],
   [
     "inspect.tier2_soft_deadline_ms",
     "inspect.tier2_soft_deadline_ms never had an effect, so the setting can be removed."
   ]
 ];
 function noEffectNote(key) {
-  return NO_EFFECT_RETIRED_NOTES.find(([path]) => key === path || key.endsWith(`.${path}`))?.[1];
+  return [...NO_EFFECT_RETIRED_NOTES, ...REMOVED_DATA_LAYER_NOTES].find(([path]) => namesPath(key, path))?.[1];
+}
+function namesPath(key, path) {
+  return key === path || key.endsWith(`.${path}`);
+}
+var REMOVED_DATA_LAYER_NOTES = [
+  [
+    "views.callgraph_copies",
+    "views.callgraph_copies is gone because no checkout borrows another checkout's call graph any more."
+  ],
+  [
+    "views.enabled",
+    "views.enabled is gone because AFT now keeps one index store per repository and always uses it."
+  ],
+  [
+    "worktree.ram_overlay",
+    "worktree.ram_overlay is gone because every worktree now has its own index state, so there is no borrowed index to patch in memory."
+  ]
+];
+function retiredIdleCheckoutHoursNote() {
+  const [retired, replacement] = RETIRED_IDLE_CHECKOUT_HOURS;
+  return `${retired} is now ${replacement}; from ${refusedFromVersion()} AFT refuses a user config file that still sets ${retired}.`;
 }
 function legacyConfigNoticeMessage(configPath, translation) {
   const equivalents = translation.retiredKeys.filter((key) => noEffectNote(key) === undefined);
@@ -18904,8 +19894,11 @@ function legacyConfigNoticeMessage(configPath, translation) {
     parts.push(`${configPath} uses retired keys (${equivalents.join(", ")}); AFT applied their current equivalents, with the same limits a project config has for those keys. Run \`npx @cortexkit/aft doctor --fix\` to update the file.`);
     if (translation.retiredEnabledFalse)
       parts.push(RETIRED_ENABLED_FALSE_INDEXES_NOTE);
+    if (equivalents.some((key) => namesPath(key, RETIRED_IDLE_CHECKOUT_HOURS[0]))) {
+      parts.push(retiredIdleCheckoutHoursNote());
+    }
   }
-  for (const [, note] of NO_EFFECT_RETIRED_NOTES) {
+  for (const [, note] of [...NO_EFFECT_RETIRED_NOTES, ...REMOVED_DATA_LAYER_NOTES]) {
     if (noEffect.has(note))
       parts.push(note);
   }
@@ -18961,7 +19954,12 @@ function validateResolvedConfig(value) {
 var ABSENT = { absent: true };
 function projectBlock(block) {
   const legacyPaths = {};
-  for (const path of [...RETIRED_PATHS.map(([retired]) => retired), ...REMOVED_NO_EFFECT_PATHS]) {
+  for (const path of [
+    ...RETIRED_PATHS.map(([retired]) => retired),
+    ...REMOVED_NO_EFFECT_PATHS,
+    ...DATA_LAYER_RETIRED_PATHS,
+    ...REMOVED_DATA_LAYER_PATHS
+  ]) {
     const dot = path.indexOf(".");
     if (dot < 0) {
       if (Object.hasOwn(block, path))
@@ -19040,7 +20038,7 @@ function canonicalJson(value) {
   return JSON.stringify(value);
 }
 function noticeDigest(projection) {
-  return createHash3("sha256").update(canonicalJson(projection), "utf8").digest("hex");
+  return createHash5("sha256").update(canonicalJson(projection), "utf8").digest("hex");
 }
 var SEMANTIC_COST_NOTICE = "AFT indexes now default on; the local semantic backend may download an ONNX runtime and model and use CPU. Run npx @cortexkit/aft setup to change indexes.semantic.";
 var SEMANTIC_COST_NOTICE_DIGEST = noticeDigest({ notice: "semantic_default_cost_v1" });
@@ -19913,9 +20911,9 @@ async function createConcreteAftTransportPool(opts) {
 var LIFECYCLE_STATE = Symbol.for("@cortexkit/aft-bridge/location-lifecycle/v1");
 var RELEASE_LOCATION = Symbol.for("@cortexkit/aft-bridge/location-release/v1");
 // ../aft-bridge/dist/lsp-github-install.js
-import { createHash as createHash4, randomBytes as randomBytes2 } from "node:crypto";
-import { closeSync as closeSync5, copyFileSync as copyFileSync3, createReadStream as createReadStream2, createWriteStream as createWriteStream2, existsSync as existsSync6, lstatSync as lstatSync2, mkdirSync as mkdirSync4, openSync as openSync4, readdirSync as readdirSync2, readFileSync as readFileSync5, readlinkSync, readSync as readSync4, realpathSync as realpathSync3, renameSync as renameSync3, rmSync as rmSync2, statSync as statSync6, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname4, join as join11, relative as relative4, resolve as resolve7 } from "node:path";
+import { createHash as createHash6, randomBytes as randomBytes2 } from "node:crypto";
+import { closeSync as closeSync6, copyFileSync as copyFileSync3, createReadStream as createReadStream2, createWriteStream as createWriteStream2, existsSync as existsSync6, lstatSync as lstatSync2, mkdirSync as mkdirSync4, openSync as openSync5, readdirSync as readdirSync2, readFileSync as readFileSync5, readlinkSync, readSync as readSync5, realpathSync as realpathSync4, renameSync as renameSync3, rmSync as rmSync2, statSync as statSync6, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname as dirname4, join as join10, relative as relative3, resolve as resolve7 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
 
@@ -20134,13 +21132,13 @@ function detectHostPlatform() {
 
 // ../aft-bridge/dist/tar-executable.js
 import { existsSync as existsSync5 } from "node:fs";
-import { join as join10 } from "node:path";
+import { join as join9 } from "node:path";
 function windowsTarExecutable(options = {}) {
   const platform = options.platform ?? process.platform;
   if (platform !== "win32")
     return "tar";
   const env = options.env ?? process.env;
-  const systemTar = join10(env.SystemRoot ?? "C:\\Windows", "System32", "tar.exe");
+  const systemTar = join9(env.SystemRoot ?? "C:\\Windows", "System32", "tar.exe");
   return (options.exists ?? existsSync5)(systemTar) ? systemTar : "tar";
 }
 function extractionCommand(args, privateStorage) {
@@ -20184,14 +21182,14 @@ function createGithubInstaller(services) {
     return getAftLspBinariesDir();
   }
   function ghPackageDir(spec) {
-    return join11(ghCacheRoot(), spec.id);
+    return join10(ghCacheRoot(), spec.id);
   }
   function ghBinDir(spec) {
     const platform = detectHostPlatform()?.platform ?? "linux";
     return dirname4(ghBinaryPath(spec, platform));
   }
   function ghExtractDir(spec) {
-    return join11(ghPackageDir(spec), "extracted");
+    return join10(ghPackageDir(spec), "extracted");
   }
   const INSTALLED_META_FILE = ".aft-installed";
   const INSTALL_FAILED_FILE = ".aft-install-failed.json";
@@ -20199,8 +21197,9 @@ function createGithubInstaller(services) {
   const INSTALL_LOCK_WAIT_MS = 10 * 60 * 1000;
   const INSTALL_LOCK_POLL_INTERVAL_MS = 1000;
   const INSTALL_LOCK_WAIT_TIMEOUT_REASON = "install lock held by another process for 10 minutes";
+  const SMOKE_TIMEOUT_MS = 2000;
   function installFailureMarkerPath(spec) {
-    return join11(ghPackageDir(spec), INSTALL_FAILED_FILE);
+    return join10(ghPackageDir(spec), INSTALL_FAILED_FILE);
   }
   function readInstallFailureMarker(spec) {
     try {
@@ -20244,15 +21243,15 @@ function createGithubInstaller(services) {
     const meta = readGithubInstalledMetaIn(ghPackageDir(spec));
     if (spec.layout === "distribution" && meta?.layout === "distribution" && isSafeVersion(meta.version)) {
       const arch = detectHostPlatform()?.arch ?? "x64";
-      return join11(ghExtractDir(spec), spec.binaryPathInArchive(platform, arch, stripTagV(meta.version)));
+      return join10(ghExtractDir(spec), spec.binaryPathInArchive(platform, arch, stripTagV(meta.version)));
     }
     const ext = platform === "win32" ? ".exe" : "";
-    return join11(ghPackageDir(spec), "bin", `${spec.binary}${ext}`);
+    return join10(ghPackageDir(spec), "bin", `${spec.binary}${ext}`);
   }
   function isGithubInstalled(spec, platform) {
     for (const candidate of ghBinaryCandidates(spec, platform)) {
       try {
-        if (statSync6(join11(ghBinDir(spec), candidate)).isFile())
+        if (statSync6(join10(ghBinDir(spec), candidate)).isFile())
           return true;
       } catch {}
     }
@@ -20265,7 +21264,7 @@ function createGithubInstaller(services) {
   }
   function readGithubInstalledMetaIn(installDir) {
     try {
-      const path = join11(installDir, INSTALLED_META_FILE);
+      const path = join10(installDir, INSTALLED_META_FILE);
       if (!statSync6(path).isFile())
         return null;
       const parsed = JSON.parse(readFileSync5(path, "utf8"));
@@ -20296,7 +21295,7 @@ function createGithubInstaller(services) {
         ...layout ? { layout } : {},
         ...smoke ? { smoke } : {}
       };
-      const path = join11(installDir, INSTALLED_META_FILE);
+      const path = join10(installDir, INSTALLED_META_FILE);
       const tempPath = `${path}.tmp-${process.pid}-${randomBytes2(6).toString("hex")}`;
       try {
         writeFileSync2(tempPath, JSON.stringify(meta), { encoding: "utf8", flag: "wx" });
@@ -20312,7 +21311,7 @@ function createGithubInstaller(services) {
   const MAX_EXTRACT_BYTES = 1024 * 1024 * 1024;
   function sha256OfFile(path) {
     return new Promise((resolve, reject) => {
-      const hash = createHash4("sha256");
+      const hash = createHash6("sha256");
       const stream = createReadStream2(path);
       stream.on("error", reject);
       stream.on("data", (chunk) => hash.update(chunk));
@@ -20320,17 +21319,17 @@ function createGithubInstaller(services) {
     });
   }
   function sha256OfFileSync(path) {
-    const hash = createHash4("sha256");
-    const fd = openSync4(path, "r");
+    const hash = createHash6("sha256");
+    const fd = openSync5(path, "r");
     try {
       const buffer = Buffer.allocUnsafe(1024 * 1024);
-      let read = readSync4(fd, buffer, 0, buffer.length, null);
+      let read = readSync5(fd, buffer, 0, buffer.length, null);
       while (read > 0) {
         hash.update(buffer.subarray(0, read));
-        read = readSync4(fd, buffer, 0, buffer.length, null);
+        read = readSync5(fd, buffer, 0, buffer.length, null);
       }
     } finally {
-      closeSync5(fd);
+      closeSync6(fd);
     }
     return hash.digest("hex");
   }
@@ -20538,7 +21537,7 @@ function createGithubInstaller(services) {
     throw new Error(`too many redirects (>${maxRedirects})`);
   }
   function validateExtraction(stagingRoot) {
-    const realStagingRoot = realpathSync3(stagingRoot);
+    const realStagingRoot = realpathSync4(stagingRoot);
     let totalBytes = 0;
     const walk = (dir) => {
       let entries;
@@ -20548,7 +21547,7 @@ function createGithubInstaller(services) {
         throw new Error(`failed to read staging dir ${dir}: ${err}`);
       }
       for (const entry of entries) {
-        const full = join11(dir, entry);
+        const full = join10(dir, entry);
         let lst;
         try {
           lst = lstatSync2(full);
@@ -20560,15 +21559,15 @@ function createGithubInstaller(services) {
           try {
             target = readlinkSync(full);
           } catch {}
-          throw new Error(`archive contains symlink ${relative4(realStagingRoot, full)} → ${target}; rejecting (zip-slip defense)`);
+          throw new Error(`archive contains symlink ${relative3(realStagingRoot, full)} → ${target}; rejecting (zip-slip defense)`);
         }
         let realFull;
         try {
-          realFull = realpathSync3(full);
+          realFull = realpathSync4(full);
         } catch (err) {
           throw new Error(`failed to realpath ${full}: ${err}`);
         }
-        const rel = relative4(realStagingRoot, realFull);
+        const rel = relative3(realStagingRoot, realFull);
         if (relativePathEscapesRoot(rel) || resolve7(realStagingRoot, rel) !== realFull) {
           throw new Error(`archive entry escapes staging root: ${full} → ${realFull} (zip-slip defense)`);
         }
@@ -20709,7 +21708,7 @@ function createGithubInstaller(services) {
   }
   function quarantineCachedGithubInstall(spec, reason) {
     const packageDir = ghPackageDir(spec);
-    const dest = join11(ghCacheRoot(), ".quarantine", encodeURIComponent(spec.id), `${Date.now()}`);
+    const dest = join10(ghCacheRoot(), ".quarantine", encodeURIComponent(spec.id), `${Date.now()}`);
     warn(`[lsp] tofu_mismatch ${spec.id}: ${reason}; quarantining ${packageDir} -> ${dest}`);
     try {
       mkdirSync4(dirname4(dest), { recursive: true });
@@ -20719,7 +21718,7 @@ function createGithubInstaller(services) {
       warn(`[lsp] tofu_mismatch ${spec.id}: failed to quarantine cache entry: ${err}`);
     }
   }
-  async function smokeGithubBinary(spec, binaryPath) {
+  async function smokeGithubBinary(spec, binaryPath, timeoutMs = SMOKE_TIMEOUT_MS) {
     return new Promise((resolveSmoke) => {
       let child;
       let settled = false;
@@ -20739,8 +21738,8 @@ function createGithubInstaller(services) {
       const timer = setTimeout(() => {
         child?.kill("SIGKILL");
         child?.unref();
-        finish("timeout", "exceeded 2000 ms; keeping install");
-      }, 2000);
+        finish("timeout", `exceeded ${timeoutMs} ms; keeping install`);
+      }, timeoutMs);
       const capture = (chunk) => {
         const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
         const available = 64 * 1024 - output.length;
@@ -20764,19 +21763,19 @@ function createGithubInstaller(services) {
   function hasRequiredRuntime(spec, extractDir, version) {
     return (spec.requiredRuntimePaths?.(stripTagV(version)) ?? []).every(({ path, kind }) => {
       try {
-        const info = statSync6(join11(extractDir, path));
+        const info = statSync6(join10(extractDir, path));
         return kind === "file" ? info.isFile() : info.isDirectory();
       } catch {
         return false;
       }
     });
   }
-  function validateCachedGithubInstall(spec, platform) {
+  function validateCachedGithubInstall(spec, platform, smokeTimeoutMs = SMOKE_TIMEOUT_MS) {
     const lease = acquireInstallLock(spec.githubRepo);
     if (!lease)
       return null;
     try {
-      const validation = validateCachedGithubInstallUnderLock(spec, platform);
+      const validation = validateCachedGithubInstallUnderLock(spec, platform, smokeTimeoutMs);
       if (typeof validation !== "boolean")
         return validation.finally(() => lease.release());
       lease.release();
@@ -20786,10 +21785,10 @@ function createGithubInstaller(services) {
       throw err;
     }
   }
-  function validateCachedGithubInstallUnderLock(spec, platform) {
+  function validateCachedGithubInstallUnderLock(spec, platform, smokeTimeoutMs = SMOKE_TIMEOUT_MS) {
     const packageDir = ghPackageDir(spec);
     const meta = readGithubInstalledMetaIn(packageDir);
-    const binaryPath = ghBinaryCandidates(spec, platform).map((candidate) => join11(ghBinDir(spec), candidate)).find((candidate) => {
+    const binaryPath = ghBinaryCandidates(spec, platform).map((candidate) => join10(ghBinDir(spec), candidate)).find((candidate) => {
       try {
         return statSync6(candidate).isFile();
       } catch {
@@ -20819,7 +21818,7 @@ function createGithubInstaller(services) {
         quarantineCachedGithubInstall(spec, "missing required runtime files");
         return false;
       }
-      const verdict = await smokeGithubBinary(spec, binaryPath);
+      const verdict = await smokeGithubBinary(spec, binaryPath, smokeTimeoutMs);
       if (verdict === "failed") {
         quarantineCachedGithubInstall(spec, "cached binary failed runtime smoke check");
         return false;
@@ -20865,7 +21864,7 @@ function createGithubInstaller(services) {
     }
     const pkgDir = ghPackageDir(spec);
     const extractDir = ghExtractDir(spec);
-    const archivePath = join11(pkgDir, expected.name);
+    const archivePath = join10(pkgDir, expected.name);
     log(`[lsp] downloading ${spec.id} ${tag} → ${matchingAsset.url}`);
     try {
       await downloadFile(matchingAsset.url, archivePath, fetchImpl, matchingAsset.size, signal);
@@ -20901,7 +21900,7 @@ function createGithubInstaller(services) {
     const binaryRelativePath = spec.binaryPathInArchive(platform, arch, version);
     try {
       await extractArchiveSafely(archivePath, extractDir, expected.archive, async (stagingDir) => {
-        const stagedBinary = join11(stagingDir, binaryRelativePath);
+        const stagedBinary = join10(stagingDir, binaryRelativePath);
         if (!existsSync6(stagedBinary) || !statSync6(stagedBinary).isFile()) {
           throw new Error(`extracted binary not found at ${stagedBinary}`);
         }
@@ -20931,7 +21930,7 @@ function createGithubInstaller(services) {
         unlinkSync3(archivePath);
       } catch {}
     }
-    const innerBinaryPath = join11(extractDir, binaryRelativePath);
+    const innerBinaryPath = join10(extractDir, binaryRelativePath);
     const targetBinary = spec.layout === "distribution" ? innerBinaryPath : ghBinaryPath(spec, platform);
     mkdirSync4(dirname4(targetBinary), { recursive: true });
     try {
@@ -21058,6 +22057,7 @@ function createGithubInstaller(services) {
     let installsStarted = 0;
     const lockWaitTimeoutMs = Math.max(0, options.__lockWaitTimeoutMsForTests ?? INSTALL_LOCK_WAIT_MS);
     const lockPollIntervalMs = Math.max(1, options.__lockPollIntervalMsForTests ?? INSTALL_LOCK_POLL_INTERVAL_MS);
+    const smokeTimeoutMs = Math.max(1, options.__smokeTimeoutMsForTests ?? SMOKE_TIMEOUT_MS);
     function notifyCachedBinDirsChanged(directory) {
       try {
         options.onCachedBinDirsChanged?.(directory);
@@ -21070,7 +22070,7 @@ function createGithubInstaller(services) {
       while (true) {
         if (signal.aborted)
           return null;
-        const validation = await withInstallLock(spec.githubRepo, async () => validateCachedGithubInstallUnderLock(spec, platform));
+        const validation = await withInstallLock(spec.githubRepo, async () => validateCachedGithubInstallUnderLock(spec, platform, smokeTimeoutMs));
         if (validation !== null)
           return validation;
         if (signal.aborted)
@@ -21099,7 +22099,7 @@ function createGithubInstaller(services) {
     }
     for (const spec of GITHUB_LSP_TABLE) {
       const controller = new AbortController;
-      const validation = isGithubInstalled(spec, host.platform) ? validateCachedGithubInstall(spec, host.platform) : false;
+      const validation = isGithubInstalled(spec, host.platform) ? validateCachedGithubInstall(spec, host.platform, smokeTimeoutMs) : false;
       if (validation === true)
         cachedBinDirs.push(ghBinDir(spec));
       const cacheReady = (validation === null ? retryBusyCacheValidation(spec, host.platform, controller.signal) : Promise.resolve(validation)).then((healthy) => {
@@ -21154,7 +22154,7 @@ function createGithubInstaller(services) {
         const currentHost = detectHostPlatform();
         if (!currentHost)
           return [];
-        const directories = await Promise.all(GITHUB_LSP_TABLE.map(async (spec) => isGithubInstalled(spec, currentHost.platform) && await validateCachedGithubInstall(spec, currentHost.platform) ? ghBinDir(spec) : null));
+        const directories = await Promise.all(GITHUB_LSP_TABLE.map(async (spec) => isGithubInstalled(spec, currentHost.platform) && await validateCachedGithubInstall(spec, currentHost.platform, smokeTimeoutMs) ? ghBinDir(spec) : null));
         return directories.filter((directory) => directory !== null);
       }
     };
@@ -21225,7 +22225,7 @@ import { stat as stat2 } from "node:fs/promises";
 // ../aft-bridge/dist/npm-resolver.js
 import { readdirSync as readdirSync3, statSync as statSync7 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
-import { dirname as dirname5, isAbsolute as isAbsolute5, join as join12 } from "node:path";
+import { dirname as dirname5, isAbsolute as isAbsolute4, join as join11 } from "node:path";
 function defaultDeps() {
   return {
     platform: process.platform,
@@ -21252,16 +22252,16 @@ function npmFromPath(deps) {
   const separator = deps.platform === "win32" ? ";" : ":";
   for (const entry of raw.split(separator)) {
     const dir = entry.trim().replace(/^"|"$/g, "");
-    if (!dir || !isAbsolute5(dir))
+    if (!dir || !isAbsolute4(dir))
       continue;
-    if (isFile(join12(dir, name)))
+    if (isFile(join11(dir, name)))
       return dir;
   }
   return null;
 }
 function npmAdjacentToNode(deps) {
   const dir = dirname5(deps.execPath);
-  return isFile(join12(dir, npmBinaryName(deps.platform))) ? dir : null;
+  return isFile(join11(dir, npmBinaryName(deps.platform))) ? dir : null;
 }
 function highestVersionedNodeBin(installsDir, name) {
   let entries;
@@ -21270,8 +22270,8 @@ function highestVersionedNodeBin(installsDir, name) {
   } catch {
     return null;
   }
-  const candidates = entries.filter((v) => isFile(join12(installsDir, v, "bin", name))).sort((a, b) => compareVersionsDesc(a, b));
-  return candidates.length > 0 ? join12(installsDir, candidates[0], "bin") : null;
+  const candidates = entries.filter((v) => isFile(join11(installsDir, v, "bin", name))).sort((a, b) => compareVersionsDesc(a, b));
+  return candidates.length > 0 ? join11(installsDir, candidates[0], "bin") : null;
 }
 function compareVersionsDesc(a, b) {
   const pa = a.replace(/^v/, "").split(".").map((n) => Number.parseInt(n, 10));
@@ -21296,22 +22296,22 @@ function wellKnownNpmDirs(deps) {
     const programFiles = env.ProgramFiles || "C:\\Program Files";
     const appData = env.APPDATA;
     const localAppData = env.LOCALAPPDATA;
-    push(join12(programFiles, "nodejs"));
+    push(join11(programFiles, "nodejs"));
     if (appData)
-      push(join12(appData, "npm"));
+      push(join11(appData, "npm"));
     if (localAppData)
-      push(join12(localAppData, "Volta", "bin"));
+      push(join11(localAppData, "Volta", "bin"));
     if (env.NVM_SYMLINK)
       push(env.NVM_SYMLINK);
   } else {
     if (env.NVM_BIN)
       push(env.NVM_BIN);
-    push(highestVersionedNodeBin(join12(home, ".nvm", "versions", "node"), name));
-    push(highestVersionedNodeBin(join12(home, ".local", "share", "mise", "installs", "node"), name));
-    push(highestVersionedNodeBin(join12(home, ".asdf", "installs", "nodejs"), name));
-    push(join12(home, ".volta", "bin"));
-    push(join12(home, ".asdf", "shims"));
-    const systemDirs = deps.systemNpmDirs ?? (platform === "darwin" ? ["/opt/homebrew/bin", "/usr/local/bin"] : ["/usr/local/bin", "/usr/bin", join12(home, ".local", "bin")]);
+    push(highestVersionedNodeBin(join11(home, ".nvm", "versions", "node"), name));
+    push(highestVersionedNodeBin(join11(home, ".local", "share", "mise", "installs", "node"), name));
+    push(highestVersionedNodeBin(join11(home, ".asdf", "installs", "nodejs"), name));
+    push(join11(home, ".volta", "bin"));
+    push(join11(home, ".asdf", "shims"));
+    const systemDirs = deps.systemNpmDirs ?? (platform === "darwin" ? ["/opt/homebrew/bin", "/usr/local/bin"] : ["/usr/local/bin", "/usr/bin", join11(home, ".local", "bin")]);
     for (const dir of systemDirs)
       push(dir);
   }
@@ -21321,17 +22321,32 @@ function resolveNpm(deps = defaultDeps()) {
   const name = npmBinaryName(deps.platform);
   const onPath = npmFromPath(deps);
   if (onPath)
-    return { command: join12(onPath, name), binDir: onPath };
+    return { command: join11(onPath, name), binDir: onPath };
   const adjacent = npmAdjacentToNode(deps);
   if (adjacent)
-    return { command: join12(adjacent, name), binDir: adjacent };
+    return { command: join11(adjacent, name), binDir: adjacent };
   for (const dir of wellKnownNpmDirs(deps)) {
-    const candidate = join12(dir, name);
+    const candidate = join11(dir, name);
     if (isFile(candidate))
       return { command: candidate, binDir: dir };
   }
   return null;
 }
+function npmCandidates(deps = defaultDeps()) {
+  const name = npmBinaryName(deps.platform);
+  const dirs = [
+    ...(deps.env.PATH ?? "").split(deps.platform === "win32" ? ";" : ":").filter(isAbsolute4),
+    dirname5(deps.execPath),
+    ...wellKnownNpmDirs(deps)
+  ];
+  return [...new Set(dirs)].flatMap((binDir) => {
+    return [
+      join11(binDir, name),
+      join11(binDir, "node_modules", "npm", "bin", "npm-cli.js"),
+      join11(binDir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js")
+    ].filter(isFile).map((command) => ({ command, binDir }));
+  });
+}
 function quoteCmdArgument(value) {
   if (/[\0\r\n"%]/.test(value)) {
     throw new Error(`npm argument cannot be represented safely for cmd.exe: ${JSON.stringify(value)}`);
@@ -21339,6 +22354,8 @@ function quoteCmdArgument(value) {
   return `"${value}"`;
 }
 function npmInvocation(resolved, npmArgs, platform = process.platform, env = process.env) {
+  if (resolved.cliPath)
+    return { command: resolved.command, args: [resolved.cliPath, ...npmArgs] };
   if (platform !== "win32" || !/\.(?:cmd|bat)$/i.test(resolved.command)) {
     return { command: resolved.command, args: [...npmArgs] };
   }
@@ -21495,7 +22512,7 @@ function terminateNpmProcessTree(child, invocation, env = process.env, gracePeri
     };
     child.once("exit", onChildExit);
     const systemRoot = env.SystemRoot ?? env.SYSTEMROOT;
-    const taskkill = systemRoot ? join12(systemRoot, "System32", "taskkill.exe") : "taskkill.exe";
+    const taskkill = systemRoot ? join11(systemRoot, "System32", "taskkill.exe") : "taskkill.exe";
     try {
       killer = spawn(taskkill, ["/pid", String(child.pid), "/t", "/f"], {
         stdio: "ignore",
@@ -21591,10 +22608,11 @@ function probeNpmCutoffSupport(npm, clock) {
   });
 }
 async function npmSupportsCutoff(npm, clock) {
-  const identity = await stat2(npm.command).then(({ size, mtimeMs }) => ({ size, mtimeMs })).catch(() => {
+  const key = npm.cliPath ? `${npm.command}\x00${npm.cliPath}` : npm.command;
+  const identity = await stat2(npm.cliPath ?? npm.command).then(({ size, mtimeMs }) => ({ size, mtimeMs })).catch(() => {
     return;
   });
-  const existing = npmCutoffSupport.get(npm.command);
+  const existing = npmCutoffSupport.get(key);
   const sameIdentity = existing && existing.identity?.size === identity?.size && existing.identity?.mtimeMs === identity?.mtimeMs;
   if (existing && sameIdentity) {
     if (!existing.settled || identity !== undefined && existing.settled.outcome !== "transient" || clock.now() < existing.settled.retryAt)
@@ -21605,7 +22623,7 @@ async function npmSupportsCutoff(npm, clock) {
     return outcome;
   });
   const entry = { identity, pending };
-  npmCutoffSupport.set(npm.command, entry);
+  npmCutoffSupport.set(key, entry);
   return pending;
 }
 function lspPublicationCutoff(graceDays, pinned, now = Date.now()) {
@@ -21623,6 +22641,79 @@ async function lspNpmInstallInvocation(npm, target, before, clock = SYSTEM_CLOCK
     target
   ]);
 }
+// ../aft-bridge/dist/lsp-npm-selection.js
+import { readFile, realpath, stat as stat3 } from "node:fs/promises";
+import { dirname as dirname6, join as join12, resolve as resolve8 } from "node:path";
+var LSP_NPM_REFUSAL = "AFT can't install language servers with the npm at <path> (<reason>). Put a real npm 7 or newer first on PATH; pinning a server version won't help.";
+function lspNpmRefusal(path, reason) {
+  return LSP_NPM_REFUSAL.replace("<path>", path).replace("<reason>", reason);
+}
+async function genuineNpm(candidate) {
+  let executable;
+  try {
+    executable = await realpath(candidate.command);
+  } catch (error) {
+    return { reason: `probe failed: ${String(error)}` };
+  }
+  const windowsShim = /\.(?:cmd|bat)$/i.test(executable);
+  let current = dirname6(executable);
+  if (windowsShim)
+    current = join12(current, "node_modules", "npm");
+  for (;; ) {
+    try {
+      const pkg = JSON.parse(await readFile(join12(current, "package.json"), "utf8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.npm;
+      if (pkg.name === "npm" && typeof bin === "string") {
+        const cli = await realpath(resolve8(current, bin));
+        if (!windowsShim && cli !== executable)
+          return { reason: "not npm: command is not npm's declared CLI" };
+        const major = /^(\d+)\.\d+\.\d+$/.exec(pkg.version)?.[1];
+        if (!major)
+          return { reason: "probe failed: npm manifest has an unknown version" };
+        if (Number(major) < 7)
+          return { reason: `old npm: ${pkg.version} (requires npm 7 or newer)` };
+        if (windowsShim || process.platform === "win32" && /\.[cm]?js$/i.test(cli)) {
+          const node = join12(candidate.binDir ?? dirname6(executable), "node.exe");
+          if (!(await stat3(node)).isFile())
+            return { reason: "probe failed: adjacent Node is missing" };
+          return { npm: { command: node, binDir: dirname6(node), cliPath: cli }, reason: "" };
+        }
+        return { npm: { command: cli, binDir: candidate.binDir }, reason: "" };
+      }
+    } catch {}
+    const parent = dirname6(current);
+    if (parent === current || windowsShim)
+      break;
+    current = parent;
+  }
+  return { reason: "not npm: no matching npm package manifest and CLI" };
+}
+async function selectLspNpm(preferred, candidates, signal) {
+  const aborted = () => ({
+    refusal: lspNpmRefusal(preferred.command, "probe failed: installation aborted")
+  });
+  if (signal?.aborted)
+    return aborted();
+  const first = await genuineNpm(preferred);
+  if (signal?.aborted)
+    return aborted();
+  if (first.npm)
+    return { npm: first.npm };
+  const seen = new Set([preferred.command]);
+  for (const candidate of candidates ?? npmCandidates()) {
+    if (signal?.aborted)
+      return aborted();
+    if (seen.has(candidate.command))
+      continue;
+    seen.add(candidate.command);
+    const result = await genuineNpm(candidate);
+    if (signal?.aborted)
+      return aborted();
+    if (result.npm)
+      return { npm: result.npm };
+  }
+  return { refusal: lspNpmRefusal(preferred.command, first.reason) };
+}
 // ../aft-bridge/dist/message-detach.js
 var BASH_WAIT_DETACH_MAGIC_KEYWORD = "&detach";
 var STANDALONE_DETACH_KEYWORD_SOURCE = `(^|[^\\p{L}\\p{N}_])${BASH_WAIT_DETACH_MAGIC_KEYWORD}(?![\\p{L}\\p{N}_])`;
@@ -21672,14 +22763,14 @@ function shouldInterruptWaitsForMessage(detachOnUserMessage, operatorText) {
   return detachOnUserMessage || containsStandaloneDetachKeyword(operatorText);
 }
 // ../aft-bridge/dist/migration.js
-import { closeSync as closeSync7, existsSync as existsSync9, mkdirSync as mkdirSync5, openSync as openSync6, readFileSync as readFileSync8, renameSync as renameSync5, rmSync as rmSync3, statSync as statSync8, unlinkSync as unlinkSync4, writeFileSync as writeFileSync4 } from "node:fs";
+import { closeSync as closeSync8, existsSync as existsSync9, mkdirSync as mkdirSync5, openSync as openSync7, readFileSync as readFileSync8, renameSync as renameSync5, rmSync as rmSync3, statSync as statSync8, unlinkSync as unlinkSync4, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir as homedir12, tmpdir as tmpdir3 } from "node:os";
-import { basename as basename2, dirname as dirname8, join as join15, resolve as resolve9 } from "node:path";
+import { basename as basename2, dirname as dirname9, join as join15, resolve as resolve10 } from "node:path";
 
 // ../aft-bridge/dist/paths.js
-import { existsSync as existsSync7, readFileSync as readFileSync6, realpathSync as realpathSync4, renameSync as renameSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync6, realpathSync as realpathSync5, renameSync as renameSync4, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { dirname as dirname6, isAbsolute as isAbsolute6, join as join13, resolve as resolve8 } from "node:path";
+import { dirname as dirname7, isAbsolute as isAbsolute5, join as join13, resolve as resolve9 } from "node:path";
 function homeDir3() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir10();
@@ -21687,14 +22778,14 @@ function homeDir3() {
 }
 function configHome() {
   const xdg = process.env.XDG_CONFIG_HOME;
-  if (xdg && isAbsolute6(xdg))
+  if (xdg && isAbsolute5(xdg))
     return xdg;
   return join13(homeDir3(), ".config");
 }
 function legacyOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
-    return resolve8(envDir);
+    return resolve9(envDir);
   return join13(configHome(), "opencode");
 }
 function legacyPiAgentDir() {
@@ -21742,9 +22833,9 @@ function resolveLegacyAftConfigSources(projectDirectory) {
   ];
   const identity = (path) => {
     try {
-      return realpathSync4(path);
+      return realpathSync5(path);
     } catch {
-      return resolve8(path);
+      return resolve9(path);
     }
   };
   const protectedPaths = new Set([
@@ -21768,7 +22859,7 @@ function repairRootScopedStorageFile(storageRoot, harness, fileName) {
   if (existsSync7(harnessPath) || !existsSync7(rootPath))
     return harnessPath;
   try {
-    openPrivateStorageDir(storageRoot, dirname6(harnessPath));
+    openPrivateStorageDir(storageRoot, dirname7(harnessPath));
     renameSync4(rootPath, harnessPath);
   } catch {}
   return harnessPath;
@@ -21789,7 +22880,7 @@ function shouldShowAnnouncement(storageRoot, harness, currentVersion) {
     return false;
   if (!lastVersion) {
     try {
-      openPrivateStorageDir(storageRoot, dirname6(versionFile));
+      openPrivateStorageDir(storageRoot, dirname7(versionFile));
       writeFileSync3(versionFile, currentVersion, { mode: PRIVATE_FILE_MODE });
     } catch {}
     return false;
@@ -21801,7 +22892,7 @@ function markAnnouncementSeen(storageRoot, harness, currentVersion) {
     return;
   const versionFile = repairRootScopedStorageFile(storageRoot, harness, "last_announced_version");
   try {
-    openPrivateStorageDir(storageRoot, dirname6(versionFile));
+    openPrivateStorageDir(storageRoot, dirname7(versionFile));
     writeFileSync3(versionFile, currentVersion, { mode: PRIVATE_FILE_MODE });
   } catch {}
 }
@@ -21850,10 +22941,10 @@ function decodeFileUrl(target) {
 }
 
 // ../aft-bridge/dist/resolver.js
-import { closeSync as closeSync6, existsSync as existsSync8, promises as fsPromises, openSync as openSync5, readFileSync as readFileSync7, readSync as readSync5 } from "node:fs";
-import { createRequire } from "node:module";
+import { closeSync as closeSync7, existsSync as existsSync8, promises as fsPromises, openSync as openSync6, readFileSync as readFileSync7, readSync as readSync6 } from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
 import { homedir as homedir11 } from "node:os";
-import { delimiter, dirname as dirname7, isAbsolute as isAbsolute7, join as join14 } from "node:path";
+import { delimiter, dirname as dirname8, isAbsolute as isAbsolute6, join as join14 } from "node:path";
 var ensureBinaryForResolver = ensureBinary;
 var npmPlatformPackageReader = null;
 var cacheCopiesInFlight = new Map;
@@ -21927,7 +23018,7 @@ function pathCandidates(env, ext) {
   const seen = new Set;
   const candidates = [];
   for (const dir of rawPath.split(delimiter)) {
-    if (!dir || !isAbsolute7(dir))
+    if (!dir || !isAbsolute6(dir))
       continue;
     const candidate = join14(dir, `aft${ext}`);
     if (seen.has(candidate))
@@ -21941,9 +23032,9 @@ function pathCandidates(env, ext) {
 function isNativeExecutable(binaryPath) {
   let fd = null;
   try {
-    fd = openSync5(binaryPath, "r");
+    fd = openSync6(binaryPath, "r");
     const buf = Buffer.alloc(4);
-    const read = readSync5(fd, buf, 0, 4, 0);
+    const read = readSync6(fd, buf, 0, 4, 0);
     if (read < 2)
       return false;
     const b0 = buf[0];
@@ -21964,7 +23055,7 @@ function isNativeExecutable(binaryPath) {
   } finally {
     if (fd !== null) {
       try {
-        closeSync6(fd);
+        closeSync7(fd);
       } catch {}
     }
   }
@@ -21994,7 +23085,7 @@ function explicitBinaryOverride(env) {
 }
 function ownPackageVersion() {
   try {
-    const req = createRequire(import.meta.url);
+    const req = createRequire2(import.meta.url);
     return req("../package.json").version;
   } catch {
     return null;
@@ -22004,10 +23095,10 @@ function npmPlatformPackage(ext) {
   if (npmPlatformPackageReader)
     return npmPlatformPackageReader(ext);
   try {
-    const req = createRequire(import.meta.url);
+    const req = createRequire2(import.meta.url);
     const manifestPath = req.resolve(`@cortexkit/aft-${platformKey()}/package.json`);
     const manifest = JSON.parse(readFileSync7(manifestPath, "utf8"));
-    const binaryPath = join14(dirname7(manifestPath), "bin", `aft${ext}`);
+    const binaryPath = join14(dirname8(manifestPath), "bin", `aft${ext}`);
     if (typeof manifest.version !== "string" || !existsSync8(binaryPath))
       return null;
     return { binaryPath, version: normalizeBareVersion(manifest.version) };
@@ -22314,19 +23405,19 @@ function acquireConfigMigrationLock(lockDir) {
   }
 }
 function atomicCopyConfigFile(sourcePath, targetPath) {
-  mkdirSync5(dirname8(targetPath), { recursive: true });
-  const tmpPath = join15(dirname8(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  mkdirSync5(dirname9(targetPath), { recursive: true });
+  const tmpPath = join15(dirname9(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
-    fd = openSync6(tmpPath, "wx", 384);
+    fd = openSync7(tmpPath, "wx", 384);
     writeFileSync4(fd, readFileSync8(sourcePath));
-    closeSync7(fd);
+    closeSync8(fd);
     fd = null;
     renameSync5(tmpPath, targetPath);
   } catch (err) {
     if (fd !== null) {
       try {
-        closeSync7(fd);
+        closeSync8(fd);
       } catch {}
     }
     try {
@@ -22336,19 +23427,19 @@ function atomicCopyConfigFile(sourcePath, targetPath) {
   }
 }
 function atomicWriteConfigFile(targetPath, content) {
-  mkdirSync5(dirname8(targetPath), { recursive: true });
-  const tmpPath = join15(dirname8(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  mkdirSync5(dirname9(targetPath), { recursive: true });
+  const tmpPath = join15(dirname9(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
-    fd = openSync6(tmpPath, "wx", 384);
+    fd = openSync7(tmpPath, "wx", 384);
     writeFileSync4(fd, content);
-    closeSync7(fd);
+    closeSync8(fd);
     fd = null;
     renameSync5(tmpPath, targetPath);
   } catch (err) {
     if (fd !== null) {
       try {
-        closeSync7(fd);
+        closeSync8(fd);
       } catch {}
     }
     try {
@@ -22456,13 +23547,13 @@ function visibleConfigMigrationWarning(scope, targetPath, paths, reason) {
 }
 function migrateAftConfigFile(opts) {
   const warnings = [];
-  const resolvedTarget = resolve9(opts.targetPath);
-  const existingSources = opts.legacySources.filter((source) => existsSync9(source.path) && resolve9(source.path) !== resolvedTarget);
+  const resolvedTarget = resolve10(opts.targetPath);
+  const existingSources = opts.legacySources.filter((source) => existsSync9(source.path) && resolve10(source.path) !== resolvedTarget);
   const info = opts.logger?.info ?? opts.logger?.log;
   if (existingSources.length === 0) {
     return { migrated: false, conflict: false, targetPath: opts.targetPath, warnings };
   }
-  mkdirSync5(dirname8(opts.targetPath), { recursive: true });
+  mkdirSync5(dirname9(opts.targetPath), { recursive: true });
   const release = acquireConfigMigrationLock(`${opts.targetPath}.lock`);
   try {
     const sources = existingSources.map((source) => ({
@@ -22521,11 +23612,11 @@ function spawnErrorLabel(error) {
 function migrationLogPath(newRoot, harness, logger) {
   const desired = join15(newRoot, "logs", "migration", `${harness}-${Date.now()}.jsonl`);
   try {
-    mkdirSync5(dirname8(desired), { recursive: true });
+    mkdirSync5(dirname9(desired), { recursive: true });
     return desired;
   } catch (err) {
     const fallback = join15(tmpdir3(), `aft-migration-${harness}-${Date.now()}.jsonl`);
-    logger?.warn?.(`Failed to create AFT migration log directory ${dirname8(desired)}: ${err instanceof Error ? err.message : String(err)}. ` + `Using fallback log path ${fallback}.`);
+    logger?.warn?.(`Failed to create AFT migration log directory ${dirname9(desired)}: ${err instanceof Error ? err.message : String(err)}. ` + `Using fallback log path ${fallback}.`);
     return fallback;
   }
 }
@@ -22584,13 +23675,13 @@ async function ensureStorageMigrated(opts) {
 // ../aft-bridge/dist/migration-notices.js
 import { readFileSync as readFileSync9, renameSync as renameSync6, rmdirSync, statSync as statSync9, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir13 } from "node:os";
-import { dirname as dirname9, join as join16, resolve as resolve10 } from "node:path";
+import { dirname as dirname10, join as join16, resolve as resolve11 } from "node:path";
 function migrationNoticeStorePath(env = process.env) {
   const stateHome = env.XDG_STATE_HOME && env.XDG_STATE_HOME.length > 0 ? env.XDG_STATE_HOME : join16(homedir13(), ".local", "state");
   return join16(stateHome, "cortexkit", "aft", "migration-notices.json");
 }
 function noticeKey(configPath, digest) {
-  return `${resolve10(configPath)}|${MIGRATION_POLICY_ID}|${digest}`;
+  return `${resolve11(configPath)}|${MIGRATION_POLICY_ID}|${digest}`;
 }
 function readRecords(storePath) {
   try {
@@ -22603,7 +23694,7 @@ function readRecords(storePath) {
 var LOCK_STALE_MS = 1e4;
 function withStoreLock(storePath, action) {
   const lockPath = `${storePath}.lock`;
-  openPrivateStorageDir(dirname9(storePath));
+  openPrivateStorageDir(dirname10(storePath));
   const deadline = Date.now() + 2000;
   for (;; ) {
     try {
@@ -22657,7 +23748,7 @@ function deliverMigrationNoticeOnce(options) {
   }
 }
 // ../aft-bridge/dist/onnx-probe.js
-import { closeSync as closeSync8, existsSync as existsSync10, openSync as openSync7, readSync as readSync6, realpathSync as realpathSync5 } from "node:fs";
+import { closeSync as closeSync9, existsSync as existsSync10, openSync as openSync8, readSync as readSync7, realpathSync as realpathSync6 } from "node:fs";
 var MH_MAGIC = 4277009102;
 var MH_MAGIC_64 = 4277009103;
 var FAT_MAGIC = 3405691582;
@@ -22670,7 +23761,7 @@ var MAX_HEADER_BYTES = 4 * 1024 * 1024;
 var UNCHECKED = { loadable: true, checked: false };
 function readAt(fd, offset, length) {
   const buffer = Buffer.alloc(length);
-  const read = readSync6(fd, buffer, 0, length, offset);
+  const read = readSync7(fd, buffer, 0, length, offset);
   return buffer.subarray(0, read);
 }
 function cpuTypeForArch(arch) {
@@ -22744,7 +23835,7 @@ function isUncheckableDependency(path) {
 function probeOnnxRuntimeLoadable(libPath, arch = process.arch) {
   let fd;
   try {
-    fd = openSync7(realpathSync5(libPath), "r");
+    fd = openSync8(realpathSync6(libPath), "r");
   } catch (err) {
     return {
       loadable: false,
@@ -22778,13 +23869,13 @@ function probeOnnxRuntimeLoadable(libPath, arch = process.arch) {
   } catch {
     return UNCHECKED;
   } finally {
-    closeSync8(fd);
+    closeSync9(fd);
   }
 }
 // ../aft-bridge/dist/onnx-runtime.js
 import { randomBytes as randomBytes3 } from "node:crypto";
-import { chmodSync as chmodSync2, closeSync as closeSync9, copyFileSync as copyFileSync4, createWriteStream as createWriteStream3, existsSync as existsSync11, lstatSync as lstatSync3, openSync as openSync8, readdirSync as readdirSync4, readFileSync as readFileSync10, readlinkSync as readlinkSync2, realpathSync as realpathSync6, renameSync as renameSync7, rmSync as rmSync4, statSync as statSync10, symlinkSync, unlinkSync as unlinkSync5, writeFileSync as writeFileSync6 } from "node:fs";
-import { basename as basename3, dirname as dirname10, isAbsolute as isAbsolute8, join as join17, relative as relative5, resolve as resolve11, win32 as win323 } from "node:path";
+import { chmodSync as chmodSync2, closeSync as closeSync10, copyFileSync as copyFileSync4, createWriteStream as createWriteStream3, existsSync as existsSync11, lstatSync as lstatSync3, openSync as openSync9, readdirSync as readdirSync4, readFileSync as readFileSync10, readlinkSync as readlinkSync2, realpathSync as realpathSync7, renameSync as renameSync7, rmSync as rmSync4, statSync as statSync10, symlinkSync, unlinkSync as unlinkSync5, writeFileSync as writeFileSync6 } from "node:fs";
+import { basename as basename3, dirname as dirname11, isAbsolute as isAbsolute7, join as join17, relative as relative4, resolve as resolve12, win32 as win324 } from "node:path";
 import { Readable as Readable3 } from "node:stream";
 import { pipeline as pipeline3 } from "node:stream/promises";
 var ORT_VERSION = "1.24.4";
@@ -23023,14 +24114,14 @@ function parseOnnxVersionFromDirectoryPath(value) {
   return null;
 }
 function isPathInsideRoot(root, candidate) {
-  const rel = relative5(root, candidate);
-  return rel === "" || !rel.startsWith("../") && !rel.startsWith("..\\") && rel !== ".." && !isAbsolute8(rel) && !win323.isAbsolute(rel);
+  const rel = relative4(root, candidate);
+  return rel === "" || !rel.startsWith("../") && !rel.startsWith("..\\") && rel !== ".." && !isAbsolute7(rel) && !win324.isAbsolute(rel);
 }
 function detectOnnxVersion(libDir, libName) {
   try {
     const entries = readdirSync4(libDir);
     try {
-      const resolved = parseOnnxVersionFromPath(realpathSync6(join17(libDir, libName)));
+      const resolved = parseOnnxVersionFromPath(realpathSync7(join17(libDir, libName)));
       if (resolved && resolved !== INVALID_ORT_VERSION)
         return resolved;
     } catch {}
@@ -23047,7 +24138,7 @@ function detectOnnxVersion(libDir, libName) {
     const base = join17(libDir, libName);
     if (existsSync11(base)) {
       try {
-        const real = realpathSync6(base);
+        const real = realpathSync7(base);
         const version = parseOnnxVersionFromPath(real) ?? parseOnnxVersionFromDirectoryPath(real);
         if (version)
           return version;
@@ -23084,18 +24175,18 @@ function pathEntriesForPlatform() {
   return pathEnvValue().split(delimiter).map((entry) => entry.trim().replace(/^"|"$/g, "")).filter((entry) => {
     if (!entry || entry === "." || entry.includes("\x00"))
       return false;
-    return isAbsolute8(entry) || win323.isAbsolute(entry);
+    return isAbsolute7(entry) || win324.isAbsolute(entry);
   });
 }
 function isWindowsSystem32Directory(dir) {
   if (process.platform !== "win32")
     return false;
-  const normalizedDir = win323.resolve(dir).replace(/[\\/]+$/, "").toLowerCase();
+  const normalizedDir = win324.resolve(dir).replace(/[\\/]+$/, "").toLowerCase();
   const windowsRoots = [process.env.SystemRoot, process.env.windir, "C:\\Windows"];
   return windowsRoots.some((root) => {
     if (!root)
       return false;
-    return normalizedDir === win323.resolve(root, "System32").replace(/[\\/]+$/, "").toLowerCase();
+    return normalizedDir === win324.resolve(root, "System32").replace(/[\\/]+$/, "").toLowerCase();
   });
 }
 function directoryContainsLibrary(dir, libName) {
@@ -23155,7 +24246,7 @@ function findSystemOnnxRuntime(libName, searchPathsOverride) {
   const normalizeCase = process.platform === "win32" || process.platform === "darwin";
   const seen = new Set;
   const uniquePaths = searchPaths.filter((p) => {
-    let key = resolve11(p).replace(/[/\\]+$/, "");
+    let key = resolve12(p).replace(/[/\\]+$/, "");
     if (normalizeCase)
       key = key.toLowerCase();
     if (seen.has(key))
@@ -23212,7 +24303,7 @@ async function downloadFileWithCap(url, destPath) {
     if (Number.isFinite(advertised) && advertised > MAX_DOWNLOAD_BYTES2) {
       throw new Error(`Content-Length ${advertised} exceeds max ${MAX_DOWNLOAD_BYTES2}`);
     }
-    privateMkdirSync(dirname10(destPath));
+    privateMkdirSync(dirname11(destPath));
     let bytesWritten = 0;
     const guard = new TransformStream({
       transform(chunk, transformController) {
@@ -23239,7 +24330,7 @@ async function downloadFileWithCap(url, destPath) {
   }
 }
 function validateExtractedTree(stagingRoot) {
-  const realRoot = realpathSync6(stagingRoot);
+  const realRoot = realpathSync7(stagingRoot);
   let totalBytes = 0;
   const walk = (dir) => {
     const entries = readdirSync4(dir);
@@ -23248,15 +24339,15 @@ function validateExtractedTree(stagingRoot) {
       const lst = lstatSync3(fullPath);
       if (lst.isSymbolicLink()) {
         const linkTarget = readlinkSync2(fullPath);
-        const resolvedTarget = resolve11(dirname10(fullPath), linkTarget);
-        const rel = relative5(realRoot, resolvedTarget);
-        if (relativePathEscapesRoot(rel) || win323.isAbsolute(rel)) {
+        const resolvedTarget = resolve12(dirname11(fullPath), linkTarget);
+        const rel = relative4(realRoot, resolvedTarget);
+        if (relativePathEscapesRoot(rel) || win324.isAbsolute(rel)) {
           throw new Error(`extracted symlink ${fullPath} points outside staging root: ${linkTarget}`);
         }
         continue;
       }
-      const rel = relative5(realRoot, fullPath);
-      if (relativePathEscapesRoot(rel) || win323.isAbsolute(rel)) {
+      const rel = relative4(realRoot, fullPath);
+      if (relativePathEscapesRoot(rel) || win324.isAbsolute(rel)) {
         throw new Error(`extracted entry ${fullPath} escapes staging root`);
       }
       if (lst.isDirectory()) {
@@ -23388,14 +24479,14 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
       log(`ORT extract: failed to copy optional ${libFile}: ${copyErr}`);
     }
   }
-  const targetRoot = realpathSync6(targetDir);
+  const targetRoot = realpathSync7(targetDir);
   for (const link of symlinks) {
     const dst = join17(targetDir, link.name);
     try {
       unlinkSync5(dst);
     } catch {}
     const dstForContainment = join17(targetRoot, link.name);
-    const resolvedTarget = resolve11(dirname10(dstForContainment), link.target);
+    const resolvedTarget = resolve12(dirname11(dstForContainment), link.target);
     if (!isPathInsideRoot(targetRoot, resolvedTarget)) {
       const message = `ONNX Runtime symlink ${link.name} points outside install dir: ${link.target}`;
       if (requiredLibs.has(link.name)) {
@@ -23473,13 +24564,13 @@ function readOnnxInstalledMeta(installDir) {
 function acquireLock(lockPath) {
   const tryClaim = () => {
     try {
-      const fd = openSync8(lockPath, "wx", PRIVATE_FILE_MODE);
+      const fd = openSync9(lockPath, "wx", PRIVATE_FILE_MODE);
       try {
         writeFileSync6(fd, `${process.pid}
 ${new Date().toISOString()}
 `);
       } finally {
-        closeSync9(fd);
+        closeSync10(fd);
       }
       return true;
     } catch (err) {
@@ -25308,7 +26399,7 @@ function isBgCompletion(value) {
 function formatCompletion(completion) {
   const status = formatStatus(completion);
   const duration = formatDuration(completion);
-  const header = `- task ${completion.task_id} (${status}${duration ? `, ${duration}` : ""})`;
+  const header = formatUnknownPtyExit(completion.task_id, completion) ?? `- task ${completion.task_id} (${status}${duration ? `, ${duration}` : ""})`;
   const previewBlock = formatOutputPreview(completion);
   const descendantWarning = completion.live_descendants_summary ? `    ${completion.live_descendants_summary}` : "";
   const captureWarning = completion.output_incomplete || completion.status === "failed" && completion.status_reason ? `    [${completion.status_reason || "PTY output may be incomplete"}]` : "";
@@ -25375,9 +26466,9 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.63.5",
+  version: "0.65.0",
   type: "module",
-  description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
+  description: "Pi coding agent extension for Agent Foundational Toolkit (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
   types: "dist/index.d.ts",
   license: "MIT",
@@ -25399,18 +26490,18 @@ var package_default = {
     "test:e2e": "bun test src/__tests__/e2e/"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.63.5",
+    "@cortexkit/aft-bridge": "0.65.0",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.63.5",
-    "@cortexkit/aft-darwin-x64": "0.63.5",
-    "@cortexkit/aft-linux-arm64": "0.63.5",
-    "@cortexkit/aft-linux-x64": "0.63.5",
-    "@cortexkit/aft-win32-arm64": "0.63.5",
-    "@cortexkit/aft-win32-x64": "0.63.5"
+    "@cortexkit/aft-darwin-arm64": "0.65.0",
+    "@cortexkit/aft-darwin-x64": "0.65.0",
+    "@cortexkit/aft-linux-arm64": "0.65.0",
+    "@cortexkit/aft-linux-x64": "0.65.0",
+    "@cortexkit/aft-win32-arm64": "0.65.0",
+    "@cortexkit/aft-win32-x64": "0.65.0"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "^0.80.2",
@@ -25490,22 +26581,15 @@ function readStatusBar(value) {
   const disabled = Array.isArray(bar.disabled_categories) ? bar.disabled_categories.filter((key) => typeof key === "string") : [];
   const errors = readOptionalNumber(bar.errors);
   const warnings = readOptionalNumber(bar.warnings);
-  const deadCode = readOptionalNumber(bar.dead_code);
-  const unusedExports = readOptionalNumber(bar.unused_exports);
-  const duplicates = readOptionalNumber(bar.duplicates);
   const todos = readOptionalNumber(bar.todos);
-  if (errors === null && warnings === null && deadCode === null && unusedExports === null && duplicates === null && todos === null && disabled.length === 0) {
+  if (errors === null && warnings === null && todos === null && disabled.length === 0) {
     return;
   }
   return {
     ...disabled.length > 0 ? { disabled_categories: disabled } : {},
     ...errors !== null ? { errors } : {},
     ...warnings !== null ? { warnings } : {},
-    ...deadCode !== null ? { dead_code: deadCode } : {},
-    ...unusedExports !== null ? { unused_exports: unusedExports } : {},
-    ...duplicates !== null ? { duplicates } : {},
-    ...todos !== null ? { todos } : {},
-    ...bar.tier2_stale === true ? { tier2_stale: true } : {}
+    ...todos !== null ? { todos } : {}
   };
 }
 function formatFlag(enabled) {
@@ -25620,11 +26704,11 @@ function coerceAftStatus(response) {
       warm_entries: readNumber(symbolCache.warm_entries)
     },
     storage_dir: readNullableString(response.storage_dir),
-    checkpoints_total: readNumber(response.checkpoints_total),
+    checkpoints_total: readOptionalNumber(response.checkpoints_total),
     session: {
       id: readString(session.id, "__default__"),
       tracked_files: readNumber(session.tracked_files),
-      checkpoints: readNumber(session.checkpoints)
+      checkpoints: readOptionalNumber(session.checkpoints)
     },
     compression: readCompression(response.compression),
     status_bar: readStatusBar(response.status_bar ?? response.status_bar_values)
@@ -25661,13 +26745,10 @@ function formatStatusDialogMessage(status) {
     const rows = [
       ["errors", sb.errors],
       ["warnings", sb.warnings],
-      ["dead code", sb.dead_code],
-      ["unused exports", sb.unused_exports],
-      ["duplicates", sb.duplicates],
       ["todos", sb.todos]
     ].filter((row) => typeof row[1] === "number");
     if (rows.length > 0) {
-      lines.push("", `Code Health${sb.tier2_stale ? " (~ stale)" : ""}`);
+      lines.push("", "Code Health");
       for (const [label, value] of rows)
         lines.push(`- ${label}: ${formatCount(value)}`);
     }
@@ -25713,7 +26794,7 @@ import { Type } from "typebox";
 // src/config.ts
 import { existsSync as existsSync12, readFileSync as readFileSync11 } from "node:fs";
 import { homedir as homedir14 } from "node:os";
-import { isAbsolute as isAbsolute9 } from "node:path";
+import { isAbsolute as isAbsolute8 } from "node:path";
 var import_comment_json = __toESM(require_src2(), 1);
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/core/core.js
@@ -30505,9 +31586,8 @@ function clampBashWatchSyncMaxMs(value) {
 }
 function resolveBashConfig(config) {
   const top = config.bash;
-  const legacy = config.experimental?.bash;
-  const reminderEnabled = (typeof top === "object" && top !== null ? top.long_running_reminder_enabled : undefined) ?? legacy?.long_running_reminder_enabled;
-  const reminderInterval = (typeof top === "object" && top !== null ? top.long_running_reminder_interval_ms : undefined) ?? legacy?.long_running_reminder_interval_ms;
+  const reminderEnabled = typeof top === "object" && top !== null ? top.long_running_reminder_enabled : undefined;
+  const reminderInterval = typeof top === "object" && top !== null ? top.long_running_reminder_interval_ms : undefined;
   const topDetachOnUserMessage = typeof top === "object" && top !== null ? top.detach_on_user_message ?? true : true;
   const rawForegroundWait = typeof top === "object" && top !== null ? top.foreground_wait_window_ms : undefined;
   const foregroundWaitWindowMs = Math.max(FOREGROUND_WAIT_WINDOW_MIN_MS, rawForegroundWait ?? FOREGROUND_WAIT_WINDOW_DEFAULT_MS);
@@ -30551,13 +31631,6 @@ function resolveBashConfig(config) {
       detach_on_user_message: topDetachOnUserMessage
     };
   }
-  const hasLegacyFeatureFlag = legacy && (legacy.rewrite !== undefined || legacy.compress !== undefined || legacy.background !== undefined);
-  if (hasLegacyFeatureFlag) {
-    const rewrite = legacy.rewrite === true;
-    const compress = legacy.compress === true;
-    const background = legacy.background === true;
-    return { ...base, enabled: true, rewrite, compress, background };
-  }
   return { ...base, enabled: true, rewrite: true, compress: true, background: true };
 }
 var FormatterEnum = _enum([
@@ -30587,9 +31660,9 @@ var ConfigureWarningsDeliveryEnum = _enum(["toast", "log", "chat"]);
 var IndexKindSchema = _enum(["search", "semantic", "callgraph"]);
 function isSupportedAbsoluteIndexPath(path) {
   if (path === "~" || path.startsWith("~/") || path.startsWith("~\\")) {
-    return isAbsolute9(homedir14());
+    return isAbsolute8(homedir14());
   }
-  return isAbsolute9(path);
+  return isAbsolute8(path);
 }
 var IndexRootSchema = object({
   path: string2().refine(isSupportedAbsoluteIndexPath, {
@@ -30646,6 +31719,7 @@ var LspServerEntrySchema = object({
   initialization_options: unknown().optional()
 });
 var LspConfigSchema = object({
+  max_servers: number2().int().nonnegative().optional(),
   idle_minutes: union([
     number2().int().transform((value) => Math.min(1440, Math.max(5, value))),
     literal("never")
@@ -30659,13 +31733,6 @@ var LspConfigSchema = object({
   versions: record(string2().trim().min(1), string2().trim().min(1)).optional()
 });
 var ExperimentalConfigSchema = object({
-  bash: object({
-    rewrite: boolean2().optional(),
-    compress: boolean2().optional(),
-    background: boolean2().optional(),
-    long_running_reminder_enabled: boolean2().optional(),
-    long_running_reminder_interval_ms: number2().int().positive().optional()
-  }).optional(),
   lsp_ty: boolean2().optional()
 });
 var BashEnvSchema = record(string2(), string2()).superRefine((env, context) => {
@@ -30736,7 +31803,7 @@ var SubcConfigSchema = object({
   connection_file: string2().optional()
 });
 var GhShimConfigSchema = object({
-  binary_path: string2().trim().refine(isAbsolute9, "gh_shim.binary_path must be absolute").optional()
+  binary_path: string2().trim().refine(isAbsolute8, "gh_shim.binary_path must be absolute").optional()
 });
 var RemoteExecConfigSchema = object({
   enabled: boolean2().optional(),
@@ -30763,7 +31830,6 @@ var PiConfigSchema = object({
 var InspectConfigSchema = object({
   enabled: boolean2().optional(),
   diagnostics_timeout_ms: number2().int().positive().optional().transform((value) => value === undefined ? undefined : clampInspectDiagnosticsTimeoutMs(value)),
-  tier2_idle_minutes: number2().min(0).optional(),
   tier2_pass_timeout_ms: number2().int().positive().optional(),
   categories: object({
     diagnostics: boolean2().optional(),
@@ -30781,14 +31847,12 @@ var InspectConfigSchema = object({
 function clampIdleRootTtlMinutes(value) {
   return Math.min(30, Math.max(5, value));
 }
+function clampIdleCheckoutHours(value) {
+  return Math.min(IDLE_CHECKOUT_HOURS_MAX, Math.max(IDLE_CHECKOUT_HOURS_MIN, value));
+}
 var IdleConfigSchema = object({
-  root_ttl_minutes: number2().int().optional().transform((value) => value === undefined ? undefined : clampIdleRootTtlMinutes(value))
-});
-var ViewsConfigSchema = object({
-  enabled: boolean2().optional()
-});
-var WorktreeConfigSchema = object({
-  ram_overlay: boolean2().optional()
+  root_ttl_minutes: number2().int().optional().transform((value) => value === undefined ? undefined : clampIdleRootTtlMinutes(value)),
+  checkout_hours: number2().int().optional().transform((value) => value === undefined ? undefined : clampIdleCheckoutHours(value))
 });
 var BackupConfigSchema = object({
   enabled: boolean2().optional(),
@@ -30810,12 +31874,10 @@ var AftConfigFieldsSchema = object({
   indexes: IndexesConfigSchema.optional(),
   index: IndexConfigSchema.optional(),
   storage: object({ cache_dir: string2().nullable().optional() }).optional(),
-  views: ViewsConfigSchema.optional(),
   callgraph_chunk_size: number2().optional(),
   inspect: InspectConfigSchema.optional(),
   idle: IdleConfigSchema.optional(),
   backup: BackupConfigSchema.optional(),
-  worktree: WorktreeConfigSchema.optional(),
   sandbox: SandboxConfigSchema.optional(),
   bash: BashConfigSchema.optional(),
   experimental: ExperimentalConfigSchema.optional(),
@@ -30863,6 +31925,11 @@ function applyActiveHarnessOverride(config, trusted) {
     delete merged.indexes;
   else
     merged.indexes = indexes;
+  const idle = mergeIdleConfig(base.idle, override.idle);
+  if (idle === undefined)
+    delete merged.idle;
+  else
+    merged.idle = idle;
   merged.sandbox = mergeSandboxConfig(base.sandbox, override.sandbox, true);
   if (!trusted && override.sandbox?.write_allow !== undefined) {
     merged.sandbox = { ...merged.sandbox, write_allow: override.sandbox.write_allow };
@@ -30965,7 +32032,10 @@ function loadConfigFromPath(configPath, tier) {
     recordConfigParseFailure(configPath, errorMsg);
     throw new ConfigRejectedError(["invalid_config_document"], configPath);
   }
-  const removed = removedConfigKeyErrors(cleanConfig);
+  const removed = removedConfigKeyErrors(cleanConfig, undefined, false);
+  if (tier === "user") {
+    removed.push(...removedConfigKeyErrors(cleanConfig).filter((error) => [...REMOVED_DATA_LAYER_PATHS, ...DATA_LAYER_RETIRED_PATHS].some((path) => error.endsWith(`${path}; run npx @cortexkit/aft doctor --fix`))));
+  }
   if (removed.length) {
     throw new ConfigRejectedError(removed);
   }
@@ -30988,8 +32058,10 @@ function loadConfigFromPath(configPath, tier) {
       warn2(text);
     }
   }
-  if (translation.legacyInput && tier === "user") {
-    log2(`Config ${configPath} uses retired keys (${translation.retiredKeys.join(", ")}); applied their current equivalents in memory`);
+  if (tier === "user") {
+    if (translation.legacyInput) {
+      log2(`Config ${configPath} uses retired keys (${translation.retiredKeys.join(", ")}); applied their current equivalents in memory`);
+    }
   } else if (translation.legacyInput) {
     configLoadNotices.push({
       configPath,
@@ -31075,6 +32147,9 @@ function mergeSemanticConfig(base, override) {
 }
 function mergeLspConfig(base, override) {
   const projectSafe = {};
+  if (override?.max_servers !== undefined && override.max_servers <= (base?.max_servers ?? 8)) {
+    projectSafe.max_servers = override.max_servers;
+  }
   if (override?.python !== undefined)
     projectSafe.python = override.python;
   if (override?.diagnostics_on_edit !== undefined) {
@@ -31095,14 +32170,12 @@ function mergeLspConfig(base, override) {
     return;
   return Object.fromEntries(Object.entries(lsp).filter(([, v]) => v !== undefined));
 }
-function mergeWorktreeConfig(baseWorktree, overrideWorktree) {
-  if (baseWorktree === undefined && overrideWorktree === undefined)
-    return;
-  if (overrideWorktree === undefined)
-    return baseWorktree;
-  if (baseWorktree === undefined)
-    return overrideWorktree;
-  return { ...baseWorktree, ...overrideWorktree };
+function mergeIdleConfig(baseIdle, overrideIdle) {
+  const merged = {
+    root_ttl_minutes: overrideIdle?.root_ttl_minutes ?? baseIdle?.root_ttl_minutes,
+    checkout_hours: overrideIdle?.checkout_hours ?? baseIdle?.checkout_hours
+  };
+  return merged.root_ttl_minutes === undefined && merged.checkout_hours === undefined ? undefined : merged;
 }
 function mergeInspectConfig(baseInspect, overrideInspect) {
   const diagnosticsTimeoutConfigured = baseInspect?.diagnostics_timeout_ms !== undefined || overrideInspect?.diagnostics_timeout_ms !== undefined;
@@ -31182,19 +32255,10 @@ function mergeBashConfig(baseBash, overrideBash, mode = "tier") {
   return merged;
 }
 function mergeExperimentalConfig(base, override) {
-  const bash = {
-    ...base?.bash,
-    ...override?.bash
-  };
   const experimental = {
     ...base,
     ...override
   };
-  if (Object.values(bash).some((value) => value !== undefined)) {
-    experimental.bash = bash;
-  } else {
-    delete experimental.bash;
-  }
   if (Object.values(experimental).every((value) => value === undefined))
     return;
   return Object.fromEntries(Object.entries(experimental).filter(([, value]) => value !== undefined));
@@ -31221,11 +32285,9 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "revision_reads",
   "validate_on_edit",
   "configure_warnings_delivery",
-  "views",
   "callgraph_chunk_size",
   "inspect",
   "idle",
-  "worktree",
   "git",
   "pi",
   "experimental",
@@ -31340,7 +32402,7 @@ function mergeConfigs(base, override) {
     bash.project_env = projectEnv;
   }
   const inspect = mergeInspectConfig(base.inspect, override.inspect);
-  const worktree = mergeWorktreeConfig(base.worktree, override.worktree);
+  const idle = mergeIdleConfig(base.idle, override.idle);
   const sandbox = mergeSandboxConfig(base.sandbox, override.sandbox);
   const remoteExec = mergeRemoteExecConfig(base.remote_exec, override.remote_exec);
   const backup = mergeProjectBackupConfig(base.backup, override.backup);
@@ -31350,7 +32412,7 @@ function mergeConfigs(base, override) {
   delete safeOverride.indexes;
   delete safeOverride.bash;
   delete safeOverride.inspect;
-  delete safeOverride.worktree;
+  delete safeOverride.idle;
   delete safeOverride.pi;
   return {
     ...base,
@@ -31360,7 +32422,7 @@ function mergeConfigs(base, override) {
     ...lsp ? { lsp } : {},
     ...bash !== undefined ? { bash } : {},
     ...inspect !== undefined ? { inspect } : {},
-    ...worktree !== undefined ? { worktree } : {},
+    ...idle !== undefined ? { idle } : {},
     ...sandbox !== undefined ? { sandbox } : {},
     ...remoteExec !== undefined ? { remote_exec: remoteExec } : {},
     ...backup !== undefined ? { backup } : {},
@@ -31680,9 +32742,9 @@ function detectPiHarness(api) {
 }
 
 // src/omp-approval.ts
-import { realpathSync as realpathSync7 } from "node:fs";
+import { realpathSync as realpathSync8 } from "node:fs";
 import { homedir as homedir15 } from "node:os";
-import { basename as basename4, dirname as dirname11, isAbsolute as isAbsolute10, join as join18, relative as relative6, resolve as resolve12, sep as sep2 } from "node:path";
+import { basename as basename4, dirname as dirname12, isAbsolute as isAbsolute9, join as join18, relative as relative5, resolve as resolve13, sep as sep2 } from "node:path";
 var OMP_TOOL_TIERS = {
   read: "read",
   grep: "read",
@@ -31727,7 +32789,7 @@ function expandPath(value) {
   if (decoded === "~")
     return homedir15();
   if (decoded.startsWith("~/") || decoded.startsWith(`~${sep2}`))
-    return resolve12(homedir15(), decoded.slice(2));
+    return resolve13(homedir15(), decoded.slice(2));
   return decoded;
 }
 function realLocation(path) {
@@ -31735,12 +32797,12 @@ function realLocation(path) {
   let current = path;
   for (;; ) {
     try {
-      return missing.length > 0 ? join18(realpathSync7(current), ...missing) : realpathSync7(current);
+      return missing.length > 0 ? join18(realpathSync8(current), ...missing) : realpathSync8(current);
     } catch (error) {
       if (error.code !== "ENOENT")
         throw error;
     }
-    const parent = dirname11(current);
+    const parent = dirname12(current);
     if (parent === current)
       return path;
     missing.unshift(basename4(current));
@@ -31755,11 +32817,11 @@ function namesOutsidePath(root, value) {
   const expanded = expandPath(value);
   if (expanded.startsWith("file:"))
     return false;
-  const absolute = isAbsolute10(expanded) ? expanded : resolve12(root, expanded);
-  if (relativePathEscapesRoot(relative6(root, absolute)))
+  const absolute = isAbsolute9(expanded) ? expanded : resolve13(root, expanded);
+  if (relativePathEscapesRoot(relative5(root, absolute)))
     return true;
   try {
-    return relativePathEscapesRoot(relative6(realLocation(root), realLocation(absolute)));
+    return relativePathEscapesRoot(relative5(realLocation(root), realLocation(absolute)));
   } catch {
     return true;
   }
@@ -31791,11 +32853,10 @@ function unquote(value) {
   const first = value[0];
   return value.length >= 2 && (first === '"' || first === "'") && value.endsWith(first) ? value.slice(1, -1) : value;
 }
-function hashlinePatchPaths(patch) {
+function hashlinePatchSections(patch) {
   if (patch.trim().length === 0)
     return;
-  const paths = [];
-  let sections = 0;
+  const sections = [];
   const rows = patch.split(`
 `);
   for (let index = 0;index < rows.length; index++) {
@@ -31811,28 +32872,31 @@ function hashlinePatchPaths(patch) {
       const hash = inner.indexOf("#");
       if (hash <= 0)
         return;
-      paths.push(inner.slice(0, hash));
-      sections++;
+      sections.push({ path: inner.slice(0, hash), moves: [] });
       continue;
     }
     const directive = /^(PUT|CUT|REM|MV)(?:\s|$)/.exec(line);
     if (directive) {
-      if (sections === 0)
+      const current = sections[sections.length - 1];
+      if (current === undefined)
         return;
       if (directive[1] === "MV") {
         const destination = line.slice(2).trim();
         if (destination.length === 0 || /\s/.test(destination))
           return;
-        paths.push(unquote(destination));
+        current.moves.push(unquote(destination));
       }
       continue;
     }
-    if (trimmed.length === 0 && sections === 0)
+    if (trimmed.length === 0 && sections.length === 0)
       continue;
-    if (sections === 0 || !line.startsWith("+"))
+    if (sections.length === 0 || !line.startsWith("+"))
       return;
   }
-  return sections > 0 ? paths : undefined;
+  return sections.length > 0 ? sections : undefined;
+}
+function hashlinePatchPaths(patch) {
+  return hashlinePatchSections(patch)?.flatMap((section) => [section.path, ...section.moves]);
 }
 var APPLY_PATCH_TARGETS = [
   "*** Add File:",
@@ -32328,8 +33392,8 @@ function renderInner(s, error, theme, innerWidth) {
   left2.push(kv("symbol cache", `${formatCountShort(s.symbol_cache.local_entries)} local · ${formatCountShort(s.symbol_cache.warm_entries)} warm`, theme));
   right2.push(theme.fg("muted", "Current session"));
   right2.push(kv("tracked files", String(s.session.tracked_files), theme));
-  right2.push(kv("checkpoints", String(s.session.checkpoints), theme));
-  right2.push(kv("all-session", String(s.checkpoints_total), theme));
+  right2.push(kv("checkpoints", s.session.checkpoints?.toString() ?? "—", theme));
+  right2.push(kv("all-session", s.checkpoints_total?.toString() ?? "—", theme));
   for (const line of renderColumns(left2, right2, colWidth))
     lines.push(line);
   lines.push("");
@@ -32497,9 +33561,9 @@ import { join as join21 } from "node:path";
 // src/lsp-cache.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 import {
-  closeSync as closeSync10,
+  closeSync as closeSync11,
   mkdirSync as mkdirSync6,
-  openSync as openSync9,
+  openSync as openSync10,
   readFileSync as readFileSync12,
   renameSync as renameSync9,
   rmSync as rmSync6,
@@ -32600,14 +33664,14 @@ function acquireInstallLock(lockKey) {
   const token = randomUUID3();
   const tryClaim = () => {
     try {
-      const fd = openSync9(lock, "wx");
+      const fd = openSync10(lock, "wx");
       try {
         writeFileSync8(fd, `${process.pid}
 ${new Date().toISOString()}
 ${token}
 `);
       } finally {
-        closeSync10(fd);
+        closeSync11(fd);
       }
       let retained = false;
       let released = false;
@@ -32770,11 +33834,11 @@ function claimLspAutoInstallPass() {
   };
   const tryClaim = () => {
     try {
-      const fd = openSync9(lock, "wx");
+      const fd = openSync10(lock, "wx");
       try {
         writeFileSync8(fd, JSON.stringify(owner));
       } finally {
-        closeSync10(fd);
+        closeSync11(fd);
       }
       return true;
     } catch (err) {
@@ -33178,18 +34242,26 @@ async function runInstall(spec, version, cwd, installLock, before, signal, deadl
     warn2(`[lsp] install ${target} aborted before spawn`);
     return false;
   }
-  const npm = resolveNpm();
-  if (!npm) {
+  const preferredNpm = resolveNpm();
+  if (!preferredNpm) {
     warn2(`[lsp] npm not found on PATH or known locations; cannot install ${target}`);
     return false;
   }
+  const selected = await selectLspNpm(preferredNpm, undefined, signal);
+  if (signal?.aborted)
+    return false;
+  if (!selected.npm) {
+    warn2(`[lsp] ${selected.refusal}`);
+    return false;
+  }
+  const npm = selected.npm;
   const invocation = await lspNpmInstallInvocation(npm, target, before);
   if (signal?.aborted) {
     warn2(`[lsp] install ${target} aborted during npm capability probe`);
     return false;
   }
   if (!invocation) {
-    warn2(`[lsp] npm cannot enforce the publication cutoff; cannot install ${target}`);
+    warn2(`[lsp] ${lspNpmRefusal(npm.command, "probe failed: cannot verify publication-cutoff support")}`);
     return false;
   }
   ensureInstallAnchor(cwd);
@@ -33271,6 +34343,9 @@ async function runInstall(spec, version, cwd, installLock, before, signal, deadl
         log2(`[lsp] installed ${target}`);
         finish(true);
       } else {
+        const rejectedOption = /--(?:no-save|before|ignore-scripts)\b/.exec(stderrBuf)?.[0];
+        if (rejectedOption)
+          warn2(`[lsp] ${lspNpmRefusal(npm.command, `rejected option: ${rejectedOption}`)}`);
         error2(`[lsp] install ${target} exited with code ${code}; last stderr:
 ${stderrBuf.trim()}`);
         finish(false);
@@ -34113,9 +35188,9 @@ import { StringEnum } from "@earendil-works/pi-ai";
 import { Type as Type4 } from "typebox";
 
 // src/tools/hoisted.ts
-import { stat as stat3 } from "node:fs/promises";
+import { stat as stat4 } from "node:fs/promises";
 import { homedir as homedir16 } from "node:os";
-import { isAbsolute as isAbsolute11, relative as relative7, resolve as resolve13, sep as sep3 } from "node:path";
+import { isAbsolute as isAbsolute10, relative as relative6, resolve as resolve14, sep as sep3 } from "node:path";
 import {
   renderDiff as renderDiff2
 } from "@earendil-works/pi-coding-agent";
@@ -34293,7 +35368,7 @@ function modelSupportsImages(extCtx) {
 }
 var NON_VISION_IMAGE_NOTE = "[Current model does not support images. The image will be omitted from this request.]";
 function containsPath(parent, child) {
-  const rel = relative7(parent, child);
+  const rel = relative6(parent, child);
   return !relativePathEscapesRoot(rel);
 }
 function normalizePathInput(path) {
@@ -34303,17 +35378,17 @@ function normalizePathInput(path) {
   if (decoded === "~")
     return homedir16();
   if (decoded.startsWith(`~${sep3}`) || decoded.startsWith("~/")) {
-    return resolve13(homedir16(), decoded.slice(2));
+    return resolve14(homedir16(), decoded.slice(2));
   }
   return decoded;
 }
 function absoluteSearchPath(cwd, target) {
   const expanded = normalizePathInput(target);
-  return isAbsolute11(expanded) ? expanded : resolve13(cwd, expanded);
+  return isAbsolute10(expanded) ? expanded : resolve14(cwd, expanded);
 }
 async function searchPathExists(cwd, target) {
   try {
-    await stat3(absoluteSearchPath(cwd, target));
+    await stat4(absoluteSearchPath(cwd, target));
     return true;
   } catch {
     return false;
@@ -34365,7 +35440,7 @@ async function assertExternalDirectoryPermission(extCtx, target, options = {}) {
   if (!target)
     return;
   const expanded = normalizePathInput(target);
-  const absoluteTarget = isAbsolute11(expanded) ? expanded : resolve13(extCtx.cwd, expanded);
+  const absoluteTarget = isAbsolute10(expanded) ? expanded : resolve14(extCtx.cwd, expanded);
   if (containsPath(extCtx.cwd, absoluteTarget))
     return;
   if (options.restrictToProjectRoot === false)
@@ -34374,7 +35449,7 @@ async function assertExternalDirectoryPermission(extCtx, target, options = {}) {
 }
 async function assertExternalReadPermission(ctx, extCtx, target, restrictToProjectRoot = ctx.config.restrict_to_project_root ?? false) {
   const expanded = normalizePathInput(target);
-  const absoluteTarget = isAbsolute11(expanded) ? expanded : resolve13(extCtx.cwd, expanded);
+  const absoluteTarget = isAbsolute10(expanded) ? expanded : resolve14(extCtx.cwd, expanded);
   if (!restrictToProjectRoot || containsPath(extCtx.cwd, absoluteTarget))
     return;
   try {
@@ -34707,7 +35782,13 @@ PDFs aren't supported on the Pi harness yet.`, response);
         const response = await callToolCallForSession(bridge, "edit", rawArgs, sessionId, extCtx);
         if (response.success === false)
           throw toolErrorFromResponse("edit", response);
-        return buildMutationResult(response);
+        return buildHashlineMutationResult(response);
+      },
+      renderCall(args, theme, context) {
+        return renderHashlineEditCall(args, theme, context);
+      },
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderMutationResult(result, theme, context, options);
       }
     });
   }
@@ -34883,6 +35964,71 @@ ${formatDiagnosticsText(diagnostics)}`;
     }
   };
 }
+function buildHashlineMutationResult(response) {
+  const result = buildMutationResult(response);
+  const rows = asRecords2(asRecord3(response.metadata)?.files);
+  const files = rows.map(hashlineFileDetails);
+  if (files.length === 0)
+    return result;
+  const changed = files.filter((file) => file.diff !== undefined);
+  const diff = changed.length === 0 ? undefined : files.length === 1 ? files[0]?.diff : files.map((file) => file.diff === undefined ? mutationFileHeader(file) : `${mutationFileHeader(file)}
+${file.diff}`).join(`
+`);
+  const firstChangedLine = rows.map((row) => firstChangedLineOfPatch(asString2(row.patch) ?? "")).find((line) => line !== undefined);
+  return {
+    ...result,
+    details: {
+      ...result.details,
+      diff,
+      firstChangedLine,
+      additions: files.reduce((sum, file) => sum + file.additions, 0),
+      deletions: files.reduce((sum, file) => sum + file.deletions, 0),
+      files
+    }
+  };
+}
+function hashlineFileDetails(row) {
+  const patch = asString2(row.patch) ?? "";
+  const diff = formatUnifiedDiffForPi(patch);
+  return {
+    path: asString2(row.relativePath) ?? "",
+    sourcePath: asString2(row.sourcePath) ?? asString2(row.movePath),
+    diff: diff.length > 0 ? diff : undefined,
+    additions: asNumber2(row.additions) ?? 0,
+    deletions: asNumber2(row.deletions) ?? 0
+  };
+}
+function firstChangedLineOfPatch(patch) {
+  let newLine;
+  for (const line of patch.split(`
+`)) {
+    const hunk = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(line);
+    if (hunk) {
+      newLine = Number(hunk[1]);
+      continue;
+    }
+    if (newLine === undefined)
+      continue;
+    if (line.startsWith("+") || line.startsWith("-"))
+      return Math.max(1, newLine);
+    if (line.startsWith(" "))
+      newLine++;
+  }
+  return;
+}
+function mutationFileName(file) {
+  return file.sourcePath ? `${shortenHomePath(file.sourcePath)} → ${shortenHomePath(file.path)}` : shortenHomePath(file.path);
+}
+function mutationFileHeader(file) {
+  return `${mutationFileName(file)} (+${file.additions}/-${file.deletions})`;
+}
+function mutationFilesLabel(files) {
+  const first = files?.[0];
+  if (!first || !files)
+    return;
+  const name = mutationFileName(first);
+  return files.length > 1 ? `${name} and ${files.length - 1} more` : name;
+}
 function formatGlobSkipReasonsNote(reasons) {
   if (!Array.isArray(reasons))
     return;
@@ -34934,6 +36080,29 @@ function renderMutationCall(toolName, filePath, theme, context) {
   text.setText(`${theme.fg("toolTitle", theme.bold(toolName))} ${pathDisplay}`);
   return text;
 }
+function renderHashlineEditCall(args, theme, context) {
+  const text = reuseText2(context.lastComponent);
+  const target = hashlinePatchTarget(asString2(asRecord3(args)?.patch));
+  const targetDisplay = target ? `${theme.fg("accent", target.name)}${target.more > 0 ? theme.fg("muted", ` and ${target.more} more`) : ""}` : theme.fg("toolOutput", "...");
+  text.setText(`${theme.fg("toolTitle", theme.bold("edit"))} ${targetDisplay}`);
+  return text;
+}
+function hashlinePatchTarget(patch) {
+  if (!patch)
+    return;
+  const sections = hashlinePatchSections(patch) ?? hashlinePatchSections(patch.slice(0, patch.lastIndexOf(`
+`) + 1));
+  const first = sections?.[0];
+  if (!sections || !first)
+    return;
+  const destination = first.moves[first.moves.length - 1];
+  const name = destination ? `${shortenHomePath(first.path)} → ${shortenHomePath(destination)}` : shortenHomePath(first.path);
+  const others = new Set(sections.flatMap((section) => [section.path, ...section.moves]));
+  others.delete(first.path);
+  if (destination)
+    others.delete(destination);
+  return { name, more: others.size };
+}
 function renderMutationResult(result, theme, context, options = { expanded: true }) {
   if (context.isError) {
     const errorText = result.content.filter((c) => c.type === "text").map((c) => c.text ?? "").join(`
@@ -34969,15 +36138,21 @@ ${summary}${suffix}`);
   const container = reuseContainer2(context.lastComponent);
   container.clear();
   container.addChild(new Spacer2(1));
-  let renderedDiff;
-  try {
-    renderedDiff = renderDiff2(diff);
-  } catch {
-    renderedDiff = diff;
+  const files = details?.files ?? [];
+  if (files.length > 1) {
+    for (const file of files) {
+      const counts = theme.fg("muted", ` (+${file.additions}/-${file.deletions})`);
+      container.addChild(new Text3(`${theme.fg("accent", mutationFileName(file))}${counts}`, 1, 0));
+      if (file.diff !== undefined) {
+        container.addChild(new Text3(renderTerminalDiff(file.diff), 1, 0));
+      }
+    }
+  } else {
+    container.addChild(new Text3(renderTerminalDiff(diff), 1, 0));
   }
-  container.addChild(new Text3(normalizeTerminalText(renderedDiff), 1, 0));
   const rawPath = context.args && typeof context.args === "object" && typeof context.args.path === "string" ? context.args.path : undefined;
-  const summaryPath = rawPath ? ` ${shortenHomePath(rawPath)}` : "";
+  const summaryLabel = rawPath ? shortenHomePath(rawPath) : mutationFilesLabel(details?.files);
+  const summaryPath = summaryLabel ? ` ${summaryLabel}` : "";
   const summary = `edited${summaryPath} (+${details?.additions ?? 0}/-${details?.deletions ?? 0})`;
   return collapsibleResult({
     summary,
@@ -34986,11 +36161,20 @@ ${summary}${suffix}`);
     context
   });
 }
+function renderTerminalDiff(diff) {
+  let renderedDiff;
+  try {
+    renderedDiff = renderDiff2(diff);
+  } catch {
+    renderedDiff = diff;
+  }
+  return normalizeTerminalText(renderedDiff);
+}
 async function resolvePathArg(cwd, path) {
   const expanded = normalizePathInput(path);
   const abs = absoluteSearchPath(cwd, path);
   try {
-    await stat3(abs);
+    await stat4(abs);
     return abs;
   } catch {
     return expanded;
@@ -35565,7 +36749,7 @@ function getBashSpawnHook(pi) {
 function backgroundWaitSentence(c) {
   if (c.watch) {
     const noPolling = c.status ? ", and never loop `bash_status` to wait" : "";
-    return `then \`bash_watch\` handles only a short remaining wait (in a main session a watch defaults to 30s, max bash.watch_sync_max_ms, 120s by default; in a delegated session a watch without a timeout waits up to the worker wait limit, bash.worker_wait_max_ms, 30 minutes by default, then reports it is still running; watch again to keep waiting); for anything longer end the turn and let the completion reminder wake you, or use bash({wait:true}) when the result is needed before anything else — never background a command and immediately \`bash_watch\` it (that wastes a turn for what foreground returns in one)${noPolling}.`;
+    return `then \`bash_watch\` handles only a short remaining wait (in a main session a watch defaults to 30s, max bash.watch_sync_max_ms, 120s by default; in a delegated session a watch without a timeout waits up to the worker wait limit, bash.worker_wait_max_ms, 30 minutes by default, then reports it is still running; watch again to keep waiting); for anything longer, first do the work that doesn't need this result, end the turn only when everything left needs it, and let the completion reminder wake you, or use bash({wait:true}) when the result is needed before anything else — never background a command and immediately \`bash_watch\` it (that wastes a turn for what foreground returns in one)${noPolling}.`;
   }
   return c.status ? "the task keeps running after the call returns, a completion reminder arrives when it exits, and `bash_status` reports its state and output. Use bash({wait:true}) instead when the result is needed before anything else." : "the task keeps running after the call returns and a completion reminder arrives when it exits. Use bash({wait:true}) instead when the result is needed before anything else.";
 }
@@ -35602,7 +36786,7 @@ function registerBashTool(pi, ctx, aftSearchRegistered = false, registeredName =
     "PTY mode"
   ].join(", ") : bashCfg.compress ? "workdir and compressed output" : "workdir";
   const detachSentence = bashCfg.detach_on_user_message ? "Any new message detaches this wait. Set `bash.detach_on_user_message: false` to keep it blocking; even then, a message containing the literal `&detach` forces detachment, and the token is stripped before delivery; the rest of the message is preserved, while a token-only message becomes `(requested background detach)`." : "Because `bash.detach_on_user_message` is false, a new message leaves this wait blocking; include the literal `&detach` anywhere to force detachment, and the token is stripped before delivery; the rest of the message is preserved, while a token-only message becomes `(requested background detach)`.";
-  const tasksSentence = bashCfg.background ? ` Commands run in the foreground and return inline; \`wait: true\` blocks until a long command finishes instead of auto-promoting (it blocks up to \`bash.worker_wait_max_ms\`, 30 minutes by default, then reports the command is still running; watch again to keep waiting); ${detachSentence} Use it when you need the result before doing anything else; keep it off otherwise so auto-promote can remind you while you work. Use \`background: true\` yourself ONLY when you have other useful work to do while it runs; ${backgroundWaitSentence(companions)} Do not change or delete files a background command uses until it finishes. A \`nohup … &\` launch still holds the call if the child keeps stdout/stderr; redirect both or use background:true. \`pty: true\` runs interactive programs (REPLs, TUIs), implies background${ptyDriveClause(companions)}.` : " Commands run in the foreground to completion; `timeout` is the hard kill cap (default 30 minutes).";
+  const tasksSentence = bashCfg.background ? ` Commands run in the foreground and return inline; \`wait: true\` blocks until a long command finishes instead of auto-promoting (it blocks up to \`bash.worker_wait_max_ms\`, 30 minutes by default, then reports the command is still running; watch again to keep waiting); ${detachSentence} Use it when you need the result before doing anything else; keep it off otherwise so auto-promote can remind you while you work. Use \`background: true\` yourself ONLY when you have other work to do while it runs, and any work that doesn't need this command's result counts; ${backgroundWaitSentence(companions)} Do not change or delete files a background command uses until it finishes. A \`nohup … &\` launch still holds the call if the child keeps stdout/stderr; redirect both or use background:true. \`pty: true\` runs interactive programs (REPLs, TUIs), implies background${ptyDriveClause(companions)}.` : " Commands run in the foreground to completion; `timeout` is the hard kill cap (default 30 minutes).";
   const remoteRuns = () => !isPowerShell && remoteRunsOffered(ctx.config);
   pi.registerTool({
     name: registeredName,
@@ -35671,6 +36855,7 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
         }
       }
       const bridgeCommand = spawnContext.command;
+      const workdir = spawnContext.cwd ?? params.workdir;
       let streamed = "";
       let usedHostFallback = false;
       let response;
@@ -35678,7 +36863,7 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
         response = await withOutsidePermissionOperation(() => callBashWithPermissionLoop(bridge, {
           command: bridgeCommand,
           timeout,
-          workdir: spawnContext.cwd ?? params.workdir,
+          workdir,
           env: spawnContext.env,
           description: params.description,
           background: effectiveBackground,
@@ -35770,7 +36955,7 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
         task_id: taskId
       };
       const output = response.output ?? "";
-      return bashResult(usedHostFallback || isPowerShell ? output : withBashHints(output, bridgeCommand, aftSearchRegistered, extCtx.cwd), details);
+      return bashResult(usedHostFallback || isPowerShell ? output : withBashHints(output, bridgeCommand, aftSearchRegistered, extCtx.cwd, workdir), details);
     },
     renderCall(args, theme, context) {
       return renderBashCall(asString2(args?.command), asString2(args?.description), theme, context);
@@ -35798,8 +36983,8 @@ function registerBashCompanionTools(pi, ctx, enabled = { bashStatus: true, bashW
     pi.registerTool(createBashKillTool(ctx));
   }
 }
-function withBashHints(output, command, aftSearchRegistered, projectRoot) {
-  return maybeAppendGrepSearchHint(maybeAppendConflictsHint(output), command, aftSearchRegistered, projectRoot);
+function withBashHints(output, command, aftSearchRegistered, projectRoot, workdir) {
+  return maybeAppendGrepSearchHint(maybeAppendConflictsHint(output), command, aftSearchRegistered, projectRoot, undefined, workdir);
 }
 function createBashStatusTool(ctx) {
   return {
@@ -35833,7 +37018,7 @@ function createBashWatchTool(ctx) {
   return {
     name: "bash_watch",
     label: "bash_watch",
-    description: `Watch a background bash task. ${WATCH_SYNC_DEFAULTS_DESCRIPTION}. In a main session sync waits are for a short remaining wait on a task; for anything longer end the turn on \`bash({background:true})\` and let the completion reminder wake you, or use \`bash({wait:true})\` when the result is needed before anything else. The user can interrupt anytime; the wait auto-converts to an async notification. Async (background:true, requires pattern) registers a non-blocking notification and returns immediately — use when you have parallel work or want to end your turn.${bashCompanionRegistered(ctx.config, "bash_status") ? " Never loop bash_status to wait." : ""}`,
+    description: `Watch a background bash task. ${WATCH_SYNC_DEFAULTS_DESCRIPTION}. In a main session sync waits are for a short remaining wait on a task; for anything longer, first do the work that doesn't need the result, end the turn only when everything left needs it, and let the completion reminder wake you, or use \`bash({wait:true})\` when the result is needed before anything else. The user can interrupt anytime; the wait auto-converts to an async notification. Async (background:true, requires pattern) registers a non-blocking notification and returns immediately — use when you have parallel work or want to end your turn.${bashCompanionRegistered(ctx.config, "bash_status") ? " Never loop bash_status to wait." : ""}`,
     promptSnippet: "Wait for or watch a background bash task",
     parameters: BashWatchParams,
     async execute(_toolCallId, params, signal, _onUpdate, extCtx) {
@@ -36300,7 +37485,7 @@ function formatWaitSummary(taskId, waited, details, watchRole) {
 async function formatBashStatus(extCtx, taskId, details, requestedOutputMode, watchRole) {
   const exit = typeof details.exit_code === "number" ? ` (exit ${details.exit_code})` : "";
   const dur = typeof details.duration_ms === "number" ? ` ${Math.round(details.duration_ms / 1000)}s` : "";
-  let text = `Task ${taskId}: ${details.status}${exit}${dur}`;
+  let text = formatUnknownPtyExit(taskId, details) ?? `Task ${taskId}: ${details.status}${exit}${dur}`;
   if (details.live_descendants_summary) {
     text += ` · ${details.live_descendants_summary}`;
   }
@@ -36606,7 +37791,7 @@ function registerFsTools(pi, ctx, surface) {
           recursive: coerceBoolean(params.recursive)
         }, extCtx);
         if (response.success === false) {
-          throw new Error(response.text || response.message || "delete failed");
+          throw toolErrorFromResponse("delete", response);
         }
         const deletedEntries = response.deleted ?? [];
         const skipped = response.skipped_files ?? [];
@@ -37244,7 +38429,7 @@ function registerNavigateTool(pi, ctx) {
   const navigateTool = withPathAliasPreparation({
     name: "aft_callgraph",
     label: "callgraph",
-    description: `Answer code-relationship questions from a real call graph — instead of grep + read chains. Reach for this whenever the question is about how symbols connect. ${zoomEnabled ? "Use aft_zoom with `callgraph:true` for one-level forward calls-out while reading source; use aft_callgraph only for reverse callers or multi-level traces so you do not double-fetch the same relationships." : "Use aft_callgraph call_tree (depth 1) for one-level forward calls-out; use it for reverse callers or multi-level traces."} All ops require both \`path\` and \`symbol\`. Use \`callers\` for call sites (before renaming/signature changes), \`impact\` for blast radius (what breaks if a symbol changes), \`call_tree\` for what a function calls, \`trace_to\` for how execution reaches a symbol from entry points, \`trace_to_symbol\` for the shortest path from one symbol to another (requires \`toSymbol\`; if ambiguous, the error returns candidate files — retry with \`toPath\`), \`trace_data\` to follow a value across assignments/params. Markers: ~ = edge resolved by name only (may point at the wrong same-named symbol); [unresolved] = callee not resolved to a definition, so the location shown is the call site. Unmarked edges are resolved exactly. By default, unresolved external/stdlib leaf calls in call_tree are collapsed into one summary per parent; pass includeUnresolved=true to show every unresolved edge individually. When a list is cut, the reply ends with \`shown N of M <unit> (<reason>) · narrow: <knobs>\`; absence of that line means the list is complete.`,
+    description: `Answer code-relationship questions from a real call graph — instead of grep + read chains. Reach for this whenever the question is about how symbols connect. ${zoomEnabled ? "Use aft_zoom with `callgraph:true` for one-level forward calls-out while reading source; use aft_callgraph only for reverse callers or multi-level traces so you do not double-fetch the same relationships." : "Use aft_callgraph call_tree (depth 1) for one-level forward calls-out; use it for reverse callers or multi-level traces."} All ops require both \`path\` and \`symbol\`. Use \`callers\` for call sites (before renaming/signature changes), \`impact\` for blast radius (what breaks if a symbol changes), \`call_tree\` for what a function calls, \`trace_to\` for how execution reaches a symbol (each path runs back to a root labelled main, test, attribute, public API, or no caller found), \`trace_to_symbol\` for the shortest path from one symbol to another (requires \`toSymbol\`; if ambiguous, the error returns candidate files — retry with \`toPath\`), \`trace_data\` to follow a value across assignments/params. Markers: ~ = edge resolved by name only (may point at the wrong same-named symbol); [unresolved] = callee not resolved to a definition, so the location shown is the call site. Unmarked edges are resolved exactly. By default, unresolved external/stdlib leaf calls in call_tree are collapsed into one summary per parent; pass includeUnresolved=true to show every unresolved edge individually. When a list is cut, the reply ends with \`shown N of M <unit> (<reason>) · narrow: <knobs>\`; absence of that line means the list is complete.`,
     parameters: navigateParamsSchema(),
     async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
       if (isEmptyParam(params.path)) {
@@ -37882,7 +39067,7 @@ function registerSafetyTool(pi, ctx) {
 
 // src/tools/semantic.ts
 import { homedir as homedir17 } from "node:os";
-import { isAbsolute as isAbsolute12, resolve as resolve14 } from "node:path";
+import { isAbsolute as isAbsolute11, resolve as resolve15 } from "node:path";
 import { Type as Type13 } from "typebox";
 var FILESYSTEM_SCAN_STATUS = "answered by a filesystem scan";
 function semanticHonestyNote(response, theme) {
@@ -37905,8 +39090,8 @@ function selectedProjectRoot(cwd, pathArg) {
   const target = pathArg?.trim();
   if (!target)
     return canonicalizeProjectRoot(cwd);
-  const expanded = target === "~" ? homedir17() : /^~[/\\]/u.test(target) ? resolve14(homedir17(), target.slice(2)) : target;
-  return canonicalizeProjectRoot(isAbsolute12(expanded) ? expanded : resolve14(cwd, expanded));
+  const expanded = target === "~" ? homedir17() : /^~[/\\]/u.test(target) ? resolve15(homedir17(), target.slice(2)) : target;
+  return canonicalizeProjectRoot(isAbsolute11(expanded) ? expanded : resolve15(cwd, expanded));
 }
 function continuityKey(projectRoot, query, includeTests, topK) {
   return JSON.stringify([
@@ -38503,93 +39688,52 @@ function registerShutdownCleanup(fn) {
 }
 
 // src/workflow-hints.ts
-var HEADING = "## IMPORTANT NOTICE about your tools";
+var HEADING = "# Agent Foundational Toolkit";
 function hashlineTagSourceHint(bashRewritesMintTags, isRegistered = () => true) {
   return `**Hashline edit tags**: ${hashlineTagSourceSentence(bashRewritesMintTags, isRegistered)}`;
 }
 var HASHLINE_TAG_SOURCE_HINT = hashlineTagSourceHint(true);
 function buildWorkflowHints(opts) {
-  const sections = [];
-  const grepName = "grep";
-  const bashName = "bash";
-  const hasOutline = !opts.absentTools.has("aft_outline");
-  const hasZoom = !opts.absentTools.has("aft_zoom");
-  const readName = "read";
-  const hasRead = !opts.absentTools.has(readName);
-  const hasGrep = !opts.absentTools.has(grepName);
-  const hasSearch = !opts.absentTools.has("aft_search");
-  const hasNavigate = !opts.absentTools.has("aft_callgraph");
-  const hasInspect = !opts.absentTools.has("aft_inspect");
-  const hasBash = !opts.absentTools.has(bashName);
-  const hasBgBash = opts.bashBackgroundEnabled && hasBash && !opts.absentTools.has("bash_status");
-  const hasWatch = !opts.absentTools.has("bash_watch");
-  const hasWrite = !opts.absentTools.has("bash_write");
-  if (hasBash && opts.bashCompressionEnabled) {
-    sections.push([
-      "**Test/build output**: bash output is auto-compressed for non-piped commands. Piped commands run verbatim and show the pipeline's output. For AFT's test/build summary, run the runner without filters:",
-      "- `bun test | grep fail` → run `bun test`",
-      "- `cargo test 2>&1 | tail -20` → run `cargo test`",
-      "- `npm run build | head -50` → run `npm run build`"
-    ].join(`
-`));
+  const has = (name) => !opts.absentTools.has(name);
+  const hasBash = has("bash");
+  const hasBackground = hasBash && opts.bashBackgroundEnabled && has("bash_watch") && has("bash_status");
+  const finding = [];
+  if (has("aft_search")) {
+    finding.push("start with aft_search; it takes concepts, identifiers, regex and literals.");
   }
-  if (hasOutline && hasZoom) {
-    sections.push(`**Web/URL access**: \`aft_outline({ target: "<url>" })\` first for structure, then \`aft_zoom({ batch: [{ target: "<url>", symbols: "<heading>" }] })\` for the specific section.`);
-  }
-  if (hasOutline && (hasGrep || hasSearch) && (hasZoom || hasRead)) {
-    const searchName = hasSearch ? "aft_search" : grepName;
-    const locate = hasSearch ? "`aft_search` is the primary code-search tool: one call auto-routes concepts, identifiers, regex, error strings, and literals." : `\`${grepName}\` (the tool — indexed and ranked) locates code.`;
-    const zoomSteer = hasZoom ? ", or `aft_zoom`" : "";
-    const searchSteer = hasSearch ? `use \`aft_search\` (concepts, identifiers, regex, literals), \`${readName}\`, \`aft_outline\`${zoomSteer} instead` : `use the \`${grepName}\` tool, \`${readName}\`, \`aft_outline\`${zoomSteer} instead`;
-    const bashSteer = hasBash ? ` If you are about to run grep, rg, sed, awk, find, or cat through ${bashName} to locate or read code: STOP — ${searchSteer}.` : "";
-    sections.push([
-      `**Code exploration**: ${locate} Then \`aft_outline\` for structure → \`${hasZoom ? "aft_zoom" : readName}\` for symbol(s). DO NOT run \`grep\`/\`rg\`/\`find\`/\`sed\`/\`cat\` through \`bash\` to locate or read code — the bash path is unindexed, unranked, serial, and routinely surfaces the wrong hit. Keep \`bash\` for shell facts (git state, file metadata, processes).${bashSteer} Reflex translations:`,
-      `- \`grep -rn "handleAuth" src/\` in bash → \`${searchName}({ query: "handleAuth" })\``,
-      `- \`find . -name "*.ts" | xargs grep watcher\` in bash → \`${searchName}({ query: "watcher invalidation" })\` (concepts work too)`,
-      `- \`sed -n '100,160p' app.ts\` / \`cat app.ts\` in bash → \`${readName}({ path: "app.ts", startLine: 100, endLine: 160 })\``
-    ].join(`
-`));
+  if (has("aft_outline") && has("aft_zoom") && has("read")) {
+    finding.push(`${finding.length ? "Then " : ""}aft_outline for structure, aft_zoom for named symbols, read for line ranges.`);
   }
-  if (hasInspect) {
-    sections.push("**Codebase health & diagnostics**: AFT does not surface compile/type errors automatically after edits — pull them with `aft_inspect`. Run it after a batch of edits and before you run tests or commit, when starting in unfamiliar code, or before a refactor/review. One call summarizes diagnostics (compile/type errors), TODOs, metrics, dead code, unused exports, and duplicates; pass `sections` for focused drill-down and `scope` to actively pull diagnostics for a specific file or directory. Its diagnostics are a fast checkpoint, not the authority — a clean `tsc` / `cargo check` / `pyright` run is the real gate. Treat stale_categories/pending_categories as stale or incomplete cache state. AFT schedules a Tier-2 refresh after its next idle or inspect-triggered background run; use one later normal aft_inspect after that refresh, not a polling loop.");
-    sections.push("**AFT status bar**: tool results may end with a one-line health bar `[AFT E<errors> W<warnings> | D<dead-code> U<unused-exports> C<clone/dup-groups> | T<todos>]` — an IDE-style glance that appears when a count changes. `E`/`W` are live LSP diagnostics for files touched this session (your universal compile-error signal across every language with an LSP). A `~` before `D` means the dead-code/unused/dup counts predate your latest edit — run `aft_inspect` for current numbers and detail. A `?` in place of a number means that count has no value yet (not zero). When `E>0`, you likely just introduced errors; investigate before moving on.");
-  }
-  if (hasNavigate) {
-    sections.push([
-      "Use `aft_callgraph` for code-relationship questions instead of grep + read chains:",
-      "- `callers` — find all call sites before changing a function signature",
-      "- `impact` — blast radius (which functions/files will need updates)",
-      "- `trace_to` — how execution reaches this code from entry points (routes, exports, main)",
-      "- `trace_to_symbol` — shortest call path from one symbol to another",
-      "- `trace_data` — follow a value through assignments and parameters across files"
-    ].join(`
-`));
+  if (hasBash) {
+    finding.push("Don't find or read code with grep, find, sed or cat in bash.");
   }
-  if (hasBgBash && hasWatch) {
-    sections.push([
-      `**Long-running commands** (builds, installs, full test suites): run them in the FOREGROUND — use \`${bashName}({ command, wait: true })\` when you know it is long and need the result before anything else; if you send a new message, the wait detaches to background; otherwise omit \`wait\` so auto-promote can hand you a reminder while you work.`,
-      "- `background: true` is ONLY for when you have OTHER useful work to do while it runs: start it, do the other work, and the completion reminder delivers the result (or spawn a subagent for the side work). Do NOT background a command and then immediately `bash_watch` it — that spends a whole extra turn waiting for something foreground returns in one.",
-      "- `bash_watch` is for blocking on an ALREADY-backgrounded task once you've run out of parallel work (sync — the user can interrupt), or reacting to a specific early output line (async: background:true + pattern). Never loop `bash_status` to wait — it's a one-shot inspector."
-    ].join(`
-`));
-  }
-  if (hasBgBash && hasWrite) {
-    sections.push(`**PTY / interactive commands**: PTY mode is for interactive REPLs and terminal apps (python, node, bash itself, vim). Start with \`${bashName}({ command: "python", pty: true, background: true })\`, read the screen with \`bash_status({ task_id, output_mode: "screen" })\`, and send input with \`bash_write({ task_id, input: "..." })\`.`);
+  const commands = [];
+  if (hasBash && opts.bashCompressionEnabled) {
+    commands.push("don't pipe test or build output into tail, grep or head; AFT already shortens it.");
   }
-  if (opts.hashlineEffective === true) {
-    sections.push(hashlineTagSourceHint(hasBash && opts.bashRewriteEnabled !== false, (name) => !opts.absentTools.has(name)));
+  if (hasBackground) {
+    commands.push("Pass wait: true when you need a long command's result before anything else; a new message from the user detaches the wait.", "Otherwise a long command moves to the background and a reminder brings its result.", "Block on it with bash_watch only when nothing else is left; bash_watch with background: true and a pattern tells you when a line appears.", "Never loop bash_status.");
   }
-  if (sections.length === 0) {
+  const sections = [
+    finding.length ? `**Finding code**: ${finding.join(" ")}` : "",
+    has("aft_callgraph") ? "**Relationships**: aft_callgraph for callers, impact, and execution or data-flow traces." : "",
+    has("aft_outline") && has("aft_zoom") ? "**Web pages**: aft_outline with a URL as target, then aft_zoom on a heading." : "",
+    "",
+    has("aft_inspect") ? "**After edits**: run aft_inspect for diagnostics; the project's typecheck and tests are the final check." : "",
+    has("aft_inspect") ? "**Status bar**: `[AFT E.. W.. | T..]` appears when a count changes. E above 0 usually means your last edit broke something; `?` means unknown, not zero." : "",
+    commands.length ? `**Commands**: ${commands.join(" ")}` : ""
+  ];
+  const hashline = opts.hashlineEffective === true ? hashlineTagSourceHint(hasBash && opts.bashRewriteEnabled !== false, has) : "";
+  if (!sections.some(Boolean) && !hashline)
     return null;
-  }
-  sections.unshift(`You are equipped with a non-standard tool set: indexed code search, symbol-level reading, structural editing, and code analysis that are faster, more precise, and far cheaper in tokens than stitching together command-line utilities in bash. Always reach for these tools first.
-
-**Parallel tool calls**: when several read-only operations are independent, emit them in ONE response instead of serializing — file reads, structure and symbol lookups, code search, diagnostics, and git status/diff/log. Sequence only when a call depends on a prior result or when a command mutates state.`);
-  return `${HEADING}
-
-${sections.join(`
+  sections[3] = "**Parallel calls**: send independent read-only calls in one response.";
+  const text = `${HEADING}
 
+${sections.filter(Boolean).join(`
 `)}`;
+  return hashline ? `${text}
+
+${hashline}` : text;
 }
 function buildHintsFromConfig(config, absentTools, hashlineEffective = false) {
   const bashCfg = resolveBashConfig(config);
@@ -38694,18 +39838,18 @@ function createVersionMismatchHandler(getPool, ensureCompatibleBinary = ensureBi
 }
 var PLUGIN_VERSION = (() => {
   try {
-    const req = createRequire2(import.meta.url);
+    const req = createRequire3(import.meta.url);
     return req("../package.json").version;
   } catch {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.63.0";
+var ANNOUNCEMENT_VERSION = "0.65.0";
 var ANNOUNCEMENT_FEATURES = [
-  "Cap a shell command's total memory, background and terminal commands included, with `bash.memory_limit_mib`.",
-  "Shell results can list or diff the files a command changed: set `bash.changed_files` to `list` or `diff`.",
-  "Put rebuildable caches on another disk with `storage.cache_dir`.",
-  "Call graphs mark callback references and link constructors, Python edits keep their indentation, and many reported issues are fixed."
+  "OpenCode 2: AFT's read-only tools also work inside Code Mode as `tools.aft.code.*`.",
+  "TypeScript monorepos run one language server per TypeScript version instead of one per package; `lsp.max_servers` caps the total.",
+  "Search and grep stay light on large growing files, and shell waits survive the computer going to sleep.",
+  "`views.enabled`, `views.callgraph_copies` and `worktree.ram_overlay` are now refused in user config; `npx @cortexkit/aft doctor --fix` removes them."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/DSa65w8wuf";
 var pendingEagerWarnings = new Map;