diff --git a/.agents/skills/ship/SKILL.md b/.agents/skills/ship/SKILL.md index 621c7d4..f0be729 100644 --- a/.agents/skills/ship/SKILL.md +++ b/.agents/skills/ship/SKILL.md @@ -1,5 +1,6 @@ Run the full ship flow: verify quality, ensure test coverage, update -artifacts, smoke test, then push, create PR, and merge when CI is green. +artifacts, smoke test, then push, create PR, address review comments, +and merge only when CI is green, all threads resolved, and user confirms. ## Phases @@ -41,11 +42,20 @@ artifacts, smoke test, then push, create PR, and merge when CI is green. - `cargo clippy --workspace -- -D warnings` - `cargo deny check` -### 8. Push, PR, Merge +### 8. Push & PR - Push branch to remote - Create or update PR with summary - Wait for CI to pass -- Merge when green + +### 9. Review & Merge +- Check for unresolved review comments — address or reply to each +- Ensure all review threads are resolved +- Confirm no changes-requested reviews remain outstanding +- Ask the user whether to merge now or wait for reviewer feedback +- Only merge when: CI green, no unresolved threads, no pending change requests **IMPORTANT**: Phases 2-5 (tests, artifacts, simplification, security review, smoke testing) are the quality core — do NOT skip them. + +**IMPORTANT**: Never auto-merge without confirming with the user. PRs should +have time for human review before merging.