@ariso-ai/ivan 1.0.15 → 1.0.17

package/dist/services/address-task-executor.d.ts

@@ -8,11 +8,15 @@ export declare class AddressTaskExecutor {
     private prService;
     private workingDir;
     private repoInstructions;
+    private githubClient;
+    private repoOwner;
+    private repoName;
     constructor();
     private getClaudeExecutor;
     private getOpenAIService;
     executeAddressTasks(tasks: Task[], quiet?: boolean): Promise<void>;
     private getUnaddressedComments;
+    private findCommentId;
     private generateReviewInstructions;
     private tryCommitWithFixes;
 }

package/dist/services/address-task-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address-task-executor.d.ts","sourceRoot":"","sources":["../../src/services/address-task-executor.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAItC,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,gBAAgB,CAAqB;;IAQ7C,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,gBAAgB;IAOlB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YA8pBjE,sBAAsB;YAwGtB,0BAA0B;YAyD1B,kBAAkB;CAuEjC"}
+{"version":3,"file":"address-task-executor.d.ts","sourceRoot":"","sources":["../../src/services/address-task-executor.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAKtC,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,QAAQ,CAAc;;IAQ9B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,gBAAgB;IAOlB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YA0tBjE,sBAAsB;YAoBtB,aAAa;YAyEb,0BAA0B;YAyD1B,kBAAkB;CAuEjC"}

package/dist/services/address-task-executor.js

@@ -6,6 +6,7 @@ import { ExecutorFactory } from './executor-factory.js';
 import { OpenAIService } from './openai-service.js';
 import { ConfigManager } from '../config.js';
 import { createGitManager, createPRService } from './service-factory.js';
+import { GitHubAPIClient } from './github-api-client.js';
 export class AddressTaskExecutor {
     jobManager;
     gitManager = null;
@@ -15,6 +16,9 @@ export class AddressTaskExecutor {
     prService = null;
     workingDir;
     repoInstructions;
+    githubClient = null;
+    repoOwner = '';
+    repoName = '';
     constructor() {
         this.jobManager = new JobManager();
         this.configManager = new ConfigManager();
@@ -61,6 +65,33 @@ export class AddressTaskExecutor {
             this.gitManager.validateGitHubCliAuthentication();
             if (!quiet)
                 console.log(chalk.green('✅ GitHub CLI is authenticated'));
+            // Initialize GitHub API client if using PAT
+            const authType = this.configManager.getGithubAuthType();
+            if (authType === 'pat') {
+                const pat = this.configManager.getGithubPat();
+                if (pat) {
+                    this.githubClient = new GitHubAPIClient(pat);
+                    const repoInfo = GitHubAPIClient.getRepoInfoFromRemote(this.workingDir);
+                    this.repoOwner = repoInfo.owner;
+                    this.repoName = repoInfo.repo;
+                }
+            }
+            // If not using PAT, get repo info from gh command
+            if (!this.githubClient) {
+                try {
+                    const repoInfo = execSync('gh repo view --json owner,name', {
+                        cwd: this.workingDir,
+                        encoding: 'utf-8'
+                    });
+                    const parsed = JSON.parse(repoInfo);
+                    this.repoOwner = parsed.owner.login;
+                    this.repoName = parsed.name;
+                }
+                catch {
+                    if (!quiet)
+                        console.log(chalk.yellow('⚠️  Could not get repository info'));
+                }
+            }
             // Load repository instructions
             this.repoInstructions = await this.configManager.getRepoInstructions(this.workingDir);
             // Group tasks by branch
@@ -221,10 +252,16 @@ export class AddressTaskExecutor {
                             try {
                                 const reviewAgent = this.configManager.getReviewAgent();
                                 const reviewComment = `${reviewAgent} please review the test and lint fixes that were applied to address the failing CI checks`;
-                                execSync(`gh pr comment ${taskPrNumber} --body "${reviewComment}"`, {
-                                    cwd: worktreePath || this.workingDir,
-                                    stdio: 'pipe'
-                                });
+                                // Use GitHub API client if available, otherwise fall back to gh command
+                                if (this.githubClient && this.repoOwner && this.repoName) {
+                                    await this.githubClient.addPRComment(this.repoOwner, this.repoName, taskPrNumber, reviewComment);
+                                }
+                                else {
+                                    execSync(`gh pr comment ${taskPrNumber} --body "${reviewComment}"`, {
+                                        cwd: worktreePath || this.workingDir,
+                                        stdio: 'pipe'
+                                    });
+                                }
                                 if (spinner)
                                     spinner.succeed('Review request comment added');
                             }
@@ -258,47 +295,49 @@ export class AddressTaskExecutor {
                 if (addressTasks.length === 0) {
                     continue;
                 }
-                // Get all unaddressed comments for this PR
-                if (!quiet)
-                    spinner = ora('Fetching PR comments...').start();
-                if (!prNumber) {
-                    throw new Error('PR number not found');
-                }
-                const comments = await this.getUnaddressedComments(parseInt(prNumber));
-                if (spinner)
-                    spinner.succeed(`Found ${comments.length} unaddressed comments`);
-                if (comments.length === 0 && addressTasks.some(t => t.description.includes('comment'))) {
-                    if (!quiet)
-                        console.log(chalk.yellow('⚠️  No unaddressed comments found'));
-                    continue;
-                }
-                // Process each comment
-                for (const comment of comments) {
-                    // In quiet mode, output the comment being addressed
-                    console.log('');
-                    console.log(chalk.blue(`📝 Addressing comment from @${comment.author}:`));
-                    console.log(chalk.gray(`   "${comment.body.substring(0, 100)}${comment.body.length > 100 ? '...' : ''}"`));
-                    // Find the corresponding task
-                    const task = addressTasks.find(t => t.description.includes(comment.author) &&
-                        t.description.includes(comment.body.substring(0, 50)));
-                    if (!task) {
+                // Process each address task directly (no need to re-fetch comments from GitHub)
+                for (const task of addressTasks) {
+                    // Skip tasks that aren't comment-related
+                    if (!task.description.includes('comment from @')) {
+                        continue;
+                    }
+                    // Parse comment information from task description
+                    // Format: "Address PR #123 comment from @author: "body" (in path:line)"
+                    const authorMatch = task.description.match(/comment from @(\w+)/);
+                    const bodyMatch = task.description.match(/: "(.+?)"/);
+                    const pathMatch = task.description.match(/\(in (.+?)(:\d+)?\)$/);
+                    const lineMatch = task.description.match(/:(\d+)\)$/);
+                    if (!authorMatch || !bodyMatch) {
                         if (!quiet)
-                            console.log(chalk.yellow('⚠️  No task found for this comment'));
+                            console.log(chalk.yellow(`⚠️  Could not parse comment from task: ${task.description}`));
                         continue;
                     }
+                    const comment = {
+                        author: authorMatch[1],
+                        body: bodyMatch[1],
+                        path: pathMatch ? pathMatch[1] : undefined,
+                        line: lineMatch ? parseInt(lineMatch[1]) : undefined,
+                        id: '' // We'll fetch this if needed for replying
+                    };
+                    // Output what we're addressing
+                    console.log('');
+                    console.log(chalk.blue(`📝 Addressing comment from @${comment.author}:`));
+                    console.log(chalk.gray(`   "${comment.body}"`));
+                    if (comment.path) {
+                        console.log(chalk.gray(`   File: ${comment.path}${comment.line ? `:${comment.line}` : ''}`));
+                    }
                     await this.jobManager.updateTaskStatus(task.uuid, 'active');
-                    // Save comment URL
-                    if (comment.id) {
-                        const repoInfo = execSync('gh repo view --json owner,name', {
-                            cwd: worktreePath || this.workingDir,
-                            encoding: 'utf-8'
-                        });
-                        const { owner, name: repoName } = JSON.parse(repoInfo);
-                        if (!prNumber) {
-                            throw new Error('PR number not found');
+                    // Fetch the comment ID from GitHub for replying later
+                    if (prNumber) {
+                        const commentId = await this.findCommentId(parseInt(prNumber), comment.author, comment.body.substring(0, 50), comment.path, comment.line);
+                        if (commentId) {
+                            comment.id = commentId;
+                            // Save comment URL
+                            if (this.repoOwner && this.repoName) {
+                                const commentUrl = `https://github.com/${this.repoOwner}/${this.repoName}/pull/${prNumber}#discussion_r${commentId}`;
+                                await this.jobManager.updateTaskCommentUrl(task.uuid, commentUrl);
+                            }
                         }
-                        const commentUrl = `https://github.com/${owner.login}/${repoName}/pull/${prNumber}#discussion_r${comment.id}`;
-                        await this.jobManager.updateTaskCommentUrl(task.uuid, commentUrl);
                     }
                     if (!quiet)
                         spinner = ora('Running Claude Code to address comment...').start();
@@ -343,78 +382,82 @@ export class AddressTaskExecutor {
                                 if (replyBody.length > maxLength) {
                                     replyBody = replyBody.substring(0, maxLength) + '\n\n... (message truncated)';
                                 }
-                                // Use a temporary file to avoid shell escaping issues
-                                const { writeFileSync, unlinkSync } = await import('fs');
-                                const { join } = await import('path');
-                                const { tmpdir } = await import('os');
-                                const tempFile = join(tmpdir(), `ivan-comment-${Date.now()}.txt`);
-                                writeFileSync(tempFile, replyBody);
-                                try {
-                                    // Use GraphQL mutation to add a reply to the review thread
-                                    const repoInfo = execSync('gh repo view --json owner,name', {
-                                        cwd: worktreePath || this.workingDir,
-                                        encoding: 'utf-8'
-                                    });
-                                    const { owner, name: repoName } = JSON.parse(repoInfo);
-                                    // Get the review thread ID from the comment
-                                    const threadQuery = `
-                    query {
-                      repository(owner: "${owner.login}", name: "${repoName}") {
-                        pullRequest(number: ${prNumber}) {
-                          reviewThreads(first: 100) {
-                            nodes {
-                              id
-                              comments(first: 100) {
-                                nodes {
-                                  databaseId
+                                // Use GitHub API client if available, otherwise fall back to gh command
+                                if (this.githubClient && this.repoOwner && this.repoName && prNumber) {
+                                    await this.githubClient.addReviewThreadReply(this.repoOwner, this.repoName, parseInt(prNumber), comment.id, replyBody);
+                                    if (spinner)
+                                        spinner.succeed('Reply added to comment');
+                                }
+                                else {
+                                    // Fallback to gh command
+                                    const { writeFileSync, unlinkSync } = await import('fs');
+                                    const { join } = await import('path');
+                                    const { tmpdir } = await import('os');
+                                    const tempFile = join(tmpdir(), `ivan-comment-${Date.now()}.txt`);
+                                    writeFileSync(tempFile, replyBody);
+                                    try {
+                                        const repoInfo = execSync('gh repo view --json owner,name', {
+                                            cwd: worktreePath || this.workingDir,
+                                            encoding: 'utf-8'
+                                        });
+                                        const { owner, name: repoName } = JSON.parse(repoInfo);
+                                        const threadQuery = `
+                      query {
+                        repository(owner: "${owner.login}", name: "${repoName}") {
+                          pullRequest(number: ${prNumber}) {
+                            reviewThreads(first: 100) {
+                              nodes {
+                                id
+                                comments(first: 100) {
+                                  nodes {
+                                    databaseId
+                                  }
                                 }
                               }
                             }
                           }
                         }
                       }
-                    }
-                  `;
-                                    const threadResult = execSync(`gh api graphql -f query='${threadQuery.replace(/'/g, "'\\''")}'`, {
-                                        cwd: worktreePath || this.workingDir,
-                                        encoding: 'utf-8'
-                                    });
-                                    const threadData = JSON.parse(threadResult);
-                                    const threads = threadData.data?.repository?.pullRequest?.reviewThreads?.nodes || [];
-                                    // Find the thread containing this comment
-                                    let threadId = null;
-                                    for (const thread of threads) {
-                                        const comments = thread.comments?.nodes || [];
-                                        if (comments.some((c) => c.databaseId?.toString() === comment.id)) {
-                                            threadId = thread.id;
-                                            break;
+                    `;
+                                        const threadResult = execSync(`gh api graphql -f query='${threadQuery.replace(/'/g, "'\\''")}'`, {
+                                            cwd: worktreePath || this.workingDir,
+                                            encoding: 'utf-8'
+                                        });
+                                        const threadData = JSON.parse(threadResult);
+                                        const threads = threadData.data?.repository?.pullRequest?.reviewThreads?.nodes || [];
+                                        let threadId = null;
+                                        for (const thread of threads) {
+                                            const comments = thread.comments?.nodes || [];
+                                            if (comments.some((c) => c.databaseId?.toString() === comment.id)) {
+                                                threadId = thread.id;
+                                                break;
+                                            }
                                         }
-                                    }
-                                    if (!threadId) {
-                                        throw new Error('Could not find review thread for comment');
-                                    }
-                                    // Add reply using GraphQL mutation
-                                    const mutation = `
-                    mutation {
-                      addPullRequestReviewThreadReply(input: {
-                        pullRequestReviewThreadId: "${threadId}"
-                        body: ${JSON.stringify(replyBody)}
-                      }) {
-                        comment {
-                          id
+                                        if (!threadId) {
+                                            throw new Error('Could not find review thread for comment');
+                                        }
+                                        const mutation = `
+                      mutation {
+                        addPullRequestReviewThreadReply(input: {
+                          pullRequestReviewThreadId: "${threadId}"
+                          body: ${JSON.stringify(replyBody)}
+                        }) {
+                          comment {
+                            id
+                          }
                         }
                       }
-                    }
-                  `;
-                                    execSync(`gh api graphql -f query='${mutation.replace(/'/g, "'\\''")}'`, {
-                                        cwd: worktreePath || this.workingDir,
-                                        stdio: 'pipe'
-                                    });
-                                    if (spinner)
-                                        spinner.succeed('Reply added to comment');
-                                }
-                                finally {
-                                    unlinkSync(tempFile);
+                    `;
+                                        execSync(`gh api graphql -f query='${mutation.replace(/'/g, "'\\''")}'`, {
+                                            cwd: worktreePath || this.workingDir,
+                                            stdio: 'pipe'
+                                        });
+                                        if (spinner)
+                                            spinner.succeed('Reply added to comment');
+                                    }
+                                    finally {
+                                        unlinkSync(tempFile);
+                                    }
                                 }
                             }
                             catch (error) {
@@ -485,68 +528,73 @@ Co-authored-by: ivan-agent <ivan-agent@users.noreply.github.com}`;
                                 replyBody = replyBody.substring(0, maxLength) + '\n\n... (message truncated)\n\n' +
                                     `This has been addressed in commit ${commitHash.substring(0, 7)}`;
                             }
-                            // Use GraphQL mutation to add a reply to the review thread
-                            const repoInfo = execSync('gh repo view --json owner,name', {
-                                cwd: worktreePath || this.workingDir,
-                                encoding: 'utf-8'
-                            });
-                            const { owner, name: repoName } = JSON.parse(repoInfo);
-                            // Get the review thread ID from the comment
-                            const threadQuery = `
-                query {
-                  repository(owner: "${owner.login}", name: "${repoName}") {
-                    pullRequest(number: ${prNumber}) {
-                      reviewThreads(first: 100) {
-                        nodes {
-                          id
-                          comments(first: 100) {
-                            nodes {
-                              databaseId
+                            // Use GitHub API client if available, otherwise fall back to gh command
+                            if (this.githubClient && this.repoOwner && this.repoName && prNumber) {
+                                await this.githubClient.addReviewThreadReply(this.repoOwner, this.repoName, parseInt(prNumber), comment.id, replyBody);
+                                if (spinner)
+                                    spinner.succeed('Reply added to comment');
+                            }
+                            else {
+                                // Fallback to gh command
+                                const repoInfo = execSync('gh repo view --json owner,name', {
+                                    cwd: worktreePath || this.workingDir,
+                                    encoding: 'utf-8'
+                                });
+                                const { owner, name: repoName } = JSON.parse(repoInfo);
+                                const threadQuery = `
+                  query {
+                    repository(owner: "${owner.login}", name: "${repoName}") {
+                      pullRequest(number: ${prNumber}) {
+                        reviewThreads(first: 100) {
+                          nodes {
+                            id
+                            comments(first: 100) {
+                              nodes {
+                                databaseId
+                              }
                             }
                           }
                         }
                       }
                     }
                   }
-                }
-              `;
-                            const threadResult = execSync(`gh api graphql -f query='${threadQuery.replace(/'/g, "'\\''")}'`, {
-                                cwd: worktreePath || this.workingDir,
-                                encoding: 'utf-8'
-                            });
-                            const threadData = JSON.parse(threadResult);
-                            const threads = threadData.data?.repository?.pullRequest?.reviewThreads?.nodes || [];
-                            // Find the thread containing this comment
-                            let threadId = null;
-                            for (const thread of threads) {
-                                const comments = thread.comments?.nodes || [];
-                                if (comments.some((c) => c.databaseId?.toString() === comment.id)) {
-                                    threadId = thread.id;
-                                    break;
+                `;
+                                const threadResult = execSync(`gh api graphql -f query='${threadQuery.replace(/'/g, "'\\''")}'`, {
+                                    cwd: worktreePath || this.workingDir,
+                                    encoding: 'utf-8'
+                                });
+                                const threadData = JSON.parse(threadResult);
+                                const threads = threadData.data?.repository?.pullRequest?.reviewThreads?.nodes || [];
+                                let threadId = null;
+                                for (const thread of threads) {
+                                    const comments = thread.comments?.nodes || [];
+                                    if (comments.some((c) => c.databaseId?.toString() === comment.id)) {
+                                        threadId = thread.id;
+                                        break;
+                                    }
                                 }
-                            }
-                            if (!threadId) {
-                                throw new Error('Could not find review thread for comment');
-                            }
-                            // Add reply using GraphQL mutation
-                            const mutation = `
-                mutation {
-                  addPullRequestReviewThreadReply(input: {
-                    pullRequestReviewThreadId: "${threadId}"
-                    body: ${JSON.stringify(replyBody)}
-                  }) {
-                    comment {
-                      id
+                                if (!threadId) {
+                                    throw new Error('Could not find review thread for comment');
+                                }
+                                const mutation = `
+                  mutation {
+                    addPullRequestReviewThreadReply(input: {
+                      pullRequestReviewThreadId: "${threadId}"
+                      body: ${JSON.stringify(replyBody)}
+                    }) {
+                      comment {
+                        id
+                      }
                     }
                   }
-                }
-              `;
-                            execSync(`gh api graphql -f query='${mutation.replace(/'/g, "'\\''")}'`, {
-                                cwd: worktreePath || this.workingDir,
-                                stdio: 'pipe'
-                            });
-                            if (spinner)
-                                spinner.succeed('Reply added to comment');
+                `;
+                                execSync(`gh api graphql -f query='${mutation.replace(/'/g, "'\\''")}'`, {
+                                    cwd: worktreePath || this.workingDir,
+                                    stdio: 'pipe'
+                                });
+                                if (spinner)
+                                    spinner.succeed('Reply added to comment');
+                            }
                         }
                         catch (error) {
                             if (spinner)
@@ -593,10 +641,16 @@ Co-authored-by: ivan-agent <ivan-agent@users.noreply.github.com}`;
                             spinner = ora('Adding review request comment...').start();
                         const reviewAgent = this.configManager.getReviewAgent();
                         const reviewComment = `${reviewAgent} ${reviewInstructions}`;
-                        execSync(`gh pr comment ${prNumber} --body "${reviewComment.replace(/"/g, '\\"')}"`, {
-                            cwd: worktreePath || this.workingDir,
-                            stdio: 'pipe'
-                        });
+                        // Use GitHub API client if available, otherwise fall back to gh command
+                        if (this.githubClient && this.repoOwner && this.repoName) {
+                            await this.githubClient.addPRComment(this.repoOwner, this.repoName, parseInt(prNumber), reviewComment);
+                        }
+                        else {
+                            execSync(`gh pr comment ${prNumber} --body "${reviewComment.replace(/"/g, '\\"')}"`, {
+                                cwd: worktreePath || this.workingDir,
+                                stdio: 'pipe'
+                            });
+                        }
                         if (spinner)
                             spinner.succeed('Review request comment added');
                     }
@@ -631,30 +685,46 @@ Co-authored-by: ivan-agent <ivan-agent@users.noreply.github.com}`;
         }
     }
     async getUnaddressedComments(prNumber) {
+        if (!this.prService) {
+            throw new Error('PR service not initialized');
+        }
         try {
-            // Get PR owner and repo name
-            const repoInfo = execSync('gh repo view --json owner,name', {
-                cwd: this.workingDir,
-                encoding: 'utf-8'
-            });
-            const { owner, name: repoName } = JSON.parse(repoInfo);
-            // Use GraphQL to get review threads with resolved status
+            return await this.prService.getUnaddressedComments(prNumber);
+        }
+        catch (error) {
+            console.error('Error fetching comments:', error);
+            return [];
+        }
+    }
+    async findCommentId(prNumber, author, bodySnippet, path, line) {
+        // Fetch ALL comments (including resolved ones) to find the matching comment
+        try {
+            // Get repo info if not already set
+            let owner = this.repoOwner;
+            let repoName = this.repoName;
+            if (!owner || !repoName) {
+                const repoInfo = execSync('gh repo view --json owner,name', {
+                    cwd: this.workingDir,
+                    encoding: 'utf-8'
+                });
+                const parsed = JSON.parse(repoInfo);
+                owner = parsed.owner.login;
+                repoName = parsed.name;
+            }
+            // Use GraphQL to get ALL review threads, not just unresolved ones
             const graphqlQuery = `
         query {
-          repository(owner: "${owner.login}", name: "${repoName}") {
+          repository(owner: "${owner}", name: "${repoName}") {
             pullRequest(number: ${prNumber}) {
               reviewThreads(first: 100) {
                 nodes {
-                  isResolved
                   comments(first: 100) {
                     nodes {
-                      id
                       databaseId
                       body
                       author {
                         login
                       }
-                      createdAt
                       path
                       line
                     }
@@ -665,44 +735,29 @@ Co-authored-by: ivan-agent <ivan-agent@users.noreply.github.com}`;
           }
         }
       `;
-            const graphqlResult = execSync(`gh api graphql -f query='${graphqlQuery}'`, {
+            const graphqlResult = execSync(`gh api graphql -f query='${graphqlQuery.replace(/'/g, "'\\''")}'`, {
                 cwd: this.workingDir,
                 encoding: 'utf-8'
             });
             const result = JSON.parse(graphqlResult);
             const threads = result.data?.repository?.pullRequest?.reviewThreads?.nodes || [];
-            const unaddressedComments = [];
-            // Process each thread
+            // Search through all comments in all threads
             for (const thread of threads) {
-                // Skip resolved threads
-                if (thread.isResolved) {
-                    continue;
-                }
                 const comments = thread.comments?.nodes || [];
-                if (comments.length === 0) {
-                    continue;
-                }
-                // Get the first comment (the main review comment)
-                const firstComment = comments[0];
-                // Check if there are replies (more than one comment in thread)
-                const hasReplies = comments.length > 1;
-                if (!hasReplies && firstComment.path) {
-                    // Only include if it's an inline code comment (has a path) and has no replies
-                    unaddressedComments.push({
-                        id: firstComment.databaseId ? firstComment.databaseId.toString() : firstComment.id,
-                        author: firstComment.author.login,
-                        body: firstComment.body,
-                        createdAt: firstComment.createdAt,
-                        path: firstComment.path,
-                        line: firstComment.line
-                    });
+                for (const comment of comments) {
+                    if (comment.author?.login === author &&
+                        comment.body.includes(bodySnippet) &&
+                        (!path || comment.path === path) &&
+                        (!line || comment.line === line)) {
+                        return comment.databaseId ? comment.databaseId.toString() : null;
+                    }
                 }
             }
-            return unaddressedComments;
+            return null;
         }
         catch (error) {
-            console.error('Error fetching comments:', error);
-            return [];
+            console.error('Error finding comment ID:', error);
+            return null;
         }
     }
     async generateReviewInstructions(diff, changedFiles, _prNumber) {