@buildautomaton/cli 0.1.56 → 0.1.57

package/dist/cli.js

@@ -973,8 +973,8 @@ var require_command = __commonJS({
   "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js"(exports) {
     var EventEmitter2 = __require("node:events").EventEmitter;
     var childProcess2 = __require("node:child_process");
-    var path73 = __require("node:path");
-    var fs54 = __require("node:fs");
+    var path75 = __require("node:path");
+    var fs53 = __require("node:fs");
     var process8 = __require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1906,11 +1906,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path73.resolve(baseDir, baseName);
-          if (fs54.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path73.extname(baseName))) return void 0;
+          const localBin = path75.resolve(baseDir, baseName);
+          if (fs53.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path75.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs54.existsSync(`${localBin}${ext}`)
+            (ext) => fs53.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -1922,21 +1922,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs54.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs53.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path73.resolve(
-            path73.dirname(resolvedScriptPath),
+          executableDir = path75.resolve(
+            path75.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path73.basename(
+            const legacyName = path75.basename(
               this._scriptPath,
-              path73.extname(this._scriptPath)
+              path75.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -1947,7 +1947,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path73.extname(executableFile));
+        launchWithNode = sourceExt.includes(path75.extname(executableFile));
         let proc;
         if (process8.platform !== "win32") {
           if (launchWithNode) {
@@ -2787,7 +2787,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path73.basename(filename, path73.extname(filename));
+        this._name = path75.basename(filename, path75.extname(filename));
         return this;
       }
       /**
@@ -2801,9 +2801,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path74) {
-        if (path74 === void 0) return this._executableDir;
-        this._executableDir = path74;
+      executableDir(path76) {
+        if (path76 === void 0) return this._executableDir;
+        this._executableDir = path76;
         return this;
       }
       /**
@@ -7061,8 +7061,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path73, errorMaps, issueData } = params;
-      const fullPath = [...path73, ...issueData.path || []];
+      const { data, path: path75, errorMaps, issueData } = params;
+      const fullPath = [...path75, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -7370,11 +7370,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path73, key) {
+      constructor(parent, value, path75, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path73;
+        this._path = path75;
         this._key = key;
       }
       get path() {
@@ -11099,10 +11099,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path73) {
-  if (!path73)
+function getElementAtPath(obj, path75) {
+  if (!path75)
     return obj;
-  return path73.reduce((acc, key) => acc?.[key], obj);
+  return path75.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -11351,11 +11351,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path73, issues) {
+function prefixIssues(path75, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path73);
+    iss.path.unshift(path75);
     return iss;
   });
 }
@@ -11544,7 +11544,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path73 = []) => {
+  const processError = (error41, path75 = []) => {
     var _a2, _b;
     for (const issue2 of error41.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -11554,7 +11554,7 @@ function treeifyError(error40, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path73, ...issue2.path];
+        const fullpath = [...path75, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11584,9 +11584,9 @@ function treeifyError(error40, _mapper) {
   processError(error40);
   return result;
 }
-function toDotPath(path73) {
+function toDotPath(path75) {
   const segs = [];
-  for (const seg of path73) {
+  for (const seg of path75) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -24592,7 +24592,7 @@ var require_ignore = __commonJS({
       //   path matching.
       // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE`
       // @returns {TestResult} true if a file is ignored
-      test(path73, checkUnignored, mode) {
+      test(path75, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -24601,7 +24601,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path73);
+          const matched = rule[mode].test(path75);
           if (!matched) {
             return;
           }
@@ -24622,17 +24622,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path73, originalPath, doThrow) => {
-      if (!isString(path73)) {
+    var checkPath = (path75, originalPath, doThrow) => {
+      if (!isString(path75)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path73) {
+      if (!path75) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path73)) {
+      if (checkPath.isNotRelative(path75)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -24641,7 +24641,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path73) => REGEX_TEST_INVALID_PATH.test(path73);
+    var isNotRelative = (path75) => REGEX_TEST_INVALID_PATH.test(path75);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -24671,19 +24671,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path73 = originalPath && checkPath.convert(originalPath);
+        const path75 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path73,
+          path75,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path73, cache2, checkUnignored, slices);
+        return this._t(path75, cache2, checkUnignored, slices);
       }
-      checkIgnore(path73) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path73)) {
-          return this.test(path73);
+      checkIgnore(path75) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path75)) {
+          return this.test(path75);
         }
-        const slices = path73.split(SLASH).filter(Boolean);
+        const slices = path75.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -24696,18 +24696,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path73, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path75, false, MODE_CHECK_IGNORE);
       }
-      _t(path73, cache2, checkUnignored, slices) {
-        if (path73 in cache2) {
-          return cache2[path73];
+      _t(path75, cache2, checkUnignored, slices) {
+        if (path75 in cache2) {
+          return cache2[path75];
         }
         if (!slices) {
-          slices = path73.split(SLASH).filter(Boolean);
+          slices = path75.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path73] = this._rules.test(path73, checkUnignored, MODE_IGNORE);
+          return cache2[path75] = this._rules.test(path75, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -24715,29 +24715,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path73] = parent.ignored ? parent : this._rules.test(path73, checkUnignored, MODE_IGNORE);
+        return cache2[path75] = parent.ignored ? parent : this._rules.test(path75, checkUnignored, MODE_IGNORE);
       }
-      ignores(path73) {
-        return this._test(path73, this._ignoreCache, false).ignored;
+      ignores(path75) {
+        return this._test(path75, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path73) => !this.ignores(path73);
+        return (path75) => !this.ignores(path75);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path73) {
-        return this._test(path73, this._testCache, true);
+      test(path75) {
+        return this._test(path75, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path73) => checkPath(path73 && checkPath.convert(path73), path73, RETURN_FALSE);
+    var isPathValid = (path75) => checkPath(path75 && checkPath.convert(path75), path75, RETURN_FALSE);
     var setupWindows = () => {
       const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
       checkPath.convert = makePosix;
       const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-      checkPath.isNotRelative = (path73) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path73) || isNotRelative(path73);
+      checkPath.isNotRelative = (path75) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path75) || isNotRelative(path75);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -25526,10 +25526,10 @@ var require_src2 = __commonJS({
     var fs_1 = __require("fs");
     var debug_1 = __importDefault(require_src());
     var log2 = debug_1.default("@kwsites/file-exists");
-    function check2(path73, isFile, isDirectory) {
-      log2(`checking %s`, path73);
+    function check2(path75, isFile, isDirectory) {
+      log2(`checking %s`, path75);
       try {
-        const stat3 = fs_1.statSync(path73);
+        const stat3 = fs_1.statSync(path75);
         if (stat3.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -25549,8 +25549,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path73, type = exports.READABLE) {
-      return check2(path73, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path75, type = exports.READABLE) {
+      return check2(path75, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -25631,15 +25631,15 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.56".length > 0 ? "0.1.56" : "0.0.0-dev";
+var CLI_VERSION = "0.1.57".length > 0 ? "0.1.57" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
 var DEFAULT_FIREHOSE_URL = "https://buildautomaton-firehose.fly.dev";
 
 // src/cli/run-cli-action.ts
-import * as fs53 from "node:fs";
-import * as path72 from "node:path";
+import * as fs52 from "node:fs";
+import * as path74 from "node:path";
 
 // src/cli-log-level.ts
 var verbosity = "info";
@@ -27183,7 +27183,7 @@ function clearMainBridgeReconnectQuietOnOpen(state, log2) {
 function scheduleMainBridgeReconnect(state, connect, log2, closeMeta) {
   if (state.closedByUser || state.currentWs != null) return;
   const meta = closeMeta ?? state.lastReconnectCloseMeta ?? void 0;
-  const delay2 = applyTieredReconnectPlanAndLog(
+  const delay3 = applyTieredReconnectPlanAndLog(
     state.mainOutage,
     log2,
     BRIDGE_SERVICE_LABEL,
@@ -27192,7 +27192,7 @@ function scheduleMainBridgeReconnect(state, connect, log2, closeMeta) {
     meta?.reason
   );
   armReconnectDelayTimer({
-    delayMs: delay2,
+    delayMs: delay3,
     bumpAttempt: () => {
       state.reconnectAttempt += 1;
     },
@@ -27394,10 +27394,10 @@ function runPendingAuth(options) {
         }
         if (resolved) return;
         beginDeferredPendingCloseLog(code, reason);
-        const delay2 = pendingAuthReconnectDelayMs(reconnectAttempt);
+        const delay3 = pendingAuthReconnectDelayMs(reconnectAttempt);
         reconnectAttempt += 1;
         if (signInQuiet.verboseLogs) {
-          const delayLabel = formatReconnectDelayForLog(delay2);
+          const delayLabel = formatReconnectDelayForLog(delay3);
           logFn(
             `[Bridge service] Next sign-in connection attempt in ${delayLabel} (attempt ${reconnectAttempt}).`
           );
@@ -27405,7 +27405,7 @@ function runPendingAuth(options) {
         reconnectTimeout = setTimeout(() => {
           reconnectTimeout = null;
           connect();
-        }, delay2);
+        }, delay3);
       },
       onError: (err) => logCliWebSocketError(logFn, "[Bridge service]", err, "while waiting for sign-in"),
       onMessage: (data) => {
@@ -27499,11 +27499,7 @@ function isCliSqliteLockError(e) {
   return lower.includes("database is locked") || lower.includes("sqlite_busy") || lower.includes("sqlite3_busy") || lower.includes("database") && lower.includes("locked");
 }
 
-// src/sqlite/create-sqlite-database-access.ts
-var { Database: SqliteDatabase } = sqliteWasm;
-var SYNC_RETRY_MAX = 40;
-var ASYNC_RETRY_MAX = 60;
-var ASYNC_BASE_DELAY_MS = 20;
+// src/sqlite/sqlite-pragmas.ts
 function applySqliteConcurrencyPragmas(db) {
   try {
     db.run("PRAGMA foreign_keys = ON");
@@ -27529,12 +27525,17 @@ function applySqliteMemoryPragmas(db) {
   } catch {
   }
 }
+
+// src/sqlite/sqlite-lock-retry.ts
+var SYNC_RETRY_MAX = 40;
+var ASYNC_RETRY_MAX = 60;
+var ASYNC_BASE_DELAY_MS = 20;
 function syncSleepMs(ms) {
   if (ms <= 0) return;
   const deadline = Date.now() + ms;
   while (Date.now() < deadline) {
     if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
-    const chunk = Math.min(80, deadline - Date.now());
+    const chunk = Math.min(10, deadline - Date.now());
     if (chunk <= 0) break;
     try {
       const sab = new SharedArrayBuffer(4);
@@ -27558,7 +27559,22 @@ async function asyncDelayMsInterruptible(ms) {
     await yieldToEventLoop();
   }
 }
+
+// src/sqlite/create-sqlite-database-access.ts
+var { Database: SqliteDatabase } = sqliteWasm;
 function createSqliteDatabaseAccess(config2) {
+  let migrateDoneForPath = null;
+  function shouldSkipMigrate(sqlitePath, db) {
+    if (migrateDoneForPath !== sqlitePath) return false;
+    try {
+      const row = db.get(
+        "SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='__migrations' LIMIT 1"
+      );
+      return row != null;
+    } catch {
+      return false;
+    }
+  }
   function safeClose(db) {
     if (db == null) return;
     try {
@@ -27574,7 +27590,11 @@ function createSqliteDatabaseAccess(config2) {
     try {
       applySqliteConcurrencyPragmas(db);
       applySqliteMemoryPragmas(db);
-      config2.migrate(db);
+      const sqlitePath2 = config2.getPath();
+      if (!shouldSkipMigrate(sqlitePath2, db)) {
+        config2.migrate(db);
+        migrateDoneForPath = sqlitePath2;
+      }
       config2.afterOpen?.(db, options);
     } catch (e) {
       safeClose(db);
@@ -27630,14 +27650,16 @@ function createSqliteDatabaseAccess(config2) {
   async function ensureInitialized(options) {
     await withAsync(() => void 0, options);
   }
+  function closeAllConnections() {
+    migrateDoneForPath = null;
+  }
   return {
     safeClose,
     openConnection,
     withSync,
     withAsync,
     ensureInitialized,
-    closeAllConnections: () => {
-    }
+    closeAllConnections
   };
 }
 
@@ -27837,7 +27859,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join2(moduleDir, "..", sub, filename),
     join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path73) => existsSync(path73));
+  const resolved = candidates.find((path75) => existsSync(path75));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -27969,6 +27991,161 @@ var withCliSqliteSync = cliSqlite.withSync;
 var withCliSqlite = cliSqlite.withAsync;
 var ensureCliSqliteInitialized = cliSqlite.ensureInitialized;
 
+// src/sqlite/code-nav-cache/code-nav-cache-paths.ts
+import fs15 from "node:fs";
+import path12 from "node:path";
+import os7 from "node:os";
+function getCodeNavCacheSqlitePath() {
+  const override = process.env.BUILDAMATON_CODE_NAV_CACHE_SQLITE_PATH?.trim();
+  if (override) return path12.resolve(override);
+  return path12.join(os7.homedir(), ".buildautomaton", "code-nav-cache.sqlite");
+}
+function ensureCodeNavCacheSqliteParentDir(sqlitePath) {
+  const dir = path12.dirname(sqlitePath);
+  if (!fs15.existsSync(dir)) fs15.mkdirSync(dir, { recursive: true });
+}
+
+// src/sqlite/code-nav-cache/migrate-code-nav-cache-sqlite.ts
+var CHECKPOINT_V12 = "001_code_nav_cache_checkpoint_v1";
+var CHECKPOINT_V1_SQL2 = readCodeNavCacheMigrationSql("001_code_nav_cache_checkpoint_v1.sql");
+var MIGRATION_002 = "002_content_hash_symbol_index";
+var MIGRATION_002_SQL = readCodeNavCacheMigrationSql("002_content_hash_symbol_index.sql");
+var MIGRATION_003 = "003_content_hash_tag_rows";
+var MIGRATION_003_SQL = readCodeNavCacheMigrationSql("003_content_hash_tag_rows.sql");
+var CODE_NAV_CACHE_SQLITE_MIGRATIONS = [
+  {
+    name: CHECKPOINT_V12,
+    checkpoint: true,
+    migrate: (db) => {
+      db.exec(CHECKPOINT_V1_SQL2);
+    },
+    alreadyApplied: (db) => {
+      const row = db.get(
+        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='file_index_parent_path' LIMIT 1`
+      );
+      return row != null;
+    }
+  },
+  {
+    name: MIGRATION_002,
+    migrate: (db) => {
+      db.exec(MIGRATION_002_SQL);
+    },
+    alreadyApplied: (db) => {
+      const row = db.get(
+        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='symbol_file_blob' LIMIT 1`
+      );
+      return row != null;
+    }
+  },
+  {
+    name: MIGRATION_003,
+    migrate: (db) => {
+      db.exec(MIGRATION_003_SQL);
+    },
+    alreadyApplied: (db) => {
+      const row = db.get(
+        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='symbol_index_tag' LIMIT 1`
+      );
+      if (row == null) return false;
+      const blob = db.get(
+        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='symbol_file_blob' LIMIT 1`
+      );
+      return blob == null;
+    }
+  }
+];
+function migrateCodeNavCacheSqlite(db) {
+  runSqliteMigrations(
+    db,
+    CODE_NAV_CACHE_SQLITE_MIGRATIONS,
+    readCodeNavCacheMigrationSql("000_bootstrap_migrations_table.sql"),
+    "code-nav-cache"
+  );
+}
+
+// src/sqlite/code-nav-cache/code-nav-cache-sqlite-work-lock.ts
+import fs16 from "node:fs";
+function isSqliteCorruptError(e) {
+  const msg = e instanceof Error ? e.message : String(e);
+  return msg.includes("malformed") || msg.includes("database disk image is malformed") || msg.includes("corrupt");
+}
+var chain = Promise.resolve();
+var workLockDepth = 0;
+function resetCodeNavCacheSqliteWorkLock() {
+  chain = Promise.resolve();
+  workLockDepth = 0;
+}
+function withCodeNavCacheSqliteWorkLock(fn) {
+  if (workLockDepth > 0) {
+    return Promise.resolve(fn());
+  }
+  const run = async () => {
+    workLockDepth += 1;
+    try {
+      return await Promise.resolve(fn());
+    } finally {
+      workLockDepth = Math.max(0, workLockDepth - 1);
+    }
+  };
+  const runWithCorruptRecovery = async () => {
+    try {
+      return await run();
+    } catch (e) {
+      if (!isSqliteCorruptError(e)) throw e;
+      try {
+        fs16.unlinkSync(getCodeNavCacheSqlitePath());
+      } catch {
+      }
+      chain = Promise.resolve();
+      return await run();
+    }
+  };
+  const next = chain.then(runWithCorruptRecovery);
+  chain = next.then(
+    () => void 0,
+    () => void 0
+  );
+  return next;
+}
+
+// src/sqlite/code-nav-cache/code-nav-cache-database.ts
+var codeNavCacheSqlite = createSqliteDatabaseAccess({
+  getPath: getCodeNavCacheSqlitePath,
+  ensureParentDir: ensureCodeNavCacheSqliteParentDir,
+  migrate: migrateCodeNavCacheSqlite
+});
+var codeNavCacheAccessDepth = 0;
+async function waitForOuterCodeNavCacheAccessAsync() {
+  while (codeNavCacheAccessDepth > 0) {
+    if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
+    await new Promise((resolve34) => setTimeout(resolve34, 5));
+    await yieldToEventLoop();
+  }
+}
+var safeCloseCodeNavCacheSqliteDatabase = codeNavCacheSqlite.safeClose;
+function closeAllCodeNavCacheSqliteConnections() {
+  codeNavCacheSqlite.closeAllConnections();
+  resetCodeNavCacheSqliteWorkLock();
+  codeNavCacheAccessDepth = 0;
+}
+var openCodeNavCacheSqliteConnection = codeNavCacheSqlite.openConnection;
+async function withCodeNavCacheSqlite(fn) {
+  return withCodeNavCacheSqliteWorkLock(async () => {
+    const nested = codeNavCacheAccessDepth > 0;
+    if (!nested) await waitForOuterCodeNavCacheAccessAsync();
+    codeNavCacheAccessDepth += 1;
+    try {
+      return await codeNavCacheSqlite.withAsync(fn);
+    } finally {
+      codeNavCacheAccessDepth = Math.max(0, codeNavCacheAccessDepth - 1);
+    }
+  });
+}
+async function ensureCodeNavCacheSqliteInitialized() {
+  await withCodeNavCacheSqlite(() => void 0);
+}
+
 // src/connection/close-bridge-connection.ts
 async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
   requestCliImmediateShutdown();
@@ -28014,6 +28191,7 @@ async function closeBridgeConnection(state, acpManager, devServerManager, log2)
   }
   try {
     closeAllCliSqliteConnections();
+    closeAllCodeNavCacheSqliteConnections();
   } catch {
   }
   say("Shutdown complete.");
@@ -28635,9 +28813,9 @@ function parseChangeSummaryJson(raw, allowedPaths, options) {
     const rawPath = typeof o.path === "string" ? o.path.trim() : "";
     const summary = typeof o.summary === "string" ? o.summary.trim() : "";
     if (!rawPath || !summary) continue;
-    const path73 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
-    if (!path73) continue;
-    rows.push({ path: path73, summary: clampSummaryToAtMostTwoLines(summary) });
+    const path75 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
+    if (!path75) continue;
+    rows.push({ path: path75, summary: clampSummaryToAtMostTwoLines(summary) });
   }
   return rows;
 }
@@ -28991,16 +29169,16 @@ function getAgentModelFromAgentConfig(config2) {
 }
 
 // src/paths/session-layout-paths.ts
-import * as path12 from "node:path";
+import * as path13 from "node:path";
 function resolveIsolatedSessionParentPathFromCheckouts(worktreePaths) {
-  const resolved = worktreePaths.map((p) => path12.resolve(p)).filter(Boolean);
+  const resolved = worktreePaths.map((p) => path13.resolve(p)).filter(Boolean);
   if (resolved.length === 0) return null;
   resolved.sort();
   return resolved[0];
 }
 function resolveSessionParentPathForAgentProcess(resolvedSessionParentPath) {
   if (resolvedSessionParentPath != null && String(resolvedSessionParentPath).trim() !== "") {
-    return path12.resolve(String(resolvedSessionParentPath).trim());
+    return path13.resolve(String(resolvedSessionParentPath).trim());
   }
   return getBridgeRoot();
 }
@@ -29345,21 +29523,21 @@ import { mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs
 import { dirname as dirname3 } from "node:path";
 
 // src/agents/acp/safe-fs-path.ts
-import * as path13 from "node:path";
+import * as path14 from "node:path";
 function resolveSafePathUnderCwd(cwd, filePath) {
   const trimmed2 = filePath.trim();
   if (!trimmed2) return null;
-  const normalizedCwd = path13.resolve(cwd);
-  const resolved = path13.isAbsolute(trimmed2) ? path13.normalize(trimmed2) : path13.resolve(normalizedCwd, trimmed2);
-  const rel = path13.relative(normalizedCwd, resolved);
-  if (rel.startsWith("..") || path13.isAbsolute(rel)) return null;
+  const normalizedCwd = path14.resolve(cwd);
+  const resolved = path14.isAbsolute(trimmed2) ? path14.normalize(trimmed2) : path14.resolve(normalizedCwd, trimmed2);
+  const rel = path14.relative(normalizedCwd, resolved);
+  if (rel.startsWith("..") || path14.isAbsolute(rel)) return null;
   return resolved;
 }
 function toDisplayPathRelativeToCwd(cwd, absolutePath) {
-  const normalizedCwd = path13.resolve(cwd);
-  const rel = path13.relative(normalizedCwd, path13.resolve(absolutePath));
-  if (!rel || rel === "") return path13.basename(absolutePath);
-  return rel.split(path13.sep).join("/");
+  const normalizedCwd = path14.resolve(cwd);
+  const rel = path14.relative(normalizedCwd, path14.resolve(absolutePath));
+  if (!rel || rel === "") return path14.basename(absolutePath);
+  return rel.split(path14.sep).join("/");
 }
 
 // src/agents/acp/clients/shared/acp-fs-read-write.ts
@@ -30762,16 +30940,16 @@ import { existsSync as existsSync2, statSync } from "node:fs";
 
 // src/git/get-git-repo-root-sync.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
-import * as path14 from "node:path";
+import * as path15 from "node:path";
 function getGitRepoRootSync(startDir) {
   try {
     const out = execFileSync2("git", ["rev-parse", "--show-toplevel"], {
-      cwd: path14.resolve(startDir),
+      cwd: path15.resolve(startDir),
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       maxBuffer: 1024 * 1024
     }).trim();
-    return out ? path14.resolve(out) : null;
+    return out ? path15.resolve(out) : null;
   } catch {
     return null;
   }
@@ -30780,25 +30958,25 @@ function getGitRepoRootSync(startDir) {
 // src/agents/acp/workspace-files.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { readFileSync as readFileSync3 } from "node:fs";
-import * as path15 from "node:path";
+import * as path16 from "node:path";
 function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
   const trimmed2 = rawPath.trim();
   if (!trimmed2) return null;
-  const normalizedSessionParent = path15.resolve(sessionParentPath);
+  const normalizedSessionParent = path16.resolve(sessionParentPath);
   let resolvedPath = resolveSafePathUnderCwd(sessionParentPath, trimmed2);
   if (!resolvedPath) {
-    const candidate = path15.isAbsolute(trimmed2) ? path15.normalize(trimmed2) : path15.normalize(path15.resolve(normalizedSessionParent, trimmed2));
+    const candidate = path16.isAbsolute(trimmed2) ? path16.normalize(trimmed2) : path16.normalize(path16.resolve(normalizedSessionParent, trimmed2));
     const gitRoot2 = getGitRepoRootSync(sessionParentPath);
     if (!gitRoot2) return null;
-    const rel = path15.relative(gitRoot2, candidate);
-    if (rel.startsWith("..") || path15.isAbsolute(rel)) return null;
+    const rel = path16.relative(gitRoot2, candidate);
+    if (rel.startsWith("..") || path16.isAbsolute(rel)) return null;
     resolvedPath = candidate;
   }
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const relFromRoot = path15.relative(gitRoot, resolvedPath);
-    if (!relFromRoot.startsWith("..") && !path15.isAbsolute(relFromRoot)) {
-      return { resolvedPath, display: relFromRoot.split(path15.sep).join("/") };
+    const relFromRoot = path16.relative(gitRoot, resolvedPath);
+    if (!relFromRoot.startsWith("..") && !path16.isAbsolute(relFromRoot)) {
+      return { resolvedPath, display: relFromRoot.split(path16.sep).join("/") };
     }
   }
   return { resolvedPath, display: toDisplayPathRelativeToCwd(sessionParentPath, resolvedPath) };
@@ -30807,9 +30985,9 @@ function readUtf8WorkspaceFile(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return "";
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const resolvedPath2 = path15.resolve(gitRoot, displayPath);
-    const rel = path15.relative(gitRoot, resolvedPath2);
-    if (!rel.startsWith("..") && !path15.isAbsolute(rel)) {
+    const resolvedPath2 = path16.resolve(gitRoot, displayPath);
+    const rel = path16.relative(gitRoot, resolvedPath2);
+    if (!rel.startsWith("..") && !path16.isAbsolute(rel)) {
       try {
         return readFileSync3(resolvedPath2, "utf8");
       } catch {
@@ -30828,9 +31006,9 @@ function tryWorkspaceDisplayToPath(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return null;
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const resolvedPath = path15.resolve(gitRoot, displayPath);
-    const rel = path15.relative(gitRoot, resolvedPath);
-    if (!rel.startsWith("..") && !path15.isAbsolute(rel)) return resolvedPath;
+    const resolvedPath = path16.resolve(gitRoot, displayPath);
+    const rel = path16.relative(gitRoot, resolvedPath);
+    if (!rel.startsWith("..") && !path16.isAbsolute(rel)) return resolvedPath;
   }
   return resolveSafePathUnderCwd(sessionParentPath, displayPath);
 }
@@ -30881,92 +31059,22 @@ function getSessionFileChangeDirectoryFlags(sessionParentPath, displayPath) {
   return { isDirectory: false, directoryRemoved: false };
 }
 
-// src/sqlite/code-nav-cache/code-nav-cache-paths.ts
-import fs15 from "node:fs";
-import path16 from "node:path";
-import os7 from "node:os";
-function getCodeNavCacheSqlitePath() {
-  const override = process.env.BUILDAMATON_CODE_NAV_CACHE_SQLITE_PATH?.trim();
-  if (override) return path16.resolve(override);
-  return path16.join(os7.homedir(), ".buildautomaton", "code-nav-cache.sqlite");
-}
-function ensureCodeNavCacheSqliteParentDir(sqlitePath) {
-  const dir = path16.dirname(sqlitePath);
-  if (!fs15.existsSync(dir)) fs15.mkdirSync(dir, { recursive: true });
-}
-
-// src/sqlite/code-nav-cache/migrate-code-nav-cache-sqlite.ts
-var CHECKPOINT_V12 = "001_code_nav_cache_checkpoint_v1";
-var CHECKPOINT_V1_SQL2 = readCodeNavCacheMigrationSql("001_code_nav_cache_checkpoint_v1.sql");
-var MIGRATION_002 = "002_content_hash_symbol_index";
-var MIGRATION_002_SQL = readCodeNavCacheMigrationSql("002_content_hash_symbol_index.sql");
-var MIGRATION_003 = "003_content_hash_tag_rows";
-var MIGRATION_003_SQL = readCodeNavCacheMigrationSql("003_content_hash_tag_rows.sql");
-var CODE_NAV_CACHE_SQLITE_MIGRATIONS = [
-  {
-    name: CHECKPOINT_V12,
-    checkpoint: true,
-    migrate: (db) => {
-      db.exec(CHECKPOINT_V1_SQL2);
-    },
-    alreadyApplied: (db) => {
-      const row = db.get(
-        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='file_index_parent_path' LIMIT 1`
-      );
-      return row != null;
-    }
-  },
-  {
-    name: MIGRATION_002,
-    migrate: (db) => {
-      db.exec(MIGRATION_002_SQL);
-    },
-    alreadyApplied: (db) => {
-      const row = db.get(
-        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='symbol_file_blob' LIMIT 1`
-      );
-      return row != null;
-    }
-  },
-  {
-    name: MIGRATION_003,
-    migrate: (db) => {
-      db.exec(MIGRATION_003_SQL);
-    },
-    alreadyApplied: (db) => {
-      const row = db.get(
-        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='symbol_index_tag' LIMIT 1`
-      );
-      if (row == null) return false;
-      const blob = db.get(
-        `SELECT 1 as ok FROM sqlite_master WHERE type='table' AND name='symbol_file_blob' LIMIT 1`
-      );
-      return blob == null;
+// src/sqlite/code-nav-cache/code-nav-cache-sqlite-transaction.ts
+function runCodeNavCacheWriteTransaction(db, fn) {
+  db.run("BEGIN IMMEDIATE");
+  try {
+    const result = fn();
+    db.run("COMMIT");
+    return result;
+  } catch (e) {
+    try {
+      db.run("ROLLBACK");
+    } catch {
     }
+    throw e;
   }
-];
-function migrateCodeNavCacheSqlite(db) {
-  runSqliteMigrations(
-    db,
-    CODE_NAV_CACHE_SQLITE_MIGRATIONS,
-    readCodeNavCacheMigrationSql("000_bootstrap_migrations_table.sql"),
-    "code-nav-cache"
-  );
 }
 
-// src/sqlite/code-nav-cache/code-nav-cache-database.ts
-var codeNavCacheSqlite = createSqliteDatabaseAccess({
-  getPath: getCodeNavCacheSqlitePath,
-  ensureParentDir: ensureCodeNavCacheSqliteParentDir,
-  migrate: migrateCodeNavCacheSqlite
-});
-var safeCloseCodeNavCacheSqliteDatabase = codeNavCacheSqlite.safeClose;
-var closeAllCodeNavCacheSqliteConnections = codeNavCacheSqlite.closeAllConnections;
-var openCodeNavCacheSqliteConnection = codeNavCacheSqlite.openConnection;
-var withCodeNavCacheSqliteSync = codeNavCacheSqlite.withSync;
-var withCodeNavCacheSqlite = codeNavCacheSqlite.withAsync;
-var ensureCodeNavCacheSqliteInitialized = codeNavCacheSqlite.ensureInitialized;
-
 // src/code-nav/yield-during-work.ts
 var CODE_NAV_YIELD_EVERY = INDEX_WORK_YIELD_EVERY;
 function createCodeNavYieldState() {
@@ -30981,11 +31089,11 @@ async function yieldDuringCodeNavWork(state) {
 }
 
 // src/code-nav/walk-code-nav-files.ts
-import fs18 from "node:fs";
+import fs19 from "node:fs";
 import path20 from "node:path";
 
 // src/files/index/walk-workspace-tree.ts
-import fs16 from "node:fs";
+import fs17 from "node:fs";
 import path17 from "node:path";
 var DEPENDENCY_INSTALL_DIR_NAMES = /* @__PURE__ */ new Set([
   "node_modules",
@@ -31003,7 +31111,7 @@ function shouldSkipWorkspaceWalkEntry(name) {
 async function walkWorkspaceTreeAsync(dir, baseDir, onFile, state) {
   let names;
   try {
-    names = await fs16.promises.readdir(dir);
+    names = await fs17.promises.readdir(dir);
   } catch {
     return;
   }
@@ -31018,7 +31126,7 @@ async function walkWorkspaceTreeAsync(dir, baseDir, onFile, state) {
     const full = path17.join(dir, name);
     let stat3;
     try {
-      stat3 = await fs16.promises.stat(full);
+      stat3 = await fs17.promises.stat(full);
     } catch {
       continue;
     }
@@ -31036,7 +31144,7 @@ function createWalkYieldState() {
 
 // src/code-nav/gitignore-filter.ts
 var import_ignore = __toESM(require_ignore(), 1);
-import fs17 from "node:fs";
+import fs18 from "node:fs";
 import path18 from "node:path";
 var DEFAULT_IGNORED = [".git", ".git/**"];
 function normalizeRelPath(relPath) {
@@ -31047,7 +31155,7 @@ var GitignoreFilter = class {
   /** Load `.gitignore` in `absDir` and push a layer when the file exists. */
   async enterDirectory(absDir, dirRel) {
     try {
-      const content = await fs17.promises.readFile(path18.join(absDir, ".gitignore"), "utf8");
+      const content = await fs18.promises.readFile(path18.join(absDir, ".gitignore"), "utf8");
       this.layers.push({ dirRel, ig: (0, import_ignore.default)().add(content) });
     } catch {
     }
@@ -31150,7 +31258,7 @@ async function walkCodeNavFilesInDirectory(dir, baseDir, relDir, filter, onFile,
   await filter.enterDirectory(dir, relDir);
   let names;
   try {
-    names = await fs18.promises.readdir(dir);
+    names = await fs19.promises.readdir(dir);
   } catch {
     filter.leaveDirectory(relDir);
     return;
@@ -31167,7 +31275,7 @@ async function walkCodeNavFilesInDirectory(dir, baseDir, relDir, filter, onFile,
     const full = path20.join(dir, name);
     let stat3;
     try {
-      stat3 = await fs18.promises.stat(full);
+      stat3 = await fs19.promises.stat(full);
     } catch {
       continue;
     }
@@ -31374,12 +31482,27 @@ function removeParentFileMapEntry(db, parentId, filePath) {
   db.run("DELETE FROM symbol_parent_file_map WHERE parent_id = ? AND file_path = ?", [parentId, filePath]);
   return previous === void 0 ? null : previous;
 }
-function clearParentFileMap(db, parentId) {
-  const rows = db.all("SELECT content_hash FROM symbol_parent_file_map WHERE parent_id = ? AND content_hash IS NOT NULL", [
-    parentId
-  ]);
-  db.run("DELETE FROM symbol_parent_file_map WHERE parent_id = ?", [parentId]);
-  return rows.map((row) => row.content_hash);
+function clearParentFileMapBatch(db, parentId, limit) {
+  const rows = db.all(
+    `SELECT file_path, content_hash
+     FROM symbol_parent_file_map
+     WHERE parent_id = ?
+     LIMIT ?`,
+    [parentId, limit]
+  );
+  if (rows.length === 0) return { released: [], remaining: false };
+  const del = db.prepare("DELETE FROM symbol_parent_file_map WHERE parent_id = ? AND file_path = ?");
+  try {
+    for (const row of rows) {
+      del.run([parentId, row.file_path]);
+    }
+  } finally {
+    del.finalize();
+  }
+  return {
+    released: rows.flatMap((row) => row.content_hash == null ? [] : [row.content_hash]),
+    remaining: rows.length >= limit
+  };
 }
 
 // src/code-nav/symbol-index/storage/symbol-content-index.ts
@@ -31468,139 +31591,15 @@ function removeSymbolIndexFileData(db, ctx, filePath) {
   const released = removeParentFileMapEntry(db, ctx.parentId, filePath);
   gcReleasedHashes(db, [released]);
 }
-function clearSymbolIndexParentData(db, ctx) {
-  const released = clearParentFileMap(db, ctx.parentId);
+function clearSymbolIndexParentDataBatch(db, ctx, limit) {
+  const { released, remaining } = clearParentFileMapBatch(db, ctx.parentId, limit);
   gcReleasedHashes(db, released);
-}
-
-// src/code-nav/symbol-index/query/tag-query-shared.ts
-var TAG_SELECT = `file_path, name, role, kind, start_line, start_column, end_line, end_column,
-  scope_start_line, scope_start_column, parent_scope_start_line, parent_scope_start_column, nav_target_path, scope_chain`;
-function rowToLocation(row) {
-  return {
-    path: row.file_path,
-    line: row.start_line + 1,
-    column: row.start_column,
-    kind: row.kind,
-    role: row.role === "def" ? "definition" : "reference"
-  };
-}
-function modulePathLocation(row) {
-  return {
-    path: row.nav_target_path,
-    line: 1,
-    column: 0,
-    kind: "module",
-    role: "reference"
-  };
-}
-function emptyRefRow(filePath) {
-  return {
-    file_path: filePath,
-    name: "",
-    role: "ref",
-    kind: "",
-    start_line: 0,
-    start_column: 0,
-    end_line: 0,
-    end_column: 0,
-    scope_start_line: null,
-    scope_start_column: null,
-    parent_scope_start_line: null,
-    parent_scope_start_column: null,
-    nav_target_path: null,
-    scope_chain: null
-  };
-}
-
-// src/code-nav/symbol-index/storage/file-content-load.ts
-function loadFileTags(db, ctx, filePath) {
-  const contentHash = getEffectiveContentHash(db, ctx, filePath);
-  if (contentHash == null) return [];
-  return db.all(
-    `SELECT ${TAG_SELECT}
-     FROM symbol_index_tag
-     WHERE content_hash = ? AND file_path = ?
-     ORDER BY start_line, start_column`,
-    [contentHash, filePath]
-  );
-}
-function loadFileImports(db, ctx, filePath) {
-  const contentHash = getEffectiveContentHash(db, ctx, filePath);
-  if (contentHash == null) return [];
-  return db.all(
-    `SELECT file_path, local_name, source_name, module_specifier, source_file_path, import_kind, start_line, start_column
-     FROM symbol_index_import
-     WHERE content_hash = ? AND file_path = ?
-     ORDER BY start_line, start_column`,
-    [contentHash, filePath]
-  );
-}
-function findTagsByName(db, ctx, name) {
-  const filePaths = listEffectiveIndexedFilePaths(db, ctx);
-  const rows = [];
-  for (const filePath of filePaths) {
-    const contentHash = getEffectiveContentHash(db, ctx, filePath);
-    if (contentHash == null) continue;
-    const matches = db.all(
-      `SELECT ${TAG_SELECT}
-       FROM symbol_index_tag
-       WHERE content_hash = ? AND file_path = ? AND name = ?
-       ORDER BY start_line, start_column`,
-      [contentHash, filePath, name]
-    );
-    rows.push(...matches);
-  }
-  rows.sort(
-    (a, b) => a.file_path.localeCompare(b.file_path) || a.start_line - b.start_line || a.start_column - b.start_column
-  );
-  return rows;
-}
-
-// src/code-nav/symbol-index/lifecycle/symbol-index-file-ready.ts
-function symbolIndexFileIsReady(parentPath, filePath) {
-  const normalizedParent = normalizeResolvedPath(parentPath);
-  const normalizedFile = filePath.replace(/\\/g, "/").replace(/^\/+/, "");
-  if (!normalizedFile) return false;
-  return withCodeNavCacheSqliteSync((db) => {
-    const ctx = getSymbolIndexParentContext(db, normalizedParent);
-    if (ctx == null) return false;
-    const versionRow = db.get("SELECT index_version FROM symbol_index_parent_path WHERE id = ?", [
-      ctx.parentId
-    ]);
-    if (versionRow == null || versionRow.index_version < SYMBOL_INDEX_VERSION) return false;
-    return getEffectiveContentHash(db, ctx, normalizedFile) != null;
-  });
+  return remaining;
 }
 
 // src/code-nav/symbol-index/sqlite/symbol-index-sqlite-lock.ts
-import fs19 from "node:fs";
-function isSqliteCorruptError(e) {
-  const msg = e instanceof Error ? e.message : String(e);
-  return msg.includes("malformed") || msg.includes("database disk image is malformed") || msg.includes("corrupt");
-}
-var chain = Promise.resolve();
 function withSymbolIndexSqliteLock(fn) {
-  const run = async () => {
-    try {
-      return await Promise.resolve(fn());
-    } catch (e) {
-      if (!isSqliteCorruptError(e)) throw e;
-      closeAllCodeNavCacheSqliteConnections();
-      try {
-        fs19.unlinkSync(getCodeNavCacheSqlitePath());
-      } catch {
-      }
-      chain = Promise.resolve();
-      return await Promise.resolve(fn());
-    }
-  };
-  const next = chain.then(run);
-  chain = next.then(
-    () => void 0,
-    () => void 0
-  );
-  return next;
+  return withCodeNavCacheSqliteWorkLock(fn);
 }
 
 // src/code-nav/symbol-index/imports/star-reexport-names.ts
@@ -31705,43 +31704,111 @@ function expandStarReexportBindings(collected) {
 }
 
 // src/code-nav/symbol-index/persistence/persist-single-file.ts
-function persistSymbolIndexFile(resolved, relPath, source, tags, imports) {
-  withCodeNavCacheSqliteSync((db) => {
-    db.run("BEGIN IMMEDIATE");
-    try {
+async function persistSymbolIndexFileAsync(resolved, relPath, source, tags, imports) {
+  await withCodeNavCacheSqlite(async (db) => {
+    runCodeNavCacheWriteTransaction(db, () => {
       upsertSymbolIndexParentPath(db, resolved);
       const ctx = getSymbolIndexParentContext(db, resolved);
       if (ctx == null) throw new Error(`Failed to resolve symbol index parent: ${resolved}`);
       persistSymbolIndexFileData(db, ctx, relPath, source, tags, imports);
-      db.run("COMMIT");
-    } catch (e) {
-      try {
-        db.run("ROLLBACK");
-      } catch {
-      }
-      throw e;
-    }
+    });
   });
 }
-function removeSymbolIndexFile(resolved, relPath) {
-  withCodeNavCacheSqliteSync((db) => {
-    db.run("BEGIN IMMEDIATE");
-    try {
+async function removeSymbolIndexFileAsync(resolved, relPath) {
+  await withCodeNavCacheSqlite(async (db) => {
+    runCodeNavCacheWriteTransaction(db, () => {
       upsertSymbolIndexParentPath(db, resolved);
       const ctx = getSymbolIndexParentContext(db, resolved);
       if (ctx == null) throw new Error(`Failed to resolve symbol index parent: ${resolved}`);
       removeSymbolIndexFileData(db, ctx, relPath);
-      db.run("COMMIT");
-    } catch (e) {
-      try {
-        db.run("ROLLBACK");
-      } catch {
-      }
-      throw e;
-    }
+    });
   });
 }
 
+// src/code-nav/symbol-index/query/tag-query-shared.ts
+var TAG_SELECT = `file_path, name, role, kind, start_line, start_column, end_line, end_column,
+  scope_start_line, scope_start_column, parent_scope_start_line, parent_scope_start_column, nav_target_path, scope_chain`;
+function rowToLocation(row) {
+  return {
+    path: row.file_path,
+    line: row.start_line + 1,
+    column: row.start_column,
+    kind: row.kind,
+    role: row.role === "def" ? "definition" : "reference"
+  };
+}
+function modulePathLocation(row) {
+  return {
+    path: row.nav_target_path,
+    line: 1,
+    column: 0,
+    kind: "module",
+    role: "reference"
+  };
+}
+function emptyRefRow(filePath) {
+  return {
+    file_path: filePath,
+    name: "",
+    role: "ref",
+    kind: "",
+    start_line: 0,
+    start_column: 0,
+    end_line: 0,
+    end_column: 0,
+    scope_start_line: null,
+    scope_start_column: null,
+    parent_scope_start_line: null,
+    parent_scope_start_column: null,
+    nav_target_path: null,
+    scope_chain: null
+  };
+}
+
+// src/code-nav/symbol-index/storage/file-content-load.ts
+function loadFileTags(db, ctx, filePath) {
+  const contentHash = getEffectiveContentHash(db, ctx, filePath);
+  if (contentHash == null) return [];
+  return db.all(
+    `SELECT ${TAG_SELECT}
+     FROM symbol_index_tag
+     WHERE content_hash = ? AND file_path = ?
+     ORDER BY start_line, start_column`,
+    [contentHash, filePath]
+  );
+}
+function loadFileImports(db, ctx, filePath) {
+  const contentHash = getEffectiveContentHash(db, ctx, filePath);
+  if (contentHash == null) return [];
+  return db.all(
+    `SELECT file_path, local_name, source_name, module_specifier, source_file_path, import_kind, start_line, start_column
+     FROM symbol_index_import
+     WHERE content_hash = ? AND file_path = ?
+     ORDER BY start_line, start_column`,
+    [contentHash, filePath]
+  );
+}
+function findTagsByName(db, ctx, name) {
+  const filePaths = listEffectiveIndexedFilePaths(db, ctx);
+  const rows = [];
+  for (const filePath of filePaths) {
+    const contentHash = getEffectiveContentHash(db, ctx, filePath);
+    if (contentHash == null) continue;
+    const matches = db.all(
+      `SELECT ${TAG_SELECT}
+       FROM symbol_index_tag
+       WHERE content_hash = ? AND file_path = ? AND name = ?
+       ORDER BY start_line, start_column`,
+      [contentHash, filePath, name]
+    );
+    rows.push(...matches);
+  }
+  rows.sort(
+    (a, b) => a.file_path.localeCompare(b.file_path) || a.start_line - b.start_line || a.start_column - b.start_column
+  );
+  return rows;
+}
+
 // src/code-nav/symbol-index/build/load-indexed-file-entry.ts
 function dbTagToSymbolTag(row) {
   return {
@@ -31787,21 +31854,52 @@ function loadIndexedFileEntry(db, ctx, relPath) {
 function normalizeRelPath2(filePath) {
   return filePath.replace(/\\/g, "/").replace(/^\/+/, "");
 }
-function listDirectImportTargetsForFile(parentPath, filePath) {
+function listDirectImportTargetsWithDb(db, resolved, relPath) {
+  const ctx = getSymbolIndexParentContext(db, resolved);
+  if (ctx == null) return [];
+  const entry = loadIndexedFileEntry(db, ctx, relPath);
+  if (entry == null) return [];
+  const paths = /* @__PURE__ */ new Set();
+  for (const binding of entry.imports) {
+    if (binding.sourceFilePath) paths.add(binding.sourceFilePath);
+  }
+  return Array.from(paths);
+}
+async function listDirectImportTargetsForFileAsync(parentPath, filePath) {
   const resolved = normalizeResolvedPath(parentPath);
   const relPath = normalizeRelPath2(filePath);
   if (!relPath) return [];
-  return withCodeNavCacheSqliteSync((db) => {
-    const ctx = getSymbolIndexParentContext(db, resolved);
+  return withCodeNavCacheSqlite((db) => listDirectImportTargetsWithDb(db, resolved, relPath));
+}
+
+// src/code-nav/symbol-index/lifecycle/symbol-index-file-ready.ts
+function symbolIndexFileIsReadyWithDb(db, parentPath, filePath) {
+  const normalizedParent = normalizeResolvedPath(parentPath);
+  const normalizedFile = filePath.replace(/\\/g, "/").replace(/^\/+/, "");
+  if (!normalizedFile) return false;
+  const ctx = getSymbolIndexParentContext(db, normalizedParent);
+  if (ctx == null) return false;
+  const versionRow = db.get("SELECT index_version FROM symbol_index_parent_path WHERE id = ?", [
+    ctx.parentId
+  ]);
+  if (versionRow == null || versionRow.index_version < SYMBOL_INDEX_VERSION) return false;
+  return getEffectiveContentHash(db, ctx, normalizedFile) != null;
+}
+async function symbolIndexFileIsReadyAsync(parentPath, filePath) {
+  return withCodeNavCacheSqlite((db) => symbolIndexFileIsReadyWithDb(db, parentPath, filePath));
+}
+async function loadSymbolIndexReadyFileSet(parentPath) {
+  const normalizedParent = normalizeResolvedPath(parentPath);
+  const paths = await withCodeNavCacheSqlite((db) => {
+    const ctx = getSymbolIndexParentContext(db, normalizedParent);
     if (ctx == null) return [];
-    const entry = loadIndexedFileEntry(db, ctx, relPath);
-    if (entry == null) return [];
-    const paths = /* @__PURE__ */ new Set();
-    for (const binding of entry.imports) {
-      if (binding.sourceFilePath) paths.add(binding.sourceFilePath);
-    }
-    return [...paths];
+    const versionRow = db.get("SELECT index_version FROM symbol_index_parent_path WHERE id = ?", [
+      ctx.parentId
+    ]);
+    if (versionRow == null || versionRow.index_version < SYMBOL_INDEX_VERSION) return [];
+    return listEffectiveIndexedFilePaths(db, ctx);
   });
+  return new Set(paths);
 }
 
 // src/code-nav/symbol-index/build/extract-file-symbol-data.ts
@@ -32111,9 +32209,9 @@ async function augmentTypeReferenceTags(tags, nameNodes, root) {
 }
 
 // src/code-nav/scope-chain.ts
-function serializeScopeChain(chain3) {
-  if (chain3.length === 0) return null;
-  return chain3.map((anchor) => `${anchor.startLine}:${anchor.startColumn}`).join(",");
+function serializeScopeChain(chain2) {
+  if (chain2.length === 0) return null;
+  return chain2.map((anchor) => `${anchor.startLine}:${anchor.startColumn}`).join(",");
 }
 function parseScopeChain(raw) {
   if (!raw) return [];
@@ -32129,9 +32227,9 @@ function parseScopeChain(raw) {
   }
   return out;
 }
-function anchorInScopeChain(line, column, chain3) {
-  if (line == null || column == null) return chain3.length === 0;
-  return chain3.some((anchor) => anchor.startLine === line && anchor.startColumn === column);
+function anchorInScopeChain(line, column, chain2) {
+  if (line == null || column == null) return chain2.length === 0;
+  return chain2.some((anchor) => anchor.startLine === line && anchor.startColumn === column);
 }
 
 // src/code-nav/enrich-tag-scope.ts
@@ -32168,15 +32266,15 @@ function scopeAnchorFromNode(node) {
   };
 }
 function findEnclosingScopeChain(nameNode) {
-  const chain3 = [];
+  const chain2 = [];
   let current = nameNode.parent;
   while (current) {
     if (SCOPE_CONTAINER_TYPES.has(current.type)) {
-      chain3.push(scopeAnchorFromNode(current));
+      chain2.push(scopeAnchorFromNode(current));
     }
     current = current.parent;
   }
-  return chain3;
+  return chain2;
 }
 function findEnclosingScopes(nameNode) {
   const scopeChain = findEnclosingScopeChain(nameNode);
@@ -33033,7 +33131,7 @@ async function extractFileSymbolData(resolved, relPath, workspaceFilesOverride)
     }
   }
   await yieldToEventLoop();
-  const workspaceFiles = workspaceFilesOverride ?? withCodeNavCacheSqliteSync((db) => listWorkspaceFiles(db, resolved, relPath));
+  const workspaceFiles = workspaceFilesOverride ?? await withCodeNavCacheSqlite((db) => listWorkspaceFiles(db, resolved, relPath));
   const imports = source != null ? await extractImportBindingsFromSource(relPath, source, workspaceFiles) : [];
   const yieldState = createCodeNavYieldState();
   return {
@@ -33058,7 +33156,7 @@ async function indexOneSymbolFileForBuild(resolved, relPath, workspaceFiles) {
   };
   if (data.imports.some((binding) => binding.importKind === "star")) {
     await yieldToEventLoop();
-    entry = withCodeNavCacheSqliteSync((db) => {
+    entry = await withCodeNavCacheSqlite((db) => {
       const ctx = getSymbolIndexParentContext(db, resolved);
       if (ctx == null) return entry;
       const resolveEntry = (filePath) => loadIndexedFileEntry(db, ctx, filePath);
@@ -33068,7 +33166,7 @@ async function indexOneSymbolFileForBuild(resolved, relPath, workspaceFiles) {
   }
   await withSymbolIndexSqliteLock(async () => {
     await yieldToEventLoop();
-    persistSymbolIndexFile(resolved, relPath, entry.source, entry.tags, entry.imports);
+    await persistSymbolIndexFileAsync(resolved, relPath, entry.source, entry.tags, entry.imports);
   });
 }
 async function ensureSymbolIndexFileAsync(parentPath, filePath, opts) {
@@ -33076,41 +33174,51 @@ async function ensureSymbolIndexFileAsync(parentPath, filePath, opts) {
   const relPath = normalizeRelPath3(filePath);
   if (!relPath) return false;
   const importDepth = opts?.importDepth ?? 0;
-  withCodeNavCacheSqliteSync((db) => {
+  await withCodeNavCacheSqlite((db) => {
     upsertSymbolIndexParentPath(db, resolved);
   });
-  if (!symbolIndexFileIsReady(resolved, relPath)) {
+  if (!await symbolIndexFileIsReadyAsync(resolved, relPath)) {
     await indexOneSymbolFileForBuild(resolved, relPath, void 0);
   }
-  if (importDepth > 0 && symbolIndexFileIsReady(resolved, relPath)) {
-    const targets = listDirectImportTargetsForFile(resolved, relPath).slice(0, MAX_IMPORT_PREFETCH_COUNT);
+  if (importDepth > 0 && await symbolIndexFileIsReadyAsync(resolved, relPath)) {
+    const targets = (await listDirectImportTargetsForFileAsync(resolved, relPath)).slice(
+      0,
+      MAX_IMPORT_PREFETCH_COUNT
+    );
     for (const target of targets) {
       await yieldToEventLoop();
-      if (!symbolIndexFileIsReady(resolved, target)) {
+      if (!await symbolIndexFileIsReadyAsync(resolved, target)) {
         await ensureSymbolIndexFileAsync(resolved, target, { importDepth: importDepth - 1 });
       }
     }
   }
-  return symbolIndexFileIsReady(resolved, relPath);
+  return await symbolIndexFileIsReadyAsync(resolved, relPath);
 }
-function registerSymbolIndexParent(parentPath) {
+async function registerSymbolIndexParentAsync(parentPath) {
   const resolved = normalizeResolvedPath(parentPath);
-  withCodeNavCacheSqliteSync((db) => {
+  await withCodeNavCacheSqlite((db) => {
     upsertSymbolIndexParentPath(db, resolved);
   });
 }
 
 // src/code-nav/symbol-index/build/build-symbol-index.ts
+var SYMBOL_PARENT_CLEAR_BATCH_SIZE = 256;
 async function buildSymbolIndexAsync(parentPath) {
   const resolved = normalizeResolvedPath(parentPath);
   await yieldToEventLoop();
-  await withSymbolIndexSqliteLock(() => {
-    withCodeNavCacheSqliteSync((db) => {
-      upsertSymbolIndexParentPath(db, resolved);
-      const ctx = getSymbolIndexParentContext(db, resolved);
-      if (ctx != null) clearSymbolIndexParentData(db, ctx);
+  let clearRemaining = true;
+  while (clearRemaining) {
+    await withSymbolIndexSqliteLock(async () => {
+      clearRemaining = await withCodeNavCacheSqlite(
+        (db) => runCodeNavCacheWriteTransaction(db, () => {
+          upsertSymbolIndexParentPath(db, resolved);
+          const ctx = getSymbolIndexParentContext(db, resolved);
+          return ctx == null ? false : clearSymbolIndexParentDataBatch(db, ctx, SYMBOL_PARENT_CLEAR_BATCH_SIZE);
+        })
+      );
     });
-  });
+    if (clearRemaining) await yieldToEventLoop();
+  }
   const workspaceFiles = /* @__PURE__ */ new Set();
   const walkState = createWalkYieldState();
   const yieldState = createCodeNavYieldState();
@@ -33127,9 +33235,7 @@ async function buildSymbolIndexAsync(parentPath) {
     resolved,
     async (relPath) => {
       await yieldDuringCodeNavWork(yieldState);
-      if (!symbolIndexFileIsReady(resolved, relPath)) {
-        await indexOneSymbolFileForBuild(resolved, relPath, workspaceFiles);
-      }
+      await indexOneSymbolFileForBuild(resolved, relPath, workspaceFiles);
       fileCount += 1;
     },
     walkState
@@ -33138,18 +33244,79 @@ async function buildSymbolIndexAsync(parentPath) {
   return { fileCount, tagCount: 0 };
 }
 
+// src/code-nav/symbol-index/scheduler/task-priority-heap.ts
+function higherPriority(a, b) {
+  return a.priority > b.priority;
+}
+var SymbolIndexTaskPriorityHeap = class {
+  heap = [];
+  clear() {
+    this.heap.length = 0;
+  }
+  push(task) {
+    this.heap.push(task);
+    let i = this.heap.length - 1;
+    while (i > 0) {
+      const parent = Math.floor((i - 1) / 2);
+      if (!higherPriority(this.heap[i], this.heap[parent])) break;
+      this.swap(i, parent);
+      i = parent;
+    }
+  }
+  pop() {
+    if (this.heap.length === 0) return void 0;
+    const top = this.heap[0];
+    const last2 = this.heap.pop();
+    if (this.heap.length > 0) {
+      this.heap[0] = last2;
+      this.sink(0);
+    }
+    return top;
+  }
+  get size() {
+    return this.heap.length;
+  }
+  sink(start) {
+    let i = start;
+    while (true) {
+      const left = i * 2 + 1;
+      const right = left + 1;
+      let best = i;
+      if (left < this.heap.length && higherPriority(this.heap[left], this.heap[best])) best = left;
+      if (right < this.heap.length && higherPriority(this.heap[right], this.heap[best])) best = right;
+      if (best === i) break;
+      this.swap(i, best);
+      i = best;
+    }
+  }
+  swap(i, j) {
+    const tmp = this.heap[i];
+    this.heap[i] = this.heap[j];
+    this.heap[j] = tmp;
+  }
+};
+
+// src/code-nav/symbol-index/scheduler/task-queue-types.ts
+function symbolIndexTaskKey(parentPath, filePath) {
+  return `${parentPath}\0${filePath}`;
+}
+
 // src/code-nav/symbol-index/scheduler/task-queue.ts
 var pending = /* @__PURE__ */ new Map();
+var heap = new SymbolIndexTaskPriorityHeap();
+var latestActiveSequenceByParent = /* @__PURE__ */ new Map();
 var workerRunning = false;
-function taskKey(parentPath, filePath) {
-  return `${parentPath}\0${filePath}`;
+function taskMatchesCurrentPending(task) {
+  const current = pending.get(symbolIndexTaskKey(task.parentPath, task.filePath));
+  return current === task;
 }
 function pickNextTask() {
-  let best;
-  for (const task of pending.values()) {
-    if (best == null || task.priority > best.priority) best = task;
+  while (heap.size > 0) {
+    const task = heap.pop();
+    if (task == null || !taskMatchesCurrentPending(task)) continue;
+    return task;
   }
-  return best;
+  return void 0;
 }
 async function runWorker() {
   if (workerRunning) return;
@@ -33159,74 +33326,93 @@ async function runWorker() {
     while (pending.size > 0) {
       const task = pickNextTask();
       if (task == null) break;
-      pending.delete(taskKey(task.parentPath, task.filePath));
+      pending.delete(symbolIndexTaskKey(task.parentPath, task.filePath));
       await yieldDuringCodeNavWork(yieldState);
-      if (!symbolIndexFileIsReady(task.parentPath, task.filePath)) {
+      const latestActiveSequence = latestActiveSequenceByParent.get(task.parentPath);
+      if (latestActiveSequence != null && task.sequence != null && task.sequence < latestActiveSequence) {
+        continue;
+      }
+      if (!await symbolIndexFileIsReadyAsync(task.parentPath, task.filePath)) {
         await ensureSymbolIndexFileAsync(task.parentPath, task.filePath);
       }
       await yieldToEventLoop();
     }
   } finally {
+    if (pending.size === 0) heap.clear();
     workerRunning = false;
     if (pending.size > 0) void runWorker();
   }
 }
-function enqueueSymbolIndexTask(parentPath, filePath, priority) {
+function enqueueSymbolIndexTask(parentPath, filePath, priority, sequence) {
   const normalizedParent = normalizeResolvedPath(parentPath);
   const normalizedFile = filePath.replace(/\\/g, "/").replace(/^\/+/, "");
   if (!normalizedFile) return;
-  if (symbolIndexFileIsReady(normalizedParent, normalizedFile)) return;
-  const key = taskKey(normalizedParent, normalizedFile);
+  const key = symbolIndexTaskKey(normalizedParent, normalizedFile);
   const existing = pending.get(key);
   if (existing != null && existing.priority >= priority) return;
-  pending.set(key, { parentPath: normalizedParent, filePath: normalizedFile, priority });
+  const task = { parentPath: normalizedParent, filePath: normalizedFile, priority, sequence };
+  pending.set(key, task);
+  heap.push(task);
   void runWorker();
 }
+function markLatestActiveSymbolIndexTask(parentPath, sequence) {
+  const normalizedParent = normalizeResolvedPath(parentPath);
+  const existing = latestActiveSequenceByParent.get(normalizedParent);
+  if (existing != null && existing >= sequence) return;
+  latestActiveSequenceByParent.set(normalizedParent, sequence);
+  for (const [key, task] of pending) {
+    if (task.parentPath === normalizedParent && task.sequence != null && task.sequence < sequence) {
+      pending.delete(key);
+    }
+  }
+  if (pending.size === 0) heap.clear();
+}
 
 // src/code-nav/symbol-index/scheduler/symbol-index-scheduler.ts
 var requestSeq = 0;
 var warmupSeq = 0;
 var warmupScheduled = /* @__PURE__ */ new Set();
+var warmupCompleted = /* @__PURE__ */ new Set();
 function scheduleSymbolIndexFile(parentPath, filePath) {
-  enqueueSymbolIndexTask(parentPath, filePath, 1e6 + ++requestSeq);
+  const sequence = ++requestSeq;
+  markLatestActiveSymbolIndexTask(parentPath, sequence);
+  enqueueSymbolIndexTask(parentPath, filePath, 1e6 + sequence, sequence);
 }
 function scheduleSymbolIndexImportNeighbors(parentPath, filePaths) {
   let priority = 5e5 + requestSeq;
   for (const filePath of filePaths) {
-    enqueueSymbolIndexTask(parentPath, filePath, priority);
+    enqueueSymbolIndexTask(parentPath, filePath, priority, requestSeq);
     priority -= 1;
   }
 }
 function scheduleSymbolIndexWarmup(parentPath) {
   const resolved = normalizeResolvedPath(parentPath);
+  if (warmupCompleted.has(resolved)) return;
   if (warmupScheduled.has(resolved)) return;
   warmupScheduled.add(resolved);
   setImmediate(() => {
     void (async () => {
       try {
+        const readyFiles = await loadSymbolIndexReadyFileSet(resolved);
         const walkState = createWalkYieldState();
         const yieldState = createCodeNavYieldState();
         await walkCodeNavFilesAsync(
           resolved,
           async (relPath) => {
             await yieldDuringCodeNavWork(yieldState);
-            if (!symbolIndexFileIsReady(resolved, relPath)) {
-              enqueueSymbolIndexTask(resolved, relPath, ++warmupSeq);
+            if (!readyFiles.has(relPath)) {
+              enqueueSymbolIndexTask(resolved, relPath, ++warmupSeq, requestSeq);
             }
           },
           walkState
         );
+        warmupCompleted.add(resolved);
       } finally {
         warmupScheduled.delete(resolved);
       }
     })();
   });
 }
-function scheduleSymbolIndexForRequest(parentPath, reqPath, importTargets) {
-  scheduleSymbolIndexFile(parentPath, reqPath);
-  scheduleSymbolIndexImportNeighbors(parentPath, importTargets);
-  scheduleSymbolIndexWarmup(parentPath);
-}
 
 // src/code-nav/symbol-index/lifecycle/normalize-symbol-index-path.ts
 import path24 from "node:path";
@@ -33242,27 +33428,23 @@ function normalizeSymbolIndexRelPath(parentPath, changedPath) {
 async function updateSymbolIndexForFile(parentPath, changedPath) {
   const relPath = normalizeSymbolIndexRelPath(parentPath, changedPath);
   if (relPath == null) return;
+  const resolved = normalizeResolvedPath(parentPath);
+  const { source, tags, imports } = await extractFileSymbolData(resolved, relPath);
+  await yieldToEventLoop();
   await withSymbolIndexSqliteLock(async () => {
-    const resolved = normalizeResolvedPath(parentPath);
-    const { source, tags, imports } = await extractFileSymbolData(resolved, relPath);
-    await yieldToEventLoop();
-    persistSymbolIndexFile(resolved, relPath, source, tags, imports);
+    await persistSymbolIndexFileAsync(resolved, relPath, source, tags, imports);
   });
 }
 async function removeSymbolIndexForFile(parentPath, changedPath) {
   const relPath = normalizeSymbolIndexRelPath(parentPath, changedPath);
   if (relPath == null) return;
+  const resolved = normalizeResolvedPath(parentPath);
   await withSymbolIndexSqliteLock(async () => {
-    removeSymbolIndexFile(normalizeResolvedPath(parentPath), relPath);
+    await removeSymbolIndexFileAsync(resolved, relPath);
   });
 }
 
 // src/code-nav/symbol-index/sqlite/symbol-index-import-sqlite.ts
-function listImportsForFile(db, parentId, filePath) {
-  const ctx = getSymbolIndexParentContextById(db, parentId);
-  if (ctx == null) return [];
-  return loadFileImports(db, ctx, filePath);
-}
 function prefersTypeImport(refKind) {
   return refKind === "type";
 }
@@ -33288,7 +33470,7 @@ function findImportBindingForLocalName(imports, localName, ref) {
 function defsByFileNameKey(filePath, name) {
   return `${filePath}\0${name}`;
 }
-function createNavigationLookups(db, parentId) {
+function createSnapshotNavigationLookups(db, parentId) {
   const ctx = getSymbolIndexParentContextById(db, parentId);
   if (ctx == null) {
     return {
@@ -33300,29 +33482,24 @@ function createNavigationLookups(db, parentId) {
   const fileDefsCache = /* @__PURE__ */ new Map();
   const defsByFileNameCache = /* @__PURE__ */ new Map();
   const importsCache = /* @__PURE__ */ new Map();
-  return {
-    loadFileDefs(filePath) {
-      let cached2 = fileDefsCache.get(filePath);
-      if (cached2) return cached2;
-      cached2 = loadFileTags(db, ctx, filePath).filter((row) => row.role === "def");
-      fileDefsCache.set(filePath, cached2);
-      return cached2;
-    },
-    lookupDefsInFileNamed(filePath, name) {
-      const key = defsByFileNameKey(filePath, name);
-      let cached2 = defsByFileNameCache.get(key);
-      if (cached2) return cached2;
-      cached2 = loadFileTags(db, ctx, filePath).filter((row) => row.role === "def" && row.name === name);
-      defsByFileNameCache.set(key, cached2);
-      return cached2;
-    },
-    lookupImportsForFile(filePath) {
-      let cached2 = importsCache.get(filePath);
-      if (cached2) return cached2;
-      cached2 = listImportsForFile(db, parentId, filePath);
-      importsCache.set(filePath, cached2);
-      return cached2;
+  for (const filePath of listEffectiveIndexedFilePaths(db, ctx)) {
+    const defs = loadFileTags(db, ctx, filePath).filter((row) => row.role === "def");
+    fileDefsCache.set(filePath, defs);
+    for (const def of defs) {
+      const key = defsByFileNameKey(filePath, def.name);
+      const existing = defsByFileNameCache.get(key);
+      if (existing) {
+        existing.push(def);
+      } else {
+        defsByFileNameCache.set(key, [def]);
+      }
     }
+    importsCache.set(filePath, loadFileImports(db, ctx, filePath));
+  }
+  return {
+    loadFileDefs: (filePath) => fileDefsCache.get(filePath) ?? [],
+    lookupDefsInFileNamed: (filePath, name) => defsByFileNameCache.get(defsByFileNameKey(filePath, name)) ?? [],
+    lookupImportsForFile: (filePath) => importsCache.get(filePath) ?? []
   };
 }
 
@@ -33331,11 +33508,11 @@ function refScopeChain(ref) {
   const parsed = parseScopeChain(ref.scope_chain);
   if (parsed.length > 0) return parsed;
   if (ref.scope_start_line != null && ref.scope_start_column != null) {
-    const chain3 = [{ startLine: ref.scope_start_line, startColumn: ref.scope_start_column }];
+    const chain2 = [{ startLine: ref.scope_start_line, startColumn: ref.scope_start_column }];
     if (ref.parent_scope_start_line != null && ref.parent_scope_start_column != null) {
-      chain3.push({ startLine: ref.parent_scope_start_line, startColumn: ref.parent_scope_start_column });
+      chain2.push({ startLine: ref.parent_scope_start_line, startColumn: ref.parent_scope_start_column });
     }
-    return chain3;
+    return chain2;
   }
   return [];
 }
@@ -33346,17 +33523,17 @@ function defAtScopeAnchor(def, anchor) {
   return scopesMatch(def.scope_start_line, def.scope_start_column, anchor.startLine, anchor.startColumn) || scopesMatch(def.start_line, def.start_column, anchor.startLine, anchor.startColumn);
 }
 function defVisibleInRefScopeChain(def, ref) {
-  const chain3 = refScopeChain(ref);
-  if (chain3.length === 0) return isModuleLevelDef2(def);
-  return anchorInScopeChain(def.scope_start_line, def.scope_start_column, chain3) || anchorInScopeChain(def.start_line, def.start_column, chain3.slice(1));
+  const chain2 = refScopeChain(ref);
+  if (chain2.length === 0) return isModuleLevelDef2(def);
+  return anchorInScopeChain(def.scope_start_line, def.scope_start_column, chain2) || anchorInScopeChain(def.start_line, def.start_column, chain2.slice(1));
 }
 function scopeDepthInChain(def, ref) {
-  const chain3 = refScopeChain(ref);
-  for (let index = 0; index < chain3.length; index++) {
-    const anchor = chain3[index];
+  const chain2 = refScopeChain(ref);
+  for (let index = 0; index < chain2.length; index++) {
+    const anchor = chain2[index];
     if (defAtScopeAnchor(def, anchor)) return index;
   }
-  return chain3.length;
+  return chain2.length;
 }
 
 // src/code-nav/resolution/navigation/confidence.ts
@@ -33522,9 +33699,9 @@ function resolveScopeLevelCandidates(defs) {
 function resolveLocalDefinitions(ref, fileDefs) {
   const named = fileDefs.filter((def) => def.name === ref.name && declaredBeforeRef(def, ref));
   if (named.length === 0) return [];
-  const chain3 = refScopeChain(ref);
-  if (chain3.length > 0) {
-    for (const anchor of chain3) {
+  const chain2 = refScopeChain(ref);
+  if (chain2.length > 0) {
+    for (const anchor of chain2) {
       const atLevel = named.filter((def) => defAtScopeAnchor(def, anchor));
       if (atLevel.length > 0) return resolveScopeLevelCandidates(atLevel);
     }
@@ -33539,10 +33716,10 @@ function resolveLocalDefinitions(ref, fileDefs) {
 function resolveLocalDefinitionCandidates(ref, fileDefs) {
   const named = fileDefs.filter((def) => def.name === ref.name && declaredBeforeRef(def, ref));
   if (named.length === 0) return [];
-  const chain3 = refScopeChain(ref);
-  if (chain3.length === 0) return resolveScopeLevelCandidates(named.filter((def) => isModuleLevelDef2(def)));
+  const chain2 = refScopeChain(ref);
+  if (chain2.length === 0) return resolveScopeLevelCandidates(named.filter((def) => isModuleLevelDef2(def)));
   const visible = named.filter((def) => {
-    if (chain3.some((anchor) => defAtScopeAnchor(def, anchor))) return true;
+    if (chain2.some((anchor) => defAtScopeAnchor(def, anchor))) return true;
     if (defVisibleInRefScopeChain(def, ref)) return true;
     return isModuleLevelDef2(def);
   });
@@ -33723,32 +33900,41 @@ function pickPrimaryTagAtPosition(rows, filePath, line, column) {
 async function queryDefinitionsNavigation(parentPath, filePath, line, column) {
   await yieldToEventLoop();
   const resolved = normalizeResolvedPath(parentPath);
-  const result = withCodeNavCacheSqliteSync((db) => {
+  const snapshot = await withCodeNavCacheSqlite((db) => {
     const ctx = getSymbolIndexParentContext(db, resolved);
     if (ctx == null) return null;
     const fileRows = loadFileTags(db, ctx, filePath);
     const primary = pickPrimaryTagAtPosition(fileRows, filePath, line, column);
     if (!primary) return null;
     const atPos = findTagsAtPosition(fileRows, filePath, line, column);
-    if (primary.kind === "module" && primary.nav_target_path) {
-      return { definitions: [modulePathLocation(primary)], confidentTarget: true };
-    }
-    const onDefinition = atPos.some((row) => row.role === "def");
-    if (onDefinition) {
-      const defs = atPos.filter((row) => row.role === "def").map(rowToLocation);
-      return { definitions: defs, confidentTarget: defs.length === 1 };
-    }
-    const lookups = createNavigationLookups(db, ctx.parentId);
+    const lookups = createSnapshotNavigationLookups(db, ctx.parentId);
     const workspaceFiles = listWorkspaceFiles(db, resolved, filePath);
-    const navCtx = buildNavigationContext(filePath, primary, lookups, workspaceFiles);
-    const navigation = resolveNavigation(navCtx);
-    return {
-      definitions: navigation.definitions.map(rowToLocation),
-      confidentTarget: navigation.confidentTarget
-    };
+    return { primary, atPos, lookups, workspaceFiles };
   });
+  if (snapshot == null) {
+    await yieldToEventLoop();
+    return { definitions: [], confidentTarget: false };
+  }
+  const result = resolveDefinitionsFromSnapshot(filePath, snapshot);
   await yieldToEventLoop();
-  return result ?? { definitions: [], confidentTarget: false };
+  return result;
+}
+function resolveDefinitionsFromSnapshot(filePath, snapshot) {
+  const { primary, atPos, lookups, workspaceFiles } = snapshot;
+  if (primary.kind === "module" && primary.nav_target_path) {
+    return { definitions: [modulePathLocation(primary)], confidentTarget: true };
+  }
+  const onDefinition = atPos.some((row) => row.role === "def");
+  if (onDefinition) {
+    const defs = atPos.filter((row) => row.role === "def").map(rowToLocation);
+    return { definitions: defs, confidentTarget: defs.length === 1 };
+  }
+  const navCtx = buildNavigationContext(filePath, primary, lookups, workspaceFiles);
+  const navigation = resolveNavigation(navCtx);
+  return {
+    definitions: navigation.definitions.map(rowToLocation),
+    confidentTarget: navigation.confidentTarget
+  };
 }
 async function queryDefinitionsAt(parentPath, filePath, line, column) {
   return (await queryDefinitionsNavigation(parentPath, filePath, line, column)).definitions;
@@ -33761,7 +33947,7 @@ async function queryDefinitionAt(parentPath, filePath, line, column) {
 async function queryReferencesAt(parentPath, filePath, line, column) {
   await yieldToEventLoop();
   const resolved = normalizeResolvedPath(parentPath);
-  const rows = withCodeNavCacheSqliteSync((db) => {
+  const rows = await withCodeNavCacheSqlite((db) => {
     const ctx = getSymbolIndexParentContext(db, resolved);
     if (ctx == null) return null;
     const fileRows = loadFileTags(db, ctx, filePath);
@@ -33796,23 +33982,28 @@ function rowToSymbolSpan(row, clickable) {
 async function querySymbolsInFile(parentPath, filePath) {
   await yieldToEventLoop();
   const resolved = normalizeResolvedPath(parentPath);
-  const spans = withCodeNavCacheSqliteSync((db) => {
+  const snapshot = await withCodeNavCacheSqlite((db) => {
     const ctx = getSymbolIndexParentContext(db, resolved);
-    if (ctx == null) return [];
+    if (ctx == null) return null;
     const rows = loadFileTags(db, ctx, filePath);
-    if (rows.length === 0) return [];
-    const lookups = createNavigationLookups(db, ctx.parentId);
+    if (rows.length === 0) return null;
+    const lookups = createSnapshotNavigationLookups(db, ctx.parentId);
     const workspaceFiles = listWorkspaceFiles(db, resolved, filePath);
-    const baseCtx = buildNavigationContext(
-      filePath,
-      rows[0] ?? emptyRefRow(filePath),
-      lookups,
-      workspaceFiles
-    );
-    return rows.map((row) => {
-      const navCtx = { ...baseCtx, ref: row };
-      return rowToSymbolSpan(row, refHasResolvableDefinitions(navCtx));
-    });
+    return { rows, lookups, workspaceFiles };
+  });
+  if (snapshot == null) {
+    await yieldToEventLoop();
+    return [];
+  }
+  const baseCtx = buildNavigationContext(
+    filePath,
+    snapshot.rows[0] ?? emptyRefRow(filePath),
+    snapshot.lookups,
+    snapshot.workspaceFiles
+  );
+  const spans = snapshot.rows.map((row) => {
+    const navCtx = { ...baseCtx, ref: row };
+    return rowToSymbolSpan(row, refHasResolvableDefinitions(navCtx));
   });
   await yieldToEventLoop();
   return spans;
@@ -34815,8 +35006,8 @@ async function execGitFile(args, options) {
 }
 
 // src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path73) {
-  return path73.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path75) {
+  return path75.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // src/git/changes/parse/parse-name-status-entries.ts
@@ -35103,9 +35294,9 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
 // src/agents/acp/put-summarize-change-summaries.ts
 async function putEncryptedChangeSummaryRows(params) {
   const base = params.apiBaseUrl.replace(/\/+$/, "");
-  const entries = params.rows.map(({ path: path73, summary }) => {
+  const entries = params.rows.map(({ path: path75, summary }) => {
     const enc = params.e2ee.encryptFields({ summary }, ["summary"]);
-    return { path: path73, summary: JSON.stringify(enc) };
+    return { path: path75, summary: JSON.stringify(enc) };
   });
   const res = await fetch(
     `${base}/internal/sessions/${encodeURIComponent(params.sessionId)}/follow-ups/summarize-changes`,
@@ -35940,8 +36131,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path73) {
-  return path73 instanceof String && cache.has(path73);
+function isPathSpec(path75) {
+  return path75 instanceof String && cache.has(path75);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -36030,8 +36221,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path73) {
-  return (0, import_file_exists.exists)(path73, import_file_exists.FOLDER);
+function folderExists(path75) {
+  return (0, import_file_exists.exists)(path75, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -36435,8 +36626,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path73) {
-      return /^\.(git)?$/.test(path73.trim());
+    parser(path75) {
+      return /^\.(git)?$/.test(path75.trim());
     }
   };
 }
@@ -36870,11 +37061,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path73, line, preview] = input.split(NULL);
-    paths.add(path73);
-    (results[path73] = results[path73] || []).push({
+    const [path75, line, preview] = input.split(NULL);
+    paths.add(path75);
+    (results[path75] = results[path75] || []).push({
       line: asNumber(line),
-      path: path73,
+      path: path75,
       preview
     });
   });
@@ -37639,14 +37830,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path73, text) {
+function parseInit(bare, path75, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path73, false, result[1]);
+    return new InitSummary(bare, path75, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path73, true, result[1]);
+    return new InitSummary(bare, path75, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -37657,7 +37848,7 @@ function parseInit(bare, path73, text) {
       break;
     }
   }
-  return new InitSummary(bare, path73, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path75, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -37666,9 +37857,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path73, existing, gitDir) {
+      constructor(bare, path75, existing, gitDir) {
         this.bare = bare;
-        this.path = path73;
+        this.path = path75;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -37680,7 +37871,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path73, customArgs) {
+function initTask(bare = false, path75, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -37689,7 +37880,7 @@ function initTask(bare = false, path73, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path73, text);
+      return parseInit(commands.includes("--bare"), path75, text);
     }
   };
 }
@@ -38505,12 +38696,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path73, index, working_dir) {
-        this.path = path73;
+      constructor(path75, index, working_dir) {
+        this.path = path75;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path73) || [null, path73, path73];
+          const detail = fromPathRegex.exec(path75) || [null, path75, path75];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -38541,14 +38732,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path73) {
+  function data(index, workingDir, path75) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path73);
+      handler(result, path75);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path73, index, workingDir));
+      result.files.push(new FileStatusSummary(path75, index, workingDir));
     }
   }
 }
@@ -38821,15 +39012,15 @@ var init_simple_git_api = __esm2({
         this._executor = _executor;
       }
       _runTask(task, then) {
-        const chain3 = this._executor.chain();
-        const promise2 = chain3.push(task);
+        const chain2 = this._executor.chain();
+        const promise2 = chain2.push(task);
         if (then) {
           taskCallback(task, promise2, then);
         }
         return Object.create(this, {
           then: { value: promise2.then.bind(promise2) },
           catch: { value: promise2.catch.bind(promise2) },
-          _executor: { value: chain3 }
+          _executor: { value: chain2 }
         });
       }
       add(files) {
@@ -38857,9 +39048,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path73, write) {
+      hashObject(path75, write) {
         return this._runTask(
-          hashObjectTask(path73, write === true),
+          hashObjectTask(path75, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -39212,8 +39403,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path73 = input.trim().replace(/^["']|["']$/g, "");
-  return path73 && normalize3(path73);
+  const path75 = input.trim().replace(/^["']|["']$/g, "");
+  return path75 && normalize3(path75);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -39527,8 +39718,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path73) {
-  return subModuleTask(["add", repo, path73]);
+function addSubModuleTask(repo, path75) {
+  return subModuleTask(["add", repo, path75]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -39861,8 +40052,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path73, then) {
-      return this._runTask(addSubModuleTask2(repo, path73), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path75, then) {
+      return this._runTask(addSubModuleTask2(repo, path75), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -40598,8 +40789,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path73, entry] of parseNumstatEntries(lines)) {
-    m.set(path73, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path75, entry] of parseNumstatEntries(lines)) {
+    m.set(path75, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -42643,37 +42834,16 @@ function defaultWorktreesRootPath() {
 }
 
 // src/files/watch-file-index.ts
-import fs37 from "node:fs";
-import { watch } from "node:fs";
-import path57 from "node:path";
+import path59 from "node:path";
 
 // src/files/index/build-file-index.ts
 import path55 from "node:path";
 
 // src/files/index/file-index-sqlite-lock.ts
-import fs36 from "node:fs";
-function isSqliteCorruptError2(e) {
-  const msg = e instanceof Error ? e.message : String(e);
-  return msg.includes("malformed") || msg.includes("database disk image is malformed") || msg.includes("corrupt");
-}
-var chain2 = Promise.resolve();
+var fileIndexChain = Promise.resolve();
 function withFileIndexSqliteLock(fn) {
-  const run = async () => {
-    try {
-      return await Promise.resolve(fn());
-    } catch (e) {
-      if (!isSqliteCorruptError2(e)) throw e;
-      closeAllCodeNavCacheSqliteConnections();
-      try {
-        fs36.unlinkSync(getCodeNavCacheSqlitePath());
-      } catch {
-      }
-      chain2 = Promise.resolve();
-      return await Promise.resolve(fn());
-    }
-  };
-  const next = chain2.then(run);
-  chain2 = next.then(
+  const next = fileIndexChain.then(() => Promise.resolve(fn()));
+  fileIndexChain = next.then(
     () => void 0,
     () => void 0
   );
@@ -42694,6 +42864,14 @@ async function collectWorkspacePathsAsync(resolved) {
   return paths;
 }
 
+// src/files/index/file-index-persist-constants.ts
+var FILE_INDEX_INSERT_BUFFER = 2048;
+
+// src/files/index/file-index-persist-shutdown.ts
+function assertFileIndexPersistNotShutdown() {
+  if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
+}
+
 // src/files/index/file-index-parent-path.ts
 function upsertFileIndexParentPath(db, resolved) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -42708,57 +42886,56 @@ function upsertFileIndexParentPath(db, resolved) {
   return Number(row.id);
 }
 
-// src/files/index/persist-file-index.ts
-var FILE_INDEX_INTERRUPT_CHECK_EVERY = 256;
-function assertNotShutdown2() {
-  if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
+// src/files/index/file-index-persist-transaction.ts
+function clearFileIndexChildPaths(db, resolved) {
+  runCodeNavCacheWriteTransaction(db, () => {
+    const parentId = upsertFileIndexParentPath(db, resolved);
+    db.run("DELETE FROM file_index_child_path WHERE parent_id = ?", [parentId]);
+  });
 }
-function persistFileIndexPaths(resolved, paths) {
-  return withCodeNavCacheSqliteSync((db) => {
-    let pathCount = 0;
-    db.run("BEGIN IMMEDIATE");
+function insertFileIndexChildPathBatch(db, resolved, paths) {
+  return runCodeNavCacheWriteTransaction(db, () => {
+    const parentId = upsertFileIndexParentPath(db, resolved);
+    const ins = db.prepare(
+      "INSERT INTO file_index_child_path (parent_id, path) VALUES (?, ?)"
+    );
     try {
-      const parentId = upsertFileIndexParentPath(db, resolved);
-      db.run("DELETE FROM file_index_child_path WHERE parent_id = ?", [parentId]);
-      const ins = db.prepare("INSERT INTO file_index_child_path (parent_id, path) VALUES (?, ?)");
-      try {
-        let batch = 0;
-        for (const rel of paths) {
-          if (++batch >= FILE_INDEX_INTERRUPT_CHECK_EVERY) {
-            batch = 0;
-            assertNotShutdown2();
-          }
-          ins.run([parentId, rel]);
-          pathCount += 1;
-        }
-      } finally {
-        ins.finalize();
+      for (const rel of paths) {
+        ins.run([parentId, rel]);
       }
-      db.run("COMMIT");
-    } catch (e) {
-      try {
-        db.run("ROLLBACK");
-      } catch {
-      }
-      throw e;
+      return paths.length;
+    } finally {
+      ins.finalize();
     }
-    return pathCount;
   });
 }
 
+// src/files/index/persist-file-index-paths.ts
+async function persistFileIndexPathsAsync(resolved, paths) {
+  await withCodeNavCacheSqlite((db) => clearFileIndexChildPaths(db, resolved));
+  let pathCount = 0;
+  for (let offset = 0; offset < paths.length; offset += FILE_INDEX_INSERT_BUFFER) {
+    assertFileIndexPersistNotShutdown();
+    const batch = paths.slice(offset, offset + FILE_INDEX_INSERT_BUFFER);
+    pathCount += await withCodeNavCacheSqlite((db) => insertFileIndexChildPathBatch(db, resolved, batch));
+    await yieldToEventLoop();
+  }
+  return pathCount;
+}
+
 // src/files/index/build-file-index.ts
-function assertNotShutdown3() {
+function assertNotShutdown2() {
   if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
 }
 async function buildFileIndexAsync(cwd) {
-  return withFileIndexSqliteLock(async () => {
-    const resolved = path55.resolve(cwd);
-    await yieldToEventLoop();
-    assertNotShutdown3();
-    const paths = await collectWorkspacePathsAsync(resolved);
-    await yieldToEventLoop();
-    assertNotShutdown3();
-    const pathCount = persistFileIndexPaths(resolved, paths);
+  const resolved = path55.resolve(cwd);
+  await yieldToEventLoop();
+  assertNotShutdown2();
+  const paths = await collectWorkspacePathsAsync(resolved);
+  await yieldToEventLoop();
+  assertNotShutdown2();
+  return await withFileIndexSqliteLock(async () => {
+    const pathCount = await persistFileIndexPathsAsync(resolved, paths);
     return { pathCount };
   });
 }
@@ -42823,8 +43000,9 @@ async function ensureFileIndexAsync(cwd) {
   return { ...await buildFileIndexAsync(resolved), fromCache: false };
 }
 
-// src/files/watch-file-index.ts
-var DEBOUNCE_MS = 900;
+// src/files/index/file-index-fs-watcher.ts
+import { watch } from "node:fs";
+var FILE_INDEX_WATCH_DEBOUNCE_MS = 900;
 function shouldIgnoreRelative(rel) {
   const n = rel.replace(/\\/g, "/");
   return n.split("/").some((segment) => shouldSkipWorkspaceWalkEntry(segment));
@@ -42834,7 +43012,7 @@ function attachWatchErrorLog(w) {
     console.error("[file-index] File watcher error:", err);
   });
 }
-function createFsWatcher(resolved, schedule) {
+function createFileIndexFsWatcher(resolved, schedule) {
   const onEvent = (_event, filename) => {
     if (filename != null) {
       const rel = typeof filename === "string" ? filename.replace(/\\/g, "/") : filename.toString("utf8").replace(/\\/g, "/");
@@ -42861,11 +43039,15 @@ function createFsWatcher(resolved, schedule) {
     throw e;
   }
 }
+
+// src/files/index/file-index-incremental-symbol-updates.ts
+import fs36 from "node:fs";
+import path57 from "node:path";
 async function applyIncrementalSymbolIndexUpdates(resolved, relPaths) {
   for (const rel of relPaths) {
     const absPath = path57.join(resolved, rel);
     try {
-      const stat3 = await fs37.promises.stat(absPath);
+      const stat3 = await fs36.promises.stat(absPath);
       if (stat3.isFile()) {
         await updateSymbolIndexForFile(resolved, absPath);
       } else {
@@ -42881,54 +43063,80 @@ async function applyIncrementalSymbolIndexUpdates(resolved, relPaths) {
     await yieldToEventLoop();
   }
 }
-function startFileIndexWatcher(cwd = getBridgeRoot()) {
-  const resolved = path57.resolve(cwd);
-  void buildFileIndexAsync(resolved).catch((e) => {
+
+// src/files/index/file-index-initial-builds.ts
+import path58 from "node:path";
+async function runInitialIndexBuilds(cwd = getBridgeRoot()) {
+  const resolved = path58.resolve(cwd);
+  try {
+    await buildFileIndexAsync(resolved);
+    await buildSymbolIndexAsync(resolved);
+  } catch (e) {
     if (e instanceof CliSqliteInterrupted) return;
     console.error("[file-index] Initial index build failed:", e);
+  }
+}
+function scheduleInitialIndexBuilds(cwd = getBridgeRoot()) {
+  setImmediate(() => {
+    void runInitialIndexBuilds(cwd);
   });
-  void buildSymbolIndexAsync(resolved).catch((e) => {
-    if (e instanceof CliSqliteInterrupted) return;
-    console.error("[code-nav] Initial symbol index build failed:", e);
-  });
+}
+
+// src/files/watch-file-index.ts
+var MAX_INCREMENTAL_SYMBOL_UPDATES = 512;
+function startFileIndexWatcher(cwd = getBridgeRoot()) {
+  const resolved = path59.resolve(cwd);
   let timer = null;
   const pendingSymbolUpdates = /* @__PURE__ */ new Set();
   let needsFullSymbolRebuild = false;
+  let rebuildRunning = false;
+  let rebuildQueued = false;
   const runRebuild = () => {
-    void buildFileIndexAsync(resolved).catch((e) => {
-      if (e instanceof CliSqliteInterrupted) return;
-      console.error("[file-index] Watch rebuild failed:", e);
-    });
-    if (needsFullSymbolRebuild) {
-      needsFullSymbolRebuild = false;
-      pendingSymbolUpdates.clear();
-      void buildSymbolIndexAsync(resolved).catch((e) => {
-        if (e instanceof CliSqliteInterrupted) return;
-        console.error("[code-nav] Watch rebuild failed:", e);
-      });
+    if (rebuildRunning) {
+      rebuildQueued = true;
       return;
     }
-    const relPaths = [...pendingSymbolUpdates];
+    rebuildRunning = true;
+    const fullSymbol = needsFullSymbolRebuild;
+    needsFullSymbolRebuild = false;
+    const relPaths = fullSymbol ? [] : [...pendingSymbolUpdates];
     pendingSymbolUpdates.clear();
-    if (relPaths.length === 0) return;
-    void applyIncrementalSymbolIndexUpdates(resolved, relPaths).catch((e) => {
+    void buildFileIndexAsync(resolved).then(async () => {
+      if (fullSymbol) {
+        await buildSymbolIndexAsync(resolved);
+        return;
+      }
+      if (relPaths.length === 0) return;
+      await applyIncrementalSymbolIndexUpdates(resolved, relPaths);
+    }).catch((e) => {
       if (e instanceof CliSqliteInterrupted) return;
-      console.error("[code-nav] Incremental watch update failed:", e);
+      console.error("[file-index] Watch rebuild failed:", e);
+    }).finally(() => {
+      rebuildRunning = false;
+      if (rebuildQueued || needsFullSymbolRebuild || pendingSymbolUpdates.size > 0) {
+        rebuildQueued = false;
+        setImmediate(runRebuild);
+      }
     });
   };
   const schedule = (relPath) => {
-    if (relPath != null) {
+    if (relPath != null && !needsFullSymbolRebuild) {
       pendingSymbolUpdates.add(relPath);
+      if (pendingSymbolUpdates.size > MAX_INCREMENTAL_SYMBOL_UPDATES) {
+        pendingSymbolUpdates.clear();
+        needsFullSymbolRebuild = true;
+      }
     } else {
+      pendingSymbolUpdates.clear();
       needsFullSymbolRebuild = true;
     }
     if (timer) clearTimeout(timer);
     timer = setTimeout(() => {
       timer = null;
       runRebuild();
-    }, DEBOUNCE_MS);
+    }, FILE_INDEX_WATCH_DEBOUNCE_MS);
   };
-  const watcher = createFsWatcher(resolved, schedule);
+  const watcher = createFileIndexFsWatcher(resolved, schedule);
   return () => {
     if (timer) {
       clearTimeout(timer);
@@ -42939,7 +43147,7 @@ function startFileIndexWatcher(cwd = getBridgeRoot()) {
 }
 
 // src/connection/create-bridge-connection.ts
-import * as path71 from "node:path";
+import * as path73 from "node:path";
 
 // src/dev-servers/manager/dev-server-manager.ts
 import { rm as rm2 } from "node:fs/promises";
@@ -42983,7 +43191,7 @@ function forceKillChild(proc, log2, shortId, graceMs) {
 }
 
 // src/dev-servers/process/wire-dev-server-child-process.ts
-import fs38 from "node:fs";
+import fs37 from "node:fs";
 
 // src/dev-servers/manager/forward-pipe.ts
 function forwardChildPipe(childReadable, terminal, onData) {
@@ -43019,7 +43227,7 @@ function wireDevServerChildProcess(d) {
         d.setPollInterval(void 0);
         return;
       }
-      fs38.readFile(d.mergedLogPath, (err, buf) => {
+      fs37.readFile(d.mergedLogPath, (err, buf) => {
         if (err || (d.getSpawnGeneration() ?? 0) !== d.scheduledGen) return;
         if (buf.length <= d.mergedReadPos.value) return;
         const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
@@ -43057,7 +43265,7 @@ ${errTail}` : ""}`);
       d.sendStatus(code === 0 || code == null ? "stopped" : "error", detail, tails);
     };
     if (mergedPath) {
-      fs38.readFile(mergedPath, (err, buf) => {
+      fs37.readFile(mergedPath, (err, buf) => {
         if (!err && buf.length > d.mergedReadPos.value) {
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
@@ -43159,13 +43367,13 @@ function parseDevServerDefs(servers) {
 }
 
 // src/dev-servers/manager/shell-spawn/utils.ts
-import fs39 from "node:fs";
+import fs38 from "node:fs";
 function isSpawnEbadf(e) {
   return typeof e === "object" && e !== null && "code" in e && e.code === "EBADF";
 }
 function rmDirQuiet(dir) {
   try {
-    fs39.rmSync(dir, { recursive: true, force: true });
+    fs38.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -43173,7 +43381,7 @@ var cachedDevNullReadFd;
 function devNullReadFd() {
   if (cachedDevNullReadFd === void 0) {
     const devPath = process.platform === "win32" ? "nul" : "/dev/null";
-    cachedDevNullReadFd = fs39.openSync(devPath, "r");
+    cachedDevNullReadFd = fs38.openSync(devPath, "r");
   }
   return cachedDevNullReadFd;
 }
@@ -43247,15 +43455,15 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
 
 // src/dev-servers/manager/shell-spawn/try-spawn-merged-log-file.ts
 import { spawn as spawn7 } from "node:child_process";
-import fs40 from "node:fs";
+import fs39 from "node:fs";
 import { tmpdir } from "node:os";
-import path58 from "node:path";
+import path60 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal) {
-  const tmpRoot = fs40.mkdtempSync(path58.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path58.join(tmpRoot, "combined.log");
+  const tmpRoot = fs39.mkdtempSync(path60.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path60.join(tmpRoot, "combined.log");
   let logFd;
   try {
-    logFd = fs40.openSync(logPath, "a");
+    logFd = fs39.openSync(logPath, "a");
   } catch {
     rmDirQuiet(tmpRoot);
     return null;
@@ -43274,7 +43482,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
     } else {
       proc = spawn7("/bin/sh", ["-c", command], { env, cwd, stdio, ...signal ? { signal } : {} });
     }
-    fs40.closeSync(logFd);
+    fs39.closeSync(logFd);
     return {
       proc,
       pipedStdoutStderr: true,
@@ -43283,7 +43491,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
     };
   } catch (e) {
     try {
-      fs40.closeSync(logFd);
+      fs39.closeSync(logFd);
     } catch {
     }
     rmDirQuiet(tmpRoot);
@@ -43294,22 +43502,22 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
 
 // src/dev-servers/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
 import { spawn as spawn8 } from "node:child_process";
-import fs41 from "node:fs";
+import fs40 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path59 from "node:path";
+import path61 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal) {
-  const tmpRoot = fs41.mkdtempSync(path59.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path59.join(tmpRoot, "combined.log");
-  const innerPath = path59.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path59.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs40.mkdtempSync(path61.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path61.join(tmpRoot, "combined.log");
+  const innerPath = path61.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path61.join(tmpRoot, "_run.sh");
   try {
-    fs41.writeFileSync(innerPath, `#!/bin/sh
+    fs40.writeFileSync(innerPath, `#!/bin/sh
 ${command}
 `);
-    fs41.writeFileSync(
+    fs40.writeFileSync(
       runnerPath,
       `#!/bin/sh
 cd ${shSingleQuote(cwd)}
@@ -43335,13 +43543,13 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal) {
-  const tmpRoot = fs41.mkdtempSync(path59.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path59.join(tmpRoot, "combined.log");
-  const runnerPath = path59.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs40.mkdtempSync(path61.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path61.join(tmpRoot, "combined.log");
+  const runnerPath = path61.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
-    fs41.writeFileSync(
+    fs40.writeFileSync(
       runnerPath,
       `@ECHO OFF\r
 CD /D ${q(cwd)}\r
@@ -44166,7 +44374,7 @@ function attachFirehoseAfterIdentified(ctx, params) {
   function scheduleFirehoseRetryAfterDrop(closeMeta) {
     if (state.closedByUser) return;
     const meta = closeMeta ?? state.lastFirehoseReconnectCloseMeta ?? void 0;
-    const delay2 = applyTieredReconnectPlanAndLog(
+    const delay3 = applyTieredReconnectPlanAndLog(
       state.firehoseOutage,
       logFn,
       PREVIEW_TUNNEL_SERVICE_LABEL,
@@ -44175,7 +44383,7 @@ function attachFirehoseAfterIdentified(ctx, params) {
       meta?.reason
     );
     armReconnectDelayTimer({
-      delayMs: delay2,
+      delayMs: delay3,
       bumpAttempt: () => {
         state.firehoseReconnectAttempt += 1;
       },
@@ -44286,17 +44494,17 @@ async function yieldSkillDiscoveryWork(entryCount) {
 }
 
 // src/skills/discovery/discover-local-skills.ts
-import fs42 from "node:fs";
-import path60 from "node:path";
+import fs41 from "node:fs";
+import path62 from "node:path";
 function collectSkillFromDir(rel, base, name, seenKeys, out) {
-  const dir = path60.join(base, name);
+  const dir = path62.join(base, name);
   try {
-    if (!fs42.statSync(dir).isDirectory()) return;
+    if (!fs41.statSync(dir).isDirectory()) return;
   } catch {
     return;
   }
-  const skillMd = path60.join(dir, "SKILL.md");
-  if (!fs42.existsSync(skillMd)) return;
+  const skillMd = path62.join(dir, "SKILL.md");
+  if (!fs41.existsSync(skillMd)) return;
   const key = `${rel}/${name}`;
   if (seenKeys.has(key)) return;
   seenKeys.add(key);
@@ -44308,11 +44516,11 @@ async function discoverLocalSkillsAsync(cwd) {
   let work = 0;
   for (const rel of SKILL_DISCOVERY_ROOTS) {
     await yieldSkillDiscoveryWork(++work);
-    const base = path60.join(cwd, rel);
-    if (!fs42.existsSync(base) || !fs42.statSync(base).isDirectory()) continue;
+    const base = path62.join(cwd, rel);
+    if (!fs41.existsSync(base) || !fs41.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
-      entries = fs42.readdirSync(base);
+      entries = fs41.readdirSync(base);
     } catch {
       continue;
     }
@@ -44325,16 +44533,16 @@ async function discoverLocalSkillsAsync(cwd) {
 }
 
 // src/skills/discovery/discover-skill-layout-roots.ts
-import fs43 from "node:fs";
-import path61 from "node:path";
+import fs42 from "node:fs";
+import path63 from "node:path";
 function collectLayoutSkill(rel, base, name, skills2) {
-  const dir = path61.join(base, name);
+  const dir = path63.join(base, name);
   try {
-    if (!fs43.statSync(dir).isDirectory()) return;
+    if (!fs42.statSync(dir).isDirectory()) return;
   } catch {
     return;
   }
-  if (!fs43.existsSync(path61.join(dir, "SKILL.md"))) return;
+  if (!fs42.existsSync(path63.join(dir, "SKILL.md"))) return;
   const relPath = `${rel}/${name}`.replace(/\\/g, "/");
   skills2.push({ name, relPath });
 }
@@ -44343,11 +44551,11 @@ async function discoverSkillLayoutRootsAsync(cwd) {
   let work = 0;
   for (const rel of SKILL_DISCOVERY_ROOTS) {
     await yieldSkillDiscoveryWork(++work);
-    const base = path61.join(cwd, rel);
-    if (!fs43.existsSync(base) || !fs43.statSync(base).isDirectory()) continue;
+    const base = path63.join(cwd, rel);
+    if (!fs42.existsSync(base) || !fs42.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
-      entries = fs43.readdirSync(base);
+      entries = fs42.readdirSync(base);
     } catch {
       continue;
     }
@@ -44435,27 +44643,6 @@ function buildBridgeUrl(apiUrl, workspaceId, authToken) {
   return `${base}/ws/bridge?${params.toString()}`;
 }
 
-// src/connection/report-git-repos.ts
-function reportGitRepos(getWs, log2) {
-  setImmediate(() => {
-    discoverGitRepos().then((repos) => {
-      if (repos.length > 0) {
-        const socket = getWs();
-        if (socket) {
-          sendWsMessage(socket, {
-            type: "git_repos",
-            repos: repos.map((r) => ({ absolutePath: r.absolutePath, remoteUrl: r.remoteUrl }))
-          });
-        }
-      }
-    }).catch((err) => {
-      log2(
-        `[Bridge service] Git repository discovery failed: ${err instanceof Error ? err.message : String(err)}`
-      );
-    });
-  });
-}
-
 // src/types/api-to-bridge-messages.ts
 var API_TO_BRIDGE_MESSAGE_TYPES = [
   "auth_token",
@@ -44712,11 +44899,11 @@ function syncRunningTurnQueueKeys(turns, queueKey) {
 }
 
 // src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
-import fs45 from "node:fs";
+import fs44 from "node:fs";
 
 // src/git/snapshot/capture.ts
-import * as fs44 from "node:fs";
-import * as path62 from "node:path";
+import * as fs43 from "node:fs";
+import * as path64 from "node:path";
 
 // src/git/snapshot/git.ts
 async function gitStashCreate(repoRoot, log2) {
@@ -44756,7 +44943,7 @@ async function gitRun(repoRoot, args, log2, label) {
 async function resolveSnapshotRepoRoots(options) {
   const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
   if (worktreePaths?.length) {
-    const uniq = [...new Set(worktreePaths.map((p) => path62.resolve(p)))];
+    const uniq = [...new Set(worktreePaths.map((p) => path64.resolve(p)))];
     return uniq;
   }
   try {
@@ -44764,7 +44951,7 @@ async function resolveSnapshotRepoRoots(options) {
     const mapped = repos.map((r) => r.absolutePath);
     const sid = sessionId?.trim();
     if (sid) {
-      const filtered = mapped.filter((root) => path62.basename(root) === sid);
+      const filtered = mapped.filter((root) => path64.basename(root) === sid);
       if (filtered.length > 0) return filtered;
     }
     return mapped;
@@ -44786,7 +44973,7 @@ async function capturePreTurnSnapshot(options) {
   });
   const dir = snapshotsDirForCwd(agentCwd);
   try {
-    fs44.mkdirSync(dir, { recursive: true });
+    fs43.mkdirSync(dir, { recursive: true });
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -44795,9 +44982,9 @@ async function capturePreTurnSnapshot(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     repos
   };
-  const filePath = path62.join(dir, `${runId}.json`);
+  const filePath = path64.join(dir, `${runId}.json`);
   try {
-    fs44.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
+    fs43.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -44810,7 +44997,7 @@ async function capturePreTurnSnapshot(options) {
 async function applyPreTurnSnapshot(filePath, log2) {
   let data;
   try {
-    const raw = fs44.readFileSync(filePath, "utf8");
+    const raw = fs43.readFileSync(filePath, "utf8");
     data = JSON.parse(raw);
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
@@ -44850,7 +45037,7 @@ async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   const agentBase = deps.sessionWorktreeManager.getSessionWorktreeRootForSession(sid) ?? getBridgeRoot();
   const file2 = snapshotFilePath(agentBase, tid);
   try {
-    await fs45.promises.access(file2, fs45.constants.F_OK);
+    await fs44.promises.access(file2, fs44.constants.F_OK);
   } catch {
     deps.log(
       `[Queue] requeued_with_revert: no pre-turn snapshot for ${tid.slice(0, 8)}\u2026; continuing without revert.`
@@ -45138,9 +45325,9 @@ function parseChangeSummarySnapshots(raw) {
   for (const item of raw) {
     if (!item || typeof item !== "object") continue;
     const o = item;
-    const path73 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
-    if (!path73) continue;
-    const row = { path: path73 };
+    const path75 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
+    if (!path75) continue;
+    const row = { path: path75 };
     if (typeof o.patchContent === "string") row.patchContent = o.patchContent;
     if (typeof o.oldText === "string") row.oldText = o.oldText;
     if (typeof o.newText === "string") row.newText = o.newText;
@@ -45350,8 +45537,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path73, body) {
-  const url2 = `http://127.0.0.1:${port}${path73}`;
+async function requestPreviewApi(port, secret, method, path75, body) {
+  const url2 = `http://127.0.0.1:${port}${path75}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -45363,7 +45550,7 @@ async function requestPreviewApi(port, secret, method, path73, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path73}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path75}: ${res.status}`);
   }
   return data;
 }
@@ -45539,14 +45726,14 @@ async function resolveFileBrowserSessionParent(sessionWorktreeManager, sessionId
 }
 
 // src/files/list-dir/index.ts
-import fs47 from "node:fs";
+import fs46 from "node:fs";
 
 // src/files/ensure-under-cwd.ts
-import path63 from "node:path";
+import path65 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path63.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path63.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path63.sep) && resolved !== cwd) {
+  const normalized = path65.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path65.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path65.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -45556,15 +45743,15 @@ function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
 var LIST_DIR_YIELD_EVERY = 256;
 
 // src/files/list-dir/map-dir-entry.ts
-import path64 from "node:path";
-import fs46 from "node:fs";
+import path66 from "node:path";
+import fs45 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path64.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path64.join(resolved, d.name);
+  const entryPath = path66.join(relativePath || ".", d.name).replace(/\\/g, "/");
+  const fullPath = path66.join(resolved, d.name);
   let isDir = d.isDirectory();
   if (d.isSymbolicLink()) {
     try {
-      const targetStat = await fs46.promises.stat(fullPath);
+      const targetStat = await fs45.promises.stat(fullPath);
       isDir = targetStat.isDirectory();
     } catch {
       isDir = false;
@@ -45594,7 +45781,7 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs47.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs46.promises.readdir(resolved, { withFileTypes: true });
     const entries = [];
     for (let i = 0; i < names.length; i++) {
       if (i > 0 && i % LIST_DIR_YIELD_EVERY === 0) {
@@ -45610,13 +45797,13 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
 }
 
 // src/files/handle-file-browser-search.ts
-import path65 from "node:path";
+import path67 from "node:path";
 var SEARCH_LIMIT = 100;
 function handleFileBrowserSearch(msg, socket, e2ee, sessionWorktreeManager) {
   void (async () => {
     await yieldToEventLoop();
     const q = typeof msg.q === "string" ? msg.q : "";
-    const sessionParentPath = path65.resolve(
+    const sessionParentPath = path67.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -45720,6 +45907,19 @@ async function resolveCodeNavParentPath(sessionWorktreeManager, sessionId) {
 }
 
 // src/code-nav/handlers/prepare-code-nav-request.ts
+var CODE_NAV_INDEX_READY_WAIT_MS = 75;
+var CODE_NAV_INDEX_READY_POLL_MS = 15;
+function delay2(ms) {
+  return new Promise((resolve34) => setTimeout(resolve34, ms));
+}
+async function waitForSymbolIndexReady(sessionParentPath, reqPath) {
+  const deadline = Date.now() + CODE_NAV_INDEX_READY_WAIT_MS;
+  do {
+    if (await symbolIndexFileIsReadyAsync(sessionParentPath, reqPath)) return true;
+    await delay2(CODE_NAV_INDEX_READY_POLL_MS);
+  } while (Date.now() < deadline);
+  return await symbolIndexFileIsReadyAsync(sessionParentPath, reqPath);
+}
 async function prepareCodeNavRequest(msg, socket, e2ee, sessionWorktreeManager) {
   await yieldToEventLoop();
   const reqPath = msg.path.replace(/^\/+/, "") || "";
@@ -45732,12 +45932,15 @@ async function prepareCodeNavRequest(msg, socket, e2ee, sessionWorktreeManager)
     return null;
   }
   const sessionParentPath = await resolveCodeNavParentPath(sessionWorktreeManager, msg.sessionId);
-  registerSymbolIndexParent(sessionParentPath);
-  await ensureSymbolIndexFileAsync(sessionParentPath, reqPath, { importDepth: 1 });
+  await registerSymbolIndexParentAsync(sessionParentPath);
+  scheduleSymbolIndexFile(sessionParentPath, reqPath);
+  const indexReady = await waitForSymbolIndexReady(sessionParentPath, reqPath);
+  if (indexReady) {
+    const importTargets = await listDirectImportTargetsForFileAsync(sessionParentPath, reqPath);
+    scheduleSymbolIndexImportNeighbors(sessionParentPath, importTargets);
+  }
+  scheduleSymbolIndexWarmup(sessionParentPath);
   await yieldToEventLoop();
-  const importTargets = listDirectImportTargetsForFile(sessionParentPath, reqPath);
-  scheduleSymbolIndexForRequest(sessionParentPath, reqPath, importTargets);
-  const indexReady = symbolIndexFileIsReady(sessionParentPath, reqPath);
   return {
     socket,
     e2ee,
@@ -45801,20 +46004,22 @@ function handleCodeNavRequest(msg, socket, e2ee, sessionWorktreeManager) {
 // src/code-nav/handlers/trigger-symbol-index-build.ts
 function triggerSymbolIndexBuild(parentPath) {
   setImmediate(() => {
-    const resolved = normalizeResolvedPath(parentPath);
-    registerSymbolIndexParent(resolved);
-    scheduleSymbolIndexWarmup(resolved);
+    void (async () => {
+      const resolved = normalizeResolvedPath(parentPath);
+      await registerSymbolIndexParentAsync(resolved);
+      scheduleSymbolIndexWarmup(resolved);
+    })();
   });
 }
 
 // src/git/tree/resolve-repo-abs-path.ts
-import * as path66 from "node:path";
+import * as path68 from "node:path";
 function resolveRepoAbsPathFromBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path66.resolve(bridgeRoot);
+  const bridgeResolved = path68.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path66.join(bridgeResolved, rel);
-  const resolved = path66.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path66.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path68.join(bridgeResolved, rel);
+  const resolved = path68.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path68.sep) && resolved !== bridgeResolved) {
     return null;
   }
   return resolved;
@@ -46212,18 +46417,18 @@ async function handleFileBrowserList(socket, e2ee, id, reqPath, sessionParentPat
 }
 
 // src/files/read-file/resolve-file-path.ts
-import fs48 from "node:fs";
+import fs47 from "node:fs";
 async function resolveFilePathAsync(relativePath, sessionParentPath = getBridgeRoot()) {
   const resolved = ensureUnderCwd(relativePath, sessionParentPath);
   if (!resolved) return { error: "Path is outside working directory" };
   let real;
   try {
-    real = await fs48.promises.realpath(resolved);
+    real = await fs47.promises.realpath(resolved);
   } catch {
     real = resolved;
   }
   try {
-    const stat3 = await fs48.promises.stat(real);
+    const stat3 = await fs47.promises.stat(real);
     if (!stat3.isFile()) return { error: "Not a file" };
     return real;
   } catch (err) {
@@ -46232,11 +46437,11 @@ async function resolveFilePathAsync(relativePath, sessionParentPath = getBridgeR
 }
 
 // src/files/read-file/read-file-range-async.ts
-import fs49 from "node:fs";
+import fs48 from "node:fs";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const fileSize = (await fs49.promises.stat(filePath)).size;
-  const fd = await fs49.promises.open(filePath, "r");
+  const fileSize = (await fs48.promises.stat(filePath)).size;
+  const fd = await fs48.promises.open(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder2("utf8");
@@ -46398,11 +46603,11 @@ async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, li
 }
 
 // src/files/read-file/read-file-buffer-full-async.ts
-import fs50 from "node:fs";
+import fs49 from "node:fs";
 var READ_CHUNK_BYTES = 256 * 1024;
 async function readFileBufferFullAsync(filePath) {
-  const stat3 = await fs50.promises.stat(filePath);
-  const fd = await fs50.promises.open(filePath, "r");
+  const stat3 = await fs49.promises.stat(filePath);
+  const fd = await fs49.promises.open(filePath, "r");
   const chunks = [];
   let position = 0;
   let bytesSinceYield = 0;
@@ -46596,8 +46801,8 @@ function isValidRemoteSkillInstallItem(item) {
 }
 
 // src/skills/install/install-remote-skills-async.ts
-import fs51 from "node:fs";
-import path67 from "node:path";
+import fs50 from "node:fs";
+import path69 from "node:path";
 
 // src/skills/install/constants.ts
 var INSTALL_SKILLS_YIELD_EVERY = 16;
@@ -46608,12 +46813,12 @@ async function writeInstallFileAsync(skillDir, f, filesWritten) {
   if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
     await yieldToEventLoop();
   }
-  const dest = path67.join(skillDir, f.path);
-  await fs51.promises.mkdir(path67.dirname(dest), { recursive: true });
+  const dest = path69.join(skillDir, f.path);
+  await fs50.promises.mkdir(path69.dirname(dest), { recursive: true });
   if (f.text !== void 0) {
-    await fs51.promises.writeFile(dest, f.text, "utf8");
+    await fs50.promises.writeFile(dest, f.text, "utf8");
   } else if (f.base64) {
-    await fs51.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
+    await fs50.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
   }
 }
 async function installRemoteSkillsAsync(cwd, targetDir, items) {
@@ -46625,7 +46830,7 @@ async function installRemoteSkillsAsync(cwd, targetDir, items) {
   try {
     for (const item of items) {
       if (!isValidRemoteSkillInstallItem(item)) continue;
-      const skillDir = path67.join(cwd, targetDir, item.skillName);
+      const skillDir = path69.join(cwd, targetDir, item.skillName);
       for (const f of item.files) {
         await writeInstallFileAsync(skillDir, f, filesWritten);
       }
@@ -46907,7 +47112,7 @@ var handleSessionDiscardedMessage = (msg, deps) => {
 };
 
 // src/routing/handlers/revert-turn-snapshot.ts
-import * as fs52 from "node:fs";
+import * as fs51 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -46920,7 +47125,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
     const file2 = snapshotFilePath(agentBase, turnId);
     try {
-      await fs52.promises.access(file2, fs52.constants.F_OK);
+      await fs51.promises.access(file2, fs51.constants.F_OK);
     } catch {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
@@ -46964,7 +47169,7 @@ var handleDevServersConfig = (msg, deps) => {
 };
 
 // src/git/bridge-git-context.ts
-import * as path68 from "node:path";
+import * as path70 from "node:path";
 
 // src/git/branches/get-current-branch.ts
 async function getCurrentBranch(repoPath) {
@@ -47014,12 +47219,12 @@ async function listRepoBranchRefs(repoPath) {
 // src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
-    return path68.basename(path68.resolve(bridgeRoot)) || "repo";
+    return path70.basename(path70.resolve(bridgeRoot)) || "repo";
   }
-  return path68.basename(relPath) || relPath;
+  return path70.basename(relPath) || relPath;
 }
 async function discoverGitReposForBridgeContext(bridgeRoot) {
-  const root = path68.resolve(bridgeRoot);
+  const root = path70.resolve(bridgeRoot);
   if (await isGitRepoDirectory(root)) {
     const remoteUrl = await getRemoteOriginUrl(root);
     return [{ absolutePath: root, remoteUrl }];
@@ -47027,19 +47232,19 @@ async function discoverGitReposForBridgeContext(bridgeRoot) {
   const [deep, shallow] = await Promise.all([discoverGitReposUnderRoot(root), discoverGitRepos(root)]);
   const byPath = /* @__PURE__ */ new Map();
   for (const repo of [...deep, ...shallow]) {
-    byPath.set(path68.resolve(repo.absolutePath), repo);
+    byPath.set(path70.resolve(repo.absolutePath), repo);
   }
   return [...byPath.values()];
 }
 async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path68.resolve(bridgeRoot);
+  const bridgeResolved = path70.resolve(bridgeRoot);
   const repos = await discoverGitReposForBridgeContext(bridgeResolved);
   const rows = [];
   for (let i = 0; i < repos.length; i++) {
     if (i > 0) await yieldToEventLoop();
     const repo = repos[i];
-    let rel = path68.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path68.isAbsolute(rel)) continue;
+    let rel = path70.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path70.isAbsolute(rel)) continue;
     const relPath = rel === "" ? "." : rel.replace(/\\/g, "/");
     const currentBranch = await getCurrentBranch(repo.absolutePath);
     const remoteUrl = repo.remoteUrl.trim() || null;
@@ -47054,11 +47259,11 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
   return rows;
 }
 async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path68.resolve(bridgeRoot);
+  const bridgeResolved = path70.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path68.join(bridgeResolved, rel);
-  const resolved = path68.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path68.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path70.join(bridgeResolved, rel);
+  const resolved = path70.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path70.sep) && resolved !== bridgeResolved) {
     return [];
   }
   return listRepoBranchRefs(resolved);
@@ -47227,25 +47432,127 @@ async function refreshBridgeTokens(params) {
   }
 }
 
-// src/connection/main-bridge-ws-lifecycle.ts
-function createMainBridgeWebSocketLifecycle(params) {
+// src/connection/main-bridge-auth-refresh-handler.ts
+function resetAfterAuthInvalid(params) {
+  const { state } = params;
+  state.reconnectAttempt = 0;
+  resetReconnectOutageTracker(state.mainOutage);
+  state.lastReconnectCloseMeta = null;
+}
+function createMainBridgeAuthRefreshHandler(params, connect) {
+  const { apiUrl, workspaceId, logFn, tokens, persistTokens, onAuthInvalid } = params;
+  let authRefreshInFlight = false;
+  return () => {
+    if (authRefreshInFlight) return;
+    void (async () => {
+      authRefreshInFlight = true;
+      try {
+        if (tokens.refreshToken) {
+          const next = await refreshBridgeTokens({
+            apiUrl,
+            workspaceId,
+            refreshToken: tokens.refreshToken
+          });
+          if (next?.token && next.refreshToken) {
+            tokens.accessToken = next.token;
+            tokens.refreshToken = next.refreshToken;
+            persistTokens?.({ token: tokens.accessToken, refreshToken: tokens.refreshToken });
+            try {
+              logFn("[Bridge service] Access token refreshed; reconnecting\u2026");
+            } catch {
+            }
+            resetAfterAuthInvalid(params);
+            params.state.logBridgeOpenAsReconnect = true;
+            authRefreshInFlight = false;
+            connect();
+            return;
+          }
+        }
+        authRefreshInFlight = false;
+        resetAfterAuthInvalid(params);
+        onAuthInvalid();
+      } catch {
+        authRefreshInFlight = false;
+        resetAfterAuthInvalid(params);
+        onAuthInvalid();
+      }
+    })();
+  };
+}
+
+// src/connection/main-bridge-ws-close-handler.ts
+function createMainBridgeCloseHandler(params, connect) {
+  const { state, logFn, bridgeHeartbeat } = params;
+  return (code, reason) => {
+    bridgeHeartbeat?.stop();
+    try {
+      const was = state.currentWs;
+      state.currentWs = null;
+      if (was) was.removeAllListeners();
+      const willReconnect = !state.closedByUser;
+      if (willReconnect) {
+        const duplicateResult = evaluateDuplicateBridgeDisconnect(
+          state.duplicateBridgeFlap,
+          Date.now(),
+          code,
+          reason
+        );
+        logDuplicateBridgeWarning(logFn, duplicateResult);
+      }
+      beginMainBridgeDeferredDisconnect(state, code, reason, logFn, willReconnect);
+      if (willReconnect) {
+        state.lastReconnectCloseMeta = { code, reason };
+        try {
+          scheduleMainBridgeReconnect(state, connect, logFn, { code, reason });
+        } catch {
+        }
+      }
+    } catch {
+      if (!state.closedByUser) {
+        try {
+          scheduleMainBridgeReconnect(state, connect, logFn);
+        } catch {
+        }
+      }
+    }
+  };
+}
+
+// src/connection/report-git-repos.ts
+function reportGitRepos(getWs, log2) {
+  setImmediate(() => {
+    discoverGitRepos().then((repos) => {
+      if (repos.length > 0) {
+        const socket = getWs();
+        if (socket) {
+          sendWsMessage(socket, {
+            type: "git_repos",
+            repos: repos.map((r) => ({ absolutePath: r.absolutePath, remoteUrl: r.remoteUrl }))
+          });
+        }
+      }
+    }).catch((err) => {
+      log2(
+        `[Bridge service] Git repository discovery failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
+  });
+}
+
+// src/connection/main-bridge-ws-open-handler.ts
+function createMainBridgeOpenHandler(params) {
   const {
     state,
     getWs,
-    apiUrl,
     workspaceId,
     justAuthenticated,
     logFn,
-    messageDeps,
     tokens,
-    persistTokens,
-    onAuthInvalid,
     e2ee,
     identifyReportedPaths,
-    bridgeHeartbeat
+    onBridgeSocketOpen
   } = params;
-  let authRefreshInFlight = false;
-  function handleOpen() {
+  return () => {
     recordBridgeSessionOpened(state.duplicateBridgeFlap, Date.now());
     const logOpenAsPostRefreshReconnect = state.logBridgeOpenAsReconnect;
     clearMainBridgeReconnectQuietOnOpen(state, logFn);
@@ -47265,6 +47572,10 @@ function createMainBridgeWebSocketLifecycle(params) {
         ...e2ee ? { e: e2ee.handshake } : {}
       });
       reportGitRepos(getWs, logFn);
+      try {
+        onBridgeSocketOpen?.();
+      } catch {
+      }
     }
     if (justAuthenticated && socket) {
       logFn(
@@ -47273,41 +47584,25 @@ function createMainBridgeWebSocketLifecycle(params) {
       logFn(`  export BUILDAUTOMATON_AUTH_TOKEN="${tokens.accessToken}"`);
       logFn(`  export BUILDAUTOMATON_WORKSPACE_ID="${workspaceId}"`);
     }
-  }
-  function handleClose(code, reason) {
-    bridgeHeartbeat?.stop();
-    try {
-      const was = state.currentWs;
-      state.currentWs = null;
-      if (was) was.removeAllListeners();
-      const willReconnect = !state.closedByUser;
-      if (willReconnect) {
-        const duplicateResult = evaluateDuplicateBridgeDisconnect(
-          state.duplicateBridgeFlap,
-          Date.now(),
-          code,
-          reason
-        );
-        logDuplicateBridgeWarning(logFn, duplicateResult);
-      }
-      beginMainBridgeDeferredDisconnect(state, code, reason, logFn, willReconnect);
-      if (willReconnect) {
-        state.lastReconnectCloseMeta = { code, reason };
-        try {
-          scheduleMainBridgeReconnect(state, connect, logFn, { code, reason });
-        } catch {
-        }
-      }
-    } catch {
-      if (!state.closedByUser) {
-        try {
-          scheduleMainBridgeReconnect(state, connect, logFn);
-        } catch {
-        }
-      }
-    }
-  }
-  function connect() {
+  };
+}
+
+// src/connection/main-bridge-ws-lifecycle.ts
+function createMainBridgeWebSocketLifecycle(params) {
+  const {
+    state,
+    apiUrl,
+    workspaceId,
+    logFn,
+    messageDeps,
+    tokens,
+    bridgeHeartbeat
+  } = params;
+  let connect;
+  const handleOpen = createMainBridgeOpenHandler(params);
+  const handleClose = createMainBridgeCloseHandler(params, () => connect());
+  const handleAuthInvalid = createMainBridgeAuthRefreshHandler(params, () => connect());
+  connect = () => {
     if (state.closedByUser) return;
     if (state.reconnectTimeout != null) {
       clearTimeout(state.reconnectTimeout);
@@ -47343,48 +47638,7 @@ function createMainBridgeWebSocketLifecycle(params) {
         onCompactHeartbeatAck: (seq) => {
           messageDeps.onBridgeHeartbeatAck?.(seq);
         },
-        onAuthInvalid: () => {
-          if (authRefreshInFlight) return;
-          void (async () => {
-            authRefreshInFlight = true;
-            try {
-              if (tokens.refreshToken) {
-                const next = await refreshBridgeTokens({
-                  apiUrl,
-                  workspaceId,
-                  refreshToken: tokens.refreshToken
-                });
-                if (next?.token && next.refreshToken) {
-                  tokens.accessToken = next.token;
-                  tokens.refreshToken = next.refreshToken;
-                  persistTokens?.({ token: tokens.accessToken, refreshToken: tokens.refreshToken });
-                  try {
-                    logFn("[Bridge service] Access token refreshed; reconnecting\u2026");
-                  } catch {
-                  }
-                  state.reconnectAttempt = 0;
-                  resetReconnectOutageTracker(state.mainOutage);
-                  state.lastReconnectCloseMeta = null;
-                  state.logBridgeOpenAsReconnect = true;
-                  authRefreshInFlight = false;
-                  connect();
-                  return;
-                }
-              }
-              authRefreshInFlight = false;
-              state.reconnectAttempt = 0;
-              resetReconnectOutageTracker(state.mainOutage);
-              state.lastReconnectCloseMeta = null;
-              onAuthInvalid();
-            } catch {
-              authRefreshInFlight = false;
-              state.reconnectAttempt = 0;
-              resetReconnectOutageTracker(state.mainOutage);
-              state.lastReconnectCloseMeta = null;
-              onAuthInvalid();
-            }
-          })();
-        },
+        onAuthInvalid: handleAuthInvalid,
         onOpen: handleOpen,
         onClose: handleClose,
         onError: (err) => {
@@ -47411,7 +47665,7 @@ function createMainBridgeWebSocketLifecycle(params) {
         }
       }
     }
-  }
+  };
   return { connect };
 }
 
@@ -47501,256 +47755,6 @@ function createBridgeHeartbeatController(params) {
   };
 }
 
-// src/sqlite/hash-json-sha256.ts
-import { createHash as createHash2 } from "node:crypto";
-function hashJsonUtf8Sha256(value) {
-  return createHash2("sha256").update(JSON.stringify(value), "utf8").digest("hex");
-}
-
-// src/sqlite/agent-capability-cache.ts
-function hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType) {
-  const t = agentType.trim();
-  if (!t) return false;
-  try {
-    const row = db.get(
-      `SELECT config_options_json FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
-      [workspaceId, t]
-    );
-    if (row?.config_options_json == null || row.config_options_json === "") return false;
-    const parsed = JSON.parse(row.config_options_json);
-    return Array.isArray(parsed) && parsed.length > 0;
-  } catch {
-    return false;
-  }
-}
-function upsertCliAgentCapabilityCache(db, row) {
-  const t = row.agentType.trim();
-  if (!t) return false;
-  const hash = hashJsonUtf8Sha256(row.configOptions);
-  try {
-    const prev = db.get(
-      `SELECT content_hash FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
-      [row.workspaceId, t]
-    );
-    if (prev?.content_hash === hash) return false;
-  } catch {
-  }
-  const json2 = JSON.stringify(row.configOptions);
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  db.run(
-    `INSERT INTO agent_capabilities (workspace_id, agent_type, config_options_json, content_hash, updated_at)
-     VALUES (?, ?, ?, ?, ?)
-     ON CONFLICT(workspace_id, agent_type) DO UPDATE SET
-       config_options_json = excluded.config_options_json,
-       content_hash = excluded.content_hash,
-       updated_at = excluded.updated_at`,
-    [row.workspaceId, t, json2, hash, now]
-  );
-  return true;
-}
-function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
-  const rows = db.all(
-    `SELECT agent_type, config_options_json FROM agent_capabilities WHERE workspace_id = ?`,
-    [workspaceId]
-  );
-  const out = [];
-  for (const r of rows) {
-    try {
-      const parsed = JSON.parse(r.config_options_json);
-      if (!Array.isArray(parsed) || parsed.length === 0) continue;
-      out.push({ agentType: r.agent_type, configOptions: parsed });
-    } catch {
-    }
-  }
-  return out;
-}
-
-// src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-import * as path70 from "node:path";
-
-// src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
-import * as path69 from "node:path";
-async function probeOneAgentTypeForCapabilities(params) {
-  const { agentType, cwd, workspaceId, log: log2, reportAgentCapabilities, bridgeReport = true, shouldContinue } = params;
-  const canContinue = () => shouldContinue?.() !== false;
-  if (!canContinue()) return false;
-  const resolved = resolveAgentCommand(agentType);
-  if (!resolved) return false;
-  let sqliteChanged = false;
-  const reportedRef = { done: false };
-  const tryReport = (co) => {
-    if (reportedRef.done) return;
-    if (!Array.isArray(co) || co.length === 0) return;
-    reportedRef.done = true;
-    let changed = false;
-    try {
-      changed = withCliSqliteSync(
-        (db) => upsertCliAgentCapabilityCache(db, {
-          workspaceId,
-          agentType,
-          configOptions: co
-        })
-      );
-    } catch {
-    }
-    sqliteChanged ||= changed;
-    if (bridgeReport && changed) {
-      reportAgentCapabilities?.({ agentType, configOptions: co });
-    }
-  };
-  let handle = null;
-  const killTimer = setTimeout(() => {
-    void handle?.disconnectGracefully();
-  }, 28e3);
-  killTimer.unref?.();
-  try {
-    if (!canContinue()) return false;
-    handle = await resolved.createClient({
-      command: resolved.command,
-      cwd: path69.resolve(cwd),
-      backendAgentType: agentType,
-      sessionMode: "agent",
-      persistedAcpSessionId: null,
-      agentConfig: null,
-      getActiveConfigOptions: () => null,
-      onAcpSessionEstablished: (info) => {
-        tryReport(info.configOptions ?? null);
-      },
-      onAcpConfigOptionsUpdated: (co) => {
-        tryReport(co);
-      },
-      onAgentSubprocessExit: () => {
-      },
-      onSessionUpdate: () => {
-      }
-    });
-    if (!await delayMsUnlessShutdownRequested(1200) || !canContinue()) return false;
-  } catch (e) {
-    log2(
-      `[Bridge service] Agent capability probe (${agentType}): ${e instanceof Error ? e.message : String(e)}`
-    );
-  } finally {
-    clearTimeout(killTimer);
-    try {
-      await handle?.disconnectGracefully();
-    } catch {
-    }
-  }
-  return sqliteChanged;
-}
-
-// src/agents/capabilities/probe-agent-capabilities-for-types.ts
-async function probeAgentCapabilitiesForDetectedTypes(params) {
-  const {
-    agentTypes,
-    cwd,
-    workspaceId,
-    log: log2,
-    reportAgentCapabilities,
-    bridgeReport = true,
-    forceAllTypes = false,
-    shouldContinue
-  } = params;
-  const canContinue = () => !isCliImmediateShutdownRequested() && shouldContinue?.() !== false;
-  let changedCount = 0;
-  for (let i = 0; i < agentTypes.length; i++) {
-    if (!canContinue()) return changedCount;
-    if (i > 0) await yieldToEventLoop();
-    const agentType = agentTypes[i];
-    if (!agentType.trim()) continue;
-    if (!forceAllTypes) {
-      try {
-        if (process.env.BUILDAUTOMATON_FORCE_PROBE_ACP_CAPABILITIES !== "1" && await withCliSqlite((db) => hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType))) {
-          continue;
-        }
-      } catch {
-      }
-    }
-    const changed = await probeOneAgentTypeForCapabilities({
-      agentType,
-      cwd,
-      workspaceId,
-      log: log2,
-      reportAgentCapabilities,
-      bridgeReport,
-      shouldContinue: canContinue
-    });
-    if (changed) changedCount += 1;
-  }
-  return changedCount;
-}
-
-// src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-async function warmupAgentCapabilitiesOnConnect(params) {
-  const { workspaceId, log: log2, getWs } = params;
-  const isCurrent = beginAgentCapabilityWarmupRun();
-  if (!isCurrent()) return;
-  const cwd = path70.resolve(getBridgeRoot());
-  async function sendBatchFromCache() {
-    if (!isCurrent()) return;
-    const socket = getWs();
-    if (!socket || socket.readyState !== wrapper_default.OPEN) return;
-    try {
-      const rows = await withCliSqlite((db) => listCliAgentCapabilityCacheForWorkspace(db, workspaceId));
-      if (!isCurrent()) return;
-      if (rows.length === 0) return;
-      sendWsMessage(socket, {
-        type: "agent_capabilities_batch",
-        items: rows.map((r) => ({ agentType: r.agentType, configOptions: r.configOptions }))
-      });
-    } catch (e) {
-      if (e instanceof CliSqliteInterrupted) return;
-      log2(
-        `[Bridge service] Agent capability batch to bridge failed: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  }
-  await sendBatchFromCache();
-  if (!isCurrent()) return;
-  let types = [];
-  try {
-    types = [...await detectLocalAgentTypes()];
-  } catch (e) {
-    log2(`[Bridge service] detectLocalAgentTypes failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  if (!isCurrent()) return;
-  try {
-    const n = await probeAgentCapabilitiesForDetectedTypes({
-      agentTypes: types,
-      cwd,
-      workspaceId,
-      log: log2,
-      bridgeReport: false,
-      forceAllTypes: false,
-      shouldContinue: isCurrent
-    });
-    if (n > 0) await sendBatchFromCache();
-  } catch (e) {
-    if (e instanceof CliSqliteInterrupted) return;
-    log2(`[Bridge service] Agent capability probe (missing cache) failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  if (!isCurrent()) return;
-  void (async () => {
-    try {
-      await yieldToEventLoop();
-      if (!isCurrent()) return;
-      const n = await probeAgentCapabilitiesForDetectedTypes({
-        agentTypes: types,
-        cwd,
-        workspaceId,
-        log: log2,
-        bridgeReport: false,
-        forceAllTypes: true,
-        shouldContinue: isCurrent
-      });
-      if (n > 0) await sendBatchFromCache();
-    } catch (e) {
-      if (e instanceof CliSqliteInterrupted) return;
-      log2(`[Bridge service] Agent capability lazy refresh failed: ${e instanceof Error ? e.message : String(e)}`);
-    }
-  })();
-}
-
 // src/mcp/tools/session-history/fork/mcp-text-result.ts
 function mcpTextResult(text, isError = false) {
   return { content: [{ type: "text", text }], ...isError ? { isError: true } : {} };
@@ -48135,6 +48139,327 @@ async function createBridgeAccessState(options = {}) {
   };
 }
 
+// src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
+import * as path72 from "node:path";
+
+// src/sqlite/hash-json-sha256.ts
+import { createHash as createHash2 } from "node:crypto";
+function hashJsonUtf8Sha256(value) {
+  return createHash2("sha256").update(JSON.stringify(value), "utf8").digest("hex");
+}
+
+// src/sqlite/agent-capability-cache.ts
+function hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType) {
+  const t = agentType.trim();
+  if (!t) return false;
+  try {
+    const row = db.get(
+      `SELECT config_options_json FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
+      [workspaceId, t]
+    );
+    if (row?.config_options_json == null || row.config_options_json === "") return false;
+    const parsed = JSON.parse(row.config_options_json);
+    return Array.isArray(parsed) && parsed.length > 0;
+  } catch {
+    return false;
+  }
+}
+function upsertCliAgentCapabilityCache(db, row) {
+  const t = row.agentType.trim();
+  if (!t) return false;
+  const hash = hashJsonUtf8Sha256(row.configOptions);
+  try {
+    const prev = db.get(
+      `SELECT content_hash FROM agent_capabilities WHERE workspace_id = ? AND agent_type = ?`,
+      [row.workspaceId, t]
+    );
+    if (prev?.content_hash === hash) return false;
+  } catch {
+  }
+  const json2 = JSON.stringify(row.configOptions);
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  db.run(
+    `INSERT INTO agent_capabilities (workspace_id, agent_type, config_options_json, content_hash, updated_at)
+     VALUES (?, ?, ?, ?, ?)
+     ON CONFLICT(workspace_id, agent_type) DO UPDATE SET
+       config_options_json = excluded.config_options_json,
+       content_hash = excluded.content_hash,
+       updated_at = excluded.updated_at`,
+    [row.workspaceId, t, json2, hash, now]
+  );
+  return true;
+}
+function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
+  const rows = db.all(
+    `SELECT agent_type, config_options_json FROM agent_capabilities WHERE workspace_id = ?`,
+    [workspaceId]
+  );
+  const out = [];
+  for (const r of rows) {
+    try {
+      const parsed = JSON.parse(r.config_options_json);
+      if (!Array.isArray(parsed) || parsed.length === 0) continue;
+      out.push({ agentType: r.agent_type, configOptions: parsed });
+    } catch {
+    }
+  }
+  return out;
+}
+
+// src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
+import * as path71 from "node:path";
+async function probeOneAgentTypeForCapabilities(params) {
+  const { agentType, cwd, workspaceId, log: log2, reportAgentCapabilities, bridgeReport = true, shouldContinue } = params;
+  const canContinue = () => shouldContinue?.() !== false;
+  if (!canContinue()) return false;
+  const resolved = resolveAgentCommand(agentType);
+  if (!resolved) return false;
+  let sqliteChanged = false;
+  const reportedRef = { done: false };
+  const tryReport = (co) => {
+    if (reportedRef.done) return;
+    if (!Array.isArray(co) || co.length === 0) return;
+    reportedRef.done = true;
+    let changed = false;
+    try {
+      changed = withCliSqliteSync(
+        (db) => upsertCliAgentCapabilityCache(db, {
+          workspaceId,
+          agentType,
+          configOptions: co
+        })
+      );
+    } catch {
+    }
+    sqliteChanged ||= changed;
+    if (bridgeReport && changed) {
+      reportAgentCapabilities?.({ agentType, configOptions: co });
+    }
+  };
+  let handle = null;
+  const killTimer = setTimeout(() => {
+    void handle?.disconnectGracefully();
+  }, 28e3);
+  killTimer.unref?.();
+  try {
+    if (!canContinue()) return false;
+    handle = await resolved.createClient({
+      command: resolved.command,
+      cwd: path71.resolve(cwd),
+      backendAgentType: agentType,
+      sessionMode: "agent",
+      persistedAcpSessionId: null,
+      agentConfig: null,
+      getActiveConfigOptions: () => null,
+      onAcpSessionEstablished: (info) => {
+        tryReport(info.configOptions ?? null);
+      },
+      onAcpConfigOptionsUpdated: (co) => {
+        tryReport(co);
+      },
+      onAgentSubprocessExit: () => {
+      },
+      onSessionUpdate: () => {
+      }
+    });
+    if (!await delayMsUnlessShutdownRequested(1200) || !canContinue()) return false;
+  } catch (e) {
+    log2(
+      `[Bridge service] Agent capability probe (${agentType}): ${e instanceof Error ? e.message : String(e)}`
+    );
+  } finally {
+    clearTimeout(killTimer);
+    try {
+      await handle?.disconnectGracefully();
+    } catch {
+    }
+  }
+  return sqliteChanged;
+}
+
+// src/agents/capabilities/probe-agent-capabilities-for-types.ts
+async function probeAgentCapabilitiesForDetectedTypes(params) {
+  const {
+    agentTypes,
+    cwd,
+    workspaceId,
+    log: log2,
+    reportAgentCapabilities,
+    bridgeReport = true,
+    forceAllTypes = false,
+    shouldContinue
+  } = params;
+  const canContinue = () => !isCliImmediateShutdownRequested() && shouldContinue?.() !== false;
+  let changedCount = 0;
+  for (let i = 0; i < agentTypes.length; i++) {
+    if (!canContinue()) return changedCount;
+    if (i > 0) await yieldToEventLoop();
+    const agentType = agentTypes[i];
+    if (!agentType.trim()) continue;
+    if (!forceAllTypes) {
+      try {
+        if (process.env.BUILDAUTOMATON_FORCE_PROBE_ACP_CAPABILITIES !== "1" && await withCliSqlite((db) => hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType))) {
+          continue;
+        }
+      } catch {
+      }
+    }
+    const changed = await probeOneAgentTypeForCapabilities({
+      agentType,
+      cwd,
+      workspaceId,
+      log: log2,
+      reportAgentCapabilities,
+      bridgeReport,
+      shouldContinue: canContinue
+    });
+    if (changed) changedCount += 1;
+  }
+  return changedCount;
+}
+
+// src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
+async function warmupAgentCapabilitiesOnConnect(params) {
+  const { workspaceId, log: log2, getWs } = params;
+  const isCurrent = beginAgentCapabilityWarmupRun();
+  if (!isCurrent()) return;
+  const cwd = path72.resolve(getBridgeRoot());
+  async function sendBatchFromCache() {
+    if (!isCurrent()) return;
+    const socket = getWs();
+    if (!socket || socket.readyState !== wrapper_default.OPEN) return;
+    try {
+      const rows = await withCliSqlite((db) => listCliAgentCapabilityCacheForWorkspace(db, workspaceId));
+      if (!isCurrent()) return;
+      if (rows.length === 0) return;
+      sendWsMessage(socket, {
+        type: "agent_capabilities_batch",
+        items: rows.map((r) => ({ agentType: r.agentType, configOptions: r.configOptions }))
+      });
+    } catch (e) {
+      if (e instanceof CliSqliteInterrupted) return;
+      log2(
+        `[Bridge service] Agent capability batch to bridge failed: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
+  await sendBatchFromCache();
+  if (!isCurrent()) return;
+  let types = [];
+  try {
+    types = [...await detectLocalAgentTypes()];
+  } catch (e) {
+    log2(`[Bridge service] detectLocalAgentTypes failed: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  if (!isCurrent()) return;
+  try {
+    const n = await probeAgentCapabilitiesForDetectedTypes({
+      agentTypes: types,
+      cwd,
+      workspaceId,
+      log: log2,
+      bridgeReport: false,
+      forceAllTypes: false,
+      shouldContinue: isCurrent
+    });
+    if (n > 0) await sendBatchFromCache();
+  } catch (e) {
+    if (e instanceof CliSqliteInterrupted) return;
+    log2(`[Bridge service] Agent capability probe (missing cache) failed: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  if (!isCurrent()) return;
+  void (async () => {
+    try {
+      await yieldToEventLoop();
+      if (!isCurrent()) return;
+      const n = await probeAgentCapabilitiesForDetectedTypes({
+        agentTypes: types,
+        cwd,
+        workspaceId,
+        log: log2,
+        bridgeReport: false,
+        forceAllTypes: true,
+        shouldContinue: isCurrent
+      });
+      if (n > 0) await sendBatchFromCache();
+    } catch (e) {
+      if (e instanceof CliSqliteInterrupted) return;
+      log2(`[Bridge service] Agent capability lazy refresh failed: ${e instanceof Error ? e.message : String(e)}`);
+    }
+  })();
+}
+
+// src/connection/create-bridge-agent-capabilities-reporter.ts
+function createAgentCapabilitiesReporter(params) {
+  const { workspaceId, getWs } = params;
+  return (info) => {
+    if (!Array.isArray(info.configOptions) || info.configOptions.length === 0) return;
+    setImmediate(() => {
+      let changed = false;
+      try {
+        changed = withCliSqliteSync(
+          (db) => upsertCliAgentCapabilityCache(db, {
+            workspaceId,
+            agentType: info.agentType,
+            configOptions: info.configOptions
+          })
+        );
+      } catch (e) {
+        if (e instanceof CliSqliteInterrupted) return;
+      }
+      if (!changed) return;
+      const socket = getWs();
+      if (!socket || socket.readyState !== wrapper_default.OPEN) return;
+      sendWsMessage(socket, {
+        type: "agent_capabilities",
+        agentType: info.agentType,
+        configOptions: info.configOptions
+      });
+    });
+  };
+}
+function createWarmupAgentCapabilitiesOnConnect(params) {
+  return async () => {
+    await warmupAgentCapabilitiesOnConnect(params);
+  };
+}
+
+// src/connection/create-bridge-message-deps.ts
+function createBridgeMessageDeps(params) {
+  const {
+    getWs,
+    log: log2,
+    acpManager,
+    sessionWorktreeManager,
+    onBridgeIdentified,
+    bridgeHeartbeat,
+    sendLocalSkillsReport,
+    reportAutoDetectedAgents,
+    warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
+    devServerManager,
+    e2ee,
+    cloudApiBaseUrl,
+    getCloudAccessToken
+  } = params;
+  return {
+    getWs,
+    log: log2,
+    acpManager,
+    sessionWorktreeManager,
+    onBridgeIdentified,
+    onBridgeHeartbeatAck: (seq) => {
+      bridgeHeartbeat.onAck(seq);
+    },
+    sendLocalSkillsReport,
+    reportAutoDetectedAgents,
+    warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
+    devServerManager,
+    e2ee,
+    cloudApiBaseUrl,
+    getCloudAccessToken
+  };
+}
+
 // src/connection/create-bridge-connection.ts
 async function createBridgeConnection(options) {
   const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
@@ -48168,48 +48493,36 @@ async function createBridgeConnection(options) {
   function getWs() {
     return state.currentWs;
   }
-  function sendAgentCapabilitiesToBridge(info) {
-    if (!Array.isArray(info.configOptions) || info.configOptions.length === 0) return;
-    setImmediate(() => {
-      let changed = false;
-      try {
-        changed = withCliSqliteSync(
-          (db) => upsertCliAgentCapabilityCache(db, {
-            workspaceId,
-            agentType: info.agentType,
-            configOptions: info.configOptions
-          })
-        );
-      } catch (e) {
-        if (e instanceof CliSqliteInterrupted) return;
-      }
-      if (!changed) return;
-      const socket = getWs();
-      if (!socket || socket.readyState !== wrapper_default.OPEN) return;
-      sendWsMessage(socket, {
-        type: "agent_capabilities",
-        agentType: info.agentType,
-        configOptions: info.configOptions
-      });
-    });
-  }
+  const sendAgentCapabilitiesToBridge = createAgentCapabilitiesReporter({ workspaceId, getWs });
   const worktreesRootPath = options.worktreesRootPath ?? defaultWorktreesRootPath();
   const sessionWorktreeManager = new SessionWorktreeManager({
     worktreesRootPath,
     log: logFn
   });
   const e2ee = options.e2eCertificate ? createCliE2eeRuntime(options.e2eCertificate) : void 0;
-  const bridgeAccess = await createBridgeAccessState({
+  const bridgeAccessRef = {
+    current: null
+  };
+  const bridgeAccessPromise = createBridgeAccessState({
     cloudApiBaseUrl: apiUrl,
     getCloudAccessToken: () => tokens.accessToken,
     e2ee
+  }).then((bridgeAccess2) => {
+    bridgeAccessRef.current = bridgeAccess2;
+    return bridgeAccess2;
   });
   const acpManager = await createAcpManager({
     log: logFn,
-    getBridgeAccessPort: () => bridgeAccess.getPort(),
+    getBridgeAccessPort: () => bridgeAccessRef.current?.getPort() ?? 0,
     reportAgentCapabilities: sendAgentCapabilitiesToBridge
   });
   logFn("CLI running. Press Ctrl+C to exit.");
+  let initialIndexBuildsScheduled = false;
+  const scheduleInitialIndexBuildsOnce = () => {
+    if (initialIndexBuildsScheduled) return;
+    initialIndexBuildsScheduled = true;
+    scheduleInitialIndexBuilds(getBridgeRoot());
+  };
   const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeRoot, e2ee });
   const bridgeHeartbeat = createBridgeHeartbeatController({ getWs, log: logFn });
   const baseOnBridgeIdentified = createOnBridgeIdentified({
@@ -48225,32 +48538,28 @@ async function createBridgeConnection(options) {
   };
   const sendLocalSkillsReport = createSendLocalSkillsReport(getWs, logFn);
   const reportAutoDetectedAgents = createReportAutoDetectedAgents(getWs, logFn);
-  const messageDeps = {
+  const messageDeps = createBridgeMessageDeps({
     getWs,
     log: logFn,
     acpManager,
     sessionWorktreeManager,
     onBridgeIdentified,
-    onBridgeHeartbeatAck: (seq) => {
-      bridgeHeartbeat.onAck(seq);
-    },
+    bridgeHeartbeat,
     sendLocalSkillsReport,
     reportAutoDetectedAgents,
-    warmupAgentCapabilitiesOnConnect: async () => {
-      await warmupAgentCapabilitiesOnConnect({
-        workspaceId,
-        log: logFn,
-        getWs
-      });
-    },
+    warmupAgentCapabilitiesOnConnect: createWarmupAgentCapabilitiesOnConnect({
+      workspaceId,
+      log: logFn,
+      getWs
+    }),
     devServerManager,
     e2ee,
     cloudApiBaseUrl: apiUrl,
     getCloudAccessToken: () => tokens.accessToken
-  };
+  });
   const identifyReportedPaths = {
-    bridgeRootPath: path71.resolve(getBridgeRoot()),
-    worktreesRootPath: path71.resolve(worktreesRootPath)
+    bridgeRootPath: path73.resolve(getBridgeRoot()),
+    worktreesRootPath: path73.resolve(worktreesRootPath)
   };
   const { connect } = createMainBridgeWebSocketLifecycle({
     state,
@@ -48265,10 +48574,12 @@ async function createBridgeConnection(options) {
     onAuthInvalid,
     e2ee,
     identifyReportedPaths,
-    bridgeHeartbeat
+    bridgeHeartbeat,
+    onBridgeSocketOpen: scheduleInitialIndexBuildsOnce
   });
   connect();
   const stopFileIndexWatcher = startFileIndexWatcher(getBridgeRoot());
+  const bridgeAccess = await bridgeAccessPromise;
   return {
     close: async () => {
       requestCliImmediateShutdown();
@@ -48505,9 +48816,9 @@ async function runCliAction(program2, opts) {
   const firehoseServerUrl = opts.firehoseUrl ?? opts.proxyUrl ?? process.env.BUILDAUTOMATON_FIREHOSE_URL ?? process.env.BUILDAUTOMATON_PROXY_URL ?? DEFAULT_FIREHOSE_URL;
   const bridgeRootOpt = (opts.bridgeRoot && typeof opts.bridgeRoot === "string" && opts.bridgeRoot.trim() ? opts.bridgeRoot.trim() : null) ?? (opts.cwd && typeof opts.cwd === "string" && opts.cwd.trim() ? opts.cwd.trim() : null);
   if (bridgeRootOpt) {
-    const resolvedBridgeRoot = path72.resolve(process.cwd(), bridgeRootOpt);
+    const resolvedBridgeRoot = path74.resolve(process.cwd(), bridgeRootOpt);
     try {
-      const st = fs53.statSync(resolvedBridgeRoot);
+      const st = fs52.statSync(resolvedBridgeRoot);
       if (!st.isDirectory()) {
         console.error(`Bridge root is not a directory: ${resolvedBridgeRoot}`);
         process.exit(1);
@@ -48527,7 +48838,7 @@ async function runCliAction(program2, opts) {
   );
   let worktreesRootPath;
   if (opts.worktreesRoot && opts.worktreesRoot.trim()) {
-    worktreesRootPath = path72.resolve(opts.worktreesRoot.trim());
+    worktreesRootPath = path74.resolve(opts.worktreesRoot.trim());
   }
   const e2eCertificates = opts.e2eeCertificatesDir?.trim() ? await loadOrCreateE2eCertificates(opts.e2eeCertificatesDir.trim()) : void 0;
   if (e2eCertificates) {