edsger 0.6.10 → 0.6.12

package/dist/phases/code-review/index.js

@@ -17,6 +17,100 @@ async function* prompt(reviewPrompt) {
     yield userMessage(reviewPrompt);
     await new Promise((res) => setTimeout(res, 10000));
 }
+/**
+ * Parse unified diff patch to build a mapping from file line numbers to diff positions
+ *
+ * GitHub API uses "position" parameter which is the line number in the unified diff:
+ * - Position starts at 1 for the first line AFTER the @@ hunk header
+ * - Increments for every line (context, additions, deletions)
+ * - Continues through all hunks in the file
+ *
+ * Example unified diff:
+ * ```
+ * @@ -1,3 +1,4 @@        <- not counted in position
+ *  context line          <- position 1, file line 1
+ * -old line              <- position 2, (deleted line, no file line number)
+ * +new line              <- position 3, file line 2
+ * +another new          <- position 4, file line 3
+ *  context               <- position 5, file line 4
+ * ```
+ *
+ * Returns: Map<file line number, diff position>
+ */
+function buildLineToPositionMap(patch) {
+    const lineToPosition = new Map();
+    const lines = patch.split('\n');
+    let position = 0; // Position in the diff (starts at 1 after first line after @@)
+    let currentNewLine = 0; // Current line number in the new file (RIGHT side)
+    for (const line of lines) {
+        // Parse hunk headers like @@ -1,7 +1,7 @@
+        // This extracts the starting line number for the new file (+side)
+        const hunkMatch = line.match(/^@@\s+-\d+(?:,\d+)?\s+\+(\d+)(?:,\d+)?\s+@@/);
+        if (hunkMatch) {
+            currentNewLine = parseInt(hunkMatch[1], 10);
+            // Don't increment position for the @@ line itself
+            continue;
+        }
+        // Every line after @@ increments the position counter
+        position++;
+        // Map line numbers based on line type
+        if (line.startsWith('+')) {
+            // Addition: this line exists in the new file at currentNewLine
+            lineToPosition.set(currentNewLine, position);
+            currentNewLine++;
+        }
+        else if (line.startsWith('-')) {
+            // Deletion: this line existed in old file, not in new file
+            // Position still increments, but currentNewLine does not
+            // We can't comment on this line using file line numbers
+        }
+        else if (!line.startsWith('\\')) {
+            // Context line (no prefix): exists in both old and new file
+            lineToPosition.set(currentNewLine, position);
+            currentNewLine++;
+        }
+        // Lines starting with '\' (like "") are metadata
+    }
+    return lineToPosition;
+}
+/**
+ * Find the diff position for a target line number, or the closest nearby position
+ *
+ * @param targetLine - The file line number we want to comment on
+ * @param lineToPosition - Map of file line numbers to diff positions
+ * @returns Object with position and actual line number, or null if not found
+ */
+function findClosestPosition(targetLine, lineToPosition) {
+    // Check if exact line exists in the diff
+    if (lineToPosition.has(targetLine)) {
+        return {
+            position: lineToPosition.get(targetLine),
+            actualLine: targetLine,
+        };
+    }
+    // Try to find a nearby line within ±10 lines range
+    const range = 10;
+    for (let offset = 1; offset <= range; offset++) {
+        // Try below first (more likely to be relevant for review comments)
+        const lineBelow = targetLine + offset;
+        if (lineToPosition.has(lineBelow)) {
+            return {
+                position: lineToPosition.get(lineBelow),
+                actualLine: lineBelow,
+            };
+        }
+        // Try above
+        const lineAbove = targetLine - offset;
+        if (lineToPosition.has(lineAbove)) {
+            return {
+                position: lineToPosition.get(lineAbove),
+                actualLine: lineAbove,
+            };
+        }
+    }
+    // No valid position found within range
+    return null;
+}
 /**
  * Main code review function
  */
@@ -179,16 +273,81 @@ export const reviewPullRequest = async (options, config) => {
             if (verbose) {
                 logInfo(`Creating GitHub review with ${comments.length} comments...`);
             }
-            // Create review with inline comments
-            const reviewComments = comments.map((comment) => ({
-                path: comment.file || comment.path,
-                line: comment.line,
-                body: comment.comment || comment.body,
-            }));
+            // Build a map of file paths to their line-to-position mappings
+            const fileLineToPosition = new Map();
+            for (const file of context.files) {
+                if (file.patch) {
+                    fileLineToPosition.set(file.filename, buildLineToPositionMap(file.patch));
+                }
+            }
+            // Get the latest commit SHA from the PR for the review
+            const commitId = context.prData.head.sha;
+            // Create review with inline comments using unified diff positions
+            const reviewComments = [];
+            for (const comment of comments) {
+                const filePath = comment.file || comment.path;
+                const requestedLine = comment.line;
+                const lineToPosition = fileLineToPosition.get(filePath);
+                if (!lineToPosition) {
+                    if (verbose) {
+                        logInfo(`⚠️  Skipping comment for ${filePath}:${requestedLine} - file has no diff`);
+                    }
+                    continue;
+                }
+                // Find the diff position for this line number
+                const positionResult = findClosestPosition(requestedLine, lineToPosition);
+                if (positionResult === null) {
+                    if (verbose) {
+                        logInfo(`⚠️  Skipping comment for ${filePath}:${requestedLine} - line not in diff range`);
+                    }
+                    continue;
+                }
+                let commentBody = comment.comment || comment.body;
+                // If we had to adjust the line number, add a note
+                if (positionResult.actualLine !== requestedLine) {
+                    commentBody = `**Note**: Comment originally for line ${requestedLine}, adjusted to line ${positionResult.actualLine} (nearest line in diff).\n\n${commentBody}`;
+                    if (verbose) {
+                        logInfo(`  Adjusted ${filePath}:${requestedLine} → line ${positionResult.actualLine} (position ${positionResult.position})`);
+                    }
+                }
+                reviewComments.push({
+                    path: filePath,
+                    position: positionResult.position,
+                    body: commentBody,
+                });
+            }
+            // If all comments were filtered out, just create a review with the summary
+            if (reviewComments.length === 0) {
+                if (verbose) {
+                    logInfo(`⚠️  All ${comments.length} comments were filtered out (invalid line numbers)`);
+                    logInfo('Creating review with summary only...');
+                }
+                const review = await octokit.pulls.createReview({
+                    owner: context.owner,
+                    repo: context.repo,
+                    pull_number: context.pullRequestNumber,
+                    event: 'COMMENT',
+                    body: (summary || overall_assessment || 'Code review completed.') +
+                        '\n\n**Note**: Some review comments could not be posted because they referenced lines not present in the diff.',
+                });
+                return {
+                    featureId,
+                    status: 'success',
+                    message: 'Code review completed - comments filtered due to invalid line numbers',
+                    reviewId: review.data.id,
+                    reviewUrl: review.data.html_url,
+                    commentsCount: 0,
+                    summary: summary || 'Code review completed (comments filtered)',
+                };
+            }
+            if (verbose) {
+                logInfo(`📝 Posting ${reviewComments.length} validated comments (${comments.length - reviewComments.length} filtered out)`);
+            }
             const review = await octokit.pulls.createReview({
                 owner: context.owner,
                 repo: context.repo,
                 pull_number: context.pullRequestNumber,
+                commit_id: commitId, // Required for position-based comments
                 event: 'COMMENT',
                 body: summary ||
                     overall_assessment ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edsger",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "type": "module",
   "bin": {
     "edsger": "dist/index.js"