c41a9f5908
Three commands reimplemented from positively-received community PRs: 1. /gsd:review (#925) — Cross-AI peer review Invoke external AI CLIs (Gemini, Claude, Codex) to independently review phase plans. Produces REVIEWS.md with per-reviewer feedback and consensus summary. Feed back into planning via --reviews flag. Multiple users praised the adversarial review concept. 2. /gsd:plant-seed (#456) — Forward-looking idea capture Capture ideas with trigger conditions that auto-surface during /gsd:new-milestone. Seeds preserve WHY, WHEN to surface, and breadcrumbs to related code. Better than deferred items because triggers are checked, not forgotten. 3. /gsd:pr-branch (#470) — Clean PR branches Create a branch for pull requests by filtering out .planning/ commits. Classifies commits as code-only, planning-only, or mixed, then cherry-picks only code changes. Reviewers see clean diffs. All three are standalone command+workflow additions with no core code changes. Help workflow updated. Test skill counts updated. 797/797 tests pass.
3.2 KiB
3.2 KiB
Create a clean branch for pull requests by filtering out .planning/ commits.
The PR branch contains only code changes — reviewers don't see GSD artifacts
(PLAN.md, SUMMARY.md, STATE.md, CONTEXT.md, etc.).
Classify commits:
```bash
PR_BRANCH="${CURRENT_BRANCH}-pr"
```bash
# Verify no .planning/ files in PR branch
PLANNING_FILES=$(git diff --name-only "$TARGET".."$PR_BRANCH" | grep "^\.planning/" | wc -l)
TOTAL_FILES=$(git diff --name-only "$TARGET".."$PR_BRANCH" | wc -l)
PR_COMMITS=$(git rev-list --count "$TARGET".."$PR_BRANCH")
```
Uses git cherry-pick with path filtering to rebuild a clean history.
Parse `$ARGUMENTS` for target branch (default: `main`).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>