Skip to content

🐛 fix(prstage): alias human-changes-requested reason to stagelabels - #15314

Merged
hivecommons-hive[bot] merged 1 commit into
v5from
scanner/fix-15269
Oct 29, 2026
Merged

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

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Closes #15269

The reason token human-changes-requested was spelled independently in prstage and stagelabels; since prstage already imports stagelabels, the prstage constant now aliases the stagelabels one so the two cannot drift. No behaviour change; both exported names are kept.

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 29, 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 danathar 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

@github-actions

Copy link
Copy Markdown
Contributor

Changelog: this PR changes code but carries no changelog entry
(no changelog.d/ fragment and no CHANGELOG.md edit).

If it is user-visible — a feature, a fix an operator would notice, a
security change, a migration, a deprecation, or anything breaking —
please add a fragment file changelog.d/<category>-<pr-or-slug>.md
containing exactly your entry (see changelog.d/README.md; the
category is one of added/changed/deprecated/fixed/security). Please
do not append to CHANGELOG.md's ## Unreleased directly — that
shared section is the merge-conflict generator fragments replaced
(#5675). If it is a refactor, a test-only change, or dependency
churn, no entry is needed and you can ignore this.

This is a reminder, not a gate; it never blocks a merge.

@kubestellar-prow kubestellar-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 29, 2026
@github-actions

github-actions Bot commented Oct 29, 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
#15308 ✨ feature: enqueue eligible PRs into GitHub native merge queues same files src/pkg/stageengine/prstage/reasons.go

clubanderson pushed a commit that referenced this pull request Oct 29, 2026
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

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

@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 stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 29, 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.

The change is correct; the red CI is not this PR's fault — v5 itself does not compile pkg/dashboard tests.

The diff: prstage.AutoMergeReasonHumanChangesRequested (src/pkg/stageengine/prstage/reasons.go:21) becomes an alias of stagelabels.LaneReasonHumanChangesRequested, whose value is the identical string "human-changes-requested" (src/pkg/stagelabels/human.go:241). reasons.go already imports stagelabels (line 6) and stagelabels does not import prstage, so there is no cycle and no behaviour change. Looks correct to me.

Why every test (dashboard …) / coverage / test job fails at 6d2add6:

pkg/dashboard/stage_tracker_linked_progress_test.go:95:31: not enough arguments in call to stageTrackerResolveLinkedPRs
pkg/dashboard/stage_tracker_linked_progress_test.go:101:31: not enough arguments in call to stageTrackerResolveLinkedPRs

That file is untouched here. On v5 HEAD (4536f90) stage_tracker.go:2948 declares stageTrackerResolveLinkedPRs(items []StageTrackerItem, open func(repo string, number int) bool) while stage_tracker_linked_progress_test.go:95 and :101 still call stageTrackerResolveLinkedPRs(items). Both files were last changed by the same merge, #15236 (15207d3), which is also this PR's merge-base — so every PR based on current v5 will fail the dashboard test shards until that test is updated. golangci-lint fails for the same compile error.

Suggested path for a maintainer: land a one-line fix to the two test call sites on v5 (pass the open func the test intends, or nil if the test does not exercise it), then re-run this PR; nothing here needs to change.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Shared CI baseline incident — not caused by this PR. The failing pkg/dashboard shards (and the downstream test, coverage, build-and-test, golangci-lint checks) are red on v5 HEAD itself:

pkg/dashboard/stage_tracker_linked_progress_test.go:95:31: not enough arguments in call to stageTrackerResolveLinkedPRs

Tracked in #15322; fix in #15321. No action needed here — once #15321 lands, this PR will go green on its next run / rebase.


🐝 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

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 29, 2026
hivecommons-hive Bot added a commit that referenced this pull request Oct 29, 2026
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: rebased onto v5 at 481dcd5 now that shared-CI incident #15322 is resolved (#15301 landed the baseline fix); 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

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 29, 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.

Style/conventions review (head 481dcd5)

The alias itself is fine — prstage already imported stagelabels at base (src/pkg/stageengine/prstage/reasons.go:130), so the one-line alias at reasons.go:21 introduces no new coupling, and the comment update in src/pkg/stagelabels/human.go:238-240 now matches what the code does.

Changelog fragment does not follow changelog.d/README.md — changelog.d/fixed-15314.md:1

  • The fragment is a commit-subject echo (- fix(prstage): alias human-changes-requested reason to stagelabels (#15314)), but the README (## Format → Content) requires "the same rich narrative style as the existing CHANGELOG.md entries (what changed, why an operator cares, issue links)"; compare the existing fixed-* fragments at head, which are all operator-facing prose with an issue link.
  • More to the point, the PR body states "No behaviour change", and the README says non-user-visible changes ("routine refactors") need no fragment — "put a no-changelog label on such PRs". A fixed-* fragment here also drives a patch bump for a change no operator can observe.

Requested change: delete changelog.d/fixed-15314.md and apply the no-changelog label (preferred), or, if a release note is genuinely wanted, rewrite it as a narrative bullet linking #15269.

— hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

hivecommons-hive Bot added a commit that referenced this pull request Oct 29, 2026
The alias is an internal refactor with no behaviour change, so per
changelog.d/README.md it carries the no-changelog label instead of a
fragment.

Hive-Fix-Attempt: 1/6
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added the no-changelog No changelog fragment required label Oct 29, 2026
clubanderson pushed a commit that referenced this pull request Oct 29, 2026
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 29, 2026
hivecommons-hive Bot added a commit that referenced this pull request Oct 29, 2026
The fragment guard regenerated the fragment before the no-changelog
label was applied; the label is now on the PR, so the fragment goes.

Hive-Fix-Attempt: 1/6
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet labels Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

stage 080-awaiting-merge-admission → 070-fixing: required-check-failing:DCO

@hivecommons-hive hivecommons-hive Bot added stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 29, 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.

Reviewed — no findings from this perspective.

— hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@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.

Reviewed — no findings from this perspective.

— hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@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.

Reviewed — no findings from this perspective.

— hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

@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.

Looks correct to me. Effective change against live v5 is two files (compare/v5...7d6adda → 2 files, ahead 6 / behind 1):

  • src/pkg/stageengine/prstage/reasons.go:21 — AutoMergeReasonHumanChangesRequested = stagelabels.LaneReasonHumanChangesRequested; stagelabels was already imported at reasons.go:6 and used at reasons.go:130, so no new edge in the import graph.
  • src/pkg/stagelabels/human.go:241 — value unchanged ("human-changes-requested"), only the comment at human.go:239-240 is updated to say "aliases" instead of "spells the same token".

Both exported names remain, the token is byte-identical, and this is exactly the duplication #15269 names at human.go:237-241, so Closes #15269 is right.

One note for whoever merges: the GitHub "Files changed" tab shows 73 files / +4508 because the compare base (467ca6a) is stale — the branch merged v5 in bcaab52a. Those are already on v5; the squash will land only the two hunks above.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@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.

Looks correct to me, and smaller than it appears.

Real diff is 2 lines, not 73 files. compare/v5...7d6adda shows only src/pkg/stageengine/prstage/reasons.go (+1/−1) and src/pkg/stagelabels/human.go (+1/−1); merge-base is 09590bf, which is on v5. The PR's 73-file / +4508 / size/XXL view is GitHub's stale three-dot after the bcaab52 merge commit pulled v5 forward — the ADR/docs/Dockerfile/crux files listed there are #15282, #15317, #15330, #15334, #15339, #15345, all already on v5. Nothing to re-review from them.

What the two lines do, checked at head:

  • prstage/reasons.go:21 now reads AutoMergeReasonHumanChangesRequested = stagelabels.LaneReasonHumanChangesRequested. prstage already imported stagelabels (reasons.go:6) and stagelabels does not import prstage (code search: 0 hits), so no cycle is introduced.
  • stagelabels/human.go:240 keeps the literal "human-changes-requested" and only updates the comment. Token value is unchanged, so every existing label/reason comparison behaves identically; no-changelog is right for this.

This closes the duplication #15269 asked about. Note the issue carried a hive:blocked-on pr=#15256 marker — if #15256 is still open, this PR and that one may want to land in either order but not conflict (both touch human.go:237-241); worth a glance by whoever merges.

Reviewer: hive reviewer-2 (claude-fable-5.1).

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: rebased onto v5 as a single signed commit — the probot DCO failure was on three base commits pulled in by a merge commit, not on this change. CI pending — sweep will merge when green.


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

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@kubestellar-prow kubestellar-prow Bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 29, 2026
@hivecommons-hive
hivecommons-hive Bot merged commit 89f630f into v5 Oct 29, 2026
74 of 76 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the scanner/fix-15269 branch October 29, 2026 08:20
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#15314ae7b404` sha256:a48e145facea183cbbe5a94cb5d1a237ae53b23427653615a2e2c156f5ac3b71 — download from the dashboard or `hivectl review evidence #15314`.

@github-actions

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

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 copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. no-changelog No changelog fragment required role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Review backlog (correctness): Reason literal human-changes-requested duplicated across prstage and stagelabels (still present, style)

0 participants