1414 # This workflow only reads PR metadata and never checks out or executes PR code.
1515 # pull_request_target gives fork PRs a token that can update labels and comments.
1616 pull_request_target :
17- types : [opened, reopened, ready_for_review, synchronize, review_requested, labeled, unlabeled]
17+ types : [opened, reopened, ready_for_review, synchronize, review_requested, review_request_removed, labeled, unlabeled]
1818 pull_request_review :
1919 types : [submitted, dismissed]
2020 # Fork review events have a read-only token. CodeRabbit's status-comment update
@@ -316,14 +316,24 @@ jobs:
316316 return match?.[1] ?? null;
317317 }
318318
319+ // Collaborator permissions are repository-level, so memoize them for
320+ // the whole run: a maintainer's current-head CHANGES_REQUESTED reaches
321+ // both review loops, and scheduled sweeps reconcile every open PR.
322+ const permissionCache = new Map();
319323 async function permissionFor(username) {
324+ const key = username.toLowerCase();
325+ if (permissionCache.has(key)) return permissionCache.get(key);
320326 try {
321327 const result = await github.rest.repos.getCollaboratorPermissionLevel({
322328 owner, repo, username,
323329 });
330+ permissionCache.set(key, result.data.permission);
324331 return result.data.permission;
325332 } catch (error) {
326- if (error.status === 404) return 'none';
333+ if (error.status === 404) {
334+ permissionCache.set(key, 'none');
335+ return 'none';
336+ }
327337 throw error;
328338 }
329339 }
@@ -339,7 +349,7 @@ jobs:
339349 'coderabbit-changes': 'Address automated review findings and push fixes.',
340350 coderabbit: 'Required CI passed. Waiting for automated review of the latest commit.',
341351 'draft-approved': 'Automated review complete for the latest commit. Mark the draft ready.',
342- 'maintainer-changes': 'Address maintainer or CODEOWNER feedback, then push an update.',
352+ 'maintainer-changes': 'Address maintainer or CODEOWNER feedback, push an update, then re-request review from the blocking maintainer .',
343353 maintainer: 'Awaiting fresh human maintainer or CODEOWNER approval.',
344354 approved: 'The required review sequence passed. Remaining merge requirements apply.',
345355 };
@@ -641,6 +651,81 @@ jobs:
641651 }
642652 }
643653
654+ // Durable per-maintainer change-request blockers (issue #1671).
655+ // Unlike approvals and CodeRabbit reviews, a human maintainer's
656+ // CHANGES_REQUESTED stays binding across author pushes, base-branch
657+ // merges, CI runs, and CodeRabbit reviews until that same
658+ // maintainer's blocker is cleared by one of:
659+ // 1. the PR author explicitly re-requesting review from them,
660+ // 2. a newer review from that maintainer (its state decides), or
661+ // 3. GitHub dismissing the blocking review.
662+ // Latest state per reviewer is keyed by review id (monotonically
663+ // increasing) so reordered or duplicate history cannot change the
664+ // result. COMMENTED reviews are neutral and never clear a blocker;
665+ // a DISMISSED latest review clears it.
666+ const latestHumanReview = new Map();
667+ for (const r of reviews) {
668+ const reviewer = r.user?.login?.toLowerCase();
669+ if (!reviewer ||
670+ r.user?.type === 'Bot' ||
671+ codeRabbitLogins.has(reviewer) ||
672+ reviewer === pr.user?.login?.toLowerCase() ||
673+ r.state === 'COMMENTED') {
674+ continue;
675+ }
676+ const previous = latestHumanReview.get(reviewer);
677+ if (!previous || r.id > previous.id) {
678+ latestHumanReview.set(reviewer, r);
679+ }
680+ }
681+ const maintainerBlockers = new Map();
682+ for (const [reviewer, review] of latestHumanReview) {
683+ if (review.state !== 'CHANGES_REQUESTED') continue;
684+ if (['admin', 'maintain', 'write'].includes(await permissionFor(review.user.login))) {
685+ maintainerBlockers.set(reviewer, review);
686+ }
687+ }
688+
689+ // Clear blockers the author explicitly re-requested. Only a
690+ // review_requested timeline event whose actor is the PR author and
691+ // whose requested reviewer is the blocking maintainer clears that
692+ // maintainer's blocker. Team requests carry no requested_reviewer
693+ // and never clear an individual blocker; review_request_removed
694+ // events only trigger reconciliation and are not clearing evidence.
695+ // If the timeline cannot be reconstructed, fail closed: keep every
696+ // blocker so awaiting-author is preserved.
697+ if (maintainerBlockers.size > 0) {
698+ let timelineEvents = null;
699+ try {
700+ timelineEvents = await github.paginate(github.rest.issues.listEventsForTimeline, {
701+ owner, repo, issue_number: pr.number, per_page: 100,
702+ });
703+ } catch (error) {
704+ core.warning(
705+ `PR #${pr.number}: could not reconstruct review-request history; ` +
706+ `preserving maintainer blockers: ${error.message}`
707+ );
708+ }
709+ if (timelineEvents) {
710+ const authorLogin = pr.user?.login?.toLowerCase();
711+ for (const event of timelineEvents) {
712+ if (event.event !== 'review_requested') continue;
713+ if (event.actor?.login?.toLowerCase() !== authorLogin) continue;
714+ const requested = event.requested_reviewer?.login?.toLowerCase();
715+ if (!requested) continue;
716+ const blocker = maintainerBlockers.get(requested);
717+ if (!blocker) continue;
718+ const requestedAt = Date.parse(event.created_at ?? '');
719+ const blockedAt = Date.parse(blocker.submitted_at ?? '');
720+ // A re-request only clears blockers it follows; missing or
721+ // unparsable timestamps fail closed and keep the blocker.
722+ if (!Number.isNaN(requestedAt) && !Number.isNaN(blockedAt) && requestedAt >= blockedAt) {
723+ maintainerBlockers.delete(requested);
724+ }
725+ }
726+ }
727+ }
728+
644729 const codeRabbitReview = latest.get(codeRabbitLogin);
645730 const freshCodeRabbitReview = codeRabbitReview?.commit_id === pr.head.sha
646731 ? codeRabbitReview
@@ -657,9 +742,6 @@ jobs:
657742 freshMaintainerReviews.push(review);
658743 }
659744 }
660- const maintainerChangeRequest = freshMaintainerReviews.find(
661- review => review.state === 'CHANGES_REQUESTED'
662- );
663745 const automatedAuthor = pr.user?.type === 'Bot';
664746 const codeRabbitEligibleAuthor = !automatedAuthor ||
665747 codeRabbitEligibleBotLogins.has(pr.user?.login.toLowerCase());
@@ -676,7 +758,7 @@ jobs:
676758 let phase;
677759 let activateCodeRabbit = false;
678760 let recycleCodeRabbitLabel = false;
679- if (codeRabbitChangesRequested || maintainerChangeRequest ) {
761+ if (codeRabbitChangesRequested || maintainerBlockers.size > 0 ) {
680762 desiredLabel = 'awaiting-author';
681763 phase = codeRabbitChangesRequested ? 'coderabbit-changes' : 'maintainer-changes';
682764 } else if (!codeRabbitEligibleAuthor) {
@@ -740,7 +822,7 @@ jobs:
740822 core.info(
741823 `PR #${pr.number}: CI passing, reviews=${latest.size}, ` +
742824 `coderabbit=${freshCodeRabbitReview?.state ?? (codeRabbitEligibleAuthor ? 'pending' : 'optional')}, ` +
743- `maintainer=${maintainerApproval?.state ?? 'pending'} → ${desiredLabel ?? '(none)'}`
825+ `maintainer=${maintainerApproval?.state ?? 'pending'}, blockers=${maintainerBlockers.size} → ${desiredLabel ?? '(none)'}`
744826 );
745827
746828 const readyForMaintainer = phase === 'maintainer' || phase === 'approved';
0 commit comments