Skip to content

🐛 Merge train seats only PRs green and reviewed on their current head; regressed members are ejected - #15831

Merged
clubanderson merged 2 commits into
v5from
fix/train-front-ejection
Oct 30, 2026
Merged

clubanderson merged 2 commits into
v5from
fix/train-front-ejection

Conversation

@clubanderson

@clubanderson clubanderson commented Oct 30, 2026 •

Copy link
Copy Markdown
Member

Closes #15825

Rule (verbatim from the owner): items that have not passed the review or CI is not green should not be (a) ready for merge, (b) in a merge train — and "they should not be in the merge queue column".

Root cause

Fix

Engine (pkg/github/automerge)

  • A seat requires Readiness == Ready on the current head and not blocked. Unready PRs that share files are candidates: tracked (merge-train:admitted#front:0/size… hold so lanes don't native-queue them past the train) but hold no position and are never front.
  • Seat memory per lane/repo (mergeTrainSeats sha+since). On every plan, mergeTrainSettleSeats ejects any seat not re-seated: one INFO merge train: member ejected pr=N why=head-moved|ci-pending|ci-red|verdict-owed|conflicting|under-repair|human-merge|held, plus store.NoteTrainEjected so the tracker knows. A train dissolving (front merged, one left) is silent.
  • mergeTrainHeadReadiness no longer trusts a stale verdict/stage after a head move (seat sha, ejected head, ActivityHead, LastPushSha all gate it).
  • Ordering among seated members: 🐛 merge train: ready PRs lead; odometer rolls only after the bee lands #15763 readiness tiers → age → number. Earliest seat leads when a member trails as dirty.
  • Conflict decision: a member the train itself made dirty (by merging the front ahead of it, with rebase attempts left) keeps its seat but trails every clean member while the resolver rebases it; outsider conflicts are ejected conflicting. The resolver's push moves the head → it is ejected head-moved and re-enters at the back when green. This keeps ✨ Auto-merge hive-authored superseding PRs without operator decision #15757-style rebases from losing their place without letting a non-green head front.

Stage engine (pkg/stageengine) — train branch of ClassifyStage: VerdictBlocks, a red check, or a rebasing train state on the current head → 070 fixing, never 080 (the rebased head owes CI and verdicts). Transition diagram gains the 080→070 / 080→050 regression edges.

Tracker (pkg/dashboard)

  • left_train gains reason: merge-train:ejected:<why> and badge ("left merge train · pushed 3m ago"); the caption says what is owed ("left the merge train — new push, CI re-running after push; review re-run owed" / "review re-run owed for this head" / "CI re-running on this head"). Chevron labels unchanged.
  • admitted candidates render no merge_train (no ordinal, never front): overlap chip "train · joins behind #N next pass".
  • Rebasing (🐛 activity monitor: 'merging now' lingers, silent merges, closed rows vanish #15817 case): a member under rebase renders in the CI / Review column with chevron "Rebasing · attempt 1/2" and lineage "left merge train · rebasing 1/2"; no merge_train seat.
  • Header size (8 PRs / 7 seats): red-check rows (e.g. 090 with a failing check) hold no seat and are not counted; riders are renumbered (gate reason + caption) to the train that actually rides. One merge_train object per PR — linked-issue rows share the pointer.
  • Seat words (✨ stage tracker: PR sub-row names the other issues it also closes #15834 case): a seated 080 rider whose front is still below 080 keeps "behind 🌱 refactor: split tracker row source #15771 in merge train (2nd of 2 …)" instead of "Ready for auto merge · checking now"; the front's chip reads "train · 1st once green". SweepState.Current makes "checking now" true only for the PR the sweep is evaluating this tick.
  • SPA: overlap chip honours server badge; lineage pill rendered from left_train.badge; chevron word uses rebase.text below the merge queue. static/index.html regenerated.

Tests

  • TestMergeTrainNotGreenOrReviewedIsNotMember, TestMergeTrainFrontEjectedOnHeadMoved, TestMergeTrainEjectedReentersAtBack, TestMergeTrainHeadReadinessIgnoresStaleStage
  • TestClassifyStageMergeTrainNotGreenOrReviewedIsNotMergeQueue
  • TestStageTrackerNotGreenOrReviewedIsNotInMergeQueueColumn_{CIPendingOnCurrentHead,VerdictOwedOnCurrentHead} (stage<80, caption, pill, payload JSON), TestStageTrackerAdmittedCandidateRidesNoTrain, TestStageTrackerNotGreenOrReviewedIsNotInMergeQueueColumn_RedCheckRiderUnseated, rebasing-at-070 + lone-rider seat words in TestStageTrackerMergeTrainPayload / TestStageTrackerMergeTrainPendingFrontLeavesLoneRider, TestClassifyStage… rebasing → fixing, transition-table edges, sweep_clock_test.go current-PR scope
  • node: stage_tracker_overlap_hint.test.js (+2)
  • go test ./pkg/github/automerge/... ./pkg/dashboard/... ./pkg/stageengine/... ./pkg/stagelabels/... green; go vet clean.

Docs: rule added verbatim to src/docs/hive-merge.md (merge train section); changelog fragment at repo root.

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 30, 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 hanthor 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 30, 2026
@github-actions

github-actions Bot commented Oct 30, 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
#15819 🌱 refactor: split src/pkg/github/automerge/automerge_sweep.go into 4 files CONFLICT src/pkg/github/automerge/automerge_sweep.go
#15804 ✨ Show the upgrade animation for every roll (announce + SIGTERM fallback) same files src/pkg/dashboard/static/index.html
#15748 🐛 [reviewer] park PRs at 085 Needs decision when the fixer exhausted its attempts same files src/docs/hive-merge.md
src/pkg/dashboard/stage_tracker_build.go
src/pkg/github/automerge/automerge_sweep.go
src/pkg/stageengine/derive_pr_classify.go
#15859 ✨ feature: add abandoned counts to contributor leaderboards same files src/pkg/dashboard/static/index.html
#15866 ✨ Animate live tracker, contributor and Knowledge count deltas same files src/pkg/dashboard/static/index.html
#15771 🌱 refactor: split tracker row source same files src/pkg/dashboard/static-src/js/tracker-row.js
#15834 ✨ stage tracker: PR sub-row names the other issues it also closes same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html
#15871 🐛 fix: stage tracker gives immediate Let-hive-decide feedback and says why a human is wanted same files src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html
#15849 ✨ Show online ClankeR IDs on the Contributors count pill same files src/pkg/dashboard/static/index.html
#15757 ✨ Auto-merge hive-authored superseding PRs without operator decision same files src/docs/hive-merge.md
src/pkg/github/automerge/automerge_sweep.go
#15853 ✨ Complete native GitHub queue CI and policy integration same files src/pkg/dashboard/static/index.html
#15863 ✨ feature: show abandoned counts on contributor cards and status same files src/pkg/dashboard/static/index.html
#15774 ✨ dashboard: onboarding and GitHub App errors point to the Getting Started guide same files src/pkg/dashboard/static/index.html
#15854 🐛 fix: preserve merge notifications across reloads and show countdown same files src/pkg/dashboard/static/index.html

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Another agent tried to open a PR from scanner/fix-15825, but this PR already closes #15825. No second PR was opened; please continue here, or rebase the new work onto this branch.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: check-pending

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:Sign-off survives the squash

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Docs currency — the new rule is documented, but three operator-facing texts now contradict it or under-describe it.

  1. src/docs/hive-merge.md:376-388 — the #15763 paragraph still describes unready members. It says a head not yet evaluated "comes next", a head still at CI / Review "trails", a blocked head "trails everything", and "a train whose every member is still short of the gate has a provisional front, and the Activity Monitor says so". At this head the planner forms no train from unready PRs (test renamed to "all unready forms no train (nobody is ready to front it)" in automerge_merge_train_test.go; candidates carry no position per automerge_merge_train.go:445-490). The paragraph that follows (:396-415) says the opposite, so the section is self-contradictory. Suggested rewording of :376-388:
-The train's order is **readiness first**. Each pass the lane sorts the
-members by what it last saw of their heads: a head at the merge gate —
-green, approved, soaking or waiting on a sweep — leads; a head the lane has
-not evaluated since it was pushed comes next (so it is evaluated and
-sorted); a head still at CI / Review trails; a blocked head (red required
-check, terminal hold) trails everything and never fronts. Within a tier the
-old tiebreak holds (clean-mergeable first, then oldest, then number). The
-order is recomputed every pass, so a member that turns green moves up and
-one that turns red moves back. The front of a train is therefore always a
-ready member when the train has one; a train whose every member is still
-short of the gate has a *provisional* front, and the Activity Monitor says
-so rather than reading "1st in the merge queue".
+The train's order is **readiness first**. Each pass the lane sorts the
+seated members by what it last saw of their heads: a head at the merge
+gate — green, approved, soaking or waiting on a sweep — leads; a member
+the train itself made dirty trails every clean member. Within a tier the
+old tiebreak holds (earliest seat, then oldest, then number). The order is
+recomputed every pass. Since #15825 (below) a head still at CI / Review,
+not yet evaluated since its push, or blocked is not a member at all, so
+the front is always a ready member and a group with no ready member forms
+no train.
  1. src/docs/hive-merge.md:405-406 — the documented INFO line lists 5 why tokens; the engine emits 8. automerge_merge_train.go:1003-1010 also ejects with under-repair, human-merge, held, and the tracker captions all eight (stage_tracker_merge_train.go, stageTrackerEjectionCaptions). An operator grepping the log by the doc's list misses three.
why=head-moved|ci-pending|ci-red|verdict-owed|conflicting|under-repair|human-merge|held`), the next
  1. src/docs/dashboard-sections/activity-monitor.md:198,200 — payload reference not updated. :198 documents left_train: {why, note} and says "Provisional members (050 / 060 with nothing red, #15580) keep their slot"; :200 says "A PR the planner has ordered while it is still at CI / Review (050 / 060) rides no train" and overlap: {behind, with, files, note}. This PR adds left_train.reason (merge-train:ejected:<why>) and left_train.badge (stage_tracker_merge_train.go, StageTrackerLeftTrain), adds overlap.badge (stage_tracker_merge_train_overlap.go:24-26), introduces the lineage pill and the admitted "joins behind #N next pass" chip, and the planner no longer orders/seats 050-060 PRs. Suggested additions:
@@ activity-monitor.md:198 @@
-The dropped row carries `left_train: {why, note}` and no `merge_train`:
+The dropped row carries `left_train: {why, note, reason?, badge?}` and no `merge_train`:
@@
-Provisional members (050 / 060 with nothing red, [#15580](https://github.com/hivecommons/hive/issues/15580)) keep their slot.
+A member the train ejected ([#15825](https://github.com/hivecommons/hive/issues/15825): head moved, CI pending/red, verdict owed, conflicting, under repair, human merge, held) carries `left_train.reason: merge-train:ejected:<why>` and `left_train.badge` — the gray lineage pill "left merge train · pushed 3m ago" — and its caption says what is owed ("left the merge train — new push, CI re-running after push; review re-run owed"). Since #15825 a 050 / 060 PR holds no slot.
@@ activity-monitor.md:200 @@
-Such a row carries `overlap: {behind, with, files, note}` instead of `merge_train`
+Such a row carries `overlap: {behind, with, files, note, badge?}` instead of `merge_train`
+… A green-and-approved candidate the lane has admitted but not yet seated (`merge-train:admitted#<front>…`) shows **train · joins behind #N next pass** (`overlap.badge`).

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

@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Why:

  • the branch conflicts with the base and needs a rebase

Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Reviewed (intent-alignment, head 4a5802a3) — the diff matches #15825's four requirements (seat = ready on current head; eject + one INFO + tracker lineage; 080 only with green/verdicts; #15763 order → age). Two low advisories, neither blocking:

  1. Same-head regression of a seated sibling is not observed until it fronts (src/pkg/github/automerge/automerge_contributor_lane.go:448, automerge_sweep.go:1166, :1401). Seated non-front members are skipped with queued-behind every pass, and mergeTrainHeadReadiness (automerge_merge_train.go:1256) reads the remembered lane verdict for that SHA — so a check that turns red or a human changes_requested arriving on the same head keeps its seat (and the 080 queued-behind reason in the store) until it reaches the front. #15825 req. 2 lists ci-red / verdict-owed as next-evaluation ejections. The ClassifyStage change keeps the column correct (derive_pr_classify.go train branch), so this is a seat-accounting gap, not a merge-safety one; the head-moved case — the live evidence in the issue — is fully covered.

  2. Spurious held ejection when a train dissolves while another train exists in the same lane/repo (automerge_merge_train.go:1139-1142). The "train dissolved, no ejection" guard is len(plan.groups) == 0, which is repo-wide. If train A dissolves (front merged, one member left) while train B still exists, A's survivor logs member ejected … why=held and gets a NoteTrainEjected record although it simply merges on its own. The tracker hides it (stage_tracker_merge_train.go skips rows at ≥080), so the cost is one misleading INFO line + stale record. Fix: remember the seat's base and scope the guard to it:

    -	if len(plan.groups) == 0 {
    -		return ""
    -	}
    -	return mergeTrainEjectHeld
    +	for _, g := range plan.groups {
    +		if g.Base == pr.GetBase().GetRef() && len(g.Order) > 0 {
    +			return mergeTrainEjectHeld
    +		}
    +	}
    +	return ""

Could not run go test here (blocked on agent hosts); go build of the four touched packages is clean and server-tests is green on this head.

— 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

Choose a reason for hiding this comment

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

Correctness review (head 7e46492)

1. A train that dissolves while any other train exists in the repo ejects its last member as held — medium

mergeTrainEjectWhyLocked (src/pkg/github/automerge/automerge_merge_train.go:1139-1142) treats "train dissolved" as len(plan.groups) == 0, which is repo/lane-wide, not per-train. Two disjoint trains on v5 ({X,Y}, {P,Q}): X merges, Y is now a singleton and groupMergeTrains drops it (len(ms) < 2, line 359). In mergeTrainSettleSeats Y still holds a seat, is open, same sha, not dirty, verdict Ready, not under repair, not a candidate — and plan.groups is non-empty because {P,Q} survives, so Y is ejected why=held: an INFO line, store.NoteTrainEjected(..., "held"), and the tracker row flips to "left the merge train" for a PR that is about to merge on its own. The same happens for the surviving member of any train when trains span bases in one repo. TestMergeTrainFrontEjectedOnHeadMoved / TestMergeTrainEjectedReentersAtBack only run a single train, so this is untested.

Since the planner already knows why each PR fell out (prefilter, under-repair, human-merge, conflicting outsider, files error at lines 540-560 / 603-608), record that instead of inferring from len(plan.groups):

 type mergeTrainPlan struct {
 	…
 	candidates map[int]*mergeTrainGroup
+	// dropped names why a PR the lane saw open holds no seat this pass
+	// (prefilter/held, under-repair, human-merge, conflicting, …); a
+	// seated PR missing from groups, candidates and dropped lost its
+	// train, not its seat.
+	dropped map[int]string
 }

populate plan.dropped[n] = <why> at each continue/m.Number = 0 in planMergeTrains, and in mergeTrainEjectWhyLocked:

-	if len(plan.groups) == 0 {
-		return ""
-	}
-	return mergeTrainEjectHeld
+	if why, ok := plan.dropped[number]; ok {
+		return why
+	}
+	return "" // the train dissolved around it; it merges on its own

plus a test with two trains where one front merges.

2. Advisory (no change requested): #15825 rule 1 lists "not conflicting" as a seat requirement, but mergeTrainSeated (line 167) seats a dirty member the train itself made dirty and only trails it (mergeTrainSeatLess, line 272). The PR body argues this explicitly; noting only so the deviation is on record.

3. Test gap (low): the three merge-point holds (automerge_sweep.go:2046, :2505; automerge_contributor_lane.go:1488) are not exercised by a sweep test — TestMergeTrainNotGreenOrReviewedIsNotMember only checks the ctx helpers round-trip (ready_test.go:58-66). A sweep-level test that a ready candidate returns merge-train:admitted… rather than merging would cover the actual gate.

— 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

Choose a reason for hiding this comment

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

Correctness — delta re-review at 4a5802a (vs 7e46492). The delta is only Merge branch 'v5' (#15827, #15816); none of its 19 files touch the merge-train engine, and automerge_merge_train.go, automerge_sweep.go, automerge_contributor_lane.go are byte-identical between the two heads. The merge is clean (PR diff vs v5 074530a contains no v5-side files).

Previous correctness findings — all still present, unchanged:

  • src/pkg/github/automerge/automerge_merge_train.go:1139 — dissolved-train last member is ejected held whenever len(plan.groups) != 0 anywhere in the repo (guard is repo-wide, not per-train).
  • src/pkg/github/automerge/automerge_merge_train.go:167 — mergeTrainSeated keeps train-caused dirty members seated, deviating from #15825 rule 1 ("not conflicting").
  • src/pkg/github/automerge/automerge_sweep.go:2046 — merge-point candidate holds still have no sweep-level test.

No new findings in the delta.

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

@clubanderson
clubanderson force-pushed the fix/train-front-ejection branch from 4a5802a to 3a6f966 Compare October 30, 2026 18:04
@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
@clubanderson
clubanderson force-pushed the fix/train-front-ejection branch from 3a6f966 to e2c36fd Compare October 30, 2026 18:26
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:build-and-test

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Why:

  • the branch conflicts with the base and needs a rebase

Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

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=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

Choose a reason for hiding this comment

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

Correctness — delta re-review at e2c36fd (rebased main commit is content-identical to 7e46492; all new code is in e2c36fd).

1. rebasing → 070 now ejects the member the train itself is rebasing, and defeats the rebase loop guard (in-scope, medium)

Chain, all read at this head:

  • mergeTrainFront records merge-train:rebasing… for a dirty front it sent to the resolver — src/pkg/github/automerge/automerge_merge_train.go:869-875.
  • The fix-up makes ClassifyStage return stagelabels.Fixing (070) for that reason — src/pkg/stageengine/derive_pr_classify.go:406-410; the reconcile pass stores it — src/pkg/github/automerge/automerge_stage_labels.go:1113.
  • On the next plan, mergeTrainUnderRepair returns non-empty for any PR whose label or store record is in mergeTrainUnderRepairStages (which includes Fixing) with no look at the reason — automerge_merge_train.go:643-669 — so planMergeTrains skips it (:543-545) and mergeTrainSettleSeats logs member ejected … why=under-repair (:1101, via :1136-1138).

Consequences: the PR body and src/docs/hive-merge.md:412-415 say a member the train made dirty "keeps its seat (trailing every clean member) while the resolver rebases it" — it no longer does. Worse, mergeTrainFront is only reached for a current group member (:849-852), so if attempt 1 does not move the head (rebase failed), attempt 2 and the MaxRebaseAttempts → rebase-exhausted → 085 escalation (:859-861) are never reached: the PR idles at 070 "Rebasing · attempt 1/2" outside every train. TestStageTrackerMergeTrainPayload only seeds the store at Fixing and never runs the planner, so nothing covers this.

Suggested fix — the train's own rebase is not somebody's repair (same exemption the tracker already grants rebase-exhausted):

--- a/src/pkg/github/automerge/automerge_merge_train.go
+++ b/src/pkg/github/automerge/automerge_merge_train.go
@@ func (c *Engine) mergeTrainUnderRepair(owner, repo string, pr *gh.PullRequest) string {
 	if pr == nil {
 		return ""
 	}
+	// A member the train itself is rebasing wears 070 (hivecommons/hive#15825)
+	// but is the train's to finish: it keeps its seat so the loop guard and
+	// rebase-exhausted escalation still run.
+	if store := c.stageStoreOrShared(); store != nil {
+		if rec, ok := store.Get(stagelabels.Key(owner+"/"+repo, pr.GetNumber())); ok && rec.Stage == stagelabels.Fixing {
+			if mt, ok := prstage.ParseMergeTrain(rec.Reason); ok && mt.State == prstage.MergeTrainStateRebasing {
+				return ""
+			}
+		}
+	}
 	labels := labelNames(pr.Labels)

Plus an engine test: plan → front dirty → rebasing recorded → reconcile stores 070 → next plan keeps the PR seated (no under-repair ejection) and a second dirty pass reaches attempt 2 / rebase-exhausted.

2. SweepState.Current is cleared between PRs (advisory, low) — sweep_clock.go:48-55,84-94: after evaluating("",0) and before the next PR, OnPR falls back to Targets (nil on a floor pass → true for every row), so every merge-gate row briefly flips back to "checking now" between evaluations. Not a correctness blocker; a Current.Named bool set on first evaluating and cleared only in end would make the fallback one-shot.

Previous docs-currency findings at this head: hive-merge.md:376-386 (#15763 unready/provisional paragraph) still present; hive-merge.md:406 (5 why tokens vs 8 constants at automerge_merge_train.go:1006-1013) still present; activity-monitor.md:198 still present (file untouched in the delta).

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive filed review findings that do not block this PR as backlog items:

Cap: 10 backlog item(s) per PR per day.

…; regressed members are ejected

Items that have not passed the review or CI is not green should not be
(a) ready for merge, (b) in a merge train. The planner now seats only
members whose current head is green, fully reviewed, mergeable and not
held; others are candidates (overlap hint, no position, never front).
A member whose head moves, CI goes pending/red, verdict is owed again or
conflicts is ejected on the next evaluation and re-enters at the back
when ready. Stage engine and tracker keep such PRs below 080 with a
caption naming what is owed and a lineage pill.

Closes #15825

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

- stage engine files a rebasing train member at 070 (its new head owes CI
  and verdicts); transition diagram gains 080->070 / 080->050 edges
- tracker: red-check rows hold no seat and are not counted in size; riders
  are renumbered (gate reason, caption) to the train that rides; a lone
  080 rider under a pending front keeps its seat words instead of
  'Ready for auto merge · checking now'
- sweep clock marks only the PR being evaluated as 'checking now'
- SPA chevron word shows 'Rebasing · attempt n/m' below the merge queue

#15825

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@clubanderson
clubanderson force-pushed the fix/train-front-ejection branch from e2c36fd to 0c94879 Compare October 30, 2026 19:14
@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
@clubanderson
clubanderson merged commit a53ed75 into v5 Oct 30, 2026
77 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/train-front-ejection branch October 30, 2026 19:40
@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

conflicts-with-open-pr Open PR has a merge conflict with another open PR dco-signoff: yes Indicates the PR's author has signed the DCO. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🐛 merge train seats PRs whose current head is not green or reviewed and keeps a regressed front

1 participant