@optave/codegraph 3.1.4 → 3.1.5

package/src/{analysis → domain/analysis}/symbol-lookup.js

@@ -12,22 +12,28 @@ import {
   findNodesWithFanIn,
   listFunctionNodes,
   openReadonlyOrFail,
-} from '../db.js';
-import { isTestFile } from '../infrastructure/test-filter.js';
-import { ALL_SYMBOL_KINDS } from '../kinds.js';
-import { paginateResult } from '../paginate.js';
-import { getFileHash, normalizeSymbol } from '../shared/normalize.js';
+  Repository,
+} from '../../db/index.js';
+import { isTestFile } from '../../infrastructure/test-filter.js';
+import { ALL_SYMBOL_KINDS } from '../../shared/kinds.js';
+import { getFileHash, normalizeSymbol } from '../../shared/normalize.js';
+import { paginateResult } from '../../shared/paginate.js';
 
 const FUNCTION_KINDS = ['function', 'method', 'class'];
 
 /**
  * Find nodes matching a name query, ranked by relevance.
  * Scoring: exact=100, prefix=60, word-boundary=40, substring=10, plus fan-in tiebreaker.
+ *
+ * @param {object} dbOrRepo - A better-sqlite3 Database or a Repository instance
  */
-export function findMatchingNodes(db, name, opts = {}) {
+export function findMatchingNodes(dbOrRepo, name, opts = {}) {
   const kinds = opts.kind ? [opts.kind] : opts.kinds?.length ? opts.kinds : FUNCTION_KINDS;
 
-  const rows = findNodesWithFanIn(db, `%${name}%`, { kinds, file: opts.file });
+  const isRepo = dbOrRepo instanceof Repository;
+  const rows = isRepo
+    ? dbOrRepo.findNodesWithFanIn(`%${name}%`, { kinds, file: opts.file })
+    : findNodesWithFanIn(dbOrRepo, `%${name}%`, { kinds, file: opts.file });
 
   const nodes = opts.noTests ? rows.filter((n) => !isTestFile(n.file)) : rows;
 

package/src/{builder → domain/graph/builder}/helpers.js

@@ -6,9 +6,9 @@
 import { createHash } from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
-import { EXTENSIONS, IGNORE_DIRS } from '../constants.js';
-import { purgeFilesData } from '../db.js';
-import { warn } from '../logger.js';
+import { purgeFilesData } from '../../../db/index.js';
+import { warn } from '../../../infrastructure/logger.js';
+import { EXTENSIONS, IGNORE_DIRS } from '../../../shared/constants.js';
 
 export const BUILTIN_RECEIVERS = new Set([
   'console',

package/src/{builder → domain/graph/builder}/incremental.js

@@ -6,9 +6,9 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import { normalizePath } from '../constants.js';
-import { warn } from '../logger.js';
-import { parseFileIncremental } from '../parser.js';
+import { warn } from '../../../infrastructure/logger.js';
+import { normalizePath } from '../../../shared/constants.js';
+import { parseFileIncremental } from '../../parser.js';
 import { computeConfidence, resolveImportPath } from '../resolve.js';
 import { BUILTIN_RECEIVERS, readFileSafe } from './helpers.js';
 

package/src/{builder → domain/graph/builder}/pipeline.js

@@ -6,10 +6,10 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { loadConfig } from '../config.js';
-import { closeDb, getBuildMeta, initSchema, MIGRATIONS, openDb } from '../db.js';
-import { info } from '../logger.js';
-import { getActiveEngine } from '../parser.js';
+import { closeDb, getBuildMeta, initSchema, MIGRATIONS, openDb } from '../../../db/index.js';
+import { loadConfig } from '../../../infrastructure/config.js';
+import { info } from '../../../infrastructure/logger.js';
+import { getActiveEngine } from '../../parser.js';
 import { PipelineContext } from './context.js';
 import { loadPathAliases } from './helpers.js';
 import { buildEdges } from './stages/build-edges.js';

package/src/{builder → domain/graph/builder}/stages/build-edges.js

@@ -6,8 +6,8 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { getNodeId } from '../../db.js';
-import { loadNative } from '../../native.js';
+import { getNodeId } from '../../../../db/index.js';
+import { loadNative } from '../../../../infrastructure/native.js';
 import { computeConfidence } from '../../resolve.js';
 import { BUILTIN_RECEIVERS, batchInsertEdges } from '../helpers.js';
 import { getResolved, isBarrelFile, resolveBarrelExport } from './resolve-imports.js';

package/src/{builder → domain/graph/builder}/stages/build-structure.js

@@ -5,8 +5,8 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { normalizePath } from '../../constants.js';
-import { debug } from '../../logger.js';
+import { debug } from '../../../../infrastructure/logger.js';
+import { normalizePath } from '../../../../shared/constants.js';
 import { readFileSafe } from '../helpers.js';
 
 /**
@@ -88,7 +88,7 @@ export async function buildStructure(ctx) {
     relDirs.add(normalizePath(path.relative(rootDir, absDir)));
   }
   try {
-    const { buildStructure: buildStructureFn } = await import('../../structure.js');
+    const { buildStructure: buildStructureFn } = await import('../../../../features/structure.js');
     const changedFilePaths = isFullBuild ? null : [...allSymbols.keys()];
     buildStructureFn(db, fileSymbols, rootDir, ctx.lineCountMap, relDirs, changedFilePaths);
   } catch (err) {
@@ -99,7 +99,7 @@ export async function buildStructure(ctx) {
   // Classify node roles
   const t1 = performance.now();
   try {
-    const { classifyNodeRoles } = await import('../../structure.js');
+    const { classifyNodeRoles } = await import('../../../../features/structure.js');
     const roleSummary = classifyNodeRoles(db);
     debug(
       `Roles: ${Object.entries(roleSummary)

package/src/{builder → domain/graph/builder}/stages/collect-files.js

@@ -5,8 +5,8 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import { normalizePath } from '../../constants.js';
-import { info } from '../../logger.js';
+import { info } from '../../../../infrastructure/logger.js';
+import { normalizePath } from '../../../../shared/constants.js';
 import { collectFiles as collectFilesUtil } from '../helpers.js';
 
 /**

package/src/{builder → domain/graph/builder}/stages/detect-changes.js

@@ -6,11 +6,11 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import { normalizePath } from '../../constants.js';
-import { closeDb } from '../../db.js';
+import { closeDb } from '../../../../db/index.js';
+import { debug, info } from '../../../../infrastructure/logger.js';
+import { normalizePath } from '../../../../shared/constants.js';
+import { parseFilesAuto } from '../../../parser.js';
 import { readJournal, writeJournalHeader } from '../../journal.js';
-import { debug, info } from '../../logger.js';
-import { parseFilesAuto } from '../../parser.js';
 import { fileHash, fileStat, purgeFilesFromGraph, readFileSafe } from '../helpers.js';
 
 /**
@@ -203,11 +203,11 @@ async function runPendingAnalysis(ctx) {
   };
   const analysisSymbols = await parseFilesAuto(allFiles, rootDir, analysisOpts);
   if (needsCfg) {
-    const { buildCFGData } = await import('../../cfg.js');
+    const { buildCFGData } = await import('../../../../features/cfg.js');
     await buildCFGData(db, analysisSymbols, rootDir, engineOpts);
   }
   if (needsDataflow) {
-    const { buildDataflowEdges } = await import('../../dataflow.js');
+    const { buildDataflowEdges } = await import('../../../../features/dataflow.js');
     await buildDataflowEdges(db, analysisSymbols, rootDir, engineOpts);
   }
   return true;

package/src/{builder → domain/graph/builder}/stages/finalize.js

@@ -6,13 +6,13 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { closeDb, getBuildMeta, setBuildMeta } from '../../db.js';
+import { closeDb, getBuildMeta, setBuildMeta } from '../../../../db/index.js';
+import { debug, info, warn } from '../../../../infrastructure/logger.js';
 import { writeJournalHeader } from '../../journal.js';
-import { debug, info, warn } from '../../logger.js';
 
 const __builderDir = path.dirname(new URL(import.meta.url).pathname.replace(/^\/([A-Z]:)/i, '$1'));
 const CODEGRAPH_VERSION = JSON.parse(
-  fs.readFileSync(path.join(__builderDir, '..', '..', '..', 'package.json'), 'utf-8'),
+  fs.readFileSync(path.join(__builderDir, '..', '..', '..', '..', '..', 'package.json'), 'utf-8'),
 ).version;
 
 /**
@@ -127,7 +127,7 @@ export async function finalize(ctx) {
       debug(`Skipping auto-registration for temp directory: ${resolvedRoot}`);
     } else {
       try {
-        const { registerRepo } = await import('../../registry.js');
+        const { registerRepo } = await import('../../../../infrastructure/registry.js');
         registerRepo(rootDir);
       } catch (err) {
         debug(`Auto-registration failed: ${err.message}`);

package/src/{builder → domain/graph/builder}/stages/insert-nodes.js

@@ -6,7 +6,7 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { bulkNodeIdsByFile } from '../../db.js';
+import { bulkNodeIdsByFile } from '../../../../db/index.js';
 import {
   batchInsertEdges,
   batchInsertNodes,

package/src/{builder → domain/graph/builder}/stages/parse-files.js

@@ -5,8 +5,8 @@
  * Populates ctx.allSymbols, ctx.fileSymbols, ctx.filesToParse.
  */
 import { performance } from 'node:perf_hooks';
-import { info } from '../../logger.js';
-import { parseFilesAuto } from '../../parser.js';
+import { info } from '../../../../infrastructure/logger.js';
+import { parseFilesAuto } from '../../../parser.js';
 
 /**
  * @param {import('../context.js').PipelineContext} ctx

package/src/{builder → domain/graph/builder}/stages/resolve-imports.js

@@ -6,7 +6,7 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { parseFilesAuto } from '../../parser.js';
+import { parseFilesAuto } from '../../../parser.js';
 import { resolveImportPath, resolveImportsBatch } from '../../resolve.js';
 
 /**

package/src/{builder → domain/graph/builder}/stages/run-analyses.js

@@ -4,7 +4,7 @@
  * Dispatches to the unified AST analysis engine (AST nodes, complexity, CFG, dataflow).
  * Filters out reverse-dep files for incremental builds.
  */
-import { debug, warn } from '../../logger.js';
+import { debug, warn } from '../../../../infrastructure/logger.js';
 
 /**
  * @param {import('../context.js').PipelineContext} ctx
@@ -31,7 +31,7 @@ export async function runAnalyses(ctx) {
     }
   }
 
-  const { runAnalyses: runAnalysesFn } = await import('../../ast-analysis/engine.js');
+  const { runAnalyses: runAnalysesFn } = await import('../../../../ast-analysis/engine.js');
   try {
     const analysisTiming = await runAnalysesFn(db, astComplexitySymbols, rootDir, opts, engineOpts);
     ctx.timing.astMs = analysisTiming.astMs;

package/src/{change-journal.js → domain/graph/change-journal.js}

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { debug, warn } from './logger.js';
+import { debug, warn } from '../../infrastructure/logger.js';
 
 export const CHANGE_EVENTS_FILENAME = 'change-events.ndjson';
 export const DEFAULT_MAX_BYTES = 1024 * 1024; // 1 MB

package/src/{cycles.js → domain/graph/cycles.js}

@@ -1,7 +1,7 @@
-import { tarjan } from './graph/algorithms/tarjan.js';
-import { buildDependencyGraph } from './graph/builders/dependency.js';
-import { CodeGraph } from './graph/model.js';
-import { loadNative } from './native.js';
+import { tarjan } from '../../graph/algorithms/tarjan.js';
+import { buildDependencyGraph } from '../../graph/builders/dependency.js';
+import { CodeGraph } from '../../graph/model.js';
+import { loadNative } from '../../infrastructure/native.js';
 
 /**
  * Detect circular dependencies in the codebase using Tarjan's SCC algorithm.

package/src/{journal.js → domain/graph/journal.js}

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { debug, warn } from './logger.js';
+import { debug, warn } from '../../infrastructure/logger.js';
 
 export const JOURNAL_FILENAME = 'changes.journal';
 const HEADER_PREFIX = '# codegraph-journal v1 ';

package/src/{resolve.js → domain/graph/resolve.js}

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { normalizePath } from './constants.js';
-import { loadNative } from './native.js';
+import { loadNative } from '../../infrastructure/native.js';
+import { normalizePath } from '../../shared/constants.js';
 
 // ── Alias format conversion ─────────────────────────────────────────
 

package/src/{watcher.js → domain/graph/watcher.js}

@@ -1,13 +1,13 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { closeDb, getNodeId as getNodeIdQuery, initSchema, openDb } from '../../db/index.js';
+import { info } from '../../infrastructure/logger.js';
+import { EXTENSIONS, IGNORE_DIRS, normalizePath } from '../../shared/constants.js';
+import { DbError } from '../../shared/errors.js';
+import { createParseTreeCache, getActiveEngine } from '../parser.js';
 import { rebuildFile } from './builder/incremental.js';
 import { appendChangeEvents, buildChangeEvent, diffSymbols } from './change-journal.js';
-import { EXTENSIONS, IGNORE_DIRS, normalizePath } from './constants.js';
-import { closeDb, getNodeId as getNodeIdQuery, initSchema, openDb } from './db.js';
-import { DbError } from './errors.js';
 import { appendJournalEntries } from './journal.js';
-import { info } from './logger.js';
-import { createParseTreeCache, getActiveEngine } from './parser.js';
 
 function shouldIgnore(filePath) {
   const parts = filePath.split(path.sep);

package/src/{parser.js → domain/parser.js}

@@ -2,8 +2,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Language, Parser, Query } from 'web-tree-sitter';
-import { warn } from './logger.js';
-import { getNative, getNativePackageVersion, loadNative } from './native.js';
+import { warn } from '../infrastructure/logger.js';
+import { getNative, getNativePackageVersion, loadNative } from '../infrastructure/native.js';
 
 // Re-export all extractors for backward compatibility
 export {
@@ -16,7 +16,7 @@ export {
   extractRubySymbols,
   extractRustSymbols,
   extractSymbols,
-} from './extractors/index.js';
+} from '../extractors/index.js';
 
 import {
   extractCSharpSymbols,
@@ -28,12 +28,12 @@ import {
   extractRubySymbols,
   extractRustSymbols,
   extractSymbols,
-} from './extractors/index.js';
+} from '../extractors/index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 function grammarPath(name) {
-  return path.join(__dirname, '..', 'grammars', name);
+  return path.join(__dirname, '..', '..', 'grammars', name);
 }
 
 let _initialized = false;

package/src/{queries.js → domain/queries.js}

@@ -6,6 +6,22 @@
  * importers continue to work without changes.
  */
 
+// ── Re-export from dedicated module for backward compat ───────────────────
+export { isTestFile, TEST_PATTERN } from '../infrastructure/test-filter.js';
+export { iterListFunctions, iterRoles, iterWhere } from '../shared/generators.js';
+// ── Kind/edge constants (canonical source: kinds.js) ─────────────────────
+export {
+  ALL_SYMBOL_KINDS,
+  CORE_EDGE_KINDS,
+  CORE_SYMBOL_KINDS,
+  EVERY_EDGE_KIND,
+  EVERY_SYMBOL_KIND,
+  EXTENDED_SYMBOL_KINDS,
+  STRUCTURAL_EDGE_KINDS,
+  VALID_ROLES,
+} from '../shared/kinds.js';
+// ── Shared utilities ─────────────────────────────────────────────────────
+export { kindIcon, normalizeSymbol } from '../shared/normalize.js';
 export { contextData, explainData } from './analysis/context.js';
 export { fileDepsData, fnDepsData, pathData } from './analysis/dependencies.js';
 export { exportsData } from './analysis/exports.js';
@@ -30,19 +46,3 @@ export {
   queryNameData,
   whereData,
 } from './analysis/symbol-lookup.js';
-// ── Re-export from dedicated module for backward compat ───────────────────
-export { isTestFile, TEST_PATTERN } from './infrastructure/test-filter.js';
-// ── Kind/edge constants (canonical source: kinds.js) ─────────────────────
-export {
-  ALL_SYMBOL_KINDS,
-  CORE_EDGE_KINDS,
-  CORE_SYMBOL_KINDS,
-  EVERY_EDGE_KIND,
-  EVERY_SYMBOL_KIND,
-  EXTENDED_SYMBOL_KINDS,
-  STRUCTURAL_EDGE_KINDS,
-  VALID_ROLES,
-} from './kinds.js';
-export { iterListFunctions, iterRoles, iterWhere } from './shared/generators.js';
-// ── Shared utilities ─────────────────────────────────────────────────────
-export { kindIcon, normalizeSymbol } from './shared/normalize.js';

package/src/{embeddings → domain/search}/generator.js

@@ -1,8 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { closeDb, findDbPath, openDb } from '../db.js';
-import { DbError } from '../errors.js';
-import { warn } from '../logger.js';
+import { closeDb, findDbPath, openDb } from '../../db/index.js';
+import { warn } from '../../infrastructure/logger.js';
+import { DbError } from '../../shared/errors.js';
 import { embed, getModelConfig } from './models.js';
 import { buildSourceText } from './strategies/source.js';
 import { buildStructuredText } from './strategies/structured.js';

package/src/{embeddings → domain/search}/models.js

@@ -1,7 +1,7 @@
 import { execFileSync } from 'node:child_process';
 import { createInterface } from 'node:readline';
-import { ConfigError, EngineError } from '../errors.js';
-import { info } from '../logger.js';
+import { info } from '../../infrastructure/logger.js';
+import { ConfigError, EngineError } from '../../shared/errors.js';
 
 // Lazy-load transformers (heavy, optional module)
 let pipeline = null;

package/src/{embeddings → domain/search}/search/cli-formatter.js

@@ -1,4 +1,4 @@
-import { warn } from '../../logger.js';
+import { warn } from '../../../infrastructure/logger.js';
 import { hybridSearchData } from './hybrid.js';
 import { ftsSearchData } from './keyword.js';
 import { multiSearchData, searchData } from './semantic.js';

package/src/{embeddings → domain/search}/search/hybrid.js

@@ -1,4 +1,4 @@
-import { openReadonlyOrFail } from '../../db.js';
+import { openReadonlyOrFail } from '../../../db/index.js';
 import { hasFtsIndex } from '../stores/fts5.js';
 import { ftsSearchData } from './keyword.js';
 import { searchData } from './semantic.js';

package/src/{embeddings → domain/search}/search/keyword.js

@@ -1,4 +1,4 @@
-import { openReadonlyOrFail } from '../../db.js';
+import { openReadonlyOrFail } from '../../../db/index.js';
 import { normalizeSymbol } from '../../queries.js';
 import { hasFtsIndex, sanitizeFtsQuery } from '../stores/fts5.js';
 import { applyFilters } from './filters.js';

package/src/{embeddings → domain/search}/search/prepare.js

@@ -1,5 +1,5 @@
-import { getEmbeddingCount, getEmbeddingMeta } from '../../db/repository/embeddings.js';
-import { openReadonlyOrFail } from '../../db.js';
+import { openReadonlyOrFail } from '../../../db/index.js';
+import { getEmbeddingCount, getEmbeddingMeta } from '../../../db/repository/embeddings.js';
 import { MODELS } from '../models.js';
 import { applyFilters } from './filters.js';
 

package/src/{embeddings → domain/search}/search/semantic.js

@@ -1,4 +1,4 @@
-import { warn } from '../../logger.js';
+import { warn } from '../../../infrastructure/logger.js';
 import { normalizeSymbol } from '../../queries.js';
 import { embed } from '../models.js';
 import { cosineSim } from '../stores/sqlite-blob.js';

package/src/{embeddings → domain/search}/strategies/structured.js

@@ -1,4 +1,4 @@
-import { findCalleeNames, findCallerNames } from '../../db.js';
+import { findCalleeNames, findCallerNames } from '../../../db/index.js';
 import { extractLeadingComment, splitIdentifier } from './text-utils.js';
 
 /**

package/src/extractors/javascript.js

@@ -1,4 +1,4 @@
-import { debug } from '../logger.js';
+import { debug } from '../infrastructure/logger.js';
 import { findChild, nodeEndLine } from './helpers.js';
 
 /**

package/src/{ast.js → features/ast.js}

@@ -7,14 +7,14 @@
  */
 
 import path from 'node:path';
-import { AST_TYPE_MAPS } from './ast-analysis/rules/index.js';
-import { buildExtensionSet } from './ast-analysis/shared.js';
-import { walkWithVisitors } from './ast-analysis/visitor.js';
-import { createAstStoreVisitor } from './ast-analysis/visitors/ast-store-visitor.js';
-import { bulkNodeIdsByFile, openReadonlyOrFail } from './db.js';
-import { outputResult } from './infrastructure/result-formatter.js';
-import { debug } from './logger.js';
-import { paginateResult } from './paginate.js';
+import { AST_TYPE_MAPS } from '../ast-analysis/rules/index.js';
+import { buildExtensionSet } from '../ast-analysis/shared.js';
+import { walkWithVisitors } from '../ast-analysis/visitor.js';
+import { createAstStoreVisitor } from '../ast-analysis/visitors/ast-store-visitor.js';
+import { bulkNodeIdsByFile, openReadonlyOrFail } from '../db/index.js';
+import { debug } from '../infrastructure/logger.js';
+import { outputResult } from '../infrastructure/result-formatter.js';
+import { paginateResult } from '../shared/paginate.js';
 
 // ─── Constants ────────────────────────────────────────────────────────
 

package/src/{audit.js → features/audit.js}

@@ -7,21 +7,26 @@
  */
 
 import path from 'node:path';
-import { loadConfig } from './config.js';
-import { openReadonlyOrFail } from './db.js';
-import { isTestFile } from './infrastructure/test-filter.js';
+import { openReadonlyOrFail } from '../db/index.js';
+import { bfsTransitiveCallers } from '../domain/analysis/impact.js';
+import { explainData } from '../domain/queries.js';
+import { loadConfig } from '../infrastructure/config.js';
+import { isTestFile } from '../infrastructure/test-filter.js';
 import { RULE_DEFS } from './manifesto.js';
-import { explainData } from './queries.js';
 
 // ─── Threshold resolution ───────────────────────────────────────────
 
 const FUNCTION_RULES = RULE_DEFS.filter((d) => d.level === 'function');
 
-function resolveThresholds(customDbPath) {
+function resolveThresholds(customDbPath, config) {
   try {
-    const dbDir = path.dirname(customDbPath);
-    const repoRoot = path.resolve(dbDir, '..');
-    const cfg = loadConfig(repoRoot);
+    const cfg =
+      config ||
+      (() => {
+        const dbDir = path.dirname(customDbPath);
+        const repoRoot = path.resolve(dbDir, '..');
+        return loadConfig(repoRoot);
+      })();
     const userRules = cfg.manifesto || {};
     const resolved = {};
     for (const def of FUNCTION_RULES) {
@@ -70,39 +75,6 @@ function checkBreaches(row, thresholds) {
   return breaches;
 }
 
-// ─── BFS impact (inline, same algorithm as fnImpactData) ────────────
-
-function computeImpact(db, nodeId, noTests, maxDepth) {
-  const visited = new Set([nodeId]);
-  const levels = {};
-  let frontier = [nodeId];
-
-  for (let d = 1; d <= maxDepth; d++) {
-    const nextFrontier = [];
-    for (const fid of frontier) {
-      const callers = db
-        .prepare(
-          `SELECT DISTINCT n.id, n.name, n.kind, n.file, n.line
-           FROM edges e JOIN nodes n ON e.source_id = n.id
-           WHERE e.target_id = ? AND e.kind = 'calls'`,
-        )
-        .all(fid);
-      for (const c of callers) {
-        if (!visited.has(c.id) && (!noTests || !isTestFile(c.file))) {
-          visited.add(c.id);
-          nextFrontier.push(c.id);
-          if (!levels[d]) levels[d] = [];
-          levels[d].push({ name: c.name, kind: c.kind, file: c.file, line: c.line });
-        }
-      }
-    }
-    frontier = nextFrontier;
-    if (frontier.length === 0) break;
-  }
-
-  return { totalDependents: visited.size - 1, levels };
-}
-
 // ─── Phase 4.4 fields (graceful null fallback) ─────────────────────
 
 function readPhase44(db, nodeId) {
@@ -147,7 +119,7 @@ export function auditData(target, customDbPath, opts = {}) {
 
   // 2. Open DB for enrichment
   const db = openReadonlyOrFail(customDbPath);
-  const thresholds = resolveThresholds(customDbPath);
+  const thresholds = resolveThresholds(customDbPath, opts.config);
 
   let functions;
   try {
@@ -189,7 +161,7 @@ function enrichFunction(db, r, noTests, maxDepth, thresholds) {
   const nodeId = nodeRow?.id;
   const health = nodeId ? buildHealth(db, nodeId, thresholds) : defaultHealth();
   const impact = nodeId
-    ? computeImpact(db, nodeId, noTests, maxDepth)
+    ? bfsTransitiveCallers(db, nodeId, { noTests, maxDepth })
     : { totalDependents: 0, levels: {} };
   const phase44 = nodeId
     ? readPhase44(db, nodeId)
@@ -260,7 +232,7 @@ function enrichSymbol(db, sym, file, noTests, maxDepth, thresholds) {
 
   const health = nodeId ? buildHealth(db, nodeId, thresholds) : defaultHealth();
   const impact = nodeId
-    ? computeImpact(db, nodeId, noTests, maxDepth)
+    ? bfsTransitiveCallers(db, nodeId, { noTests, maxDepth })
     : { totalDependents: 0, levels: {} };
   const phase44 = nodeId
     ? readPhase44(db, nodeId)

package/src/{batch.js → features/batch.js}

@@ -5,10 +5,6 @@
  * Designed for multi-agent swarms that need to dispatch 20+ queries in one call.
  */
 
-import { complexityData } from './complexity.js';
-import { dataflowData } from './dataflow.js';
-import { ConfigError } from './errors.js';
-import { flowData } from './flow.js';
 import {
   contextData,
   explainData,
@@ -18,7 +14,11 @@ import {
   fnImpactData,
   impactAnalysisData,
   whereData,
-} from './queries.js';
+} from '../domain/queries.js';
+import { ConfigError } from '../shared/errors.js';
+import { complexityData } from './complexity.js';
+import { dataflowData } from './dataflow.js';
+import { flowData } from './flow.js';
 
 /**
  * Map of supported batch commands → their data function + first-arg semantics.

package/src/{boundaries.js → features/boundaries.js}

@@ -1,5 +1,5 @@
-import { isTestFile } from './infrastructure/test-filter.js';
-import { debug } from './logger.js';
+import { debug } from '../infrastructure/logger.js';
+import { isTestFile } from '../infrastructure/test-filter.js';
 
 // ─── Glob-to-Regex ───────────────────────────────────────────────────