Skip to content

πŸ› stale-red base refresh: update PRs returned to their contributor (072) - #18949

Merged
hivecommons-hive[bot] merged 1 commit into
hivecommons:v6from
Danathar:fix/stale-red-open-pr-evidence
Nov 18, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
hivecommons:v6from
Danathar:fix/stale-red-open-pr-evidence

Conversation

@Danathar

Copy link
Copy Markdown
Contributor

Summary

The stale-red base refresh (from #17544) skipped PRs at stage/072-returned-to-contributor. It assumed the contributor's hive would bring those branches up to date. Nothing asks it to, so a 072 PR whose red the base had since fixed stayed red until a person pressed "Update branch". This PR lets the stale-red refresh update 072 PRs. Every other skip is unchanged, and the missing-check refresh keeps its 072 skip.

What happened

The change

  • staleRedRefreshSkip no longer skips 072. The pass still updates a PR only when the base tip clears every failing check, so the red it clears is the base's, not the contributor's.
  • The update stays pinned to the evaluated head. If the contributor or their hive pushes first, GitHub refuses the update (head-moved), and their push is never merged over.
  • 074 (the adoption recovery owns those), dependency-bot branches, non-editable forks, drafts, held PRs, open shared-CI incidents and base-red PRs are still skipped.
  • baseRefreshBranchOwnerSkip is unchanged, so the missing-check refresh still skips 072. A 072 PR there is usually waiting on review changes, not on the base.

What I checked and did not change

The batch prompt also suggested the refresh misses checks that run only on PRs, because they never appear on the base tip. That's true in the code: StaleRedBaseVerdictFor returns base-unknown for a check with no completed run on the tip, as #17544 chose. But it isn't what held these two PRs. Both failing checks ran green on the actions main tip, and the prompt's claim that the tip runs only four checks doesn't match the tip's check runs. So this PR doesn't add open-PR evidence to the stale-red verdict. That can be a separate change if a case shows up.

Tests

  • TestStaleRedRefreshSkip: a 072 PR is now a candidate.
  • The missing-check skip table still expects returned-to-contributor.

Locally I ran only gofmt -l (AGENTS.md bans local go test/go build/go vet) and check-docs-citations.py, which verified 2163 references. CI is the test run.

Appendix: code refs

  • src/cmd/hive/stale_red_base_refresh.go: staleRedRefreshSkip, and the comments on refreshStaleRedBehindPRs and baseRefreshBranchOwnerSkip
  • src/cmd/hive/stale_red_base_refresh_test.go
  • src/docs/operator-reference/sweeps-and-operations.md: the stale-red section and the write-surface table row

πŸ€– Generated with Claude Code

https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1

The stale-red base refresh merges the base into a red PR only when every
failing check is green on the base tip, so the red it clears is the base's.
It still skipped PRs at stage/072-returned-to-contributor on the assumption
that the contributor's hive pushes there, but nothing asks the contributor
to merge the base: projectbluefin/actions#765 and hivecommons#766 stayed red at 072 for
ten hours after main fixed their checks in hivecommons#768 (both green on the base tip
all night), until a person pressed "Update branch".

The 072 skip is lifted for the stale-red refresh only; the missing-check
refresh keeps it. The update stays pinned to the evaluated head, so a push
from the contributor wins.

Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 18, 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 nicholasjackson 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 18, 2026
@hivecommons-hive

hivecommons-hive Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

@Danathar this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch is behind the base and Hive cannot update it; enable "allow edits by maintainers" or rebase

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Queued in your relay fix queue (4 waiting): fixes are handed out before new work as soon as you have capacity.

@Danathar Danathar changed the title fix(automerge): let the stale-red base refresh update 072 PRs πŸ› stale-red base refresh: update PRs returned to their contributor (072) Nov 18, 2026
@github-actions

github-actions Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

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.

PR Title Relation Files
#18945 πŸ› automerge: name held workflow runs and stop base-refreshing them CONFLICT src/docs/operator-reference/sweeps-and-operations.md (conflict)
#18946 πŸ› shared-ci: re-run PRs once the base recovers, tracker still open same files src/docs/operator-reference/sweeps-and-operations.md

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Nov 18, 2026
@clubanderson clubanderson added the author/human A person pushed this PR themselves label Nov 18, 2026
@hivecommons-hive
hivecommons-hive Bot merged commit 946391a into hivecommons:v6 Nov 18, 2026
87 of 88 checks passed
@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

Evidence bundle `#189491e4d274` sha256:f48ed78639d341ffb5f6cc08913bf29bcfa40218e56257a7cc702590ab03d631 β€” download from the dashboard or `hivectl review evidence #18949`.

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

Labels

author/human A person pushed this PR themselves 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants