Repository navigation
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>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@Danathar this PR is back in your court ( Review asks:
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 (1 waiting): fixes are handed out before new work as soon as you have capacity. |
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>
Open PR overlap check✅ Resolved: no conflicting open PRs or same-file overlaps remain against |
|
@clubanderson asked the hive to adopt this pull request now, without waiting for its author's hive. The hive opens its own PR carrying the author's commits and sign-off unchanged on the pass now running; this PR closes when that copy merges. |
Some dependency bumps need a code change before they can go green. The fix loop never pushes to another bot's branch, so today the hive only hands such a PR to a person, and that person's one step is clicking Adopt. This PR adds an opt-in switch, off by default, that lets the hive take that step itself. When the review swarm asked for changes on the red head, the dependency-bot sweep adds the same
adoption/supersedelabel the dashboard adds.What changes
auto_merge.trusted_bot_authors.review-verdicts.json. This is the raw verdict, not the trusted-bot lane's advisory downgrade, which normalizes it toadvisory.changes_requested, the sweep addsadoption/supersedeonce per bot head and posts no hand-off for that head. The write is gated as write-back kindcontributor_adoptand logged as one INFO line with the repo, PR, head and reason.hive/adopt-<n>, and the fix loop repairs the copy.dependency-bot-conflicts-adopt.json, so a restart does not repeat one. A new bot head is eligible again.changes_requestedverdict (missing, advisory, approve or requires_human);hold,do-not-mergeor a human-merge label or title prefix;auto_merge.human_merge_paths(the pin-only exception is honored) or its files cannot be read;pkg/githubgains a read-onlyClient.HumanMergePathHeld. The relay's pin-only check moved into a shared helper and behaves the same.Setting
auto_merge.dependency_bot_adopt.enabled, default false.PUT /api/config/auto-mergeasdependency_bot_adopt_enabled.auto_merge.updatefielddependency_bot_adopt_enabled. Turning it on counts as widening.hive-merge.md(new section), the operator reference table and the dependency-bot bullet, and the write-path table insweeps-and-operations.md.Evidence
In projectbluefin/chairlift on 2026-11-16:
mergeraptor[bot]) that bumpedgithub.com/frostyard/updexto v2. Its required check was red because no import used/v2.changes_requestedand named the fix. Fix dispatch refused the PR asother-bot-author. The trusted-bot lane logged that verdict as advisory, and nothing else happened for hours.hive/adopt-787. The scanner fixed it, the reviewer checked it, and the hive merged it at 3:50 PM.Tests
cmd/hive/dependency_bot_adopt_test.go:changes_requestedgives exactly one label request and no hand-off;needs-owner-mergelabel, a human-merge path, an unreadable path check, stage adoption off, an untrusted bot, and every non-changes_requestedverdict (including one on another head) each keep the hand-off;pkg/github:TestHumanMergePathHeldcovers unconfigured, no match, match, moved head, fail-closed errors, and the pin-only exception admitting or not. It also checks that the call writes nothing.pkg/config), the dashboard API and its rendered toggle (pkg/dashboard), and the admin MCP op (pkg/adminmcp). The golden config is updated.gofmt -lwas run, per AGENTS.md.static/index.htmlwas regenerated by concatenatingstatic-srcin manifest order, the generator's documented byte-for-byte contract; the unchanged tree reproduced the committed file exactly first.🤖 Generated with Claude Code
https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1