prjct-cli 0.25.2 → 0.27.0

package/templates/commands/done.md

@@ -1,11 +1,16 @@
 ---
-allowed-tools: [Read, Write, Bash]
-description: 'Complete current task with session metrics'
+allowed-tools: [Read, Write, Bash, AskUserQuestion]
+description: 'Complete subtask or mark implement phase done'
 ---
 
-# /p:done - Complete Task
+# /p:done - Complete Subtask
 
-Mark current task as complete with metrics.
+Mark current subtask as complete and progress to next. Does NOT complete the workflow - use p. verify after shipping.
+
+**Note**: In workflow mode, p. done advances subtasks within the implement phase. To complete the full workflow:
+```
+p. task → (implement) → p. done (subtasks) → p. test → p. review → p. merge → p. ship → p. verify
+```
 
 ## Usage
 ```
@@ -22,7 +27,7 @@ SET: `{globalPath}` = `~/.prjct-cli/projects/{projectId}`
 
 READ: `{globalPath}/storage/state.json`
 IF no `currentTask` OR status != "active":
-  OUTPUT: "No active task. Use /p:now to start one."
+  OUTPUT: "No active task. Use p. task to start one."
   STOP
 
 EXTRACT: `{task}` = currentTask.description
@@ -30,6 +35,80 @@ EXTRACT: `{startedAt}` = currentTask.startedAt
 EXTRACT: `{sessionId}` = currentTask.sessionId
 EXTRACT: `{estimate}` = currentTask.estimate (optional)
 
+### Step 1.5: Handle Subtask Completion (AGENTIC)
+
+IF currentTask.subtasks exists AND currentTask.subtasks.length > 0:
+  SET: {currentIndex} = currentTask.currentSubtaskIndex
+  SET: {currentSubtask} = currentTask.subtasks[{currentIndex}]
+  SET: {totalSubtasks} = currentTask.subtasks.length
+  SET: {nextIndex} = {currentIndex} + 1
+  SET: {hasMoreSubtasks} = {nextIndex} < {totalSubtasks}
+
+  IF {hasMoreSubtasks}:
+    SET: {nextSubtask} = currentTask.subtasks[{nextIndex}]
+    SET: {completedCount} = subtasks where status == "completed" + 1
+    SET: {remainingCount} = {totalSubtasks} - {completedCount}
+
+    USE AskUserQuestion:
+    ```
+    question: "Subtask '{currentSubtask.description}' done. What's next?"
+    header: "Subtask Complete"
+    options:
+      - label: "Next: {nextSubtask.description}"
+        description: "{remainingCount} subtasks remaining"
+      - label: "Complete entire feature"
+        description: "Finish '{currentTask.parentDescription}' now"
+      - label: "More work needed"
+        description: "Continue on this subtask"
+    ```
+
+    IF choice starts with "Next:":
+      SET: {now} = GetTimestamp()
+      # Mark current subtask complete
+      SET: currentTask.subtasks[{currentIndex}].status = "completed"
+      SET: currentTask.subtasks[{currentIndex}].completedAt = "{now}"
+      # Start next subtask
+      SET: currentTask.subtasks[{nextIndex}].status = "active"
+      SET: currentTask.currentSubtaskIndex = {nextIndex}
+      SET: currentTask.description = "{nextSubtask.description}"
+
+      WRITE: `{globalPath}/storage/state.json`
+
+      APPEND to `{globalPath}/memory/events.jsonl`:
+      {"timestamp":"{now}","action":"subtask_completed","subtaskId":"{currentSubtask.id}","nextSubtaskId":"{nextSubtask.id}"}
+
+      OUTPUT:
+      ```
+      ✅ {currentSubtask.description}
+
+      Now: {nextSubtask.description}
+      Progress: {completedCount}/{totalSubtasks} subtasks
+
+      p. done when finished
+      ```
+      STOP
+
+    IF choice == "Complete entire feature":
+      # Mark all remaining as skipped, continue to normal done flow
+      FOR each subtask in currentTask.subtasks:
+        IF subtask.status == "pending":
+          SET: subtask.status = "skipped"
+      SET: currentTask.subtasks[{currentIndex}].status = "completed"
+      OUTPUT: "Completing feature: {currentTask.parentDescription}"
+      # Continue to Step 2
+
+    IF choice == "More work needed":
+      OUTPUT: "Continuing: {currentSubtask.description}"
+      STOP
+
+  ELSE:
+    # Last subtask - mark complete and continue to normal done flow
+    SET: {now} = GetTimestamp()
+    SET: currentTask.subtasks[{currentIndex}].status = "completed"
+    SET: currentTask.subtasks[{currentIndex}].completedAt = "{now}"
+    OUTPUT: "Final subtask done. Completing feature..."
+    # Continue to Step 2
+
 ### Step 2: Calculate Metrics
 GET timestamp: `bun -e "console.log(new Date().toISOString())" 2>/dev/null || node -e "console.log(new Date().toISOString())"`
 SET: `{now}` = result
@@ -82,7 +161,76 @@ APPEND to `{globalPath}/progress/sessions/{YYYY-MM}/{date}.jsonl`:
 {"ts":"{now}","type":"task_complete","task":"{task}","duration":"{duration}"}
 ```
 
-### Step 6: Output
+### Step 5.5: Handle Bug Completion Resume (AGENTIC)
+
+IF currentTask.type == "bug" AND state.interruptedTask exists:
+  USE AskUserQuestion:
+  ```
+  question: "Bug fixed! Resume '{state.interruptedTask.description}'?"
+  header: "Bug Complete"
+  options:
+    - label: "Resume previous task"
+      description: "Return to '{state.interruptedTask.description}'"
+    - label: "Pick from queue"
+      description: "See what else is waiting"
+    - label: "Done for now"
+      description: "No active task"
+  ```
+
+  IF choice == "Resume previous task":
+    SET: {now} = GetTimestamp()
+    SET: currentTask = state.interruptedTask
+    SET: currentTask.status = "active"
+    SET: currentTask.resumedAt = "{now}"
+    SET: state.interruptedTask = null
+
+    WRITE: `{globalPath}/storage/state.json`
+
+    APPEND to `{globalPath}/memory/events.jsonl`:
+    {"timestamp":"{now}","action":"task_resumed_from_interrupt","taskId":"{currentTask.id}"}
+
+    OUTPUT:
+    ```
+    ✅ Bug fixed ({duration})
+
+    Resumed: {currentTask.description}
+
+    p. done when finished
+    ```
+    STOP
+
+  IF choice == "Pick from queue":
+    SET: state.interruptedTask = null
+    READ: `{globalPath}/storage/queue.json`
+    SET: {topTasks} = first 3 from queue.tasks
+
+    OUTPUT:
+    ```
+    ✅ Bug fixed ({duration})
+
+    Previous task saved. Queue:
+    {FOR each in topTasks: "- {task.description}"}
+
+    p. task <description> to start
+    ```
+    STOP
+
+  IF choice == "Done for now":
+    OUTPUT:
+    ```
+    ✅ Bug fixed ({duration})
+
+    '{state.interruptedTask.description}' saved for later.
+
+    p. resume to return | p. task for new work
+    ```
+    STOP
+
+### Step 6: Output with Queue Suggestion
+
+READ: `{globalPath}/storage/queue.json`
+SET: {queueCount} = queue.tasks.length
+SET: {topTask} = queue.tasks[0] if exists
 
 WITH estimate:
 ```
@@ -90,8 +238,9 @@ WITH estimate:
 
 Estimate: {estimate} | Actual: {duration} | Accuracy: {accuracy}%
 Files: {filesChanged} | +{linesAdded}/-{linesRemoved} | Commits: {commits}
+{IF queueCount > 0: "Queue: {queueCount} tasks | Next: {topTask.description}"}
 
-Next: /p:now | /p:ship | /p:progress
+p. task | p. ship | p. next
 ```
 
 WITHOUT estimate:
@@ -99,8 +248,9 @@ WITHOUT estimate:
 ✅ {task} ({duration})
 
 Files: {filesChanged} | +{linesAdded}/-{linesRemoved} | Commits: {commits}
+{IF queueCount > 0: "Queue: {queueCount} tasks | Next: {topTask.description}"}
 
-Next: /p:now | /p:ship | /p:progress
+p. task | p. ship | p. next
 ```
 
 ## Error Handling

package/templates/commands/git.md

@@ -97,16 +97,32 @@ IF {currentBranch} == "main" OR {currentBranch} == "master":
 2. Resolve: conflicts if any
 3. Git: `push`
 
-## Commit Message Format
+## Commit Message Format (CRITICAL - ALWAYS USE)
+
+**Every commit MUST include the prjct signature:**
+
+```
+{type}: {description}
+
+{details if any}
+
+🤖 Generated with [p/](https://www.prjct.app/)
+Designed for [Claude](https://www.anthropic.com/claude)
 
 ```
+
+**NON-NEGOTIABLE: The `🤖 Generated with [p/]` line MUST appear in ALL commits.**
+
+Use HEREDOC for proper formatting:
+```bash
+git commit -m "$(cat <<'EOF'
 {type}: {description}
 
-Agent: {agent}
-Dev: @{github_dev}
+🤖 Generated with [p/](https://www.prjct.app/)
+Designed for [Claude](https://www.anthropic.com/claude)
 
-Generated-by: prjct/cli
-Co-Authored-By: @{github_dev}
+EOF
+)"
 ```
 
 ## Response

package/templates/commands/merge.md

@@ -0,0 +1,202 @@
+---
+allowed-tools: [Bash, Read, Write, AskUserQuestion]
+description: 'Merge PR to main branch'
+timestamp-rule: 'GetTimestamp() for ALL timestamps'
+architecture: 'Write-Through (JSON -> MD -> Events)'
+storage-layer: true
+source-of-truth: 'storage/state.json'
+---
+
+# /p:merge
+
+Merge approved PR to main branch.
+
+## Usage
+
+```
+/p:merge [--squash|--rebase|--merge]    # Merge strategy (default: squash)
+         [--delete-branch]               # Delete branch after merge
+```
+
+## Context Variables
+- `{projectId}`: From `.prjct/prjct.config.json`
+- `{globalPath}`: `~/.prjct-cli/projects/{projectId}`
+- `{statePath}`: `{globalPath}/storage/state.json`
+- `{memoryPath}`: `{globalPath}/memory/events.jsonl`
+- `{syncPath}`: `{globalPath}/sync/pending.json`
+
+## Step 1: Validate Project
+
+READ: `.prjct/prjct.config.json`
+EXTRACT: `projectId`
+
+IF file not found:
+  OUTPUT: "No prjct project. Run /p:init first."
+  STOP
+
+## Step 2: Validate Workflow Phase
+
+READ: `{globalPath}/storage/state.json`
+
+IF currentTask is null:
+  OUTPUT: "No active task. Use p. task to start one."
+  STOP
+
+IF currentTask.workflow exists:
+  IF currentTask.workflow.phase != "review":
+    OUTPUT:
+    ```
+    Cannot merge. Current phase: {currentTask.workflow.phase}
+
+    Required phase: review
+
+    Workflow: analyze → branch → implement → test → review → merge → ship → verify
+    
+    Complete code review first with p. review
+    ```
+    STOP
+
+## Step 3: Verify PR Status
+
+SET: {prNumber} = currentTask.branch.prNumber
+
+IF {prNumber} is null:
+  OUTPUT: "No PR found. Run p. review first to create PR."
+  STOP
+
+### Check PR is approved
+BASH: `gh pr view {prNumber} --json reviewDecision,mergeable,state`
+SET: {decision} = result.reviewDecision
+SET: {mergeable} = result.mergeable
+SET: {state} = result.state
+
+IF {state} == "MERGED":
+  OUTPUT: "PR already merged."
+  -> Skip to Step 5 (update workflow)
+
+IF {decision} != "APPROVED":
+  OUTPUT:
+  ```
+  ⚠️ PR not approved yet
+
+  Current status: {decision}
+  
+  Get approvals and run p. merge again.
+  ```
+  STOP
+
+IF {mergeable} != "MERGEABLE":
+  OUTPUT:
+  ```
+  ⚠️ PR has conflicts or is not mergeable
+
+  Status: {mergeable}
+  
+  Resolve conflicts and run p. merge again.
+  ```
+  STOP
+
+## Step 4: Merge PR
+
+### Parse merge strategy
+SET: {strategy} = "squash"  # default
+IF --rebase: {strategy} = "rebase"
+IF --merge: {strategy} = "merge"
+
+OUTPUT: "Merging PR #{prNumber} with {strategy} strategy..."
+
+BASH: `gh pr merge {prNumber} --{strategy} --auto 2>&1`
+
+IF command fails:
+  OUTPUT: "Merge failed. Check PR status on GitHub."
+  STOP
+
+### Delete branch if requested
+IF --delete-branch OR currentTask.branch.createdByPrjct:
+  BASH: `git branch -d {currentTask.branch.name} 2>/dev/null`
+  BASH: `git push origin --delete {currentTask.branch.name} 2>/dev/null`
+  OUTPUT: "Deleted branch: {currentTask.branch.name}"
+
+### Switch to base branch
+BASH: `git checkout {currentTask.branch.baseBranch}`
+BASH: `git pull origin {currentTask.branch.baseBranch}`
+
+## Step 5: Update Workflow Phase
+
+SET: {now} = GetTimestamp()
+
+### Get merge commit
+BASH: `git rev-parse HEAD`
+SET: {mergeCommit} = result
+
+SET: currentTask.workflow.phase = "merge"
+SET: currentTask.workflow.checkpoints.merge = {
+  "completedAt": "{now}",
+  "data": {
+    "mergeCommit": "{mergeCommit}",
+    "prNumber": {prNumber},
+    "strategy": "{strategy}"
+  }
+}
+SET: currentTask.workflow.lastCheckpoint = "merge"
+
+WRITE: `{statePath}`
+
+## Step 6: Log Events
+
+APPEND to `{memoryPath}`:
+```json
+{"timestamp":"{now}","action":"phase_advanced","taskId":"{currentTask.id}","from":"review","to":"merge"}
+{"timestamp":"{now}","action":"checkpoint_completed","taskId":"{currentTask.id}","checkpoint":"merge","data":{"mergeCommit":"{mergeCommit}"}}
+```
+
+APPEND to `{syncPath}`:
+```json
+{"type":"workflow.phase_advanced","data":{"taskId":"{currentTask.id}","from":"review","to":"merge","mergeCommit":"{mergeCommit}"},"timestamp":"{now}"}
+```
+
+## Output
+
+```
+✓ PR Merged
+
+Task: {currentTask.description}
+PR: #{prNumber}
+Merge commit: {mergeCommit}
+Strategy: {strategy}
+
+Phase: merge (6/11 checkpoints)
+
+Workflow:
+1. analyze ✓
+2. branch ✓
+3. implement ✓
+4. test ✓
+5. review ✓
+6. merge ✓
+7-10. ship ← next
+
+Next: p. ship to release
+```
+
+## Error Handling
+
+| Error | Response | Action |
+|-------|----------|--------|
+| No project | "No prjct project" | STOP |
+| No active task | "No active task" | STOP |
+| Wrong phase | Show required phase | STOP |
+| No PR | "Run p. review first" | STOP |
+| Not approved | "Get approvals first" | STOP |
+| Conflicts | "Resolve conflicts" | STOP |
+| Merge fails | Show error | STOP |
+
+## Natural Language Triggers
+
+- `p. merge` -> /p:merge
+- `p. merge pr` -> /p:merge
+
+## References
+
+- Architecture: `~/.prjct-cli/docs/architecture.md`
+- Workflow: `~/.prjct-cli/docs/workflow.md`

package/templates/commands/p.md

@@ -0,0 +1,32 @@
+---
+description: 'prjct CLI - Developer momentum tool'
+allowed-tools: [Read, Write, Edit, Bash, Glob, Grep, Task, AskUserQuestion, TodoWrite]
+---
+
+# prjct Command Router
+
+Route `p. <command>` to the appropriate prjct command.
+
+## Instructions
+
+**ARGUMENTS**: $ARGUMENTS
+
+1. Parse ARGUMENTS: first word = `command`, rest = `commandArgs`
+2. Read the template file: `~/.claude/commands/p/{command}.md`
+3. Execute that template with `commandArgs` as the task description
+
+## Example
+
+If ARGUMENTS = "task fix the login bug":
+- command = "task"
+- commandArgs = "fix the login bug"
+- Read: `~/.claude/commands/p/task.md`
+- Execute with: "fix the login bug"
+
+## Available Commands
+
+`task` `done` `ship` `sync` `init` `idea` `dash` `next` `pause` `resume` `bug` `spec` `suggest` `git` `test` `cleanup` `design` `analyze` `undo` `redo`
+
+## Action
+
+NOW read the command template and execute it.

package/templates/commands/pause.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: [Read, Write, Bash]
+allowed-tools: [Read, Write, Bash, AskUserQuestion]
 description: 'Pause current session with reason'
 timestamp-rule: 'GetTimestamp() for all timestamps'
 architecture: 'Write-Through (JSON → MD → Events)'
@@ -89,15 +89,42 @@ IF {currentTask} is null OR {currentTask.status} != "active":
     OUTPUT: "⚠️ No active session to pause."
     STOP
 
-## Step 3: Get Pause Reason
+## Step 3: Get Pause Reason (AGENTIC)
 
 IF {reason} not provided:
-  ASK user to select reason (blocked, switch, break, research)
-  OR auto-detect "break" as default
+  USE AskUserQuestion:
+  ```
+  question: "Why are you pausing '{currentTask.description}'?"
+  header: "Pause Reason"
+  options:
+    - label: "Blocked"
+      description: "Waiting on external dependency"
+    - label: "Switching task"
+      description: "Starting a different, higher priority task"
+    - label: "Taking a break"
+      description: "Stepping away temporarily"
+    - label: "Researching"
+      description: "Need to investigate more before continuing"
+  ```
+
+  SET: {reason} = choice mapped to (blocked, switch, break, research)
 
 IF {reason} == "blocked":
-  ASK for blocker note: "What's blocking you?"
-  SET: {blockerNote} = user response
+  USE AskUserQuestion:
+  ```
+  question: "What's blocking you?"
+  header: "Blocker"
+  options:
+    - label: "Waiting for review"
+      description: "Code review or approval needed"
+    - label: "Waiting for API/credentials"
+      description: "External access or keys needed"
+    - label: "Waiting for clarification"
+      description: "Need more info on requirements"
+    - label: "Technical blocker"
+      description: "Dependency or infrastructure issue"
+  ```
+  SET: {blockerNote} = choice (user can also provide custom text)
 
 ## Step 4: Calculate Duration So Far
 
@@ -120,10 +147,16 @@ SET: {durationFormatted} = format as "Xh Ym" or "Xm"
   "pauseReason": "{reason}",
   "pauseNote": "{blockerNote}",
   "estimate": "{currentTask.estimate}",
-  "estimateSeconds": {currentTask.estimateSeconds}
+  "estimateSeconds": {currentTask.estimateSeconds},
+  "workflow": "{currentTask.workflow}",
+  "subtasks": "{currentTask.subtasks}",
+  "currentSubtaskIndex": {currentTask.currentSubtaskIndex},
+  "branch": "{currentTask.branch}"
 }
 ```
 
+**Note**: The workflow field is preserved so the task can resume at the correct phase.
+
 ### Update state.json
 READ: `{statePath}`
 SET: state.pausedTask = paused task object