Skip to content

πŸ› fix(automerge): share merge-train lane verdicts across sweep engines - #19292

Merged
hivecommons-hive[bot] merged 1 commit into
hivecommons:v6from
Danathar:fix/stage-080-090-flip
Nov 19, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
hivecommons:v6from
Danathar:fix/stage-080-090-flip

Conversation

@Danathar

Copy link
Copy Markdown
Contributor

A PR the contributor lane leaves to a person no longer flips between stages 080 and 090. The merge-train verdicts are now shared by every sweep engine, not kept on one.

What was wrong (live case)

projectbluefin/utah-packages#1222 is a github-actions bot PR with no linked issue. The contributor lane correctly says contributor-lane:no-linked-issue (090, a person merges it), and by design such a PR is never a merge-train member (mergeTrainHumanMergeReason, #15425). But on 11-19 its stage went 090 β†’ 080 (merge-train:queued-behind#1217) β†’ 090 51 times in 3.5 h. The stage dampener absorbed most of the flips, though GitHub still got 9 stage/090 and 8 stage/080 label writes.

Cause: the per-head lane verdicts (mergeTrainVerdicts) lived on one Engine. The contributor lane also runs every minute on a fresh one-shot engine (SweepContributorLaneAutoMerges). That engine had no verdict, fell back to the stage store, read the 090 record as "ready", and seated #1222 behind #1217 at 080. On the next pass the long-lived loop parked it at 090 again. This is the same class of gap #17178 fixed for the once-per-head marks; the train verdicts were left out of it.

What changed

After the change, #1222 stays at 090 (contributor-lane:no-linked-issue), and #1217 is no longer shown as a two-PR train.

Left as they are (noted for follow-up, not needed for this bug):

  • A transient mergeable-unknown verdict still clears the mark, so a single short 080 blip is possible.
  • After a restart, the memory is empty until the lane re-evaluates the PR. The 090-reads-as-ready fallback is kept, because 090 can also mean the hive merges after a human approves (πŸ› Lead 090 merge-gate action is Approve and let hive mergeΒ #15668).
  • Train seats and the files cache are still per engine.

Tests

πŸ€– Generated with Claude Code

https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1

A PR the lane leaves to a person (contributor-lane:no-linked-issue,
untrusted-author-role, ...) is never a merge-train member. The planner
knows that from the lane's per-head verdict (noteMergeTrainOutcome), but
the verdict lived on the engine that reached it. The contributor lane runs
both in the long-lived loop and every minute on a one-shot engine
(SweepContributorLaneAutoMerges), and the one-shot engine started empty:
with no verdict it read the PR's 090 stage record as ready, seated it
behind the train front at 080 (merge-train:queued-behind#N), and the next
pass put it back at 090.

projectbluefin utah-packages#1222 (a github-actions bot PR, no linked
issue, overlapping hivecommons#1217) flipped 080/090 this way 51 times in 3.5 hours,
each one suppressed by the stage dampener.

The verdicts now live in the sweep memory shared by every engine over the
same client, next to the once-per-head marks from hivecommons#17178. A read-only
integration-eligibility probe keeps its own memory, as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 19, 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

@kubestellar-prow kubestellar-prow Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 19, 2026
@hivecommons-hive
hivecommons-hive Bot merged commit 043317e into hivecommons:v6 Nov 19, 2026
81 checks passed
@hivecommons-hive

hivecommons-hive Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

Evidence bundle `#19292a1d5ef9` sha256:764c1ea82f41b9fad23eaa1986c8d99a537970ddfcfd1bfe787d612bf6c3830f β€” download from the dashboard or `hivectl review evidence #19292`.

merged by Hive trusted-author auto-merge: author Danathar holds role owner and GitHub permission maintain on repo; CI green at a1d5ef9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant