@optave/codegraph 2.2.1 → 2.2.3-dev.44e8146

package/src/export.js

@@ -1,12 +1,15 @@
 import path from 'node:path';
 import { isTestFile } from './queries.js';
 
+const DEFAULT_MIN_CONFIDENCE = 0.5;
+
 /**
  * Export the dependency graph in DOT (Graphviz) format.
  */
 export function exportDOT(db, opts = {}) {
   const fileLevel = opts.fileLevel !== false;
   const noTests = opts.noTests || false;
+  const minConf = opts.minConfidence ?? DEFAULT_MIN_CONFIDENCE;
   const lines = [
     'digraph codegraph {',
     '  rankdir=LR;',
@@ -23,8 +26,9 @@ export function exportDOT(db, opts = {}) {
       JOIN nodes n1 ON e.source_id = n1.id
       JOIN nodes n2 ON e.target_id = n2.id
       WHERE n1.file != n2.file AND e.kind IN ('imports', 'imports-type', 'calls')
+        AND e.confidence >= ?
     `)
-      .all();
+      .all(minConf);
     if (noTests) edges = edges.filter((e) => !isTestFile(e.source) && !isTestFile(e.target));
 
     // Try to use directory nodes from DB (built by structure analysis)
@@ -102,8 +106,9 @@ export function exportDOT(db, opts = {}) {
       JOIN nodes n2 ON e.target_id = n2.id
       WHERE n1.kind IN ('function', 'method', 'class', 'interface', 'type', 'struct', 'enum', 'trait', 'record', 'module') AND n2.kind IN ('function', 'method', 'class', 'interface', 'type', 'struct', 'enum', 'trait', 'record', 'module')
       AND e.kind = 'calls'
+      AND e.confidence >= ?
     `)
-      .all();
+      .all(minConf);
     if (noTests)
       edges = edges.filter((e) => !isTestFile(e.source_file) && !isTestFile(e.target_file));
 
@@ -126,6 +131,7 @@ export function exportDOT(db, opts = {}) {
 export function exportMermaid(db, opts = {}) {
   const fileLevel = opts.fileLevel !== false;
   const noTests = opts.noTests || false;
+  const minConf = opts.minConfidence ?? DEFAULT_MIN_CONFIDENCE;
   const lines = ['graph LR'];
 
   if (fileLevel) {
@@ -136,8 +142,9 @@ export function exportMermaid(db, opts = {}) {
       JOIN nodes n1 ON e.source_id = n1.id
       JOIN nodes n2 ON e.target_id = n2.id
       WHERE n1.file != n2.file AND e.kind IN ('imports', 'imports-type', 'calls')
+        AND e.confidence >= ?
     `)
-      .all();
+      .all(minConf);
     if (noTests) edges = edges.filter((e) => !isTestFile(e.source) && !isTestFile(e.target));
 
     for (const { source, target } of edges) {
@@ -155,8 +162,9 @@ export function exportMermaid(db, opts = {}) {
       JOIN nodes n2 ON e.target_id = n2.id
       WHERE n1.kind IN ('function', 'method', 'class', 'interface', 'type', 'struct', 'enum', 'trait', 'record', 'module') AND n2.kind IN ('function', 'method', 'class', 'interface', 'type', 'struct', 'enum', 'trait', 'record', 'module')
       AND e.kind = 'calls'
+      AND e.confidence >= ?
     `)
-      .all();
+      .all(minConf);
     if (noTests)
       edges = edges.filter((e) => !isTestFile(e.source_file) && !isTestFile(e.target_file));
 
@@ -175,6 +183,7 @@ export function exportMermaid(db, opts = {}) {
  */
 export function exportJSON(db, opts = {}) {
   const noTests = opts.noTests || false;
+  const minConf = opts.minConfidence ?? DEFAULT_MIN_CONFIDENCE;
 
   let nodes = db
     .prepare(`
@@ -185,13 +194,13 @@ export function exportJSON(db, opts = {}) {
 
   let edges = db
     .prepare(`
-    SELECT DISTINCT n1.file AS source, n2.file AS target, e.kind
+    SELECT DISTINCT n1.file AS source, n2.file AS target, e.kind, e.confidence
     FROM edges e
     JOIN nodes n1 ON e.source_id = n1.id
     JOIN nodes n2 ON e.target_id = n2.id
-    WHERE n1.file != n2.file
+    WHERE n1.file != n2.file AND e.confidence >= ?
   `)
-    .all();
+    .all(minConf);
   if (noTests) edges = edges.filter((e) => !isTestFile(e.source) && !isTestFile(e.target));
 
   return { nodes, edges };

package/src/extractors/javascript.js

@@ -139,9 +139,11 @@ export function extractSymbols(tree, _filePath) {
           if (callInfo) {
             calls.push(callInfo);
           }
+          if (fn.type === 'member_expression') {
+            const cbDef = extractCallbackDefinition(node, fn);
+            if (cbDef) definitions.push(cbDef);
+          }
         }
-        const cbDef = extractCallbackDefinition(node);
-        if (cbDef) definitions.push(cbDef);
         break;
       }
 
@@ -320,10 +322,6 @@ function extractReceiverName(objNode) {
   if (objNode.type === 'identifier') return objNode.text;
   if (objNode.type === 'this') return 'this';
   if (objNode.type === 'super') return 'super';
-  if (objNode.type === 'member_expression') {
-    const prop = objNode.childForFieldName('property');
-    if (prop) return objNode.text;
-  }
   return objNode.text;
 }
 
@@ -432,8 +430,8 @@ const EXPRESS_METHODS = new Set([
 ]);
 const EVENT_METHODS = new Set(['on', 'once', 'addEventListener', 'addListener']);
 
-function extractCallbackDefinition(callNode) {
-  const fn = callNode.childForFieldName('function');
+function extractCallbackDefinition(callNode, fn) {
+  if (!fn) fn = callNode.childForFieldName('function');
   if (!fn || fn.type !== 'member_expression') return null;
 
   const prop = fn.childForFieldName('property');

package/src/index.js

@@ -21,7 +21,9 @@ export {
   buildEmbeddings,
   cosineSim,
   DEFAULT_MODEL,
+  EMBEDDING_STRATEGIES,
   embed,
+  estimateTokens,
   MODELS,
   multiSearchData,
   search,
@@ -41,6 +43,7 @@ export {
   ALL_SYMBOL_KINDS,
   contextData,
   diffImpactData,
+  diffImpactMermaid,
   explainData,
   FALSE_POSITIVE_CALLER_THRESHOLD,
   FALSE_POSITIVE_NAMES,

package/src/mcp.js

@@ -8,7 +8,7 @@
 import { createRequire } from 'node:module';
 import { findCycles } from './cycles.js';
 import { findDbPath } from './db.js';
-import { ALL_SYMBOL_KINDS } from './queries.js';
+import { ALL_SYMBOL_KINDS, diffImpactMermaid } from './queries.js';
 
 const REPO_PROP = {
   repo: {
@@ -201,6 +201,11 @@ const BASE_TOOLS = [
         ref: { type: 'string', description: 'Git ref to diff against (default: HEAD)' },
         depth: { type: 'number', description: 'Transitive caller depth', default: 3 },
         no_tests: { type: 'boolean', description: 'Exclude test files', default: false },
+        format: {
+          type: 'string',
+          enum: ['json', 'mermaid'],
+          description: 'Output format (default: json)',
+        },
       },
     },
   },
@@ -467,12 +472,21 @@ export async function startMCPServer(customDbPath, options = {}) {
           });
           break;
         case 'diff_impact':
-          result = diffImpactData(dbPath, {
-            staged: args.staged,
-            ref: args.ref,
-            depth: args.depth,
-            noTests: args.no_tests,
-          });
+          if (args.format === 'mermaid') {
+            result = diffImpactMermaid(dbPath, {
+              staged: args.staged,
+              ref: args.ref,
+              depth: args.depth,
+              noTests: args.no_tests,
+            });
+          } else {
+            result = diffImpactData(dbPath, {
+              staged: args.staged,
+              ref: args.ref,
+              depth: args.depth,
+              noTests: args.no_tests,
+            });
+          }
           break;
         case 'semantic_search': {
           const { searchData } = await import('./embedder.js');

package/src/queries.js

@@ -334,6 +334,7 @@ export function moduleMapData(customDbPath, limit = 20, opts = {}) {
     dir: path.dirname(n.file) || '.',
     inEdges: n.in_edges,
     outEdges: n.out_edges,
+    coupling: n.in_edges + n.out_edges,
   }));
 
   const totalNodes = db.prepare('SELECT COUNT(*) as c FROM nodes').get().c;
@@ -608,16 +609,34 @@ export function diffImpactData(customDbPath, opts = {}) {
 
   if (!diffOutput.trim()) {
     db.close();
-    return { changedFiles: 0, affectedFunctions: [], affectedFiles: [], summary: null };
+    return {
+      changedFiles: 0,
+      newFiles: [],
+      affectedFunctions: [],
+      affectedFiles: [],
+      summary: null,
+    };
   }
 
   const changedRanges = new Map();
+  const newFiles = new Set();
   let currentFile = null;
+  let prevIsDevNull = false;
   for (const line of diffOutput.split('\n')) {
+    if (line.startsWith('--- /dev/null')) {
+      prevIsDevNull = true;
+      continue;
+    }
+    if (line.startsWith('--- ')) {
+      prevIsDevNull = false;
+      continue;
+    }
     const fileMatch = line.match(/^\+\+\+ b\/(.+)/);
     if (fileMatch) {
       currentFile = fileMatch[1];
       if (!changedRanges.has(currentFile)) changedRanges.set(currentFile, []);
+      if (prevIsDevNull) newFiles.add(currentFile);
+      prevIsDevNull = false;
       continue;
     }
     const hunkMatch = line.match(/^@@ .+ \+(\d+)(?:,(\d+))? @@/);
@@ -630,7 +649,13 @@ export function diffImpactData(customDbPath, opts = {}) {
 
   if (changedRanges.size === 0) {
     db.close();
-    return { changedFiles: 0, affectedFunctions: [], affectedFiles: [], summary: null };
+    return {
+      changedFiles: 0,
+      newFiles: [],
+      affectedFunctions: [],
+      affectedFiles: [],
+      summary: null,
+    };
   }
 
   const affectedFunctions = [];
@@ -658,6 +683,10 @@ export function diffImpactData(customDbPath, opts = {}) {
     const visited = new Set([fn.id]);
     let frontier = [fn.id];
     let totalCallers = 0;
+    const levels = {};
+    const edges = [];
+    const idToKey = new Map();
+    idToKey.set(fn.id, `${fn.file}::${fn.name}:${fn.line}`);
     for (let d = 1; d <= maxDepth; d++) {
       const nextFrontier = [];
       for (const fid of frontier) {
@@ -673,6 +702,11 @@ export function diffImpactData(customDbPath, opts = {}) {
             visited.add(c.id);
             nextFrontier.push(c.id);
             allAffected.add(`${c.file}:${c.name}`);
+            const callerKey = `${c.file}::${c.name}:${c.line}`;
+            idToKey.set(c.id, callerKey);
+            if (!levels[d]) levels[d] = [];
+            levels[d].push({ name: c.name, kind: c.kind, file: c.file, line: c.line });
+            edges.push({ from: idToKey.get(fid), to: callerKey });
             totalCallers++;
           }
         }
@@ -686,6 +720,8 @@ export function diffImpactData(customDbPath, opts = {}) {
       file: fn.file,
       line: fn.line,
       transitiveCallers: totalCallers,
+      levels,
+      edges,
     };
   });
 
@@ -695,6 +731,7 @@ export function diffImpactData(customDbPath, opts = {}) {
   db.close();
   return {
     changedFiles: changedRanges.size,
+    newFiles: [...newFiles],
     affectedFunctions: functionResults,
     affectedFiles: [...affectedFiles],
     summary: {
@@ -705,6 +742,120 @@ export function diffImpactData(customDbPath, opts = {}) {
   };
 }
 
+export function diffImpactMermaid(customDbPath, opts = {}) {
+  const data = diffImpactData(customDbPath, opts);
+  if (data.error) return data.error;
+  if (data.changedFiles === 0 || data.affectedFunctions.length === 0) {
+    return 'flowchart TB\n    none["No impacted functions detected"]';
+  }
+
+  const newFileSet = new Set(data.newFiles || []);
+  const lines = ['flowchart TB'];
+
+  // Assign stable Mermaid node IDs
+  let nodeCounter = 0;
+  const nodeIdMap = new Map();
+  const nodeLabels = new Map();
+  function nodeId(key, label) {
+    if (!nodeIdMap.has(key)) {
+      nodeIdMap.set(key, `n${nodeCounter++}`);
+      if (label) nodeLabels.set(key, label);
+    }
+    return nodeIdMap.get(key);
+  }
+
+  // Register all nodes (changed functions + their callers)
+  for (const fn of data.affectedFunctions) {
+    nodeId(`${fn.file}::${fn.name}:${fn.line}`, fn.name);
+    for (const callers of Object.values(fn.levels || {})) {
+      for (const c of callers) {
+        nodeId(`${c.file}::${c.name}:${c.line}`, c.name);
+      }
+    }
+  }
+
+  // Collect all edges and determine blast radius
+  const allEdges = new Set();
+  const edgeFromNodes = new Set();
+  const edgeToNodes = new Set();
+  const changedKeys = new Set();
+
+  for (const fn of data.affectedFunctions) {
+    changedKeys.add(`${fn.file}::${fn.name}:${fn.line}`);
+    for (const edge of fn.edges || []) {
+      const edgeKey = `${edge.from}|${edge.to}`;
+      if (!allEdges.has(edgeKey)) {
+        allEdges.add(edgeKey);
+        edgeFromNodes.add(edge.from);
+        edgeToNodes.add(edge.to);
+      }
+    }
+  }
+
+  // Blast radius: caller nodes that are never a source (leaf nodes of the impact tree)
+  const blastRadiusKeys = new Set();
+  for (const key of edgeToNodes) {
+    if (!edgeFromNodes.has(key) && !changedKeys.has(key)) {
+      blastRadiusKeys.add(key);
+    }
+  }
+
+  // Intermediate callers: not changed, not blast radius
+  const intermediateKeys = new Set();
+  for (const key of edgeToNodes) {
+    if (!changedKeys.has(key) && !blastRadiusKeys.has(key)) {
+      intermediateKeys.add(key);
+    }
+  }
+
+  // Group changed functions by file
+  const fileGroups = new Map();
+  for (const fn of data.affectedFunctions) {
+    if (!fileGroups.has(fn.file)) fileGroups.set(fn.file, []);
+    fileGroups.get(fn.file).push(fn);
+  }
+
+  // Emit changed-file subgraphs
+  let sgCounter = 0;
+  for (const [file, fns] of fileGroups) {
+    const isNew = newFileSet.has(file);
+    const tag = isNew ? 'new' : 'modified';
+    const sgId = `sg${sgCounter++}`;
+    lines.push(`    subgraph ${sgId}["${file} **(${tag})**"]`);
+    for (const fn of fns) {
+      const key = `${fn.file}::${fn.name}:${fn.line}`;
+      lines.push(`        ${nodeIdMap.get(key)}["${fn.name}"]`);
+    }
+    lines.push('    end');
+    const style = isNew ? 'fill:#e8f5e9,stroke:#4caf50' : 'fill:#fff3e0,stroke:#ff9800';
+    lines.push(`    style ${sgId} ${style}`);
+  }
+
+  // Emit intermediate caller nodes (outside subgraphs)
+  for (const key of intermediateKeys) {
+    lines.push(`    ${nodeIdMap.get(key)}["${nodeLabels.get(key)}"]`);
+  }
+
+  // Emit blast radius subgraph
+  if (blastRadiusKeys.size > 0) {
+    const sgId = `sg${sgCounter++}`;
+    lines.push(`    subgraph ${sgId}["Callers **(blast radius)**"]`);
+    for (const key of blastRadiusKeys) {
+      lines.push(`        ${nodeIdMap.get(key)}["${nodeLabels.get(key)}"]`);
+    }
+    lines.push('    end');
+    lines.push(`    style ${sgId} fill:#f3e5f5,stroke:#9c27b0`);
+  }
+
+  // Emit edges (impact flows from changed fn toward callers)
+  for (const edgeKey of allEdges) {
+    const [from, to] = edgeKey.split('|');
+    lines.push(`    ${nodeIdMap.get(from)} --> ${nodeIdMap.get(to)}`);
+  }
+
+  return lines.join('\n');
+}
+
 export function listFunctionsData(customDbPath, opts = {}) {
   const db = openReadonlyOrFail(customDbPath);
   const noTests = opts.noTests || false;
@@ -1113,10 +1264,10 @@ export function moduleMap(customDbPath, limit = 20, opts = {}) {
   for (const [dir, files] of [...dirs].sort()) {
     console.log(`  [${dir}/]`);
     for (const f of files) {
-      const total = f.inEdges + f.outEdges;
-      const bar = '#'.repeat(Math.min(total, 40));
+      const coupling = f.inEdges + f.outEdges;
+      const bar = '#'.repeat(Math.min(coupling, 40));
       console.log(
-        `    ${path.basename(f.file).padEnd(35)} <-${String(f.inEdges).padStart(3)} ->${String(f.outEdges).padStart(3)}  ${bar}`,
+        `    ${path.basename(f.file).padEnd(35)} <-${String(f.inEdges).padStart(3)} ->${String(f.outEdges).padStart(3)}  =${String(coupling).padStart(3)}  ${bar}`,
       );
     }
   }
@@ -1770,6 +1921,7 @@ function explainFunctionImpl(db, target, noTests, getFileLines) {
 export function explainData(target, customDbPath, opts = {}) {
   const db = openReadonlyOrFail(customDbPath);
   const noTests = opts.noTests || false;
+  const depth = opts.depth || 0;
   const kind = isFileLikeTarget(target) ? 'file' : 'function';
 
   const dbPath = findDbPath(customDbPath);
@@ -1799,6 +1951,37 @@ export function explainData(target, customDbPath, opts = {}) {
       ? explainFileImpl(db, target, getFileLines)
       : explainFunctionImpl(db, target, noTests, getFileLines);
 
+  // Recursive dependency explanation for function targets
+  if (kind === 'function' && depth > 0 && results.length > 0) {
+    const visited = new Set(results.map((r) => `${r.name}:${r.file}:${r.line}`));
+
+    function explainCallees(parentResults, currentDepth) {
+      if (currentDepth <= 0) return;
+      for (const r of parentResults) {
+        const newCallees = [];
+        for (const callee of r.callees) {
+          const key = `${callee.name}:${callee.file}:${callee.line}`;
+          if (visited.has(key)) continue;
+          visited.add(key);
+          const calleeResults = explainFunctionImpl(db, callee.name, noTests, getFileLines);
+          const exact = calleeResults.find(
+            (cr) => cr.file === callee.file && cr.line === callee.line,
+          );
+          if (exact) {
+            exact._depth = (r._depth || 0) + 1;
+            newCallees.push(exact);
+          }
+        }
+        if (newCallees.length > 0) {
+          r.depDetails = newCallees;
+          explainCallees(newCallees, currentDepth - 1);
+        }
+      }
+    }
+
+    explainCallees(results, depth);
+  }
+
   db.close();
   return { target, kind, results };
 }
@@ -1858,46 +2041,63 @@ export function explain(target, customDbPath, opts = {}) {
       console.log();
     }
   } else {
-    for (const r of data.results) {
+    function printFunctionExplain(r, indent = '') {
       const lineRange = r.endLine ? `${r.line}-${r.endLine}` : `${r.line}`;
       const lineInfo = r.lineCount ? `${r.lineCount} lines` : '';
       const summaryPart = r.summary ? ` | ${r.summary}` : '';
-      console.log(`\n# ${r.name} (${r.kind})  ${r.file}:${lineRange}`);
+      const depthLevel = r._depth || 0;
+      const heading = depthLevel === 0 ? '#' : '##'.padEnd(depthLevel + 2, '#');
+      console.log(`\n${indent}${heading} ${r.name} (${r.kind})  ${r.file}:${lineRange}`);
       if (lineInfo || r.summary) {
-        console.log(`  ${lineInfo}${summaryPart}`);
+        console.log(`${indent}  ${lineInfo}${summaryPart}`);
       }
       if (r.signature) {
-        if (r.signature.params != null) console.log(`  Parameters: (${r.signature.params})`);
-        if (r.signature.returnType) console.log(`  Returns: ${r.signature.returnType}`);
+        if (r.signature.params != null)
+          console.log(`${indent}  Parameters: (${r.signature.params})`);
+        if (r.signature.returnType) console.log(`${indent}  Returns: ${r.signature.returnType}`);
       }
 
       if (r.callees.length > 0) {
-        console.log(`\n## Calls (${r.callees.length})`);
+        console.log(`\n${indent}  Calls (${r.callees.length}):`);
         for (const c of r.callees) {
-          console.log(`  ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
+          console.log(`${indent}    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
         }
       }
 
       if (r.callers.length > 0) {
-        console.log(`\n## Called by (${r.callers.length})`);
+        console.log(`\n${indent}  Called by (${r.callers.length}):`);
         for (const c of r.callers) {
-          console.log(`  ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
+          console.log(`${indent}    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
         }
       }
 
       if (r.relatedTests.length > 0) {
         const label = r.relatedTests.length === 1 ? 'file' : 'files';
-        console.log(`\n## Tests (${r.relatedTests.length} ${label})`);
+        console.log(`\n${indent}  Tests (${r.relatedTests.length} ${label}):`);
         for (const t of r.relatedTests) {
-          console.log(`  ${t.file}`);
+          console.log(`${indent}    ${t.file}`);
         }
       }
 
       if (r.callees.length === 0 && r.callers.length === 0) {
-        console.log(`  (no call edges found -- may be invoked dynamically or via re-exports)`);
+        console.log(
+          `${indent}  (no call edges found -- may be invoked dynamically or via re-exports)`,
+        );
+      }
+
+      // Render recursive dependency details
+      if (r.depDetails && r.depDetails.length > 0) {
+        console.log(`\n${indent}  --- Dependencies (depth ${depthLevel + 1}) ---`);
+        for (const dep of r.depDetails) {
+          printFunctionExplain(dep, `${indent}  `);
+        }
       }
       console.log();
     }
+
+    for (const r of data.results) {
+      printFunctionExplain(r);
+    }
   }
 }
 
@@ -2079,8 +2279,12 @@ export function fnImpact(name, customDbPath, opts = {}) {
 }
 
 export function diffImpact(customDbPath, opts = {}) {
+  if (opts.format === 'mermaid') {
+    console.log(diffImpactMermaid(customDbPath, opts));
+    return;
+  }
   const data = diffImpactData(customDbPath, opts);
-  if (opts.json) {
+  if (opts.json || opts.format === 'json') {
     console.log(JSON.stringify(data, null, 2));
     return;
   }

package/src/structure.js

@@ -231,7 +231,8 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
  */
 export function structureData(customDbPath, opts = {}) {
   const db = openReadonlyOrFail(customDbPath);
-  const filterDir = opts.directory || null;
+  const rawDir = opts.directory || null;
+  const filterDir = rawDir && normalizePath(rawDir) !== '.' ? rawDir : null;
   const maxDepth = opts.depth || null;
   const sortBy = opts.sort || 'files';
   const noTests = opts.noTests || false;

package/src/watcher.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { readFileSafe } from './builder.js';
 import { EXTENSIONS, IGNORE_DIRS, normalizePath } from './constants.js';
 import { initSchema, openDb } from './db.js';
 import { appendJournalEntries } from './journal.js';
@@ -35,7 +36,7 @@ async function updateFile(_db, rootDir, filePath, stmts, engineOpts, cache) {
 
   let code;
   try {
-    code = fs.readFileSync(filePath, 'utf-8');
+    code = readFileSafe(filePath);
   } catch (err) {
     warn(`Cannot read ${relPath}: ${err.message}`);
     return null;