skills/pbakaus_impeccable
1
0
Fork 0
mirror of https://github.com/pbakaus/impeccable.git synced 2026-09-11 21:57:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve PR sheriff queue flow

Browse Source 
Make policy and merge-conflict blockers age as contributor work, keep maintainer-policy decisions out of ready state, auto-close regular contributors unless explicitly exempted, and mark new or reopened issues for triage.

AI-assisted change: implemented and validated by Codex under maintainer direction.
This commit is contained in:
Paul Bakaus
2026-08-31 15:47:32 -07:00
parent 33367e2297
commit ee1442d7af
3 changed files with 130 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/github/sheriff.mjs
+37 -2
View File
@@ -5,6 +5,7 @@ import { pathToFileURL } from 'node:url';
const DAY_MS = 24 * 60 * 60 * 1000;
export const LABEL_DEFS = [
{ name: 'needs triage', color: 'd4c5f9', description: 'New or reopened issue awaiting maintainer triage' },
{ name: 'waiting on contributor', color: 'fbca04', description: 'Waiting for the PR author to respond or make changes' },
{ name: 'needs maintainer review', color: '5319e7', description: 'Ready for a maintainer to review or decide' },
{ name: 'ready to merge', color: '0e8a16', description: 'Passing, resolved, and ready for a maintainer merge decision' },
@@ -42,6 +43,11 @@ const DEFAULT_TRUSTED_MARKER_AUTHORS = ['github-actions', 'github-actions[bot]']
const REVIEW_BLOCKING_STATES = new Set(['CHANGES_REQUESTED']);
const FAILING_STATUS_STATES = new Set(['ERROR', 'FAILURE']);
const CONTRIBUTOR_POLICY_LABELS = new Set([
'policy: needs issue',
'policy: needs ai disclosure',
'policy: generated output',
]);
const SHERIFF_WAIT_COMMAND = /^\/sheriff\s+wait\s*$/i;
const PR_QUERY = `
@@ -144,6 +150,7 @@ export function evaluatePullRequest(pr, options = {}) {
const autoCloseRegulars = options.autoCloseRegulars === true;
const labels = new Set(pr.labels || []);
const policyBlockers = [...labels].filter(isBlockingPolicyLabel);
const author = normalizeLogin(pr.authorLogin || pr.author?.login || '');
const daysOpen = Math.floor((now.getTime() - toDate(pr.createdAt).getTime()) / DAY_MS);
const latestContributorCommitAt = latestCommitBelongsToAuthor(pr, author) ? pr.latestCommitAt : null;
@@ -173,7 +180,30 @@ export function evaluatePullRequest(pr, options = {}) {
}
if (pr.mergeable === 'CONFLICTING') {
addBlocker({ kind: 'merge-conflicts', label: 'blocked: merge conflicts', at: pr.updatedAt });
const firstSeenAt = latestLabelEventAt(
pr.labelEvents || [],
'blocked: merge conflicts',
'LabeledEvent',
) || pr.updatedAt || pr.latestCommitAt || pr.createdAt;
addContributorBlocker({
kind: 'merge-conflicts',
label: 'blocked: merge conflicts',
at: latestDate([firstSeenAt, latestContributorAt]),
});
}
for (const label of policyBlockers) {
const firstSeenAt = latestLabelEventAt(
pr.labelEvents || [],
label,
'LabeledEvent',
) || pr.updatedAt || pr.createdAt;
const blocker = {
kind: label,
at: latestDate([firstSeenAt, latestContributorAt]),
};
if (CONTRIBUTOR_POLICY_LABELS.has(label)) addContributorBlocker(blocker);
else addBlocker(blocker);
}
if (latestBlockingReviewAt && !isAfter(latestContributorAt, latestBlockingReviewAt)) {
@@ -216,6 +246,7 @@ export function evaluatePullRequest(pr, options = {}) {
&& !contributorActionRequired
&& unresolvedThreadCount === 0
&& pr.reviewDecision !== 'CHANGES_REQUESTED'
&& policyBlockers.length === 0
&& statusIsReady
&& mergeableIsReady;
@@ -373,7 +404,7 @@ export function staleWarningComment(pr, {
WARNING_MARKER,
`Thanks for the PR. Impeccable is moving quickly, and this PR is currently waiting on contributor action.`,
'',
`It has been waiting for contributor action for ${waitingDays} days. Please address the outstanding review feedback, draft state, or explicit maintainer wait request. PRs that are still waiting on contributor action after ${closeDays} days are closed automatically.`,
`It has been waiting for contributor action for ${waitingDays} days. Please address the outstanding review feedback, draft state, merge conflict, policy requirement, or explicit maintainer wait request. PRs that are still waiting on contributor action after ${closeDays} days are closed automatically.`,
'',
`If nothing changes, this PR may be closed on or after ${closeDate}. Happy to reopen when it is ready to continue.`,
].join('\n');
@@ -760,6 +791,10 @@ function normalizeLogin(login) {
return String(login || '').toLowerCase();
}
function isBlockingPolicyLabel(label) {
return String(label || '').startsWith('policy:') && label !== 'policy: approved';
}
function requireValue(argv, index, flag) {
const value = argv[index];
if (!value || value.startsWith('--')) throw new Error(`${flag} requires a value.`);