/ship

/ship — Autonomous PR Lifecycle

Take the current branch from wherever it is to merged. Idempotent — detect current state and resume from there. Run /ship as many times as needed; it always picks up where it left off.

Do the work. Don't describe a checklist — execute each phase, capture evidence, and report terse status updates.

Step 0: Detect State & Resume

Before running any phase, figure out where we are:

BRANCH = git rev-parse --abbrev-ref HEAD
PR_EXISTS = gh pr view --json number,url,isDraft,title,body,state,mergeStateStatus,headRefOid 2>/dev/null

Route to the right phase:

1. Already merged (PR_EXISTS.state == MERGED) → Report: Already merged. Done.
2. In merge queue (PR_EXISTS.mergeStateStatus == BEHIND or auto-merge is enabled) → skip to Phase 3.3 (monitor queue).
3. PR exists, checks running/passed, no unresolved Greptile comments → skip to Phase 3.
4. PR exists, has unresolved Greptile comments → skip to Phase 2 (read existing review, fix remaining comments).
5. PR exists but no Greptile review yet → skip to Phase 2.1 (wait for/trigger review).
6. Branch pushed but no PR → skip to Phase 1 (create PR).
7. Branch not pushed → start from Phase 1 (push + create PR).

To detect Greptile state: call list_merge_request_comments with greptileGenerated: true, addressed: false. If comments exist, there's unresolved review work.

To detect auto-merge: gh pr view --json autoMergeRequest -q .autoMergeRequest. Non-null means auto-merge is enabled (we're queued or waiting for checks).

Report: Resuming from Phase <N>. (or Starting fresh. if no prior state)

Preflight Gates

Verify ALL of these. If any fail, STOP with the exact reason.

1. Current branch is NOT main or master.
2. Working tree is clean (git status --porcelain is empty). If non-empty, STOP: "Dirty worktree. Commit or stash changes first."
3. GitHub CLI authenticated: gh auth status.
4. Branch name does not contain WIP, wip, draft, or DRAFT.
5. Greptile MCP tools available: probe with list_pull_requests (limit 1). If the tool errors, STOP: "Greptile MCP tools unavailable."

Report: Preflight: OK

Phase 1: PR Setup

1. Push the branch:

   git push -u origin HEAD
   

2. Check for existing PR:

   gh pr view --json number,url,isDraft,title,body,headRefOid
   

   • No PR exists → create one: gh pr create --fill
   • PR is draft → mark ready: gh pr ready
   • PR title or body contains WIP/wip/draft/DRAFT → STOP: "PR marked as WIP/draft. Not ready to ship."

3. Record PR_NUMBER, PR_URL, and HEAD_SHA.

4. Extract repo owner/name: gh repo view --json nameWithOwner -q .nameWithOwner

Report: Phase 1: PR #<N> created/found (<URL>)

Phase 2: Greptile Review Loop

Set ITERATION = 0, MAX_ITERATIONS = 5.

Loop start

ITERATION += 1. If ITERATION > MAX_ITERATIONS:

• If score < 4/5 or unresolved > 0 → STOP: "Greptile non-convergence after 5 iterations (score X/5, N unresolved)." List remaining comment URLs. Do NOT proceed to Phase 3.
• If score >= 4/5 and unresolved == 0 → proceed to Phase 3.

2.1 Wait for fresh review

Record HEAD_SHA via git rev-parse HEAD.

Poll for the latest completed review:

• Call list_code_reviews with the PR number, status COMPLETED, limit 1.
• If the review's completedAt is AFTER the push, proceed.
• Otherwise wait 20 seconds and poll again.
• Timeout after 5 minutes → try trigger_code_review once, then poll another 5 minutes.
• If still no fresh review after 10 minutes → STOP: "Greptile review timeout."

On resume: If there's already a completed review newer than HEAD_SHA, skip waiting and read it directly.

2.2 Read the review

1. PR description: gh pr view --json body -q .body — Greptile writes its summary and score here (if shouldUpdateDescription is enabled in greptile.json).
2. Review body: get_code_review with the review ID → get score.
3. Unresolved comments: list_merge_request_comments with greptileGenerated: true, addressed: false.

Report: Phase 2: Greptile review (iteration <N>/5) — Score X/5, N unresolved comments.

2.3 Check exit conditions

• Score >= 4/5 AND 0 unresolved → proceed to Phase 3.
• Human reviewer requested changes (gh pr view --json reviewDecision -q .reviewDecision returns CHANGES_REQUESTED from a non-bot) → STOP: "Human reviewer requested changes."
• Otherwise continue fixing.

2.4 Fix comments

For each actionable unresolved Greptile comment:

1. Read the comment (file, line, suggestion).
2. Fix the code.
3. Reply with a terse, human-sounding response (2-6 words, no AI-speak):

   gh api repos/{owner}/{repo}/pulls/{pr}/comments/{comment_id}/replies -f body="<terse reply>"
   

   Good: "done", "moved to a const", "added guard clause", "yep good catch" Bad: "Fixed: extracted to a named constant", "Great suggestion! I've updated the code to..."
4. Resolve the thread:

   gh api repos/{owner}/{repo}/pulls/{pr}/comments/{comment_id} --jq .node_id
   gh api graphql -f query='mutation { resolveReviewThread(input: {threadId: "<thread_node_id>"}) { thread { isResolved } } }'
   

If you disagree with a comment or it needs human judgment, reply with why (still terse) and leave it unresolved.

2.5 Commit and push

Stage changed files (never stage .env, credentials, or secrets). Commit with a message describing what changed. Push.

Update HEAD_SHA = git rev-parse HEAD.

Report: Phase 2: Fixed N comments, resolved threads. Pushed.

Go back to Loop start.

Phase 3: Merge via Queue

3.1 Wait for PR checks

On resume: If auto-merge is already enabled, skip to 3.3.

gh pr checks --watch

If any check fails → STOP: "PR check failure: ." Include the failing output.

Report: Phase 3: PR checks passed.

3.2 Enable auto-merge

gh pr merge --auto --squash --delete-branch

If the repo uses a merge queue, this enters it. If not, this waits for required checks then merges.

Report: Phase 3: Auto-merge enabled.

3.3 Monitor merge

Poll every 60 seconds:

gh pr view --json state,mergeStateStatus -q '.state + " " + .mergeStateStatus'

• state == MERGED → report success, done.
• state == OPEN (removed from queue or checks failed):
  1. Inspect failing checks:

     gh pr checks --json name,state,conclusion
     

  2. Classify the failure:
     • Deterministic failures (lint, typecheck, unit tests, build) → STOP: "Check failure: ."
     • Non-deterministic failures (test names containing "sim", "integration", "e2e", or "flaky"; or any test job that previously passed on the same commit) → requeue candidate.
  3. If requeue candidate:
     • REQUEUE_COUNT += 1. If REQUEUE_COUNT > 2 → STOP: "Persistent test failure after 2 requeues."
     • Re-enable auto-merge:

       gh pr merge --auto --squash --delete-branch
       

     • Report: Phase 3: Non-deterministic test failure. Requeue <N>/2.
  4. If ambiguous → STOP: "Merge failure — . Unable to classify as flaky or real." (Fail closed.)

3.4 Done

Report: Phase 3: Merged PR #<N>. Branch deleted.

STOP Conditions (never merge)

Condition	Phase	Message
Default branch	Preflight	"Cannot ship from main/master."
Dirty worktree	Preflight	"Dirty worktree. Commit or stash."
WIP/draft in branch name	Preflight	"Branch name contains WIP/draft."
WIP/draft in PR title/body	Phase 1	"PR marked as WIP/draft."
gh auth fails	Preflight	"GitHub CLI not authenticated."
Greptile tools unavailable	Preflight	"Greptile MCP tools unavailable."
Human requested changes	Phase 2	"Human reviewer requested changes."
Greptile non-convergence	Phase 2	"Non-convergence after 5 iterations."
Greptile review timeout	Phase 2	"Greptile review timeout (10 min)."
PR check failure	Phase 3	"Check failure: ."
Ambiguous merge failure	Phase 3	"Merge failure: . Unable to classify."
2 requeues exhausted	Phase 3	"Persistent test failure after 2 requeues."
Merge conflicts	Any	"Merge conflicts detected."

Output Style

Terse. One line per phase transition. No walls of text. Examples:

First run:

Preflight: OK
Starting fresh.
Phase 1: PR #745 created (https://github.com/org/repo/pull/745)
Phase 2: Greptile review (iteration 1/5) — Score 3/5, 4 unresolved.
Phase 2: Fixed 3 comments, resolved threads. 1 left (style preference, disagree). Pushed.
Phase 2: Greptile review (iteration 2/5) — Score 5/5, 0 unresolved. Proceeding.
Phase 3: PR checks passed. Auto-merge enabled.
Phase 3: Merged PR #745. Branch deleted.

Resume after a previous stop:

Preflight: OK
Resuming from Phase 2. PR #745 exists, 2 unresolved Greptile comments.
Phase 2: Fixed 2 comments, resolved threads. Pushed.
Phase 2: Score 5/5, 0 unresolved. Proceeding.
Phase 3: Merged PR #745. Branch deleted.

Resume when already queued:

Preflight: OK
Resuming from Phase 3.3. PR #745 auto-merge enabled.
Phase 3: Merged PR #745. Branch deleted.