Split and Ship
Ship an approved split plan as separate branches, commits, and PRs.
Context
A split plan must exist in the conversation. The plan specifies an ordered list of groups, each with a name, file list, and branch topology (stacked or independent).
Step 1: Prepare Working Tree
- Detect the default branch:
gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'
- Check the current branch and whether a PR already exists for it using
gh pr view
- Save all staged changes, then unstage everything (
git reset)
- Stash all changes including untracked files (
git stash --include-untracked) so files can be selectively restored per group
Verify git stash list shows the saved changes before proceeding.
Step 2: Ship Each Group
Use TaskCreate to create a task for each group. Process groups in order.
For each group:
- Determine branch: If the current branch already has a PR and this group's changes align with the PR's purpose, stay on the current branch. Otherwise, use
AskUserQuestion to confirm the proposed branch name and create it from the appropriate base:
- Independent group: branch from the default branch
- Stacked group: branch from the previous group's branch
- Restore and stage this group's files from the stash (
git checkout stash -- <files> restores and stages in one operation). For files with hunks belonging to different groups, restore the file, then use Edit to remove the hunks that belong to later groups before staging. After committing, reset the working tree (git checkout -- .) to clean up before the next group.
- Commit and push: run the
/commit-rules skill to load commit message rules, commit the staged changes following them, then git push
- Create or update PR:
- Staying on existing branch with a PR: run the
/update-pr skill
- New branch: run the
/create-pr skill targeting the appropriate base (default branch for independent groups, previous group's branch for stacked groups)
Step 3: Clean Up and Summarize
- Drop the stash
- Check out the last created branch
- Output a summary table: group name, branch, PR URL, and base branch
Then use the TaskList tool and proceed to any remaining task.
Rules
- Run the
/commit-rules skill before every commit; do not commit without loading it first.
- Never lose uncommitted work. If any step fails (commit hook, push, PR creation), stop and report the failure, which groups have been shipped, and that the stash still contains all changes for recovery.
- Stacked PRs target the previous group's branch. Independent PRs target the default branch.
- For stacked groups, the PR description should note the dependency chain.
- Don't reference
.turbo/ content (filenames, IDs, headings) in branch names. .turbo/ is gitignored, so these references would be opaque to anyone reading without local copies.
1---2name: split-and-ship-23description: Execute an approved split plan by creating separate branches, commits, and PRs for each change group. Use when the user asks to "split and ship", "ship the split plan", "create separate PRs", or "split changes into branches".4---56# Split and Ship78Ship an approved split plan as separate branches, commits, and PRs.910## Context1112A split plan must exist in the conversation. The plan specifies an ordered list of groups, each with a name, file list, and branch topology (stacked or independent).1314## Step 1: Prepare Working Tree15161. Detect the default branch: `gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'`172. Check the current branch and whether a PR already exists for it using `gh pr view`183. Save all staged changes, then unstage everything (`git reset`)194. Stash all changes including untracked files (`git stash --include-untracked`) so files can be selectively restored per group2021Verify `git stash list` shows the saved changes before proceeding.2223## Step 2: Ship Each Group2425Use `TaskCreate` to create a task for each group. Process groups in order.2627For each group:28291. **Determine branch**: If the current branch already has a PR and this group's changes align with the PR's purpose, stay on the current branch. Otherwise, use `AskUserQuestion` to confirm the proposed branch name and create it from the appropriate base:30 - Independent group: branch from the default branch31 - Stacked group: branch from the previous group's branch322. **Restore and stage** this group's files from the stash (`git checkout stash -- <files>` restores and stages in one operation). For files with hunks belonging to different groups, restore the file, then use Edit to remove the hunks that belong to later groups before staging. After committing, reset the working tree (`git checkout -- .`) to clean up before the next group.333. **Commit and push**: run the `/commit-rules` skill to load commit message rules, commit the staged changes following them, then `git push`344. **Create or update PR**:35 - Staying on existing branch with a PR: run the `/update-pr` skill36 - New branch: run the `/create-pr` skill targeting the appropriate base (default branch for independent groups, previous group's branch for stacked groups)3738## Step 3: Clean Up and Summarize39401. Drop the stash412. Check out the last created branch423. Output a summary table: group name, branch, PR URL, and base branch4344Then use the TaskList tool and proceed to any remaining task.4546## Rules4748- Run the `/commit-rules` skill before every commit; do not commit without loading it first.49- Never lose uncommitted work. If any step fails (commit hook, push, PR creation), stop and report the failure, which groups have been shipped, and that the stash still contains all changes for recovery.50- Stacked PRs target the previous group's branch. Independent PRs target the default branch.51- For stacked groups, the PR description should note the dependency chain.52- Don't reference `.turbo/` content (filenames, IDs, headings) in branch names. `.turbo/` is gitignored, so these references would be opaque to anyone reading without local copies.
majiayu000