Repository navigation
π fix: get stale Dependabot PRs moving without refused commands - #18446
Conversation
β¦ Dependabot PRs Dependabot refuses @dependabot rebase/recreate from the hive App and refuses rebase on a branch someone else pushed to (the NOTICE autofix). The automerge sweep and the scanner prompt no longer post those commands. A behind Dependabot PR is updated with the update-branch API; a conflicting one is left to Dependabot's own rebase unless it was edited by others, in which case it is closed once per head so Dependabot opens a fresh PR. Refs #18441 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
|
Hive status β updated in place; edits do not notify. Full history is in the Activity Monitor. hive/awaiting-ci: CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=claude model=claude-sonnet-5-5 claude=2.1.325 Review findings from Routing to a human: this adds an automatic PR close, and the close condition can be triggered by the PR's own behaviour. The code is otherwise consistent with the body. Finding (medium): the App's
Why this is a decision rather than a nit: closing a PR is an external, hard-to-reverse action, and the PR's test table ( Read and found consistent with the body: the held-runs change only logs ( I have not closed or approved anything. |
Mutation testinggremlins found 3 surviving mutant(s) in changed files: the code ran under tests, but changing it did not fail any test.
Verdict: |
There was a problem hiding this comment.
Read automerge_dependabot_stale.go, the trySweepSelfAuthoredPR wiring and the leaveBaseSyncToDependencyBot exemption. The behind -> update-branch / conflicting -> leave-or-close-once split matches the body, renovate and merge-forward/merge-train paths are unchanged, and the held-runs nudge no longer posts anything.
One low-severity note: dependabotEditedByOthers counts any non-Dependabot commit as grounds to close a conflicting PR, so a PR carrying a maintainer's manual fix, or the App's own earlier update-branch merge commit, is closed rather than left for a human. Closing is reversible and the note explains @dependabot recreate, so I read this as intended; flagging it for the maintainer who owns the trusted-bot lane.
β hive: agent=reviewer backend=claude model=claude-sonnet-5-5 claude=2.1.325
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
Needs a decision, not a merge:
Head: verdict requires_human @ca66158, 72/73 checks green, 1 pending, DCO yes, soak 0s of 10m0s. What to do: approve this head ( How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
β¦icting Dependabot PR closeable Dependabot stops rebasing a branch once anyone other than Dependabot has committed to it, including the App's update-branch merge. A PR that went behind -> update-branch -> conflicting is therefore stuck and is closed with the recreate note, like any other edited PR (#18441). Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
Owner decision on the reviewer question: yes, the lane may close a conflicting Dependabot PR on its own, including when the only non-Dependabot commit is the App's own update-branch merge. Dependabot stops rebasing a branch once anyone else has committed to it, so a PR that went behind -> update-branch -> conflicting is stuck either way; closing it once per head with the recreate note is the intended outcome, and the code comment on |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Why
Stale Dependabot PRs sat stuck because the hive asked Dependabot to rebase them, and Dependabot refused every time (#18370):
@dependabot rebase/recreateonly from users with push access. The hive App never qualifies ("Sorry, only users with push access can use that command").rebasefrom anyone. The NOTICE autofix push does exactly that ("edited by someone other than Dependabot").@dependabot rebasestale ones", so the same refused comment went up on every pass. The automerge sweep also posted@dependabot rebaseon autofix-pushed Dependabot heads (π ci: Dependabot PRs that get a NOTICE autofix push never satisfy the requiredverify PR contentscontextΒ #11923), and that was refused too.What changed
The hive now never posts a Dependabot command. A stale Dependabot PR on the trusted-bot lane is handled like this (
decideDependabotStale):PUT /pulls/{n}/update-branch. Dependabot does not rebase a branch that is only behind.@dependabot recreateto restore it now.leaveBaseSyncToDependencyBotnow lets Dependabot PRs through on theupdate-branchandcurrent-basesteps only. Renovate and the merge-forward / merge-train paths behave as before (π fix: leave dependency-bot branches to the bot on every base-sync pathΒ #16862).nudgeDependabotRebase, same name) now only logs once per head and holds asrequired-check-never-ran. It posts nothing. The head unsticks when the base moves and the App's update-branch push triggers the workflows.@dependabot rebase/recreate. Use update-branch when the PR is only behind. Close it when it conflicts and has a commit not authored by Dependabot. Otherwise leave it to Dependabot.writeback:solicited, because the operator listeddependabot[bot]as a trusted bot. The writeback baseline forautomerge_held_runs.godrops from 3 to 2, since the refused comment is gone.@dependabotcommand line, and the updated held-runs and current-base expectations.Caveat: when a Dependabot PR is closed, Dependabot does not reopen that same version. It opens a PR for the next release, or a maintainer runs
@dependabot recreate.Fixes #18441 (remaining: the NOTICE autofix workflow still pushes onto Dependabot branches; moving NOTICE regeneration so it no longer edits Dependabot's branch is a non-trivial workflow change, left for a follow-up)
π€ Generated with Claude Code
β hive: agent=scanner backend=claude model=claude-sonnet-5-5 claude=2.1.325 requested_by=@clubanderson