@cortexkit/aft-pi 0.39.2 → 0.39.4

package/dist/index.js

@@ -12177,6 +12177,21 @@ class BridgeReplacedDuringVersionCheck extends Error {
   }
 }
 
+class BridgeTransportTimeoutError extends Error {
+  command;
+  timeoutMs;
+  code = "transport_timeout";
+  constructor(command, timeoutMs, message) {
+    super(message);
+    this.command = command;
+    this.timeoutMs = timeoutMs;
+    this.name = "BridgeTransportTimeoutError";
+  }
+}
+function isBridgeTransportTimeout(err) {
+  return err instanceof Error && err.code === "transport_timeout";
+}
+
 class BinaryBridge {
   static RESTART_RESET_MS = 5 * 60 * 1000;
   static STDERR_TAIL_MAX = 20;
@@ -12404,7 +12419,7 @@ class BinaryBridge {
             } else {
               this.warnVia(timeoutMsg2);
             }
-            entry.reject(new Error(`${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`));
             return;
           }
           const childActiveSinceRequest = this.lastChildActivityAt > requestSentAt;
@@ -12940,6 +12955,220 @@ class BinaryBridge {
     }
   }
 }
+// ../aft-bridge/dist/callgraph-format.js
+import { homedir as homedir3 } from "node:os";
+var PLAIN_CALLGRAPH_THEME = {
+  fg: (_role, text) => text
+};
+function asRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return;
+  return value;
+}
+function asRecords(value) {
+  return Array.isArray(value) ? value.map(asRecord).filter(Boolean) : [];
+}
+function asString(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function asNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function asBoolean(value) {
+  return typeof value === "boolean" ? value : undefined;
+}
+function shortenPath(path2) {
+  const home = homedir3();
+  if (path2.startsWith(home))
+    return `~${path2.slice(home.length)}`;
+  return path2;
+}
+function joinNonEmpty(parts, separator = " · ") {
+  return parts.filter((part) => Boolean(part && part.length > 0)).join(separator);
+}
+function treeLine(depth, text) {
+  return `${"  ".repeat(depth)}${depth === 0 ? "" : "↳ "}${text}`;
+}
+function nameMatchEdgeMarker(record, theme) {
+  return asString(record.resolved_by) === "name_match" ? ` ${theme.fg("warning", "~")}` : "";
+}
+function renderCallTreeNode(node, depth, lines, theme) {
+  const name = asString(node.name) ?? "(unknown)";
+  const file = shortenPath(asString(node.file) ?? "(unknown file)");
+  const line = asNumber(node.line);
+  const unresolved = node.resolved === false ? ` ${theme.fg("warning", "[unresolved]")}` : "";
+  const nameMatch = nameMatchEdgeMarker(node, theme);
+  const location = line !== undefined ? `[${file}:${line}]` : `[${file}]`;
+  lines.push(treeLine(depth, `${name} ${location}${unresolved}${nameMatch}`));
+  asRecords(node.children).forEach((child) => {
+    renderCallTreeNode(child, depth + 1, lines, theme);
+  });
+}
+function depthWarning(response, theme, depthField = "depth_limited", truncatedField = "truncated") {
+  const limited = asBoolean(response[depthField]);
+  const truncated = asNumber(response[truncatedField]) ?? 0;
+  if (!limited && truncated === 0)
+    return "";
+  const detail = truncated > 0 ? `, ${truncated} truncated` : "";
+  return theme.fg("warning", `(depth limited${detail})`);
+}
+function renderTracePath(path2, index, lines, theme) {
+  lines.push(`Path ${index + 1}`);
+  asRecords(path2.hops).forEach((hop, hopIndex) => {
+    const symbol = asString(hop.symbol) ?? "(unknown)";
+    const file = shortenPath(asString(hop.file) ?? "(unknown file)");
+    const line = asNumber(hop.line);
+    const entry = hop.is_entry_point === true ? " [entry]" : "";
+    const nameMatch = nameMatchEdgeMarker(hop, theme);
+    lines.push(treeLine(hopIndex + 1, `${symbol}${entry} ${line !== undefined ? `[${file}:${line}]` : `[${file}]`}${nameMatch}`));
+  });
+}
+function renderCallersGroupLines(group, theme) {
+  const file = shortenPath(asString(group.file) ?? "(unknown file)");
+  const lines = [theme.fg("accent", file)];
+  const callers = asRecords(group.callers);
+  const bySymbolProvenance = new Map;
+  for (const caller of callers) {
+    const symbol = asString(caller.symbol) ?? "(unknown)";
+    const provenanceKey = asString(caller.resolved_by) === "name_match" ? `${symbol}\x00name_match` : `${symbol}\x00exact`;
+    const line = asNumber(caller.line);
+    const bucket = bySymbolProvenance.get(provenanceKey) ?? [];
+    if (line !== undefined)
+      bucket.push(line);
+    bySymbolProvenance.set(provenanceKey, bucket);
+  }
+  const keys = [...bySymbolProvenance.keys()].sort((a, b) => a.localeCompare(b));
+  for (const key of keys) {
+    const symbol = key.split("\x00")[0] ?? "(unknown)";
+    const isNameMatch = key.endsWith("\x00name_match");
+    const lineNums = (bySymbolProvenance.get(key) ?? []).sort((a, b) => a - b);
+    const linePart = lineNums.length > 0 ? lineNums.map(String).join(", ") : "?";
+    const marker = isNameMatch ? ` ${theme.fg("warning", "~")}` : "";
+    lines.push(`  ↳ ${symbol}:${linePart}${marker}`);
+  }
+  return lines;
+}
+function formatCallgraphSections(op, response, theme = PLAIN_CALLGRAPH_THEME) {
+  const record = asRecord(response);
+  if (!record)
+    return [theme.fg("muted", "No navigation result.")];
+  if (op === "call_tree") {
+    const lines = [];
+    renderCallTreeNode(record, 0, lines, theme);
+    const warning = depthWarning(record, theme);
+    if (warning)
+      lines.push(warning);
+    return lines.length > 0 ? lines : [theme.fg("muted", "No call tree available.")];
+  }
+  if (op === "callers") {
+    const groups = asRecords(record.callers);
+    const warning = depthWarning(record, theme);
+    const total = asNumber(record.total_callers) ?? 0;
+    const sections2 = [
+      joinNonEmpty([
+        theme.fg("success", `${total} caller${total === 1 ? "" : "s"}`),
+        theme.fg("muted", `${groups.length} file group${groups.length === 1 ? "" : "s"}`),
+        warning
+      ])
+    ];
+    groups.forEach((group) => {
+      sections2.push(renderCallersGroupLines(group, theme).join(`
+`));
+    });
+    return sections2;
+  }
+  if (op === "trace_to_symbol") {
+    const path2 = asRecords(record.path);
+    const complete = asBoolean(record.complete);
+    const reason = asString(record.reason);
+    if (path2.length === 0) {
+      const prefix = complete === false ? theme.fg("warning", "No complete path") : theme.fg("muted", "No path");
+      return [`${prefix}${reason ? ` (${reason})` : ""}`];
+    }
+    const lines = [theme.fg("success", `${path2.length} hop${path2.length === 1 ? "" : "s"}`)];
+    path2.forEach((hop, index) => {
+      const symbol = asString(hop.symbol) ?? "(unknown)";
+      const file = shortenPath(asString(hop.file) ?? "(unknown file)");
+      const line = asNumber(hop.line);
+      const nameMatch = nameMatchEdgeMarker(hop, theme);
+      lines.push(treeLine(index + 1, `${symbol} ${line !== undefined ? `[${file}:${line}]` : `[${file}]`}${nameMatch}`));
+    });
+    return lines;
+  }
+  if (op === "trace_to") {
+    const paths = asRecords(record.paths);
+    const warning = depthWarning(record, theme, "max_depth_reached", "truncated_paths");
+    const totalPaths = asNumber(record.total_paths) ?? paths.length;
+    const entryPoints = asNumber(record.entry_points_found) ?? 0;
+    const sections2 = [
+      joinNonEmpty([
+        theme.fg("success", `${totalPaths} path${totalPaths === 1 ? "" : "s"}`),
+        theme.fg("muted", `${entryPoints} entry point${entryPoints === 1 ? "" : "s"}`),
+        warning
+      ])
+    ];
+    if (paths.length === 0)
+      sections2.push(theme.fg("muted", "No entry paths found."));
+    paths.forEach((path2, index) => {
+      const lines = [];
+      renderTracePath(path2, index, lines, theme);
+      sections2.push(lines.join(`
+`));
+    });
+    return sections2;
+  }
+  if (op === "impact") {
+    const callers = asRecords(record.callers);
+    const warning = depthWarning(record, theme);
+    const totalAffected = asNumber(record.total_affected) ?? callers.length;
+    const affectedFiles = asNumber(record.affected_files) ?? 0;
+    const sections2 = [
+      joinNonEmpty([
+        theme.fg("warning", `${totalAffected} affected call site${totalAffected === 1 ? "" : "s"}`),
+        theme.fg("muted", `${affectedFiles} file${affectedFiles === 1 ? "" : "s"}`),
+        warning
+      ])
+    ];
+    if (callers.length === 0)
+      sections2.push(theme.fg("muted", "No impacted callers found."));
+    callers.forEach((caller) => {
+      const file = shortenPath(asString(caller.caller_file) ?? "(unknown file)");
+      const symbol = asString(caller.caller_symbol) ?? "(unknown)";
+      const line = asNumber(caller.line) ?? 0;
+      const entry = caller.is_entry_point === true ? ` ${theme.fg("warning", "[entry]")}` : "";
+      const nameMatch = nameMatchEdgeMarker(caller, theme);
+      const expression = asString(caller.call_expression);
+      const params = Array.isArray(caller.parameters) ? caller.parameters.map(String).join(", ") : "";
+      sections2.push([
+        `${theme.fg("accent", file)}:${line}`,
+        `  ↳ ${symbol}${entry}${nameMatch}`,
+        expression ? `  ${theme.fg("muted", expression)}` : undefined,
+        params ? `  ${theme.fg("muted", `params: ${params}`)}` : undefined
+      ].filter(Boolean).join(`
+`));
+    });
+    return sections2;
+  }
+  const hops = asRecords(record.hops);
+  const sections = [
+    joinNonEmpty([
+      theme.fg("success", `${hops.length} hop${hops.length === 1 ? "" : "s"}`),
+      asBoolean(record.depth_limited) ? theme.fg("warning", "(depth limited)") : undefined
+    ])
+  ];
+  if (hops.length === 0)
+    sections.push(theme.fg("muted", "No data-flow hops found."));
+  hops.forEach((hop, index) => {
+    const file = shortenPath(asString(hop.file) ?? "(unknown file)");
+    const symbol = asString(hop.symbol) ?? "(unknown)";
+    const variable = asString(hop.variable) ?? "(unknown)";
+    const line = asNumber(hop.line) ?? 0;
+    const approximate = hop.approximate === true ? ` ${theme.fg("warning", "[approx]")}` : "";
+    const nameMatch = nameMatchEdgeMarker(hop, theme);
+    sections.push(treeLine(index, `${variable} ${theme.fg("muted", `${asString(hop.flow_type) ?? "flow"}`)} ${symbol} [${file}:${line}]${approximate}${nameMatch}`));
+  });
+  return sections;
+}
 // ../aft-bridge/dist/coerce.js
 function coerceStringArray(value) {
   if (Array.isArray(value)) {
@@ -12990,7 +13219,7 @@ function isEmptyParam(value) {
 import { spawnSync } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 import { join as join3 } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
@@ -13048,10 +13277,10 @@ function isExpectedCachedBinary(binaryPath, tag) {
 function getCacheDir() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join3(homedir3(), "AppData", "Local");
+    const base2 = localAppData || join3(homedir4(), "AppData", "Local");
     return join3(base2, "aft", "bin");
   }
-  const base = process.env.XDG_CACHE_HOME || join3(homedir3(), ".cache");
+  const base = process.env.XDG_CACHE_HOME || join3(homedir4(), ".cache");
   return join3(base, "aft", "bin");
 }
 function getBinaryName() {
@@ -13293,7 +13522,7 @@ function formatEditSummary(data) {
   if (data.created === true) {
     let s2 = `Created file (${counts}).`;
     if (data.formatted)
-      s2 += " Auto-formatted.";
+      s2 += formatAutoFormattedSuffix(data);
     return s2;
   }
   let detail = counts;
@@ -13304,9 +13533,21 @@ function formatEditSummary(data) {
   }
   let s = `Edited (${detail}).`;
   if (data.formatted)
-    s += " Auto-formatted.";
+    s += formatAutoFormattedSuffix(data);
   return s;
 }
+function formatAutoFormattedSuffix(data) {
+  const reflowText = data.reformatted?.text;
+  if (typeof reflowText === "string" && reflowText.length > 0) {
+    return `
+Auto-formatted — the formatter reflowed your edit. On disk now:
+${reflowText}`;
+  }
+  if (data.reformatted?.extensive === true) {
+    return " Auto-formatted — extensive reflow; re-read the file before your next anchored edit.";
+  }
+  return " Auto-formatted.";
+}
 // ../aft-bridge/dist/format.js
 function compressionSavingsPercent(original, compressed) {
   if (original <= 0)
@@ -13331,7 +13572,7 @@ function stripJsoncSymbols(value) {
 // ../aft-bridge/dist/migration.js
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync4, mkdirSync as mkdirSync4 } from "node:fs";
-import { homedir as homedir5, tmpdir } from "node:os";
+import { homedir as homedir6, tmpdir } from "node:os";
 import { dirname as dirname2, join as join6 } from "node:path";
 
 // ../aft-bridge/dist/paths.js
@@ -13388,7 +13629,7 @@ function markAnnouncementSeen(storageRoot, harness, currentVersion) {
 import { execSync } from "node:child_process";
 import { chmodSync as chmodSync2, closeSync as closeSync2, copyFileSync as copyFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync3, openSync as openSync2, readSync, renameSync as renameSync3, unlinkSync as unlinkSync2 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
-import { homedir as homedir4 } from "node:os";
+import { homedir as homedir5 } from "node:os";
 import { join as join5 } from "node:path";
 var ensureBinaryForResolver = ensureBinary;
 function copyToVersionedCache(npmBinaryPath, knownVersion) {
@@ -13430,7 +13671,7 @@ function normalizeBareVersion(version) {
   return version.startsWith("v") ? version.slice(1) : version;
 }
 function homeDirFromEnv(env) {
-  return (process.platform === "win32" ? env.USERPROFILE || env.HOME : env.HOME) || homedir4();
+  return (process.platform === "win32" ? env.USERPROFILE || env.HOME : env.HOME) || homedir5();
 }
 function cacheDirFromEnv(env) {
   if (process.platform === "win32") {
@@ -13612,8 +13853,8 @@ function dataHome() {
 }
 function homeDir() {
   if (process.platform === "win32")
-    return process.env.USERPROFILE || process.env.HOME || homedir5();
-  return process.env.HOME || homedir5();
+    return process.env.USERPROFILE || process.env.HOME || homedir6();
+  return process.env.HOME || homedir6();
 }
 function resolveLegacyStorageRoot(harness) {
   if (harness === "pi")
@@ -13703,13 +13944,13 @@ async function ensureStorageMigrated(opts) {
 }
 // ../aft-bridge/dist/npm-resolver.js
 import { readdirSync, statSync as statSync2 } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { delimiter, dirname as dirname3, isAbsolute as isAbsolute2, join as join7 } from "node:path";
 function defaultDeps() {
   return {
     platform: process.platform,
     env: process.env,
-    home: homedir6(),
+    home: homedir7(),
     execPath: process.execPath
   };
 }
@@ -15044,13 +15285,13 @@ function tokenizeStage(stage) {
 }
 // ../aft-bridge/dist/pool.js
 import { realpathSync as realpathSync2 } from "node:fs";
-import { homedir as homedir7 } from "node:os";
+import { homedir as homedir8 } from "node:os";
 var DEFAULT_IDLE_TIMEOUT_MS = 30 * 60 * 1000;
 var DEFAULT_MAX_POOL_SIZE = 8;
 var CLEANUP_INTERVAL_MS = 60 * 1000;
 function canonicalHomeDir() {
   try {
-    const home = homedir7();
+    const home = homedir8();
     if (!home)
       return null;
     try {
@@ -16073,7 +16314,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.39.2",
+  version: "0.39.4",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -16096,7 +16337,7 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.39.2",
+    "@cortexkit/aft-bridge": "0.39.4",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
@@ -16104,12 +16345,12 @@ var package_default = {
     zod: "^4.1.8"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.39.2",
-    "@cortexkit/aft-darwin-x64": "0.39.2",
-    "@cortexkit/aft-linux-arm64": "0.39.2",
-    "@cortexkit/aft-linux-x64": "0.39.2",
-    "@cortexkit/aft-win32-arm64": "0.39.2",
-    "@cortexkit/aft-win32-x64": "0.39.2"
+    "@cortexkit/aft-darwin-arm64": "0.39.4",
+    "@cortexkit/aft-darwin-x64": "0.39.4",
+    "@cortexkit/aft-linux-arm64": "0.39.4",
+    "@cortexkit/aft-linux-x64": "0.39.4",
+    "@cortexkit/aft-win32-arm64": "0.39.4",
+    "@cortexkit/aft-win32-x64": "0.39.4"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "*",
@@ -16136,7 +16377,7 @@ var package_default = {
 };
 
 // src/shared/status.ts
-function asRecord(value) {
+function asRecord2(value) {
   return typeof value === "object" && value !== null ? value : {};
 }
 function readString(value, fallback = "") {
@@ -16155,7 +16396,7 @@ function readOptionalNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 function readCompressionAggregate(value) {
-  const aggregate = asRecord(value);
+  const aggregate = asRecord2(value);
   return {
     events: readNumber(aggregate.events),
     original_tokens: readNumber(aggregate.original_tokens),
@@ -16166,7 +16407,7 @@ function readCompressionAggregate(value) {
 function readCompression(value) {
   if (typeof value !== "object" || value === null)
     return;
-  const compression = asRecord(value);
+  const compression = asRecord2(value);
   return {
     project: readCompressionAggregate(compression.project),
     session: readCompressionAggregate(compression.session)
@@ -16175,7 +16416,7 @@ function readCompression(value) {
 function readStatusBar(value) {
   if (typeof value !== "object" || value === null)
     return;
-  const bar = asRecord(value);
+  const bar = asRecord2(value);
   return {
     errors: readNumber(bar.errors),
     warnings: readNumber(bar.warnings),
@@ -16219,16 +16460,16 @@ function formatBytes(bytes) {
   return `${value.toFixed(decimals)} ${units[unitIndex]}`;
 }
 function coerceAftStatus(response) {
-  const features = asRecord(response.features);
-  const searchIndex = asRecord(response.search_index);
-  const semanticIndex = asRecord(response.semantic_index);
+  const features = asRecord2(response.features);
+  const searchIndex = asRecord2(response.search_index);
+  const semanticIndex = asRecord2(response.semantic_index);
   const semanticConfig = {
-    ...asRecord(response.semantic),
-    ...asRecord(response.semantic_config)
+    ...asRecord2(response.semantic),
+    ...asRecord2(response.semantic_config)
   };
-  const disk = asRecord(response.disk);
-  const symbolCache = asRecord(response.symbol_cache);
-  const session = asRecord(response.session);
+  const disk = asRecord2(response.disk);
+  const symbolCache = asRecord2(response.symbol_cache);
+  const session = asRecord2(response.session);
   return {
     version: readString(response.version, "unknown"),
     project_root: readNullableString(response.project_root),
@@ -16684,7 +16925,7 @@ function registerStatusCommand(pi, ctx) {
 
 // src/config.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4, renameSync as renameSync4, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { homedir as homedir8 } from "node:os";
+import { homedir as homedir9 } from "node:os";
 import { join as join10 } from "node:path";
 var import_comment_json = __toESM(require_src2(), 1);
 
@@ -30381,6 +30622,8 @@ var AftConfigSchema = exports_external.object({
   restrict_to_project_root: exports_external.boolean().optional(),
   search_index: exports_external.boolean().optional(),
   semantic_search: exports_external.boolean().optional(),
+  callgraph_store: exports_external.boolean().optional(),
+  callgraph_chunk_size: exports_external.number().optional(),
   inspect: InspectConfigSchema.optional(),
   bash: BashConfigSchema.optional(),
   experimental: ExperimentalConfigSchema.optional(),
@@ -30441,6 +30684,37 @@ function resolveLspConfigForConfigure(config2) {
   }
   return overrides;
 }
+function resolveProjectOverridesForConfigure(config2) {
+  const overrides = {};
+  if (config2.format_on_edit !== undefined)
+    overrides.format_on_edit = config2.format_on_edit;
+  if (config2.formatter_timeout_secs !== undefined)
+    overrides.formatter_timeout_secs = config2.formatter_timeout_secs;
+  if (config2.validate_on_edit !== undefined)
+    overrides.validate_on_edit = config2.validate_on_edit;
+  if (config2.formatter !== undefined)
+    overrides.formatter = config2.formatter;
+  if (config2.checker !== undefined)
+    overrides.checker = config2.checker;
+  overrides.restrict_to_project_root = config2.restrict_to_project_root ?? false;
+  if (config2.search_index !== undefined)
+    overrides.search_index = config2.search_index;
+  if (config2.semantic_search !== undefined)
+    overrides.semantic_search = config2.semantic_search;
+  if (config2.callgraph_store !== undefined)
+    overrides.callgraph_store = config2.callgraph_store;
+  if (config2.callgraph_chunk_size !== undefined)
+    overrides.callgraph_chunk_size = config2.callgraph_chunk_size;
+  Object.assign(overrides, resolveExperimentalConfigForConfigure(config2));
+  Object.assign(overrides, resolveLspConfigForConfigure(config2));
+  if (config2.semantic !== undefined)
+    overrides.semantic = config2.semantic;
+  if (config2.inspect !== undefined)
+    overrides.inspect = config2.inspect;
+  if (config2.max_callgraph_files !== undefined)
+    overrides.max_callgraph_files = config2.max_callgraph_files;
+  return overrides;
+}
 function resolveExperimentalConfigForConfigure(config2) {
   const overrides = {};
   const bash = resolveBashConfig(config2);
@@ -30617,6 +30891,17 @@ function detectConfigFile(basePath) {
     return { format: "json", path: jsonPath };
   return { format: "none", path: jsonPath };
 }
+var configLoadErrors = [];
+function getConfigLoadErrors() {
+  return configLoadErrors;
+}
+function formatConfigParseFailureMessage(configPath, errorMessage) {
+  return `AFT config at ${configPath} failed to parse and was ignored (running on defaults): ${errorMessage}. ` + "Fix the syntax or run `npx @cortexkit/aft doctor`.";
+}
+function recordConfigParseFailure(configPath, errorMessage) {
+  configLoadErrors.push({ path: configPath, message: errorMessage });
+  warn2(formatConfigParseFailureMessage(configPath, errorMessage));
+}
 function loadConfigFromPath(configPath) {
   try {
     if (!existsSync6(configPath))
@@ -30624,7 +30909,7 @@ function loadConfigFromPath(configPath) {
     const content = readFileSync4(configPath, "utf-8");
     const rawConfig = import_comment_json.parse(content);
     if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
-      warn2(`Config validation error in ${configPath}: root must be an object`);
+      recordConfigParseFailure(configPath, "root must be an object");
       return null;
     }
     migrateRawConfig(rawConfig, configPath, { log: log2, warn: warn2 });
@@ -30640,6 +30925,7 @@ function loadConfigFromPath(configPath) {
   } catch (err) {
     const errorMsg = err instanceof Error ? err.message : String(err);
     error2(`Error loading config from ${configPath}: ${errorMsg}`);
+    recordConfigParseFailure(configPath, errorMsg);
     return null;
   }
 }
@@ -30775,6 +31061,8 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "configure_warnings_delivery",
   "search_index",
   "semantic_search",
+  "callgraph_store",
+  "callgraph_chunk_size",
   "inspect",
   "experimental",
   "bash"
@@ -30836,9 +31124,10 @@ function resolveBridgePoolTransportOptions(config2) {
   };
 }
 function getGlobalPiDir() {
-  return join10(homedir8(), ".pi", "agent");
+  return join10(homedir9(), ".pi", "agent");
 }
 function loadAftConfig(projectDirectory) {
+  configLoadErrors = [];
   const userBasePath = join10(getGlobalPiDir(), "aft");
   migrateAftConfigFile(`${userBasePath}.jsonc`);
   migrateAftConfigFile(`${userBasePath}.json`);
@@ -30893,7 +31182,7 @@ import {
   unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync4
 } from "node:fs";
-import { homedir as homedir9 } from "node:os";
+import { homedir as homedir10 } from "node:os";
 import { join as join11 } from "node:path";
 function aftCacheBase() {
   const override = process.env.AFT_CACHE_DIR;
@@ -30901,10 +31190,10 @@ function aftCacheBase() {
     return override;
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join11(homedir9(), "AppData", "Local");
+    const base2 = localAppData || join11(homedir10(), "AppData", "Local");
     return join11(base2, "aft");
   }
-  const base = process.env.XDG_CACHE_HOME || join11(homedir9(), ".cache");
+  const base = process.env.XDG_CACHE_HOME || join11(homedir10(), ".cache");
   return join11(base, "aft");
 }
 function lspCacheRoot() {
@@ -32617,6 +32906,8 @@ function warningTitle(warning) {
       return "Checker is not installed";
     case "lsp_binary_missing":
       return "LSP binary is missing";
+    case "config_parse_failed":
+      return "Config failed to parse";
   }
 }
 function formatConfigureWarning(warning) {
@@ -32862,7 +33153,7 @@ import { Type as Type3 } from "typebox";
 
 // src/tools/hoisted.ts
 import { stat } from "node:fs/promises";
-import { homedir as homedir10 } from "node:os";
+import { homedir as homedir11 } from "node:os";
 import { isAbsolute as isAbsolute4, relative as relative4, resolve as resolve4, sep } from "node:path";
 import {
   renderDiff
@@ -32984,9 +33275,9 @@ function expandTilde2(path3) {
   if (!path3 || !path3.startsWith("~"))
     return path3;
   if (path3 === "~")
-    return homedir10();
+    return homedir11();
   if (path3.startsWith(`~${sep}`) || path3.startsWith("~/")) {
-    return resolve4(homedir10(), path3.slice(2));
+    return resolve4(homedir11(), path3.slice(2));
   }
   return path3;
 }
@@ -33044,14 +33335,7 @@ function appendSkippedSearchPaths(text, missing) {
 
 ${note}` : note;
 }
-function externalDirectoryPromptTimeoutMs() {
-  const raw = process.env.AFT_PI_EXTERNAL_PROMPT_TIMEOUT_MS;
-  if (raw === undefined)
-    return 30000;
-  const parsed = Number.parseInt(raw, 10);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : 30000;
-}
-async function assertExternalDirectoryPermission(extCtx, target, action = "modify", options = {}) {
+async function assertExternalDirectoryPermission(extCtx, target, options = {}) {
   if (!target)
     return;
   const expanded = expandTilde2(target);
@@ -33060,30 +33344,7 @@ async function assertExternalDirectoryPermission(extCtx, target, action = "modif
     return;
   if (options.restrictToProjectRoot === false)
     return;
-  const confirmFn = extCtx.ui?.confirm;
-  if (extCtx.hasUI === false || !confirmFn) {
-    throw new Error(`Permission denied: cannot prompt for ${action} outside the project (${absoluteTarget}).`);
-  }
-  const timeoutMs = externalDirectoryPromptTimeoutMs();
-  let timer;
-  const timeoutPromise = new Promise((resolve5) => {
-    timer = setTimeout(() => resolve5("timeout"), timeoutMs);
-  });
-  try {
-    const result = await Promise.race([
-      confirmFn("Allow external directory access?", `AFT wants to ${action} outside the project: ${absoluteTarget}`),
-      timeoutPromise
-    ]);
-    if (result === true)
-      return;
-    if (result === "timeout") {
-      throw new Error(`Permission denied: external directory prompt timed out after ${timeoutMs}ms.`);
-    }
-    throw new Error("Permission denied: external directory access was cancelled.");
-  } finally {
-    if (timer !== undefined)
-      clearTimeout(timer);
-  }
+  throw new Error(`Blocked: '${absoluteTarget}' is outside the project root and restrict_to_project_root is ` + "enabled (AFT full isolation). Not overridable per-call; set restrict_to_project_root: false " + "in aft.jsonc to allow external paths.");
 }
 var ReadParams = Type2.Object({
   path: Type2.String({
@@ -33132,7 +33393,7 @@ function registerHoistedTools(pi, ctx, surface) {
         const offset = coerceOptionalInt(params.offset, "offset", 1, Number.MAX_SAFE_INTEGER);
         const limit = coerceOptionalInt(params.limit, "limit", 1, Number.MAX_SAFE_INTEGER);
         const filePath = await resolvePathArg(extCtx.cwd, params.path);
-        await assertExternalDirectoryPermission(extCtx, filePath, "read", {
+        await assertExternalDirectoryPermission(extCtx, filePath, {
           restrictToProjectRoot: surface.restrictToProjectRoot
         });
         const req = {
@@ -33170,7 +33431,7 @@ function registerHoistedTools(pi, ctx, surface) {
       parameters: WriteParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const filePath = await resolvePathArg(extCtx.cwd, params.filePath);
-        await assertExternalDirectoryPermission(extCtx, filePath, "modify", {
+        await assertExternalDirectoryPermission(extCtx, filePath, {
           restrictToProjectRoot: surface.restrictToProjectRoot
         });
         const bridge = bridgeFor(ctx, extCtx.cwd);
@@ -33204,7 +33465,7 @@ function registerHoistedTools(pi, ctx, surface) {
       parameters: EditParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const filePath = await resolvePathArg(extCtx.cwd, params.filePath);
-        await assertExternalDirectoryPermission(extCtx, filePath, "modify", {
+        await assertExternalDirectoryPermission(extCtx, filePath, {
           restrictToProjectRoot: surface.restrictToProjectRoot
         });
         const bridge = bridgeFor(ctx, extCtx.cwd);
@@ -33257,7 +33518,7 @@ function registerHoistedTools(pi, ctx, surface) {
         if (params.path) {
           pathSplit = await splitSearchPathArg(extCtx.cwd, params.path);
           for (const target of pathSplit.paths) {
-            await assertExternalDirectoryPermission(extCtx, absoluteSearchPath(extCtx.cwd, target), "search", {
+            await assertExternalDirectoryPermission(extCtx, absoluteSearchPath(extCtx.cwd, target), {
               restrictToProjectRoot: surface.restrictToProjectRoot
             });
           }
@@ -33380,7 +33641,7 @@ function reuseContainer(last) {
 }
 function renderMutationCall(toolName, filePath, theme, context) {
   const text = reuseText(context.lastComponent);
-  const pathDisplay = filePath ? theme.fg("accent", shortenPath(filePath)) : theme.fg("toolOutput", "...");
+  const pathDisplay = filePath ? theme.fg("accent", shortenPath2(filePath)) : theme.fg("toolOutput", "...");
   text.setText(`${theme.fg("toolTitle", theme.bold(toolName))} ${pathDisplay}`);
   return text;
 }
@@ -33416,8 +33677,8 @@ ${summary}${suffix}`);
   container.addChild(new Text(renderDiff(diff), 1, 0));
   return container;
 }
-function shortenPath(path3) {
-  const home = homedir10();
+function shortenPath2(path3) {
+  const home = homedir11();
   if (path3.startsWith(home))
     return `~${path3.slice(home.length)}`;
   return path3;
@@ -33467,7 +33728,7 @@ function formatReadFooter2(agentSpecifiedRange, data) {
 }
 
 // src/tools/render-helpers.ts
-import { homedir as homedir11 } from "node:os";
+import { homedir as homedir12 } from "node:os";
 import { renderDiff as renderDiff2 } from "@earendil-works/pi-coding-agent";
 import { Container as Container2, Spacer as Spacer2, Text as Text2 } from "@earendil-works/pi-tui";
 function reuseText2(last) {
@@ -33476,8 +33737,8 @@ function reuseText2(last) {
 function reuseContainer2(last) {
   return last instanceof Container2 ? last : new Container2;
 }
-function shortenPath2(path3) {
-  const home = homedir11();
+function shortenPath3(path3) {
+  const home = homedir12();
   if (path3.startsWith(home))
     return `~${path3.slice(home.length)}`;
   return path3;
@@ -33491,7 +33752,7 @@ function renderToolCall(toolName, summary, theme, context) {
 function accentPath(theme, path3) {
   if (!path3)
     return theme.fg("toolOutput", "...");
-  return theme.fg("accent", shortenPath2(path3));
+  return theme.fg("accent", shortenPath3(path3));
 }
 function collectTextContent(result) {
   return result.content.filter((part) => part.type === "text").map((part) => part.text ?? "").join(`
@@ -33530,23 +33791,20 @@ function renderSections(sections, context) {
   });
   return container;
 }
-function asRecord2(value) {
+function asRecord3(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return;
   return value;
 }
-function asRecords(value) {
-  return Array.isArray(value) ? value.map(asRecord2).filter(Boolean) : [];
+function asRecords2(value) {
+  return Array.isArray(value) ? value.map(asRecord3).filter(Boolean) : [];
 }
-function asString(value) {
+function asString2(value) {
   return typeof value === "string" ? value : undefined;
 }
-function asNumber(value) {
+function asNumber2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
-function asBoolean(value) {
-  return typeof value === "boolean" ? value : undefined;
-}
 function formatValue(value) {
   if (Array.isArray(value))
     return value.map(formatValue).join(", ");
@@ -33659,7 +33917,7 @@ var ReplaceParams = Type3.Object({
   dryRun: Type3.Optional(Type3.Boolean({ description: "Preview without applying (default: false)" }))
 });
 function appendHintSection(response, sections, theme) {
-  const hint = asString(response.hint);
+  const hint = asString2(response.hint);
   if (hint && hint.length > 0) {
     sections.push(theme.fg("warning", hint));
   }
@@ -33668,8 +33926,8 @@ function appendScopeSections(response, sections, theme) {
   if (response.no_files_matched_scope === true) {
     sections.push(theme.fg("warning", "No files matched the scope (paths/globs resolved to zero files)"));
   }
-  const warnings = asRecords(response.scope_warnings);
-  const warningStrings = Array.isArray(response.scope_warnings) ? response.scope_warnings.filter((w) => typeof w === "string") : warnings.map((w) => asString(w.warning) ?? "").filter(Boolean);
+  const warnings = asRecords2(response.scope_warnings);
+  const warningStrings = Array.isArray(response.scope_warnings) ? response.scope_warnings.filter((w) => typeof w === "string") : warnings.map((w) => asString2(w.warning) ?? "").filter(Boolean);
   if (warningStrings.length > 0) {
     sections.push(`${theme.fg("muted", "Scope warnings:")}
 ${warningStrings.map((w) => `  ${w}`).join(`
@@ -33681,7 +33939,7 @@ async function resolveAstPaths(extCtx, paths) {
     return;
   return Promise.all(paths.filter((path3) => typeof path3 === "string").map((path3) => resolvePathArg(extCtx.cwd, path3)));
 }
-async function assertAstPathsPermission(extCtx, paths, action, restrictToProjectRoot) {
+async function assertAstPathsPermission(extCtx, paths, restrictToProjectRoot) {
   if (paths === undefined || paths.length === 0)
     return;
   const checked = new Set;
@@ -33689,17 +33947,17 @@ async function assertAstPathsPermission(extCtx, paths, action, restrictToProject
     if (checked.has(path3))
       continue;
     checked.add(path3);
-    await assertExternalDirectoryPermission(extCtx, path3, action, { restrictToProjectRoot });
+    await assertExternalDirectoryPermission(extCtx, path3, { restrictToProjectRoot });
   }
 }
 function buildAstSearchSections(payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No AST search results.")];
-  const matches = asRecords(response.matches);
-  const totalMatches = asNumber(response.total_matches) ?? matches.length;
-  const filesWithMatches = asNumber(response.files_with_matches) ?? groupByFile(matches, (match) => asString(match.file)).size;
-  const filesSearched = asNumber(response.files_searched);
+  const matches = asRecords2(response.matches);
+  const totalMatches = asNumber2(response.total_matches) ?? matches.length;
+  const filesWithMatches = asNumber2(response.files_with_matches) ?? groupByFile(matches, (match) => asString2(match.file)).size;
+  const filesSearched = asNumber2(response.files_searched);
   const header = [
     theme.fg("success", `${totalMatches} match${totalMatches === 1 ? "" : "es"}`),
     theme.fg("accent", `${filesWithMatches} file${filesWithMatches === 1 ? "" : "s"}`),
@@ -33711,26 +33969,26 @@ function buildAstSearchSections(payload, theme) {
     appendHintSection(response, sections2, theme);
     return sections2;
   }
-  const grouped = groupByFile(matches, (match) => asString(match.file));
+  const grouped = groupByFile(matches, (match) => asString2(match.file));
   const sections = [header];
   for (const [file2, fileMatches] of grouped.entries()) {
-    const lines = [theme.fg("accent", shortenPath2(file2))];
+    const lines = [theme.fg("accent", shortenPath3(file2))];
     fileMatches.forEach((match, index) => {
-      const line = asNumber(match.line) ?? 0;
-      const column = asNumber(match.column) ?? 0;
-      const snippet = asString(match.text)?.trim() || "(empty match)";
+      const line = asNumber2(match.line) ?? 0;
+      const column = asNumber2(match.column) ?? 0;
+      const snippet = asString2(match.text)?.trim() || "(empty match)";
       lines.push(`  ${index + 1}. ${theme.fg("muted", `${line}:${column}`)} ${snippet}`);
-      const metaVars = asRecord2(match.meta_variables);
+      const metaVars = asRecord3(match.meta_variables);
       if (metaVars && Object.keys(metaVars).length > 0) {
         Object.entries(metaVars).forEach(([name, value]) => {
           lines.push(`     ${theme.fg("muted", `${name} =`)} ${formatValue(value)}`);
         });
       }
-      const context = asRecords(match.context);
+      const context = asRecords2(match.context);
       context.forEach((ctxLine) => {
-        const ctxNumber = asNumber(ctxLine.line) ?? 0;
+        const ctxNumber = asNumber2(ctxLine.line) ?? 0;
         const prefix = ctxLine.is_match === true ? theme.fg("accent", ">") : theme.fg("muted", "|");
-        lines.push(`     ${prefix} ${ctxNumber}: ${asString(ctxLine.text) ?? ""}`);
+        lines.push(`     ${prefix} ${ctxNumber}: ${asString2(ctxLine.text) ?? ""}`);
       });
     });
     sections.push(lines.join(`
@@ -33739,13 +33997,13 @@ function buildAstSearchSections(payload, theme) {
   return sections;
 }
 function buildAstReplaceSections(payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No AST replace results.")];
-  const files = asRecords(response.files);
-  const totalReplacements = asNumber(response.total_replacements) ?? 0;
-  const totalFiles = asNumber(response.total_files) ?? files.length;
-  const filesWithMatches = asNumber(response.files_with_matches);
+  const files = asRecords2(response.files);
+  const totalReplacements = asNumber2(response.total_replacements) ?? 0;
+  const totalFiles = asNumber2(response.total_files) ?? files.length;
+  const filesWithMatches = asNumber2(response.files_with_matches);
   const dryRun = response.dry_run === true;
   const headerParts = [
     dryRun ? theme.fg("warning", "[dry run]") : theme.fg("success", "[applied]"),
@@ -33761,10 +34019,10 @@ function buildAstReplaceSections(payload, theme) {
     return sections;
   }
   files.forEach((fileResult) => {
-    const file2 = shortenPath2(asString(fileResult.file) ?? "(unknown file)");
-    const replacements = asNumber(fileResult.replacements) ?? 0;
-    const error50 = asString(fileResult.error);
-    const diff = asString(fileResult.diff);
+    const file2 = shortenPath3(asString2(fileResult.file) ?? "(unknown file)");
+    const replacements = asNumber2(fileResult.replacements) ?? 0;
+    const error50 = asString2(fileResult.error);
+    const diff = asString2(fileResult.diff);
     const lines = [
       `${theme.fg("accent", file2)} ${theme.fg("muted", `(${replacements} replacement${replacements === 1 ? "" : "s"})`)}`
     ];
@@ -33774,7 +34032,7 @@ function buildAstReplaceSections(payload, theme) {
       const rendered = renderUnifiedDiff(diff);
       lines.push(rendered || theme.fg("muted", "No diff available."));
     } else {
-      const backupId = asString(fileResult.backup_id);
+      const backupId = asString2(fileResult.backup_id);
       lines.push(backupId ? `${theme.fg("success", "saved")} ${theme.fg("muted", backupId)}` : theme.fg("success", "saved"));
     }
     sections.push(lines.join(`
@@ -33808,7 +34066,7 @@ function registerAstTools(pi, ctx, surface) {
       parameters: SearchParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const paths = await resolveAstPaths(extCtx, params.paths);
-        await assertAstPathsPermission(extCtx, paths, "search", ctx.config.restrict_to_project_root ?? false);
+        await assertAstPathsPermission(extCtx, paths, ctx.config.restrict_to_project_root ?? false);
         const bridge = bridgeFor(ctx, extCtx.cwd);
         const req = {
           pattern: params.pattern,
@@ -33839,7 +34097,7 @@ function registerAstTools(pi, ctx, surface) {
       parameters: ReplaceParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const paths = await resolveAstPaths(extCtx, params.paths);
-        await assertAstPathsPermission(extCtx, paths, params.dryRun === true ? "search" : "modify", ctx.config.restrict_to_project_root ?? false);
+        await assertAstPathsPermission(extCtx, paths, ctx.config.restrict_to_project_root ?? false);
         const bridge = bridgeFor(ctx, extCtx.cwd);
         const req = {
           pattern: params.pattern,
@@ -33871,7 +34129,7 @@ import { Type as Type4 } from "typebox";
 var FOREGROUND_POLL_INTERVAL_MS = 100;
 var BASH_WAIT_POLL_INTERVAL_MS = 100;
 var DEFAULT_BASH_STATUS_WAIT_TIMEOUT_MS = 30000;
-var MAX_BASH_STATUS_WAIT_TIMEOUT_MS = 300000;
+var MAX_BASH_STATUS_WAIT_TIMEOUT_MS = 30 * 60 * 1000;
 var REGEX_WAIT_SCAN_WINDOW_BYTES = 64 * 1024;
 function resolveForegroundWaitMs(configured) {
   const override = process.env.AFT_TEST_FOREGROUND_WAIT_MS;
@@ -33883,7 +34141,8 @@ function resolveForegroundWaitMs(configured) {
   return configured;
 }
 var BASH_TRANSPORT_TIMEOUT_MS = 30000;
-var BashParams = Type4.Object({
+var DEFAULT_HARD_TIMEOUT_MS = 30 * 60 * 1000;
+var BashBaseParams = {
   command: Type4.String({
     description: "Shell command to execute. Supports pipes, redirections, and shell syntax."
   }),
@@ -33893,19 +34152,38 @@ var BashParams = Type4.Object({
   })),
   description: Type4.Optional(Type4.String({
     description: "Human-readable description shown in UI logs. Helps users understand what the command does without reading shell syntax."
-  })),
+  }))
+};
+var BashBackgroundFlagParam = {
   background: Type4.Optional(Type4.Boolean({
-    description: "Spawn command in background and return immediately with a task_id. Use bash_status to poll completion and bash_kill to terminate. Ideal for long-running tasks like builds or dev servers."
-  })),
+    description: "Spawn command in background and return immediately with a task_id. Use bash_watch to wait for completion or output patterns; bash_status for a one-shot snapshot only. Use bash_kill to terminate. Ideal for long-running tasks like builds or dev servers."
+  }))
+};
+var BashCompressionParam = {
   compressed: Type4.Optional(Type4.Boolean({
     description: "Compress output by removing ANSI codes, carriage returns, and excessive blank lines. Default: true. Set to false for raw terminal output including color codes."
-  })),
+  }))
+};
+var BashPtyParams = {
   pty: Type4.Optional(Type4.Boolean({
     description: 'Spawn the command in a real PTY for interactive programs. Implies background: true automatically. Inspect with bash_status({ task_id, output_mode: "screen" }) and send input with bash_write.'
   })),
   ptyRows: optionalInt(1, 60),
   ptyCols: optionalInt(1, 140)
+};
+var BashParams = Type4.Object({
+  ...BashBaseParams,
+  ...BashBackgroundFlagParam,
+  ...BashCompressionParam,
+  ...BashPtyParams
+});
+var BashForegroundOnlyParams = Type4.Object({
+  ...BashBaseParams,
+  ...BashCompressionParam
 });
+function bashParamsForConfig(backgroundEnabled) {
+  return backgroundEnabled ? BashParams : BashForegroundOnlyParams;
+}
 var BashTaskParams = Type4.Object({
   task_id: Type4.String({
     description: "Background bash task id returned by bash({ background: true })."
@@ -33946,6 +34224,9 @@ var BashWriteParams = Type4.Object({
     description: "Either a string of verbatim bytes (e.g. 'print(1)\\n') OR an array mixing strings " + "and { key: '<name>' } objects for atomic text+key sequences. " + "Example: [ 'iHello', { key: 'esc' }, ':wq', { key: 'enter' } ]. " + "Allowed key names: enter, return, tab, space, backspace, esc, escape, up, down, " + "left, right, home, end, page-up, page-down, delete, insert, f1..f12, ctrl-a..ctrl-z."
   })
 });
+function unavailableSnapshot() {
+  return { status: "unknown" };
+}
 async function callBashBridge(bridge, command, params = {}, extCtx, options) {
   return await callBridge(bridge, command, params, extCtx, {
     transportTimeoutMs: BASH_TRANSPORT_TIMEOUT_MS,
@@ -33979,28 +34260,30 @@ function registerBashTool(pi, ctx, aftSearchRegistered = false) {
   const searchSteer = aftSearchRegistered ? "use `aft_search` (concepts, identifiers, regex, literals), `read`, `aft_outline`, or `aft_zoom` instead" : "use the `grep` tool, `read`, `aft_outline`, or `aft_zoom` instead";
   const bashCfg = resolveBashConfig(ctx.config);
   const compressionSentence = bashCfg.compress ? " Output is compressed by default; pass `compressed: false` for raw output." : "";
-  const tasksSentence = bashCfg.background ? ' Pass `background: true` to run in the background and get a task_id for `bash_status`/`bash_kill`. Pass `pty: true` for interactive programs (REPLs, TUIs) and drive them with `bash_status({ output_mode: "screen" })` plus `bash_write`.' : " Commands that outlive the foreground wait window are promoted to background tasks; inspect them with `bash_status({ task_id })` or terminate with `bash_kill`.";
+  const tasksSentence = bashCfg.background ? ' Pass `background: true` to run in the background and get a task_id for `bash_status`/`bash_watch`/`bash_kill`. Pass `pty: true` for interactive programs (REPLs, TUIs) and drive them with `bash_status({ output_mode: "screen" })` plus `bash_write`. Use `bash_watch` to wait for exit or output patterns (sync blocks, async notifies). Do not loop `bash_status` to wait.' : " Commands run in the foreground to completion; `timeout` is the hard kill cap (default 30 minutes).";
   pi.registerTool({
     name: "bash",
     label: "bash",
     description: `Execute shell commands.${compressionSentence}${tasksSentence}
 
 DO NOT use bash for code search or code exploration. If you are about to run grep, rg, sed, awk, find, or cat through bash to locate or read code: STOP — ${searchSteer}.`,
-    promptSnippet: "Run shell commands (timeout in milliseconds; supports workdir, background tasks, compressed output, PTY mode)",
+    promptSnippet: bashCfg.background ? "Run shell commands (timeout in milliseconds; supports workdir, background tasks, compressed output, PTY mode)" : "Run shell commands (timeout in milliseconds; supports workdir and compressed output)",
     promptGuidelines: [
       `DO NOT use bash for code search or exploration — ${searchSteer}.`,
       "Set compressed: false when you need ANSI color codes in the output."
     ],
-    parameters: BashParams,
+    parameters: bashParamsForConfig(bashCfg.background),
     async execute(_toolCallId, params, _signal, onUpdate, extCtx) {
       const bridge = bridgeFor(ctx, extCtx.cwd);
       const bashCfg2 = resolveBashConfig(ctx.config);
       const foregroundWaitMs = resolveForegroundWaitMs(bashCfg2.foreground_wait_window_ms);
+      const backgroundDisabled = !bashCfg2.background;
       const timeout = coerceOptionalInt(params.timeout, "timeout", 1, Number.MAX_SAFE_INTEGER);
-      const ptyRows = coerceOptionalInt(params.ptyRows, "ptyRows", 1, 60);
-      const ptyCols = coerceOptionalInt(params.ptyCols, "ptyCols", 1, 140);
-      const effectiveBackground = params.background === true || params.pty === true;
-      const effectiveTimeout = effectiveBackground ? timeout : resolveBashKillTimeout(timeout, foregroundWaitMs);
+      const ptyRows = backgroundDisabled ? undefined : coerceOptionalInt(params.ptyRows, "ptyRows", 1, 60);
+      const ptyCols = backgroundDisabled ? undefined : coerceOptionalInt(params.ptyCols, "ptyCols", 1, 140);
+      const requestedPty = !backgroundDisabled && params.pty === true;
+      const effectiveBackground = !backgroundDisabled && (params.background === true || requestedPty);
+      const effectiveTimeout = effectiveBackground || backgroundDisabled ? timeout : resolveBashKillTimeout(timeout, foregroundWaitMs);
       let spawnContext = {
         command: params.command,
         cwd: params.workdir
@@ -34025,7 +34308,7 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
         background: effectiveBackground,
         notify_on_completion: effectiveBackground,
         compressed: params.compressed,
-        pty: params.pty,
+        pty: requestedPty,
         pty_rows: ptyRows,
         pty_cols: ptyCols
       }, extCtx, {
@@ -34047,9 +34330,9 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
       if (response.status === "running" && taskId) {
         if (effectiveBackground) {
           trackBgTask(resolveSessionId(extCtx), taskId);
-          return bashResult(appendPipeStripNote(formatBackgroundLaunch(taskId, params.pty === true), pipeStrip.note), { task_id: taskId });
+          return bashResult(appendPipeStripNote(formatBackgroundLaunch(taskId, requestedPty), pipeStrip.note), { task_id: taskId });
         }
-        const waitTimeoutMs = effectiveTimeout !== undefined ? Math.min(effectiveTimeout, foregroundWaitMs) : foregroundWaitMs;
+        const waitTimeoutMs = backgroundDisabled ? effectiveTimeout ?? DEFAULT_HARD_TIMEOUT_MS : effectiveTimeout !== undefined ? Math.min(effectiveTimeout, foregroundWaitMs) : foregroundWaitMs;
         const startedAt = Date.now();
         while (true) {
           const status = await callBashBridge(bridge, "bash_status", { task_id: taskId }, extCtx);
@@ -34066,6 +34349,10 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
             });
           }
           if (Date.now() - startedAt >= waitTimeoutMs) {
+            if (backgroundDisabled) {
+              await sleep(FOREGROUND_POLL_INTERVAL_MS);
+              continue;
+            }
             const promoted = await callBashBridge(bridge, "bash_promote", { task_id: taskId }, extCtx);
             if (promoted.success === false) {
               throw new Error(promoted.message ?? "bash_promote failed");
@@ -34093,10 +34380,12 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
       return renderBashResult(result, theme, context);
     }
   });
-  pi.registerTool(createBashStatusTool(ctx));
-  pi.registerTool(createBashWatchTool(ctx));
-  pi.registerTool(createBashWriteTool(ctx));
-  pi.registerTool(createBashKillTool(ctx));
+  if (bashCfg.background) {
+    pi.registerTool(createBashStatusTool(ctx));
+    pi.registerTool(createBashWatchTool(ctx));
+    pi.registerTool(createBashWriteTool(ctx));
+    pi.registerTool(createBashKillTool(ctx));
+  }
 }
 function formatBackgroundLaunch(taskId, isPty) {
   if (isPty) {
@@ -34115,7 +34404,7 @@ function createBashStatusTool(ctx) {
   return {
     name: "bash_status",
     label: "bash_status",
-    description: "Read-only snapshot of a background bash task. Returns immediately. Never waits. Use bash_watch to block on or register for pattern matches and exit events.",
+    description: "Read-only snapshot of a background bash task. Returns immediately. Never waits. One look to check on a task is fine — never loop it to wait for completion. To wait, use bash_watch.",
     promptSnippet: "Inspect a background bash task by task_id",
     parameters: BashStatusParams,
     async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
@@ -34130,7 +34419,7 @@ function createBashWatchTool(ctx) {
   return {
     name: "bash_watch",
     label: "bash_watch",
-    description: "Watch a background bash task. Two modes. Async (background:true, requires pattern) registers a non-blocking notification and returns immediately — use this to be pinged when a specific line appears or the task exits, without freezing your turn. Sync (default) blocks until a pattern matches/the task exits/timeout, and is ONLY for short bounded waits (seconds, e.g. a dev server printing a readiness line). Do NOT sync-wait for a long task (build/test/install): blocking locks the user out until it ends — instead end your turn and let the automatic completion reminder arrive, or use async mode.",
+    description: "Watch a background bash task. Sync (default) blocks until a pattern matches, the task exits, or timeout — use it when the result is the next thing you need, even for long builds/tests/installs (pass timeout_ms up to 30 min for those). The user can interrupt anytime; the wait auto-converts to an async notification. Async (background:true, requires pattern) registers a non-blocking notification and returns immediately — use when you have parallel work or want to end your turn. Never loop bash_status to wait.",
     promptSnippet: "Wait for or watch a background bash task",
     parameters: BashWatchParams,
     async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
@@ -34284,9 +34573,31 @@ async function waitForBashStatus(ctx, bridge, extCtx, taskId, outputMode, waitFo
   if (waitForExit)
     markTaskWaiting(sessionId, taskId);
   let sawTerminal = false;
+  let lastData;
   try {
     while (true) {
-      const data = await bashStatusSnapshot(bridge, extCtx, taskId, outputMode, bridgeOptions);
+      let data;
+      try {
+        data = await bashStatusSnapshot(bridge, extCtx, taskId, outputMode, bridgeOptions);
+      } catch (err) {
+        if (!isBridgeTransportTimeout(err))
+          throw err;
+        if (isSyncWatchAborted(sessionId)) {
+          return withWaited(lastData ?? unavailableSnapshot(), {
+            reason: "user_message",
+            elapsed_ms: Date.now() - startedAt
+          });
+        }
+        if (Date.now() >= deadline) {
+          return withWaited(lastData ?? unavailableSnapshot(), {
+            reason: "unavailable",
+            elapsed_ms: Date.now() - startedAt
+          });
+        }
+        await sleep(Math.min(BASH_WAIT_POLL_INTERVAL_MS, Math.max(0, deadline - Date.now())));
+        continue;
+      }
+      lastData = data;
       const terminal = isTerminalStatus(data.status);
       if (waitFor) {
         const scan = await readNewTaskOutput(extCtx, taskId, data, spillCursor);
@@ -34478,6 +34789,9 @@ function formatWaitSummary(waited, details) {
   if (waited.reason === "timeout") {
     return `Waited ${waited.elapsed_ms}ms; timeout reached without match.`;
   }
+  if (waited.reason === "unavailable") {
+    return `Waited ${waited.elapsed_ms}ms; the bridge stayed busy and status couldn't be read. The task may still be running — check with bash_status({ taskId }).`;
+  }
   const exit = typeof details.exit_code === "number" ? `, exit ${details.exit_code}` : "";
   return `Waited ${waited.elapsed_ms}ms; task exited (${details.status}${exit}).`;
 }
@@ -34647,7 +34961,7 @@ function registerConflictsTool(pi, ctx) {
       const reqParams = {};
       const path3 = params?.path;
       if (typeof path3 === "string" && path3.trim() !== "") {
-        await assertExternalDirectoryPermission(extCtx, path3, "inspect", {
+        await assertExternalDirectoryPermission(extCtx, path3, {
           restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
         });
         reqParams.path = await resolvePathArg(extCtx.cwd, path3);
@@ -34703,10 +35017,10 @@ function renderFsResult(toolName, args, result, theme, context) {
     const skipped = data.skipped_files ?? [];
     const lines = [];
     for (const entry of deletedPaths) {
-      lines.push(`${theme.fg("success", "✓ deleted")} ${theme.fg("accent", shortenPath2(entry))}`);
+      lines.push(`${theme.fg("success", "✓ deleted")} ${theme.fg("accent", shortenPath3(entry))}`);
     }
     for (const entry of skipped) {
-      lines.push(`${theme.fg("error", "✗ skipped")} ${theme.fg("accent", shortenPath2(entry.file))} ${theme.fg("muted", `(${entry.reason})`)}`);
+      lines.push(`${theme.fg("error", "✗ skipped")} ${theme.fg("accent", shortenPath3(entry.file))} ${theme.fg("muted", `(${entry.reason})`)}`);
     }
     if (lines.length === 0) {
       lines.push(theme.fg("muted", "(no files deleted)"));
@@ -34716,8 +35030,8 @@ function renderFsResult(toolName, args, result, theme, context) {
   }
   const moveArgs = args;
   return renderSections([
-    `${theme.fg("success", "✓ moved")} ${theme.fg("accent", shortenPath2(moveArgs.filePath))}`,
-    `${theme.fg("muted", "to")} ${theme.fg("accent", shortenPath2(moveArgs.destination))}`
+    `${theme.fg("success", "✓ moved")} ${theme.fg("accent", shortenPath3(moveArgs.filePath))}`,
+    `${theme.fg("muted", "to")} ${theme.fg("accent", shortenPath3(moveArgs.destination))}`
   ], context);
 }
 function registerFsTools(pi, ctx, surface) {
@@ -34738,7 +35052,7 @@ function registerFsTools(pi, ctx, surface) {
           if (checked.has(file2))
             continue;
           checked.add(file2);
-          await assertExternalDirectoryPermission(extCtx, file2, "modify", {
+          await assertExternalDirectoryPermission(extCtx, file2, {
             restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
           });
         }
@@ -34782,7 +35096,7 @@ function registerFsTools(pi, ctx, surface) {
         const destination = await resolvePathArg(extCtx.cwd, params.destination);
         const checked = new Set([filePath, destination]);
         for (const file2 of checked) {
-          await assertExternalDirectoryPermission(extCtx, file2, "modify", {
+          await assertExternalDirectoryPermission(extCtx, file2, {
             restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
           });
         }
@@ -34831,33 +35145,33 @@ var ImportParams = Type7.Object({
   }))
 });
 function buildImportSections(args, payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No import result.")];
   if (args.op === "organize") {
-    const groups = asRecords(response.groups);
-    const groupText = groups.length > 0 ? groups.map((group) => `${asString(group.name) ?? "unknown"}: ${asNumber(group.count) ?? 0}`).join(" · ") : "No imports found";
+    const groups = asRecords2(response.groups);
+    const groupText = groups.length > 0 ? groups.map((group) => `${asString2(group.name) ?? "unknown"}: ${asNumber2(group.count) ?? 0}`).join(" · ") : "No imports found";
     return [
-      `${theme.fg("success", "organized")} ${theme.fg("accent", asString(response.file) ?? args.filePath)}`,
+      `${theme.fg("success", "organized")} ${theme.fg("accent", asString2(response.file) ?? args.filePath)}`,
       `${theme.fg("muted", "groups")} ${groupText}`,
-      `${theme.fg("muted", "duplicates removed")} ${asNumber(response.removed_duplicates) ?? 0}`
+      `${theme.fg("muted", "duplicates removed")} ${asNumber2(response.removed_duplicates) ?? 0}`
     ];
   }
   if (args.op === "add") {
-    const moduleName2 = asString(response.module) ?? args.module ?? "(module)";
+    const moduleName2 = asString2(response.module) ?? args.module ?? "(module)";
     const status = response.already_present === true ? theme.fg("warning", "already present") : theme.fg("success", "added");
     return [
       `${status} ${theme.fg("accent", moduleName2)}`,
-      `${theme.fg("muted", "file")} ${theme.fg("accent", asString(response.file) ?? args.filePath)}`,
-      `${theme.fg("muted", "group")} ${asString(response.group) ?? "—"}`
+      `${theme.fg("muted", "file")} ${theme.fg("accent", asString2(response.file) ?? args.filePath)}`,
+      `${theme.fg("muted", "group")} ${asString2(response.group) ?? "—"}`
     ];
   }
-  const moduleName = asString(response.module) ?? args.module ?? "(module)";
+  const moduleName = asString2(response.module) ?? args.module ?? "(module)";
   const didRemove = response.removed !== false;
   const removeStatus = didRemove ? `${theme.fg("success", "removed")} ${theme.fg("accent", moduleName)}` : `${theme.fg("warning", "not present")} ${theme.fg("accent", moduleName)}`;
   return [
     removeStatus,
-    `${theme.fg("muted", "file")} ${theme.fg("accent", asString(response.file) ?? args.filePath)}`,
+    `${theme.fg("muted", "file")} ${theme.fg("accent", asString2(response.file) ?? args.filePath)}`,
     args.removeName ? `${theme.fg("muted", "name")} ${args.removeName}` : `${theme.fg("muted", "scope")} entire import`
   ];
 }
@@ -34886,7 +35200,7 @@ function registerImportTools(pi, ctx) {
         throw new Error(`op='${params.op}' requires 'module'`);
       }
       const filePath = await resolvePathArg(extCtx.cwd, params.filePath);
-      await assertExternalDirectoryPermission(extCtx, filePath, "modify", {
+      await assertExternalDirectoryPermission(extCtx, filePath, {
         restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
       });
       const bridge = bridgeFor(ctx, extCtx.cwd);
@@ -34962,7 +35276,7 @@ async function resolveAndGateScope(extCtx, ctx, scope) {
     if (checked.has(target))
       continue;
     checked.add(target);
-    await assertExternalDirectoryPermission(extCtx, target, "read", {
+    await assertExternalDirectoryPermission(extCtx, target, {
       restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
     });
   }
@@ -34990,16 +35304,16 @@ function diagnosticsServerSummary(section) {
   return parts.length > 0 ? parts.join("; ") : "none reported";
 }
 function diagnosticsSummaryPart(summary) {
-  const section = asRecord2(summary?.diagnostics);
+  const section = asRecord3(summary?.diagnostics);
   if (!section)
     return;
-  const errors3 = asNumber(section.errors);
-  const warnings = asNumber(section.warnings);
-  const info = asNumber(section.info);
-  const hints = asNumber(section.hints);
+  const errors3 = asNumber2(section.errors);
+  const warnings = asNumber2(section.warnings);
+  const info = asNumber2(section.info);
+  const hints = asNumber2(section.hints);
   const hasCounts = [errors3, warnings, info, hints].some((value) => value !== undefined);
   const counts = `${errors3 ?? 0} errors/${warnings ?? 0} warnings/${info ?? 0} info/${hints ?? 0} hints`;
-  const status = asString(section.status);
+  const status = asString2(section.status);
   if (status === "pending") {
     return hasCounts ? `diagnostics ${counts} so far — still pending (servers: ${diagnosticsServerSummary(section)})` : `diagnostics pending (servers: ${diagnosticsServerSummary(section)})`;
   }
@@ -35012,9 +35326,9 @@ function diagnosticsSummaryPart(summary) {
   return;
 }
 function diagnosticLocation(diagnostic) {
-  const file2 = asString(diagnostic.file) ?? "(unknown file)";
-  const line = asNumber(diagnostic.line);
-  const column = asNumber(diagnostic.column);
+  const file2 = asString2(diagnostic.file) ?? "(unknown file)";
+  const line = asNumber2(diagnostic.line);
+  const column = asNumber2(diagnostic.column);
   if (line === undefined)
     return file2;
   if (column === undefined)
@@ -35022,14 +35336,14 @@ function diagnosticLocation(diagnostic) {
   return `${file2}:${line}:${column}`;
 }
 function diagnosticsDetailSection(details) {
-  const diagnostics = asRecords(details?.diagnostics);
+  const diagnostics = asRecords2(details?.diagnostics);
   if (diagnostics.length === 0)
     return;
   const lines = ["diagnostics"];
   for (const diagnostic of diagnostics) {
-    const severity = asString(diagnostic.severity) ?? "information";
-    const message = asString(diagnostic.message) ?? "(no message)";
-    const source = asString(diagnostic.source);
+    const severity = asString2(diagnostic.severity) ?? "information";
+    const message = asString2(diagnostic.message) ?? "(no message)";
+    const source = asString2(diagnostic.source);
     const suffix = source ? ` [${source}]` : "";
     lines.push(`- ${diagnosticLocation(diagnostic)} ${severity} ${message}${suffix}`);
   }
@@ -35037,15 +35351,15 @@ function diagnosticsDetailSection(details) {
 `);
 }
 function countFrom(summary, key) {
-  const section = asRecord2(summary?.[key]);
-  return asNumber(section?.count);
+  const section = asRecord3(summary?.[key]);
+  return asNumber2(section?.count);
 }
 function tier2SummaryPart(summary, key, label) {
-  const section = asRecord2(summary?.[key]);
-  const count = asNumber(section?.count);
+  const section = asRecord3(summary?.[key]);
+  const count = asNumber2(section?.count);
   if (count !== undefined)
     return `${label} ${count}`;
-  const status = asString(section?.status);
+  const status = asString2(section?.status);
   return `${label} ${status ?? "unavailable"}`;
 }
 function shortDupOccurrence(entry) {
@@ -35054,12 +35368,12 @@ function shortDupOccurrence(entry) {
 }
 function tier2TopPreview(summary, theme) {
   const lines = [];
-  const dup = asRecord2(summary?.duplicates);
+  const dup = asRecord3(summary?.duplicates);
   const dupTop = Array.isArray(dup?.top) ? dup.top : [];
   for (const group of dupTop) {
-    const record2 = asRecord2(group);
+    const record2 = asRecord3(group);
     const files = Array.isArray(record2?.files) ? record2.files : [];
-    const cost = asNumber(record2?.cost);
+    const cost = asNumber2(record2?.cost);
     if (files.length < 2)
       continue;
     const a = shortDupOccurrence(String(files[0]));
@@ -35070,12 +35384,12 @@ function tier2TopPreview(summary, theme) {
     ["dead_code", "dead"],
     ["unused_exports", "unused"]
   ]) {
-    const section = asRecord2(summary?.[key]);
+    const section = asRecord3(summary?.[key]);
     const top = Array.isArray(section?.top) ? section.top : [];
     for (const item of top) {
-      const record2 = asRecord2(item);
-      const file2 = asString(record2?.file);
-      const symbol2 = asString(record2?.symbol);
+      const record2 = asRecord3(item);
+      const file2 = asString2(record2?.file);
+      const symbol2 = asString2(record2?.symbol);
       if (!file2 || !symbol2)
         continue;
       lines.push(`  ${label} ${symbol2} (${file2.split("/").pop()})`);
@@ -35088,7 +35402,7 @@ ${lines.join(`
 `)}`;
 }
 function tier2RefreshCategories(response) {
-  const scannerState = asRecord2(response.scanner_state);
+  const scannerState = asRecord3(response.scanner_state);
   const categories = new Set;
   for (const key of ["pending_categories", "stale_categories"]) {
     const values = scannerState?.[key];
@@ -35135,18 +35449,18 @@ function runPendingTier2Categories(bridge, categories, extCtx) {
   });
 }
 function buildInspectSections(payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No inspect snapshot available.")];
-  const summary = asRecord2(response.summary);
-  const metrics = asRecord2(summary?.metrics);
-  const scannerState = asRecord2(response.scanner_state);
+  const summary = asRecord3(response.summary);
+  const metrics = asRecord3(summary?.metrics);
+  const scannerState = asRecord3(response.scanner_state);
   const stale = Array.isArray(scannerState?.stale_categories) ? scannerState.stale_categories.length : 0;
   const pending = Array.isArray(scannerState?.pending_categories) ? scannerState.pending_categories.length : 0;
   const parts = [
     `todos ${countFrom(summary, "todos") ?? 0}`,
     diagnosticsSummaryPart(summary),
-    `metrics ${asNumber(metrics?.files) ?? 0} files/${asNumber(metrics?.symbols) ?? 0} symbols`,
+    `metrics ${asNumber2(metrics?.files) ?? 0} files/${asNumber2(metrics?.symbols) ?? 0} symbols`,
     tier2SummaryPart(summary, "dead_code", "dead code"),
     tier2SummaryPart(summary, "unused_exports", "unused exports"),
     tier2SummaryPart(summary, "duplicates", "duplicates")
@@ -35158,7 +35472,7 @@ function buildInspectSections(payload, theme) {
   const topPreview = tier2TopPreview(summary, theme);
   if (topPreview)
     sections.push(topPreview);
-  const details = asRecord2(response.details);
+  const details = asRecord3(response.details);
   if (details) {
     const names = Object.keys(details);
     sections.push(names.length > 0 ? `details: ${names.join(", ")}` : theme.fg("muted", "No drill-down details returned."));
@@ -35166,7 +35480,7 @@ function buildInspectSections(payload, theme) {
     if (diagnosticsDetails)
       sections.push(diagnosticsDetails);
   }
-  const text = asString(response.text);
+  const text = asString2(response.text);
   if (text)
     sections.push(text);
   return sections;
@@ -35199,7 +35513,10 @@ function registerInspectTool(pi, ctx) {
       runPendingTier2Categories(bridge, tier2RefreshCategories(response), extCtx);
       const body = response.text;
       if (typeof body === "string") {
-        const diagnostics = diagnosticsSummaryPart(asRecord2(response.summary));
+        const diagnosticsSummary = diagnosticsSummaryPart(asRecord3(response.summary));
+        const diagnosticsDetail = diagnosticsDetailSection(asRecord3(response.details));
+        const diagnostics = [diagnosticsSummary, diagnosticsDetail].filter(Boolean).join(`
+`);
         const text = diagnostics ? body ? `${body}
 
 ${diagnostics}` : diagnostics : body;
@@ -35239,138 +35556,11 @@ function navigateParamsSchema() {
     }))
   });
 }
-function treeLine(depth, text) {
-  return `${"  ".repeat(depth)}${depth === 0 ? "" : "↳ "}${text}`;
-}
-function renderCallTreeNode(node, depth, lines) {
-  const name = asString(node.name) ?? "(unknown)";
-  const file2 = shortenPath2(asString(node.file) ?? "(unknown file)");
-  const line = asNumber(node.line);
-  lines.push(treeLine(depth, `${name} ${line !== undefined ? `[${file2}:${line}]` : `[${file2}]`}`));
-  asRecords(node.children).forEach((child) => {
-    renderCallTreeNode(child, depth + 1, lines);
-  });
-}
-function depthWarning(response, theme, depthField = "depth_limited", truncatedField = "truncated") {
-  const limited = asBoolean(response[depthField]);
-  const truncated = asNumber(response[truncatedField]) ?? 0;
-  if (!limited && truncated === 0)
-    return "";
-  const detail = truncated > 0 ? `, ${truncated} truncated` : "";
-  return theme.fg("warning", `(depth limited${detail})`);
-}
-function renderTracePath(path3, index, lines) {
-  lines.push(`Path ${index + 1}`);
-  asRecords(path3.hops).forEach((hop, hopIndex) => {
-    const symbol2 = asString(hop.symbol) ?? "(unknown)";
-    const file2 = shortenPath2(asString(hop.file) ?? "(unknown file)");
-    const line = asNumber(hop.line);
-    const entry = hop.is_entry_point === true ? " [entry]" : "";
-    lines.push(treeLine(hopIndex + 1, `${symbol2}${entry} ${line !== undefined ? `[${file2}:${line}]` : `[${file2}]`}`));
-  });
-}
 function buildNavigateSections(args, payload, theme) {
-  const response = asRecord2(payload);
-  if (!response)
-    return [theme.fg("muted", "No navigation result.")];
-  if (args.op === "call_tree") {
-    const lines = [];
-    renderCallTreeNode(response, 0, lines);
-    const warning = depthWarning(response, theme);
-    if (warning)
-      lines.push(warning);
-    return lines.length > 0 ? lines : [theme.fg("muted", "No call tree available.")];
-  }
-  if (args.op === "callers") {
-    const groups = asRecords(response.callers);
-    const warning = depthWarning(response, theme);
-    const sections2 = [
-      `${theme.fg("success", `${asNumber(response.total_callers) ?? 0} caller${(asNumber(response.total_callers) ?? 0) === 1 ? "" : "s"}`)} ${theme.fg("muted", `${groups.length} file group${groups.length === 1 ? "" : "s"}`)} ${warning}`.trim()
-    ];
-    groups.forEach((group) => {
-      const file2 = shortenPath2(asString(group.file) ?? "(unknown file)");
-      const lines = [theme.fg("accent", file2)];
-      asRecords(group.callers).forEach((caller) => {
-        lines.push(`  ↳ ${asString(caller.symbol) ?? "(unknown)"} ${theme.fg("muted", `line ${asNumber(caller.line) ?? "?"}`)}`);
-      });
-      sections2.push(lines.join(`
-`));
-    });
-    return sections2;
-  }
-  if (args.op === "trace_to_symbol") {
-    const path3 = asRecords(response.path);
-    const complete = asBoolean(response.complete);
-    const reason = asString(response.reason);
-    if (path3.length === 0) {
-      const prefix = complete === false ? theme.fg("warning", "No complete path") : theme.fg("muted", "No path");
-      return [`${prefix}${reason ? ` (${reason})` : ""}`];
-    }
-    const lines = [theme.fg("success", `${path3.length} hop${path3.length === 1 ? "" : "s"}`)];
-    path3.forEach((hop, index) => {
-      const symbol2 = asString(hop.symbol) ?? "(unknown)";
-      const file2 = shortenPath2(asString(hop.file) ?? "(unknown file)");
-      const line = asNumber(hop.line);
-      lines.push(treeLine(index + 1, `${symbol2} ${line !== undefined ? `[${file2}:${line}]` : `[${file2}]`}`));
-    });
-    return lines;
-  }
-  if (args.op === "trace_to") {
-    const paths = asRecords(response.paths);
-    const warning = depthWarning(response, theme, "max_depth_reached", "truncated_paths");
-    const sections2 = [
-      `${theme.fg("success", `${asNumber(response.total_paths) ?? paths.length} path${(asNumber(response.total_paths) ?? paths.length) === 1 ? "" : "s"}`)} ${theme.fg("muted", `${asNumber(response.entry_points_found) ?? 0} entry point${(asNumber(response.entry_points_found) ?? 0) === 1 ? "" : "s"}`)} ${warning}`.trim()
-    ];
-    if (paths.length === 0)
-      sections2.push(theme.fg("muted", "No entry paths found."));
-    paths.forEach((path3, index) => {
-      const lines = [];
-      renderTracePath(path3, index, lines);
-      sections2.push(lines.join(`
-`));
-    });
-    return sections2;
-  }
-  if (args.op === "impact") {
-    const callers = asRecords(response.callers);
-    const warning = depthWarning(response, theme);
-    const sections2 = [
-      `${theme.fg("warning", `${asNumber(response.total_affected) ?? callers.length} affected call site${(asNumber(response.total_affected) ?? callers.length) === 1 ? "" : "s"}`)} ${theme.fg("muted", `${asNumber(response.affected_files) ?? 0} file${(asNumber(response.affected_files) ?? 0) === 1 ? "" : "s"}`)} ${warning}`.trim()
-    ];
-    if (callers.length === 0)
-      sections2.push(theme.fg("muted", "No impacted callers found."));
-    callers.forEach((caller) => {
-      const file2 = shortenPath2(asString(caller.caller_file) ?? "(unknown file)");
-      const symbol2 = asString(caller.caller_symbol) ?? "(unknown)";
-      const line = asNumber(caller.line) ?? 0;
-      const entry = caller.is_entry_point === true ? ` ${theme.fg("warning", "[entry]")}` : "";
-      const expression = asString(caller.call_expression);
-      const params = Array.isArray(caller.parameters) ? caller.parameters.map(String).join(", ") : "";
-      sections2.push([
-        `${theme.fg("accent", file2)}:${line}`,
-        `  ↳ ${symbol2}${entry}`,
-        expression ? `  ${theme.fg("muted", expression)}` : undefined,
-        params ? `  ${theme.fg("muted", `params: ${params}`)}` : undefined
-      ].filter(Boolean).join(`
-`));
-    });
-    return sections2;
-  }
-  const hops = asRecords(response.hops);
-  const sections = [
-    `${theme.fg("success", `${hops.length} hop${hops.length === 1 ? "" : "s"}`)} ${asBoolean(response.depth_limited) ? theme.fg("warning", "(depth limited)") : ""}`.trim()
-  ];
-  if (hops.length === 0)
-    sections.push(theme.fg("muted", "No data-flow hops found."));
-  hops.forEach((hop, index) => {
-    const file2 = shortenPath2(asString(hop.file) ?? "(unknown file)");
-    const symbol2 = asString(hop.symbol) ?? "(unknown)";
-    const variable = asString(hop.variable) ?? "(unknown)";
-    const line = asNumber(hop.line) ?? 0;
-    const approximate = hop.approximate === true ? ` ${theme.fg("warning", "[approx]")}` : "";
-    sections.push(treeLine(index, `${variable} ${theme.fg("muted", `${asString(hop.flow_type) ?? "flow"}`)} ${symbol2} [${file2}:${line}]${approximate}`));
-  });
-  return sections;
+  const themeAdapter = {
+    fg: (role, s) => theme.fg(role, s)
+  };
+  return formatCallgraphSections(args.op, payload, themeAdapter);
 }
 function renderNavigateCall(args, theme, context) {
   const summary = [
@@ -35390,7 +35580,7 @@ function registerNavigateTool(pi, ctx) {
   pi.registerTool({
     name: "aft_callgraph",
     label: "callgraph",
-    description: "Answer code-relationship questions from a real call graph — instead of grep + read chains. Reach for this whenever the question is about how symbols connect. All ops require both `filePath` and `symbol`. Use `callers` for call sites (before renaming/signature changes), `impact` for blast radius (what breaks if a symbol changes), `call_tree` for what a function calls, `trace_to` for how execution reaches a symbol from entry points, `trace_to_symbol` for the shortest path from one symbol to another (requires `toSymbol`; if ambiguous, the error returns candidate files — retry with `toFile`), `trace_data` to follow a value across assignments/params.",
+    description: "Answer code-relationship questions from a real call graph — instead of grep + read chains. Reach for this whenever the question is about how symbols connect. All ops require both `filePath` and `symbol`. Use `callers` for call sites (before renaming/signature changes), `impact` for blast radius (what breaks if a symbol changes), `call_tree` for what a function calls, `trace_to` for how execution reaches a symbol from entry points, `trace_to_symbol` for the shortest path from one symbol to another (requires `toSymbol`; if ambiguous, the error returns candidate files — retry with `toFile`), `trace_data` to follow a value across assignments/params. Markers: ~ = edge resolved by name only (may point at the wrong same-named symbol); [unresolved] = callee not resolved to a definition, so the location shown is the call site. Unmarked edges are resolved exactly.",
     parameters: navigateParamsSchema(),
     async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
       if (isEmptyParam(params.filePath)) {
@@ -35412,7 +35602,7 @@ function registerNavigateTool(pi, ctx) {
         if (checked.has(target))
           continue;
         checked.add(target);
-        await assertExternalDirectoryPermission(extCtx, target, "read", {
+        await assertExternalDirectoryPermission(extCtx, target, {
           restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
         });
       }
@@ -35433,7 +35623,8 @@ function registerNavigateTool(pi, ctx) {
         req.toFile = toFile;
       try {
         const response = await callBridge(bridge, params.op, req, extCtx);
-        return textResult(JSON.stringify(response, null, 2));
+        return textResult(formatCallgraphSections(params.op, response, PLAIN_CALLGRAPH_THEME).join(`
+`), response);
       } catch (error50) {
         if (error50 instanceof BridgeError && CALLGRAPH_SOFT_CODES.has(error50.code)) {
           return textResult(error50.message);
@@ -35491,7 +35682,7 @@ async function assertReadPathPermissions(extCtx, ctx, paths) {
     if (!target || checked.has(target))
       continue;
     checked.add(target);
-    await assertExternalDirectoryPermission(extCtx, target, "read", {
+    await assertExternalDirectoryPermission(extCtx, target, {
       restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
     });
   }
@@ -35511,25 +35702,25 @@ function buildOutlineSections(text, theme) {
 `)];
 }
 function buildZoomSections(args, payload, theme) {
-  const batch = asRecord2(payload);
+  const batch = asRecord3(payload);
   const batchItems = Array.isArray(batch?.symbols) ? batch.symbols : Array.isArray(batch?.entries) ? batch.entries : null;
   if (batchItems) {
     const header = batch?.complete === false ? [theme.fg("warning", "Incomplete zoom results")] : [];
     return [
       ...header,
       ...batchItems.map((item) => {
-        const record2 = asRecord2(item);
+        const record2 = asRecord3(item);
         if (!record2)
           return theme.fg("muted", "No zoom result available.");
-        const name = asString(record2.name) ?? "(unknown symbol)";
-        const itemTargetLabel = asString(record2.targetLabel) ?? zoomTargetLabel(args);
+        const name = asString2(record2.name) ?? "(unknown symbol)";
+        const itemTargetLabel = asString2(record2.targetLabel) ?? zoomTargetLabel(args);
         if (record2.success === false) {
-          const location = record2.targetLabel ? ` in ${shortenPath2(itemTargetLabel)}` : "";
-          return theme.fg("error", `Symbol "${name}" not found${location}: ${asString(record2.error) ?? "zoom failed"}`);
+          const location = record2.targetLabel ? ` in ${shortenPath3(itemTargetLabel)}` : "";
+          return theme.fg("error", `Symbol "${name}" not found${location}: ${asString2(record2.error) ?? "zoom failed"}`);
         }
-        const content = asString(record2.content);
+        const content = asString2(record2.content);
         return [
-          `${theme.fg("accent", name)} ${theme.fg("muted", shortenPath2(itemTargetLabel))}`,
+          `${theme.fg("accent", name)} ${theme.fg("muted", shortenPath3(itemTargetLabel))}`,
           content
         ].filter(Boolean).join(`
 `);
@@ -35540,32 +35731,32 @@ function buildZoomSections(args, payload, theme) {
   if (items.length === 0)
     return [theme.fg("muted", "No zoom result available.")];
   return items.map((item) => {
-    const record2 = asRecord2(item);
+    const record2 = asRecord3(item);
     if (!record2)
       return theme.fg("muted", "No zoom result available.");
-    const name = asString(record2.name) ?? "(unknown symbol)";
-    const kind = asString(record2.kind) ?? "symbol";
-    const range = asRecord2(record2.range);
+    const name = asString2(record2.name) ?? "(unknown symbol)";
+    const kind = asString2(record2.kind) ?? "symbol";
+    const range = asRecord3(record2.range);
     const startLine = range && typeof range.start_line === "number" ? range.start_line : undefined;
     const endLine = range && typeof range.end_line === "number" ? range.end_line : undefined;
     const targetLabel = zoomTargetLabel(args);
-    const location = startLine !== undefined ? `${shortenPath2(targetLabel)}:${startLine}${endLine && endLine !== startLine ? `-${endLine}` : ""}` : shortenPath2(targetLabel);
+    const location = startLine !== undefined ? `${shortenPath3(targetLabel)}:${startLine}${endLine && endLine !== startLine ? `-${endLine}` : ""}` : shortenPath3(targetLabel);
     const lines = [`${theme.fg("accent", name)} ${theme.fg("muted", `[${kind}] ${location}`)}`];
-    const content = asString(record2.content);
+    const content = asString2(record2.content);
     if (content) {
       lines.push(content.split(`
 `).map((line) => `  ${line}`).join(`
 `));
     }
-    const annotations = asRecord2(record2.annotations);
-    const callsOut = annotations ? asRecords(annotations.calls_out) : [];
-    const calledBy = annotations ? asRecords(annotations.called_by) : [];
+    const annotations = asRecord3(record2.annotations);
+    const callsOut = annotations ? asRecords2(annotations.calls_out) : [];
+    const calledBy = annotations ? asRecords2(annotations.called_by) : [];
     if (callsOut.length > 0) {
-      lines.push(`${theme.fg("muted", "calls out")}`, callsOut.map((call) => `  ↳ ${asString(call.name) ?? "(unknown)"}${typeof call.line === "number" ? `:${call.line}` : ""}`).join(`
+      lines.push(`${theme.fg("muted", "calls out")}`, callsOut.map((call) => `  ↳ ${asString2(call.name) ?? "(unknown)"}${typeof call.line === "number" ? `:${call.line}` : ""}`).join(`
 `));
     }
     if (calledBy.length > 0) {
-      lines.push(`${theme.fg("muted", "called by")}`, calledBy.map((call) => `  ↳ ${asString(call.name) ?? "(unknown)"}${typeof call.line === "number" ? `:${call.line}` : ""}`).join(`
+      lines.push(`${theme.fg("muted", "called by")}`, calledBy.map((call) => `  ↳ ${asString2(call.name) ?? "(unknown)"}${typeof call.line === "number" ? `:${call.line}` : ""}`).join(`
 `));
     }
     return lines.join(`
@@ -35904,32 +36095,32 @@ var RefactorParams = Type11.Object({
   callSiteLine: optionalInt(1, Number.MAX_SAFE_INTEGER)
 });
 function buildRefactorSections(args, payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No refactor result.")];
   if (args.op === "move") {
-    const results = asRecords(response.results);
+    const results = asRecords2(response.results);
     return [
       `${theme.fg("success", "moved symbol")} ${theme.fg("toolOutput", args.symbol ?? "(symbol)")}`,
-      `${theme.fg("muted", "files modified")} ${asNumber(response.files_modified) ?? results.length}`,
-      `${theme.fg("muted", "consumers updated")} ${asNumber(response.consumers_updated) ?? 0}`,
-      results.length > 0 ? results.map((entry) => `  ↳ ${shortenPath2(asString(entry.file) ?? "(unknown file)")}`).join(`
+      `${theme.fg("muted", "files modified")} ${asNumber2(response.files_modified) ?? results.length}`,
+      `${theme.fg("muted", "consumers updated")} ${asNumber2(response.consumers_updated) ?? 0}`,
+      results.length > 0 ? results.map((entry) => `  ↳ ${shortenPath3(asString2(entry.file) ?? "(unknown file)")}`).join(`
 `) : theme.fg("muted", "No files reported.")
     ];
   }
   if (args.op === "extract") {
     return [
-      `${theme.fg("success", "extracted")} ${theme.fg("toolOutput", asString(response.name) ?? args.name ?? "(function)")}`,
-      `${theme.fg("muted", "file")} ${theme.fg("accent", shortenPath2(asString(response.file) ?? args.filePath))}`,
+      `${theme.fg("success", "extracted")} ${theme.fg("toolOutput", asString2(response.name) ?? args.name ?? "(function)")}`,
+      `${theme.fg("muted", "file")} ${theme.fg("accent", shortenPath3(asString2(response.file) ?? args.filePath))}`,
       `${theme.fg("muted", "params")} ${Array.isArray(response.parameters) ? response.parameters.join(", ") || "none" : "none"}`,
-      `${theme.fg("muted", "return type")} ${asString(response.return_type) ?? "unknown"}`
+      `${theme.fg("muted", "return type")} ${asString2(response.return_type) ?? "unknown"}`
     ];
   }
   return [
-    `${theme.fg("success", "inlined")} ${theme.fg("toolOutput", asString(response.symbol) ?? args.symbol ?? "(symbol)")}`,
-    `${theme.fg("muted", "file")} ${theme.fg("accent", shortenPath2(asString(response.file) ?? args.filePath))}`,
-    `${theme.fg("muted", "context")} ${asString(response.call_context) ?? "unknown"}`,
-    `${theme.fg("muted", "substitutions")} ${asNumber(response.substitutions) ?? 0}`
+    `${theme.fg("success", "inlined")} ${theme.fg("toolOutput", asString2(response.symbol) ?? args.symbol ?? "(symbol)")}`,
+    `${theme.fg("muted", "file")} ${theme.fg("accent", shortenPath3(asString2(response.file) ?? args.filePath))}`,
+    `${theme.fg("muted", "context")} ${asString2(response.call_context) ?? "unknown"}`,
+    `${theme.fg("muted", "substitutions")} ${asNumber2(response.substitutions) ?? 0}`
   ];
 }
 function renderRefactorCall(args, theme, context) {
@@ -35986,7 +36177,7 @@ function registerRefactorTool(pi, ctx) {
         if (checked.has(target))
           continue;
         checked.add(target);
-        await assertExternalDirectoryPermission(extCtx, target, "modify", {
+        await assertExternalDirectoryPermission(extCtx, target, {
           restrictToProjectRoot: ctx.config.restrict_to_project_root ?? false
         });
       }
@@ -36038,34 +36229,34 @@ var SafetyParams = Type12.Object({
   }))
 });
 function buildSafetySections(args, payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No safety result.")];
   if (args.op === "undo") {
     if (response.operation === true) {
       return [
-        `${theme.fg("success", "restored operation")} ${theme.fg("accent", asString(response.op_id) ?? "(operation)")}`,
-        `${theme.fg("muted", "files")} ${asNumber(response.restored_count) ?? asRecords(response.restored).length}`
+        `${theme.fg("success", "restored operation")} ${theme.fg("accent", asString2(response.op_id) ?? "(operation)")}`,
+        `${theme.fg("muted", "files")} ${asNumber2(response.restored_count) ?? asRecords2(response.restored).length}`
       ];
     }
     return [
-      `${theme.fg("success", "restored")} ${theme.fg("accent", shortenPath2(asString(response.path) ?? args.filePath ?? "(file)"))}`,
-      `${theme.fg("muted", "backup")} ${asString(response.backup_id) ?? "—"}`
+      `${theme.fg("success", "restored")} ${theme.fg("accent", shortenPath3(asString2(response.path) ?? args.filePath ?? "(file)"))}`,
+      `${theme.fg("muted", "backup")} ${asString2(response.backup_id) ?? "—"}`
     ];
   }
   if (args.op === "history") {
-    const entries = asRecords(response.entries);
+    const entries = asRecords2(response.entries);
     const sections2 = [
-      theme.fg("accent", shortenPath2(asString(response.file) ?? args.filePath ?? "(file)"))
+      theme.fg("accent", shortenPath3(asString2(response.file) ?? args.filePath ?? "(file)"))
     ];
     if (entries.length === 0) {
       sections2.push(theme.fg("muted", "No history entries."));
       return sections2;
     }
     sections2.push(entries.map((entry, index) => {
-      const backupId = asString(entry.backup_id) ?? `entry-${index + 1}`;
+      const backupId = asString2(entry.backup_id) ?? `entry-${index + 1}`;
       const timestamp = formatTimestamp(entry.timestamp) ?? "unknown time";
-      const description = asString(entry.description) ?? "";
+      const description = asString2(entry.description) ?? "";
       return `${index + 1}. ${backupId} ${theme.fg("muted", timestamp)}${description ? `
    ${description}` : ""}`;
     }).join(`
@@ -36073,22 +36264,22 @@ function buildSafetySections(args, payload, theme) {
     return sections2;
   }
   if (args.op === "checkpoint") {
-    const skipped = asRecords(response.skipped);
+    const skipped = asRecords2(response.skipped);
     return [
-      `${theme.fg("success", "checkpoint created")} ${theme.fg("accent", asString(response.name) ?? args.name ?? "(checkpoint)")}`,
-      `${theme.fg("muted", "files")} ${asNumber(response.file_count) ?? 0}`,
+      `${theme.fg("success", "checkpoint created")} ${theme.fg("accent", asString2(response.name) ?? args.name ?? "(checkpoint)")}`,
+      `${theme.fg("muted", "files")} ${asNumber2(response.file_count) ?? 0}`,
       skipped.length > 0 ? `${theme.fg("warning", "skipped")}
-${skipped.map((entry) => `  ↳ ${shortenPath2(asString(entry.file) ?? "(file)")}: ${asString(entry.error) ?? "unknown error"}`).join(`
+${skipped.map((entry) => `  ↳ ${shortenPath3(asString2(entry.file) ?? "(file)")}: ${asString2(entry.error) ?? "unknown error"}`).join(`
 `)}` : theme.fg("muted", "No skipped files.")
     ];
   }
   if (args.op === "restore") {
     return [
-      `${theme.fg("success", "checkpoint restored")} ${theme.fg("accent", asString(response.name) ?? args.name ?? "(checkpoint)")}`,
-      `${theme.fg("muted", "files")} ${asNumber(response.file_count) ?? 0}`
+      `${theme.fg("success", "checkpoint restored")} ${theme.fg("accent", asString2(response.name) ?? args.name ?? "(checkpoint)")}`,
+      `${theme.fg("muted", "files")} ${asNumber2(response.file_count) ?? 0}`
     ];
   }
-  const checkpoints = asRecords(response.checkpoints);
+  const checkpoints = asRecords2(response.checkpoints);
   const sections = [
     theme.fg("accent", `${checkpoints.length} checkpoint${checkpoints.length === 1 ? "" : "s"}`)
   ];
@@ -36097,8 +36288,8 @@ ${skipped.map((entry) => `  ↳ ${shortenPath2(asString(entry.file) ?? "(file)")
     return sections;
   }
   sections.push(checkpoints.map((checkpoint, index) => {
-    const name = asString(checkpoint.name) ?? `checkpoint-${index + 1}`;
-    const count = asNumber(checkpoint.file_count) ?? 0;
+    const name = asString2(checkpoint.name) ?? `checkpoint-${index + 1}`;
+    const count = asNumber2(checkpoint.file_count) ?? 0;
     const created = formatTimestamp(checkpoint.created_at) ?? "unknown time";
     return `${index + 1}. ${name} ${theme.fg("muted", `${count} file${count === 1 ? "" : "s"} · ${created}`)}`;
   }).join(`
@@ -36139,7 +36330,7 @@ function registerSafetyTool(pi, ctx) {
           previewReq.file = filePath;
         const preview = await callBridge(bridge, "undo_preview", previewReq, extCtx);
         for (const file2 of new Set(responsePaths(preview))) {
-          await assertExternalDirectoryPermission(extCtx, file2, "modify", {
+          await assertExternalDirectoryPermission(extCtx, file2, {
             restrictToProjectRoot
           });
         }
@@ -36152,7 +36343,7 @@ function registerSafetyTool(pi, ctx) {
             if (checked.has(file2))
               continue;
             checked.add(file2);
-            await assertExternalDirectoryPermission(extCtx, file2, "modify", {
+            await assertExternalDirectoryPermission(extCtx, file2, {
               restrictToProjectRoot
             });
           }
@@ -36161,7 +36352,7 @@ function registerSafetyTool(pi, ctx) {
       if (params.op === "restore" && params.name) {
         const preview = await callBridge(bridge, "checkpoint_paths", { name: params.name }, extCtx);
         for (const file2 of new Set(responsePaths(preview))) {
-          await assertExternalDirectoryPermission(extCtx, file2, "modify", {
+          await assertExternalDirectoryPermission(extCtx, file2, {
             restrictToProjectRoot
           });
         }
@@ -36242,13 +36433,13 @@ var SearchParams2 = Type13.Object({
   }))
 });
 function buildSemanticSections(args, payload, theme) {
-  const response = asRecord2(payload);
+  const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No search result.")];
-  const status = asString(response.status) ?? "unknown";
-  const semanticStatus = asString(response.semantic_status) ?? status;
-  const interpretedAs = asString(response.interpreted_as) ?? "unknown";
-  const queryKind = asString(response.query_kind);
+  const status = asString2(response.status) ?? "unknown";
+  const semanticStatus = asString2(response.semantic_status) ?? status;
+  const interpretedAs = asString2(response.interpreted_as) ?? "unknown";
+  const queryKind = asString2(response.query_kind);
   const sections = [
     `${theme.fg(semanticStatus === "ready" ? "success" : "warning", `semantic: ${semanticStatus}`)} ${theme.fg("muted", `mode=${interpretedAs}${queryKind ? ` kind=${queryKind}` : ""} query=${JSON.stringify(args.query)} topK=${args.topK ?? 10}`)}`
   ];
@@ -36260,34 +36451,34 @@ function buildSemanticSections(args, payload, theme) {
   const honestyNote = semanticHonestyNote(response, theme);
   if (honestyNote)
     sections.push(honestyNote);
-  const results = asRecords(response.results);
+  const results = asRecords2(response.results);
   if (status !== "ready" && results.length === 0) {
-    sections.push(asString(response.text) ?? theme.fg("muted", "Semantic index is not ready."));
+    sections.push(asString2(response.text) ?? theme.fg("muted", "Semantic index is not ready."));
     return sections;
   }
   if (results.length === 0) {
     sections.push(theme.fg("muted", "No matches found."));
     return sections;
   }
-  const grouped = groupByFile(results, (result) => asString(result.file));
+  const grouped = groupByFile(results, (result) => asString2(result.file));
   for (const [file2, fileResults] of grouped.entries()) {
-    const lines = [theme.fg("accent", shortenPath2(file2))];
+    const lines = [theme.fg("accent", shortenPath3(file2))];
     fileResults.forEach((result) => {
-      if (asString(result.kind) === "GrepLine") {
-        const line = asNumber(result.line);
-        const column = asNumber(result.column);
-        const lineText = asString(result.line_text) ?? "";
+      if (asString2(result.kind) === "GrepLine") {
+        const line = asNumber2(result.line);
+        const column = asNumber2(result.column);
+        const lineText = asString2(result.line_text) ?? "";
         const location2 = line !== undefined ? `${line}${column !== undefined ? `:${column}` : ""}` : "?";
         lines.push(`  ↳ ${theme.fg("muted", `line ${location2}`)} ${lineText}`);
         return;
       }
-      const score = asNumber(result.score);
-      const source = asString(result.source);
-      const kind = asString(result.kind) ?? "symbol";
-      const location = asString(result.location);
+      const score = asNumber2(result.score);
+      const source = asString2(result.source);
+      const kind = asString2(result.kind) ?? "symbol";
+      const location = asString2(result.location);
       if (source === "lexical") {
         lines.push(`  ↳ ${theme.fg("muted", `[lexical match${score !== undefined ? ` — score ${score.toFixed(3)}` : ""}]`)}`);
-        const snippet2 = asString(result.snippet);
+        const snippet2 = asString2(result.snippet);
         if (snippet2) {
           lines.push(...snippet2.split(`
 `).map((line) => `     ${line}`));
@@ -36295,16 +36486,16 @@ function buildSemanticSections(args, payload, theme) {
         return;
       }
       if (kind === "file_summary" || location === "[file summary]") {
-        const summary = asString(result.snippet) ?? asString(result.name) ?? "(no summary)";
+        const summary = asString2(result.snippet) ?? asString2(result.name) ?? "(no summary)";
         lines.push(`  ↳ ${summary} ${theme.fg("muted", `[file summary${score !== undefined ? ` score ${score.toFixed(3)}` : ""}]`)}`);
         return;
       }
-      const startLine = asNumber(result.start_line);
-      const endLine = asNumber(result.end_line);
+      const startLine = asNumber2(result.start_line);
+      const endLine = asNumber2(result.end_line);
       const range = startLine !== undefined ? `${startLine}${endLine && endLine !== startLine ? `-${endLine}` : ""}` : "?";
-      const name = asString(result.name) ?? "(unknown)";
+      const name = asString2(result.name) ?? "(unknown)";
       lines.push(`  ↳ ${name} ${theme.fg("muted", `[${kind}] lines ${range}${score !== undefined ? ` score ${score.toFixed(3)}` : ""}`)}`);
-      const snippet = asString(result.snippet);
+      const snippet = asString2(result.snippet);
       if (snippet) {
         lines.push(...snippet.split(`
 `).map((line) => `     ${line}`));
@@ -36416,11 +36607,11 @@ function buildWorkflowHints(opts) {
   }
   if (hasBgBash) {
     sections.push([
-      `**Long-running commands** (builds, installs, full test suites): \`${bashName}({ background: true })\` returns a \`task_id\` immediately. Then do ONE of these:`,
-      "1. Keep working on something independent of the result.",
-      "2. End your turn — a completion reminder with the result arrives automatically.",
-      `3. Need to react to a specific output line early? Register \`bash_watch({ task_id, pattern, background: true })\`, then end your turn — it pings you the moment the pattern appears.`,
-      `\`bash_status({ task_id })\` is for inspecting output AFTER the reminder arrives, or one quick look at a live task — never call it repeatedly to wait: the reminder already delivers the result, and each poll wastes a turn. Sync \`bash_watch\` (without \`background: true\`) blocks your turn and locks the user out — reserve it for waits of a few seconds (a dev server printing its ready line), never for builds or test suites.`
+      `**Long-running commands** (builds, installs, full test suites): \`${bashName}({ background: true })\` returns a \`task_id\` immediately.`,
+      "1. Nothing else useful to do (a build/test/validation whose result is the next thing you need) → sync `bash_watch` to block until it exits (pass a longer timeout_ms for long commands; the user can interrupt).",
+      "2. Useful parallel work available → end your turn; the completion reminder delivers the result. (Or spawn a subagent for the side work.)",
+      "3. Want to react to a specific early output line → async `bash_watch` (background:true + pattern).",
+      "Never loop `bash_status` to wait — it's a one-shot inspector, not a wait primitive."
     ].join(`
 `));
     sections.push(`**PTY / interactive commands**: PTY mode is for interactive REPLs and terminal apps (python, node, bash itself, vim). Start with \`${bashName}({ command: "python", pty: true, background: true })\`, read the screen with \`bash_status({ task_id, output_mode: "screen" })\`, and send input with \`bash_write({ task_id, input: "..." })\`.`);
@@ -36535,7 +36726,7 @@ function isConfigureWarning(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return false;
   const warning = value;
-  return (warning.kind === "formatter_not_installed" || warning.kind === "checker_not_installed" || warning.kind === "lsp_binary_missing") && typeof warning.hint === "string";
+  return (warning.kind === "formatter_not_installed" || warning.kind === "checker_not_installed" || warning.kind === "lsp_binary_missing" || warning.kind === "config_parse_failed") && typeof warning.hint === "string";
 }
 function coerceConfigureWarnings(warnings) {
   return warnings.filter(isConfigureWarning);
@@ -36545,6 +36736,18 @@ function drainPendingEagerWarnings(projectRoot) {
   pendingEagerWarnings.delete(projectRoot);
   return pending;
 }
+function enqueueConfigParseWarnings(projectRoot, errors3) {
+  if (!projectRoot || errors3.length === 0)
+    return;
+  const pending = pendingEagerWarnings.get(projectRoot) ?? [];
+  for (const entry of errors3) {
+    const hint = formatConfigParseFailureMessage(entry.path, entry.message);
+    if (!pending.some((item) => item.kind === "config_parse_failed" && item.hint === hint)) {
+      pending.push({ kind: "config_parse_failed", hint });
+    }
+  }
+  pendingEagerWarnings.set(projectRoot, pending);
+}
 function shouldPrepareOnnxRuntime(config2) {
   const isFastembedSemanticBackend = (config2.semantic?.backend ?? "fastembed") === "fastembed";
   return config2.semantic_search === true && isFastembedSemanticBackend;
@@ -36653,6 +36856,7 @@ async function src_default(pi) {
   }
   await ensureStorageMigrated({ harness: "pi", binaryPath, logger: bridgeLogger });
   const config2 = loadAftConfig(process.cwd());
+  enqueueConfigParseWarnings(process.cwd(), getConfigLoadErrors());
   const storageDir = resolveCortexKitStorageRoot();
   let onnxRuntimePromise = null;
   if (shouldPrepareOnnxRuntime(config2)) {
@@ -36661,30 +36865,7 @@ async function src_default(pi) {
       return null;
     });
   }
-  const configOverrides = {};
-  if (config2.format_on_edit !== undefined)
-    configOverrides.format_on_edit = config2.format_on_edit;
-  if (config2.formatter_timeout_secs !== undefined)
-    configOverrides.formatter_timeout_secs = config2.formatter_timeout_secs;
-  if (config2.validate_on_edit !== undefined)
-    configOverrides.validate_on_edit = config2.validate_on_edit;
-  if (config2.formatter !== undefined)
-    configOverrides.formatter = config2.formatter;
-  if (config2.checker !== undefined)
-    configOverrides.checker = config2.checker;
-  configOverrides.restrict_to_project_root = config2.restrict_to_project_root ?? false;
-  if (config2.search_index !== undefined)
-    configOverrides.search_index = config2.search_index;
-  if (config2.semantic_search !== undefined)
-    configOverrides.semantic_search = config2.semantic_search;
-  Object.assign(configOverrides, resolveExperimentalConfigForConfigure(config2));
-  Object.assign(configOverrides, resolveLspConfigForConfigure(config2));
-  if (config2.semantic !== undefined)
-    configOverrides.semantic = config2.semantic;
-  if (config2.inspect !== undefined)
-    configOverrides.inspect = config2.inspect;
-  if (config2.max_callgraph_files !== undefined)
-    configOverrides.max_callgraph_files = config2.max_callgraph_files;
+  const configOverrides = resolveProjectOverridesForConfigure(config2);
   if (config2.url_fetch_allow_private !== undefined)
     configOverrides.url_fetch_allow_private = config2.url_fetch_allow_private;
   configOverrides.storage_dir = storageDir;
@@ -36892,12 +37073,25 @@ ${lines}
     return { content, details: event.details, isError: event.isError };
   });
   pi.on("turn_end", async (_event, extCtx) => {
+    const sessionID = resolveSessionId(extCtx);
     await handleTurnEndBgCompletions({
       ctx,
       directory: extCtx.cwd,
-      sessionID: resolveSessionId(extCtx),
+      sessionID,
       runtime: pi
     });
+    const bridge = pool.getActiveBridgeForRoot(extCtx.cwd);
+    if (bridge && sessionID) {
+      handleConfigureWarningsForSession({
+        projectRoot: extCtx.cwd,
+        sessionId: sessionID,
+        client: pi,
+        bridge,
+        warnings: [],
+        storageDir,
+        pluginVersion: PLUGIN_VERSION
+      });
+    }
   });
   pi.on("input", (_event, extCtx) => {
     signalSyncWatchAbort(resolveSessionId(extCtx));
@@ -36926,6 +37120,7 @@ ${lines}
   log2(`AFT extension ready (surface=${config2.tool_surface ?? "recommended"})`);
 }
 var __test__2 = {
+  enqueueConfigParseWarnings,
   bridgeDirectoryFromCallback,
   resolveToolSurface,
   handleConfigureWarningsForSession,