scip-query 0.4.3 → 0.5.0

package/dist/cli.js

@@ -2832,10 +2832,6 @@ var TEST_FILE_PATTERNS = [
 var TEST_SUPPORT_PATH_PATTERNS = [
   "%/test-utils/%"
 ];
-function testFileExclusionSql(alias, extraPatterns = []) {
-  const patterns = uniquePatterns([...TEST_FILE_PATTERNS, ...extraPatterns]);
-  return patterns.map((pattern) => `${alias}.relative_path NOT LIKE '${pattern}'`).join("\n      AND ");
-}
 function buildFileDepGraph(db, scope) {
   const scopeFilter = scope ? `AND d1.relative_path LIKE '%${scope}%'` : "";
   const edges = db.all(
@@ -2890,6 +2886,8 @@ function findFirstSymbolMatch(db, symbolPattern) {
   const fileLineMatch = symbolPattern.match(/^(.+):(\d+)-(\d+)$/);
   if (fileLineMatch) {
     const [, filePath, startStr, endStr] = fileLineMatch;
+    const userStart0 = Math.max(0, parseInt(startStr, 10) - 1);
+    const userEnd0 = Math.max(userStart0, parseInt(endStr, 10) - 1);
     let row = db.get(
       `SELECT gs.id, gs.symbol, der.document_id, der.start_line, der.end_line, d.relative_path
       FROM global_symbols gs
@@ -2901,8 +2899,8 @@ function findFirstSymbolMatch(db, symbolPattern) {
       ORDER BY (der.end_line - der.start_line) ASC
         LIMIT 1`,
       `%${filePath}%`,
-      parseInt(startStr, 10),
-      parseInt(endStr, 10)
+      userStart0,
+      userEnd0
     );
     if (!row) {
       row = db.get(
@@ -2919,8 +2917,8 @@ function findFirstSymbolMatch(db, symbolPattern) {
          ORDER BY (MAX(c.end_line) - MIN(c.start_line)) ASC
          LIMIT 1`,
         `%${filePath}%`,
-        parseInt(startStr, 10),
-        parseInt(endStr, 10)
+        userStart0,
+        userEnd0
       );
     }
     if (row && !db.isIgnored(row.relative_path)) {
@@ -3212,6 +3210,59 @@ function getSourceReferenceSites(db, symbol) {
   }
   return sites;
 }
+function getResolvedReferenceSites(db, symbol) {
+  const match = getFullSymbolMatch(db, symbol);
+  if (!match) {
+    return [];
+  }
+  const rows = db.all(
+    `SELECT DISTINCT d.relative_path, c.start_line, c.end_line
+     FROM mentions m
+     JOIN chunks c ON m.chunk_id = c.id
+     JOIN documents d ON c.document_id = d.id
+     WHERE m.symbol_id = ?
+       AND m.role != 1
+       ${db.pathExclusionsFor("d")}
+     ORDER BY d.relative_path, c.start_line`,
+    match.symbolId
+  );
+  const chunksByFile = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    if (db.isIgnored(row.relative_path)) continue;
+    let bucket = chunksByFile.get(row.relative_path);
+    if (!bucket) {
+      bucket = [];
+      chunksByFile.set(row.relative_path, bucket);
+    }
+    bucket.push({ start_line: row.start_line, end_line: row.end_line });
+  }
+  const identifier = leafName(match.symbol);
+  const sites = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const [file, chunks] of chunksByFile) {
+    const definitions = getDefinitionsForFile(db, file);
+    const excludeOpts = file === match.relativePath ? { excludeStartLine: match.startLine, excludeEndLine: match.endLine } : {};
+    const allHits = identifier ? findIdentifierLines(db, file, identifier, excludeOpts) : [];
+    for (const chunk of chunks) {
+      const hitsInChunk = allHits.filter(
+        (line) => line >= chunk.start_line && line <= chunk.end_line
+      );
+      const lines = hitsInChunk.length > 0 ? hitsInChunk : [chunk.start_line];
+      for (const line of lines) {
+        const enclosing = findEnclosingDefinition(definitions, line);
+        const key = `${file}|${line}|${enclosing?.symbol ?? ""}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        sites.push({
+          file,
+          line,
+          enclosingSymbol: enclosing?.symbol ?? null
+        });
+      }
+    }
+  }
+  return sites;
+}
 function calleeQueryParams(symbol, limit) {
   const params = [
     symbol.documentId,
@@ -3577,7 +3628,16 @@ function resolveCallableDefinitionStartLine(lines, definition) {
   const escapedLeaf = escapeRegex2(definition.leaf);
   const strongPatterns = [
     new RegExp(`\\b(?:function|def|fn)\\s+${escapedLeaf}\\b`),
-    new RegExp(`\\b${escapedLeaf}\\b\\s*[:=]\\s*(?:async\\s*)?(?:function\\b|\\()`)
+    new RegExp(`\\b${escapedLeaf}\\b\\s*[:=]\\s*(?:async\\s*)?(?:function\\b|\\()`),
+    // Method/function declaration with optional TypeScript generic
+    // parameters: matches `foo(`, `foo<T>(`, `foo<T = Record<string, unknown>>(`.
+    // `[^(]*` with greedy backtracking handles nested generics as long as
+    // the generic block itself doesn't contain a `(`. Anchored to start of
+    // line content (optional leading whitespace + optional access modifiers)
+    // so it prefers the declaration line over call sites.
+    new RegExp(
+      `^\\s*(?:export\\s+|public\\s+|private\\s+|protected\\s+|static\\s+|readonly\\s+|async\\s+|abstract\\s+|get\\s+|set\\s+)*${escapedLeaf}\\s*(?:<[^(]*>)?\\s*\\(`
+    )
   ];
   const fallbackPatterns = [
     new RegExp(`\\b${escapedLeaf}\\b\\s*\\(`)
@@ -4198,15 +4258,18 @@ function scoreDocumentPath(relativePath, rawPattern) {
 function normalizeLookupPath(filePattern) {
   return filePattern.trim().replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/+/, "").replace(/\/+$/, "");
 }
-function uniquePatterns(patterns) {
-  return [...new Set(patterns)];
-}
 
 // src/queries/clean-signature.ts
 function cleanSignature(sig) {
   if (!sig || !sig.trim()) return null;
   return sig.replace(/^```\w*\s*/, "").replace(/\s*```$/, "").replace(/^\(method\)\s*/, "").replace(/^\(property\)\s*/, "").replace(/^\(function\)\s*/, "").replace(/^\(class\)\s*/, "").replace(/^\(interface\)\s*/, "").replace(/^\(enum\)\s*/, "").replace(/^\(type alias\)\s*/, "").replace(/^\(const\)\s*/, "").replace(/^\(var\)\s*/, "").trim() || null;
 }
+function extractSignature(doc) {
+  if (!doc) return null;
+  const pipeIdx = doc.indexOf("|");
+  if (pipeIdx === -1) return doc.replace(/\n/g, " ");
+  return doc.slice(pipeIdx + 1).replace(/\n/g, " ");
+}
 
 // src/queries/symbols.ts
 function symbols(db, filePattern) {
@@ -4216,9 +4279,7 @@ function symbols(db, filePattern) {
   }
   return resolvedPaths.flatMap((relativePath) => getDefinitionsForFile(db, relativePath)).filter((row) => !db.isIgnored(row.relativePath)).map((row) => {
     const docRow = db.get(
-      `SELECT REPLACE(SUBSTR(documentation, INSTR(documentation, '|') + 1), char(10), ' ') AS sig
-         FROM global_symbols
-         WHERE id = ?`,
+      "SELECT documentation FROM global_symbols WHERE id = ?",
       row.symbolId
     );
     return {
@@ -4226,7 +4287,7 @@ function symbols(db, filePattern) {
       endLine: row.endLine,
       symbol: row.symbol,
       shortName: shortenSymbol(row.symbol),
-      signature: cleanSignature(docRow?.sig ?? null)
+      signature: cleanSignature(extractSignature(docRow?.documentation ?? null))
     };
   });
 }
@@ -4255,60 +4316,21 @@ function stripExtension(relativePath) {
 // src/queries/refs.ts
 function refs(db, symbolPattern) {
   const match = findFirstSymbolMatch(db, symbolPattern);
-  if (match) {
-    const includeDefinitionSite = !isFunctionLikeSymbol(match.symbol);
-    const definitionRows = includeDefinitionSite ? [{
-      relativePath: match.relativePath,
-      line: match.startLine
-    }] : [];
-    const sourceSites = getSourceReferenceSites(db, match).filter((site) => !db.isIgnored(site.file)).map((site) => ({
-      relativePath: site.file,
-      line: site.line
-    }));
-    if (sourceSites.length > 0) {
-      const seen2 = /* @__PURE__ */ new Set();
-      const rows2 = [...definitionRows, ...sourceSites, ...getRubySemanticRefs(db, match)].filter((site) => {
-        const key = `${site.relativePath}:${site.line}`;
-        if (seen2.has(key)) return false;
-        seen2.add(key);
-        return true;
-      });
-      return rows2;
-    }
-  }
-  const rows = db.all(
-    `SELECT DISTINCT d.relative_path, c.start_line
-    FROM mentions m
-    JOIN chunks c ON m.chunk_id = c.id
-    JOIN documents d ON c.document_id = d.id
-    JOIN global_symbols gs ON m.symbol_id = gs.id
-    WHERE m.symbol_id = ?
-      AND ${db.localSymbolPredicate}
-      AND m.role != 1
-    ORDER BY d.relative_path, c.start_line`,
-    match?.symbolId ?? -1
-  );
-  const referenceRows = rows.filter((r) => !db.isIgnored(r.relative_path)).map((r) => ({
-    relativePath: r.relative_path,
-    line: r.start_line
-  }));
-  if (!match || db.isIgnored(match.relativePath) || isFunctionLikeSymbol(match.symbol)) {
-    return referenceRows;
-  }
-  const seen = new Set(referenceRows.map((row) => `${row.relativePath}:${row.line}`));
-  if (!seen.has(`${match.relativePath}:${match.startLine}`)) {
-    referenceRows.unshift({
-      relativePath: match.relativePath,
-      line: match.startLine
-    });
-  }
-  for (const row of getRubySemanticRefs(db, match)) {
+  if (!match) return [];
+  const includeDefinitionSite = !isFunctionLikeSymbol(match.symbol);
+  const definitionRows = includeDefinitionSite && !db.isIgnored(match.relativePath) ? [{ relativePath: match.relativePath, line: match.startLine }] : [];
+  const sourceSites = getSourceReferenceSites(db, match);
+  const referenceSites = (sourceSites.length > 0 ? sourceSites : getResolvedReferenceSites(db, match)).filter((site) => !db.isIgnored(site.file)).map((site) => ({ relativePath: site.file, line: site.line }));
+  const rubySites = getRubySemanticRefs(db, match);
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const row of [...definitionRows, ...referenceSites, ...rubySites]) {
     const key = `${row.relativePath}:${row.line}`;
     if (seen.has(key)) continue;
     seen.add(key);
-    referenceRows.push(row);
+    out.push(row);
   }
-  return referenceRows;
+  return out;
 }
 function getRubySemanticRefs(db, match) {
   if (!match.relativePath.endsWith(".rb")) {
@@ -4361,50 +4383,24 @@ function trace(db, symbolPattern) {
     return { definitions: [], referencedBy: [] };
   }
   const definitionMeta = db.get(
-    `SELECT
-      gs.display_name,
-      REPLACE(SUBSTR(gs.documentation, INSTR(gs.documentation, '|') + 1), char(10), ' ') AS sig
-    FROM global_symbols gs
-    WHERE gs.id = ?
-    LIMIT 10`,
+    "SELECT display_name, documentation FROM global_symbols WHERE id = ?",
     match.symbolId
   );
+  const sig = extractSignature(definitionMeta?.documentation ?? null);
   const definitions = db.isIgnored(match.relativePath) ? [] : [{
     relativePath: match.relativePath,
     startLine: match.startLine,
     endLine: match.endLine,
-    signature: buildTraceSignature(definitionMeta?.sig ?? null, definitionMeta?.display_name ?? null, match.symbol),
+    signature: buildTraceSignature(sig, definitionMeta?.display_name ?? null, match.symbol),
     source: definitionSource(db, match.relativePath, match.startLine, match.endLine)
   }];
   const sourceSites = getSourceReferenceSites(db, match);
-  const referencedBy = sourceSites.length > 0 ? sourceSites.filter((site) => !db.isIgnored(site.file)).map((site) => ({
+  const resolvedSites = sourceSites.length > 0 ? sourceSites : getResolvedReferenceSites(db, match);
+  const referencedBy = resolvedSites.filter((site) => !db.isIgnored(site.file)).map((site) => ({
     relativePath: site.file,
     line: site.line,
     enclosingSymbol: site.enclosingSymbol,
     enclosingShort: site.enclosingSymbol ? shortenSymbol(site.enclosingSymbol) : "(top-level)"
-  })) : db.all(
-    `SELECT DISTINCT d.relative_path, c.start_line AS line,
-        (SELECT enc_gs.symbol
-         FROM defn_enclosing_ranges enc_der
-         JOIN global_symbols enc_gs ON enc_der.symbol_id = enc_gs.id
-         WHERE enc_der.document_id = d.id
-           AND enc_der.start_line <= c.start_line
-           AND enc_der.end_line >= c.end_line
-         ORDER BY (enc_der.end_line - enc_der.start_line) ASC
-         LIMIT 1
-        ) AS enclosing_symbol
-      FROM mentions m
-      JOIN chunks c ON m.chunk_id = c.id
-      JOIN documents d ON c.document_id = d.id
-      WHERE m.symbol_id = ?
-        AND m.role != 1
-      ORDER BY d.relative_path, c.start_line`,
-    match.symbolId
-  ).filter((r) => !db.isIgnored(r.relative_path)).map((r) => ({
-    relativePath: r.relative_path,
-    line: r.line,
-    enclosingSymbol: r.enclosing_symbol,
-    enclosingShort: r.enclosing_symbol ? shortenSymbol(r.enclosing_symbol) : "(top-level)"
   }));
   return { definitions, referencedBy };
 }
@@ -4490,26 +4486,18 @@ function system(db, modulePattern) {
     ...matchedPaths
   );
   const files2 = fileRows.map((r) => r.relative_path).filter((p) => !db.isIgnored(p));
-  const symbolRows = db.all(
-    `SELECT der.start_line, der.end_line, gs.symbol,
-      REPLACE(SUBSTR(gs.documentation, INSTR(gs.documentation, '|') + 1), char(10), ' ') AS sig
-    FROM defn_enclosing_ranges der
-    JOIN global_symbols gs ON der.symbol_id = gs.id
-    JOIN documents d ON der.document_id = d.id
-    WHERE d.relative_path IN (${placeholders})
-      AND ${db.localSymbolPredicate}
-      ${db.symbolNoise}
-      AND gs.documentation IS NOT NULL
-    ORDER BY d.relative_path, der.start_line`,
-    ...matchedPaths
-  );
-  const symbols2 = symbolRows.map((r) => ({
-    startLine: r.start_line,
-    endLine: r.end_line,
-    symbol: r.symbol,
-    shortName: shortenSymbol(r.symbol),
-    signature: cleanSignature(r.sig)
-  }));
+  const symbols2 = files2.flatMap((relativePath) => getDefinitionsForFile(db, relativePath)).filter((d) => d.documentation !== null && d.documentation !== "").sort(
+    (a, b) => a.relativePath.localeCompare(b.relativePath) || a.startLine - b.startLine || a.endLine - b.endLine
+  ).map((d) => {
+    const sig = extractSignature(d.documentation);
+    return {
+      startLine: d.startLine,
+      endLine: d.endLine,
+      symbol: d.symbol,
+      shortName: shortenSymbol(d.symbol),
+      signature: cleanSignature(sig)
+    };
+  });
   const depRows = db.all(
     `SELECT DISTINCT d2.relative_path
     FROM mentions m
@@ -4976,32 +4964,24 @@ function outline(db, filePattern) {
   if (resolvedPaths.length === 0) {
     return [];
   }
-  const placeholders = resolvedPaths.map(() => "?").join(", ");
-  const rows = db.all(
-    `SELECT gs.symbol, gs.enclosing_symbol, der.start_line, der.end_line
-    FROM defn_enclosing_ranges der
-    JOIN global_symbols gs ON der.symbol_id = gs.id
-    JOIN documents d ON der.document_id = d.id
-    WHERE d.relative_path IN (${placeholders})
-      ${db.symbolNoise}
-    ORDER BY d.relative_path, der.start_line`,
-    ...resolvedPaths
+  const definitions = resolvedPaths.flatMap((relativePath) => getDefinitionsForFile(db, relativePath)).filter((d) => !db.isIgnored(d.relativePath)).sort(
+    (a, b) => a.relativePath.localeCompare(b.relativePath) || a.startLine - b.startLine || a.endLine - b.endLine
   );
-  const nodes = rows.map((r) => ({
-    symbol: r.symbol,
-    shortName: shortenSymbol(r.symbol),
-    startLine: r.start_line,
-    endLine: r.end_line,
+  const nodes = definitions.map((d) => ({
+    symbol: d.symbol,
+    shortName: shortenSymbol(d.symbol),
+    startLine: d.startLine,
+    endLine: d.endLine,
     children: []
   }));
   const nodeMap = /* @__PURE__ */ new Map();
   for (const n of nodes) nodeMap.set(n.symbol, n);
   const roots = [];
-  for (let i = 0; i < rows.length; i++) {
-    const r = rows[i];
+  for (let i = 0; i < definitions.length; i++) {
+    const d = definitions[i];
     const node = nodes[i];
-    if (r.enclosing_symbol && nodeMap.has(r.enclosing_symbol)) {
-      nodeMap.get(r.enclosing_symbol).children.push(node);
+    if (d.enclosingSymbol && nodeMap.has(d.enclosingSymbol)) {
+      nodeMap.get(d.enclosingSymbol).children.push(node);
       continue;
     }
     let bestParent = null;
@@ -5029,23 +5009,12 @@ function outline(db, filePattern) {
 function members(db, symbolPattern) {
   const parent = findFirstSymbolMatch(db, symbolPattern);
   if (!parent) return [];
-  const rows = db.all(
-    `SELECT gs.symbol, der.start_line, der.end_line
-     FROM global_symbols gs
-     JOIN defn_enclosing_ranges der ON gs.id = der.symbol_id
-     WHERE der.document_id = ?
-       AND gs.symbol != ?
-       ${db.symbolNoiseFor("gs")}
-     ORDER BY der.start_line`,
-    parent.documentId,
-    parent.symbol
-  );
-  return rows.filter((row) => isDirectChildSymbol(parent.symbol, row.symbol)).map((row) => ({
-    symbol: row.symbol,
-    shortName: shortenSymbol(row.symbol),
-    startLine: row.start_line,
-    endLine: row.end_line,
-    kind: leafSuffix(row.symbol) ?? "unknown"
+  return getDefinitionsForFile(db, parent.relativePath).filter((definition) => definition.symbol !== parent.symbol).filter((definition) => isDirectChildSymbol(parent.symbol, definition.symbol)).sort((a, b) => a.startLine - b.startLine || a.endLine - b.endLine).map((definition) => ({
+    symbol: definition.symbol,
+    shortName: shortenSymbol(definition.symbol),
+    startLine: definition.startLine,
+    endLine: definition.endLine,
+    kind: leafSuffix(definition.symbol) ?? "unknown"
   }));
 }
 
@@ -5839,35 +5808,21 @@ function findCallees(db, symbolPattern) {
 }
 function getAllCalleeFingerprints(db, opts) {
   const { minCallees, scope, excludeSymbol } = opts;
-  const scopeFilter = scope ? `AND d.relative_path LIKE '%${scope}%'` : "";
-  const excludeFilter = excludeSymbol ? `AND gs.symbol != '${excludeSymbol.replace(/'/g, "''")}'` : "";
-  const symbols2 = db.all(
-    `SELECT gs.id, gs.symbol, der.document_id, der.start_line, der.end_line, d.relative_path
-    FROM global_symbols gs
-    JOIN defn_enclosing_ranges der ON gs.id = der.symbol_id
-    JOIN documents d ON der.document_id = d.id
-    WHERE 1 = 1
-      ${db.pathExclusionsFor("d")}
-      ${db.symbolNoiseFor("gs")}
-      AND (der.end_line - der.start_line + 1) >= 5
-      ${scopeFilter}
-      ${excludeFilter}
-    ORDER BY d.relative_path`
-  );
   const fingerprints = [];
-  for (const sym of symbols2) {
-    if (db.isIgnored(sym.relative_path)) continue;
-    if (!isFunctionLikeSymbol(sym.symbol)) continue;
-    const calleeRows = getCalleeRowsForSymbol(db, {
-      documentId: sym.document_id,
-      startLine: sym.start_line,
-      endLine: sym.end_line,
-      symbolId: sym.id
+  for (const definition of getAllDefinitions(db, { scope })) {
+    if (db.isIgnored(definition.relativePath)) continue;
+    if (!definition.isFunctionLike) continue;
+    if (excludeSymbol && definition.symbol === excludeSymbol) continue;
+    if (definition.endLine - definition.startLine + 1 < 5) continue;
+    const callees = new Set(
+      getCalleeRowsForSymbol(db, definition).map((row) => row.symbol)
+    );
+    if (callees.size < minCallees) continue;
+    fingerprints.push({
+      symbol: definition.symbol,
+      file: definition.relativePath,
+      callees
     });
-    const callees = new Set(calleeRows.map((r) => r.symbol));
-    if (callees.size >= minCallees) {
-      fingerprints.push({ symbol: sym.symbol, file: sym.relative_path, callees });
-    }
   }
   return fingerprints;
 }
@@ -6485,18 +6440,10 @@ function changeSurface(db, filePattern) {
     resolvedFile
   );
   if (!doc || db.isIgnored(doc.relative_path)) return null;
-  const syms = db.all(
-    `SELECT DISTINCT gs.id AS symbol_id, gs.symbol, der.start_line, der.end_line
-    FROM defn_enclosing_ranges der
-    JOIN global_symbols gs ON der.symbol_id = gs.id
-    WHERE der.document_id = ?
-      ${db.symbolNoiseFor("gs")}
-    ORDER BY der.start_line`,
-    doc.id
-  );
+  const definitions = getDefinitionsForFile(db, doc.relative_path).sort((a, b) => a.startLine - b.startLine || a.endLine - b.endLine);
   const symbols2 = [];
   let totalExternalConsumers = 0;
-  for (const sym of syms) {
+  for (const def of definitions) {
     const consumerRow = db.get(
       `SELECT COUNT(DISTINCT c.document_id) AS consumer_count
       FROM mentions m
@@ -6504,7 +6451,7 @@ function changeSurface(db, filePattern) {
       WHERE m.symbol_id = ?
         AND m.role != 1
         AND c.document_id != ?`,
-      sym.symbol_id,
+      def.symbolId,
       doc.id
     );
     const externalConsumers = consumerRow?.consumer_count ?? 0;
@@ -6518,10 +6465,10 @@ function changeSurface(db, filePattern) {
     }
     totalExternalConsumers += externalConsumers;
     symbols2.push({
-      symbol: sym.symbol,
-      shortName: shortenSymbol(sym.symbol),
-      startLine: sym.start_line,
-      endLine: sym.end_line,
+      symbol: def.symbol,
+      shortName: shortenSymbol(def.symbol),
+      startLine: def.startLine,
+      endLine: def.endLine,
       externalConsumers,
       riskLevel
     });
@@ -7015,95 +6962,6 @@ function definitionLoc4(definition) {
 // src/queries/complexity-hotspots.ts
 function complexityHotspots(db, opts) {
   const { scope, minLoc = 10, limit = 30 } = opts ?? {};
-  const scopeFilter = scope ? `AND d.relative_path LIKE '%${scope}%'` : "";
-  const rows = db.all(
-    `SELECT
-      gs.symbol,
-      d.relative_path AS file,
-      der.start_line,
-      der.end_line,
-      (der.end_line - der.start_line + 1) AS loc,
-      -- fanIn: distinct files that reference this symbol
-      (SELECT COUNT(DISTINCT ref_c.document_id)
-       FROM mentions ref_m
-       JOIN chunks ref_c ON ref_m.chunk_id = ref_c.id
-       WHERE ref_m.symbol_id = gs.id AND ref_m.role != 1
-      ) AS fan_in,
-      -- fanOut: distinct symbols referenced within this definition range
-      -- that are defined in different files
-      (SELECT COUNT(DISTINCT out_gs.id)
-       FROM mentions out_m
-       JOIN chunks out_c ON out_m.chunk_id = out_c.id
-       JOIN global_symbols out_gs ON out_m.symbol_id = out_gs.id
-       JOIN defn_enclosing_ranges out_der ON out_gs.id = out_der.symbol_id
-       WHERE out_c.document_id = der.document_id
-         AND out_c.start_line >= der.start_line
-         AND out_c.end_line <= der.end_line
-         AND out_m.role != 1
-         AND out_gs.id != gs.id
-         AND out_der.document_id != der.document_id
-      ) AS fan_out,
-      -- calleeCount: total distinct callees within definition range
-      (SELECT COUNT(DISTINCT callee_gs.id)
-       FROM mentions callee_m
-       JOIN chunks callee_c ON callee_m.chunk_id = callee_c.id
-       JOIN global_symbols callee_gs ON callee_m.symbol_id = callee_gs.id
-       WHERE callee_c.document_id = der.document_id
-         AND callee_c.start_line >= der.start_line
-         AND callee_c.end_line <= der.end_line
-         AND callee_m.role != 1
-         AND callee_gs.id != gs.id
-      ) AS callee_count
-    FROM global_symbols gs
-    JOIN defn_enclosing_ranges der ON gs.id = der.symbol_id
-    JOIN documents d ON der.document_id = d.id
-    WHERE 1 = 1
-      ${db.pathExclusionsFor("d")}
-      AND ${testFileExclusionSql("d")}
-      ${db.symbolNoiseFor("gs")}
-      AND (der.end_line - der.start_line + 1) >= ?
-      ${scopeFilter}
-    ORDER BY (
-      CAST((der.end_line - der.start_line + 1) AS REAL) / 50.0
-      * CAST((SELECT COUNT(DISTINCT ref_c2.document_id)
-              FROM mentions ref_m2
-              JOIN chunks ref_c2 ON ref_m2.chunk_id = ref_c2.id
-              WHERE ref_m2.symbol_id = gs.id AND ref_m2.role != 1
-             ) AS REAL) / 5.0
-      * MAX(CAST((SELECT COUNT(DISTINCT out_gs2.id)
-                  FROM mentions out_m2
-                  JOIN chunks out_c2 ON out_m2.chunk_id = out_c2.id
-                  JOIN global_symbols out_gs2 ON out_m2.symbol_id = out_gs2.id
-                  JOIN defn_enclosing_ranges out_der2 ON out_gs2.id = out_der2.symbol_id
-                  WHERE out_c2.document_id = der.document_id
-                    AND out_c2.start_line >= der.start_line
-                    AND out_c2.end_line <= der.end_line
-                    AND out_m2.role != 1
-                    AND out_gs2.id != gs.id
-                    AND out_der2.document_id != der.document_id
-                 ) AS REAL) / 5.0, 1.0)
-    ) DESC
-    LIMIT ?`,
-    minLoc,
-    limit
-  );
-  const indexedResults = rows.filter((r) => !db.isIgnored(r.file)).map((r) => ({
-    symbol: r.symbol,
-    shortName: shortenSymbol(r.symbol),
-    file: r.file,
-    startLine: r.start_line,
-    endLine: r.end_line,
-    loc: r.loc,
-    fanIn: r.fan_in,
-    fanOut: r.fan_out,
-    calleeCount: r.callee_count,
-    score: Math.round(
-      r.loc / 50 * (r.fan_in / 5) * Math.max(r.fan_out / 5, 1) * 100
-    ) / 100
-  }));
-  if (indexedResults.length > 0) {
-    return indexedResults;
-  }
   return getAllDefinitions(db, { scope }).filter((definition) => !db.isIgnored(definition.relativePath)).map((definition) => {
     const loc = definition.endLine - definition.startLine + 1;
     const callerRows = getCallerRowsForSymbol(db, definition, { limit: 500 });
@@ -7548,34 +7406,12 @@ function dataflow(db, symbolPattern) {
     line: match.startLine
   }];
   const sourceUsageSites = getSourceReferenceSites(db, match);
-  const usageSites = sourceUsageSites.length > 0 ? sourceUsageSites.map((site) => ({
-    file: site.file,
-    line: site.line,
-    enclosing_symbol: site.enclosingSymbol
-  })) : db.all(
-    `SELECT d.relative_path AS file, c.start_line AS line,
-        (SELECT enc_gs.symbol
-         FROM defn_enclosing_ranges enc_der
-         JOIN global_symbols enc_gs ON enc_der.symbol_id = enc_gs.id
-         WHERE enc_der.document_id = d.id
-           AND enc_der.start_line <= c.start_line
-           AND enc_der.end_line >= c.end_line
-         ORDER BY (enc_der.end_line - enc_der.start_line) ASC
-         LIMIT 1
-        ) AS enclosing_symbol
-      FROM mentions m
-      JOIN chunks c ON m.chunk_id = c.id
-      JOIN documents d ON c.document_id = d.id
-      WHERE m.symbol_id = ? AND m.role != 1
-        ${db.pathExclusionsFor("d")}
-      ORDER BY d.relative_path, c.start_line`,
-    match.symbolId
-  );
-  const normalizedUsageSites = usageSites.filter((site) => !db.isIgnored(site.file)).map((site) => ({
+  const resolvedSites = sourceUsageSites.length > 0 ? sourceUsageSites : getResolvedReferenceSites(db, match);
+  const normalizedUsageSites = resolvedSites.filter((site) => !db.isIgnored(site.file)).map((site) => ({
     file: site.file,
     line: site.line,
-    enclosingSymbol: site.enclosing_symbol ?? "(top-level)",
-    enclosingShort: site.enclosing_symbol ? shortenSymbol(site.enclosing_symbol) : "(top-level)"
+    enclosingSymbol: site.enclosingSymbol ?? "(top-level)",
+    enclosingShort: site.enclosingSymbol ? shortenSymbol(site.enclosingSymbol) : "(top-level)"
   }));
   const producers = uniqueSymbolRows(getCalleeRowsForSymbol(db, match, { limit: 30 }).map((row) => ({
     symbol: row.symbol,
@@ -7658,53 +7494,37 @@ function backwardSlice(db, match, maxDepth) {
   };
 }
 function forwardSlice(db, match) {
-  const rows = db.all(
-    `SELECT DISTINCT
-      enc_gs.symbol AS enclosing_symbol,
-      enc_d.relative_path AS enclosing_file,
-      out_gs.symbol AS output_symbol,
-      out_d.relative_path AS output_file
-    FROM mentions ref_m
-    JOIN chunks ref_c ON ref_m.chunk_id = ref_c.id
-    JOIN documents ref_d ON ref_c.document_id = ref_d.id
-    -- Find enclosing function at each reference site
-    JOIN defn_enclosing_ranges enc_der
-      ON enc_der.document_id = ref_d.id
-      AND enc_der.start_line <= ref_c.start_line
-      AND enc_der.end_line >= ref_c.end_line
-    JOIN global_symbols enc_gs ON enc_der.symbol_id = enc_gs.id
-    JOIN documents enc_d ON enc_der.document_id = enc_d.id
-    -- Find other symbols referenced within that enclosing function
-    JOIN mentions out_m ON out_m.role != 1
-    JOIN chunks out_c ON out_m.chunk_id = out_c.id
-      AND out_c.document_id = enc_der.document_id
-      AND out_c.start_line >= enc_der.start_line
-      AND out_c.end_line <= enc_der.end_line
-    JOIN global_symbols out_gs ON out_m.symbol_id = out_gs.id
-    JOIN defn_enclosing_ranges out_der ON out_gs.id = out_der.symbol_id
-    JOIN documents out_d ON out_der.document_id = out_d.id
-    WHERE ref_m.symbol_id = ? AND ref_m.role != 1
-      AND out_gs.id != ? AND out_gs.id != enc_gs.id
-      AND out_d.id != ref_d.id
-      ${db.symbolNoiseFor("out_gs")}
-      ${db.pathExclusionsFor("out_d")}
-    ORDER BY out_d.relative_path
-    LIMIT 30`,
-    match.symbolId,
-    match.symbolId
-  );
-  const seen = /* @__PURE__ */ new Set();
+  const sourceRefs = getSourceReferenceSites(db, match);
+  const refs2 = sourceRefs.length > 0 ? sourceRefs : getResolvedReferenceSites(db, match);
+  const seenOutputs = /* @__PURE__ */ new Set();
   const connected = [];
-  for (const r of rows) {
-    if (seen.has(r.output_symbol) || db.isIgnored(r.output_file)) continue;
-    seen.add(r.output_symbol);
-    connected.push({
-      symbol: r.output_symbol,
-      shortName: shortenSymbol(r.output_symbol),
-      file: r.output_file,
-      relationship: `used alongside target in ${shortenSymbol(r.enclosing_symbol)}`
-    });
+  for (const ref of refs2) {
+    if (connected.length >= 30) break;
+    if (db.isIgnored(ref.file)) continue;
+    const enclosingSymbol = ref.enclosingSymbol ?? findEnclosingDefinition(
+      getDefinitionsForFile(db, ref.file),
+      ref.line
+    )?.symbol ?? null;
+    if (!enclosingSymbol || enclosingSymbol === match.symbol) continue;
+    const enclosingMatch = findExactSymbolMatch(db, enclosingSymbol);
+    if (!enclosingMatch) continue;
+    for (const callee of getCalleeRowsForSymbol(db, enclosingMatch)) {
+      if (callee.symbol === match.symbol) continue;
+      if (callee.symbol === enclosingSymbol) continue;
+      if (callee.file === ref.file) continue;
+      if (db.isIgnored(callee.file)) continue;
+      if (seenOutputs.has(callee.symbol)) continue;
+      seenOutputs.add(callee.symbol);
+      connected.push({
+        symbol: callee.symbol,
+        shortName: shortenSymbol(callee.symbol),
+        file: callee.file,
+        relationship: `used alongside target in ${shortenSymbol(enclosingSymbol)}`
+      });
+      if (connected.length >= 30) break;
+    }
   }
+  connected.sort((a, b) => a.file.localeCompare(b.file));
   return {
     symbol: match.symbol,
     shortName: shortenSymbol(match.symbol),