@optave/codegraph 3.1.3 → 3.1.5

package/src/domain/search/strategies/structured.js

@@ -0,0 +1,43 @@
+import { findCalleeNames, findCallerNames } from '../../../db/index.js';
+import { extractLeadingComment, splitIdentifier } from './text-utils.js';
+
+/**
+ * Build graph-enriched text for a symbol using dependency context.
+ * Produces compact, semantic text (~100 tokens) instead of full source code.
+ */
+export function buildStructuredText(node, file, lines, db) {
+  const readable = splitIdentifier(node.name);
+  const parts = [`${node.kind} ${node.name} (${readable}) in ${file}`];
+  const startLine = Math.max(0, node.line - 1);
+
+  // Extract parameters from signature (best-effort, single-line)
+  const sigLine = lines[startLine] || '';
+  const paramMatch = sigLine.match(/\(([^)]*)\)/);
+  if (paramMatch?.[1]?.trim()) {
+    parts.push(`Parameters: ${paramMatch[1].trim()}`);
+  }
+
+  // Graph context: callees (capped at 10)
+  const callees = findCalleeNames(db, node.id);
+  if (callees.length > 0) {
+    parts.push(`Calls: ${callees.slice(0, 10).join(', ')}`);
+  }
+
+  // Graph context: callers (capped at 10)
+  const callers = findCallerNames(db, node.id);
+  if (callers.length > 0) {
+    parts.push(`Called by: ${callers.slice(0, 10).join(', ')}`);
+  }
+
+  // Leading comment (high semantic value) or first few lines of code
+  const comment = extractLeadingComment(lines, startLine);
+  if (comment) {
+    parts.push(comment);
+  } else {
+    const endLine = Math.min(lines.length, startLine + 4);
+    const snippet = lines.slice(startLine, endLine).join('\n').trim();
+    if (snippet) parts.push(snippet);
+  }
+
+  return parts.join('\n');
+}

package/src/domain/search/strategies/text-utils.js

@@ -0,0 +1,43 @@
+/**
+ * Split an identifier into readable words.
+ * camelCase/PascalCase -> "camel Case", snake_case -> "snake case", kebab-case -> "kebab case"
+ */
+export function splitIdentifier(name) {
+  return name
+    .replace(/([a-z])([A-Z])/g, '$1 $2')
+    .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
+    .replace(/[_-]+/g, ' ')
+    .trim();
+}
+
+/**
+ * Extract leading comment text (JSDoc, //, #, etc.) above a function line.
+ * Returns the cleaned comment text or null if none found.
+ */
+export function extractLeadingComment(lines, fnLineIndex) {
+  if (fnLineIndex > lines.length) return null;
+  const raw = [];
+  for (let i = fnLineIndex - 1; i >= Math.max(0, fnLineIndex - 15); i--) {
+    if (i >= lines.length) continue;
+    const trimmed = lines[i].trim();
+    if (/^(\/\/|\/\*|\*\/|\*|#|\/\/\/)/.test(trimmed)) {
+      raw.unshift(trimmed);
+    } else if (trimmed === '') {
+      if (raw.length > 0) break;
+    } else {
+      break;
+    }
+  }
+  if (raw.length === 0) return null;
+  return raw
+    .map((line) =>
+      line
+        .replace(/^\/\*\*?\s?|\*\/$/g, '') // opening /** or /* and closing */
+        .replace(/^\*\s?/, '') // middle * lines
+        .replace(/^\/\/\/?\s?/, '') // // or ///
+        .replace(/^#\s?/, '') // # (Python/Ruby)
+        .trim(),
+    )
+    .filter((l) => l.length > 0)
+    .join(' ');
+}

package/src/extractors/csharp.js

@@ -1,4 +1,4 @@
-import { findChild, nodeEndLine } from './helpers.js';
+import { extractModifierVisibility, findChild, nodeEndLine } from './helpers.js';
 
 /**
  * Extract symbols from C# files.
@@ -133,6 +133,7 @@ export function extractCSharpSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: extractModifierVisibility(node),
           });
         }
         break;
@@ -150,6 +151,7 @@ export function extractCSharpSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: extractModifierVisibility(node),
           });
         }
         break;
@@ -165,6 +167,7 @@ export function extractCSharpSymbols(tree, _filePath) {
             kind: 'property',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
+            visibility: extractModifierVisibility(node),
           });
         }
         break;
@@ -260,7 +263,12 @@ function extractCSharpClassFields(classNode) {
       if (!child || child.type !== 'variable_declarator') continue;
       const nameNode = child.childForFieldName('name');
       if (nameNode) {
-        fields.push({ name: nameNode.text, kind: 'property', line: member.startPosition.row + 1 });
+        fields.push({
+          name: nameNode.text,
+          kind: 'property',
+          line: member.startPosition.row + 1,
+          visibility: extractModifierVisibility(member),
+        });
       }
     }
   }

package/src/extractors/go.js

@@ -1,4 +1,4 @@
-import { findChild, nodeEndLine } from './helpers.js';
+import { findChild, goVisibility, nodeEndLine } from './helpers.js';
 
 /**
  * Extract symbols from Go files.
@@ -22,6 +22,7 @@ export function extractGoSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: goVisibility(nameNode.text),
           });
         }
         break;
@@ -55,6 +56,7 @@ export function extractGoSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: goVisibility(nameNode.text),
           });
         }
         break;

package/src/extractors/helpers.js

@@ -9,3 +9,74 @@ export function findChild(node, type) {
   }
   return null;
 }
+
+/**
+ * Extract visibility from a node by scanning its children for modifier keywords.
+ * Works for Java, C#, PHP, and similar languages where modifiers are child nodes.
+ * @param {object} node - tree-sitter node
+ * @param {Set<string>} [modifierTypes] - node types that indicate modifiers
+ * @returns {'public'|'private'|'protected'|undefined}
+ */
+const DEFAULT_MODIFIER_TYPES = new Set([
+  'modifiers',
+  'modifier',
+  'visibility_modifier',
+  'accessibility_modifier',
+]);
+const VISIBILITY_KEYWORDS = new Set(['public', 'private', 'protected']);
+
+/**
+ * Python convention: __name → private, _name → protected, else undefined.
+ */
+export function pythonVisibility(name) {
+  if (name.startsWith('__') && name.endsWith('__')) return undefined; // dunder — public
+  if (name.startsWith('__')) return 'private';
+  if (name.startsWith('_')) return 'protected';
+  return undefined;
+}
+
+/**
+ * Go convention: uppercase first letter → public, lowercase → private.
+ */
+export function goVisibility(name) {
+  if (!name) return undefined;
+  // Strip receiver prefix (e.g., "Receiver.Method" → check "Method")
+  const bare = name.includes('.') ? name.split('.').pop() : name;
+  if (!bare) return undefined;
+  return bare[0] === bare[0].toUpperCase() && bare[0] !== bare[0].toLowerCase()
+    ? 'public'
+    : 'private';
+}
+
+/**
+ * Rust: check for `visibility_modifier` child (pub, pub(crate), etc.).
+ */
+export function rustVisibility(node) {
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (!child) continue;
+    if (child.type === 'visibility_modifier') {
+      return 'public'; // pub, pub(crate), pub(super) all mean "visible"
+    }
+  }
+  return 'private';
+}
+
+export function extractModifierVisibility(node, modifierTypes = DEFAULT_MODIFIER_TYPES) {
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (!child) continue;
+    // Direct keyword match (e.g., PHP visibility_modifier = "public")
+    if (modifierTypes.has(child.type)) {
+      const text = child.text;
+      if (VISIBILITY_KEYWORDS.has(text)) return text;
+      // C# 'private protected' — accessible to derived types in same assembly → protected
+      if (text === 'private protected') return 'protected';
+      // Compound modifiers node (Java: "public static") — scan its text for a keyword
+      for (const kw of VISIBILITY_KEYWORDS) {
+        if (text.includes(kw)) return kw;
+      }
+    }
+  }
+  return undefined;
+}

package/src/extractors/java.js

@@ -1,4 +1,4 @@
-import { findChild, nodeEndLine } from './helpers.js';
+import { extractModifierVisibility, findChild, nodeEndLine } from './helpers.js';
 
 /**
  * Extract symbols from Java files.
@@ -165,6 +165,7 @@ export function extractJavaSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: extractModifierVisibility(node),
           });
         }
         break;
@@ -182,6 +183,7 @@ export function extractJavaSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: extractModifierVisibility(node),
           });
         }
         break;
@@ -267,7 +269,12 @@ function extractClassFields(classNode) {
       if (!child || child.type !== 'variable_declarator') continue;
       const nameNode = child.childForFieldName('name');
       if (nameNode) {
-        fields.push({ name: nameNode.text, kind: 'property', line: member.startPosition.row + 1 });
+        fields.push({
+          name: nameNode.text,
+          kind: 'property',
+          line: member.startPosition.row + 1,
+          visibility: extractModifierVisibility(member),
+        });
       }
     }
   }

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';
 
 /**
@@ -77,12 +77,14 @@ function extractSymbolsQuery(tree, query) {
       const parentClass = findParentClass(c.meth_node);
       const fullName = parentClass ? `${parentClass}.${methName}` : methName;
       const methChildren = extractParameters(c.meth_node);
+      const methVis = extractVisibility(c.meth_node);
       definitions.push({
         name: fullName,
         kind: 'method',
         line: c.meth_node.startPosition.row + 1,
         endLine: nodeEndLine(c.meth_node),
         children: methChildren.length > 0 ? methChildren : undefined,
+        visibility: methVis,
       });
     } else if (c.iface_node) {
       // interface_declaration (TS/TSX only)
@@ -375,12 +377,14 @@ function extractSymbolsWalk(tree) {
           const parentClass = findParentClass(node);
           const fullName = parentClass ? `${parentClass}.${nameNode.text}` : nameNode.text;
           const methChildren = extractParameters(node);
+          const methVis = extractVisibility(node);
           definitions.push({
             name: fullName,
             kind: 'method',
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: methChildren.length > 0 ? methChildren : undefined,
+            visibility: methVis,
           });
         }
         break;
@@ -701,13 +705,46 @@ function extractClassProperties(classNode) {
           nameNode.type === 'identifier' ||
           nameNode.type === 'private_property_identifier')
       ) {
-        props.push({ name: nameNode.text, kind: 'property', line: child.startPosition.row + 1 });
+        // Private # fields: nameNode.type is 'private_property_identifier'
+        // TS modifiers: accessibility_modifier child on the field_definition
+        const vis =
+          nameNode.type === 'private_property_identifier' ? 'private' : extractVisibility(child);
+        props.push({
+          name: nameNode.text,
+          kind: 'property',
+          line: child.startPosition.row + 1,
+          visibility: vis,
+        });
       }
     }
   }
   return props;
 }
 
+/**
+ * Extract visibility modifier from a class member node.
+ * Checks for TS access modifiers (public/private/protected) and JS private (#) fields.
+ * Returns 'public' | 'private' | 'protected' | undefined.
+ */
+function extractVisibility(node) {
+  // Check for TS accessibility modifiers (accessibility_modifier child)
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (!child) continue;
+    if (child.type === 'accessibility_modifier') {
+      const text = child.text;
+      if (text === 'private' || text === 'protected' || text === 'public') return text;
+    }
+  }
+  // Check for JS private name (# prefix) — try multiple field names
+  const nameNode =
+    node.childForFieldName('name') || node.childForFieldName('property') || node.child(0);
+  if (nameNode && nameNode.type === 'private_property_identifier') {
+    return 'private';
+  }
+  return undefined;
+}
+
 function isConstantValue(valueNode) {
   if (!valueNode) return false;
   const t = valueNode.type;

package/src/extractors/php.js

@@ -1,4 +1,4 @@
-import { findChild, nodeEndLine } from './helpers.js';
+import { extractModifierVisibility, findChild, nodeEndLine } from './helpers.js';
 
 function extractPhpParameters(fnNode) {
   const params = [];
@@ -35,6 +35,7 @@ function extractPhpClassChildren(classNode) {
             name: varNode.text,
             kind: 'property',
             line: member.startPosition.row + 1,
+            visibility: extractModifierVisibility(member),
           });
         }
       }
@@ -231,6 +232,7 @@ export function extractPHPSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: extractModifierVisibility(node),
           });
         }
         break;

package/src/extractors/python.js

@@ -1,4 +1,4 @@
-import { findChild, nodeEndLine } from './helpers.js';
+import { findChild, nodeEndLine, pythonVisibility } from './helpers.js';
 
 /**
  * Extract symbols from Python files.
@@ -30,6 +30,7 @@ export function extractPythonSymbols(tree, _filePath) {
             endLine: nodeEndLine(node),
             decorators,
             children: fnChildren.length > 0 ? fnChildren : undefined,
+            visibility: pythonVisibility(nameNode.text),
           });
         }
         break;
@@ -209,7 +210,12 @@ export function extractPythonSymbols(tree, _filePath) {
           const left = assignment.childForFieldName('left');
           if (left && left.type === 'identifier' && !seen.has(left.text)) {
             seen.add(left.text);
-            props.push({ name: left.text, kind: 'property', line: child.startPosition.row + 1 });
+            props.push({
+              name: left.text,
+              kind: 'property',
+              line: child.startPosition.row + 1,
+              visibility: pythonVisibility(left.text),
+            });
           }
         }
       }
@@ -262,7 +268,12 @@ export function extractPythonSymbols(tree, _filePath) {
         !seen.has(attr.text)
       ) {
         seen.add(attr.text);
-        props.push({ name: attr.text, kind: 'property', line: stmt.startPosition.row + 1 });
+        props.push({
+          name: attr.text,
+          kind: 'property',
+          line: stmt.startPosition.row + 1,
+          visibility: pythonVisibility(attr.text),
+        });
       }
     }
   }

package/src/extractors/rust.js

@@ -1,4 +1,4 @@
-import { findChild, nodeEndLine } from './helpers.js';
+import { findChild, nodeEndLine, rustVisibility } from './helpers.js';
 
 /**
  * Extract symbols from Rust files.
@@ -37,6 +37,7 @@ export function extractRustSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: params.length > 0 ? params : undefined,
+            visibility: rustVisibility(node),
           });
         }
         break;
@@ -52,6 +53,7 @@ export function extractRustSymbols(tree, _filePath) {
             line: node.startPosition.row + 1,
             endLine: nodeEndLine(node),
             children: fields.length > 0 ? fields : undefined,
+            visibility: rustVisibility(node),
           });
         }
         break;

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,9 +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 { flowData } from './flow.js';
 import {
   contextData,
   explainData,
@@ -17,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.
@@ -53,7 +54,7 @@ export const BATCH_COMMANDS = {
 export function batchData(command, targets, customDbPath, opts = {}) {
   const entry = BATCH_COMMANDS[command];
   if (!entry) {
-    throw new Error(
+    throw new ConfigError(
       `Unknown batch command "${command}". Valid commands: ${Object.keys(BATCH_COMMANDS).join(', ')}`,
     );
   }

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 ───────────────────────────────────────────────────
 

package/src/{branch-compare.js → features/branch-compare.js}

@@ -11,9 +11,9 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import Database from 'better-sqlite3';
-import { buildGraph } from './builder.js';
-import { isTestFile } from './infrastructure/test-filter.js';
-import { kindIcon } from './queries.js';
+import { buildGraph } from '../domain/graph/builder.js';
+import { kindIcon } from '../domain/queries.js';
+import { isTestFile } from '../infrastructure/test-filter.js';
 
 // ─── Git Helpers ────────────────────────────────────────────────────────
 

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

@@ -7,14 +7,14 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import { CFG_RULES } from './ast-analysis/rules/index.js';
+import { CFG_RULES } from '../ast-analysis/rules/index.js';
 import {
   makeCfgRules as _makeCfgRules,
   buildExtensionSet,
   buildExtToLangMap,
-} from './ast-analysis/shared.js';
-import { walkWithVisitors } from './ast-analysis/visitor.js';
-import { createCfgVisitor } from './ast-analysis/visitors/cfg-visitor.js';
+} from '../ast-analysis/shared.js';
+import { walkWithVisitors } from '../ast-analysis/visitor.js';
+import { createCfgVisitor } from '../ast-analysis/visitors/cfg-visitor.js';
 import {
   deleteCfgForNode,
   getCfgBlocks,
@@ -22,14 +22,13 @@ import {
   getFunctionNodeId,
   hasCfgTables,
   openReadonlyOrFail,
-} from './db.js';
-import { isTestFile } from './infrastructure/test-filter.js';
-import { info } from './logger.js';
-import { paginateResult } from './paginate.js';
+} from '../db/index.js';
+import { info } from '../infrastructure/logger.js';
+import { isTestFile } from '../infrastructure/test-filter.js';
+import { paginateResult } from '../shared/paginate.js';
 
 // Re-export for backward compatibility
-export { CFG_RULES };
-export { _makeCfgRules as makeCfgRules };
+export { _makeCfgRules as makeCfgRules, CFG_RULES };
 
 const CFG_EXTENSIONS = buildExtensionSet(CFG_RULES);
 
@@ -105,13 +104,13 @@ export async function buildCFGData(db, fileSymbols, rootDir, _engineOpts) {
   }
 
   if (needsFallback) {
-    const { createParsers } = await import('./parser.js');
+    const { createParsers } = await import('../domain/parser.js');
     parsers = await createParsers();
   }
 
   let getParserFn = null;
   if (parsers) {
-    const mod = await import('./parser.js');
+    const mod = await import('../domain/parser.js');
     getParserFn = mod.getParser;
   }