edsger 0.4.8 → 0.4.9

package/dist/phases/code-refine-verification/verifier.js

@@ -9,29 +9,76 @@ import { logInfo, logError } from '../../utils/logger.js';
 import { parsePullRequestUrl, fetchPRReviews, } from '../code-refine/context-fetcher.js';
 import { getFeature } from '../../api/features/get-feature.js';
 /**
- * Fetch PR file changes (diff information)
+ * Fetch complete file content from a specific ref (branch/commit)
+ */
+async function fetchFileContent(octokit, owner, repo, ref, path, verbose) {
+    try {
+        const { data } = await octokit.repos.getContent({
+            owner,
+            repo,
+            ref,
+            path,
+        });
+        // Handle file content (not directory)
+        if ('content' in data && !Array.isArray(data)) {
+            // Content is base64 encoded
+            return Buffer.from(data.content, 'base64').toString('utf-8');
+        }
+        return undefined;
+    }
+    catch (error) {
+        if (verbose) {
+            logError(`Failed to fetch content for ${path} at ref ${ref}: ${error}`);
+        }
+        return undefined;
+    }
+}
+/**
+ * Fetch PR file changes (diff information and full content)
  */
 async function fetchPRFileChanges(octokit, owner, repo, prNumber, verbose) {
     try {
         if (verbose) {
-            logInfo('📂 Fetching PR file changes...');
+            logInfo('📂 Fetching PR file changes and content...');
         }
+        // Get PR details to get the head ref
+        const { data: pr } = await octokit.pulls.get({
+            owner,
+            repo,
+            pull_number: prNumber,
+        });
+        const headRef = pr.head.sha;
+        // Get list of changed files
         const { data: files } = await octokit.pulls.listFiles({
             owner,
             repo,
             pull_number: prNumber,
             per_page: 100,
         });
-        const fileChanges = files.map((file) => ({
-            filename: file.filename,
-            status: file.status,
-            additions: file.additions,
-            deletions: file.deletions,
-            changes: file.changes,
-            patch: file.patch,
+        if (verbose) {
+            logInfo(`✅ Found ${files.length} changed files`);
+            logInfo(`📥 Fetching full content for changed files from ${headRef.substring(0, 7)}...`);
+        }
+        // Fetch full content for each file in parallel
+        const fileChanges = await Promise.all(files.map(async (file) => {
+            let fullContent;
+            // Only fetch content for files that were not deleted
+            if (file.status !== 'removed') {
+                fullContent = await fetchFileContent(octokit, owner, repo, headRef, file.filename, verbose);
+            }
+            return {
+                filename: file.filename,
+                status: file.status,
+                additions: file.additions,
+                deletions: file.deletions,
+                changes: file.changes,
+                patch: file.patch,
+                fullContent,
+            };
         }));
         if (verbose) {
-            logInfo(`✅ Found ${fileChanges.length} changed files`);
+            const filesWithContent = fileChanges.filter((f) => f.fullContent).length;
+            logInfo(`✅ Retrieved full content for ${filesWithContent}/${fileChanges.length} files`);
         }
         return fileChanges;
     }
@@ -221,6 +268,35 @@ function createThreadAnalysisPrompt(thread, fileChange, firstComment) {
     const allComments = thread.comments.nodes
         .map((c, idx) => `Comment ${idx + 1} by @${c.author.login}:\n${c.body}`)
         .join('\n\n');
+    // Build the code context section
+    let codeContext = '';
+    // Include diff (what changed)
+    if (fileChange.patch) {
+        codeContext += `**Code Changes (Diff):**
+\`\`\`diff
+${fileChange.patch}
+\`\`\`
+
+`;
+    }
+    // Include full file content for better context
+    if (fileChange.fullContent) {
+        // Truncate very large files to avoid context limits
+        const maxLength = 10000;
+        const content = fileChange.fullContent.length > maxLength
+            ? fileChange.fullContent.substring(0, maxLength) +
+                '\n\n... (file truncated, showing first 10000 characters)'
+            : fileChange.fullContent;
+        codeContext += `**Complete File Content (After Changes):**
+\`\`\`
+${content}
+\`\`\`
+
+`;
+    }
+    if (!codeContext) {
+        codeContext = '(No code information available)\n\n';
+    }
     return `You are analyzing whether a code review comment has been addressed by subsequent code changes.
 
 **Review Thread Information:**
@@ -231,18 +307,24 @@ function createThreadAnalysisPrompt(thread, fileChange, firstComment) {
 **Review Comments:**
 ${allComments}
 
-**Code Changes in This File:**
-\`\`\`diff
-${fileChange.patch || '(No patch available)'}
-\`\`\`
+${codeContext}
 
 **Your Task:**
-Analyze whether the code changes adequately address the feedback in the review comments. Consider:
+Analyze whether the code changes adequately address the feedback in the review comments. You have access to:
+1. **The diff** showing what was changed
+2. **The complete file content** after changes for full context
+
+Consider:
 1. Does the feedback request a specific code change?
 2. Have those changes (or equivalent changes) been made?
-3. If the feedback points to a specific line, have related areas of code been modified to address the concern?
+3. If the feedback points to a specific line, use the full file content to understand the broader context
+4. Check if related areas of code were modified to address the concern
+5. Use the complete file to verify the fix is properly integrated
 
-**Important:** The comment may point to a specific line, but the fix might be in nearby code. Focus on whether the **underlying issue** was addressed, not just whether that exact line was modified.
+**Important:**
+- The comment may point to a specific line, but the fix might be in nearby code
+- Focus on whether the **underlying issue** was addressed, not just whether that exact line was modified
+- Use the full file content to understand the complete context and verify the implementation
 
 Return your analysis in this JSON format:
 \`\`\`json
@@ -253,9 +335,10 @@ Return your analysis in this JSON format:
 \`\`\`
 
 Example responses:
-- If a comment says "add null check" and the diff shows a null check was added nearby: {"isAddressed": true, "reason": "Null check added in related code"}
-- If a comment suggests a refactor but no relevant changes are visible: {"isAddressed": false, "reason": "No refactoring changes visible in diff"}
+- If a comment says "add null check" and the code shows a null check was added: {"isAddressed": true, "reason": "Null check added in the updated code"}
+- If a comment suggests a refactor but no relevant changes are visible: {"isAddressed": false, "reason": "No refactoring changes visible in diff or file content"}
 - If code was modified in related areas addressing the concern: {"isAddressed": true, "reason": "Related code modified to address the concern"}
+- If the full context shows the issue is resolved differently: {"isAddressed": true, "reason": "Issue resolved through alternative implementation visible in full file"}
 `;
 }
 /**

package/package.json

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