Skip to content

docs(pst): rule 5 -- explicit CI-watch loop for await-then-merge#66

Merged
pstaylor-patrick merged 2 commits into
mainfrom
feat/pst-rule5-ci-watch
Jun 21, 2026
Merged

docs(pst): rule 5 -- explicit CI-watch loop for await-then-merge#66
pstaylor-patrick merged 2 commits into
mainfrom
feat/pst-rule5-ci-watch

Conversation

@pstaylor-patrick

Copy link
Copy Markdown
Owner

Summary

  • Rule 5 (Merge) lacked explicit guidance on what to do when instructed to "await green CI then merge" in admin-bypass or auto-merge mode
  • Session hung after checking CI status instead of watching until complete and proceeding to merge
  • Fix: treat the instruction as a single run-to-completion directive (rule 13); use gh pr checks <PR#> --watch, merge on pass, report on fail
  • Also covers the CI-didn't-trigger edge case: kick manually then watch

Test plan

  • Docs-only change, no code execution path affected
  • SKILL.md line count: 139 (under 200-line budget)

🤖 Generated with Claude Code

https://claude.ai/code/session_019BCr5Qxi8jXnG2Rr7zdkw1

pstaylor-patrick and others added 2 commits June 21, 2026 05:31
In admin-bypass/auto-merge mode, "await green CI then merge" is a
run-to-completion directive (rule 13). Add explicit guidance: use
`gh pr checks <PR#> --watch`, merge immediately on pass, report on
fail. Also covers the CI-didn't-trigger case: kick manually then watch.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019BCr5Qxi8jXnG2Rr7zdkw1
- Replace wrong `gh pr comment -b "/rerun"` (posts a comment, not a rerun)
  and `gh workflow run` (fires workflow_dispatch, not pull_request) with
  `gh pr checks <PR#> --rerun-failed` which actually re-queues failed checks
- Clarify that the watch-then-merge sequence is only valid after adversarial
  review is already recorded (rule 7), preventing a race past the review gate

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019BCr5Qxi8jXnG2Rr7zdkw1
@pstaylor-patrick pstaylor-patrick merged commit bb28967 into main Jun 21, 2026
1 check passed
@pstaylor-patrick pstaylor-patrick deleted the feat/pst-rule5-ci-watch branch June 21, 2026 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant