From fbbf502584baddb9ab1dfb94b1c9f37d8648f651 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Mon, 3 Aug 2026 23:33:20 +0000 Subject: [PATCH 1/2] agents(pr): prohibit per-file edit lists in PR descriptions Update the pull request rules to explicitly prohibit per-file edit lists or individual file changelog items in PR descriptions and commit messages. Reinforce that PR descriptions must provide a high-level overview explaining why a change is made and how at a conceptual level, and mandate linking related issues. --- .agents/rules/pr.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.agents/rules/pr.md b/.agents/rules/pr.md index ba8236d072..caacb07519 100644 --- a/.agents/rules/pr.md +++ b/.agents/rules/pr.md @@ -1,6 +1,6 @@ --- trigger: model_decision -description: Apply when drafting pull request descriptions. +description: rules to apply to pull request descriptions --- @CONTRIBUTING.md @@ -18,3 +18,7 @@ Before drafting any pull request description, strictly adhere to the rules in * Once a Pull Request is created, always make new commits or merge commits. * **NEVER** amend or rebase commits on an active PR branch to avoid breaking code review threads. +* **NEVER** include a list of per-file edits or changelog bullet points of + individual file modifications in PR descriptions or commit messages. +* High-level overview only: state *why* the change is made and *how* at a + conceptual level. Link related issues (e.g. `Work towards #`). From 3581bf002fe4f20887db9a4b1e8e627e4e55f97d Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Tue, 4 Aug 2026 02:52:46 +0000 Subject: [PATCH 2/2] agents(merge-pr): require user consent for admin force-merges Add instructions to the merge-pr skill for handling explicit force merge requests using the gh pr merge --admin flag to bypass the merge queue. Emphasize that passing --admin strictly requires explicit user permission or consent and must never be invoked autonomously. --- .agents/skills/merge-pr/SKILL.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.agents/skills/merge-pr/SKILL.md b/.agents/skills/merge-pr/SKILL.md index 73086759ed..30b8f38af4 100644 --- a/.agents/skills/merge-pr/SKILL.md +++ b/.agents/skills/merge-pr/SKILL.md @@ -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 ", "merge this PR", or monitor its merge): 1. **Enqueue for Merge**: Run `gh pr merge --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 --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.