Skip to content

✨ tracker: merge queue position on the chevron, stable wording, stall warning - #15427

Merged
hivecommons-hive[bot] merged 2 commits into
v5from
train-position
Oct 29, 2026
Merged

hivecommons-hive[bot] merged 2 commits into
v5from
train-position

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15395

What the operator saw

Rows for #15319 / #15374 wore "⟳ queued-behind · merge sweep running ⬡" for 4h, flipping to "🕓 queued-behind ⬡" every sweep. Live diagnosis in #15395: the head of their train (#15315) was at stage 090 ready-for-human-merge (newcomer author below require_tiers), so nothing behind it could move — the chip said neither what they were behind nor why the head was stuck, and leaked the slug. Later hive's #15406 chip read the bare slug front.

Changes

  1. Position on the chevron — "In merge queue · 2 of 6 · ~4m" (front: "Next to merge · 1 of 4"); tooltip names the head, what it is waiting on, "Hive merges one at a time, in order", estimated turn. No slugs in visible text.
  2. Stable wording — chip label is identical with sweep_running true/false; the sweep shows as a pulse on the existing ⬡ plus a "Checking now…" tooltip line (node-harness test).
  3. Merge queue popover — Merge gate column header → ordered list (#, title, state, ETA), reusing the "All merges" popover pattern.
  4. Stall warning — governor.merge_train_stall_warn_s (default 3600): chip "Merge queue stalled · head #N waiting on CI 3h", activity-log line once per hour.
  5. API — merge_train {position, length, head_number, head_state, head_since, eta_s, eta_at, eta_basis, late, stalled, stalled_s} per queued item; Go table tests for position/ETA/stall with injected clock.
  6. Countdown to auto-merge (owner follow-up) — server computes eta_s/eta_basis ("2 ahead · next sweep in 40s"): own remaining soak + per-PR-ahead (remaining soak or one sweep interval) + time to next tick; SPA renders a live countdown on the same tick as the soak chip so it does not reset on poll re-render; blocked → no ETA, blocker shown; exceeded >2× → "running late".
  7. Slug leak fix (🐛 tracker: say it once, in plain words — simplify hovers, menus and captions #15406 "front") — every merge_train state has a plain-words mapping; TestStageTrackerMergeTrainStateSlugsNeverLeak enumerates prstage.MergeTrainState* and renders each through chip/popover.
  8. One PR per issue (🐛 fix: show adopted PR provenance in the stage tracker #15402 / ✨ tracker: show where an adopted PR came from #15407 both for tracker: an adopted PR's row never says where it came from #15396) — the sweep keeps one PR per closing issue (green beats red; then earlier-opened) and holds the other out of every train with gate state duplicate-of:<n> ("Duplicate of 🐛 fix: show adopted PR provenance in the stage tracker #15402 · needs a pick", needs-decision). "Let hive decide" wires to the existing supersede path (ActionCloseDuplicate / rule one-pr-per-issue, through the writeback gate). Selection-rule tests.

Builds on hive's own #15400 (same function; this version keeps the label constant and adds position/ETA).

Validation

  • go build, go vet, go test -race ./pkg/dashboard/... ./pkg/config/... ./pkg/github/automerge/... ./pkg/delegatedecision/... ./pkg/stageengine/...
  • go generate ./pkg/dashboard/... committed (TestIndexHTMLIsGenerated)
  • Docs: dashboard-sections.md, api-reference/dashboard-misc.md, operator-reference.md, labels-and-control-signals.md; check-api-reference-citations.sh --fix clean; changelog fragment.

@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 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 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/docs/labels-and-control-signals.md
src/pkg/github/automerge/automerge_contributor_lane.go
src/pkg/github/automerge/automerge_sweep.go
#15405 🐛 fix: require verified signature for email-only hive commit identity match same files src/docs/operator-reference.md
#15425 ✨ feature: show local claim holders in tracker same files src/pkg/dashboard/static/index.html
#15400 🐛 fix: keep merge queue position visible during sweeps CONFLICT src/pkg/dashboard/stage_tracker_merge_train_test.go
src/pkg/dashboard/static-src/js/tracker-words.js
src/pkg/dashboard/static/index.html
#15431 ✨ review: combined review heads — one kick per head, sub-agent per perspective (#15058) same files src/pkg/config/config.go
#15430 🐛 fix: honour requiredChecksExpected memory on the queued merge lane same files src/pkg/github/automerge/automerge_sweep.go

@kubestellar-prow kubestellar-prow Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2026
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2026
@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026

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

Decision needed: @clubanderson should decide whether the new one-pr-per-issue delegate rule may close a contributor's PR in favour of an earlier hive PR, since it runs before the existing prefer-contributor rule and has no author-kind guard.

The UI work I read looks fine; the merge-policy half of this PR changes who the hive may close, and that ordering needs an owner's call before it lands.

Read at 7a68eac (I focused on the automerge/delegate change, not the 2k-line UI surface):

  1. decideTrainDuplicate pre-empts prefer-contributor. policy.go:586-588 calls decideTrainDuplicate before the !in.DCOMissing && !in.ReporterTrustHold guard and before decideCompeting. The existing rule at policy.go:704-707 deliberately only recommends when a hive PR competes with a mergeable, current contributor PR ("keep … open until that comparison confirms the contributor's PR is an adequate replacement"). The new rule at policy.go:660-676 returns VerdictCloseSuperseded + ActionCloseDuplicate for whichever PR the queue held, and the queue's pick (automerge_merge_train_duplicate.go:36-55) is green-first then earlier-opened, with no HiveAuthored check. So a green contributor PR opened after a green hive PR for the same Fixes #N is now held, and "Let hive decide" closes it — the opposite of what prefer-contributor protects. If that is intended, say so in the body; if not, the rule needs an author-kind guard or must run after decideCompeting.

  2. Hold is cross-lane blind, by construction. planDuplicateHolds (automerge_merge_train_duplicate.go:120) sees only the prs slice handed to planMergeTrains for one lane (automerge_merge_train.go:346), so a self-authored and a contributor PR for the same issue are never compared. Open question, not a defect — it just means the rule is narrower than the body's "one PR per issue" reads.

  3. Overlap with #15400 (695fded, Refs #15395 — partial): same tracker-words.js / stage_tracker_merge_gate_test.go region; the body says this builds on it. They conflict rather than duplicate; one should be closed once the other lands. I have not closed anything.

Verified as stated: every prstage.MergeTrainState* incl. the new duplicate-of has a Sentence() mapping (merge_train.go:191-196); the three lane sweeps skip held duplicates symmetrically (automerge_sweep.go:1086,1322, automerge_contributor_lane.go:435).

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

Read the automerge side of this against v5@e0f8bd9 (head 7a68eac). One verified defect in the new one-PR-per-issue hold; the tracker/SPA half I only skimmed, so no claims there.

Finding (medium): the "green beats red" pick never sees GitHub's conflict state, so an earlier-opened conflicting PR holds a clean later one out of every train.

  • automerge_merge_train_duplicate.go:129 computes Green from pr.GetMergeableState() on the PRs handed to planMergeTrains. Those come from openPullRequests → listOpenPullRequests, whose own comment at automerge_sweep.go:1657-1660 says the list endpoint "does not populate MergeableState"; the existing train code re-fetches members for exactly that reason at automerge_merge_train.go:392-404.
  • planDuplicateHolds runs before that re-fetch (automerge_merge_train.go:346), so mergeTrainDirty("") is always false and Green collapses to !mergeTrainHeadBlocked(...). That map is written only by noteMergeTrainOutcome (automerge_merge_train.go:696-710) from a prior lane verdict (red required check, terminal hold, permanent refusal) — a PR GitHub reports dirty is never in it.
  • Result: for two PRs closing the same issue where the earlier one is conflicting and the later one is clean (the 15320 red / 15330 green case in the test table), mergeTrainDuplicateBetter (:51) sees both as green and keeps the earlier, conflicting one; the clean PR is skipped in all three lanes (automerge_sweep.go:1086,1322, automerge_contributor_lane.go:435) with duplicate-of until a human picks. That is the inverse of the rule in the PR body ("green beats red").
  • The tests pass because the fixtures set MergeableState directly (automerge_merge_train_duplicate_test.go:80), which the live list path never does.

Suggested fix: in planDuplicateHolds, only for issues with ≥2 candidates, PullRequests.Get each candidate (same pattern and REST caller tag as :392-404) before deciding Green — the extra reads are bounded by the number of actual duplicate pairs. A test that builds candidates from list-shaped PRs (empty MergeableState) would catch the regression.

Also noting: this and #15400 both Fixes #15395 and both rewrite the queued-behind branch of stageTrackerMergeGateWord in tracker-words.js (#15400 at :581-586); the body acknowledges it. Whichever lands second needs a rebase, and — once this PR's own hold rule is live — a pair like that would be held by exactly the mechanism above.

— hive: agent=reviewer 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 29, 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
  • the review swarm requested changes

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

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 071-needs-author: conflicting

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

@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026
… warning

Position chip "In merge queue · 2 of 6 · ~4m" (front: "Next to merge · 1 of 4"),
label stable across sweeps (sweep = spinning ⬡ + "Checking now…"), Merge queue
popover in the sticky bar, countdown to the member's turn anchored server-side
(merge_train.eta_s/eta_at/eta_basis/late), stall warning with
governor.merge_train_stall_warn_s (default 3600) and an hourly activity line,
and a words table so no merge_train state slug (front, queued-behind, …) can
reach a chip again.

Fixes #15395

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…et hive decide

Two open PRs declaring the same Fixes #N (hive's #15402 and #15407 for
per closing issue (green head first, then earlier-opened) and holds the
other with stage reason merge-train:duplicate-of#<winner>; the tracker
shows merge_gate.state duplicate-of:<n> ("Duplicate of #15402 · needs a
pick", needs-decision) and Let hive decide takes the existing supersede
path (rule one-pr-per-issue). Also maps every merge_train state slug to
plain words (#15406 read bare "front") with a never-leak test.

Fixes #15395

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026

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

Delta re-review (correctness) — read 7a68eac…75a613e. The delta is a rebase onto v5 (#15424 / #15426 / #15429); the PR's own hunks are byte-identical to the previous head apart from doc citation line churn, so the prior finding is unchanged.

Still present — duplicate-hold "green" never sees GitHub's conflict state (src/pkg/github/automerge/automerge_merge_train_duplicate.go:129)

planDuplicateHolds is called at automerge_merge_train.go:356, before the live PullRequests.Get refresh at automerge_merge_train.go:397-421 whose own comment says "the list API does not carry it". So pr.GetMergeableState() at line 129 is always "" on sweep input, mergeTrainDirty("") is false, and Green reduces to !mergeTrainHeadBlocked(...). A conflicting earlier PR with green checks therefore beats a clean later PR for the same issue, contradicting the body ("green beats red") and the field comment at line 23-25. TestPlanDuplicateHoldsFiltersCandidates (automerge_merge_train_duplicate_test.go:80) pre-populates MergeableState on fabricated PRs, which list-fetched PRs never have, so it does not catch this.

Smallest fix: refresh the state for candidates that actually collide, before picking a winner (one Get per colliding PR, same caller tag as the train refresh):

--- a/src/pkg/github/automerge/automerge_merge_train_duplicate.go
+++ b/src/pkg/github/automerge/automerge_merge_train_duplicate.go
@@ func (c *Engine) planDuplicateHolds(plan *mergeTrainPlan, owner, repo, displayRepo string, prs []*gh.PullRequest, prefilter func(*gh.PullRequest) string) []*gh.PullRequest {
-func (c *Engine) planDuplicateHolds(plan *mergeTrainPlan, owner, repo, displayRepo string, prs []*gh.PullRequest, prefilter func(*gh.PullRequest) string) []*gh.PullRequest {
-	byIssue := map[int][]mergeTrainDuplicateCandidate{}
+func (c *Engine) planDuplicateHolds(ctx context.Context, plan *mergeTrainPlan, owner, repo, displayRepo string, prs []*gh.PullRequest, prefilter func(*gh.PullRequest) string) []*gh.PullRequest {
+	byIssue := map[int][]*gh.PullRequest{}
 	for _, pr := range prs {
 		if pr == nil || pr.GetNumber() <= 0 || !mergeTrainCandidate(prefilter(pr)) {
 			continue
 		}
 		issues := mergeTrainClosedIssues(pr, displayRepo)
 		if len(issues) == 0 {
 			continue
 		}
-		cand := mergeTrainDuplicateCandidate{
-			Number:    pr.GetNumber(),
-			CreatedAt: pr.GetCreatedAt().Time,
-			Green:     !mergeTrainDirty(pr.GetMergeableState()) && !c.mergeTrainHeadBlocked(owner, repo, pr.GetNumber(), pr.GetHead().GetSHA()),
-		}
 		for _, issue := range issues {
-			byIssue[issue] = append(byIssue[issue], cand)
+			byIssue[issue] = append(byIssue[issue], pr)
 		}
 	}
-	holds := mergeTrainDuplicateHolds(byIssue)
+	// Only PRs that actually collide need GitHub's live mergeable_state;
+	// the list API leaves it empty.
+	state := map[int]string{}
+	cands := map[int][]mergeTrainDuplicateCandidate{}
+	for issue, list := range byIssue {
+		if len(list) < 2 {
+			continue
+		}
+		for _, pr := range list {
+			n := pr.GetNumber()
+			if _, seen := state[n]; !seen {
+				state[n] = pr.GetMergeableState()
+				if state[n] == "" && c.gh != nil {
+					if live, _, err := c.gh.PullRequests.Get(hgithub.WithRESTCaller(ctx, "hive:automerge_merge_train"), owner, repo, n); err == nil {
+						state[n] = live.GetMergeableState()
+					}
+				}
+			}
+			cands[issue] = append(cands[issue], mergeTrainDuplicateCandidate{
+				Number:    n,
+				CreatedAt: pr.GetCreatedAt().Time,
+				Green:     !mergeTrainDirty(state[n]) && !c.mergeTrainHeadBlocked(owner, repo, n, pr.GetHead().GetSHA()),
+			})
+		}
+	}
+	holds := mergeTrainDuplicateHolds(cands)

and prs = c.planDuplicateHolds(ctx, plan, …) at automerge_merge_train.go:356. Add a test that feeds list-shaped PRs (no MergeableState) through a fake PullRequests.Get returning dirty for the earlier PR and asserts the later clean PR wins.

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

@hivecommons-hive
hivecommons-hive Bot merged commit 6c7cb37 into v5 Oct 29, 2026
77 of 78 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the train-position branch October 29, 2026 17:06
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#1542775a613e` sha256:fffc69f22594521309f4e579e20f69c632851ad9b3904d7f7695e35a47e85988 — download from the dashboard or `hivectl review evidence #15427`.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 75a613e.

@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

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

Read the tree at 75a613e. Scope of this review: the sweep-side one-PR-per-issue rule (item 8) and its wiring into the trains and the decision policy. I did not read the dashboard JS, the ETA arithmetic in stage_tracker_merge_train.go, or the docs — someone should still cover those. Two findings, both in the new rule; the rest of what I read holds up.

1. (medium) The duplicate hold ignores the base branch, so a port of the same fix is held — and can be closed — as a duplicate.
planDuplicateHolds keys candidates on issue number only (src/pkg/github/automerge/automerge_merge_train_duplicate.go:117-137) and runs at automerge_merge_train.go:356, before the perBase split at :364-371 that the rest of the train logic uses precisely because PRs on different bases do not contend. Two open PRs that both say Closes #N against different bases (fix on v5, port on v6/v4) therefore become a pair: the loser leaves every train (automerge_sweep.go:1093, :1329, automerge_contributor_lane.go:435), is shown as "Duplicate of #N · needs a pick", and "Let hive decide" resolves it through decideTrainDuplicate → ActionCloseDuplicate (src/pkg/delegatedecision/policy.go:674-679) — closing a PR that must merge. Suggest folding pr.GetBase().GetRef() into the grouping key. automerge_merge_train_duplicate_test.go has no case with two bases.

2. (low) The "green beats red" rule's conflict leg is dead on the production path.
Green reads pr.GetMergeableState() off the listed PR (automerge_merge_train_duplicate.go:131), but the list API does not carry mergeable_state — the plan itself says so at automerge_merge_train.go:398-399 and only fetches live state for grouped members, which happens after the holds are decided. Conflicts are also deliberately kept out of mergeTrainBlocked (:727-729). So !mergeTrainDirty("") is always true and a conflicting earlier PR beats a clean later one; the rule degrades to "red-CI memory from a previous pass, then earlier-opened". The test fixture at automerge_merge_train_duplicate_test.go:80 sets MergeableState on the struct directly, which is why it passes. Either fetch live state for the few PRs that share an issue, or drop the conflict clause from the docstring and PR body so they match what runs.

Verified non-issue: the held PR continues before noteMergeTrainOutcome (automerge_contributor_lane.go:435-437 vs :459-460; same shape at automerge_sweep.go:1093/:1201), so a red loser's blocked mark survives while it is held — the pair does not oscillate pass to pass.

Overlap: this and #15400 (already judged at its head) both edit tracker-words.js and stage_tracker_merge_train_test.go; the body says this one builds on it, so whichever lands second needs a rebase, not a pick between them.

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

Read the Go side of head 75a613e — the one-PR-per-issue holdout, the delegate rule, the prstage/config additions and the dashboard server pass. No defects found in what I read; this looks correct to me. I did not read tracker-queue.js / tracker-words.js line by line, so the SPA countdown and popover are covered here only by the node-harness tests, not by this review.

What I verified:

  • Holdout only triggers on closing keywords. automerge_merge_train_duplicate.go:98 goes through ParseClaimedIssues, whose claimRefPattern (prclaims.go:490) requires close|fixes|resolves…; a Refs #N or bare #N never groups two PRs. So #15400 (Refs #15395) and this PR (Fixes #15395) would not hold each other.
  • Holds are per pass, not persisted. planDuplicateHolds (:118) rebuilds plan.duplicates from the lane's candidate list on every pass, so a winner turning red re-picks on the next sweep without any state to clear. Wired identically in the three lanes (automerge_sweep.go:1093, :1329, automerge_contributor_lane.go:435) ahead of the sibling check, and only after mergeTrainCandidate(prefilter(pr)) — a PR the lane's prefilter already rejects never counts as a candidate.
  • Close is never automatic. decideTrainDuplicate (delegatedecision/policy.go:659) runs after the sentinel rules (:586) and emits ActionCloseDuplicate with VerdictCloseSuperseded, which is what lets the llm.go:370 older-than-target guard pass for the red-earlier/green-later case; a paused repo gets recommend-only.
  • Config.MergeTrainStallWarn() (config.go:4992) is nil-safe and falls back to the default, so mergeTrainQueueOptionsFrom cannot panic on a nil config.
  • MergeTrainStateDuplicateOf overloads Position to carry the issue number (prstage/merge_train.go); Sentence() and stageTrackerApplyDuplicateHold both read it that way, so the overload is consistent, though a dedicated field would read less surprisingly.

Overlap for a maintainer: this PR contains #15400's change to tracker-words.js (same stable "In merge queue · N of M" label, same sweep-cue handling) and #15400 is now DIRTY against v5. If this one lands, #15400 is a no-op and could be closed in its favour. I have not closed anything.

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

hivecommons-hive Bot added a commit to Karibhou/hive that referenced this pull request Oct 29, 2026
v5 already ships the queue-position chip (hivecommons#15427, hivecommons#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>
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.

Activity Monitor: merge-train rows read "queued-behind" for hours with no position, head or reason; chip wording flips every sweep

1 participant