@cortexkit/aft-pi 0.52.1 → 0.53.0

package/dist/index.js

@@ -7948,7 +7948,7 @@ function error(message, meta) {
 }
 // ../aft-bridge/dist/bash-format.js
 function isTerminalStatus(status) {
-  return status === "completed" || status === "failed" || status === "killed" || status === "timed_out";
+  return status === "completed" || status === "failed" || status === "killed" || status === "timed_out" || status === "fate_unknown";
 }
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -8491,6 +8491,7 @@ var TERMINAL_BASH_STATUSES = new Set([
   "failed",
   "killed",
   "timed_out",
+  "fate_unknown",
   "cancelled",
   "timeout"
 ]);
@@ -9921,7 +9922,7 @@ function isEmptyParam(value) {
   return false;
 }
 // ../aft-bridge/dist/config-keys.js
-var OPENCODE_ONLY_KEYS = ["hoist_builtin_tools", "auto_update"];
+var OPENCODE_ONLY_KEYS = ["auto_update"];
 function stripHarnessSpecificConfigKeys(value, keys) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return value;
@@ -10359,34 +10360,54 @@ async function fetchLatestTag() {
 }
 // ../aft-bridge/dist/durable-log.js
 import { appendFile, mkdir, rename, rm, stat } from "node:fs/promises";
+import { dirname } from "node:path";
+
+// ../aft-bridge/dist/storage-paths.js
 import { homedir as homedir5 } from "node:os";
-import { dirname, join as join5 } from "node:path";
-var DEFAULT_LOG_BYTES = 32 * 1024 * 1024;
-var DEFAULT_LOG_GENERATIONS = 1;
+import { join as join5, resolve as resolve3 } from "node:path";
 function homeDir2() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir5();
   return process.env.HOME || homedir5();
 }
 function dataHome() {
-  if (process.env.XDG_DATA_HOME)
-    return process.env.XDG_DATA_HOME;
+  const xdg = process.env.XDG_DATA_HOME;
+  if (xdg)
+    return xdg;
   if (process.platform === "win32") {
     return process.env.LOCALAPPDATA || process.env.APPDATA || join5(homeDir2(), "AppData", "Local");
   }
   return join5(homeDir2(), ".local", "share");
 }
+function resolveStoragePath(raw) {
+  let expanded = raw;
+  if (raw === "~") {
+    expanded = homeDir2();
+  } else if (raw.startsWith("~/") || raw.startsWith("~\\")) {
+    expanded = join5(homeDir2(), raw.slice(2));
+  }
+  return resolve3(expanded);
+}
+function resolveCortexKitStorageRoot() {
+  const override = process.env.AFT_STORAGE_DIR;
+  if (override)
+    return resolveStoragePath(override);
+  return resolveStoragePath(join5(dataHome(), "cortexkit", "aft"));
+}
 function resolveAftStorageRoot(configuredRoot) {
+  if (process.env.AFT_STORAGE_DIR)
+    return resolveCortexKitStorageRoot();
   if (configuredRoot)
     return configuredRoot;
-  if (process.env.AFT_CACHE_DIR)
-    return join5(process.env.AFT_CACHE_DIR, "aft");
-  return join5(dataHome(), "cortexkit", "aft");
+  return resolveCortexKitStorageRoot();
 }
 function resolveAftLogPath(filename, configuredRoot) {
   return join5(resolveAftStorageRoot(configuredRoot), "logs", filename);
 }
 
+// ../aft-bridge/dist/durable-log.js
+var DEFAULT_LOG_BYTES = 32 * 1024 * 1024;
+var DEFAULT_LOG_GENERATIONS = 1;
 class RotatingLogSink {
   path;
   maxBytes;
@@ -10758,7 +10779,7 @@ class SubcSocket {
     return this.sock.localPort ?? null;
   }
   static connect(host, port, deadlineMs) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const sock = net.connect({ host, port });
       sock.setNoDelay(true);
       const timer = setTimeout(() => {
@@ -10767,7 +10788,7 @@ class SubcSocket {
       }, Math.max(0, deadlineMs - Date.now()));
       sock.once("connect", () => {
         clearTimeout(timer);
-        resolve3(new SubcSocket(sock));
+        resolve4(new SubcSocket(sock));
       });
       sock.once("error", (err) => {
         clearTimeout(timer);
@@ -10799,7 +10820,7 @@ class SubcSocket {
     }
     if (n === 0)
       return Promise.resolve(new Uint8Array(0));
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       let timer = null;
       if (Number.isFinite(deadlineMs)) {
         const remaining = deadlineMs - Date.now();
@@ -10812,7 +10833,7 @@ class SubcSocket {
           reject(new SocketTimeoutError(`timed out waiting for ${n} bytes`));
         }, remaining);
       }
-      this.waiter = { need: n, resolve: resolve3, reject, timer };
+      this.waiter = { need: n, resolve: resolve4, reject, timer };
       this.tryServe();
     });
   }
@@ -10848,7 +10869,7 @@ class SubcSocket {
     let queued = false;
     let settled = false;
     let timer = null;
-    const completed = new Promise((resolve3, reject) => {
+    const completed = new Promise((resolve4, reject) => {
       const settle = (run) => {
         if (settled)
           return;
@@ -10872,7 +10893,7 @@ class SubcSocket {
             if (err) {
               reject(new SocketWriteQueuedError("subc socket reported a write error after bytes were handed to the socket", err instanceof Error ? err : new Error(String(err))));
             } else {
-              resolve3();
+              resolve4();
             }
           });
         });
@@ -11295,15 +11316,15 @@ class SubcClient {
     const key = pendingKey(handle, corr);
     let subscriptionPending = null;
     let resolveClosed = null;
-    const closed = new Promise((resolve3, reject) => {
+    const closed = new Promise((resolve4, reject) => {
       if (this.closedErr) {
         reject(this.closedErr);
         return;
       }
-      resolveClosed = resolve3;
+      resolveClosed = resolve4;
       subscriptionPending = {
         handle,
-        resolve: () => resolve3(),
+        resolve: () => resolve4(),
         reject,
         onProgress: onEvent,
         timer: null,
@@ -11392,11 +11413,11 @@ class SubcClient {
     const waiters = [];
     for (const pending of this.pending.values()) {
       if (pending.handle === handle && !pending.subscription) {
-        waiters.push(new Promise((resolve3) => {
+        waiters.push(new Promise((resolve4) => {
           const previous = pending.onSettle;
           pending.onSettle = () => {
             previous?.();
-            resolve3();
+            resolve4();
           };
         }));
       }
@@ -11452,11 +11473,11 @@ class SubcClient {
     const channel = handle?.channel ?? 0;
     const epoch = handle?.epoch ?? 0;
     const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false, admission), channel, epoch, corr, body);
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
         handle,
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         onProgress,
         timer: null,
@@ -11530,11 +11551,11 @@ class SubcClient {
       }
       return this.outcomeUnknownCallError("connection dropped before the managed call returned a response", error2);
     };
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
         handle,
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         onProgress,
         timer: null,
@@ -11983,7 +12004,7 @@ function normalizeConnectOptions(opts) {
     identity: opts.identity,
     targetKind: opts.targetKind ?? DEFAULT_MANAGED_TARGET_KIND,
     reconnectBackoff: opts.reconnectBackoff ?? DEFAULT_RECONNECT_BACKOFF,
-    sleep: opts.sleep ?? ((ms) => new Promise((resolve3) => setTimeout(resolve3, ms))),
+    sleep: opts.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms))),
     timeoutArbitrationGraceMs: opts.timeoutArbitrationGraceMs ?? TIMEOUT_ARBITRATION_GRACE_MS,
     livenessProbeWindowMs: opts.livenessProbeWindowMs ?? LIVENESS_PROBE_WINDOW_MS,
     onControlPush: opts.onControlPush
@@ -12442,14 +12463,14 @@ function getLifecycleRegistry() {
 
 // ../aft-bridge/dist/project-identity.js
 import { realpathSync } from "node:fs";
-import { resolve as resolve3 } from "node:path";
+import { resolve as resolve4 } from "node:path";
 function canonicalizeProjectRoot(dir) {
   const trimmed = dir.replace(/[/\\]+$/, "");
   let canonical;
   try {
     canonical = realpathSync(trimmed);
   } catch {
-    canonical = resolve3(trimmed);
+    canonical = resolve4(trimmed);
   }
   return normalizeWindowsRoot(canonical);
 }
@@ -12945,8 +12966,8 @@ class SubcTransportPool {
     this.connectFn = options.connect ?? ((opts) => SubcClient.connect(opts));
     this.onBgEventsNudge = options.onBgEventsNudge;
     this.onBgEventsNudgeRef = options.onBgEventsNudgeRef;
-    this.bgBackoffSleep = options.bgBackoffSleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
-    this.routeRetrySleep = options.routeRetrySleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
+    this.bgBackoffSleep = options.bgBackoffSleep ?? ((ms) => new Promise((resolve5) => setTimeout(resolve5, ms)));
+    this.routeRetrySleep = options.routeRetrySleep ?? ((ms) => new Promise((resolve5) => setTimeout(resolve5, ms)));
     this.bgDispatchProbeIntervalMs = options.bgDispatchProbeIntervalMs ?? BG_DISPATCH_PROBE_INTERVAL_MS;
     const lifecycle = options.lifecycle;
     const demandCheck = options.lifecycleDemandCheck ?? options.demandCheck ?? lifecycle?.demandCheck;
@@ -13862,12 +13883,12 @@ function stripJsoncSymbols(value) {
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { closeSync as closeSync3, existsSync as existsSync6, mkdirSync as mkdirSync4, openSync as openSync3, readFileSync as readFileSync5, renameSync as renameSync4, rmSync as rmSync2, statSync as statSync4, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir8, tmpdir } from "node:os";
-import { basename, dirname as dirname3, join as join8, resolve as resolve5 } from "node:path";
+import { basename, dirname as dirname3, join as join8, resolve as resolve6 } from "node:path";
 
 // ../aft-bridge/dist/paths.js
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { dirname as dirname2, isAbsolute as isAbsolute2, join as join6, resolve as resolve4 } from "node:path";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join6, resolve as resolve5 } from "node:path";
 function homeDir3() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir6();
@@ -13882,7 +13903,7 @@ function configHome() {
 function legacyOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
-    return resolve4(envDir);
+    return resolve5(envDir);
   return join6(configHome(), "opencode");
 }
 function legacyPiAgentDir() {
@@ -14247,9 +14268,6 @@ function resolveLegacyStorageRoot(harness) {
     return join8(homeDir4(), ".pi", "agent", "aft");
   return join8(dataHome2(), "opencode", "storage", "plugin", "aft");
 }
-function resolveCortexKitStorageRoot() {
-  return join8(dataHome2(), "cortexkit", "aft");
-}
 function stripJsoncForParse(input) {
   let out = "";
   let inString = false;
@@ -14519,8 +14537,8 @@ function visibleConfigMigrationWarning(scope, targetPath, paths, reason) {
 }
 function migrateAftConfigFile(opts) {
   const warnings = [];
-  const resolvedTarget = resolve5(opts.targetPath);
-  const existingSources = opts.legacySources.filter((source) => existsSync6(source.path) && resolve5(source.path) !== resolvedTarget);
+  const resolvedTarget = resolve6(opts.targetPath);
+  const existingSources = opts.legacySources.filter((source) => existsSync6(source.path) && resolve6(source.path) !== resolvedTarget);
   const info = opts.logger?.info ?? opts.logger?.log;
   if (existingSources.length === 0) {
     return { migrated: false, conflict: false, targetPath: opts.targetPath, warnings };
@@ -14766,7 +14784,7 @@ function npmSpawnEnv(resolved, baseEnv = process.env) {
 import { execFileSync } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
 import { chmodSync as chmodSync3, closeSync as closeSync4, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync7, lstatSync, mkdirSync as mkdirSync5, openSync as openSync4, readdirSync as readdirSync3, readFileSync as readFileSync6, readlinkSync, realpathSync as realpathSync2, rmSync as rmSync3, statSync as statSync6, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { basename as basename2, dirname as dirname5, isAbsolute as isAbsolute4, join as join10, relative as relative2, resolve as resolve6, win32 } from "node:path";
+import { basename as basename2, dirname as dirname5, isAbsolute as isAbsolute4, join as join10, relative as relative2, resolve as resolve7, win32 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
 var ORT_VERSION = "1.24.4";
@@ -15071,7 +15089,7 @@ function findSystemOnnxRuntime(libName) {
   const normalizeCase = process.platform === "win32" || process.platform === "darwin";
   const seen = new Set;
   const uniquePaths = searchPaths.filter((p) => {
-    let key = resolve6(p).replace(/[/\\]+$/, "");
+    let key = resolve7(p).replace(/[/\\]+$/, "");
     if (normalizeCase)
       key = key.toLowerCase();
     if (seen.has(key))
@@ -15155,7 +15173,7 @@ function validateExtractedTree(stagingRoot) {
       const lst = lstatSync(fullPath);
       if (lst.isSymbolicLink()) {
         const linkTarget = readlinkSync(fullPath);
-        const resolvedTarget = resolve6(dirname5(fullPath), linkTarget);
+        const resolvedTarget = resolve7(dirname5(fullPath), linkTarget);
         const rel2 = relative2(realRoot, resolvedTarget);
         if (rel2.startsWith("..") || isAbsolute4(rel2) || win32.isAbsolute(rel2)) {
           throw new Error(`extracted symlink ${fullPath} points outside staging root: ${linkTarget}`);
@@ -15273,7 +15291,7 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
       unlinkSync4(dst);
     } catch {}
     const dstForContainment = join10(targetRoot, link.name);
-    const resolvedTarget = resolve6(dirname5(dstForContainment), link.target);
+    const resolvedTarget = resolve7(dirname5(dstForContainment), link.target);
     if (!isPathInsideRoot(targetRoot, resolvedTarget)) {
       const message = `ONNX Runtime symlink ${link.name} points outside install dir: ${link.target}`;
       if (requiredLibs.has(link.name)) {
@@ -16340,7 +16358,7 @@ class RevivableTransportPool {
     const delay = Math.max(0, this.revivalRetryNotBefore - Date.now());
     if (delay > 0) {
       let scheduled;
-      scheduled = new Promise((resolve7) => setTimeout(resolve7, delay)).then(() => {
+      scheduled = new Promise((resolve8) => setTimeout(resolve8, delay)).then(() => {
         if (this.revival === scheduled)
           this.revival = null;
         return this.ensureActivePool();
@@ -17443,7 +17461,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.52.1",
+  version: "0.53.0",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -17466,19 +17484,19 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.52.1",
+    "@cortexkit/aft-bridge": "0.53.0",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
     typebox: "1.1.38",
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.52.1",
-    "@cortexkit/aft-darwin-x64": "0.52.1",
-    "@cortexkit/aft-linux-arm64": "0.52.1",
-    "@cortexkit/aft-linux-x64": "0.52.1",
-    "@cortexkit/aft-win32-arm64": "0.52.1",
-    "@cortexkit/aft-win32-x64": "0.52.1"
+    "@cortexkit/aft-darwin-arm64": "0.53.0",
+    "@cortexkit/aft-darwin-x64": "0.53.0",
+    "@cortexkit/aft-linux-arm64": "0.53.0",
+    "@cortexkit/aft-linux-x64": "0.53.0",
+    "@cortexkit/aft-win32-arm64": "0.53.0",
+    "@cortexkit/aft-win32-x64": "0.53.0"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "^0.80.2",
@@ -17622,13 +17640,16 @@ function coerceAftStatus(response) {
     project_root: readNullableString(response.project_root),
     canonical_root: readNullableString(response.canonical_root),
     cache_role: readString(response.cache_role, "not_initialized"),
+    degraded: readBoolean(response.degraded),
+    degraded_reasons: Array.isArray(response.degraded_reasons) ? response.degraded_reasons.filter((r) => typeof r === "string") : [],
     message: typeof response.message === "string" ? response.message : undefined,
     features: {
       format_on_edit: readBoolean(features.format_on_edit),
       validate_on_edit: readString(features.validate_on_edit, "off"),
       restrict_to_project_root: readBoolean(features.restrict_to_project_root),
       search_index: readBoolean(features.search_index ?? features.experimental_search_index),
-      semantic_search: readBoolean(features.semantic_search ?? features.experimental_semantic_search)
+      semantic_search: readBoolean(features.semantic_search ?? features.experimental_semantic_search),
+      callgraph_store: readBoolean(features.callgraph_store)
     },
     search_index: {
       status: readString(searchIndex.status, "unknown"),
@@ -17679,21 +17700,10 @@ function formatStatusDialogMessage(status) {
     `AFT version: ${status.version}`,
     `Project root: ${status.project_root ?? "(not configured)"}`,
     `Canonical root: ${status.canonical_root ?? "(not configured)"}`,
-    `Cache role: ${formatCacheRoleLabel(status.cache_role)}`,
-    "",
-    "Enabled features",
-    `- format_on_edit: ${formatFlag(status.features.format_on_edit)}`,
-    `- search_index: ${formatFlag(status.features.search_index)}`,
-    `- semantic_search: ${formatFlag(status.features.semantic_search)}`,
-    "",
-    "Search index",
-    `- status: ${status.search_index.status}`,
-    `- files: ${formatCount(status.search_index.files)}`,
-    `- trigrams: ${formatCount(status.search_index.trigrams)}`,
-    "",
-    "Semantic index",
-    `- status: ${formatSemanticIndexStatus(status.semantic_index.status, status.semantic_index.stage)}`
+    `Cache role: ${formatCacheRoleLabel(status.cache_role)}`
   ];
+  appendDegradedStatus(lines, status, false);
+  lines.push("", "Enabled features", `- format_on_edit: ${formatFlag(status.features.format_on_edit)}`, `- search_index: ${formatFlag(status.features.search_index)}`, `- semantic_search: ${formatFlag(status.features.semantic_search)}`, `- callgraph_store: ${formatFlag(status.features.callgraph_store)}`, "", "Search index", `- status: ${status.search_index.status}`, `- files: ${formatCount(status.search_index.files)}`, `- trigrams: ${formatCount(status.search_index.trigrams)}`, "", "Semantic index", `- status: ${formatSemanticIndexStatus(status.semantic_index.status, status.semantic_index.stage)}`);
   const refreshing = formatSemanticRefreshing(status.semantic_index.refreshing_count);
   if (refreshing) {
     lines.push(`- ${refreshing}`);
@@ -17743,6 +17753,15 @@ function formatStatusDialogMessage(status) {
   return lines.join(`
 `);
 }
+function appendDegradedStatus(lines, status, markdown) {
+  if (!status.degraded || status.degraded_reasons.length === 0)
+    return;
+  lines.push("", markdown ? "### Degraded mode" : "Degraded mode");
+  for (const reason of status.degraded_reasons) {
+    const detail = reason === "home_root" ? "project root is your home directory; heavy indexes are disabled" : reason;
+    lines.push(`- ${detail}`);
+  }
+}
 
 // src/tools/_shared.ts
 import { existsSync as existsSync9 } from "node:fs";
@@ -17753,7 +17772,8 @@ var optionalInt = (min, max, description = "(integer)") => Type.Optional(Type.Un
 function withPathAliasPreparation(tool) {
   const existing = tool.prepareArguments;
   const prepare = (args) => {
-    const prepared = tool.name === "edit" ? prepareCanonicalEditArguments(tool.name, args) : prepareCanonicalPathArguments(tool.name, args);
+    const isEditTool = tool.name === "edit" || tool.name === "aft_edit";
+    const prepared = isEditTool ? prepareCanonicalEditArguments("edit", args) : prepareCanonicalPathArguments(tool.name, args);
     return existing ? existing(prepared) : prepared;
   };
   return {
@@ -17980,7 +18000,7 @@ function renderInner(s, error3, theme, innerWidth) {
     lines.push(line);
   lines.push("");
   lines.push(theme.fg("muted", "Features"));
-  lines.push(`  ${featureBadge("format_on_edit", s.features.format_on_edit, theme)}  ${featureBadge("search_index", s.features.search_index, theme)}  ${featureBadge("semantic_search", s.features.semantic_search, theme)}`);
+  lines.push(`  ${featureBadge("format_on_edit", s.features.format_on_edit, theme)}  ${featureBadge("search_index", s.features.search_index, theme)}  ${featureBadge("semantic_search", s.features.semantic_search, theme)}  ${featureBadge("callgraph_store", s.features.callgraph_store, theme)}`);
   const compressionRows = formatCompressionStatusRows(s.compression);
   if (compressionRows.length > 0) {
     lines.push("");
@@ -18138,6 +18158,8 @@ function registerStatusCommand(pi, ctx) {
 
 // src/config.ts
 import { existsSync as existsSync10, readFileSync as readFileSync7, renameSync as renameSync5, unlinkSync as unlinkSync5, writeFileSync as writeFileSync4 } from "node:fs";
+import { homedir as homedir12 } from "node:os";
+import { isAbsolute as isAbsolute6 } from "node:path";
 var import_comment_json = __toESM(require_src2(), 1);
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
@@ -32501,6 +32523,32 @@ var CheckerEnum = exports_external.enum([
   "none"
 ]);
 var ConfigureWarningsDeliveryEnum = exports_external.enum(["toast", "log", "chat"]);
+var IndexKindSchema = exports_external.enum(["search", "semantic", "callgraph"]);
+function isSupportedAbsoluteIndexPath(path2) {
+  if (path2 === "~" || path2.startsWith("~/") || path2.startsWith("~\\")) {
+    return isAbsolute6(homedir12());
+  }
+  return isAbsolute6(path2);
+}
+var IndexRootSchema = exports_external.object({
+  path: exports_external.string().refine(isSupportedAbsoluteIndexPath, {
+    message: "index.roots path must be absolute after ~ expansion"
+  }),
+  indexes: exports_external.array(IndexKindSchema).min(1, "index.roots indexes must be non-empty")
+}).superRefine(({ indexes }, context) => {
+  if (new Set(indexes).size !== indexes.length) {
+    context.addIssue({
+      code: "custom",
+      message: "index.roots indexes must not contain duplicates"
+    });
+  }
+}).transform(({ path: path2, indexes }) => ({
+  path: path2,
+  indexes: ["search", "semantic", "callgraph"].filter((kind) => indexes.includes(kind) || kind === "search" && indexes.includes("semantic"))
+}));
+var IndexConfigSchema = exports_external.object({
+  roots: exports_external.array(IndexRootSchema).optional()
+});
 var SemanticConfigSchema = exports_external.object({
   backend: exports_external.enum(["fastembed", "openai_compatible", "ollama"]).optional(),
   model: exports_external.string().trim().min(1).optional(),
@@ -32566,7 +32614,12 @@ var SubcConfigSchema = exports_external.object({
   connection_file: exports_external.string().optional()
 });
 var GhShimConfigSchema = exports_external.object({
-  enabled: exports_external.boolean().optional()
+  enabled: exports_external.boolean().optional(),
+  binary_path: exports_external.string().trim().refine(isAbsolute6, "gh_shim.binary_path must be absolute").optional()
+});
+var GitCoAuthorSchema = exports_external.string().trim().refine((value) => value === "off" || value === "auto" || /^[^<>\r\n]+\s+<[^<>\s@]+@[^<>\s@]+>$/.test(value), "git.co_author must be 'off', 'auto', or an explicit 'Name <email>' identity");
+var GitConfigSchema = exports_external.object({
+  co_author: GitCoAuthorSchema.optional()
 });
 var InspectConfigSchema = exports_external.object({
   enabled: exports_external.boolean().optional(),
@@ -32597,10 +32650,12 @@ var AftConfigSchema = exports_external.preprocess((value) => stripHarnessSpecifi
   formatter: exports_external.record(exports_external.string(), FormatterEnum).optional(),
   checker: exports_external.record(exports_external.string(), CheckerEnum).optional(),
   configure_warnings_delivery: ConfigureWarningsDeliveryEnum.optional(),
+  hoist_builtin_tools: exports_external.boolean().optional(),
   tool_surface: exports_external.enum(["minimal", "recommended", "all"]).optional(),
   disabled_tools: exports_external.array(exports_external.string()).optional(),
   restrict_to_project_root: exports_external.boolean().optional(),
   search_index: exports_external.boolean().optional(),
+  index: IndexConfigSchema.optional(),
   semantic_search: exports_external.boolean().optional(),
   callgraph_store: exports_external.boolean().optional(),
   callgraph_chunk_size: exports_external.number().optional(),
@@ -32615,7 +32670,8 @@ var AftConfigSchema = exports_external.preprocess((value) => stripHarnessSpecifi
   semantic: SemanticConfigSchema.optional(),
   bridge: BridgeConfigSchema.optional(),
   subc: SubcConfigSchema.optional(),
-  gh_shim: GhShimConfigSchema.optional()
+  gh_shim: GhShimConfigSchema.optional(),
+  git: GitConfigSchema.optional()
 }).strict());
 var CONFIG_MIGRATIONS = [
   { oldKey: "experimental_search_index", newPath: ["search_index"] },
@@ -32778,6 +32834,12 @@ function recordConfigParseFailure(configPath, errorMessage) {
   configLoadErrors.push({ path: configPath, message: errorMessage });
   warn2(formatConfigParseFailureMessage(configPath, errorMessage));
 }
+function warnIgnoredHarnessSpecificConfigKeys(config2, configPath) {
+  const ignored = OPENCODE_ONLY_KEYS.filter((key) => Object.hasOwn(config2, key));
+  if (ignored.length === 0)
+    return;
+  warn2(`Ignoring OpenCode-only config key${ignored.length === 1 ? "" : "s"} ${ignored.map((key) => `\`${key}\``).join(", ")} in ${configPath}; ${ignored.length === 1 ? "it has" : "they have"} no effect on the Pi harness.`);
+}
 function loadConfigFromPath(configPath) {
   try {
     if (!existsSync10(configPath))
@@ -32790,6 +32852,7 @@ function loadConfigFromPath(configPath) {
     }
     migrateRawConfig(rawConfig, configPath, { log: log2, warn: warn2 });
     const cleanConfig = stripJsoncSymbols(rawConfig);
+    warnIgnoredHarnessSpecificConfigKeys(cleanConfig, configPath);
     const result = AftConfigSchema.safeParse(cleanConfig);
     if (result.success) {
       log2(`Config loaded from ${configPath}`);
@@ -32953,6 +33016,7 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "enabled",
   "edit_mode",
   "tool_surface",
+  "hoist_builtin_tools",
   "format_on_edit",
   "validate_on_edit",
   "configure_warnings_delivery",
@@ -32962,6 +33026,7 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "callgraph_chunk_size",
   "inspect",
   "worktree",
+  "git",
   "experimental",
   "bash"
 ]);
@@ -32984,6 +33049,8 @@ function getStrippedTopLevelKeys(override) {
     stripped.push("bridge");
   if (override.backup !== undefined)
     stripped.push("backup");
+  if (override.index?.roots !== undefined)
+    stripped.push("index.roots");
   if (override.sandbox?.enabled === false)
     stripped.push("sandbox.enabled");
   if (override.sandbox?.write_allow !== undefined)
@@ -33690,18 +33757,18 @@ function ensureInstallAnchor(cwd) {
   }
 }
 function runInstall(spec, version2, cwd, signal) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const target = `${spec.npm}@${version2}`;
     log2(`[lsp] installing ${target} to ${cwd}`);
     if (signal?.aborted) {
       warn2(`[lsp] install ${target} aborted before spawn`);
-      resolve7(false);
+      resolve8(false);
       return;
     }
     const npm = resolveNpm();
     if (!npm) {
       warn2(`[lsp] npm not found on PATH or known locations; cannot install ${target}`);
-      resolve7(false);
+      resolve8(false);
       return;
     }
     ensureInstallAnchor(cwd);
@@ -33724,7 +33791,7 @@ function runInstall(spec, version2, cwd, signal) {
         return;
       settled = true;
       cleanup();
-      resolve7(ok);
+      resolve8(ok);
     };
     const onAbort = () => {
       warn2(`[lsp] install ${target} aborted during shutdown`);
@@ -33825,7 +33892,7 @@ function cachedPackageDir(npmPackage) {
   return lspBinDir(npmPackage).replace(/[\\/]node_modules[\\/]\.bin[\\/]?$/, "");
 }
 function hashInstalledBinary(spec) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const candidates = process.platform === "win32" ? [
       lspBinaryPath(spec.npm, spec.binary),
       lspBinaryPath(spec.npm, `${spec.binary}.cmd`),
@@ -33849,7 +33916,7 @@ function hashInstalledBinary(spec) {
     const stream = createReadStream(pathToHash);
     stream.on("error", reject);
     stream.on("data", (chunk) => hash2.update(chunk));
-    stream.on("end", () => resolve7(hash2.digest("hex")));
+    stream.on("end", () => resolve8(hash2.digest("hex")));
   });
 }
 function installedBinaryPath(spec) {
@@ -33976,7 +34043,7 @@ import {
   unlinkSync as unlinkSync7,
   writeFileSync as writeFileSync7
 } from "node:fs";
-import { dirname as dirname6, join as join15, relative as relative3, resolve as resolve7 } from "node:path";
+import { dirname as dirname6, join as join15, relative as relative3, resolve as resolve8 } from "node:path";
 import { Readable as Readable3 } from "node:stream";
 import { pipeline as pipeline3 } from "node:stream/promises";
 
@@ -34133,12 +34200,12 @@ function writeGithubInstalledMetaIn(installDir, version2, binarySha256, archiveS
 var MAX_DOWNLOAD_BYTES3 = 256 * 1024 * 1024;
 var MAX_EXTRACT_BYTES2 = 1024 * 1024 * 1024;
 function sha256OfFile(path2) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const hash2 = createHash5("sha256");
     const stream = createReadStream2(path2);
     stream.on("error", reject);
     stream.on("data", (chunk) => hash2.update(chunk));
-    stream.on("end", () => resolve8(hash2.digest("hex")));
+    stream.on("end", () => resolve9(hash2.digest("hex")));
   });
 }
 function sha256OfFileSync2(path2) {
@@ -34395,7 +34462,7 @@ function validateExtraction(stagingRoot) {
         throw new Error(`failed to realpath ${full}: ${err}`);
       }
       const rel = relative3(realStagingRoot, realFull);
-      if (rel.startsWith("..") || resolve7(realStagingRoot, rel) !== realFull) {
+      if (rel.startsWith("..") || resolve8(realStagingRoot, rel) !== realFull) {
         throw new Error(`archive entry escapes staging root: ${full} → ${realFull} (zip-slip defense)`);
       }
       if (lst.isDirectory()) {
@@ -34978,8 +35045,8 @@ function installProcessHandlers() {
       }
       signalShutdownStarted = true;
       process.exitCode = SIGNAL_EXIT_CODES[sig];
-      const timeout = new Promise((resolve8) => {
-        setTimeout(resolve8, SIGNAL_CLEANUP_TIMEOUT_MS);
+      const timeout = new Promise((resolve9) => {
+        setTimeout(resolve9, SIGNAL_CLEANUP_TIMEOUT_MS);
       });
       Promise.race([runCleanups(sig), timeout]).finally(() => {
         process.exit(SIGNAL_EXIT_CODES[sig]);
@@ -35021,16 +35088,222 @@ import { Type as Type3 } from "typebox";
 
 // src/tools/hoisted.ts
 import { stat as stat2 } from "node:fs/promises";
-import { homedir as homedir12 } from "node:os";
-import { isAbsolute as isAbsolute6, relative as relative4, resolve as resolve8, sep } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { isAbsolute as isAbsolute7, relative as relative4, resolve as resolve9, sep } from "node:path";
 import {
-  renderDiff
+  renderDiff as renderDiff2
 } from "@earendil-works/pi-coding-agent";
-import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+import { Container as Container2, Spacer as Spacer2, Text as Text2 } from "@earendil-works/pi-tui";
 import { Type as Type2 } from "typebox";
 
 // src/tools/diff-format.ts
 import { diffLines } from "diff";
+
+// src/tools/render-helpers.ts
+import { homedir as homedir13 } from "node:os";
+import { renderDiff } from "@earendil-works/pi-coding-agent";
+import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+var NATIVE_COLLAPSED_RESULT_MAX_LINES = 5;
+function normalizeTerminalText(text) {
+  return text.replace(/\r/g, "");
+}
+
+class TerminalSafeComponent {
+  component;
+  constructor(component) {
+    this.component = component;
+  }
+  render(width) {
+    return this.component.render(width).map(normalizeTerminalText);
+  }
+  invalidate() {
+    this.component.invalidate?.();
+  }
+  handleInput(data) {
+    this.component.handleInput?.(data);
+  }
+}
+function reuseText(last) {
+  return last instanceof Text ? last : new Text("", 0, 0);
+}
+function reuseContainer(last) {
+  return last instanceof Container ? last : new Container;
+}
+function shortenPath2(path2) {
+  const home = homedir13();
+  if (path2.startsWith(home))
+    return `~${path2.slice(home.length)}`;
+  return path2;
+}
+function renderToolCall(toolName, summary, theme, context) {
+  const text = reuseText(context.lastComponent);
+  const suffix = summary ? ` ${summary}` : "";
+  text.setText(`${theme.fg("toolTitle", theme.bold(toolName))}${suffix}`);
+  return text;
+}
+function accentPath(theme, path2) {
+  if (!path2)
+    return theme.fg("toolOutput", "...");
+  return theme.fg("accent", shortenPath2(path2));
+}
+function collectTextContent(result) {
+  return result.content.filter((part) => part.type === "text").map((part) => part.text ?? "").join(`
+`).trim();
+}
+function extractStructuredPayload(result) {
+  if (result.details !== undefined)
+    return result.details;
+  const text = collectTextContent(result);
+  if (!text)
+    return;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return;
+  }
+}
+function renderErrorResult(result, fallback, theme, context) {
+  const text = reuseText(context.lastComponent);
+  const message = collectTextContent(result) || fallback;
+  text.setText(`
+${theme.fg("error", message)}`);
+  return text;
+}
+function collapsibleResult({
+  summary,
+  full,
+  expanded,
+  context
+}) {
+  const renderedAtCollapseWidth = full.render(200);
+  const terminalSafeFull = renderedAtCollapseWidth.some((line) => line.includes("\r")) ? new TerminalSafeComponent(full) : full;
+  if (expanded === true || renderedAtCollapseWidth.length <= NATIVE_COLLAPSED_RESULT_MAX_LINES) {
+    return terminalSafeFull;
+  }
+  const text = reuseText(context.lastComponent);
+  text.setText(`
+${summary.replace(/[\r\n]+/g, " ").trim()}`);
+  return text;
+}
+function renderSections(sections, context) {
+  const container = reuseContainer(context.lastComponent);
+  container.clear();
+  const visibleSections = sections.filter((section) => section.trim().length > 0);
+  if (visibleSections.length === 0)
+    return container;
+  container.addChild(new Spacer(1));
+  visibleSections.forEach((section, index) => {
+    if (index > 0)
+      container.addChild(new Spacer(1));
+    container.addChild(new Text(section, 0, 0));
+  });
+  return container;
+}
+function asRecord3(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return;
+  return value;
+}
+function asRecords2(value) {
+  return Array.isArray(value) ? value.map(asRecord3).filter(Boolean) : [];
+}
+function asString2(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function asNumber2(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function formatValue(value) {
+  if (Array.isArray(value))
+    return value.map(formatValue).join(", ");
+  if (typeof value === "string")
+    return value;
+  if (typeof value === "number" || typeof value === "boolean")
+    return String(value);
+  if (value === null || value === undefined)
+    return "—";
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+function groupByFile(items, getFile) {
+  const groups = new Map;
+  items.forEach((item) => {
+    const file2 = getFile(item) ?? "(unknown file)";
+    const current = groups.get(file2) ?? [];
+    current.push(item);
+    groups.set(file2, current);
+  });
+  return groups;
+}
+function formatTimestamp(value) {
+  if (typeof value === "string" && value.length > 0)
+    return value;
+  if (typeof value !== "number" || !Number.isFinite(value))
+    return;
+  const millis = value > 1000000000000 ? value : value * 1000;
+  const date5 = new Date(millis);
+  if (Number.isNaN(date5.getTime()))
+    return String(value);
+  return date5.toISOString().replace("T", " ").replace(".000Z", "Z");
+}
+function formatUnifiedDiffForPi(unifiedDiff) {
+  if (!unifiedDiff.trim())
+    return "";
+  const entries = [];
+  const hunkHeader = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
+  let oldLine = 1;
+  let newLine = 1;
+  for (const line of unifiedDiff.split(`
+`)) {
+    if (!line)
+      continue;
+    if (line.startsWith("--- ") || line.startsWith("+++ "))
+      continue;
+    if (line.startsWith("\"))
+      continue;
+    const headerMatch = line.match(hunkHeader);
+    if (headerMatch) {
+      oldLine = Number(headerMatch[1]);
+      newLine = Number(headerMatch[2]);
+      continue;
+    }
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      entries.push({ prefix: "+", line: newLine, text: line.slice(1) });
+      newLine += 1;
+      continue;
+    }
+    if (line.startsWith("-") && !line.startsWith("---")) {
+      entries.push({ prefix: "-", line: oldLine, text: line.slice(1) });
+      oldLine += 1;
+      continue;
+    }
+    if (line.startsWith(" ")) {
+      entries.push({ prefix: " ", line: oldLine, text: line.slice(1) });
+      oldLine += 1;
+      newLine += 1;
+    }
+  }
+  if (entries.length === 0)
+    return "";
+  const width = String(entries.reduce((max, entry) => Math.max(max, entry.line), 1)).length;
+  return normalizeTerminalText(entries.map((entry) => `${entry.prefix}${String(entry.line).padStart(width, " ")} ${entry.text}`).join(`
+`));
+}
+function renderUnifiedDiff(unifiedDiff) {
+  const piDiff = formatUnifiedDiffForPi(unifiedDiff);
+  if (!piDiff)
+    return "";
+  try {
+    return normalizeTerminalText(renderDiff(piDiff));
+  } catch {
+    return normalizeTerminalText(piDiff);
+  }
+}
+
+// src/tools/diff-format.ts
 var DEFAULT_CONTEXT_LINES = 4;
 function formatDiffForPi(oldContent, newContent, contextLines = DEFAULT_CONTEXT_LINES) {
   const parts = diffLines(oldContent, newContent);
@@ -35127,8 +35400,11 @@ function formatDiffForPi(oldContent, newContent, contextLines = DEFAULT_CONTEXT_
     }
     lastWasChange = false;
   }
-  return { diff: output.join(`
-`), firstChangedLine };
+  return {
+    diff: normalizeTerminalText(output.join(`
+`)),
+    firstChangedLine
+  };
 }
 
 // src/tools/hoisted.ts
@@ -35163,22 +35439,22 @@ function modelSupportsImages(extCtx) {
 var NON_VISION_IMAGE_NOTE = "[Current model does not support images. The image will be omitted from this request.]";
 function containsPath(parent, child) {
   const rel = relative4(parent, child);
-  return rel === "" || !rel.startsWith("..") && !isAbsolute6(rel);
+  return rel === "" || !rel.startsWith("..") && !isAbsolute7(rel);
 }
 function normalizePathInput(path2) {
   const decoded = decodeFileUrl(path2);
   if (!decoded || !decoded.startsWith("~"))
     return decoded;
   if (decoded === "~")
-    return homedir12();
+    return homedir14();
   if (decoded.startsWith(`~${sep}`) || decoded.startsWith("~/")) {
-    return resolve8(homedir12(), decoded.slice(2));
+    return resolve9(homedir14(), decoded.slice(2));
   }
   return decoded;
 }
 function absoluteSearchPath(cwd, target) {
   const expanded = normalizePathInput(target);
-  return isAbsolute6(expanded) ? expanded : resolve8(cwd, expanded);
+  return isAbsolute7(expanded) ? expanded : resolve9(cwd, expanded);
 }
 async function searchPathExists(cwd, target) {
   try {
@@ -35234,7 +35510,7 @@ async function assertExternalDirectoryPermission(extCtx, target, options = {}) {
   if (!target)
     return;
   const expanded = normalizePathInput(target);
-  const absoluteTarget = isAbsolute6(expanded) ? expanded : resolve8(extCtx.cwd, expanded);
+  const absoluteTarget = isAbsolute7(expanded) ? expanded : resolve9(extCtx.cwd, expanded);
   if (containsPath(extCtx.cwd, absoluteTarget))
     return;
   if (options.restrictToProjectRoot === false)
@@ -35360,20 +35636,25 @@ function validateBatchEdits(edits) {
   });
 }
 function renderReadCall(args, theme, context) {
-  const text = reuseText(context.lastComponent);
+  const text = reuseText2(context.lastComponent);
   const filePath = args ? readPathArg(args) : undefined;
-  const pathDisplay = filePath ? theme.fg("accent", shortenPath2(filePath)) : theme.fg("toolOutput", "...");
+  const pathDisplay = filePath ? theme.fg("accent", shortenPath3(filePath)) : theme.fg("toolOutput", "...");
   text.setText(`${theme.fg("toolTitle", theme.bold("read"))} ${pathDisplay}`);
   return text;
 }
 function registerHoistedTools(pi, ctx, surface) {
+  const prefix = surface.hoistBuiltinTools === false ? "aft_" : "";
+  const readName = `${prefix}read`;
+  const writeName = `${prefix}write`;
+  const editName = `${prefix}edit`;
+  const grepName = `${prefix}grep`;
   if (surface.hoistRead) {
     pi.registerTool(withPathAliasPreparation({
-      name: "read",
-      label: "read",
+      name: readName,
+      label: readName,
       description: "Read file contents with line numbers. Backed by AFT's indexed Rust reader — faster than the built-in `read` on large repos. Images are returned as attachments on vision-capable models; PDFs and non-vision models are not yet supported.",
       promptSnippet: "Read file contents (supports offset/limit for large files)",
-      promptGuidelines: ["Use read to examine files instead of cat or sed."],
+      promptGuidelines: [`Use ${readName} to examine files instead of cat or sed.`],
       parameters: ReadParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const bridge = bridgeFor(ctx, extCtx.cwd);
@@ -35435,11 +35716,11 @@ PDFs aren't supported on the Pi harness yet.`, response);
   if (surface.hoistWrite) {
     const writeBackupText = ctx.config.backup?.enabled === false ? "Backup capture is disabled by user config." : "Existing files are backed up before overwriting (undo via aft_safety).";
     pi.registerTool(withPathAliasPreparation({
-      name: "write",
-      label: "write",
-      description: `Write content to a file, creating it and parent directories automatically. ${writeBackupText} Auto-formats when the project has a formatter configured. Uses \`path\`. For partial edits, use the \`edit\` tool.`,
+      name: writeName,
+      label: writeName,
+      description: `Write content to a file, creating it and parent directories automatically. ${writeBackupText} Auto-formats when the project has a formatter configured. Uses \`path\`. For partial edits, use the \`${editName}\` tool.`,
       promptSnippet: "Create or overwrite files (uses path; auto-formats)",
-      promptGuidelines: ["Use write only for new files or complete rewrites."],
+      promptGuidelines: [`Use ${writeName} only for new files or complete rewrites.`],
       parameters: WriteParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const filePathArg = mutationFilePathArg(params);
@@ -35464,17 +35745,17 @@ PDFs aren't supported on the Pi harness yet.`, response);
       renderCall(args, theme, context) {
         return renderMutationCall("write", mutationFilePathArg(args ?? {}), theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderMutationResult(result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderMutationResult(result, theme, context, options);
       }
     }));
   }
   if (surface.hoistEdit && ctx.hashlineEffective === true) {
     pi.registerTool({
-      name: "edit",
-      label: "edit",
+      name: editName,
+      label: editName,
       description: HASHLINE_EDIT_DESCRIPTION,
-      promptSnippet: "Apply a tagged hashline patch through the edit tool",
+      promptSnippet: `Apply a tagged hashline patch through the ${editName} tool`,
       promptGuidelines: [
         "Read a file to obtain its current hashline tag before editing it.",
         "Pass exactly one patch string; paths and tags belong in patch section headers."
@@ -35506,13 +35787,13 @@ PDFs aren't supported on the Pi harness yet.`, response);
   }
   if (surface.hoistEdit && ctx.hashlineEffective !== true) {
     pi.registerTool(withPathAliasPreparation({
-      name: "edit",
-      label: "edit",
+      name: editName,
+      label: editName,
       description: "Edit part of a file via `appendContent`, batch `edits[]`, or symbol plus `content`. Batch `{ oldString, newString, replaceAll: true }` replaces every match. Provide exactly one mode per call: appendContent, edits[], or symbol plus content (mixing modes is rejected).",
       promptSnippet: "Partial file edits via appendContent, edits[], or symbol plus content (exactly one mode per call).",
       promptGuidelines: [
-        "Prefer edit over write when changing part of an existing file.",
-        "Use appendContent when adding text to the end of a file.",
+        `Prefer ${editName} over ${writeName} when changing part of an existing file.`,
+        `Use ${editName} with appendContent when adding text to the end of a file.`,
         "Use edits[] for multiple atomic changes in one file.",
         "Include enough surrounding context in an edits[] find/replace item to make the match unique, or set replaceAll/occurrence explicitly."
       ],
@@ -35547,18 +35828,18 @@ PDFs aren't supported on the Pi harness yet.`, response);
       renderCall(args, theme, context) {
         return renderMutationCall("edit", mutationFilePathArg(args ?? {}), theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderMutationResult(result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderMutationResult(result, theme, context, options);
       }
     }));
   }
   if (surface.hoistGrep) {
     pi.registerTool(withPathAliasPreparation({
-      name: "grep",
-      label: "grep",
+      name: grepName,
+      label: grepName,
       description: "Search for a regex pattern across files. Uses AFT's trigram index inside the project root for fast repeated queries, and falls back to ripgrep for paths outside the project root.",
       promptSnippet: "Fast regex search across files (trigram-indexed inside the project root)",
-      promptGuidelines: ["Prefer grep over bash-invoked find/rg for in-project searches."],
+      promptGuidelines: [`Prefer ${grepName} over bash-invoked find/rg for in-project searches.`],
       parameters: GrepParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const bridge = bridgeFor(ctx, extCtx.cwd);
@@ -35688,23 +35969,23 @@ function formatDiagnosticsText(diagnostics) {
     return JSON.stringify(diagnostics, null, 2);
   }
 }
-function reuseText(last) {
-  return last instanceof Text ? last : new Text("", 0, 0);
+function reuseText2(last) {
+  return last instanceof Text2 ? last : new Text2("", 0, 0);
 }
-function reuseContainer(last) {
-  return last instanceof Container ? last : new Container;
+function reuseContainer2(last) {
+  return last instanceof Container2 ? last : new Container2;
 }
 function renderMutationCall(toolName, filePath, theme, context) {
-  const text = reuseText(context.lastComponent);
-  const pathDisplay = filePath ? theme.fg("accent", shortenPath2(filePath)) : theme.fg("toolOutput", "...");
+  const text = reuseText2(context.lastComponent);
+  const pathDisplay = filePath ? theme.fg("accent", shortenPath3(filePath)) : theme.fg("toolOutput", "...");
   text.setText(`${theme.fg("toolTitle", theme.bold(toolName))} ${pathDisplay}`);
   return text;
 }
-function renderMutationResult(result, theme, context) {
+function renderMutationResult(result, theme, context, options = { expanded: true }) {
   if (context.isError) {
     const errorText = result.content.filter((c) => c.type === "text").map((c) => c.text ?? "").join(`
 `).trim();
-    const text = reuseText(context.lastComponent);
+    const text = reuseText2(context.lastComponent);
     text.setText(`
 ${theme.fg("error", errorText || "edit failed")}`);
     return text;
@@ -35714,27 +35995,46 @@ ${theme.fg("error", errorText || "edit failed")}`);
   if (!diff) {
     const additions = details?.additions ?? 0;
     const deletions = details?.deletions ?? 0;
-    const text = reuseText(context.lastComponent);
     const countDetail = typeof details?.editsApplied === "number" && details.editsApplied > 1 ? `, ${details.editsApplied} edits` : typeof details?.replacements === "number" && details.replacements > 1 ? `, ${details.replacements} replacements` : "";
-    const summary = theme.fg("success", `+${additions}/-${deletions}${countDetail}`);
+    const summary2 = theme.fg("success", `+${additions}/-${deletions}${countDetail}`);
     let suffix = "";
     if (details?.truncated) {
       suffix = ` ${theme.fg("muted", "(diff truncated)")}`;
     } else if (details?.noOp) {
       suffix = ` ${theme.fg("muted", "(no net change)")}`;
     }
-    text.setText(`
-${summary}${suffix}`);
-    return text;
+    const full = reuseText2(context.lastComponent);
+    full.setText(`
+${summary2}${suffix}`);
+    return collapsibleResult({
+      summary: `${summary2}${suffix}`,
+      full,
+      expanded: options.expanded,
+      context
+    });
   }
-  const container = reuseContainer(context.lastComponent);
+  const container = reuseContainer2(context.lastComponent);
   container.clear();
-  container.addChild(new Spacer(1));
-  container.addChild(new Text(renderDiff(diff), 1, 0));
-  return container;
+  container.addChild(new Spacer2(1));
+  let renderedDiff;
+  try {
+    renderedDiff = renderDiff2(diff);
+  } catch {
+    renderedDiff = diff;
+  }
+  container.addChild(new Text2(normalizeTerminalText(renderedDiff), 1, 0));
+  const rawPath = context.args && typeof context.args === "object" && typeof context.args.path === "string" ? context.args.path : undefined;
+  const summaryPath = rawPath ? ` ${shortenPath3(rawPath)}` : "";
+  const summary = `edited${summaryPath} (+${details?.additions ?? 0}/-${details?.deletions ?? 0})`;
+  return collapsibleResult({
+    summary,
+    full: container,
+    expanded: options.expanded,
+    context
+  });
 }
-function shortenPath2(path2) {
-  const home = homedir12();
+function shortenPath3(path2) {
+  const home = homedir14();
   if (path2.startsWith(home))
     return `~${path2.slice(home.length)}`;
   return path2;
@@ -35750,174 +36050,6 @@ async function resolvePathArg(cwd, path2) {
   }
 }
 
-// src/tools/render-helpers.ts
-import { homedir as homedir13 } 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) {
-  return last instanceof Text2 ? last : new Text2("", 0, 0);
-}
-function reuseContainer2(last) {
-  return last instanceof Container2 ? last : new Container2;
-}
-function shortenPath3(path2) {
-  const home = homedir13();
-  if (path2.startsWith(home))
-    return `~${path2.slice(home.length)}`;
-  return path2;
-}
-function renderToolCall(toolName, summary, theme, context) {
-  const text = reuseText2(context.lastComponent);
-  const suffix = summary ? ` ${summary}` : "";
-  text.setText(`${theme.fg("toolTitle", theme.bold(toolName))}${suffix}`);
-  return text;
-}
-function accentPath(theme, path2) {
-  if (!path2)
-    return theme.fg("toolOutput", "...");
-  return theme.fg("accent", shortenPath3(path2));
-}
-function collectTextContent(result) {
-  return result.content.filter((part) => part.type === "text").map((part) => part.text ?? "").join(`
-`).trim();
-}
-function extractStructuredPayload(result) {
-  if (result.details !== undefined)
-    return result.details;
-  const text = collectTextContent(result);
-  if (!text)
-    return;
-  try {
-    return JSON.parse(text);
-  } catch {
-    return;
-  }
-}
-function renderErrorResult(result, fallback, theme, context) {
-  const text = reuseText2(context.lastComponent);
-  const message = collectTextContent(result) || fallback;
-  text.setText(`
-${theme.fg("error", message)}`);
-  return text;
-}
-function renderSections(sections, context) {
-  const container = reuseContainer2(context.lastComponent);
-  container.clear();
-  const visibleSections = sections.filter((section) => section.trim().length > 0);
-  if (visibleSections.length === 0)
-    return container;
-  container.addChild(new Spacer2(1));
-  visibleSections.forEach((section, index) => {
-    if (index > 0)
-      container.addChild(new Spacer2(1));
-    container.addChild(new Text2(section, 0, 0));
-  });
-  return container;
-}
-function asRecord3(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value))
-    return;
-  return value;
-}
-function asRecords2(value) {
-  return Array.isArray(value) ? value.map(asRecord3).filter(Boolean) : [];
-}
-function asString2(value) {
-  return typeof value === "string" ? value : undefined;
-}
-function asNumber2(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
-}
-function formatValue(value) {
-  if (Array.isArray(value))
-    return value.map(formatValue).join(", ");
-  if (typeof value === "string")
-    return value;
-  if (typeof value === "number" || typeof value === "boolean")
-    return String(value);
-  if (value === null || value === undefined)
-    return "—";
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return String(value);
-  }
-}
-function groupByFile(items, getFile) {
-  const groups = new Map;
-  items.forEach((item) => {
-    const file2 = getFile(item) ?? "(unknown file)";
-    const current = groups.get(file2) ?? [];
-    current.push(item);
-    groups.set(file2, current);
-  });
-  return groups;
-}
-function formatTimestamp(value) {
-  if (typeof value === "string" && value.length > 0)
-    return value;
-  if (typeof value !== "number" || !Number.isFinite(value))
-    return;
-  const millis = value > 1000000000000 ? value : value * 1000;
-  const date5 = new Date(millis);
-  if (Number.isNaN(date5.getTime()))
-    return String(value);
-  return date5.toISOString().replace("T", " ").replace(".000Z", "Z");
-}
-function formatUnifiedDiffForPi(unifiedDiff) {
-  if (!unifiedDiff.trim())
-    return "";
-  const entries = [];
-  const hunkHeader = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
-  let oldLine = 1;
-  let newLine = 1;
-  for (const line of unifiedDiff.split(`
-`)) {
-    if (!line)
-      continue;
-    if (line.startsWith("--- ") || line.startsWith("+++ "))
-      continue;
-    if (line.startsWith("\"))
-      continue;
-    const headerMatch = line.match(hunkHeader);
-    if (headerMatch) {
-      oldLine = Number(headerMatch[1]);
-      newLine = Number(headerMatch[2]);
-      continue;
-    }
-    if (line.startsWith("+") && !line.startsWith("+++")) {
-      entries.push({ prefix: "+", line: newLine, text: line.slice(1) });
-      newLine += 1;
-      continue;
-    }
-    if (line.startsWith("-") && !line.startsWith("---")) {
-      entries.push({ prefix: "-", line: oldLine, text: line.slice(1) });
-      oldLine += 1;
-      continue;
-    }
-    if (line.startsWith(" ")) {
-      entries.push({ prefix: " ", line: oldLine, text: line.slice(1) });
-      oldLine += 1;
-      newLine += 1;
-    }
-  }
-  if (entries.length === 0)
-    return "";
-  const width = String(entries.reduce((max, entry) => Math.max(max, entry.line), 1)).length;
-  return entries.map((entry) => `${entry.prefix}${String(entry.line).padStart(width, " ")} ${entry.text}`).join(`
-`);
-}
-function renderUnifiedDiff(unifiedDiff) {
-  const piDiff = formatUnifiedDiffForPi(unifiedDiff);
-  if (!piDiff)
-    return "";
-  try {
-    return renderDiff2(piDiff);
-  } catch {
-    return piDiff;
-  }
-}
-
 // src/tools/ast.ts
 var AstLang = StringEnum(["typescript", "tsx", "javascript", "python", "rust", "go", "pascal", "r", "objc"], {
   description: "Target language"
@@ -35995,7 +36127,7 @@ function buildAstSearchSections(payload, theme) {
   const grouped = groupByFile(matches, (match) => asString2(match.file));
   const sections = [header];
   for (const [file2, fileMatches] of grouped.entries()) {
-    const lines = [theme.fg("accent", shortenPath3(file2))];
+    const lines = [theme.fg("accent", shortenPath2(file2))];
     fileMatches.forEach((match, index) => {
       const line = asNumber2(match.line) ?? 0;
       const column = asNumber2(match.column) ?? 0;
@@ -36042,7 +36174,7 @@ function buildAstReplaceSections(payload, theme) {
     return sections;
   }
   files.forEach((fileResult) => {
-    const file2 = shortenPath3(asString2(fileResult.file) ?? "(unknown file)");
+    const file2 = shortenPath2(asString2(fileResult.file) ?? "(unknown file)");
     const replacements = asNumber2(fileResult.replacements) ?? 0;
     const error53 = asString2(fileResult.error);
     const diff = asString2(fileResult.diff);
@@ -36068,17 +36200,27 @@ function renderAstCall(toolName, args, theme, context) {
   const summary = toolName === "ast_grep_replace" ? `${lang} ${theme.fg("toolOutput", `${args.pattern} → ${args.rewrite}`)}` : `${lang} ${theme.fg("toolOutput", args.pattern)}`;
   return renderToolCall(toolName === "ast_grep_replace" ? "ast replace" : "ast search", summary, theme, context);
 }
-function renderAstResult(toolName, result, theme, context) {
+function renderAstResult(toolName, result, theme, context, options = { expanded: true }) {
   if (context.isError) {
     return renderErrorResult(result, `${toolName} failed`, theme, context);
   }
   const payload = extractStructuredPayload(result);
   if (!payload) {
-    const text = collectTextContent(result);
-    return renderSections([text || theme.fg("muted", "No result.")], context);
+    const text = collectTextContent(result) || theme.fg("muted", "No result.");
+    return collapsibleResult({
+      summary: text,
+      full: renderSections([text], context),
+      expanded: options.expanded,
+      context
+    });
   }
   const sections = toolName === "ast_grep_replace" ? buildAstReplaceSections(payload, theme) : buildAstSearchSections(payload, theme);
-  return renderSections(sections, context);
+  return collapsibleResult({
+    summary: sections[0] ?? `${toolName} completed`,
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerAstTools(pi, ctx, surface) {
   if (surface.astSearch) {
@@ -36110,8 +36252,8 @@ function registerAstTools(pi, ctx, surface) {
       renderCall(args, theme, context) {
         return renderAstCall("ast_grep_search", args, theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderAstResult("ast_grep_search", result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderAstResult("ast_grep_search", result, theme, context, options);
       }
     });
   }
@@ -36144,8 +36286,8 @@ function registerAstTools(pi, ctx, surface) {
       renderCall(args, theme, context) {
         return renderAstCall("ast_grep_replace", args, theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderAstResult("ast_grep_replace", result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderAstResult("ast_grep_replace", result, theme, context, options);
       }
     });
   }
@@ -36335,16 +36477,18 @@ function getBashSpawnHook(pi) {
   }
   return api2.hooks?.bashSpawn;
 }
-function registerBashTool(pi, ctx, aftSearchRegistered = false) {
+function registerBashTool(pi, ctx, aftSearchRegistered = false, registeredName = "bash", registerCompanions = true) {
   const spawnHook = getBashSpawnHook(pi);
-  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 readToolName = registeredName === "bash" ? "read" : "aft_read";
+  const grepToolName = registeredName === "bash" ? "grep" : "aft_grep";
+  const searchSteer = aftSearchRegistered ? `use \`aft_search\` (concepts, identifiers, regex, literals), \`${readToolName}\`, \`aft_outline\`, or \`aft_zoom\` instead` : `use the \`${grepToolName}\` tool, \`${readToolName}\`, \`aft_outline\`, or \`aft_zoom\` instead`;
   const bashCfg = resolveBashConfig(ctx.config);
   let hostFallbackActive = false;
   const compressionSentence = bashCfg.compress ? " Output is compressed by default; pass `compressed: false` for raw output. Piped commands run verbatim and show the pipeline's output; for AFT's test/build summary, run the runner without `| head`, `| tail`, or `| grep`." : "";
   const tasksSentence = bashCfg.background ? ' Commands run in the foreground and return inline; `wait: true` blocks until a long command finishes instead of auto-promoting, but detaches to background if you send a new message — use it when you need the result before doing anything else; keep it off otherwise so auto-promote can remind you while you work. Use `background: true` yourself ONLY when you have other useful work to do while it runs; then `bash_watch` waits on the task (sync blocks until exit/pattern, async notifies) and `bash_status` peeks at it — never background a command and immediately `bash_watch` it (that wastes a turn for what foreground returns in one), and never loop `bash_status` to wait. `pty: true` runs interactive programs (REPLs, TUIs), implies background, and is driven with `bash_status({ output_mode: "screen" })` plus `bash_write`.' : " Commands run in the foreground to completion; `timeout` is the hard kill cap (default 30 minutes).";
   pi.registerTool({
-    name: "bash",
-    label: "bash",
+    name: registeredName,
+    label: registeredName,
     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}.`,
@@ -36470,16 +36614,20 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
     renderCall(args, theme, context) {
       return renderBashCall(args?.command, args?.description, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderBashResult(result, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderBashResult(result, theme, context, options);
     }
   });
-  if (bashCfg.background) {
-    pi.registerTool(createBashStatusTool(ctx));
-    pi.registerTool(createBashWatchTool(ctx));
-    pi.registerTool(createBashWriteTool(ctx));
-    pi.registerTool(createBashKillTool(ctx));
-  }
+  if (registerCompanions)
+    registerBashCompanionTools(pi, ctx);
+}
+function registerBashCompanionTools(pi, ctx) {
+  if (!resolveBashConfig(ctx.config).background)
+    return;
+  pi.registerTool(createBashStatusTool(ctx));
+  pi.registerTool(createBashWatchTool(ctx));
+  pi.registerTool(createBashWriteTool(ctx));
+  pi.registerTool(createBashKillTool(ctx));
 }
 function withBashHints(output, command, aftSearchRegistered, projectRoot) {
   return maybeAppendGrepSearchHint(maybeAppendConflictsHint(output), command, aftSearchRegistered, projectRoot);
@@ -36908,7 +37056,7 @@ function renderBashCall(command, description, theme, context) {
   text.setText(`${theme.fg("toolTitle", theme.bold("bash"))} ${theme.fg("accent", display)}`);
   return text;
 }
-function renderBashResult(result, theme, context) {
+function renderBashResult(result, theme, context, options = { expanded: true }) {
   if (context.isError) {
     const errorText = result.content.filter((c) => c.type === "text").map((c) => c.text ?? "").join(`
 `).trim();
@@ -36955,7 +37103,14 @@ ${theme.fg("error", errorText || "bash failed")}`);
     const truncText = theme.fg("warning", "(output truncated)");
     container.addChild(new Text3(truncText, 1, 0));
   }
-  return container;
+  const firstOutputLine = rawOutput.split(/\r?\n/, 1)[0] || "(no output)";
+  const exitSummary = exitCode === undefined ? "completed" : `exit ${exitCode}`;
+  return collapsibleResult({
+    summary: `${exitSummary}: ${firstOutputLine}`,
+    full: container,
+    expanded: options.expanded,
+    context
+  });
 }
 function shortenCommand(command) {
   if (command.length <= 60)
@@ -36987,14 +37142,19 @@ function buildConflictSections(text) {
   sections.push(...rest.map((section) => section.trim()).filter(Boolean));
   return sections;
 }
-function renderConflictResult(text, theme, context) {
+function renderConflictResult(text, theme, context, options = { expanded: true }) {
   const sections = buildConflictSections(text).map((section, index) => index === 0 ? theme.fg("warning", section) : section);
-  return renderSections(sections, context);
+  return collapsibleResult({
+    summary: sections[0] ?? "No merge conflicts found.",
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
-function renderConflictToolResult(result, theme, context) {
+function renderConflictToolResult(result, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "conflicts failed", theme, context);
-  return renderConflictResult(collectTextContent(result), theme, context);
+  return renderConflictResult(collectTextContent(result), theme, context, options);
 }
 function registerConflictsTool(pi, ctx) {
   pi.registerTool(withPathAliasPreparation({
@@ -37021,8 +37181,8 @@ function registerConflictsTool(pi, ctx) {
     renderCall(_args, theme, context) {
       return renderConflictCall(theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderConflictToolResult(result, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderConflictToolResult(result, theme, context, options);
     }
   }));
 }
@@ -37065,7 +37225,7 @@ function renderFsCall(toolName, args, theme, context) {
   const moveArgs = args;
   return renderToolCall("move", `${accentPath(theme, moveArgs.path)} ${theme.fg("muted", "→")} ${accentPath(theme, moveArgs.destination)}`, theme, context);
 }
-function renderFsResult(toolName, args, result, theme, context) {
+function renderFsResult(toolName, args, result, theme, context, options = { expanded: true }) {
   if (context.isError) {
     return renderErrorResult(result, `${toolName} failed`, theme, context);
   }
@@ -37076,22 +37236,33 @@ 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", shortenPath3(entry))}`);
+      lines.push(`${theme.fg("success", "✓ deleted")} ${theme.fg("accent", shortenPath2(entry))}`);
     }
     for (const entry of skipped) {
-      lines.push(`${theme.fg("error", "✗ skipped")} ${theme.fg("accent", shortenPath3(entry.file))} ${theme.fg("muted", `(${entry.reason})`)}`);
+      lines.push(`${theme.fg("error", "✗ skipped")} ${theme.fg("accent", shortenPath2(entry.file))} ${theme.fg("muted", `(${entry.reason})`)}`);
     }
     if (lines.length === 0) {
       lines.push(theme.fg("muted", "(no files deleted)"));
     }
-    return renderSections([lines.join(`
-`)], context);
+    return collapsibleResult({
+      summary: `${deletedPaths.length} deleted, ${skipped.length} skipped`,
+      full: renderSections([lines.join(`
+`)], context),
+      expanded: options.expanded,
+      context
+    });
   }
   const moveArgs = args;
-  return renderSections([
-    `${theme.fg("success", "✓ moved")} ${theme.fg("accent", shortenPath3(moveArgs.path ?? ""))}`,
-    `${theme.fg("muted", "to")} ${theme.fg("accent", shortenPath3(moveArgs.destination))}`
-  ], context);
+  const sections = [
+    `${theme.fg("success", "✓ moved")} ${theme.fg("accent", shortenPath2(moveArgs.path ?? ""))}`,
+    `${theme.fg("muted", "to")} ${theme.fg("accent", shortenPath2(moveArgs.destination))}`
+  ];
+  return collapsibleResult({
+    summary: `moved ${shortenPath2(moveArgs.path ?? "")} to ${shortenPath2(moveArgs.destination)}`,
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerFsTools(pi, ctx, surface) {
   const backupsDisabled = ctx.config.backup?.enabled === false;
@@ -37137,8 +37308,8 @@ function registerFsTools(pi, ctx, surface) {
       renderCall(args, theme, context) {
         return renderFsCall("aft_delete", args, theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderFsResult("aft_delete", context.args, result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderFsResult("aft_delete", context.args, result, theme, context, options);
       }
     }));
   }
@@ -37170,8 +37341,8 @@ function registerFsTools(pi, ctx, surface) {
       renderCall(args, theme, context) {
         return renderFsCall("aft_move", args, theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderFsResult("aft_move", context.args, result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderFsResult("aft_move", context.args, result, theme, context, options);
       }
     }));
   }
@@ -37245,11 +37416,17 @@ function renderImportCall(args, theme, context) {
   ].filter(Boolean).join(" ");
   return renderToolCall("import", summary, theme, context);
 }
-function renderImportResult(result, args, theme, context) {
+function renderImportResult(result, args, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "import failed", theme, context);
   const payload = extractStructuredPayload(result);
-  return renderSections(buildImportSections(args, payload, theme), context);
+  const sections = buildImportSections(args, payload, theme);
+  return collapsibleResult({
+    summary: sections[0] ?? `${args.op} import completed`,
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerImportTools(pi, ctx) {
   const organizeRecovery = ctx.config.backup?.enabled === false ? "Backup capture is disabled by user config; review broad cleanup changes before proceeding." : "Use aft_safety checkpoint/undo before broad cleanup.";
@@ -37297,8 +37474,8 @@ function registerImportTools(pi, ctx) {
     renderCall(args, theme, context) {
       return renderImportCall(args, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderImportResult(result, context.args, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderImportResult(result, context.args, theme, context, options);
     }
   }));
 }
@@ -37582,14 +37759,18 @@ function renderInspectCall(args, theme, context) {
   const summary = [sections, scope, args.topK ? `topK=${args.topK}` : undefined].filter(Boolean).join(" ");
   return renderToolCall("inspect", summary ? theme.fg("toolOutput", summary) : undefined, theme, context);
 }
-function renderInspectResult(result, theme, context) {
+function renderInspectResult(result, theme, context, options = { expanded: true }) {
   const payload = extractStructuredPayload(result);
   const terminal = parseInspectTerminal(payload);
-  if (terminal)
-    return renderSections([renderInspectTerminal(terminal, asString2(asRecord3(payload)?.text))], context);
   if (context.isError)
     return renderErrorResult(result, "inspect failed", theme, context);
-  return renderSections(buildInspectSections(payload, theme), context);
+  const sections = terminal ? [renderInspectTerminal(terminal, asString2(asRecord3(payload)?.text))] : buildInspectSections(payload, theme);
+  return collapsibleResult({
+    summary: sections[0] ?? "inspect completed",
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerInspectTool(pi, ctx) {
   pi.registerTool({
@@ -37624,8 +37805,8 @@ function registerInspectTool(pi, ctx) {
     renderCall(args, theme, context) {
       return renderInspectCall(args, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderInspectResult(result, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderInspectResult(result, theme, context, options);
     }
   });
 }
@@ -37676,10 +37857,16 @@ function renderNavigateCall(args, theme, context) {
   ].filter(Boolean).join(" ");
   return renderToolCall("callgraph", summary, theme, context);
 }
-function renderNavigateResult(result, args, theme, context) {
+function renderNavigateResult(result, args, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "navigate failed", theme, context);
-  return renderSections(buildNavigateSections(args, extractStructuredPayload(result), theme), context);
+  const sections = buildNavigateSections(args, extractStructuredPayload(result), theme);
+  return collapsibleResult({
+    summary: sections[0] ?? `${args.op} completed`,
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerNavigateTool(pi, ctx) {
   pi.registerTool(withPathAliasPreparation({
@@ -37747,8 +37934,8 @@ function registerNavigateTool(pi, ctx) {
     renderCall(args, theme, context) {
       return renderNavigateCall(args, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderNavigateResult(result, context.args, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderNavigateResult(result, context.args, theme, context, options);
     }
   }));
 }
@@ -37825,7 +38012,7 @@ function renderZoomRecord(record2, targetLabel, theme) {
   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 location = startLine !== undefined ? `${shortenPath3(targetLabel)}:${startLine}${endLine && endLine !== startLine ? `-${endLine}` : ""}` : shortenPath3(targetLabel);
+  const location = startLine !== undefined ? `${shortenPath2(targetLabel)}:${startLine}${endLine && endLine !== startLine ? `-${endLine}` : ""}` : shortenPath2(targetLabel);
   const lines = [`${theme.fg("accent", name)} ${theme.fg("muted", `[${kind}] ${location}`)}`];
   const content = asString2(record2.content);
   if (content) {
@@ -37862,7 +38049,7 @@ function buildZoomSections(args, payload, theme) {
         const name = asString2(record2.name) ?? asString2(response.name) ?? "(unknown symbol)";
         const itemTargetLabel = asString2(record2.targetLabel) ?? zoomTargetLabel(args);
         if (response.success === false || record2.success === false) {
-          const location = record2.targetLabel ? ` in ${shortenPath3(itemTargetLabel)}` : "";
+          const location = record2.targetLabel ? ` in ${shortenPath2(itemTargetLabel)}` : "";
           return theme.fg("error", `Symbol "${name}" not found${location}: ${asString2(response.message) ?? asString2(record2.error) ?? "zoom failed"}`);
         }
         if (record2.response) {
@@ -37871,7 +38058,7 @@ function buildZoomSections(args, payload, theme) {
         const content = asString2(record2.content);
         if (content) {
           return [
-            `${theme.fg("accent", name)} ${theme.fg("muted", shortenPath3(itemTargetLabel))}`,
+            `${theme.fg("accent", name)} ${theme.fg("muted", shortenPath2(itemTargetLabel))}`,
             content
           ].filter(Boolean).join(`
 `);
@@ -37894,10 +38081,16 @@ function renderOutlineCall(args, theme, context) {
   const summary = Array.isArray(args.target) ? theme.fg("accent", `${args.target.length} ${args.files ? "directories" : "files"}`) : typeof args.target === "string" ? `${accentPath(theme, args.target)}${args.files ? " files" : ""}` : undefined;
   return renderToolCall("outline", summary, theme, context);
 }
-function renderOutlineResult(result, theme, context) {
+function renderOutlineResult(result, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "outline failed", theme, context);
-  return renderSections(buildOutlineSections(collectTextContent(result), theme), context);
+  const sections = buildOutlineSections(collectTextContent(result), theme);
+  return collapsibleResult({
+    summary: sections[0] ?? "outline completed",
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function renderZoomCall(args, theme, context) {
   const symbols = args.symbols;
@@ -37916,10 +38109,16 @@ function renderZoomCall(args, theme, context) {
   }
   return renderToolCall("zoom", `${accentPath(theme, zoomTargetLabel(args))} ${summary}`, theme, context);
 }
-function renderZoomResult(result, args, theme, context) {
+function renderZoomResult(result, args, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "zoom failed", theme, context);
-  return renderSections(buildZoomSections(args, extractStructuredPayload(result), theme), context);
+  const sections = buildZoomSections(args, extractStructuredPayload(result), theme);
+  return collapsibleResult({
+    summary: sections[0] ?? "zoom completed",
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerReadingTools(pi, ctx, surface) {
   if (surface.outline) {
@@ -37981,8 +38180,8 @@ Pass a single \`target\`:
       renderCall(args, theme, context) {
         return renderOutlineCall(args, theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderOutlineResult(result, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderOutlineResult(result, theme, context, options);
       }
     }));
   }
@@ -38073,8 +38272,8 @@ Pass a single \`target\`:
       renderCall(args, theme, context) {
         return renderZoomCall(args, theme, context);
       },
-      renderResult(result, _options, theme, context) {
-        return renderZoomResult(result, context.args, theme, context);
+      renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+        return renderZoomResult(result, context.args, theme, context, options);
       }
     }));
   }
@@ -38106,21 +38305,21 @@ function buildRefactorSections(args, payload, theme) {
       `${theme.fg("success", "moved symbol")} ${theme.fg("toolOutput", args.symbol ?? "(symbol)")}`,
       `${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(`
+      results.length > 0 ? results.map((entry) => `  ↳ ${shortenPath2(asString2(entry.file) ?? "(unknown file)")}`).join(`
 `) : theme.fg("muted", "No files reported.")
     ];
   }
   if (args.op === "extract") {
     return [
       `${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.path ?? ""))}`,
+      `${theme.fg("muted", "file")} ${theme.fg("accent", shortenPath2(asString2(response.file) ?? args.path ?? ""))}`,
       `${theme.fg("muted", "params")} ${Array.isArray(response.parameters) ? response.parameters.join(", ") || "none" : "none"}`,
       `${theme.fg("muted", "return type")} ${asString2(response.return_type) ?? "unknown"}`
     ];
   }
   return [
     `${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.path ?? ""))}`,
+    `${theme.fg("muted", "file")} ${theme.fg("accent", shortenPath2(asString2(response.file) ?? args.path ?? ""))}`,
     `${theme.fg("muted", "context")} ${asString2(response.call_context) ?? "unknown"}`,
     `${theme.fg("muted", "substitutions")} ${asNumber2(response.substitutions) ?? 0}`
   ];
@@ -38133,10 +38332,16 @@ function renderRefactorCall(args, theme, context) {
   ].filter(Boolean).join(" ");
   return renderToolCall("refactor", summary, theme, context);
 }
-function renderRefactorResult(result, args, theme, context) {
+function renderRefactorResult(result, args, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "refactor failed", theme, context);
-  return renderSections(buildRefactorSections(args, extractStructuredPayload(result), theme), context);
+  const sections = buildRefactorSections(args, extractStructuredPayload(result), theme);
+  return collapsibleResult({
+    summary: sections[0] ?? `${args.op} completed`,
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerRefactorTool(pi, ctx) {
   pi.registerTool(withPathAliasPreparation({
@@ -38203,8 +38408,8 @@ function registerRefactorTool(pi, ctx) {
     renderCall(args, theme, context) {
       return renderRefactorCall(args, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderRefactorResult(result, context.args, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderRefactorResult(result, context.args, theme, context, options);
     }
   }));
 }
@@ -38239,14 +38444,14 @@ function buildSafetySections(args, payload, theme) {
       ];
     }
     return [
-      `${theme.fg("success", "restored")} ${theme.fg("accent", shortenPath3(asString2(response.path) ?? args.path ?? "(file)"))}`,
+      `${theme.fg("success", "restored")} ${theme.fg("accent", shortenPath2(asString2(response.path) ?? args.path ?? "(file)"))}`,
       `${theme.fg("muted", "backup")} ${asString2(response.backup_id) ?? "—"}`
     ];
   }
   if (args.op === "history") {
     const entries = asRecords2(response.entries);
     const sections2 = [
-      theme.fg("accent", shortenPath3(asString2(response.file) ?? args.path ?? "(file)"))
+      theme.fg("accent", shortenPath2(asString2(response.file) ?? args.path ?? "(file)"))
     ];
     if (entries.length === 0) {
       sections2.push(theme.fg("muted", "No history entries."));
@@ -38268,7 +38473,7 @@ function buildSafetySections(args, payload, theme) {
       `${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) => `  ↳ ${shortenPath3(asString2(entry.file) ?? "(file)")}: ${asString2(entry.error) ?? "unknown error"}`).join(`
+${skipped.map((entry) => `  ↳ ${shortenPath2(asString2(entry.file) ?? "(file)")}: ${asString2(entry.error) ?? "unknown error"}`).join(`
 `)}` : theme.fg("muted", "No skipped files.")
     ];
   }
@@ -38300,10 +38505,16 @@ function renderSafetyCall(args, theme, context) {
   const summary = [theme.fg("accent", args.op), target ? accentPath(theme, target) : undefined].filter(Boolean).join(" ");
   return renderToolCall("safety", summary, theme, context);
 }
-function renderSafetyResult(result, args, theme, context) {
+function renderSafetyResult(result, args, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "safety failed", theme, context);
-  return renderSections(buildSafetySections(args, extractStructuredPayload(result), theme), context);
+  const sections = buildSafetySections(args, extractStructuredPayload(result), theme);
+  return collapsibleResult({
+    summary: `${args.op}: ${sections[0] ?? "completed"}`,
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerSafetyTool(pi, ctx) {
   pi.registerTool(withPathAliasPreparation({
@@ -38372,8 +38583,8 @@ function registerSafetyTool(pi, ctx) {
     renderCall(args, theme, context) {
       return renderSafetyCall(args, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderSafetyResult(result, context.args, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderSafetyResult(result, context.args, theme, context, options);
     }
   }));
 }
@@ -38440,7 +38651,7 @@ function buildSemanticSections(args, payload, theme) {
   }
   const grouped = groupByFile(results, (result) => asString2(result.file));
   for (const [file2, fileResults] of grouped.entries()) {
-    const lines = [theme.fg("accent", shortenPath3(file2))];
+    const lines = [theme.fg("accent", shortenPath2(file2))];
     fileResults.forEach((result) => {
       if (asString2(result.kind) === "GrepLine") {
         const line = asNumber2(result.line);
@@ -38487,10 +38698,16 @@ function buildSemanticSections(args, payload, theme) {
 function renderSemanticCall(args, theme, context) {
   return renderToolCall("search", theme.fg("toolOutput", args.query), theme, context);
 }
-function renderSemanticResult(result, args, theme, context) {
+function renderSemanticResult(result, args, theme, context, options = { expanded: true }) {
   if (context.isError)
     return renderErrorResult(result, "search failed", theme, context);
-  return renderSections(buildSemanticSections(args, extractStructuredPayload(result), theme), context);
+  const sections = buildSemanticSections(args, extractStructuredPayload(result), theme);
+  return collapsibleResult({
+    summary: sections[0] ?? "search completed",
+    full: renderSections(sections, context),
+    expanded: options.expanded,
+    context
+  });
 }
 function registerSemanticTool(pi, ctx) {
   pi.registerTool(withPathAliasPreparation({
@@ -38522,8 +38739,8 @@ function registerSemanticTool(pi, ctx) {
     renderCall(args, theme, context) {
       return renderSemanticCall(args, theme, context);
     },
-    renderResult(result, _options, theme, context) {
-      return renderSemanticResult(result, context.args, theme, context);
+    renderResult(result, options = { expanded: false, isPartial: false }, theme, context) {
+      return renderSemanticResult(result, context.args, theme, context, options);
     }
   }));
 }
@@ -38533,12 +38750,15 @@ var ALL_ONLY_TOOLS = new Set(["aft_callgraph", "aft_delete", "aft_move", "aft_re
 function resolvePiToolSurface(config2) {
   const surface = config2.tool_surface ?? "recommended";
   const disabled = new Set(config2.disabled_tools ?? []);
+  const hoistBuiltinTools = config2.hoist_builtin_tools !== false;
   const ok = (name) => !disabled.has(name);
+  const builtinToolEnabled = (bareName) => ok(hoistBuiltinTools ? bareName : `aft_${bareName}`);
   const allOnly = (name) => ALL_ONLY_TOOLS.has(name) && ok(name);
   const restrictToProjectRoot = config2.restrict_to_project_root ?? false;
   if (surface === "minimal") {
     return {
-      hoistBash: ok("bash"),
+      hoistBuiltinTools,
+      hoistBash: builtinToolEnabled("bash"),
       hoistRead: false,
       hoistWrite: false,
       hoistEdit: false,
@@ -38560,11 +38780,12 @@ function resolvePiToolSurface(config2) {
     };
   }
   const base = {
-    hoistBash: ok("bash"),
-    hoistRead: ok("read"),
-    hoistWrite: ok("write"),
-    hoistEdit: ok("edit"),
-    hoistGrep: ok("grep") && config2.search_index === true,
+    hoistBuiltinTools,
+    hoistBash: builtinToolEnabled("bash"),
+    hoistRead: builtinToolEnabled("read"),
+    hoistWrite: builtinToolEnabled("write"),
+    hoistEdit: builtinToolEnabled("edit"),
+    hoistGrep: builtinToolEnabled("grep") && config2.search_index === true,
     restrictToProjectRoot,
     outline: ok("aft_outline"),
     zoom: ok("aft_zoom"),
@@ -38593,7 +38814,8 @@ function resolvePiToolSurface(config2) {
 }
 function registerPiToolSurface(pi, ctx, surface) {
   if (surface.hoistBash && resolveBashConfig(ctx.config).enabled) {
-    registerBashTool(pi, ctx, surface.semantic);
+    registerBashTool(pi, ctx, surface.semantic, surface.hoistBuiltinTools ? "bash" : "aft_bash", false);
+    registerBashCompanionTools(pi, ctx);
   }
   registerHoistedTools(pi, ctx, surface);
   if (surface.outline || surface.zoom) {
@@ -38704,6 +38926,9 @@ function buildHintsFromConfig(config2, absentTools, hoistBuiltins) {
   });
 }
 function registerWorkflowHints(pi, config2, surface) {
+  const hoistBuiltins = surface.hoistBuiltinTools;
+  const grepName = hoistBuiltins ? "grep" : "aft_grep";
+  const bashName = hoistBuiltins ? "bash" : "aft_bash";
   const absent = new Set;
   if (!surface.outline)
     absent.add("aft_outline");
@@ -38716,12 +38941,12 @@ function registerWorkflowHints(pi, config2, surface) {
   if (!surface.inspect)
     absent.add("aft_inspect");
   if (!surface.hoistGrep)
-    absent.add("grep");
+    absent.add(grepName);
   if (!surface.hoistBash) {
-    absent.add("bash");
+    absent.add(bashName);
     absent.add("bash_status");
   }
-  const hintsBlock = buildHintsFromConfig(config2, absent, true);
+  const hintsBlock = buildHintsFromConfig(config2, absent, hoistBuiltins);
   if (!hintsBlock)
     return;
   log2(`Workflow hints injected (${hintsBlock.length} chars)`);
@@ -38778,7 +39003,7 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.52.1";
+var ANNOUNCEMENT_VERSION = "0.53.0";
 var ANNOUNCEMENT_FEATURES = [
   "Callgraph stays consistent under load: edits arriving mid-rebuild can no longer be silently lost from navigation results.",
   "aft_zoom handles real-world .jsonc: files with comment banners above the opening brace now resolve, and not-found errors point at the segment that actually failed (thanks @iceteaSA).",
@@ -39129,7 +39354,7 @@ ${lines}
       if (onnxRuntimePromise) {
         await Promise.race([
           onnxRuntimePromise,
-          new Promise((resolve9) => setTimeout(() => resolve9(null), 60000))
+          new Promise((resolve10) => setTimeout(() => resolve10(null), 60000))
         ]);
       }
       const bridge = pool.getBridge(cwd);