name: gsd-pr-branch description: "Create a clean PR branch by filtering out .planning/ commits — ready for code review" argument-hint: "[target branch, default: main]" allowed-tools:

• Bash
• Read
• AskUserQuestion

This solves the problem of PR diffs being cluttered with PLAN.md, SUMMARY.md, STATE.md changes that are irrelevant to code review. </objective>

Uses git cherry-pick with path filtering to rebuild a clean history. </purpose>

CURRENT_BRANCH=$(git branch --show-current)
TARGET=${1:-main}

Check preconditions:

• Must be on a feature branch (not main/master)
• Must have commits ahead of target

AHEAD=$(git rev-list --count "$TARGET".."$CURRENT_BRANCH" 2>/dev/null)
if [ "$AHEAD" = "0" ]; then
  echo "No commits ahead of $TARGET — nothing to filter."
  exit 0
fi

Display:

━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 GSD ► PR BRANCH
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

Branch: {CURRENT_BRANCH}
Target: {TARGET}
Commits: {AHEAD} ahead

# Get all commits ahead of target
git log --oneline "$TARGET".."$CURRENT_BRANCH" --no-merges

For each commit, check if it ONLY touches .planning/ files:

# For each commit hash
FILES=$(git diff-tree --no-commit-id --name-only -r $HASH)
ALL_PLANNING=$(echo "$FILES" | grep -v "^\.planning/" | wc -l)

Classify:

• Code commits: Touch at least one non-.planning/ file → INCLUDE
• Planning-only commits: Touch only .planning/ files → EXCLUDE
• Mixed commits: Touch both → INCLUDE (planning changes come along)

Display analysis:

Commits to include: {N} (code changes)
Commits to exclude: {N} (planning-only)
Mixed commits: {N} (code + planning — included)

Create PR branch from target

git checkout -b "$PR_BRANCH" "$TARGET"

Cherry-pick only code commits (in order):

```bash
for HASH in $CODE_COMMITS; do
  git cherry-pick "$HASH" --no-commit
  # Remove any .planning/ files that came along in mixed commits
  git rm -r --cached .planning/ 2>/dev/null || true
  git commit -C "$HASH"
done

Return to original branch:

git checkout "$CURRENT_BRANCH"

Display results:

✅ PR branch created: {PR_BRANCH}

Original: {AHEAD} commits, {ORIGINAL_FILES} files
PR branch: {PR_COMMITS} commits, {TOTAL_FILES} files
Planning files: {PLANNING_FILES} (should be 0)

Next steps:
  git push origin {PR_BRANCH}
  gh pr create --base {TARGET} --head {PR_BRANCH}

Or use /gsd-ship to create the PR automatically.

<success_criteria>

• PR branch created from target
• Planning-only commits excluded
• No .planning/ files in PR branch diff
• Commit messages preserved from original
• User shown next steps </success_criteria>