Repository navigation
✨ dependency-bot: opt-in hive adoption of red dependency-bot PRs that need a code change - #18529
Conversation
… need a code change Add auto_merge.dependency_bot_adopt.enabled (default off). With it on, the dependency-bot sweep, at the point it would hand a red trusted-bot Renovate/Dependabot/mergeraptor PR to a person (red on the same head past the 4h grace and the transient re-run hold), reads the review swarm's own aggregate verdict for exactly that head from review-verdicts.json. When it is changes_requested, it adds adoption/supersede (the dashboard Adopt decision's label) once per bot head, gated as write-back kind contributor_adopt, and posts no hand-off for that head. The existing adoption path copies the PR to hive/adopt-<n> and the fix loop repairs it. Held, human-merge-labelled or -titled PRs, heads touching auto_merge.human_merge_paths (read-only check sharing the relay's pin-only exception), heads without a changes_requested verdict, hives with stage adoption off and write-back refusals keep the person hand-off. A failed label write is recorded for the head and the hand-off follows next pass. Requests persist in dependency-bot-conflicts-adopt.json. The setting is wired through config, PUT /api/config/auto-merge (dependency_bot_adopt_enabled), the Features → Auto-merge toggle and the admin MCP auto_merge.update op, with docs and a changelog fragment. 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>
The sweep's write calls moved into sweepDependencyBotConflictsWith, so the notification write-site inventory and its doc row name that function. 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>
5893659 to
df33323
Compare
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. hive/awaiting-ci: rebased onto v6 (conflict was the settings search index in config-state.js / index.html, resolved keeping both sides); CI pending — sweep will merge when green. 🐝 Hive Agent: — hive: agent=scanner backend=claude model=claude-sonnet-5-5 claude=2.1.325 |
Mutation testingHead ❌ gremlins did not produce a report for 1 package(s), so no verdict can be derived from this run (see the job log):
6 mutant(s) in changed files are not reached by any test (NOT COVERED). A maintainer may apply the
Verdict: |
There was a problem hiding this comment.
Decision needed: @clubanderson should the hive be allowed to adopt (copy and repair) a red trusted-bot dependency PR on its own when the review swarm says changes_requested, even though it is off by default?
This adds opt-in automation (auto_merge.dependency_bot_adopt.enabled, default off) that takes over another bot's PR. That is merge/trust policy, so I am routing it.
Verified in src/cmd/hive/dependency_bot_adopt.go, skipReason fails closed on every check I read:
- the author must be a trusted bot;
- stage adoption must be on;
- no hold,
do-not-mergeor human-merge rule may apply; adoption/supersedemust not already be set;- the swarm verdict on the exact head must be
changes_requested; - the human-merge-path check must succeed, and an error counts as "touches".
requestDependencyBotAdoption records the request per head before the label write, so a restart will not repeat it.
Open question, not a defect: depBotHeadVerdictFromArtifact reads review-verdicts.json, so adoption depends on this reviewer lane's verdicts. Please confirm you are comfortable with agent verdicts gating that step.
— hive: agent=reviewer backend=claude model=claude-sonnet-5-5 claude=2.1.325
|
Needs a decision, not a merge:
Head: verdict requires_human @f112e5e, 76/76 checks green, 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 |
clubanderson
left a comment
There was a problem hiding this comment.
Owner decision: yes, the hive may adopt a red trusted-bot dependency PR on its own when the swarm verdict on that exact head is changes_requested. It is off by default (auto_merge.dependency_bot_adopt.enabled), fails closed on hold / do-not-merge / human-merge paths / missing verdict / write-back refusal, is once per head and persisted, and reuses the existing adoption path. CI is green at f112e5e. It does not overlap #18446 (v5, stale/behind Dependabot rebasing in the automerge lane): different branch, different files, different failure mode, so both stay.
|
[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 |
Supersedes #18510 (adopted after CI went red and the contributor was unavailable; original commits by @Danathar preserved).
This branch is #18510's head
58936593cd92as pushed by @Danathar (forkDanathar/hive), unchanged. Last lane reason on the original:conflicting.Hive fix agent: rebase this branch on
v6, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and theirSigned-off-by; add your own sign-off on your commits. Do not open another PR.Conflicts with
v6: the contributor head could not be replayed onto the base, so this copy opened as it is and the hive's fixer is resolving the conflicts on this branch (rebase-resolve episode, two attempts). If both fail the PR parks for a person: adopt the commits into a fresh branch, or close it as superseded.