prjct-cli 0.22.0 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,81 @@
 # Changelog
 
+## [0.25.0] - 2025-12-30
+
+### Maintenance Release
+
+Version bump for release preparation.
+
+## [0.24.0] - 2025-12-28
+
+### Breaking Change: Unified Task Command
+
+Consolidated `/p:now`, `/p:feature`, and `/p:work` into a single `/p:task` command with agentic classification.
+
+**New Command: `/p:task`**
+- Unified entry point for all work
+- Agentic type classification (not keyword-based)
+- 7-phase development workflow for all task types
+- Git branch management with type-based prefixes
+
+**Agentic Classification:**
+The agent analyzes task descriptions holistically to determine type:
+- `feature` - Adds new functionality
+- `bug` - Something broken or incorrect
+- `improvement` - Enhances existing functionality
+- `refactor` - Reorganizes without behavior change
+- `chore` - Maintenance, deps, docs
+
+**Migration:**
+```
+/p:now "fix login bug"     →  /p:task "fix login bug"
+/p:feature "add dark mode" →  /p:task "add dark mode"
+/p:work "update docs"      →  /p:task "update docs"
+```
+
+**Deprecated Commands:**
+- `/p:now` - Redirects to `/p:task`
+- `/p:feature` - Redirects to `/p:task`
+- `/p:work` - Redirects to `/p:task`
+
+**Files Changed:**
+- `templates/commands/task.md` - New unified template
+- `templates/commands/now.md` - Deprecated, redirects
+- `templates/commands/feature.md` - Deprecated, redirects
+- `core/commands/command-data.ts` - Registry updates
+- `templates/global/CLAUDE.md` - Updated workflow docs
+- `CLAUDE.md` - Updated project docs
+
+## [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/CLAUDE.md

@@ -86,19 +86,18 @@ User Action → Storage (JSON) → Context (MD) → Sync Events
 ## Core Workflow
 
 ```
-/p:sync → /p:now "task" → [work] → /p:done → /p:ship
+/p:sync → /p:task "description" → [work] → /p:done → /p:ship
 ```
 
 ## Commands
 
-### Core Commands (14)
+### Core Commands
 | Command | Purpose |
 |---------|---------|
 | `/p:init` | Initialize project with deep analysis |
 | `/p:idea` | Transform ideas into architectures |
-| `/p:feature` | Add feature with value analysis |
+| `/p:task` | Start task with agentic classification + 7-phase workflow |
 | `/p:spec` | Create detailed specifications |
-| `/p:now [task]` | Start/show current task |
 | `/p:pause` | Pause active task |
 | `/p:resume` | Resume paused task |
 | `/p:next` | Show priority queue |
@@ -109,6 +108,13 @@ User Action → Storage (JSON) → Context (MD) → Sync Events
 | `/p:sync` | Analyze repo, generate agents |
 | `/p:suggest` | Context-aware recommendations |
 
+### Deprecated Commands
+| Command | Migration |
+|---------|-----------|
+| `/p:now` | Use `/p:task` instead |
+| `/p:feature` | Use `/p:task` instead |
+| `/p:work` | Use `/p:task` instead |
+
 ### Optional Commands
 | Command | Purpose |
 |---------|---------|
@@ -123,9 +129,10 @@ User Action → Storage (JSON) → Context (MD) → Sync Events
 
 Messages starting with `p.` trigger commands:
 ```
-p. start auth → /p:now "auth"
-p. done       → /p:done
-p. ship login → /p:ship "login"
+p. task add auth → /p:task "add auth"
+p. task fix login → /p:task "fix login"
+p. done          → /p:done
+p. ship login    → /p:ship "login"
 ```
 
 ## Template-Driven Execution

package/core/commands/command-data.ts

@@ -51,16 +51,27 @@ export const COMMANDS: CommandMeta[] = [
     requiresProject: true,
     features: ['Simple ideas -> Quick capture', 'Complex ideas -> Full architecture'],
   },
+  {
+    name: 'task',
+    group: 'core',
+    description: 'Start task with agentic classification and 7-phase workflow',
+    usage: { claude: '/p:task "<description>"', terminal: 'prjct task "<description>"' },
+    params: '<description>',
+    implemented: true,
+    hasTemplate: true,
+    requiresProject: true,
+    features: ['Agentic type classification', '7-phase workflow', 'Git branch management', 'Task breakdown'],
+  },
   {
     name: 'feature',
     group: 'core',
-    description: 'Add feature with value analysis and task breakdown',
-    usage: { claude: '/p:feature "add testing"', terminal: 'prjct feature "add testing"' },
+    description: 'DEPRECATED - Use /p:task instead',
+    usage: { claude: '/p:task "<description>"', terminal: 'prjct task "<description>"' },
     params: '<description>',
     implemented: true,
     hasTemplate: true,
     requiresProject: true,
-    features: ['Value analysis', 'Auto roadmap generation', 'Task breakdown'],
+    deprecated: true,
   },
   {
     name: 'spec',
@@ -75,22 +86,24 @@ export const COMMANDS: CommandMeta[] = [
   {
     name: 'now',
     group: 'core',
-    description: 'Set or show current task with session tracking',
-    usage: { claude: '/p:now ["task"]', terminal: 'prjct now ["task"]' },
-    params: '[task] [estimate]',
+    description: 'DEPRECATED - Use /p:task instead',
+    usage: { claude: '/p:task "<description>"', terminal: 'prjct task "<description>"' },
+    params: '[task]',
     implemented: true,
     hasTemplate: true,
     requiresProject: true,
+    deprecated: true,
   },
   {
     name: 'work',
     group: 'core',
-    description: 'Set or show current task (alias for now)',
-    usage: { claude: '/p:work ["task"]', terminal: 'prjct work ["task"]' },
+    description: 'DEPRECATED - Use /p:task instead',
+    usage: { claude: '/p:task "<description>"', terminal: 'prjct task "<description>"' },
     params: '[task]',
     implemented: true,
     hasTemplate: true,
     requiresProject: true,
+    deprecated: true,
   },
   {
     name: 'pause',

package/core/commands/setup.ts

@@ -130,28 +130,63 @@ export class SetupCommands extends PrjctCommandsBase {
       const settingsPath = path.join(claudeDir, 'settings.json')
       const statusLinePath = path.join(claudeDir, 'prjct-statusline.sh')
 
+      // Version is embedded at install time
       const scriptContent = `#!/bin/bash
 # prjct Status Line for Claude Code
-# Shows ⚡ prjct with animated spinner when command is running
+# Shows version update notifications and current task
+
+# Current CLI version (embedded at install time)
+CLI_VERSION="${VERSION}"
 
 # Read JSON context from stdin (provided by Claude Code)
 read -r json
 
-# Spinner frames
-frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
-
-# Calculate frame based on time (changes every 80ms)
-frame=$(($(date +%s%N 2>/dev/null || echo 0) / 80000000 % 10))
-
-# Check if prjct command is running
-running_file="$HOME/.prjct-cli/.running"
-
-if [ -f "$running_file" ]; then
-  task=$(cat "$running_file" 2>/dev/null || echo "working")
-  echo "⚡ prjct \${frames[$frame]} $task"
-else
-  echo "⚡ prjct"
+# Extract cwd from JSON
+CWD=$(echo "$json" | grep -o '"cwd"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"cwd"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+# Check if this is a prjct project
+CONFIG="$CWD/.prjct/prjct.config.json"
+if [[ -f "$CONFIG" ]]; then
+  # Extract projectId
+  PROJECT_ID=$(grep -o '"projectId"[[:space:]]*:[[:space:]]*"[^"]*"' "$CONFIG" | sed 's/.*"projectId"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+  if [[ -n "$PROJECT_ID" ]]; then
+    PROJECT_JSON="$HOME/.prjct-cli/projects/$PROJECT_ID/project.json"
+
+    # Check version mismatch
+    if [[ -f "$PROJECT_JSON" ]]; then
+      PROJECT_VERSION=$(grep -o '"cliVersion"[[:space:]]*:[[:space:]]*"[^"]*"' "$PROJECT_JSON" | sed 's/.*"cliVersion"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+      # If no cliVersion or different version, show update notice
+      if [[ -z "$PROJECT_VERSION" ]] || [[ "$PROJECT_VERSION" != "$CLI_VERSION" ]]; then
+        echo "⚠️ prjct v$CLI_VERSION available! Run /p:sync"
+        exit 0
+      fi
+    else
+      # No project.json means project needs sync
+      echo "⚠️ prjct v$CLI_VERSION available! Run /p:sync"
+      exit 0
+    fi
+
+    # Show current task if exists
+    STATE="$HOME/.prjct-cli/projects/$PROJECT_ID/storage/state.json"
+    if [[ -f "$STATE" ]]; then
+      TASK=$(grep -o '"description"[[:space:]]*:[[:space:]]*"[^"]*"' "$STATE" | head -1 | sed 's/.*"description"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+      STATUS=$(grep -o '"status"[[:space:]]*:[[:space:]]*"[^"]*"' "$STATE" | head -1 | sed 's/.*"status"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+      if [[ -n "$TASK" ]] && [[ "$STATUS" == "active" ]]; then
+        # Truncate task to 40 chars
+        TASK_SHORT="\${TASK:0:40}"
+        [[ \${#TASK} -gt 40 ]] && TASK_SHORT="$TASK_SHORT..."
+        echo "🎯 $TASK_SHORT"
+        exit 0
+      fi
+    fi
+  fi
 fi
+
+# Default: show prjct branding
+echo "⚡ prjct"
 `
       fs.writeFileSync(statusLinePath, scriptContent, { mode: 0o755 })
 
@@ -204,8 +239,8 @@ fi
     console.log(`  ${chalk.bold('1.')} Initialize your project:`)
     console.log(`     ${chalk.green('cd your-project && prjct init')}`)
     console.log('')
-    console.log(`  ${chalk.bold('2.')} Set your current focus:`)
-    console.log(`     ${chalk.green('prjct now "build auth"')}`)
+    console.log(`  ${chalk.bold('2.')} Start your first task:`)
+    console.log(`     ${chalk.green('prjct task "build auth"')}`)
     console.log('')
     console.log(`  ${chalk.bold('3.')} Ship & celebrate:`)
     console.log(`     ${chalk.green('prjct ship "user login"')}`)

package/core/infrastructure/setup.ts

@@ -13,6 +13,9 @@
  */
 
 import { execSync } from 'child_process'
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
 import installer from './command-installer'
 import editorsConfig from './editors-config'
 import { VERSION } from '../utils/version'
@@ -106,6 +109,9 @@ export async function run(): Promise<SetupResults> {
 
     // Step 4b: Install documentation files
     await installer.installDocs()
+
+    // Step 4c: Install status line with version check
+    await installStatusLine()
   }
 
   // Step 5: Save version in editors-config
@@ -120,6 +126,101 @@ export async function run(): Promise<SetupResults> {
 // Default export for CommonJS require
 export default { run }
 
+/**
+ * Install status line script with version check
+ */
+async function installStatusLine(): Promise<void> {
+  try {
+    const claudeDir = path.join(os.homedir(), '.claude')
+    const settingsPath = path.join(claudeDir, 'settings.json')
+    const statusLinePath = path.join(claudeDir, 'prjct-statusline.sh')
+
+    // Ensure .claude directory exists
+    if (!fs.existsSync(claudeDir)) {
+      fs.mkdirSync(claudeDir, { recursive: true })
+    }
+
+    // Version is embedded at install time
+    const scriptContent = `#!/bin/bash
+# prjct Status Line for Claude Code
+# Shows version update notifications and current task
+
+# Current CLI version (embedded at install time)
+CLI_VERSION="${VERSION}"
+
+# Read JSON context from stdin (provided by Claude Code)
+read -r json
+
+# Extract cwd from JSON
+CWD=$(echo "$json" | grep -o '"cwd"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"cwd"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+# Check if this is a prjct project
+CONFIG="$CWD/.prjct/prjct.config.json"
+if [[ -f "$CONFIG" ]]; then
+  # Extract projectId
+  PROJECT_ID=$(grep -o '"projectId"[[:space:]]*:[[:space:]]*"[^"]*"' "$CONFIG" | sed 's/.*"projectId"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+  if [[ -n "$PROJECT_ID" ]]; then
+    PROJECT_JSON="$HOME/.prjct-cli/projects/$PROJECT_ID/project.json"
+
+    # Check version mismatch
+    if [[ -f "$PROJECT_JSON" ]]; then
+      PROJECT_VERSION=$(grep -o '"cliVersion"[[:space:]]*:[[:space:]]*"[^"]*"' "$PROJECT_JSON" | sed 's/.*"cliVersion"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+      # If no cliVersion or different version, show update notice
+      if [[ -z "$PROJECT_VERSION" ]] || [[ "$PROJECT_VERSION" != "$CLI_VERSION" ]]; then
+        echo "⚠️ prjct v$CLI_VERSION available! Run /p:sync"
+        exit 0
+      fi
+    else
+      # No project.json means project needs sync
+      echo "⚠️ prjct v$CLI_VERSION available! Run /p:sync"
+      exit 0
+    fi
+
+    # Show current task if exists
+    STATE="$HOME/.prjct-cli/projects/$PROJECT_ID/storage/state.json"
+    if [[ -f "$STATE" ]]; then
+      TASK=$(grep -o '"description"[[:space:]]*:[[:space:]]*"[^"]*"' "$STATE" | head -1 | sed 's/.*"description"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+      STATUS=$(grep -o '"status"[[:space:]]*:[[:space:]]*"[^"]*"' "$STATE" | head -1 | sed 's/.*"status"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+
+      if [[ -n "$TASK" ]] && [[ "$STATUS" == "active" ]]; then
+        # Truncate task to 40 chars
+        TASK_SHORT="\${TASK:0:40}"
+        [[ \${#TASK} -gt 40 ]] && TASK_SHORT="$TASK_SHORT..."
+        echo "🎯 $TASK_SHORT"
+        exit 0
+      fi
+    fi
+  fi
+fi
+
+# Default: show prjct branding
+echo "⚡ prjct"
+`
+    fs.writeFileSync(statusLinePath, scriptContent, { mode: 0o755 })
+
+    // Update settings.json to use this status line
+    let settings: Record<string, unknown> = {}
+    if (fs.existsSync(settingsPath)) {
+      try {
+        settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'))
+      } catch {
+        // Invalid JSON, start fresh
+      }
+    }
+
+    settings.statusLine = {
+      type: 'command',
+      command: statusLinePath
+    }
+
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2))
+  } catch {
+    // Silently fail - status line is optional
+  }
+}
+
 /**
  * Show setup results
  */

package/core/schemas/project.ts

@@ -19,6 +19,7 @@ export const ProjectItemSchema = z.object({
   repoPath: z.string(),
   description: z.string().optional(),
   version: z.string().optional(),
+  cliVersion: z.string().optional(), // prjct-cli version used to sync
   techStack: z.array(z.string()),
   fileCount: z.number(),
   commitCount: z.number(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prjct-cli",
-  "version": "0.22.0",
+  "version": "0.25.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 |