Skip to content

πŸ› fix: keep merge queue position visible during sweeps - #15499

Closed
hivecommons-hive[bot] wants to merge 27 commits into
v5from
hive/adopt-15400
Closed

hivecommons-hive[bot] wants to merge 27 commits into
v5from
hive/adopt-15400

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersedes #15400 (adopted in place, re-homed because a hive commit on the contributor branch cannot carry a squash-safe sign-off; original commits by @Karibhou preserved).

This branch is #15400's head 16015b3685ce as pushed by @Karibhou (fork Karibhou/hive), unchanged. Last lane reason on the original: merge-train:queued-behind#15468:7/7:0/0:main.go,dashboard-copy-inventory.md,dashboard-sections.md,operator-reference.md,+9.

Hive fix agent: rebase this branch on v5, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and their Signed-off-by; add your own sign-off on your commits. Do not open another PR.

Sign-off attribution: the original PR would squash the App's signed fixes as the contributor. This App-authored superseder keeps every original commit and sign-off unchanged and attributes the squash to the App instead. DCO and all merge gates still apply here.

Karibhou and others added 2 commits October 29, 2026 15:44
Hive-Run: #15395
Hive-Plan: merge-queue-label
Hive-Spec: issue-15395#chip-wording
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
v5 already ships the queue-position chip (#15427, #15449): 'Merge queued Β· 2nd',
sweep-stable label, spinning cue and a tooltip naming the train and PRs ahead.
The early return added here shadowed it with different wording and broke
TestStageTrackerMergeQueueChipNode, so drop the superseded JS, its test and
its changelog fragment.

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 Oct 29, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

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

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.

No conflicting open PRs or same-file overlaps were found.

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

Decision needed: @clubanderson should decide whether #15499 can be closed as a no-op: its net diff against v5 is empty because merged #15427 already stabilised the queued-behind label.

This PR is a no-op against v5 β€” git diff origin/v5...hive/adopt-15400 produces no hunks.

What I verified:

  • e867a1218 (the original #15400 commit) added a queued-behind && src.merge_train branch in src/pkg/dashboard/static-src/js/tracker-words.js (~line 708) returning In merge queue Β· N of M with a sweep-independent label, plus a test and changelog fragment.
  • 16015b368 ("reconcile merge-queue chip wording with v5 tracker") removes exactly those 32 lines again β€” 4 files, 0 insertions, 32 deletions.
  • The behaviour it targeted already landed on v5 in #15427 (6c7cb37b9), whose STAGE_TRACKER_TRAIN_STATE_WORD table makes the label stable across sweeps (sweep only changes cue + "Checking now…").

So merging this would change nothing. Recommend closing in favour of #15427, which is already merged. I have not closed anything.

β€” hive: agent=reviewer-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.

Decision needed: @clubanderson should decide whether to close #15499 β€” it is a net no-op against v5 (the queue-position chip it re-homes already landed in #15427).

This PR changes nothing against v5. git diff v5...16015b3 is empty, and the branch tree at 16015b3 is byte-identical to its base 3ef38e645.

Mechanism, from the two commits on the branch:

  • e867a1218 adds a merge-queue chip early-return in src/pkg/dashboard/static-src/js/tracker-words.js, a test in stage_tracker_merge_gate_test.go and changelog.d/fixed-15395-merge-queue-wording.md (+32).
  • 16015b368 deletes exactly those 32 lines. Its own message says why: v5 already ships the queue-position chip via #15427 (6c7cb37b9, an ancestor of this branch's base) and the early return shadowed it and broke TestStageTrackerMergeQueueChipNode.

So the behaviour #15395 asked for is already on v5 from #15427; merging this would be a no-op. The original #15400 is already closed. Flagging for a maintainer: if you agree, this can be closed as superseded by #15427. I have not closed anything.

β€” 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.

Decision needed: @clubanderson should decide whether #15499 is closed as an empty no-op (its two content commits cancel out; changedFiles is 0) or whether the merge-queue-position-during-sweep bug from #15400 still needs a fresh fix on v5.

This PR currently changes nothing: merging it would be a no-op against v5.

  • e867a12 adds the sweep-independent 'In merge queue Β· N of M' branch to src/pkg/dashboard/static-src/js/tracker-words.js (+7), a test in stage_tracker_merge_gate_test.go (+17), the regenerated index.html (+7) and a changelog fragment (+1).
  • 16015b3 ("reconcile merge-queue chip wording with v5 tracker") deletes exactly those 32 lines.
  • git diff e867a12^ 16015b3 is empty; the remaining five commits are Merge branch 'v5'; GitHub reports changedFiles: 0.

The original #15400 is closed, so this adoption branch is the only thing left carrying the title. I have not closed anything β€” flagging for a maintainer: if the v5 tracker already keeps the queue position visible during sweeps (which is what 16015b3's message suggests), this can be closed as redundant; if the bug is still live, it needs a new fix rather than this branch.

β€” 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.

Decision needed: @clubanderson should decide whether to close #15499 as a no-op: its branch now carries zero changes against v5 because v5 already ships the sweep-stable merge-queue chip from #15427/#15449.

This PR merges as a no-op. git diff origin/v5 adeee8c is empty (GitHub agrees: 0 changed files, 9 commits ahead β€” one fix, one reconcile, seven v5 merges).

What happened, from the branch history:

  • e867a12 (the original fix by @Karibhou) added an early return in stageTrackerMergeGateInfo for queued-behind rows, a node test and changelog.d/fixed-15395-merge-queue-wording.md.
  • 16015b3 ("reconcile merge-queue chip wording with v5 tracker") deleted all 32 of those lines again, because v5 already had the behaviour from #15427 and #15449 and the new early return shadowed it with different wording and broke TestStageTrackerMergeQueueChipNode.

I checked the claim rather than taking the commit message's word for it: at v5, src/pkg/dashboard/static-src/js/tracker-words.js:739-746 builds the queued row's word from merge_train (position/size) and uses mg.sweep_running only for the ' Checking now…' tip suffix and the cue. So the label is already independent of the sweep clock β€” which is exactly what #15395 / this PR set out to fix.

Nothing is wrong with the code; there is simply nothing left to merge. Recommending close in favour of #15427 (already merged). I have not closed anything.

β€” hive: agent=reviewer-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.

Decision needed: @clubanderson should decide whether to close #15499 (and its source #15400) as superseded by the merged #15427, since this head now has an empty diff against v5.

This PR is now a no-op against v5: gh pr diff 15499 is empty (0 lines, 0 changed files) at head fdfab4e.

How it got here, verified from the commits:

  • e867a12 (the original fix by @Karibhou) added the merge-queue chip wording: +7 lines in src/pkg/dashboard/static-src/js/tracker-words.js, +7 in static/index.html, a +17-line test in stage_tracker_merge_gate_test.go, and changelog.d/fixed-15395-merge-queue-wording.md.
  • #15427 ("tracker: merge queue position on the chevron, stable wording, stall warning") merged to v5 on 2026-10-29T17:06Z and carries the same feature with wider scope (config, docs, delegated_pr_context.go, server.go).
  • 16015b3 ("reconcile merge-queue chip wording with v5 tracker") then removed exactly those 32 lines again β€” same four files, 32 deletions(+0), the mirror image of e867a12.
  • Everything after is Merge branch 'v5' commits, so the branch contains nothing v5 does not already have.

Merging it would change no file. Recommending it be closed in favour of #15427 (already merged); #15400, which this adopts, is in the same position. I have not closed anything.

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

@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 stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed 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 labels Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Needs a decision, not a merge:

Head: verdict requires_human @e794b31, 40/41 checks green, 1 pending, DCO yes, soak 0s of 30m0s.

What to do: approve this head (e794b31) to merge as-is, or leave a changes requested review (or reply /hive decision <what to change>) and the hive will push the fix.

How to release it:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue labels Oct 30, 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.

Decision needed: @clubanderson should decide whether to close #15499 as a no-op: its head tree is identical to v5 (0 files changed), because v5 already ships the merge-queue position chip via #15427 and the branch's own second commit reverts the superseded JS.

This PR no longer changes anything. Merging it would be a no-op against v5.

What I verified at head 95d7d2e:

  • git diff origin/v5...pr15499 (three-dot, i.e. the PR's contribution over its merge-base) touches 0 files; GitHub shows the same (changedFiles: 0).
  • The branch has exactly two non-merge content commits. e867a12 adds the queued-member early return in src/pkg/dashboard/static-src/js/tracker-words.js (+32 across 4 files); 16015b3 ("reconcile merge-queue chip wording with v5 tracker") removes those same 32 lines β€” its message states that v5 already ships the queue-position chip (#15427, #15449) and that the early return broke TestStageTrackerMergeQueueChipNode. git diff e867a12^ 16015b3 is empty.
  • v5 carries 6c7cb37 ✨ tracker: merge queue position on the chevron, stable wording, stall warning (#15427), which is the behaviour this PR's title describes.

So the goal ("keep merge queue position visible during sweeps") is already met on v5 by #15427, and #15400 (the contributor original this adopts) is already closed. Flagging for a maintainer: if you agree, this one could be closed as superseded by #15427. I have not closed anything.

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

@hivecommons-hive hivecommons-hive Bot added stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Needs a decision, not a merge:

Head: verdict requires_human @95d7d2e, 42/43 checks green, 1 pending, DCO yes, soak 0s of 30m0s.

What to do: approve this head (95d7d2e) to merge as-is, or leave a changes requested review (or reply /hive decision <what to change>) and the hive will push the fix.

How to release it:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

1 similar comment
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Needs a decision, not a merge:

Head: verdict requires_human @95d7d2e, 42/43 checks green, 1 pending, DCO yes, soak 0s of 30m0s.

What to do: approve this head (95d7d2e) to merge as-is, or leave a changes requested review (or reply /hive decision <what to change>) and the hive will push the fix.

How to release it:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@clubanderson

Copy link
Copy Markdown
Member

Closing as a no-op: this branch has an empty diff against v5 β€” the merge-queue position fix already landed via #15427 and #15449. Thanks @Karibhou for the original (#15400).

clubanderson added a commit that referenced this pull request Oct 30, 2026
… a person (#15584)

* fix: close the hive's own empty-diff PRs instead of asking a person

A hive-authored adoption whose fix had already landed through another PR
sat a day at "needs decision" (#15499) while the swarm
asked the owner "close as a no-op?" on six heads in a row.

Root cause: the adoption's dispatch records carried no author_agent, so the
verdict relay judged the App's own PR non-hive and routed its decision down
the contributor lane. Dispatch records now carry hive_authored and the relay
falls back to the PR author's login against the hive identity.

Then three fixes on top:

- Empty-diff auto-close. A hive-authored PR with changed_files == 0, confirmed
  by the base...head compare, is closed through the writeback gate as
  superseded by the PR the reviewer named (hive-redundant-of), with the sweep's
  edited-in-place comment and hive/superseded label. Same guards as the
  superseded rule (L6, held, keep-open, draft, parked by a person) plus a
  15-minute head age. A person's empty PR is never closed by the hive.
  supersededCheckWarranted now runs for a decision verdict that carries
  hive-redundant-of; the aggregate never self-approves such a question.

- Decision-question dedupe. writeback.DecisionKey identifies a question by its
  hive-redundant-of PR, else its normalised words; content dedupe collapses
  reworded bodies to it. The relay refreshes the hive's standing COMMENTED
  review in place instead of posting again, and the 085 entry comment is not
  repeated across heads or 50<->85 flaps. A PR with no diff against its base
  re-stamps its prior verdict on every new head (delta re-review), so a
  merge-from-base no longer draws a review round.

- Tracker decision_needed. A row parked on a reviewer decision quotes the
  newest decision-requested verdict on any head (the current head has none
  during a re-review), carries redundant_of, shows a "redundant of #N" chip
  and leads with "Close as superseded".

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* fix: fetch the PR for the hive-author fallback only when routing depends on it

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* docs: refresh client.go citation shifted by the BaseDiffEmpty field

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* dashboard: carry the redundant-of chip in static-src so index.html regenerates byte-exact

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
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. 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/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants