Pr Ship

PR Ship

End-to-end PR lifecycle shepherd: create PR → wait for CI → review → fix → merge. Single invocation, single PR.

Announce at start: "Using pr-ship skill to shepherd this PR from creation to merge."

Usage

/pr-ship [pr_number] [--no-auto-merge]

Session State

Track these values in conversation context throughout the session:

• PR_NUMBER - current PR number
• PHASE - current phase (create / ci-wait / review / fix / merge)
• RETRY_COUNT - CI failure + review fix retry counter (max 3, shared), initialized to 0
• AUTO_MERGE - true unless --no-auto-merge is passed
• EMPTY_CI_COUNT - consecutive empty CI check counter (max 3), initialized to 0

Phase 0 - Create PR

Skip if pr_number is provided. When skipping, set PR_NUMBER from the argument and jump to Phase 1.

Parse arguments:

# Detect --no-auto-merge flag
AUTO_MERGE=true
if echo "$ARGUMENTS" | grep -q -- '--no-auto-merge'; then
  AUTO_MERGE=false
fi

# Detect pr_number (first numeric argument)
PR_NUMBER=$(echo "$ARGUMENTS" | grep -oE '[0-9]+' | head -1)

If PR_NUMBER is set: set RETRY_COUNT = 0, EMPTY_CI_COUNT = 0, skip to Phase 1.

If PR_NUMBER is not set: invoke oss-pr to create the PR:

/oss-pr

After oss-pr completes, extract PR_NUMBER from the PR URL in its output. Set RETRY_COUNT = 0, EMPTY_CI_COUNT = 0.

Phase 1 - CI Wait

Check CI status:

gh pr view $PR_NUMBER --json statusCheckRollup \
  --jq '.statusCheckRollup[] | {name: .name, status: .status, conclusion: .conclusion}'

Required jobs (same list as pr-review):

• Code Quality
• Unit Tests (ubuntu-latest)
• Unit Tests (macos-14)
• Unit Tests (windows-2022)
• Coverage Test
• i18n-check

Informational exclusions: codecov/patch and codecov/project - always excluded from failure checks.

Decision Matrix

Workflow Approval (CI not triggered)

HEAD_SHA=$(gh pr view $PR_NUMBER --json headRefOid --jq '.headRefOid')
REPO=$(gh repo view --json nameWithOwner --jq '.nameWithOwner')
RUN_IDS=$(gh api "repos/$REPO/actions/runs?head_sha=$HEAD_SHA&status=action_required" \
  --jq '.workflow_runs[].id')
for RUN_ID in $RUN_IDS; do
  gh run approve "$RUN_ID" --repo "$REPO"
done

Then EMPTY_CI_COUNT++ and ScheduleWakeup 270s to re-check. If EMPTY_CI_COUNT >= 3 (~13.5 minutes), abort:

CI has not triggered after ~13.5 minutes of waiting. Check the repository CI configuration, then re-invoke /pr-ship $PR_NUMBER.

CI Failure Handler

Step 1 - Check retry budget:

If RETRY_COUNT >= 3:

Maximum retry count reached (3/3). Manually inspect PR #$PR_NUMBER, then re-invoke /pr-ship $PR_NUMBER.

Exit.

Step 2 - Identify failures:

# Get failed job names
FAILED_JOBS=$(gh pr view $PR_NUMBER --json statusCheckRollup \
  --jq '[.statusCheckRollup[] | select(.conclusion == "FAILURE" or .conclusion == "CANCELLED") | select(.name | test("^codecov/") | not) | .name] | join(", ")')

Report to user:

CI failed: $FAILED_JOBS. Attempting fix ($RETRY_COUNT/3)...

Step 3 - Fetch failure details:

REPO=$(gh repo view --json nameWithOwner --jq '.nameWithOwner')

# Find the failed run IDs
HEAD_SHA=$(gh pr view $PR_NUMBER --json headRefOid --jq '.headRefOid')
FAILED_RUN_IDS=$(gh api "repos/$REPO/actions/runs?head_sha=$HEAD_SHA&status=failure" \
  --jq '.workflow_runs[].id')

# Get logs for each failed run
for RUN_ID in $FAILED_RUN_IDS; do
  gh run view "$RUN_ID" --repo "$REPO" --log-failed 2>/dev/null | tail -100
done

Step 4 - Fix in worktree:

REPO_ROOT=$(git rev-parse --show-toplevel)
WORKTREE_DIR="/tmp/wayland-ship-${PR_NUMBER}"
HEAD_BRANCH=$(gh pr view $PR_NUMBER --json headRefName --jq '.headRefName')

# Clean up stale worktree
git worktree remove "$WORKTREE_DIR" --force 2>/dev/null || true

# Create worktree
git fetch origin "$HEAD_BRANCH"
git worktree add "$WORKTREE_DIR" "origin/$HEAD_BRANCH" --detach

# Symlink node_modules
ln -s "$REPO_ROOT/node_modules" "$WORKTREE_DIR/node_modules"

Fix only CI-reported errors (lint errors, type errors, test failures) in the worktree. No refactoring, no scope expansion.

After fixing, run local quality gate:

cd "$WORKTREE_DIR"
bun run lint:fix
bun run format
bunx tsc --noEmit
bun run test

Step 5 - Commit and push:

cd "$WORKTREE_DIR"
git add -u
git commit -m "fix(<scope>): resolve CI failures"
git push origin HEAD:$HEAD_BRANCH

No AI signature in commits.

Step 6 - Cleanup worktree:

cd "$REPO_ROOT"
git worktree remove "$WORKTREE_DIR" --force 2>/dev/null || true

Step 7 - Increment and loop:

RETRY_COUNT++. ScheduleWakeup 270s → re-enter Phase 1.

Phase 2 - Review

Invoke pr-review in interactive mode, passing the PR number explicitly:

/pr-review $PR_NUMBER

(No --automation flag - this is an interactive session.)

Decision based on review conclusion

Phase 3 - Fix

Check retry budget first:

If RETRY_COUNT >= 3:

Maximum retry count reached (3/3). Manually inspect PR #$PR_NUMBER, then re-invoke /pr-ship $PR_NUMBER.

Exit.

Invoke pr-fix in interactive mode, passing the PR number explicitly:

/pr-fix $PR_NUMBER

(No --automation flag.)

After pr-fix completes

Fix pushed successfully: RETRY_COUNT++. ScheduleWakeup 270s → back to Phase 1 (wait for CI on new commit).

Fix aborted (all issues dismissed, or user rejected CRITICAL dismissal):

pr-fix produced no fixes. Continue shepherding this PR? (yes/no)

• yes → back to Phase 1 (CI may already be passing)
• no → exit, output PR URL for manual handling

Phase 4 - Merge

AUTO_MERGE = true (default)

gh pr merge $PR_NUMBER --squash --auto

Output:

✅ PR #$PR_NUMBER has been set to auto-merge and will merge automatically once CI passes.

AUTO_MERGE = false (--no-auto-merge)

Display summary:

=== PR #$PR_NUMBER Ready ===

Title: <title>
Changes: +<additions> / -<deletions> (<file_count> files)
Review: <conclusion>
CI: All passing

Type merge to confirm merge, or abort to cancel.

Fetch summary data:

gh pr view $PR_NUMBER --json title,additions,deletions,changedFiles \
  --jq '{title: .title, additions: .additions, deletions: .deletions, files: .changedFiles}'

• User says merge → gh pr merge $PR_NUMBER --squash → output ✅ PR #$PR_NUMBER merged.
• User says abort → exit, output PR URL

ScheduleWakeup Integration

This skill uses /loop dynamic mode for CI waiting. Each ScheduleWakeup call:

ScheduleWakeup(
  delaySeconds: 270,
  reason: "waiting for CI on PR #$PR_NUMBER (check N)",
  prompt: "/pr-ship $PR_NUMBER"
)

Interval: 270s uniformly (under 5-min prompt cache TTL).

When to call ScheduleWakeup:

• CI is still running (QUEUED/IN_PROGRESS)
• Just approved a workflow run
• Just pushed a CI fix
• Just pushed a pr-fix commit

When NOT to call ScheduleWakeup:

• CI has completed (pass or fail with actionable errors)
• During review (Phase 2) or fix (Phase 3) execution
• After merge (Phase 4)

Mandatory Rules

• No AI signature - no Co-Authored-By, no Generated with in any commit or comment
• Retry limit = 3 - hard cap, shared between CI fixes and review fixes
• Fix scope discipline - CI fixes target only CI-reported errors; review fixes go through pr-fix
• No label pollution - pr-ship does not set any bot:* labels
• ScheduleWakeup only for CI wait - never during review or fix execution
• REPO detection at runtime - gh repo view --json nameWithOwner --jq '.nameWithOwner'
• Worktree path - always /tmp/wayland-ship-<PR_NUMBER> (distinct from pr-automation's /tmp/wayland-pr-* and pr-verify's /tmp/wayland-verify-*)
• Worktree cleanup - always remove worktree after CI fix, even on failure

Quick Reference

0. Parse args: pr_number? --no-auto-merge?
1. Phase 0: /oss-pr (skip if pr_number given)
2. Phase 1: CI wait loop
   - check statusCheckRollup
   - passing -> Phase 2
   - running -> ScheduleWakeup 270s
   - not triggered -> approve workflow + ScheduleWakeup 270s
   - failed -> retry_count < 3? fix + push + ScheduleWakeup 270s : abort
3. Phase 2: /pr-review (interactive)
   - APPROVED -> Phase 4
   - CONDITIONAL/REJECTED -> Phase 3
4. Phase 3: /pr-fix (interactive)
   - pushed -> retry_count++, back to Phase 1
   - aborted -> ask user
5. Phase 4: merge
   - default: gh pr merge --squash --auto
   - --no-auto-merge: confirm then gh pr merge --squash