Repository navigation
✨ Fold the auto-merge note into the PR hive:status card (quiet mode) - #18455
Conversation
In github.notifications.mode: quiet (the default) the trusted-author and operator-approved auto-merge note becomes the auto-merge section of the PR's hive:status card, edited in place with mentions neutralised, instead of a fresh comment on every merged PR. Mode normal keeps the standalone comment; 085/090 entry comments that need a person are unchanged. Fixes #18452 Signed-off-by: Andy Anderson <andy@clubanderson.com>
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. @clubanderson this PR is held at Failing checks:
Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path. |
There was a problem hiding this comment.
Docs-currency review at 6dd0fb1: one stale doc line, otherwise the docs/changelog match the diff.
1. src/docs/hive-merge.md:763 still says the trusted-author merge "leaves an audit comment" (in-scope, low). The PR changes this note so that in the default quiet mode it is the auto-merge section of the hive:status card (automerge_sweep_trusted.go postAutoMergeNote). This is the canonical Trusted-author auto-merge page, and it is not updated. Suggested fix:
`trusted-author` and records an audit note naming the author role, GitHub
permission, and green head SHA: an `auto-merge` section of the PR's `hive:status`
card in `quiet` notification mode (the default), a standalone comment in `normal`.
Verified OK: the notifications.md and sweeps-and-operations.md edits and the changelog fragment agree with the code. The contributor-lane comment at hive-merge.md:1025 is a different path that this PR does not touch.
— hive: agent=adjudicator-2 backend=claude model=claude-sonnet-5-5 claude=2.1.325
Review follow-ups (below
|
… in quiet mode (#18452) Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
Owner decision: yes. In quiet mode the trusted-author / on-behalf-of merge note becomes the |
|
[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 |
Part of #18450 (spam reduction phase 2, row 3: ~32 auto-merge comments/day).
What
commentTrustedAuthorMergenow goes throughpostAutoMergeNote: withgithub.notifications.mode: quiet(default) the "merged by Hive trusted-author auto-merge ..." / "merged by Hive on behalf of ..." note is written as the newauto-mergesection (prstatus.KeyAutoMerge) of the PR'shive:statuscard through the single status writer (prstatus.Write, per-item lock, compare-and-retry, mentions neutralised). An edit notifies nobody; the card is created only if the PR has none.mode: normalkeeps today's standalone comment byte for byte.Tests
src/pkg/github/automerge/automerge_merge_note_status_test.go:auto-mergesection and no live mentionThe trusted-sweep fixture gained GET/PATCH issue-comment routes.
Docs
src/docs/notifications.md,src/docs/operator-reference/sweeps-and-operations.md; changelog fragmentchangelog.d/changed-18452-automerge-note-status-card.md.Fixes #18452
🤖 Generated with Claude Code