@cortexkit/aft-pi 0.50.3 → 0.51.0

package/dist/index.js

@@ -8325,6 +8325,120 @@ function skipSpaces(input, start) {
     index++;
   return index;
 }
+// ../aft-bridge/dist/bash-host-fallback.js
+import { spawn } from "node:child_process";
+var BASH_HOST_FALLBACK_BANNER = "[AFT host fallback - module transport down; no rewrites/compression/background]";
+var BASH_HOST_FALLBACK_MAX_OUTPUT_BYTES = 100 * 1024;
+var BASH_HOST_FALLBACK_MAX_TIMEOUT_MS = 10 * 60 * 1000;
+var BASH_HOST_FALLBACK_REFUSAL = "AFT transport is down; only foreground execution is available in host fallback";
+function bashHostFallbackAskPattern(command, cwd) {
+  return `AFT UNAVAILABLE - host fallback execution:
+
+Exact command:
+${command}
+
+Working directory:
+${cwd}`;
+}
+function appendTail(chunks, chunk) {
+  const combined = Buffer.concat([...chunks, chunk]);
+  if (combined.byteLength <= BASH_HOST_FALLBACK_MAX_OUTPUT_BYTES) {
+    return { chunks: [combined], truncated: false };
+  }
+  return {
+    chunks: [combined.subarray(combined.byteLength - BASH_HOST_FALLBACK_MAX_OUTPUT_BYTES)],
+    truncated: true
+  };
+}
+function renderOutput(output, exitCode) {
+  const body = output.toString("utf8");
+  const separator = body.length === 0 || body.endsWith(`
+`) ? "" : `
+`;
+  return `${BASH_HOST_FALLBACK_BANNER}
+${body}${separator}[exit code: ${exitCode}]`;
+}
+async function runBashHostFallback(options) {
+  const timeoutMs = Math.min(Math.max(1, options.timeoutMs ?? BASH_HOST_FALLBACK_MAX_TIMEOUT_MS), BASH_HOST_FALLBACK_MAX_TIMEOUT_MS);
+  if (options.signal?.aborted) {
+    throw new DOMException("The host fallback command was aborted", "AbortError");
+  }
+  return await new Promise((resolve2, reject) => {
+    const child = spawn(options.command, {
+      cwd: options.projectRoot,
+      shell: true,
+      env: { ...process.env, ...options.env },
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: process.platform !== "win32",
+      windowsHide: true
+    });
+    let chunks = [];
+    let truncated = false;
+    let timedOut = false;
+    let aborted = false;
+    let settled = false;
+    let abortForceTimer;
+    const capture = (chunk) => {
+      const next = appendTail(chunks, Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+      chunks = next.chunks;
+      truncated ||= next.truncated;
+    };
+    child.stdout?.on("data", capture);
+    child.stderr?.on("data", capture);
+    const kill = (signal) => {
+      if (child.exitCode !== null || child.signalCode !== null)
+        return;
+      if (process.platform !== "win32" && child.pid !== undefined) {
+        try {
+          process.kill(-child.pid, signal);
+          return;
+        } catch {}
+      }
+      child.kill(signal);
+    };
+    const onAbort = () => {
+      aborted = true;
+      kill("SIGTERM");
+      abortForceTimer = setTimeout(() => kill("SIGKILL"), 250);
+      abortForceTimer.unref?.();
+    };
+    options.signal?.addEventListener("abort", onAbort, { once: true });
+    const timer = setTimeout(() => {
+      timedOut = true;
+      kill("SIGKILL");
+    }, timeoutMs);
+    const cleanup = () => {
+      clearTimeout(timer);
+      if (abortForceTimer !== undefined)
+        clearTimeout(abortForceTimer);
+      options.signal?.removeEventListener("abort", onAbort);
+    };
+    child.once("error", (error2) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      reject(error2);
+    });
+    child.once("close", (code) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      if (aborted) {
+        reject(new DOMException("The host fallback command was aborted", "AbortError"));
+        return;
+      }
+      const exitCode = timedOut ? 124 : code ?? 1;
+      resolve2({
+        success: true,
+        output: renderOutput(Buffer.concat(chunks), exitCode),
+        exit_code: exitCode,
+        truncated
+      });
+    });
+  });
+}
 // ../aft-bridge/dist/bash-timeout.js
 function resolveBashKillTimeout(modelTimeout, foregroundWaitMs) {
   if (modelTimeout !== undefined && modelTimeout >= foregroundWaitMs) {
@@ -8333,7 +8447,7 @@ function resolveBashKillTimeout(modelTimeout, foregroundWaitMs) {
   return;
 }
 // ../aft-bridge/dist/bridge.js
-import { spawn } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
@@ -8363,51 +8477,6 @@ function isPassiveCommand(command) {
   return PASSIVE_COMMANDS.has(command);
 }
 
-// ../aft-bridge/dist/status-bar.js
-var STATUS_BAR_HEARTBEAT_CALLS = 15;
-function createStatusBarEmitState() {
-  return { callsSinceEmit: 0 };
-}
-function parseStatusBarCounts(value) {
-  if (!value || typeof value !== "object")
-    return;
-  const record = value;
-  const num = (key) => {
-    const raw = record[key];
-    return typeof raw === "number" && Number.isFinite(raw) ? raw : 0;
-  };
-  return {
-    errors: num("errors"),
-    warnings: num("warnings"),
-    dead_code: num("dead_code"),
-    unused_exports: num("unused_exports"),
-    duplicates: num("duplicates"),
-    todos: num("todos"),
-    tier2_stale: record.tier2_stale === true,
-    ...typeof record.line === "string" ? { line: record.line } : {}
-  };
-}
-function countsEqual(a, b) {
-  return a.errors === b.errors && a.warnings === b.warnings && a.dead_code === b.dead_code && a.unused_exports === b.unused_exports && a.duplicates === b.duplicates && a.todos === b.todos && a.tier2_stale === b.tier2_stale && a.line === b.line;
-}
-function shouldEmitStatusBar(state, next) {
-  const changed = state.last === undefined || !countsEqual(state.last, next);
-  state.callsSinceEmit += 1;
-  const heartbeat = state.callsSinceEmit >= STATUS_BAR_HEARTBEAT_CALLS;
-  if (changed || heartbeat) {
-    state.last = next;
-    state.callsSinceEmit = 0;
-    return true;
-  }
-  return false;
-}
-function formatStatusBar(counts) {
-  if (counts.line !== undefined)
-    return counts.line;
-  const staleMark = counts.tier2_stale ? "~" : "";
-  return `[AFT E${counts.errors} W${counts.warnings} | ` + `${staleMark}D${counts.dead_code} U${counts.unused_exports} C${counts.duplicates} | ` + `T${counts.todos}]`;
-}
-
 // ../aft-bridge/dist/bridge.js
 var DEFAULT_BRIDGE_TIMEOUT_MS = 30000;
 var BRIDGE_HANG_TIMEOUT_THRESHOLD = 2;
@@ -8536,6 +8605,14 @@ class BridgeTransportTimeoutError extends Error {
     this.name = "BridgeTransportTimeoutError";
   }
 }
+
+class BridgeTransportUnavailableError extends Error {
+  code = "bridge_transport_unavailable";
+  constructor(message, options) {
+    super(message, options);
+    this.name = "BridgeTransportUnavailableError";
+  }
+}
 function isBridgeTransportTimeout(err) {
   return err instanceof Error && err.code === "transport_timeout";
 }
@@ -8578,7 +8655,6 @@ class BinaryBridge {
   configureWarningClients = new Map;
   restartResetTimer = null;
   lastChildActivityAt = 0;
-  lastStatusBar;
   consecutiveRequestTimeouts = 0;
   errorPrefix;
   logger;
@@ -8779,7 +8855,7 @@ class BinaryBridge {
         throw new Error(`${this.errorPrefix} Bridge is retiring after the on-disk binary changed; retry to respawn on the updated binary`);
       }
       if (this._shuttingDown) {
-        throw new Error(`${this.errorPrefix} Bridge is shutting down, cannot send "${command}"`);
+        throw new BridgeTransportUnavailableError(`${this.errorPrefix} Bridge is shutting down, cannot send "${command}"`);
       }
       if (Object.hasOwn(params, "id")) {
         throw new Error("params cannot contain reserved key 'id'");
@@ -8813,7 +8889,7 @@ class BinaryBridge {
                 await this.deliverConfigureWarnings(configResult, params, options);
                 await this.checkVersion(implicitTransportOptions);
                 if (!this.isAlive()) {
-                  throw new Error(`${this.errorPrefix} Bridge died during version check. Check logs: ${this.getLogFilePathVia()}`);
+                  throw new BridgeTransportUnavailableError(`${this.errorPrefix} Bridge died during version check. Check logs: ${this.getLogFilePathVia()}`);
                 }
                 this.configured = true;
               } finally {
@@ -8882,7 +8958,7 @@ class BinaryBridge {
         if (!this.process?.stdin?.writable) {
           this.pending.delete(id);
           clearTimeout(timer);
-          reject(new Error(`${this.errorPrefix} stdin not writable for command "${command}"`));
+          reject(new BridgeTransportUnavailableError(`${this.errorPrefix} stdin not writable for command "${command}"`));
           return;
         }
         requestSentAt = Date.now();
@@ -8892,7 +8968,7 @@ class BinaryBridge {
             if (entry) {
               this.pending.delete(id);
               clearTimeout(entry.timer);
-              entry.reject(new Error(`${this.errorPrefix} Failed to write to stdin: ${err.message}`));
+              entry.reject(new BridgeTransportUnavailableError(`${this.errorPrefix} Failed to write to stdin: ${err.message}`, { cause: err }));
             }
           }
         });
@@ -9059,7 +9135,6 @@ class BinaryBridge {
   }
   spawnProcess(triggeringSessionId) {
     this._retiringDueToBinaryChange = false;
-    this.lastStatusBar = undefined;
     if (triggeringSessionId) {
       this.sessionLogVia(triggeringSessionId, `Spawning binary: ${this.binaryPath} (cwd: ${this.cwd})`);
     } else {
@@ -9100,7 +9175,7 @@ class BinaryBridge {
         }
       }
     }
-    const child = spawn(this.binaryPath, [], {
+    const child = spawn2(this.binaryPath, [], {
       cwd: this.cwd,
       stdio: ["pipe", "pipe", "pipe"],
       env
@@ -9130,7 +9205,7 @@ class BinaryBridge {
       if (this.process !== currentChild)
         return;
       this.errorVia(`Process error: ${err.message}${this.formatStderrTail()}`);
-      this.handleCrash();
+      this.handleCrash(err);
     });
     child.on("exit", (code, signal) => {
       if (this.process !== currentChild)
@@ -9143,7 +9218,7 @@ class BinaryBridge {
         this.process = null;
         this.configured = false;
         this.clearRestartResetTimer();
-        this.rejectAllPending(new Error(`${this.errorPrefix} Binary killed by ${signal}`));
+        this.rejectAllPending(new BridgeTransportUnavailableError(`${this.errorPrefix} Binary killed by ${signal}`));
         return;
       }
       this.handleCrash();
@@ -9298,7 +9373,6 @@ class BinaryBridge {
         this.consecutiveRequestTimeouts = 0;
         this.scheduleRestartCountReset();
         this.accountForBashTaskResponse(entry.command, response);
-        this.captureStatusBar(response);
         entry.resolve(response);
       } else if (typeof response.type === "string") {
         this.logVia(`Ignoring unknown stdout push frame type: ${response.type}`);
@@ -9319,14 +9393,6 @@ class BinaryBridge {
       this.outstandingBackgroundTaskIds.add(taskId);
     }
   }
-  captureStatusBar(response) {
-    const parsed = parseStatusBarCounts(response.status_bar);
-    if (parsed)
-      this.lastStatusBar = parsed;
-  }
-  getStatusBar() {
-    return this.lastStatusBar;
-  }
   handleTimeout(triggeringSessionId) {
     this.consecutiveRequestTimeouts = 0;
     this.spawnedBinaryFingerprint = null;
@@ -9367,7 +9433,7 @@ class BinaryBridge {
     if (tail) {
       this.errorVia(`Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""}.${tail}`);
     }
-    this.rejectAllPending(new Error(`${this.errorPrefix} Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""} (see ${this.getLogFilePathVia()})`));
+    this.rejectAllPending(new BridgeTransportUnavailableError(`${this.errorPrefix} Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""} (see ${this.getLogFilePathVia()})`, { cause }));
     if (this._retiringDueToBinaryChange) {
       this.logVia("Binary exited while retiring after an on-disk update; skipping auto-restart");
       return;
@@ -13030,6 +13096,12 @@ function normalizeWindowsRoot(p) {
 }
 
 // ../aft-bridge/dist/subc-transport.js
+class SubcTransportShuttingDownError extends SubcCallError {
+  constructor() {
+    super("terminal", "subc transport is shutting down", "transport_shutting_down");
+    this.name = "SubcTransportShuttingDownError";
+  }
+}
 var AFT_MODULE_ID = "aft";
 var MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3;
 var BG_STABLE_MS = 5000;
@@ -13371,7 +13443,6 @@ class SubcTransport {
   pool;
   projectRoot;
   generation;
-  lastStatusBar;
   cachedStatus = null;
   constructor(pool, projectRoot, generation) {
     this.pool = pool;
@@ -13387,20 +13458,12 @@ class SubcTransport {
   getConcretePoolId() {
     return this.pool.getConcretePoolId();
   }
-  getStatusBar() {
-    return this.lastStatusBar;
-  }
   getCachedStatus() {
     return this.cachedStatus;
   }
   cacheStatusSnapshot(snapshot) {
     this.cachedStatus = snapshot;
   }
-  captureStatusBar(response) {
-    const parsed = parseStatusBarCounts(response.status_bar);
-    if (parsed)
-      this.lastStatusBar = parsed;
-  }
   identityFor(session) {
     return {
       project_root: this.projectRoot,
@@ -13421,9 +13484,7 @@ class SubcTransport {
     if (preview === true)
       body.preview = true;
     const reply = await this.pool.routeRequest(this.identityFor(sessionId), body, timeoutMs, onProgress, this.generation);
-    const result = reliftReply(reply);
-    this.captureStatusBar(result);
-    return result;
+    return reliftReply(reply);
   }
   async send(command, params = {}, options) {
     this.assertCurrent();
@@ -13437,9 +13498,7 @@ class SubcTransport {
     if (editSlotSurvives !== undefined)
       body.edit_slot_survives = editSlotSurvives;
     const reply = await this.pool.routeRequest(this.identityFor(session), body, timeoutMs, onProgress, this.generation);
-    const response = reliftReply(reply);
-    this.captureStatusBar(response);
-    return response;
+    return reliftReply(reply);
   }
   splitOptions(options) {
     if (!options)
@@ -13710,7 +13769,7 @@ class SubcTransportPool {
   getBridge(projectRoot) {
     const root = this.canonicalRoot(projectRoot);
     if (this.shuttingDown && this.lifecycleEnabled()) {
-      throw new SubcCallError("terminal", "subc transport is shutting down");
+      throw new SubcTransportShuttingDownError;
     }
     if (!this.lifecycleEnabled())
       return this.makeFacade(root);
@@ -14010,7 +14069,7 @@ class SubcTransportPool {
   }
   async ensureClient() {
     if (this.shuttingDown)
-      throw new SubcCallError("terminal", "subc transport is shutting down");
+      throw new SubcTransportShuttingDownError;
     if (this.client)
       return this.client;
     if (this.connecting)
@@ -14024,7 +14083,7 @@ class SubcTransportPool {
         try {
           client.close();
         } catch {}
-        throw new SubcCallError("terminal", "subc transport is shutting down");
+        throw new SubcTransportShuttingDownError;
       }
       this.client = client;
       this.transportFailures = 0;
@@ -14289,8 +14348,24 @@ function isRouteGoodbyeError(error2) {
   }
   return error2.code === "route_closed" && error2.message.includes("route closed by subc");
 }
+function hasEngineResponse(error2) {
+  const response = error2.response;
+  if (response !== null && typeof response === "object")
+    return true;
+  const cause = error2.cause;
+  if (cause === null || typeof cause !== "object")
+    return false;
+  const causeResponse = cause.response;
+  return causeResponse !== null && typeof causeResponse === "object";
+}
+function isBashTransportDeadError(error2) {
+  if (!(error2 instanceof Error) || hasEngineResponse(error2) || isRouteGoodbyeError(error2)) {
+    return false;
+  }
+  return error2 instanceof BridgeTransportUnavailableError || error2 instanceof SubcTransportShuttingDownError || isConsumerReconnectTransient(error2) || error2 instanceof StaleRouteHandleError || error2 instanceof SubcRootGenerationExpiredError || error2 instanceof SubcRootReapedError;
+}
 function isTransportClassError(error2) {
-  return isBridgeTransportTimeout(error2) || isConsumerReconnectTransient(error2) || error2 instanceof StaleRouteHandleError || error2 instanceof SubcRootGenerationExpiredError || error2 instanceof SubcRootReapedError;
+  return isBridgeTransportTimeout(error2) || isBashTransportDeadError(error2);
 }
 function adaptToolError(command, error2) {
   if (!(error2 instanceof Error))
@@ -16860,9 +16935,6 @@ class RevivableProjectTransport {
   getCwd() {
     return this.projectRoot;
   }
-  getStatusBar() {
-    return this.owner.currentBridge(this.projectRoot)?.getStatusBar();
-  }
   getCachedStatus() {
     return this.owner.currentBridge(this.projectRoot)?.getCachedStatus() ?? null;
   }
@@ -17881,7 +17953,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.50.3",
+  version: "0.51.0",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -17904,19 +17976,19 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.50.3",
+    "@cortexkit/aft-bridge": "0.51.0",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
     typebox: "1.1.38",
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.50.3",
-    "@cortexkit/aft-darwin-x64": "0.50.3",
-    "@cortexkit/aft-linux-arm64": "0.50.3",
-    "@cortexkit/aft-linux-x64": "0.50.3",
-    "@cortexkit/aft-win32-arm64": "0.50.3",
-    "@cortexkit/aft-win32-x64": "0.50.3"
+    "@cortexkit/aft-darwin-arm64": "0.51.0",
+    "@cortexkit/aft-darwin-x64": "0.51.0",
+    "@cortexkit/aft-linux-arm64": "0.51.0",
+    "@cortexkit/aft-linux-x64": "0.51.0",
+    "@cortexkit/aft-win32-arm64": "0.51.0",
+    "@cortexkit/aft-win32-x64": "0.51.0"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "^0.80.2",
@@ -17983,14 +18055,23 @@ function readStatusBar(value) {
   if (typeof value !== "object" || value === null)
     return;
   const bar = asRecord2(value);
+  const errors = readOptionalNumber(bar.errors);
+  const warnings = readOptionalNumber(bar.warnings);
+  const deadCode = readOptionalNumber(bar.dead_code);
+  const unusedExports = readOptionalNumber(bar.unused_exports);
+  const duplicates = readOptionalNumber(bar.duplicates);
+  const todos = readOptionalNumber(bar.todos);
+  if (errors === null && warnings === null && deadCode === null && unusedExports === null && duplicates === null && todos === null) {
+    return;
+  }
   return {
-    errors: readNumber(bar.errors),
-    warnings: readNumber(bar.warnings),
-    dead_code: readNumber(bar.dead_code),
-    unused_exports: readNumber(bar.unused_exports),
-    duplicates: readNumber(bar.duplicates),
-    todos: readNumber(bar.todos),
-    tier2_stale: readBoolean(bar.tier2_stale)
+    ...errors !== null ? { errors } : {},
+    ...warnings !== null ? { warnings } : {},
+    ...deadCode !== null ? { dead_code: deadCode } : {},
+    ...unusedExports !== null ? { unused_exports: unusedExports } : {},
+    ...duplicates !== null ? { duplicates } : {},
+    ...todos !== null ? { todos } : {},
+    ...bar.tier2_stale === true ? { tier2_stale: true } : {}
   };
 }
 function formatFlag(enabled) {
@@ -17999,6 +18080,15 @@ function formatFlag(enabled) {
 function formatCount(value) {
   return value == null ? "—" : value.toLocaleString("en-US");
 }
+function formatCacheRoleLabel(role) {
+  if (role === "worktree") {
+    return "worktree — shared repo index (built by the main checkout)";
+  }
+  if (role === "read_only") {
+    return "read_only — sharing the repo index family (read-only borrow)";
+  }
+  return role;
+}
 function formatSemanticIndexStatus(status, stage) {
   if ((status === "loading" || status === "building") && stage === "fingerprint_change") {
     return "Rebuilding (model changed)";
@@ -18099,7 +18189,7 @@ function formatStatusDialogMessage(status) {
     `AFT version: ${status.version}`,
     `Project root: ${status.project_root ?? "(not configured)"}`,
     `Canonical root: ${status.canonical_root ?? "(not configured)"}`,
-    `Cache role: ${status.cache_role}`,
+    `Cache role: ${formatCacheRoleLabel(status.cache_role)}`,
     "",
     "Enabled features",
     `- format_on_edit: ${formatFlag(status.features.format_on_edit)}`,
@@ -18131,7 +18221,19 @@ function formatStatusDialogMessage(status) {
   lines.push("", "Disk usage", `- trigram index: ${formatBytes(status.disk.trigram_disk_bytes)}`, `- semantic index: ${formatBytes(status.disk.semantic_disk_bytes)}`, "", "Runtime", `- LSP servers: ${formatCount(status.lsp_servers)}`, `- symbol cache: ${formatCount(status.symbol_cache.local_entries)} local / ${formatCount(status.symbol_cache.warm_entries)} warm`);
   if (status.status_bar) {
     const sb = status.status_bar;
-    lines.push("", `Code Health${sb.tier2_stale ? " (~ stale)" : ""}`, `- errors: ${formatCount(sb.errors)}`, `- warnings: ${formatCount(sb.warnings)}`, `- dead code: ${formatCount(sb.dead_code)}`, `- unused exports: ${formatCount(sb.unused_exports)}`, `- duplicates: ${formatCount(sb.duplicates)}`, `- todos: ${formatCount(sb.todos)}`);
+    const rows = [
+      ["errors", sb.errors],
+      ["warnings", sb.warnings],
+      ["dead code", sb.dead_code],
+      ["unused exports", sb.unused_exports],
+      ["duplicates", sb.duplicates],
+      ["todos", sb.todos]
+    ].filter((row) => typeof row[1] === "number");
+    if (rows.length > 0) {
+      lines.push("", `Code Health${sb.tier2_stale ? " (~ stale)" : ""}`);
+      for (const [label, value] of rows)
+        lines.push(`- ${label}: ${formatCount(value)}`);
+    }
   }
   if (status.storage_dir ?? status.disk.storage_dir) {
     lines.push(`- storage dir: ${status.storage_dir ?? status.disk.storage_dir}`);
@@ -18210,6 +18312,8 @@ async function callBridge(bridge, command, params = {}, extCtx, options) {
   try {
     response = await bridge.send(command, merged, Object.keys(sendOptions).length > 0 ? sendOptions : undefined);
   } catch (error3) {
+    if (command === "bash" && isBashTransportDeadError(error3))
+      throw error3;
     throw adaptToolError(command, error3);
   }
   if (response.success === false) {
@@ -18345,8 +18449,8 @@ function renderInner(s, error3, theme, innerWidth) {
   }
   lines.push(rowFull("Project root", s.project_root ?? "(not configured)", theme, innerWidth));
   lines.push(rowFull("Canonical root", s.canonical_root ?? "(not configured)", theme, innerWidth));
-  const cacheTone = s.cache_role === "main" ? "accent" : s.cache_role === "worktree" ? "warning" : "muted";
-  lines.push(rowFull("Cache role", theme.fg(cacheTone, s.cache_role), theme, innerWidth));
+  const cacheTone = s.cache_role === "main" ? "accent" : "muted";
+  lines.push(rowFull("Cache role", theme.fg(cacheTone, formatCacheRoleLabel(s.cache_role)), theme, innerWidth));
   lines.push("");
   const colWidth = Math.floor((innerWidth - 2) / 2);
   const left = [];
@@ -32839,6 +32943,7 @@ function resolveBashConfig(config2) {
     rewrite: false,
     compress: false,
     background: false,
+    host_fallback: false,
     long_running_reminder_enabled: reminderEnabled,
     long_running_reminder_interval_ms: reminderInterval,
     foreground_wait_window_ms: foregroundWaitWindowMs
@@ -32854,7 +32959,8 @@ function resolveBashConfig(config2) {
       enabled: true,
       rewrite: top.rewrite ?? true,
       compress: top.compress ?? true,
-      background: top.background ?? true
+      background: top.background ?? true,
+      host_fallback: top.host_fallback ?? false
     };
   }
   const hasLegacyFeatureFlag = legacy && (legacy.rewrite !== undefined || legacy.compress !== undefined || legacy.background !== undefined);
@@ -32941,6 +33047,7 @@ var BashFeaturesSchema = exports_external.object({
   rewrite: exports_external.boolean().optional(),
   compress: exports_external.boolean().optional(),
   background: exports_external.boolean().optional(),
+  host_fallback: exports_external.boolean().optional(),
   long_running_reminder_enabled: exports_external.boolean().optional(),
   long_running_reminder_interval_ms: exports_external.number().int().positive().optional(),
   foreground_wait_window_ms: exports_external.number().int().positive().optional()
@@ -32969,6 +33076,9 @@ var InspectConfigSchema = exports_external.object({
     expected_mirrors: exports_external.array(exports_external.tuple([exports_external.string().trim().min(1), exports_external.string().trim().min(1)])).optional()
   }).optional()
 });
+var WorktreeConfigSchema = exports_external.object({
+  ram_overlay: exports_external.boolean().optional()
+});
 var BackupConfigSchema = exports_external.object({
   enabled: exports_external.boolean().optional(),
   max_depth: exports_external.number().int().positive().optional(),
@@ -32993,6 +33103,7 @@ var AftConfigSchema = exports_external.preprocess((value) => stripHarnessSpecifi
   callgraph_chunk_size: exports_external.number().optional(),
   inspect: InspectConfigSchema.optional(),
   backup: BackupConfigSchema.optional(),
+  worktree: WorktreeConfigSchema.optional(),
   sandbox: SandboxConfigSchema.optional(),
   bash: BashConfigSchema.optional(),
   experimental: ExperimentalConfigSchema.optional(),
@@ -33249,6 +33360,15 @@ function mergeLspConfig(base, override) {
     return;
   return Object.fromEntries(Object.entries(lsp).filter(([, v]) => v !== undefined));
 }
+function mergeWorktreeConfig(baseWorktree, overrideWorktree) {
+  if (baseWorktree === undefined && overrideWorktree === undefined)
+    return;
+  if (overrideWorktree === undefined)
+    return baseWorktree;
+  if (baseWorktree === undefined)
+    return overrideWorktree;
+  return { ...baseWorktree, ...overrideWorktree };
+}
 function mergeInspectConfig(baseInspect, overrideInspect) {
   const inspect = {
     ...baseInspect,
@@ -33334,6 +33454,7 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "callgraph_store",
   "callgraph_chunk_size",
   "inspect",
+  "worktree",
   "experimental",
   "bash"
 ]);
@@ -33378,11 +33499,13 @@ function mergeConfigs(base, override) {
   const experimental = mergeExperimentalConfig(base.experimental, override.experimental);
   const bash = mergeBashConfig(base.bash, override.bash);
   const inspect = mergeInspectConfig(base.inspect, override.inspect);
+  const worktree = mergeWorktreeConfig(base.worktree, override.worktree);
   const sandbox = mergeSandboxConfig(base.sandbox, override.sandbox);
   const bridge = base.bridge;
   const safeOverride = pickProjectSafeFields(override);
   delete safeOverride.bash;
   delete safeOverride.inspect;
+  delete safeOverride.worktree;
   return {
     ...base,
     ...safeOverride,
@@ -33391,6 +33514,7 @@ function mergeConfigs(base, override) {
     ...lsp ? { lsp } : {},
     ...bash !== undefined ? { bash } : {},
     ...inspect !== undefined ? { inspect } : {},
+    ...worktree !== undefined ? { worktree } : {},
     ...sandbox !== undefined ? { sandbox } : {},
     experimental,
     semantic,
@@ -33472,7 +33596,7 @@ function loadAftConfig(projectDirectory) {
 }
 
 // src/lsp-auto-install.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 import { createHash as createHash4 } from "node:crypto";
 import {
   createReadStream,
@@ -34072,7 +34196,7 @@ function runInstall(spec, version2, cwd, signal) {
       return;
     }
     ensureInstallAnchor(cwd);
-    const child = spawn2(npm.command, ["install", "--no-save", "--ignore-scripts", "--silent", target], {
+    const child = spawn3(npm.command, ["install", "--no-save", "--ignore-scripts", "--silent", target], {
       stdio: ["ignore", "pipe", "pipe"],
       cwd,
       env: npmSpawnEnv(npm)
@@ -35270,26 +35394,6 @@ function sendFeatureAnnouncement(version2, features, footer, storageDir) {
   markAnnouncementSeen(storageDir, "pi", version2);
 }
 
-// src/status-bar-inject.ts
-var DEFAULT_SESSION = "__default__";
-var emitStateBySession = new Map;
-function statusBarBlockForSession(sessionID, counts, force = false) {
-  if (!counts)
-    return;
-  const key = sessionID ?? DEFAULT_SESSION;
-  let state = emitStateBySession.get(key);
-  if (!state) {
-    state = createStatusBarEmitState();
-    emitStateBySession.set(key, state);
-  }
-  if (force) {
-    state.last = counts;
-    state.callsSinceEmit = 0;
-    return formatStatusBar(counts);
-  }
-  return shouldEmitStatusBar(state, counts) ? formatStatusBar(counts) : undefined;
-}
-
 // src/bash-wait-detach.ts
 var BASH_TRANSPORT_TIMEOUT_MS = 30000;
 async function sendBashWaitDetach(bridge, sessionID) {
@@ -36730,7 +36834,7 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
       "Piped commands run verbatim and show the pipeline's output; run test/build tools without pipes when you need AFT's summary."
     ],
     parameters: bashParamsForConfig(bashCfg.background),
-    async execute(_toolCallId, params, _signal, onUpdate, extCtx) {
+    async execute(_toolCallId, params, signal, onUpdate, extCtx) {
       const bridge = bridgeFor(ctx, extCtx.cwd);
       const bashCfg2 = resolveBashConfig(ctx.config);
       const foregroundWaitMs = resolveForegroundWaitMs(bashCfg2.foreground_wait_window_ms);
@@ -36765,30 +36869,62 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
       }
       const bridgeCommand = spawnContext.command;
       let streamed = "";
-      const response = await callBashWithPermissionLoop(bridge, {
-        command: bridgeCommand,
-        timeout: effectiveTimeout,
-        workdir: spawnContext.cwd ?? params.workdir,
-        env: spawnContext.env,
-        description: params.description,
-        background: effectiveBackground,
-        notify_on_completion: effectiveBackground,
-        compressed,
-        pty: requestedPty,
-        pty_rows: ptyRows,
-        pty_cols: ptyCols,
-        foreground_orchestrate: true,
-        block_to_completion: blockToCompletion,
-        wait: requestedWait,
-        sandbox: params.sandbox
-      }, extCtx, {
-        transportTimeoutMs: orchestratedTransportTimeoutMs(blockToCompletion, requestedWait, effectiveTimeout, foregroundWaitMs),
-        onProgress: ({ text }) => {
-          streamed += text;
-          const displayText = truncateToVisualLines(streamed, 100);
-          onUpdate?.(bashResult(displayText, { streaming: true }));
-        }
-      });
+      let usedHostFallback = false;
+      let response;
+      try {
+        response = await callBashWithPermissionLoop(bridge, {
+          command: bridgeCommand,
+          timeout: effectiveTimeout,
+          workdir: spawnContext.cwd ?? params.workdir,
+          env: spawnContext.env,
+          description: params.description,
+          background: effectiveBackground,
+          notify_on_completion: effectiveBackground,
+          compressed,
+          pty: requestedPty,
+          pty_rows: ptyRows,
+          pty_cols: ptyCols,
+          foreground_orchestrate: true,
+          block_to_completion: blockToCompletion,
+          wait: requestedWait,
+          sandbox: params.sandbox
+        }, extCtx, {
+          transportTimeoutMs: orchestratedTransportTimeoutMs(blockToCompletion, requestedWait, effectiveTimeout, foregroundWaitMs),
+          onProgress: ({ text }) => {
+            streamed += text;
+            const displayText = truncateToVisualLines(streamed, 100);
+            onUpdate?.(bashResult(displayText, { streaming: true }));
+          }
+        });
+      } catch (error53) {
+        if (!bashCfg2.host_fallback || !isBashTransportDeadError(error53))
+          throw error53;
+        if (rawRequestedBackground) {
+          throw new Error(`${BASH_HOST_FALLBACK_REFUSAL}; background:true is unsupported.`);
+        }
+        if (rawRequestedPty) {
+          throw new Error(`${BASH_HOST_FALLBACK_REFUSAL}; pty:true is unsupported.`);
+        }
+        if (!extCtx.hasUI || typeof extCtx.ui?.confirm !== "function") {
+          throw new BridgeError("Permission denied: host fallback execution requires an interactive UI.", "permission_denied");
+        }
+        const projectRoot = extCtx.cwd;
+        const pattern = bashHostFallbackAskPattern(bridgeCommand, projectRoot);
+        const approved = await extCtx.ui.confirm("AFT unavailable — run command on host?", pattern, {
+          signal: signal ?? extCtx.signal
+        });
+        if (!approved) {
+          throw new BridgeError("Permission denied: AFT host fallback execution was denied.", "permission_denied");
+        }
+        response = await runBashHostFallback({
+          command: bridgeCommand,
+          projectRoot,
+          timeoutMs: timeout,
+          signal: signal ?? extCtx.signal,
+          env: spawnContext.env
+        });
+        usedHostFallback = true;
+      }
       if (response.success === false) {
         throw new Error(response.message ?? "bash failed");
       }
@@ -36805,7 +36941,7 @@ DO NOT use bash for code search or code exploration. If you are about to run gre
         task_id: taskId
       };
       const output = response.output ?? "";
-      return bashResult(withBashHints(output, bridgeCommand, aftSearchRegistered, extCtx.cwd), details);
+      return bashResult(usedHostFallback ? output : withBashHints(output, bridgeCommand, aftSearchRegistered, extCtx.cwd), details);
     },
     renderCall(args, theme, context) {
       return renderBashCall(args?.command, args?.description, theme, context);
@@ -37647,10 +37783,10 @@ function registerImportTools(pi, ctx) {
 import { Type as Type8 } from "typebox";
 var InspectParams = Type8.Object({
   sections: Type8.Optional(Type8.Union([Type8.String(), Type8.Array(Type8.String())], {
-    description: "Categories to include in detailed drill-down (e.g. 'todos' or ['todos', 'dead_code', 'cycles']). Use 'all' for every active category. Omit for summary-only mode."
+    description: "Categories to include in detailed drill-down (e.g. 'todos' or ['todos', 'dead_code', 'cycles']). Use 'all' for every active category. Omit for summary-only mode. `sections` changes detail, not the categories verified."
   })),
   scope: Type8.Optional(Type8.Union([Type8.String(), Type8.Array(Type8.String())], {
-    description: "Restrict scan/results to paths under this scope (file or directory, absolute or relative to project root). Tier 1 scopes the scan; Tier 2 scans project-wide and applies scope as a result filter."
+    description: "Restrict returned results to paths under this scope (file or directory, absolute or relative to project root). `scope=` narrows results; it does not reduce the blocking-fresh verification work."
   })),
   topK: Type8.Optional(Type8.Integer({
     minimum: 1,
@@ -37659,11 +37795,6 @@ var InspectParams = Type8.Object({
     description: "Max drill-down items per category. Default 20, max 100."
   }))
 });
-var TIER2_INSPECT_CATEGORIES = new Set(["dead_code", "unused_exports", "duplicates", "cycles"]);
-var INSPECT_TIER2_RUN_TIMEOUT_MS = 5 * 60000;
-var INSPECT_TIER2_MIN_TRIGGER_INTERVAL_MS = 4 * 60000;
-var runningTier2Categories = new WeakMap;
-var lastTier2TriggerAtByBridge = new WeakMap;
 function normalizeStringOrArray(value) {
   return isEmptyParam(value) ? undefined : value;
 }
@@ -37694,15 +37825,119 @@ function validateOptionalTopK(value) {
   }
   return value;
 }
-function diagnosticsServerSummary(section) {
-  const pending = Array.isArray(section.servers_pending) ? section.servers_pending.filter((item) => typeof item === "string") : [];
-  const notInstalled = Array.isArray(section.servers_not_installed) ? section.servers_not_installed.filter((item) => typeof item === "string") : [];
-  const parts = [];
-  if (pending.length > 0)
-    parts.push(`pending: ${pending.join(", ")}`);
-  if (notInstalled.length > 0)
-    parts.push(`not installed: ${notInstalled.join(", ")}`);
-  return parts.length > 0 ? parts.join("; ") : "none reported";
+function terminalKind(response) {
+  for (const value of [
+    response.terminal,
+    response.outcome,
+    response.inspect_outcome,
+    response.inspect_terminal,
+    response.status
+  ]) {
+    if (typeof value !== "string")
+      continue;
+    const normalized = value.toUpperCase().replaceAll("_", "-");
+    if (normalized === "FRESH" || normalized === "INTERRUPTED" || normalized === "PHASE-FAILED") {
+      return normalized;
+    }
+  }
+  return;
+}
+function firstRecord(...values) {
+  for (const value of values) {
+    const record2 = asRecord3(value);
+    if (record2)
+      return record2;
+  }
+  return;
+}
+function firstString(...values) {
+  for (const value of values) {
+    const text = asString2(value);
+    if (text !== undefined)
+      return text;
+  }
+  return;
+}
+function parseInspectPhaseEntries(value) {
+  if (!Array.isArray(value))
+    return [];
+  return value.flatMap((candidate) => {
+    const entry = asRecord3(candidate);
+    const id = asString2(entry?.id);
+    if (!id)
+      return [];
+    const alsoSatisfied = Array.isArray(entry?.also_satisfied) ? entry.also_satisfied.filter((category) => typeof category === "string") : [];
+    return [
+      {
+        id,
+        producer: asString2(entry?.producer),
+        category: asString2(entry?.category),
+        alsoSatisfied
+      }
+    ];
+  });
+}
+function parseInspectTerminal(payload) {
+  const response = asRecord3(payload);
+  if (!response)
+    return;
+  const kind = terminalKind(response);
+  if (!kind)
+    return;
+  const waitStamp = firstRecord(response.wait_stamp, response.waitStamp, response.blocking_wait_stamp);
+  const phaseSource = kind === "FRESH" ? waitStamp ?? response : response;
+  const phases = parseInspectPhaseEntries(phaseSource.phases ?? response.completed_phases ?? response.completedPhases);
+  if (kind !== "PHASE-FAILED") {
+    return {
+      kind,
+      phases,
+      waitStampText: kind === "FRESH" ? firstString(waitStamp?.text, waitStamp?.human_text) : undefined
+    };
+  }
+  const failedPhaseRecord = asRecord3(response.failed_phase);
+  const failedPhaseId = firstString(failedPhaseRecord?.id, response.failed_phase);
+  const failedPhase = failedPhaseId ? parseInspectPhaseEntries([
+    {
+      id: failedPhaseId,
+      producer: firstString(failedPhaseRecord?.producer, response.failed_phase_producer, response.producer),
+      category: firstString(failedPhaseRecord?.category, response.failed_phase_category, response.category)
+    }
+  ])[0] : undefined;
+  return {
+    kind,
+    phases,
+    failedPhase,
+    failureReason: asString2(response.failure_reason),
+    failureDetail: asString2(response.failure_detail)
+  };
+}
+function formatPhase(entry) {
+  const details = [
+    entry.producer ? `producer: ${entry.producer}` : undefined,
+    entry.category ? `category: ${entry.category}` : undefined,
+    entry.alsoSatisfied.length > 0 ? `also satisfied: ${entry.alsoSatisfied.join(", ")}` : undefined
+  ].filter((detail) => Boolean(detail));
+  return details.length > 0 ? `${entry.id} (${details.join("; ")})` : entry.id;
+}
+function renderInspectTerminal(terminal, serverText) {
+  const lines = [terminal.kind];
+  if (terminal.kind === "FRESH") {
+    lines.push(`wait-stamp: ${terminal.waitStampText ?? "not supplied"}`);
+  }
+  if (terminal.kind === "PHASE-FAILED") {
+    if (terminal.failedPhase)
+      lines.push(`failed phase: ${formatPhase(terminal.failedPhase)}`);
+    lines.push(`failure reason: ${terminal.failureReason ?? "not supplied"}`);
+    if (terminal.failureDetail)
+      lines.push(`failure detail: ${terminal.failureDetail}`);
+  }
+  lines.push(terminal.phases.length > 0 ? `completed phases:
+${terminal.phases.map((phase) => `- ${formatPhase(phase)}`).join(`
+`)}` : "completed phases: none");
+  if (serverText?.trim())
+    lines.push(serverText);
+  return lines.join(`
+`);
 }
 function diagnosticsSummaryPart(summary) {
   const section = asRecord3(summary?.diagnostics);
@@ -37712,31 +37947,9 @@ function diagnosticsSummaryPart(summary) {
   const warnings = asNumber2(section.warnings);
   const info = asNumber2(section.info);
   const hints = asNumber2(section.hints);
-  const hasCounts = [errors3, warnings, info, hints].some((value) => value !== undefined);
-  const counts = `${errors3 ?? 0} errors/${warnings ?? 0} warnings/${info ?? 0} info/${hints ?? 0} hints`;
-  const status = asString2(section.status);
-  const provisionalCounts = asRecord3(section.provisional_counts);
-  const provisionalValues = provisionalCounts ? [
-    asNumber2(provisionalCounts.errors),
-    asNumber2(provisionalCounts.warnings),
-    asNumber2(provisionalCounts.info),
-    asNumber2(provisionalCounts.hints)
-  ] : [];
-  const provisionalText = provisionalCounts ? ` (${provisionalValues[0] ?? 0} errors/${provisionalValues[1] ?? 0} warnings/${provisionalValues[2] ?? 0} info/${provisionalValues[3] ?? 0} hints)` : "";
-  const provisionalFraming = `provisional — analyzer not ready; counts excluded from E/W${provisionalText}`;
-  if (status === "pending") {
-    return `diagnostics ${provisionalFraming} — still pending (servers: ${diagnosticsServerSummary(section)}); wait for the LSP update and use the next normal aft_inspect, not repeated polling`;
-  }
-  if (status === "incomplete") {
-    return `diagnostics ${provisionalFraming} (incomplete — servers: ${diagnosticsServerSummary(section)})`;
-  }
-  if (provisionalCounts) {
-    return `diagnostics ${provisionalFraming}`;
-  }
-  if (hasCounts) {
-    return `diagnostics ${counts}`;
-  }
-  return;
+  if (![errors3, warnings, info, hints].some((value) => value !== undefined))
+    return;
+  return `diagnostics ${errors3 ?? 0} errors/${warnings ?? 0} warnings/${info ?? 0} info/${hints ?? 0} hints`;
 }
 function diagnosticLocation(diagnostic) {
   const file2 = asString2(diagnostic.file) ?? "(unknown file)";
@@ -37748,36 +37961,28 @@ function diagnosticLocation(diagnostic) {
     return `${file2}:${line}`;
   return `${file2}:${line}:${column}`;
 }
-function diagnosticsDetailSection(details, summary) {
+function diagnosticsDetailSection(details) {
   const diagnostics = asRecords2(details?.diagnostics);
   if (diagnostics.length === 0)
     return;
-  const diagnosticsSummary = asRecord3(summary?.diagnostics);
-  const provisional = asString2(diagnosticsSummary?.status) === "pending" || asString2(diagnosticsSummary?.status) === "incomplete" || asRecord3(diagnosticsSummary?.provisional_counts) !== undefined;
-  const lines = [
-    provisional ? "diagnostics (provisional — analyzer not ready; counts excluded from E/W)" : "diagnostics"
-  ];
-  for (const diagnostic of diagnostics) {
-    const severity = asString2(diagnostic.severity) ?? "information";
-    const message = asString2(diagnostic.message) ?? "(no message)";
-    const source = asString2(diagnostic.source);
-    const suffix = source ? ` [${source}]` : "";
-    lines.push(`- ${diagnosticLocation(diagnostic)} ${severity} ${message}${suffix}`);
-  }
-  return lines.join(`
+  return [
+    "diagnostics",
+    ...diagnostics.map((diagnostic) => {
+      const severity = asString2(diagnostic.severity) ?? "information";
+      const message = asString2(diagnostic.message) ?? "(no message)";
+      const source = asString2(diagnostic.source);
+      return `- ${diagnosticLocation(diagnostic)} ${severity} ${message}${source ? ` [${source}]` : ""}`;
+    })
+  ].join(`
 `);
 }
 function countFrom(summary, key) {
-  const section = asRecord3(summary?.[key]);
-  return asNumber2(section?.count);
+  return asNumber2(asRecord3(summary?.[key])?.count);
 }
 function tier2SummaryPart(summary, key, label) {
   const section = asRecord3(summary?.[key]);
   const count = asNumber2(section?.count);
-  if (count !== undefined)
-    return `${label} ${count}`;
-  const status = asString2(section?.status);
-  return `${label} ${status ?? "unavailable"}`;
+  return count !== undefined ? `${label} ${count}` : `${label} unavailable`;
 }
 function shortDupOccurrence(entry) {
   const [path2] = entry.split(":");
@@ -37785,95 +37990,41 @@ function shortDupOccurrence(entry) {
 }
 function tier2TopPreview(summary, theme) {
   const lines = [];
-  const dup = asRecord3(summary?.duplicates);
-  const dupTop = Array.isArray(dup?.top) ? dup.top : [];
+  const dupTop = Array.isArray(asRecord3(summary?.duplicates)?.top) ? asRecord3(summary?.duplicates)?.top : [];
   for (const group of dupTop) {
     const record2 = asRecord3(group);
     const files = Array.isArray(record2?.files) ? record2.files : [];
     const cost = asNumber2(record2?.cost);
     if (files.length < 2)
       continue;
-    const a = shortDupOccurrence(String(files[0]));
-    const b = shortDupOccurrence(String(files[1]));
-    lines.push(`  dup ${a} ↔ ${b}${cost !== undefined ? ` (${cost})` : ""}`);
+    lines.push(`  dup ${shortDupOccurrence(String(files[0]))} ↔ ${shortDupOccurrence(String(files[1]))}${cost !== undefined ? ` (${cost})` : ""}`);
   }
   for (const [key, label] of [
     ["dead_code", "dead"],
     ["unused_exports", "unused"]
   ]) {
-    const section = asRecord3(summary?.[key]);
-    const top = Array.isArray(section?.top) ? section.top : [];
+    const top = Array.isArray(asRecord3(summary?.[key])?.top) ? asRecord3(summary?.[key])?.top : [];
     for (const item of top) {
       const record2 = asRecord3(item);
       const file2 = asString2(record2?.file);
       const symbol2 = asString2(record2?.symbol);
-      if (!file2 || !symbol2)
-        continue;
-      lines.push(`  ${label} ${symbol2} (${file2.split("/").pop()})`);
+      if (file2 && symbol2)
+        lines.push(`  ${label} ${symbol2} (${file2.split("/").pop()})`);
     }
   }
-  if (lines.length === 0)
-    return;
-  return `${theme.fg("muted", "top findings:")}
+  return lines.length > 0 ? `${theme.fg("muted", "top findings:")}
 ${lines.join(`
-`)}`;
-}
-function tier2RefreshCategories(response) {
-  const scannerState = asRecord3(response.scanner_state);
-  const categories = new Set;
-  for (const key of ["pending_categories", "stale_categories"]) {
-    const values = scannerState?.[key];
-    if (!Array.isArray(values))
-      continue;
-    for (const category of values) {
-      if (typeof category === "string" && TIER2_INSPECT_CATEGORIES.has(category)) {
-        categories.add(category);
-      }
-    }
-  }
-  return [...categories];
-}
-function runPendingTier2Categories(bridge, categories, extCtx) {
-  const now = Date.now();
-  const running = runningTier2Categories.get(bridge) ?? new Set;
-  const lastTriggerAt = lastTier2TriggerAtByBridge.get(bridge) ?? new Map;
-  const toRun = categories.filter((category) => {
-    if (running.has(category))
-      return false;
-    const previousTriggerAt = lastTriggerAt.get(category);
-    return previousTriggerAt === undefined || previousTriggerAt + INSPECT_TIER2_MIN_TRIGGER_INTERVAL_MS <= now;
-  });
-  if (toRun.length === 0)
-    return;
-  for (const category of toRun) {
-    running.add(category);
-    lastTriggerAt.set(category, now);
-  }
-  runningTier2Categories.set(bridge, running);
-  lastTier2TriggerAtByBridge.set(bridge, lastTriggerAt);
-  callBridge(bridge, "inspect_tier2_run", { categories: toRun }, extCtx, {
-    transportTimeoutMs: INSPECT_TIER2_RUN_TIMEOUT_MS
-  }).catch(() => {}).finally(() => {
-    const active = runningTier2Categories.get(bridge);
-    if (!active)
-      return;
-    for (const category of toRun) {
-      active.delete(category);
-    }
-    if (active.size === 0) {
-      runningTier2Categories.delete(bridge);
-    }
-  });
+`)}` : undefined;
 }
 function buildInspectSections(payload, theme) {
+  const terminal = parseInspectTerminal(payload);
+  if (terminal)
+    return [renderInspectTerminal(terminal, asString2(asRecord3(payload)?.text))];
   const response = asRecord3(payload);
   if (!response)
     return [theme.fg("muted", "No inspect snapshot available.")];
   const summary = asRecord3(response.summary);
   const metrics = asRecord3(summary?.metrics);
-  const scannerState = asRecord3(response.scanner_state);
-  const stale = Array.isArray(scannerState?.stale_categories) ? scannerState.stale_categories.length : 0;
-  const pending = Array.isArray(scannerState?.pending_categories) ? scannerState.pending_categories.length : 0;
   const parts = [
     `todos ${countFrom(summary, "todos") ?? 0}`,
     diagnosticsSummaryPart(summary),
@@ -37884,9 +38035,6 @@ function buildInspectSections(payload, theme) {
     tier2SummaryPart(summary, "cycles", "cycles")
   ].filter((part) => Boolean(part));
   const sections = [theme.fg("accent", parts.join(" · "))];
-  if (stale > 0 || pending > 0) {
-    sections.push(theme.fg("warning", `scanner state: ${stale} stale · ${pending} pending. Treat stale_categories/pending_categories as stale or incomplete cache state. AFT schedules a Tier-2 refresh after its next idle or inspect-triggered background run; use one later normal aft_inspect after that refresh, not a polling loop`));
-  }
   const topPreview = tier2TopPreview(summary, theme);
   if (topPreview)
     sections.push(topPreview);
@@ -37894,7 +38042,7 @@ function buildInspectSections(payload, theme) {
   if (details) {
     const names = Object.keys(details);
     sections.push(names.length > 0 ? `details: ${names.join(", ")}` : theme.fg("muted", "No drill-down details returned."));
-    const diagnosticsDetails = diagnosticsDetailSection(details, summary);
+    const diagnosticsDetails = diagnosticsDetailSection(details);
     if (diagnosticsDetails)
       sections.push(diagnosticsDetails);
   }
@@ -37910,15 +38058,19 @@ function renderInspectCall(args, theme, context) {
   return renderToolCall("inspect", summary ? theme.fg("toolOutput", summary) : undefined, theme, context);
 }
 function renderInspectResult(result, theme, context) {
+  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(extractStructuredPayload(result), theme), context);
+  return renderSections(buildInspectSections(payload, theme), context);
 }
 function registerInspectTool(pi, ctx) {
   pi.registerTool({
     name: "aft_inspect",
     label: "inspect",
-    description: "Codebase health snapshot. One call returns summary stats for: TODOs, diagnostics, file/symbol metrics, dead code, unused exports, code duplicates, and TS/JS import cycles. Pass `sections` for per-category drill-down details.\n\n" + "Categories run in tiers — Tier 1 (todos, metrics) return synchronously from cache. Tier 2 (dead_code, unused_exports, duplicates, cycles) waits for a fresh reuse scan up to a short deadline; if a category is still scanning the response reports `complete: false` with `pending_categories: [...]` rather than a fabricated clean count. Pi may still trigger a deduped background warmup for categories that remain pending. Rust module cycles are out of scope for `cycles`.\n\n" + `Use when: starting work on unfamiliar code, after multi-edit batches to check diagnostics, before a refactor, before review, or to verify cleanup completeness.
+    description: "Blocking-fresh codebase health inspection. Each call completes current analysis and produces exactly one terminal result: FRESH includes a wait-stamp and completed phases; INTERRUPTED and PHASE-FAILED retain completed phases, with PHASE-FAILED also reporting its phase attribution and failure reason. `sections` selects drill-down detail, not the categories verified.\n\n" + "Use `scope=` to narrow returned results. It does not reduce the fresh verification work. Passive health changes use the alert channel; do not infer inspect completion from that channel.\n\n" + `Use when: starting work on unfamiliar code, after multi-edit batches to check diagnostics, before a refactor, before review, or to verify cleanup completeness.
 
 ` + "Treat `dead_code` as a hint, not proof: reachability is call-based, so symbols reached only via method dispatch or referenced only in type position may be false positives — verify before deleting.",
     parameters: InspectParams,
@@ -37934,13 +38086,12 @@ function registerInspectTool(pi, ctx) {
         rawArgs.scope = scope;
       if (topK !== undefined)
         rawArgs.topK = topK;
-      const response = await callToolCall(bridge, "inspect", rawArgs, extCtx, {
-        keepBridgeOnTimeout: true
-      });
-      if (response.success === false) {
+      const response = await callToolCall(bridge, "inspect", rawArgs, extCtx);
+      const terminal = parseInspectTerminal(response);
+      if (terminal)
+        return textResult(renderInspectTerminal(terminal, response.text), response);
+      if (response.success === false)
         throw new Error(response.text || response.message || "inspect failed");
-      }
-      runPendingTier2Categories(bridge, tier2RefreshCategories(response), extCtx);
       return textResult(response.text, response);
     },
     renderCall(args, theme, context) {
@@ -39100,7 +39251,7 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.50.3";
+var ANNOUNCEMENT_VERSION = "0.51.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).",
@@ -39463,12 +39614,7 @@ ${lines}
   pi.on("tool_result", async (event, extCtx) => {
     const sessionID = resolveSessionId(extCtx);
     const bgContent = await appendToolResultBgCompletions({ ctx, directory: extCtx.cwd, sessionID }, event.content);
-    let content = bgContent ?? event.content;
-    const isInspect = typeof event.details === "object" && event.details !== null && "scanner_state" in event.details;
-    const activeBridge = pool.getActiveBridgeForRoot(extCtx.cwd);
-    const bar = statusBarBlockForSession(sessionID, activeBridge?.getStatusBar(), isInspect);
-    if (bar)
-      content = [...content, { type: "text", text: bar }];
+    const content = bgContent ?? event.content;
     if (content === event.content)
       return;
     return { content, details: event.details, isError: event.isError };