prjct-cli 0.22.0 → 0.23.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [0.23.0] - 2025-12-28
+
+### Feature: Branch + PR Workflow
+
+Integrated git branch management and PR-based shipping workflow.
+
+**Branch Management:**
+- `/p:now` auto-creates feature branches when on main/master
+- `/p:bug` auto-creates bug branches with proper naming
+- Handles uncommitted changes (stash/commit/abort prompts)
+- Tracks branch info in state.json
+
+**Protected Branch Validation:**
+- `/p:git` blocks commits/pushes to main/master
+- Validates current branch matches expected task branch
+- Clear error messages with recovery instructions
+
+**PR-Based Shipping (`/p:ship`):**
+- Creates PR via `gh` CLI instead of direct push
+- Generates PR description with quality metrics
+- Waits for CI checks (up to 10 min)
+- Records CI status (passed/failed/timeout)
+- Supports `--draft` flag for WIP PRs
+
+**Template Updates:**
+- `templates/commands/bug.md` - Branch creation + stashing
+- `templates/commands/git.md` - Protected branch checks
+- `templates/commands/now.md` - Feature branch workflow
+- `templates/commands/ship.md` - Full PR lifecycle
+
 ## [0.20.1] - 2025-12-26
 
 ### Refactor: Type Consolidation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prjct-cli",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "Built for Claude - Ship fast, track progress, stay focused. Developer momentum tool for indie hackers.",
   "main": "core/index.ts",
   "bin": {

package/templates/commands/bug.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: [Read, Write, Bash, Task, Glob]
+allowed-tools: [Read, Write, Bash, Task, Glob, AskUserQuestion]
 description: 'Report bug with auto-priority and auto-start'
 architecture: 'Write-Through (JSON → MD → Events)'
 storage-layer: true
@@ -129,6 +129,73 @@ GENERATE: {sessionId} = UUID v4
 bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(require('crypto').randomUUID())"
 ```
 
+### Step 5.5: Create Bug Branch
+
+#### Check Current Branch
+BASH: `git branch --show-current`
+SET: {currentBranch} = result
+
+IF {currentBranch} == "main" OR {currentBranch} == "master":
+  OUTPUT: "Creating bug branch..."
+
+  #### Handle Uncommitted Changes
+  BASH: `git status --porcelain`
+  SET: {hasChanges} = (result not empty)
+
+  IF {hasChanges}:
+    IF {severity} == "critical" OR {severity} == "high":
+      # Auto-stash for urgent bugs
+      BASH: `git stash push -m "prjct: stashed for urgent bug fix"`
+      SET: {stashedChanges} = true
+      OUTPUT: "Stashed changes for urgent bug fix"
+    ELSE:
+      USE AskUserQuestion:
+      ```
+      question: "Uncommitted changes detected. How to proceed?"
+      header: "Git Changes"
+      options:
+        - label: "Stash changes"
+          description: "Temporarily save changes, create branch, then continue"
+        - label: "Commit first"
+          description: "Commit current changes before switching"
+        - label: "Abort"
+          description: "Cancel and queue bug for later"
+      ```
+
+      IF choice == "Stash changes":
+        BASH: `git stash push -m "prjct: stashed for {description}"`
+        SET: {stashedChanges} = true
+      ELSE IF choice == "Commit first":
+        OUTPUT: "Commit your changes first, then run /p:bug again"
+        STOP
+      ELSE:
+        SET: {laterFlag} = true
+        SET: {autoStarted} = false
+        → Skip to Step 6
+
+  #### Create Bug Branch
+  SET: {bugSlug} = slugify({description})
+  LIMIT: {bugSlug} to 50 characters, lowercase, replace spaces with hyphens
+  SET: {branchName} = "bug/{bugSlug}"
+
+  BASH: `git checkout -b {branchName}`
+  IF command fails (branch exists):
+    BASH: `git checkout {branchName}`
+    IF still fails:
+      OUTPUT: "Failed to create/checkout branch: {branchName}"
+      SET: {laterFlag} = true
+      SET: {autoStarted} = false
+      → Skip to Step 6
+
+  SET: {branchCreated} = true
+  SET: {baseBranch} = {currentBranch}
+  OUTPUT: "✅ Created branch: {branchName}"
+
+ELSE:
+  SET: {branchName} = {currentBranch}
+  SET: {branchCreated} = false
+  SET: {baseBranch} = null
+
 ### Update state.json
 ```json
 {
@@ -139,7 +206,13 @@ bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(re
     "startedAt": "{now}",
     "sessionId": "{sessionId}",
     "type": "bug",
-    "priority": "{severity}"
+    "priority": "{severity}",
+    "branch": {
+      "name": "{branchName}",
+      "createdByPrjct": {branchCreated},
+      "baseBranch": "{baseBranch}",
+      "createdAt": "{now}"
+    }
   },
   "previousTask": {existing previousTask if any},
   "lastUpdated": "{now}"
@@ -156,6 +229,7 @@ WRITE: `{statePath}`
 Priority: {severity}
 Started: {now}
 Session: {sessionId}
+Branch: {branchName}
 ```
 WRITE: `{nowContextPath}`
 
@@ -221,7 +295,7 @@ ELSE:
 ```
 🐛 [{severity}] {description}
 
-Started working on fix
+Branch: {branchName}
 Session: {sessionId}
 
 /p:done when fixed
@@ -312,4 +386,6 @@ Start later: /p:now "🐛 payment not processing"
 | Error | Response | Action |
 |-------|----------|--------|
 | No project | "No prjct project" | STOP |
+| On protected branch with changes | Ask/auto-stash for urgent | WAIT |
+| Branch creation fails | Queue bug for later | CONTINUE |
 | Write fails | Log warning | CONTINUE |

package/templates/commands/git.md

@@ -31,16 +31,64 @@ Reads from **Storage (JSON)** as source of truth.
 
 ## Flow: commit
 
-1. Read: `storage/state.json` → get task context
-2. Git: `add .` → stage changes
-3. Create: commit message with prjct metadata
-4. Commit: with message
-5. Log: `memory/events.jsonl`
+### Step 1: Validate Branch
+READ: `.prjct/prjct.config.json` → extract `projectId`
+SET: `{globalPath}` = `~/.prjct-cli/projects/{projectId}`
+
+READ: `{globalPath}/storage/state.json`
+IF currentTask AND currentTask.branch:
+  SET: {expectedBranch} = currentTask.branch.name
+ELSE:
+  SET: {expectedBranch} = null
+
+BASH: `git branch --show-current`
+SET: {currentBranch} = result
+
+IF {currentBranch} == "main" OR {currentBranch} == "master":
+  OUTPUT:
+  ```
+  ⚠️ Cannot commit on protected branch: {currentBranch}
+
+  Start a task first with /p:now "task name" to create a feature branch.
+  ```
+  STOP
+
+IF {expectedBranch} AND {currentBranch} != {expectedBranch}:
+  OUTPUT:
+  ```
+  ⚠️ Branch mismatch
+
+  Current: {currentBranch}
+  Expected: {expectedBranch}
+
+  Switch to the correct branch: git checkout {expectedBranch}
+  ```
+  STOP
+
+### Step 2: Stage and Commit
+1. Git: `add .` → stage changes
+2. Create: commit message with prjct metadata
+3. Commit: with message
+4. Log: `memory/events.jsonl`
 
 ## Flow: push
 
+### Step 1: Check Protected Branch
+BASH: `git branch --show-current`
+SET: {currentBranch} = result
+
+IF {currentBranch} == "main" OR {currentBranch} == "master":
+  OUTPUT:
+  ```
+  ⚠️ Cannot push directly to protected branch: {currentBranch}
+
+  Use /p:ship to create a Pull Request instead.
+  ```
+  STOP
+
+### Step 2: Push
 1. Git: `status` → verify clean
-2. Git: `push` with branch tracking
+2. Git: `push -u origin {currentBranch}` with branch tracking
 3. Handle: errors (upstream, conflicts)
 
 ## Flow: sync
@@ -63,10 +111,38 @@ Co-Authored-By: @{github_dev}
 
 ## Response
 
+### Success
 ```
 ✅ Git {operation}
 
+Branch: {currentBranch}
 {operation_details}
 
 /p:ship | /p:status
 ```
+
+### Protected Branch Block
+```
+⚠️ Cannot {operation} on protected branch: {currentBranch}
+
+Use /p:ship to create a Pull Request instead.
+```
+
+### Branch Mismatch
+```
+⚠️ Branch mismatch
+
+Current: {currentBranch}
+Expected: {expectedBranch}
+
+Switch to the correct branch: git checkout {expectedBranch}
+```
+
+## Error Handling
+
+| Error | Response | Action |
+|-------|----------|--------|
+| On protected branch | "Cannot {op} on protected branch" | STOP |
+| Branch mismatch | Show expected vs current | STOP |
+| Push fails | "Push failed. Try: git pull --rebase" | STOP |
+| Conflicts | Show conflicted files | STOP |

package/templates/commands/now.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: [Read, Write, Bash]
+allowed-tools: [Read, Write, Bash, AskUserQuestion]
 description: 'Set or show current task with session tracking'
 ---
 
@@ -61,6 +61,72 @@ IF currentTask.description == task:
   OUTPUT: "🎯 Continuing: {task}"
   STOP
 
+### Step 2.5: Git Branch Management
+
+#### 2.5.1 Check Current Branch
+BASH: `git branch --show-current`
+SET: {currentBranch} = result
+
+#### 2.5.2 Block Protected Branches
+IF {currentBranch} == "main" OR {currentBranch} == "master":
+  OUTPUT:
+  ```
+  ⚠️ Cannot work on protected branch: {currentBranch}
+
+  Creating feature branch for your task...
+  ```
+
+  #### 2.5.3 Handle Uncommitted Changes
+  BASH: `git status --porcelain`
+  SET: {hasChanges} = (result not empty)
+
+  IF {hasChanges}:
+    USE AskUserQuestion:
+    ```
+    question: "Uncommitted changes detected. How to proceed?"
+    header: "Git Changes"
+    options:
+      - label: "Stash changes"
+        description: "Temporarily save changes, create branch, then continue"
+      - label: "Commit first"
+        description: "Commit current changes before switching"
+      - label: "Abort"
+        description: "Cancel and keep working on current branch"
+    ```
+
+    IF choice == "Stash changes":
+      BASH: `git stash push -m "prjct: stashed for {task}"`
+      SET: {stashedChanges} = true
+    ELSE IF choice == "Commit first":
+      OUTPUT: "Commit your changes first, then run /p:now again"
+      STOP
+    ELSE:
+      OUTPUT: "Aborted. Staying on {currentBranch}"
+      STOP
+
+  #### 2.5.4 Create Feature Branch
+  SET: {taskSlug} = slugify({task})
+  LIMIT: {taskSlug} to 50 characters, lowercase, replace spaces with hyphens
+
+  SET: {taskType} = "feature" (or "bug" if task contains bug keywords)
+  SET: {branchName} = "{taskType}/{taskSlug}"
+
+  BASH: `git checkout -b {branchName}`
+  IF command fails (branch exists):
+    BASH: `git checkout {branchName}`
+    IF still fails:
+      OUTPUT: "Failed to create/checkout branch: {branchName}"
+      STOP
+
+  SET: {branchCreated} = true
+  SET: {baseBranch} = {currentBranch}
+  OUTPUT: "✅ Created branch: {branchName}"
+
+ELSE:
+  SET: {branchName} = {currentBranch}
+  SET: {branchCreated} = false
+  SET: {baseBranch} = null
+
 ### Step 3: Create New Task
 GET timestamp: `bun -e "console.log(new Date().toISOString())" 2>/dev/null || node -e "console.log(new Date().toISOString())"`
 GET uuid: `bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(require('crypto').randomUUID())"`
@@ -83,7 +149,13 @@ WRITE to `{globalPath}/storage/state.json`:
     "startedAt": "{startedAt}",
     "sessionId": "{sessionId}",
     "estimate": "{estimate}",
-    "estimateSeconds": {estimateSeconds}
+    "estimateSeconds": {estimateSeconds},
+    "branch": {
+      "name": "{branchName}",
+      "createdByPrjct": {branchCreated},
+      "baseBranch": "{baseBranch}",
+      "createdAt": "{startedAt}"
+    }
   },
   "lastUpdated": "{startedAt}"
 }
@@ -98,6 +170,7 @@ WRITE: `{globalPath}/context/now.md`:
 
 Started: {startedAt}
 Session: {sessionId}
+Branch: {branchName}
 ```
 
 ### Step 6: Log Events
@@ -106,23 +179,24 @@ APPEND to `{globalPath}/memory/events.jsonl`
 
 ### Step 7: Output
 
-WITH estimate:
+WITH branch created:
 ```
 🎯 {task}
 
+Branch: {branchName}
 Session: {sessionId}
-Estimate: {estimate}
+{IF estimate: Estimate: {estimate}}
 
 /p:done when finished | /p:pause to take a break
 ```
 
-WITHOUT estimate:
+WITHOUT branch created (already on feature branch):
 ```
 🎯 {task}
 
+Branch: {branchName} (existing)
 Session: {sessionId}
-
-💡 Tip: Add estimate next time with /p:now "task" 2h
+{IF estimate: Estimate: {estimate}}
 
 /p:done when finished | /p:pause to take a break
 ```
@@ -133,6 +207,8 @@ Session: {sessionId}
 |-------|----------|--------|
 | No project | "No prjct project" | STOP |
 | Active task exists | Show options | STOP |
+| On protected branch with changes | Ask: stash/commit/abort | WAIT |
+| Branch creation fails | "Failed to create branch" | STOP |
 | Write fails | "Failed to create session" | STOP |
 
 ## References

package/templates/commands/ship.md

@@ -1,19 +1,20 @@
 ---
-allowed-tools: [Read, Write, Bash, Glob, Grep]
-description: 'Ship feature with automated workflow'
+allowed-tools: [Read, Write, Bash, Glob, Grep, AskUserQuestion]
+description: 'Ship feature with automated PR workflow'
 ---
 
 # /p:ship - Ship Feature
 
-Ship completed work with pre-flight checks, code review, and quality gates.
+Ship completed work with pre-flight checks, code review, PR creation, and CI verification.
 
 ## Usage
 ```
-/p:ship [feature] [--blocking] [--skip-review]
+/p:ship [feature] [--blocking] [--skip-review] [--draft]
 ```
 - `feature`: Name of the feature being shipped (required)
 - `--blocking`: Abort if any check fails
 - `--skip-review`: Skip code review (for trivial changes)
+- `--draft`: Create PR as draft
 
 ## Flow
 
@@ -135,14 +136,171 @@ UPDATE version file with new version
 BASH: `git log --oneline -20 --pretty=format:"- %s"`
 INSERT new entry in CHANGELOG.md
 
-### Step 7: Git Commit & Push
+### Step 7: Create Pull Request
+
+#### 7.1 Check gh CLI
+BASH: `which gh 2>/dev/null`
+IF result empty:
+  OUTPUT:
+  ```
+  ⚠️ GitHub CLI (gh) not installed
+
+  Install: https://cli.github.com/
+  Or: brew install gh
+
+  After installing, run: gh auth login
+  ```
+  STOP
+
+#### 7.2 Check Authentication
+BASH: `gh auth status 2>&1`
+IF not authenticated:
+  OUTPUT: "Run `gh auth login` to authenticate with GitHub"
+  STOP
+
+#### 7.3 Get Branch Info
+READ: `{globalPath}/storage/state.json`
+IF currentTask AND currentTask.branch:
+  SET: {branchName} = currentTask.branch.name
+  SET: {baseBranch} = currentTask.branch.baseBranch OR "main"
+ELSE:
+  BASH: `git branch --show-current`
+  SET: {branchName} = result
+  SET: {baseBranch} = "main"
+
+IF {branchName} == "main" OR {branchName} == "master":
+  OUTPUT:
+  ```
+  ⚠️ Cannot ship from protected branch: {branchName}
+
+  Create a feature branch first with /p:now "task name"
+  ```
+  STOP
+
+#### 7.4 Commit Changes
 BASH: `git add .`
-BASH: `git commit -m "feat: Ship {feature} v{newVersion}
+BASH: `git commit -m "feat: {feature}
+
+{code review summary if any issues were found}
 
 🤖 Generated with [p/](https://www.prjct.app/)
 Designed for [Claude](https://www.anthropic.com/claude)
 "`
-BASH: `git push`
+
+#### 7.5 Push Branch
+BASH: `git push -u origin {branchName}`
+IF push fails:
+  OUTPUT: "Push failed. Check your git credentials or try: git pull --rebase"
+  STOP
+
+#### 7.6 Create Pull Request
+SET: {prTitle} = "feat: {feature}"
+SET: {prBody} = """
+## Summary
+{feature description}
+
+## Changes
+- {totalLines} lines changed in {filesChanged} files
+- Type: {changeType}
+
+## Quality Checks
+- Lint: {lintStatus}
+- Tests: {testStatus}
+- Review: {reviewStatus}
+
+{IF issues found:}
+### Review Notes
+{list of issues found during code review}
+{END IF}
+
+---
+🤖 Generated with [p/](https://www.prjct.app/)
+Designed for [Claude](https://www.anthropic.com/claude)
+"""
+
+IF `--draft`:
+  SET: {draftFlag} = "--draft"
+ELSE:
+  SET: {draftFlag} = ""
+
+BASH: `gh pr create --title "{prTitle}" --base {baseBranch} {draftFlag} --body "$(cat <<'EOF'
+{prBody}
+EOF
+)"`
+
+IF command fails:
+  # PR might already exist
+  BASH: `gh pr view --json url,number`
+  IF exists:
+    EXTRACT: {prUrl}, {prNumber}
+    OUTPUT: "PR already exists: {prUrl}"
+  ELSE:
+    OUTPUT: "Failed to create PR. Check gh auth status."
+    STOP
+ELSE:
+  EXTRACT: {prUrl} from output
+  EXTRACT: {prNumber} from output
+
+OUTPUT: "📎 PR created: {prUrl}"
+
+#### 7.7 Wait for CI Checks
+OUTPUT: "Waiting for CI checks..."
+
+SET: {maxWaitTime} = 600  # 10 minutes
+SET: {checkInterval} = 30  # 30 seconds
+SET: {elapsed} = 0
+
+LOOP:
+  BASH: `gh pr checks {prNumber} --json name,state,conclusion 2>/dev/null || echo "[]"`
+  PARSE: {ciChecks}
+
+  IF {ciChecks} is empty OR all checks have conclusion:
+    # All checks completed
+    SET: {failedChecks} = checks where conclusion != "success" AND conclusion != "skipped"
+
+    IF {failedChecks}.length > 0:
+      SET: {ciStatus} = "failed"
+      OUTPUT:
+      ```
+      ❌ CI checks failed:
+      {FOR each failed check:}
+      - {name}: {conclusion}
+      {END FOR}
+
+      Fix issues and push again. PR: {prUrl}
+      ```
+      → Continue to Step 8 (don't stop, just record the failure)
+    ELSE:
+      SET: {ciStatus} = "passed"
+      OUTPUT: "✅ All CI checks passed"
+    BREAK
+
+  SET: {pendingCount} = checks where state == "pending" OR state == "queued"
+  OUTPUT: "⏳ Waiting for {pendingCount} CI checks..."
+
+  WAIT: {checkInterval} seconds
+  SET: {elapsed} = {elapsed} + {checkInterval}
+
+  IF {elapsed} >= {maxWaitTime}:
+    SET: {ciStatus} = "timeout"
+    OUTPUT: "⏰ CI still running after 10 minutes. Check PR: {prUrl}"
+    BREAK
+
+#### 7.8 Update State with PR Info
+READ: `{globalPath}/storage/state.json`
+IF currentTask:
+  UPDATE currentTask.branch:
+  ```json
+  {
+    "branch": {
+      ...existing,
+      "prUrl": "{prUrl}",
+      "prNumber": {prNumber},
+      "ciStatus": "{ciStatus}"
+    }
+  }
+  ```
+  WRITE: `{globalPath}/storage/state.json`
 
 ### Step 8: Update Storage
 GET timestamp: `bun -e "console.log(new Date().toISOString())" 2>/dev/null || node -e "console.log(new Date().toISOString())"`
@@ -157,7 +315,11 @@ PREPEND new ship object:
   "version": "{newVersion}",
   "shippedAt": "{timestamp}",
   "lint": "{lintStatus}",
-  "tests": "{testStatus}"
+  "tests": "{testStatus}",
+  "branch": "{branchName}",
+  "prUrl": "{prUrl}",
+  "prNumber": {prNumber},
+  "ciStatus": "{ciStatus}"
 }
 ```
 WRITE: `{globalPath}/storage/shipped.json`
@@ -172,15 +334,49 @@ Log to memory:
 APPEND to `{globalPath}/memory/events.jsonl`
 
 ### Step 9: Output
+
+IF {ciStatus} == "passed":
 ```
-🚀 Shipped: {feature}
+🚀 PR Ready: {feature}
 
 Version: {oldVersion} → {newVersion}
 Changes: {changeType} ({totalLines} lines in {filesChanged} files)
 Quality: Lint {lintStatus} | Tests {testStatus}
-Review: {reviewStatus}
+CI: ✅ Passed
+
+📎 PR: {prUrl}
+
+Next steps:
+1. Request review from team
+2. Merge when approved
+
+/p:done to close task | /p:next for more work
+```
 
-Next: /p:feature | /p:recap
+IF {ciStatus} == "failed":
+```
+⚠️ PR Created (CI Failed): {feature}
+
+Version: {oldVersion} → {newVersion}
+Quality: Lint {lintStatus} | Tests {testStatus}
+CI: ❌ Failed
+
+📎 PR: {prUrl}
+
+Fix CI issues and push again.
+```
+
+IF {ciStatus} == "timeout":
+```
+🚀 PR Created: {feature}
+
+Version: {oldVersion} → {newVersion}
+Quality: Lint {lintStatus} | Tests {testStatus}
+CI: ⏳ Still running
+
+📎 PR: {prUrl}
+
+Check CI status on GitHub.
 ```
 
 ## Error Handling
@@ -189,58 +385,88 @@ Next: /p:feature | /p:recap
 |-------|----------|--------|
 | No git repo | "Not a git repository" | STOP |
 | No changes | "No changes to ship" | STOP |
+| On protected branch | "Cannot ship from main/master" | STOP |
+| gh CLI not installed | Show install instructions | STOP |
+| gh not authenticated | "Run gh auth login" | STOP |
 | Lint/test fails (blocking) | "Quality checks failed" | STOP |
 | Lint/test fails (non-blocking) | Show warning | CONTINUE |
 | Code review finds issues (blocking) | "Fix issues before shipping" | STOP |
 | Code review finds issues (non-blocking) | Prompt to continue | ASK |
-| Push fails | "Push failed. Try: git pull --rebase" | CONTINUE |
+| Push fails | "Push failed. Try: git pull --rebase" | STOP |
+| PR creation fails | Check if PR exists | CONTINUE |
+| CI fails | Show failed checks, record in storage | CONTINUE |
+| CI timeout | Show PR URL, continue | CONTINUE |
 
 ## Examples
 
-### Example 1: Trivial Change (auto-skip review)
+### Example 1: Successful Ship with PR
 ```
-/p:ship "fix typo"
+/p:ship "add user auth"
 
-Pre-flight: Trivial changes (3 lines in 1 file)
+Pre-flight: Medium changes (87 lines in 5 files)
 Quality: Lint ✅ | Tests ✅
-Review: Skipped (trivial)
+Review: Passed
 
-🚀 Shipped: fix typo
-Version: 1.2.0 → 1.2.1
-```
+📎 PR created: https://github.com/user/repo/pull/42
+Waiting for CI checks...
+⏳ Waiting for 3 CI checks...
+✅ All CI checks passed
 
-### Example 2: Medium Change (with review)
-```
-/p:ship "add auth"
+🚀 PR Ready: add user auth
 
-Pre-flight: Medium changes (87 lines in 5 files)
+Version: 1.2.0 → 1.3.0
+Changes: medium (87 lines in 5 files)
 Quality: Lint ✅ | Tests ✅
-Review: Running...
+CI: ✅ Passed
 
-## Code Review Results
-Found 2 issues (confidence >= 70%):
-- [85%] Missing error handling in OAuth callback
-  File: src/auth/oauth.ts:67
-- [72%] Token not validated before use
-  File: src/auth/validate.ts:23
+📎 PR: https://github.com/user/repo/pull/42
 
-Continue with ship? (y/n)
+Next steps:
+1. Request review from team
+2. Merge when approved
 ```
 
-### Example 3: Blocking Mode
+### Example 2: Ship with CI Failure
 ```
-/p:ship "deploy script" --blocking
+/p:ship "fix login bug"
 
 Pre-flight: Small changes (28 lines in 2 files)
 Quality: Lint ✅ | Tests ✅
-Review: Running...
+Review: Passed
+
+📎 PR created: https://github.com/user/repo/pull/43
+Waiting for CI checks...
+
+❌ CI checks failed:
+- build: failure
+- test: failure
+
+⚠️ PR Created (CI Failed): fix login bug
+
+📎 PR: https://github.com/user/repo/pull/43
+
+Fix CI issues and push again.
+```
+
+### Example 3: Blocked on Protected Branch
+```
+/p:ship "new feature"
+
+⚠️ Cannot ship from protected branch: main
+
+Create a feature branch first with /p:now "task name"
+```
+
+### Example 4: Draft PR
+```
+/p:ship "work in progress" --draft
+
+📎 PR created (draft): https://github.com/user/repo/pull/44
 
-## Code Review Results
-Found 1 issue (confidence >= 70%):
-- [95%] Hardcoded credentials detected
-  File: scripts/deploy.sh:12
+🚀 PR Created: work in progress
+CI: ⏳ Still running
 
-Fix issues before shipping.
+📎 PR: https://github.com/user/repo/pull/44
 ```
 
 ## References