@sienklogic/plan-build-run 2.1.0 → 2.1.1

package/plugins/pbr/skills/plan/templates/completion-output.md.tmpl

@@ -0,0 +1,27 @@
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PLANNING PHASE {N} ✓                       ║
+╚══════════════════════════════════════════════════════════════╝
+
+**Phase {N}: {phase-name}** — {plan_count} plans created
+
+Plans:
+{plan_list_lines}
+
+Wave execution:
+{wave_table_lines}
+
+---
+
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
+
+**Build Phase {N}** — execute these plans
+
+/pbr:execute-phase {N}
+
+<sub>/clear first → fresh context window</sub>
+
+**Also available:**
+- /pbr:plan-phase {N} --assumptions — review assumptions first
+- /pbr:discuss-phase {N} — talk through details before building

package/plugins/pbr/skills/plan/templates/planner-prompt.md.tmpl

@@ -31,7 +31,7 @@ Key rules:
 4. Every task needs all 5 elements: name, files, action, verify, done
 5. Honor all locked decisions from CONTEXT.md
 6. Do NOT include deferred ideas
-7. Write plan files to: .planning/phases/{NN}-{slug}/{phase}-{plan_num}-PLAN.md
+7. Write plan files to: .planning/phases/{NN}-{slug}/PLAN-{plan_num}.md
 8. If any task requires env vars, API keys, or external service setup, note it in the task's <action> — the executor will generate USER-SETUP.md automatically
 
 Use the Write tool to create each plan file.

package/plugins/pbr/skills/profile/SKILL.md

@@ -0,0 +1,173 @@
+---
+name: profile
+description: "Switch the active model profile. Presets: quality, balanced, budget, adaptive. Supports custom profiles from config.json model_profiles."
+allowed-tools: Read, Write, Bash, AskUserQuestion
+argument-hint: "[quality|balanced|budget|adaptive|<custom>]"
+---
+
+**STOP — DO NOT READ THIS FILE. You are already reading it. This prompt was injected into your context by Claude Code's plugin system. Begin executing Step 0 immediately.**
+
+# /pbr:set-profile — Model Profile Manager
+
+You are running the **profile** skill. Your job is to show the current model profile or switch to a new one by writing model assignments to `.planning/config.json`.
+
+## Step 0 — Immediate Output
+
+**Before ANY tool calls**, display this banner:
+
+```
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► MODEL PROFILE                              ║
+╚══════════════════════════════════════════════════════════════╝
+```
+
+Then proceed to Step 1.
+
+## Step 1 — Load Config
+
+Read `.planning/config.json`.
+
+If the file does not exist, output:
+
+```
+Error: .planning/config.json not found. Run /pbr:new-project first.
+```
+
+Stop immediately.
+
+## Step 2 — Parse Arguments
+
+Extract the first word from `$ARGUMENTS` as the profile name. Trim whitespace.
+
+- If `$ARGUMENTS` is empty or blank → **show-mode** (go to Step 3).
+- If a profile name is present → **switch-mode** (go to Step 4).
+
+## Step 3 — Show Mode (no argument)
+
+Display the current profile status and available options.
+
+1. Read `config.json` key `model_profile`. If absent, treat as `"balanced"`.
+2. Read `config.json` key `models` (object). If absent, use empty object.
+3. Read `config.json` key `model_profiles` (object, optional custom profiles). If absent, use empty object.
+
+Output the following (fill in actual values):
+
+```
+Active profile: <model_profile value>
+
+Current model assignments:
+  researcher          : <models.researcher or "not set">
+  planner             : <models.planner or "not set">
+  executor            : <models.executor or "not set">
+  verifier            : <models.verifier or "not set">
+  integration_checker : <models.integration_checker or "not set">
+  debugger            : <models.debugger or "not set">
+  mapper              : <models.mapper or "not set">
+  synthesizer         : <models.synthesizer or "not set">
+
+Available presets:
+  quality   — all agents use opus (maximum capability)
+  balanced  — mix of sonnet/inherit/haiku (default)
+  budget    — all agents use haiku (minimum cost)
+  adaptive  — sonnet for planning/verification, inherit/haiku for execution
+```
+
+If `model_profiles` has any keys, also display:
+
+```
+Custom profiles:
+  <profile-name>  — <key count> model overrides
+```
+
+Output: "Run `/pbr:set-profile <name>` to switch profiles."
+
+Stop. Do not write anything.
+
+## Step 4 — Switch Mode (argument provided)
+
+### Step 4a — Validate Profile Name
+
+Built-in preset names: `quality`, `balanced`, `budget`, `adaptive`.
+
+Custom profile names: keys in `config.json model_profiles` (if any).
+
+If the provided name does not match any of the above:
+
+```
+Error: Unknown profile "<name>".
+
+Valid presets: quality, balanced, budget, adaptive
+<list any custom profile names from config.json model_profiles, if any>
+
+Run `/pbr:set-profile` to see the current status.
+```
+
+Stop immediately.
+
+### Step 4b — Resolve Model Values
+
+Use the preset table to resolve model values:
+
+| Agent               | quality | balanced | budget | adaptive |
+|---------------------|---------|----------|--------|----------|
+| researcher          | opus    | sonnet   | haiku  | sonnet   |
+| planner             | opus    | inherit  | haiku  | sonnet   |
+| executor            | opus    | inherit  | haiku  | inherit  |
+| verifier            | opus    | sonnet   | haiku  | sonnet   |
+| integration_checker | sonnet  | sonnet   | haiku  | haiku    |
+| debugger            | opus    | inherit  | haiku  | inherit  |
+| mapper              | sonnet  | sonnet   | haiku  | haiku    |
+| synthesizer         | sonnet  | haiku    | haiku  | haiku    |
+
+For a **custom profile** (name found in `config.json model_profiles`):
+- Start with the `balanced` defaults from the table above.
+- Overlay any keys present in `config.json model_profiles[<name>]`.
+- Any agents not specified in the custom profile use the balanced default.
+
+### Step 4c — Write to config.json
+
+Update `config.json` using the Bash tool with `node -e` inline script:
+
+```bash
+node -e "
+const fs = require('fs');
+const cfg = JSON.parse(fs.readFileSync('.planning/config.json', 'utf8'));
+cfg.model_profile = '<name>';
+cfg.models = cfg.models || {};
+cfg.models.researcher = '<value>';
+cfg.models.planner = '<value>';
+cfg.models.executor = '<value>';
+cfg.models.verifier = '<value>';
+cfg.models.integration_checker = '<value>';
+cfg.models.debugger = '<value>';
+cfg.models.mapper = '<value>';
+cfg.models.synthesizer = '<value>';
+fs.writeFileSync('.planning/config.json', JSON.stringify(cfg, null, 2));
+console.log('OK');
+"
+```
+
+Replace each `<value>` with the resolved model string for that agent. Replace `<name>` with the profile name.
+
+### Step 4d — Confirm
+
+Output:
+
+```
+Active profile set to: <name>
+
+Model assignments updated:
+  researcher          : <value>
+  planner             : <value>
+  executor            : <value>
+  verifier            : <value>
+  integration_checker : <value>
+  debugger            : <value>
+  mapper              : <value>
+  synthesizer         : <value>
+
+Config written to .planning/config.json.
+Run /pbr:set-profile to verify.
+```
+
+Stop. Done.

package/plugins/pbr/skills/quick/SKILL.md

@@ -19,13 +19,18 @@ This skill **spawns a single Task(subagent_type: "pbr:executor")** for execution
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► QUICK TASK
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► QUICK TASK                                 ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
 
+## References
+
+- `references/questioning.md` — Questioning philosophy and progressive depth patterns
+- `references/ui-brand.md` — Status symbols, banners, checkpoint boxes, progress display
+
 ## Context Budget
 
 Reference: `skills/shared/context-budget.md` for the universal orchestrator rules.
@@ -35,6 +40,21 @@ Additionally for this skill:
 - **Never** skip creating `.planning/quick/{NNN}-{slug}/` and writing PLAN.md — even trivial tasks need tracking artifacts
 - **Minimize** reading executor output into main context — read only SUMMARY.md frontmatter
 
+## Composable Flags
+
+Parse `$ARGUMENTS` for optional flags before extracting the task description:
+
+- **`--discuss`**: Include a brief discussion step before building. When passed, after Step 3 (Validate Scope), ask 2-3 clarifying questions about the approach before generating the plan. This adds a lightweight discussion without the full `/pbr:discuss-phase` overhead.
+- **`--full`**: Run the complete begin-plan-build chain. When passed, instead of the quick task flow, chain directly: `Skill({ skill: "pbr:plan", args: "" })` with the task description carried over. This escalates to the full pipeline including research.
+
+Strip these flags from `$ARGUMENTS` before using the remainder as the task description.
+
+**Flag combinations:**
+- `--discuss` alone: Quick task with brief discussion step
+- `--full` alone: Escalate to full pipeline
+- `--discuss --full`: Escalate to full pipeline (--full takes precedence)
+- No flags: Standard quick task flow
+
 ## Core Principle
 
 **Quick tasks are for small, well-defined work.** If the user describes something that would take more than 3-5 tasks or touches multiple subsystems, suggest using the full plan/build cycle instead.
@@ -45,13 +65,17 @@ Additionally for this skill:
 
 ### Step 1: Check Project Context
 
+**Init-first pattern**: When spawning agents, pass the output of `node plugins/pbr/scripts/pbr-tools.js init quick "{description}"` as context rather than having the agent read multiple files separately. This reduces file reads and prevents context-loading failures.
+
 1. Check if `.planning/` directory exists
    - If yes: read config.json for settings
-   - If no: create `.planning/` directory first, then warn "No Plan-Build-Run project found. This will create a standalone quick task. Consider running `/pbr:begin` first for full project tracking."
+   - If no: create **both** `.planning/` and `.planning/quick/` directories, then warn "No Plan-Build-Run project found. This will create a standalone quick task. Consider running `/pbr:new-project` first for full project tracking."
 
-2. **After** confirming `.planning/` directory exists (created in step 1 if needed), write `.planning/.active-skill` with the content `quick` (single word, no newline). This registers you with the workflow enforcement hook — it will block source code writes until PLAN.md exists.
+2. If `.planning/` exists but `.planning/quick/` does not: create `.planning/quick/` now. **Every quick task gets tracked in `.planning/quick/` — this directory MUST exist before Step 4.**
 
-3. Check if ROADMAP.md exists
+3. **After** confirming both directories exist, write `.planning/.active-skill` with the content `quick` (single word, no newline). This registers you with the workflow enforcement hook — it will block source code writes until PLAN.md exists.
+
+4. Check if ROADMAP.md exists
    - If yes: note the current phase context (quick tasks may relate to the active phase)
    - If no: proceed without phase context
 
@@ -79,17 +103,19 @@ Use AskUserQuestion:
   header: "Scope"
   options:
     - label: "Quick task"  description: "Execute as lightweight task"
-    - label: "Full plan"   description: "Switch to /pbr:plan for proper planning"
+    - label: "Full plan"   description: "Switch to /pbr:plan-phase for proper planning"
     - label: "Revise"      description: "Let me rewrite the task description"
   multiSelect: false
 
 If user selects "Quick task": continue to Step 4.
-If user selects "Full plan": respond "Use `/pbr:plan` to create a full planning cycle for this task." and stop.
+If user selects "Full plan": clean up `.active-skill` if it exists, then chain directly: `Skill({ skill: "pbr:plan", args: "" })`. The user's task description carries over in conversation context — the plan skill will pick it up.
 If user selects "Revise": go back to Step 2 to get a new task description.
 If user types something else (freeform): interpret their response and proceed accordingly.
 
 ### Step 4: Generate Slug and Task Number
 
+**CRITICAL (no hook): You MUST complete Steps 4, 5, and 6 before any executor is spawned. If you skip these steps, the quick task will have no tracking artifacts and no PLAN.md for the executor to follow. This is the #1 failure mode of this skill.**
+
 **Generate slug:**
 - Take the first 4-5 meaningful words from the description
 - Lowercase, hyphen-separated
@@ -105,8 +131,12 @@ If user types something else (freeform): interpret their response and proceed ac
 
 ### Step 5: Create Quick Task Directory
 
+**STOP — Use the Write or Bash tool RIGHT NOW to create this directory. Do not skip this step.**
+
 Create: `.planning/quick/{NNN}-{slug}/`
 
+Verify the directory exists with `ls .planning/quick/{NNN}-{slug}/` before proceeding. If the directory doesn't exist, you have a bug — go back and create it.
+
 ### Step 6: Create Minimal PLAN.md
 
 Write `.planning/quick/{NNN}-{slug}/PLAN.md`:
@@ -140,17 +170,37 @@ Before proceeding to Step 7, confirm these exist on disk:
 
 If either check fails, you have skipped steps. Go back and complete Steps 4-6. Do NOT proceed to spawning an executor.
 
+### Step 6b: Local LLM Task Validation (optional, advisory)
+
+If `config.local_llm.enabled` is `true`, run a quick scope validation before spawning:
+
+```bash
+node ${CLAUDE_PLUGIN_ROOT}/scripts/pbr-tools.js llm classify PLAN ".planning/quick/{NNN}-{slug}/PLAN.md"
+```
+
+- If classification is `"stub"` with confidence >= 0.7: warn `"⚠ Plan looks like a stub — executor may struggle. Consider adding more detail to task descriptions."`
+- If the command fails or returns null: skip silently (local LLM unavailable)
+- This is advisory only — never block on the result
+
 ### Step 7: Spawn Executor
 
 **Pre-spawn check** — Verify `.planning/quick/{NNN}-{slug}/PLAN.md` exists and contains at least one `<task>` block. If missing, STOP and complete Steps 4-6 first.
 
-Display to the user: `◐ Spawning executor...`
+Display to the user: `◆ Spawning executor...`
 
 Spawn a `Task(subagent_type: "pbr:executor")` with the following prompt:
 
+> **Completion markers**: After executor completes, check for `## PLAN COMPLETE` or `## PLAN FAILED`. Route accordingly.
+
 ```
 You are executor. Execute the following quick task plan.
 
+<files_to_read>
+CRITICAL (no hook): Read these files BEFORE any other action:
+1. .planning/quick/{NNN}-{slug}/PLAN.md — the quick task plan with task details
+2. .planning/STATE.md — current project state and progress (if exists)
+</files_to_read>
+
 Plan file: .planning/quick/{NNN}-{slug}/PLAN.md
 Phase: quick
 Plan ID: {NNN}
@@ -173,6 +223,17 @@ After the executor completes:
    - `partial` — some tasks completed, others failed
    - `failed` — task failed entirely
 
+### Step 8b: Spot-Check Executor Output
+
+CRITICAL (no hook): Verify executor output before proceeding.
+
+1. **SUMMARY.md exists**: Check `.planning/quick/{NNN}-{slug}/SUMMARY.md` exists
+2. **Key files exist**: Verify first 2 files from SUMMARY.md `key_files` frontmatter exist on disk
+3. **Commits present**: Run `git log --oneline -5` and verify at least one commit matches the task scope
+4. **Self-check status**: Look for `## Self-Check: FAILED` in SUMMARY.md — if present, warn the user
+
+If ANY spot-check fails, present the user with options: **Retry** / **Continue anyway** / **Abort**
+
 ### Step 9: Update STATE.md
 
 If STATE.md exists, update the Quick Tasks section.
@@ -210,6 +271,24 @@ If `planning.commit_docs: true` in config.json:
 - Stage STATE.md changes
 - Commit: `docs(planning): quick task {NNN} - {slug}`
 
+### Step 11b: Check Pending Todos
+
+After completing work, check if any pending todos are now satisfied:
+
+1. Check if `.planning/todos/pending/` exists and contains files
+2. If no pending todos: skip to Step 12
+3. If pending todos exist:
+   a. Read the title and description from each pending todo's YAML frontmatter
+   b. Compare each todo against the work just completed (the task description, files changed, commits made)
+   c. If a todo is **clearly satisfied** by the work (the todo's goal matches what was built):
+      - Move it: read the file, update `status: done`, add `completed: {YYYY-MM-DD}`, write to `.planning/todos/done/{filename}`, delete from `pending/` via Bash `rm`
+      - Display: `✓ Auto-closed todo {NNN}: {title} (satisfied by quick task {NNN})`
+   d. If a todo is **partially related** but not fully satisfied: do NOT close it, but mention it:
+      - Display: `ℹ Related pending todo {NNN}: {title} — may be partially addressed`
+   e. If a todo is unrelated: skip silently
+
+**Important:** Only auto-close todos where the match is unambiguous. When in doubt, leave it open — false closures are worse than missed closures.
+
 ### Step 12: Report Results
 
 **Artifact check** — Before reporting, verify all required artifacts exist:
@@ -224,36 +303,41 @@ Display results to the user with branded output:
 
 **If completed:**
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► QUICK TASK COMPLETE ✓
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► QUICK TASK COMPLETE ✓                      ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Quick Task {NNN}:** {description}
 Commit: {hash} — {commit message}
 Files: {list of files changed}
 
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Continue your workflow** — task complete
 
-`/pbr:status`
+`/pbr:progress`
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
+
 
 **Also available:**
 - `/pbr:continue` — execute next logical step
-- `/pbr:todo list` — see pending todos
+- `/pbr:check-todos` — see pending todos
+
 
-───────────────────────────────────────────────────────────────
 ```
 
 **If partial:**
 ```
-⚠ Quick Task {NNN}: {description}
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► QUICK TASK {NNN} PARTIAL ⚠                ║
+╚══════════════════════════════════════════════════════════════╝
+
 Completed: {N} of {M} tasks
 Failed task: {task name} — {failure reason}
 
@@ -349,6 +433,6 @@ Choose verification based on context:
 6. **DO NOT** skip the SUMMARY.md — even quick tasks need documentation
 7. **DO NOT** use `git add .` — stage specific files only
 8. **DO NOT** skip verification — every task needs a verify step
-9. **DO NOT** create a quick task for something that needs planning — suggest `/pbr:plan`
+9. **DO NOT** create a quick task for something that needs planning — suggest `/pbr:plan-phase`
 10. **DO NOT** modify STATE.md if it doesn't exist (other than warning)
 11. **DO NOT** break the numbering sequence — always find the next number

package/plugins/pbr/skills/resume/SKILL.md

@@ -11,14 +11,14 @@ allowed-tools: Read, Write, Bash, Glob, Grep, AskUserQuestion
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► RESUMING SESSION
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► RESUMING SESSION                           ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
 
-# /pbr:resume — Resume Previous Session
+# /pbr:resume-work — Resume Previous Session
 
 You are running the **resume** skill. Your job is to find the last pause point, restore context for the user, and suggest the next action so they can continue seamlessly.
 
@@ -147,9 +147,9 @@ Use the selected pause point for the rest of the resume flow.
 3. Display the resume context using the branded banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► SESSION RESTORED ✓
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► SESSION RESTORED ✓                         ║
+╚══════════════════════════════════════════════════════════════╝
 
 Resuming session from {pause date}
 
@@ -182,9 +182,11 @@ Blockers:
 
 **If only one clear next action exists**, present it with branded routing:
 ```
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **{explanation from continue-here}**
 
@@ -192,7 +194,7 @@ Blockers:
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
+
 ```
 
 **If multiple reasonable actions exist** (e.g., the continue-here suggests one thing but the filesystem state suggests another), use the **action-routing** pattern (see `skills/shared/gate-prompts.md`):
@@ -203,7 +205,7 @@ Use AskUserQuestion:
   options:
     - label: "{continue-here suggestion}"   description: "Resume from pause point"
     - label: "{filesystem-inferred action}"  description: "Based on current state"
-    - label: "Show status"                   description: "Run /pbr:status for full overview"
+    - label: "Show status"                   description: "Run /pbr:progress for full overview"
     - label: "Something else"                description: "Enter a different command"
   multiSelect: false
 
@@ -234,7 +236,7 @@ Progress: {completed}/{total} plans complete
 {Plans with summaries listed as complete}
 {Plans without summaries listed as remaining}
 
-Note: No detailed pause context available. Run `/pbr:status` for a full overview.
+Note: No detailed pause context available. Run `/pbr:progress` for a full overview.
 ```
 
 5. Suggest the next action based on phase state using the **action-routing** pattern:
@@ -243,10 +245,10 @@ Use AskUserQuestion:
   question: "What would you like to do next?"
   header: "Next Step"
   options: (build dynamically from phase state)
-    - label: "/pbr:build {N}"       description: "Continue building (plans remaining)"
-    - label: "/pbr:review {N}"      description: "Review completed phase"
-    - label: "/pbr:plan {N} --gaps" description: "Fix verification gaps"
-    - label: "/pbr:plan {N+1}"      description: "Plan the next phase"
+    - label: "/pbr:execute-phase {N}"       description: "Continue building (plans remaining)"
+    - label: "/pbr:verify-work {N}"      description: "Review completed phase"
+    - label: "/pbr:plan-phase {N} --gaps" description: "Fix verification gaps"
+    - label: "/pbr:plan-phase {N+1}"      description: "Plan the next phase"
   multiSelect: false
 
 Show only the options that apply to the current state (1-3 real options + "Something else").
@@ -264,7 +266,7 @@ When neither .continue-here.md nor STATE.md position data exists:
 
      No Plan-Build-Run project found.
 
-     **To fix:** Run `/pbr:begin` to start a new project, or `/pbr:scan` to analyze an existing codebase.
+     **To fix:** Run `/pbr:new-project` to start a new project, or `/pbr:map-codebase` to analyze an existing codebase.
      ```
    - Stop here.
 
@@ -301,7 +303,7 @@ Phase {N}: {name}
 - {X} of {Y} plans completed
 - Last activity: {date from most recent SUMMARY.md or git log}
 
-Suggested: Run `/pbr:status` for a full overview, then choose your next action.
+Suggested: Run `/pbr:progress` for a full overview, then choose your next action.
 ```
 
 ---
@@ -312,13 +314,13 @@ After displaying context, route to the appropriate action:
 
 | Situation | Suggested Action |
 |-----------|-----------------|
-| Mid-phase, plans remaining | `/pbr:build {N}` (executor will skip completed plans) |
-| Phase complete, not reviewed | `/pbr:review {N}` |
-| Phase reviewed, has gaps | `/pbr:plan {N} --gaps` |
-| Phase complete and verified | `/pbr:plan {N+1}` |
-| Between milestones | `/pbr:milestone new` |
+| Mid-phase, plans remaining | `/pbr:execute-phase {N}` (executor will skip completed plans) |
+| Phase complete, not reviewed | `/pbr:verify-work {N}` |
+| Phase reviewed, has gaps | `/pbr:plan-phase {N} --gaps` |
+| Phase complete and verified | `/pbr:plan-phase {N+1}` |
+| Between milestones | `/pbr:new-milestone` |
 | Active debug session | `/pbr:debug` (will offer to resume) |
-| Pending todos exist | Mention: "Also {count} pending todos. `/pbr:todo list`" |
+| Pending todos exist | Mention: "Also {count} pending todos. `/pbr:check-todos`" |
 
 ---
 
@@ -348,7 +350,7 @@ For each plan file in the current phase:
 
 If .continue-here.md is more than 7 days old:
 - Warn: "This pause point is {N} days old. The codebase may have changed."
-- Suggest: "Run `/pbr:status` to verify the current state before continuing."
+- Suggest: "Run `/pbr:progress` to verify the current state before continuing."
 
 ---
 
@@ -358,7 +360,7 @@ If .continue-here.md is more than 7 days old:
 - Warn about each missing file
 - Attempt to find equivalent files (renamed, moved)
 - If phase directory is gone: "Phase {N} directory was removed. This pause point is invalid."
-- Suggest `/pbr:status` for recovery
+- Suggest `/pbr:progress` for recovery
 
 ### Git history doesn't match .continue-here.md
 - Commits referenced in the handoff may have been rebased, amended, or rolled back
@@ -385,7 +387,7 @@ If .continue-here.md is more than 7 days old:
 
   Project was initialized but no work has been done.
 
-  **To fix:** Run `/pbr:plan 1` to start planning, or `/pbr:discuss 1` to talk through the first phase.
+  **To fix:** Run `/pbr:plan-phase 1` to start planning, or `/pbr:discuss-phase 1` to talk through the first phase.
   ```
 
 ---