@optave/codegraph 3.5.0 → 3.6.0

package/src/db/index.ts

@@ -11,6 +11,7 @@ export {
   flushDeferredClose,
   openDb,
   openReadonlyOrFail,
+  openReadonlyWithNative,
   openRepo,
 } from './connection.js';
 export { getBuildMeta, initSchema, MIGRATIONS, setBuildMeta } from './migrations.js';

package/src/db/migrations.ts

@@ -304,7 +304,8 @@ export function setBuildMeta(
   tx();
 }
 
-export function initSchema(db: BetterSqlite3Database): void {
+/** Run numbered migrations that haven't been applied yet. */
+function applyMigrations(db: BetterSqlite3Database): void {
   db.exec(`CREATE TABLE IF NOT EXISTS schema_version (version INTEGER NOT NULL DEFAULT 0)`);
 
   const row = db.prepare<{ version: number }>('SELECT version FROM schema_version').get();
@@ -322,40 +323,43 @@ export function initSchema(db: BetterSqlite3Database): void {
       currentVersion = migration.version;
     }
   }
+}
 
-  // Legacy column compat — add columns that may be missing from pre-migration DBs
+/** Ensure columns and indexes exist for pre-migration DBs (legacy compat). */
+function ensureLegacyColumns(db: BetterSqlite3Database): void {
   if (hasTable(db, 'nodes')) {
-    if (!hasColumn(db, 'nodes', 'end_line')) {
-      db.exec('ALTER TABLE nodes ADD COLUMN end_line INTEGER');
-    }
-    if (!hasColumn(db, 'nodes', 'role')) {
-      db.exec('ALTER TABLE nodes ADD COLUMN role TEXT');
-    }
-    db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_role ON nodes(role)');
-    if (!hasColumn(db, 'nodes', 'parent_id')) {
-      db.exec('ALTER TABLE nodes ADD COLUMN parent_id INTEGER REFERENCES nodes(id)');
-    }
-    db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_parent ON nodes(parent_id)');
-    db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_kind_parent ON nodes(kind, parent_id)');
-    if (!hasColumn(db, 'nodes', 'qualified_name')) {
-      db.exec('ALTER TABLE nodes ADD COLUMN qualified_name TEXT');
-    }
-    if (!hasColumn(db, 'nodes', 'scope')) {
-      db.exec('ALTER TABLE nodes ADD COLUMN scope TEXT');
-    }
-    if (!hasColumn(db, 'nodes', 'visibility')) {
-      db.exec('ALTER TABLE nodes ADD COLUMN visibility TEXT');
-    }
-    db.exec('UPDATE nodes SET qualified_name = name WHERE qualified_name IS NULL');
-    db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_qualified_name ON nodes(qualified_name)');
-    db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_scope ON nodes(scope)');
+    ensureNodeColumns(db);
   }
   if (hasTable(db, 'edges')) {
-    if (!hasColumn(db, 'edges', 'confidence')) {
-      db.exec('ALTER TABLE edges ADD COLUMN confidence REAL DEFAULT 1.0');
-    }
-    if (!hasColumn(db, 'edges', 'dynamic')) {
-      db.exec('ALTER TABLE edges ADD COLUMN dynamic INTEGER DEFAULT 0');
-    }
+    ensureEdgeColumns(db);
   }
 }
+
+function ensureNodeColumns(db: BetterSqlite3Database): void {
+  const missing = (col: string) => !hasColumn(db, 'nodes', col);
+  if (missing('end_line')) db.exec('ALTER TABLE nodes ADD COLUMN end_line INTEGER');
+  if (missing('role')) db.exec('ALTER TABLE nodes ADD COLUMN role TEXT');
+  db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_role ON nodes(role)');
+  if (missing('parent_id'))
+    db.exec('ALTER TABLE nodes ADD COLUMN parent_id INTEGER REFERENCES nodes(id)');
+  db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_parent ON nodes(parent_id)');
+  db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_kind_parent ON nodes(kind, parent_id)');
+  if (missing('qualified_name')) db.exec('ALTER TABLE nodes ADD COLUMN qualified_name TEXT');
+  if (missing('scope')) db.exec('ALTER TABLE nodes ADD COLUMN scope TEXT');
+  if (missing('visibility')) db.exec('ALTER TABLE nodes ADD COLUMN visibility TEXT');
+  db.exec('UPDATE nodes SET qualified_name = name WHERE qualified_name IS NULL');
+  db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_qualified_name ON nodes(qualified_name)');
+  db.exec('CREATE INDEX IF NOT EXISTS idx_nodes_scope ON nodes(scope)');
+}
+
+function ensureEdgeColumns(db: BetterSqlite3Database): void {
+  if (!hasColumn(db, 'edges', 'confidence'))
+    db.exec('ALTER TABLE edges ADD COLUMN confidence REAL DEFAULT 1.0');
+  if (!hasColumn(db, 'edges', 'dynamic'))
+    db.exec('ALTER TABLE edges ADD COLUMN dynamic INTEGER DEFAULT 0');
+}
+
+export function initSchema(db: BetterSqlite3Database): void {
+  applyMigrations(db);
+  ensureLegacyColumns(db);
+}

package/src/domain/analysis/context.ts

@@ -15,10 +15,8 @@ import {
   getComplexityForNode,
   getLineCountForNode,
   getMaxEndLineForFile,
-  openReadonlyOrFail,
 } from '../../db/index.js';
 import { cachedStmt } from '../../db/repository/cached-stmt.js';
-import { loadConfig } from '../../infrastructure/config.js';
 import { debug } from '../../infrastructure/logger.js';
 import { isTestFile } from '../../infrastructure/test-filter.js';
 import {
@@ -40,6 +38,7 @@ import type {
   RelatedNodeRow,
   StmtCache,
 } from '../../types.js';
+import { resolveAnalysisOpts, withReadonlyDb } from './query-helpers.js';
 import { findMatchingNodes } from './symbol-lookup.js';
 
 interface DisplayOpts {
@@ -52,6 +51,60 @@ interface DisplayOpts {
   [key: string]: unknown;
 }
 
+/** Format a callee row into the output shape with summary and source. */
+function formatCalleeRow(
+  c: RelatedNodeRow,
+  repoRoot: string,
+  getFileLines: (file: string) => string[] | null,
+  displayOpts: DisplayOpts,
+  includeSource: boolean,
+) {
+  const cLines = getFileLines(c.file);
+  return {
+    name: c.name,
+    kind: c.kind,
+    file: c.file,
+    line: c.line,
+    endLine: c.end_line || null,
+    summary: cLines ? extractSummary(cLines, c.line, displayOpts) : null,
+    source: includeSource
+      ? readSourceRange(repoRoot, c.file, c.line, c.end_line ?? undefined, displayOpts)
+      : null,
+  };
+}
+
+/** BFS to collect deeper callees beyond the first level. */
+function collectDeeperCallees(
+  db: BetterSqlite3Database,
+  startIds: number[],
+  rootId: number,
+  repoRoot: string,
+  getFileLines: (file: string) => string[] | null,
+  opts: { noTests: boolean; maxDepth: number; displayOpts: DisplayOpts },
+) {
+  const { noTests, maxDepth, displayOpts } = opts;
+  const visited = new Set(startIds);
+  visited.add(rootId);
+  let frontier = [...startIds];
+  const result: ReturnType<typeof formatCalleeRow>[] = [];
+
+  for (let d = 2; d <= maxDepth; d++) {
+    const nextFrontier: number[] = [];
+    for (const fid of frontier) {
+      const deeper = findCallees(db, fid) as RelatedNodeRow[];
+      for (const c of deeper) {
+        if (visited.has(c.id) || (noTests && isTestFile(c.file))) continue;
+        visited.add(c.id);
+        nextFrontier.push(c.id);
+        result.push(formatCalleeRow(c, repoRoot, getFileLines, displayOpts, true));
+      }
+    }
+    frontier = nextFrontier;
+    if (frontier.length === 0) break;
+  }
+  return result;
+}
+
 function buildCallees(
   db: BetterSqlite3Database,
   node: NodeRow,
@@ -63,65 +116,20 @@ function buildCallees(
   const calleeRows = findCallees(db, node.id) as RelatedNodeRow[];
   const filteredCallees = noTests ? calleeRows.filter((c) => !isTestFile(c.file)) : calleeRows;
 
-  const callees = filteredCallees.map((c) => {
-    const cLines = getFileLines(c.file);
-    const summary = cLines ? extractSummary(cLines, c.line, displayOpts) : null;
-    let calleeSource: string | null = null;
-    if (depth >= 1) {
-      calleeSource = readSourceRange(
-        repoRoot,
-        c.file,
-        c.line,
-        c.end_line ?? undefined,
-        displayOpts,
-      );
-    }
-    return {
-      name: c.name,
-      kind: c.kind,
-      file: c.file,
-      line: c.line,
-      endLine: c.end_line || null,
-      summary,
-      source: calleeSource,
-    };
-  });
+  const callees = filteredCallees.map((c) =>
+    formatCalleeRow(c, repoRoot, getFileLines, displayOpts, depth >= 1),
+  );
 
   if (depth > 1) {
-    const visited = new Set(filteredCallees.map((c) => c.id));
-    visited.add(node.id);
-    let frontier = filteredCallees.map((c) => c.id);
-    const maxDepth = Math.min(depth, 5);
-    for (let d = 2; d <= maxDepth; d++) {
-      const nextFrontier: number[] = [];
-      for (const fid of frontier) {
-        const deeper = findCallees(db, fid) as RelatedNodeRow[];
-        for (const c of deeper) {
-          if (!visited.has(c.id) && (!noTests || !isTestFile(c.file))) {
-            visited.add(c.id);
-            nextFrontier.push(c.id);
-            const cLines = getFileLines(c.file);
-            callees.push({
-              name: c.name,
-              kind: c.kind,
-              file: c.file,
-              line: c.line,
-              endLine: c.end_line || null,
-              summary: cLines ? extractSummary(cLines, c.line, displayOpts) : null,
-              source: readSourceRange(
-                repoRoot,
-                c.file,
-                c.line,
-                c.end_line ?? undefined,
-                displayOpts,
-              ),
-            });
-          }
-        }
-      }
-      frontier = nextFrontier;
-      if (frontier.length === 0) break;
-    }
+    const deeper = collectDeeperCallees(
+      db,
+      filteredCallees.map((c) => c.id),
+      node.id,
+      repoRoot,
+      getFileLines,
+      { noTests, maxDepth: Math.min(depth, 5), displayOpts },
+    );
+    callees.push(...deeper);
   }
 
   return callees;
@@ -433,15 +441,12 @@ export function contextData(
     config?: any;
   } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
+  return withReadonlyDb(customDbPath, (db) => {
     const depth = opts.depth || 0;
     const noSource = opts.noSource || false;
-    const noTests = opts.noTests || false;
     const includeTests = opts.includeTests || false;
 
-    const config = opts.config || loadConfig();
-    const displayOpts: DisplayOpts = config.display || {};
+    const { noTests, displayOpts } = resolveAnalysisOpts(opts);
 
     const dbPath = findDbPath(customDbPath);
     const repoRoot = path.resolve(path.dirname(dbPath), '..');
@@ -494,9 +499,7 @@ export function contextData(
 
     const base = { name, results };
     return paginateResult(base, 'results', { limit: opts.limit, offset: opts.offset });
-  } finally {
-    db.close();
-  }
+  });
 }
 
 export function explainData(
@@ -510,14 +513,11 @@ export function explainData(
     config?: any;
   } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
-    const noTests = opts.noTests || false;
+  return withReadonlyDb(customDbPath, (db) => {
     const depth = opts.depth || 0;
     const kind = isFileLikeTarget(target) ? 'file' : 'function';
 
-    const config = opts.config || loadConfig();
-    const displayOpts: DisplayOpts = config.display || {};
+    const { noTests, displayOpts } = resolveAnalysisOpts(opts);
 
     const dbPath = findDbPath(customDbPath);
     const repoRoot = path.resolve(path.dirname(dbPath), '..');
@@ -536,7 +536,5 @@ export function explainData(
 
     const base = { target, kind, results };
     return paginateResult(base, 'results', { limit: opts.limit, offset: opts.offset });
-  } finally {
-    db.close();
-  }
+  });
 }

package/src/domain/analysis/dependencies.ts

@@ -5,7 +5,6 @@ import {
   findImportSources,
   findImportTargets,
   findNodesByFile,
-  openReadonlyOrFail,
 } from '../../db/index.js';
 import { cachedStmt } from '../../db/repository/cached-stmt.js';
 import { isTestFile } from '../../infrastructure/test-filter.js';
@@ -19,6 +18,7 @@ import type {
   RelatedNodeRow,
   StmtCache,
 } from '../../types.js';
+import { withReadonlyDb } from './query-helpers.js';
 import { findMatchingNodes } from './symbol-lookup.js';
 
 type UpstreamRow = { id: number; name: string; kind: string; file: string; line: number };
@@ -32,8 +32,7 @@ export function fileDepsData(
   customDbPath: string,
   opts: { noTests?: boolean; limit?: number; offset?: number } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
+  return withReadonlyDb(customDbPath, (db) => {
     const noTests = opts.noTests || false;
     const fileNodes = findFileNodes(db, `%${file}%`) as NodeRow[];
     if (fileNodes.length === 0) {
@@ -59,9 +58,7 @@ export function fileDepsData(
 
     const base = { file, results };
     return paginateResult(base, 'results', { limit: opts.limit, offset: opts.offset });
-  } finally {
-    db.close();
-  }
+  });
 }
 
 /**
@@ -140,8 +137,7 @@ export function fnDepsData(
     offset?: number;
   } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
+  return withReadonlyDb(customDbPath, (db) => {
     const depth = opts.depth || 3;
     const noTests = opts.noTests || false;
     const hc = new Map();
@@ -194,9 +190,7 @@ export function fnDepsData(
 
     const base = { name, results };
     return paginateResult(base, 'results', { limit: opts.limit, offset: opts.offset });
-  } finally {
-    db.close();
-  }
+  });
 }
 
 /**
@@ -384,8 +378,7 @@ export function pathData(
     kind?: string;
   } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
+  return withReadonlyDb(customDbPath, (db) => {
     const noTests = opts.noTests || false;
     const maxDepth = opts.maxDepth || 10;
     const edgeKinds = opts.edgeKinds || ['calls'];
@@ -477,13 +470,67 @@ export function pathData(
       reverse,
       maxDepth,
     };
-  } finally {
-    db.close();
-  }
+  });
 }
 
 // ── File-level shortest path ────────────────────────────────────────────
 
+/** BFS over file adjacency graph to find shortest path. */
+function bfsFilePath(
+  neighborStmt: ReturnType<BetterSqlite3Database['prepare']>,
+  sourceFile: string,
+  targetFile: string,
+  edgeKinds: string[],
+  maxDepth: number,
+  noTests: boolean,
+): { found: boolean; path: string[]; alternateCount: number } {
+  const visited = new Set([sourceFile]);
+  const parentMap = new Map<string, string>();
+  let queue = [sourceFile];
+  let found = false;
+  let alternateCount = 0;
+
+  for (let depth = 1; depth <= maxDepth; depth++) {
+    const nextQueue: string[] = [];
+    for (const currentFile of queue) {
+      const neighbors = neighborStmt.all(currentFile, ...edgeKinds) as Array<{
+        neighbor_file: string;
+      }>;
+      for (const n of neighbors) {
+        if (noTests && isTestFile(n.neighbor_file)) continue;
+        if (n.neighbor_file === targetFile) {
+          if (!found) {
+            found = true;
+            parentMap.set(n.neighbor_file, currentFile);
+          }
+          alternateCount++;
+          continue;
+        }
+        if (!visited.has(n.neighbor_file)) {
+          visited.add(n.neighbor_file);
+          parentMap.set(n.neighbor_file, currentFile);
+          nextQueue.push(n.neighbor_file);
+        }
+      }
+    }
+    if (found) break;
+    queue = nextQueue;
+    if (queue.length === 0) break;
+  }
+
+  if (!found) return { found: false, path: [], alternateCount: 0 };
+
+  // Reconstruct path
+  const filePath: string[] = [targetFile];
+  let cur = targetFile;
+  while (cur !== sourceFile) {
+    cur = parentMap.get(cur)!;
+    filePath.push(cur);
+  }
+  filePath.reverse();
+  return { found: true, path: filePath, alternateCount: Math.max(0, alternateCount - 1) };
+}
+
 /**
  * BFS at the file level: find shortest import/edge path between two files.
  * Adjacency: file A → file B if any symbol in A has an edge to any symbol in B.
@@ -499,8 +546,7 @@ export function filePathData(
     reverse?: boolean;
   } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
+  return withReadonlyDb(customDbPath, (db) => {
     const noTests = opts.noTests || false;
     const maxDepth = opts.maxDepth || 10;
     const edgeKinds = opts.edgeKinds || ['imports', 'imports-type'];
@@ -569,42 +615,17 @@ export function filePathData(
          WHERE n_src.file = ? AND e.kind IN (${kindPlaceholders}) AND n_tgt.file != n_src.file`;
     const neighborStmt = db.prepare(neighborQuery);
 
-    // BFS
-    const visited = new Set([sourceFile]);
-    const parentMap = new Map<string, string>();
-    let queue = [sourceFile];
-    let found = false;
-    let alternateCount = 0;
-
-    for (let depth = 1; depth <= maxDepth; depth++) {
-      const nextQueue: string[] = [];
-      for (const currentFile of queue) {
-        const neighbors = neighborStmt.all(currentFile, ...edgeKinds) as Array<{
-          neighbor_file: string;
-        }>;
-        for (const n of neighbors) {
-          if (noTests && isTestFile(n.neighbor_file)) continue;
-          if (n.neighbor_file === targetFile) {
-            if (!found) {
-              found = true;
-              parentMap.set(n.neighbor_file, currentFile);
-            }
-            alternateCount++;
-            continue;
-          }
-          if (!visited.has(n.neighbor_file)) {
-            visited.add(n.neighbor_file);
-            parentMap.set(n.neighbor_file, currentFile);
-            nextQueue.push(n.neighbor_file);
-          }
-        }
-      }
-      if (found) break;
-      queue = nextQueue;
-      if (queue.length === 0) break;
-    }
+    // BFS to find shortest file path
+    const bfsResult = bfsFilePath(
+      neighborStmt,
+      sourceFile,
+      targetFile,
+      edgeKinds,
+      maxDepth,
+      noTests,
+    );
 
-    if (!found) {
+    if (!bfsResult.found) {
       return {
         from,
         to,
@@ -620,29 +641,18 @@ export function filePathData(
       };
     }
 
-    // Reconstruct path
-    const filePath: string[] = [targetFile];
-    let cur = targetFile;
-    while (cur !== sourceFile) {
-      cur = parentMap.get(cur)!;
-      filePath.push(cur);
-    }
-    filePath.reverse();
-
     return {
       from,
       to,
       fromCandidates,
       toCandidates,
       found: true,
-      hops: filePath.length - 1,
-      path: filePath,
-      alternateCount: Math.max(0, alternateCount - 1),
+      hops: bfsResult.path.length - 1,
+      path: bfsResult.path,
+      alternateCount: bfsResult.alternateCount,
       edgeKinds,
       reverse,
       maxDepth,
     };
-  } finally {
-    db.close();
-  }
+  });
 }

package/src/domain/analysis/exports.ts

@@ -4,10 +4,8 @@ import {
   findDbPath,
   findFileNodes,
   findNodesByFile,
-  openReadonlyOrFail,
 } from '../../db/index.js';
 import { cachedStmt } from '../../db/repository/cached-stmt.js';
-import { loadConfig } from '../../infrastructure/config.js';
 import { debug } from '../../infrastructure/logger.js';
 import { isTestFile } from '../../infrastructure/test-filter.js';
 import {
@@ -17,6 +15,7 @@ import {
 } from '../../shared/file-utils.js';
 import { paginateResult } from '../../shared/paginate.js';
 import type { BetterSqlite3Database, NodeRow, StmtCache } from '../../types.js';
+import { resolveAnalysisOpts, withReadonlyDb } from './query-helpers.js';
 
 /** Cache the schema probe for the `exported` column per db handle. */
 const _hasExportedColCache: WeakMap<BetterSqlite3Database, boolean> = new WeakMap();
@@ -37,12 +36,8 @@ export function exportsData(
     config?: any;
   } = {},
 ) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
-    const noTests = opts.noTests || false;
-
-    const config = opts.config || loadConfig();
-    const displayOpts = config.display || {};
+  return withReadonlyDb(customDbPath, (db) => {
+    const { noTests, displayOpts } = resolveAnalysisOpts(opts);
 
     const dbFilePath = findDbPath(customDbPath);
     const repoRoot = path.resolve(path.dirname(dbFilePath), '..');
@@ -101,9 +96,39 @@ export function exportsData(
       }
     }
     return paginated;
-  } finally {
-    db.close();
+  });
+}
+
+/** Collect symbols re-exported through barrel files. */
+function collectReexportedSymbols(
+  db: BetterSqlite3Database,
+  fileNodeId: number,
+  reexportsToStmt: ReturnType<BetterSqlite3Database['prepare']>,
+  exportedNodesStmt: ReturnType<BetterSqlite3Database['prepare']> | null,
+  hasExportedCol: boolean,
+  getFileLines: (file: string) => string[] | null,
+  buildSymbolResult: (s: NodeRow, fileLines: string[] | null) => any,
+) {
+  const reexportTargets = reexportsToStmt.all(fileNodeId) as Array<{ file: string }>;
+  const reexportedSymbols: Array<ReturnType<typeof buildSymbolResult> & { originFile: string }> =
+    [];
+  for (const reexTarget of reexportTargets) {
+    let targetExported: NodeRow[];
+    if (hasExportedCol) {
+      targetExported = exportedNodesStmt!.all(reexTarget.file) as NodeRow[];
+    } else {
+      const targetSymbols = findNodesByFile(db, reexTarget.file) as NodeRow[];
+      const exportedIds = findCrossFileCallTargets(db, reexTarget.file) as Set<number>;
+      targetExported = targetSymbols.filter((s) => exportedIds.has(s.id));
+    }
+    for (const s of targetExported) {
+      reexportedSymbols.push({
+        ...buildSymbolResult(s, getFileLines(reexTarget.file)),
+        originFile: reexTarget.file,
+      });
+    }
   }
+  return reexportedSymbols;
 }
 
 function exportsFileImpl(
@@ -197,34 +222,20 @@ function exportsFileImpl(
 
     const totalUnused = results.filter((r) => r.consumerCount === 0).length;
 
-    // Files that re-export this file (barrel -> this file)
     const reexports = (reexportsFromStmt.all(fn.id) as Array<{ file: string }>).map((r) => ({
       file: r.file,
     }));
 
-    // For barrel files: gather symbols re-exported from target modules
-    const reexportTargets = reexportsToStmt.all(fn.id) as Array<{ file: string }>;
-
-    const reexportedSymbols: Array<ReturnType<typeof buildSymbolResult> & { originFile: string }> =
-      [];
-    for (const reexTarget of reexportTargets) {
-      let targetExported: NodeRow[];
-      if (hasExportedCol) {
-        targetExported = exportedNodesStmt!.all(reexTarget.file) as NodeRow[];
-      } else {
-        // Fallback: same heuristic as direct exports — symbols called from other files
-        const targetSymbols = findNodesByFile(db, reexTarget.file) as NodeRow[];
-        const exportedIds = findCrossFileCallTargets(db, reexTarget.file) as Set<number>;
-        targetExported = targetSymbols.filter((s) => exportedIds.has(s.id));
-      }
-      for (const s of targetExported) {
-        const fileLines = getFileLines(reexTarget.file);
-        reexportedSymbols.push({
-          ...buildSymbolResult(s, fileLines),
-          originFile: reexTarget.file,
-        });
-      }
-    }
+    // Gather symbols re-exported from target modules (barrel file support)
+    const reexportedSymbols = collectReexportedSymbols(
+      db,
+      fn.id,
+      reexportsToStmt,
+      exportedNodesStmt,
+      hasExportedCol,
+      getFileLines,
+      buildSymbolResult,
+    );
 
     let filteredResults = results;
     let filteredReexported = reexportedSymbols;