chore(commands): improve commit/ship workflow documentation

- Add confirmation step to /commit before staging changes
- Reorder /ship to sync with base branch before validation
- Delegate /ship commit step to /commit for consistency
- Optimize CI polling with 3-min initial wait

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: joshsmithxrm

.claude/commands/commit.md

@@ -18,7 +18,23 @@ Create recovery checkpoints during long work sessions. Unlike `/ship`, this:
 
 ## Process
 
-### 1. Detect Current Phase
+### 1. Acknowledge Uncommitted Changes
+
+Before committing, list what will be included:
+
+```bash
+git status --short
+```
+
+**If changes exist:**
+1. Display the list of changed/new files
+2. Ask user to confirm: "Including these changes. Proceed? [Y/n]"
+3. If user declines, abort without changes
+
+**If no changes exist:**
+- Report "Nothing to commit" and exit
+
+### 2. Detect Current Phase
 
 Analyze the work context to determine phase:
 
@@ -28,13 +44,13 @@ Analyze the work context to determine phase:
 | Code changes, no test changes | `implementation` |
 | Test files changed | `testing` |
 
-### 2. Stage All Changes
+### 3. Stage All Changes
 
 ```bash
 git add -A
 ```
 
-### 3. Generate Commit Message
+### 4. Generate Commit Message
 
 Based on detected phase:
 
@@ -69,7 +85,7 @@ test(scope): add tests for feature
 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 ```
 
-### 4. Create Commit
+### 5. Create Commit
 
 ```bash
 git commit -m "$(cat <<'EOF'
@@ -83,8 +99,15 @@ EOF
 ```
 Commit
 ======
+Changes to include:
+  M  src/PPDS.Cli/Services/PluginService.cs
+  M  src/PPDS.Cli/Commands/PluginCommands.cs
+  A  tests/PPDS.Cli.Tests/PluginServiceTests.cs
+
+Including these changes. Proceed? [Y/n] y
+
 [✓] Phase detected: implementation
-[✓] Files staged: 5
+[✓] Files staged: 3
 [✓] Committed: feat(plugins): add registration service
 
 Checkpoint saved. Continue working or run /ship when ready.

.claude/commands/ship.md

@@ -13,15 +13,17 @@ Complete work: validate, commit, push, create PR, and handle CI/bot feedback aut
 ```
 /ship
     ↓
-Pre-PR Validation (absorbed from /pre-pr)
+Sync with base branch (rebase if needed)
     ↓
-Commit changes
+Pre-PR Validation (build & test)
+    ↓
+Commit changes (delegates to /commit)
     ↓
 Push to remote
     ↓
 Create PR
     ↓
-Wait for CI
+Wait for CI (3 min initial, then poll)
     ↓
 If CI fails: Debug and fix (up to 3 attempts)
     ↓
@@ -43,9 +45,31 @@ GITHUB_REPO=$(echo "$GITHUB_REMOTE" | sed -E 's#.*/([^/]+?)(\.git)?$#\1#')
 
 Use `$GITHUB_OWNER` and `$GITHUB_REPO` in all `gh api` calls instead of hardcoded values.
 
-### 1. Pre-PR Validation
+### 1. Sync with Base Branch
+
+Always sync before validation to ensure tests run against rebased code:
+
+```bash
+git fetch origin
+BEHIND=$(git rev-list --count HEAD..origin/main)
+
+if [ "$BEHIND" -gt 0 ]; then
+  # Check for commits already in main (stale branch scenario)
+  UNIQUE=$(git log --oneline origin/main..HEAD --cherry-pick --right-only 2>/dev/null | wc -l)
+  TOTAL=$(git rev-list --count origin/main..HEAD)
+
+  if [ "$UNIQUE" -lt "$TOTAL" ]; then
+    echo "Branch has $(($TOTAL - $UNIQUE)) commits already in main, auto-resolving..."
+  fi
+
+  # Use -X theirs to auto-resolve when commits match main
+  git rebase -X theirs origin/main
+fi
+```
+
+### 2. Pre-PR Validation
 
-Run all validation checks before creating the PR:
+Run all validation checks on rebased code:
 
 **Build & Test:**
 ```bash
@@ -66,36 +90,18 @@ git rm .claude/design.md 2>/dev/null || true
 git rm docs/tui/POLISH_TRACKER.md 2>/dev/null || true
 ```
 
-### 1b. Sync with Base Branch (BEFORE push)
+### 3. Commit (if needed)
 
-Always rebase before pushing to ensure bot reviewers see only your actual changes:
+If uncommitted changes exist, delegate to `/commit`:
 
-```bash
-git fetch origin
-BEHIND=$(git rev-list --count HEAD..origin/main)
+1. Run `/commit` which will:
+   - List changed files and ask user to confirm
+   - Detect phase and generate appropriate commit message
+   - Create the commit with `Co-Authored-By` trailer
 
-if [ "$BEHIND" -gt 0 ]; then
-  # Check for commits already in main (stale branch scenario)
-  UNIQUE=$(git log --oneline origin/main..HEAD --cherry-pick --right-only 2>/dev/null | wc -l)
-  TOTAL=$(git rev-list --count origin/main..HEAD)
+See `/commit` command for full behavior.
 
-  if [ "$UNIQUE" -lt "$TOTAL" ]; then
-    echo "Branch has $(($TOTAL - $UNIQUE)) commits already in main, auto-resolving..."
-  fi
-
-  # Use -X theirs to auto-resolve when commits match main
-  git rebase -X theirs origin/main
-fi
-```
-
-### 2. Commit (if needed)
-
-If uncommitted changes exist:
-1. Stage all: `git add -A`
-2. Generate conventional commit message
-3. Commit with `Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>`
-
-### 3. Push (if needed)
+### 4. Push (if needed)
 
 ```bash
 git push -u origin "$(git rev-parse --abbrev-ref HEAD)"
@@ -106,7 +112,7 @@ If `--amend` was used:
 git push --force-with-lease
 ```
 
-### 4. Create PR (if none exists)
+### 5. Create PR (if none exists)
 
 ```bash
 gh pr create --title "PR title" --body "$(cat <<'EOF'
@@ -124,7 +130,7 @@ EOF
 )"
 ```
 
-### 5. Wait for Required CI Checks
+### 6. Wait for Required CI Checks
 
 After PR creation, poll only REQUIRED checks (don't wait for optional ones):
 
@@ -140,23 +146,32 @@ After PR creation, poll only REQUIRED checks (don't wait for optional ones):
 - `claude`, `claude-review` - optional AI review
 - `codecov/*` - informational coverage
 
-**Polling approach:**
+**Polling approach (optimized for context efficiency):**
+
+1. Wait 3 minutes after PR creation (CI needs time to start)
+2. Poll once for required checks
+3. If all passed → proceed to bot review
+4. If still running → wait 2 more minutes, poll again
+5. If failed → start autonomous fix (step 8)
+
 ```bash
 # Get SHA of PR head commit (use gh CLI's built-in --jq, NOT external jq)
 SHA=$(gh pr view {pr} --json headRefOid --jq '.headRefOid')
 
-# Poll required checks every 30 seconds until all complete
-# Use $GITHUB_OWNER and $GITHUB_REPO from step 0
+# Initial 3-minute wait
+sleep 180
+
+# Poll required checks
 gh api repos/$GITHUB_OWNER/$GITHUB_REPO/commits/$SHA/check-runs \
   --jq '.check_runs[] | select(.name | test("^(build|test|extension|Analyze|CodeQL|dependency)"))
         | {name: .name, status: .status, conclusion: .conclusion}'
 ```
 
 **Important:** Do NOT use `gh pr checks --watch` - it waits for ALL checks including optional ones.
 
-**Timeout:** If required checks don't complete within 15 minutes, update session status to `Shipping` and continue to bot review phase.
+**Timeout:** If required checks don't complete after 2 poll cycles (~7 minutes), update session status to `Shipping` and continue to bot review phase.
 
-### 5b. Wait for Bot Reviews (parallel to CI)
+### 6b. Wait for Bot Reviews (parallel to CI)
 
 Bot reviews can complete before or after CI. Check for them independently:
 
@@ -180,7 +195,7 @@ gh api "repos/$GITHUB_OWNER/$GITHUB_REPO/code-scanning/alerts?ref=refs/pull/{pr}
 
 Update session status to `ReviewsInProgress` once at least one bot has commented.
 
-### 6. Enumerate ALL Bot Reviewers
+### 7. Enumerate ALL Bot Reviewers
 
 **CRITICAL: Before addressing ANY comments, enumerate all reviewers:**
 
@@ -221,7 +236,7 @@ gh api repos/$GITHUB_OWNER/$GITHUB_REPO/pulls/{pr}/comments \
 2. If bot comments reference files not in your diff, they may be stale (rebase should fix this)
 3. If you rebased, bots will re-review the updated PR
 
-### 7. Handle CI Failures
+### 8. Handle CI Failures
 
 **If CI fails (up to 3 attempts):**
 
@@ -243,9 +258,9 @@ gh run view [run-id] --log-failed
 
 After 3 failed attempts, update session status to `stuck` and escalate.
 
-### 8. Address Bot Comments
+### 9. Address Bot Comments
 
-Using the comments enumerated in step 6, for each finding determine verdict:
+Using the comments enumerated in step 7, for each finding determine verdict:
 
 | Verdict | Action |
 |---------|--------|
@@ -276,7 +291,7 @@ gh pr comment {pr} --body "Addressed bot feedback: ..."
 gh api graphql -f query='mutation { resolveReviewThread(input: {threadId: "ID"}) { thread { isResolved } } }'
 ```
 
-### 9. Update Session Status
+### 10. Update Session Status
 
 After all checks pass: