@cortexkit/aft-pi 0.39.1 → 0.39.3

package/dist/index.js

@@ -12020,6 +12020,11 @@ var LONG_RUNNING_COMMAND_TIMEOUT_MS = {
 function timeoutForCommand(command) {
   return LONG_RUNNING_COMMAND_TIMEOUT_MS[command];
 }
+var PASSIVE_COMMANDS = new Set(["status"]);
+var PASSIVE_COMMAND_TIMEOUT_MS = 5000;
+function isPassiveCommand(command) {
+  return PASSIVE_COMMANDS.has(command);
+}
 
 // ../aft-bridge/dist/status-bar.js
 var STATUS_BAR_HEARTBEAT_CALLS = 15;
@@ -12092,6 +12097,11 @@ function bashTaskIdFrom(response) {
 function tagStderrLine(line) {
   return /^\[aft(-\w+)?\] /.test(line) ? line : `[aft] ${line}`;
 }
+var BENIGN_CPUINFO_PROC_CPUINFO_PARSE_FAILURE = "failed to parse processor information from /proc/cpuinfo";
+function shouldSurfaceStderrLine(line) {
+  const normalized = line.trim();
+  return !(normalized === `Error in cpuinfo: ${BENIGN_CPUINFO_PROC_CPUINFO_PARSE_FAILURE}` || normalized === BENIGN_CPUINFO_PROC_CPUINFO_PARSE_FAILURE);
+}
 function compareSemver(a, b) {
   const [aMain, aPre] = a.split("-", 2);
   const [bMain, bPre] = b.split("-", 2);
@@ -12183,6 +12193,7 @@ class BinaryBridge {
   _restartCount = 0;
   _shuttingDown = false;
   timeoutMs;
+  hangThreshold;
   maxRestarts;
   configured = false;
   _configurePromise = null;
@@ -12207,6 +12218,7 @@ class BinaryBridge {
     this.binaryPath = binaryPath;
     this.cwd = cwd;
     this.timeoutMs = options?.timeoutMs ?? DEFAULT_BRIDGE_TIMEOUT_MS;
+    this.hangThreshold = options?.hangThreshold ?? BRIDGE_HANG_TIMEOUT_THRESHOLD;
     this.maxRestarts = options?.maxRestarts ?? 3;
     this.configOverrides = clampSemanticTimeout(configOverrides ?? {}, this.timeoutMs);
     this.minVersion = options?.minVersion;
@@ -12324,7 +12336,9 @@ class BinaryBridge {
       if (requestSessionId && options?.configureWarningClient !== undefined) {
         this.configureWarningClients.set(requestSessionId, options.configureWarningClient);
       }
-      const effectiveTimeoutMs = options?.transportTimeoutMs ?? options?.timeoutMs ?? this.timeoutMs;
+      const passive = isPassiveCommand(command);
+      const resolvedTimeoutMs = options?.transportTimeoutMs ?? options?.timeoutMs ?? this.timeoutMs;
+      const effectiveTimeoutMs = passive ? Math.min(resolvedTimeoutMs, PASSIVE_COMMAND_TIMEOUT_MS) : resolvedTimeoutMs;
       const implicitTransportOptions = {
         ...options?.transportTimeoutMs !== undefined || options?.timeoutMs !== undefined ? { transportTimeoutMs: effectiveTimeoutMs } : {},
         markConfiguredOnSuccess: false
@@ -12374,7 +12388,7 @@ class BinaryBridge {
       }
       const line = `${JSON.stringify(request)}
 `;
-      const keepBridgeOnTimeout = options?.keepBridgeOnTimeout === true;
+      const keepBridgeOnTimeout = passive || options?.keepBridgeOnTimeout === true;
       let requestSentAt = Date.now();
       const response = await new Promise((resolve2, reject) => {
         const timer = setTimeout(() => {
@@ -12396,7 +12410,7 @@ class BinaryBridge {
           const childActiveSinceRequest = this.lastChildActivityAt > requestSentAt;
           const consecutiveTimeouts = this.consecutiveRequestTimeouts + 1;
           this.consecutiveRequestTimeouts = consecutiveTimeouts;
-          const keepWarm = childActiveSinceRequest || consecutiveTimeouts < BRIDGE_HANG_TIMEOUT_THRESHOLD;
+          const keepWarm = childActiveSinceRequest || consecutiveTimeouts < this.hangThreshold;
           const restartSuffix = keepWarm ? " — bridge kept warm" : " — restarting bridge";
           const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms${restartSuffix}`;
           if (requestSessionId) {
@@ -12691,7 +12705,7 @@ class BinaryBridge {
 `)) !== -1) {
       const line = this.stderrBuffer.slice(0, newlineIdx).replace(/\r$/, "");
       this.stderrBuffer = this.stderrBuffer.slice(newlineIdx + 1);
-      if (!line)
+      if (!line || !shouldSurfaceStderrLine(line))
         continue;
       const tagged = tagStderrLine(line);
       this.logVia(tagged);
@@ -12701,7 +12715,7 @@ class BinaryBridge {
   flushStderrBuffer() {
     const line = this.stderrBuffer.replace(/\r$/, "");
     this.stderrBuffer = "";
-    if (!line)
+    if (!line || !shouldSurfaceStderrLine(line))
       return;
     const tagged = tagStderrLine(line);
     this.logVia(tagged);
@@ -12926,6 +12940,208 @@ 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 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 location = line !== undefined ? `[${file}:${line}]` : `[${file}]`;
+  lines.push(treeLine(depth, `${name} ${location}${unresolved}`));
+  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) {
+  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]" : "";
+    lines.push(treeLine(hopIndex + 1, `${symbol}${entry} ${line !== undefined ? `[${file}:${line}]` : `[${file}]`}`));
+  });
+}
+function renderCallersGroupLines(group, theme) {
+  const file = shortenPath(asString(group.file) ?? "(unknown file)");
+  const lines = [theme.fg("accent", file)];
+  const callers = asRecords(group.callers);
+  const bySymbol = new Map;
+  for (const caller of callers) {
+    const symbol = asString(caller.symbol) ?? "(unknown)";
+    const line = asNumber(caller.line);
+    const bucket = bySymbol.get(symbol) ?? [];
+    if (line !== undefined)
+      bucket.push(line);
+    bySymbol.set(symbol, bucket);
+  }
+  const symbols = [...bySymbol.keys()].sort((a, b) => a.localeCompare(b));
+  for (const symbol of symbols) {
+    const lineNums = (bySymbol.get(symbol) ?? []).sort((a, b) => a - b);
+    const linePart = lineNums.length > 0 ? lineNums.map(String).join(", ") : "?";
+    lines.push(`  ↳ ${symbol}:${linePart}`);
+  }
+  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);
+      lines.push(treeLine(index + 1, `${symbol} ${line !== undefined ? `[${file}:${line}]` : `[${file}]`}`));
+    });
+    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);
+      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 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}`,
+        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]")}` : "";
+    sections.push(treeLine(index, `${variable} ${theme.fg("muted", `${asString(hop.flow_type) ?? "flow"}`)} ${symbol} [${file}:${line}]${approximate}`));
+  });
+  return sections;
+}
 // ../aft-bridge/dist/coerce.js
 function coerceStringArray(value) {
   if (Array.isArray(value)) {
@@ -12976,7 +13192,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";
@@ -13034,10 +13250,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() {
@@ -13317,7 +13533,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
@@ -13374,7 +13590,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) {
@@ -13416,7 +13632,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") {
@@ -13598,8 +13814,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")
@@ -13689,13 +13905,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
   };
 }
@@ -15030,13 +15246,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 {
@@ -15074,6 +15290,7 @@ class BridgePool {
     this.projectConfigLoader = options.projectConfigLoader;
     this.bridgeOptions = {
       timeoutMs: options.timeoutMs,
+      hangThreshold: options.hangThreshold,
       maxRestarts: options.maxRestarts,
       minVersion: options.minVersion,
       onVersionMismatch: options.onVersionMismatch,
@@ -16058,7 +16275,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.39.1",
+  version: "0.39.3",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -16081,7 +16298,7 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.39.1",
+    "@cortexkit/aft-bridge": "0.39.3",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
@@ -16089,12 +16306,12 @@ var package_default = {
     zod: "^4.1.8"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.39.1",
-    "@cortexkit/aft-darwin-x64": "0.39.1",
-    "@cortexkit/aft-linux-arm64": "0.39.1",
-    "@cortexkit/aft-linux-x64": "0.39.1",
-    "@cortexkit/aft-win32-arm64": "0.39.1",
-    "@cortexkit/aft-win32-x64": "0.39.1"
+    "@cortexkit/aft-darwin-arm64": "0.39.3",
+    "@cortexkit/aft-darwin-x64": "0.39.3",
+    "@cortexkit/aft-linux-arm64": "0.39.3",
+    "@cortexkit/aft-linux-x64": "0.39.3",
+    "@cortexkit/aft-win32-arm64": "0.39.3",
+    "@cortexkit/aft-win32-x64": "0.39.3"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "*",
@@ -16121,7 +16338,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 = "") {
@@ -16140,7 +16357,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),
@@ -16151,7 +16368,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)
@@ -16160,7 +16377,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),
@@ -16204,16 +16421,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),
@@ -16669,7 +16886,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);
 
@@ -30331,6 +30548,10 @@ var BashFeaturesSchema = exports_external.object({
   foreground_wait_window_ms: exports_external.number().int().positive().optional()
 });
 var BashConfigSchema = exports_external.union([exports_external.boolean(), BashFeaturesSchema]);
+var BridgeConfigSchema = exports_external.object({
+  request_timeout_ms: exports_external.number().int().min(1000, { message: "bridge.request_timeout_ms must be at least 1000" }).optional(),
+  hang_threshold: exports_external.number().int().min(1, { message: "bridge.hang_threshold must be at least 1" }).optional()
+});
 var InspectConfigSchema = exports_external.object({
   enabled: exports_external.boolean().optional(),
   tier2_idle_minutes: exports_external.number().min(0).optional(),
@@ -30362,13 +30583,16 @@ 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(),
   lsp: LspConfigSchema.optional(),
   url_fetch_allow_private: exports_external.boolean().optional(),
   semantic: SemanticConfigSchema.optional(),
-  max_callgraph_files: exports_external.number().int().positive().optional()
+  max_callgraph_files: exports_external.number().int().positive().optional(),
+  bridge: BridgeConfigSchema.optional()
 }).strict();
 function normalizeLspExtension(extension) {
   return extension.trim().replace(/^\.+/, "");
@@ -30421,6 +30645,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);
@@ -30597,6 +30852,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))
@@ -30604,7 +30870,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 });
@@ -30620,6 +30886,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;
   }
 }
@@ -30755,6 +31022,8 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "configure_warnings_delivery",
   "search_index",
   "semantic_search",
+  "callgraph_store",
+  "callgraph_chunk_size",
   "inspect",
   "experimental",
   "bash"
@@ -30776,6 +31045,8 @@ function getStrippedTopLevelKeys(override) {
     stripped.push("url_fetch_allow_private");
   if (override.max_callgraph_files !== undefined)
     stripped.push("max_callgraph_files");
+  if (override.bridge !== undefined)
+    stripped.push("bridge");
   return stripped;
 }
 function mergeConfigs(base, override) {
@@ -30787,6 +31058,7 @@ function mergeConfigs(base, override) {
   const experimental = mergeExperimentalConfig(base.experimental, override.experimental);
   const bash = mergeBashConfig(base.bash, override.bash);
   const inspect = mergeInspectConfig(base.inspect, override.inspect);
+  const bridge = base.bridge;
   const safeOverride = pickProjectSafeFields(override);
   delete safeOverride.bash;
   delete safeOverride.inspect;
@@ -30800,13 +31072,23 @@ function mergeConfigs(base, override) {
     ...inspect !== undefined ? { inspect } : {},
     experimental,
     semantic,
+    ...bridge !== undefined ? { bridge } : {},
     ...disabledTools.length > 0 ? { disabled_tools: [...new Set(disabledTools)] } : {}
   };
 }
+var DEFAULT_BRIDGE_REQUEST_TIMEOUT_MS = 30000;
+var DEFAULT_BRIDGE_HANG_THRESHOLD = 2;
+function resolveBridgePoolTransportOptions(config2) {
+  return {
+    timeoutMs: config2.bridge?.request_timeout_ms ?? DEFAULT_BRIDGE_REQUEST_TIMEOUT_MS,
+    hangThreshold: config2.bridge?.hang_threshold ?? DEFAULT_BRIDGE_HANG_THRESHOLD
+  };
+}
 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`);
@@ -30861,7 +31143,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;
@@ -30869,10 +31151,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() {
@@ -32585,6 +32867,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) {
@@ -32830,7 +33114,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
@@ -32952,12 +33236,66 @@ 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;
 }
+function absoluteSearchPath(cwd, target) {
+  const expanded = expandTilde2(target);
+  return isAbsolute4(expanded) ? expanded : resolve4(cwd, expanded);
+}
+async function searchPathExists(cwd, target) {
+  try {
+    await stat(absoluteSearchPath(cwd, target));
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function splitSearchPathArg(cwd, raw) {
+  if (await searchPathExists(cwd, raw) || !/\s/.test(raw)) {
+    return { paths: [raw], missing: [] };
+  }
+  const fragments = raw.trim().split(/\s+/).filter(Boolean);
+  if (fragments.length < 2) {
+    return { paths: [raw], missing: [] };
+  }
+  const existing = [];
+  const missing = [];
+  for (const fragment of fragments) {
+    if (await searchPathExists(cwd, fragment)) {
+      existing.push(fragment);
+    } else {
+      missing.push(fragment);
+    }
+  }
+  if (existing.length === 0) {
+    return { paths: [raw], missing: [] };
+  }
+  return { paths: existing, missing };
+}
+async function bridgeSearchPathArg(cwd, split) {
+  if (split.paths.length === 1 && split.missing.length === 0) {
+    return await resolvePathArg(cwd, split.paths[0]);
+  }
+  return split.paths.map((target) => absoluteSearchPath(cwd, target)).join(" ");
+}
+function formatSkippedSearchPaths(missing) {
+  if (missing.length === 0)
+    return;
+  const noun = missing.length === 1 ? "path" : "paths";
+  return `Skipped ${missing.length} ${noun} not found: ${missing.join(", ")}`;
+}
+function appendSkippedSearchPaths(text, missing) {
+  const note = formatSkippedSearchPaths(missing);
+  if (!note)
+    return text;
+  return text.length > 0 ? `${text}
+
+${note}` : note;
+}
 function externalDirectoryPromptTimeoutMs() {
   const raw = process.env.AFT_PI_EXTERNAL_PROMPT_TIMEOUT_MS;
   if (raw === undefined)
@@ -33167,19 +33505,26 @@ function registerHoistedTools(pi, ctx, surface) {
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const bridge = bridgeFor(ctx, extCtx.cwd);
         const req = { pattern: params.pattern };
+        let pathSplit;
         if (params.path) {
-          await assertExternalDirectoryPermission(extCtx, params.path, "search", {
-            restrictToProjectRoot: surface.restrictToProjectRoot
-          });
-          req.path = await resolvePathArg(extCtx.cwd, params.path);
+          pathSplit = await splitSearchPathArg(extCtx.cwd, params.path);
+          for (const target of pathSplit.paths) {
+            await assertExternalDirectoryPermission(extCtx, absoluteSearchPath(extCtx.cwd, target), "search", {
+              restrictToProjectRoot: surface.restrictToProjectRoot
+            });
+          }
+          req.path = await bridgeSearchPathArg(extCtx.cwd, pathSplit);
         }
         if (params.include)
           req.include = splitIncludeGlobs(params.include);
         if (params.caseSensitive !== undefined)
           req.case_sensitive = params.caseSensitive;
         const response = await callBridge(bridge, "grep", req, extCtx);
-        const text = response.text ?? "";
-        return textResult(text);
+        if (pathSplit && pathSplit.missing.length > 0) {
+          response.complete = false;
+        }
+        const text = appendSkippedSearchPaths(response.text ?? "", pathSplit?.missing ?? []);
+        return textResult(text, response);
       }
     });
   }
@@ -33287,7 +33632,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;
 }
@@ -33323,15 +33668,15 @@ ${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;
 }
 async function resolvePathArg(cwd, path3) {
   const expanded = expandTilde2(path3);
-  const abs = isAbsolute4(expanded) ? expanded : resolve4(cwd, expanded);
+  const abs = absoluteSearchPath(cwd, path3);
   try {
     await stat(abs);
     return abs;
@@ -33374,7 +33719,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) {
@@ -33383,8 +33728,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;
@@ -33398,7 +33743,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(`
@@ -33437,23 +33782,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(", ");
@@ -33566,7 +33908,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));
   }
@@ -33575,8 +33917,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(`
@@ -33600,13 +33942,13 @@ async function assertAstPathsPermission(extCtx, paths, action, restrictToProject
   }
 }
 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"}`),
@@ -33618,26 +33960,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(`
@@ -33646,13 +33988,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]"),
@@ -33668,10 +34010,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"})`)}`
     ];
@@ -33681,7 +34023,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(`
@@ -33778,7 +34120,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;
@@ -33790,7 +34132,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."
   }),
@@ -33800,19 +34143,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 })."
@@ -33886,28 +34248,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
@@ -33932,7 +34296,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, {
@@ -33954,9 +34318,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);
@@ -33973,6 +34337,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");
@@ -34000,10 +34368,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) {
@@ -34022,7 +34392,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) {
@@ -34037,7 +34407,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) {
@@ -34610,10 +34980,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)"));
@@ -34623,8 +34993,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,33 +35108,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`
   ];
 }
@@ -34897,16 +35267,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)})`;
   }
@@ -34919,9 +35289,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)
@@ -34929,14 +35299,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}`);
   }
@@ -34944,15 +35314,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) {
@@ -34961,12 +35331,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]));
@@ -34977,12 +35347,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()})`);
@@ -34995,7 +35365,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];
@@ -35042,18 +35412,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")
@@ -35065,7 +35435,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."));
@@ -35073,7 +35443,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;
@@ -35106,7 +35476,7 @@ function registerInspectTool(pi, ctx) {
       runPendingTier2Categories(bridge, tier2RefreshCategories(response), extCtx);
       const body = response.text;
       if (typeof body === "string") {
-        const diagnostics = diagnosticsSummaryPart(asRecord2(response.summary));
+        const diagnostics = diagnosticsSummaryPart(asRecord3(response.summary));
         const text = diagnostics ? body ? `${body}
 
 ${diagnostics}` : diagnostics : body;
@@ -35146,138 +35516,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 = [
@@ -35340,7 +35583,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);
@@ -35418,25 +35662,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(`
 `);
@@ -35447,32 +35691,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(`
@@ -35811,32 +36055,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) {
@@ -35945,34 +36189,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(`
@@ -35980,22 +36224,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"}`)
   ];
@@ -36004,8 +36248,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(`
@@ -36149,13 +36393,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}`)}`
   ];
@@ -36167,34 +36411,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}`));
@@ -36202,16 +36446,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}`));
@@ -36323,11 +36567,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: "..." })\`.`);
@@ -36442,7 +36686,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);
@@ -36452,6 +36696,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;
@@ -36560,6 +36816,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)) {
@@ -36568,30 +36825,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;
@@ -36658,6 +36892,7 @@ ${lines}
   }
   let pool;
   const poolOptions = {
+    ...resolveBridgePoolTransportOptions(config2),
     errorPrefix: "[aft-pi]",
     minVersion: PLUGIN_VERSION,
     onVersionMismatch: createVersionMismatchHandler(() => pool),
@@ -36798,12 +37033,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));
@@ -36832,6 +37080,7 @@ ${lines}
   log2(`AFT extension ready (surface=${config2.tool_surface ?? "recommended"})`);
 }
 var __test__2 = {
+  enqueueConfigParseWarnings,
   bridgeDirectoryFromCallback,
   resolveToolSurface,
   handleConfigureWarningsForSession,