Conversation
Replace `--auto --squash` with `--squash --admin` in both cascade-action and single-review prompts. Approval decisions now immediately bypass branch protection rules (don-petry has bypass permissions) rather than queuing for auto-merge. Non-approval (escalate) paths are unchanged — no bypass merge is triggered. Also adds a 5-second sleep after the rebase/update-branch call to give GitHub time to process the branch update before the merge is attempted. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
Updates the agent action prompts used by the PR-review automation to merge approved PRs via an admin bypass path (instead of GitHub auto-merge), and adds a short wait after branch updates to reduce merge races.
Changes:
- Switch approval-path merge command from
gh pr merge --auto --squashtogh pr merge --squash --admin. - Add a 5-second sleep after the
update-branch(rebase) API call before merging. - Document why
--adminis used and explicitly forbid--autoin these approval flows.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| prompts/single-review.md | Updates single-review approval actions to use admin bypass merge and adds a post-rebase delay. |
| prompts/cascade-action.md | Updates cascade approval actions to use admin bypass merge and adds a post-rebase delay. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…ompts - Replace fixed `sleep 5` with a bounded poll loop (6×5s) that exits as soon as `mergeStateStatus` is no longer BEHIND, avoiding the race between update-branch and the subsequent merge call - Update synthesize.md to use `--squash --admin` instead of `--auto --squash` so all three action prompts (cascade-action, single-review, synthesize) are consistent - Remove stale "same logic as synthesize.md" / "same as synthesizer" cross-references that caused documentation drift Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Automated review — NEEDS HUMAN REVIEWRisk: HIGH SummaryThis PR replaces FindingsCritical
Major
Minor
Info
CI statusCI is passing ( Reviewed by the don-petry PR-review cascade (triage: haiku 4.5 → deep: sonnet 4.6 + duck: gpt-5.4 → audit: opus 4.6). Reply with |
Add a hard CI gate in review-one-pr.sh (step 1b) that runs immediately after the head SHA fetch, before triage or any LLM calls. PRs with failing/errored checks (FAILURE, ACTION_REQUIRED, TIMED_OUT, CANCELLED) or still-running checks (IN_PROGRESS, QUEUED, WAITING) exit with code 100 (no-op sentinel) so they don't count against the MAX_PRS budget. PRs with no CI checks at all are treated as passing. Also remove the redundant CI-failing escalation signal from triage.md — failing-CI PRs can no longer reach the triage tier. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Abandoning --admin approach — too broad a bypass. Starting over with a dedicated bot account so the approval gate works correctly without bypassing CI checks. |
Summary
gh pr merge --auto --squashwithgh pr merge --squash --adminin bothcascade-action.mdandsingle-review.mdupdate-branchrebase call to let GitHub process the branch update before merging--adminis only invoked when the agent's decision isapproveWhy
--autoqueues a merge gated on further required approvals, which the bot account couldn't satisfy.--adminbypasses branch protection rules immediately —don-petryhas bypass permissions configured on these repos.Test plan
workflow_dispatchrun against a known-approvable PR withdry_run=false🤖 Generated with Claude Code