Merge pull request #160 from rostilos/1.5.4-rc

Refactor issue reconciliation logic and update prompt instructions

Author: rostilos

frontend

@@ -57,6 +57,12 @@
             <artifactId>codecrow-vcs-client</artifactId>
         </dependency>
 
+        <!-- AST parser for scope resolution -->
+        <dependency>
+            <groupId>org.rostilos.codecrow</groupId>
+            <artifactId>codecrow-ast-parser</artifactId>
+        </dependency>
+
         <!-- Spring dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

java-ecosystem/libs/analysis-engine/pom.xml

@@ -11,6 +11,7 @@
         requires org.rostilos.codecrow.commitgraph;
         requires org.rostilos.codecrow.filecontent;
         requires org.rostilos.codecrow.vcs;
+        requires org.rostilos.codecrow.astparser;
         requires org.rostilos.codecrow.analysisapi;
         requires transitive org.rostilos.codecrow.queue;
         requires codecrow.events;

java-ecosystem/libs/analysis-engine/src/main/java/module-info.java

@@ -10,6 +10,7 @@
 import org.rostilos.codecrow.analysisengine.dto.request.processor.BranchProcessRequest;
 import org.rostilos.codecrow.analysisengine.exception.AnalysisLockedException;
 import org.rostilos.codecrow.analysisengine.service.branch.*;
+import org.rostilos.codecrow.analysisengine.service.AstScopeEnricher;
 import org.rostilos.codecrow.analysisengine.util.DiffParsingUtils;
 import org.rostilos.codecrow.analysisengine.service.AnalysisLockService;
 import org.rostilos.codecrow.analysisengine.service.ProjectValidationService;
@@ -85,6 +86,7 @@ public class BranchAnalysisProcessor {
         private final CodeAnalysisService codeAnalysisService;
         private final AiAnalysisClient aiAnalysisClient;
         private final PullRequestService pullRequestService;
+        private final AstScopeEnricher astScopeEnricher;
 
         /**
          * Optional RAG operations service — can be null if RAG module is not deployed.
@@ -108,6 +110,7 @@ public BranchAnalysisProcessor(
                         CodeAnalysisService codeAnalysisService,
                         AiAnalysisClient aiAnalysisClient,
                         PullRequestService pullRequestService,
+                        AstScopeEnricher astScopeEnricher,
                         @Autowired(required = false) RagOperationsService ragOperationsService) {
                 this.projectService = projectService;
                 this.branchRepository = branchRepository;
@@ -125,6 +128,7 @@ public BranchAnalysisProcessor(
                 this.codeAnalysisService = codeAnalysisService;
                 this.aiAnalysisClient = aiAnalysisClient;
                 this.pullRequestService = pullRequestService;
+                this.astScopeEnricher = astScopeEnricher;
                 this.ragOperationsService = ragOperationsService;
         }
 
@@ -700,6 +704,18 @@ private void performDirectPushAnalysisIfNeeded(
                                         ? directPushAnalysis.getIssues().size()
                                         : 0;
 
+                        // === AST scope enrichment for direct push issues ===
+                        try {
+                                if (directPushAnalysis.getIssues() != null && !directPushAnalysis.getIssues().isEmpty()
+                                                && !fileContents.isEmpty()) {
+                                        astScopeEnricher.enrichWithAstScopes(
+                                                        directPushAnalysis.getIssues(), fileContents);
+                                }
+                        } catch (Exception astEx) {
+                                log.warn("AST scope enrichment failed for direct push (non-critical): {}",
+                                                astEx.getMessage());
+                        }
+
                         log.info("Direct push analysis completed: project={}, branch={}, commit={}, {} issues found",
                                         project.getId(), request.getTargetBranchName(),
                                         request.getCommitHash(), issuesFound);