codemap-ai 3.2.0 → 3.5.0

package/dist/cli.js

@@ -2,22 +2,408 @@
 
 import {
   FlowStorage
-} from "./chunk-LXZ73T7X.js";
+} from "./chunk-BRVRY5KT.js";
 
 // src/cli-flow.ts
 import { Command } from "commander";
 import { resolve as resolve3, join as join4 } from "path";
-import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync4, writeFileSync } from "fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync5, writeFileSync } from "fs";
 import { homedir } from "os";
 import chalk from "chalk";
 import ora from "ora";
 
 // src/flow/builder.ts
-import { readFileSync, statSync } from "fs";
+import { readFileSync as readFileSync2, statSync } from "fs";
 import { createHash } from "crypto";
 import { glob } from "glob";
 import { resolve, relative, extname } from "path";
 
+// src/analysis/class-hierarchy.ts
+function buildClassHierarchy(nodes) {
+  const classes = /* @__PURE__ */ new Map();
+  const children = /* @__PURE__ */ new Map();
+  const parents = /* @__PURE__ */ new Map();
+  for (const node of nodes) {
+    if (node.type === "class") {
+      const classNode = {
+        id: node.id,
+        name: node.name,
+        file: node.filePath,
+        line: node.startLine,
+        extends: node.extends || [],
+        methods: []
+        // Will populate in next step
+      };
+      classes.set(node.name, classNode);
+    }
+  }
+  for (const node of nodes) {
+    if (node.type === "method" && node.parentClass) {
+      const classNode = classes.get(node.parentClass);
+      if (classNode) {
+        classNode.methods.push(node.name);
+      }
+    }
+  }
+  for (const [className, classNode] of classes) {
+    for (const parentName of classNode.extends) {
+      if (!children.has(parentName)) {
+        children.set(parentName, []);
+      }
+      children.get(parentName).push(className);
+      if (!parents.has(className)) {
+        parents.set(className, []);
+      }
+      parents.get(className).push(parentName);
+    }
+  }
+  return {
+    classes,
+    children,
+    parents
+  };
+}
+function findMethodDefinition(className, methodName, hierarchy) {
+  const visited = /* @__PURE__ */ new Set();
+  const queue = [className];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (visited.has(current)) {
+      continue;
+    }
+    visited.add(current);
+    const classNode = hierarchy.classes.get(current);
+    if (classNode) {
+      if (classNode.methods.includes(methodName)) {
+        return classNode;
+      }
+      const parentNames = hierarchy.parents.get(current) || [];
+      for (const parent of parentNames) {
+        queue.push(parent);
+      }
+    }
+  }
+  return null;
+}
+function resolveMethodCall(instanceType, methodName, hierarchy) {
+  return findMethodDefinition(instanceType, methodName, hierarchy);
+}
+
+// src/flow/enhanced-resolver.ts
+var EnhancedResolver = class {
+  constructor(storage) {
+    this.storage = storage;
+  }
+  hierarchy = null;
+  variableTypes = /* @__PURE__ */ new Map();
+  /**
+   * Build class hierarchy from all nodes in storage
+   */
+  buildHierarchy() {
+    const nodes = this.getAllNodes();
+    this.hierarchy = buildClassHierarchy(nodes);
+  }
+  /**
+   * Load variable type information from storage
+   */
+  loadVariableTypes() {
+    const stmt = this.storage.db.prepare(`
+      SELECT * FROM variable_types
+    `);
+    const rows = stmt.all();
+    for (const row of rows) {
+      const scopeId = row.scope_node_id;
+      if (!this.variableTypes.has(scopeId)) {
+        this.variableTypes.set(scopeId, []);
+      }
+      this.variableTypes.get(scopeId).push({
+        name: row.variable_name,
+        type: row.type_name,
+        scope: scopeId,
+        line: row.line
+      });
+    }
+  }
+  /**
+   * Resolve all unresolved edges using type information
+   */
+  resolveAllCalls() {
+    if (!this.hierarchy) {
+      this.buildHierarchy();
+    }
+    this.loadVariableTypes();
+    const resolvedCalls = [];
+    const stmt = this.storage.db.prepare(`
+      SELECT * FROM edges
+      WHERE target_id LIKE 'ref:%'
+      AND type = 'calls'
+    `);
+    const edges = stmt.all();
+    for (const edgeRow of edges) {
+      const edge = {
+        id: edgeRow.id,
+        type: edgeRow.type,
+        sourceId: edgeRow.source_id,
+        targetId: edgeRow.target_id,
+        metadata: edgeRow.metadata ? JSON.parse(edgeRow.metadata) : void 0
+      };
+      const resolved = this.resolveCall(edge);
+      if (resolved.targetNode) {
+        resolvedCalls.push(resolved);
+        this.updateEdgeTarget(edge.id, resolved.targetNode.id);
+      }
+    }
+    return resolvedCalls;
+  }
+  /**
+   * Resolve a single call edge
+   */
+  resolveCall(edge) {
+    const unresolvedName = edge.metadata?.unresolvedName;
+    if (!unresolvedName) {
+      return {
+        originalEdge: edge,
+        targetNode: null,
+        confidence: "LOW",
+        reason: "No unresolved name in metadata"
+      };
+    }
+    const sourceNode = this.storage.getNode(edge.sourceId);
+    if (!sourceNode) {
+      return {
+        originalEdge: edge,
+        targetNode: null,
+        confidence: "LOW",
+        reason: "Source node not found"
+      };
+    }
+    if (!unresolvedName.includes(".")) {
+      return this.resolveSimpleCall(unresolvedName, sourceNode, edge);
+    }
+    return this.resolveMethodCall(unresolvedName, sourceNode, edge);
+  }
+  /**
+   * Resolve simple function call (no dot notation)
+   */
+  resolveSimpleCall(functionName, sourceNode, edge) {
+    const sameFileNodes = this.storage.getNodesByFile(sourceNode.filePath);
+    const localMatch = sameFileNodes.find(
+      (n) => (n.type === "function" || n.type === "method") && n.name === functionName
+    );
+    if (localMatch) {
+      return {
+        originalEdge: edge,
+        targetNode: localMatch,
+        confidence: "HIGH",
+        reason: "Found in same file"
+      };
+    }
+    const globalMatches = this.storage.searchNodesByName(functionName);
+    if (globalMatches.length === 1) {
+      return {
+        originalEdge: edge,
+        targetNode: globalMatches[0],
+        confidence: "MEDIUM",
+        reason: "Single global match"
+      };
+    }
+    if (globalMatches.length > 1) {
+      const sourceDir = sourceNode.filePath.split("/").slice(0, -1).join("/");
+      const sameDirMatch = globalMatches.find((n) => n.filePath.startsWith(sourceDir));
+      if (sameDirMatch) {
+        return {
+          originalEdge: edge,
+          targetNode: sameDirMatch,
+          confidence: "MEDIUM",
+          reason: "Multiple matches, picked same directory"
+        };
+      }
+      return {
+        originalEdge: edge,
+        targetNode: globalMatches[0],
+        confidence: "LOW",
+        reason: `Multiple matches (${globalMatches.length}), picked first`
+      };
+    }
+    return {
+      originalEdge: edge,
+      targetNode: null,
+      confidence: "LOW",
+      reason: "No matches found"
+    };
+  }
+  /**
+   * Resolve method call using type information
+   * Pattern: obj.method() or self.method()
+   */
+  resolveMethodCall(fullName, sourceNode, edge) {
+    const parts = fullName.split(".");
+    const varName = parts[0];
+    const methodName = parts.slice(1).join(".");
+    if (varName === "self" || varName === "this") {
+      return this.resolveSelfMethodCall(methodName, sourceNode, edge);
+    }
+    const scopeTypes = this.variableTypes.get(sourceNode.id) || [];
+    const varType = scopeTypes.find((v) => v.name === varName);
+    if (!varType) {
+      return this.resolveSimpleCall(methodName, sourceNode, edge);
+    }
+    if (!this.hierarchy) {
+      return {
+        originalEdge: edge,
+        targetNode: null,
+        confidence: "LOW",
+        reason: "Class hierarchy not built"
+      };
+    }
+    const classNode = resolveMethodCall(varType.type, methodName, this.hierarchy);
+    if (classNode) {
+      const methodNode = this.findMethodInClass(classNode.name, methodName);
+      if (methodNode) {
+        return {
+          originalEdge: edge,
+          targetNode: methodNode,
+          confidence: "HIGH",
+          reason: `Resolved via type tracking: ${varName}: ${varType.type}`
+        };
+      }
+    }
+    return {
+      originalEdge: edge,
+      targetNode: null,
+      confidence: "LOW",
+      reason: `Type found (${varType.type}) but method not resolved`
+    };
+  }
+  /**
+   * Resolve self.method() or this.method()
+   */
+  resolveSelfMethodCall(methodName, sourceNode, edge) {
+    const parentClass = sourceNode.metadata?.parentClass;
+    if (!parentClass) {
+      return {
+        originalEdge: edge,
+        targetNode: null,
+        confidence: "LOW",
+        reason: "self/this call but no parent class"
+      };
+    }
+    if (!this.hierarchy) {
+      return {
+        originalEdge: edge,
+        targetNode: null,
+        confidence: "LOW",
+        reason: "Class hierarchy not built"
+      };
+    }
+    const classNode = resolveMethodCall(parentClass, methodName, this.hierarchy);
+    if (classNode) {
+      const methodNode2 = this.findMethodInClass(classNode.name, methodName);
+      if (methodNode2) {
+        return {
+          originalEdge: edge,
+          targetNode: methodNode2,
+          confidence: "HIGH",
+          reason: `Resolved self.${methodName} in ${parentClass}`
+        };
+      }
+    }
+    const sameFileNodes = this.storage.getNodesByFile(sourceNode.filePath);
+    const methodNode = sameFileNodes.find(
+      (n) => n.type === "method" && n.name === methodName
+    );
+    if (methodNode) {
+      return {
+        originalEdge: edge,
+        targetNode: methodNode,
+        confidence: "MEDIUM",
+        reason: "Found method in same file"
+      };
+    }
+    return {
+      originalEdge: edge,
+      targetNode: null,
+      confidence: "LOW",
+      reason: `Method ${methodName} not found in ${parentClass}`
+    };
+  }
+  /**
+   * Find method node in a class
+   */
+  findMethodInClass(className, methodName) {
+    const stmt = this.storage.db.prepare(`
+      SELECT * FROM nodes
+      WHERE type = 'method'
+      AND name = ?
+      AND json_extract(metadata, '$.parentClass') = ?
+    `);
+    const row = stmt.get(methodName, className);
+    if (!row) return null;
+    return {
+      id: row.id,
+      type: row.type,
+      name: row.name,
+      filePath: row.file_path,
+      startLine: row.start_line,
+      endLine: row.end_line,
+      language: row.language,
+      metadata: row.metadata ? JSON.parse(row.metadata) : void 0
+    };
+  }
+  /**
+   * Get all nodes from storage
+   */
+  getAllNodes() {
+    const stmt = this.storage.db.prepare("SELECT * FROM nodes");
+    const rows = stmt.all();
+    return rows.map((row) => ({
+      id: row.id,
+      type: row.type,
+      name: row.name,
+      filePath: row.file_path,
+      startLine: row.start_line,
+      endLine: row.end_line,
+      language: row.language,
+      metadata: row.metadata ? JSON.parse(row.metadata) : void 0
+    }));
+  }
+  /**
+   * Update edge target in database
+   */
+  updateEdgeTarget(edgeId, newTargetId) {
+    const stmt = this.storage.db.prepare(`
+      UPDATE edges
+      SET target_id = ?
+      WHERE id = ?
+    `);
+    stmt.run(newTargetId, edgeId);
+  }
+  /**
+   * Get resolution statistics
+   */
+  getStats() {
+    const totalStmt = this.storage.db.prepare(`
+      SELECT COUNT(*) as count FROM edges WHERE type = 'calls'
+    `);
+    const totalRow = totalStmt.get();
+    const totalCalls = totalRow.count;
+    const resolvedStmt = this.storage.db.prepare(`
+      SELECT COUNT(*) as count FROM edges
+      WHERE type = 'calls' AND target_id NOT LIKE 'ref:%'
+    `);
+    const resolvedRow = resolvedStmt.get();
+    const resolvedCalls = resolvedRow.count;
+    const unresolvedCalls = totalCalls - resolvedCalls;
+    const resolutionRate = totalCalls > 0 ? resolvedCalls / totalCalls * 100 : 0;
+    return {
+      totalCalls,
+      resolvedCalls,
+      unresolvedCalls,
+      resolutionRate
+    };
+  }
+};
+
 // src/parsers/base.ts
 var BaseParser = class {
   nodeIdCounter = 0;
@@ -97,10 +483,13 @@ var TypeScriptParser = class extends BaseParser {
   language = "typescript";
   extensions = [".ts", ".tsx"];
   parser;
+  treeSitterParser;
+  // Expose for Phase 3
   constructor() {
     super();
     this.parser = new Parser();
     this.parser.setLanguage(TypeScript.typescript);
+    this.treeSitterParser = this.parser;
   }
   parse(filePath, content) {
     const analysis = this.createEmptyAnalysis(filePath);
@@ -272,31 +661,38 @@ var TypeScriptParser = class extends BaseParser {
   handleClass(node, filePath, analysis, parentId) {
     const nameNode = node.childForFieldName("name");
     if (!nameNode) return;
+    const extends_ = [];
+    for (const child of node.children) {
+      if (child.type === "class_heritage") {
+        const extendsClause = child.children.find((c) => c.type === "extends_clause");
+        if (extendsClause) {
+          const baseClass = extendsClause.children.find((c) => c.type === "identifier");
+          if (baseClass) {
+            extends_.push(baseClass.text);
+          }
+        }
+      }
+    }
     const classNode = this.createNode(
       "class",
       nameNode.text,
       filePath,
       node.startPosition.row + 1,
-      node.endPosition.row + 1
+      node.endPosition.row + 1,
+      {
+        extends: extends_
+      }
     );
     analysis.nodes.push(classNode);
     analysis.edges.push(
       this.createEdge("contains", parentId, classNode.id)
     );
-    for (const child of node.children) {
-      if (child.type === "class_heritage") {
-        const extendsClause = child.children.find((c) => c.type === "extends_clause");
-        if (extendsClause) {
-          const baseClass = extendsClause.children.find((c) => c.type === "identifier");
-          if (baseClass) {
-            analysis.edges.push(
-              this.createEdge("extends", classNode.id, `ref:${baseClass.text}`, {
-                unresolvedName: baseClass.text
-              })
-            );
-          }
-        }
-      }
+    for (const baseClass of extends_) {
+      analysis.edges.push(
+        this.createEdge("extends", classNode.id, `ref:${baseClass}`, {
+          unresolvedName: baseClass
+        })
+      );
     }
     const body = node.childForFieldName("body");
     if (body) {
@@ -310,6 +706,8 @@ var TypeScriptParser = class extends BaseParser {
   handleMethod(node, filePath, analysis, parentId) {
     const nameNode = node.childForFieldName("name");
     if (!nameNode) return;
+    const parentNode = analysis.nodes.find((n) => n.id === parentId);
+    const parentClass = parentNode?.type === "class" ? parentNode.name : void 0;
     const methodNode = this.createNode(
       "method",
       nameNode.text,
@@ -318,7 +716,8 @@ var TypeScriptParser = class extends BaseParser {
       node.endPosition.row + 1,
       {
         static: node.children.some((c) => c.type === "static"),
-        async: node.children.some((c) => c.type === "async")
+        async: node.children.some((c) => c.type === "async"),
+        parentClass
       }
     );
     analysis.nodes.push(methodNode);
@@ -378,6 +777,7 @@ var JavaScriptParser = class extends TypeScriptParser {
     super();
     this.parser = new Parser();
     this.parser.setLanguage(JavaScript);
+    this.treeSitterParser = this.parser;
   }
   parse(filePath, content) {
     const sourceCode = typeof content === "string" ? content : String(content);
@@ -402,10 +802,13 @@ var PythonParser = class extends BaseParser {
   language = "python";
   extensions = [".py"];
   parser;
+  treeSitterParser;
+  // Expose for Phase 3
   constructor() {
     super();
     this.parser = new Parser2();
     this.parser.setLanguage(Python);
+    this.treeSitterParser = this.parser;
   }
   parse(filePath, content) {
     const analysis = this.createEmptyAnalysis(filePath);
@@ -753,6 +1156,8 @@ var PythonParser = class extends BaseParser {
       node.endPosition.row + 1,
       {
         bases,
+        extends: bases,
+        // Add extends for consistency with TypeScript
         isPrivate: name.startsWith("_")
       }
     );
@@ -790,6 +1195,8 @@ var PythonParser = class extends BaseParser {
     const nameNode = node.childForFieldName("name");
     if (!nameNode) return;
     const name = nameNode.text;
+    const parentNode = analysis.nodes.find((n) => n.id === classId);
+    const parentClass = parentNode?.type === "class" ? parentNode.name : void 0;
     const decorators = [];
     if (node.parent?.type === "decorated_definition") {
       for (const sibling of node.parent.children) {
@@ -818,7 +1225,8 @@ var PythonParser = class extends BaseParser {
         classmethod: isClassMethod,
         property: isProperty,
         isPrivate: name.startsWith("_"),
-        isDunder: name.startsWith("__") && name.endsWith("__")
+        isDunder: name.startsWith("__") && name.endsWith("__"),
+        parentClass
       }
     );
     analysis.nodes.push(methodNode);
@@ -961,6 +1369,614 @@ function registerAllParsers() {
 }
 registerAllParsers();
 
+// src/flow/phase3-analyzer.ts
+import { readFileSync } from "fs";
+
+// src/analysis/property-tracker.ts
+function extractPropertyAccesses(functionNode, scopeId, scopeName, filePath) {
+  const accesses = [];
+  const isJS = /\.(js|ts|jsx|tsx)$/.test(filePath);
+  const isPython = /\.py$/.test(filePath);
+  if (isJS) {
+    extractJavaScriptPropertyAccesses(functionNode, scopeId, scopeName, accesses);
+  } else if (isPython) {
+    extractPythonPropertyAccesses(functionNode, scopeId, scopeName, accesses);
+  }
+  return accesses;
+}
+function extractJavaScriptPropertyAccesses(node, scopeId, scopeName, accesses) {
+  traverseNode(node, (current) => {
+    if (current.type === "member_expression") {
+      const access = parseJavaScriptMemberExpression(current, scopeId);
+      if (access) {
+        accesses.push(access);
+      }
+    }
+    if (current.type === "optional_chain") {
+      const memberExpr = current.children.find((c) => c.type === "member_expression");
+      if (memberExpr) {
+        const access = parseJavaScriptMemberExpression(memberExpr, scopeId);
+        if (access) {
+          access.accessType = "optional";
+          accesses.push(access);
+        }
+      }
+    }
+    if (current.type === "subscript_expression") {
+      const access = parseJavaScriptSubscript(current, scopeId);
+      if (access) {
+        accesses.push(access);
+      }
+    }
+  });
+}
+function parseJavaScriptMemberExpression(node, scopeId) {
+  const propertyPath = [];
+  let objectName = "";
+  let currentNode = node;
+  while (currentNode && currentNode.type === "member_expression") {
+    const propertyNode = currentNode.childForFieldName("property");
+    if (propertyNode) {
+      propertyPath.unshift(propertyNode.text);
+    }
+    const objectNode = currentNode.childForFieldName("object");
+    if (!objectNode) break;
+    if (objectNode.type === "identifier") {
+      objectName = objectNode.text;
+      break;
+    } else if (objectNode.type === "member_expression") {
+      currentNode = objectNode;
+    } else {
+      return null;
+    }
+  }
+  if (!objectName || isCommonJavaScriptObject(objectName)) {
+    return null;
+  }
+  if (propertyPath.length === 0) {
+    return null;
+  }
+  return {
+    objectName,
+    propertyPath,
+    fullPath: `${objectName}.${propertyPath.join(".")}`,
+    line: node.startPosition.row + 1,
+    scopeId,
+    accessType: "dot"
+  };
+}
+function parseJavaScriptSubscript(node, scopeId) {
+  const objectNode = node.childForFieldName("object");
+  const indexNode = node.childForFieldName("index");
+  if (!objectNode || !indexNode) return null;
+  if (indexNode.type !== "string") return null;
+  const objectName = objectNode.text;
+  const propertyName = indexNode.text.replace(/['"]/g, "");
+  if (isCommonJavaScriptObject(objectName)) {
+    return null;
+  }
+  return {
+    objectName,
+    propertyPath: [propertyName],
+    fullPath: `${objectName}.${propertyName}`,
+    line: node.startPosition.row + 1,
+    scopeId,
+    accessType: "bracket"
+  };
+}
+function extractPythonPropertyAccesses(node, scopeId, scopeName, accesses) {
+  traverseNode(node, (current) => {
+    if (current.type === "attribute") {
+      const access = parsePythonAttribute(current, scopeId);
+      if (access) {
+        accesses.push(access);
+      }
+    }
+    if (current.type === "subscript") {
+      const access = parsePythonSubscript(current, scopeId);
+      if (access) {
+        accesses.push(access);
+      }
+    }
+  });
+}
+function parsePythonAttribute(node, scopeId) {
+  const propertyPath = [];
+  let objectName = "";
+  let currentNode = node;
+  while (currentNode && currentNode.type === "attribute") {
+    const attrNode = currentNode.childForFieldName("attribute");
+    if (attrNode) {
+      propertyPath.unshift(attrNode.text);
+    }
+    const objectNode = currentNode.childForFieldName("object");
+    if (!objectNode) break;
+    if (objectNode.type === "identifier") {
+      objectName = objectNode.text;
+      break;
+    } else if (objectNode.type === "attribute") {
+      currentNode = objectNode;
+    } else {
+      return null;
+    }
+  }
+  if (!objectName || isCommonPythonObject(objectName)) {
+    return null;
+  }
+  if (propertyPath.length === 0) {
+    return null;
+  }
+  return {
+    objectName,
+    propertyPath,
+    fullPath: `${objectName}.${propertyPath.join(".")}`,
+    line: node.startPosition.row + 1,
+    scopeId,
+    accessType: "dot"
+  };
+}
+function parsePythonSubscript(node, scopeId) {
+  const valueNode = node.childForFieldName("value");
+  const subscriptChildren = node.children.filter(
+    (c) => c.type === "string" || c.type === "identifier"
+  );
+  if (!valueNode || subscriptChildren.length === 0) return null;
+  const keyNode = subscriptChildren.find((c) => c.type === "string");
+  if (!keyNode) return null;
+  const objectName = valueNode.text;
+  const stringContent = keyNode.children.find((c) => c.type === "string_content");
+  const propertyName = stringContent ? stringContent.text : keyNode.text.replace(/['"]/g, "");
+  if (isCommonPythonObject(objectName)) {
+    return null;
+  }
+  return {
+    objectName,
+    propertyPath: [propertyName],
+    fullPath: `${objectName}.${propertyName}`,
+    line: node.startPosition.row + 1,
+    scopeId,
+    accessType: "bracket"
+  };
+}
+function traverseNode(node, visitor) {
+  visitor(node);
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child) {
+      traverseNode(child, visitor);
+    }
+  }
+}
+function isCommonJavaScriptObject(name) {
+  const commonObjects = /* @__PURE__ */ new Set([
+    // Global objects
+    "console",
+    "window",
+    "document",
+    "process",
+    "global",
+    // Common libraries
+    "Math",
+    "JSON",
+    "Date",
+    "Array",
+    "Object",
+    "String",
+    "Number",
+    // Keywords
+    "this",
+    "super",
+    // Common module patterns
+    "exports",
+    "module",
+    "require"
+  ]);
+  return commonObjects.has(name);
+}
+function isCommonPythonObject(name) {
+  const commonObjects = /* @__PURE__ */ new Set([
+    // Keywords
+    "self",
+    "cls",
+    // Built-in types
+    "str",
+    "int",
+    "float",
+    "dict",
+    "list",
+    "tuple",
+    "set",
+    // Common modules
+    "os",
+    "sys",
+    "json",
+    "math",
+    "datetime"
+  ]);
+  return commonObjects.has(name);
+}
+
+// src/analysis/return-analyzer.ts
+function analyzeReturnStatements(functionNode, functionId, functionName, filePath) {
+  const returns = [];
+  const isJS = /\.(js|ts|jsx|tsx)$/.test(filePath);
+  const isPython = /\.py$/.test(filePath);
+  if (isJS) {
+    extractJavaScriptReturns(functionNode, functionId, functionName, returns);
+  } else if (isPython) {
+    extractPythonReturns(functionNode, functionId, functionName, returns);
+  }
+  return returns;
+}
+function extractJavaScriptReturns(node, functionId, functionName, returns) {
+  traverseNode2(node, (current) => {
+    if (current.type === "return_statement") {
+      const returnNode = current.children.find(
+        (c) => c.type !== "return" && c.type !== ";"
+      );
+      if (returnNode) {
+        const returnInfo = parseJavaScriptReturnValue(
+          returnNode,
+          functionId,
+          functionName
+        );
+        if (returnInfo) {
+          returns.push(returnInfo);
+        }
+      }
+    }
+  });
+}
+function parseJavaScriptReturnValue(returnNode, functionId, functionName) {
+  const line = returnNode.startPosition.row + 1;
+  const returnExpression = returnNode.text;
+  let returnType = null;
+  let objectShape = null;
+  if (returnNode.type === "object") {
+    objectShape = extractJavaScriptObjectShape(returnNode);
+    returnType = "object";
+  } else if (returnNode.type === "array") {
+    returnType = "array";
+    objectShape = {
+      properties: [],
+      propertyTypes: /* @__PURE__ */ new Map(),
+      nestedShapes: /* @__PURE__ */ new Map(),
+      isArray: true,
+      isDictionary: false,
+      isOptional: false
+    };
+  } else if (returnNode.type === "new_expression") {
+    const constructorNode = returnNode.childForFieldName("constructor");
+    if (constructorNode) {
+      returnType = constructorNode.text;
+    }
+  } else if (returnNode.type === "identifier") {
+    returnType = `@var:${returnNode.text}`;
+  } else if (returnNode.type === "call_expression") {
+    const funcNode = returnNode.childForFieldName("function");
+    if (funcNode) {
+      returnType = `@call:${funcNode.text}`;
+    }
+  }
+  return {
+    functionId,
+    functionName,
+    returnType,
+    objectShape,
+    line,
+    returnExpression
+  };
+}
+function extractJavaScriptObjectShape(objectNode) {
+  const properties = [];
+  const propertyTypes = /* @__PURE__ */ new Map();
+  const nestedShapes = /* @__PURE__ */ new Map();
+  for (const child of objectNode.children) {
+    if (child.type === "pair") {
+      const keyNode = child.childForFieldName("key");
+      const valueNode = child.childForFieldName("value");
+      if (keyNode) {
+        const propertyName = keyNode.text.replace(/['"]/g, "");
+        properties.push(propertyName);
+        if (valueNode) {
+          const propertyType = inferJavaScriptType(valueNode);
+          propertyTypes.set(propertyName, propertyType);
+          if (valueNode.type === "object") {
+            const nestedShape = extractJavaScriptObjectShape(valueNode);
+            nestedShapes.set(propertyName, nestedShape);
+          }
+        }
+      }
+    }
+  }
+  return {
+    properties,
+    propertyTypes,
+    nestedShapes,
+    isArray: false,
+    isDictionary: false,
+    isOptional: false
+  };
+}
+function inferJavaScriptType(valueNode) {
+  switch (valueNode.type) {
+    case "number":
+      return "number";
+    case "string":
+    case "template_string":
+      return "string";
+    case "true":
+    case "false":
+      return "boolean";
+    case "null":
+      return "null";
+    case "undefined":
+      return "undefined";
+    case "array":
+      return "array";
+    case "object":
+      return "object";
+    case "arrow_function":
+    case "function_expression":
+      return "function";
+    case "identifier":
+      return `@var:${valueNode.text}`;
+    case "call_expression":
+      return "@call";
+    default:
+      return "unknown";
+  }
+}
+function extractPythonReturns(node, functionId, functionName, returns) {
+  traverseNode2(node, (current) => {
+    if (current.type === "return_statement") {
+      const returnNode = current.children.find((c) => c.type !== "return");
+      if (returnNode) {
+        const returnInfo = parsePythonReturnValue(
+          returnNode,
+          functionId,
+          functionName
+        );
+        if (returnInfo) {
+          returns.push(returnInfo);
+        }
+      }
+    }
+  });
+}
+function parsePythonReturnValue(returnNode, functionId, functionName) {
+  const line = returnNode.startPosition.row + 1;
+  const returnExpression = returnNode.text;
+  let returnType = null;
+  let objectShape = null;
+  if (returnNode.type === "dictionary") {
+    objectShape = extractPythonDictionaryShape(returnNode);
+    returnType = "dict";
+  } else if (returnNode.type === "list") {
+    returnType = "list";
+    objectShape = {
+      properties: [],
+      propertyTypes: /* @__PURE__ */ new Map(),
+      nestedShapes: /* @__PURE__ */ new Map(),
+      isArray: true,
+      isDictionary: false,
+      isOptional: false
+    };
+  } else if (returnNode.type === "call") {
+    const funcNode = returnNode.childForFieldName("function");
+    if (funcNode) {
+      const funcName = funcNode.text;
+      if (funcName[0] === funcName[0].toUpperCase()) {
+        returnType = funcName;
+      } else {
+        returnType = `@call:${funcName}`;
+      }
+    }
+  } else if (returnNode.type === "identifier") {
+    returnType = `@var:${returnNode.text}`;
+  } else if (returnNode.type === "list_comprehension") {
+    returnType = "list";
+    objectShape = {
+      properties: [],
+      propertyTypes: /* @__PURE__ */ new Map(),
+      nestedShapes: /* @__PURE__ */ new Map(),
+      isArray: true,
+      isDictionary: false,
+      isOptional: false
+    };
+  }
+  return {
+    functionId,
+    functionName,
+    returnType,
+    objectShape,
+    line,
+    returnExpression
+  };
+}
+function extractPythonDictionaryShape(dictNode) {
+  const properties = [];
+  const propertyTypes = /* @__PURE__ */ new Map();
+  const nestedShapes = /* @__PURE__ */ new Map();
+  for (const child of dictNode.children) {
+    if (child.type === "pair") {
+      const keyNode = child.children.find((c) => c.type === "string");
+      const valueNode = child.children.find(
+        (c) => c.type !== "string" && c.type !== ":"
+      );
+      if (keyNode) {
+        const stringContent = keyNode.children.find(
+          (c) => c.type === "string_content"
+        );
+        const propertyName = stringContent ? stringContent.text : keyNode.text.replace(/['"]/g, "");
+        properties.push(propertyName);
+        if (valueNode) {
+          const propertyType = inferPythonType(valueNode);
+          propertyTypes.set(propertyName, propertyType);
+          if (valueNode.type === "dictionary") {
+            const nestedShape = extractPythonDictionaryShape(valueNode);
+            nestedShapes.set(propertyName, nestedShape);
+          }
+        }
+      }
+    }
+  }
+  return {
+    properties,
+    propertyTypes,
+    nestedShapes,
+    isArray: false,
+    isDictionary: true,
+    isOptional: false
+  };
+}
+function inferPythonType(valueNode) {
+  switch (valueNode.type) {
+    case "integer":
+    case "float":
+      return "number";
+    case "string":
+      return "string";
+    case "true":
+    case "false":
+      return "boolean";
+    case "none":
+      return "None";
+    case "list":
+      return "list";
+    case "dictionary":
+      return "dict";
+    case "lambda":
+      return "function";
+    case "identifier":
+      return `@var:${valueNode.text}`;
+    case "call":
+      return "@call";
+    default:
+      return "unknown";
+  }
+}
+function traverseNode2(node, visitor) {
+  visitor(node);
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child) {
+      traverseNode2(child, visitor);
+    }
+  }
+}
+
+// src/flow/storage-queries-phase3.ts
+import { randomUUID } from "crypto";
+function storePropertyAccesses(db, accesses) {
+  const stmt = db.prepare(`
+    INSERT OR REPLACE INTO property_accesses
+    (id, scope_node_id, object_name, property_path, full_path, access_type, file_path, line)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+  `);
+  const insert = db.transaction((accesses2) => {
+    for (const access of accesses2) {
+      stmt.run(
+        randomUUID(),
+        access.scopeId,
+        access.objectName,
+        JSON.stringify(access.propertyPath),
+        access.fullPath,
+        access.accessType,
+        access.filePath || "",
+        access.line
+      );
+    }
+  });
+  insert(accesses);
+}
+function storeReturnInfo(db, returns) {
+  const stmt = db.prepare(`
+    INSERT OR REPLACE INTO return_shapes
+    (id, function_id, return_type, object_shape, line, return_expression)
+    VALUES (?, ?, ?, ?, ?, ?)
+  `);
+  const insert = db.transaction((returns2) => {
+    for (const ret of returns2) {
+      stmt.run(
+        randomUUID(),
+        ret.functionId,
+        ret.returnType,
+        ret.objectShape ? JSON.stringify(serializeObjectShape(ret.objectShape)) : null,
+        ret.line,
+        ret.returnExpression
+      );
+    }
+  });
+  insert(returns);
+}
+function serializeObjectShape(shape) {
+  return {
+    properties: shape.properties,
+    propertyTypes: Array.from(shape.propertyTypes.entries()),
+    nestedShapes: Array.from(shape.nestedShapes.entries()).map(([key, nested]) => [
+      key,
+      serializeObjectShape(nested)
+    ]),
+    isArray: shape.isArray,
+    isDictionary: shape.isDictionary,
+    isOptional: shape.isOptional
+  };
+}
+
+// src/flow/phase3-analyzer.ts
+function analyzeFileForPhase3(filePath, functionNodes, db) {
+  try {
+    const language = getLanguageFromPath(filePath);
+    if (!language) return;
+    const parserInstance = parserRegistry.getByLanguage(language);
+    if (!parserInstance || !parserInstance.treeSitterParser) return;
+    const content = readFileSync(filePath, "utf-8");
+    const tree = parserInstance.treeSitterParser.parse(content);
+    const rootNode = tree.rootNode;
+    for (const func of functionNodes) {
+      const funcNode = findNodeAtLine(rootNode, func.startLine, func.endLine);
+      if (!funcNode) continue;
+      const accesses = extractPropertyAccesses(funcNode, func.id, func.name, filePath);
+      if (accesses.length > 0) {
+        const accessesWithFile = accesses.map((a) => ({ ...a, filePath }));
+        storePropertyAccesses(db, accessesWithFile);
+      }
+      const returns = analyzeReturnStatements(funcNode, func.id, func.name, filePath);
+      if (returns.length > 0) {
+        storeReturnInfo(db, returns);
+      }
+    }
+  } catch (error) {
+  }
+}
+function getLanguageFromPath(filePath) {
+  if (filePath.endsWith(".py")) return "python";
+  if (filePath.endsWith(".js") || filePath.endsWith(".jsx")) return "javascript";
+  if (filePath.endsWith(".ts") || filePath.endsWith(".tsx")) return "typescript";
+  return null;
+}
+function findNodeAtLine(node, startLine, endLine) {
+  const nodeStart = node.startPosition.row + 1;
+  const nodeEnd = node.endPosition.row + 1;
+  if (nodeStart === startLine && nodeEnd === endLine) {
+    return node;
+  }
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child) {
+      const result = findNodeAtLine(child, startLine, endLine);
+      if (result) return result;
+    }
+  }
+  if (nodeStart <= startLine && nodeEnd >= endLine) {
+    if (node.type === "function_definition" || node.type === "function_declaration" || node.type === "method_definition" || node.type === "arrow_function" || node.type === "function_expression") {
+      return node;
+    }
+  }
+  return null;
+}
+
 // src/flow/builder.ts
 var FlowBuilder = class {
   storage;
@@ -988,7 +2004,7 @@ var FlowBuilder = class {
     const filesToIndex = [];
     let skipped = 0;
     for (const filePath of allFiles) {
-      const content = readFileSync(filePath, "utf-8");
+      const content = readFileSync2(filePath, "utf-8");
       const hash = this.hashContent(content);
       if (!this.config.forceReindex) {
         const existingHash = this.storage.getFileHash(filePath);
@@ -1021,6 +2037,12 @@ var FlowBuilder = class {
       currentFile: ""
     });
     this.resolveAllCalls();
+    const enhancedResolver = new EnhancedResolver(this.storage);
+    enhancedResolver.buildHierarchy();
+    const enhancedResolved = enhancedResolver.resolveAllCalls();
+    if (enhancedResolved.length > 0) {
+      console.log(`\u2728 Enhanced resolver: resolved ${enhancedResolved.length} additional calls`);
+    }
     const stats = this.storage.getStats();
     this.emitProgress({
       phase: "complete",
@@ -1066,7 +2088,7 @@ var FlowBuilder = class {
   }
   async parseAndStore(filePath, hash, rootPath) {
     const language = this.getLanguage(filePath);
-    const content = readFileSync(filePath, "utf-8");
+    const content = readFileSync2(filePath, "utf-8");
     const parser = parserRegistry.getByLanguage(language);
     if (!parser) {
       throw new Error(`No parser found for language: ${language}`);
@@ -1103,6 +2125,15 @@ var FlowBuilder = class {
         );
       }
     }
+    const functionNodes = analysis.nodes.filter((n) => n.type === "function" || n.type === "method").map((n) => ({
+      id: n.id,
+      name: n.name,
+      startLine: n.startLine,
+      endLine: n.endLine
+    }));
+    if (functionNodes.length > 0) {
+      analyzeFileForPhase3(filePath, functionNodes, this.storage.db);
+    }
     if (analysis.databaseOperations) {
       for (const dbOp of analysis.databaseOperations) {
         this.storage.insertDatabaseOperation({
@@ -1382,9 +2413,90 @@ function getGitStatus(rootPath) {
 }
 
 // src/analysis/imports.ts
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
+function isJavaScriptBuiltin(identifier) {
+  const builtins = /* @__PURE__ */ new Set([
+    "Object",
+    "Array",
+    "String",
+    "Number",
+    "Boolean",
+    "Date",
+    "RegExp",
+    "Error",
+    "TypeError",
+    "SyntaxError",
+    "ReferenceError",
+    "Promise",
+    "Map",
+    "Set",
+    "WeakMap",
+    "WeakSet",
+    "JSON",
+    "Math",
+    "Infinity",
+    "NaN",
+    "undefined",
+    "Function",
+    "Symbol",
+    "Proxy",
+    "Reflect",
+    "Int8Array",
+    "Uint8Array",
+    "Int16Array",
+    "Uint16Array",
+    "Int32Array",
+    "Uint32Array",
+    "Float32Array",
+    "Float64Array",
+    "BigInt",
+    "ArrayBuffer",
+    "DataView",
+    "Intl",
+    "WebAssembly",
+    "Buffer",
+    "URL",
+    "URLSearchParams",
+    "console",
+    "process",
+    "global",
+    "window",
+    "document",
+    // Common keywords that look like types
+    "TRUE",
+    "FALSE",
+    "NULL"
+  ]);
+  return builtins.has(identifier);
+}
+function isPythonBuiltin(identifier) {
+  const builtins = /* @__PURE__ */ new Set([
+    "True",
+    "False",
+    "None",
+    "Exception",
+    "BaseException",
+    "ValueError",
+    "TypeError",
+    "KeyError",
+    "AttributeError",
+    "IndexError",
+    "RuntimeError",
+    "NotImplementedError",
+    "Dict",
+    "List",
+    "Tuple",
+    "Set",
+    "FrozenSet",
+    "Optional",
+    "Union",
+    "Any",
+    "Callable"
+  ]);
+  return builtins.has(identifier);
+}
 function analyzeJavaScriptImports(filePath) {
-  const content = readFileSync2(filePath, "utf-8");
+  const content = readFileSync3(filePath, "utf-8");
   const lines = content.split("\n");
   const imports = /* @__PURE__ */ new Map();
   for (let i = 0; i < lines.length; i++) {
@@ -1423,19 +2535,52 @@ function analyzeJavaScriptImports(filePath) {
     }
   }
   const missing = [];
-  const commonLibraries = ["express", "cors", "winston", "Redis", "MongoClient", "mongoose", "axios"];
-  for (const lib of commonLibraries) {
-    if (!imports.has(lib)) {
+  const localDefinitions = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const classMatch = line.match(/^(?:export\s+)?class\s+([A-Z][a-zA-Z0-9]*)/);
+    if (classMatch) {
+      localDefinitions.add(classMatch[1]);
+    }
+    const funcMatch = line.match(/^(?:export\s+)?(?:async\s+)?function\s+([A-Z][a-zA-Z0-9]*)/);
+    if (funcMatch) {
+      localDefinitions.add(funcMatch[1]);
+    }
+    const constMatch = line.match(/^(?:export\s+)?const\s+([A-Z][a-z][a-zA-Z0-9]*)\s*=/);
+    if (constMatch) {
+      localDefinitions.add(constMatch[1]);
+    }
+  }
+  const potentialImports = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lines.length; i++) {
+    let line = lines[i];
+    if (line.trim().startsWith("import ") || line.trim().startsWith("//") || line.trim().startsWith("*") || line.trim().startsWith("#")) {
+      continue;
+    }
+    line = line.replace(/\/\/.*$/g, "");
+    line = line.replace(/\/\*.*?\*\//g, "");
+    line = line.replace(/[`"'].*?[`"']/g, "");
+    const matches = line.matchAll(/(?<!\.)([A-Z][a-z][a-zA-Z0-9]*)(?!\.)/g);
+    for (const match of matches) {
+      const identifier = match[1];
+      if (!isJavaScriptBuiltin(identifier)) {
+        potentialImports.add(identifier);
+      }
+    }
+  }
+  for (const identifier of potentialImports) {
+    if (!imports.has(identifier) && !localDefinitions.has(identifier)) {
       const usageLines = [];
       for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
-        if (line.includes(lib) && !line.trim().startsWith("//")) {
+        const regex = new RegExp(`\\b${identifier}\\b`);
+        if (regex.test(line) && !line.trim().startsWith("//")) {
           usageLines.push(i + 1);
         }
       }
       if (usageLines.length > 0) {
         missing.push({
-          identifier: lib,
+          identifier,
           line: usageLines[0],
           type: "missing",
           usedAt: usageLines
@@ -1446,7 +2591,7 @@ function analyzeJavaScriptImports(filePath) {
   return { missing, unused };
 }
 function analyzePythonImports(filePath) {
-  const content = readFileSync2(filePath, "utf-8");
+  const content = readFileSync3(filePath, "utf-8");
   const lines = content.split("\n");
   const imports = /* @__PURE__ */ new Map();
   for (let i = 0; i < lines.length; i++) {
@@ -1484,7 +2629,56 @@ function analyzePythonImports(filePath) {
       unused.push({ identifier, line, type: "unused" });
     }
   }
-  return { missing: [], unused };
+  const missing = [];
+  const localDefinitions = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const classMatch = line.match(/^class\s+([A-Z][a-zA-Z0-9_]*)/);
+    if (classMatch) {
+      localDefinitions.add(classMatch[1]);
+    }
+    const funcMatch = line.match(/^(?:async\s+)?def\s+([A-Z][a-zA-Z0-9_]*)/);
+    if (funcMatch) {
+      localDefinitions.add(funcMatch[1]);
+    }
+  }
+  const potentialImports = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lines.length; i++) {
+    let line = lines[i];
+    if (line.trim().startsWith("import ") || line.trim().startsWith("from ") || line.trim().startsWith("#")) {
+      continue;
+    }
+    line = line.replace(/#.*$/g, "");
+    line = line.replace(/[`"'f].*?[`"']/g, "");
+    const matches = line.matchAll(/(?<!\.)([A-Z][a-zA-Z0-9_]*)(?!\.)/g);
+    for (const match of matches) {
+      const identifier = match[1];
+      if (!isPythonBuiltin(identifier)) {
+        potentialImports.add(identifier);
+      }
+    }
+  }
+  for (const identifier of potentialImports) {
+    if (!imports.has(identifier) && !localDefinitions.has(identifier)) {
+      const usageLines = [];
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const regex = new RegExp(`\\b${identifier}\\b`);
+        if (regex.test(line) && !line.trim().startsWith("#")) {
+          usageLines.push(i + 1);
+        }
+      }
+      if (usageLines.length > 0) {
+        missing.push({
+          identifier,
+          line: usageLines[0],
+          type: "missing",
+          usedAt: usageLines
+        });
+      }
+    }
+  }
+  return { missing, unused };
 }
 function analyzeImports(filePath) {
   if (filePath.endsWith(".py")) {
@@ -1496,14 +2690,14 @@ function analyzeImports(filePath) {
 }
 
 // src/analysis/docker.ts
-import { readFileSync as readFileSync3, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync4, existsSync as existsSync2 } from "fs";
 import { load as parseYaml } from "js-yaml";
 import { join as join2 } from "path";
 function parseDockerfile(dockerfilePath) {
   if (!existsSync2(dockerfilePath)) {
     return null;
   }
-  const content = readFileSync3(dockerfilePath, "utf-8");
+  const content = readFileSync4(dockerfilePath, "utf-8");
   const lines = content.split("\n");
   let inHealthCheck = false;
   for (const line of lines) {
@@ -1581,7 +2775,7 @@ function parseDockerCompose(projectRoot) {
   let composeData = null;
   for (const file of composeFiles) {
     if (existsSync2(file)) {
-      const content = readFileSync3(file, "utf-8");
+      const content = readFileSync4(file, "utf-8");
       composeData = parseYaml(content);
       break;
     }
@@ -1650,6 +2844,549 @@ function calculateServiceBlastRadius(graph, serviceName) {
   return Array.from(affected);
 }
 
+// src/analysis/line-diff.ts
+import { execSync as execSync2 } from "child_process";
+function parseLineLevelDiff(projectRoot) {
+  try {
+    const diffOutput = execSync2("git diff HEAD", {
+      cwd: projectRoot,
+      encoding: "utf-8",
+      maxBuffer: 10 * 1024 * 1024
+      // 10MB buffer
+    });
+    if (!diffOutput.trim()) {
+      return {
+        removedLines: [],
+        addedLines: [],
+        modifiedLines: []
+      };
+    }
+    return parseDiffOutput(diffOutput);
+  } catch (error) {
+    return {
+      removedLines: [],
+      addedLines: [],
+      modifiedLines: []
+    };
+  }
+}
+function parseDiffOutput(diffOutput) {
+  const removedLines = [];
+  const addedLines = [];
+  let currentFile = "";
+  let currentFunction = "";
+  let removedLineNumber = 0;
+  let addedLineNumber = 0;
+  const lines = diffOutput.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (line.startsWith("diff --git")) {
+      const match = line.match(/b\/(.*?)$/);
+      if (match) {
+        currentFile = match[1].trim();
+      }
+      continue;
+    }
+    if (line.startsWith("@@")) {
+      const match = line.match(/@@ -(\d+),\d+ \+(\d+),\d+ @@(.*)/);
+      if (match) {
+        removedLineNumber = parseInt(match[1]);
+        addedLineNumber = parseInt(match[2]);
+        const context = match[3].trim();
+        if (context) {
+          currentFunction = extractFunctionName(context);
+        }
+      }
+      continue;
+    }
+    if (line.startsWith("---") || line.startsWith("+++") || line.startsWith("index ")) {
+      continue;
+    }
+    if (line.startsWith("-") && !line.startsWith("---")) {
+      const content = line.substring(1);
+      if (content.trim()) {
+        removedLines.push({
+          file: currentFile,
+          lineNumber: removedLineNumber,
+          content,
+          inFunction: currentFunction || void 0
+        });
+      }
+      removedLineNumber++;
+      continue;
+    }
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      const content = line.substring(1);
+      if (content.trim()) {
+        addedLines.push({
+          file: currentFile,
+          lineNumber: addedLineNumber,
+          content,
+          inFunction: currentFunction || void 0
+        });
+      }
+      addedLineNumber++;
+      continue;
+    }
+    if (line.startsWith(" ") || !line.startsWith("-") && !line.startsWith("+")) {
+      removedLineNumber++;
+      addedLineNumber++;
+    }
+  }
+  const modifiedLines = matchModifiedLines(removedLines, addedLines);
+  return {
+    removedLines,
+    addedLines,
+    modifiedLines
+  };
+}
+function extractFunctionName(context) {
+  context = context.replace(/^(function|def|class|const|let|var|async|export)\s+/, "");
+  const patterns = [
+    /^(\w+)\s*\(/,
+    // functionName(
+    /^(\w+)\s*=/,
+    // functionName =
+    /^(\w+)\s*{/,
+    // ClassName {
+    /^(\w+)\s*:/
+    // functionName:
+  ];
+  for (const pattern of patterns) {
+    const match = context.match(pattern);
+    if (match) {
+      return match[1];
+    }
+  }
+  const firstWord = context.split(/\s+/)[0];
+  return firstWord || "";
+}
+function matchModifiedLines(removedLines, addedLines) {
+  const modifiedLines = [];
+  const removedByLocation = /* @__PURE__ */ new Map();
+  const addedByLocation = /* @__PURE__ */ new Map();
+  for (const removed of removedLines) {
+    const key = `${removed.file}:${removed.inFunction || "global"}`;
+    if (!removedByLocation.has(key)) {
+      removedByLocation.set(key, []);
+    }
+    removedByLocation.get(key).push(removed);
+  }
+  for (const added of addedLines) {
+    const key = `${added.file}:${added.inFunction || "global"}`;
+    if (!addedByLocation.has(key)) {
+      addedByLocation.set(key, []);
+    }
+    addedByLocation.get(key).push(added);
+  }
+  for (const [location, removedLinesInLocation] of removedByLocation) {
+    const addedLinesInLocation = addedByLocation.get(location) || [];
+    for (const removed of removedLinesInLocation) {
+      const matchingAdded = addedLinesInLocation.find(
+        (added) => Math.abs(added.lineNumber - removed.lineNumber) <= 2
+      );
+      if (matchingAdded) {
+        modifiedLines.push({
+          before: removed,
+          after: matchingAdded
+        });
+      }
+    }
+  }
+  return modifiedLines;
+}
+
+// src/analysis/removed-calls.ts
+function extractRemovedCalls(removedLines) {
+  const removedCalls = [];
+  for (const line of removedLines) {
+    const calls = parseLineForCalls(line.content, line.file);
+    for (const call of calls) {
+      removedCalls.push({
+        callee: call.name,
+        removedFrom: line.inFunction || "unknown",
+        file: line.file,
+        lineNumber: line.lineNumber,
+        rawContent: line.content.trim()
+      });
+    }
+  }
+  return removedCalls;
+}
+function parseLineForCalls(lineContent, filePath) {
+  const calls = [];
+  if (isCommentOrString(lineContent)) {
+    return calls;
+  }
+  lineContent = lineContent.replace(/\/\/.*$/g, "");
+  lineContent = lineContent.replace(/#.*$/g, "");
+  lineContent = lineContent.replace(/\/\*.*?\*\//g, "");
+  lineContent = lineContent.replace(/["'`].*?["'`]/g, "");
+  const isJS = /\.(js|ts|jsx|tsx)$/.test(filePath);
+  const isPython = /\.py$/.test(filePath);
+  if (isJS) {
+    calls.push(...extractJavaScriptCalls(lineContent));
+  }
+  if (isPython) {
+    calls.push(...extractPythonCalls(lineContent));
+  }
+  return calls;
+}
+function isCommentOrString(line) {
+  const trimmed = line.trim();
+  if (trimmed.startsWith("//") || trimmed.startsWith("/*") || trimmed.startsWith("*") || trimmed.startsWith("#")) {
+    return true;
+  }
+  const stringPrefixes = ['"', "'", "`"];
+  if (stringPrefixes.some((prefix) => trimmed.startsWith(prefix))) {
+    return true;
+  }
+  return false;
+}
+function extractJavaScriptCalls(lineContent) {
+  const calls = [];
+  const seen = /* @__PURE__ */ new Set();
+  const simplePattern = /\b([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
+  let match;
+  while ((match = simplePattern.exec(lineContent)) !== null) {
+    const functionName = match[1];
+    if (!isJavaScriptKeyword(functionName) && !seen.has(functionName)) {
+      calls.push({ name: functionName });
+      seen.add(functionName);
+    }
+  }
+  const methodPattern = /\.([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
+  while ((match = methodPattern.exec(lineContent)) !== null) {
+    const methodName = match[1];
+    if (!isJavaScriptKeyword(methodName) && !seen.has(methodName)) {
+      calls.push({ name: methodName });
+      seen.add(methodName);
+    }
+  }
+  const awaitPattern = /await\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
+  while ((match = awaitPattern.exec(lineContent)) !== null) {
+    const functionName = match[1];
+    if (!isJavaScriptKeyword(functionName) && !seen.has(functionName)) {
+      calls.push({ name: functionName });
+      seen.add(functionName);
+    }
+  }
+  return calls;
+}
+function extractPythonCalls(lineContent) {
+  const calls = [];
+  const seen = /* @__PURE__ */ new Set();
+  const simplePattern = /\b([a-zA-Z_][a-zA-Z0-9_]*)\s*\(/g;
+  let match;
+  while ((match = simplePattern.exec(lineContent)) !== null) {
+    const functionName = match[1];
+    if (!isPythonKeyword(functionName) && !seen.has(functionName)) {
+      calls.push({ name: functionName });
+      seen.add(functionName);
+    }
+  }
+  const methodPattern = /\.([a-zA-Z_][a-zA-Z0-9_]*)\s*\(/g;
+  while ((match = methodPattern.exec(lineContent)) !== null) {
+    const methodName = match[1];
+    if (!isPythonKeyword(methodName) && !seen.has(methodName)) {
+      calls.push({ name: methodName });
+      seen.add(methodName);
+    }
+  }
+  const awaitPattern = /await\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*\(/g;
+  while ((match = awaitPattern.exec(lineContent)) !== null) {
+    const functionName = match[1];
+    if (!isPythonKeyword(functionName) && !seen.has(functionName)) {
+      calls.push({ name: functionName });
+      seen.add(functionName);
+    }
+  }
+  return calls;
+}
+function isJavaScriptKeyword(identifier) {
+  const keywords = /* @__PURE__ */ new Set([
+    // Keywords
+    "if",
+    "else",
+    "for",
+    "while",
+    "do",
+    "switch",
+    "case",
+    "break",
+    "continue",
+    "return",
+    "throw",
+    "try",
+    "catch",
+    "finally",
+    "new",
+    "typeof",
+    "instanceof",
+    "delete",
+    "void",
+    "async",
+    "await",
+    "yield",
+    "import",
+    "export",
+    "from",
+    "class",
+    "extends",
+    "super",
+    "this",
+    "static",
+    "const",
+    "let",
+    "var",
+    "function",
+    "constructor",
+    "get",
+    "set",
+    // Common builtins to skip
+    "console",
+    "parseInt",
+    "parseFloat",
+    "isNaN",
+    "isFinite",
+    "setTimeout",
+    "setInterval",
+    "clearTimeout",
+    "clearInterval",
+    "require",
+    "module",
+    "exports",
+    "__dirname",
+    "__filename"
+  ]);
+  return keywords.has(identifier);
+}
+function isPythonKeyword(identifier) {
+  const keywords = /* @__PURE__ */ new Set([
+    // Keywords
+    "if",
+    "elif",
+    "else",
+    "for",
+    "while",
+    "break",
+    "continue",
+    "pass",
+    "return",
+    "raise",
+    "try",
+    "except",
+    "finally",
+    "with",
+    "as",
+    "yield",
+    "import",
+    "from",
+    "class",
+    "def",
+    "lambda",
+    "global",
+    "nonlocal",
+    "assert",
+    "del",
+    "in",
+    "is",
+    "not",
+    "and",
+    "or",
+    "async",
+    "await",
+    // Common builtins to skip
+    "print",
+    "len",
+    "range",
+    "enumerate",
+    "zip",
+    "map",
+    "filter",
+    "sorted",
+    "reversed",
+    "sum",
+    "min",
+    "max",
+    "abs",
+    "round",
+    "open",
+    "input",
+    "type",
+    "isinstance",
+    "hasattr",
+    "getattr",
+    "setattr"
+  ]);
+  return keywords.has(identifier);
+}
+
+// src/analysis/removed-call-impact.ts
+var SECURITY_KEYWORDS = [
+  // Authentication & Authorization
+  "authenticate",
+  "authorization",
+  "authorize",
+  "login",
+  "logout",
+  "signin",
+  "signout",
+  "verify",
+  "check",
+  "validate",
+  "permission",
+  "access",
+  "role",
+  "admin",
+  "auth",
+  // Input validation & sanitization
+  "sanitize",
+  "escape",
+  "clean",
+  "filter",
+  "whitelist",
+  "blacklist",
+  "validate",
+  "verification",
+  "check",
+  // Security tokens & sessions
+  "token",
+  "session",
+  "cookie",
+  "csrf",
+  "xsrf",
+  "jwt",
+  "oauth",
+  "api_key",
+  "apikey",
+  "secret",
+  "password",
+  "hash",
+  "encrypt",
+  // Injection prevention
+  "xss",
+  "sql",
+  "injection",
+  "query",
+  "prepared",
+  "statement",
+  // Rate limiting & abuse prevention
+  "ratelimit",
+  "throttle",
+  "captcha",
+  "honeypot"
+];
+function analyzeRemovedCallImpact(removedCalls, storage) {
+  const impacts = [];
+  for (const removedCall of removedCalls) {
+    try {
+      const impact = analyzeSingleRemovedCall(removedCall, storage);
+      if (impact) {
+        impacts.push(impact);
+      }
+    } catch (error) {
+      console.error(`Error analyzing removed call ${removedCall.callee}:`, error);
+    }
+  }
+  return impacts;
+}
+function analyzeSingleRemovedCall(removedCall, storage) {
+  const nodes = storage.searchNodesByName(removedCall.callee);
+  if (nodes.length === 0) {
+    return null;
+  }
+  const functionNode = nodes[0];
+  const allCallers = storage.getResolvedCallers(functionNode.id);
+  const stillCalledBy = allCallers.filter((c) => c.name !== removedCall.removedFrom).map((c) => ({
+    name: c.name,
+    file: c.filePath,
+    line: c.startLine
+  }));
+  const removedFromNodes = storage.searchNodesByName(removedCall.removedFrom);
+  let impactedFunctions = [];
+  if (removedFromNodes.length > 0) {
+    const removedFromNode = removedFromNodes[0];
+    const impactedNodes = storage.getImpactedNodes(removedFromNode.id, 5);
+    impactedFunctions = impactedNodes.map((n) => ({
+      name: n.name,
+      file: n.filePath,
+      line: n.startLine,
+      reason: `Calls ${removedCall.removedFrom}() which no longer calls ${removedCall.callee}()`
+    }));
+  }
+  const severity = calculateSeverity(
+    removedCall,
+    stillCalledBy,
+    impactedFunctions
+  );
+  const description = buildImpactDescription(
+    removedCall,
+    stillCalledBy,
+    impactedFunctions,
+    severity
+  );
+  return {
+    removedCall,
+    functionNode: {
+      id: functionNode.id,
+      name: functionNode.name,
+      file: functionNode.filePath,
+      line: functionNode.startLine
+    },
+    stillCalledBy,
+    impactedFunctions,
+    severity,
+    description
+  };
+}
+function calculateSeverity(removedCall, stillCalledBy, impactedFunctions) {
+  const isSecurityFunction = SECURITY_KEYWORDS.some(
+    (keyword) => removedCall.callee.toLowerCase().includes(keyword)
+  );
+  if (isSecurityFunction && impactedFunctions.length > 5) {
+    return "CRITICAL";
+  }
+  if (isSecurityFunction && stillCalledBy.length === 0) {
+    return "CRITICAL";
+  }
+  if (stillCalledBy.length === 0) {
+    return "HIGH";
+  }
+  if (impactedFunctions.length > 20) {
+    return "HIGH";
+  }
+  if (impactedFunctions.length >= 10) {
+    return "MEDIUM";
+  }
+  if (isSecurityFunction && impactedFunctions.length > 0) {
+    return "MEDIUM";
+  }
+  return "LOW";
+}
+function buildImpactDescription(removedCall, stillCalledBy, impactedFunctions, severity) {
+  const parts = [];
+  parts.push(
+    `${removedCall.callee}() was removed from ${removedCall.removedFrom}() at line ${removedCall.lineNumber}`
+  );
+  if (stillCalledBy.length === 0) {
+    parts.push(`\u26A0\uFE0F ORPHANED: ${removedCall.callee}() is no longer called anywhere in the codebase`);
+  } else {
+    const callerNames = stillCalledBy.slice(0, 3).map((c) => c.name).join(", ");
+    const moreCount = stillCalledBy.length > 3 ? ` and ${stillCalledBy.length - 3} more` : "";
+    parts.push(`Still called by: ${callerNames}${moreCount}`);
+  }
+  if (impactedFunctions.length > 0) {
+    parts.push(
+      `Impact: ${impactedFunctions.length} function${impactedFunctions.length === 1 ? "" : "s"} depend on ${removedCall.removedFrom}()`
+    );
+  }
+  if (severity === "CRITICAL") {
+    parts.push("\u{1F534} CRITICAL: Security or validation function removed from execution path");
+  }
+  return parts.join("\n");
+}
+
 // src/commands/impact.ts
 async function analyzeImpact(options = {}) {
   const rootPath = resolve2(options.path || ".");
@@ -1674,6 +3411,8 @@ async function analyzeImpactWithGit(storage, rootPath, options) {
       directCallers: /* @__PURE__ */ new Map(),
       affectedEndpoints: [],
       importIssues: /* @__PURE__ */ new Map(),
+      removedCallImpacts: [],
+      // NEW
       riskLevel: "LOW",
       totalImpact: 0
     };
@@ -1730,17 +3469,22 @@ async function analyzeImpactWithGit(storage, rootPath, options) {
       entryPointFiles
     };
   }
+  const lineDiff = parseLineLevelDiff(rootPath);
+  const removedCalls = extractRemovedCalls(lineDiff.removedLines);
+  const removedCallImpacts = analyzeRemovedCallImpact(removedCalls, storage);
   const totalCallers = Array.from(directCallers.values()).reduce((sum, callers) => sum + callers.length, 0);
   const hasCriticalImportIssues = Array.from(importIssues.values()).some((i) => i.missing.length > 0);
   const hasDockerImpact = dockerImpact && dockerImpact.affectedServices.length > 0;
+  const hasCriticalRemovedCalls = removedCallImpacts.some((i) => i.severity === "CRITICAL");
+  const hasHighRiskRemovedCalls = removedCallImpacts.some((i) => i.severity === "HIGH");
   let riskLevel = "LOW";
-  if (hasCriticalImportIssues && hasDockerImpact) {
+  if (hasCriticalRemovedCalls || hasCriticalImportIssues && hasDockerImpact) {
     riskLevel = "CRITICAL";
-  } else if (hasCriticalImportIssues || hasDockerImpact && dockerImpact.affectedServices.length > 2) {
+  } else if (hasHighRiskRemovedCalls || hasCriticalImportIssues || hasDockerImpact && dockerImpact.affectedServices.length > 2) {
     riskLevel = "HIGH";
   } else if (totalCallers > 20 || affectedEndpoints.length > 5) {
     riskLevel = "HIGH";
-  } else if (totalCallers > 10 || affectedEndpoints.length > 2 || hasDockerImpact) {
+  } else if (totalCallers > 10 || affectedEndpoints.length > 2 || hasDockerImpact || removedCallImpacts.length > 0) {
     riskLevel = "MEDIUM";
   }
   return {
@@ -1750,8 +3494,10 @@ async function analyzeImpactWithGit(storage, rootPath, options) {
     affectedEndpoints,
     importIssues,
     dockerImpact,
+    removedCallImpacts,
+    // NEW
     riskLevel,
-    totalImpact: totalCallers + (dockerImpact?.affectedServices.length || 0)
+    totalImpact: totalCallers + (dockerImpact?.affectedServices.length || 0) + removedCallImpacts.length
   };
 }
 async function analyzeImpactWithHash(storage, rootPath, options) {
@@ -1786,6 +3532,8 @@ async function analyzeImpactWithHash(storage, rootPath, options) {
     directCallers: /* @__PURE__ */ new Map(),
     affectedEndpoints: [],
     importIssues,
+    removedCallImpacts: [],
+    // NEW - not available in hash mode
     riskLevel: hasCriticalImportIssues ? "CRITICAL" : changedFiles.length > 10 ? "HIGH" : changedFiles.length > 5 ? "MEDIUM" : "LOW",
     totalImpact: result.indexed
   };
@@ -1799,7 +3547,7 @@ function configureMCPServer(projectPath) {
     if (!existsSync3(claudeConfigPath)) {
       return false;
     }
-    const config = JSON.parse(readFileSync4(claudeConfigPath, "utf-8"));
+    const config = JSON.parse(readFileSync5(claudeConfigPath, "utf-8"));
     if (!config.mcpServers) {
       config.mcpServers = {};
     }
@@ -1813,7 +3561,7 @@ function configureMCPServer(projectPath) {
     return false;
   }
 }
-program.name("codemap").description("CodeMap Flow - Call graph analyzer for understanding code impact").version("3.2.0");
+program.name("codemap").description("CodeMap Flow - Call graph analyzer for understanding code impact").version("3.5.0");
 program.command("index").description("Build call graph for your codebase").argument("[path]", "Path to the project root", ".").option("-f, --force", "Force reindex all files (ignore cache)").option("--include <patterns...>", "Glob patterns to include").option("--exclude <patterns...>", "Glob patterns to exclude").action(async (path, options) => {
   const rootPath = resolve3(path);
   const outputDir = join4(rootPath, ".codemap");
@@ -2021,12 +3769,12 @@ program.command("impact").description("Analyze impact of code changes").argument
       for (const [file, issues] of result.importIssues.entries()) {
         if (issues.missing.length > 0) {
           console.log(chalk.red(`    \u274C CRITICAL: ${file} - Missing imports still in use:`));
-          for (const missing of issues.missing.slice(0, 5)) {
+          for (const missing of issues.missing.slice(0, 10)) {
             const usageInfo = missing.usedAt ? ` (used at lines: ${missing.usedAt.slice(0, 3).join(", ")}${missing.usedAt.length > 3 ? "..." : ""})` : "";
             console.log(chalk.gray(`       \u2022 ${missing.identifier}${usageInfo}`));
           }
-          if (issues.missing.length > 5) {
-            console.log(chalk.gray(`       ... and ${issues.missing.length - 5} more`));
+          if (issues.missing.length > 10) {
+            console.log(chalk.gray(`       ... and ${issues.missing.length - 10} more`));
           }
         }
         if (issues.unused.length > 0 && options.verbose) {
@@ -2037,6 +3785,42 @@ program.command("impact").description("Analyze impact of code changes").argument
         }
       }
     }
+    if (result.removedCallImpacts && result.removedCallImpacts.length > 0) {
+      console.log(chalk.blue("\n  \u{1F6A8} Removed Function Calls:\n"));
+      for (const impact of result.removedCallImpacts) {
+        const severityColors = {
+          "CRITICAL": chalk.red,
+          "HIGH": chalk.red,
+          "MEDIUM": chalk.yellow,
+          "LOW": chalk.gray
+        };
+        const severityColor = severityColors[impact.severity];
+        console.log(severityColor(`    ${impact.severity}: ${impact.removedCall.callee}()`));
+        console.log(chalk.gray(`       Removed from: ${impact.removedCall.removedFrom}() at line ${impact.removedCall.lineNumber}`));
+        console.log(chalk.gray(`       File: ${impact.removedCall.file}`));
+        if (impact.stillCalledBy.length === 0) {
+          console.log(chalk.red(`       \u26A0\uFE0F ORPHANED: No longer called anywhere!`));
+        } else {
+          const callerNames = impact.stillCalledBy.slice(0, 3).map((c) => c.name).join(", ");
+          const moreCount = impact.stillCalledBy.length > 3 ? ` and ${impact.stillCalledBy.length - 3} more` : "";
+          console.log(chalk.gray(`       Still called by: ${callerNames}${moreCount}`));
+        }
+        if (impact.impactedFunctions.length > 0) {
+          console.log(chalk.gray(`       Impact: ${impact.impactedFunctions.length} dependent function${impact.impactedFunctions.length === 1 ? "" : "s"}`));
+          const topImpacted = impact.impactedFunctions.slice(0, 3);
+          for (const func of topImpacted) {
+            console.log(chalk.gray(`         \u2022 ${func.name} (${func.file}:${func.line})`));
+          }
+          if (impact.impactedFunctions.length > 3) {
+            console.log(chalk.gray(`         ... and ${impact.impactedFunctions.length - 3} more`));
+          }
+        }
+        if (impact.severity === "CRITICAL") {
+          console.log(chalk.red(`       \u{1F534} ${impact.description.split("\n").pop()}`));
+        }
+        console.log();
+      }
+    }
     if (result.dockerImpact) {
       console.log(chalk.blue("\n  \u{1F4E6} Docker Service Impact:\n"));
       console.log(chalk.red(`    \u26A0\uFE0F  Entry point file(s) modified - service(s) will not start:`));
@@ -2076,7 +3860,7 @@ program.command("reindex").description("Force full re-index of codebase").argume
 program.command("mcp-server").description("Start MCP server for Claude Code integration").option("-p, --path <path>", "Project root path", ".").action(async (options) => {
   process.env.CODEMAP_PROJECT_ROOT = resolve3(options.path);
   process.env.CODEMAP_DB_PATH = join4(resolve3(options.path), ".codemap", "graph.db");
-  await import("./flow-server-UQEOUP2C.js");
+  await import("./flow-server-FMPWJSLK.js");
 });
 program.parse();
 //# sourceMappingURL=cli.js.map