prjct-cli 0.21.0 → 0.23.0

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

package/templates/skills/notion-push.md

@@ -0,0 +1,116 @@
+---
+allowed-tools: [Read, Bash]
+description: 'Push prjct data to Notion databases'
+timestamp-rule: 'GetTimestamp() for all timestamps'
+---
+
+# /p:notion push - Push Data to Notion
+
+## Purpose
+
+Manually sync all prjct data to Notion databases:
+- Shipped features → Shipped Features database
+- Ideas → Ideas database
+- Queue tasks → Active Tasks database (optional)
+
+## Prerequisites
+
+1. Notion integration configured (`/p:notion setup`)
+2. Token stored in `~/.prjct-cli/config/notion.json`
+
+## Flow
+
+### Step 1: Check Config
+
+READ: `.prjct/prjct.config.json` → extract `projectId`
+READ: `~/.prjct-cli/projects/{projectId}/project.json`
+
+IF `integrations.notion.enabled !== true`:
+  OUTPUT: "Notion not configured. Run /p:notion setup first."
+  STOP
+
+### Step 2: Load Token
+
+READ: `~/.prjct-cli/config/notion.json` → extract `token`
+
+IF no token:
+  OUTPUT: "Notion token not found. Run /p:notion setup first."
+  STOP
+
+### Step 3: Load Data
+
+READ: `~/.prjct-cli/projects/{projectId}/storage/shipped.json`
+READ: `~/.prjct-cli/projects/{projectId}/storage/ideas.json`
+
+### Step 4: Push to Notion
+
+For each shipped feature:
+```bash
+curl -X POST "https://api.notion.com/v1/pages" \
+  -H "Authorization: Bearer {token}" \
+  -H "Notion-Version: 2022-06-28" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "parent": { "database_id": "{databases.shipped}" },
+    "properties": {
+      "Name": { "title": [{ "text": { "content": "{feature.name}" } }] },
+      "Project": { "select": { "name": "{projectName}" } },
+      "Type": { "select": { "name": "{feature.type}" } },
+      "Version": { "rich_text": [{ "text": { "content": "{feature.version}" } }] },
+      "Shipped Date": { "date": { "start": "{feature.shippedAt}" } }
+    }
+  }'
+```
+
+For each idea:
+```bash
+curl -X POST "https://api.notion.com/v1/pages" \
+  -H "Authorization: Bearer {token}" \
+  -H "Notion-Version: 2022-06-28" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "parent": { "database_id": "{databases.ideas}" },
+    "properties": {
+      "Name": { "title": [{ "text": { "content": "{idea.text}" } }] },
+      "Project": { "select": { "name": "{projectName}" } },
+      "Status": { "select": { "name": "{idea.status}" } },
+      "Created": { "date": { "start": "{idea.addedAt}" } }
+    }
+  }'
+```
+
+### Step 5: Report Results
+
+```
+✅ Notion Push Complete
+
+Shipped Features: {shipped.count} synced
+Ideas: {ideas.count} synced
+
+View in Notion: {dashboardUrl}
+```
+
+## Response (Success)
+
+```
+✅ Notion Push Complete
+
+📦 Shipped: 11 features synced
+💡 Ideas: 1 idea synced
+
+Dashboard: https://notion.so/...
+```
+
+## Response (No Data)
+
+```
+Nothing to push. Add features or ideas first.
+```
+
+## Error Handling
+
+| Error | Response |
+|-------|----------|
+| Not configured | "Run /p:notion setup first" |
+| Token invalid | "Token expired. Run /p:notion setup again" |
+| API error | Show error, suggest retry |

package/templates/{commands → skills}/notion-setup.md

@@ -76,7 +76,7 @@ Ensure the token starts with "ntn_" or "secret_".
 ```
 Now share a Notion page with your integration:
 
-1. Open a Notion page where you want the databases
+1. Create a new page in Notion named "prjct: {projectName}"
 2. Click "..." → "Connect to" → select "prjct-cli"
 3. Copy the page URL or ID
 
@@ -87,18 +87,25 @@ Parse page ID from URL:
 - `https://notion.so/workspace/Page-Title-abc123...` → `abc123...`
 - Just the 32-character ID is also valid
 
-### Step 5: Create Databases
+### Step 5: Create Project Databases
 
-Create 4 databases under the parent page:
+Create 4 databases + 1 dashboard under the parent page.
+Each project gets its own set of databases (not shared).
 
-| Database | Description |
-|----------|-------------|
-| prjct: Shipped Features | Track shipped features with metrics |
-| prjct: Roadmap | Feature planning and progress |
-| prjct: Ideas | Captured ideas and status |
-| prjct: Active Tasks | Current task queue |
+| Created | Name | Description |
+|---------|------|-------------|
+| Dashboard | {projectName}: Dashboard | Metrics + links to all DBs |
+| Database | {projectName}: Shipped Features | Track shipped features with metrics |
+| Database | {projectName}: Roadmap | Feature planning and progress |
+| Database | {projectName}: Ideas | Captured ideas and status |
+| Database | {projectName}: Active Tasks | Current task queue |
 
-Each database has project-specific columns for multi-project support.
+The dashboard shows:
+- Total features shipped
+- Ideas pendientes
+- Tareas activas
+- Progreso del roadmap
+- Links a cada database
 
 ### Step 6: Save Config
 
@@ -150,17 +157,18 @@ Or create `~/.prjct-cli/config/notion.json`:
 ✅ Notion Connected
 
 Workspace: {workspaceName}
-Created: 4 databases
+Project: {projectName}
+Created: 1 dashboard + 4 databases
 
-Databases:
-• prjct: Shipped Features
-• prjct: Roadmap
-• prjct: Ideas
-• prjct: Active Tasks
+• {projectName}: Dashboard (with metrics)
+• {projectName}: Shipped Features
+• {projectName}: Roadmap
+• {projectName}: Ideas
+• {projectName}: Active Tasks
 
 Auto-sync enabled:
-• On /p:ship → Shipped Features
-• On /p:idea → Ideas
+• On /p:ship → Shipped Features + Dashboard metrics
+• On /p:idea → Ideas + Dashboard metrics
 
 To sync all existing data: /p:notion sync
 ```