heuristics classpath

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/TransitionLinkerEnricher.java

@@ -14,12 +14,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import click.kamil.springstatemachineexporter.analysis.enricher.routing.HeuristicRoutingEngine;
+import click.kamil.springstatemachineexporter.analysis.enricher.routing.HeuristicBeanResolutionEngine;
-import click.kamil.springstatemachineexporter.analysis.enricher.routing.RoutingEngine;
+import click.kamil.springstatemachineexporter.analysis.enricher.routing.BeanResolutionEngine;
+import click.kamil.springstatemachineexporter.analysis.enricher.matching.EventMatchingEngine;
+import click.kamil.springstatemachineexporter.analysis.enricher.matching.HeuristicEventMatchingEngine;
 
 public class TransitionLinkerEnricher implements AnalysisEnricher {
 
-    private final RoutingEngine routingEngine = new HeuristicRoutingEngine();
+    private final BeanResolutionEngine routingEngine = new HeuristicBeanResolutionEngine();
+    private final EventMatchingEngine matchingEngine = new HeuristicEventMatchingEngine();
 
     @Override
     public void enrich(AnalysisResult result, CodebaseContext context, CodebaseIntelligenceProvider intelligence) {
@@ -43,41 +46,10 @@ public class TransitionLinkerEnricher implements AnalysisEnricher {
             List<MatchedTransition> matched = new ArrayList<>();
 
             for (Transition t : stateMachineTransitions) {
-                if (t.getEvent() != null) {
+                if (t.getEvent() != null && matchingEngine.matches(t.getEvent(), tp)) {
                     String smEventRaw = t.getEvent().fullIdentifier() != null ? t.getEvent().fullIdentifier() : t.getEvent().rawName();
-                    String smEvent = simplify(smEventRaw);
+                    // Event matches
-                    
+                    for (State smSourceState : t.getSourceStates()) {
-                    boolean isWildcard = triggerEvent.equals("event") || triggerEvent.equals("e") || 
-                                         triggerEvent.equals("msg") || triggerEvent.equals("message") || 
-                                         triggerEvent.equals("payload");
-                    
-                    if (isWildcard) {
-                        String targetVar = chain.getContextMachineId();
-                        if (targetVar == null && chain.getTriggerPoint() != null) {
-                            targetVar = chain.getTriggerPoint().getStateMachineId();
-                        }
-                        // We no longer hard-block wildcards without a specific routing context.
-                        // If a project doesn't use standard SM persisters (e.g. restores state manually),
-                        // contextMachineId will be null. We should still link the wildcard to provide SOME visibility,
-                        // rather than completely hiding the endpoint.
-                    }
-                                         
-                    List<String> polyEvents = tp.getPolymorphicEvents() != null ? tp.getPolymorphicEvents() : java.util.Collections.emptyList();
-                    boolean hasPolyMatch = false;
-                    for (String pe : polyEvents) {
-                        String simplePe = pe;
-                        if (pe.contains(".")) {
-                            simplePe = pe.substring(pe.lastIndexOf('.') + 1);
-                        }
-                        if (simplePe.equals(smEventRaw) || simplePe.equals(smEvent)) {
-                            hasPolyMatch = true;
-                            break;
-                        }
-                    }
-
-                    if (hasPolyMatch || (polyEvents.isEmpty() && (isWildcard || smEvent.equals(triggerEvent)))) {
-                        // Event matches or is a wildcard
-                        for (State smSourceState : t.getSourceStates()) {
                             String smSourceRaw = smSourceState.fullIdentifier() != null ? smSourceState.fullIdentifier() : smSourceState.rawName();
                             String smSource = simplify(smSourceRaw);
                             if (triggerSource == null || triggerSource.equals(smSource)) {
@@ -107,7 +79,6 @@ public class TransitionLinkerEnricher implements AnalysisEnricher {
                         }
                     }
                 }
-            }
 
             if (!matched.isEmpty()) {
                 CallChain newChain = chain.toBuilder().matchedTransitions(matched).build();

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/matching/EventMatchingEngine.java

@@ -0,0 +1,11 @@
+package click.kamil.springstatemachineexporter.analysis.enricher.matching;
+
+import click.kamil.springstatemachineexporter.analysis.model.TriggerPoint;
+import click.kamil.springstatemachineexporter.model.Event;
+
+public interface EventMatchingEngine {
+    /**
+     * Determines whether the given trigger point is a match for the state machine event.
+     */
+    boolean matches(Event stateMachineEvent, TriggerPoint triggerPoint);
+}

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/matching/HeuristicEventMatchingEngine.java

@@ -0,0 +1,53 @@
+package click.kamil.springstatemachineexporter.analysis.enricher.matching;
+
+import click.kamil.springstatemachineexporter.analysis.model.TriggerPoint;
+import click.kamil.springstatemachineexporter.model.Event;
+import java.util.List;
+
+public class HeuristicEventMatchingEngine implements EventMatchingEngine {
+
+    @Override
+    public boolean matches(Event stateMachineEvent, TriggerPoint triggerPoint) {
+        if (stateMachineEvent == null || triggerPoint == null || triggerPoint.getEvent() == null) {
+            return false;
+        }
+
+        String triggerEvent = simplify(triggerPoint.getEvent());
+        String smEventRaw = stateMachineEvent.fullIdentifier() != null ? stateMachineEvent.fullIdentifier() : stateMachineEvent.rawName();
+        String smEvent = simplify(smEventRaw);
+
+        boolean isWildcard = isWildcardVariable(triggerEvent);
+
+        List<String> polyEvents = triggerPoint.getPolymorphicEvents() != null ? triggerPoint.getPolymorphicEvents() : java.util.Collections.emptyList();
+        
+        boolean hasPolyMatch = false;
+        for (String pe : polyEvents) {
+            String simplePe = pe;
+            if (pe.contains(".")) {
+                simplePe = pe.substring(pe.lastIndexOf('.') + 1);
+            }
+            if (simplePe.equals(smEventRaw) || simplePe.equals(smEvent)) {
+                hasPolyMatch = true;
+                break;
+            }
+        }
+
+        return hasPolyMatch || smEvent.equals(triggerEvent) || (polyEvents.isEmpty() && isWildcard);
+    }
+
+    private boolean isWildcardVariable(String eventStr) {
+        return eventStr.equals("event") || eventStr.equals("e") || 
+               eventStr.equals("msg") || eventStr.equals("message") || 
+               eventStr.equals("payload");
+    }
+
+    private String simplify(String name) {
+        if (name == null) return null;
+        String simplified = name.replaceAll("(?i)(.*)(Event|Action|Transition|Command)(s)?$", "$1");
+        if (simplified.isEmpty()) {
+            simplified = name;
+        }
+        simplified = simplified.replaceAll("^.*\\.([A-Z0-9_]+)$", "$1");
+        return simplified;
+    }
+}

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/routing/BeanResolutionEngine.java

@@ -2,6 +2,6 @@ package click.kamil.springstatemachineexporter.analysis.enricher.routing;
 
 import click.kamil.springstatemachineexporter.analysis.model.CallChain;
 
-public interface RoutingEngine {
+public interface BeanResolutionEngine {
     boolean isRoutedToCorrectMachine(CallChain chain, String currentMachineName);
 }

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/routing/HeuristicBeanResolutionEngine.java

@@ -5,7 +5,7 @@ import click.kamil.springstatemachineexporter.analysis.model.CallChain;
 import java.util.HashSet;
 import java.util.Set;
 
-public class HeuristicRoutingEngine implements RoutingEngine {
+public class HeuristicBeanResolutionEngine implements BeanResolutionEngine {
 
     @Override
     public boolean isRoutedToCorrectMachine(CallChain chain, String currentMachineName) {

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/model/CallEdge.java

@@ -0,0 +1,11 @@
+package click.kamil.springstatemachineexporter.analysis.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CallEdge {
+    private final String targetMethod;
+    private final List<String> arguments;
+}

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/CallGraphEngine.java

@@ -0,0 +1,11 @@
+package click.kamil.springstatemachineexporter.analysis.service;
+
+import click.kamil.springstatemachineexporter.analysis.model.CallChain;
+import click.kamil.springstatemachineexporter.analysis.model.EntryPoint;
+import click.kamil.springstatemachineexporter.analysis.model.TriggerPoint;
+
+import java.util.List;
+
+public interface CallGraphEngine {
+    List<CallChain> findChains(List<EntryPoint> entryPoints, List<TriggerPoint> triggers);
+}

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/DynamicClasspathResolver.java

@@ -0,0 +1,162 @@
+package click.kamil.springstatemachineexporter.analysis.service;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+public class DynamicClasspathResolver {
+
+    public List<String> resolveClasspath(Path projectRoot) {
+        log.info("Attempting dynamic classpath resolution for project at {}", projectRoot);
+        if (projectRoot == null || !Files.exists(projectRoot)) {
+            return Collections.emptyList();
+        }
+
+        if (Files.exists(projectRoot.resolve("pom.xml"))) {
+            return resolveMaven(projectRoot);
+        } else if (Files.exists(projectRoot.resolve("build.gradle")) || Files.exists(projectRoot.resolve("build.gradle.kts"))) {
+            return resolveGradle(projectRoot);
+        }
+
+        log.info("No Maven or Gradle configuration found at {}. Proceeding without dynamic classpath.", projectRoot);
+        return Collections.emptyList();
+    }
+
+    protected List<String> resolveMaven(Path projectRoot) {
+        log.info("Maven project detected. Resolving dependencies...");
+        Path cpFile = null;
+        try {
+            cpFile = Files.createTempFile("state_machine_exporter_cp", ".txt");
+            String mvnCmd = getCommand(projectRoot, "mvnw", "mvn");
+            if (mvnCmd == null) {
+                log.warn("Maven executable not found.");
+                return Collections.emptyList();
+            }
+
+            ProcessBuilder pb = new ProcessBuilder(
+                    mvnCmd,
+                    "-q",
+                    "dependency:build-classpath",
+                    "-DincludeScope=compile",
+                    "-Dmdep.outputFile=" + cpFile.toAbsolutePath().toString()
+            );
+            pb.directory(projectRoot.toFile());
+            
+            runProcess(pb);
+
+            if (Files.exists(cpFile)) {
+                String cpString = Files.readString(cpFile).trim();
+                if (!cpString.isEmpty()) {
+                    return Arrays.asList(cpString.split(File.pathSeparator));
+                }
+            }
+        } catch (Exception e) {
+            log.error("Failed to dynamically resolve Maven classpath", e);
+        } finally {
+            if (cpFile != null) {
+                try {
+                    Files.deleteIfExists(cpFile);
+                } catch (IOException ignored) {}
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    protected List<String> resolveGradle(Path projectRoot) {
+        log.info("Gradle project detected. Resolving dependencies...");
+        Path initScript = null;
+        try {
+            initScript = Files.createTempFile("state_machine_exporter_init", ".gradle");
+            String gradleCmd = getCommand(projectRoot, "gradlew", "gradle");
+            if (gradleCmd == null) {
+                log.warn("Gradle executable not found.");
+                return Collections.emptyList();
+            }
+
+            String scriptContent = """
+                    allprojects {
+                        task smePrintClasspath {
+                            doLast {
+                                def cp = []
+                                if (configurations.findByName("compileClasspath")) {
+                                    cp = configurations.compileClasspath.files
+                                }
+                                println "SME_CLASSPATH_MARKER:" + cp.join(File.pathSeparator)
+                            }
+                        }
+                    }
+                    """;
+            Files.writeString(initScript, scriptContent);
+
+            ProcessBuilder pb = new ProcessBuilder(
+                    gradleCmd,
+                    "-q",
+                    "-I", initScript.toAbsolutePath().toString(),
+                    "smePrintClasspath"
+            );
+            pb.directory(projectRoot.toFile());
+
+            String output = runProcessAndGetOutput(pb);
+            for (String line : output.split("\\r?\\n")) {
+                if (line.startsWith("SME_CLASSPATH_MARKER:")) {
+                    String cpString = line.substring("SME_CLASSPATH_MARKER:".length()).trim();
+                    if (!cpString.isEmpty()) {
+                        return Arrays.asList(cpString.split(File.pathSeparator));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("Failed to dynamically resolve Gradle classpath", e);
+        } finally {
+            if (initScript != null) {
+                try {
+                    Files.deleteIfExists(initScript);
+                } catch (IOException ignored) {}
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    private String getCommand(Path projectRoot, String wrapper, String systemBinary) {
+        Path wrapperUnix = projectRoot.resolve(wrapper);
+        Path wrapperWin = projectRoot.resolve(wrapper + ".bat");
+        
+        boolean isWin = System.getProperty("os.name").toLowerCase().contains("win");
+        
+        if (isWin && Files.exists(wrapperWin)) return wrapperWin.toAbsolutePath().toString();
+        if (!isWin && Files.exists(wrapperUnix)) {
+            // Need absolute path like ./gradlew
+            return wrapperUnix.toAbsolutePath().toString();
+        }
+        
+        return systemBinary;
+    }
+
+    protected void runProcess(ProcessBuilder pb) throws IOException, InterruptedException {
+        Process p = pb.start();
+        p.waitFor();
+    }
+
+    protected String runProcessAndGetOutput(ProcessBuilder pb) throws IOException, InterruptedException {
+        Process p = pb.start();
+        StringBuilder out = new StringBuilder();
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                out.append(line).append("\n");
+            }
+        }
+        p.waitFor();
+        return out.toString();
+    }
+}

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetector.java

@@ -172,40 +172,97 @@ public class GenericEventDetector {
     }
 
     private String extractSourceState(ASTNode node) {
-        ASTNode current = node.getParent();
+        ASTNode current = node;
         while (current != null && !(current instanceof MethodDeclaration)) {
-            if (current instanceof IfStatement ifStmt) {
+            ASTNode parent = current.getParent();
-                Expression expr = ifStmt.getExpression();
+            
-                String state = extractStateFromExpression(expr);
+            // 1. Direct parent is IfStatement wrapper (e.g., if (state == X) { sm.sendEvent() })
-                if (state != null) return state;
+            if (parent instanceof IfStatement ifStmt) {
-            } else if (current instanceof SwitchCase switchCase) {
+                // Only consider if our current node is in the 'then' or 'else' part, not the condition
-                if (!switchCase.expressions().isEmpty()) {
+                if (ifStmt.getExpression() != current) {
-                    return getSimpleNameString((Expression) switchCase.expressions().get(0));
+                    Expression expr = ifStmt.getExpression();
+                    String state = extractStateFromExpression(expr);
+                    if (state != null) return state;
                 }
-            } else if (current instanceof SwitchStatement switchStmt) {
-                // If it's a switch block but we haven't hit a SwitchCase directly (AST hierarchy usually has SwitchCase as siblings of block statements)
-                // Actually, walking up from the node, we will hit the SwitchStatement, but we need the SwitchCase right before us in the block.
-                ASTNode parentBlock = current;
-                // It's complex to walk siblings. A simpler heuristic is to just use IfStatement and SwitchCase (if wrapped correctly).
             }
-            current = current.getParent();
+
+            // 2. Parent is a Block or SwitchStatement: perform sibling traversal
+            if (parent instanceof Block block) {
+                String state = extractStateFromSiblings(current, block.statements());
+                if (state != null) return state;
+            } else if (parent instanceof SwitchStatement switchStmt) {
+                String state = extractStateFromSiblings(current, switchStmt.statements());
+                if (state != null) return state;
+            }
+
+            current = parent;
         }
         return null;
     }
 
+    private String extractStateFromSiblings(ASTNode currentNode, List<?> statements) {
+        int index = statements.indexOf(currentNode);
+        if (index <= 0) return null; // No previous siblings
+
+        // Walk backwards through siblings
+        for (int i = index - 1; i >= 0; i--) {
+            Object stmtObj = statements.get(i);
+            
+            if (stmtObj instanceof SwitchCase switchCase) {
+                if (!switchCase.expressions().isEmpty()) {
+                    return getSimpleNameString((Expression) switchCase.expressions().get(0));
+                }
+            } else if (stmtObj instanceof IfStatement ifStmt) {
+                // Guard clause detection: check if the 'then' block has a return/throw
+                if (isGuardClause(ifStmt.getThenStatement())) {
+                    Expression expr = ifStmt.getExpression();
+                    // If it's a guard clause, it usually checks `state != EXPECTED`, so the true state *is* EXPECTED
+                    String state = extractStateFromExpression(expr);
+                    if (state != null) return state;
+                }
+            }
+        }
+        return null;
+    }
+
+    private boolean isGuardClause(Statement thenStatement) {
+        if (thenStatement instanceof ReturnStatement || thenStatement instanceof ThrowStatement) {
+            return true;
+        }
+        if (thenStatement instanceof Block block) {
+            for (Object obj : block.statements()) {
+                if (obj instanceof ReturnStatement || obj instanceof ThrowStatement) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private String extractStateFromExpression(Expression expr) {
         if (expr instanceof InfixExpression infix) {
-            if (infix.getOperator() == InfixExpression.Operator.EQUALS) {
+            if (infix.getOperator() == InfixExpression.Operator.EQUALS || infix.getOperator() == InfixExpression.Operator.NOT_EQUALS) {
                 Expression left = infix.getLeftOperand();
                 Expression right = infix.getRightOperand();
-                // Usually one is a method call like getState(), the other is an enum
+                
-                if (left instanceof QualifiedName || left instanceof SimpleName && !(right instanceof SimpleName)) {
+                // Ignore null checks entirely
+                if (left instanceof NullLiteral || right instanceof NullLiteral) {
+                    return null;
+                }
+                
+                // Usually one is a method call like getState() or a variable like `state`
+                // and the other is the constant enum like `OrderState.PENDING` or `"PENDING"`
+                
+                // If one is a QualifiedName (enum constant) or StringLiteral, it's likely the state
+                if (left instanceof QualifiedName || left instanceof StringLiteral || left instanceof FieldAccess) {
                     return getSimpleNameString(left);
                 }
-                if (right instanceof QualifiedName || right instanceof SimpleName && !(left instanceof SimpleName)) {
+                if (right instanceof QualifiedName || right instanceof StringLiteral || right instanceof FieldAccess) {
                     return getSimpleNameString(right);
                 }
-                return getSimpleNameString(right); // Fallback
+                
+                // Fallback
+                return getSimpleNameString(right);
             }
         } else if (expr instanceof MethodInvocation mi) {
             if ("equals".equals(mi.getName().getIdentifier()) && !mi.arguments().isEmpty()) {

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/HeuristicCallGraphEngine.java

@@ -1,6 +1,7 @@
 package click.kamil.springstatemachineexporter.analysis.service;
 
 import click.kamil.springstatemachineexporter.analysis.model.CallChain;
+import click.kamil.springstatemachineexporter.analysis.model.CallEdge;
 import click.kamil.springstatemachineexporter.analysis.model.EntryPoint;
 import click.kamil.springstatemachineexporter.analysis.model.TriggerPoint;
 import click.kamil.springstatemachineexporter.ast.common.CodebaseContext;
@@ -11,19 +12,13 @@ import org.eclipse.jdt.core.dom.*;
 import java.util.*;
 
 @Slf4j
-public class CallGraphBuilder {
+public class HeuristicCallGraphEngine implements CallGraphEngine {
     private final CodebaseContext context;
     private final ConstantResolver constantResolver;
     private String currentMethodFqn;
     private Map<String, List<CallEdge>> graph;
 
-    @lombok.Data
+    public HeuristicCallGraphEngine(CodebaseContext context) {
-    private static class CallEdge {
-        private final String targetMethod;
-        private final List<String> arguments;
-    }
-
-    public CallGraphBuilder(CodebaseContext context) {
         this.context = context;
         this.constantResolver = new ConstantResolver();
     }

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/JdtIntelligenceProvider.java

@@ -21,7 +21,7 @@ public class JdtIntelligenceProvider implements CodebaseIntelligenceProvider {
     private final GenericEventDetector eventDetector;
     private final SpringMvcDetector mvcDetector;
     private final MessagingDetector messagingDetector;
-    private final CallGraphBuilder callGraphBuilder;
+    private final CallGraphEngine callGraphEngine;
     private final LifecycleDetector lifecycleDetector;
     private final InterceptorDetector interceptorDetector;
     private final SpringComponentDetector componentDetector;
@@ -32,7 +32,7 @@ public class JdtIntelligenceProvider implements CodebaseIntelligenceProvider {
         this.eventDetector = new GenericEventDetector(context, constantResolver, context.getLibraryHints());
         this.mvcDetector = new SpringMvcDetector(context, constantResolver);
         this.messagingDetector = new MessagingDetector(context);
-        this.callGraphBuilder = new CallGraphBuilder(context);
+        this.callGraphEngine = new HeuristicCallGraphEngine(context);
         this.lifecycleDetector = new LifecycleDetector(context);
         this.interceptorDetector = new InterceptorDetector(context);
         this.componentDetector = new SpringComponentDetector(context);
@@ -69,7 +69,7 @@ public class JdtIntelligenceProvider implements CodebaseIntelligenceProvider {
     @Override
     public List<CallChain> findCallChains(List<EntryPoint> entryPoints, List<TriggerPoint> triggers) {
         log.info("JdtIntelligenceProvider searching for call chains between {} entry points and {} triggers", entryPoints.size(), triggers.size());
-        return callGraphBuilder.findChains(entryPoints, triggers);
+        return callGraphEngine.findChains(entryPoints, triggers);
     }
 
     @Override

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/command/ExporterCommand.java

@@ -57,6 +57,9 @@ public class ExporterCommand implements Callable<Integer> {
     @Option(names = {"--debug"}, description = "Enable diagnostic mode to show unresolved call chains and detailed analysis logging.", defaultValue = "false")
     private boolean debug;
 
+    @Option(names = {"--resolve-classpath"}, description = "Automatically run Maven/Gradle to resolve full classpath dependencies for perfect AST bindings.", defaultValue = "false")
+    private boolean resolveClasspath;
+
     @Override
     public Integer call() throws Exception {
         var out = spec.commandLine().getOut();
@@ -87,7 +90,7 @@ public class ExporterCommand implements Callable<Integer> {
             if (jsonFile != null) {
                 exportService.runJsonExporter(jsonFile, outputDir, selectedFormats, profiles, eventFormat, stateFormat);
             } else {
-                exportService.runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, profiles, eventFormat, stateFormat);
+                exportService.runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, profiles, null, null, eventFormat, stateFormat, resolveClasspath);
             }
             out.println(CommandLine.Help.Ansi.AUTO.string("%n@|bold,green SUCCESS:|@ All state machines have been exported to " + outputDir.toAbsolutePath()));
             return 0;

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/service/ExportService.java

@@ -53,22 +53,22 @@ public class ExportService {
     public static final Set<String> STATE_MACHINE_RETURN_TYPES = Set.of("StateMachine", "StateMachineFactory", "StateMachineModelFactory");
 
     public void runExporter(Path inputDir, Path outputDir, List<String> selectedFormats, boolean renderChoicesAsDiamonds) throws IOException {
-        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, Collections.emptyList(), click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn);
+        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, Collections.emptyList(), null, null, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, false);
     }
 
     public void runExporter(Path inputDir, Path outputDir, List<String> selectedFormats, boolean renderChoicesAsDiamonds, List<String> activeProfiles) throws IOException {
-        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, activeProfiles, null, null, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn);
+        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, activeProfiles, null, null, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, false);
     }
 
     public void runExporter(Path inputDir, Path outputDir, List<String> selectedFormats, boolean renderChoicesAsDiamonds, List<String> activeProfiles, Path flowsOverride, String machineFilter) throws IOException {
-        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, activeProfiles, flowsOverride, machineFilter, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn);
+        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, activeProfiles, flowsOverride, machineFilter, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, click.kamil.springstatemachineexporter.exporter.EnumFormat.fn, false);
     }
 
     public void runExporter(Path inputDir, Path outputDir, List<String> selectedFormats, boolean renderChoicesAsDiamonds, List<String> activeProfiles, click.kamil.springstatemachineexporter.exporter.EnumFormat eventFormat, click.kamil.springstatemachineexporter.exporter.EnumFormat stateFormat) throws IOException {
-        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, activeProfiles, null, null, eventFormat, stateFormat);
+        runExporter(inputDir, outputDir, selectedFormats, renderChoicesAsDiamonds, activeProfiles, null, null, eventFormat, stateFormat, false);
     }
 
-    public void runExporter(Path inputDir, Path outputDir, List<String> selectedFormats, boolean renderChoicesAsDiamonds, List<String> activeProfiles, Path flowsOverride, String machineFilter, click.kamil.springstatemachineexporter.exporter.EnumFormat eventFormat, click.kamil.springstatemachineexporter.exporter.EnumFormat stateFormat) throws IOException {
+    public void runExporter(Path inputDir, Path outputDir, List<String> selectedFormats, boolean renderChoicesAsDiamonds, List<String> activeProfiles, Path flowsOverride, String machineFilter, click.kamil.springstatemachineexporter.exporter.EnumFormat eventFormat, click.kamil.springstatemachineexporter.exporter.EnumFormat stateFormat, boolean resolveClasspath) throws IOException {
         CodebaseContext context = new CodebaseContext();
         context.setActiveProfiles(activeProfiles);
         
@@ -94,6 +94,18 @@ public class ExportService {
                 .collect(Collectors.toList());
         log.info("Setting JDT sourcepath: {}", sourcepaths);
         context.setSourcepath(sourcepaths);
+        
+        if (resolveClasspath) {
+            click.kamil.springstatemachineexporter.analysis.service.DynamicClasspathResolver classpathResolver = new click.kamil.springstatemachineexporter.analysis.service.DynamicClasspathResolver();
+            List<String> dynamicClasspath = classpathResolver.resolveClasspath(projectRoot);
+            if (!dynamicClasspath.isEmpty()) {
+                context.setClasspath(dynamicClasspath);
+                log.info("Injected {} external JARs into JDT ASTParser", dynamicClasspath.size());
+            }
+        } else {
+            log.info("Dynamic classpath resolution disabled. Use --resolve-classpath to enable.");
+        }
+        
         context.setResolveBindings(true);
         
         Path hintsFile = inputDir.resolve("hints.json");

state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/InheritedEventDetectionTest.java

@@ -4,7 +4,7 @@ import click.kamil.springstatemachineexporter.analysis.model.CallChain;
 import click.kamil.springstatemachineexporter.analysis.model.EntryPoint;
 import click.kamil.springstatemachineexporter.analysis.model.TriggerPoint;
 import click.kamil.springstatemachineexporter.analysis.resolver.ConstantResolver;
-import click.kamil.springstatemachineexporter.analysis.service.CallGraphBuilder;
+import click.kamil.springstatemachineexporter.analysis.service.HeuristicCallGraphEngine;
 import click.kamil.springstatemachineexporter.analysis.service.GenericEventDetector;
 import click.kamil.springstatemachineexporter.analysis.service.SpringMvcDetector;
 import click.kamil.springstatemachineexporter.ast.common.CodebaseContext;
@@ -76,7 +76,7 @@ public class InheritedEventDetectionTest {
         assertThat(tp.getEvent()).isEqualTo("event");
 
         // Build Call Chains
-        CallGraphBuilder callGraphBuilder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine callGraphBuilder = new HeuristicCallGraphEngine(context);
         List<CallChain> chains = callGraphBuilder.findChains(entryPoints, triggers);
 
         assertThat(chains).describedAs("Should link ChildController.trigger to BaseController.send").hasSize(1);

state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/enricher/TransitionLinkerEnricherTest.java

@@ -145,6 +145,36 @@ class TransitionLinkerEnricherTest {
 
 
 
+    @Test
+    void shouldMatchBaseEventDespiteScrapedPolyEvents() {
+        Transition t1 = new Transition();
+        t1.setSourceStates(List.of(State.of("NEW", "NEW")));
+        t1.setTargetStates(List.of(State.of("PAID", "PAID")));
+        // State machine uses the base event generically
+        t1.setEvent(Event.of("BaseEvent", "BaseEvent"));
+
+        // Trigger point uses "BaseEvent", but polyEvents scraped some implementation/constants
+        CallChain chain = CallChain.builder()
+                .triggerPoint(TriggerPoint.builder()
+                        .event("BaseEvent")
+                        .polymorphicEvents(List.of("EVENT_A", "EVENT_B"))
+                        .build())
+                .contextMachineId("testMachine")
+                .build();
+
+        AnalysisResult result = AnalysisResult.builder()
+                .name("testMachine")
+                .transitions(List.of(t1))
+                .metadata(CodebaseMetadata.builder().callChains(List.of(chain)).build())
+                .build();
+
+        enricher.enrich(result, null, null);
+
+        // It should match because smEvent matches triggerEvent directly, overriding the failed poly search
+        CallChain updatedChain = result.getMetadata().getCallChains().get(0);
+        assertThat(updatedChain.getMatchedTransitions()).hasSize(1);
+    }
+
     @Test
     void shouldNotMatchArbitraryGetXMethodWildcard() {
         Transition t1 = new Transition();

state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/enricher/routing/HeuristicBeanResolutionEngineTest.java

@@ -9,9 +9,9 @@ import java.util.Arrays;
 import static org.junit.jupiter.api.Assertions.*;
 
 @Tag("heuristic_bean_resolution")
-public class HeuristicRoutingEngineTest {
+public class HeuristicBeanResolutionEngineTest {
 
-    private final HeuristicRoutingEngine engine = new HeuristicRoutingEngine();
+    private final HeuristicBeanResolutionEngine engine = new HeuristicBeanResolutionEngine();
 
     @Test
     public void testDeepPackageDivergenceMismatch() {

state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/DynamicClasspathResolverTest.java

@@ -0,0 +1,78 @@
+package click.kamil.springstatemachineexporter.analysis.service;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Tag("dynamic_classpath_resolver")
+class DynamicClasspathResolverTest {
+
+    @Test
+    void shouldResolveMavenClasspathDynamically(@TempDir Path tempDir) throws IOException {
+        // Create dummy pom.xml
+        Files.createFile(tempDir.resolve("pom.xml"));
+        
+        // Mock the resolver so it doesn't actually run maven, but writes the expected output file
+        DynamicClasspathResolver resolver = new DynamicClasspathResolver() {
+            @Override
+            protected void runProcess(ProcessBuilder pb) throws IOException {
+                // Pretend maven executed and generated the cp.txt
+                String cp = "/fake/m2/repo/spring-core.jar" + File.pathSeparator + "/fake/m2/repo/spring-context.jar";
+                
+                String outputFileArg = pb.command().stream()
+                        .filter(arg -> arg.startsWith("-Dmdep.outputFile="))
+                        .findFirst()
+                        .orElseThrow();
+                Path outputFile = Path.of(outputFileArg.substring("-Dmdep.outputFile=".length()));
+                
+                Files.writeString(outputFile, cp);
+            }
+        };
+
+        List<String> classpath = resolver.resolveClasspath(tempDir);
+        
+        assertThat(classpath).containsExactly(
+                "/fake/m2/repo/spring-core.jar",
+                "/fake/m2/repo/spring-context.jar"
+        );
+    }
+
+    @Test
+    void shouldResolveGradleClasspathDynamically(@TempDir Path tempDir) throws IOException {
+        // Create dummy build.gradle
+        Files.createFile(tempDir.resolve("build.gradle"));
+        
+        DynamicClasspathResolver resolver = new DynamicClasspathResolver() {
+            @Override
+            protected String runProcessAndGetOutput(ProcessBuilder pb) {
+                // Pretend gradle executed and printed the marker
+                String cp = "/fake/gradle/caches/spring-core.jar" + File.pathSeparator + "/fake/gradle/caches/spring-context.jar";
+                return "Some noisy gradle output\n" +
+                       "SME_CLASSPATH_MARKER:" + cp + "\n" +
+                       "BUILD SUCCESSFUL\n";
+            }
+        };
+
+        List<String> classpath = resolver.resolveClasspath(tempDir);
+        
+        assertThat(classpath).containsExactly(
+                "/fake/gradle/caches/spring-core.jar",
+                "/fake/gradle/caches/spring-context.jar"
+        );
+    }
+
+    @Test
+    void shouldReturnEmptyListIfNoBuildFileFound(@TempDir Path tempDir) {
+        DynamicClasspathResolver resolver = new DynamicClasspathResolver();
+        List<String> classpath = resolver.resolveClasspath(tempDir);
+        assertThat(classpath).isEmpty();
+    }
+}

state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetectorControlFlowTest.java

@@ -0,0 +1,132 @@
+package click.kamil.springstatemachineexporter.analysis.service;
+
+import click.kamil.springstatemachineexporter.analysis.model.TriggerPoint;
+import click.kamil.springstatemachineexporter.analysis.resolver.ConstantResolver;
+import click.kamil.springstatemachineexporter.ast.common.CodebaseContext;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Tag("control_flow_sibling_avoidance")
+class GenericEventDetectorControlFlowTest {
+
+    @Test
+    void shouldDetectStateFromDirectIfWrapper(@TempDir Path tempDir) throws IOException {
+        String source = """
+                package com.example;
+                public class OrderService {
+                    private StateMachine sm;
+                    public void processOrder(OrderState state) {
+                        if (state == OrderState.PENDING) {
+                            sm.sendEvent(OrderEvent.PAY);
+                        }
+                    }
+                }
+                
+                class StateMachine {
+                    public void sendEvent(OrderEvent e) {}
+                }
+                
+                enum OrderState { PENDING }
+                enum OrderEvent { PAY }
+                """;
+        Files.writeString(tempDir.resolve("OrderService.java"), source);
+        
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+        
+        GenericEventDetector detector = new GenericEventDetector(context, new ConstantResolver(), Collections.emptyList());
+        List<TriggerPoint> triggers = detector.detect((org.eclipse.jdt.core.dom.CompilationUnit) context.getTypeDeclaration("com.example.OrderService").getRoot());
+        
+        assertThat(triggers).hasSize(1);
+        TriggerPoint tp = triggers.get(0);
+        assertThat(tp.getEvent()).isEqualTo("OrderEvent.PAY");
+        assertThat(tp.getSourceState()).isEqualTo("PENDING");
+    }
+
+    @Test
+    void shouldDetectStateFromGuardClauseSibling(@TempDir Path tempDir) throws IOException {
+        String source = """
+                package com.example;
+                public class OrderService {
+                    private StateMachine sm;
+                    public void processOrder(OrderState state) {
+                        if (state != OrderState.PENDING) {
+                            return;
+                        }
+                        
+                        sm.sendEvent(OrderEvent.PAY);
+                    }
+                }
+                
+                class StateMachine {
+                    public void sendEvent(OrderEvent e) {}
+                }
+                
+                enum OrderState { PENDING }
+                enum OrderEvent { PAY }
+                """;
+        Files.writeString(tempDir.resolve("OrderService.java"), source);
+        
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+        
+        GenericEventDetector detector = new GenericEventDetector(context, new ConstantResolver(), Collections.emptyList());
+        List<TriggerPoint> triggers = detector.detect((org.eclipse.jdt.core.dom.CompilationUnit) context.getTypeDeclaration("com.example.OrderService").getRoot());
+        
+        assertThat(triggers).hasSize(1);
+        TriggerPoint tp = triggers.get(0);
+        assertThat(tp.getEvent()).isEqualTo("OrderEvent.PAY");
+        assertThat(tp.getSourceState()).isEqualTo("PENDING");
+    }
+
+    @Test
+    void shouldDetectStateFromSwitchCaseSibling(@TempDir Path tempDir) throws IOException {
+        String source = """
+                package com.example;
+                public class OrderService {
+                    private StateMachine sm;
+                    public void processOrder(OrderState state) {
+                        switch (state) {
+                            case PENDING:
+                                sm.sendEvent(OrderEvent.PAY);
+                                break;
+                            case PAID:
+                                sm.sendEvent(OrderEvent.SHIP);
+                                break;
+                        }
+                    }
+                }
+                
+                class StateMachine {
+                    public void sendEvent(OrderEvent e) {}
+                }
+                
+                enum OrderState { PENDING, PAID }
+                enum OrderEvent { PAY, SHIP }
+                """;
+        Files.writeString(tempDir.resolve("OrderService.java"), source);
+        
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+        
+        GenericEventDetector detector = new GenericEventDetector(context, new ConstantResolver(), Collections.emptyList());
+        List<TriggerPoint> triggers = detector.detect((org.eclipse.jdt.core.dom.CompilationUnit) context.getTypeDeclaration("com.example.OrderService").getRoot());
+        
+        assertThat(triggers).hasSize(2);
+        
+        TriggerPoint payTrigger = triggers.stream().filter(t -> t.getEvent().equals("OrderEvent.PAY")).findFirst().get();
+        assertThat(payTrigger.getSourceState()).isEqualTo("PENDING");
+        
+        TriggerPoint shipTrigger = triggers.stream().filter(t -> t.getEvent().equals("OrderEvent.SHIP")).findFirst().get();
+        assertThat(shipTrigger.getSourceState()).isEqualTo("PAID");
+    }
+}

state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/HeuristicCallGraphEngineTest.java

@@ -12,9 +12,11 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 
+import org.junit.jupiter.api.Tag;
 import static org.assertj.core.api.Assertions.assertThat;
 
-class CallGraphBuilderTest {
+@Tag("heuristic_guess_paths_and_scrape_regex_replace_with_data_flow_analysis")
+class HeuristicCallGraphEngineTest {
 
     @Test
     void shouldFindCallChainWithLambdaMethodReference(@TempDir Path tempDir) throws IOException {
@@ -43,7 +45,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderService")
@@ -94,7 +96,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.PersisterService")
@@ -146,7 +148,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -200,7 +202,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -268,7 +270,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -322,7 +324,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -392,7 +394,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -438,7 +440,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -489,7 +491,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -547,7 +549,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -597,7 +599,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -650,7 +652,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -695,7 +697,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -747,7 +749,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -793,7 +795,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -837,7 +839,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -887,7 +889,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -933,7 +935,7 @@ class CallGraphBuilderTest {
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
 
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder()
                 .className("com.example.OrderController")
@@ -984,7 +986,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("processOrderEvent").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("updateOrderState").event("event").build();
@@ -1017,7 +1019,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("createOrder").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("processOrderEvent").event("event").build();
@@ -1073,7 +1075,7 @@ class CallGraphBuilderTest {
         
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.controller.EventController").methodName("handleEvent").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.service.EventService").methodName("process").event("type").build();
@@ -1115,7 +1117,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1149,7 +1151,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1181,7 +1183,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1218,7 +1220,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1255,7 +1257,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1290,7 +1292,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1327,7 +1329,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1361,7 +1363,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1397,7 +1399,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1431,7 +1433,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1469,7 +1471,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1510,7 +1512,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1548,7 +1550,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1587,7 +1589,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1630,7 +1632,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1672,7 +1674,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1713,7 +1715,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1754,7 +1756,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1797,7 +1799,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();
@@ -1842,7 +1844,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint ep1 = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus1").build();
         EntryPoint ep2 = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus2").build();
@@ -1887,7 +1889,7 @@ class CallGraphBuilderTest {
         Files.writeString(tempDir.resolve("OrderConfig.java"), source);
         CodebaseContext context = new CodebaseContext();
         context.scan(tempDir);
-        CallGraphBuilder builder = new CallGraphBuilder(context);
+        HeuristicCallGraphEngine builder = new HeuristicCallGraphEngine(context);
 
         EntryPoint entryPoint = EntryPoint.builder().className("com.example.OrderController").methodName("handleStatus").build();
         TriggerPoint trigger = TriggerPoint.builder().className("com.example.OrderService").methodName("process").event("event").build();