Skip to content

Tracker: Fixing PR with a stale merge-failed gate still anchors in the Merge queue column (#15574) #15656

Closed

Description

@clubanderson

What the maintainer saw

Hive's own spoke (roll 9 build), issue #15511 row → child PR #15574 (hive's adopted copy of @odttlnt's #15526). Its chevron reads Fixing · @hivecommons-hive[bot] but sits in the Merge queue column, not CI / Review. Captions: Covered by #15574 (adopted from @odttlnt's #15526) — being fixed by hive and fell back to Fixing — Red or changes requested; a hive agent is fixing it — conflicting.

Maintainer: "why is this in merge queue if it is being fixed?"

Same class as #15405 earlier today, which #15616 ("PRs under repair leave the merge train") addressed for the merge_train path.

Why it still happens at v5 HEAD (post-#15616)

stageTrackerAnchor (SPA, tracker-row.js) picks the chevron column in this order: terminal → merge_gate.state ∈ {merging, merge-failed} → merge_train.state → stage. #15616 closed the merge_train promotion by dropping under-repair rows from the train server-side, but the merge_gate promotion is untouched: a PR whose merge attempt GitHub refused with a conflict regresses to 070 with reason conflicting, and stageTrackerMergeAttemptStale keeps merge-failed on the gate (it only clears it when the head moved or the reason is CI-pending). So the Fixing row is still anchored in column 80.

Reproduced against the HEAD bundle:

070 Fixing + merge_gate.state=merge-failed → column 80   (bug)
070 Fixing + merge_train.state=queued-behind → column 80 (pre-#15616 server only)
070 Fixing + left_train                    → column 50

Rule to enforce

The chevron column is derived from the current state, never from the highest stage reached:

  • Fixing / needs-author / returned-to-contributor / adopted / CI running / review pending → CI / Review
  • only ≥ 080 queued-and-green (or merging) → Merge queue
  • merged → Merged

"fell back to …" captions keep the history text; the column follows the fallback. One function must decide both the column anchor and train membership so they can never disagree, with a ratchet test over every known state → expected column.

Activity

  1. added
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    on Oct 30, 2026
  2. added a commit that references this issue on Oct 30, 2026
    6b8de16
  3. added a commit that references this issue on Oct 30, 2026
    21da71a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions