@cortexkit/aft-opencode 0.64.0 → 0.65.0

package/dist/index.js

@@ -8709,7 +8709,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);
 }
@@ -8733,6 +8740,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;
@@ -8760,7 +8840,8 @@ function watchPollDelayMs(elapsedMs) {
   return 1000;
 }
 var watchClock = {
-  now: () => performance.now(),
+  source: new WaitClock,
+  now: () => watchClock.source.now(),
   sleep: abortableSleep
 };
 function abortableSleep(ms, signal) {
@@ -8906,6 +8987,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;
@@ -8913,15 +8995,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")
@@ -8929,42 +9011,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")
@@ -8972,20 +9055,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)
@@ -8993,19 +9079,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)))
@@ -9014,11 +9100,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;
@@ -9033,28 +9120,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;
@@ -9113,22 +9201,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 {
@@ -9136,12 +9227,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";
@@ -9160,7 +9251,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";
@@ -9171,7 +9262,7 @@ function splitTopLevelStatements(command) {
         inBacktick = false;
       continue;
     }
-    if (ch === "\\") {
+    if (ch === "\\" && backslashEscapesNext(command[index + 1], quote, platform)) {
       escaped = true;
       continue;
     }
@@ -9214,7 +9305,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++) {
@@ -9227,7 +9318,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;
@@ -9238,7 +9329,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;
@@ -9254,7 +9345,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;
@@ -9271,9 +9362,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 {
@@ -9289,7 +9382,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 === "`") {
@@ -9302,6 +9395,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 === ">";
 }
@@ -9313,7 +9411,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";
@@ -9321,7 +9419,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 homedir2, 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",
@@ -9341,8 +9439,8 @@ function toolchainHomes(inherited) {
   if (!global[TOOLCHAINS]) {
     const home = process.platform === "win32" ? inherited.USERPROFILE || inherited.HOME || homedir2() : inherited.HOME || homedir2();
     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];
@@ -9369,31 +9467,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;
@@ -9469,7 +9567,7 @@ function withPathPrepended(env, dir, platform = process.platform) {
 
 // ../aft-bridge/dist/storage-paths.js
 import { homedir as homedir3, 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;
@@ -9491,21 +9589,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");
@@ -9513,8 +9611,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")) {
@@ -9525,14 +9623,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);
 }
@@ -9567,8 +9665,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);
@@ -10344,7 +10442,7 @@ async function cachedFileSha256(path) {
 }
 // ../aft-bridge/dist/bridge.js
 import { homedir as homedir4 } 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
@@ -10482,6 +10580,7 @@ function compareSemver(a, b) {
 }
 var SYSTEM_CLOCK = {
   now: () => Date.now(),
+  awakeNow: () => performance.now(),
   setTimeout: (callback, ms) => setTimeout(callback, ms),
   clearTimeout: (timer) => clearTimeout(timer)
 };
@@ -10598,6 +10697,7 @@ class BinaryBridge {
   hangWindowMinMs;
   hangProbeTimeoutMs;
   clock;
+  waitClock;
   lateShellReplyGraceMs;
   maxRestarts;
   configured = false;
@@ -10634,6 +10734,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]";
@@ -11000,11 +11101,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);
@@ -11017,11 +11124,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,
@@ -11252,11 +11360,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(homedir4() || "", ".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(homedir4() || "", ".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) {
@@ -11577,14 +11685,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) {
@@ -11832,34 +11947,34 @@ class BinaryBridge {
 }
 // ../aft-bridge/dist/cache-paths.js
 import { homedir as homedir5 } 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) || homedir5();
 }
 function getOpenCodeCacheRoot(env = process.env, home = homedir5()) {
-  return join6(env.XDG_CACHE_HOME || join6(home, ".cache"), "opencode");
+  return join5(env.XDG_CACHE_HOME || join5(home, ".cache"), "opencode");
 }
 function getOpenCodeConfigRoot(env = process.env, home = homedir5()) {
-  return join6(env.XDG_CONFIG_HOME || join6(home, ".config"), "opencode");
+  return join5(env.XDG_CONFIG_HOME || join5(home, ".config"), "opencode");
 }
 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/coerce.js
 function coerceStringArray(value) {
@@ -12004,7 +12119,7 @@ function isFindReplaceOnlyEdit(args) {
 }
 // ../aft-bridge/dist/config-error.js
 import { homedir as homedir6 } 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();
@@ -12014,10 +12129,10 @@ function formatConfigErrorMessage(detail) {
 function resolveSubcConnectionFilePath(raw, home = homedir6()) {
   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.`;
@@ -12087,7 +12202,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 {
@@ -12095,7 +12210,7 @@ function readConfigTiers(opts) {
       const doc = readFileSync2(opts.userConfigPath, "utf-8");
       tiers.push({
         tier: "user",
-        source: resolve4(opts.userConfigPath),
+        source: resolve3(opts.userConfigPath),
         doc
       });
     }
@@ -12105,7 +12220,7 @@ function readConfigTiers(opts) {
       const doc = readFileSync2(opts.projectConfigPath, "utf-8");
       tiers.push({
         tier: "project",
-        source: resolve4(opts.projectConfigPath),
+        source: resolve3(opts.projectConfigPath),
         doc
       });
     }
@@ -12121,7 +12236,7 @@ function formatDroppedKeyWarnings(dropped) {
 // ../aft-bridge/dist/config-watch.js
 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 resolve5 } from "node:path";
+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) {
@@ -12176,6 +12291,7 @@ function aftLiveConfigKeys(resolveBash) {
     pathKey("revision_reads"),
     pathKey("inspect.diagnostics_timeout_ms"),
     pathKey("lsp.idle_minutes"),
+    pathKey("lsp.max_servers"),
     ...[
       "diagnostics",
       "todos",
@@ -12288,7 +12404,7 @@ function canonicalDirectory(dir) {
   try {
     return realpathSync2(dir);
   } catch {
-    return resolve5(dir);
+    return resolve4(dir);
   }
 }
 function watchAftConfigFiles(options) {
@@ -12308,6 +12424,7 @@ function watchAftConfigFiles(options) {
   const fallbackSeen = new Map;
   const watchImpl = options.watchImpl ?? watch;
   let rejectedRetries = 0;
+  let recheckAfterArming = false;
   const check = () => {
     if (retryTimer)
       clearTimeout(retryTimer);
@@ -12316,7 +12433,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);
@@ -12374,7 +12492,7 @@ function watchAftConfigFiles(options) {
     for (const path of options.paths) {
       try {
         const resolved = realpathSync2(path);
-        const target = resolved === resolve5(path) ? undefined : resolved;
+        const target = resolved === resolve4(path) ? undefined : resolved;
         if (targets.get(path) !== target) {
           if (target)
             targets.set(path, target);
@@ -12438,12 +12556,16 @@ function watchAftConfigFiles(options) {
     }
     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 () => {
@@ -12486,6 +12608,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",
@@ -12595,7 +12721,7 @@ function startLiveConfigReload(options) {
 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";
 
@@ -12711,7 +12837,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) {
@@ -12728,16 +12854,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;
@@ -12963,7 +13089,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);
@@ -13054,7 +13180,7 @@ import { dirname as dirname3 } from "node:path";
 
 // ../aft-bridge/dist/private-storage.js
 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 isAbsolute4, join as join9, parse, relative as relative3, resolve as resolve6, sep } from "node:path";
+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) {
@@ -13089,19 +13215,19 @@ function privateCopyFileSync(source, destination) {
 }
 var warned = new Set;
 function openPrivateStorageDir(root, path = root) {
-  const base = resolve6(root);
+  const base = resolve5(root);
   if (!root || base === parse(base).root) {
     throw new Error(`refusing filesystem root as private storage: ${base}`);
   }
-  const rel = relative3(base, resolve6(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())
@@ -13295,21 +13421,23 @@ async function renameIfPresent(from, to) {
       throw error;
   }
 }
-// ../../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";
@@ -13347,6 +13475,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;
@@ -13481,7 +13611,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 {
 }
 
@@ -13531,14 +13661,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();
     });
@@ -13555,12 +13683,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);
@@ -13777,7 +13911,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";
@@ -13851,7 +13985,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;
@@ -13898,7 +14032,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 {
@@ -13937,13 +14074,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
+// ../../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;
@@ -13962,9 +14112,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() {
@@ -13984,20 +14146,60 @@ function unwrap(result) {
 
 class LaunchNonceCell {
   cached;
+  pending;
   descriptorReads = 0;
   lookup;
   platform;
   stat;
-  constructor(lookup, platform = process.platform, stat = (fd) => fstatSync3(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());
   }
@@ -14128,8 +14330,198 @@ function closeQuietly(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;
 
@@ -14222,10 +14614,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";
@@ -14261,6 +14656,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;
@@ -14385,6 +14788,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;
@@ -14400,8 +14811,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 });
@@ -14437,17 +14855,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) => {
@@ -14458,6 +14882,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;
     };
@@ -14487,7 +14913,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 = {}) {
@@ -14503,10 +14929,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);
@@ -14516,6 +14944,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);
         }
@@ -14545,6 +14982,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;
@@ -14552,22 +14991,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)
@@ -14580,11 +15040,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)
@@ -14650,7 +15113,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;
@@ -14703,10 +15166,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) {
@@ -14718,7 +15192,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)
@@ -14732,7 +15324,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 = {
@@ -14742,11 +15334,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)));
@@ -14755,10 +15363,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;
@@ -14770,6 +15384,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);
@@ -14780,7 +15405,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)
@@ -14788,7 +15413,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) {
@@ -14822,12 +15453,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)
@@ -14844,7 +15485,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);
@@ -14929,6 +15570,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();
@@ -15052,6 +15694,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`);
           }
@@ -15174,6 +15819,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;
@@ -15189,7 +15844,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;
@@ -15326,6 +15981,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);
@@ -15335,6 +15998,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();
@@ -15368,6 +16035,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);
@@ -15438,9 +16108,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;
@@ -15477,6 +16153,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);
@@ -15488,6 +16170,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,
@@ -15497,11 +16180,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;
@@ -15524,7 +16214,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) {
@@ -15542,13 +16238,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 };
@@ -16000,21 +16701,21 @@ function getLifecycleRegistry() {
 }
 
 // ../aft-bridge/dist/project-identity.js
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 import { realpathSync as realpathSync3 } from "node:fs";
-import { posix as posix2, resolve as resolve7, win32 as win322 } from "node:path";
+import { posix as posix3, resolve as resolve6, win32 as win323 } from "node:path";
 function canonicalizeProjectRoot(dir) {
   const trimmed = trimProjectRootSeparators(dir);
   let canonical;
   try {
     canonical = realpathSync3(trimmed);
   } catch {
-    canonical = resolve7(trimmed);
+    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;
 }
@@ -16049,7 +16750,7 @@ function hasDotComponent(path) {
   return path.split(/[\\/]/).some((component) => component === "." || component === "..");
 }
 function projectRootKeyHash(dir) {
-  return createHash4("sha256").update(canonicalizeProjectRoot(dir)).digest("hex").slice(0, 16);
+  return createHash5("sha256").update(canonicalizeProjectRoot(dir)).digest("hex").slice(0, 16);
 }
 
 // ../aft-bridge/dist/subc-transport.js
@@ -16816,6 +17517,8 @@ class SubcTransportPool {
   harness;
   connectionFile;
   handshakeTimeoutMs;
+  clock;
+  waitClock;
   consumerIdentity;
   hostScopes;
   hostScopeCache = new Map;
@@ -16858,6 +17561,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;
@@ -17484,11 +18194,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()) {
@@ -17509,12 +18220,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) {
@@ -17529,22 +18240,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);
@@ -17587,9 +18298,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]);
@@ -17598,7 +18309,7 @@ class SubcTransportPool {
           }
           return opened;
         } finally {
-          clearTimeout(timer);
+          cancelTimer?.();
         }
       };
       const openRouteAfterReloadWindow = async () => {
@@ -17677,6 +18388,7 @@ class SubcTransportPool {
           try {
             request = client.request(route, body, {
               timeoutMs: Math.ceil(requestTimeoutMs),
+              ...deadline.resumed ? { sleepGraceMs: 0 } : {},
               onProgress
             });
           } catch (error) {
@@ -17804,6 +18516,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);
@@ -18805,7 +19518,7 @@ function taskIdFromError(error) {
   return;
 }
 // ../aft-bridge/dist/feature-config.js
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 import { createRequire } from "node:module";
 var CANONICAL_TOOLS = [
   "aft_callgraph",
@@ -18866,12 +19579,7 @@ var RETIRED_IDLE_CHECKOUT_HOURS = [
   "idle.checkout_hours"
 ];
 var DATA_LAYER_KEYS_REFUSED_FROM = [0, 65];
-var DATA_LAYER_RETIRED_PATHS = [
-  "views.callgraph_copies",
-  "views.enabled",
-  "views.idle_checkout_hours",
-  "worktree.ram_overlay"
-];
+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;
@@ -18898,7 +19606,10 @@ function readRunningRelease() {
   return [0, 0];
 }
 var runningRelease;
+var runningReleaseOverrideForTest;
 function getRunningRelease() {
+  if (runningReleaseOverrideForTest)
+    return runningReleaseOverrideForTest;
   runningRelease ??= readRunningRelease();
   return runningRelease;
 }
@@ -18927,7 +19638,7 @@ function removedBlockKeyErrors(value, release, refuseRetired) {
   const paths = REMOVED_OPENCODE_PATHS.filter((path) => hasPath(value, path));
   if (refuseRetired)
     paths.push(...refusedRetiredNames(value));
-  if (releaseAtLeast(release, DATA_LAYER_KEYS_REFUSED_FROM))
+  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`);
 }
@@ -18951,7 +19662,10 @@ var REFUSED_RETIRED_PATHS = [
   "experimental.bash",
   "idle.lsp_ttl_minutes",
   "inspect.tier2_soft_deadline_ms",
-  "inspect.max_drill_down_items"
+  "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));
@@ -19143,8 +19857,9 @@ function translateDataLayerPaths(map, prefix, out) {
     }
   }
   for (const path of REMOVED_DATA_LAYER_PATHS) {
-    if (hasPath(map, path))
-      out.removedKeys.push(`${prefix}${path}`);
+    const [container, leaf] = path.split(".");
+    if (container && leaf && takeNested(map, container, leaf).found)
+      recordRetired(out, prefix, path);
   }
 }
 function translateExperimentalPaths(map, prefix, out) {
@@ -19394,7 +20109,7 @@ var NO_EFFECT_RETIRED_NOTES = [
   ]
 ];
 function noEffectNote(key) {
-  return NO_EFFECT_RETIRED_NOTES.find(([path]) => namesPath(key, 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}`);
@@ -19415,26 +20130,7 @@ var REMOVED_DATA_LAYER_NOTES = [
 ];
 function retiredIdleCheckoutHoursNote() {
   const [retired, replacement] = RETIRED_IDLE_CHECKOUT_HOURS;
-  return `${retired} is now ${replacement}; from ${refusedFromVersion()} AFT refuses a config file that still sets ${retired}.`;
-}
-function removedConfigKeysNoticeMessage(configPath, translation) {
-  const removed = translation.removedKeys ?? [];
-  if (removed.length === 0)
-    return "";
-  const parts = [
-    `${configPath} sets removed keys (${removed.join(", ")}); AFT ignores them, and from ${refusedFromVersion()} it refuses a config file that sets them. Run \`npx @cortexkit/aft doctor --fix\` to remove them.`
-  ];
-  for (const [path, note] of REMOVED_DATA_LAYER_NOTES) {
-    if (removed.some((key) => namesPath(key, path)))
-      parts.push(note);
-  }
-  return parts.join(" ");
-}
-function removedConfigKeysNoticeDigest(translation) {
-  return noticeDigest({
-    notice: "removed_data_layer_keys_v1",
-    keys: sortedUnique(translation.removedKeys)
-  });
+  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);
@@ -19448,13 +20144,10 @@ function legacyConfigNoticeMessage(configPath, translation) {
       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);
   }
-  const removed = removedConfigKeysNoticeMessage(configPath, translation);
-  if (removed)
-    parts.push(removed);
   return parts.join(" ");
 }
 function translateConfigDocument(map, tier) {
@@ -19462,7 +20155,6 @@ function translateConfigDocument(map, tier) {
     warnings: [],
     legacyInput: false,
     retiredKeys: [],
-    removedKeys: [],
     retiredEnabledFalse: false
   };
   translateBlock(map, tier === "user", "base", out);
@@ -19473,7 +20165,6 @@ function translateConfigDocument(map, tier) {
     }
   }
   out.retiredKeys = sortedUnique(out.retiredKeys);
-  out.removedKeys = sortedUnique(out.removedKeys);
   return out;
 }
 function unknownDisabledTools(disabled) {
@@ -19512,7 +20203,8 @@ function projectBlock(block) {
   for (const path of [
     ...RETIRED_PATHS.map(([retired]) => retired),
     ...REMOVED_NO_EFFECT_PATHS,
-    ...DATA_LAYER_RETIRED_PATHS
+    ...DATA_LAYER_RETIRED_PATHS,
+    ...REMOVED_DATA_LAYER_PATHS
   ]) {
     const dot = path.indexOf(".");
     if (dot < 0) {
@@ -19592,7 +20284,7 @@ function canonicalJson(value) {
   return JSON.stringify(value);
 }
 function noticeDigest(projection) {
-  return createHash5("sha256").update(canonicalJson(projection), "utf8").digest("hex");
+  return createHash6("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" });
@@ -20630,9 +21322,9 @@ async function releaseBridge(pool) {
   await pool.shutdown();
 }
 // ../aft-bridge/dist/lsp-github-install.js
-import { createHash as createHash6, randomBytes as randomBytes2 } from "node:crypto";
+import { createHash as createHash7, 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 join11, relative as relative4, resolve as resolve8 } from "node:path";
+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";
 
@@ -20851,13 +21543,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) {
@@ -20901,14 +21593,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";
@@ -20916,8 +21608,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 {
@@ -20961,15 +21654,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 {}
     }
@@ -20982,7 +21675,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"));
@@ -21013,7 +21706,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" });
@@ -21029,7 +21722,7 @@ function createGithubInstaller(services) {
   const MAX_EXTRACT_BYTES = 1024 * 1024 * 1024;
   function sha256OfFile(path) {
     return new Promise((resolve, reject) => {
-      const hash = createHash6("sha256");
+      const hash = createHash7("sha256");
       const stream = createReadStream2(path);
       stream.on("error", reject);
       stream.on("data", (chunk) => hash.update(chunk));
@@ -21037,7 +21730,7 @@ function createGithubInstaller(services) {
     });
   }
   function sha256OfFileSync(path) {
-    const hash = createHash6("sha256");
+    const hash = createHash7("sha256");
     const fd = openSync5(path, "r");
     try {
       const buffer = Buffer.allocUnsafe(1024 * 1024);
@@ -21265,7 +21958,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);
@@ -21277,7 +21970,7 @@ 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 {
@@ -21285,8 +21978,8 @@ function createGithubInstaller(services) {
         } catch (err) {
           throw new Error(`failed to realpath ${full}: ${err}`);
         }
-        const rel = relative4(realStagingRoot, realFull);
-        if (relativePathEscapesRoot(rel) || resolve8(realStagingRoot, rel) !== 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)`);
         }
         if (lst.isDirectory()) {
@@ -21426,7 +22119,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 });
@@ -21436,7 +22129,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;
@@ -21456,8 +22149,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;
@@ -21481,19 +22174,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();
@@ -21503,10 +22196,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 {
@@ -21536,7 +22229,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;
@@ -21582,7 +22275,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);
@@ -21618,7 +22311,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}`);
         }
@@ -21648,7 +22341,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 {
@@ -21775,6 +22468,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);
@@ -21787,7 +22481,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)
@@ -21816,7 +22510,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) => {
@@ -21871,7 +22565,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);
       }
     };
@@ -21942,7 +22636,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 homedir7 } 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,
@@ -21969,16 +22663,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;
@@ -21987,8 +22681,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));
@@ -22013,22 +22707,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);
   }
@@ -22038,12 +22732,12 @@ 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 };
   }
@@ -22052,15 +22746,15 @@ function resolveNpm(deps = defaultDeps()) {
 function npmCandidates(deps = defaultDeps()) {
   const name = npmBinaryName(deps.platform);
   const dirs = [
-    ...(deps.env.PATH ?? "").split(deps.platform === "win32" ? ";" : ":").filter(isAbsolute5),
+    ...(deps.env.PATH ?? "").split(deps.platform === "win32" ? ";" : ":").filter(isAbsolute4),
     dirname5(deps.execPath),
     ...wellKnownNpmDirs(deps)
   ];
   return [...new Set(dirs)].flatMap((binDir) => {
     return [
-      join12(binDir, name),
-      join12(binDir, "node_modules", "npm", "bin", "npm-cli.js"),
-      join12(binDir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js")
+      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 }));
   });
 }
@@ -22229,7 +22923,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",
@@ -22363,7 +23057,7 @@ async function lspNpmInstallInvocation(npm, target, before, clock = SYSTEM_CLOCK
 }
 // ../aft-bridge/dist/lsp-npm-selection.js
 import { readFile, realpath, stat as stat3 } from "node:fs/promises";
-import { dirname as dirname6, join as join13, resolve as resolve9 } from "node:path";
+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);
@@ -22378,13 +23072,13 @@ async function genuineNpm(candidate) {
   const windowsShim = /\.(?:cmd|bat)$/i.test(executable);
   let current = dirname6(executable);
   if (windowsShim)
-    current = join13(current, "node_modules", "npm");
+    current = join12(current, "node_modules", "npm");
   for (;; ) {
     try {
-      const pkg = JSON.parse(await readFile(join13(current, "package.json"), "utf8"));
+      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(resolve9(current, bin));
+        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];
@@ -22393,7 +23087,7 @@ async function genuineNpm(candidate) {
         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 = join13(candidate.binDir ?? dirname6(executable), "node.exe");
+          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: "" };
@@ -22485,12 +23179,12 @@ function shouldInterruptWaitsForMessage(detachOnUserMessage, operatorText) {
 // ../aft-bridge/dist/migration.js
 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 homedir10, tmpdir as tmpdir3 } from "node:os";
-import { basename as basename2, dirname as dirname9, join as join16, resolve as resolve11 } 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 realpathSync5, renameSync as renameSync4, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { dirname as dirname7, isAbsolute as isAbsolute6, join as join14, resolve as resolve10 } 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 || homedir8();
@@ -22498,18 +23192,18 @@ function homeDir3() {
 }
 function configHome() {
   const xdg = process.env.XDG_CONFIG_HOME;
-  if (xdg && isAbsolute6(xdg))
+  if (xdg && isAbsolute5(xdg))
     return xdg;
-  return join14(homeDir3(), ".config");
+  return join13(homeDir3(), ".config");
 }
 function legacyOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
-    return resolve10(envDir);
-  return join14(configHome(), "opencode");
+    return resolve9(envDir);
+  return join13(configHome(), "opencode");
 }
 function legacyPiAgentDir() {
-  return join14(homeDir3(), ".pi", "agent");
+  return join13(homeDir3(), ".pi", "agent");
 }
 function legacySources(basePath, label, harness) {
   return [
@@ -22518,10 +23212,10 @@ function legacySources(basePath, label, harness) {
   ];
 }
 function resolveCortexKitUserConfigPath() {
-  return join14(configHome(), "cortexkit", "aft.jsonc");
+  return join13(configHome(), "cortexkit", "aft.jsonc");
 }
 function resolveCortexKitProjectConfigPath(projectDirectory) {
-  return join14(projectDirectory, ".cortexkit", "aft.jsonc");
+  return join13(projectDirectory, ".cortexkit", "aft.jsonc");
 }
 function resolveProjectConfigReadPath(projectDirectory, operatingHarness) {
   const canonical = resolveCortexKitProjectConfigPath(projectDirectory);
@@ -22548,14 +23242,14 @@ function resolveCortexKitConfigPaths(projectDirectory) {
 }
 function resolveLegacyAftConfigSources(projectDirectory) {
   const project = [
-    ...legacySources(join14(projectDirectory, ".opencode", "aft"), "OpenCode project", "opencode"),
-    ...legacySources(join14(projectDirectory, ".pi", "aft"), "Pi project", "pi")
+    ...legacySources(join13(projectDirectory, ".opencode", "aft"), "OpenCode project", "opencode"),
+    ...legacySources(join13(projectDirectory, ".pi", "aft"), "Pi project", "pi")
   ];
   const identity = (path) => {
     try {
       return realpathSync5(path);
     } catch {
-      return resolve10(path);
+      return resolve9(path);
     }
   };
   const protectedPaths = new Set([
@@ -22564,18 +23258,18 @@ function resolveLegacyAftConfigSources(projectDirectory) {
   ].map(identity));
   return {
     user: [
-      ...legacySources(join14(legacyOpenCodeConfigDir(), "aft"), "OpenCode user", "opencode"),
-      ...legacySources(join14(legacyPiAgentDir(), "aft"), "Pi user", "pi")
+      ...legacySources(join13(legacyOpenCodeConfigDir(), "aft"), "OpenCode user", "opencode"),
+      ...legacySources(join13(legacyPiAgentDir(), "aft"), "Pi user", "pi")
     ].filter((source) => !protectedPaths.has(identity(source.path))),
     project
   };
 }
 function resolveHarnessStoragePath(storageRoot, harness, ...segments) {
-  return join14(storageRoot, harness, ...segments);
+  return join13(storageRoot, harness, ...segments);
 }
 function repairRootScopedStorageFile(storageRoot, harness, fileName) {
   const harnessPath = resolveHarnessStoragePath(storageRoot, harness, fileName);
-  const rootPath = join14(storageRoot, fileName);
+  const rootPath = join13(storageRoot, fileName);
   if (existsSync7(harnessPath) || !existsSync7(rootPath))
     return harnessPath;
   try {
@@ -22664,15 +23358,15 @@ function decodeFileUrl(target) {
 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 homedir9 } from "node:os";
-import { delimiter, dirname as dirname8, isAbsolute as isAbsolute7, join as join15 } 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;
 function copyToVersionedCache(npmBinaryPath, version) {
   const tag = version.startsWith("v") ? version : `v${version}`;
   const ext = process.platform === "win32" ? ".exe" : "";
-  const versionedDir = join15(getAftBinaryCacheDir(), tag);
-  const cachedPath = join15(versionedDir, `aft${ext}`);
+  const versionedDir = join14(getAftBinaryCacheDir(), tag);
+  const cachedPath = join14(versionedDir, `aft${ext}`);
   if (existsSync8(cachedPath) && isTrustedCachedBinary(cachedPath, version))
     return { cachedPath };
   const existing = cacheCopiesInFlight.get(cachedPath);
@@ -22718,7 +23412,7 @@ function homeDirFromEnv(env) {
   return (process.platform === "win32" ? env.USERPROFILE || env.HOME : env.HOME) || homedir9();
 }
 function cachedBinaryPathFromEnv(version, env, ext) {
-  const binaryPath = join15(getAftBinaryCacheDir(env), version, `aft${ext}`);
+  const binaryPath = join14(getAftBinaryCacheDir(env), version, `aft${ext}`);
   return existsSync8(binaryPath) ? binaryPath : null;
 }
 async function probeBinaryCandidateOffThread(binaryPath, source, expectedVersion) {
@@ -22738,9 +23432,9 @@ 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 = join15(dir, `aft${ext}`);
+    const candidate = join14(dir, `aft${ext}`);
     if (seen.has(candidate))
       continue;
     seen.add(candidate);
@@ -22818,7 +23512,7 @@ function npmPlatformPackage(ext) {
     const req = createRequire2(import.meta.url);
     const manifestPath = req.resolve(`@cortexkit/aft-${platformKey()}/package.json`);
     const manifest = JSON.parse(readFileSync7(manifestPath, "utf8"));
-    const binaryPath = join15(dirname8(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) };
@@ -22885,7 +23579,7 @@ async function findProbedBinary(expectedVersion, env) {
     if (usable)
       return { path: usable, source: "PATH" };
   }
-  const cargoPath = join15(homeDirFromEnv(env), ".cargo", "bin", `aft${ext}`);
+  const cargoPath = join14(homeDirFromEnv(env), ".cargo", "bin", `aft${ext}`);
   if (existsSync8(cargoPath)) {
     const usable = await probeBinaryCandidateOffThread(cargoPath, "cargo", pluginVersion);
     if (usable)
@@ -22984,9 +23678,9 @@ function dataHome() {
   if (process.env.XDG_DATA_HOME)
     return process.env.XDG_DATA_HOME;
   if (process.platform === "win32") {
-    return process.env.LOCALAPPDATA || process.env.APPDATA || join16(homeDir4(), "AppData", "Local");
+    return process.env.LOCALAPPDATA || process.env.APPDATA || join15(homeDir4(), "AppData", "Local");
   }
-  return join16(homeDir4(), ".local", "share");
+  return join15(homeDir4(), ".local", "share");
 }
 function homeDir4() {
   if (process.platform === "win32")
@@ -22995,8 +23689,8 @@ function homeDir4() {
 }
 function resolveLegacyStorageRoot(harness) {
   if (harness === "pi")
-    return join16(homeDir4(), ".pi", "agent", "aft");
-  return join16(dataHome(), "opencode", "storage", "plugin", "aft");
+    return join15(homeDir4(), ".pi", "agent", "aft");
+  return join15(dataHome(), "opencode", "storage", "plugin", "aft");
 }
 function stripJsoncForParse(input) {
   let out = "";
@@ -23126,7 +23820,7 @@ function acquireConfigMigrationLock(lockDir) {
 }
 function atomicCopyConfigFile(sourcePath, targetPath) {
   mkdirSync5(dirname9(targetPath), { recursive: true });
-  const tmpPath = join16(dirname9(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  const tmpPath = join15(dirname9(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
     fd = openSync7(tmpPath, "wx", 384);
@@ -23148,7 +23842,7 @@ function atomicCopyConfigFile(sourcePath, targetPath) {
 }
 function atomicWriteConfigFile(targetPath, content) {
   mkdirSync5(dirname9(targetPath), { recursive: true });
-  const tmpPath = join16(dirname9(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  const tmpPath = join15(dirname9(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
     fd = openSync7(tmpPath, "wx", 384);
@@ -23267,8 +23961,8 @@ function visibleConfigMigrationWarning(scope, targetPath, paths, reason) {
 }
 function migrateAftConfigFile(opts) {
   const warnings = [];
-  const resolvedTarget = resolve11(opts.targetPath);
-  const existingSources = opts.legacySources.filter((source) => existsSync9(source.path) && resolve11(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 };
@@ -23330,12 +24024,12 @@ function spawnErrorLabel(error) {
   return [code, error.message].filter(Boolean).join(": ");
 }
 function migrationLogPath(newRoot, harness, logger) {
-  const desired = join16(newRoot, "logs", "migration", `${harness}-${Date.now()}.jsonl`);
+  const desired = join15(newRoot, "logs", "migration", `${harness}-${Date.now()}.jsonl`);
   try {
     mkdirSync5(dirname9(desired), { recursive: true });
     return desired;
   } catch (err) {
-    const fallback = join16(tmpdir3(), `aft-migration-${harness}-${Date.now()}.jsonl`);
+    const fallback = join15(tmpdir3(), `aft-migration-${harness}-${Date.now()}.jsonl`);
     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;
   }
@@ -23395,13 +24089,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 homedir11 } from "node:os";
-import { dirname as dirname10, join as join17, resolve as resolve12 } 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 : join17(homedir11(), ".local", "state");
-  return join17(stateHome, "cortexkit", "aft", "migration-notices.json");
+  const stateHome = env.XDG_STATE_HOME && env.XDG_STATE_HOME.length > 0 ? env.XDG_STATE_HOME : join16(homedir11(), ".local", "state");
+  return join16(stateHome, "cortexkit", "aft", "migration-notices.json");
 }
 function noticeKey(configPath, digest) {
-  return `${resolve12(configPath)}|${MIGRATION_POLICY_ID}|${digest}`;
+  return `${resolve11(configPath)}|${MIGRATION_POLICY_ID}|${digest}`;
 }
 function readRecords(storePath) {
   try {
@@ -23595,7 +24289,7 @@ function probeOnnxRuntimeLoadable(libPath, arch = process.arch) {
 // ../aft-bridge/dist/onnx-runtime.js
 import { randomBytes as randomBytes3 } from "node:crypto";
 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 isAbsolute8, join as join18, relative as relative5, resolve as resolve13, win32 as win323 } from "node:path";
+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";
@@ -23686,7 +24380,7 @@ function resolveOnnxRuntime(storageDir, seams) {
 }
 async function findCachedOnnxRuntime(ortVersionDir, libName) {
   const resolvedOrtDir = resolveCachedOnnxRuntimeDir(ortVersionDir, libName);
-  const libPath = join18(resolvedOrtDir, libName);
+  const libPath = join17(resolvedOrtDir, libName);
   if (existsSync11(libPath)) {
     const meta = readOnnxInstalledMeta(ortVersionDir);
     if (meta?.sha256) {
@@ -23711,7 +24405,7 @@ async function findCachedOnnxRuntime(ortVersionDir, libName) {
 }
 async function resolveOnnxRuntimeUncoalesced(storageDir, seams) {
   const info = seams.platformInfo !== undefined ? seams.platformInfo : getPlatformInfo();
-  const ortVersionDir = join18(storageDir, "onnxruntime", ORT_VERSION);
+  const ortVersionDir = join17(storageDir, "onnxruntime", ORT_VERSION);
   const libName = info?.libName ?? "libonnxruntime.dylib";
   const cached = await findCachedOnnxRuntime(ortVersionDir, libName);
   if (cached)
@@ -23725,9 +24419,9 @@ async function resolveOnnxRuntimeUncoalesced(storageDir, seams) {
     warn(`ONNX Runtime auto-download not available for ${process.platform}/${process.arch}. Install manually: ${getManualInstallHint()}`);
     return null;
   }
-  const onnxBaseDir = join18(storageDir, "onnxruntime");
+  const onnxBaseDir = join17(storageDir, "onnxruntime");
   openPrivateStorageDir(storageDir, onnxBaseDir);
-  const lockPath = join18(onnxBaseDir, ONNX_LOCK_FILE);
+  const lockPath = join17(onnxBaseDir, ONNX_LOCK_FILE);
   const pollMs = seams.lockPollMs ?? LOCK_POLL_MS;
   const deadline = Date.now() + LOCK_WAIT_MS;
   let announcedWait = false;
@@ -23772,7 +24466,7 @@ function cleanupAbandonedStagingDirs(onnxBaseDir) {
     for (const entry of entries) {
       if (!entry.startsWith(`${ORT_VERSION}.tmp.`))
         continue;
-      const stagingDir = join18(onnxBaseDir, entry);
+      const stagingDir = join17(onnxBaseDir, entry);
       const parts = entry.split(".");
       const pidStr = parts[parts.length - 2];
       const pid = pidStr ? Number.parseInt(pidStr, 10) : NaN;
@@ -23809,7 +24503,7 @@ function cleanupAbandonedStagingDirs(onnxBaseDir) {
 }
 function cleanupIncompleteTargetIfUnowned(ortDir) {
   try {
-    if (existsSync11(ortDir) && !existsSync11(join18(ortDir, ONNX_INSTALLED_META_FILE))) {
+    if (existsSync11(ortDir) && !existsSync11(join17(ortDir, ONNX_INSTALLED_META_FILE))) {
       log(`[onnx] removing half-populated install dir ${ortDir} (no meta file)`);
       rmSync4(ortDir, { recursive: true, force: true });
     }
@@ -23837,14 +24531,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(realpathSync7(join18(libDir, libName)));
+      const resolved = parseOnnxVersionFromPath(realpathSync7(join17(libDir, libName)));
       if (resolved && resolved !== INVALID_ORT_VERSION)
         return resolved;
     } catch {}
@@ -23858,7 +24552,7 @@ function detectOnnxVersion(libDir, libName) {
       if (version)
         return version;
     }
-    const base = join18(libDir, libName);
+    const base = join17(libDir, libName);
     if (existsSync11(base)) {
       try {
         const real = realpathSync7(base);
@@ -23898,18 +24592,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) {
@@ -23925,10 +24619,10 @@ function directoryContainsLibrary(dir, libName) {
   }
 }
 function resolveCachedOnnxRuntimeDir(ortVersionDir, libName) {
-  if (existsSync11(join18(ortVersionDir, libName)))
+  if (existsSync11(join17(ortVersionDir, libName)))
     return ortVersionDir;
-  const libSubdir = join18(ortVersionDir, "lib");
-  if (existsSync11(join18(libSubdir, libName)))
+  const libSubdir = join17(ortVersionDir, "lib");
+  if (existsSync11(join17(libSubdir, libName)))
     return libSubdir;
   return ortVersionDir;
 }
@@ -23943,12 +24637,12 @@ function findSystemOnnxRuntime(libName, searchPathsOverride) {
   } else if (process.platform === "win32") {
     const programFiles = process.env.ProgramFiles ?? "C:\\Program Files";
     const programFilesX86 = process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
-    searchPaths.push(join18(programFiles, "onnxruntime", "lib"), join18(programFiles, "Microsoft ONNX Runtime", "lib"), join18(programFiles, "Microsoft Machine Learning", "lib"), join18(programFilesX86, "onnxruntime", "lib"), ...(() => {
+    searchPaths.push(join17(programFiles, "onnxruntime", "lib"), join17(programFiles, "Microsoft ONNX Runtime", "lib"), join17(programFiles, "Microsoft Machine Learning", "lib"), join17(programFilesX86, "onnxruntime", "lib"), ...(() => {
       const nugetPaths = [];
       const userProfile = process.env.USERPROFILE ?? "";
       if (!userProfile)
         return nugetPaths;
-      const nugetPackageDir = join18(userProfile, ".nuget", "packages", "microsoft.ml.onnxruntime");
+      const nugetPackageDir = join17(userProfile, ".nuget", "packages", "microsoft.ml.onnxruntime");
       if (!existsSync11(nugetPackageDir))
         return nugetPaths;
       try {
@@ -23957,7 +24651,7 @@ function findSystemOnnxRuntime(libName, searchPathsOverride) {
             continue;
           if (entry.name === "__globalPackagesFolder" || entry.name.startsWith("."))
             continue;
-          nugetPaths.push(join18(nugetPackageDir, entry.name, "runtimes", "win-x64", "native"), join18(nugetPackageDir, entry.name, "runtimes", "win-arm64", "native"));
+          nugetPaths.push(join17(nugetPackageDir, entry.name, "runtimes", "win-x64", "native"), join17(nugetPackageDir, entry.name, "runtimes", "win-arm64", "native"));
         }
       } catch (err) {
         warn(`Failed to scan NuGet ONNX Runtime cache ${nugetPackageDir}: ${err instanceof Error ? err.message : String(err)}`);
@@ -23969,7 +24663,7 @@ function findSystemOnnxRuntime(libName, searchPathsOverride) {
   const normalizeCase = process.platform === "win32" || process.platform === "darwin";
   const seen = new Set;
   const uniquePaths = searchPaths.filter((p) => {
-    let key = resolve13(p).replace(/[/\\]+$/, "");
+    let key = resolve12(p).replace(/[/\\]+$/, "");
     if (normalizeCase)
       key = key.toLowerCase();
     if (seen.has(key))
@@ -23979,7 +24673,7 @@ function findSystemOnnxRuntime(libName, searchPathsOverride) {
   });
   const unknownVersionPaths = [];
   for (const dir of uniquePaths) {
-    const libPath = join18(dir, libName);
+    const libPath = join17(dir, libName);
     if (process.platform === "win32") {
       if (!directoryContainsLibrary(dir, libName))
         continue;
@@ -24058,19 +24752,19 @@ function validateExtractedTree(stagingRoot) {
   const walk = (dir) => {
     const entries = readdirSync4(dir);
     for (const entry of entries) {
-      const fullPath = join18(dir, entry);
+      const fullPath = join17(dir, entry);
       const lst = lstatSync3(fullPath);
       if (lst.isSymbolicLink()) {
         const linkTarget = readlinkSync2(fullPath);
-        const resolvedTarget = resolve13(dirname11(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()) {
@@ -24095,11 +24789,11 @@ async function downloadOnnxRuntime(info, targetDir) {
   const url = `https://github.com/${ORT_REPO}/releases/download/v${ORT_VERSION}/${info.assetName}.${info.archiveType === "tgz" ? "tgz" : "zip"}`;
   log(`Downloading ONNX Runtime v${ORT_VERSION} for ${process.platform}/${process.arch}...`);
   const tmpDir = `${targetDir}.tmp.${process.pid}.${Date.now().toString(36)}${randomBytes3(4).toString("hex")}`;
-  const extractionRoot = join18(tmpDir, "extract");
-  const stagedInstallDir = join18(tmpDir, "install");
+  const extractionRoot = join17(tmpDir, "extract");
+  const stagedInstallDir = join17(tmpDir, "install");
   try {
     privateMkdirSync(extractionRoot);
-    const archivePath = join18(tmpDir, `onnxruntime.${info.archiveType}`);
+    const archivePath = join17(tmpDir, `onnxruntime.${info.archiveType}`);
     await downloadFileWithCap(url, archivePath);
     const archiveSha256 = await sha256File(archivePath);
     log(`ONNX Runtime archive sha256=${archiveSha256}`);
@@ -24112,7 +24806,7 @@ async function downloadOnnxRuntime(info, targetDir) {
       unlinkSync5(archivePath);
     } catch {}
     validateExtractedTree(extractionRoot);
-    const extractedDir = join18(extractionRoot, info.assetName, "lib");
+    const extractedDir = join17(extractionRoot, info.assetName, "lib");
     if (!existsSync11(extractedDir)) {
       throw new Error(`Expected directory not found: ${extractedDir}`);
     }
@@ -24120,7 +24814,7 @@ async function downloadOnnxRuntime(info, targetDir) {
     const realFiles = [];
     const symlinks = [];
     for (const libFile of libFiles) {
-      const src = join18(extractedDir, libFile);
+      const src = join17(extractedDir, libFile);
       try {
         const stat = lstatSync3(src);
         log(`ORT extract: ${libFile} — isSymlink=${stat.isSymbolicLink()}, isFile=${stat.isFile()}, size=${stat.size}`);
@@ -24135,14 +24829,14 @@ async function downloadOnnxRuntime(info, targetDir) {
       }
     }
     copyOnnxLibraries(info, extractedDir, stagedInstallDir, realFiles, symlinks);
-    const libPath = join18(stagedInstallDir, info.libName);
+    const libPath = join17(stagedInstallDir, info.libName);
     const libHash = await sha256File(libPath);
     if (libHash !== info.librarySha256) {
       throw new Error(`onnx runtime library hash mismatch at ${libPath}: sha256 ${libHash}, ` + `expected the pinned ${info.librarySha256} for ${info.assetName}`);
     }
     writeOnnxInstalledMeta(stagedInstallDir, ORT_VERSION, libHash, archiveSha256);
     publishOnnxRuntime(stagedInstallDir, targetDir);
-    writeStampedFileDigest(join18(targetDir, info.libName), libHash);
+    writeStampedFileDigest(join17(targetDir, info.libName), libHash);
     rmSync4(tmpDir, { recursive: true, force: true });
     log(`ONNX Runtime v${ORT_VERSION} installed to ${targetDir}`);
     return targetDir;
@@ -24184,8 +24878,8 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
   const requiredLibs = new Set([info.libName]);
   privateMkdirSync(targetDir);
   for (const libFile of realFiles) {
-    const src = join18(extractedDir, libFile);
-    const dst = join18(targetDir, libFile);
+    const src = join17(extractedDir, libFile);
+    const dst = join17(targetDir, libFile);
     try {
       if (copyFile === copyFileSync4)
         privateCopyFileSync(src, dst);
@@ -24204,12 +24898,12 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
   }
   const targetRoot = realpathSync7(targetDir);
   for (const link of symlinks) {
-    const dst = join18(targetDir, link.name);
+    const dst = join17(targetDir, link.name);
     try {
       unlinkSync5(dst);
     } catch {}
-    const dstForContainment = join18(targetRoot, link.name);
-    const resolvedTarget = resolve13(dirname11(dstForContainment), link.target);
+    const dstForContainment = join17(targetRoot, link.name);
+    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)) {
@@ -24229,7 +24923,7 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
       log(`ORT extract: failed to symlink optional ${link.name}: ${symlinkErr}`);
     }
   }
-  const requiredPath = join18(targetDir, info.libName);
+  const requiredPath = join17(targetDir, info.libName);
   if (!existsSync11(requiredPath)) {
     rmSync4(targetDir, { recursive: true, force: true });
     throw new Error(`Required ONNX Runtime library missing after install: ${requiredPath}`);
@@ -24257,7 +24951,7 @@ function writeOnnxInstalledMeta(installDir, version, sha256, archiveSha256) {
       ...sha256 ? { sha256 } : {},
       archiveSha256
     };
-    writeFileSync6(join18(installDir, ONNX_INSTALLED_META_FILE), JSON.stringify(meta), {
+    writeFileSync6(join17(installDir, ONNX_INSTALLED_META_FILE), JSON.stringify(meta), {
       encoding: "utf8",
       mode: PRIVATE_FILE_MODE
     });
@@ -24266,7 +24960,7 @@ function writeOnnxInstalledMeta(installDir, version, sha256, archiveSha256) {
   }
 }
 function readOnnxInstalledMeta(installDir) {
-  const path = join18(installDir, ONNX_INSTALLED_META_FILE);
+  const path = join17(installDir, ONNX_INSTALLED_META_FILE);
   try {
     if (!statSync10(path).isFile())
       return null;
@@ -25071,7 +25765,7 @@ function formatSemanticIndexStatus(status, stage, error, backend) {
 // src/config.ts
 import { existsSync as existsSync12, readFileSync as readFileSync11, statSync as statSync11 } from "node:fs";
 import { homedir as homedir12 } from "node:os";
-import { isAbsolute as isAbsolute9, parse as parsePath, resolve as resolvePath } from "node:path";
+import { isAbsolute as isAbsolute8, parse as parsePath, resolve as resolvePath } 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
@@ -29957,9 +30651,9 @@ var SemanticBackendEnum = _enum(["fastembed", "openai_compatible", "ollama", "sy
 var IndexKindSchema = _enum(["search", "semantic", "callgraph"]);
 function isSupportedAbsoluteIndexPath(path) {
   if (path === "~" || path.startsWith("~/") || path.startsWith("~\\")) {
-    return isAbsolute9(homedir12());
+    return isAbsolute8(homedir12());
   }
-  return isAbsolute9(path);
+  return isAbsolute8(path);
 }
 var IndexRootSchema = object({
   path: string2().refine(isSupportedAbsoluteIndexPath, {
@@ -30016,6 +30710,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")
@@ -30099,7 +30794,7 @@ var SubcConfigSchema = object({
   client_reaper: boolean2().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(),
@@ -30152,13 +30847,6 @@ var IdleConfigSchema = object({
   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 ViewsConfigSchema = object({
-  enabled: boolean2().optional(),
-  callgraph_copies: number2().int().optional()
-});
-var WorktreeConfigSchema = object({
-  ram_overlay: boolean2().optional()
-});
 var BackupConfigSchema = object({
   enabled: boolean2().optional(),
   max_depth: number2().int().positive().optional(),
@@ -30184,12 +30872,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(),
@@ -30472,6 +31158,9 @@ function loadConfigFromPath(configPath, tier) {
     throw new ConfigRejectedError(["invalid_config_document"], configPath);
   }
   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);
   }
@@ -30498,14 +31187,7 @@ function loadConfigFromPath(configPath, tier) {
     if (translation.legacyInput) {
       log2(`Config ${configPath} uses retired keys (${translation.retiredKeys.join(", ")}); applied their current equivalents in memory`);
     }
-    if (translation.removedKeys.length > 0) {
-      configLoadNotices.push({
-        configPath,
-        digest: removedConfigKeysNoticeDigest(translation),
-        message: removedConfigKeysNoticeMessage(configPath, translation)
-      });
-    }
-  } else if (translation.legacyInput || translation.removedKeys.length > 0) {
+  } else if (translation.legacyInput) {
     configLoadNotices.push({
       configPath,
       digest: noticeDigest(projection),
@@ -30560,6 +31242,9 @@ function mergeSemanticConfig(baseSemantic, overrideSemantic) {
 }
 function mergeLspConfig(baseLsp, overrideLsp) {
   const projectLsp = {};
+  if (overrideLsp?.max_servers !== undefined && overrideLsp.max_servers <= (baseLsp?.max_servers ?? 8)) {
+    projectLsp.max_servers = overrideLsp.max_servers;
+  }
   if (overrideLsp?.python !== undefined)
     projectLsp.python = overrideLsp.python;
   if (overrideLsp?.diagnostics_on_edit !== undefined) {
@@ -30581,15 +31266,6 @@ function mergeLspConfig(baseLsp, overrideLsp) {
   }
   return Object.fromEntries(Object.entries(lsp).filter(([, value]) => value !== 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,
@@ -30726,11 +31402,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",
@@ -30847,22 +31521,18 @@ 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);
   const pi = mergePiConfig(base.pi, override.pi);
-  const views = base.views !== undefined || override.views !== undefined ? { ...base.views, ...override.views } : undefined;
   const bridge = base.bridge;
   const safeOverride = pickProjectSafeFields(override);
   delete safeOverride.indexes;
   delete safeOverride.bash;
   delete safeOverride.inspect;
-  delete safeOverride.worktree;
   delete safeOverride.idle;
   delete safeOverride.pi;
-  delete safeOverride.views;
   return {
     ...base,
     ...safeOverride,
@@ -30871,13 +31541,11 @@ 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 } : {},
     ...pi !== undefined ? { pi } : {},
-    ...views !== undefined ? { views } : {},
     experimental,
     semantic,
     search,
@@ -31281,7 +31949,7 @@ async function signalActiveBridges(pool, projectRoot, sessionID, request) {
 }
 
 // src/bg-notifications.ts
-import { createHash as createHash7, randomBytes as randomBytes4, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash8, randomBytes as randomBytes4, randomUUID as randomUUID2 } from "node:crypto";
 
 // src/shared/last-assistant-model.ts
 function isRecord3(value) {
@@ -31605,7 +32273,7 @@ async function awaitWakeAdmission(options) {
 
 // src/bg-notifications.ts
 function hashReminder(text) {
-  return createHash7("sha256").update(text).digest("hex").slice(0, 16);
+  return createHash8("sha256").update(text).digest("hex").slice(0, 16);
 }
 var CONSUMED_TASKIDS_CAP = 256;
 var DELIVERED_AWAITING_ACK_CAP = 4096;
@@ -33105,7 +33773,7 @@ function shorten(value, limit) {
 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"}]` : "";
@@ -33161,7 +33829,7 @@ async function runDetachedBgHandler(work, onError) {
 
 // src/lsp-auto-install.ts
 import { existsSync as existsSync14, mkdirSync as mkdirSync7, renameSync as renameSync9, rmSync as rmSync6, statSync as statSync13, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join21 } from "node:path";
+import { join as join20 } from "node:path";
 
 // src/lsp-cache.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
@@ -33176,7 +33844,7 @@ import {
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync7
 } from "node:fs";
-import { join as join19 } from "node:path";
+import { join as join18 } from "node:path";
 function aftCacheBase() {
   return getAftCacheRoot();
 }
@@ -33184,18 +33852,18 @@ function lspCacheRoot() {
   return getAftLspPackagesDir();
 }
 function lspPackageDir(npmPackage) {
-  return join19(lspCacheRoot(), encodeURIComponent(npmPackage));
+  return join18(lspCacheRoot(), encodeURIComponent(npmPackage));
 }
 function lspBinaryPath(npmPackage, binary) {
-  return join19(lspPackageDir(npmPackage), "node_modules", ".bin", binary);
+  return join18(lspPackageDir(npmPackage), "node_modules", ".bin", binary);
 }
 function lspBinDir(npmPackage) {
-  return join19(lspPackageDir(npmPackage), "node_modules", ".bin");
+  return join18(lspPackageDir(npmPackage), "node_modules", ".bin");
 }
 function isInstalled(npmPackage, binary) {
   for (const candidate of lspBinaryCandidates(binary)) {
     try {
-      if (statSync12(join19(lspBinDir(npmPackage), candidate)).isFile())
+      if (statSync12(join18(lspBinDir(npmPackage), candidate)).isFile())
         return true;
     } catch {}
   }
@@ -33215,13 +33883,13 @@ function writeInstalledMetaIn(installDir, version, sha256) {
       installedAt: new Date().toISOString(),
       ...sha256 ? { sha256 } : {}
     };
-    writeFileSync7(join19(installDir, INSTALLED_META_FILE), JSON.stringify(meta), "utf8");
+    writeFileSync7(join18(installDir, INSTALLED_META_FILE), JSON.stringify(meta), "utf8");
   } catch (err) {
     log2(`[lsp-cache] failed to write installed-meta in ${installDir}: ${err}`);
   }
 }
 function readInstalledMetaIn(installDir) {
-  const path = join19(installDir, INSTALLED_META_FILE);
+  const path = join18(installDir, INSTALLED_META_FILE);
   try {
     if (!statSync12(path).isFile())
       return null;
@@ -33245,7 +33913,7 @@ function readInstalledMeta(packageKey) {
   return readInstalledMetaIn(lspPackageDir(packageKey));
 }
 function lockPath(npmPackage) {
-  return join19(lspPackageDir(npmPackage), ".aft-installing");
+  return join18(lspPackageDir(npmPackage), ".aft-installing");
 }
 var STALE_LOCK_MS2 = 30 * 60 * 1000;
 function acquireInstallLock(lockKey) {
@@ -33376,7 +34044,7 @@ var AUTO_INSTALL_STAMP_FILE = "last-lsp-autoinstall.json";
 var AUTO_INSTALL_WINDOW_MS = 60 * 1000;
 var AUTO_INSTALL_LOCK_STALE_MS = 30 * 60 * 1000;
 function autoInstallStampPath() {
-  return join19(aftCacheBase(), AUTO_INSTALL_STAMP_FILE);
+  return join18(aftCacheBase(), AUTO_INSTALL_STAMP_FILE);
 }
 function hasRecentAutoInstallStamp(path) {
   try {
@@ -33477,7 +34145,7 @@ function claimLspAutoInstallPass() {
 }
 var VERSION_CHECK_FILE = ".aft-version-check";
 function readVersionCheck(npmPackage) {
-  const file = join19(lspPackageDir(npmPackage), VERSION_CHECK_FILE);
+  const file = join18(lspPackageDir(npmPackage), VERSION_CHECK_FILE);
   try {
     const raw = readFileSync12(file, "utf8");
     const parsed = JSON.parse(raw);
@@ -33494,7 +34162,7 @@ function readVersionCheck(npmPackage) {
 }
 function writeVersionCheck(npmPackage, latest) {
   mkdirSync6(lspPackageDir(npmPackage), { recursive: true });
-  const file = join19(lspPackageDir(npmPackage), VERSION_CHECK_FILE);
+  const file = join18(lspPackageDir(npmPackage), VERSION_CHECK_FILE);
   const record = {
     last_checked: new Date().toISOString(),
     latest_eligible: latest
@@ -33611,7 +34279,7 @@ function isVersionSupported(spec, version) {
 
 // src/lsp-project-relevance.ts
 import { existsSync as existsSync13, readdirSync as readdirSync5, readFileSync as readFileSync13 } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join19 } from "node:path";
 var MAX_WALK_DIRS = 200;
 var MAX_WALK_DEPTH = 4;
 var NOISE_DIRS = new Set([
@@ -33628,7 +34296,7 @@ function hasRootMarker(projectRoot, rootMarkers) {
   if (!rootMarkers)
     return false;
   for (const marker of rootMarkers) {
-    if (existsSync13(join20(projectRoot, marker)))
+    if (existsSync13(join19(projectRoot, marker)))
       return true;
   }
   return false;
@@ -33652,7 +34320,7 @@ function hasPackageJsonDep(projectRoot, depNames) {
 }
 function readPackageJson(projectRoot) {
   try {
-    const raw = readFileSync13(join20(projectRoot, "package.json"), "utf8");
+    const raw = readFileSync13(join19(projectRoot, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null)
       return null;
@@ -33682,7 +34350,7 @@ function relevantExtensionsInProject(projectRoot, extToServer) {
     for (const entry of entries) {
       if (entry.isDirectory()) {
         if (current.depth < MAX_WALK_DEPTH && !NOISE_DIRS.has(entry.name.toLowerCase())) {
-          queue.push({ dir: join20(current.dir, entry.name), depth: current.depth + 1 });
+          queue.push({ dir: join19(current.dir, entry.name), depth: current.depth + 1 });
         }
         continue;
       }
@@ -33815,7 +34483,7 @@ async function resolveTargetVersion(spec, config, fetchImpl = fetch) {
 }
 function ensureInstallAnchor(cwd) {
   try {
-    const stub = join21(cwd, "package.json");
+    const stub = join20(cwd, "package.json");
     if (!existsSync14(stub)) {
       writeFileSync8(stub, `${JSON.stringify({ name: "aft-lsp-cache", version: "0.0.0", private: true })}
 `);
@@ -34036,10 +34704,10 @@ function sha256OfFileSync(path) {
 }
 function quarantineCachedNpmInstall(spec, reason) {
   const packageDir = lspPackageDir(spec.npm);
-  const dest = join21(packageDir, "..", ".quarantine", encodeURIComponent(spec.npm), `${Date.now()}`);
+  const dest = join20(packageDir, "..", ".quarantine", encodeURIComponent(spec.npm), `${Date.now()}`);
   warn2(`[lsp] tofu_mismatch ${spec.npm}: ${reason}; quarantining ${packageDir} -> ${dest}`);
   try {
-    mkdirSync7(join21(dest, ".."), { recursive: true });
+    mkdirSync7(join20(dest, ".."), { recursive: true });
     rmSync6(dest, { recursive: true, force: true });
     renameSync9(packageDir, dest);
   } catch (err) {
@@ -45786,7 +46454,7 @@ function date6(params) {
 
 // ../../node_modules/.bun/zod@4.1.8/node_modules/zod/v4/classic/external.js
 config2(en_default());
-// ../../node_modules/.bun/@opencode-ai+plugin@1.17.11+f7c91cc509d955ee/node_modules/@opencode-ai/plugin/dist/tool.js
+// ../../node_modules/.bun/@opencode-ai+plugin@1.17.11+a24dd7ca87f30650/node_modules/@opencode-ai/plugin/dist/tool.js
 function tool(input) {
   return input;
 }
@@ -45900,6 +46568,31 @@ async function getSessionDirectory(client, sessionId, fallbackDirectory) {
   inflight.set(sessionId, lookup);
   return lookup;
 }
+async function getSessionDirectoryForEvent(client, sessionId, instanceDirectory) {
+  const directory = await getSessionDirectory(client, sessionId, instanceDirectory);
+  if (isV2PluginContext(client) && (directory !== client.location.directory || cache.get(sessionId)?.location?.workspaceID !== client.location.workspaceID))
+    return null;
+  return directory;
+}
+function getSessionDirectoryForDeletedEvent(client, sessionId, eventLocation) {
+  if (!sessionId || !isV2PluginContext(client))
+    return null;
+  let location;
+  if (eventLocation === undefined) {
+    location = cache.get(sessionId)?.location;
+  } else {
+    if (!eventLocation || typeof eventLocation !== "object")
+      return null;
+    const ref = eventLocation;
+    if (typeof ref.directory !== "string" || !ref.directory || ref.workspaceID !== undefined && typeof ref.workspaceID !== "string")
+      return null;
+    location = { directory: ref.directory, workspaceID: ref.workspaceID };
+    setCache(sessionId, location.directory, location);
+  }
+  if (!location || location.directory !== client.location.directory || location.workspaceID !== client.location.workspaceID)
+    return null;
+  return location.directory;
+}
 async function boundedLookup(client, sessionId, fallbackDirectory) {
   const generation = {};
   lookupGenerations.set(sessionId, generation);
@@ -45909,6 +46602,7 @@ async function boundedLookup(client, sessionId, fallbackDirectory) {
       lookupGenerations.delete(oldest);
   }
   let timer;
+  let location;
   try {
     const timeout = new Promise((resolve) => {
       timer = setTimeout(() => {
@@ -45917,9 +46611,11 @@ async function boundedLookup(client, sessionId, fallbackDirectory) {
       }, LOOKUP_TIMEOUT_MS);
     });
     const directory = await Promise.race([
-      lookupSessionDirectory(client, sessionId, fallbackDirectory).then((directory) => {
+      lookupSessionDirectory(client, sessionId, fallbackDirectory, (ref) => {
+        location = ref;
+      }).then((directory) => {
         if (lookupGenerations.get(sessionId) === generation && directory !== null) {
-          setCache(sessionId, directory);
+          setCache(sessionId, directory, location);
         }
         return directory;
       }).finally(() => {
@@ -45928,15 +46624,15 @@ async function boundedLookup(client, sessionId, fallbackDirectory) {
       }),
       timeout
     ]);
-    setCache(sessionId, directory);
+    setCache(sessionId, directory, location);
     return directory;
   } finally {
     clearTimeout(timer);
   }
 }
-async function lookupSessionDirectory(client, sessionId, fallbackDirectory) {
+async function lookupSessionDirectory(client, sessionId, fallbackDirectory, onLocation) {
   if (isV2PluginContext(client))
-    return lookupV2SessionDirectory(client, sessionId);
+    return lookupV2SessionDirectory(client, sessionId, onLocation);
   const c = client;
   const sessionApi = c?.session;
   if (!sessionApi || typeof sessionApi.get !== "function") {
@@ -45955,15 +46651,16 @@ async function lookupSessionDirectory(client, sessionId, fallbackDirectory) {
   }
   return dir;
 }
-async function lookupV2SessionDirectory(context, sessionId) {
+async function lookupV2SessionDirectory(context, sessionId, onLocation) {
   let dir = null;
   let failure;
   try {
     const session = await Effect.runPromise(Effect.timeout(context.session.get({ sessionID: sessionId }), V2_SESSION_LOOKUP_TIMEOUT_MS));
     const directory = session?.location?.directory;
-    if (typeof directory === "string" && directory.length > 0)
+    if (typeof directory === "string" && directory.length > 0) {
       dir = directory;
-    else
+      onLocation({ directory, workspaceID: session?.location?.workspaceID });
+    } else
       failure = "the session record has no location.directory";
   } catch (err) {
     failure = err instanceof Error ? err.message || err.name : String(err);
@@ -45973,10 +46670,10 @@ async function lookupV2SessionDirectory(context, sessionId) {
   }
   return dir;
 }
-function setCache(sessionId, directory) {
+function setCache(sessionId, directory, location) {
   if (cache.has(sessionId))
     cache.delete(sessionId);
-  cache.set(sessionId, { directory, recordedAt: Date.now() });
+  cache.set(sessionId, { directory, location, recordedAt: Date.now() });
   if (cache.size > CACHE_MAX_ENTRIES) {
     const oldest = cache.keys().next().value;
     if (oldest !== undefined)
@@ -47243,7 +47940,7 @@ async function trackV2BackgroundTask(ctx, runtime, taskId, startedEpoch) {
   }
   state.tasks.set(taskId, kill);
 }
-async function killStoppedBackgroundTasks(client, sessionID, ctx, startedBeforeMs) {
+async function killStoppedBackgroundTasks(client, sessionID, ctx, startedBeforeMs, deletedEvent) {
   const kills = [];
   const visited = new Set;
   const dispatch = (taskId, kill) => {
@@ -47263,10 +47960,11 @@ async function killStoppedBackgroundTasks(client, sessionID, ctx, startedBeforeM
       dispatch(taskId, kill);
     }
   }
-  if (ctx) {
+  const directory = ctx ? deletedEvent ? getSessionDirectoryForDeletedEvent(client, sessionID, deletedEvent.location) : await getSessionDirectoryForEvent(client, sessionID, client.location.directory) : null;
+  if (ctx && directory) {
     const runtime = {
       sessionID,
-      directory: client.location.directory,
+      directory,
       directoryIsSessionRoot: true
     };
     try {
@@ -47340,7 +48038,7 @@ function registerV2SessionLifecycle(context, ctx) {
       }
       if (event.type === "session.deleted") {
         const state = sessions.get(sessionID);
-        const kills = killStoppedBackgroundTasks(context, sessionID, ctx);
+        const kills = killStoppedBackgroundTasks(context, sessionID, ctx, undefined, event);
         rememberDeleted(context, sessionID);
         sessions.delete(sessionID);
         releaseSessionState(sessionID);
@@ -47688,7 +48386,8 @@ ${BASH_RUNON_GUIDANCE}`, "");
       const metadata = metadataUpdater(context);
       const rawCommand = args.command;
       const command = rawCommand;
-      const cwd = args.workdir ?? context.directory;
+      const workdir = args.workdir;
+      const cwd = workdir ?? context.directory;
       const subagentStatus = await resolveSubagentStatus(ctx.client, context.sessionID, context.directory);
       const isSubagent = subagentStatus === true;
       const backgroundDisabled = !bashCfg.background;
@@ -47732,7 +48431,7 @@ ${BASH_RUNON_GUIDANCE}`, "");
         data = await withPermissionLoop(ctx, context, {
           command,
           timeout: rawTimeout,
-          workdir: args.workdir,
+          workdir,
           env: shellEnv?.env ?? {},
           description,
           background: effectiveBackground,
@@ -47818,7 +48517,7 @@ ${BASH_RUNON_GUIDANCE}`, "");
         return { output: rendered, title: uiTitle, metadata: metadataPayload };
       }
       const output = data.output ?? "";
-      const rendered = usedHostFallback ? output : maybeAppendGrepSearchHint(output, command, aftSearchRegistered, projectRootFor(context));
+      const rendered = usedHostFallback ? output : maybeAppendGrepSearchHint(output, command, aftSearchRegistered, projectRootFor(context), undefined, workdir);
       const metadataPayload = foregroundMetadata(description, data, rendered);
       await metadata(metadataPayload);
       return {
@@ -47894,7 +48593,7 @@ async function formatBashStatusText(runtime, taskId, data, requestedOutputMode,
   const status = data.status;
   const exit = typeof data.exit_code === "number" ? ` (exit ${data.exit_code})` : "";
   const dur = typeof data.duration_ms === "number" ? ` ${Math.round(data.duration_ms / 1000)}s` : "";
-  let text = `Task ${taskId}: ${status}${exit}${dur}`;
+  let text = formatUnknownPtyExit(taskId, data) ?? `Task ${taskId}: ${status}${exit}${dur}`;
   if (typeof data.live_descendants_summary === "string") {
     text += ` · ${data.live_descendants_summary}`;
   }
@@ -49845,7 +50544,7 @@ function createDeleteTool(ctx) {
         recursive
       });
       if (response.success === false) {
-        throw new Error(response.message ?? "delete failed");
+        throw toolErrorFromResponse("delete", response);
       }
       const deletedEntries = response.deleted ?? [];
       const skipped = response.skipped_files ?? [];
@@ -51151,6 +51850,15 @@ function semanticTools(ctx) {
 
 // src/tool-registration.ts
 var V2_BUILTIN_REPLACEMENTS = new Set(["read", "edit", "write", "apply_patch"]);
+var V2_CODEMODE_NAMES = {
+  read: "read",
+  grep: "grep",
+  glob: "glob",
+  aft_search: "search",
+  aft_outline: "outline",
+  aft_zoom: "zoom",
+  aft_callgraph: "callgraph"
+};
 function openCodeEditSlotSurvives(config) {
   return !resolvedDisabledTools(config).includes("edit");
 }
@@ -51217,6 +51925,25 @@ function registerAftTools(context, location, definitions, consumers = {}) {
       if (V2_BUILTIN_REPLACEMENTS.has(name))
         editor.remove(projected.name);
       editor.add(projected);
+      const codeModeName = V2_CODEMODE_NAMES[name];
+      if (codeModeName) {
+        editor.add({
+          name: codeModeName,
+          get description() {
+            return projected.description;
+          },
+          get input() {
+            return projected.input;
+          },
+          options: {
+            ...projected.options,
+            namespace: "aft.code",
+            permission: projected.name,
+            codemode: true
+          },
+          execute: projected.execute
+        });
+      }
     }
   });
 }
@@ -51672,7 +52399,7 @@ function startOpenCodeLiveConfigReload(options) {
 // src/notifications.ts
 import { existsSync as existsSync17, readFileSync as readFileSync14 } from "node:fs";
 import { homedir as homedir14, platform } from "node:os";
-import { join as join24 } from "node:path";
+import { join as join23 } from "node:path";
 function isTuiMode() {
   return process.env.OPENCODE_CLIENT === "cli";
 }
@@ -51694,15 +52421,15 @@ function getDesktopStatePath() {
   const os = platform();
   const home = homedir14();
   if (os === "darwin") {
-    return join24(home, "Library", "Application Support", "ai.opencode.desktop", "opencode.global.dat");
+    return join23(home, "Library", "Application Support", "ai.opencode.desktop", "opencode.global.dat");
   }
   if (os === "linux") {
-    const xdgConfig = process.env.XDG_CONFIG_HOME || join24(home, ".config");
-    return join24(xdgConfig, "ai.opencode.desktop", "opencode.global.dat");
+    const xdgConfig = process.env.XDG_CONFIG_HOME || join23(home, ".config");
+    return join23(xdgConfig, "ai.opencode.desktop", "opencode.global.dat");
   }
   if (os === "win32") {
-    const appData = process.env.APPDATA || join24(home, "AppData", "Roaming");
-    return join24(appData, "ai.opencode.desktop", "opencode.global.dat");
+    const appData = process.env.APPDATA || join23(home, "AppData", "Roaming");
+    return join23(appData, "ai.opencode.desktop", "opencode.global.dat");
   }
   return null;
 }
@@ -52231,30 +52958,30 @@ import { dirname as dirname16 } from "node:path";
 // src/hooks/auto-update-checker/cache.ts
 import { cpSync, existsSync as existsSync19, mkdtempSync, readFileSync as readFileSync16, rmSync as rmSync7, writeFileSync as writeFileSync10 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { basename as basename5, dirname as dirname15, join as join27 } from "node:path";
+import { basename as basename5, dirname as dirname15, join as join26 } from "node:path";
 var import_comment_json3 = __toESM(require_src2(), 1);
 
 // src/hooks/auto-update-checker/checker.ts
 import { existsSync as existsSync18, readFileSync as readFileSync15, statSync as statSync16, writeFileSync as writeFileSync9 } from "node:fs";
 import { readFile as readFile2 } from "node:fs/promises";
 import { homedir as homedir15 } from "node:os";
-import { dirname as dirname14, isAbsolute as isAbsolute14, join as join26, resolve as resolve17 } from "node:path";
+import { dirname as dirname14, isAbsolute as isAbsolute13, join as join25, resolve as resolve16 } from "node:path";
 import { fileURLToPath } from "node:url";
 var import_comment_json2 = __toESM(require_src2(), 1);
 
 // src/hooks/auto-update-checker/constants.ts
-import { join as join25 } from "node:path";
+import { join as join24 } from "node:path";
 var PACKAGE_NAME = "@cortexkit/aft-opencode";
 var NPM_REGISTRY_URL = "https://registry.npmjs.org";
 var NPM_FETCH_TIMEOUT = 1e4;
 function cacheDir() {
-  return join25(getOpenCodeCacheRoot(), "packages");
+  return join24(getOpenCodeCacheRoot(), "packages");
 }
 function userOpenCodeConfig() {
-  return join25(getOpenCodeConfigRoot(), "opencode.json");
+  return join24(getOpenCodeConfigRoot(), "opencode.json");
 }
 function userOpenCodeConfigJsonc() {
-  return join25(getOpenCodeConfigRoot(), "opencode.jsonc");
+  return join24(getOpenCodeConfigRoot(), "opencode.jsonc");
 }
 
 // src/hooks/auto-update-checker/types.ts
@@ -52313,8 +53040,8 @@ function extractChannel(version) {
 }
 function getConfigPaths(directory) {
   return [
-    join26(directory, ".opencode", "opencode.json"),
-    join26(directory, ".opencode", "opencode.jsonc"),
+    join25(directory, ".opencode", "opencode.json"),
+    join25(directory, ".opencode", "opencode.jsonc"),
     userOpenCodeConfig(),
     userOpenCodeConfigJsonc()
   ];
@@ -52327,9 +53054,9 @@ function resolvePathPluginSpec(spec, configPath) {
       return spec.replace(/^file:\/\//, "");
     }
   }
-  if (isAbsolute14(spec) || /^[A-Za-z]:[\\/]/.test(spec))
+  if (isAbsolute13(spec) || /^[A-Za-z]:[\\/]/.test(spec))
     return spec;
-  return resolve17(dirname14(configPath), spec);
+  return resolve16(dirname14(configPath), spec);
 }
 function getLocalDevPath(directory) {
   for (const configPath of getConfigPaths(directory)) {
@@ -52341,7 +53068,7 @@ function getLocalDevPath(directory) {
       for (const entry of plugins) {
         if (entry === PACKAGE_NAME || entry.startsWith(`${PACKAGE_NAME}@`))
           continue;
-        if (entry.startsWith("file://") || entry.startsWith(".") || isAbsolute14(entry)) {
+        if (entry.startsWith("file://") || entry.startsWith(".") || isAbsolute13(entry)) {
           const localPath = resolvePathPluginSpec(entry, configPath);
           const pkgPath = findPackageJsonUp(localPath);
           if (!pkgPath)
@@ -52360,7 +53087,7 @@ function findPackageJsonUp(startPath) {
     const stat = statSync16(startPath);
     let dir = stat.isDirectory() ? startPath : dirname14(startPath);
     for (let i = 0;i < 10; i++) {
-      const pkgPath = join26(dir, "package.json");
+      const pkgPath = join25(dir, "package.json");
       if (existsSync18(pkgPath)) {
         try {
           const pkg = PackageJsonSchema.safeParse(JSON.parse(readFileSync15(pkgPath, "utf-8")));
@@ -52426,7 +53153,7 @@ function findPluginEntry(directory) {
 }
 var cachedPackageVersion = null;
 function getSpecCachePackageJsonPath(spec) {
-  return join26(cacheDir(), spec, "node_modules", PACKAGE_NAME, "package.json");
+  return join25(cacheDir(), spec, "node_modules", PACKAGE_NAME, "package.json");
 }
 function getCachedVersion(spec) {
   if (!spec && cachedPackageVersion)
@@ -52435,7 +53162,7 @@ function getCachedVersion(spec) {
     getCurrentRuntimePackageJsonPath(),
     spec ? getSpecCachePackageJsonPath(spec) : null,
     getSpecCachePackageJsonPath(`${PACKAGE_NAME}@latest`),
-    join26(getOpenCodeCacheRoot(), "node_modules", PACKAGE_NAME, "package.json")
+    join25(getOpenCodeCacheRoot(), "node_modules", PACKAGE_NAME, "package.json")
   ].filter(isString);
   for (const packageJsonPath of candidates) {
     try {
@@ -52506,7 +53233,7 @@ async function registryWithoutNpm(directory) {
   for (let current = directory;; current = dirname14(current)) {
     if (scoped)
       break;
-    const path = join26(current, ".npmrc");
+    const path = join25(current, ".npmrc");
     visited.add(path);
     const settings = await readRegistrySettings(path);
     scoped ??= settings["@cortexkit:registry"];
@@ -52516,7 +53243,7 @@ async function registryWithoutNpm(directory) {
   }
   const explicitUserConfig = process.env.npm_config_userconfig ?? process.env.NPM_CONFIG_USERCONFIG;
   const home = (process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME) ?? homedir15();
-  const userConfig = explicitUserConfig ?? join26(home, ".npmrc");
+  const userConfig = explicitUserConfig ?? join25(home, ".npmrc");
   if (!scoped && !visited.has(userConfig)) {
     const settings = await readRegistrySettings(userConfig, explicitUserConfig !== undefined);
     scoped = settings["@cortexkit:registry"];
@@ -52538,14 +53265,14 @@ function validateRegistry(registry) {
 }
 var reportedRegistryFailures = new Set;
 function reportRegistryFailure(directory) {
-  const key = resolve17(directory);
+  const key = resolve16(directory);
   if (reportedRegistryFailures.has(key))
     return;
   reportedRegistryFailures.add(key);
   debug2("[auto-update-checker] Configured npm registry could not be resolved or used; skipping update check.");
 }
 function resolveRegistry(directory) {
-  const key = resolve17(directory);
+  const key = resolve16(directory);
   let pending = registryCache.get(key);
   if (!pending) {
     pending = (async () => {
@@ -52602,10 +53329,10 @@ async function getLatestVersion(channel = "latest", options = {}) {
 var pendingSnapshots = new Map;
 var quarantinedInstallDirs = new Set;
 function createAutoUpdateSnapshot(installDir, packageJsonPath, packageName) {
-  const packageDir = join27(installDir, "node_modules", packageName);
-  const lockfilePath = join27(installDir, "package-lock.json");
-  const tempDir = mkdtempSync(join27(tmpdir4(), "aft-auto-update-"));
-  const stagedPackageDir = existsSync19(packageDir) ? join27(tempDir, "package") : null;
+  const packageDir = join26(installDir, "node_modules", packageName);
+  const lockfilePath = join26(installDir, "package-lock.json");
+  const tempDir = mkdtempSync(join26(tmpdir4(), "aft-auto-update-"));
+  const stagedPackageDir = existsSync19(packageDir) ? join26(tempDir, "package") : null;
   if (stagedPackageDir)
     cpSync(packageDir, stagedPackageDir, { recursive: true });
   return {
@@ -52646,7 +53373,7 @@ function stripPackageNameFromPath(pathValue, packageName) {
   return current;
 }
 function removeFromPackageLock(installDir, packageName) {
-  const lockPath = join27(installDir, "package-lock.json");
+  const lockPath = join26(installDir, "package-lock.json");
   if (!existsSync19(lockPath))
     return false;
   try {
@@ -52702,7 +53429,7 @@ function restorePendingSnapshot(installDir) {
   restoreAutoUpdateSnapshot(snapshot);
 }
 function removeInstalledPackage(installDir, packageName) {
-  const packageDir = join27(installDir, "node_modules", packageName);
+  const packageDir = join26(installDir, "node_modules", packageName);
   if (!existsSync19(packageDir))
     return false;
   rmSync7(packageDir, { recursive: true, force: true });
@@ -52715,14 +53442,14 @@ function resolveInstallContext(runtimePackageJsonPath = getCurrentRuntimePackage
     const nodeModulesDir = stripPackageNameFromPath(packageDir, PACKAGE_NAME);
     if (nodeModulesDir && basename5(nodeModulesDir) === "node_modules") {
       const installDir = dirname15(nodeModulesDir);
-      const packageJsonPath = join27(installDir, "package.json");
+      const packageJsonPath = join26(installDir, "package.json");
       if (existsSync19(packageJsonPath))
         return { installDir, packageJsonPath };
     }
     return null;
   }
   const cacheRoot = dirname15(cacheDir());
-  const legacyPackageJsonPath = join27(cacheRoot, "package.json");
+  const legacyPackageJsonPath = join26(cacheRoot, "package.json");
   if (existsSync19(legacyPackageJsonPath)) {
     return { installDir: cacheRoot, packageJsonPath: legacyPackageJsonPath };
   }
@@ -53348,16 +54075,16 @@ import {
   writeFileSync as writeFileSync12
 } from "node:fs";
 import { createServer } from "node:http";
-import { dirname as dirname17, join as join29 } from "node:path";
+import { dirname as dirname17, join as join28 } from "node:path";
 
 // src/shared/rpc-utils.ts
-import { join as join28 } from "node:path";
+import { join as join27 } from "node:path";
 function projectHash(directory) {
   return projectRootKeyHash(directory);
 }
 function rpcPortFileDir(storageDir, directory) {
   const hash = projectHash(directory);
-  return join28(storageDir, "rpc", hash, "ports");
+  return join27(storageDir, "rpc", hash, "ports");
 }
 function isPidAlive(pid) {
   if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0)
@@ -53434,7 +54161,7 @@ class AftRpcServer {
   constructor(storageDir, directory) {
     this.portsDir = rpcPortFileDir(storageDir, directory);
     this.instanceId = randomBytes5(8).toString("hex");
-    this.portFilePath = join29(this.portsDir, `${this.instanceId}.json`);
+    this.portFilePath = join28(this.portsDir, `${this.instanceId}.json`);
   }
   handle(method, handler) {
     this.handlers.set(method, handler);
@@ -53533,13 +54260,13 @@ class AftRpcServer {
       const temporary = entry.endsWith(".json.tmp");
       if (!temporary && !entry.endsWith(".json"))
         continue;
-      const filePath = join29(this.portsDir, entry);
+      const filePath = join28(this.portsDir, entry);
       if (filePath === this.portFilePath)
         continue;
       try {
         const record = parseRpcPortRecord(readFileSync18(filePath, "utf-8"));
         if (record === null) {
-          if (!temporary || Date.now() - statSync18(join29(this.portsDir, entry)).mtimeMs >= UNREADABLE_TMP_MAX_AGE_MS) {
+          if (!temporary || Date.now() - statSync18(join28(this.portsDir, entry)).mtimeMs >= UNREADABLE_TMP_MAX_AGE_MS) {
             unlinkSync7(filePath);
           }
           continue;
@@ -53978,11 +54705,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),
@@ -54180,95 +54907,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 bashStatusName = "bash_status";
-  const bashWriteName = "bash_write";
-  const hasOutline = !opts.disabledTools.has("aft_outline");
-  const hasZoom = !opts.disabledTools.has("aft_zoom");
-  const readName = "read";
-  const hasRead = !opts.disabledTools.has(readName);
-  const hasGrep = !opts.disabledTools.has(grepName);
-  const hasSearch = !opts.disabledTools.has("aft_search");
-  const hasNavigate = !opts.disabledTools.has("aft_callgraph");
-  const hasInspect = !opts.disabledTools.has("aft_inspect");
-  const hasBash = !opts.disabledTools.has(bashName);
-  const hasBgBash = hasBash && opts.bashBackgroundEnabled && !opts.disabledTools.has(bashStatusName);
-  const hasWatch = !opts.disabledTools.has("bash_watch");
-  const hasWrite = !opts.disabledTools.has(bashWriteName);
-  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.disabledTools.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 (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. Dead code, unused exports, duplicates, cycles and complexity are computed only when you call aft_inspect, and the call waits until they are current; nothing refreshes them in the background, so run it again after further edits instead of polling.");
-    sections.push("**AFT status bar**: tool results may end with a one-line health bar `[AFT E<errors> W<warnings> | 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). Dead code, unused exports and duplicates are not on the bar; run `aft_inspect` for them. 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; each path runs back to a root labelled main, test, attribute, public API, or no caller found",
-      "- `trace_to_symbol` — shortest call path from one symbol to another",
-      "- `trace_data` — follow a value through assignments and parameters across files"
-    ].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 (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 (hasBash) {
+    finding.push("Don't find or read code with grep, find, sed or cat in bash.");
   }
-  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 \`${bashStatusName}({ taskId, outputMode: "screen" })\`, and send input with \`${bashWriteName}({ taskId, 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.disabledTools.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, disabledTools, hashlineEffective = false) {
   const bashCfg = resolveBashConfig(config);
@@ -54330,12 +55014,12 @@ function throwSentinel(command) {
   throw sentinel;
 }
 var PLUGIN_VERSION = resolvePluginVersion(import.meta.url);
-var ANNOUNCEMENT_VERSION = "0.64.0";
+var ANNOUNCEMENT_VERSION = "0.65.0";
 var ANNOUNCEMENT_FEATURES = [
-  "A new index store makes AFT much faster: call graphs build 26x faster, edits reach the call graph about 9x faster, dead-code checks run 4x faster, and the index takes 4x less disk and 3x less memory.",
-  "All worktrees of a repository share one index, so a new worktree is ready in under a second. `npx @cortexkit/aft cache prune-legacy` lists the old index folders and can remove them.",
-  "`trace_to` labels each root it reaches: main, test, attribute, public API, or no caller found.",
-  "Dead code, unused exports, duplicates, cycles and complexity run only when `aft_inspect` is called; the status bar shows errors, warnings and TODOs."
+  "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 plugin = async (input) => initializePluginForDirectory(input);
@@ -54705,14 +55389,19 @@ Install: ${getManualInstallHint()}`);
     event: async (eventInput) => {
       await autoUpdateEventHook(eventInput);
       const eventType = eventInput.event.type;
-      observeOpenCodeBgNotificationEvent(eventInput.event);
       const sessionID = extractSessionID(eventInput.event.properties);
+      let sessionDir = null;
+      if (sessionID && (eventType === "session.created" || eventType === "session.idle" || eventType === "session.status")) {
+        sessionDir = await getSessionDirectoryForEvent(input.client, sessionID, input.directory);
+        if (!sessionDir)
+          return;
+      }
+      observeOpenCodeBgNotificationEvent(eventInput.event);
       if (eventType === "session.moved" && sessionID) {
         clearSessionDirectory(sessionID);
         return;
       }
-      if (eventType === "session.created" && sessionID) {
-        const sessionDir = await getSessionDirectory(input.client, sessionID, input.directory) ?? input.directory;
+      if (eventType === "session.created" && sessionID && sessionDir) {
         observeFreshSessionStart(pool, sessionDir, sessionID, "new");
       }
       if (eventType === "session.deleted" && sessionID) {
@@ -54722,9 +55411,8 @@ Install: ${getManualInstallHint()}`);
       }
       if (eventType !== "session.idle")
         return;
-      if (!sessionID)
+      if (!sessionID || !sessionDir)
         return;
-      const sessionDir = await getSessionDirectory(input.client, sessionID, input.directory) ?? input.directory;
       if (!isProjectEnabled(sessionDir))
         return;
       await handleIdleBgCompletions({