@@ -3,6 +3,8 @@ name: Label PR review state
33on :
44 schedule :
55 - cron : " 0 * * * *" # hourly fallback
6+ push :
7+ branches : [main]
68 workflow_dispatch :
79 inputs :
810 pull_request_number :
@@ -27,7 +29,7 @@ permissions:
2729 # This privileged workflow only reads PR/check metadata and writes issue labels,
2830 # comments, and commit statuses. All unspecified permissions, including contents,
2931 # are none; no fork code or configuration is checked out or executed.
30- pull-requests : read
32+ pull-requests : write
3133 issues : write
3234 checks : read
3335 statuses : write
8385 const guideMarker = '<!-- zoo-code-pr-review-process -->';
8486 const codeRabbitLabelMarkerPrefix = '<!-- coderabbit-review-label:';
8587 const codeRabbitLogin = 'coderabbitai[bot]';
88+ const codeRabbitLogins = new Set([codeRabbitLogin, 'coderabbitai']);
8689 const codeRabbitActiveLabel = 'coderabbit-review-active';
8790 const reviewGateName = 'Zoo Code / PR review gate';
8891 const reconciliationCheckName = 'Zoo Code / reconcile PR review state';
9598 }
9699
97100 // When triggered by a single PR event, only reconcile that PR.
98- // The hourly schedule and workflow_dispatch reconcile all open PRs.
101+ // Main-branch pushes, the hourly schedule, and workflow_dispatch reconcile all open PRs.
99102 let prs;
100103 let eventPrNumbers = [];
101104 if (context.payload.pull_request?.number) {
@@ -180,6 +183,19 @@ jobs:
180183 }
181184 const currentLabels = new Set(pr.labels.map(l => l.name));
182185 const labelErrors = [];
186+ if (desiredLabel && !currentLabels.has(desiredLabel)) {
187+ try {
188+ await github.rest.issues.addLabels({
189+ owner, repo, issue_number: pr.number, labels: [desiredLabel],
190+ });
191+ currentLabels.add(desiredLabel);
192+ pr.labels.push({ name: desiredLabel });
193+ } catch (err) {
194+ const error = new Error(`Could not add desired label: ${err.message}`);
195+ error.preserveStateLabels = true;
196+ throw error;
197+ }
198+ }
183199 for (const label of stateLabels) {
184200 if (label !== desiredLabel && currentLabels.has(label)) {
185201 try {
@@ -198,17 +214,6 @@ jobs:
198214 }
199215 }
200216 }
201- if (desiredLabel && !currentLabels.has(desiredLabel)) {
202- try {
203- await github.rest.issues.addLabels({
204- owner, repo, issue_number: pr.number, labels: [desiredLabel],
205- });
206- currentLabels.add(desiredLabel);
207- pr.labels.push({ name: desiredLabel });
208- } catch (err) {
209- labelErrors.push(err);
210- }
211- }
212217 if (desiredLabel !== 'awaiting-author' && currentLabels.has('stale-awaiting-author')) {
213218 try {
214219 await github.rest.issues.removeLabel({
@@ -328,6 +333,7 @@ jobs:
328333 conflict: 'Resolve the merge conflicts. The review sequence resumes after the branch is mergeable.',
329334 'ci-pending': 'Wait for required CI checks; awaiting-maintainer requires CI and automated review completion.',
330335 'ci-failed': 'Fix the failing required CI checks; awaiting-maintainer requires CI and automated review completion.',
336+ 'mergeability-pending': 'Wait for GitHub to finish calculating mergeability.',
331337 'configuration-error': 'Repository rules must not require this advisory workflow\'s own gate or reconciliation job.',
332338 'coderabbit-changes': 'Address automated review findings and push fixes.',
333339 coderabbit: 'Required CI passed. Waiting for automated review of the latest commit.',
@@ -626,10 +632,11 @@ jobs:
626632 const latest = new Map();
627633 for (const r of reviews) {
628634 const reviewer = r.user.login.toLowerCase();
635+ const reviewerKey = codeRabbitLogins.has(reviewer) ? codeRabbitLogin : reviewer;
629636 if (r.state === 'DISMISSED') {
630- latest.delete(reviewer );
637+ latest.delete(reviewerKey );
631638 } else if (r.state !== 'COMMENTED') {
632- latest.set(reviewer , r);
639+ latest.set(reviewerKey , r);
633640 }
634641 }
635642
@@ -641,6 +648,7 @@ jobs:
641648 for (const review of latest.values()) {
642649 if (review.commit_id !== pr.head.sha ||
643650 review.user?.type === 'Bot' ||
651+ codeRabbitLogins.has(review.user?.login.toLowerCase()) ||
644652 review.user?.login.toLowerCase() === pr.user?.login.toLowerCase()) {
645653 continue;
646654 }
@@ -700,6 +708,24 @@ jobs:
700708 phase = 'approved';
701709 }
702710
711+ if (desiredLabel === 'awaiting-maintainer') {
712+ const { data: latestPrDetail } = await github.rest.pulls.get({
713+ owner, repo, pull_number: pr.number,
714+ });
715+ if (latestPrDetail.mergeable === false && latestPrDetail.mergeable_state === 'dirty') {
716+ core.info(`PR #${pr.number}: has merge conflicts — labeling has-conflicts`);
717+ await updateReviewGate(pr, 'conflict', false);
718+ await setCodeRabbitReviewActive(pr, false);
719+ await reconcileLabels(pr, 'has-conflicts');
720+ await updateReviewGuide(pr, 'conflict', existingGuide);
721+ continue;
722+ }
723+ if (latestPrDetail.mergeable === null || latestPrDetail.mergeable_state === 'unknown') {
724+ desiredLabel = null;
725+ phase = 'mergeability-pending';
726+ }
727+ }
728+
703729 core.info(
704730 `PR #${pr.number}: CI passing, reviews=${latest.size}, ` +
705731 `coderabbit=${freshCodeRabbitReview?.state ?? (automatedAuthor ? 'optional' : 'pending')}, ` +
@@ -739,10 +765,12 @@ jobs:
739765 } catch (cleanupError) {
740766 metadataErrors.push(cleanupError);
741767 }
742- try {
743- await reconcileLabels(pr, null);
744- } catch (cleanupError) {
745- metadataErrors.push(cleanupError);
768+ if (!error.preserveStateLabels) {
769+ try {
770+ await reconcileLabels(pr, null);
771+ } catch (cleanupError) {
772+ metadataErrors.push(cleanupError);
773+ }
746774 }
747775 const detail = error.status
748776 ? `${error.message} (HTTP ${error.status}${error.response?.data?.message ? `: ${error.response.data.message}` : ''})`
0 commit comments