@cortexkit/aft-opencode 0.34.0 → 0.35.1

package/dist/config.d.ts

@@ -7,8 +7,8 @@ export declare const ConfigureWarningsDeliveryEnum: z.ZodEnum<{
 }>;
 export type ConfigureWarningsDelivery = z.infer<typeof ConfigureWarningsDeliveryEnum>;
 export declare const LspServerSchema: z.ZodObject<{
-    extensions: z.ZodArray<z.ZodString>;
-    binary: z.ZodString;
+    extensions: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    binary: z.ZodOptional<z.ZodString>;
     args: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
     root_markers: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
     disabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -101,8 +101,8 @@ export declare const AftConfigSchema: z.ZodObject<{
     }, z.core.$strip>>;
     lsp: z.ZodOptional<z.ZodObject<{
         servers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-            extensions: z.ZodArray<z.ZodString>;
-            binary: z.ZodString;
+            extensions: z.ZodOptional<z.ZodArray<z.ZodString>>;
+            binary: z.ZodOptional<z.ZodString>;
             args: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
             root_markers: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
             disabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -141,8 +141,10 @@ export type AftConfig = z.infer<typeof AftConfigSchema>;
 export type LspServerConfig = z.infer<typeof LspServerSchema>;
 export interface ConfigureLspServer {
     id: string;
-    extensions: string[];
-    binary: string;
+    /** Omitted when overriding a built-in server to inherit its extensions. */
+    extensions?: string[];
+    /** Omitted when overriding a built-in server to inherit its binary. */
+    binary?: string;
     args: string[];
     root_markers: string[];
     disabled: boolean;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA2MlD;;;;;;;;;;;;;;;;;GAiBG;AAQH,QAAA,MAAM,MAAM,EAAE,MAA6D,CAAC;AAs0B5E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA6MlD;;;;;;;;;;;;;;;;;GAiBG;AAQH,QAAA,MAAM,MAAM,EAAE,MAA6D,CAAC;AA80B5E,eAAe,MAAM,CAAC"}

package/dist/index.js

@@ -11593,11 +11593,81 @@ function error(message, meta) {
     console.error(`[aft-bridge] ERROR: ${message}`);
   }
 }
+// ../aft-bridge/dist/bash-hints.js
+var CONFLICT_HINT = `
+
+[Hint] Use aft_conflicts to see all conflict regions across files in a single call.`;
+var GREP_HINT = `
+
+[Hint] Use the grep tool instead of bash for faster indexed search.`;
+function maybeAppendConflictsHint(output) {
+  if (!output.includes("Automatic merge failed; fix conflicts"))
+    return output;
+  if (!/^CONFLICT \(|^error: could not apply /m.test(output))
+    return output;
+  return output + CONFLICT_HINT;
+}
+function maybeAppendGrepHint(output, command) {
+  const probe = command !== undefined ? command : output.slice(0, 300).split(`
+`)[0] ?? "";
+  if (!/\b(rg|grep)\s/.test(probe))
+    return output;
+  return output + GREP_HINT;
+}
 // ../aft-bridge/dist/bridge.js
 import { spawn } from "node:child_process";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { StringDecoder } from "node:string_decoder";
+
+// ../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
+  };
+}
+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;
+}
+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) {
+  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}]`;
+}
+function statusBarLine(counts) {
+  return `
+
+${formatStatusBar(counts)}`;
+}
+
+// ../aft-bridge/dist/bridge.js
 var DEFAULT_BRIDGE_TIMEOUT_MS = 30000;
 var BRIDGE_HANG_TIMEOUT_THRESHOLD = 2;
 var SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS = 5000;
@@ -11708,6 +11778,7 @@ class BinaryBridge {
   configureWarningClients = new Map;
   restartResetTimer = null;
   lastChildActivityAt = 0;
+  lastStatusBar;
   consecutiveRequestTimeouts = 0;
   errorPrefix;
   logger;
@@ -12085,6 +12156,7 @@ class BinaryBridge {
     this.spawnProcess(triggeringSessionId);
   }
   spawnProcess(triggeringSessionId) {
+    this.lastStatusBar = undefined;
     if (triggeringSessionId) {
       this.sessionLogVia(triggeringSessionId, `Spawning binary: ${this.binaryPath} (cwd: ${this.cwd})`);
     } else {
@@ -12286,6 +12358,7 @@ class BinaryBridge {
           clearTimeout(entry.timer);
           this.consecutiveRequestTimeouts = 0;
           this.scheduleRestartCountReset();
+          this.captureStatusBar(response);
           entry.resolve(response);
         } else if (typeof response.type === "string") {
           this.logVia(`Ignoring unknown stdout push frame type: ${response.type}`);
@@ -12295,6 +12368,14 @@ class BinaryBridge {
       }
     }
   }
+  captureStatusBar(response) {
+    const parsed = parseStatusBarCounts(response.status_bar);
+    if (parsed)
+      this.lastStatusBar = parsed;
+  }
+  getStatusBar() {
+    return this.lastStatusBar;
+  }
   handleTimeout(triggeringSessionId) {
     this.consecutiveRequestTimeouts = 0;
     this.rejectAllPending(new Error(`${this.errorPrefix} bridge killed during sibling timeout — request aborted`));
@@ -12659,6 +12740,20 @@ async function fetchLatestTag() {
     clearTimeout(timeout);
   }
 }
+// ../aft-bridge/dist/jsonc.js
+function stripJsoncSymbols(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => stripJsoncSymbols(item));
+  }
+  if (value !== null && typeof value === "object") {
+    const out = {};
+    for (const [key, val] of Object.entries(value)) {
+      out[key] = stripJsoncSymbols(val);
+    }
+    return out;
+  }
+  return value;
+}
 // ../aft-bridge/dist/migration.js
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync4, mkdirSync as mkdirSync4 } from "node:fs";
@@ -12717,7 +12812,7 @@ function markAnnouncementSeen(storageRoot, harness, currentVersion) {
 
 // ../aft-bridge/dist/resolver.js
 import { execSync } from "node:child_process";
-import { chmodSync as chmodSync2, copyFileSync as copyFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync3, renameSync as renameSync3, unlinkSync as unlinkSync2 } from "node:fs";
+import { chmodSync as chmodSync2, closeSync as closeSync2, copyFileSync as copyFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync3, openSync as openSync2, readSync, renameSync as renameSync3, unlinkSync as unlinkSync2 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { homedir as homedir3 } from "node:os";
 import { join as join4 } from "node:path";
@@ -12798,6 +12893,37 @@ function probeBinaryCandidate(binaryPath, source, expectedVersion) {
 function parsePathLookupOutput(output) {
   return output.split(/\r?\n/).map((candidate) => candidate.trim()).filter(Boolean);
 }
+function isNativeExecutable(binaryPath) {
+  let fd = null;
+  try {
+    fd = openSync2(binaryPath, "r");
+    const buf = Buffer.alloc(4);
+    const read = readSync(fd, buf, 0, 4, 0);
+    if (read < 2)
+      return false;
+    const b0 = buf[0];
+    const b1 = buf[1];
+    if (b0 === 35 && b1 === 33)
+      return false;
+    const m32 = buf.readUInt32BE(0);
+    const machO = new Set([4277009102, 4277009103, 3472551422, 3489328638, 3405691582]);
+    if (read >= 4 && machO.has(m32))
+      return true;
+    if (read >= 4 && m32 === 2135247942)
+      return true;
+    if (b0 === 77 && b1 === 90)
+      return true;
+    return false;
+  } catch {
+    return false;
+  } finally {
+    if (fd !== null) {
+      try {
+        closeSync2(fd);
+      } catch {}
+    }
+  }
+}
 function platformKey(platform = process.platform, arch = process.arch) {
   const archMap = PLATFORM_ARCH_MAP[platform];
   if (!archMap) {
@@ -12851,6 +12977,10 @@ function findBinarySync(expectedVersion) {
       stdio: ["pipe", "pipe", "pipe"]
     }).trim();
     for (const candidate of parsePathLookupOutput(result)) {
+      if (!isNativeExecutable(candidate)) {
+        warn(`PATH binary at ${candidate} is not a native executable (script shim?); skipping`);
+        continue;
+      }
       const usable = probeBinaryCandidate(candidate, "PATH", expectedVersion);
       if (usable)
         return usable;
@@ -13000,7 +13130,7 @@ async function ensureStorageMigrated(opts) {
 // ../aft-bridge/dist/onnx-runtime.js
 import { execFileSync } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
-import { chmodSync as chmodSync3, closeSync as closeSync2, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync5, lstatSync, mkdirSync as mkdirSync5, openSync as openSync2, readdirSync, readFileSync as readFileSync3, readlinkSync, realpathSync, rmSync as rmSync2, statSync as statSync2, symlinkSync, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { chmodSync as chmodSync3, closeSync as closeSync3, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync5, lstatSync, mkdirSync as mkdirSync5, openSync as openSync3, readdirSync, readFileSync as readFileSync3, readlinkSync, realpathSync, rmSync as rmSync2, statSync as statSync2, symlinkSync, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { basename, dirname as dirname3, isAbsolute, join as join6, relative, resolve, win32 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
@@ -13575,13 +13705,13 @@ function sha256File(path) {
 function acquireLock(lockPath) {
   const tryClaim = () => {
     try {
-      const fd = openSync2(lockPath, "wx");
+      const fd = openSync3(lockPath, "wx");
       try {
         writeFileSync2(fd, `${process.pid}
 ${new Date().toISOString()}
 `);
       } finally {
-        closeSync2(fd);
+        closeSync3(fd);
       }
       return true;
     } catch (err) {
@@ -13717,7 +13847,8 @@ class BridgePool {
       onBashLongRunning: options.onBashLongRunning,
       onBashPatternMatch: options.onBashPatternMatch,
       errorPrefix: options.errorPrefix,
-      logger: options.logger
+      logger: options.logger,
+      childEnv: options.childEnv
     };
     this.configOverrides = configOverrides;
     if (Number.isFinite(this.idleTimeoutMs)) {
@@ -13850,6 +13981,9 @@ class BridgePool {
   _testGetConfigOverrides() {
     return { ...this.configOverrides };
   }
+  _testGetBridgeOptions() {
+    return { ...this.bridgeOptions };
+  }
 }
 function normalizeKey(projectRoot) {
   const stripped = projectRoot.replace(/[/\\]+$/, "");
@@ -14897,10 +15031,10 @@ function formatDuration(completion) {
 }
 
 // src/config.ts
-var import_comment_json = __toESM(require_src2(), 1);
 import { existsSync as existsSync6, readFileSync as readFileSync4, renameSync as renameSync4, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { join as join8 } from "node:path";
+var import_comment_json = __toESM(require_src2(), 1);
 
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -28473,8 +28607,8 @@ var LspExtensionSchema = exports_external.string().trim().min(1).refine((value)
   message: "Extension must include characters other than leading dots"
 });
 var LspServerEntrySchema = exports_external.object({
-  extensions: exports_external.array(LspExtensionSchema).min(1),
-  binary: exports_external.string().trim().min(1),
+  extensions: exports_external.array(LspExtensionSchema).min(1).optional(),
+  binary: exports_external.string().trim().min(1).optional(),
   args: exports_external.array(exports_external.string()).optional().default([]),
   root_markers: exports_external.array(exports_external.string().trim().min(1)).optional().default([".git"]),
   disabled: exports_external.boolean().optional().default(false),
@@ -28579,12 +28713,16 @@ function resolveLspConfigForConfigure(config2) {
   const servers = Object.entries(config2.lsp?.servers ?? {}).map(([id, server]) => {
     const entry = {
       id,
-      extensions: server.extensions.map(normalizeLspExtension),
-      binary: server.binary,
       args: server.args,
       root_markers: server.root_markers,
       disabled: server.disabled
     };
+    if (server.extensions && server.extensions.length > 0) {
+      entry.extensions = server.extensions.map(normalizeLspExtension);
+    }
+    if (server.binary) {
+      entry.binary = server.binary;
+    }
     if (server.env && Object.keys(server.env).length > 0) {
       entry.env = server.env;
     }
@@ -28900,14 +29038,15 @@ function loadConfigFromPath(configPath) {
     const content = readFileSync4(configPath, "utf-8");
     const rawConfig = import_comment_json.parse(content);
     migrateRawConfig(rawConfig, configPath, { log: log2, warn: warn2 });
-    const result = AftConfigSchema.safeParse(rawConfig);
+    const cleanConfig = stripJsoncSymbols(rawConfig);
+    const result = AftConfigSchema.safeParse(cleanConfig);
     if (result.success) {
       log2(`Config loaded from ${configPath}`);
       return result.data;
     }
     const errorMsg = result.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join(", ");
     warn2(`Config validation error in ${configPath}: ${errorMsg}`);
-    return parseConfigPartially(rawConfig);
+    return parseConfigPartially(cleanConfig);
   } catch (err) {
     const errorMsg = err instanceof Error ? err.message : String(err);
     error2(`Error loading config from ${configPath}: ${errorMsg}`);
@@ -29612,10 +29751,10 @@ async function flushConfigureWarningsOnIdle(sessionId) {
 
 // src/hooks/auto-update-checker/index.ts
 import {
-  closeSync as closeSync3,
+  closeSync as closeSync4,
   existsSync as existsSync10,
   mkdirSync as mkdirSync6,
-  openSync as openSync3,
+  openSync as openSync4,
   readFileSync as readFileSync8,
   renameSync as renameSync5,
   rmSync as rmSync4,
@@ -30166,7 +30305,7 @@ function claimCheckSlot(storageDir, intervalMs) {
     const lockPath = `${file2}.lock`;
     let lockFd;
     try {
-      lockFd = openSync3(lockPath, "wx");
+      lockFd = openSync4(lockPath, "wx");
       writeFileSync6(lockFd, JSON.stringify({ pid: process.pid, startedMs: Date.now() }));
     } catch (err) {
       if (err.code !== "EEXIST") {
@@ -30177,7 +30316,7 @@ function claimCheckSlot(storageDir, intervalMs) {
     const lock = {
       release: () => {
         try {
-          closeSync3(lockFd);
+          closeSync4(lockFd);
         } catch {}
         rmSync4(lockPath, { force: true });
       }
@@ -30307,9 +30446,9 @@ import { join as join15 } from "node:path";
 
 // src/lsp-cache.ts
 import {
-  closeSync as closeSync4,
+  closeSync as closeSync5,
   mkdirSync as mkdirSync7,
-  openSync as openSync4,
+  openSync as openSync5,
   readFileSync as readFileSync9,
   statSync as statSync4,
   unlinkSync as unlinkSync5,
@@ -30402,13 +30541,13 @@ function acquireInstallLock(lockKey) {
   const lock = lockPath(lockKey);
   const tryClaim = () => {
     try {
-      const fd = openSync4(lock, "wx");
+      const fd = openSync5(lock, "wx");
       try {
         writeFileSync7(fd, `${process.pid}
 ${new Date().toISOString()}
 `);
       } finally {
-        closeSync4(fd);
+        closeSync5(fd);
       }
       return true;
     } catch (err) {
@@ -32015,29 +32154,6 @@ function normalizeToolMap(tools) {
   }
   return tools;
 }
-
-// src/shared/bash-hints.ts
-var CONFLICT_HINT = `
-
-[Hint] Use aft_conflicts to see all conflict regions across files in a single call.`;
-var GREP_HINT = `
-
-[Hint] Use the grep tool instead of bash for faster indexed search.`;
-function maybeAppendConflictsHint(output) {
-  if (!output.includes("Automatic merge failed; fix conflicts"))
-    return output;
-  if (!/^CONFLICT \(|^error: could not apply /m.test(output))
-    return output;
-  return output + CONFLICT_HINT;
-}
-function maybeAppendGrepHint(output) {
-  const firstLine = output.slice(0, 300).split(`
-`)[0] ?? "";
-  if (!/\b(rg|grep)\s/.test(firstLine))
-    return output;
-  return output + GREP_HINT;
-}
-
 // src/shared/pty-cache.ts
 var import_headless = __toESM(require_xterm_headless(), 1);
 import * as fs2 from "node:fs/promises";
@@ -32631,6 +32747,22 @@ function registerShutdownCleanup(fn) {
   };
 }
 
+// src/status-bar-inject.ts
+var emitStateBySession = new Map;
+function statusBarSuffixForSession(sessionID, counts) {
+  if (!counts)
+    return "";
+  let state = emitStateBySession.get(sessionID);
+  if (!state) {
+    state = createStatusBarEmitState();
+    emitStateBySession.set(sessionID, state);
+  }
+  return shouldEmitStatusBar(state, counts) ? statusBarLine(counts) : "";
+}
+function clearStatusBarSession(sessionID) {
+  emitStateBySession.delete(sessionID);
+}
+
 // src/tools/ast.ts
 import { tool as tool3 } from "@opencode-ai/plugin";
 
@@ -36905,6 +37037,7 @@ function buildWorkflowHints(opts) {
   }
   if (hasInspect) {
     sections.push("**Codebase health & diagnostics**: AFT does not surface compile/type errors automatically after edits — pull them with `aft_inspect`. Run it after a batch of edits and before you run tests or commit, when starting in unfamiliar code, or before a refactor/review. One call summarizes diagnostics (compile/type errors), TODOs, metrics, dead code, unused exports, and duplicates; pass `sections` for focused drill-down and `scope` to actively pull diagnostics for a specific file or directory. Its diagnostics are a fast checkpoint, not the authority — a clean `tsc` / `cargo check` / `pyright` run is the real gate. Treat `stale_categories` as a genuine stale-cache signal while an async Tier 2 refresh catches up.");
+    sections.push("**AFT status bar**: tool results may end with a one-line health bar `[AFT E<errors> W<warnings> | D<dead-code> U<unused-exports> C<clone/dup-groups> | T<todos>]` — an IDE-style glance that appears when a count changes. `E`/`W` are live LSP diagnostics for files touched this session (your universal compile-error signal across every language with an LSP). A `~` before `D` means the dead-code/unused/dup counts predate your latest edit — run `aft_inspect` for current numbers and detail. When `E>0`, you likely just introduced errors; investigate before moving on.");
   }
   if (hasNavigate) {
     sections.push([
@@ -36984,13 +37117,14 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.34.0";
+var ANNOUNCEMENT_VERSION = "0.35.0";
 var ANNOUNCEMENT_FEATURES = [
-  "`aft_import` now supports 12 more languages (Solidity, Java, C#, PHP, Kotlin, Scala, Swift, Ruby, Lua, Perl, C/C++, Vue) — 17 total.",
-  "New YAML + Kubernetes/CRD support across outline, zoom, search, and ast_grep.",
-  "`aft_conflicts` takes an optional `path` to inspect any repo or git worktree, and names the repository it checked.",
-  "`.aftignore` (layered on `.gitignore`) plus ripgrep-style `grep` that searches an explicitly-named file even when ignored.",
-  "`aft_zoom` call-graph annotations are now opt-in (`callgraph: true`); `semantic.max_files` and `bash.foreground_wait_window_ms` are configurable."
+  "Leaner semantic indexing — local embedding now uses about half the CPU and a fraction of the peak memory, with no change to results and no re-index needed.",
+  "New IDE-style status bar on tool results — live LSP errors/warnings plus dead-code, unused-export, duplicate, and TODO counts at a glance.",
+  "`aft_inspect` is more accurate (dead-code reachability, duplicate collapse, ranked findings) and a background scheduler keeps its counts fresh during long sessions.",
+  "The TUI sidebar is now collapsible — click the `AFT` header to toggle a condensed view.",
+  "`npx @cortexkit/aft --version` reports CLI, binary, and per-harness versions; `doctor --issue` can scope its report to a single session.",
+  "New SCSS support and `.inc` files parsed as PHP."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/DSa65w8wuf";
 var plugin = async (input) => initializePluginForDirectory(input);
@@ -37398,6 +37532,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       const sessionID = extractSessionID(eventInput.event.properties);
       if ((eventType === "session.deleted" || eventType === "session.shutdown") && sessionID) {
         inspectTier2Idle.clear(sessionID);
+        clearStatusBarSession(sessionID);
         return;
       }
       if (eventType !== "session.idle")
@@ -37460,6 +37595,12 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       }
       const sessionDir = getSessionDirectoryCached(toolInput.sessionID) ?? input.directory;
       await appendInTurnBgCompletions({ ctx, directory: sessionDir, sessionID: toolInput.sessionID }, output);
+      if (output.output !== undefined) {
+        const activeBridge = ctx.pool.getActiveBridgeForRoot(sessionDir);
+        const suffix = statusBarSuffixForSession(toolInput.sessionID, activeBridge?.getStatusBar());
+        if (suffix)
+          output.output += suffix;
+      }
     },
     config: async (config2) => {
       if (!config2 || typeof config2 !== "object")

package/dist/shared/bash-hints.d.ts

@@ -1,24 +1,2 @@
-/**
- * Append the `aft_conflicts` hint when the output indicates a real git merge
- * or rebase produced conflicts.
- *
- * Gated on BOTH:
- *  - the "Automatic merge failed; fix conflicts" marker, AND
- *  - a git-conflict signal (`CONFLICT (...)` line or `error: could not apply`)
- *
- * Both conditions are required because `aft_conflicts` calls `git ls-files -u`,
- * which fails with "not a git repository" outside a git working tree. The
- * marker string can legitimately appear in docs, READMEs, test fixtures, and
- * grep output, so we cannot key off it alone — a false-positive hint sends
- * agents into a confusing error.
- */
-export declare function maybeAppendConflictsHint(output: string): string;
-/**
- * Append the grep-tool hint when the bash command was a grep/rg invocation.
- *
- * Detected by examining the FIRST LINE of output (which is the echoed command
- * line on most shells in foreground mode). We cap the slice at 300 chars so
- * a single huge first line doesn't slow this hook.
- */
-export declare function maybeAppendGrepHint(output: string): string;
+export { maybeAppendConflictsHint, maybeAppendGrepHint } from "@cortexkit/aft-bridge";
 //# sourceMappingURL=bash-hints.d.ts.map

package/dist/shared/bash-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash-hints.d.ts","sourceRoot":"","sources":["../../src/shared/bash-hints.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAM/D;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAI1D"}
+{"version":3,"file":"bash-hints.d.ts","sourceRoot":"","sources":["../../src/shared/bash-hints.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/status-bar-inject.d.ts

@@ -0,0 +1,11 @@
+import { type StatusBarCounts } from "@cortexkit/aft-bridge";
+/**
+ * Decide whether to surface the bar for this session+counts and, if so, return
+ * the line to append to the tool output. Returns `""` when suppressed
+ * (unchanged since last emit and heartbeat not elapsed) or when counts are
+ * absent (no inspect scan has populated Tier-2 yet).
+ */
+export declare function statusBarSuffixForSession(sessionID: string, counts: StatusBarCounts | undefined): string;
+/** Drop a session's emit state (on session delete/shutdown). */
+export declare function clearStatusBarSession(sessionID: string): void;
+//# sourceMappingURL=status-bar-inject.d.ts.map

package/dist/status-bar-inject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"status-bar-inject.d.ts","sourceRoot":"","sources":["../src/status-bar-inject.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAI/B;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe,GAAG,SAAS,GAClC,MAAM,CAQR;AAED,gEAAgE;AAChE,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE7D"}

package/dist/tui.js

@@ -1,7 +1,7 @@
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var version = "0.34.0";
+var version = "0.35.1";
 
 // src/shared/rpc-client.ts
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
@@ -560,6 +560,37 @@ var SectionHeader = (props) => /* @__PURE__ */ jsxDEV("box", {
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this)
 }, undefined, false, undefined, this);
+function toneColor(theme, tone) {
+  switch (tone) {
+    case "ok":
+      return theme.success ?? theme.accent;
+    case "warn":
+      return theme.warning;
+    case "err":
+      return theme.error;
+    default:
+      return theme.textMuted;
+  }
+}
+var CollapsedRow = (props) => /* @__PURE__ */ jsxDEV("box", {
+  width: "100%",
+  flexDirection: "row",
+  justifyContent: "space-between",
+  children: [
+    /* @__PURE__ */ jsxDEV("text", {
+      fg: props.theme.textMuted,
+      children: props.label
+    }, undefined, false, undefined, this),
+    props.children
+  ]
+}, undefined, true, undefined, this);
+function collapsedCompressionValue(compression) {
+  if (!compression || compression.project.events <= 0)
+    return null;
+  const { savings_tokens, original_tokens } = compression.project;
+  const pct = original_tokens > 0 ? Math.round(savings_tokens / original_tokens * 100) : 0;
+  return `${formatCount(savings_tokens)} / ${pct}%`;
+}
 function resolveTuiStorageDir() {
   return resolveCortexKitStorageRoot();
 }
@@ -579,8 +610,12 @@ function scopedSidebarSnapshot(scoped, directory, sessionID) {
     return null;
   return scoped.snapshot;
 }
+function shouldSuppressUninitializedDowngrade(incomingCacheRole, haveInitializedForContext) {
+  return incomingCacheRole === "not_initialized" && haveInitializedForContext;
+}
 var SidebarContent = (props) => {
   const [status, setStatus] = createSignal(null);
+  const [collapsed, setCollapsed] = createSignal(false);
   let inflight = null;
   let generation = 0;
   let debounceTimer;
@@ -637,6 +672,10 @@ var SidebarContent = (props) => {
         return;
       if (response && response.success !== false) {
         const snapshot = coerceAftStatus(response);
+        const current = status();
+        const haveGoodForContext = current !== null && current.directory === directory && current.sessionID === sid && current.snapshot.cache_role !== "not_initialized";
+        if (shouldSuppressUninitializedDowngrade(snapshot.cache_role, haveGoodForContext))
+          return;
         setStatus({ directory, sessionID: sid, snapshot });
         requestRender();
       }
@@ -749,6 +788,10 @@ var SidebarContent = (props) => {
         flexDirection: "row",
         justifyContent: "space-between",
         alignItems: "center",
+        onMouseDown: () => {
+          if (!notInitialized())
+            setCollapsed((x) => !x);
+        },
         children: [
           /* @__PURE__ */ jsxDEV("box", {
             flexDirection: "row",
@@ -761,8 +804,11 @@ var SidebarContent = (props) => {
                 children: /* @__PURE__ */ jsxDEV("text", {
                   fg: props.theme.background,
                   children: /* @__PURE__ */ jsxDEV("b", {
-                    children: "AFT"
-                  }, undefined, false, undefined, this)
+                    children: [
+                      notInitialized() ? "" : collapsed() ? "▶ " : "▼ ",
+                      "AFT"
+                    ]
+                  }, undefined, true, undefined, this)
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
               s()?.degraded && /* @__PURE__ */ jsxDEV("box", {
@@ -807,7 +853,39 @@ var SidebarContent = (props) => {
           children: s().message || "AFT bridge is now spawned lazily, information here will be populated after first tool call."
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      !notInitialized() && /* @__PURE__ */ jsxDEV(Fragment, {
+      !notInitialized() && collapsed() && /* @__PURE__ */ jsxDEV("box", {
+        width: "100%",
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsxDEV(CollapsedRow, {
+            theme: props.theme,
+            label: "Search Index",
+            children: /* @__PURE__ */ jsxDEV("text", {
+              fg: toneColor(props.theme, searchStatus().tone),
+              children: "●"
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV(CollapsedRow, {
+            theme: props.theme,
+            label: "Semantic Index",
+            children: /* @__PURE__ */ jsxDEV("text", {
+              fg: toneColor(props.theme, semanticStatus().tone),
+              children: "●"
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this),
+          collapsedCompressionValue(s()?.compression) && /* @__PURE__ */ jsxDEV(CollapsedRow, {
+            theme: props.theme,
+            label: "Compression",
+            children: /* @__PURE__ */ jsxDEV("text", {
+              fg: props.theme.textMuted,
+              children: /* @__PURE__ */ jsxDEV("b", {
+                children: collapsedCompressionValue(s()?.compression)
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      !notInitialized() && !collapsed() && /* @__PURE__ */ jsxDEV(Fragment, {
         children: [
           /* @__PURE__ */ jsxDEV(SectionHeader, {
             theme: props.theme,
@@ -1018,7 +1096,12 @@ var StatusDialog = (props) => {
       if (controller.signal.aborted || requestGeneration !== pollGeneration)
         return;
       if (response.success !== false) {
-        setStatus(coerceAftStatus(response));
+        const snapshot = coerceAftStatus(response);
+        const current = status();
+        if (shouldSuppressUninitializedDowngrade(snapshot.cache_role, current !== null && current.cache_role !== "not_initialized")) {
+          return;
+        }
+        setStatus(snapshot);
         setError(null);
       }
     } catch {

package/dist/workflow-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA0FzE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAQjG"}
+{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+FzE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAQjG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -30,19 +30,19 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.34.0",
+    "@cortexkit/aft-bridge": "0.35.1",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^4.6.2",
     "undici": "^7.25.0",
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.34.0",
-    "@cortexkit/aft-darwin-x64": "0.34.0",
-    "@cortexkit/aft-linux-arm64": "0.34.0",
-    "@cortexkit/aft-linux-x64": "0.34.0",
-    "@cortexkit/aft-win32-arm64": "0.34.0",
-    "@cortexkit/aft-win32-x64": "0.34.0"
+    "@cortexkit/aft-darwin-arm64": "0.35.1",
+    "@cortexkit/aft-darwin-x64": "0.35.1",
+    "@cortexkit/aft-linux-arm64": "0.35.1",
+    "@cortexkit/aft-linux-x64": "0.35.1",
+    "@cortexkit/aft-win32-arm64": "0.35.1",
+    "@cortexkit/aft-win32-x64": "0.35.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.15.11",

package/src/shared/bash-hints.ts

@@ -1,45 +1,4 @@
-// Pure helpers for the bash-output hint nudges fired from `tool.execute.after`.
-//
-// These run on every bash result and append agent-visible "[Hint] ..." lines
-// that steer toward AFT tools. The functions return the new output string
-// (or the original string when no hint should fire) so the hook can compose
-// them without managing state.
-
-const CONFLICT_HINT =
-  "\n\n[Hint] Use aft_conflicts to see all conflict regions across files in a single call.";
-const GREP_HINT = "\n\n[Hint] Use the grep tool instead of bash for faster indexed search.";
-
-/**
- * Append the `aft_conflicts` hint when the output indicates a real git merge
- * or rebase produced conflicts.
- *
- * Gated on BOTH:
- *  - the "Automatic merge failed; fix conflicts" marker, AND
- *  - a git-conflict signal (`CONFLICT (...)` line or `error: could not apply`)
- *
- * Both conditions are required because `aft_conflicts` calls `git ls-files -u`,
- * which fails with "not a git repository" outside a git working tree. The
- * marker string can legitimately appear in docs, READMEs, test fixtures, and
- * grep output, so we cannot key off it alone — a false-positive hint sends
- * agents into a confusing error.
- */
-export function maybeAppendConflictsHint(output: string): string {
-  if (!output.includes("Automatic merge failed; fix conflicts")) return output;
-  // git merge prints "CONFLICT (content|file|...): ..." per file.
-  // git rebase / git am print "error: could not apply <sha>" per failed pick.
-  if (!/^CONFLICT \(|^error: could not apply /m.test(output)) return output;
-  return output + CONFLICT_HINT;
-}
-
-/**
- * Append the grep-tool hint when the bash command was a grep/rg invocation.
- *
- * Detected by examining the FIRST LINE of output (which is the echoed command
- * line on most shells in foreground mode). We cap the slice at 300 chars so
- * a single huge first line doesn't slow this hook.
- */
-export function maybeAppendGrepHint(output: string): string {
-  const firstLine = output.slice(0, 300).split("\n")[0] ?? "";
-  if (!/\b(rg|grep)\s/.test(firstLine)) return output;
-  return output + GREP_HINT;
-}
+// Bash-output hint nudges now live in the shared bridge package so both plugin
+// hosts use one implementation. Re-exported here to keep the existing OpenCode
+// import path stable.
+export { maybeAppendConflictsHint, maybeAppendGrepHint } from "@cortexkit/aft-bridge";

package/src/tui/index.tsx

@@ -17,6 +17,7 @@ import {
   createAftSidebarSlot,
   formatCompressionSidebarRows,
   resolveTuiStorageDir,
+  shouldSuppressUninitializedDowngrade,
 } from "./sidebar";
 
 // The TUI talks to the server plugin via AftRpcClient. The client reads the
@@ -160,7 +161,20 @@ const StatusDialog = (props: StatusDialogProps) => {
       );
       if (controller.signal.aborted || requestGeneration !== pollGeneration) return;
       if ((response as Record<string, unknown>).success !== false) {
-        setStatus(coerceAftStatus(response as Record<string, unknown>));
+        const snapshot = coerceAftStatus(response as Record<string, unknown>);
+        // Stale-while-revalidate: don't downgrade a good snapshot to a transient
+        // `not_initialized` (bridge mid-respawn / session-dir key miss) — it
+        // arrives as success:true and would blank the dialog until the next poll.
+        const current = status();
+        if (
+          shouldSuppressUninitializedDowngrade(
+            snapshot.cache_role,
+            current !== null && current.cache_role !== "not_initialized",
+          )
+        ) {
+          return;
+        }
+        setStatus(snapshot);
         setError(null);
       }
     } catch {

package/src/tui/sidebar.tsx

@@ -142,6 +142,43 @@ const SectionHeader = (props: { theme: TuiThemeCurrent; title: string; marginTop
   </box>
 );
 
+// Map a status tone to a theme color — used for the collapsed-view status dots.
+function toneColor(theme: TuiThemeCurrent, tone: "ok" | "warn" | "err" | "muted"): string {
+  switch (tone) {
+    case "ok":
+      return theme.success ?? theme.accent;
+    case "warn":
+      return theme.warning;
+    case "err":
+      return theme.error;
+    default:
+      return theme.textMuted;
+  }
+}
+
+// Collapsed-view row: label on the left, a status dot (or compact value) on the
+// right. Mirrors the expanded StatRow layout so the columns line up.
+const CollapsedRow = (props: { theme: TuiThemeCurrent; label: string; children: JSX.Element }) => (
+  <box width="100%" flexDirection="row" justifyContent="space-between">
+    <text fg={props.theme.textMuted}>{props.label}</text>
+    {props.children}
+  </box>
+);
+
+// Compact "saved / ratio" string for the collapsed Compression row — e.g.
+// "7.6M / 64%". Uses the local `formatCount` (not the aft-bridge token
+// formatter) so the TUI bundle doesn't pull the bridge barrel, which exports
+// URL-fetch helpers unsuitable for Bun's TUI runtime. Returns null when no
+// compression has been recorded yet.
+export function collapsedCompressionValue(
+  compression: StatusCompression | undefined,
+): string | null {
+  if (!compression || compression.project.events <= 0) return null;
+  const { savings_tokens, original_tokens } = compression.project;
+  const pct = original_tokens > 0 ? Math.round((savings_tokens / original_tokens) * 100) : 0;
+  return `${formatCount(savings_tokens)} / ${pct}%`;
+}
+
 // v0.27 moved AFT storage to the CortexKit root. TUI code must use a
 // lightweight local path helper rather than the shared bridge barrel, which
 // also exports URL-fetch helpers unsuitable for Bun's TUI runtime.
@@ -177,6 +214,22 @@ export function scopedSidebarSnapshot(
   return scoped.snapshot;
 }
 
+/**
+ * Stale-while-revalidate guard. A transient `not_initialized` snapshot (bridge
+ * mid-respawn after a binary swap, or a momentary session-dir key miss) arrives
+ * over RPC as `success: true`, so a naive `setStatus` would overwrite a good
+ * snapshot and collapse the panel to the lazy-bridge placeholder — the blank
+ * flicker that recovers on the next poll. Suppress the downgrade only when we
+ * already hold initialized data for the same context; never blocks the first
+ * real snapshot, and a genuine context switch clears separately.
+ */
+export function shouldSuppressUninitializedDowngrade(
+  incomingCacheRole: string | undefined,
+  haveInitializedForContext: boolean,
+): boolean {
+  return incomingCacheRole === "not_initialized" && haveInitializedForContext;
+}
+
 const SidebarContent = (props: {
   api: TuiPluginApi;
   sessionID: () => string;
@@ -184,6 +237,9 @@ const SidebarContent = (props: {
   pluginVersion: string;
 }) => {
   const [status, setStatus] = createSignal<ScopedSidebarStatus | null>(null);
+  // Collapsed/expanded toggle — local UI state (not persisted), mirroring
+  // OpenCode's native MCP sidebar section. Default expanded.
+  const [collapsed, setCollapsed] = createSignal(false);
   let inflight: {
     controller: AbortController;
     generation: number;
@@ -251,6 +307,16 @@ const SidebarContent = (props: {
       if (currentDirectory() !== directory || props.sessionID() !== sid) return;
       if (response && (response as Record<string, unknown>).success !== false) {
         const snapshot = coerceAftStatus(response as Record<string, unknown>);
+        // Stale-while-revalidate: keep the last-good snapshot instead of
+        // flickering to the lazy-bridge placeholder on a transient
+        // not_initialized. See shouldSuppressUninitializedDowngrade.
+        const current = status();
+        const haveGoodForContext =
+          current !== null &&
+          current.directory === directory &&
+          current.sessionID === sid &&
+          current.snapshot.cache_role !== "not_initialized";
+        if (shouldSuppressUninitializedDowngrade(snapshot.cache_role, haveGoodForContext)) return;
         setStatus({ directory, sessionID: sid, snapshot });
         requestRender();
       }
@@ -394,12 +460,27 @@ const SidebarContent = (props: {
       paddingLeft={1}
       paddingRight={1}
     >
-      {/* Header: AFT badge + binary version + degraded badge (when active) */}
-      <box flexDirection="row" justifyContent="space-between" alignItems="center">
+      {/* Header: triangle toggle + AFT badge + binary version + degraded badge.
+          Clicking the header row collapses/expands the panel (mirrors OpenCode's
+          native MCP sidebar section). Only interactive once initialized — the
+          lazy-bridge placeholder has nothing to collapse. */}
+      <box
+        flexDirection="row"
+        justifyContent="space-between"
+        alignItems="center"
+        onMouseDown={() => {
+          if (!notInitialized()) setCollapsed((x) => !x);
+        }}
+      >
         <box flexDirection="row" alignItems="center">
+          {/* Triangle lives inside the accent badge so the toggle reads as one
+              unit: "▶ AFT" / "▼ AFT". Hidden pre-init (nothing to collapse). */}
           <box paddingLeft={1} paddingRight={1} backgroundColor={props.theme.accent}>
             <text fg={props.theme.background}>
-              <b>AFT</b>
+              <b>
+                {notInitialized() ? "" : collapsed() ? "▶ " : "▼ "}
+                AFT
+              </b>
             </text>
           </box>
           {s()?.degraded && (
@@ -445,8 +526,29 @@ const SidebarContent = (props: {
         </box>
       )}
 
+      {/* Collapsed view — condensed status dots + compact compression. Shown
+          only when initialized AND collapsed. Three rows mirroring the section
+          order of the expanded grid. */}
+      {!notInitialized() && collapsed() && (
+        <box width="100%" flexDirection="column">
+          <CollapsedRow theme={props.theme} label="Search Index">
+            <text fg={toneColor(props.theme, searchStatus().tone)}>●</text>
+          </CollapsedRow>
+          <CollapsedRow theme={props.theme} label="Semantic Index">
+            <text fg={toneColor(props.theme, semanticStatus().tone)}>●</text>
+          </CollapsedRow>
+          {collapsedCompressionValue(s()?.compression) && (
+            <CollapsedRow theme={props.theme} label="Compression">
+              <text fg={props.theme.textMuted}>
+                <b>{collapsedCompressionValue(s()?.compression)}</b>
+              </text>
+            </CollapsedRow>
+          )}
+        </box>
+      )}
+
       {/* Search index */}
-      {!notInitialized() && (
+      {!notInitialized() && !collapsed() && (
         <>
           <SectionHeader theme={props.theme} title="Search Index" />
           <StatRow