edsger 0.4.2 → 0.4.4

package/dist/phases/code-refine/context-fetcher.d.ts

@@ -1,6 +1,6 @@
 /**
  * Context fetcher for code refine phase
- * Fetches GitHub PR review comments that request changes
+ * Fetches GitHub PR review comments and reviews using GraphQL API
  */
 import { Octokit } from '@octokit/rest';
 export interface PRReviewComment {
@@ -16,6 +16,7 @@ export interface PRReviewComment {
     original_position: number | null;
     diff_hunk: string | null;
     in_reply_to_id?: number;
+    url?: string;
 }
 export interface PRReview {
     id: number;
@@ -26,6 +27,17 @@ export interface PRReview {
     state: string;
     submitted_at: string | null;
 }
+export interface PRReviewThread {
+    id: string;
+    isResolved: boolean;
+    isOutdated: boolean;
+    line: number | null;
+    originalLine: number | null;
+    startLine: number | null;
+    originalStartLine: number | null;
+    diffSide: string;
+    comments: PRReviewComment[];
+}
 export interface CodeRefineContext {
     featureId: string;
     featureName: string;
@@ -36,6 +48,7 @@ export interface CodeRefineContext {
     repo: string;
     reviews: PRReview[];
     reviewComments: PRReviewComment[];
+    reviewThreads?: PRReviewThread[];
     technicalDesign?: string;
     userStories?: any[];
     testCases?: any[];
@@ -56,6 +69,13 @@ export declare function fetchPRReviews(octokit: Octokit, owner: string, repo: st
  * Fetch PR review comments
  */
 export declare function fetchPRReviewComments(octokit: Octokit, owner: string, repo: string, prNumber: number, verbose?: boolean): Promise<PRReviewComment[]>;
+/**
+ * Fetch PR data using GraphQL API including review threads and reviews
+ */
+export declare function fetchPRDataGraphQL(octokit: Octokit, owner: string, repo: string, prNumber: number, verbose?: boolean): Promise<{
+    reviewThreads: PRReviewThread[];
+    reviews: PRReview[];
+}>;
 /**
  * Fetch user stories via MCP
  */

package/dist/phases/code-refine/context-fetcher.js

@@ -1,6 +1,6 @@
 /**
  * Context fetcher for code refine phase
- * Fetches GitHub PR review comments that request changes
+ * Fetches GitHub PR review comments and reviews using GraphQL API
  */
 import { Octokit } from '@octokit/rest';
 import { getFeature } from '../../api/features/get-feature.js';
@@ -54,6 +54,114 @@ export async function fetchPRReviewComments(octokit, owner, repo, prNumber, verb
     }
     return comments;
 }
+/**
+ * Fetch PR data using GraphQL API including review threads and reviews
+ */
+export async function fetchPRDataGraphQL(octokit, owner, repo, prNumber, verbose) {
+    if (verbose) {
+        console.log(`🔍 Fetching PR data via GraphQL for ${owner}/${repo}#${prNumber}...`);
+    }
+    const query = `
+    query($owner: String!, $repo: String!, $prNumber: Int!) {
+      repository(owner: $owner, name: $repo) {
+        pullRequest(number: $prNumber) {
+          reviews(first: 100) {
+            nodes {
+              id
+              databaseId
+              author {
+                login
+              }
+              body
+              state
+              submittedAt
+            }
+          }
+          reviewThreads(first: 100) {
+            nodes {
+              id
+              isResolved
+              isOutdated
+              line
+              originalLine
+              startLine
+              originalStartLine
+              diffSide
+              comments(first: 100) {
+                nodes {
+                  id
+                  databaseId
+                  body
+                  path
+                  originalPosition
+                  diffHunk
+                  createdAt
+                  url
+                  author {
+                    login
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  `;
+    const result = await octokit.graphql(query, {
+        owner,
+        repo,
+        prNumber,
+    });
+    const pullRequest = result.repository.pullRequest;
+    // Transform GraphQL reviews to our interface
+    const reviews = (pullRequest.reviews.nodes || []).map((review) => ({
+        id: review.databaseId,
+        user: {
+            login: review.author?.login || 'unknown',
+        },
+        body: review.body,
+        state: review.state,
+        submitted_at: review.submittedAt,
+    }));
+    // Transform GraphQL review threads to our interface
+    const reviewThreads = (pullRequest.reviewThreads.nodes || []).map((thread) => ({
+        id: thread.id,
+        isResolved: thread.isResolved,
+        isOutdated: thread.isOutdated,
+        line: thread.line,
+        originalLine: thread.originalLine,
+        startLine: thread.startLine,
+        originalStartLine: thread.originalStartLine,
+        diffSide: thread.diffSide,
+        comments: (thread.comments.nodes || []).map((comment) => ({
+            id: comment.databaseId,
+            body: comment.body,
+            path: comment.path,
+            line: thread.line, // Use thread's line for consistency
+            user: {
+                login: comment.author?.login || 'unknown',
+            },
+            created_at: comment.createdAt,
+            position: comment.originalPosition,
+            original_position: comment.originalPosition,
+            diff_hunk: comment.diffHunk,
+            url: comment.url,
+        })),
+    }));
+    // Filter for reviews requesting changes
+    const changesRequestedReviews = reviews.filter((review) => review.state === 'CHANGES_REQUESTED');
+    // Filter for unresolved threads
+    const unresolvedThreads = reviewThreads.filter((thread) => !thread.isResolved);
+    if (verbose) {
+        console.log(`✅ Found ${changesRequestedReviews.length} reviews requesting changes`);
+        console.log(`✅ Found ${unresolvedThreads.length} unresolved review threads`);
+    }
+    return {
+        reviewThreads: unresolvedThreads,
+        reviews: changesRequestedReviews,
+    };
+}
 /**
  * Fetch user stories via MCP
  */
@@ -163,13 +271,17 @@ export async function fetchCodeRefineContext(mcpServerUrl, mcpToken, featureId,
     const octokit = new Octokit({
         auth: githubToken,
     });
-    // Fetch PR reviews and comments
-    const [reviews, reviewComments, userStories, testCases] = await Promise.all([
-        fetchPRReviews(octokit, owner, repo, prNumber, verbose),
-        fetchPRReviewComments(octokit, owner, repo, prNumber, verbose),
+    // Fetch PR data using GraphQL API and additional context
+    const [prData, userStories, testCases] = await Promise.all([
+        fetchPRDataGraphQL(octokit, owner, repo, prNumber, verbose),
         fetchUserStories(mcpServerUrl, mcpToken, featureId, verbose),
         fetchTestCases(mcpServerUrl, mcpToken, featureId, verbose),
     ]);
+    // Extract review comments from unresolved threads
+    const reviewComments = prData.reviewThreads.flatMap((thread) => thread.comments);
+    if (verbose) {
+        console.log(`📊 Summary: ${prData.reviews.length} reviews requesting changes, ${prData.reviewThreads.length} unresolved threads, ${reviewComments.length} total comments`);
+    }
     return {
         featureId,
         featureName: feature.name,
@@ -178,8 +290,9 @@ export async function fetchCodeRefineContext(mcpServerUrl, mcpToken, featureId,
         pullRequestNumber: prNumber,
         owner,
         repo,
-        reviews,
+        reviews: prData.reviews,
         reviewComments,
+        reviewThreads: prData.reviewThreads,
         technicalDesign: feature.technical_design,
         userStories,
         testCases,
@@ -213,8 +326,45 @@ export function formatContextForPrompt(context) {
             sections.push('');
         });
     }
-    // Review comments
-    if (context.reviewComments.length > 0) {
+    // Review threads (unresolved conversations)
+    if (context.reviewThreads && context.reviewThreads.length > 0) {
+        sections.push(`## Unresolved Review Threads`);
+        sections.push(`*These conversations must be resolved before the PR can be merged.*`);
+        sections.push('');
+        context.reviewThreads.forEach((thread, idx) => {
+            sections.push(`### Thread ${idx + 1} ${thread.isOutdated ? '(Outdated)' : ''}`);
+            // Show thread location
+            if (thread.line !== null) {
+                sections.push(`**Line**: ${thread.line}`);
+            }
+            if (thread.startLine !== null && thread.startLine !== thread.line) {
+                sections.push(`**Line Range**: ${thread.startLine} - ${thread.line || thread.originalLine}`);
+            }
+            sections.push(`**Status**: ❌ Unresolved`);
+            sections.push('');
+            // Show all comments in this thread
+            thread.comments.forEach((comment, commentIdx) => {
+                sections.push(`#### ${commentIdx === 0 ? 'Original Comment' : `Reply ${commentIdx}`} by @${comment.user.login}`);
+                if (comment.path) {
+                    sections.push(`**File**: ${comment.path}`);
+                }
+                if (comment.url) {
+                    sections.push(`**URL**: ${comment.url}`);
+                }
+                if (commentIdx === 0 && comment.diff_hunk) {
+                    sections.push(`**Context**:`);
+                    sections.push('```diff');
+                    sections.push(comment.diff_hunk);
+                    sections.push('```');
+                }
+                sections.push(`**Comment**:`);
+                sections.push(comment.body);
+                sections.push('');
+            });
+        });
+    }
+    else if (context.reviewComments.length > 0) {
+        // Fallback to old format if no thread data available
         sections.push(`## Review Comments`);
         sections.push('');
         context.reviewComments.forEach((comment, idx) => {

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

@@ -50,10 +50,24 @@ async function fetchUnresolvedReviewThreads(octokit, owner, repo, prNumber, verb
             prNumber,
         });
         const allThreads = result?.repository?.pullRequest?.reviewThreads?.nodes || [];
-        // Filter for unresolved threads
-        const unresolvedThreads = allThreads.filter((thread) => !thread.isResolved);
+        // Filter for truly unresolved threads
+        // - Exclude resolved threads (isResolved = true)
+        // - Exclude outdated threads (isOutdated = true) - these mean code has changed, should auto-resolve
+        const unresolvedThreads = allThreads.filter((thread) => !thread.isResolved && !thread.isOutdated);
+        // Separate outdated threads that should be auto-resolved
+        const outdatedThreads = allThreads.filter((thread) => !thread.isResolved && thread.isOutdated);
         if (verbose) {
             logInfo(`📊 Found ${unresolvedThreads.length} unresolved review threads (out of ${allThreads.length} total)`);
+            if (outdatedThreads.length > 0) {
+                logInfo(`📊 Found ${outdatedThreads.length} outdated threads (code changed, will auto-resolve)`);
+            }
+        }
+        // Auto-resolve outdated threads
+        if (outdatedThreads.length > 0) {
+            const markedCount = await resolveReviewThreads(octokit, outdatedThreads, verbose);
+            if (verbose) {
+                logInfo(`✅ Auto-resolved ${markedCount} outdated threads`);
+            }
         }
         return unresolvedThreads;
     }
@@ -65,6 +79,7 @@ async function fetchUnresolvedReviewThreads(octokit, owner, repo, prNumber, verb
 }
 /**
  * Analyze why a comment thread is unresolved and provide specific reason
+ * Note: Outdated threads are auto-resolved, so this only analyzes truly unresolved threads
  */
 function analyzeUnresolvedThread(thread) {
     const firstComment = thread.comments.nodes[0];
@@ -72,13 +87,8 @@ function analyzeUnresolvedThread(thread) {
         return 'Comment thread exists but has no comments';
     }
     const reasons = [];
-    // Check if thread is outdated (code has changed but thread not resolved)
-    if (thread.isOutdated) {
-        reasons.push('Code has changed since comment was made, but thread not marked as resolved');
-    }
-    else {
-        reasons.push('Code at this location has not been modified to address the feedback');
-    }
+    // Since outdated threads are filtered out, remaining threads need code changes
+    reasons.push('Code at this location has not been modified to address the feedback');
     // Check if there are multiple comments (discussion ongoing)
     if (thread.comments.totalCount > 1) {
         reasons.push(`Discussion ongoing (${thread.comments.totalCount} comments in thread)`);

package/package.json

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