Skip to content

Soften sheriff stale classification #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbakaus merged 1 commit into from
Jul 9, 2026
Merged

Soften sheriff stale classification #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions scripts/github/sheriff.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,40 +145,47 @@ export function evaluatePullRequest(pr, options = {}) {
const unresolvedThreadBlockers = unresolvedThreadsNeedingContributor(pr.reviewThreads || [], author);

const blockers = [];
const addBlocker = (blocker) => blockers.push({ contributorAction: false, ...blocker });
const addContributorBlocker = (blocker) => blockers.push({ contributorAction: true, ...blocker });
if (pr.isDraft) {
blockers.push({ kind: 'draft' });
addContributorBlocker({ kind: 'draft' });
}

if (FAILING_STATUS_STATES.has(pr.statusState)) {
blockers.push({ kind: 'ci', label: 'blocked: ci', at: pr.latestCommitAt || pr.updatedAt });
addBlocker({ kind: 'ci', label: 'blocked: ci', at: pr.latestCommitAt || pr.updatedAt });
}

if (pr.mergeable === 'CONFLICTING') {
blockers.push({ kind: 'merge-conflicts', label: 'blocked: merge conflicts', at: pr.updatedAt });
addBlocker({ kind: 'merge-conflicts', label: 'blocked: merge conflicts', at: pr.updatedAt });
}

if (latestBlockingReviewAt && !isAfter(latestContributorAt, latestBlockingReviewAt)) {
blockers.push({ kind: 'changes-requested', label: 'blocked: review threads', at: latestBlockingReviewAt });
addContributorBlocker({ kind: 'changes-requested', label: 'blocked: review threads', at: latestBlockingReviewAt });
}

if (unresolvedThreadBlockers.length > 0) {
blockers.push({
addContributorBlocker({
kind: 'review-threads',
label: 'blocked: review threads',
at: latestDate(unresolvedThreadBlockers.map((thread) => thread.latestCommentAt)),
});
}

if (latestMaintainerWaitAt && !isAfter(latestContributorAt, latestMaintainerWaitAt)) {
blockers.push({ kind: 'sheriff-wait', at: latestMaintainerWaitAt });
addContributorBlocker({ kind: 'sheriff-wait', at: latestMaintainerWaitAt });
}

const waitingLabelAt = latestLabelEventAt(pr.labelEvents || [], 'waiting on contributor', 'LabeledEvent');
const waitingLabelAt = latestMaintainerLabelEventAt(
pr.labelEvents || [],
'waiting on contributor',
'LabeledEvent',
maintainers,
);
if (labels.has('waiting on contributor') && waitingLabelAt && !isAfter(latestContributorAt, waitingLabelAt)) {
blockers.push({ kind: 'manual-waiting', at: waitingLabelAt });
addContributorBlocker({ kind: 'manual-waiting', at: waitingLabelAt });

@cursor cursor Bot Jul 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hydration skips maintainer label backfill

Medium Severity

Evaluation now treats waiting on contributor as a contributor blocker only when a maintainer LabeledEvent exists, but hydrateMissingWaitingLabelEvents still skips issue-event backfill whenever any labeled event is present—including sheriff bot events. A maintainer-applied wait can be cleared incorrectly when the GraphQL timeline only captured bot labeling.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit a8ad2cf. Configure here.

}

const contributorActionRequired = blockers.length > 0;
const contributorActionRequired = blockers.some((blocker) => blocker.contributorAction);
const unresolvedThreadCount = (pr.reviewThreads || []).filter((thread) => !thread.isResolved).length;
const statusIsReady = pr.statusState === 'SUCCESS';
const mergeableIsReady = pr.mergeable === 'MERGEABLE';
Expand Down Expand Up @@ -320,7 +327,7 @@ export function staleWarningComment(pr, { daysOpen, closeDays, now = new Date()
WARNING_MARKER,
`Thanks for the PR. Impeccable is moving quickly, and this PR is currently waiting on contributor action.`,
'',
`It has been open for ${daysOpen} days. Please address the outstanding review feedback, CI failure, merge conflict, draft state, or explicit maintainer wait request. PRs that are still waiting on contributor action after ${closeDays} days open are closed automatically.`,
`It has been open for ${daysOpen} 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 open 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');
Expand Down Expand Up @@ -615,6 +622,13 @@ function latestLabelEventAt(events, label, type) {
.map((event) => event.createdAt));
}

function latestMaintainerLabelEventAt(events, label, type, maintainers) {
return latestDate(events
.filter((event) => event.type === type && event.label === label)
.filter((event) => maintainers.has(normalizeLogin(event.actorLogin)))
.map((event) => event.createdAt));
}
Comment on lines +625 to +630

function issueEventType(event) {
if (event === 'labeled') return 'LabeledEvent';
if (event === 'unlabeled') return 'UnlabeledEvent';
Expand Down
28 changes: 25 additions & 3 deletions tests/github-sheriff.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,36 @@ describe('github sheriff', () => {
assert.equal(plan.shouldClose, false);
});

it('marks failing checks as waiting on contributor', () => {
it('marks failing checks as blocked without starting the contributor stale clock', () => {
const plan = evaluatePullRequest(pr({
createdAt: '2026-07-01T00:00:00Z',
statusState: 'FAILURE',
}), { now: NOW });

assert.equal(plan.contributorActionRequired, true);
assert.ok(plan.desiredLabels.includes('blocked: ci'));
assert.equal(plan.contributorActionRequired, false);
assert.deepEqual(plan.labelsToAdd, ['blocked: ci', 'needs maintainer review']);
assert.equal(plan.shouldWarn, false);
assert.equal(plan.shouldClose, false);
});

it('does not warn or close PRs blocked only by merge conflicts', () => {
const plan = evaluatePullRequest(pr({
createdAt: '2026-06-20T00:00:00Z',
mergeable: 'CONFLICTING',
labels: ['waiting on contributor', 'stale'],
labelEvents: [
labelEvent('LabeledEvent', 'waiting on contributor', 'github-actions[bot]', '2026-07-01T00:00:00Z'),
],
comments: [
comment('github-actions[bot]', '2026-07-01T00:00:00Z', WARNING_MARKER),
],
}), { now: NOW });

assert.equal(plan.contributorActionRequired, false);
assert.deepEqual(plan.labelsToAdd, ['blocked: merge conflicts', 'needs maintainer review']);
assert.deepEqual(plan.labelsToRemove, ['stale', 'waiting on contributor']);
assert.equal(plan.shouldWarn, false);
assert.equal(plan.shouldClose, false);
});

it('marks passing resolved PRs as ready to merge', () => {
Expand Down