1.2.1 rc #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

rostilos wants to merge 52 commits into main from 1.2.1-rc

frontend

Submodule frontend updated 14 files

+0 −3		src/api_service/ai/aiConnectionService.ts
+1 −0		src/api_service/integration/integration.interface.ts
+11 −0		src/api_service/integration/integrationService.ts
+5 −2		src/api_service/project/projectService.ts
+186 −5		src/components/RagConfiguration.tsx
+5 −37		src/pages/Account/AI/AISettings.tsx
+49 −0		src/pages/Account/CodeHosting/bitbucket/HostingSettings.tsx
+41 −0		src/pages/Account/CodeHosting/github/GitHubHostingSettings.tsx
+50 −0		src/pages/Account/CodeHosting/gitlab/GitLabHostingSettings.tsx
+2 −14		src/pages/Account/Integrations/IntegrationSuccess.tsx
+2 −14		src/pages/Account/Project/ImportProject.tsx
+30 −2		src/pages/Account/Project/ProjectConfiguration.tsx
+2 −14		src/pages/Account/Project/new/NewProject.tsx
+2 −1		src/pages/Jobs/JobDetailPage.tsx

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,12 @@ @@
                 <artifactId>okhttp</artifactId>
             </dependency>
+            <!-- JTokkit for token counting -->
+            <dependency>
+                <groupId>com.knuddels</groupId>
+                <artifactId>jtokkit</artifactId>
+            </dependency>
             <!-- Test Dependencies -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
         requires com.fasterxml.jackson.annotation;
         requires jakarta.persistence;
         requires kotlin.stdlib;
+        requires jtokkit;
         exports org.rostilos.codecrow.analysisengine.aiclient;
         exports org.rostilos.codecrow.analysisengine.config;
@@ Expand Down @@

...-engine/src/main/java/org/rostilos/codecrow/analysisengine/aiclient/AiAnalysisClient.java

-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * Extracts analysis data from nested response structure.
-         * Expected: response -> result -> {comment, issues}
+         * Expected: response -> result -> {comment, issues, inference_stats}
          * Issues can be either a List (array) or Map (object with numeric keys)
          */
         private Map<String, Object> extractAndValidateAnalysisData(Map response) throws IOException {
@@ Expand All @@
                 if (result == null) {
                     throw new IOException("Missing 'result' field in AI response");
                 }
+                // Check for error response from MCP client
+                Object errorFlag = result.get("error");
+                if (Boolean.TRUE.equals(errorFlag) || "true".equals(String.valueOf(errorFlag))) {
+                    String errorMessage = result.get("error_message") != null
+                        ? String.valueOf(result.get("error_message"))
+                        : String.valueOf(result.get("comment"));
+                    throw new IOException("Analysis failed: " + errorMessage);
+                }
                 if (!result.containsKey("comment") || !result.containsKey("issues")) {
                     throw new IOException("Analysis data missing required fields: 'comment' and/or 'issues'");
@@ Expand Down @@

.../main/java/org/rostilos/codecrow/analysisengine/dto/request/ai/AiAnalysisRequestImpl.java

-Original file line number
+Diff line change
@@ -1,3 +1,3 @@
     package org.rostilos.codecrow.analysisengine.dto.request.ai;
     import com.fasterxml.jackson.annotation.JsonProperty;
@@ Expand Down Expand Up / @@ -278,6 +278,113 @@ @@
                 return self();
             }
+            /**
+             * Set previous issues from ALL PR analysis versions.
+             * This provides the LLM with complete issue history including resolved issues,
+             * helping it understand what was already found and fixed.
+             *
+             * Issues are deduplicated by fingerprint (file + line ±3 + severity + truncated reason).
+             * When duplicates exist across versions, we keep the most recent version's data
+             * but preserve resolved status if ANY version marked it resolved.
+             *
+             * @param allPrAnalyses List of all analyses for this PR, ordered by version DESC (newest first)
+             */
+            public T withAllPrAnalysesData(List<CodeAnalysis> allPrAnalyses) {
+                if (allPrAnalyses == null || allPrAnalyses.isEmpty()) {
+                    return self();
+                }
+                // Convert all issues to DTOs
+                List<AiRequestPreviousIssueDTO> allIssues = allPrAnalyses.stream()
+                        .flatMap(analysis -> analysis.getIssues().stream())
+                        .map(AiRequestPreviousIssueDTO::fromEntity)
+                        .toList();
+                // Deduplicate: group by fingerprint, keep most recent version but preserve resolved status
+                java.util.Map<String, AiRequestPreviousIssueDTO> deduped = new java.util.LinkedHashMap<>();
+                for (AiRequestPreviousIssueDTO issue : allIssues) {
+                    String fingerprint = computeIssueFingerprint(issue);
+                    AiRequestPreviousIssueDTO existing = deduped.get(fingerprint);
+                    if (existing == null) {
+                        // First occurrence of this issue
+                        deduped.put(fingerprint, issue);
+                    } else {
+                        // Duplicate found - keep the one with higher prVersion (more recent)
+                        // But if older version is resolved and newer is not, preserve resolved status
+                        int existingVersion = existing.prVersion() != null ? existing.prVersion() : 0;
+                        int currentVersion = issue.prVersion() != null ? issue.prVersion() : 0;
+                        boolean existingResolved = "resolved".equalsIgnoreCase(existing.status());
+                        boolean currentResolved = "resolved".equalsIgnoreCase(issue.status());
+                        if (currentVersion > existingVersion) {
+                            // Current is newer - use it, but preserve resolved status if existing was resolved
+                            if (existingResolved && !currentResolved) {
+                                // Older version was resolved but newer one isn't marked - use resolved data from older
+                                deduped.put(fingerprint, mergeResolvedStatus(issue, existing));
+                            } else {
+                                deduped.put(fingerprint, issue);
+                            }
+                        } else if (existingVersion == currentVersion) {
+                            // Same version - prefer resolved one
+                            if (currentResolved && !existingResolved) {
+                                deduped.put(fingerprint, issue);
+                            }
+                        }
+                        // If existing is newer, keep it (already in map)
+                    }
+                }
+                this.previousCodeAnalysisIssues = new java.util.ArrayList<>(deduped.values());
+                return self();
+            }
+            /**
+             * Compute a fingerprint for an issue to detect duplicates across PR versions.
+             * Uses: file + normalized line (±3 tolerance) + severity + first 50 chars of reason.
+             */
+            private String computeIssueFingerprint(AiRequestPreviousIssueDTO issue) {
+                String file = issue.file() != null ? issue.file() : "";
+                // Normalize line to nearest multiple of 3 for tolerance
+                int lineGroup = issue.line() != null ? (issue.line() / 3) : 0;
+                String severity = issue.severity() != null ? issue.severity() : "";
+                String reasonPrefix = issue.reason() != null
+                    ? issue.reason().substring(0, Math.min(50, issue.reason().length())).toLowerCase().trim()
+                    : "";
+                return file + "::" + lineGroup + "::" + severity + "::" + reasonPrefix;
+            }
+            /**
+             * Merge resolved status from an older issue version into a newer one.
+             * Creates a new DTO with the newer issue's data but the older issue's resolution info.
+             */
+            private AiRequestPreviousIssueDTO mergeResolvedStatus(
+                    AiRequestPreviousIssueDTO newer,
+                    AiRequestPreviousIssueDTO resolvedOlder) {
+                return new AiRequestPreviousIssueDTO(
+                        newer.id(),
+                        newer.type(),
+                        newer.severity(),
+                        newer.reason(),
+                        newer.suggestedFixDescription(),
+                        newer.suggestedFixDiff(),
+                        newer.file(),
+                        newer.line(),
+                        newer.branch(),
+                        newer.pullRequestId(),
+                        resolvedOlder.status(), // Use resolved status from older
+                        newer.category(),
+                        newer.prVersion(),
+                        resolvedOlder.resolvedDescription(),
+                        resolvedOlder.resolvedByCommit(),
+                        resolvedOlder.resolvedInAnalysisId()
+                );
+            }
             public T withMaxAllowedTokens(int maxAllowedTokens) {
                 this.maxAllowedTokens = maxAllowedTokens;
                 return self();
@@ Expand Down @@

...n/java/org/rostilos/codecrow/analysisengine/dto/request/ai/AiRequestPreviousIssueDTO.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,12 +15,23 @@ public record AiRequestPreviousIssueDTO( @@
             String branch,
             String pullRequestId,
             String status, // open|resolved|ignored
-            String category
+            String category,
+            // Resolution tracking fields
+            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)
     ) {
         public static AiRequestPreviousIssueDTO fromEntity(CodeAnalysisIssue issue) {
             String categoryStr = issue.getIssueCategory() != null
                 ? issue.getIssueCategory().name()
                 : IssueCategory.CODE_QUALITY.name();
+            Integer prVersion = null;
+            if (issue.getAnalysis() != null) {
+                prVersion = issue.getAnalysis().getPrVersion();
+            }
             return new AiRequestPreviousIssueDTO(
                     String.valueOf(issue.getId()),
                     categoryStr,
@@ Expand All @@
                     issue.getAnalysis() == null ? null : issue.getAnalysis().getBranchName(),
                     issue.getAnalysis() == null || issue.getAnalysis().getPrNumber() == null ? null : String.valueOf(issue.getAnalysis().getPrNumber()),
                     issue.isResolved() ? "resolved" : "open",
-                    categoryStr
+                    categoryStr,
+                    prVersion,
+                    issue.getResolvedDescription(),
+                    issue.getResolvedCommitHash(),
+                    issue.getResolvedAnalysisId()
             );
         }
     }

...ain/java/org/rostilos/codecrow/analysisengine/dto/request/processor/PrProcessRequest.java

-Original file line number
+Diff line change
@@ Expand Up @@
         public String prAuthorId;
         public String prAuthorUsername;
+        /**
+         * Optional pre-acquired lock key. If set, the processor will skip lock acquisition
+         * and use this lock key directly. This prevents double-locking when the webhook handler
+         * has already acquired the lock before calling the processor.
+         */
+        public String preAcquiredLockKey;
         public Long getProjectId() {
@@ Expand Down Expand Up / @@ -64,4 +71,6 @@ public String getSourceBranchName() { @@
         public String getPrAuthorId() { return prAuthorId; }
         public String getPrAuthorUsername() { return prAuthorUsername; }
+        public String getPreAcquiredLockKey() { return preAcquiredLockKey; }
     }

...e/src/main/java/org/rostilos/codecrow/analysisengine/exception/DiffTooLargeException.java

-Original file line number
+Diff line change
@@ -0,0 +1,47 @@
+    package org.rostilos.codecrow.analysisengine.exception;
+    /**
+     * Exception thrown when a diff exceeds the configured token limit for analysis.
+     * This is a soft skip - the analysis is not performed but the job is not marked as failed.
+     */
+    public class DiffTooLargeException extends RuntimeException {
+        private final int estimatedTokens;
+        private final int maxAllowedTokens;
+        private final Long projectId;
+        private final Long pullRequestId;
+        public DiffTooLargeException(int estimatedTokens, int maxAllowedTokens, Long projectId, Long pullRequestId) {
+            super(String.format(
+                "PR diff exceeds token limit: estimated %d tokens, max allowed %d tokens (project=%d, PR=%d)",
+                estimatedTokens, maxAllowedTokens, projectId, pullRequestId
+            ));
+            this.estimatedTokens = estimatedTokens;
+            this.maxAllowedTokens = maxAllowedTokens;
+            this.projectId = projectId;
+            this.pullRequestId = pullRequestId;
+        }
+        public int getEstimatedTokens() {
+            return estimatedTokens;
+        }
+        public int getMaxAllowedTokens() {
+            return maxAllowedTokens;
+        }
+        public Long getProjectId() {
+            return projectId;
+        }
+        public Long getPullRequestId() {
+            return pullRequestId;
+        }
+        /**
+         * Returns the percentage of the token limit that would be used.
+         */
+        public double getUtilizationPercentage() {
+            return maxAllowedTokens > 0 ? (estimatedTokens * 100.0 / maxAllowedTokens) : 0;
+        }
+    }

...org/rostilos/codecrow/analysisengine/processor/analysis/PullRequestAnalysisProcessor.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ @@
     import java.time.Duration;
     import java.time.Instant;
     import java.util.HashMap;
+    import java.util.List;
     import java.util.Map;
     import java.util.Optional;
@@ Expand Down Expand Up / @@ -90,34 +91,45 @@ public Map<String, Object> process( @@
             // Publish analysis started event
             publishAnalysisStartedEvent(project, request, correlationId);
-            Optional<String> lockKey = analysisLockService.acquireLockWithWait(
-                    project,
-                    request.getSourceBranchName(),
-                    AnalysisLockType.PR_ANALYSIS,
-                    request.getCommitHash(),
-                    request.getPullRequestId(),
-                    consumer::accept
-            );
-            if (lockKey.isEmpty()) {
-                String message = String.format(
-                        "Failed to acquire lock after %d minutes for project=%s, PR=%d, branch=%s. Another analysis is still in progress.",
-                        analysisLockService.getLockWaitTimeoutMinutes(),
-                        project.getId(),
-                        request.getPullRequestId(),
-                        request.getSourceBranchName()
-                );
-                log.warn(message);
-                // Publish failed event due to lock timeout
-                publishAnalysisCompletedEvent(project, request, correlationId, startTime,
-                        AnalysisCompletedEvent.CompletionStatus.FAILED, 0, 0, "Lock acquisition timeout");
-                throw new AnalysisLockedException(
-                        AnalysisLockType.PR_ANALYSIS.name(),
+            // Check if a lock was already acquired by the caller (e.g., webhook handler)
+            // to prevent double-locking which causes unnecessary 2-minute waits
+            String lockKey;
+            boolean isPreAcquired = false;
+            if (request.getPreAcquiredLockKey() != null && !request.getPreAcquiredLockKey().isBlank()) {
+                lockKey = request.getPreAcquiredLockKey();
+                isPreAcquired = true;
+                log.info("Using pre-acquired lock: {} for project={}, PR={}", lockKey, project.getId(), request.getPullRequestId());
+            } else {
+                Optional<String> acquiredLock = analysisLockService.acquireLockWithWait(
+                        project,
                         request.getSourceBranchName(),
-                        project.getId()
+                        AnalysisLockType.PR_ANALYSIS,
+                        request.getCommitHash(),
+                        request.getPullRequestId(),
+                        consumer::accept
                 );
+                if (acquiredLock.isEmpty()) {
+                    String message = String.format(
+                            "Failed to acquire lock after %d minutes for project=%s, PR=%d, branch=%s. Another analysis is still in progress.",
+                            analysisLockService.getLockWaitTimeoutMinutes(),
+                            project.getId(),
+                            request.getPullRequestId(),
+                            request.getSourceBranchName()
+                    );
+                    log.warn(message);
+                    // Publish failed event due to lock timeout
+                    publishAnalysisCompletedEvent(project, request, correlationId, startTime,
+                            AnalysisCompletedEvent.CompletionStatus.FAILED, 0, 0, "Lock acquisition timeout");
+                    throw new AnalysisLockedException(
+                            AnalysisLockType.PR_ANALYSIS.name(),
+                            request.getSourceBranchName(),
+                            project.getId()
+                    );
+                }
+                lockKey = acquiredLock.get();
             }
             try {
@@ Expand All / @@ -139,16 +151,24 @@ public Map<String, Object> process( @@
                     return Map.of("status", "cached", "cached", true);
                 }
-                Optional<CodeAnalysis> previousAnalysis = codeAnalysisService.getPreviousVersionCodeAnalysis(
+                // Get all previous analyses for this PR to provide full issue history to AI
+                List<CodeAnalysis> allPrAnalyses = codeAnalysisService.getAllPrAnalyses(
                         project.getId(),
                         request.getPullRequestId()
                 );
+                // Get the most recent analysis for incremental diff calculation
+                Optional<CodeAnalysis> previousAnalysis = allPrAnalyses.isEmpty()
+                        ? Optional.empty()
+                        : Optional.of(allPrAnalyses.get(0));
-                // Ensure branch index exists for target branch if configured
+                // Ensure branch index exists for TARGET branch (e.g., "1.2.1-rc")
+                // This is where the PR will merge TO - we want RAG context from this branch
                 ensureRagIndexForTargetBranch(project, request.getTargetBranchName(), consumer);
                 VcsAiClientService aiClientService = vcsServiceFactory.getAiClientService(provider);
-                AiAnalysisRequest aiRequest = aiClientService.buildAiAnalysisRequest(project, request, previousAnalysis);
+                AiAnalysisRequest aiRequest = aiClientService.buildAiAnalysisRequest(
+                        project, request, previousAnalysis, allPrAnalyses);
                 Map<String, Object> aiResponse = aiAnalysisClient.performAnalysis(aiRequest, event -> {
                     try {
@@ Expand Down Expand Up / @@ -208,7 +228,9 @@ public Map<String, Object> process( @@
                 return Map.of("status", "error", "message", e.getMessage());
             } finally {
-                analysisLockService.releaseLock(lockKey.get());
+                if (!isPreAcquired) {
+                    analysisLockService.releaseLock(lockKey);
+                }
             }
         }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

1.2.1 rc #111

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

1.2.1 rc #111

Are you sure you want to change the base?

Uh oh!

1.2.1 rc #111

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!