Skip to content

agents: explain force-merging while requiring user consent #3998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickeylev merged 3 commits into from
Aug 4, 2026
+5 −0
Merged

agents: explain force-merging while requiring user consent #3998

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbbf502
agents(pr): prohibit per-file edit lists in PR descriptions
rickeylev Aug 3, 2026
3581bf0
agents(merge-pr): require user consent for admin force-merges
rickeylev Aug 4, 2026
22adf73
Merge branch 'main' into expose_worker_stderr_logs
rickeylev Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .agents/skills/merge-pr/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ description: Merge a pull request into main, monitoring the merge queue, retryin
When the user asks to merge a pull request (e.g., "merge PR <number>", "merge this PR", or monitor its merge):

1. **Enqueue for Merge**: Run `gh pr merge <pr_number> --auto --squash` to enable auto-merge or add the pull request to the merge queue.
- **Force / Admin Merge**: **CRITICAL**: Passing `--admin` to bypass the
merge queue or required checks requires explicit user permission or
consent. Only pass `--admin` (e.g., `gh pr merge <pr_number> --admin
--squash`) if the user has explicitly requested or approved a force/admin
merge. Never invoke `--admin` autonomously.
2. **Invoke a Background Shepherd**: Launch a background subagent with the role `Merge PR Shepherd` to continuously watch the PR until it merges.
3. **Leverage Existing CI Skills**:
- Have the subagent use the **`monitor-ci-results`** skill to watch for CI check failures and generate analysis reports.
Expand Down