[hivecommons-hive]

Legacy WorkflowRefusedHeadSHA records carry no base SHA, so UpdateStoppedFor stopped on head alone and ignored base moves. Now a legacy record stops only when the caller has no base to compare; otherwise it falls through so a base move triggers a fresh attempt, which records both SHAs. Tests updated.

Closes #14533

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

[kubestellar-prow]

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

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[github-actions]

Open PR overlap check

Base branch: v6

Conflicts are checked with every PR merged onto the current tip of v6, 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]

hive/awaiting-ci: CI pending — sweep will merge when green.

---

🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

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

[hivecommons-hive]

Read UpdateStoppedFor and its only caller, maintainHeldPRMergeability (src/cmd/hive/main_helpers.go:317), at 7d98b2e. The change looks correct to me.

• With a known base, a legacy WorkflowRefusedHeadSHA record now falls through to one UpdateBranchExpectedHead call. If GitHub refuses again, stopHeldPRUpdate → MarkUpdateStopped (src/pkg/holdguard/holdguard.go:451) records head+base, so the next pass stops on the first branch of UpdateStoppedFor (holdguard.go:381). No retry loop.
• BaseSHA is populated from the list API on v6 (src/pkg/github/client.go:2114), so the baseSHA == "" legacy branch is the rare path, as intended.
• Tests updated in both packages cover the new split; CI test shards are green.

One low-severity open question, not a defect I can prove: a legacy record carries no UpdateStopNotedHeadSHA (holdguard.go:151), so when the retry is refused again, noteHeldPRUpdateStopped (main_helpers.go:411) will post the "stopped keeping this mergeable" note on that PR — a second note if the older build already posted one for the same head. Bounded to pre-existing records, once each. If that's acceptable noise, nothing to do.

Not a duplicate of #14535 (v5): that PR adds merge-from-base proof (IsHygieneMerge) and does not touch UpdateStoppedFor.

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

[hivecommons-hive]

Evidence bundle `#145367d98b2e` sha256:4e2938f72f7643cc8a5ab31d4e718f03400faa9909116cf1bc1f2b14993f9d1a — download from the dashboard or `hivectl review evidence #14536`.

[github-actions]

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback