@lzehrung/codegraph 2.3.19 → 2.3.20

package/dist/bin/cli.js

@@ -17,8 +17,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod2) => function __require2() {
-  return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -32,13 +32,13 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
-  mod2
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
 ));
 
 // dist/cli/compileCache.js
@@ -292,12 +292,12 @@ function isRelativeToRoot(normalizedRoot, normalizedFile) {
   const relativePath3 = path2.relative(comparableRoot, comparableFile);
   return !!relativePath3.length && !relativePath3.startsWith("..") && !path2.isAbsolute(relativePath3);
 }
-function isFilePathWithinRoot(projectRoot, filePath) {
+function isFilePathWithinRoot(projectRoot, filePath, realpathMemo) {
   const normalizedRoot = normalizePath(resolveComparableProjectRoot(projectRoot));
   const normalizedFile = normalizePath(resolveFilePathFromRoot(normalizedRoot, filePath));
   if (isRelativeToRoot(normalizedRoot, normalizedFile))
     return true;
-  return windowsAliasRelativePath(normalizedRoot, normalizedFile) !== null;
+  return windowsAliasRelativePath(normalizedRoot, normalizedFile, realpathMemo) !== null;
 }
 function assertFilePathWithinRoot(projectRoot, filePath, label = "File") {
   const normalizedRoot = normalizePath(resolveComparableProjectRoot(projectRoot));
@@ -318,7 +318,7 @@ function resolveFilePathWithinRoot(projectRoot, filePath, label) {
     };
   }
 }
-function toProjectRelativePath(projectRoot, filePath) {
+function toProjectRelativePath(projectRoot, filePath, realpathMemo) {
   const normalizedRoot = normalizePath(resolveComparableProjectRoot(projectRoot));
   const normalizedFile = normalizePath(resolveFilePathFromRoot(normalizedRoot, filePath));
   if (isRelativeToRoot(normalizedRoot, normalizedFile)) {
@@ -332,21 +332,37 @@ function toProjectRelativePath(projectRoot, filePath) {
     }
     return normalizePath(path2.relative(normalizedRoot, normalizedFile));
   }
-  return windowsAliasRelativePath(normalizedRoot, normalizedFile);
+  return windowsAliasRelativePath(normalizedRoot, normalizedFile, realpathMemo);
 }
-function windowsAliasRelativePath(normalizedRoot, normalizedFile) {
+function resolveWindowsRealpath(filePath, realpathMemo) {
+  if (!realpathMemo)
+    return fs2.realpathSync.native(filePath);
+  const key = fileIdentityKey(filePath);
+  const cached2 = realpathMemo.get(key);
+  if (cached2 !== void 0)
+    return cached2;
+  const resolved = fs2.realpathSync.native(filePath);
+  realpathMemo.set(key, resolved);
+  return resolved;
+}
+function windowsAliasRelativePath(normalizedRoot, normalizedFile, realpathMemo) {
   if (process.platform !== "win32")
     return null;
   if (!isWindowsQualifiedAbsolutePath(normalizedRoot) || !isWindowsQualifiedAbsolutePath(normalizedFile)) {
     return null;
   }
   try {
-    const realRoot = fs2.realpathSync.native(normalizedRoot);
-    const realFile = fs2.realpathSync.native(normalizedFile);
+    const realRoot = resolveWindowsRealpath(normalizedRoot, realpathMemo);
+    const realFile = resolveWindowsRealpath(normalizedFile, realpathMemo);
     const directRelativePath = path2.win32.relative(realRoot, realFile);
     if (!directRelativePath.startsWith("..") && !path2.win32.isAbsolute(directRelativePath)) {
       return normalizePath(directRelativePath);
     }
+    const rootHasNoReparsePoint = fileIdentityKey(realRoot) === fileIdentityKey(normalizedRoot);
+    const fileHasNoReparsePoint = fileIdentityKey(realFile) === fileIdentityKey(normalizedFile);
+    if (rootHasNoReparsePoint && fileHasNoReparsePoint) {
+      return null;
+    }
     const rootStat = fs2.statSync(realRoot, { bigint: true });
     let ancestorPath = realFile;
     while (true) {
@@ -14224,6 +14240,7 @@ __export(projectFiles_exports, {
   DEFAULT_PROJECT_MANIFESTS: () => DEFAULT_PROJECT_MANIFESTS,
   DEFAULT_PROJECT_PATTERNS: () => DEFAULT_PROJECT_PATTERNS,
   createDiscoveredFileMatcher: () => createDiscoveredFileMatcher,
+  createGitIgnoreSourceOwnershipLookup: () => createGitIgnoreSourceOwnershipLookup,
   discoverProjectFiles: () => discoverProjectFiles,
   discoverProjectFilesWithGitCandidates: () => discoverProjectFilesWithGitCandidates,
   filterRealPathsWithinRoot: () => filterRealPathsWithinRoot,
@@ -14231,6 +14248,7 @@ __export(projectFiles_exports, {
   listProjectFiles: () => listProjectFiles,
   listProjectFilesWithGitCandidates: () => listProjectFilesWithGitCandidates,
   matchesDiscoveryGlob: () => matchesDiscoveryGlob,
+  owningGitIgnoreSourceRoot: () => owningGitIgnoreSourceRoot,
   translateGlobRootIgnoreGlobsForScanRoot: () => translateGlobRootIgnoreGlobsForScanRoot
 });
 import fs6 from "node:fs";
@@ -14516,11 +14534,11 @@ function collectCandidateAncestorDirectories(root, files) {
   }
   return directories;
 }
-function owningGitIgnoreSourceRoot(file2, roots) {
+function owningGitIgnoreSourceRoot(file2, roots, realpathMemo) {
   const normalized = normalizePath(file2);
   let owning;
   for (const root of roots) {
-    if (!isFilePathWithinRoot(root.path, normalized) && !isFilePathWithinRoot(root.repositoryRoot, normalized)) {
+    if (!isFilePathWithinRoot(root.path, normalized, realpathMemo) && !isFilePathWithinRoot(root.repositoryRoot, normalized, realpathMemo)) {
       continue;
     }
     if (!owning || root.repositoryRoot.length > owning.repositoryRoot.length) {
@@ -14529,6 +14547,19 @@ function owningGitIgnoreSourceRoot(file2, roots) {
   }
   return owning;
 }
+function createGitIgnoreSourceOwnershipLookup(roots, realpathMemo) {
+  const ownershipByDirectory = /* @__PURE__ */ new Map();
+  return (file2) => {
+    const directory = normalizePath(path9.dirname(file2));
+    const key = fileIdentityKey(directory);
+    if (ownershipByDirectory.has(key)) {
+      return ownershipByDirectory.get(key);
+    }
+    const owning = owningGitIgnoreSourceRoot(directory, roots, realpathMemo);
+    ownershipByDirectory.set(key, owning);
+    return owning;
+  };
+}
 async function gitignoreFileIfPresent(directory) {
   const file2 = normalizePath(path9.join(directory, ".gitignore"));
   try {
@@ -14554,13 +14585,15 @@ async function findGitIgnoreSources(sourceRoots, candidateFiles) {
   for (const { path: sourceRoot, repositoryRoot } of roots) {
     addDirectory(sourceRoot, repositoryRoot);
   }
+  const realpathMemo = /* @__PURE__ */ new Map();
+  const owningOf = createGitIgnoreSourceOwnershipLookup(roots, realpathMemo);
   for (const file2 of candidateFiles) {
-    const owning = owningGitIgnoreSourceRoot(file2, roots);
+    const owning = owningOf(file2);
     if (!owning)
       continue;
     let dir = normalizePath(path9.dirname(file2));
     const stopKey = fileIdentityKey(owning.repositoryRoot);
-    for (; ; ) {
+    while (true) {
       const dirKey = fileIdentityKey(dir);
       const walkKey = `${dirKey}\0${stopKey}`;
       if (walkedDirectoryKeys.has(walkKey))
@@ -14570,7 +14603,7 @@ async function findGitIgnoreSources(sourceRoots, candidateFiles) {
       if (dirKey === stopKey)
         break;
       const parent = normalizePath(path9.dirname(dir));
-      if (parent === dir || !isFilePathWithinRoot(owning.path, parent) && !isFilePathWithinRoot(owning.repositoryRoot, parent)) {
+      if (parent === dir || !isFilePathWithinRoot(owning.path, parent, realpathMemo) && !isFilePathWithinRoot(owning.repositoryRoot, parent, realpathMemo)) {
         break;
       }
       dir = parent;
@@ -14690,7 +14723,9 @@ async function listProjectFilesInternal(projectRoot, patterns = DEFAULT_PROJECT_
   try {
     const useGitignore = options?.useGitignore ?? true;
     const realRoot = await fsp5.realpath(root);
-    const attemptedGitCandidates = useGitignore && options?.gitignoreRoot === void 0 && normalizePath(realRoot) === normalizePath(root);
+    const scanRootKey = fileIdentityKey(root);
+    const gitignoreRootMatchesScanRoot = options?.gitignoreRoot === void 0 || fileIdentityKey(options.gitignoreRoot) === scanRootKey;
+    const attemptedGitCandidates = useGitignore && gitignoreRootMatchesScanRoot && fileIdentityKey(realRoot) === scanRootKey;
     const gitDiscoveryCallbacks = {
       ...options?.onDiscoveryProgress ? { onDiscoveryProgress: options.onDiscoveryProgress } : {},
       ...options?.onDiscoveryTiming ? { onDiscoveryTiming: options.onDiscoveryTiming } : {}
@@ -24687,9 +24722,9 @@ function collectModuleSpecifiersFromSource(support, source, opts) {
           if (mFrom) {
             const dots = mFrom[1] ?? "";
             const name = mFrom[2] ?? "";
-            const mod2 = `${dots}${name}`;
-            if (mod2)
-              out.push({ spec: mod2 });
+            const mod = `${dots}${name}`;
+            if (mod)
+              out.push({ spec: mod });
           }
         }
       } catch {
@@ -27866,8 +27901,8 @@ function resolvePythonNamespaceMember(resolved, imported) {
   return void 0;
 }
 async function pushStarImport(context, moduleSpec, moduleLevel) {
-  const { relDots, mod: mod2 } = splitRelativeModuleSpec(moduleSpec);
-  const resolved = await resolvePythonModule(context.projectRoot, context.file, mod2, relDots);
+  const { relDots, mod } = splitRelativeModuleSpec(moduleSpec);
+  const resolved = await resolvePythonModule(context.projectRoot, context.file, mod, relDots);
   context.pushBinding({
     kind: "star",
     from: moduleSpec,
@@ -27877,8 +27912,8 @@ async function pushStarImport(context, moduleSpec, moduleLevel) {
   });
 }
 async function pushNamedImport(context, moduleSpec, imported, local, moduleLevel) {
-  const { relDots, mod: mod2 } = splitRelativeModuleSpec(moduleSpec);
-  const resolved = await resolvePythonModule(context.projectRoot, context.file, mod2, relDots);
+  const { relDots, mod } = splitRelativeModuleSpec(moduleSpec);
+  const resolved = await resolvePythonModule(context.projectRoot, context.file, mod, relDots);
   const namespaceResolved = resolvePythonNamespaceMember(resolved, imported);
   if (namespaceResolved) {
     context.pushBinding({
@@ -27916,12 +27951,12 @@ async function collectPythonImportsFromSource(context) {
   const pySrc = stripPythonCommentsAndStrings(context.source);
   const fromLinePattern = /^[\t ]*from\s+([^\s]+)\s+import\s+([^\n#]+)/gm;
   for (const match of pySrc.matchAll(fromLinePattern)) {
-    const mod2 = match[1].trim();
+    const mod = match[1].trim();
     const moduleLevel = !/^[\t ]/.test(match[0]);
     const items = match[2].split(",").map((item) => item.trim());
     for (const item of items) {
       if (item === "*") {
-        await pushStarImport(context, mod2, moduleLevel);
+        await pushStarImport(context, mod, moduleLevel);
         continue;
       }
       const aliasMatch = item.match(PYTHON_NAMED_IMPORT_PATTERN);
@@ -27929,7 +27964,7 @@ async function collectPythonImportsFromSource(context) {
         continue;
       const imported = aliasMatch[1];
       const local = aliasMatch[2] ?? imported;
-      await pushNamedImport(context, mod2, imported, local, moduleLevel);
+      await pushNamedImport(context, mod, imported, local, moduleLevel);
     }
   }
   const importPattern = PYTHON_MODULE_IMPORT_PATTERN;
@@ -28220,8 +28255,8 @@ function isSymbolHandleExported(exports, handle) {
   return exports.some((entry) => entry.type === "local" && symbolHandleFromLocal(entry.target.file, entry.target) === handle);
 }
 function isProjectSymbolExported(index, file2, symbolDef) {
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  return mod2 ? isLocalSymbolExported(mod2.exports, symbolDef) : false;
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  return mod ? isLocalSymbolExported(mod.exports, symbolDef) : false;
 }
 var DESCENDANT_DECLARATION_CONTAINER_TYPES;
 var init_declarations = __esm({
@@ -29498,14 +29533,14 @@ function expandStarImports(modules, opts) {
     }
     return null;
   };
-  for (const mod2 of modules.values()) {
+  for (const mod of modules.values()) {
     const expandedImportKeys = /* @__PURE__ */ new Set();
-    for (const existing of mod2.imports) {
+    for (const existing of mod.imports) {
       const key = expandedImportKey(existing);
       if (key)
         expandedImportKeys.add(key);
     }
-    for (const imp of [...mod2.imports]) {
+    for (const imp of [...mod.imports]) {
       if (imp.kind !== "star" || typeof imp.resolved !== "string")
         continue;
       const target = modules.get(fileIdentityKey(imp.resolved));
@@ -29537,7 +29572,7 @@ function expandStarImports(modules, opts) {
         if (!expandedImportKeyValue || expandedImportKeys.has(expandedImportKeyValue))
           continue;
         expandedImportKeys.add(expandedImportKeyValue);
-        mod2.imports.push(expandedImport);
+        mod.imports.push(expandedImport);
       }
     }
   }
@@ -32363,15 +32398,15 @@ function readSqliteSchemaVersion(db, key) {
     return { status: "missing" };
   if (typeof row.value !== "string")
     return { status: "invalid" };
-  const version3 = Number(row.value);
-  if (!Number.isInteger(version3) || version3 < 0)
+  const version2 = Number(row.value);
+  if (!Number.isInteger(version2) || version2 < 0)
     return { status: "invalid" };
-  return { status: "ok", version: version3 };
+  return { status: "ok", version: version2 };
 }
-function writeSqliteSchemaVersion(db, key, version3) {
+function writeSqliteSchemaVersion(db, key, version2) {
   db.prepare(`INSERT INTO cache_schema_metadata (key, value)
      VALUES (?, ?)
-     ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(key, String(version3));
+     ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(key, String(version2));
 }
 function ensureSqliteVersionedTableSchema(args) {
   ensureSqliteSchemaMetadataTable(args.db);
@@ -32952,6 +32987,9 @@ import path37 from "node:path";
 function memoryCacheKey(projectRoot, file2) {
   return `${normalizePath(projectRoot)}::${file2}`;
 }
+function clearMemoryCache() {
+  memoryCache.clear();
+}
 function clearMemoryCacheForProject(projectRoot) {
   const prefix = `${normalizePath(projectRoot)}::`;
   for (const key of memoryCache.keys()) {
@@ -33221,8 +33259,8 @@ async function buildBloomFilterForFile(file2, opts) {
 function isModuleIndex(value) {
   if (!value || typeof value !== "object")
     return false;
-  const mod2 = value;
-  return typeof mod2.file === "string" && Array.isArray(mod2.exports) && Array.isArray(mod2.imports) && Array.isArray(mod2.locals);
+  const mod = value;
+  return typeof mod.file === "string" && Array.isArray(mod.exports) && Array.isArray(mod.imports) && Array.isArray(mod.locals);
 }
 function transformPersistedExportFromModule(projectRoot, entry, toRelative) {
   if (toRelative) {
@@ -33419,6 +33457,9 @@ function writeModulesToCache(projectRoot, writes, opts) {
     }
   }
 }
+function writeToCache(projectRoot, file2, sig, mod, opts) {
+  writeModulesToCache(projectRoot, [{ file: file2, sig, mod }], opts);
+}
 var PARSED_CACHE_VERSION, MODULE_CACHE_SCHEMA_VERSION, MODULE_CACHE_TABLE, MODULE_CACHE_SCHEMA_VERSION_KEY, MODULE_CACHE_COLUMNS, MAX_MEMORY_CACHE_ENTRIES, memoryCache, cachedExecutionFingerprint, cachedExecutionHash, diskModuleCaches, warnedMissingNodeSqlite;
 var init_module_cache = __esm({
   "dist/indexer/build-cache/module-cache.js"() {
@@ -37329,10 +37370,10 @@ var init_regexes = __esm({
     duration = /^P(?:(\d+W)|(?!.*W)(?=\d|T\d)(\d+Y)?(\d+M)?(\d+D)?(T(?=\d)(\d+H)?(\d+M)?(\d+([.,]\d+)?S)?)?)$/;
     extendedDuration = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/;
     guid = /^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$/;
-    uuid = (version3) => {
-      if (!version3)
+    uuid = (version2) => {
+      if (!version2)
         return /^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}|00000000-0000-0000-0000-000000000000|ffffffff-ffff-ffff-ffff-ffffffffffff)$/;
-      return new RegExp(`^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-${version3}[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$`);
+      return new RegExp(`^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-${version2}[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$`);
     };
     uuid4 = /* @__PURE__ */ uuid(4);
     uuid6 = /* @__PURE__ */ uuid(6);
@@ -50882,10 +50923,10 @@ function fromJSONSchema(schema, params) {
   } catch {
     throw new Error("fromJSONSchema input is not valid JSON (possibly cyclic); use $defs/$ref for recursive schemas");
   }
-  const version3 = detectVersion(normalized, params?.defaultTarget);
+  const version2 = detectVersion(normalized, params?.defaultTarget);
   const defs = normalized.$defs || normalized.definitions || {};
   const ctx = {
-    version: version3,
+    version: version2,
     defs,
     refs: /* @__PURE__ */ new Map(),
     processing: /* @__PURE__ */ new Set(),
@@ -52474,21 +52515,21 @@ async function buildSymbolGraph(index, opts) {
     addEdge(aliasId, targetId, label);
     return true;
   };
-  for (const mod2 of index.byFile.values()) {
-    const displayFile = normalizePath(mod2.file);
+  for (const mod of index.byFile.values()) {
+    const displayFile = normalizePath(mod.file);
     if (!shouldIncludeFile(displayFile))
       continue;
-    for (const def of mod2.locals) {
+    for (const def of mod.locals) {
       const node = nodeForDef(def);
       if (!nodes.has(node.id))
         nodes.set(node.id, node);
     }
   }
-  for (const mod2 of index.byFile.values()) {
-    const displayFile = normalizePath(mod2.file);
+  for (const mod of index.byFile.values()) {
+    const displayFile = normalizePath(mod.file);
     if (!shouldIncludeFile(displayFile))
       continue;
-    for (const imp of mod2.imports) {
+    for (const imp of mod.imports) {
       if (!imp)
         continue;
       const targetFile = typeof imp.resolved === "string" ? normalizePath(imp.resolved) : void 0;
@@ -52983,12 +53024,12 @@ async function tryLoadProjectSnapshotModules(projectRoot, opts, fileSignatures,
     if (!candidates)
       return /* @__PURE__ */ new Map();
     const modules = /* @__PURE__ */ new Map();
-    for (const [moduleKey, mod2] of candidates) {
+    for (const [moduleKey, mod] of candidates) {
       const signature = normalizedCurrentSignatures.get(moduleKey);
       const snapshotSignature = normalizedFileSignatures.get(moduleKey);
       if (!signature || !snapshotSignature || !snapshotSignatureMatches(snapshotSignature, signature))
         continue;
-      modules.set(moduleKey, mod2);
+      modules.set(moduleKey, mod);
     }
     return modules;
   } catch (error51) {
@@ -53079,21 +53120,21 @@ function createPersistedBloomFilters(bloomFilters, fileSignatures, projectRoot)
     }
   };
 }
-function isSupportedProjectSnapshotVersion(version3) {
-  return version3 === PROJECT_SNAPSHOT_VERSION || version3 === LEGACY_EMBEDDED_MODULE_SNAPSHOT_VERSION;
+function isSupportedProjectSnapshotVersion(version2) {
+  return version2 === PROJECT_SNAPSHOT_VERSION || version2 === LEGACY_EMBEDDED_MODULE_SNAPSHOT_VERSION;
 }
-function snapshotHydratesModulesFromDisk(version3) {
-  return version3 === PROJECT_SNAPSHOT_VERSION;
+function snapshotHydratesModulesFromDisk(version2) {
+  return version2 === PROJECT_SNAPSHOT_VERSION;
 }
-function mutableModuleIndex(mod2) {
-  if (!Object.isFrozen(mod2) && !Object.isFrozen(mod2.imports) && !Object.isFrozen(mod2.exports) && !Object.isFrozen(mod2.locals)) {
-    return mod2;
+function mutableModuleIndex(mod) {
+  if (!Object.isFrozen(mod) && !Object.isFrozen(mod.imports) && !Object.isFrozen(mod.exports) && !Object.isFrozen(mod.locals)) {
+    return mod;
   }
   return {
-    file: mod2.file,
-    exports: [...mod2.exports],
-    imports: [...mod2.imports],
-    locals: [...mod2.locals]
+    file: mod.file,
+    exports: [...mod.exports],
+    imports: [...mod.imports],
+    locals: [...mod.locals]
   };
 }
 function modulesForThinSnapshot(index, projectRoot, opts) {
@@ -53110,8 +53151,8 @@ function collectSnapshotModules(projectRoot, opts, payload, snapshotPath, identi
     return cached2.modules;
   }
   const modules = /* @__PURE__ */ new Map();
-  for (const mod2 of payload.modules) {
-    modules.set(fileIdentityKey(mod2.file), mod2);
+  for (const mod of payload.modules) {
+    modules.set(fileIdentityKey(mod.file), mod);
   }
   if (snapshotHydratesModulesFromDisk(payload.version)) {
     const cachedModules = loadAllCachedModules(projectRoot, opts);
@@ -53124,16 +53165,16 @@ function collectSnapshotModules(projectRoot, opts, payload, snapshotPath, identi
         modules.set(key, row.mod);
       }
     }
-    for (const [key, mod2] of modules) {
-      if (!mod2.imports.some((binding) => binding.kind === "star"))
+    for (const [key, mod] of modules) {
+      if (!mod.imports.some((binding) => binding.kind === "star"))
         continue;
-      modules.set(key, mutableModuleIndex(mod2));
+      modules.set(key, mutableModuleIndex(mod));
     }
     expandStarImports(modules, opts);
-    for (const [key, mod2] of modules) {
-      if (Object.isFrozen(mod2))
+    for (const [key, mod] of modules) {
+      if (Object.isFrozen(mod))
         continue;
-      modules.set(key, freezeSnapshotPayload(mod2));
+      modules.set(key, freezeSnapshotPayload(mod));
     }
   }
   const entry = { identity, root: projectRoot, modules };
@@ -53779,6 +53820,55 @@ var init_project_snapshot = __esm({
 });
 
 // dist/indexer/build-cache.js
+var build_cache_exports = {};
+__export(build_cache_exports, {
+  BLOOM_FILTER_SNAPSHOT_FILENAME: () => BLOOM_FILTER_SNAPSHOT_FILENAME,
+  BLOOM_FILTER_SNAPSHOT_VERSION: () => BLOOM_FILTER_SNAPSHOT_VERSION,
+  MANIFEST_VERSION: () => MANIFEST_VERSION,
+  PROJECT_SNAPSHOT_VERSION: () => PROJECT_SNAPSHOT_VERSION,
+  buildBloomFilterForFile: () => buildBloomFilterForFile,
+  cacheRoot: () => cacheRoot,
+  cacheSignatureForFile: () => cacheSignatureForFile,
+  clearMemoryCache: () => clearMemoryCache,
+  closeDiskCacheDatabase: () => closeDiskCacheDatabase,
+  collectWorkspaceManifestDependencyEdges: () => collectWorkspaceManifestDependencyEdges,
+  computeConfigHash: () => computeConfigHash,
+  createFallbackImportExtractionHandler: () => createFallbackImportExtractionHandler,
+  createProjectSnapshotIdentity: () => createProjectSnapshotIdentity,
+  diffBuildOptions: () => diffBuildOptions,
+  diskModuleCacheExists: () => diskModuleCacheExists,
+  fileSignature: () => fileSignature,
+  fileSignatureFromSource: () => fileSignatureFromSource,
+  graphOptionsEqual: () => graphOptionsEqual,
+  initCacheReport: () => initCacheReport,
+  initFileReport: () => initFileReport,
+  initManifestReport: () => initManifestReport,
+  loadManifest: () => loadManifest,
+  normalizeGraphOptions: () => normalizeGraphOptions,
+  normalizeIndexedFileInputs: () => normalizeIndexedFileInputs,
+  normalizeIndexedFileInputsWithinRoot: () => normalizeIndexedFileInputsWithinRoot,
+  normalizeLanguageExtensions: () => normalizeLanguageExtensions,
+  projectSnapshotFilesSignature: () => projectSnapshotFilesSignature,
+  pruneDiskModuleCache: () => pruneDiskModuleCache,
+  recordConfigHashResult: () => recordConfigHashResult,
+  recordFileFailure: () => recordFileFailure,
+  resolveCacheLocation: () => resolveCacheLocation,
+  sanitizeManifestEntriesForRoot: () => sanitizeManifestEntriesForRoot,
+  sanitizeManifestTransientFilesForRoot: () => sanitizeManifestTransientFilesForRoot,
+  summarizeBuildOptions: () => summarizeBuildOptions,
+  transformManifestEntries: () => transformManifestEntries,
+  tryLoadDetailedSymbolGraphSnapshot: () => tryLoadDetailedSymbolGraphSnapshot,
+  tryLoadFromCache: () => tryLoadFromCache,
+  tryLoadPersistedBloomFilters: () => tryLoadPersistedBloomFilters,
+  tryLoadProjectIndexSnapshot: () => tryLoadProjectIndexSnapshot,
+  tryLoadProjectSnapshotModules: () => tryLoadProjectSnapshotModules,
+  verifyManifestEntries: () => verifyManifestEntries,
+  writeDetailedSymbolGraphSnapshot: () => writeDetailedSymbolGraphSnapshot,
+  writeManifest: () => writeManifest2,
+  writeModulesToCache: () => writeModulesToCache,
+  writeProjectIndexSnapshot: () => writeProjectIndexSnapshot,
+  writeToCache: () => writeToCache
+});
 var init_build_cache = __esm({
   "dist/indexer/build-cache.js"() {
     "use strict";
@@ -53988,13 +54078,20 @@ var init_parsed_cache = __esm({
 import { performance as performance4 } from "node:perf_hooks";
 async function finalizeProjectIndex(args) {
   const discoveryTimings = args.opts?.report ? args.opts.report.timings ??= {} : void 0;
-  const metadataDiscoveryStart = args.projectFiles === void 0 ? performance4.now() : void 0;
-  const projectFiles = await (args.projectFiles ?? discoverProjectFilesWithGitCandidates(args.projectRoot, {
-    ...args.opts?.logLevel ? { logLevel: args.opts.logLevel } : {},
-    ...args.knownGitCandidates !== void 0 ? { knownGitCandidates: args.knownGitCandidates } : {}
-  }));
-  if (metadataDiscoveryStart !== void 0 && discoveryTimings) {
-    discoveryTimings.metadataDiscoveryMs = Math.round(performance4.now() - metadataDiscoveryStart);
+  let projectFiles;
+  if (args.projectFiles !== void 0) {
+    projectFiles = await args.projectFiles;
+  } else {
+    const metadataDiscoveryStart = performance4.now();
+    projectFiles = await discoverProjectFilesWithGitCandidates(args.projectRoot, {
+      ...args.opts?.logLevel ? { logLevel: args.opts.logLevel } : {},
+      ...args.knownGitCandidates !== void 0 ? { knownGitCandidates: args.knownGitCandidates } : {}
+    });
+    if (discoveryTimings) {
+      const metadataDiscoveryMs = Math.round(performance4.now() - metadataDiscoveryStart);
+      discoveryTimings.metadataDiscoveryMs = metadataDiscoveryMs;
+      (discoveryTimings.steps ??= []).push({ name: "metadata-discovery", ms: metadataDiscoveryMs });
+    }
   }
   if (args.timings)
     args.timings.totalMs = Math.round(performance4.now() - args.totalStart);
@@ -54046,15 +54143,25 @@ function toManifestFileEntry(entry) {
     edges: entry.edges
   };
 }
+function recordManifestTimingStep(timings, name, startedAt) {
+  if (!timings)
+    return;
+  (timings.steps ??= []).push({ name, ms: Math.round(performance5.now() - startedAt) });
+}
 async function writeIndexManifestSnapshot(args) {
   const files = args.files instanceof Map ? Object.fromEntries(args.files) : args.files;
   if (!Object.keys(files).length && !args.allowEmpty)
     return;
   const writeManifestStart = performance5.now();
+  const gitHeadStartedAt = performance5.now();
   const lastCommit = await getGitHead(args.projectRoot);
-  const configHashResult = await computeConfigHash(args.projectRoot, args.opts?.logLevel);
+  recordManifestTimingStep(args.timings, "git-head", gitHeadStartedAt);
+  const configHashStartedAt = performance5.now();
+  const configHashResult = args.configHash ?? await computeConfigHash(args.projectRoot, args.opts?.logLevel);
+  recordManifestTimingStep(args.timings, "config-hash", configHashStartedAt);
   const projectRootMtimeMs = args.symlinkDirectories !== void 0 ? (await fsp24.stat(args.projectRoot)).mtimeMs : void 0;
   const configHash = recordConfigHashResult(args.manifestReport, configHashResult, args.opts?.logLevel);
+  const transformStartedAt = performance5.now();
   const manifestData = {
     version: MANIFEST_VERSION,
     projectRoot: path45.resolve(args.projectRoot).replace(/\\/g, "/"),
@@ -54071,9 +54178,15 @@ async function writeIndexManifestSnapshot(args) {
       ...projectRootMtimeMs !== void 0 ? { symlinkDirectoriesRootMtimeMs: projectRootMtimeMs } : {}
     } : {}
   };
+  recordManifestTimingStep(args.timings, "manifest-transform", transformStartedAt);
+  const manifestWriteStartedAt = performance5.now();
   const manifestWritten = await writeManifest2(args.projectRoot, args.opts, manifestData);
-  if (manifestWritten)
+  recordManifestTimingStep(args.timings, "manifest-write", manifestWriteStartedAt);
+  if (manifestWritten) {
+    const cachePruneStartedAt = performance5.now();
     pruneDiskModuleCache(args.projectRoot, Object.keys(files), args.opts);
+    recordManifestTimingStep(args.timings, "cache-prune", cachePruneStartedAt);
+  }
   if (args.timings) {
     args.timings.writeManifestMs = Math.round(performance5.now() - writeManifestStart);
   }
@@ -54087,1367 +54200,6 @@ var init_build_manifest = __esm({
   }
 });
 
-// node_modules/piscina/package.json
-var require_package = __commonJS({
-  "node_modules/piscina/package.json"(exports, module2) {
-    module2.exports = {
-      name: "piscina",
-      version: "4.9.3",
-      description: "A fast, efficient Node.js Worker Thread Pool implementation",
-      main: "./dist/main.js",
-      types: "./dist/index.d.ts",
-      exports: {
-        types: "./dist/index.d.ts",
-        import: "./dist/esm-wrapper.mjs",
-        require: "./dist/main.js"
-      },
-      scripts: {
-        build: "tsc && gen-esm-wrapper . dist/esm-wrapper.mjs",
-        lint: 'standardx "**/*.{ts,mjs,js,cjs}" | snazzy',
-        test: "c8 tap",
-        "test:ci": "npm run lint && npm run build && npm run test:coverage",
-        "test:coverage": "c8 --reporter=lcov tap --cov",
-        prepack: "npm run build",
-        bench: "npm run bench:taskqueue && npm run bench:piscina",
-        "bench:piscina": "npm run benchmark:piscina-default &&npm run benchmark:piscina-fixed-queue && npm run benchmark:piscina-comparison",
-        "bench:taskqueue": "npm run benchmark:queue-comparison",
-        "benchmark:piscina-default": "node benchmark/simple-benchmark.js",
-        "benchmark:piscina-fixed-queue": "node benchmark/simple-benchmark-fixed-queue.js",
-        "benchmark:piscina-comparison": "node benchmark/piscina-queue-comparison.js",
-        "benchmark:queue-comparison": "node benchmark/queue-comparison.js"
-      },
-      repository: {
-        type: "git",
-        url: "git+https://github.com/piscinajs/piscina.git"
-      },
-      keywords: [
-        "fast",
-        "worker threads",
-        "thread pool",
-        "wade wilson"
-      ],
-      author: "James M Snell <jasnell@gmail.com>",
-      contributors: [
-        "Anna Henningsen <anna@addaleax.net>",
-        "Matteo Collina <matteo.collina@gmail.com>"
-      ],
-      license: "MIT",
-      devDependencies: {
-        "@types/node": "^22.4.1",
-        "@typescript-eslint/eslint-plugin": "^6.9.0",
-        "@typescript-eslint/parser": "^6.9.0",
-        "abort-controller": "^3.0.0",
-        c8: "^10.1.2",
-        "concat-stream": "^2.0.0",
-        "gen-esm-wrapper": "^1.1.1",
-        snazzy: "^9.0.0",
-        standardx: "^7.0.0",
-        tap: "^16.3.7",
-        tinybench: "^2.8.0",
-        "ts-node": "^10.9.2",
-        typescript: "5.6.2"
-      },
-      optionalDependencies: {
-        "@napi-rs/nice": "^1.0.1"
-      },
-      eslintConfig: {
-        rules: {
-          semi: [
-            "error",
-            "always"
-          ],
-          "no-unused-vars": "off",
-          "no-use-before-define": "off",
-          "no-unreachable-loop": "off",
-          "no-dupe-class-members": "off",
-          "@typescript-eslint/no-unused-vars": "error"
-        },
-        globals: {
-          SharedArrayBuffer: true,
-          Atomics: true,
-          AbortController: true,
-          MessageChannel: true
-        }
-      },
-      standardx: {
-        parser: "@typescript-eslint/parser",
-        plugins: [
-          "@typescript-eslint/eslint-plugin"
-        ]
-      },
-      bugs: {
-        url: "https://github.com/piscinajs/piscina/issues"
-      },
-      homepage: "https://github.com/piscinajs/piscina#readme",
-      directories: {
-        example: "examples",
-        test: "test"
-      }
-    };
-  }
-});
-
-// node_modules/piscina/dist/symbols.js
-var require_symbols = __commonJS({
-  "node_modules/piscina/dist/symbols.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.kFieldCount = exports.kResponseCountField = exports.kRequestCountField = exports.kQueueOptions = exports.kValue = exports.kTransferable = exports.kMovable = void 0;
-    exports.kMovable = /* @__PURE__ */ Symbol("Piscina.kMovable");
-    exports.kTransferable = /* @__PURE__ */ Symbol.for("Piscina.transferable");
-    exports.kValue = /* @__PURE__ */ Symbol.for("Piscina.valueOf");
-    exports.kQueueOptions = /* @__PURE__ */ Symbol.for("Piscina.queueOptions");
-    exports.kRequestCountField = 0;
-    exports.kResponseCountField = 1;
-    exports.kFieldCount = 2;
-  }
-});
-
-// node_modules/piscina/dist/common.js
-var require_common3 = __commonJS({
-  "node_modules/piscina/dist/common.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.commonState = exports.READY = void 0;
-    exports.isTransferable = isTransferable;
-    exports.isMovable = isMovable;
-    exports.markMovable = markMovable;
-    exports.createHistogramSummary = createHistogramSummary;
-    exports.toHistogramIntegerNano = toHistogramIntegerNano;
-    exports.maybeFileURLToPath = maybeFileURLToPath;
-    exports.getAvailableParallelism = getAvailableParallelism;
-    var node_url_1 = __require("node:url");
-    var node_os_1 = __require("node:os");
-    var symbols_1 = require_symbols();
-    exports.READY = "_WORKER_READY";
-    function isTransferable(value) {
-      return value != null && typeof value === "object" && symbols_1.kTransferable in value && symbols_1.kValue in value;
-    }
-    function isMovable(value) {
-      return isTransferable(value) && value[symbols_1.kMovable] === true;
-    }
-    function markMovable(value) {
-      Object.defineProperty(value, symbols_1.kMovable, {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: true
-      });
-    }
-    exports.commonState = {
-      isWorkerThread: false,
-      workerData: void 0
-    };
-    function createHistogramSummary(histogram) {
-      const { mean, stddev, min, max } = histogram;
-      return {
-        average: mean / 1e3,
-        mean: mean / 1e3,
-        stddev,
-        min: min / 1e3,
-        max: max / 1e3,
-        p0_001: histogram.percentile(1e-3) / 1e3,
-        p0_01: histogram.percentile(0.01) / 1e3,
-        p0_1: histogram.percentile(0.1) / 1e3,
-        p1: histogram.percentile(1) / 1e3,
-        p2_5: histogram.percentile(2.5) / 1e3,
-        p10: histogram.percentile(10) / 1e3,
-        p25: histogram.percentile(25) / 1e3,
-        p50: histogram.percentile(50) / 1e3,
-        p75: histogram.percentile(75) / 1e3,
-        p90: histogram.percentile(90) / 1e3,
-        p97_5: histogram.percentile(97.5) / 1e3,
-        p99: histogram.percentile(99) / 1e3,
-        p99_9: histogram.percentile(99.9) / 1e3,
-        p99_99: histogram.percentile(99.99) / 1e3,
-        p99_999: histogram.percentile(99.999) / 1e3
-      };
-    }
-    function toHistogramIntegerNano(milliseconds) {
-      return Math.max(1, Math.trunc(milliseconds * 1e3));
-    }
-    function maybeFileURLToPath(filename) {
-      return filename.startsWith("file:") ? (0, node_url_1.fileURLToPath)(new node_url_1.URL(filename)) : filename;
-    }
-    function getAvailableParallelism() {
-      if (typeof node_os_1.availableParallelism === "function") {
-        return (0, node_os_1.availableParallelism)();
-      }
-      try {
-        return (0, node_os_1.cpus)().length;
-      } catch {
-        return 1;
-      }
-    }
-  }
-});
-
-// node_modules/piscina/dist/task_queue/array_queue.js
-var require_array_queue = __commonJS({
-  "node_modules/piscina/dist/task_queue/array_queue.js"(exports) {
-    "use strict";
-    var __importDefault = exports && exports.__importDefault || function(mod2) {
-      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
-    };
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ArrayTaskQueue = void 0;
-    var node_assert_1 = __importDefault(__require("node:assert"));
-    var ArrayTaskQueue2 = class {
-      constructor() {
-        this.tasks = [];
-      }
-      get size() {
-        return this.tasks.length;
-      }
-      shift() {
-        var _a3;
-        return (_a3 = this.tasks.shift()) !== null && _a3 !== void 0 ? _a3 : null;
-      }
-      push(task) {
-        this.tasks.push(task);
-      }
-      remove(task) {
-        const index = this.tasks.indexOf(task);
-        node_assert_1.default.notStrictEqual(index, -1);
-        this.tasks.splice(index, 1);
-      }
-    };
-    exports.ArrayTaskQueue = ArrayTaskQueue2;
-  }
-});
-
-// node_modules/piscina/dist/task_queue/fixed_queue.js
-var require_fixed_queue = __commonJS({
-  "node_modules/piscina/dist/task_queue/fixed_queue.js"(exports) {
-    "use strict";
-    var __importDefault = exports && exports.__importDefault || function(mod2) {
-      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
-    };
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.FixedQueue = void 0;
-    var node_assert_1 = __importDefault(__require("node:assert"));
-    var kSize = 2048;
-    var kMask = kSize - 1;
-    var FixedCircularBuffer = class {
-      constructor() {
-        this.bottom = 0;
-        this.top = 0;
-        this.list = new Array(kSize);
-        this.next = null;
-      }
-      isEmpty() {
-        return this.top === this.bottom;
-      }
-      isFull() {
-        return (this.top + 1 & kMask) === this.bottom;
-      }
-      push(data) {
-        this.list[this.top] = data;
-        this.top = this.top + 1 & kMask;
-      }
-      shift() {
-        const nextItem = this.list[this.bottom];
-        if (nextItem === void 0) {
-          return null;
-        }
-        this.list[this.bottom] = void 0;
-        this.bottom = this.bottom + 1 & kMask;
-        return nextItem;
-      }
-      remove(task) {
-        const indexToRemove = this.list.indexOf(task);
-        node_assert_1.default.notStrictEqual(indexToRemove, -1);
-        let curr = indexToRemove;
-        while (true) {
-          const next = curr + 1 & kMask;
-          this.list[curr] = this.list[next];
-          if (this.list[curr] === void 0) {
-            break;
-          }
-          if (next === indexToRemove) {
-            this.list[curr] = void 0;
-            break;
-          }
-          curr = next;
-        }
-        this.top = this.top - 1 & kMask;
-      }
-    };
-    var FixedQueue2 = class {
-      constructor() {
-        this._size = 0;
-        this.head = this.tail = new FixedCircularBuffer();
-      }
-      isEmpty() {
-        return this.head.isEmpty();
-      }
-      push(data) {
-        if (this.head.isFull()) {
-          this.head = this.head.next = new FixedCircularBuffer();
-        }
-        this.head.push(data);
-        this._size++;
-      }
-      shift() {
-        const tail = this.tail;
-        const next = tail.shift();
-        if (next !== null)
-          this._size--;
-        if (tail.isEmpty() && tail.next !== null) {
-          this.tail = tail.next;
-          tail.next = null;
-        }
-        return next;
-      }
-      remove(task) {
-        let prev = null;
-        let buffer = this.tail;
-        while (true) {
-          if (buffer.list.includes(task)) {
-            buffer.remove(task);
-            this._size--;
-            break;
-          }
-          if (buffer.next === null)
-            break;
-          prev = buffer;
-          buffer = buffer.next;
-        }
-        if (buffer.isEmpty()) {
-          if (prev === null) {
-            if (buffer.next !== null)
-              this.tail = buffer.next;
-          } else {
-            if (buffer.next === null) {
-              this.head = prev;
-            } else {
-              prev.next = buffer.next;
-            }
-          }
-        }
-      }
-      get size() {
-        return this._size;
-      }
-    };
-    exports.FixedQueue = FixedQueue2;
-  }
-});
-
-// node_modules/piscina/dist/task_queue/index.js
-var require_task_queue = __commonJS({
-  "node_modules/piscina/dist/task_queue/index.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.TaskInfo = exports.FixedQueue = exports.ArrayTaskQueue = void 0;
-    exports.isTaskQueue = isTaskQueue;
-    var node_perf_hooks_1 = __require("node:perf_hooks");
-    var node_async_hooks_1 = __require("node:async_hooks");
-    var common_1 = require_common3();
-    var symbols_1 = require_symbols();
-    var array_queue_1 = require_array_queue();
-    Object.defineProperty(exports, "ArrayTaskQueue", { enumerable: true, get: function() {
-      return array_queue_1.ArrayTaskQueue;
-    } });
-    var fixed_queue_1 = require_fixed_queue();
-    Object.defineProperty(exports, "FixedQueue", { enumerable: true, get: function() {
-      return fixed_queue_1.FixedQueue;
-    } });
-    function isTaskQueue(value) {
-      return typeof value === "object" && value !== null && "size" in value && typeof value.shift === "function" && typeof value.remove === "function" && typeof value.push === "function";
-    }
-    var taskIdCounter = 0;
-    var TaskInfo = class extends node_async_hooks_1.AsyncResource {
-      constructor(task, transferList, filename, name, callback, abortSignal, triggerAsyncId) {
-        super("Piscina.Task", { requireManualDestroy: true, triggerAsyncId });
-        this.abortListener = null;
-        this.workerInfo = null;
-        this.callback = callback;
-        this.task = task;
-        this.transferList = transferList;
-        if ((0, common_1.isMovable)(task)) {
-          if (this.transferList == null) {
-            this.transferList = [];
-          }
-          this.transferList = this.transferList.concat(task[symbols_1.kTransferable]);
-          this.task = task[symbols_1.kValue];
-        }
-        this.filename = filename;
-        this.name = name;
-        this.taskId = taskIdCounter++;
-        this.abortSignal = abortSignal;
-        this.created = node_perf_hooks_1.performance.now();
-        this.started = 0;
-      }
-      releaseTask() {
-        const ret = this.task;
-        this.task = null;
-        return ret;
-      }
-      done(err, result) {
-        this.runInAsyncScope(this.callback, null, err, result);
-        this.emitDestroy();
-        if (this.abortSignal && this.abortListener) {
-          if ("removeEventListener" in this.abortSignal && this.abortListener) {
-            this.abortSignal.removeEventListener("abort", this.abortListener);
-          } else {
-            this.abortSignal.off("abort", this.abortListener);
-          }
-        }
-      }
-      get [symbols_1.kQueueOptions]() {
-        return symbols_1.kQueueOptions in this.task ? this.task[symbols_1.kQueueOptions] : null;
-      }
-      get interface() {
-        return {
-          taskId: this.taskId,
-          filename: this.filename,
-          name: this.name,
-          created: this.created,
-          isAbortable: this.abortSignal !== null,
-          [symbols_1.kQueueOptions]: this[symbols_1.kQueueOptions]
-        };
-      }
-    };
-    exports.TaskInfo = TaskInfo;
-  }
-});
-
-// node_modules/piscina/dist/errors.js
-var require_errors = __commonJS({
-  "node_modules/piscina/dist/errors.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.Errors = void 0;
-    exports.Errors = {
-      ThreadTermination: () => new Error("Terminating worker thread"),
-      FilenameNotProvided: () => new Error("filename must be provided to run() or in options object"),
-      TaskQueueAtLimit: () => new Error("Task queue is at limit"),
-      NoTaskQueueAvailable: () => new Error("No task queue available and all Workers are busy"),
-      CloseTimeout: () => new Error("Close operation timed out")
-    };
-  }
-});
-
-// node_modules/piscina/dist/worker_pool/index.js
-var require_worker_pool = __commonJS({
-  "node_modules/piscina/dist/worker_pool/index.js"(exports) {
-    "use strict";
-    var __importDefault = exports && exports.__importDefault || function(mod2) {
-      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
-    };
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.WorkerInfo = exports.AsynchronouslyCreatedResourcePool = void 0;
-    var node_worker_threads_1 = __require("node:worker_threads");
-    var node_assert_1 = __importDefault(__require("node:assert"));
-    var errors_1 = require_errors();
-    var symbols_1 = require_symbols();
-    var AsynchronouslyCreatedResource = class {
-      constructor() {
-        this.onreadyListeners = [];
-      }
-      markAsReady() {
-        const listeners = this.onreadyListeners;
-        (0, node_assert_1.default)(listeners !== null);
-        this.onreadyListeners = null;
-        for (const listener of listeners) {
-          listener();
-        }
-      }
-      isReady() {
-        return this.onreadyListeners === null;
-      }
-      onReady(fn) {
-        if (this.onreadyListeners === null) {
-          fn();
-          return;
-        }
-        this.onreadyListeners.push(fn);
-      }
-    };
-    var AsynchronouslyCreatedResourcePool = class {
-      constructor(maximumUsage) {
-        this.pendingItems = /* @__PURE__ */ new Set();
-        this.readyItems = /* @__PURE__ */ new Set();
-        this.maximumUsage = maximumUsage;
-        this.onAvailableListeners = [];
-      }
-      add(item) {
-        this.pendingItems.add(item);
-        item.onReady(() => {
-          if (this.pendingItems.has(item)) {
-            this.pendingItems.delete(item);
-            this.readyItems.add(item);
-            this.maybeAvailable(item);
-          }
-        });
-      }
-      delete(item) {
-        this.pendingItems.delete(item);
-        this.readyItems.delete(item);
-      }
-      findAvailable() {
-        let minUsage = this.maximumUsage;
-        let candidate = null;
-        for (const item of this.readyItems) {
-          const usage = item.currentUsage();
-          if (usage === 0)
-            return item;
-          if (usage < minUsage) {
-            candidate = item;
-            minUsage = usage;
-          }
-        }
-        return candidate;
-      }
-      *[Symbol.iterator]() {
-        yield* this.pendingItems;
-        yield* this.readyItems;
-      }
-      get size() {
-        return this.pendingItems.size + this.readyItems.size;
-      }
-      maybeAvailable(item) {
-        if (item.currentUsage() < this.maximumUsage) {
-          for (const listener of this.onAvailableListeners) {
-            listener(item);
-          }
-        }
-      }
-      onAvailable(fn) {
-        this.onAvailableListeners.push(fn);
-      }
-    };
-    exports.AsynchronouslyCreatedResourcePool = AsynchronouslyCreatedResourcePool;
-    var WorkerInfo = class extends AsynchronouslyCreatedResource {
-      constructor(worker, port, onMessage) {
-        super();
-        this.idleTimeout = null;
-        this.lastSeenResponseCount = 0;
-        this.worker = worker;
-        this.port = port;
-        this.port.on("message", (message) => this._handleResponse(message));
-        this.onMessage = onMessage;
-        this.taskInfos = /* @__PURE__ */ new Map();
-        this.sharedBuffer = new Int32Array(new SharedArrayBuffer(symbols_1.kFieldCount * Int32Array.BYTES_PER_ELEMENT));
-      }
-      destroy() {
-        this.worker.terminate();
-        this.port.close();
-        this.clearIdleTimeout();
-        for (const taskInfo of this.taskInfos.values()) {
-          taskInfo.done(errors_1.Errors.ThreadTermination());
-        }
-        this.taskInfos.clear();
-      }
-      clearIdleTimeout() {
-        if (this.idleTimeout !== null) {
-          clearTimeout(this.idleTimeout);
-          this.idleTimeout = null;
-        }
-      }
-      ref() {
-        this.port.ref();
-        return this;
-      }
-      unref() {
-        this.port.unref();
-        return this;
-      }
-      _handleResponse(message) {
-        this.onMessage(message);
-        if (this.taskInfos.size === 0) {
-          this.unref();
-        }
-      }
-      postTask(taskInfo) {
-        (0, node_assert_1.default)(!this.taskInfos.has(taskInfo.taskId));
-        const message = {
-          task: taskInfo.releaseTask(),
-          taskId: taskInfo.taskId,
-          filename: taskInfo.filename,
-          name: taskInfo.name
-        };
-        try {
-          this.port.postMessage(message, taskInfo.transferList);
-        } catch (err) {
-          taskInfo.done(err);
-          return;
-        }
-        taskInfo.workerInfo = this;
-        this.taskInfos.set(taskInfo.taskId, taskInfo);
-        this.ref();
-        this.clearIdleTimeout();
-        Atomics.add(this.sharedBuffer, symbols_1.kRequestCountField, 1);
-        Atomics.notify(this.sharedBuffer, symbols_1.kRequestCountField, 1);
-      }
-      processPendingMessages() {
-        const actualResponseCount = Atomics.load(this.sharedBuffer, symbols_1.kResponseCountField);
-        if (actualResponseCount !== this.lastSeenResponseCount) {
-          this.lastSeenResponseCount = actualResponseCount;
-          let entry;
-          while ((entry = (0, node_worker_threads_1.receiveMessageOnPort)(this.port)) !== void 0) {
-            this._handleResponse(entry.message);
-          }
-        }
-      }
-      isRunningAbortableTask() {
-        if (this.taskInfos.size !== 1)
-          return false;
-        const [[, task]] = this.taskInfos;
-        return task.abortSignal !== null;
-      }
-      currentUsage() {
-        if (this.isRunningAbortableTask())
-          return Infinity;
-        return this.taskInfos.size;
-      }
-    };
-    exports.WorkerInfo = WorkerInfo;
-  }
-});
-
-// node_modules/piscina/dist/abort.js
-var require_abort = __commonJS({
-  "node_modules/piscina/dist/abort.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.AbortError = void 0;
-    exports.onabort = onabort;
-    var AbortError = class extends Error {
-      constructor(reason) {
-        super("The task has been aborted", { cause: reason });
-      }
-      get name() {
-        return "AbortError";
-      }
-    };
-    exports.AbortError = AbortError;
-    function onabort(abortSignal, listener) {
-      if ("addEventListener" in abortSignal) {
-        abortSignal.addEventListener("abort", listener, { once: true });
-      } else {
-        abortSignal.once("abort", listener);
-      }
-    }
-  }
-});
-
-// node_modules/piscina/dist/index.js
-var require_dist = __commonJS({
-  "node_modules/piscina/dist/index.js"(exports) {
-    "use strict";
-    var __classPrivateFieldSet = exports && exports.__classPrivateFieldSet || function(receiver, state, value, kind, f) {
-      if (kind === "m") throw new TypeError("Private method is not writable");
-      if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-      if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-      return kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value), value;
-    };
-    var __classPrivateFieldGet = exports && exports.__classPrivateFieldGet || function(receiver, state, kind, f) {
-      if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-      if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-      return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-    };
-    var __importDefault = exports && exports.__importDefault || function(mod2) {
-      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
-    };
-    var _DirectlyTransferable_value;
-    var _ArrayBufferViewTransferable_view;
-    var _Piscina_pool;
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.FixedQueue = exports.version = exports.queueOptionsSymbol = exports.valueSymbol = exports.transferableSymbol = exports.Piscina = exports.workerData = exports.isWorkerThread = exports.move = void 0;
-    var node_worker_threads_1 = __require("node:worker_threads");
-    var node_events_1 = __require("node:events");
-    var node_path_1 = __require("node:path");
-    var node_util_1 = __require("node:util");
-    var node_perf_hooks_1 = __require("node:perf_hooks");
-    var promises_1 = __require("node:timers/promises");
-    var node_assert_1 = __importDefault(__require("node:assert"));
-    var package_json_1 = require_package();
-    Object.defineProperty(exports, "version", { enumerable: true, get: function() {
-      return package_json_1.version;
-    } });
-    var symbols_1 = require_symbols();
-    Object.defineProperty(exports, "queueOptionsSymbol", { enumerable: true, get: function() {
-      return symbols_1.kQueueOptions;
-    } });
-    Object.defineProperty(exports, "transferableSymbol", { enumerable: true, get: function() {
-      return symbols_1.kTransferable;
-    } });
-    Object.defineProperty(exports, "valueSymbol", { enumerable: true, get: function() {
-      return symbols_1.kValue;
-    } });
-    var task_queue_1 = require_task_queue();
-    Object.defineProperty(exports, "FixedQueue", { enumerable: true, get: function() {
-      return task_queue_1.FixedQueue;
-    } });
-    var worker_pool_1 = require_worker_pool();
-    var abort_1 = require_abort();
-    var errors_1 = require_errors();
-    var common_1 = require_common3();
-    var cpuParallelism = (0, common_1.getAvailableParallelism)();
-    var kDefaultOptions = {
-      filename: null,
-      name: "default",
-      minThreads: Math.max(Math.floor(cpuParallelism / 2), 1),
-      maxThreads: cpuParallelism * 1.5,
-      idleTimeout: 0,
-      maxQueue: Infinity,
-      concurrentTasksPerWorker: 1,
-      useAtomics: true,
-      taskQueue: new task_queue_1.ArrayTaskQueue(),
-      niceIncrement: 0,
-      trackUnmanagedFds: true,
-      closeTimeout: 3e4,
-      recordTiming: true
-    };
-    var kDefaultRunOptions = {
-      transferList: void 0,
-      filename: null,
-      signal: null,
-      name: null
-    };
-    var kDefaultCloseOptions = {
-      force: false
-    };
-    var DirectlyTransferable = class {
-      constructor(value) {
-        _DirectlyTransferable_value.set(this, void 0);
-        __classPrivateFieldSet(this, _DirectlyTransferable_value, value, "f");
-      }
-      get [(_DirectlyTransferable_value = /* @__PURE__ */ new WeakMap(), symbols_1.kTransferable)]() {
-        return __classPrivateFieldGet(this, _DirectlyTransferable_value, "f");
-      }
-      get [symbols_1.kValue]() {
-        return __classPrivateFieldGet(this, _DirectlyTransferable_value, "f");
-      }
-    };
-    var ArrayBufferViewTransferable = class {
-      constructor(view) {
-        _ArrayBufferViewTransferable_view.set(this, void 0);
-        __classPrivateFieldSet(this, _ArrayBufferViewTransferable_view, view, "f");
-      }
-      get [(_ArrayBufferViewTransferable_view = /* @__PURE__ */ new WeakMap(), symbols_1.kTransferable)]() {
-        return __classPrivateFieldGet(this, _ArrayBufferViewTransferable_view, "f").buffer;
-      }
-      get [symbols_1.kValue]() {
-        return __classPrivateFieldGet(this, _ArrayBufferViewTransferable_view, "f");
-      }
-    };
-    var ThreadPool = class {
-      constructor(publicInterface, options) {
-        var _a3;
-        this.skipQueue = [];
-        this.completed = 0;
-        this.start = node_perf_hooks_1.performance.now();
-        this.inProcessPendingMessages = false;
-        this.startingUp = false;
-        this.closingUp = false;
-        this.workerFailsDuringBootstrap = false;
-        this.destroying = false;
-        this.publicInterface = publicInterface;
-        this.taskQueue = options.taskQueue || new task_queue_1.ArrayTaskQueue();
-        const filename = options.filename ? (0, common_1.maybeFileURLToPath)(options.filename) : null;
-        this.options = { ...kDefaultOptions, ...options, filename, maxQueue: 0 };
-        if (this.options.recordTiming) {
-          this.runTime = (0, node_perf_hooks_1.createHistogram)();
-          this.waitTime = (0, node_perf_hooks_1.createHistogram)();
-        }
-        if (options.maxThreads !== void 0 && this.options.minThreads >= options.maxThreads) {
-          this.options.minThreads = options.maxThreads;
-        }
-        if (options.minThreads !== void 0 && this.options.maxThreads <= options.minThreads) {
-          this.options.maxThreads = options.minThreads;
-        }
-        if (options.maxQueue === "auto") {
-          this.options.maxQueue = this.options.maxThreads ** 2;
-        } else {
-          this.options.maxQueue = (_a3 = options.maxQueue) !== null && _a3 !== void 0 ? _a3 : kDefaultOptions.maxQueue;
-        }
-        this.workers = new worker_pool_1.AsynchronouslyCreatedResourcePool(this.options.concurrentTasksPerWorker);
-        this.workers.onAvailable((w) => this._onWorkerAvailable(w));
-        this.startingUp = true;
-        this._ensureMinimumWorkers();
-        this.startingUp = false;
-        this.needsDrain = false;
-      }
-      _ensureMinimumWorkers() {
-        if (this.closingUp || this.destroying) {
-          return;
-        }
-        while (this.workers.size < this.options.minThreads) {
-          this._addNewWorker();
-        }
-      }
-      _addNewWorker() {
-        const pool = this;
-        const worker = new node_worker_threads_1.Worker((0, node_path_1.resolve)(__dirname, "worker.js"), {
-          env: this.options.env,
-          argv: this.options.argv,
-          execArgv: this.options.execArgv,
-          resourceLimits: this.options.resourceLimits,
-          workerData: this.options.workerData,
-          trackUnmanagedFds: this.options.trackUnmanagedFds
-        });
-        const { port1, port2 } = new node_worker_threads_1.MessageChannel();
-        const workerInfo = new worker_pool_1.WorkerInfo(worker, port1, onMessage);
-        if (this.startingUp) {
-          workerInfo.markAsReady();
-        }
-        const message = {
-          filename: this.options.filename,
-          name: this.options.name,
-          port: port2,
-          sharedBuffer: workerInfo.sharedBuffer,
-          useAtomics: this.options.useAtomics,
-          niceIncrement: this.options.niceIncrement
-        };
-        worker.postMessage(message, [port2]);
-        function onMessage(message2) {
-          const { taskId, result } = message2;
-          const taskInfo = workerInfo.taskInfos.get(taskId);
-          workerInfo.taskInfos.delete(taskId);
-          pool.workers.maybeAvailable(workerInfo);
-          if (taskInfo === void 0) {
-            const err = new Error(`Unexpected message from Worker: ${(0, node_util_1.inspect)(message2)}`);
-            pool.publicInterface.emit("error", err);
-          } else {
-            taskInfo.done(message2.error, result);
-          }
-          pool._processPendingMessages();
-        }
-        function onReady() {
-          if (workerInfo.currentUsage() === 0) {
-            workerInfo.unref();
-          }
-          if (!workerInfo.isReady()) {
-            workerInfo.markAsReady();
-          }
-        }
-        function onEventMessage(message2) {
-          pool.publicInterface.emit("message", message2);
-        }
-        worker.on("message", (message2) => {
-          message2 instanceof Object && common_1.READY in message2 ? onReady() : onEventMessage(message2);
-        });
-        worker.on("error", (err) => {
-          this._onError(worker, workerInfo, err, false);
-        });
-        worker.on("exit", (exitCode) => {
-          if (this.destroying) {
-            return;
-          }
-          const err = new Error(`worker exited with code: ${exitCode}`);
-          this._onError(worker, workerInfo, err, true);
-        });
-        worker.unref();
-        port1.on("close", () => {
-          worker.ref();
-        });
-        this.workers.add(workerInfo);
-      }
-      _onError(worker, workerInfo, err, onlyErrorUnfinishedTasks) {
-        worker.ref = () => {
-        };
-        const taskInfos = [...workerInfo.taskInfos.values()];
-        workerInfo.taskInfos.clear();
-        this._removeWorker(workerInfo);
-        if (workerInfo.isReady() && !this.workerFailsDuringBootstrap) {
-          this._ensureMinimumWorkers();
-        } else {
-          this.workerFailsDuringBootstrap = true;
-        }
-        if (taskInfos.length > 0) {
-          for (const taskInfo of taskInfos) {
-            taskInfo.done(err, null);
-          }
-        } else if (!onlyErrorUnfinishedTasks) {
-          this.publicInterface.emit("error", err);
-        }
-      }
-      _processPendingMessages() {
-        if (this.inProcessPendingMessages || !this.options.useAtomics) {
-          return;
-        }
-        this.inProcessPendingMessages = true;
-        try {
-          for (const workerInfo of this.workers) {
-            workerInfo.processPendingMessages();
-          }
-        } finally {
-          this.inProcessPendingMessages = false;
-        }
-      }
-      _removeWorker(workerInfo) {
-        workerInfo.destroy();
-        this.workers.delete(workerInfo);
-      }
-      _onWorkerAvailable(workerInfo) {
-        var _a3;
-        while ((this.taskQueue.size > 0 || this.skipQueue.length > 0) && workerInfo.currentUsage() < this.options.concurrentTasksPerWorker) {
-          const taskInfo = this.skipQueue.shift() || this.taskQueue.shift();
-          if (taskInfo.abortSignal && workerInfo.taskInfos.size > 0) {
-            this.skipQueue.push(taskInfo);
-            break;
-          }
-          const now = node_perf_hooks_1.performance.now();
-          (_a3 = this.waitTime) === null || _a3 === void 0 ? void 0 : _a3.record((0, common_1.toHistogramIntegerNano)(now - taskInfo.created));
-          taskInfo.started = now;
-          workerInfo.postTask(taskInfo);
-          this._maybeDrain();
-          return;
-        }
-        if (this.options.idleTimeout === Infinity) {
-          return;
-        }
-        if (workerInfo.taskInfos.size === 0 && this.workers.size > this.options.minThreads) {
-          workerInfo.idleTimeout = setTimeout(() => {
-            node_assert_1.default.strictEqual(workerInfo.taskInfos.size, 0);
-            if (this.workers.size > this.options.minThreads) {
-              this._removeWorker(workerInfo);
-            }
-          }, this.options.idleTimeout).unref();
-        }
-      }
-      runTask(task, options) {
-        var _a3, _b;
-        let { filename, name } = options;
-        const { transferList = [] } = options;
-        if (filename == null) {
-          filename = this.options.filename;
-        }
-        if (name == null) {
-          name = this.options.name;
-        }
-        if (typeof filename !== "string") {
-          return Promise.reject(errors_1.Errors.FilenameNotProvided());
-        }
-        filename = (0, common_1.maybeFileURLToPath)(filename);
-        let signal;
-        if (this.closingUp) {
-          const closingUpAbortController = new AbortController();
-          closingUpAbortController.abort("queue is closing up");
-          signal = closingUpAbortController.signal;
-        } else {
-          signal = (_a3 = options.signal) !== null && _a3 !== void 0 ? _a3 : null;
-        }
-        let resolve;
-        let reject;
-        const ret = new Promise((res, rej) => {
-          resolve = res;
-          reject = rej;
-        });
-        const taskInfo = new task_queue_1.TaskInfo(task, transferList, filename, name, (err, result) => {
-          var _a4;
-          this.completed++;
-          if (taskInfo.started) {
-            (_a4 = this.runTime) === null || _a4 === void 0 ? void 0 : _a4.record((0, common_1.toHistogramIntegerNano)(node_perf_hooks_1.performance.now() - taskInfo.started));
-          }
-          if (err !== null) {
-            reject(err);
-          } else {
-            resolve(result);
-          }
-          this._maybeDrain();
-        }, signal, this.publicInterface.asyncResource.asyncId());
-        if (signal !== null) {
-          if (signal.aborted) {
-            return Promise.reject(new abort_1.AbortError(signal.reason));
-          }
-          taskInfo.abortListener = () => {
-            reject(new abort_1.AbortError(signal.reason));
-            if (taskInfo.workerInfo !== null) {
-              this._removeWorker(taskInfo.workerInfo);
-              this._ensureMinimumWorkers();
-            } else {
-              this.taskQueue.remove(taskInfo);
-            }
-          };
-          (0, abort_1.onabort)(signal, taskInfo.abortListener);
-        }
-        if (this.taskQueue.size > 0) {
-          const totalCapacity = this.options.maxQueue + this.pendingCapacity();
-          if (this.taskQueue.size >= totalCapacity) {
-            if (this.options.maxQueue === 0) {
-              return Promise.reject(errors_1.Errors.NoTaskQueueAvailable());
-            } else {
-              return Promise.reject(errors_1.Errors.TaskQueueAtLimit());
-            }
-          } else {
-            if (this.workers.size < this.options.maxThreads) {
-              this._addNewWorker();
-            }
-            this.taskQueue.push(taskInfo);
-          }
-          this._maybeDrain();
-          return ret;
-        }
-        let workerInfo = this.workers.findAvailable();
-        if (workerInfo !== null && workerInfo.currentUsage() > 0 && signal) {
-          workerInfo = null;
-        }
-        let waitingForNewWorker = false;
-        if ((workerInfo === null || workerInfo.currentUsage() > 0) && this.workers.size < this.options.maxThreads) {
-          this._addNewWorker();
-          waitingForNewWorker = true;
-        }
-        if (workerInfo === null) {
-          if (this.options.maxQueue <= 0 && !waitingForNewWorker) {
-            return Promise.reject(errors_1.Errors.NoTaskQueueAvailable());
-          } else {
-            this.taskQueue.push(taskInfo);
-          }
-          this._maybeDrain();
-          return ret;
-        }
-        const now = node_perf_hooks_1.performance.now();
-        (_b = this.waitTime) === null || _b === void 0 ? void 0 : _b.record((0, common_1.toHistogramIntegerNano)(now - taskInfo.created));
-        taskInfo.started = now;
-        workerInfo.postTask(taskInfo);
-        this._maybeDrain();
-        return ret;
-      }
-      pendingCapacity() {
-        return this.workers.pendingItems.size * this.options.concurrentTasksPerWorker;
-      }
-      _maybeDrain() {
-        const totalCapacity = this.options.maxQueue + this.pendingCapacity();
-        const totalQueueSize = this.taskQueue.size + this.skipQueue.length;
-        if (totalQueueSize === 0) {
-          this.needsDrain = false;
-          this.publicInterface.emit("drain");
-        }
-        if (totalQueueSize >= totalCapacity) {
-          this.needsDrain = true;
-          this.publicInterface.emit("needsDrain");
-        }
-      }
-      async destroy() {
-        this.destroying = true;
-        while (this.skipQueue.length > 0) {
-          const taskInfo = this.skipQueue.shift();
-          taskInfo.done(new Error("Terminating worker thread"));
-        }
-        while (this.taskQueue.size > 0) {
-          const taskInfo = this.taskQueue.shift();
-          taskInfo.done(new Error("Terminating worker thread"));
-        }
-        const exitEvents = [];
-        while (this.workers.size > 0) {
-          const [workerInfo] = this.workers;
-          exitEvents.push((0, node_events_1.once)(workerInfo.worker, "exit"));
-          this._removeWorker(workerInfo);
-        }
-        try {
-          await Promise.all(exitEvents);
-        } finally {
-          this.destroying = false;
-        }
-      }
-      async close(options) {
-        this.closingUp = true;
-        if (options.force) {
-          const skipQueueLength = this.skipQueue.length;
-          for (let i = 0; i < skipQueueLength; i++) {
-            const taskInfo = this.skipQueue.shift();
-            if (taskInfo.workerInfo === null) {
-              taskInfo.done(new abort_1.AbortError("pool is closed"));
-            } else {
-              this.skipQueue.push(taskInfo);
-            }
-          }
-          const taskQueueLength = this.taskQueue.size;
-          for (let i = 0; i < taskQueueLength; i++) {
-            const taskInfo = this.taskQueue.shift();
-            if (taskInfo.workerInfo === null) {
-              taskInfo.done(new abort_1.AbortError("pool is closed"));
-            } else {
-              this.taskQueue.push(taskInfo);
-            }
-          }
-        }
-        const onPoolFlushed = () => new Promise((resolve) => {
-          const numberOfWorkers = this.workers.size;
-          if (numberOfWorkers === 0) {
-            resolve();
-            return;
-          }
-          let numberOfWorkersDone = 0;
-          const checkIfWorkerIsDone = (workerInfo) => {
-            if (workerInfo.taskInfos.size === 0) {
-              numberOfWorkersDone++;
-            }
-            if (numberOfWorkers === numberOfWorkersDone) {
-              resolve();
-            }
-          };
-          for (const workerInfo of this.workers) {
-            checkIfWorkerIsDone(workerInfo);
-            workerInfo.port.on("message", () => checkIfWorkerIsDone(workerInfo));
-          }
-        });
-        const throwOnTimeOut = async (timeout) => {
-          await (0, promises_1.setTimeout)(timeout);
-          throw errors_1.Errors.CloseTimeout();
-        };
-        try {
-          await Promise.race([
-            onPoolFlushed(),
-            throwOnTimeOut(this.options.closeTimeout)
-          ]);
-        } catch (error51) {
-          this.publicInterface.emit("error", error51);
-        } finally {
-          await this.destroy();
-          this.publicInterface.emit("close");
-          this.closingUp = false;
-        }
-      }
-    };
-    var Piscina2 = class _Piscina extends node_events_1.EventEmitterAsyncResource {
-      constructor(options = {}) {
-        const opts = { ...options, "__proto__": null };
-        super({ ...opts, name: "Piscina" });
-        _Piscina_pool.set(this, void 0);
-        if (typeof opts.filename !== "string" && opts.filename != null) {
-          throw new TypeError("options.filename must be a string or null");
-        }
-        if (typeof opts.name !== "string" && opts.name != null) {
-          throw new TypeError("options.name must be a string or null");
-        }
-        if (opts.minThreads !== void 0 && (typeof opts.minThreads !== "number" || opts.minThreads < 0)) {
-          throw new TypeError("options.minThreads must be a non-negative integer");
-        }
-        if (opts.maxThreads !== void 0 && (typeof opts.maxThreads !== "number" || opts.maxThreads < 1)) {
-          throw new TypeError("options.maxThreads must be a positive integer");
-        }
-        if (opts.minThreads !== void 0 && opts.maxThreads !== void 0 && opts.minThreads > opts.maxThreads) {
-          throw new RangeError("options.minThreads and options.maxThreads must not conflict");
-        }
-        if (opts.idleTimeout !== void 0 && (typeof opts.idleTimeout !== "number" || opts.idleTimeout < 0)) {
-          throw new TypeError("options.idleTimeout must be a non-negative integer");
-        }
-        if (opts.maxQueue !== void 0 && opts.maxQueue !== "auto" && (typeof opts.maxQueue !== "number" || opts.maxQueue < 0)) {
-          throw new TypeError("options.maxQueue must be a non-negative integer");
-        }
-        if (opts.concurrentTasksPerWorker !== void 0 && (typeof opts.concurrentTasksPerWorker !== "number" || opts.concurrentTasksPerWorker < 1)) {
-          throw new TypeError("options.concurrentTasksPerWorker must be a positive integer");
-        }
-        if (opts.useAtomics !== void 0 && typeof opts.useAtomics !== "boolean") {
-          throw new TypeError("options.useAtomics must be a boolean value");
-        }
-        if (opts.resourceLimits !== void 0 && (typeof opts.resourceLimits !== "object" || opts.resourceLimits === null)) {
-          throw new TypeError("options.resourceLimits must be an object");
-        }
-        if (opts.taskQueue !== void 0 && !(0, task_queue_1.isTaskQueue)(opts.taskQueue)) {
-          throw new TypeError("options.taskQueue must be a TaskQueue object");
-        }
-        if (opts.niceIncrement !== void 0 && (typeof opts.niceIncrement !== "number" || opts.niceIncrement < 0 && process.platform !== "win32")) {
-          throw new TypeError("options.niceIncrement must be a non-negative integer on Unix systems");
-        }
-        if (opts.trackUnmanagedFds !== void 0 && typeof opts.trackUnmanagedFds !== "boolean") {
-          throw new TypeError("options.trackUnmanagedFds must be a boolean value");
-        }
-        if (opts.closeTimeout !== void 0 && (typeof opts.closeTimeout !== "number" || opts.closeTimeout < 0)) {
-          throw new TypeError("options.closeTimeout must be a non-negative integer");
-        }
-        __classPrivateFieldSet(this, _Piscina_pool, new ThreadPool(this, opts), "f");
-      }
-      /** @deprecated Use run(task, options) instead **/
-      runTask(task, transferList, filename, signal) {
-        if (typeof transferList === "object" && !Array.isArray(transferList) || typeof transferList === "string") {
-          signal = filename;
-          filename = transferList;
-          transferList = void 0;
-        }
-        if (typeof filename === "object" && !Array.isArray(filename)) {
-          signal = filename;
-          filename = void 0;
-        }
-        if (transferList !== void 0 && !Array.isArray(transferList)) {
-          return Promise.reject(new TypeError("transferList argument must be an Array"));
-        }
-        if (filename !== void 0 && typeof filename !== "string") {
-          return Promise.reject(new TypeError("filename argument must be a string"));
-        }
-        if (signal !== void 0 && typeof signal !== "object") {
-          return Promise.reject(new TypeError("signal argument must be an object"));
-        }
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").runTask(task, {
-          transferList,
-          filename: filename || null,
-          name: "default",
-          signal: signal || null
-        });
-      }
-      run(task, options = kDefaultRunOptions) {
-        if (options === null || typeof options !== "object") {
-          return Promise.reject(new TypeError("options must be an object"));
-        }
-        const { transferList, filename, name, signal } = options;
-        if (transferList !== void 0 && !Array.isArray(transferList)) {
-          return Promise.reject(new TypeError("transferList argument must be an Array"));
-        }
-        if (filename != null && typeof filename !== "string") {
-          return Promise.reject(new TypeError("filename argument must be a string"));
-        }
-        if (name != null && typeof name !== "string") {
-          return Promise.reject(new TypeError("name argument must be a string"));
-        }
-        if (signal != null && typeof signal !== "object") {
-          return Promise.reject(new TypeError("signal argument must be an object"));
-        }
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").runTask(task, { transferList, filename, name, signal });
-      }
-      async close(options = kDefaultCloseOptions) {
-        if (options === null || typeof options !== "object") {
-          throw TypeError("options must be an object");
-        }
-        let { force } = options;
-        if (force !== void 0 && typeof force !== "boolean") {
-          return Promise.reject(new TypeError("force argument must be a boolean"));
-        }
-        force !== null && force !== void 0 ? force : force = kDefaultCloseOptions.force;
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").close({
-          force
-        });
-      }
-      destroy() {
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").destroy();
-      }
-      get maxThreads() {
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").options.maxThreads;
-      }
-      get minThreads() {
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").options.minThreads;
-      }
-      get options() {
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").options;
-      }
-      get threads() {
-        const ret = [];
-        for (const workerInfo of __classPrivateFieldGet(this, _Piscina_pool, "f").workers) {
-          ret.push(workerInfo.worker);
-        }
-        return ret;
-      }
-      get queueSize() {
-        const pool = __classPrivateFieldGet(this, _Piscina_pool, "f");
-        return Math.max(pool.taskQueue.size - pool.pendingCapacity(), 0);
-      }
-      get completed() {
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").completed;
-      }
-      get waitTime() {
-        if (!__classPrivateFieldGet(this, _Piscina_pool, "f").waitTime) {
-          return null;
-        }
-        return (0, common_1.createHistogramSummary)(__classPrivateFieldGet(this, _Piscina_pool, "f").waitTime);
-      }
-      get runTime() {
-        if (!__classPrivateFieldGet(this, _Piscina_pool, "f").runTime) {
-          return null;
-        }
-        return (0, common_1.createHistogramSummary)(__classPrivateFieldGet(this, _Piscina_pool, "f").runTime);
-      }
-      get utilization() {
-        if (!__classPrivateFieldGet(this, _Piscina_pool, "f").runTime) {
-          return 0;
-        }
-        const count = __classPrivateFieldGet(this, _Piscina_pool, "f").runTime.count;
-        if (count === 0) {
-          return 0;
-        }
-        const capacity = this.duration * __classPrivateFieldGet(this, _Piscina_pool, "f").options.maxThreads;
-        const totalMeanRuntime = __classPrivateFieldGet(this, _Piscina_pool, "f").runTime.mean / 1e3 * count;
-        return totalMeanRuntime / capacity;
-      }
-      get duration() {
-        return node_perf_hooks_1.performance.now() - __classPrivateFieldGet(this, _Piscina_pool, "f").start;
-      }
-      get needsDrain() {
-        return __classPrivateFieldGet(this, _Piscina_pool, "f").needsDrain;
-      }
-      static get isWorkerThread() {
-        return common_1.commonState.isWorkerThread;
-      }
-      static get workerData() {
-        return common_1.commonState.workerData;
-      }
-      static get version() {
-        return package_json_1.version;
-      }
-      static get Piscina() {
-        return _Piscina;
-      }
-      static get FixedQueue() {
-        return task_queue_1.FixedQueue;
-      }
-      static get ArrayTaskQueue() {
-        return task_queue_1.ArrayTaskQueue;
-      }
-      static move(val) {
-        if (val != null && typeof val === "object" && typeof val !== "function") {
-          if (!(0, common_1.isTransferable)(val)) {
-            if (node_util_1.types.isArrayBufferView(val)) {
-              val = new ArrayBufferViewTransferable(val);
-            } else {
-              val = new DirectlyTransferable(val);
-            }
-          }
-          (0, common_1.markMovable)(val);
-        }
-        return val;
-      }
-      static get transferableSymbol() {
-        return symbols_1.kTransferable;
-      }
-      static get valueSymbol() {
-        return symbols_1.kValue;
-      }
-      static get queueOptionsSymbol() {
-        return symbols_1.kQueueOptions;
-      }
-    };
-    exports.Piscina = Piscina2;
-    _Piscina_pool = /* @__PURE__ */ new WeakMap();
-    exports.default = Piscina2;
-    exports.move = Piscina2.move;
-    exports.isWorkerThread = Piscina2.isWorkerThread;
-    exports.workerData = Piscina2.workerData;
-  }
-});
-
-// node_modules/piscina/dist/main.js
-var require_main = __commonJS({
-  "node_modules/piscina/dist/main.js"(exports, module2) {
-    "use strict";
-    var __importDefault = exports && exports.__importDefault || function(mod2) {
-      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
-    };
-    var index_1 = __importDefault(require_dist());
-    module2.exports = index_1.default;
-  }
-});
-
-// node_modules/piscina/dist/esm-wrapper.mjs
-var import_main, ArrayTaskQueue, FixedQueue, Piscina, isWorkerThread, move, queueOptionsSymbol, transferableSymbol, valueSymbol, version2, workerData2;
-var init_esm_wrapper = __esm({
-  "node_modules/piscina/dist/esm-wrapper.mjs"() {
-    import_main = __toESM(require_main(), 1);
-    ArrayTaskQueue = import_main.default.ArrayTaskQueue;
-    FixedQueue = import_main.default.FixedQueue;
-    Piscina = import_main.default.Piscina;
-    isWorkerThread = import_main.default.isWorkerThread;
-    move = import_main.default.move;
-    queueOptionsSymbol = import_main.default.queueOptionsSymbol;
-    transferableSymbol = import_main.default.transferableSymbol;
-    valueSymbol = import_main.default.valueSymbol;
-    version2 = import_main.default.version;
-    workerData2 = import_main.default.workerData;
-  }
-});
-
 // dist/worker/nativeWorkerPool.js
 var nativeWorkerPool_exports = {};
 __export(nativeWorkerPool_exports, {
@@ -55460,6 +54212,7 @@ import os6 from "node:os";
 import fs21 from "node:fs";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import path46 from "node:path";
+import { Piscina } from "piscina";
 function defaultNativeWorkerThreadCount(availableParallelism = os6.availableParallelism()) {
   return Math.min(DEFAULT_NATIVE_THREAD_CAP, Math.max(1, Math.floor(availableParallelism * 0.75)));
 }
@@ -55503,7 +54256,6 @@ var HARD_MAX_THREADS, DEFAULT_NATIVE_THREAD_CAP;
 var init_nativeWorkerPool = __esm({
   "dist/worker/nativeWorkerPool.js"() {
     "use strict";
-    init_esm_wrapper();
     init_workerThreads();
     init_windowsProcessDrain();
     HARD_MAX_THREADS = 64;
@@ -55925,10 +54677,10 @@ function isConfinedFileReadError(error51) {
 function createEmptyModuleIndex(file2) {
   return { file: file2, exports: [], imports: [], locals: [] };
 }
-async function resolveCrossModuleSymbolExports(file2, mod2, support, projectRoot, graphOptions, workspaceConfig, matchPath) {
+async function resolveCrossModuleSymbolExports(file2, mod, support, projectRoot, graphOptions, workspaceConfig, matchPath) {
   if (!support.supportsCrossModuleSymbols || !isJsTsLanguage(support.id))
     return;
-  const reexports = mod2.exports.filter((entry) => entry.type === "reexport" || entry.type === "exportStar" || entry.type === "namespaceReexport");
+  const reexports = mod.exports.filter((entry) => entry.type === "reexport" || entry.type === "exportStar" || entry.type === "namespaceReexport");
   if (!reexports.length)
     return;
   for (const entry of reexports) {
@@ -56016,30 +54768,30 @@ async function buildIndexedModuleForFile(args) {
     }));
   }
   collectJsonDependencies(imports, args.jsonDependencies);
-  let mod2;
+  let mod;
   if (sup.id === "sql") {
-    mod2 = buildSqlModuleIndex(args.file, source);
+    mod = buildSqlModuleIndex(args.file, source);
   } else if (lacksParserContext) {
-    mod2 = { ...createEmptyModuleIndex(args.file), imports };
+    mod = { ...createEmptyModuleIndex(args.file), imports };
   } else {
-    mod2 = collectLocalsAndExportsFromSource(args.file, source, sup, imports, {
+    mod = collectLocalsAndExportsFromSource(args.file, source, sup, imports, {
       ...tree ? { tree } : {},
       ...nativeQueries !== void 0 ? { nativeQueries } : {},
       ...args.opts?.native ? { nativeMode: args.opts.native } : {},
       ...args.opts?.logLevel ? { logLevel: args.opts.logLevel } : {}
     });
   }
-  mod2.imports = imports;
-  await resolveCrossModuleSymbolExports(args.file, mod2, sup, args.projectRoot, args.graphOptions, args.workspaceConfig, args.matchPath);
+  mod.imports = imports;
+  await resolveCrossModuleSymbolExports(args.file, mod, sup, args.projectRoot, args.graphOptions, args.workspaceConfig, args.matchPath);
   const sigInfo = args.fileSignatures.get(args.file);
   const cacheable = !prepared.nativeFallbackReason && !lacksParserContext;
   let cacheWrite;
   if (sigInfo && cacheable) {
     const cacheSig = args.cacheEnabled ? await moduleCacheSignatureForFile(args.file, sigInfo, args.opts, args.resolverEnvironmentFingerprint) : sigInfo.cacheSig;
-    cacheWrite = { file: args.file, sig: cacheSig, mod: mod2 };
+    cacheWrite = { file: args.file, sig: cacheSig, mod };
   }
   return {
-    module: mod2,
+    module: mod,
     ...cacheWrite !== void 0 ? { cacheWrite } : {},
     graphContext: {
       source,
@@ -56125,7 +54877,9 @@ function createIndexBuildRunState(projectRoot, opts, graphOptions = normalizeGra
     normalizedProjectRoot: normalizePath(path47.resolve(projectRoot)),
     report,
     timings: report?.timings,
-    totalStart: performance7.now(),
+    // Delegated rebuilds mint a fresh run state after the preamble; reuse the caller's
+    // origin so totalMs covers the whole wait, matching progress completion.
+    totalStart: opts?.progressStartedAt ?? performance7.now(),
     cacheMode,
     cacheEnabled: cacheMode !== "off",
     graphOptions,
@@ -56226,6 +54980,12 @@ function recordBuildTimingStep(timings, step) {
   if (step.name === "filesystem-scan")
     timings.filesystemScanMs = step.ms;
 }
+async function recordTimedBuildStep(timings, name, fn) {
+  const startedAt = performance7.now();
+  const result = await fn();
+  recordBuildTimingStep(timings, { name, ms: Math.round(performance7.now() - startedAt) });
+  return result;
+}
 function buildConcurrency(opts) {
   return resolveWorkerThreadCount({ requested: Number(opts?.threads || 0), defaultCount: 8, max: 64 });
 }
@@ -56375,8 +55135,8 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
       }
       const cacheSig = cacheEnabled ? await moduleCacheSignatureForFile(file2, sigInfo, opts, resolverEnvironmentFingerprint) : sigInfo.cacheSig;
       const canReuseModuleCache = cacheEnabled && (!graphOptions.resolveNodeModules || resolverEnvironmentFingerprint !== null);
-      const mod2 = canReuseModuleCache ? tryLoadFromCache(projectRoot, file2, cacheSig, opts, report, moduleCacheAvailable) : null;
-      return [file2, { sigInfo, mod: mod2 }];
+      const mod = canReuseModuleCache ? tryLoadFromCache(projectRoot, file2, cacheSig, opts, report, moduleCacheAvailable) : null;
+      return [file2, { sigInfo, mod }];
     } catch (error51) {
       return [file2, { error: error51 }];
     } finally {
@@ -56433,15 +55193,15 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
         if ("error" in cacheProbe)
           throw cacheProbe.error;
         const { sigInfo } = cacheProbe;
-        let mod2 = cacheProbe.mod;
-        if (mod2 && fileReport) {
+        let mod = cacheProbe.mod;
+        if (mod && fileReport) {
           fileReport.cached = (fileReport.cached ?? 0) + 1;
         }
         const cachedEdgesEntry = cachedGraphEntries?.get(file2);
         const edgesCached = !!cachedEdgesEntry && (cachedEdgesEntry.gitSig && cachedEdgesEntry.gitSig === sigInfo.gitSig || cachedEdgesEntry.sig === sigInfo.sig);
         const sqlFactCache = shouldProvideSqlFactCache(file2, sigInfo, cachedEdgesEntry) ? await getSqlFactCache() : void 0;
         let edges = [];
-        if (mod2 && edgesCached) {
+        if (mod && edgesCached) {
           edges = await collectEdgesForFile(file2, projectRoot, workspaceConfig, {
             fast: !!graphOptions.fast,
             ...graphOptions.fastRegexDisabledLanguages ? { fastRegexDisabledLanguages: graphOptions.fastRegexDisabledLanguages } : {},
@@ -56470,7 +55230,7 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
                 bloomFilterCache.set(file2, filter);
             }
           }
-          return [file2, mod2, edges, void 0];
+          return [file2, mod, edges, void 0];
         }
         if (fileReport)
           fileReport.parsed = (fileReport.parsed ?? 0) + 1;
@@ -56481,7 +55241,7 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
         let graphContext;
         let cacheWrite;
         const matchPath = support.id === "ts" || support.id === "tsx" ? await loadMatchPathForFile(file2) : void 0;
-        if (!mod2) {
+        if (!mod) {
           const built = await buildIndexedModuleForFile({
             file: file2,
             support,
@@ -56502,11 +55262,11 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
             cacheEnabled,
             ...confinedRoot ? { confinedRoot, trustedSource: trustedSources?.get(file2) } : {}
           });
-          mod2 = built.module;
+          mod = built.module;
           graphContext = built.graphContext;
           cacheWrite = built.cacheWrite;
         } else {
-          collectJsonDependencies(mod2.imports, jsonDependencies);
+          collectJsonDependencies(mod.imports, jsonDependencies);
         }
         edges = await collectEdgesForFile(file2, projectRoot, workspaceConfig, {
           ...graphContext ? { parsed: graphContext } : {},
@@ -56527,7 +55287,7 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
           allFiles: normalizedFiles,
           ...sqlFactCache ? { sqlFactCache } : {}
         });
-        return [file2, mod2 ?? createEmptyModuleIndex(file2), edges, cacheWrite];
+        return [file2, mod ?? createEmptyModuleIndex(file2), edges, cacheWrite];
       } catch (error51) {
         if (isNativeRequiredUnavailableError(error51) || isNodeSqliteUnavailableError(error51))
           throw error51;
@@ -56571,8 +55331,8 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
       }
     };
     const pendingCacheWrites = [];
-    for (const [file2, mod2, edges, cacheWrite] of fileResults) {
-      modules.set(fileIdentityKey(file2), mod2);
+    for (const [file2, mod, edges, cacheWrite] of fileResults) {
+      modules.set(fileIdentityKey(file2), mod);
       appendUniqueGraphEdges(edges);
       if (cacheWrite)
         pendingCacheWrites.push(cacheWrite);
@@ -56638,6 +55398,7 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
           files: manifestEntries,
           timings,
           manifestReport: report?.manifest,
+          ...helperOpts?.configHash ? { configHash: helperOpts.configHash } : {},
           ...helperOpts?.transientFiles !== void 0 ? { transientFiles: helperOpts.transientFiles } : {},
           ...helperOpts?.symlinkDirectories !== void 0 ? { symlinkDirectories: helperOpts.symlinkDirectories } : {}
         })
@@ -56647,29 +55408,31 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
       const cacheSig = fileSignatures.get(file2)?.cacheSig;
       return [file2, { ...entry, ...cacheSig ? { cacheSig } : {} }];
     })) : manifestEntriesForIndex;
-    const index = await timeIndexBuildPhase({
+    const discoveredInsideFinalize = projectFiles === void 0;
+    const finalizeStartedAt = performance7.now();
+    if (buildStartedAt !== void 0) {
+      emitIndexBuildActivity(opts, "Finalizing project graph", totalFiles, totalFiles);
+    }
+    const index = await finalizeProjectIndex({
+      projectRoot,
+      normalizedProjectRoot,
       opts,
       timings,
-      buildStartedAt,
-      stepName: "finalize",
-      activity: "Finalizing project graph",
-      current: totalFiles,
-      total: totalFiles,
-      fn: () => finalizeProjectIndex({
-        projectRoot,
-        normalizedProjectRoot,
-        opts,
-        timings,
-        totalStart,
-        graph,
-        modules,
-        parsedMap,
-        bloomFilterCache,
-        ...projectFiles !== void 0 ? { projectFiles } : {},
-        buildReport: report,
-        manifestEntries: indexManifestEntries
-      })
-    });
+      totalStart,
+      graph,
+      modules,
+      parsedMap,
+      bloomFilterCache,
+      ...projectFiles !== void 0 ? { projectFiles } : {},
+      buildReport: report,
+      manifestEntries: indexManifestEntries
+    });
+    if (timings) {
+      const elapsed = Math.round(performance7.now() - finalizeStartedAt);
+      const discoveryMs = discoveredInsideFinalize ? timings.metadataDiscoveryMs ?? 0 : 0;
+      const finalizeMs = discoveredInsideFinalize ? Math.max(0, elapsed - discoveryMs) : elapsed;
+      recordBuildTimingStep(timings, { name: "finalize", ms: finalizeMs });
+    }
     if (manifestEntries) {
       await timeIndexBuildPhase({
         opts,
@@ -56693,7 +55456,6 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
 }
 async function buildProjectIndexWithManifestOptions(projectRoot, opts, helperOpts) {
   const timings = opts?.report ? opts.report.timings ??= {} : void 0;
-  resetTransientBuildTimings(timings);
   await initializeFileIdentityCaseSensitivity(projectRoot);
   try {
     const useDiskCache = (opts?.cache ?? "off") === "disk";
@@ -56752,6 +55514,7 @@ async function buildProjectIndexWithManifestOptions(projectRoot, opts, helperOpt
       warnNoFilesMessage: `Warning: No files found in project root: ${projectRoot}. Check codegraph.config.json globs and CLI --include-glob/--ignore-glob filters. Diagnostic: codegraph doctor`,
       ...helperOpts?.ignoreExistingManifest ? { ignoreExistingManifest: true } : {},
       ...helperOpts?.reportDiscoveryProgress ? { reportDiscoveryProgress: true } : {},
+      ...helperOpts?.configHash ? { configHash: helperOpts.configHash } : {},
       projectFiles,
       transientFiles,
       ...discoveredSymlinkDirectories !== void 0 ? { symlinkDirectories: discoveredSymlinkDirectories } : {}
@@ -56764,13 +55527,18 @@ async function buildProjectIndexWithManifestOptions(projectRoot, opts, helperOpt
   }
 }
 async function buildProjectIndex(projectRoot, opts) {
+  const progressStartedAt = opts?.progressStartedAt ?? performance7.now();
+  const timings = opts?.report ? opts.report.timings ??= {} : void 0;
+  resetTransientBuildTimings(timings);
   return buildProjectIndexWithManifestOptions(projectRoot, {
     ...opts,
-    progressStartedAt: opts?.progressStartedAt ?? performance7.now()
+    progressStartedAt
   });
 }
 async function buildProjectIndexFromFiles(projectRoot, inputFiles, rawOpts) {
   const opts = { ...rawOpts, progressStartedAt: rawOpts?.progressStartedAt ?? performance7.now() };
+  const timings = opts.report ? opts.report.timings ??= {} : void 0;
+  resetTransientBuildTimings(timings);
   try {
     const useDiskCache = (opts?.cache ?? "off") === "disk";
     const normalizedInputFiles = await normalizeIndexedFileInputsWithinRoot(projectRoot, inputFiles, "Index file");
@@ -56804,15 +55572,17 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
     ...rawOpts,
     progressStartedAt: rawOpts?.progressStartedAt ?? performance7.now()
   };
-  await initializeFileIdentityCaseSensitivity(projectRoot);
-  clearResolutionCaches();
+  const discoveryTimings = opts.report ? opts.report.timings ??= {} : void 0;
+  resetTransientBuildTimings(discoveryTimings);
+  await recordTimedBuildStep(discoveryTimings, "file-identity", () => initializeFileIdentityCaseSensitivity(projectRoot));
+  await recordTimedBuildStep(discoveryTimings, "clear-resolution-caches", () => {
+    clearResolutionCaches();
+  });
   const graphOptions = normalizeGraphOptions(opts?.graph);
   const strictIncremental = opts?.incrementalStrict ?? false;
   if (strictIncremental && graphOptions.fast)
     graphOptions.fast = false;
   const { normalizedProjectRoot, report, timings, totalStart, cacheMode, cacheEnabled, onFallbackImportExtraction } = createIndexBuildRunState(projectRoot, opts, graphOptions);
-  const discoveryTimings = opts?.report ? opts.report.timings ??= {} : void 0;
-  resetTransientBuildTimings(discoveryTimings);
   let checkProgressActive = false;
   const startCheckProgress = () => {
     if (checkProgressActive)
@@ -56854,14 +55624,14 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
     }
     startCheckProgress();
     const manifestStart = performance7.now();
-    const manifest = await loadManifest(projectRoot, opts, report);
+    const manifest = await recordTimedBuildStep(timings, "load-manifest", () => loadManifest(projectRoot, opts, report));
     if (timings)
       timings.manifestMs = Math.round(performance7.now() - manifestStart);
     const manifestUsed = !!manifest;
     const manifestReport = initManifestReport(report, manifestUsed, false);
     if (manifestReport && !manifestUsed)
       manifestReport.reason = "missing";
-    const optionDiffs = diffBuildOptions(manifest?.buildOptions, opts);
+    const optionDiffs = await recordTimedBuildStep(timings, "diff-build-options", () => diffBuildOptions(manifest?.buildOptions, opts));
     const warningOptionDiffs = optionDiffs.filter((diff) => diff !== "cache");
     if (manifest && warningOptionDiffs.length) {
       logWithLevel(opts?.logLevel, "warn", `Warning: Manifest options differ from current build options: ${warningOptionDiffs.join(", ")}`);
@@ -56869,7 +55639,7 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
     if (manifestReport && optionDiffs.length) {
       manifestReport.optionsMismatch = optionDiffs;
     }
-    const currentConfigHashResult = await computeConfigHash(projectRoot, opts?.logLevel);
+    const currentConfigHashResult = await recordTimedBuildStep(timings, "config-hash", () => computeConfigHash(projectRoot, opts?.logLevel));
     const currentConfigHash = recordConfigHashResult(manifestReport, currentConfigHashResult, opts?.logLevel);
     const configChanged = !!currentConfigHashResult.error || !manifest?.configHash || currentConfigHash !== manifest.configHash;
     let resolverEnvironmentFingerprint;
@@ -56898,7 +55668,8 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
       }
       return await buildProjectIndexFromExport(projectRoot, opts, {
         ignoreExistingManifest: true,
-        reportDiscoveryProgress: true
+        reportDiscoveryProgress: true,
+        configHash: currentConfigHashResult
       });
     }
     const gitAvailable = await isGitRepo(projectRoot);
@@ -56940,7 +55711,8 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         logWithLevel(opts?.logLevel, "warn", "Warning: Manifest commit is no longer available; rebuilding full index.");
         const rebuiltIndex = await buildProjectIndexFromExport(projectRoot, opts, {
           ignoreExistingManifest: true,
-          reportDiscoveryProgress: true
+          reportDiscoveryProgress: true,
+          configHash: currentConfigHashResult
         });
         if (manifestReport) {
           manifestReport.reason = "staleGitCommit";
@@ -56961,7 +55733,8 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         logWithLevel(opts?.logLevel, "warn", `Warning: Manifest verification failed (mismatches: ${mismatches}, missing: ${missing}). Rebuilding full index.`);
         return await buildProjectIndexFromExport(projectRoot, opts, {
           ignoreExistingManifest: true,
-          reportDiscoveryProgress: true
+          reportDiscoveryProgress: true,
+          configHash: currentConfigHashResult
         });
       }
     }
@@ -56997,7 +55770,8 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         logWithLevel(opts?.logLevel, "warn", "Warning: Failed to list untracked project files via Git; rebuilding full index.", error51);
         return await buildProjectIndexFromExport(projectRoot, opts, {
           ignoreExistingManifest: true,
-          reportDiscoveryProgress: true
+          reportDiscoveryProgress: true,
+          configHash: currentConfigHashResult
         });
       }
     } else if (!opts?.filesAreProjectScope) {
@@ -57054,17 +55828,27 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
     const dependentFilesOfDeletedTracked = collectDeletedTrackedFileDependents(trackedEntries, deletedTrackedFiles);
     if (allFiles.size === 0) {
       completeCheckProgress(0);
-      await writeIndexManifestSnapshot({
-        projectRoot,
+      await timeIndexBuildPhase({
         opts,
-        graphOptions,
-        ...resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {},
-        files: {},
         timings,
-        manifestReport,
-        allowEmpty: true,
-        transientFiles,
-        ...manifest.symlinkDirectories !== void 0 ? { symlinkDirectories: manifest.symlinkDirectories } : {}
+        buildStartedAt: void 0,
+        stepName: "index-manifest",
+        activity: "Writing index manifest",
+        current: 0,
+        total: 0,
+        fn: () => writeIndexManifestSnapshot({
+          projectRoot,
+          opts,
+          graphOptions,
+          ...resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {},
+          files: {},
+          timings,
+          manifestReport,
+          allowEmpty: true,
+          transientFiles,
+          configHash: currentConfigHashResult,
+          ...manifest.symlinkDirectories !== void 0 ? { symlinkDirectories: manifest.symlinkDirectories } : {}
+        })
       });
       return {
         graph: { nodes: /* @__PURE__ */ new Set(), edges: [] },
@@ -57331,8 +56115,8 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
           }
         });
         const pendingIncrementalCacheWrites = [];
-        for (const [file2, mod2, cacheWrite] of fileResults) {
-          modules.set(fileIdentityKey(file2), mod2);
+        for (const [file2, mod, cacheWrite] of fileResults) {
+          modules.set(fileIdentityKey(file2), mod);
           if (cacheWrite)
             pendingIncrementalCacheWrites.push(cacheWrite);
         }
@@ -57418,16 +56202,27 @@ async function buildProjectIndexIncremental(projectRoot, rawOpts) {
           ...signature.gitSig ? { gitSig: signature.gitSig } : {}
         });
       }
-      await writeIndexManifestSnapshot({
-        projectRoot,
+      await timeIndexBuildPhase({
         opts,
-        graphOptions,
-        ...resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {},
-        files: manifestEntries,
         timings,
-        manifestReport,
-        transientFiles,
-        ...manifest.symlinkDirectories !== void 0 ? { symlinkDirectories: manifest.symlinkDirectories } : {}
+        buildStartedAt: updateStartedAt,
+        stepName: "index-manifest",
+        activity: "Writing index manifest",
+        current: allFiles.size,
+        total: allFiles.size,
+        mode: "update",
+        fn: () => writeIndexManifestSnapshot({
+          projectRoot,
+          opts,
+          graphOptions,
+          ...resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {},
+          files: manifestEntries,
+          timings,
+          manifestReport,
+          transientFiles,
+          configHash: currentConfigHashResult,
+          ...manifest.symlinkDirectories !== void 0 ? { symlinkDirectories: manifest.symlinkDirectories } : {}
+        })
       });
       const index = await finalizeProjectIndex({
         projectRoot,
@@ -57661,6 +56456,16 @@ var init_build_index = __esm({
       "persist-cache": true,
       "workspace-manifests": true,
       "index-manifest": true,
+      "file-identity": true,
+      "clear-resolution-caches": true,
+      "load-manifest": true,
+      "diff-build-options": true,
+      "git-head": true,
+      "config-hash": true,
+      "manifest-transform": true,
+      "manifest-write": true,
+      "cache-prune": true,
+      "metadata-discovery": true,
       finalize: true,
       "snapshot-write": true
     };
@@ -58036,7 +56841,7 @@ var init_navigation_provenance = __esm({
 
 // dist/indexer/navigation-goto.js
 async function resolveMemberAccessDefinition(params) {
-  const { index, mod: mod2, node, source, sup, resolveLexicalBinding } = params;
+  const { index, mod, node, source, sup, resolveLexicalBinding } = params;
   const parent = node.parent;
   if (!parent || !sup.supportsCrossModuleSymbols || !isMemberAccessNode(sup, parent)) {
     return null;
@@ -58051,7 +56856,7 @@ async function resolveMemberAccessDefinition(params) {
       if (lexicalBinding)
         return { kind: "resolved", def: lexicalBinding };
       const exprName = sliceText(expr, source);
-      const imp = mod2.imports.find((candidate) => candidate.kind === "named" && candidate.local === exprName || candidate.kind === "default" && candidate.local === exprName || candidate.kind === "namespace" && candidate.localNS === exprName);
+      const imp = mod.imports.find((candidate) => candidate.kind === "named" && candidate.local === exprName || candidate.kind === "default" && candidate.local === exprName || candidate.kind === "namespace" && candidate.localNS === exprName);
       if (imp) {
         if (imp.kind === "namespace") {
           return {
@@ -58067,10 +56872,10 @@ async function resolveMemberAccessDefinition(params) {
           return { kind: "resolved", def: result };
         }
       }
-      const local = mod2.locals.find((candidate) => candidate.localName === exprName);
+      const local = mod.locals.find((candidate) => candidate.localName === exprName);
       if (local)
         return { kind: "resolved", def: local };
-      for (const starImport of mod2.imports.filter((candidate) => candidate.kind === "star")) {
+      for (const starImport of mod.imports.filter((candidate) => candidate.kind === "star")) {
         const result = resolveImported(index, starImport, exprName);
         if (result) {
           if ("namespace" in result) {
@@ -58155,7 +56960,7 @@ async function resolveMemberAccessDefinition(params) {
     const member = sliceText(prop, source);
     if (!sup.membersAreImplicitlyInScope && implicitClassReceiver) {
       const classContainer = findEnclosingClassContainer(node);
-      const memberDef = classContainer ? findLocalWithinNode(mod2.locals, member, classContainer, sup.normalizeIdentifier) : void 0;
+      const memberDef = classContainer ? findLocalWithinNode(mod.locals, member, classContainer, sup.normalizeIdentifier) : void 0;
       if (memberDef) {
         return okGoToResult(index, memberDef, {
           via: { exportedName: member },
@@ -60606,6 +59411,7 @@ function codegraphLifecycleManifestPath(root) {
   return path51.join(root, CODEGRAPH_DIR, MANIFEST_FILE);
 }
 async function initCodegraphLifecycle(root, options = {}) {
+  emitLifecyclePostBuildProgress(options.buildOptions, "Updating Git ignore policy");
   const gitignore = await prepareCodegraphLifecycleGitignore(root, {
     updateGitignore: options.updateGitignore ?? true
   });
@@ -60627,9 +59433,13 @@ async function initCodegraphLifecycle(root, options = {}) {
   return await syncCodegraphLifecycleCore(root, { ...options, init: true }, existing, gitignore);
 }
 async function syncCodegraphLifecycle(root, options = {}) {
-  const gitignore = options.init ? await prepareCodegraphLifecycleGitignore(root, {
-    updateGitignore: options.updateGitignore ?? true
-  }) : void 0;
+  let gitignore;
+  if (options.init) {
+    emitLifecyclePostBuildProgress(options.buildOptions, "Updating Git ignore policy");
+    gitignore = await prepareCodegraphLifecycleGitignore(root, {
+      updateGitignore: options.updateGitignore ?? true
+    });
+  }
   const existing = await readLifecycleManifest(root, { allowInvalid: Boolean(options.init && options.force) });
   return await syncCodegraphLifecycleCore(root, options, existing, gitignore);
 }
@@ -60638,6 +59448,7 @@ async function syncCodegraphLifecycleCore(root, options, existing, gitignore) {
     throw new CodegraphLifecycleUserError("Codegraph is not initialized for this project. Run codegraph init or codegraph sync --init.");
   }
   const manifest = await buildLifecycleManifest(root, options.buildOptions, existing, options.force ? { force: true } : {});
+  emitLifecyclePostBuildProgress(options.buildOptions, "Writing lifecycle manifest");
   await writeLifecycleManifest(root, manifest);
   const thenCount = existing?.fileCount ?? 0;
   const fallbackTotalDelta = manifest.fileCount - thenCount;
@@ -60724,20 +59535,31 @@ async function uninitCodegraphLifecycle(root, options = {}) {
 }
 async function buildLifecycleManifest(root, buildOptions, existing, options = {}) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const sessionBuildOptions = { ...buildOptions ?? {}, cache: "disk" };
+  const sessionBuildOptions = {
+    ...withIndexTeardownProgress(buildOptions),
+    cache: "disk"
+  };
   const forcedSessionBuildOptions = options.force ? { ...sessionBuildOptions, cacheStrict: true, cacheVerify: true } : sessionBuildOptions;
   const session = createAgentSession({ root, buildOptions: forcedSessionBuildOptions });
   const snapshot = await session.loadProject({ symbolGraph: "skip" });
+  const configHash = await resolveLifecycleConfigHash(root, sessionBuildOptions, buildOptions);
+  emitLifecyclePostBuildProgress(buildOptions, "Hashing file signatures");
+  let fileSignatureHash = hashManifestEntries(snapshot.files, root, snapshot.index.manifestEntries, snapshot.index.manifestSignaturesFresh);
+  if (!fileSignatureHash) {
+    emitLifecyclePostBuildProgress(buildOptions, "Hashing discovered files");
+    fileSignatureHash = await hashDiscoveredFiles(snapshot.files, root);
+  }
+  const files = discoveredFileRelativePaths(snapshot.files, root);
   return {
     schemaVersion: MANIFEST_SCHEMA_VERSION,
     root: ".",
     createdAt: existing?.createdAt ?? now,
     lastSyncAt: now,
-    configHash: await hashConfig(root, buildOptions?.logLevel),
+    configHash,
     buildOptionsHash: hashBuildOptions(buildOptions),
     fileCount: snapshot.files.length,
-    fileSignatureHash: hashManifestEntries(snapshot.files, root, snapshot.index.manifestEntries, snapshot.index.manifestSignaturesFresh) ?? await hashDiscoveredFiles(snapshot.files, root),
-    files: discoveredFileRelativePaths(snapshot.files, root),
+    fileSignatureHash,
+    files,
     analysis: snapshot.analysis
   };
 }
@@ -60781,6 +59603,43 @@ async function writeLifecycleManifest(root, manifest) {
     throw new CodegraphLifecycleUserError(`Unable to write Codegraph lifecycle manifest at ${manifestPath}: ${stringifyError(error51)}`);
   }
 }
+function emitLifecyclePostBuildProgress(buildOptions, activity) {
+  buildOptions?.onProgress?.({
+    type: "progress",
+    phase: "start",
+    mode: "check",
+    message: activity,
+    activity,
+    current: 0,
+    total: 0
+  });
+}
+function withIndexTeardownProgress(buildOptions) {
+  const onProgress = buildOptions?.onProgress;
+  if (!onProgress)
+    return { ...buildOptions ?? {} };
+  return {
+    ...buildOptions,
+    onProgress: (update) => {
+      onProgress(update);
+      if (update.phase !== "complete")
+        return;
+      const indexFinished = update.mode === "build" || update.mode === "update" || update.mode === "check" && update.message === "Checked project index";
+      if (!indexFinished)
+        return;
+      emitLifecyclePostBuildProgress(buildOptions, "Closing disk cache");
+    }
+  };
+}
+async function resolveLifecycleConfigHash(root, sessionBuildOptions, buildOptions) {
+  emitLifecyclePostBuildProgress(buildOptions, "Reading index config hash");
+  const indexManifest = await loadManifest(root, sessionBuildOptions);
+  const storedHash = indexManifest?.configHash;
+  if (storedHash)
+    return storedHash;
+  emitLifecyclePostBuildProgress(buildOptions, "Hashing project config");
+  return await hashConfig(root, buildOptions?.logLevel);
+}
 async function hashConfig(root, logLevel) {
   const result = await computeConfigHash(root, logLevel);
   if (result.error) {
@@ -63936,30 +62795,30 @@ function readGraphSchemaVersion(db) {
     const row = db.prepare("SELECT value FROM graph_metadata WHERE key = ?").get(GRAPH_SCHEMA_VERSION_KEY);
     if (!row?.value)
       return 0;
-    const version3 = Number(String(row.value));
-    if (!Number.isInteger(version3) || version3 < 0)
+    const version2 = Number(String(row.value));
+    if (!Number.isInteger(version2) || version2 < 0)
       return 0;
-    return version3;
+    return version2;
   } catch {
     return 0;
   }
 }
-function writeGraphSchemaVersion(db, version3) {
+function writeGraphSchemaVersion(db, version2) {
   db.prepare("INSERT OR REPLACE INTO graph_metadata (key, value) VALUES (?, ?);").run([
     GRAPH_SCHEMA_VERSION_KEY,
-    String(version3)
+    String(version2)
   ]);
 }
 function migrateGraphSchema(db, fromVersion) {
-  let version3 = fromVersion;
-  if (version3 < 1) {
-    version3 = 1;
+  let version2 = fromVersion;
+  if (version2 < 1) {
+    version2 = 1;
   }
-  if (version3 < 2) {
+  if (version2 < 2) {
     ensureSymbolsVisibilityColumn(db);
-    version3 = 2;
+    version2 = 2;
   }
-  if (version3 < 3) {
+  if (version2 < 3) {
     db.exec(`
       DELETE FROM graph_snapshot_files
       WHERE snapshot_id NOT IN (
@@ -63970,10 +62829,10 @@ function migrateGraphSchema(db, fromVersion) {
         SELECT id FROM graph_snapshots ORDER BY created_at DESC, id DESC LIMIT ${GRAPH_SNAPSHOT_RETENTION}
       );
     `);
-    version3 = 3;
+    version2 = 3;
   }
-  if (version3 !== fromVersion) {
-    writeGraphSchemaVersion(db, version3);
+  if (version2 !== fromVersion) {
+    writeGraphSchemaVersion(db, version2);
   }
 }
 var SQLITE_SCHEMA_VERSION, GRAPH_SNAPSHOT_RETENTION, GRAPH_SCHEMA_VERSION_KEY, hasColumn, ensureSymbolsVisibilityColumn, ensureGraphIndexes, ensureSchema;
@@ -64641,6 +63500,7 @@ var init_rowBounds = __esm({
 import fs27 from "node:fs";
 import path59 from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { Piscina as Piscina2 } from "piscina";
 function resolveRawSqlQueryWorkerPath() {
   const selfDirectory = path59.dirname(fileURLToPath5(import.meta.url));
   const sibling = path59.resolve(selfDirectory, "rawQueryWorker.js");
@@ -64659,7 +63519,7 @@ async function runRawSqlQueryInWorker(task, deadlineMs, signal) {
   const workerPath = resolveRawSqlQueryWorkerPath();
   return await rawSqlQueryWorkerLifecycle.run(task, deadlineMs, signal, () => {
     markWindowsProcessDrainRequired();
-    return new Piscina({
+    return new Piscina2({
       filename: workerPath,
       minThreads: 1,
       maxThreads: 1,
@@ -64671,7 +63531,6 @@ var MAX_RAW_SQL_QUERY_WORKERS, SqliteQueryDeadlineExceededError, SqliteQueryCanc
 var init_rawQueryWorkerPool = __esm({
   "dist/sqlite/rawQueryWorkerPool.js"() {
     "use strict";
-    init_esm_wrapper();
     init_packageInfo();
     init_windowsProcessDrain();
     MAX_RAW_SQL_QUERY_WORKERS = 2;
@@ -66569,12 +65428,12 @@ function findDeclarationNameNode(sup, currentNode) {
   }
   return null;
 }
-function getOrBuildScopeIndex(index, file2, source, sup, mod2, tree) {
+function getOrBuildScopeIndex(index, file2, source, sup, mod, tree) {
   const fileKey = fileIdentityKey(file2);
   let scopeIndex = index.scopeCache.get(fileKey);
   if (scopeIndex)
     return scopeIndex;
-  scopeIndex = buildScopeIndexFromSource(file2, source, sup, mod2.imports, { tree });
+  scopeIndex = buildScopeIndexFromSource(file2, source, sup, mod.imports, { tree });
   index.scopeCache.set(fileKey, scopeIndex);
   return scopeIndex;
 }
@@ -66621,10 +65480,10 @@ function toModuleRef(resolved) {
     return void 0;
   return typeof resolved === "string" ? resolved : resolved.external;
 }
-function resolveNamedDefinition(index, mod2, file2, support, name) {
+function resolveNamedDefinition(index, mod, file2, support, name) {
   const normalizedName = support.normalizeIdentifier(name);
   const requiresExplicitReceiver = !support.membersAreImplicitlyInScope;
-  const directExport = requiresExplicitReceiver ? mod2.exports.find((entry) => entry.type === "local" && support.normalizeIdentifier(entry.exportedAs) === normalizedName && !entry.target.isMember) : void 0;
+  const directExport = requiresExplicitReceiver ? mod.exports.find((entry) => entry.type === "local" && support.normalizeIdentifier(entry.exportedAs) === normalizedName && !entry.target.isMember) : void 0;
   const hit = directExport && directExport.type === "local" ? { kind: "resolved", def: directExport.target } : resolveExport(index, file2, name, { allowLocalFallback: support.membersAreImplicitlyInScope });
   if (hit?.kind === "resolved" && (!requiresExplicitReceiver || !hit.def.isMember)) {
     return okGoToResult(index, hit.def, {
@@ -66644,7 +65503,7 @@ function resolveNamedDefinition(index, mod2, file2, support, name) {
       });
     }
   }
-  for (const imp of mod2.imports) {
+  for (const imp of mod.imports) {
     if (imp.kind === "default" && support.normalizeIdentifier(imp.local) === normalizedName) {
       const result = resolveImported(index, imp, "default");
       if (result && !("namespace" in result)) {
@@ -67642,8 +66501,8 @@ var init_navigation = __esm({
 // dist/indexer/navigation.js
 async function goToDefinition(index, req, parsedContext) {
   const { file: file2, line, column } = req;
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  if (!mod2)
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  if (!mod)
     return { status: "not_found", reason: "File not indexed" };
   const sqlResult = await goToSqlDefinition(index, req);
   if (sqlResult)
@@ -67709,10 +66568,10 @@ async function goToDefinition(index, req, parsedContext) {
     }
   }
   if (sup.supportsCrossModuleSymbols) {
-    const scopeIndex = node.parent && isMemberAccessNode(sup, node.parent) ? getOrBuildScopeIndex(index, file2, source, sup, mod2, tree) : null;
+    const scopeIndex = node.parent && isMemberAccessNode(sup, node.parent) ? getOrBuildScopeIndex(index, file2, source, sup, mod, tree) : null;
     const memberAccessResult = await resolveMemberAccessDefinition({
       index,
-      mod: mod2,
+      mod,
       node,
       source,
       sup,
@@ -67762,7 +66621,7 @@ async function goToDefinition(index, req, parsedContext) {
     }
   }
   if (name) {
-    const scopeIndex = getOrBuildScopeIndex(index, file2, source, sup, mod2, tree);
+    const scopeIndex = getOrBuildScopeIndex(index, file2, source, sup, mod, tree);
     const local = findClosestBinding(scopeIndex, file2, name, node, sup);
     if (local) {
       return okGoToResult(index, local, {
@@ -67771,7 +66630,7 @@ async function goToDefinition(index, req, parsedContext) {
       });
     }
     if (sup.supportsCrossModuleSymbols) {
-      const resolvedName = resolveNamedDefinition(index, mod2, file2, sup, name);
+      const resolvedName = resolveNamedDefinition(index, mod, file2, sup, name);
       if (resolvedName) {
         return resolvedName;
       }
@@ -67822,10 +66681,10 @@ async function findReferences(index, req, opts) {
   const definitionFile = def.file;
   const parsedDef = index.parsed?.get(fileIdentityKey(definitionFile));
   const parsedContext = await ensureParsedContext(definitionFile, parsedDef, index.languageExtensions);
-  const mod2 = index.byFile.get(fileIdentityKey(definitionFile));
-  if (!mod2)
+  const mod = index.byFile.get(fileIdentityKey(definitionFile));
+  if (!mod)
     return { status: "not_found", reason: "Module not found" };
-  const scope = getCachedScope(index, definitionFile, mod2, parsedContext);
+  const scope = getCachedScope(index, definitionFile, mod, parsedContext);
   const refs = [];
   const maxReferences = typeof opts?.maxReferences === "number" && opts.maxReferences > 0 ? opts.maxReferences : void 0;
   const seenRefs = /* @__PURE__ */ new Set();
@@ -67849,7 +66708,7 @@ async function findReferences(index, req, opts) {
     }
   }
   const exportedNames = [];
-  for (const entry of mod2.exports) {
+  for (const entry of mod.exports) {
     if (entry.type === "local" && sameDef(entry.target, def, index.languageExtensions)) {
       exportedNames.push(entry.exportedAs);
     }
@@ -68254,13 +67113,13 @@ function defFromSymbolId(index, id) {
   const startStr = parts[2];
   const file2 = normalizePath(rawFile);
   const startIndex = Number(startStr);
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  if (!mod2)
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  if (!mod)
     return null;
-  const exact = mod2.locals.find((def) => def.localName === localName && (def.range?.start?.index ?? 0) === startIndex);
+  const exact = mod.locals.find((def) => def.localName === localName && (def.range?.start?.index ?? 0) === startIndex);
   if (exact)
     return exact;
-  const byName = mod2.locals.find((def) => def.localName === localName);
+  const byName = mod.locals.find((def) => def.localName === localName);
   return byName ?? null;
 }
 function resolveSymbolId(index, id) {
@@ -68271,10 +67130,10 @@ function resolveSymbolId(index, id) {
     const rawFile = parts[0];
     const alias = parts[1];
     const file2 = normalizePath(rawFile);
-    const mod2 = index.byFile.get(fileIdentityKey(file2));
-    if (!mod2)
+    const mod = index.byFile.get(fileIdentityKey(file2));
+    if (!mod)
       return null;
-    const named = mod2.imports.find((imp) => imp.kind === "named" && imp.local === alias);
+    const named = mod.imports.find((imp) => imp.kind === "named" && imp.local === alias);
     if (named) {
       const result = resolveImported(index, named, named.imported);
       if (result && !("namespace" in result))
@@ -68286,7 +67145,7 @@ function resolveSymbolId(index, id) {
           return hit.def;
       }
     }
-    const defaultImport = mod2.imports.find((imp) => imp.kind === "default" && imp.local === alias);
+    const defaultImport = mod.imports.find((imp) => imp.kind === "default" && imp.local === alias);
     if (defaultImport) {
       const result = resolveImported(index, defaultImport, "default");
       if (result && !("namespace" in result))
@@ -68302,7 +67161,7 @@ function resolveSymbolId(index, id) {
           return first.target;
       }
     }
-    const namespaceImport = mod2.imports.find((imp) => imp.kind === "namespace" && imp.localNS === alias);
+    const namespaceImport = mod.imports.find((imp) => imp.kind === "namespace" && imp.localNS === alias);
     if (namespaceImport) {
       const target = typeof namespaceImport.resolved === "string" ? namespaceImport.resolved : void 0;
       if (target) {
@@ -68321,8 +67180,8 @@ function resolveSymbolId(index, id) {
 }
 function getApiSurface(index) {
   const out = [];
-  for (const mod2 of index.byFile.values()) {
-    const exports = mod2.exports.map((entry) => {
+  for (const mod of index.byFile.values()) {
+    const exports = mod.exports.map((entry) => {
       if (entry.type === "local") {
         return {
           name: entry.target.localName,
@@ -68354,7 +67213,7 @@ function getApiSurface(index) {
       };
     });
     if (exports.length) {
-      out.push({ file: mod2.file, exports });
+      out.push({ file: mod.file, exports });
     }
   }
   return out;
@@ -68444,12 +67303,12 @@ async function listDirectDeletedFileImporters(index, deletedFiles, projectRoot)
       ...edge.to.type === "file" ? { resolved: edge.to.path } : {}
     });
   }
-  for (const mod2 of index.byFile.values()) {
+  for (const mod of index.byFile.values()) {
     const uniqueImports = /* @__PURE__ */ new Map();
-    for (const entry of importsByFile.get(mod2.file) ?? []) {
+    for (const entry of importsByFile.get(mod.file) ?? []) {
       uniqueImports.set(`${entry.spec}::${entry.resolved ?? ""}`, entry);
     }
-    for (const imp of mod2.imports) {
+    for (const imp of mod.imports) {
       const resolved = getImportResolvedPath(imp);
       uniqueImports.set(`${imp.from}::${resolved ?? ""}`, {
         spec: imp.from,
@@ -68459,12 +67318,12 @@ async function listDirectDeletedFileImporters(index, deletedFiles, projectRoot)
     for (const entry of uniqueImports.values()) {
       for (const deletedFile of deletedFileSet) {
         const resolvedImportPath = entry.resolved ? normalizePath(entry.resolved) : void 0;
-        const resolvedAliasTarget = resolvedImportPath === deletedFile ? resolvedImportPath : await resolveDeletedAliasImportTarget(projectRoot, workspaceConfig, mod2.file, entry.spec, deletedFile);
-        if (!matchesDeletedImportTarget(mod2.file, entry.spec, resolvedAliasTarget, deletedFile)) {
+        const resolvedAliasTarget = resolvedImportPath === deletedFile ? resolvedImportPath : await resolveDeletedAliasImportTarget(projectRoot, workspaceConfig, mod.file, entry.spec, deletedFile);
+        if (!matchesDeletedImportTarget(mod.file, entry.spec, resolvedAliasTarget, deletedFile)) {
           continue;
         }
-        candidates.set(`${mod2.file}::${deletedFile}`, {
-          file: mod2.file,
+        candidates.set(`${mod.file}::${deletedFile}`, {
+          file: mod.file,
           deletedFile
         });
       }
@@ -68688,17 +67547,17 @@ async function collectDeletedImporterEdges(index, deletedFiles, projectRoot) {
   const deletedFileSet = new Set(deletedFiles.map((file2) => normalizePath(file2)));
   const edges = /* @__PURE__ */ new Map();
   const workspaceConfig = projectRoot ? await loadWorkspaceConfig(projectRoot) : void 0;
-  for (const mod2 of index.byFile.values()) {
-    for (const imp of mod2.imports) {
+  for (const mod of index.byFile.values()) {
+    for (const imp of mod.imports) {
       for (const deletedFile of deletedFileSet) {
         const resolvedImportPath = getImportResolvedPath(imp);
         const normalizedResolvedImportPath = resolvedImportPath ? normalizePath(resolvedImportPath) : void 0;
-        const resolvedAliasTarget = normalizedResolvedImportPath === deletedFile ? normalizedResolvedImportPath : await resolveDeletedAliasImportTarget(projectRoot, workspaceConfig, mod2.file, imp.from, deletedFile);
-        const matchesDeletedFile = matchesDeletedImportTarget(mod2.file, imp.from, resolvedAliasTarget, deletedFile);
+        const resolvedAliasTarget = normalizedResolvedImportPath === deletedFile ? normalizedResolvedImportPath : await resolveDeletedAliasImportTarget(projectRoot, workspaceConfig, mod.file, imp.from, deletedFile);
+        const matchesDeletedFile = matchesDeletedImportTarget(mod.file, imp.from, resolvedAliasTarget, deletedFile);
         if (!matchesDeletedFile)
           continue;
         const edge = {
-          from: mod2.file,
+          from: mod.file,
           to: { type: "file", path: deletedFile },
           raw: imp.from,
           ...imp.typeOnly ? { typeOnly: imp.typeOnly } : {}
@@ -68709,8 +67568,8 @@ async function collectDeletedImporterEdges(index, deletedFiles, projectRoot) {
   }
   return Array.from(edges.values());
 }
-function listReviewableExports(mod2) {
-  return mod2.exports.filter((entry) => entry.type !== "local");
+function listReviewableExports(mod) {
+  return mod.exports.filter((entry) => entry.type !== "local");
 }
 async function collectDeletedSnapshotEdges(deletedSnapshots, projectRoot) {
   const edges = /* @__PURE__ */ new Map();
@@ -71853,14 +70712,14 @@ async function locateChangedSymbolsWithLines(index, file2, hunks) {
   const changedNodes = findNodesInLines(tree, changedLines);
   const changedByteRanges = computeChangedByteRanges(source, hunks);
   const seenHandles = /* @__PURE__ */ new Map();
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  const trackedPositions = mod2 ? buildTrackedSymbolPositions(mod2.locals) : void 0;
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  const trackedPositions = mod ? buildTrackedSymbolPositions(mod.locals) : void 0;
   for (const node of changedNodes) {
     const classification = classifyChangedNode(node, source, sup);
     const symbolHandle = findSymbolHandleForNode(index, file2, node, sup, classification, source, trackedPositions);
     if (!symbolHandle)
       continue;
-    const symbolDef = mod2?.locals.find((l) => symbolHandleFromLocal(file2, l) === symbolHandle);
+    const symbolDef = mod?.locals.find((l) => symbolHandleFromLocal(file2, l) === symbolHandle);
     if (!symbolDef)
       continue;
     const existing = seenHandles.get(symbolHandle);
@@ -71991,8 +70850,8 @@ async function mapChangedLinesToSymbols(index, file2, hunks, changedLinesOverrid
   const { source, tree } = parsedEntry;
   const sup = parsedEntry.sup;
   const changedLines = changedLinesOverride ?? collectChangedLines(hunks);
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  const trackedPositions = mod2 ? buildTrackedSymbolPositions(mod2.locals) : void 0;
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  const trackedPositions = mod ? buildTrackedSymbolPositions(mod.locals) : void 0;
   const nodes = findNodesInLines(tree, changedLines);
   const linesByHandle = /* @__PURE__ */ new Map();
   for (const node of nodes) {
@@ -72353,13 +71212,13 @@ function signatureOnlyDeclarationLineChanged(tree, symbolDef, changedLines) {
   return false;
 }
 function findSymbolHandleForNode(index, file2, node, sup, classification, source, trackedPositions) {
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  if (!mod2)
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  if (!mod)
     return null;
   if (classification?.type === "definition" && isDefinitionNameNode(node, sup, source)) {
     const definitionLine = node.startPosition?.row + 1;
     const definitionColumn = node.startPosition?.column + 1;
-    const local = findLocalByStartPosition(mod2.locals, definitionLine, definitionColumn);
+    const local = findLocalByStartPosition(mod.locals, definitionLine, definitionColumn);
     if (local) {
       return symbolHandleFromLocal(file2, local);
     }
@@ -72368,7 +71227,7 @@ function findSymbolHandleForNode(index, file2, node, sup, classification, source
   if (nameNode) {
     const ancestorLine = nameNode.startPosition?.row + 1;
     const ancestorColumn = nameNode.startPosition?.column + 1;
-    const local = findLocalByStartPosition(mod2.locals, ancestorLine, ancestorColumn);
+    const local = findLocalByStartPosition(mod.locals, ancestorLine, ancestorColumn);
     return local ? symbolHandleFromLocal(file2, local) : null;
   }
   return null;
@@ -72617,11 +71476,11 @@ function relativePath2(root, file2) {
 function sortSymbols(symbols) {
   return symbols.slice().sort((left, right) => symbolId(left).localeCompare(symbolId(right)));
 }
-function isExported(mod2, handle) {
-  return isSymbolHandleExported(mod2.exports, handle);
+function isExported(mod, handle) {
+  return isSymbolHandleExported(mod.exports, handle);
 }
-function listReviewableExports2(mod2) {
-  return mod2.exports.filter((entry) => entry.type !== "local");
+function listReviewableExports2(mod) {
+  return mod.exports.filter((entry) => entry.type !== "local");
 }
 function exportSummaryName(entry) {
   return entry.type === "exportStar" ? "*" : entry.exportedAs;
@@ -72758,8 +71617,8 @@ function collectRemovedExportGroups(hunks) {
 function statementDeclaresSpecifier(statement, specifier) {
   return statement.specifiers.some((candidate) => candidate.kind === specifier.kind && candidate.name === specifier.name && candidate.fromModule === specifier.fromModule);
 }
-function buildExportSummaryGroups(file2, mod2, source, hunks) {
-  const entries = listReviewableExports2(mod2);
+function buildExportSummaryGroups(file2, mod, source, hunks) {
+  const entries = listReviewableExports2(mod);
   if (!hunks) {
     return { changed: uniqueExportSummaries(buildExportSummaries(file2, entries)), context: [] };
   }
@@ -72891,12 +71750,12 @@ async function summarizeChangedFiles2(input) {
     mod: index.byFile.get(fileIdentityKey(file2)),
     hunks: diffHunksByFile.get(fileIdentityKey(file2)) ?? diffHunksByFile.get(file2)
   }));
-  const fileEntries = await mapLimit(filesWithModules, Math.max(1, referenceConcurrency), async ({ file: file2, mod: mod2, hunks }) => {
+  const fileEntries = await mapLimit(filesWithModules, Math.max(1, referenceConcurrency), async ({ file: file2, mod, hunks }) => {
     const isBinary = diffChangesByFile.get(file2)?.isBinary ?? false;
     if (isBinary) {
       return {
         file: file2,
-        mod: mod2,
+        mod,
         hunks,
         locals: [],
         handles: [],
@@ -72905,10 +71764,10 @@ async function summarizeChangedFiles2(input) {
         parseFailed: false
       };
     }
-    if (!mod2) {
+    if (!mod) {
       return {
         file: file2,
-        mod: mod2,
+        mod,
         hunks,
         locals: [],
         handles: [],
@@ -72918,10 +71777,10 @@ async function summarizeChangedFiles2(input) {
       };
     }
     if (!hunks) {
-      const locals2 = sortSymbols(mod2.locals);
+      const locals2 = sortSymbols(mod.locals);
       return {
         file: file2,
-        mod: mod2,
+        mod,
         hunks,
         locals: locals2,
         handles: locals2.map((local) => symbolId(local)),
@@ -72947,7 +71806,7 @@ async function summarizeChangedFiles2(input) {
     const handles = locals.map((local) => symbolId(local));
     return {
       file: file2,
-      mod: mod2,
+      mod,
       hunks,
       locals,
       handles,
@@ -73030,7 +71889,7 @@ async function summarizeChangedFiles2(input) {
       ...callsites ? { callsites } : {}
     };
   };
-  const summariesWithHandles = await mapLimit(fileEntries, Math.max(1, referenceConcurrency), async ({ file: file2, mod: mod2, hunks, locals, handles, diffLinesByHandle }) => {
+  const summariesWithHandles = await mapLimit(fileEntries, Math.max(1, referenceConcurrency), async ({ file: file2, mod, hunks, locals, handles, diffLinesByHandle }) => {
     const diffChange = diffChangesByFile.get(file2);
     const diffMetadata = reviewFileDiffMetadata(projectRoot, diffChange);
     const deletedSnapshot = deletedSnapshots.get(file2);
@@ -73047,7 +71906,7 @@ async function summarizeChangedFiles2(input) {
         handles: []
       };
     }
-    if (!mod2 && deletedSnapshot) {
+    if (!mod && deletedSnapshot) {
       const deletedLocals = sortSymbols(deletedSnapshot.module.locals);
       const localSymbols2 = includeSymbolDetails ? deletedLocals.map((local) => {
         const handle = symbolId(local);
@@ -73084,7 +71943,7 @@ async function summarizeChangedFiles2(input) {
         handles: handles2
       };
     }
-    if (!mod2) {
+    if (!mod) {
       const fileExistsOnDisk = existenceByFile.get(file2) ?? false;
       const isDeletedByDiff = diffKindsByFile.get(file2) === "deleted";
       const isMissingExplicitInput = !fileExistsOnDisk && explicitFiles.has(file2) && !isDeletedByDiff;
@@ -73107,8 +71966,8 @@ async function summarizeChangedFiles2(input) {
         handles: []
       };
     }
-    const localSymbols = await mapLimit(locals, Math.max(1, referenceConcurrency), async (local) => await buildSymbolSummary(local, mod2, diffLinesByHandle));
-    const exportSummaryGroups = buildExportSummaryGroups(file2, mod2, await loadSource(file2), hunks);
+    const localSymbols = await mapLimit(locals, Math.max(1, referenceConcurrency), async (local) => await buildSymbolSummary(local, mod, diffLinesByHandle));
+    const exportSummaryGroups = buildExportSummaryGroups(file2, mod, await loadSource(file2), hunks);
     const symbols = [...localSymbols, ...exportSummaryGroups.changed];
     return {
       summary: {
@@ -73401,8 +72260,8 @@ async function buildReviewReport(projectRoot, opts = {}, cached2) {
 }
 function buildSymbolDefLookup(index) {
   const lookup = /* @__PURE__ */ new Map();
-  for (const mod2 of index.byFile.values()) {
-    for (const local of mod2.locals) {
+  for (const mod of index.byFile.values()) {
+    for (const local of mod.locals) {
       lookup.set(symbolId(local), local);
     }
   }
@@ -75768,10 +74627,10 @@ function rebuildDerivedQueryIndexSchema(db) {
   })();
 }
 function ensureQueryIndexSchema(db) {
-  const version3 = readQueryIndexSchemaVersion(db);
-  if (version3 > QUERY_INDEX_SCHEMA_VERSION)
-    throw new QueryIndexFutureSchemaError(version3);
-  if (!version3) {
+  const version2 = readQueryIndexSchemaVersion(db);
+  if (version2 > QUERY_INDEX_SCHEMA_VERSION)
+    throw new QueryIndexFutureSchemaError(version2);
+  if (!version2) {
     const existing2 = existingQueryTables(db);
     if (existing2.size) {
       throw new QueryIndexSchemaError("Query index has tables but no recognized schema version.");
@@ -75781,10 +74640,10 @@ function ensureQueryIndexSchema(db) {
     db.pragma(`user_version = ${QUERY_INDEX_SCHEMA_VERSION}`);
     return;
   }
-  if (version3 === 1 || version3 === 2) {
+  if (version2 === 1 || version2 === 2) {
     rebuildDerivedQueryIndexSchema(db);
-  } else if (version3 < QUERY_INDEX_SCHEMA_VERSION) {
-    throw new QueryIndexSchemaError(`Query index schema version ${version3} has no supported migration.`);
+  } else if (version2 < QUERY_INDEX_SCHEMA_VERSION) {
+    throw new QueryIndexSchemaError(`Query index schema version ${version2} has no supported migration.`);
   }
   const existing = existingQueryTables(db);
   const missing = REQUIRED_TABLES.filter((table) => !existing.has(table));
@@ -75819,8 +74678,8 @@ var init_schema2 = __esm({
     init_content();
     QUERY_INDEX_SCHEMA_VERSION = 3;
     QueryIndexFutureSchemaError = class extends Error {
-      constructor(version3) {
-        super(`Query index schema version ${version3} is newer than supported version ${QUERY_INDEX_SCHEMA_VERSION}.`);
+      constructor(version2) {
+        super(`Query index schema version ${version2} is newer than supported version ${QUERY_INDEX_SCHEMA_VERSION}.`);
         this.name = "QueryIndexFutureSchemaError";
       }
     };
@@ -76487,6 +75346,7 @@ __export(workerPool_exports, {
 import fs33 from "node:fs";
 import path75 from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
+import { Piscina as Piscina3 } from "piscina";
 function shouldPrepareQueryIndexFilesInWorker(fileCount, threadCount = resolveWorkerThreads()) {
   return threadCount > 1 && fileCount >= QUERY_INDEX_WORKER_MIN_FILES;
 }
@@ -76532,7 +75392,7 @@ async function prepareQueryIndexFilesInWorker(projectRoot, files) {
     return await prepareQueryIndexFilesInProcess(projectRoot, files);
   }
   markWindowsProcessDrainRequired();
-  const pool = new Piscina({
+  const pool = new Piscina3({
     filename: workerPath,
     minThreads: 1,
     maxThreads: threads,
@@ -76567,7 +75427,6 @@ var QUERY_INDEX_MAX_THREADS, QUERY_INDEX_WORKER_MIN_FILES;
 var init_workerPool = __esm({
   "dist/agent/query-index/workerPool.js"() {
     "use strict";
-    init_esm_wrapper();
     init_packageInfo();
     init_content();
     init_paths2();
@@ -81808,9 +80667,9 @@ function buildReexportChains(index, changedSymbols, maxDepth = REEXPORT_CHAIN_MA
   if (!exportedSymbols.length)
     return void 0;
   const reexportsBySource = /* @__PURE__ */ new Map();
-  for (const mod2 of index.byFile.values()) {
-    const file2 = mod2.file;
-    for (const entry of mod2.exports) {
+  for (const mod of index.byFile.values()) {
+    const file2 = mod.file;
+    for (const entry of mod.exports) {
       if (entry.type !== "reexport" && entry.type !== "exportStar" && entry.type !== "namespaceReexport") {
         continue;
       }
@@ -82058,10 +80917,10 @@ async function collectImpactSuggestions(index, projectRoot, diffFiles, options)
       break;
     const absoluteFile = resolveFilePath(projectRoot, fileChange.path);
     const reportFile = toProjectRelative(projectRoot, absoluteFile);
-    const mod2 = index.byFile.get(fileIdentityKey(absoluteFile));
-    const importedLocals = collectImportedLocals(mod2);
-    const importedFiles = collectImportedFiles(mod2);
-    const missingExportSuggestions = collectMissingExportSuggestions(mod2, exportLookup, reportFile, projectRoot, importedFiles);
+    const mod = index.byFile.get(fileIdentityKey(absoluteFile));
+    const importedLocals = collectImportedLocals(mod);
+    const importedFiles = collectImportedFiles(mod);
+    const missingExportSuggestions = collectMissingExportSuggestions(mod, exportLookup, reportFile, projectRoot, importedFiles);
     for (const suggestion of missingExportSuggestions) {
       if (maxSuggestions !== void 0 && output.length >= maxSuggestions)
         break;
@@ -82077,7 +80936,7 @@ async function collectImpactSuggestions(index, projectRoot, diffFiles, options)
         break;
       if (importedLocals.has(candidate.name))
         continue;
-      if (mod2 && mod2.locals.some((local) => local.localName === candidate.name))
+      if (mod && mod.locals.some((local) => local.localName === candidate.name))
         continue;
       const result = await goToDefinition(index, {
         file: absoluteFile,
@@ -82126,9 +80985,9 @@ async function collectImpactSuggestions(index, projectRoot, diffFiles, options)
 function buildExportLookup(index) {
   const exportNamesByFile = /* @__PURE__ */ new Map();
   const filesByExportName = /* @__PURE__ */ new Map();
-  for (const mod2 of index.byFile.values()) {
-    const file2 = mod2.file;
-    const names = collectExportNames(mod2);
+  for (const mod of index.byFile.values()) {
+    const file2 = mod.file;
+    const names = collectExportNames(mod);
     exportNamesByFile.set(fileIdentityKey(file2), names);
     for (const name of names) {
       const existing = filesByExportName.get(name) ?? /* @__PURE__ */ new Set();
@@ -82138,9 +80997,9 @@ function buildExportLookup(index) {
   }
   return { exportNamesByFile, filesByExportName };
 }
-function collectExportNames(mod2) {
+function collectExportNames(mod) {
   const names = /* @__PURE__ */ new Set();
-  for (const entry of mod2.exports) {
+  for (const entry of mod.exports) {
     const exportedName = getExportedName(entry);
     if (exportedName)
       names.add(exportedName);
@@ -82152,11 +81011,11 @@ function getExportedName(entry) {
     return entry.exportedAs;
   return null;
 }
-function collectImportedLocals(mod2) {
+function collectImportedLocals(mod) {
   const locals = /* @__PURE__ */ new Set();
-  if (!mod2)
+  if (!mod)
     return locals;
-  for (const binding of mod2.imports) {
+  for (const binding of mod.imports) {
     const local = getImportLocal(binding);
     if (local)
       locals.add(local);
@@ -82170,11 +81029,11 @@ function getImportLocal(binding) {
     return binding.local;
   return null;
 }
-function collectImportedFiles(mod2) {
+function collectImportedFiles(mod) {
   const files = /* @__PURE__ */ new Set();
-  if (!mod2)
+  if (!mod)
     return files;
-  for (const binding of mod2.imports) {
+  for (const binding of mod.imports) {
     if (binding.resolved && typeof binding.resolved === "string") {
       files.add(binding.resolved);
     }
@@ -82193,11 +81052,11 @@ function determineSuggestionConfidence({ symbol: symbol2, exportCandidateCount,
 function isCommonSymbolName(symbol2) {
   return COMMON_SYMBOLS.has(symbol2);
 }
-function collectMissingExportSuggestions(mod2, lookup, reportFile, projectRoot, importedFiles) {
-  if (!mod2)
+function collectMissingExportSuggestions(mod, lookup, reportFile, projectRoot, importedFiles) {
+  if (!mod)
     return [];
   const suggestions = [];
-  for (const binding of mod2.imports) {
+  for (const binding of mod.imports) {
     if (!binding.resolved)
       continue;
     if (typeof binding.resolved !== "string")
@@ -82596,8 +81455,8 @@ function collectConfigAndBreakingSuggestions(index, projectRoot, fileChanges, ch
       const removedLines = removedLinesByFile.get(normalized);
       if (!removedLines || removedLines.size === 0)
         continue;
-      const mod2 = index.byFile.get(fileIdentityKey(normalized));
-      const hasExports = !!mod2?.exports.length;
+      const mod = index.byFile.get(fileIdentityKey(normalized));
+      const hasExports = !!mod?.exports.length;
       const alreadyHasForFile = Array.from(breakingByKey.values()).some((entry) => fileIdentityKey(entry.file) === fileIdentityKey(normalized));
       if (!hasExports || alreadyHasForFile)
         continue;
@@ -86775,7 +85634,7 @@ var init_chunk_Br0eD_fh = __esm({
     __getOwnPropNames2 = Object.getOwnPropertyNames;
     __getProtoOf2 = Object.getPrototypeOf;
     __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    __commonJSMin = (cb, mod2) => () => (mod2 || cb((mod2 = { exports: {} }).exports, mod2), mod2.exports);
+    __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
     __exportAll = (all, symbols) => {
       let target = {};
       for (var name in all) {
@@ -86803,10 +85662,10 @@ var init_chunk_Br0eD_fh = __esm({
       }
       return to;
     };
-    __toESM2 = (mod2, isNodeMode, target) => (target = mod2 != null ? __create2(__getProtoOf2(mod2)) : {}, __copyProps2(isNodeMode || !mod2 || !mod2.__esModule ? __defProp2(target, "default", {
-      value: mod2,
+    __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", {
+      value: mod,
       enumerable: true
-    }) : target, mod2));
+    }) : target, mod));
   }
 });
 
@@ -87866,14 +86725,14 @@ function missingClientCapabilities(required2, declared) {
   }
   return Object.keys(missing).length > 0 ? missing : void 0;
 }
-function isModernProtocolVersion(version3) {
-  return version3 >= FIRST_MODERN_PROTOCOL_VERSION;
+function isModernProtocolVersion(version2) {
+  return version2 >= FIRST_MODERN_PROTOCOL_VERSION;
 }
 function legacyProtocolVersions(versions) {
-  return versions.filter((version3) => !isModernProtocolVersion(version3));
+  return versions.filter((version2) => !isModernProtocolVersion(version2));
 }
 function modernProtocolVersions(versions) {
-  return versions.filter((version3) => isModernProtocolVersion(version3));
+  return versions.filter((version2) => isModernProtocolVersion(version2));
 }
 function appendTextFallbackForNonObject(result) {
   const sc = result.structuredContent;
@@ -89987,8 +88846,8 @@ function getWireResultSchemas() {
   };
   return wireResultSchemasMemo;
 }
-function codecForVersion(version3) {
-  return version3 !== void 0 && isModernProtocolVersion(version3) ? rev2026Codec : rev2025Codec;
+function codecForVersion(version2) {
+  return version2 !== void 0 && isModernProtocolVersion(version2) ? rev2026Codec : rev2025Codec;
 }
 function classifiedWireEra(classification) {
   if (classification.revision !== void 0) return codecForVersion(classification.revision).era;
@@ -90654,8 +89513,8 @@ function withRequestStateValue(ctx, value) {
     }
   };
 }
-function setNegotiatedProtocolVersion(instance, version3) {
-  writeNegotiatedProtocolVersion(instance, version3);
+function setNegotiatedProtocolVersion(instance, version2) {
+  writeNegotiatedProtocolVersion(instance, version2);
 }
 function isPlainObject$1(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -91896,8 +90755,8 @@ var init_src_CX2iR2pK = __esm({
       */
       _negotiatedProtocolVersion;
       static {
-        writeNegotiatedProtocolVersion = (instance, version3) => {
-          instance._negotiatedProtocolVersion = version3;
+        writeNegotiatedProtocolVersion = (instance, version2) => {
+          instance._negotiatedProtocolVersion = version2;
         };
       }
       _supportedProtocolVersions;
@@ -92699,7 +91558,7 @@ function createDefaultAjvInstance(engineClass) {
   addFormats(ajv);
   return ajv;
 }
-var require_code$1, require_scope, require_codegen, require_util2, require_names, require_errors2, require_boolSchema, require_rules, require_applicability, require_dataType, require_defaults, require_code, require_keyword, require_subschema, require_fast_deep_equal, require_json_schema_traverse, require_resolve, require_validate, require_validation_error, require_ref_error, require_compile2, require_data, require_utils6, require_schemes, require_fast_uri, require_uri, require_core$3, require_id, require_ref, require_core$2, require_limitNumber, require_multipleOf, require_ucs2length, require_limitLength, require_pattern2, require_limitProperties, require_required, require_limitItems, require_equal, require_uniqueItems, require_const, require_enum, require_validation$2, require_additionalItems, require_items, require_prefixItems, require_items2020, require_contains, require_dependencies, require_propertyNames, require_additionalProperties, require_properties, require_patternProperties, require_not, require_anyOf, require_oneOf, require_allOf, require_if, require_thenElse, require_applicator$2, require_format$2, require_format$1, require_metadata, require_draft7, require_types, require_discriminator, require_json_schema_draft_07, require_ajv, require_dynamicAnchor, require_dynamicRef, require_recursiveAnchor, require_recursiveRef, require_dynamic, require_dependentRequired, require_dependentSchemas, require_limitContains, require_next, require_unevaluatedProperties, require_unevaluatedItems, require_unevaluated$1, require_schema$1, require_applicator$1, require_content$1, require_core$1, require_format, require_meta_data$1, require_validation$1, require_json_schema_2019_09, require__2019, require_draft2020, require_schema, require_applicator, require_unevaluated, require_content, require_core, require_format_annotation, require_meta_data, require_validation, require_json_schema_2020_12, require__2020, require_formats, require_limit, require_dist2, import_ajv, import__2019, import__2020, import_dist, addFormats, AjvJsonSchemaValidator, Ajv;
+var require_code$1, require_scope, require_codegen, require_util2, require_names, require_errors, require_boolSchema, require_rules, require_applicability, require_dataType, require_defaults, require_code, require_keyword, require_subschema, require_fast_deep_equal, require_json_schema_traverse, require_resolve, require_validate, require_validation_error, require_ref_error, require_compile2, require_data, require_utils6, require_schemes, require_fast_uri, require_uri, require_core$3, require_id, require_ref, require_core$2, require_limitNumber, require_multipleOf, require_ucs2length, require_limitLength, require_pattern2, require_limitProperties, require_required, require_limitItems, require_equal, require_uniqueItems, require_const, require_enum, require_validation$2, require_additionalItems, require_items, require_prefixItems, require_items2020, require_contains, require_dependencies, require_propertyNames, require_additionalProperties, require_properties, require_patternProperties, require_not, require_anyOf, require_oneOf, require_allOf, require_if, require_thenElse, require_applicator$2, require_format$2, require_format$1, require_metadata, require_draft7, require_types, require_discriminator, require_json_schema_draft_07, require_ajv, require_dynamicAnchor, require_dynamicRef, require_recursiveAnchor, require_recursiveRef, require_dynamic, require_dependentRequired, require_dependentSchemas, require_limitContains, require_next, require_unevaluatedProperties, require_unevaluatedItems, require_unevaluated$1, require_schema$1, require_applicator$1, require_content$1, require_core$1, require_format, require_meta_data$1, require_validation$1, require_json_schema_2019_09, require__2019, require_draft2020, require_schema, require_applicator, require_unevaluated, require_content, require_core, require_format_annotation, require_meta_data, require_validation, require_json_schema_2020_12, require__2020, require_formats, require_limit, require_dist, import_ajv, import__2019, import__2020, import_dist, addFormats, AjvJsonSchemaValidator, Ajv;
 var init_ajvProvider_CEoC_sr = __esm({
   "node_modules/@modelcontextprotocol/server/dist/ajvProvider-CEoC__sr.mjs"() {
     init_chunk_Br0eD_fh();
@@ -93805,7 +92664,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       };
       exports.default = names;
     }));
-    require_errors2 = /* @__PURE__ */ __commonJSMin(((exports) => {
+    require_errors = /* @__PURE__ */ __commonJSMin(((exports) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.extendErrors = exports.resetErrorsCount = exports.reportExtraError = exports.reportError = exports.keyword$DataError = exports.keywordError = void 0;
       const codegen_1 = require_codegen();
@@ -93901,7 +92760,7 @@ var init_ajvProvider_CEoC_sr = __esm({
     require_boolSchema = /* @__PURE__ */ __commonJSMin(((exports) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.boolOrEmptySchema = exports.topBoolOrEmptySchema = void 0;
-      const errors_1 = require_errors2();
+      const errors_1 = require_errors();
       const codegen_1 = require_codegen();
       const names_1 = require_names();
       const boolError = { message: "boolean schema is false" };
@@ -94017,7 +92876,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       exports.reportTypeError = exports.checkDataTypes = exports.checkDataType = exports.coerceAndCheckDataType = exports.getJSONTypes = exports.getSchemaTypes = exports.DataType = void 0;
       const rules_1 = require_rules();
       const applicability_1 = require_applicability();
-      const errors_1 = require_errors2();
+      const errors_1 = require_errors();
       const codegen_1 = require_codegen();
       const util_1 = require_util2();
       var DataType;
@@ -94328,7 +93187,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       const codegen_1 = require_codegen();
       const names_1 = require_names();
       const code_1 = require_code();
-      const errors_1 = require_errors2();
+      const errors_1 = require_errors();
       function macroKeywordCode(cxt, def) {
         const { gen, keyword, schema, parentSchema, it } = cxt;
         const macroSchema = def.macro.call(it.self, schema, parentSchema, it);
@@ -94732,7 +93591,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       const names_1 = require_names();
       const resolve_1 = require_resolve();
       const util_1 = require_util2();
-      const errors_1 = require_errors2();
+      const errors_1 = require_errors();
       function validateFunctionCode(it) {
         if (isSchemaObj(it)) {
           checkKeywords(it);
@@ -99608,7 +98467,7 @@ var init_ajvProvider_CEoC_sr = __esm({
       };
       exports.default = formatLimitPlugin;
     }));
-    require_dist2 = /* @__PURE__ */ __commonJSMin(((exports, module2) => {
+    require_dist = /* @__PURE__ */ __commonJSMin(((exports, module2) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       const formats_1 = require_formats();
       const limit_1 = require_limit();
@@ -99643,7 +98502,7 @@ var init_ajvProvider_CEoC_sr = __esm({
     import_ajv = require_ajv();
     import__2019 = require__2019();
     import__2020 = require__2020();
-    import_dist = /* @__PURE__ */ __toESM2(require_dist2(), 1);
+    import_dist = /* @__PURE__ */ __toESM2(require_dist(), 1);
     addFormats = import_dist.default;
     AjvJsonSchemaValidator = class {
       _ajv;
@@ -100302,7 +99161,7 @@ var init_mcp_DXXb3Vv3 = __esm({
           if (identity.clientInfo !== void 0) server._clientVersion = identity.clientInfo;
         };
         installDiscoverHandler = (server, servedModernVersions) => {
-          const missing = servedModernVersions.filter((version3) => !server._supportedProtocolVersions.includes(version3));
+          const missing = servedModernVersions.filter((version2) => !server._supportedProtocolVersions.includes(version2));
           if (missing.length > 0) server._supportedProtocolVersions = [...server._supportedProtocolVersions, ...missing];
           server.setRequestHandler("server/discover", () => server._ondiscover());
         };
@@ -101860,8 +100719,8 @@ var init_stdio = __esm({
         if (this._outboundIntercept?.(message) === "handled") return;
         return this._wire.send(message, options);
       }
-      setProtocolVersion = (version3) => {
-        this._wire.setProtocolVersion?.(version3);
+      setProtocolVersion = (version2) => {
+        this._wire.setProtocolVersion?.(version2);
       };
       /** Forwards one inbound message to the connected instance. */
       deliver(message, extra) {
@@ -108936,8 +107795,8 @@ function formatIndexOutput(output) {
     return lines.join("\n");
   }
   lines.push("Modules:");
-  for (const mod2 of output.modules) {
-    lines.push(`- ${mod2.file}: ${mod2.locals.length} locals, ${mod2.exports.length} exports, ${mod2.imports.length} imports`);
+  for (const mod of output.modules) {
+    lines.push(`- ${mod.file}: ${mod.locals.length} locals, ${mod.exports.length} exports, ${mod.imports.length} imports`);
   }
   return lines.join("\n");
 }
@@ -108945,10 +107804,16 @@ async function handleIndexCommand(context) {
   const verbose = context.hasFlag("--verbose");
   const commandReport = context.reportEnabled ? { command: "index", timings: {} } : void 0;
   const commandStart = performance16.now();
-  const resolveStart = performance16.now();
-  const files = await context.resolveFiles();
-  if (commandReport) {
-    commandReport.timings.resolveFilesMs = Math.round(performance16.now() - resolveStart);
+  const shouldWriteManifest = !context.includeRootsAbs.length && !context.gitBase && !context.changedSince;
+  const hasCliDiscoveryGlob = context.getOpt("--include-glob") !== void 0 || context.getOpt("--ignore-glob") !== void 0;
+  const needsResolvedFiles = !shouldWriteManifest || hasCliDiscoveryGlob;
+  let files = [];
+  if (needsResolvedFiles) {
+    const resolveStart = performance16.now();
+    files = await context.resolveFiles();
+    if (commandReport) {
+      commandReport.timings.resolveFilesMs = Math.round(performance16.now() - resolveStart);
+    }
   }
   const threads = parseNonNegativeIntegerOption(context.getOpt("--threads"), "--threads", 0);
   const cache = parseCacheModeOption(context.getOpt("--cache"));
@@ -108956,7 +107821,6 @@ async function handleIndexCommand(context) {
   const cacheStrict = context.hasFlag("--cache-strict");
   const full = context.hasFlag("--json") || context.hasFlag("--full");
   const cacheVerify = context.hasFlag("--cache-verify");
-  const shouldWriteManifest = !context.includeRootsAbs.length && !context.gitBase && !context.changedSince;
   const indexReport = { timings: {} };
   if (commandReport) {
     commandReport.index = indexReport;
@@ -110612,8 +109476,8 @@ async function handleDumpmodCommand(context) {
   }
   const file2 = resolvedFile.file;
   const index = await loadNavigationIndex(context);
-  const mod2 = index.byFile.get(fileIdentityKey(file2));
-  if (!mod2) {
+  const mod = index.byFile.get(fileIdentityKey(file2));
+  if (!mod) {
     writeCliOutput(context, {
       status: "not_found",
       reason: "Module not indexed",
@@ -110623,13 +109487,13 @@ async function handleDumpmodCommand(context) {
   }
   writeCliOutput(context, {
     file: file2,
-    locals: mod2.locals.map((l) => ({
+    locals: mod.locals.map((l) => ({
       name: l.localName,
       kind: l.kind,
       start: l.range.start
     })),
-    imports: mod2.imports,
-    exports: mod2.exports.map((e) => e.type === "local" ? {
+    imports: mod.imports,
+    exports: mod.exports.map((e) => e.type === "local" ? {
       type: e.type,
       exportedAs: e.exportedAs,
       def: {
@@ -113902,6 +112766,7 @@ var init_discoveryGlobs = __esm({
 
 // dist/cli/invocationContext.js
 import fs46 from "node:fs";
+import fsp44 from "node:fs/promises";
 import path96 from "node:path";
 function loadDiscoveryGlobHelpers() {
   discoveryGlobHelpersPromise ??= Promise.resolve().then(() => (init_discoveryGlobs(), discoveryGlobs_exports));
@@ -114004,7 +112869,7 @@ function createCliBaseContext(command, parsed) {
 }
 async function loadCliProjectContext(base) {
   const { command, parsed, getOpt, hasFlag, projectRootFs } = base;
-  const { cliGlobDiscoveryOptions, activeCliRootGlobDiscoveryOptions, cliGitignoreDiscoveryOptions, gitBase, gitHead, changedSince, graphFlags } = base;
+  const { cliGlobDiscoveryOptions, activeCliRootGlobDiscoveryOptions, cliGitignoreDiscoveryOptions, hasCliDiscoveryGlobs, gitBase, gitHead, changedSince, graphFlags } = base;
   const { hasDiscoveryOptions: hasDiscoveryOptions2, loadCodegraphConfig: loadCodegraphConfig2, mergeDiscoveryOptions: mergeDiscoveryOptions2 } = await loadConfigHelpers();
   const explicitDiscoveryOptions = mergeDiscoveryOptions2(cliGlobDiscoveryOptions, cliGitignoreDiscoveryOptions);
   const config2 = await loadCodegraphConfig2(projectRootFs);
@@ -114072,48 +112937,101 @@ async function loadCliProjectContext(base) {
     }
     return rootFilteredFiles.filter((filePath) => matchedFiles.has(filePath));
   };
-  const resolveFilesFromRoots = async () => {
-    const { listProjectFiles: listProjectFiles2 } = await loadProjectFilesHelpers();
+  const discoveryWalkCache = /* @__PURE__ */ new Map();
+  let knownSymlinkDirectories;
+  let symlinkHintResolved = false;
+  const resolveKnownSymlinkDirectories = async () => {
+    if (symlinkHintResolved)
+      return knownSymlinkDirectories;
+    symlinkHintResolved = true;
+    try {
+      const { loadManifest: loadManifest2 } = await Promise.resolve().then(() => (init_build_cache(), build_cache_exports));
+      const symlinkHintManifest = await loadManifest2(projectRootFs, {
+        ...config2.cache?.location ? { cacheLocation: config2.cache.location } : {}
+      });
+      if (symlinkHintManifest?.symlinkDirectories !== void 0 && symlinkHintManifest.symlinkDirectoriesRootMtimeMs !== void 0) {
+        const rootMtime = (await fsp44.stat(projectRootFs)).mtimeMs;
+        if (rootMtime === symlinkHintManifest.symlinkDirectoriesRootMtimeMs) {
+          knownSymlinkDirectories = symlinkHintManifest.symlinkDirectories;
+        }
+      }
+    } catch {
+      knownSymlinkDirectories = void 0;
+    }
+    return knownSymlinkDirectories;
+  };
+  const discoveryWalkCacheKey = (scanRoot, patterns, options) => JSON.stringify({
+    scanRoot: normalizePath(scanRoot),
+    patterns: patterns ?? null,
+    includeGlobs: options.includeGlobs ?? null,
+    ignoreGlobs: options.ignoreGlobs ?? null,
+    globRoot: options.globRoot ? normalizePath(options.globRoot) : null,
+    useGitignore: options.useGitignore ?? null,
+    gitignoreRoot: options.gitignoreRoot ? normalizePath(options.gitignoreRoot) : null,
+    logLevel: options.logLevel ?? null
+  });
+  const listDiscoveredProjectFiles = async (scanRoot, patterns, options) => {
+    const symlinkDirectories = await resolveKnownSymlinkDirectories();
+    const walkOptions = {
+      ...options,
+      ...symlinkDirectories !== void 0 ? { knownSymlinkDirectories: symlinkDirectories } : {}
+    };
+    const key = discoveryWalkCacheKey(scanRoot, patterns, walkOptions);
+    let pending = discoveryWalkCache.get(key);
+    if (!pending) {
+      pending = (async () => {
+        const { listProjectFilesWithGitCandidates: listProjectFilesWithGitCandidates2 } = await loadProjectFilesHelpers();
+        return await listProjectFilesWithGitCandidates2(scanRoot, patterns, walkOptions);
+      })();
+      discoveryWalkCache.set(key, pending);
+    }
+    return await pending;
+  };
+  const resolveDiscoveryPatterns = async () => {
     const basePatterns = command === "duplicates" ? await getDuplicateProjectPatterns() : void 0;
     const [{ languageExtensionPatterns: languageExtensionPatterns2 }, { DEFAULT_PROJECT_PATTERNS: DEFAULT_PROJECT_PATTERNS2 }] = await Promise.all([
       Promise.resolve().then(() => (init_languages(), languages_exports)),
       loadProjectFilesHelpers()
     ]);
     const customPatterns = languageExtensionPatterns2(config2.languages?.extensions);
-    const patterns = customPatterns.length ? [...basePatterns ?? DEFAULT_PROJECT_PATTERNS2, ...customPatterns] : basePatterns;
+    return customPatterns.length ? [...basePatterns ?? DEFAULT_PROJECT_PATTERNS2, ...customPatterns] : basePatterns;
+  };
+  const resolveFilesFromRoots = async () => {
+    const patterns = await resolveDiscoveryPatterns();
+    const walkDiscoveryOptions = hasCliDiscoveryGlobs ? diagnosticDiscoveryOptions : discoveryOptions;
+    const walkOptions = {
+      ...walkDiscoveryOptions,
+      gitignoreRoot: projectRootFs
+    };
     if (!includeRootsAbs.length) {
-      const diagnosticFiles = await listProjectFiles2(projectRootFs, patterns, {
-        ...diagnosticDiscoveryOptions,
-        gitignoreRoot: projectRootFs
-      });
-      recordCliGlobDiagnostics(diagnosticFiles, projectRootFs);
-      flushCliGlobDiagnostics();
-      if (!hasDiscoveryOptions2(activeCliRootGlobDiscoveryOptions)) {
-        return await listProjectFiles2(projectRootFs, patterns, {
-          ...discoveryOptions,
-          gitignoreRoot: projectRootFs
-        });
+      const files = await listDiscoveredProjectFiles(projectRootFs, patterns, walkOptions);
+      if (hasCliDiscoveryGlobs) {
+        recordCliGlobDiagnostics(files, projectRootFs);
+        flushCliGlobDiagnostics();
+        return applyCliDiscoveryFilters(files);
       }
-      return applyCliDiscoveryFilters(diagnosticFiles);
+      return files;
     }
-    const normalizedRoots = includeRootsAbs;
-    const all = await Promise.all(normalizedRoots.map(async (r) => {
-      const files = await listProjectFiles2(r, patterns, {
-        ...diagnosticDiscoveryOptions,
-        gitignoreRoot: projectRootFs
-      });
-      recordCliGlobDiagnostics(files, r);
+    const all = await Promise.all(includeRootsAbs.map(async (scanRoot) => {
+      const files = await listDiscoveredProjectFiles(scanRoot, patterns, walkOptions);
+      if (hasCliDiscoveryGlobs) {
+        recordCliGlobDiagnostics(files, scanRoot);
+      }
       return files;
     }));
-    flushCliGlobDiagnostics();
+    if (hasCliDiscoveryGlobs) {
+      flushCliGlobDiagnostics();
+    }
     return applyCliDiscoveryFilters(Array.from(new Set(all.flat())));
   };
   const listProjectFilesForScan = async (scanRoot) => {
-    const { listProjectFiles: listProjectFiles2 } = await loadProjectFilesHelpers();
     if (scanRoot === projectRootFs) {
-      return await listProjectFiles2(scanRoot, void 0, discoveryOptions);
+      return await listDiscoveredProjectFiles(scanRoot, void 0, {
+        ...discoveryOptions,
+        gitignoreRoot: projectRootFs
+      });
     }
-    const files = await listProjectFiles2(scanRoot, void 0, {
+    const files = await listDiscoveredProjectFiles(scanRoot, void 0, {
       ...includeRootDiscoveryOptions,
       gitignoreRoot: projectRootFs
     });
@@ -114141,8 +113059,7 @@ async function loadCliProjectContext(base) {
     const deletedFiles = files.filter((filePath) => !fs46.existsSync(filePath));
     const scanRoots = includeRootsAbs.length ? includeRootsAbs : [projectRootFs];
     await Promise.all(scanRoots.map(async (scanRoot) => {
-      const { listProjectFiles: listProjectFiles2 } = await loadProjectFilesHelpers();
-      const currentFiles = fs46.existsSync(scanRoot) ? await listProjectFiles2(scanRoot, patterns, {
+      const currentFiles = fs46.existsSync(scanRoot) ? await listDiscoveredProjectFiles(scanRoot, patterns, {
         ...diagnosticDiscoveryOptions,
         gitignoreRoot: projectRootFs
       }) : [];