Ship

Ship Pipeline

Run the full review-fix-improve-fix-merge pipeline to ship the current branch.

Arguments

• $ARGUMENTS - Optional: flags to customize the pipeline (e.g., "skip-improve" to skip the improve phase)

Context

• Current branch: !git branch --show-current
• Base ref: !git branch -r 2>/dev/null | grep -oE 'origin/(main|master)' | head -1
• Git status: !git status --short
• Changes vs main: !git diff --stat origin/main...HEAD 2>/dev/null | head -50
• Changes vs master: !git diff --stat origin/master...HEAD 2>/dev/null | head -50

Overview

You orchestrate a 6-phase pipeline to take the current branch from "done coding" to "merged into master." Each phase must complete before advancing to the next.

Phases: 0. Commit — commit any uncommitted changes so downstream phases see them

1. Review — run /review to get findings
2. Address review — fix blocking issues and warnings
3. Improve — analyze session for learnings and fix gaps (inline, not via /improve)
4. Address improvements — apply approved improvements
5. Merge — run /merge to land the branch 5b. Switch worktree to default branch — hygiene step so follow-up work starts from the new tip

If any phase has nothing to do (no findings, no improvements), skip it and move on.

Continue Protocol

All phases must execute in a single unbroken sequence. After any sub-skill returns (/review, /merge) or any inline analysis completes, immediately proceed to the next phase. Never treat a sub-skill return or analysis report as the end of your task. The pipeline is only complete after Phase 5b finishes or an abort condition is hit.

Phase 0: Commit Uncommitted Changes

First, git fetch origin <default-branch> (the branch found in "Base ref" above). The BEHIND/diverged detection below reads local knowledge of origin/master (git status, git log HEAD..origin/master) — if that ref hasn't been fetched recently, a remote that has moved on looks identical to "up to date," and the gap surfaces later as confusing failures (e.g. lint-pr/pre-pr failing on files this branch never touched, because --new-from-rev=origin/master diffed against a stale local ref) instead of being caught here where it's cheap to fix. This is a plain fetch, not a merge/rebase — it only updates remote-tracking refs, so it's always safe to run even mid-pipeline.

Before running review, ensure all changes are committed. The review phase uses git diff origin/master...HEAD which only sees committed changes — uncommitted work would be invisible to the reviewer.

Check git status --short. If there are staged or unstaged changes to tracked files (or untracked files that are clearly part of the work):

1. Stage the relevant changes: git add the modified/new files
2. Craft a concise commit message summarizing the changes
3. Commit

This applies whether or not the branch already has commits ahead of master. If there are no existing commits ahead of master but the working tree has uncommitted work, this phase produces the first commit — do not abort. The "no changes on branch" abort only fires when both the commit history AND the working tree are empty (checked after this phase runs).

If there are uncommitted changes AND existing commits ahead of master, commit the uncommitted changes as a separate commit to preserve the existing commit history.

If the branch is BEHIND origin/master (check git status output for "Your branch is behind 'origin/master' by N commits"), fast-forward first or the review will diff against a stale base. With uncommitted changes that overlap incoming files:

1. git stash push -u -m "ship phase 0" to set the work aside
2. git pull --ff-only to advance to origin/master
3. git stash pop and resolve any conflicts (the pull may have moved code under your edits)
4. make test (or project equivalent) to confirm the resolved tree is sane
5. Stage + commit as one feature commit

If pull --ff-only fails because the branch has diverged (commits ahead AND behind), check whether the divergence is the post-squash-merge pattern: the branch has commits that were already squash-merged into master in a previous /ship. Detect this by comparing git log --oneline origin/master..HEAD against the most recent merge commit on master — if the local commit subjects match content that's already squash-landed, the resolution is to git reset --hard origin/master && git cherry-pick <new-commits> to drop the already-applied originals and keep only the new work. The local commits aren't lost (they remain on the remote feature branch), and a plain git rebase origin/master will conflict because the squashed master commit doesn't apply cleanly to the unmodified branch base. Confirm the reset+cherry-pick plan with the user before running it (it's destructive on local refs even though nothing is actually lost). For non-squash-merge divergence (true forking history), still stop and ask — don't auto-rebase.

If the working tree is clean, skip this phase.

Print:

Phase 0: committed uncommitted changes. (or "Phase 0: working tree clean — skipped.")

Phase 1: Review

Invoke the /review skill to analyze the current branch changes. Wait for the full report.

Even if /rereview ran recently, still run /review. The two skills use different prompts and surface different patterns: /rereview is depth-first with three independent reviewers and tends to catch security and regression risks; /review is breadth-first and tends to catch consistency and asymmetry issues that depth-first review misses. They are complementary, not redundant. Do not skip Phase 1 just because /rereview was clean. Phase 2 acts on /review's findings only — any prior /rereview output is informational background, not a substitute for this phase's input.

If the review returns no blocking issues, no warnings, and no suggestions, print:

Review clean — skipping to Phase 3.

And skip directly to Phase 3.

Phase 2: Address Review Findings

Work through the review report systematically:

2a: Fix BLOCKING issues

For each blocking issue in the review report:

1. Read the referenced file and understand the issue
2. Make the minimal fix
3. Commit with a message describing the fix

If there are no blocking issues, skip to 2b.

2b: Fix WARNING issues

For each warning in the review report:

1. Read the referenced file and understand the warning
2. Make the minimal fix and commit
3. Do NOT skip warnings — treat every warning as actionable and fix it

2c: Fix SUGGESTION / INFO issues

For each suggestion or INFO-level finding in the review report:

1. Read the referenced file and understand the suggestion
2. Apply the improvement and commit
3. Do NOT skip suggestions — apply all of them

2d: Verify fixes

After addressing all findings (blocking, warnings, and suggestions), run the full project quality gate (not just unit tests) to confirm nothing broke — for a Go project with a pre-pr-style make target, run the full gate (build/vet/fmt/lint/coverage), not just go test, since lint and coverage gates catch issues tests don't:

• Detect test runner/gate from project type (go.mod, package.json, Gemfile, Cargo.toml, pyproject.toml)
• Run it
• If it fails on a file this session never touched, don't assume a regression from your own fix — re-fetch origin/<default-branch> and check whether the branch has fallen behind (see Phase 0's fetch step); a stale local origin/master ref makes a lint/coverage gate diff against the wrong base and surfaces pre-existing issues as if they were new. Rebase onto the fresh base and re-run before diagnosing further.
• If it fails for a real reason, diagnose and fix before proceeding

Print a summary of what was addressed:

Phase 2 complete: fixed N blocking issues, N warnings, N suggestions. Tests passing.

Phase 3: Improve

Check if $ARGUMENTS contains "skip-improve". If so, skip to Phase 5.

PIPELINE CONTINUATION RULE: You are mid-pipeline. After the improve analysis completes, you MUST continue to Phase 4 and Phase 5. Do NOT stop, summarize, or wait for user input. The /ship pipeline is not complete until Phase 5 finishes.

Run the improve analysis inline using these abbreviated steps (do NOT invoke /improve as a separate skill):

1. Scan the conversation for skills that were used and any friction points encountered
2. For each skill with issues, check if it is local (inside this worktree) or external (generate a handoff prompt)
3. Auto-apply all local skill improvements, codebase gap fixes, and agent guidance updates without asking
4. Commit applied changes with descriptive messages
5. Print external handoff prompts for the user (if any)
6. Skip knowledge capture, voice profile, and new skill proposals — these are not needed in the ship pipeline

Print:

Phase 3 complete: analyzed session, applied N improvements, N handoff prompts generated.

Immediately continue to Phase 4.

Phase 4: Address Improvements

If Phase 3 produced code changes:

1. Verify the changes compile/pass tests
2. Commit any uncommitted improvement changes with descriptive messages

If Phase 3 produced no code changes, skip this phase.

Print:

Phase 4 complete: applied N improvements. Tests passing.

Phase 5: Merge

Invoke the /merge skill to land the branch into master.

Handle merge script exit codes as documented in the /merge skill (conflicts, nothing to merge, review blocked, errors).

If CI fails on tests unrelated to your PR, fix them inline as part of /ship rather than rebasing or treating the merge as blocked. Pre-existing flakes (timing-sensitive tests, data races on shared mutable state, environment-dependent assertions) are normal during a /ship cycle on a project with sparse CI history. Capture each fix as its own commit with a message that names the flake and the cause (e.g., "fix flaky-test sleep timing on slower CI" or "fix data race on shared buffer under -race") so the rationale stays clear in history. Then re-run /merge.

Phase 5b: Switch worktree to default branch

After /merge returns success, ensure the worktree is on the default branch so any follow-up work (or any other agent invoked next in this worktree) starts from the new tip rather than the squashed-out feature branch. This is belt-and-suspenders alongside /merge's own auto-switch — if /merge already switched (default for squash), this is a no-op; if the user passed --keep-branch or used --method rebase/--method merge, this still rescues the follow-up agent path.

Detect the default branch and switch. This is a simplified probe that only recognizes main / master — /merge itself uses the GitHub API (gh api repos/<slug>) for canonical detection and handles repos with non-standard default names. If your repo's default is something else (e.g., trunk), /merge's own auto-switch already handled it and this phase is a no-op; skip Phase 5b for those repos rather than relying on the fallback below.

DEFAULT_BRANCH=$(git branch -r 2>/dev/null | grep -oE 'origin/(main|master)' | head -1 | sed 's|origin/||')
[ -z "$DEFAULT_BRANCH" ] && DEFAULT_BRANCH="master"
git checkout "$DEFAULT_BRANCH" 2>/dev/null && git pull --ff-only origin "$DEFAULT_BRANCH"

If the checkout fails (uncommitted changes, no local default-branch ref, another worktree owns it, etc.), warn but do not abort — the pipeline is complete; this is hygiene. Print the current branch and a one-line note that follow-up work in this worktree should git checkout "$DEFAULT_BRANCH" (or git reset --hard origin/"$DEFAULT_BRANCH") before committing.

Abort Conditions

• No changes on branch: Only after Phase 0 completes, if there are still no commits ahead of master and no uncommitted changes, stop immediately: "Nothing to ship — no changes on this branch." Uncommitted changes on their own are NOT an abort condition — Phase 0 commits them.
• Tests fail after 3 fix attempts: Stop and report: "Tests are failing after 3 fix attempts. Manual intervention needed."
• Merge blocked by required review: Report the PR URL and stop: "PR requires review approval before merging."

Summary Format

After the pipeline completes (or aborts), print:

# Ship Summary: {branch name}

| Phase | Status | Details |
|-------|--------|---------|
| Commit | {done/skipped} | {committed N files / working tree clean} |
| Review | {done/skipped} | {N blocking, N warnings, N suggestions found} |
| Address Review | {done/skipped} | {N blocking fixed, N warnings fixed, N suggestions applied} |
| Improve | {done/skipped} | {N improvements applied} |
| Address Improvements | {done/skipped} | {N commits} |
| Merge | {done/blocked/failed} | {PR URL or error} |
| Switch Worktree | {done/skipped/warned} | {current branch after switch, or warning} |