Repository navigation
π fix(blocked): one Unblocked note per lift, and not "actionable" when un-admitted - #16828
Conversation
β¦n un-admitted projectbluefin/website#987: the review-backlog reconciler posted "Unblocked: β¦hivecommons#986 merged β¦ This item is actionable now" and, 8s later, the blocked sweep "β¦hivecommons#986 is no longer open; re-triaging." The issue had no triage/accepted. - unblockAlreadyNoted: a hive:unblocked note naming the same PR, newer than the last blocked-on marker, makes the second path quiet (postUnblockedNote and githubIssueBacklogSink.LiftBlock). - unblockAdmission: PR-settled notes on an issue project.issue_filter does not admit say "Unblocked β waiting for a maintainer to admit it" and name the admitting label. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1 Signed-off-by: Danathar <Danathar@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Read at head db62d00 against v6; pkg/github builds. The dedup and admission wiring look correct to me; one narrow gap worth a sentence from the author.
Verified
issue_blocked.go:800-804andreview_backlog_blocks.go:119-123: both lifters now callunblockAlreadyNotedafterunblockIssue, so the label is still removed even when the note is suppressed β the website#987 pair (lift note, then "no longer open" 8s later) collapses to one note, andTestUnblockAlreadyNotedcovers both orders plus the short-vs-full repo spelling.unblockNoteRefRE(issue_blocked.go:669) matches every note shape that names a PR:blockedPRSettledNote,blockedSupersededSettledNote(which names the superseding PR, consistent withreviewBacklogLiftNote(repo, supersededBy, β¦)atreview_backlog_blocks.go:284), and thesource PRretriage form. Deadline/marker-less notes fall through tom == nil.unblockAdmission(issue_blocked.go:645-667) stripsblockedcase-insensitively before askingfilter.Admits, matching howclient.go:2141admits issues;reviewBacklogAdmissiononly does the extraIssues.GetforgithubIssueBacklogSink, so non-GitHub sinks are unchanged.
Low β body-level re-block is invisible to the reset
unblockAlreadyNoted (issue_blocked.go:691-717) stops at a blocked-on marker only when it is in a comment. But the normal markers are body sections: blockedBacklogNote (issue_blocked.go:301-306) and blockedOnReviewedPRNote (review_backlog_blocks.go:69-73) write BlockedOnMarker into the issue body; only the re-target path (issue_blocked.go:530) posts it as a comment. So if an issue is lifted with a note for o/r#986, then later re-blocked on #986 via the body (PR reopened and re-targeted, or the body re-parked), the next lift strips the label but posts no note β the old "Unblocked: o/r#986" comment still matches and no newer marker comment resets it. The PR body's "a newer blocked-on marker resets it" is true only for the comment form. Re-blocking on an already-settled PR is rare, so I'd call this low; but if it matters, comparing the matched note's CreatedAt against the issue's UpdatedAt/body edit, or against the time blocked was last applied (blockedLabelActor already reads the timeline), would close it.
Nothing else blocking from my side.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
Executive summary
Two hive paths lift the same
blockedlabel, and each posted its own "Unblocked" note seconds apart. Both notes said the issue was actionable (or "re-triaging") even whenproject.issue_filterdoes not admit it. projectbluefin/website#987 shows both problems:The issue has no
triage/accepted, so nothing would work it.With this PR, whichever path runs second sees the first one's note for the same PR and posts nothing. On an un-admitted issue the note says "Unblocked β waiting for a maintainer to admit it" and names the label that admits it.
What
LiftBlockremoves the label and posts nothingproject.issue_filterproject.issue_filteradmits only issues labelledtriage/acceptedβ¦"Why
ReconcileReviewBacklogBlocks(review_backlog_blocks.go) lifts a review-backlog item when its PR settles. It knows merged from abandoned, and it checks the finding against the base.reconcileBlockedTargets(issue_blocked.go) also lifts any blocked issue whose blocked-on PR settled. Its targets come from the enumeration snapshot or a listing taken before the other sweep removed the label.postUnblockedNotededuped only an identical note, and the two notes differ in wording.LiftBlockdid not dedupe at all.unparkIssueFilterNote).How
unblockAlreadyNoted(comments, note)reads the PR the note is about (Unblocked: [source PR ]owner/repo#N). It walks the comments newest first:hive:unblockednote naming the same PR (by short repo name and number) means it was already noted;postUnblockedNoteuses it before posting.githubIssueBacklogSink.LiftBlockstill removes the label, then skips the comment when the lift is already noted.unblockAdmission(labels)asks the issue filter about the labels withoutblocked. It returns "" when admitted, otherwise the sentence naming the required labels.blockedPRSettledNote, the newblockedSupersededSettledNote,reviewBacklogLiftNoteandreviewBacklogRetriageNote.reviewBacklogAdmission). Other destinations have no issue filter.Files
src/pkg/github/issue_blocked.gounblockAlreadyNoted,unblockAdmission, admission-aware settled notessrc/pkg/github/review_backlog_blocks.goLiftBlockdedupe,reviewBacklogAdmission, admission-aware notessrc/pkg/github/issue_unblock_once_test.gosrc/pkg/github/review_backlog_heads_test.gosrc/docs/hive-open-issue.md,src/docs/labels-and-control-signals/reference.md,changelog.d/Tests
TestUnblockAlreadyNoted(8 rows)TestBlockedSweepQuietAfterReviewBacklogLiftTestReviewBacklogLiftQuietAfterSweepNoteLiftBlockTestUnblockNotesAdmissionAware,TestBlockedSweepNoteNamesAdmission,TestReviewBacklogReconcileLiftNamesAdmissionTestUnblockAdmissionIgnoresTheBlockedLabel,TestReviewBacklogAdmissionReadsTheIssueblocked; GitHub-issue items onlyTestReconcileBlockedIssuesand the review-backlog testsgo test ./pkg/github/...,./pkg/writeback/check-docs-citations.py src/docs, writeback ratchetNotes
liftBlockedMarkerless) and the deadline lift. Neither names a PR, and howblockedis applied and lifted without a blocked-on marker is being reworked in a separate PR (the blocked-on marker fix). This PR only touches the two PR-settled paths and their wording.origin/v6..origin/v5has nothing for these files.π€ Generated with Claude Code
https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1