From 721ab7d11555613e3902891fc7c80b4799f6392a Mon Sep 17 00:00:00 2001
From: JacobPEvans <20714140+JacobPEvans-personal@users.noreply.github.com>
Date: Sun, 25 Oct 2026 11:37:18 -0400
Subject: [PATCH] fix: agents hold PRs with draft or human:review and never arm
 auto-merge

The org pr-automerge workflow arms eligible PRs, so agent instructions
no longer run gh pr merge --auto themselves.

Assisted-by: Claude:claude-opus-5-5
Claude-Session: https://claude.ai/code/session_01WyipjowtZGZps1bYUGaNRk
---
 github-workflows/skills/ship/SKILL.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/github-workflows/skills/ship/SKILL.md b/github-workflows/skills/ship/SKILL.md
index 604cb895..9f9039f6 100644
--- a/github-workflows/skills/ship/SKILL.md
+++ b/github-workflows/skills/ship/SKILL.md
@@ -78,11 +78,13 @@ git status --porcelain
    `npm run lint`, `make lint`, etc.). If failures are found, fix them and amend the commit.
    Skip this step if no lint command is discoverable.
 6. Push: `git push -u origin HEAD`
-7. Create PR: `gh pr create --fill` (or with title/body derived from commit).
-   Never pass `--draft`. Include the session id (`<runtime>-<host>-<8hex>`) in
-   the PR body. Unless the PR needs `human:review` or is a promotion into a
-   production branch, enable auto-merge: `gh pr merge <PR_NUMBER> --auto --squash`.
-   An open PR does not merge by itself without it — never assume it merged.
+7. Create a PR: `gh pr create --fill` (or with title/body derived from the commit).
+   Use a draft or add `human:review` if it must wait for a person. Include the
+   session id (`<runtime>-<host>-<8hex>`) in the PR body. The org `pr-automerge`
+   workflow arms non-draft PRs without `human:review`; agents never arm auto-merge.
+   It uses a merge commit for PRs into `main` on git-flow repos and squash otherwise.
+   It never arms `develop` to `main` promotions. Never assume the PR merged;
+   verify its state before reporting.
 8. **Pacing**: Run `sleep 2` after `gh pr create` to allow GitHub to index the PR
 9. Capture PR number from output (look for `pull/NUMBER` pattern)
 10. Add it to the PR list