Merge pull request #132 from rostilos/1.5.0-rc

1.5.0 rc

Author: rostilos

README.md

@@ -45,7 +45,6 @@ High level components:
 ---
 
 ## Contributing
-
 Contributions are welcome. Please see our [Development Guide](https://codecrow.app/docs/developer/dev-setup) for more information.
 
 ## License

deployment/config/java-shared/codecrow-vcs-mcp-1.0.jar

@@ -215,9 +215,6 @@ services:
       - codecrow-network
     volumes:
       - web_frontend_logs:/app/logs
-      - ./config/web-frontend/.env:/app/.env
-    command:
-      ["sh", "-c", "serve -s dist -l 8080 >> /app/logs/web-frontend.log 2>&1"]
     restart: unless-stopped
 
   fix-permissions:

deployment/docker-compose-sample-new-relic.yml

@@ -232,9 +232,6 @@ services:
       - codecrow-network
     volumes:
       - web_frontend_logs:/app/logs
-      - ./config/web-frontend/.env:/app/.env
-    command:
-      ["sh", "-c", "serve -s dist -l 8080 >> /app/logs/web-frontend.log 2>&1"]
     restart: unless-stopped
 
   fix-permissions:

deployment/docker-compose-sample.yml

@@ -30,6 +30,7 @@
     exports org.rostilos.codecrow.analysisengine.processor;
     exports org.rostilos.codecrow.analysisengine.processor.analysis;
     exports org.rostilos.codecrow.analysisengine.service;
+    exports org.rostilos.codecrow.analysisengine.service.gitgraph;
     exports org.rostilos.codecrow.analysisengine.service.rag;
     exports org.rostilos.codecrow.analysisengine.service.vcs;
     exports org.rostilos.codecrow.analysisengine.util;
@@ -39,6 +40,7 @@
     opens org.rostilos.codecrow.analysisengine.processor to spring.core, spring.beans, spring.context;
     opens org.rostilos.codecrow.analysisengine.processor.analysis to spring.core, spring.beans, spring.context;
     opens org.rostilos.codecrow.analysisengine.service to spring.core, spring.beans, spring.context;
+    opens org.rostilos.codecrow.analysisengine.service.gitgraph to spring.core, spring.beans, spring.context;
     opens org.rostilos.codecrow.analysisengine.service.rag to spring.core, spring.beans, spring.context;
     opens org.rostilos.codecrow.analysisengine.service.vcs to spring.core, spring.beans, spring.context;
 }

frontend

@@ -4,6 +4,7 @@
 import org.rostilos.codecrow.core.model.codeanalysis.AnalysisMode;
 import org.rostilos.codecrow.core.model.codeanalysis.AnalysisType;
 import java.util.List;
+import java.util.Map;
 
 public interface AiAnalysisRequest {
     Long getProjectId();
@@ -55,4 +56,12 @@ public interface AiAnalysisRequest {
     String getPreviousCommitHash();
 
     String getCurrentCommitHash();
+
+    /**
+     * File contents pre-fetched by Java for MCP-free reconciliation.
+     * Map of filePath → full file content. When non-null and non-empty,
+     * Python will use these directly instead of spawning an MCP agent to
+     * fetch files via VCS tool calls.
+     */
+    default Map<String, String> getReconciliationFileContents() { return null; }
 }

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

@@ -10,6 +10,7 @@
 import org.rostilos.codecrow.core.model.project.ProjectVcsConnectionBinding;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class AiAnalysisRequestImpl implements AiAnalysisRequest {
@@ -54,6 +55,9 @@ public class AiAnalysisRequestImpl implements AiAnalysisRequest {
     // Custom project review rules (JSON-serializable list)
     protected final String projectRules;
 
+    // Pre-fetched file contents for MCP-free branch reconciliation
+    protected final Map<String, String> reconciliationFileContents;
+
     protected AiAnalysisRequestImpl(Builder<?> builder) {
         this.projectId = builder.projectId;
         this.projectVcsWorkspace = builder.projectVcsWorkspace;
@@ -89,6 +93,8 @@ protected AiAnalysisRequestImpl(Builder<?> builder) {
         this.enrichmentData = builder.enrichmentData;
         // Custom project review rules
         this.projectRules = builder.projectRules;
+        // Pre-fetched file contents for MCP-free reconciliation
+        this.reconciliationFileContents = builder.reconciliationFileContents;
     }
 
     public Long getProjectId() {
@@ -210,6 +216,11 @@ public String getProjectRules() {
         return projectRules;
     }
 
+    @Override
+    public Map<String, String> getReconciliationFileContents() {
+        return reconciliationFileContents;
+    }
+
     public static Builder<?> builder() {
         return new Builder<>();
     }
@@ -250,6 +261,8 @@ public static class Builder<T extends Builder<T>> {
         private PrEnrichmentDataDto enrichmentData;
         // Custom project review rules (JSON string)
         private String projectRules;
+        // Pre-fetched file contents for MCP-free reconciliation
+        private Map<String, String> reconciliationFileContents;
 
         protected Builder() {
         }
@@ -311,6 +324,18 @@ public T withPreviousAnalysisData(Optional<CodeAnalysis> optionalPreviousAnalysi
             return self();
         }
 
+        /**
+         * Sets previous issues directly from pre-built DTOs.
+         * Used when the caller already has the DTOs (e.g., built from BranchIssue data
+         * via {@link AiRequestPreviousIssueDTO#fromBranchIssue}) and no entity-to-DTO
+         * conversion is needed. This avoids lazy-initialization issues that occur when
+         * CodeAnalysisIssue proxies are accessed outside a Hibernate session.
+         */
+        public T withPreviousIssues(List<AiRequestPreviousIssueDTO> issues) {
+            this.previousCodeAnalysisIssues = issues;
+            return self();
+        }
+
         /**
          * Set previous issues from ALL PR analysis versions.
          * This provides the LLM with complete issue history including resolved issues,
@@ -409,6 +434,7 @@ private AiRequestPreviousIssueDTO mergeResolvedStatus(
                     newer.id(),
                     newer.type(),
                     newer.severity(),
+                    newer.title(),
                     newer.reason(),
                     newer.suggestedFixDescription(),
                     newer.suggestedFixDiff(),
@@ -421,7 +447,8 @@ private AiRequestPreviousIssueDTO mergeResolvedStatus(
                     newer.prVersion(),
                     resolvedOlder.resolvedDescription(),
                     resolvedOlder.resolvedByCommit(),
-                    resolvedOlder.resolvedInAnalysisId());
+                    resolvedOlder.resolvedInAnalysisId(),
+                    newer.codeSnippet());
         }
 
         public T withMaxAllowedTokens(int maxAllowedTokens) {
@@ -520,6 +547,11 @@ public T withProjectRules(String projectRules) {
             return self();
         }
 
+        public T withReconciliationFileContents(Map<String, String> reconciliationFileContents) {
+            this.reconciliationFileContents = reconciliationFileContents;
+            return self();
+        }
+
         public AiAnalysisRequestImpl build() {
             return new AiAnalysisRequestImpl(this);
         }

java-ecosystem/libs/analysis-engine/src/main/java/org/rostilos/codecrow/analysisengine/dto/request/ai/AiAnalysisRequest.java

@@ -1,12 +1,14 @@
 package org.rostilos.codecrow.analysisengine.dto.request.ai;
 
+import org.rostilos.codecrow.core.model.branch.BranchIssue;
 import org.rostilos.codecrow.core.model.codeanalysis.CodeAnalysisIssue;
 import org.rostilos.codecrow.core.model.codeanalysis.IssueCategory;
 
 public record AiRequestPreviousIssueDTO(
         String id,
         String type, // security|quality|performance|style
         String severity, // critical|high|medium|low|info
+        String title,
         String reason,
         String suggestedFixDescription,
         String suggestedFixDiff,
@@ -20,7 +22,9 @@ public record AiRequestPreviousIssueDTO(
         Integer prVersion, // Which PR iteration this issue was found in
         String resolvedDescription, // Description of how the issue was resolved
         String resolvedByCommit, // Commit hash that resolved the issue
-        Long resolvedInAnalysisId // Analysis ID where this was resolved (null if still open)
+        Long resolvedInAnalysisId, // Analysis ID where this was resolved (null if still open)
+        // Content-based anchoring
+        String codeSnippet // Verbatim source line for line anchoring — Python passes back, Java re-resolves
 ) {
     public static AiRequestPreviousIssueDTO fromEntity(CodeAnalysisIssue issue) {
         String categoryStr = issue.getIssueCategory() != null 
@@ -36,6 +40,7 @@ public static AiRequestPreviousIssueDTO fromEntity(CodeAnalysisIssue issue) {
                 String.valueOf(issue.getId()),
                 categoryStr,
                 issue.getSeverity() != null ? issue.getSeverity().name() : null,
+                issue.getTitle(),
                 issue.getReason(),
                 issue.getSuggestedFixDescription(),
                 issue.getSuggestedFixDiff(),
@@ -48,7 +53,58 @@ public static AiRequestPreviousIssueDTO fromEntity(CodeAnalysisIssue issue) {
                 prVersion,
                 issue.getResolvedDescription(),
                 issue.getResolvedCommitHash(),
-                issue.getResolvedAnalysisId()
+                issue.getResolvedAnalysisId(),
+                issue.getCodeSnippet()
+        );
+    }
+
+    /**
+     * Factory method that reads all data from a BranchIssue's own fields.
+     * Used for AI reconciliation of branch-level issues.
+     * The BranchIssue is a fully independent entity — no CodeAnalysisIssue dereference needed.
+     *
+     * <p><b>ID handling:</b> The {@code id} field is set to the origin
+     * {@link CodeAnalysisIssue} ID when available, because
+     * {@code processReconciledIssue()} looks up the BranchIssue via
+     * {@code findByBranchIdAndOriginIssueId(branchId, id)}.  If there is no
+     * origin issue (e.g. the BranchIssue was created directly), we fall back to
+     * the BranchIssue's own PK.
+     */
+    public static AiRequestPreviousIssueDTO fromBranchIssue(BranchIssue bi) {
+        String categoryStr = bi.getIssueCategory() != null
+                ? bi.getIssueCategory().name()
+                : IssueCategory.CODE_QUALITY.name();
+
+        // Use the reconciled line number if available
+        Integer lineNumber = bi.getCurrentLineNumber() != null
+                ? bi.getCurrentLineNumber() : bi.getLineNumber();
+
+        // Use origin issue ID so processReconciledIssue() can look up by
+        // findByBranchIdAndOriginIssueId.  Hibernate allows getId() on a
+        // lazy proxy without triggering full initialization.
+        String issueId = bi.getOriginIssue() != null
+                ? String.valueOf(bi.getOriginIssue().getId())
+                : String.valueOf(bi.getId());
+
+        return new AiRequestPreviousIssueDTO(
+                issueId,
+                categoryStr,
+                bi.getSeverity() != null ? bi.getSeverity().name() : null,
+                bi.getTitle(),
+                bi.getReason(),
+                bi.getSuggestedFixDescription(),
+                bi.getSuggestedFixDiff(),
+                bi.getFilePath(),
+                lineNumber,
+                bi.getOriginBranchName(),
+                bi.getOriginPrNumber() != null ? String.valueOf(bi.getOriginPrNumber()) : null,
+                bi.isResolved() ? "resolved" : "open",
+                categoryStr,
+                null,                        // prVersion — not applicable for branch issues
+                bi.getResolvedDescription(),
+                bi.getResolvedInCommitHash(),
+                bi.getOriginAnalysisId(),    // resolvedInAnalysisId → use origin for provenance
+                bi.getCodeSnippet()
         );
     }
 }