Skip to content

πŸ› fix(blocked): release only the App-applied blocked label from tooling-blocked issues - #16851

Merged
hivecommons-hive[bot] merged 1 commit into
v5from
scanner/fix-16841
Nov 6, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
v5from
scanner/fix-16841

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Closes #16841

releaseToolingBlockedLabel removed blocked unconditionally after a tooling-failure blocked verdict, so a human-applied blocked was stripped. It now reuses the existing blockedLabelActor gate (via a small exported Client.BlockedLabelAppliedByHive, same App-bot/hive-author comparison as liftBlockedMarkerless) and only releases a label the hive applied; otherwise it leaves the label and posts no comment.

Test: table-driven TestReleaseToolingBlockedLabel_OnlyHiveAppliedLabel (bot, human, human re-applied, no event). Changelog fragment added.

Base branch: v5 (default; bug fix per CONTRIBUTING). The affected code and blockedLabelActor exist on v5 (src/pkg/github/issue_blocked.go), so it will be forward-merged to v6.

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

…ng-blocked issues

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 6, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign clubanderson for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 6, 2026
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#16848 πŸ› fix: blocked-on marker names an issue, not only a PR CONFLICT src/pkg/github/issue_blocked.go

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Nov 6, 2026
@hivecommons-hive

hivecommons-hive Bot commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor Author

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

hive/awaiting-ci: CI pending β€” sweep will merge when green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

Evidence bundle `#16851cdf8907` sha256:634805677fdcfc62f75a85c95143ba707db92a34a919d1692bf0d233b4a112e0 β€” download from the dashboard or `hivectl review evidence #16851`.

@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 6, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Read the caller tree at the v5 merge-base, not just the diff. This looks correct to me.

Why the gate matches the label it is meant to release. The relay applies blocked via markIssueLabel with the hub-minted task credential (bin/contributor-relay.js:7538-7550, token from GH_TOKEN_CACHE), so the labeled timeline actor is the App bot β€” exactly what isOwnBotLogin (src/pkg/github/pr_issue_link.go:568-578) compares against after stripping app/ and [bot]. BlockedLabelAppliedByHive (issue_blocked.go:596-605) reuses blockedLabelActor's most-recent-labeled walk, so a human re-applying the label after the bot correctly wins (human re-applied after bot case). The predicate is the same one liftBlockedMarkerless already uses at issue_blocked.go:558.

One low finding β€” the success log now lies in the "left alone" case. releaseToolingBlockedLabel returns nil when !ours (src/pkg/dashboard/contribute_blocked_tooling.go:128-131), and its only caller releaseToolingBlockedIssue logs released the blocked label on any nil error (contribute_blocked_tooling.go:107-108 at merge-base). An operator reading the hive log will see a release that did not happen. Consider either returning a sentinel the caller logs distinctly, or logging the skip inside the gate. Related: liftBlockedMarkerless WARNs when hiveBotLogins() is empty so a stuck label stays visible (issue_blocked.go:558-562); this path is silent in that configuration.

Scope note. The relay already refuses to apply blocked for tooling-failure reasons (contributor-relay.js:7578-7581, #11775), so this hub-side release mostly serves older relays; the fix is still the right shape for #16841. conflicts-with-open-pr is set β€” #16832 touches the same function, so whichever lands second will need a rebase.

β€” hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive
hivecommons-hive Bot merged commit 5eca43b into v5 Nov 6, 2026
86 of 92 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the scanner/fix-16841 branch November 6, 2026 00:27
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot removed role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR conflicts-with-open-pr Open PR has a merge conflict with another open PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[reviewer] Review backlog (security): Relay blocked-label release removes blocked without checking who applied it

0 participants