Add retry loop support to PR review responder workflow (#2493)

.github/workflows/pr-review-responder.yml

@@ -74,17 +74,83 @@ jobs:
               return;
             }
 
-            const hasRequestLabel = pr.labels.some(label => label.name === 'cc:request');
+            // Check for cc:request (initial) or cc:request:N (re-request) labels
+            // If multiple labels exist, use the highest count to avoid resetting the retry counter
+            let requestCount = -1;
+            let currentLabel = '';
+
+            for (const label of pr.labels) {
+              if (label.name === 'cc:request') {
+                if (requestCount < 0) {
+                  requestCount = 0;
+                  currentLabel = 'cc:request';
+                }
+              }
+              const match = label.name.match(/^cc:request:(\d+)$/);
+              if (match) {
+                const count = parseInt(match[1], 10);
+                if (count > requestCount) {
+                  requestCount = count;
+                  currentLabel = label.name;
+                }
+              }
+            }
+
+            if (requestCount === -1) {
+              console.log(`PR #${prNumber} does not have a cc:request or cc:request:N label`);
+              core.setOutput('should_continue', 'false');
+              return;
+            }
+
+            // Guard: do not loop more than 3 retries (4 total runs: initial + 3 retries)
+            // cc:request (0) -> cc:request:1 (1) -> cc:request:2 (2) -> cc:request:3 (3) -> blocked
+            if (requestCount >= 4) {
+              console.log(`PR #${prNumber} has reached max retry count (${requestCount}), adding cc:needs-human-review`);
+
+              // Ensure the label exists
+              try {
+                await github.rest.issues.createLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  name: 'cc:needs-human-review',
+                  color: 'd93f0b',
+                  description: 'Claude Code has exhausted auto-retries; needs human review'
+                });
+              } catch (e) {
+                // Label already exists, ignore
+              }
+
+              // Remove current label, cc:pending, and add needs-human-review
+              await github.rest.issues.removeLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                name: currentLabel
+              }).catch(() => {});
+
+              await github.rest.issues.removeLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                name: 'cc:pending'
+              }).catch(() => {});
+
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                labels: ['cc:needs-human-review']
+              });
 
-            if (!hasRequestLabel) {
-              console.log(`PR #${prNumber} does not have the cc:request label`);
               core.setOutput('should_continue', 'false');
               return;
             }
 
-            console.log(`PR #${prNumber} has cc:request label, proceeding with pr-fix`);
+            console.log(`PR #${prNumber} has ${currentLabel} label (count=${requestCount}), proceeding with pr-fix`);
             core.setOutput('pr_number', prNumber);
             core.setOutput('should_continue', 'true');
+            core.setOutput('request_count', requestCount);
+            core.setOutput('current_label', currentLabel);
 
       - name: Checkout repository
         if: steps.pr-info.outputs.should_continue == 'true'
@@ -106,7 +172,7 @@ jobs:
       - name: Update labels to pending
         if: steps.pr-info.outputs.should_continue == 'true'
         run: |
-          gh pr edit ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }} --remove-label "cc:request" --add-label "cc:pending"
+          gh pr edit ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }} --remove-label "${{ steps.pr-info.outputs.current_label }}" --add-label "cc:pending"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -122,6 +188,7 @@ jobs:
       - name: Re-trigger workflows if commits were pushed
         # Use always() to ensure commits get tested even if Claude Code fails partway through
         if: steps.pr-info.outputs.should_continue == 'true' && always()
+        id: retrigger
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -137,6 +204,7 @@ jobs:
           if [ "${{ steps.before-claude.outputs.sha }}" != "$PR_HEAD_SHA" ]; then
             echo "Claude pushed new commits (before: ${{ steps.before-claude.outputs.sha }}, after: $PR_HEAD_SHA)"
             echo "Re-triggering workflows via workflow_dispatch"
+            echo "commits_pushed=true" >> $GITHUB_OUTPUT
             # Use workflow_dispatch to trigger workflows - this works with GITHUB_TOKEN unlike PR events
             # which are blocked to prevent infinite loops
             #
@@ -163,10 +231,42 @@ jobs:
               || echo "::warning::Failed to trigger Claude PR Review workflow"
           else
             echo "No new commits pushed, skipping workflow re-triggers"
+            echo "commits_pushed=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Update labels to done
-        if: steps.pr-info.outputs.should_continue == 'true' && success()
+      - name: Ensure next request label exists
+        # Use always() so retry loop continues even if Claude Code fails after pushing commits
+        if: steps.pr-info.outputs.should_continue == 'true' && always() && steps.retrigger.outputs.commits_pushed == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const nextCount = parseInt('${{ steps.pr-info.outputs.request_count }}', 10) + 1;
+            const labelName = `cc:request:${nextCount}`;
+            try {
+              await github.rest.issues.createLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: labelName,
+                color: '1d76db',
+                description: `Claude Code auto-re-request iteration ${nextCount}`
+              });
+            } catch (e) {
+              // Label already exists, ignore
+            }
+
+      - name: Update labels - re-request review (commits pushed)
+        # Use always() so retry loop continues even if Claude Code fails after pushing commits
+        if: steps.pr-info.outputs.should_continue == 'true' && always() && steps.retrigger.outputs.commits_pushed == 'true'
+        run: |
+          REQUEST_COUNT="${{ steps.pr-info.outputs.request_count }}"
+          NEXT_COUNT=$(( ${REQUEST_COUNT:-0} + 1 ))
+          echo "Setting cc:request:${NEXT_COUNT} to auto-re-request review (retry ${NEXT_COUNT} of 3)"
+          gh pr edit ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }} --remove-label "cc:pending" --add-label "cc:request:${NEXT_COUNT}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update labels to done (no new commits)
+        if: steps.pr-info.outputs.should_continue == 'true' && success() && steps.retrigger.outputs.commits_pushed == 'false'
         run: |
           gh pr edit ${{ steps.pr-info.outputs.pr_number }} --repo ${{ github.repository }} --remove-label "cc:pending" --add-label "cc:done"
         env: