@cortexkit/aft-pi 0.58.0 → 0.58.1

package/dist/index.js

@@ -7938,6 +7938,9 @@ function isTerminalStatus(status) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function monotonicNowMs() {
+  return performance.now();
+}
 // ../aft-bridge/dist/bash-hints.js
 import * as fs from "node:fs";
 import * as os from "node:os";
@@ -7948,6 +7951,10 @@ function resolveWatchTimeoutMs(requestedMs, role, capMs) {
   const fallback = role === "worker" ? capMs : DEFAULT_PRIMARY_WATCH_TIMEOUT_MS;
   return Math.min(requestedMs ?? fallback, capMs);
 }
+function formatWatchWaited(elapsedMs, limitMs, capMs) {
+  const limit = limitMs >= capMs ? `limit ${limitMs}ms, the bash.watch_sync_max_ms cap` : `limit ${limitMs}ms`;
+  return `Waited ${Math.round(elapsedMs)}ms (${limit})`;
+}
 function watchTimeoutSteer(role, capMs, timeoutParam = "timeoutMs") {
   if (role === "worker") {
     return `The command is still running; this is not a failure. Watch again (${timeoutParam} up to ${capMs}) and don't report a result until it finishes.`;
@@ -8334,7 +8341,7 @@ import { existsSync } from "node:fs";
 import { join as join3 } from "node:path";
 
 // ../aft-bridge/dist/child-process.js
-import { execFileSync as nodeExecFileSync, execSync as nodeExecSync, spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "node:child_process";
+import { execFile as nodeExecFile, execFileSync as nodeExecFileSync, execSync as nodeExecSync, spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "node:child_process";
 var HIDDEN = { windowsHide: true };
 function withWindowsHidden(args, takesArgv) {
   const out = [...args];
@@ -8356,6 +8363,7 @@ function hidden(resolve, takesArgv) {
 }
 var spawn = hidden(() => nodeSpawn, true);
 var spawnSync = hidden(() => nodeSpawnSync, true);
+var execFile = hidden(() => nodeExecFile, true);
 var execFileSync = hidden(() => nodeExecFileSync, true);
 var execSync = hidden(() => nodeExecSync, false);
 
@@ -9682,17 +9690,30 @@ class BinaryBridge {
     }
   }
   onStderrData(data) {
-    this.stderrBuffer += data;
-    let newlineIdx;
-    while ((newlineIdx = this.stderrBuffer.indexOf(`
-`)) !== -1) {
-      const line = this.stderrBuffer.slice(0, newlineIdx).replace(/\r$/, "");
-      this.stderrBuffer = this.stderrBuffer.slice(newlineIdx + 1);
-      if (!line || !shouldSurfaceStderrLine(line))
-        continue;
-      const tagged = tagStderrLine(line);
-      this.logVia(tagged);
-      this.pushStderrLine(tagged);
+    const partialLimit = 64 * 1024;
+    let offset = 0;
+    while (offset < data.length) {
+      const newline = data.indexOf(`
+`, offset);
+      const end = newline < 0 ? data.length : newline;
+      while (offset < end) {
+        const count = Math.min(partialLimit - this.stderrBuffer.length, end - offset);
+        this.stderrBuffer += data.slice(offset, offset + count);
+        offset += count;
+        if (this.stderrBuffer.length === partialLimit) {
+          const last = this.stderrBuffer.charCodeAt(this.stderrBuffer.length - 1);
+          const carry = last >= 55296 && last <= 56319 ? this.stderrBuffer.slice(-1) : "";
+          const fragment = carry ? this.stderrBuffer.slice(0, -1) : this.stderrBuffer;
+          const tagged = tagStderrLine(`${fragment} [stderr record truncated into bounded fragments; ${Buffer.byteLength(fragment)} bytes shown, continuation follows]`);
+          this.stderrBuffer = carry;
+          this.logVia(tagged);
+          this.pushStderrLine(tagged);
+        }
+      }
+      if (newline < 0)
+        break;
+      this.flushStderrBuffer();
+      offset = newline + 1;
     }
   }
   flushStderrBuffer() {
@@ -10438,9 +10459,366 @@ function formatDroppedKeyWarnings(dropped) {
   }
   return dropped.map((item) => `Ignoring ${item.key} from ${item.tier} config (${item.reason})`);
 }
+// ../aft-bridge/dist/config-watch.js
+import { readFileSync as readFileSync3, statSync as statSync3, watch } from "node:fs";
+import { basename, dirname } 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) {
+  const segments = name.split(".");
+  return {
+    name,
+    read(config) {
+      let value = config;
+      for (const segment of segments) {
+        if (value === null || typeof value !== "object")
+          return;
+        value = value[segment];
+      }
+      return value;
+    },
+    write(config, value) {
+      const set = (target, index) => {
+        const copy = target !== null && typeof target === "object" && !Array.isArray(target) ? { ...target } : {};
+        const segment = segments[index];
+        if (index === segments.length - 1) {
+          if (value === undefined)
+            delete copy[segment];
+          else
+            copy[segment] = value;
+        } else {
+          copy[segment] = set(copy[segment], index + 1);
+        }
+        return copy;
+      };
+      return set(config, 0);
+    }
+  };
+}
+function bashKey(name, resolveBash) {
+  return {
+    name: `bash.${name}`,
+    read: (config) => resolveBash(config)[name],
+    write(config, value) {
+      const resolved = { ...resolveBash(config), [name]: value };
+      for (const key of Object.keys(resolved)) {
+        if (resolved[key] === undefined)
+          delete resolved[key];
+      }
+      return { ...config, bash: resolved };
+    }
+  };
+}
+function aftLiveConfigKeys(resolveBash) {
+  return [
+    pathKey("configure_warnings_delivery"),
+    pathKey("restrict_to_project_root"),
+    pathKey("inspect.diagnostics_timeout_ms"),
+    pathKey("inspect.tier2_idle_minutes"),
+    bashKey("foreground_wait_window_ms", resolveBash),
+    bashKey("host_fallback", resolveBash),
+    bashKey("subagent_background", resolveBash),
+    bashKey("watch_sync_max_ms", resolveBash)
+  ];
+}
+function sameValue(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+function flattenLeaves(value, prefix, out) {
+  if (value !== null && typeof value === "object" && !Array.isArray(value)) {
+    const entries = Object.entries(value);
+    if (entries.length === 0 && prefix)
+      out.set(prefix, "{}");
+    for (const [key, child] of entries) {
+      flattenLeaves(child, prefix ? `${prefix}.${key}` : key, out);
+    }
+    return;
+  }
+  if (prefix)
+    out.set(prefix, JSON.stringify(value));
+}
+function applyLiveConfigKeys(current, next, keys, baseline = current) {
+  let config = current;
+  const applied = [];
+  for (const key of keys) {
+    const value = key.read(next);
+    if (sameValue(key.read(current), value))
+      continue;
+    config = key.write(config, value);
+    applied.push(key.name);
+  }
+  const before = new Map;
+  const after = new Map;
+  flattenLeaves(baseline, "", before);
+  flattenLeaves(next, "", after);
+  const liveNames = keys.map((key) => key.name);
+  const isLive = (leaf) => liveNames.some((name) => leaf === name || leaf.startsWith(`${name}.`));
+  const deferred = new Set;
+  for (const leaf of new Set([...before.keys(), ...after.keys()])) {
+    if (before.get(leaf) === after.get(leaf) || isLive(leaf))
+      continue;
+    deferred.add(leaf);
+  }
+  return { config, applied, deferred: [...deferred].sort() };
+}
+function readTextOrNull(path) {
+  try {
+    return readFileSync3(path, "utf8");
+  } catch {
+    return null;
+  }
+}
+var CONFIG_WATCH_REVALIDATE_MS = 2000;
+var CONFIG_WATCH_REJECTED_RETRIES = 3;
+var CONFIG_WATCH_MAX_DELAY_MS = 1000;
+function identityOf(dir) {
+  try {
+    const stat = statSync3(dir, { bigint: true });
+    const base = `${stat.dev}:${stat.ino}`;
+    return process.platform === "win32" ? base : `${base}:${stat.birthtimeNs}`;
+  } catch {
+    return null;
+  }
+}
+function watchDirFor(file) {
+  let dir = dirname(file);
+  while (dir !== dirname(dir) && identityOf(dir) === null)
+    dir = dirname(dir);
+  return dir;
+}
+function watchAftConfigFiles(options) {
+  const debounceMs = options.debounceMs ?? CONFIG_WATCH_DEBOUNCE_MS;
+  const lastSeen = new Map;
+  for (const path of options.paths) {
+    if (options.initialTexts)
+      lastSeen.set(path, options.initialTexts[path] ?? null);
+    else
+      lastSeen.set(path, options.checkAtStart ? undefined : readTextOrNull(path));
+  }
+  let timer = null;
+  let firstPendingAt = null;
+  let stopped = false;
+  const watchers = new Map;
+  const watchImpl = options.watchImpl ?? watch;
+  let rejectedRetries = 0;
+  const check = () => {
+    timer = null;
+    firstPendingAt = null;
+    if (stopped)
+      return;
+    revalidate();
+    const seen = new Map;
+    for (const path of options.paths) {
+      const text = readTextOrNull(path);
+      if (text !== lastSeen.get(path))
+        seen.set(path, text);
+    }
+    if (seen.size === 0)
+      return;
+    const outcome = options.onChange();
+    if (outcome === false) {
+      if (rejectedRetries < CONFIG_WATCH_REJECTED_RETRIES) {
+        rejectedRetries += 1;
+        retryTimer = setTimeout(check, CONFIG_WATCH_MAX_DELAY_MS);
+        retryTimer.unref?.();
+      }
+      return;
+    }
+    rejectedRetries = 0;
+    if (outcome instanceof Map) {
+      for (const path of options.paths)
+        lastSeen.set(path, outcome.get(path) ?? null);
+    } else {
+      for (const [path, text] of seen)
+        lastSeen.set(path, text);
+    }
+  };
+  let retryTimer = null;
+  const schedule = () => {
+    if (stopped)
+      return;
+    const now = Date.now();
+    firstPendingAt ??= now;
+    if (timer)
+      clearTimeout(timer);
+    const delay = Math.max(0, Math.min(debounceMs, firstPendingAt + CONFIG_WATCH_MAX_DELAY_MS - now));
+    timer = setTimeout(check, delay);
+    timer.unref?.();
+  };
+  function revalidate() {
+    const wanted = new Set(options.paths.map(watchDirFor));
+    let moved = false;
+    for (const [dir, entry] of watchers) {
+      if (!wanted.has(dir) || entry.stale || identityOf(dir) !== entry.identity) {
+        entry.watcher.close();
+        watchers.delete(dir);
+        moved = true;
+      }
+    }
+    for (const dir of wanted) {
+      if (watchers.has(dir))
+        continue;
+      try {
+        const identity = identityOf(dir);
+        options.beforeWatchForTest?.(dir);
+        const name = basename(dir);
+        const watcher = watchImpl(dir, { persistent: false }, (event, filename) => {
+          if (event === "rename" && filename === name) {
+            const current = watchers.get(dir);
+            if (current && current.watcher === watcher)
+              current.stale = true;
+          }
+          schedule();
+        });
+        if (identityOf(dir) !== identity) {
+          watcher.close();
+          moved = true;
+          continue;
+        }
+        const entry = { watcher, identity, stale: false };
+        entry.watcher.on("error", () => {
+          entry.watcher.close();
+          if (watchers.get(dir) === entry)
+            watchers.delete(dir);
+          schedule();
+        });
+        watchers.set(dir, entry);
+        moved = true;
+      } catch {}
+    }
+    return moved;
+  }
+  revalidate();
+  if (options.checkAtStart)
+    check();
+  const revalidateTimer = setInterval(() => {
+    if (!stopped && revalidate())
+      schedule();
+  }, CONFIG_WATCH_REVALIDATE_MS);
+  revalidateTimer.unref?.();
+  return () => {
+    stopped = true;
+    if (timer)
+      clearTimeout(timer);
+    if (retryTimer)
+      clearTimeout(retryTimer);
+    clearInterval(revalidateTimer);
+    for (const entry of watchers.values())
+      entry.watcher.close();
+    watchers.clear();
+  };
+}
+function aftLiveSecurityKeys(keys) {
+  const byName = new Map(keys.map((key) => [key.name, key]));
+  const pick = (name) => {
+    const key = byName.get(name);
+    if (!key)
+      throw new Error(`unknown live config key ${name}`);
+    return key;
+  };
+  return [
+    {
+      key: pick("restrict_to_project_root"),
+      loosens: (current, next) => current === true && next !== true
+    },
+    {
+      key: pick("bash.host_fallback"),
+      loosens: (current, next) => current !== true && next === true
+    }
+  ];
+}
+function liveConfigReloadLogLine(applied, deferred) {
+  let line = "config reload";
+  if (applied.length > 0)
+    line += ` applied=[${applied.join(",")}]`;
+  if (deferred.length > 0) {
+    line += ` deferred=[${deferred.join(",")}] (deferred keys apply on next connect/restart)`;
+  }
+  return line;
+}
+function startLiveConfigReload(options) {
+  const baseline = options.getConfig();
+  let lastError = null;
+  let acceptedSources = new Set(options.initialSources);
+  let acceptedProjectText = options.initialProjectText ?? null;
+  let acceptedTexts;
+  const reload = () => {
+    let loaded = options.load();
+    if (loaded.ok) {
+      const read = new Set(loaded.sources);
+      const deleted = [...acceptedSources].find((path) => !read.has(path));
+      if (deleted !== undefined) {
+        loaded = { ok: false, message: `AFT config at ${deleted} was deleted` };
+      } else {
+        acceptedSources = read;
+      }
+    }
+    if (!loaded.ok) {
+      const message = `${loaded.message.trim().replace(/[.!?]?$/, ".")} ${CONFIG_LIVE_KEEP_NOTE}`;
+      if (message !== lastError) {
+        lastError = message;
+        options.reportError(message);
+      }
+      return null;
+    }
+    lastError = null;
+    acceptedTexts = loaded.texts;
+    const current = options.getConfig();
+    let next = loaded.config;
+    const held = [];
+    const projectText = loaded.projectText ?? null;
+    if (loaded.projectText !== undefined && projectText !== acceptedProjectText) {
+      for (const security of options.securityKeys ?? []) {
+        const now = security.key.read(current);
+        if (security.loosens(now, security.key.read(next))) {
+          next = security.key.write(next, now);
+          held.push(security.key.name);
+        }
+      }
+      if (held.length === 0)
+        acceptedProjectText = projectText;
+    }
+    const result = applyLiveConfigKeys(current, next, options.keys, baseline);
+    if (result.applied.length > 0)
+      options.setConfig(result.config);
+    if (result.applied.length > 0 || result.deferred.length > 0 || held.length > 0) {
+      let line = liveConfigReloadLogLine(result.applied, result.deferred);
+      if (held.length > 0) {
+        line += ` held=[${held.join(",")}] (not loosened while the project file differs from the one the published values came from; the next restart applies them)`;
+      }
+      options.log(line);
+    }
+    return { ...result, held };
+  };
+  const safeReload = () => {
+    try {
+      acceptedTexts = undefined;
+      if (reload() === null)
+        return false;
+      const texts = acceptedTexts;
+      if (!texts)
+        return true;
+      return new Map(options.paths.map((path) => [path, texts[path] ?? null]));
+    } catch (err) {
+      options.reportError(`AFT config reload failed: ${err instanceof Error ? err.message : String(err)}`);
+      return false;
+    }
+  };
+  if (options.watch === false) {
+    return { reload, stop: () => {} };
+  }
+  const stop = watchAftConfigFiles({
+    paths: options.paths,
+    debounceMs: options.debounceMs,
+    onChange: safeReload,
+    initialTexts: options.initialTexts,
+    checkAtStart: true
+  });
+  return { reload, stop };
+}
 // ../aft-bridge/dist/downloader.js
 import { createHash as createHash2, randomUUID } from "node:crypto";
-import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync as existsSync3, mkdirSync, openSync, readdirSync, readFileSync as readFileSync3, renameSync as renameSync2, rmSync, statSync as statSync3, unlinkSync as unlinkSync2, writeSync } from "node:fs";
+import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync as existsSync3, mkdirSync, openSync, 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 join7 } from "node:path";
 import { Readable } from "node:stream";
@@ -10792,7 +11170,7 @@ function isReclaimableDownloadLock(owner, ageMs, staleMs) {
 }
 function reclaimDownloadLock(lockPath, expectedOwner) {
   try {
-    if (readFileSync3(lockPath, "utf-8") !== expectedOwner)
+    if (readFileSync4(lockPath, "utf-8") !== expectedOwner)
       return false;
     rmSync(lockPath, { force: true });
     return true;
@@ -10810,7 +11188,7 @@ function sweepStaleDownloadTemps(versionedCacheDir, binaryName) {
         continue;
       }
       const tempPath = join7(versionedCacheDir, entry.name);
-      const ageMs = Date.now() - statSync3(tempPath).mtimeMs;
+      const ageMs = Date.now() - statSync4(tempPath).mtimeMs;
       if (Math.abs(ageMs) > DOWNLOAD_LOCK_STALE_MS)
         unlinkSync2(tempPath);
     }
@@ -10832,7 +11210,7 @@ async function acquireDownloadLock(lockPath, timing = {}) {
       }
       return () => {
         try {
-          if (readFileSync3(lockPath, "utf-8") === owner) {
+          if (readFileSync4(lockPath, "utf-8") === owner) {
             rmSync(lockPath, { force: true });
           }
         } catch {}
@@ -10844,8 +11222,8 @@ async function acquireDownloadLock(lockPath, timing = {}) {
       let existingOwner;
       let ageMs;
       try {
-        existingOwner = readFileSync3(lockPath, "utf-8");
-        ageMs = Date.now() - statSync3(lockPath).mtimeMs;
+        existingOwner = readFileSync4(lockPath, "utf-8");
+        ageMs = Date.now() - statSync4(lockPath).mtimeMs;
       } catch (readErr) {
         if (readErr.code === "ENOENT")
           continue;
@@ -10895,7 +11273,7 @@ async function fetchLatestTag() {
 }
 // ../aft-bridge/dist/durable-log.js
 import { appendFile, chmod, mkdir, rename, rm, stat } from "node:fs/promises";
-import { dirname } from "node:path";
+import { dirname as dirname2 } from "node:path";
 var DEFAULT_LOG_BYTES = 32 * 1024 * 1024;
 var DEFAULT_LOG_GENERATIONS = 1;
 var LOG_DIR_MODE = 448;
@@ -10908,6 +11286,10 @@ class RotatingLogSink {
   queue = Promise.resolve();
   disabled = false;
   failureReported = false;
+  queuedBytes = 0;
+  queuedRecords = 0;
+  droppedBytes = 0;
+  overflowQueued = false;
   constructor(path, options = {}) {
     this.path = path;
     this.maxBytes = options.maxBytes ?? DEFAULT_LOG_BYTES;
@@ -10916,7 +11298,34 @@ class RotatingLogSink {
   append(data) {
     if (this.disabled || data.length === 0)
       return;
-    this.queue = this.queue.then(() => this.write(data)).catch((error) => {
+    const bytes = Buffer.byteLength(data);
+    const overflow = this.queuedBytes + bytes > 1024 * 1024 || this.queuedRecords >= 4096;
+    if (overflow) {
+      this.droppedBytes += bytes;
+      if (this.overflowQueued)
+        return;
+      this.overflowQueued = true;
+      data = "";
+    } else {
+      this.queuedBytes += bytes;
+      this.queuedRecords += 1;
+    }
+    this.queue = this.queue.then(async () => {
+      if (overflow) {
+        const dropped = this.droppedBytes;
+        this.droppedBytes = 0;
+        this.overflowQueued = false;
+        await this.write(`[aft-plugin] durable log queue overflow: dropped ${dropped} bytes (1MiB/4096-record pending limit); reduce diagnostic volume.
+`);
+      } else {
+        try {
+          await this.write(data);
+        } finally {
+          this.queuedBytes -= bytes;
+          this.queuedRecords -= 1;
+        }
+      }
+    }).catch((error) => {
       this.disabled = true;
       if (!this.failureReported) {
         this.failureReported = true;
@@ -10931,8 +11340,8 @@ class RotatingLogSink {
     await this.queue;
   }
   async write(data) {
-    const dir = dirname(this.path);
-    await mkdir(dirname(dir), { recursive: true });
+    const dir = dirname2(this.path);
+    await mkdir(dirname2(dir), { recursive: true });
     try {
       await mkdir(dir, { mode: LOG_DIR_MODE });
     } catch (error) {
@@ -11038,6 +11447,15 @@ function formatEditSummary(data) {
   let s = `Edited (${detail}).`;
   if (data.formatted)
     s += formatAutoFormattedSuffix(data);
+  const fuzzy = data.fuzzy_matches ?? (data.fuzzy_match ? [data.fuzzy_match] : []);
+  for (const match of fuzzy) {
+    s += `
+Fuzzy match (pass ${match.pass}).`;
+    for (const [index, text] of match.replaced_text.entries()) {
+      s += `
+Replaced text ${index + 1}: ${text}`;
+    }
+  }
   return s;
 }
 function formatAutoFormattedSuffix(data) {
@@ -12766,7 +13184,7 @@ function reverseRequestMethod(body) {
   }
 }
 // ../aft-bridge/dist/subc-transport.js
-import { existsSync as existsSync4, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync4, statSync as statSync5 } from "node:fs";
 
 // ../aft-bridge/dist/lifecycle-registry.js
 import { lstat } from "node:fs/promises";
@@ -13289,6 +13707,7 @@ var RECONNECT_RETRY_FLOOR_MS = 100;
 var RECONNECT_RETRY_CAP_MS = 2000;
 var SUBC_DEFAULT_REQUEST_TIMEOUT_MS = 30000;
 var ROUTE_OPEN_RELOAD_WAIT_CEILING_MS = 45000;
+var CALL_DEADLINE_EXPIRED = Symbol("call deadline expired");
 function reloadWaitExhaustedSuffix(callDeadlineMs) {
   if (callDeadlineMs > ROUTE_OPEN_RELOAD_WAIT_CEILING_MS) {
     const ceilingSeconds = ROUTE_OPEN_RELOAD_WAIT_CEILING_MS / 1000;
@@ -13641,7 +14060,16 @@ function absentRootError(root) {
   return new SubcError(`invalid route project root: project root does not exist: ${root}`, "config_divergence");
 }
 function reloadWindowExhaustedError(error, callDeadlineMs) {
-  const suffix = reloadWaitExhaustedSuffix(callDeadlineMs);
+  return withDeadlineSuffix(error, reloadWaitExhaustedSuffix(callDeadlineMs));
+}
+function callDeadlinePassedError(lastError, callDeadlineMs) {
+  const seconds = Math.round(callDeadlineMs / 100) / 10;
+  const suffix = ` The AFT daemon module did not return within this call's ${seconds}s deadline.`;
+  if (lastError !== undefined)
+    return withDeadlineSuffix(lastError, suffix);
+  return new SubcError(`route to module '${AFT_MODULE_ID}' was not ready before the call ran out of time.${suffix}`, REQUEST_DEADLINE_CODE);
+}
+function withDeadlineSuffix(error, suffix) {
   if (error instanceof Error) {
     try {
       error.message += suffix;
@@ -13880,7 +14308,7 @@ class SubcTransportPool {
   rootCanAttach(root) {
     let directoryExists = false;
     try {
-      directoryExists = statSync4(root).isDirectory();
+      directoryExists = statSync5(root).isDirectory();
     } catch {}
     if (directoryExists) {
       this.dormantRoots.delete(root);
@@ -14220,6 +14648,7 @@ class SubcTransportPool {
     return this.rootReapedError(record);
   }
   async routeRequest(identity, body, timeoutMs, onProgress, expectedGeneration, abortSignal) {
+    const callStartedAt = performance.now();
     const root = asCanonicalRootPath(identity.project_root);
     let generation = expectedGeneration;
     if (this.lifecycleEnabled()) {
@@ -14272,19 +14701,41 @@ class SubcTransportPool {
       };
       const callDeadlineMs = timeoutMs ?? SUBC_DEFAULT_REQUEST_TIMEOUT_MS;
       const reloadWaitBudgetMs = Math.min(callDeadlineMs, ROUTE_OPEN_RELOAD_WAIT_CEILING_MS);
-      let reloadWaitedMs = 0;
+      let scheduledDelayMs = 0;
+      let lastRefusal;
+      const spentMs = () => Math.max(performance.now() - callStartedAt, scheduledDelayMs);
+      const remainingMs = () => callDeadlineMs - spentMs();
+      const openRouteWithinDeadline = async () => {
+        const remaining = remainingMs();
+        if (remaining <= 0)
+          throw callDeadlinePassedError(lastRefusal, callDeadlineMs);
+        let timer;
+        const expired = new Promise((resolve) => {
+          timer = setTimeout(() => resolve(CALL_DEADLINE_EXPIRED), remaining);
+        });
+        try {
+          const opened = await Promise.race([openRoute(), expired]);
+          if (opened === CALL_DEADLINE_EXPIRED) {
+            throw callDeadlinePassedError(lastRefusal, callDeadlineMs);
+          }
+          return opened;
+        } finally {
+          clearTimeout(timer);
+        }
+      };
       const openRouteAfterReloadWindow = async () => {
         while (true) {
           try {
-            return await openRoute();
+            return await openRouteWithinDeadline();
           } catch (error) {
             if (!isRouteOpenReloadWindowError(error))
               throw error;
-            if (reloadWaitedMs + this.nextRouteReopenDelayMs() >= reloadWaitBudgetMs) {
+            lastRefusal = error;
+            if (spentMs() + this.nextRouteReopenDelayMs() >= reloadWaitBudgetMs) {
               throw reloadWindowExhaustedError(error, callDeadlineMs);
             }
             const { delayMs, wait } = this.waitForRouteReopenBackoff();
-            reloadWaitedMs += delayMs;
+            scheduledDelayMs = spentMs() + delayMs;
             await wait;
           }
         }
@@ -14320,7 +14771,7 @@ class SubcTransportPool {
           route: routeLabel(entry.handle)
         });
       };
-      const requestOnRoute = async (route, entry) => {
+      const requestOnRoute = async (route, entry, requestTimeoutMs) => {
         this.assertRecordLive(record);
         if (abortSignal?.aborted) {
           clearRouteEntry(entry);
@@ -14336,8 +14787,10 @@ class SubcTransportPool {
         };
         abortSignal?.addEventListener("abort", onAbort, { once: true });
         try {
-          const requestTimeoutMs = reloadWaitedMs > 0 ? callDeadlineMs - reloadWaitedMs : timeoutMs;
-          const request = client.request(route, body, { timeoutMs: requestTimeoutMs, onProgress });
+          const request = client.request(route, body, {
+            timeoutMs: Math.ceil(requestTimeoutMs),
+            onProgress
+          });
           const reply = abortSignal ? await Promise.race([request, aborted]) : await request;
           if (!this.isCurrentSession(key, record)) {
             if (this.isReapInduced(record))
@@ -14358,8 +14811,11 @@ class SubcTransportPool {
       let reopened = false;
       let retriedAbsentRoute = false;
       while (true) {
+        const requestTimeoutMs = remainingMs();
+        if (requestTimeoutMs <= 0)
+          throw callDeadlinePassedError(lastRefusal, callDeadlineMs);
         try {
-          const reply = await requestOnRoute(routeAndEntry.route, routeAndEntry.entry);
+          const reply = await requestOnRoute(routeAndEntry.route, routeAndEntry.entry, requestTimeoutMs);
           if (reopened)
             this.resetRouteReopenBackoff();
           return reply;
@@ -14369,11 +14825,12 @@ class SubcTransportPool {
           const ownsRoute = this.isCurrentSession(key, record) && this.client === client;
           if (ownsRoute && isRouteRequestReloadRefusal(error)) {
             clearRouteEntry(routeAndEntry.entry);
-            if (reloadWaitedMs + this.nextRouteReopenDelayMs() >= reloadWaitBudgetMs) {
+            lastRefusal = error;
+            if (spentMs() + this.nextRouteReopenDelayMs() >= reloadWaitBudgetMs) {
               throw reloadWindowExhaustedError(error, callDeadlineMs);
             }
             const { delayMs, wait } = this.waitForRouteReopenBackoff();
-            reloadWaitedMs += delayMs;
+            scheduledDelayMs = spentMs() + delayMs;
             await wait;
             routeAndEntry = await openRouteAfterReloadWindow();
             reopened = true;
@@ -14382,7 +14839,12 @@ class SubcTransportPool {
           if (ownsRoute && !retriedAbsentRoute && isRouteProvenAbsentError(error)) {
             retriedAbsentRoute = true;
             clearRouteEntry(routeAndEntry.entry);
-            await this.waitForRouteReopenBackoff().wait;
+            if (spentMs() + this.nextRouteReopenDelayMs() >= callDeadlineMs) {
+              throw callDeadlinePassedError(error, callDeadlineMs);
+            }
+            const { delayMs, wait } = this.waitForRouteReopenBackoff();
+            scheduledDelayMs = spentMs() + delayMs;
+            await wait;
             routeAndEntry = await openRouteAfterReloadWindow();
             reopened = true;
             continue;
@@ -16060,14 +16522,14 @@ function shouldInterruptWaitsForMessage(detachOnUserMessage, operatorText) {
   return detachOnUserMessage || containsStandaloneDetachKeyword(operatorText);
 }
 // ../aft-bridge/dist/migration.js
-import { closeSync as closeSync3, existsSync as existsSync8, mkdirSync as mkdirSync3, openSync as openSync3, readFileSync as readFileSync6, renameSync as renameSync4, rmSync as rmSync2, statSync as statSync5, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { closeSync as closeSync3, existsSync as existsSync8, mkdirSync as mkdirSync3, openSync as openSync3, readFileSync as readFileSync7, renameSync as renameSync4, rmSync as rmSync2, statSync as statSync6, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir10, tmpdir as tmpdir2 } from "node:os";
-import { basename, dirname as dirname4, join as join10, resolve as resolve6 } from "node:path";
+import { basename as basename2, dirname as dirname5, join as join10, resolve as resolve6 } from "node:path";
 
 // ../aft-bridge/dist/paths.js
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync4, renameSync as renameSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync5, renameSync as renameSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { dirname as dirname2, isAbsolute as isAbsolute3, join as join8, resolve as resolve5 } from "node:path";
+import { dirname as dirname3, isAbsolute as isAbsolute3, join as join8, resolve as resolve5 } from "node:path";
 function homeDir3() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir8();
@@ -16127,7 +16589,7 @@ function repairRootScopedStorageFile(storageRoot, harness, fileName) {
   if (existsSync6(harnessPath) || !existsSync6(rootPath))
     return harnessPath;
   try {
-    mkdirSync2(dirname2(harnessPath), { recursive: true });
+    mkdirSync2(dirname3(harnessPath), { recursive: true });
     renameSync3(rootPath, harnessPath);
   } catch {}
   return harnessPath;
@@ -16139,7 +16601,7 @@ function shouldShowAnnouncement(storageRoot, harness, currentVersion) {
   let lastVersion = "";
   try {
     if (existsSync6(versionFile)) {
-      lastVersion = readFileSync4(versionFile, "utf-8").trim();
+      lastVersion = readFileSync5(versionFile, "utf-8").trim();
     }
   } catch {
     return false;
@@ -16148,7 +16610,7 @@ function shouldShowAnnouncement(storageRoot, harness, currentVersion) {
     return false;
   if (!lastVersion) {
     try {
-      mkdirSync2(dirname2(versionFile), { recursive: true });
+      mkdirSync2(dirname3(versionFile), { recursive: true });
       writeFileSync2(versionFile, currentVersion);
     } catch {}
     return false;
@@ -16160,7 +16622,7 @@ function markAnnouncementSeen(storageRoot, harness, currentVersion) {
     return;
   const versionFile = repairRootScopedStorageFile(storageRoot, harness, "last_announced_version");
   try {
-    mkdirSync2(dirname2(versionFile), { recursive: true });
+    mkdirSync2(dirname3(versionFile), { recursive: true });
     writeFileSync2(versionFile, currentVersion);
   } catch {}
 }
@@ -16209,10 +16671,10 @@ function decodeFileUrl(target) {
 }
 
 // ../aft-bridge/dist/resolver.js
-import { closeSync as closeSync2, existsSync as existsSync7, promises as fsPromises, openSync as openSync2, readFileSync as readFileSync5, readSync } from "node:fs";
+import { closeSync as closeSync2, existsSync as existsSync7, promises as fsPromises, openSync as openSync2, readFileSync as readFileSync6, readSync } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir as homedir9 } from "node:os";
-import { delimiter, dirname as dirname3, isAbsolute as isAbsolute4, join as join9 } from "node:path";
+import { delimiter, dirname as dirname4, isAbsolute as isAbsolute4, join as join9 } from "node:path";
 var ensureBinaryForResolver = ensureBinary;
 var npmPlatformPackageReader = null;
 var cacheCopiesInFlight = new Map;
@@ -16365,8 +16827,8 @@ function npmPlatformPackage(ext) {
   try {
     const req = createRequire(import.meta.url);
     const manifestPath = req.resolve(`@cortexkit/aft-${platformKey()}/package.json`);
-    const manifest = JSON.parse(readFileSync5(manifestPath, "utf8"));
-    const binaryPath = join9(dirname3(manifestPath), "bin", `aft${ext}`);
+    const manifest = JSON.parse(readFileSync6(manifestPath, "utf8"));
+    const binaryPath = join9(dirname4(manifestPath), "bin", `aft${ext}`);
     if (typeof manifest.version !== "string" || !existsSync7(binaryPath))
       return null;
     return { binaryPath, version: normalizeBareVersion(manifest.version) };
@@ -16620,7 +17082,7 @@ function acquireConfigMigrationLock(lockDir) {
       if (code !== "EEXIST")
         throw err;
       try {
-        const ageMs = Date.now() - statSync5(lockDir).mtimeMs;
+        const ageMs = Date.now() - statSync6(lockDir).mtimeMs;
         if (ageMs > 60000) {
           rmSync2(lockDir, { recursive: true, force: true });
           continue;
@@ -16634,12 +17096,12 @@ function acquireConfigMigrationLock(lockDir) {
   }
 }
 function atomicCopyConfigFile(sourcePath, targetPath) {
-  mkdirSync3(dirname4(targetPath), { recursive: true });
-  const tmpPath = join10(dirname4(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  mkdirSync3(dirname5(targetPath), { recursive: true });
+  const tmpPath = join10(dirname5(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
     fd = openSync3(tmpPath, "wx", 384);
-    writeFileSync3(fd, readFileSync6(sourcePath));
+    writeFileSync3(fd, readFileSync7(sourcePath));
     closeSync3(fd);
     fd = null;
     renameSync4(tmpPath, targetPath);
@@ -16656,8 +17118,8 @@ function atomicCopyConfigFile(sourcePath, targetPath) {
   }
 }
 function atomicWriteConfigFile(targetPath, content) {
-  mkdirSync3(dirname4(targetPath), { recursive: true });
-  const tmpPath = join10(dirname4(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  mkdirSync3(dirname5(targetPath), { recursive: true });
+  const tmpPath = join10(dirname5(targetPath), `.${basename2(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
     fd = openSync3(tmpPath, "wx", 384);
@@ -16718,11 +17180,11 @@ function markLegacySourcesMovedAside(sources, targetPath, logger) {
     const desiredMarkerPath = `${source.path}${MOVED_MARKER_SUFFIX}`;
     const markerPath = nonClobberingSidecarPath(desiredMarkerPath);
     try {
-      const original = readFileSync6(source.path, "utf-8");
+      const original = readFileSync7(source.path, "utf-8");
       if (markerPath !== desiredMarkerPath) {
         logger?.warn?.(`Preserving existing legacy AFT marker ${desiredMarkerPath}; writing new marker to ${markerPath}`);
       }
-      atomicWriteConfigFile(markerPath, movedMarkerContent(targetPath, basename(source.path), original));
+      atomicWriteConfigFile(markerPath, movedMarkerContent(targetPath, basename2(source.path), original));
       unlinkSync3(source.path);
       info?.(`Moved legacy AFT config ${source.path} aside to ${markerPath}; AFT now reads ${targetPath}`);
     } catch (err) {
@@ -16782,15 +17244,15 @@ function migrateAftConfigFile(opts) {
   if (existingSources.length === 0) {
     return { migrated: false, conflict: false, targetPath: opts.targetPath, warnings };
   }
-  mkdirSync3(dirname4(opts.targetPath), { recursive: true });
+  mkdirSync3(dirname5(opts.targetPath), { recursive: true });
   const release = acquireConfigMigrationLock(`${opts.targetPath}.lock`);
   try {
     const sources = existingSources.map((source) => ({
       ...source,
-      content: readFileSync6(source.path, "utf-8")
+      content: readFileSync7(source.path, "utf-8")
     }));
     if (existsSync8(opts.targetPath)) {
-      const targetContent = readFileSync6(opts.targetPath, "utf-8");
+      const targetContent = readFileSync7(opts.targetPath, "utf-8");
       for (const source of sources) {
         if (fileSemanticsMatch(source.content, targetContent))
           continue;
@@ -16841,11 +17303,11 @@ function spawnErrorLabel(error) {
 function migrationLogPath(newRoot, harness, logger) {
   const desired = join10(newRoot, "logs", "migration", `${harness}-${Date.now()}.jsonl`);
   try {
-    mkdirSync3(dirname4(desired), { recursive: true });
+    mkdirSync3(dirname5(desired), { recursive: true });
     return desired;
   } catch (err) {
     const fallback = join10(tmpdir2(), `aft-migration-${harness}-${Date.now()}.jsonl`);
-    logger?.warn?.(`Failed to create AFT migration log directory ${dirname4(desired)}: ${err instanceof Error ? err.message : String(err)}. ` + `Using fallback log path ${fallback}.`);
+    logger?.warn?.(`Failed to create AFT migration log directory ${dirname5(desired)}: ${err instanceof Error ? err.message : String(err)}. ` + `Using fallback log path ${fallback}.`);
     return fallback;
   }
 }
@@ -16906,9 +17368,9 @@ async function ensureStorageMigrated(opts) {
   throw new Error(`AFT storage migration failed (${detail}). ` + `Harness: ${opts.harness}. Legacy: ${legacyRoot}. Target: ${newRoot}. ` + `See log: ${logPath}. ` + `Plugin load aborted to prevent legacy/new state divergence.` + (stderrTail ? ` Stderr tail: ${stderrTail}` : "") + (stdoutTail ? ` Stdout tail: ${stdoutTail}` : ""));
 }
 // ../aft-bridge/dist/migration-notices.js
-import { mkdirSync as mkdirSync4, readFileSync as readFileSync7, renameSync as renameSync5, rmdirSync, statSync as statSync6, writeFileSync as writeFileSync4 } from "node:fs";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync8, renameSync as renameSync5, rmdirSync, statSync as statSync7, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir as homedir11 } from "node:os";
-import { dirname as dirname5, join as join11, resolve as resolve7 } from "node:path";
+import { dirname as dirname6, join as join11, resolve as resolve7 } from "node:path";
 function migrationNoticeStorePath(env = process.env) {
   const stateHome = env.XDG_STATE_HOME && env.XDG_STATE_HOME.length > 0 ? env.XDG_STATE_HOME : join11(homedir11(), ".local", "state");
   return join11(stateHome, "cortexkit", "aft", "migration-notices.json");
@@ -16918,7 +17380,7 @@ function noticeKey(configPath, digest) {
 }
 function readRecords(storePath) {
   try {
-    const parsed = JSON.parse(readFileSync7(storePath, "utf8"));
+    const parsed = JSON.parse(readFileSync8(storePath, "utf8"));
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
   } catch {
     return {};
@@ -16927,7 +17389,7 @@ function readRecords(storePath) {
 var LOCK_STALE_MS = 1e4;
 function withStoreLock(storePath, action) {
   const lockPath = `${storePath}.lock`;
-  mkdirSync4(dirname5(storePath), { recursive: true });
+  mkdirSync4(dirname6(storePath), { recursive: true });
   const deadline = Date.now() + 2000;
   for (;; ) {
     try {
@@ -16937,7 +17399,7 @@ function withStoreLock(storePath, action) {
       if (error.code !== "EEXIST")
         throw error;
       try {
-        if (Date.now() - statSync6(lockPath).mtimeMs > LOCK_STALE_MS)
+        if (Date.now() - statSync7(lockPath).mtimeMs > LOCK_STALE_MS)
           rmdirSync(lockPath);
       } catch {}
       if (Date.now() > deadline)
@@ -16978,9 +17440,9 @@ function deliverMigrationNoticeOnce(options) {
   }
 }
 // ../aft-bridge/dist/npm-resolver.js
-import { readdirSync as readdirSync2, statSync as statSync7 } from "node:fs";
+import { readdirSync as readdirSync2, statSync as statSync8 } from "node:fs";
 import { homedir as homedir12 } from "node:os";
-import { dirname as dirname6, isAbsolute as isAbsolute5, join as join12 } from "node:path";
+import { dirname as dirname7, isAbsolute as isAbsolute5, join as join12 } from "node:path";
 function defaultDeps() {
   return {
     platform: process.platform,
@@ -16994,7 +17456,7 @@ function npmBinaryName(platform) {
 }
 function isFile(p) {
   try {
-    return statSync7(p).isFile();
+    return statSync8(p).isFile();
   } catch {
     return false;
   }
@@ -17015,7 +17477,7 @@ function npmFromPath(deps) {
   return null;
 }
 function npmAdjacentToNode(deps) {
-  const dir = dirname6(deps.execPath);
+  const dir = dirname7(deps.execPath);
   return isFile(join12(dir, npmBinaryName(deps.platform))) ? dir : null;
 }
 function highestVersionedNodeBin(installsDir, name) {
@@ -17400,8 +17862,8 @@ function probeOnnxRuntimeLoadable(libPath, arch = process.arch) {
 }
 // ../aft-bridge/dist/onnx-runtime.js
 import { createHash as createHash4, randomBytes as randomBytes2 } from "node:crypto";
-import { chmodSync as chmodSync2, closeSync as closeSync5, copyFileSync as copyFileSync2, createWriteStream as createWriteStream2, existsSync as existsSync11, lstatSync, mkdirSync as mkdirSync5, openSync as openSync5, readdirSync as readdirSync3, readFileSync as readFileSync8, readlinkSync, realpathSync as realpathSync3, renameSync as renameSync6, rmSync as rmSync3, statSync as statSync8, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync5 } from "node:fs";
-import { basename as basename2, dirname as dirname7, isAbsolute as isAbsolute6, join as join14, relative as relative2, resolve as resolve8, win32 } from "node:path";
+import { chmodSync as chmodSync2, closeSync as closeSync5, copyFileSync as copyFileSync2, createWriteStream as createWriteStream2, existsSync as existsSync11, lstatSync, mkdirSync as mkdirSync5, openSync as openSync5, readdirSync as readdirSync3, readFileSync as readFileSync9, readlinkSync, realpathSync as realpathSync3, renameSync as renameSync6, rmSync as rmSync3, statSync as statSync9, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync5 } from "node:fs";
+import { basename as basename3, dirname as dirname8, isAbsolute as isAbsolute6, join as join14, relative as relative2, resolve as resolve8, win32 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
 
@@ -17605,7 +18067,7 @@ function cleanupAbandonedStagingDirs(onnxBaseDir) {
             abandoned = true;
           } else {
             try {
-              const ageMs = Date.now() - statSync8(stagingDir).mtimeMs;
+              const ageMs = Date.now() - statSync9(stagingDir).mtimeMs;
               abandoned = ageMs > STALE_LOCK_MS;
             } catch {
               abandoned = true;
@@ -17642,7 +18104,7 @@ var REQUIRED_ORT_MAJOR = 1;
 var REQUIRED_ORT_MIN_MINOR = 20;
 var INVALID_ORT_VERSION = "<invalid>";
 function parseOnnxVersionFromPath(value) {
-  const name = basename2(value);
+  const name = basename3(value);
   const semverish = name.match(/(?:^|[._-])(\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?)(?:\.(?:dylib|dll))?$/);
   if (semverish)
     return semverish[1].split(/[-+]/, 1)[0];
@@ -17847,7 +18309,7 @@ async function downloadFileWithCap(url, destPath) {
     if (Number.isFinite(advertised) && advertised > MAX_DOWNLOAD_BYTES2) {
       throw new Error(`Content-Length ${advertised} exceeds max ${MAX_DOWNLOAD_BYTES2}`);
     }
-    mkdirSync5(dirname7(destPath), { recursive: true });
+    mkdirSync5(dirname8(destPath), { recursive: true });
     let bytesWritten = 0;
     const guard = new TransformStream({
       transform(chunk, transformController) {
@@ -17881,7 +18343,7 @@ function validateExtractedTree(stagingRoot) {
       const lst = lstatSync(fullPath);
       if (lst.isSymbolicLink()) {
         const linkTarget = readlinkSync(fullPath);
-        const resolvedTarget = resolve8(dirname7(fullPath), linkTarget);
+        const resolvedTarget = resolve8(dirname8(fullPath), linkTarget);
         const rel = relative2(realRoot, resolvedTarget);
         if (rel.startsWith("..") || isAbsolute6(rel) || win32.isAbsolute(rel)) {
           throw new Error(`extracted symlink ${fullPath} points outside staging root: ${linkTarget}`);
@@ -18017,7 +18479,7 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
       unlinkSync4(dst);
     } catch {}
     const dstForContainment = join14(targetRoot, link.name);
-    const resolvedTarget = resolve8(dirname7(dstForContainment), link.target);
+    const resolvedTarget = resolve8(dirname8(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)) {
@@ -18069,9 +18531,9 @@ function writeOnnxInstalledMeta(installDir, version, sha256, archiveSha256) {
 function readOnnxInstalledMeta(installDir) {
   const path = join14(installDir, ONNX_INSTALLED_META_FILE);
   try {
-    if (!statSync8(path).isFile())
+    if (!statSync9(path).isFile())
       return null;
-    const raw = readFileSync8(path, "utf8");
+    const raw = readFileSync9(path, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.version !== "string" || parsed.version.length === 0)
       return null;
@@ -18087,7 +18549,7 @@ function readOnnxInstalledMeta(installDir) {
 }
 function sha256File2(path) {
   const hash = createHash4("sha256");
-  hash.update(readFileSync8(path));
+  hash.update(readFileSync9(path));
   return hash.digest("hex");
 }
 function acquireLock(lockPath) {
@@ -18115,12 +18577,12 @@ ${new Date().toISOString()}
   let owningPid = null;
   let lockMtimeMs = 0;
   try {
-    const raw = readFileSync8(lockPath, "utf8");
+    const raw = readFileSync9(lockPath, "utf8");
     const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
     const parsed = Number.parseInt(firstLine, 10);
     if (Number.isFinite(parsed) && parsed > 0)
       owningPid = parsed;
-    lockMtimeMs = statSync8(lockPath).mtimeMs;
+    lockMtimeMs = statSync9(lockPath).mtimeMs;
   } catch {
     return tryClaim();
   }
@@ -18140,7 +18602,7 @@ function releaseLock(lockPath) {
   try {
     let owningPid = null;
     try {
-      const raw = readFileSync8(lockPath, "utf8");
+      const raw = readFileSync9(lockPath, "utf8");
       const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
       const parsed = Number.parseInt(firstLine, 10);
       if (Number.isFinite(parsed) && parsed > 0)
@@ -19880,7 +20342,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.58.0",
+  version: "0.58.1",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -19903,30 +20365,32 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.58.0",
+    "@cortexkit/aft-bridge": "0.58.1",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
-    typebox: "1.1.38",
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.58.0",
-    "@cortexkit/aft-darwin-x64": "0.58.0",
-    "@cortexkit/aft-linux-arm64": "0.58.0",
-    "@cortexkit/aft-linux-x64": "0.58.0",
-    "@cortexkit/aft-win32-arm64": "0.58.0",
-    "@cortexkit/aft-win32-x64": "0.58.0"
+    "@cortexkit/aft-darwin-arm64": "0.58.1",
+    "@cortexkit/aft-darwin-x64": "0.58.1",
+    "@cortexkit/aft-linux-arm64": "0.58.1",
+    "@cortexkit/aft-linux-x64": "0.58.1",
+    "@cortexkit/aft-win32-arm64": "0.58.1",
+    "@cortexkit/aft-win32-x64": "0.58.1"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "^0.80.2",
     "@earendil-works/pi-ai": "^0.80.2",
     "@earendil-works/pi-tui": "^0.80.2",
     "@types/node": "^22.0.0",
+    typebox: "1.1.38",
     typescript: "^5.8.0"
   },
   peerDependencies: {
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*"
+    "@earendil-works/pi-tui": "*",
+    typebox: "*"
   },
   exports: {
     ".": {
@@ -20623,7 +21087,7 @@ function registerStatusCommand(pi, ctx) {
 }
 
 // src/config.ts
-import { existsSync as existsSync13, readFileSync as readFileSync9, renameSync as renameSync7, unlinkSync as unlinkSync5, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync13, readFileSync as readFileSync10, renameSync as renameSync7, unlinkSync as unlinkSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { homedir as homedir13 } from "node:os";
 import { isAbsolute as isAbsolute7 } from "node:path";
@@ -25436,7 +25900,7 @@ var IndexConfigSchema = object({
   roots: array(IndexRootSchema).optional()
 });
 var SemanticConfigSchema = object({
-  backend: _enum(["fastembed", "openai_compatible", "ollama"]).optional(),
+  backend: _enum(["fastembed", "openai_compatible", "ollama", "synapse"]).optional(),
   model: string2().trim().min(1).optional(),
   base_url: string2().trim().min(1).optional(),
   api_key_env: string2().trim().min(1).optional(),
@@ -25447,6 +25911,17 @@ var SemanticConfigSchema = object({
   max_input_tokens: number2().int().positive().optional(),
   max_files: number2().int().positive().optional()
 });
+var RerankConfigSchema = object({
+  backend: _enum(["off", "onnx", "remote", "synapse"]).optional(),
+  model: string2().trim().min(1).optional(),
+  endpoint: string2().trim().min(1).optional(),
+  api_key_env: string2().trim().min(1).optional(),
+  top_n: number2().int().positive().optional(),
+  timeout_ms: number2().int().positive().optional()
+});
+var SearchConfigSchema = object({
+  rerank: RerankConfigSchema.optional()
+});
 var LspExtensionSchema = string2().trim().min(1).refine((value) => value.replace(/^\.+/, "").length > 0, {
   message: "Extension must include characters other than leading dots"
 });
@@ -25582,6 +26057,7 @@ var AftConfigFieldsSchema = object({
   lsp: LspConfigSchema.optional(),
   url_fetch_allow_private: boolean2().optional(),
   semantic: SemanticConfigSchema.optional(),
+  search: SearchConfigSchema.optional(),
   bridge: BridgeConfigSchema.optional(),
   subc: SubcConfigSchema.optional(),
   github: GithubConfigSchema.optional(),
@@ -25729,7 +26205,7 @@ function migrateAftConfigFile2(configPath, logger = { log: log2, warn: warn2 })
   let tmpPath = null;
   let oldKeys = [];
   try {
-    const content = readFileSync9(configPath, "utf-8");
+    const content = readFileSync10(configPath, "utf-8");
     const rawConfig = import_comment_json.parse(content);
     if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
       return { migrated: false, oldKeys: [] };
@@ -25764,6 +26240,18 @@ ${serialized}` : serialized;
   }
 }
 var configLoadErrors = [];
+var configValidationErrors = [];
+var configLoadSources = [];
+var configLoadTexts = new Map;
+function getConfigLoadSources() {
+  return configLoadSources;
+}
+function getConfigLoadTexts() {
+  return configLoadTexts;
+}
+function getConfigValidationErrors() {
+  return configValidationErrors;
+}
 function getConfigLoadErrors() {
   return configLoadErrors;
 }
@@ -25808,7 +26296,9 @@ function loadConfigFromPath(configPath, tier) {
   try {
     if (!existsSync13(configPath))
       return null;
-    const content = readFileSync9(configPath, "utf-8");
+    const content = readFileSync10(configPath, "utf-8");
+    configLoadSources.push(configPath);
+    configLoadTexts.set(configPath, content);
     const rawConfig = import_comment_json.parse(content);
     if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
       recordConfigParseFailure(configPath, "root must be an object");
@@ -25858,6 +26348,7 @@ function loadConfigFromPath(configPath, tier) {
   } else {
     const errorMsg = result.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join(", ");
     warn2(`Config validation error in ${configPath}: ${errorMsg}`);
+    configValidationErrors.push({ path: configPath, message: errorMsg });
     parsed = parseConfigPartially(cleanConfig);
   }
   if (tier === "user" && parsed.disabled_tools === undefined) {
@@ -26068,14 +26559,33 @@ function getStrippedTopLevelKeys(override) {
   for (const tool of partitionProjectDisables(override.disabled_tools).ignored) {
     stripped.push(`disabled_tools.${tool}`);
   }
+  stripped.push(...projectRerankStrippedKeys(override.search?.rerank));
   return stripped;
 }
+function projectRerankStrippedKeys(rerank) {
+  if (rerank === undefined)
+    return [];
+  const stripped = [];
+  if (rerank.backend !== undefined && rerank.backend !== "off")
+    stripped.push("search.rerank.backend");
+  for (const key of ["model", "endpoint", "api_key_env", "top_n", "timeout_ms"]) {
+    if (rerank[key] !== undefined)
+      stripped.push(`search.rerank.${key}`);
+  }
+  return stripped;
+}
+function mergeProjectSearchConfig(base, project) {
+  if (project?.rerank?.backend !== "off")
+    return base;
+  return { ...base, rerank: { ...base?.rerank, backend: "off" } };
+}
 function mergeConfigs(base, override) {
   const disabledTools = unionDisabledTools(base.disabled_tools, partitionProjectDisables(override.disabled_tools).accepted);
   const indexes = mergeIndexes(base.indexes, override.indexes, true);
   const formatter = { ...base.formatter, ...override.formatter };
   const checker = { ...base.checker, ...override.checker };
   const semantic = mergeSemanticConfig(base.semantic, override.semantic);
+  const search = mergeProjectSearchConfig(base.search, override.search);
   const lsp = mergeLspConfig(base.lsp, override.lsp);
   const experimental = mergeExperimentalConfig(base.experimental, override.experimental);
   const bash = mergeBashConfig(base.bash, override.bash);
@@ -26105,6 +26615,7 @@ function mergeConfigs(base, override) {
     ...pi !== undefined ? { pi } : {},
     experimental,
     semantic,
+    search,
     ...bridge !== undefined ? { bridge } : {},
     ...indexes !== undefined ? { indexes } : {},
     ...disabledTools !== undefined ? { disabled_tools: disabledTools } : {}
@@ -26163,6 +26674,9 @@ function buildConfigTierConfigureParams(projectDirectory, processState = {}) {
 }
 function loadAftConfig(projectDirectory) {
   configLoadErrors = [];
+  configValidationErrors = [];
+  configLoadSources = [];
+  configLoadTexts = new Map;
   configLoadNotices = [];
   semanticInputSupplied = false;
   const { userConfigPath, projectConfigPath } = resolveAftConfigPaths(projectDirectory);
@@ -26213,10 +26727,10 @@ import {
   createReadStream as createReadStream2,
   existsSync as existsSync15,
   mkdirSync as mkdirSync7,
-  readFileSync as readFileSync12,
+  readFileSync as readFileSync13,
   renameSync as renameSync9,
   rmSync as rmSync5,
-  statSync as statSync10,
+  statSync as statSync11,
   writeFileSync as writeFileSync8
 } from "node:fs";
 import { join as join17 } from "node:path";
@@ -26227,10 +26741,10 @@ import {
   closeSync as closeSync6,
   mkdirSync as mkdirSync6,
   openSync as openSync6,
-  readFileSync as readFileSync10,
+  readFileSync as readFileSync11,
   renameSync as renameSync8,
   rmSync as rmSync4,
-  statSync as statSync9,
+  statSync as statSync10,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync7
 } from "node:fs";
@@ -26253,7 +26767,7 @@ function lspBinDir(npmPackage) {
 function isInstalled(npmPackage, binary) {
   for (const candidate of lspBinaryCandidates(binary)) {
     try {
-      if (statSync9(join15(lspBinDir(npmPackage), candidate)).isFile())
+      if (statSync10(join15(lspBinDir(npmPackage), candidate)).isFile())
         return true;
     } catch {}
   }
@@ -26281,9 +26795,9 @@ function writeInstalledMetaIn(installDir, version, sha256) {
 function readInstalledMetaIn(installDir) {
   const path = join15(installDir, INSTALLED_META_FILE);
   try {
-    if (!statSync9(path).isFile())
+    if (!statSync10(path).isFile())
       return null;
-    const raw = readFileSync10(path, "utf8");
+    const raw = readFileSync11(path, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.version !== "string" || parsed.version.length === 0)
       return null;
@@ -26352,12 +26866,12 @@ ${token}
   let owningPid = null;
   let lockMtimeMs = 0;
   try {
-    const raw = readFileSync10(lock, "utf8");
+    const raw = readFileSync11(lock, "utf8");
     const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
     const parsed = Number.parseInt(firstLine, 10);
     if (Number.isFinite(parsed) && parsed > 0)
       owningPid = parsed;
-    lockMtimeMs = statSync9(lock).mtimeMs;
+    lockMtimeMs = statSync10(lock).mtimeMs;
   } catch {
     return tryClaim();
   }
@@ -26391,7 +26905,7 @@ function releaseInstallLock(lockKey, acquisitionToken) {
     let owningPid = null;
     let owningToken = "";
     try {
-      const raw = readFileSync10(lock, "utf8");
+      const raw = readFileSync11(lock, "utf8");
       const lines = raw.split(/\r?\n/);
       const parsed = Number.parseInt(lines[0]?.trim() ?? "", 10);
       if (Number.isFinite(parsed) && parsed > 0)
@@ -26438,7 +26952,7 @@ function autoInstallStampPath() {
 }
 function hasRecentAutoInstallStamp(path) {
   try {
-    const parsed = JSON.parse(readFileSync10(path, "utf8"));
+    const parsed = JSON.parse(readFileSync11(path, "utf8"));
     return typeof parsed.lastRunMs === "number" && Number.isFinite(parsed.lastRunMs) && Math.abs(Date.now() - parsed.lastRunMs) < AUTO_INSTALL_WINDOW_MS;
   } catch {
     return false;
@@ -26446,7 +26960,7 @@ function hasRecentAutoInstallStamp(path) {
 }
 function readAutoInstallLockOwner(path) {
   try {
-    const parsed = JSON.parse(readFileSync10(path, "utf8"));
+    const parsed = JSON.parse(readFileSync11(path, "utf8"));
     if (typeof parsed.pid !== "number" || typeof parsed.startedMs !== "number" || typeof parsed.token !== "string") {
       return null;
     }
@@ -26459,7 +26973,7 @@ function autoInstallLockIsStale(path) {
   const owner = readAutoInstallLockOwner(path);
   let age = Number.POSITIVE_INFINITY;
   try {
-    age = Math.abs(Date.now() - statSync9(path).mtimeMs);
+    age = Math.abs(Date.now() - statSync10(path).mtimeMs);
   } catch {
     return true;
   }
@@ -26537,7 +27051,7 @@ var VERSION_CHECK_FILE = ".aft-version-check";
 function readVersionCheck(npmPackage) {
   const file = join15(lspPackageDir(npmPackage), VERSION_CHECK_FILE);
   try {
-    const raw = readFileSync10(file, "utf8");
+    const raw = readFileSync11(file, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.last_checked === "string") {
       return {
@@ -26640,6 +27154,13 @@ var NPM_LSP_TABLE = [
     extensions: ["ts", "tsx", "js", "jsx", "mjs", "cjs", "mts", "cts"],
     rootMarkers: ["tsconfig.json", "jsconfig.json", "package.json"]
   },
+  {
+    id: "typescript-sdk",
+    npm: "typescript",
+    binary: "tsserver",
+    extensions: ["ts", "tsx", "js", "jsx", "mjs", "cjs", "mts", "cts"],
+    rootMarkers: ["tsconfig.json", "jsconfig.json", "package.json"]
+  },
   {
     id: "python",
     npm: "pyright",
@@ -26714,7 +27235,7 @@ var NPM_LSP_TABLE = [
 ];
 
 // src/lsp-project-relevance.ts
-import { existsSync as existsSync14, readdirSync as readdirSync4, readFileSync as readFileSync11 } from "node:fs";
+import { existsSync as existsSync14, readdirSync as readdirSync4, readFileSync as readFileSync12 } from "node:fs";
 import { join as join16 } from "node:path";
 var MAX_WALK_DIRS = 200;
 var MAX_WALK_DEPTH = 4;
@@ -26756,7 +27277,7 @@ function hasPackageJsonDep(projectRoot, depNames) {
 }
 function readPackageJson(projectRoot) {
   try {
-    const raw = readFileSync11(join16(projectRoot, "package.json"), "utf8");
+    const raw = readFileSync12(join16(projectRoot, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null)
       return null;
@@ -27104,7 +27625,7 @@ function hashInstalledBinary(spec) {
     let pathToHash = null;
     for (const p of candidates) {
       try {
-        if (statSync10(p).isFile()) {
+        if (statSync11(p).isFile()) {
           pathToHash = p;
           break;
         }
@@ -27130,14 +27651,14 @@ function installedBinaryPath(spec) {
   ] : [lspBinaryPath(spec.npm, spec.binary)];
   for (const candidate of candidates) {
     try {
-      if (statSync10(candidate).isFile())
+      if (statSync11(candidate).isFile())
         return candidate;
     } catch {}
   }
   return null;
 }
 function sha256OfFileSync(path) {
-  return createHash5("sha256").update(readFileSync12(path)).digest("hex");
+  return createHash5("sha256").update(readFileSync13(path)).digest("hex");
 }
 function quarantineCachedNpmInstall(spec, reason) {
   const packageDir = lspPackageDir(spec.npm);
@@ -27180,7 +27701,7 @@ function runAutoInstall(projectRoot, config, fetchImpl = fetch) {
     if (isInstalled(spec.npm, spec.binary) && validateCachedNpmInstall(spec)) {
       cachedBinDirs.push(lspBinDir(spec.npm));
     }
-    if (config.disabled.has(spec.id)) {
+    if (config.disabled.has(spec.id) || spec.id === "typescript-sdk" && config.disabled.has("typescript")) {
       skipped.push({ id: spec.id, reason: "disabled by config" });
       continue;
     }
@@ -27235,16 +27756,16 @@ import {
   lstatSync as lstatSync2,
   mkdirSync as mkdirSync8,
   readdirSync as readdirSync5,
-  readFileSync as readFileSync13,
+  readFileSync as readFileSync14,
   readlinkSync as readlinkSync2,
   realpathSync as realpathSync4,
   renameSync as renameSync10,
   rmSync as rmSync6,
-  statSync as statSync11,
+  statSync as statSync12,
   unlinkSync as unlinkSync7,
   writeFileSync as writeFileSync9
 } from "node:fs";
-import { dirname as dirname8, join as join18, relative as relative3, resolve as resolve9 } from "node:path";
+import { dirname as dirname9, join as join18, relative as relative3, resolve as resolve9 } from "node:path";
 import { Readable as Readable3 } from "node:stream";
 import { pipeline as pipeline3 } from "node:stream/promises";
 
@@ -27353,7 +27874,7 @@ function installFailureMarkerPath(spec) {
 }
 function readInstallFailureMarker(spec) {
   try {
-    const marker = JSON.parse(readFileSync13(installFailureMarkerPath(spec), "utf8"));
+    const marker = JSON.parse(readFileSync14(installFailureMarkerPath(spec), "utf8"));
     if (typeof marker.release !== "string" || typeof marker.sha256 !== "string" || typeof marker.error !== "string" || typeof marker.at !== "string" || !Number.isFinite(Date.parse(marker.at))) {
       return null;
     }
@@ -27367,7 +27888,7 @@ function writeInstallFailureMarker(spec, release, sha256, installError) {
   const markerError = installError.replace(/\s+/g, " ").trim();
   const tempPath = `${path}.tmp-${process.pid}-${randomBytes3(6).toString("hex")}`;
   try {
-    mkdirSync8(dirname8(path), { recursive: true });
+    mkdirSync8(dirname9(path), { recursive: true });
     writeFileSync9(tempPath, `${JSON.stringify({ release, sha256, error: markerError, at: new Date().toISOString() })}
 `, { encoding: "utf8", mode: 384 });
     renameSync10(tempPath, path);
@@ -27396,7 +27917,7 @@ function ghBinaryPath(spec, platform) {
 function isGithubInstalled(spec, platform) {
   for (const candidate of ghBinaryCandidates(spec, platform)) {
     try {
-      if (statSync11(join18(ghBinDir(spec), candidate)).isFile())
+      if (statSync12(join18(ghBinDir(spec), candidate)).isFile())
         return true;
     } catch {}
   }
@@ -27410,9 +27931,9 @@ function ghBinaryCandidates(spec, platform) {
 function readGithubInstalledMetaIn(installDir) {
   try {
     const path = join18(installDir, INSTALLED_META_FILE2);
-    if (!statSync11(path).isFile())
+    if (!statSync12(path).isFile())
       return null;
-    const parsed = JSON.parse(readFileSync13(path, "utf8"));
+    const parsed = JSON.parse(readFileSync14(path, "utf8"));
     if (typeof parsed.version !== "string" || parsed.version.length === 0)
       return null;
     return {
@@ -27453,7 +27974,7 @@ function sha256OfFile(path) {
   });
 }
 function sha256OfFileSync2(path) {
-  return createHash6("sha256").update(readFileSync13(path)).digest("hex");
+  return createHash6("sha256").update(readFileSync14(path)).digest("hex");
 }
 async function fetchReleaseByTag(githubRepo, tag, fetchImpl, signal) {
   const candidates = [];
@@ -27629,7 +28150,7 @@ async function downloadFile(url, destPath, fetchImpl, assetSize, signal) {
     if (Number.isFinite(advertised) && advertised > MAX_DOWNLOAD_BYTES3) {
       throw new Error(`Content-Length ${advertised} exceeds max ${MAX_DOWNLOAD_BYTES3}`);
     }
-    mkdirSync8(dirname8(destPath), { recursive: true });
+    mkdirSync8(dirname9(destPath), { recursive: true });
     let bytesWritten = 0;
     const guard = new TransformStream({
       transform(chunk, controller) {
@@ -27799,7 +28320,7 @@ function quarantineCachedGithubInstall(spec, reason) {
   const dest = join18(ghCacheRoot(), ".quarantine", encodeURIComponent(spec.id), `${Date.now()}`);
   warn2(`[lsp] tofu_mismatch ${spec.id}: ${reason}; quarantining ${packageDir} -> ${dest}`);
   try {
-    mkdirSync8(dirname8(dest), { recursive: true });
+    mkdirSync8(dirname9(dest), { recursive: true });
     rmSync6(dest, { recursive: true, force: true });
     renameSync10(packageDir, dest);
   } catch (err) {
@@ -27811,7 +28332,7 @@ function validateCachedGithubInstall(spec, platform) {
   const meta = readGithubInstalledMetaIn(packageDir);
   const binaryPath = ghBinaryCandidates(spec, platform).map((candidate) => join18(ghBinDir(spec), candidate)).find((candidate) => {
     try {
-      return statSync11(candidate).isFile();
+      return statSync12(candidate).isFile();
     } catch {
       return false;
     }
@@ -27929,7 +28450,7 @@ async function downloadAndInstall(spec, tag, assets, platform, arch, fetchImpl,
     return { ok: false, sha256: archiveSha256, error: message };
   }
   const targetBinary = ghBinaryPath(spec, platform);
-  mkdirSync8(dirname8(targetBinary), { recursive: true });
+  mkdirSync8(dirname9(targetBinary), { recursive: true });
   try {
     copyFileSync3(innerBinaryPath, targetBinary);
     if (platform !== "win32") {
@@ -28694,7 +29215,7 @@ var ISSUE_AND_PR_READ_DESCRIPTION = "GitHub issues and pull requests can be read
 function whenGhReadEnabled(enabled, description) {
   return enabled ? description : "";
 }
-var READ_DESCRIPTION = "Read file contents with line numbers. Backed by AFT's indexed Rust reader — faster than the built-in `read` on large repos. Images are returned as attachments on vision-capable models; PDFs and non-vision models are not yet supported.";
+var READ_DESCRIPTION = "Read file contents with line numbers or sorted directory entries. Use startLine/endLine or 1-based offset/limit for either. Directory limit defaults to and is capped at 1000; enumeration stops at 10,000 entries and partial listings carry a shown/total trailer. Backed by AFT's indexed Rust reader — faster than the built-in `read` on large repos. Images are returned as attachments on vision-capable models; PDFs and non-vision models are not yet supported.";
 function readDescription(ghReadEnabled) {
   const githubDescription = whenGhReadEnabled(ghReadEnabled, ISSUE_AND_PR_READ_DESCRIPTION);
   return githubDescription ? `${READ_DESCRIPTION} ${githubDescription}` : READ_DESCRIPTION;
@@ -28790,12 +29311,12 @@ async function assertExternalDirectoryPermission(extCtx, target, options = {}) {
 }
 var ReadParams = Type2.Object({
   path: Type2.String({
-    description: "Path to the file to read (absolute or relative to project root)"
+    description: "Path to the file or directory to read (absolute or relative to project root)"
   }),
-  startLine: optionalInt(1, Number.MAX_SAFE_INTEGER, "1-based line to start reading from"),
-  endLine: optionalInt(1, Number.MAX_SAFE_INTEGER, "1-based line to stop reading at (inclusive)"),
-  limit: optionalInt(1, Number.MAX_SAFE_INTEGER, "Maximum number of lines to return"),
-  offset: optionalInt(1, Number.MAX_SAFE_INTEGER, "1-based line number to start reading from (use with limit)")
+  startLine: optionalInt(1, Number.MAX_SAFE_INTEGER, "1-based line or directory entry to start reading from"),
+  endLine: optionalInt(1, Number.MAX_SAFE_INTEGER, "1-based line or directory entry to stop reading at (inclusive)"),
+  limit: optionalInt(1, Number.MAX_SAFE_INTEGER, "Max lines (default: 2000) or directory entries (default and cap: 1000) to return"),
+  offset: optionalInt(1, Number.MAX_SAFE_INTEGER, "1-based line or directory entry to start reading from (use with limit). Ignored if startLine is provided")
 });
 var WriteParams = Type2.Object({
   path: Type2.String({
@@ -28930,7 +29451,7 @@ function registerHoistedTools(pi, ctx, surface) {
       name: readName,
       label: readName,
       description: readDescription(resolveGithubConfig(ctx.config).read),
-      promptSnippet: "Read file contents (supports offset/limit for large files)",
+      promptSnippet: "Read files or directories (supports offset/limit for either)",
       promptGuidelines: [`Use ${readName} to examine files instead of cat or sed.`],
       parameters: ReadParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
@@ -30105,7 +30626,7 @@ A notification will fire when the pattern matches or the task exits.`, watchDeta
       const effectiveWaitMs = workerForcedSync ? syncWaitCap : resolveWatchTimeoutMs(coerceConfiguredWatchTimeout(params.timeout_ms, syncWaitCap), role, syncWaitCap);
       const data = await waitForBashStatus(ctx, bridge, extCtx, params.task_id, undefined, waitFor, true, effectiveWaitMs);
       if (data.waited?.reason === "user_message") {
-        const convertedText = await convertToAsyncWatchOnAbort(bridge, extCtx, params.task_id, waitFor, coerceBoolean(params.once, true));
+        const convertedText = await convertToAsyncWatchOnAbort(bridge, extCtx, params.task_id, waitFor, coerceBoolean(params.once, true), data.waited.elapsed_ms);
         return textResult(convertedText, { waited: data.waited });
       }
       const text = await formatBashStatus(extCtx, params.task_id, data, undefined, { role, capMs: syncWaitCap });
@@ -30113,9 +30634,10 @@ A notification will fire when the pattern matches or the task exits.`, watchDeta
     }
   };
 }
-async function convertToAsyncWatchOnAbort(bridge, extCtx, taskId, waitFor, once) {
+async function convertToAsyncWatchOnAbort(bridge, extCtx, taskId, waitFor, once, elapsedMs) {
+  const interrupted = `Sync watch for task ${taskId} was interrupted because you sent a message after ${elapsedMs}ms of waiting. `;
   if (!waitFor) {
-    return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits; don't poll bash_status.`;
+    return interrupted + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits; don't poll bash_status.`;
   }
   const notifyParams = {
     task_id: taskId,
@@ -30131,12 +30653,12 @@ async function convertToAsyncWatchOnAbort(bridge, extCtx, taskId, waitFor, once)
     const registered = await callBashBridge(bridge, "bash_notify", notifyParams, extCtx);
     if (registered.success === false) {
       unmarkExplicitControl(sessionId, taskId);
-      return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `Auto-registering an async watch failed (${String(registered.message ?? "unknown error")}). ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits.`;
+      return interrupted + `Auto-registering an async watch failed (${String(registered.message ?? "unknown error")}). ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits.`;
     }
-    return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `The wait has been converted to an async watch (${registered.watch_id}). ` + `A notification will fire when the pattern matches or the task exits.`;
+    return interrupted + `The wait has been converted to an async watch (${registered.watch_id}). ` + `A notification will fire when the pattern matches or the task exits.`;
   } catch (err) {
     unmarkExplicitControl(sessionId, taskId);
-    return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `Auto-registering an async watch failed (${err instanceof Error ? err.message : String(err)}). ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits.`;
+    return interrupted + `Auto-registering an async watch failed (${err instanceof Error ? err.message : String(err)}). ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits.`;
   }
 }
 function createBashWriteTool(ctx) {
@@ -30208,8 +30730,9 @@ async function bashStatusSnapshot(bridge, extCtx, taskId, outputMode, options, c
   }, extCtx, options);
 }
 async function waitForBashStatus(ctx, bridge, extCtx, taskId, outputMode, waitFor, waitForExit, effectiveWaitMs) {
-  const startedAt = Date.now();
+  const startedAt = monotonicNowMs();
   const deadline = startedAt + effectiveWaitMs;
+  const elapsedMs = () => Math.round(monotonicNowMs() - startedAt);
   let spillCursor = { output: 0, stderr: 0 };
   const scanState = {
     output: { text: "", baseOffset: 0 },
@@ -30239,16 +30762,18 @@ async function waitForBashStatus(ctx, bridge, extCtx, taskId, outputMode, waitFo
         if (isSyncWatchAborted(sessionId)) {
           return withWaited(lastData ?? unavailableSnapshot(), {
             reason: "user_message",
-            elapsed_ms: Date.now() - startedAt
+            elapsed_ms: elapsedMs(),
+            limit_ms: effectiveWaitMs
           });
         }
-        if (Date.now() >= deadline) {
+        if (monotonicNowMs() >= deadline) {
           return withWaited(lastData ?? unavailableSnapshot(), {
             reason: "unavailable",
-            elapsed_ms: Date.now() - startedAt
+            elapsed_ms: elapsedMs(),
+            limit_ms: effectiveWaitMs
           });
         }
-        await sleep(Math.min(BASH_WAIT_POLL_INTERVAL_MS, Math.max(0, deadline - Date.now())));
+        await sleep(Math.min(BASH_WAIT_POLL_INTERVAL_MS, Math.max(0, deadline - monotonicNowMs())));
         continue;
       }
       lastData = data;
@@ -30277,7 +30802,8 @@ async function waitForBashStatus(ctx, bridge, extCtx, taskId, outputMode, waitFo
               const matchStream = data.mode === "pty" ? undefined : chunk.stream === "output" ? "stdout" : "stderr";
               return withWaited(data, {
                 reason: "matched",
-                elapsed_ms: Date.now() - startedAt,
+                elapsed_ms: elapsedMs(),
+                limit_ms: effectiveWaitMs,
                 match: match.text,
                 match_offset: state.baseOffset + match.byteOffset,
                 match_stream: matchStream
@@ -30297,15 +30823,27 @@ async function waitForBashStatus(ctx, bridge, extCtx, taskId, outputMode, waitFo
           consumeBgCompletion(sessionId, taskId);
           await markBgCompletionDelivered({ ctx, directory: extCtx.cwd, sessionID: sessionId }, taskId);
         }
-        return withWaited(data, { reason: "exited", elapsed_ms: Date.now() - startedAt });
+        return withWaited(data, {
+          reason: "exited",
+          elapsed_ms: elapsedMs(),
+          limit_ms: effectiveWaitMs
+        });
       }
       if (isSyncWatchAborted(sessionId)) {
-        return withWaited(data, { reason: "user_message", elapsed_ms: Date.now() - startedAt });
+        return withWaited(data, {
+          reason: "user_message",
+          elapsed_ms: elapsedMs(),
+          limit_ms: effectiveWaitMs
+        });
       }
-      if (Date.now() >= deadline) {
-        return withWaited(data, { reason: "timeout", elapsed_ms: Date.now() - startedAt });
+      if (monotonicNowMs() >= deadline) {
+        return withWaited(data, {
+          reason: "timeout",
+          elapsed_ms: elapsedMs(),
+          limit_ms: effectiveWaitMs
+        });
       }
-      await sleep(Math.min(BASH_WAIT_POLL_INTERVAL_MS, Math.max(0, deadline - Date.now())));
+      await sleep(Math.min(BASH_WAIT_POLL_INTERVAL_MS, Math.max(0, deadline - monotonicNowMs())));
     }
   } finally {
     if (waitForExit && !sawTerminal)
@@ -30412,18 +30950,19 @@ function withWaited(data, waited) {
   return { ...data, waited };
 }
 function formatWaitSummary(waited, details, watchRole) {
+  const waitedText = formatWatchWaited(waited.elapsed_ms, waited.limit_ms, watchRole.capMs);
   if (waited.reason === "matched") {
     const stream = waited.match_stream ? ` in ${waited.match_stream}` : "";
-    return `Waited ${waited.elapsed_ms}ms; matched ${JSON.stringify(waited.match ?? "")}${stream} at offset ${waited.match_offset ?? 0}.`;
+    return `${waitedText}; matched ${JSON.stringify(waited.match ?? "")}${stream} at offset ${waited.match_offset ?? 0}.`;
   }
   if (waited.reason === "timeout") {
-    return `Waited ${waited.elapsed_ms}ms; timeout reached without match. ${watchTimeoutSteer(watchRole.role, watchRole.capMs, "timeout_ms")}`;
+    return `${waitedText}; timeout reached without match. ${watchTimeoutSteer(watchRole.role, watchRole.capMs, "timeout_ms")}`;
   }
   if (waited.reason === "unavailable") {
-    return `Waited ${waited.elapsed_ms}ms; the bridge was busy, so task state is unknown. Do not poll; let the task's completion notification wake the session, or use one bash_status snapshot on the next normal tool call.`;
+    return `${waitedText}; the bridge was busy, so task state is unknown. Do not poll; let the task's completion notification wake the session, or use one bash_status snapshot on the next normal tool call.`;
   }
   const exit = typeof details.exit_code === "number" ? `, exit ${details.exit_code}` : "";
-  return `Waited ${waited.elapsed_ms}ms; task exited (${details.status}${exit}).`;
+  return `${waitedText}; task exited (${details.status}${exit}).`;
 }
 async function formatBashStatus(extCtx, taskId, details, requestedOutputMode, watchRole) {
   const exit = typeof details.exit_code === "number" ? ` (exit ${details.exit_code})` : "";
@@ -30690,7 +31229,7 @@ function registerFsTools(pi, ctx, surface) {
     pi.registerTool(withPathAliasPreparation({
       name: "aft_delete",
       label: "delete",
-      description: "Delete one or more files (or directories). " + (backupsDisabled ? "Backup capture is disabled by user config, so this tool does not create undo snapshots. " : "Each file is backed up before deletion — use `aft_safety undo` to recover any of them. For directories, every file inside is individually backed up before removal. The deleted file's contents stay in the undo store until its retention expires. A recursive delete whose backup would copy more than 2,000 files or 100 MiB in one call is refused before anything is deleted; delete such a tree in smaller pieces, or use bash `rm -rf` when no undo is needed. ") + "Directory deletion requires recursive: true. " + "Returns { success, complete, deleted, skipped_files }: partial success is allowed; files that fail are reported in skipped_files.",
+      description: "Delete one or more files (or directories). " + (backupsDisabled ? "Backup capture is disabled by user config, so this tool does not create undo snapshots. A directory tree containing a mount point of another filesystem is still refused. " : "Each file is backed up before deletion — use `aft_safety undo` to recover any of them. A recursive delete backs up the whole tree: directories (empty ones too, with their permissions), file contents, hard links (relinked by undo) and symlinks (the link itself, never its target; restored exactly, even when dangling). Sockets are deleted but undo does not restore them, and a file hard-linked to paths outside the tree comes back as an independent copy; both are reported as warnings. Refused before anything is deleted: mount points of another filesystem, named pipes, device nodes, and symlinks undo cannot recreate exactly (non-UTF-8 target, or on Windows). Paths under the system temp directory are never backed up, so only mount points are refused there. The deleted file's contents stay in the undo store until its retention expires. A recursive delete whose backup would record more than 2,000 entries (files, directories and links) or copy 100 MiB in one call is refused before anything is deleted; delete such a tree in smaller pieces, or use bash `rm -rf` when no undo is needed. ") + "Directory deletion requires recursive: true. " + "Returns { success, complete, deleted, skipped_files }: partial success is allowed; files that fail are reported in skipped_files.",
       parameters: DeleteParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const inputs = coerceStringArray(params.files);
@@ -30698,14 +31237,13 @@ function registerFsTools(pi, ctx, surface) {
           throw new Error("delete: `files` must be a non-empty array of paths");
         }
         const files = await Promise.all(inputs.map((file) => resolvePathArg(extCtx.cwd, file)));
+        const restrictToProjectRoot = ctx.config.restrict_to_project_root ?? false;
         const checked = new Set;
         for (const file of files) {
           if (checked.has(file))
             continue;
           checked.add(file);
-          await assertExternalDirectoryPermission(extCtx, file, {
-            restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
-          });
+          await assertExternalDirectoryPermission(extCtx, file, { restrictToProjectRoot });
         }
         const bridge = bridgeFor(ctx, extCtx.cwd);
         const response = await callToolCall(bridge, "delete", {
@@ -30743,10 +31281,9 @@ function registerFsTools(pi, ctx, surface) {
         const filePath = await resolvePathArg(extCtx.cwd, params.path);
         const destination = await resolvePathArg(extCtx.cwd, params.destination);
         const checked = new Set([filePath, destination]);
+        const restrictToProjectRoot = ctx.config.restrict_to_project_root ?? false;
         for (const file of checked) {
-          await assertExternalDirectoryPermission(extCtx, file, {
-            restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
-          });
+          await assertExternalDirectoryPermission(extCtx, file, { restrictToProjectRoot });
         }
         const bridge = bridgeFor(ctx, extCtx.cwd);
         const response = await callToolCall(bridge, "move", {
@@ -32176,6 +32713,12 @@ function piHashlineDowngrade(config, surface) {
     message: 'edit_mode "hashline" is not in effect because "read" is in disabled_tools (hashline edits need tagged reads); registered tools keep their ordinary behavior.'
   };
 }
+function withLiveRestriction(surface, ctx) {
+  return Object.defineProperty({ ...surface }, "restrictToProjectRoot", {
+    enumerable: true,
+    get: () => ctx.config.restrict_to_project_root ?? false
+  });
+}
 function resolvePiToolSurface(config, pi) {
   const disabled = new Set(resolvedDisabledTools(config));
   const ok = (name) => !disabled.has(name);
@@ -32228,7 +32771,8 @@ function bindToolRegistrationFunnel(pi, ctx, harness) {
     }
   });
 }
-function registerPiToolSurface(pi, ctx, surface, harness) {
+function registerPiToolSurface(pi, ctx, loadedSurface, harness) {
+  const surface = withLiveRestriction(loadedSurface, ctx);
   const boundPi = bindToolRegistrationFunnel(pi, ctx, harness);
   if (surface.hoistBash)
     registerBashTool(boundPi, ctx, surface.semantic, "bash", false);
@@ -32262,6 +32806,8 @@ var CONFIG_ERROR_STATUS_KEY = "aft";
 var defaultDependencies = {
   loadConfig: loadAftConfig,
   configLoadErrors: getConfigLoadErrors,
+  configLoadSources: getConfigLoadSources,
+  configLoadTexts: getConfigLoadTexts,
   migrateConfigLocations: (directory) => migrateAftConfigLocations(directory, bridgeLogger).flatMap((result) => result.warnings),
   subcConnectionFileError
 };
@@ -32280,6 +32826,8 @@ function parseFailure(dependencies) {
 }
 async function resolvePiBootstrapConfig(directory, notify, dependencies = defaultDependencies) {
   let config;
+  let sources = [];
+  let sourceTexts = {};
   try {
     dependencies.loadConfig(directory);
     const firstFailure = parseFailure(dependencies);
@@ -32291,11 +32839,13 @@ async function resolvePiBootstrapConfig(directory, notify, dependencies = defaul
     const failure = parseFailure(dependencies);
     if (failure)
       return configErrorState(failure, notify);
+    sources = [...dependencies.configLoadSources?.() ?? []];
+    sourceTexts = Object.fromEntries(dependencies.configLoadTexts?.() ?? []);
   } catch (err) {
     return configErrorState(err instanceof Error ? err.message : String(err), notify);
   }
   const missing = await dependencies.subcConnectionFileError(config.subc?.connection_file);
-  return missing === null ? { ok: true, config } : configErrorState(missing, notify, config);
+  return missing === null ? { ok: true, config, sources, sourceTexts } : configErrorState(missing, notify, config);
 }
 function failingRegistrations(pi, message) {
   const registerTool = (tool) => {
@@ -32331,6 +32881,58 @@ function registerPiConfigErrorState(pi, config, message) {
   log2("AFT is in the config error state; every tool call will fail");
 }
 
+// src/config-live-reload.ts
+var PI_LIVE_CONFIG_KEYS = aftLiveConfigKeys((config) => resolveBashConfig(config));
+function projectTextOf(directory) {
+  const { projectConfigPath } = resolveCortexKitConfigPaths(directory);
+  return getConfigLoadTexts().get(projectConfigPath) ?? null;
+}
+function loadPiConfigForLiveReload(directory) {
+  try {
+    const config = loadAftConfig(directory);
+    const [failure] = getConfigLoadErrors();
+    if (failure) {
+      return { ok: false, message: formatConfigParseErrorMessage(failure.path, failure.message) };
+    }
+    const [invalid] = getConfigValidationErrors();
+    if (invalid) {
+      return {
+        ok: false,
+        message: `AFT config at ${invalid.path} has an invalid setting: ${invalid.message}`
+      };
+    }
+    return {
+      ok: true,
+      config,
+      sources: [...getConfigLoadSources()],
+      projectText: projectTextOf(directory),
+      texts: Object.fromEntries(getConfigLoadTexts())
+    };
+  } catch (err) {
+    return { ok: false, message: err instanceof Error ? err.message : String(err) };
+  }
+}
+function startPiLiveConfigReload(options) {
+  const { userConfigPath, projectConfigPath } = resolveCortexKitConfigPaths(options.directory);
+  return startLiveConfigReload({
+    paths: [userConfigPath, projectConfigPath],
+    load: () => loadPiConfigForLiveReload(options.directory),
+    initialSources: options.initialSources,
+    initialProjectText: options.initialSourceTexts?.[projectConfigPath] ?? null,
+    initialTexts: options.initialSourceTexts,
+    securityKeys: aftLiveSecurityKeys(PI_LIVE_CONFIG_KEYS),
+    keys: PI_LIVE_CONFIG_KEYS,
+    getConfig: options.getConfig,
+    setConfig: options.setConfig,
+    log: (message) => log2(`${message} (${options.directory})`),
+    reportError: (message) => {
+      error2(message);
+      options.notify(message);
+    },
+    watch: options.watch
+  });
+}
+
 // src/shutdown-hooks.ts
 var GLOBAL_KEY = "__aftPiShutdownHooks__";
 function getState() {
@@ -32503,6 +33105,8 @@ function buildHintsFromConfig(config, absentTools, hashlineEffective = false) {
   });
 }
 function registerWorkflowHints(pi, config, surface) {
+  if (skipsEagerStartup())
+    return;
   const absent = new Set;
   if (!surface.outline)
     absent.add("aft_outline");
@@ -32956,6 +33560,16 @@ ${lines}
     hashlineEffective: hashlineEditRegistered,
     storageDir
   };
+  const liveConfigReload = startPiLiveConfigReload({
+    directory: projectRoot,
+    initialSources: bootstrap.sources ?? [],
+    initialSourceTexts: bootstrap.sourceTexts,
+    getConfig: () => ctx.config,
+    setConfig: (next) => {
+      ctx.config = next;
+    },
+    notify: (message) => deliverConfigMigrationWarnings([message])
+  });
   if (onnxRuntimePromise) {
     onnxRuntimePromise.then((ortDylibDir) => {
       if (ortDylibDir) {
@@ -33062,6 +33676,7 @@ Retry with: npx @cortexkit/aft doctor --fix`
   });
   const unregisterShutdownCleanup = registerShutdownCleanup(async () => {
     hostShutdownStarted = true;
+    liveConfigReload.stop();
     try {
       await Promise.allSettled([abortInFlightAutoInstalls(), abortInFlightGithubInstalls()]);
       await pool.shutdown();
@@ -33072,6 +33687,7 @@ Retry with: npx @cortexkit/aft doctor --fix`
   });
   pi.on("session_shutdown", async () => {
     hostShutdownStarted = true;
+    liveConfigReload.stop();
     try {
       await Promise.allSettled([abortInFlightAutoInstalls(), abortInFlightGithubInstalls()]);
       await pool.shutdown();