@cortexkit/aft-pi 0.52.0 → 0.52.2

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"
 ]);
@@ -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);
 }
@@ -12482,6 +12503,8 @@ var AFT_MODULE_ID = "aft";
 var MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3;
 var RECONNECT_RETRY_FLOOR_MS = 100;
 var RECONNECT_RETRY_CAP_MS = 2000;
+var ROUTE_OPEN_RELOAD_WAIT_CAP_MS = 15000;
+var ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX = " The AFT daemon module did not return within the 15s reload window.";
 var BG_STABLE_MS = 5000;
 function reconnectBackoffMs(attempt) {
   return Math.min(RECONNECT_RETRY_FLOOR_MS * 2 ** Math.min(attempt, 6), RECONNECT_RETRY_CAP_MS);
@@ -12790,6 +12813,15 @@ function isAbsentRootRouteError(err) {
 function absentRootError(root) {
   return new SubcError(`invalid route project root: project root does not exist: ${root}`, "config_divergence");
 }
+function reloadWindowExhaustedError(error2) {
+  if (error2 instanceof Error) {
+    try {
+      error2.message += ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX;
+      return error2;
+    } catch {}
+  }
+  return new Error(`${String(error2)}${ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX}`);
+}
 function safeCloseRoute(client, route) {
   try {
     client.closeRouteChannel(route).catch(() => {
@@ -12914,6 +12946,7 @@ class SubcTransportPool {
   connecting = null;
   routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
   routeReopenRetry = null;
+  routeReopenRetryMs = null;
   sessions = new Map;
   rootIndex = new Map;
   dormantRoots = new Map;
@@ -12933,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;
@@ -13387,6 +13420,23 @@ class SubcTransportPool {
           throw error2;
         }
       };
+      const openRouteAfterReloadWindow = async () => {
+        let reloadWaitedMs = 0;
+        while (true) {
+          try {
+            return await openRoute();
+          } catch (error2) {
+            if (!isRouteOpenReloadWindowError(error2))
+              throw error2;
+            const { delayMs, wait } = this.waitForRouteReopenBackoff();
+            if (reloadWaitedMs + delayMs > ROUTE_OPEN_RELOAD_WAIT_CAP_MS) {
+              throw reloadWindowExhaustedError(error2);
+            }
+            reloadWaitedMs += delayMs;
+            await wait;
+          }
+        }
+      };
       const clearRouteEntry = (entry) => {
         if (record.routeEntry !== entry)
           return;
@@ -13423,7 +13473,7 @@ class SubcTransportPool {
         this.ensureBgSubscription(identity, record);
         return reply;
       };
-      let routeAndEntry = await openRoute();
+      let routeAndEntry = await openRouteAfterReloadWindow();
       try {
         return await requestOnRoute(routeAndEntry.route);
       } catch (error2) {
@@ -13431,8 +13481,8 @@ class SubcTransportPool {
           throw this.annotateReapError(error2, record);
         if (isRouteProvenAbsentError(error2) && this.isCurrentSession(key, record) && this.client === client) {
           clearRouteEntry(routeAndEntry.entry);
-          await this.waitForRouteReopenBackoff();
-          routeAndEntry = await openRoute();
+          await this.waitForRouteReopenBackoff().wait;
+          routeAndEntry = await openRouteAfterReloadWindow();
           try {
             const reply = await requestOnRoute(routeAndEntry.route);
             this.resetRouteReopenBackoff();
@@ -13458,17 +13508,21 @@ class SubcTransportPool {
   }
   waitForRouteReopenBackoff() {
     const pending = this.routeReopenRetry;
-    if (pending)
-      return pending;
-    const delay = this.routeReopenRetryDelayMs;
-    this.routeReopenRetryDelayMs = Math.min(delay * 2, RECONNECT_RETRY_CAP_MS);
+    const pendingDelay = this.routeReopenRetryMs;
+    if (pending && pendingDelay !== null)
+      return { delayMs: pendingDelay, wait: pending };
+    const delayMs = this.routeReopenRetryDelayMs;
+    this.routeReopenRetryDelayMs = Math.min(delayMs * 2, RECONNECT_RETRY_CAP_MS);
     let retry;
-    retry = Promise.resolve().then(() => this.routeRetrySleep(delay)).finally(() => {
-      if (this.routeReopenRetry === retry)
+    retry = Promise.resolve().then(() => this.routeRetrySleep(delayMs)).finally(() => {
+      if (this.routeReopenRetry === retry) {
         this.routeReopenRetry = null;
+        this.routeReopenRetryMs = null;
+      }
     });
     this.routeReopenRetry = retry;
-    return retry;
+    this.routeReopenRetryMs = delayMs;
+    return { delayMs, wait: retry };
   }
   resetRouteReopenBackoff() {
     this.routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
@@ -13755,6 +13809,12 @@ function isRouteGoodbyeError(error2) {
   }
   return error2.code === "route_closed" && error2.message.includes("route closed by subc");
 }
+function isRouteOpenReloadWindowError(error2) {
+  if (error2 === null || typeof error2 !== "object")
+    return false;
+  const code = error2.code;
+  return code === "module_reloading" || code === "module_warming" || code === "target_unavailable";
+}
 function hasEngineResponse(error2) {
   const response = error2.response;
   if (response !== null && typeof response === "object")
@@ -13823,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();
@@ -13843,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() {
@@ -14086,7 +14146,16 @@ function platformKey(platform = process.platform, arch = process.arch) {
   }
   return key;
 }
+function logBinaryResolution(resolution) {
+  log(`Resolved binary from ${resolution.source}: ${resolution.path}`);
+}
 function findBinarySync(expectedVersion) {
+  const resolution = findBinarySyncInner(expectedVersion);
+  if (resolution)
+    logBinaryResolution(resolution);
+  return resolution?.path ?? null;
+}
+function findBinarySyncInner(expectedVersion) {
   const ext = process.platform === "win32" ? ".exe" : "";
   const env = { ...process.env };
   const pluginVersion = expectedVersion ?? (() => {
@@ -14100,8 +14169,9 @@ function findBinarySync(expectedVersion) {
   if (pluginVersion) {
     const tag = pluginVersion.startsWith("v") ? pluginVersion : `v${pluginVersion}`;
     const versionCached = cachedBinaryPathFromEnv(tag, env, ext);
-    if (versionCached && isExpectedCachedBinary2(versionCached, pluginVersion))
-      return versionCached;
+    if (versionCached && isExpectedCachedBinary2(versionCached, pluginVersion)) {
+      return { path: versionCached, source: "versioned cache" };
+    }
   }
   try {
     const key = platformKey();
@@ -14116,7 +14186,7 @@ function findBinarySync(expectedVersion) {
         warn(`npm platform package binary v${npmVersion} does not match plugin v${pluginVersion}; skipping (continuing to PATH lookup)`);
       } else {
         const copied = copyToVersionedCache(resolved, npmVersion);
-        return copied ?? resolved;
+        return { path: copied ?? resolved, source: "npm platform package" };
       }
     }
   } catch {}
@@ -14134,27 +14204,28 @@ function findBinarySync(expectedVersion) {
       }
       const usable = probeBinaryCandidate(candidate, "PATH", expectedVersion);
       if (usable)
-        return usable;
+        return { path: usable, source: "PATH" };
     }
   } catch {}
   const cargoPath = join7(homeDirFromEnv(env), ".cargo", "bin", `aft${ext}`);
   if (existsSync5(cargoPath)) {
     const usable = probeBinaryCandidate(cargoPath, "cargo", expectedVersion);
     if (usable)
-      return usable;
+      return { path: usable, source: "cargo" };
   }
   return null;
 }
 async function findBinary(expectedVersion) {
   const syncResult = findBinarySync(expectedVersion);
   if (syncResult) {
-    log(`Resolved binary: ${syncResult}`);
     return syncResult;
   }
   log("Binary not found locally, attempting auto-download...");
   const downloaded = await ensureBinaryForResolver(expectedVersion);
-  if (downloaded)
+  if (downloaded) {
+    logBinaryResolution({ path: downloaded, source: "auto-download" });
     return downloaded;
+  }
   throw new Error([
     "Could not find the `aft` binary.",
     "",
@@ -14197,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;
@@ -14469,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 };
@@ -14716,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";
@@ -15021,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))
@@ -15105,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}`);
@@ -15223,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)) {
@@ -16290,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();
@@ -17393,7 +17461,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.52.0",
+  version: "0.52.2",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -17416,19 +17484,19 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.52.0",
+    "@cortexkit/aft-bridge": "0.52.2",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
     typebox: "1.1.38",
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.52.0",
-    "@cortexkit/aft-darwin-x64": "0.52.0",
-    "@cortexkit/aft-linux-arm64": "0.52.0",
-    "@cortexkit/aft-linux-x64": "0.52.0",
-    "@cortexkit/aft-win32-arm64": "0.52.0",
-    "@cortexkit/aft-win32-x64": "0.52.0"
+    "@cortexkit/aft-darwin-arm64": "0.52.2",
+    "@cortexkit/aft-darwin-x64": "0.52.2",
+    "@cortexkit/aft-linux-arm64": "0.52.2",
+    "@cortexkit/aft-linux-x64": "0.52.2",
+    "@cortexkit/aft-win32-arm64": "0.52.2",
+    "@cortexkit/aft-win32-x64": "0.52.2"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "^0.80.2",
@@ -18088,6 +18156,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
@@ -32451,6 +32521,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(),
@@ -32516,7 +32612,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(),
@@ -32551,6 +32652,7 @@ var AftConfigSchema = exports_external.preprocess((value) => stripHarnessSpecifi
   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(),
@@ -32565,7 +32667,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"] },
@@ -32912,6 +33015,7 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "callgraph_chunk_size",
   "inspect",
   "worktree",
+  "git",
   "experimental",
   "bash"
 ]);
@@ -32934,6 +33038,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)
@@ -33640,18 +33746,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);
@@ -33674,7 +33780,7 @@ function runInstall(spec, version2, cwd, signal) {
         return;
       settled = true;
       cleanup();
-      resolve7(ok);
+      resolve8(ok);
     };
     const onAbort = () => {
       warn2(`[lsp] install ${target} aborted during shutdown`);
@@ -33775,7 +33881,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`),
@@ -33799,7 +33905,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) {
@@ -33926,7 +34032,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";
 
@@ -34083,12 +34189,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) {
@@ -34345,7 +34451,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()) {
@@ -34928,8 +35034,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]);
@@ -34971,12 +35077,12 @@ 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
@@ -35081,6 +35187,189 @@ function formatDiffForPi(oldContent, newContent, contextLines = DEFAULT_CONTEXT_
 `), firstChangedLine };
 }
 
+// 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 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
+}) {
+  if (expanded === true || full.render(200).length <= NATIVE_COLLAPSED_RESULT_MAX_LINES) {
+    return full;
+  }
+  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 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 renderDiff(piDiff);
+  } catch {
+    return piDiff;
+  }
+}
+
 // src/tools/hoisted.ts
 function readAttachments(response) {
   return Array.isArray(response.attachments) ? response.attachments : [];
@@ -35113,22 +35402,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 {
@@ -35184,7 +35473,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)
@@ -35240,6 +35529,7 @@ var HASHLINE_EDIT_DESCRIPTION = [
   "",
   "Quick reference:",
   "- Header: `[path#TAG]`; TAG is exactly four hexadecimal digits from a current tagged read. Read every addressed row and gap boundary; REM and MV require a whole-file tagged read. Re-read after an edit before chaining: an edit-response tag can retain only changed context.",
+  "- Same canonical path: multiple sections compose in patch order against pre-request coordinates.",
   "- Addresses: `0` (BOF), `N` (one line), `N.=M` (range; `N..=M`/`N..M` also work), `<N`/`>N` (gap before/after), `N*`/`<N*`/`>N*` (block), and `$`/`$-K` (EOF-relative). A plain `N` PUT replaces; use `<N` or `>N` to insert.",
   "- PUT text: `PUT <address>:` followed by one or more `+` body rows (`+` alone is blank). A final patch newline is allowed. PUT without `:` copies `@name` (or the anonymous register) and takes no body; names use `@` plus ASCII letters, digits, `_`, or `-`.",
   "- CUT: `CUT <address> [@name]`. REM: bare `REM` only, removing the whole file. MV: `MV <destination>` (one whitespace-free path, optional matching quotes), once and after any line operations. `*** Begin Patch`/`*** End Patch` is an optional envelope."
@@ -35309,9 +35599,9 @@ 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;
 }
@@ -35413,8 +35703,8 @@ 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);
       }
     }));
   }
@@ -35496,8 +35786,8 @@ 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);
       }
     }));
   }
@@ -35637,23 +35927,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;
@@ -35663,27 +35953,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(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;
@@ -35699,174 +36008,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"
@@ -35944,7 +36085,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;
@@ -35991,7 +36132,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);
@@ -36017,17 +36158,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) {
@@ -36059,8 +36210,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);
       }
     });
   }
@@ -36093,8 +36244,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);
       }
     });
   }
@@ -36419,8 +36570,8 @@ 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) {
@@ -36857,7 +37008,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();
@@ -36904,7 +37055,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)
@@ -36936,14 +37094,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({
@@ -36970,8 +37133,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);
     }
   }));
 }
@@ -37014,7 +37177,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);
   }
@@ -37025,22 +37188,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;
@@ -37086,8 +37260,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);
       }
     }));
   }
@@ -37119,8 +37293,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);
       }
     }));
   }
@@ -37194,11 +37368,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.";
@@ -37246,8 +37426,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);
     }
   }));
 }
@@ -37531,14 +37711,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({
@@ -37573,8 +37757,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);
     }
   });
 }
@@ -37625,10 +37809,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({
@@ -37696,8 +37886,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);
     }
   }));
 }
@@ -37774,7 +37964,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) {
@@ -37811,7 +38001,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) {
@@ -37820,7 +38010,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(`
 `);
@@ -37843,10 +38033,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;
@@ -37865,10 +38061,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) {
@@ -37930,8 +38132,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);
       }
     }));
   }
@@ -38022,8 +38224,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);
       }
     }));
   }
@@ -38055,21 +38257,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}`
   ];
@@ -38082,10 +38284,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({
@@ -38152,8 +38360,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);
     }
   }));
 }
@@ -38188,14 +38396,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."));
@@ -38217,7 +38425,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.")
     ];
   }
@@ -38249,10 +38457,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({
@@ -38321,8 +38535,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);
     }
   }));
 }
@@ -38389,7 +38603,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);
@@ -38436,10 +38650,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({
@@ -38471,8 +38691,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);
     }
   }));
 }
@@ -38727,7 +38947,7 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.52.0";
+var ANNOUNCEMENT_VERSION = "0.52.2";
 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).",
@@ -39078,7 +39298,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);