@sienklogic/plan-build-run 2.11.0 → 2.12.1

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

@@ -5,66 +5,161 @@ allowed-tools: Read, Skill, AskUserQuestion
 argument-hint: "<freeform description of what you want to do>"
 ---
 
-**STOP — DO NOT READ THIS FILE. You are already reading it. This prompt was injected into your context by Claude Code's plugin system. Using the Read tool on this SKILL.md file wastes ~3,000 tokens. Begin executing Step 1 immediately.**
+**STOP -- DO NOT READ THIS FILE. You are already reading it. This prompt was injected into your context by Claude Code's plugin system. Using the Read tool on this SKILL.md file wastes ~3,000 tokens. Begin executing Step 1 immediately.**
 
-# /pbr:do — Freeform Task Router
+# /pbr:do -- Freeform Task Router
 
-You are running the **do** skill. Your job is to analyze freeform text from the user and route it to the most appropriate PBR skill. You are a dispatcher, not an executor — you never do the work yourself.
+You are running the **do** skill. Your job is to analyze freeform text from the user and route it to the most appropriate PBR skill. You are a dispatcher, not an executor -- you never do the work yourself.
 
-## Step 0 — Immediate Output
+## Step 0 -- Immediate Output
 
 **Before ANY tool calls**, display this banner:
 
 ```
 ╔══════════════════════════════════════════════════════════════╗
-║  PLAN-BUILD-RUN ► ROUTING                                    ║
+║  PLAN-BUILD-RUN ► DO                                        ║
 ╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
 
-## Step 1 — Validate Input
+## Step 1 -- Validate Input
 
 If `$ARGUMENTS` is empty, ask the user what they want to do via AskUserQuestion:
+
 ```
 What would you like to do? Describe the task, bug, or idea and I'll route it to the right skill.
 ```
 
-## Step 2 — Analyze and Route
+## Step 2 -- Analyze and Route
+
+### Step 2a -- Gather Context
+
+1. Read `.planning/STATE.md` to get `current_phase`, `status`, `phase_slug`.
+2. Check if `.planning/ROADMAP.md` exists (set `hasRoadmap`).
+3. Build context object: `{ activePhase: phase_slug, hasRoadmap: boolean }`.
+
+### Step 2b -- Check Config
+
+1. Read `.planning/config.json` if it exists.
+2. Check `features.natural_language_routing` (default: `true` if absent).
+3. Check `features.adaptive_ceremony` (default: `true` if absent).
+4. Check `ceremony_level` (default: `"auto"` if absent).
+
+### Step 2c -- Intent Classification
+
+**When NL routing is enabled** (`features.natural_language_routing` is true or absent):
 
-Evaluate `$ARGUMENTS` against these routing criteria. Apply the **first matching** rule:
+Score `$ARGUMENTS` against these route keyword groups:
 
-| If the text describes... | Route to | Why |
-|--------------------------|----------|-----|
-| A bug, error, crash, failure, or something broken | `/pbr:debug` | Needs systematic investigation |
-| Exploration, research, comparison, or "how does X work" | `/pbr:explore` | Open-ended investigation |
-| A complex task: refactoring, migration, multi-file architecture, system redesign | `/pbr:plan add` | Needs a full phase with research/plan/build cycle |
-| A review or quality concern about existing work | `/pbr:review` | Needs verification against plan |
-| A note, idea, or "remember to..." | `/pbr:note` | Capture for later |
-| A specific, actionable task (add feature, fix typo, update config, write test) | `/pbr:quick` | Self-contained, single executor |
+| Route | Keywords | Weight |
+|-------|----------|--------|
+| debug | bug, error, crash, fix, broken, failing, exception, stacktrace, debug | 1.0 |
+| explore | explore, research, investigate, how does, how do, understand, analyze, compare | 1.0 |
+| plan-phase | plan, architect, design, migrate, refactor across, redesign, system, new | 0.9 |
+| quick | add, create, update, change, rename, remove, write test, implement, feature, refactor | 0.85 |
+| note | remember, note, todo, idea, later, don't forget, remind | 1.0 |
+| validate-phase | validate, coverage gaps, test gaps, missing tests, untested, requirement coverage | 1.0 |
+| verify-work | review, check, verify, quality, looks right | 0.9 |
 
-**Ambiguity handling**: If the text could reasonably match multiple routes, ask the user via AskUserQuestion with the top 2-3 options. For example:
+**Scoring algorithm:**
+
+1. Count how many keywords from each route appear in the lowercased input.
+2. Calculate confidence per route: `(0.5 + 0.5 * (1 - 1/(matches+1))) * weight`.
+3. Apply context boosters:
+   - If there's a recent error in context: boost debug by +0.3.
+   - If an active phase exists: boost plan-phase by +0.1.
+   - If no roadmap exists: reduce plan-phase by -0.2.
+4. Clamp all scores to 0-1.
+
+**Routing decision:**
+
+- If top confidence >= 0.7: proceed with that route.
+- If top confidence < 0.7: present top 2-3 candidates to user via AskUserQuestion. Example:
 
 ```
-"Refactor the authentication system" could be:
-- /pbr:plan add — Full planning cycle (recommended for multi-file refactors)
-- /pbr:quick — Quick execution (if scope is small and clear)
+Your request could match several skills:
+- /pbr:quick (confidence: 0.65) -- Self-contained task execution
+- /pbr:debug (confidence: 0.55) -- Systematic bug investigation
+Which would you prefer?
 ```
 
-## Step 3 — Confirm and Dispatch
+**When NL routing is disabled** (`features.natural_language_routing` is false):
+
+Fall back to the original static table -- apply the **first matching** rule:
+
+| If the text describes... | Route to |
+|--------------------------|----------|
+| A bug, error, crash, failure, or something broken | `/pbr:debug` |
+| Exploration, research, comparison, or "how does X work" | `/pbr:explore` |
+| A complex task: refactoring, migration, multi-file architecture, system redesign | `/pbr:plan-phase add` |
+| Validation, coverage gaps, missing tests, or untested requirements | `/pbr:validate-phase` |
+| A review or quality concern about existing work | `/pbr:verify-work` |
+| A note, idea, or "remember to..." | `/pbr:note` |
+| A specific, actionable task (add feature, fix typo, update config, write test) | `/pbr:quick` |
+
+### Step 2d -- Risk Classification
+
+**When adaptive ceremony is enabled** (`features.adaptive_ceremony` is true or absent):
+
+Analyze `$ARGUMENTS` for risk signals:
+
+| Risk Level | Signal Keywords |
+|------------|----------------|
+| HIGH | migrate, redesign, refactor across, architecture, security, database schema, breaking change, entire, across |
+| MEDIUM | implement, create, integrate, add feature, new endpoint, write test, add, endpoint, api |
+| LOW | typo, rename, config, update, fix typo, comment, readme, docs |
+
+**Scoring:** HIGH signals add +3, MEDIUM signals add +1, LOW signals add -1 each. Additional context factors: 8+ files affected (+3), 3+ files (+1), 3+ subsystems (+5), no existing tests (+1).
+
+**Risk thresholds:** score >= 4 is HIGH, score >= 1 is MEDIUM, otherwise LOW.
+
+**Ceremony override:** If `ceremony_level` is NOT `"auto"`, skip risk classification and use the override directly:
+
+| ceremony_level | Ceremony |
+|----------------|----------|
+| low | inline |
+| medium | lightweight-plan |
+| high | full-plan-build-verify |
+
+**Risk-to-ceremony mapping** (when `ceremony_level` is `"auto"`):
+
+| Risk | Ceremony | Dispatch |
+|------|----------|----------|
+| low | inline | Route to `/pbr:quick` (inline execution, no plan file) |
+| medium | lightweight-plan | Route to `/pbr:quick` (with note to create a lightweight plan) |
+| high | full-plan-build-verify | Route to `/pbr:plan-phase add` (full plan-build-verify cycle) |
+
+**When adaptive ceremony is disabled** (`features.adaptive_ceremony` is false):
+
+Use the route from Step 2c without ceremony adjustment.
+
+## Step 3 -- Confirm and Dispatch
 
 Display the routing decision:
 
 ```
 **Input:** {first 80 chars of arguments}
+**Intent:** {skill} (confidence: {score})
+**Risk:** {low|medium|high} -- {top signal}
+**Ceremony:** {inline|lightweight-plan|full-plan-build-verify}
 **Routing to:** {chosen skill}
-**Reason:** {one-line explanation}
 ```
 
 Then invoke the chosen skill via the Skill tool, passing `$ARGUMENTS` as the args.
 
-**Special case for `/pbr:plan add`**: When routing to plan, check if `.planning/ROADMAP.md` exists first (via Read). If it doesn't, suggest `/pbr:begin` instead — the user needs to set up the project before they can add phases.
+**Special case for `/pbr:plan-phase add`**: When routing to plan, check if `.planning/ROADMAP.md` exists first (via Read). If it doesn't, suggest `/pbr:new-project` instead -- the user needs to set up the project before they can add phases.
 
-## Step 4 — No Follow-Up
+## Step 4 -- No Follow-Up
 
 After invoking the skill, your job is done. The dispatched skill handles everything from here (execution, commits, state updates). Do not add any additional output after the Skill tool call.
+
+## Feature Toggles
+
+These config properties in `.planning/config.json` control routing behavior:
+
+- `features.natural_language_routing: false` -- disables smart intent detection, falls back to static keyword table.
+- `features.adaptive_ceremony: false` -- disables risk-based ceremony selection, uses intent route directly.
+- `ceremony_level: "high"` -- forces full ceremony on everything (overrides risk classification).
+- `ceremony_level: "low"` -- forces inline ceremony on everything.
+- `ceremony_level: "auto"` -- (default) uses risk classification to determine ceremony.

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

@@ -23,23 +23,36 @@ Then proceed to Step 1.
 
 You are running the **explore** skill. Your job is to help the user think through ideas that might become a todo, requirement, phase, decision, or nothing yet. This is Socratic conversation, not requirements gathering. No phase number is needed.
 
-This skill runs **inline** (no Task delegation), with optional Task() spawns for context loading and mid-conversation research.
+This skill runs **inline** (no Task delegation), with optional Task() spawns for context loading, upfront research, and mid-conversation research.
+
+**CRITICAL: Agent type rule** — When spawning ANY research or analysis Task(), ALWAYS use `subagent_type: "pbr:researcher"`. NEVER use `general-purpose`, `Explore`, or other non-PBR agent types. The PreToolUse hook will block non-PBR agents.
+
+---
+
+## References
+
+- `references/questioning.md` — Questioning philosophy, progressive depth layers, Socratic patterns, anti-patterns (checklist walking, corporate speak)
+- `references/ui-brand.md` — Status symbols, banners, checkpoint boxes, progress display
 
 ---
 
 ## Context Budget
 
 Reference: `skills/shared/context-budget.md` for the universal orchestrator rules.
+Reference: `skills/shared/agent-type-resolution.md` for agent type fallback when spawning Task() subagents.
 
 Additionally for this skill:
 - **Minimize** file reads — this is a thinking skill, not a code analysis skill
-- **Delegate** deep research to a researcher subagent if investigation exceeds 3-4 file reads
+- **Delegate** deep research to a researcher subagent if investigation exceeds the read threshold:
+  - At context_window_tokens < 500000 (200k model): delegate after 3-4 file reads
+  - At context_window_tokens >= 500000 (1M model): delegate after 12 file reads
+  Check `context_window_tokens` in `.planning/config.json` to determine which limit applies.
 
 ---
 
-## How /pbr:explore Differs from /pbr:discuss
+## How /pbr:explore Differs from /pbr:discuss-phase
 
-| | /pbr:discuss | /pbr:explore |
+| | /pbr:discuss-phase | /pbr:explore |
 |---|---|---|
 | Purpose | Make decisions for a phase | Discover what you actually want |
 | Structure | Pre-computed gray areas with options | Open-ended Socratic conversation |
@@ -105,6 +118,31 @@ Reference `skills/shared/domain-probes.md` for technology-specific follow-up que
 
 ---
 
+## Upfront Research Delegation
+
+When the user's initial request is research-heavy (e.g., "explore best practices for X", "research how other projects do Y", "compare approaches to Z"), delegate immediately to `pbr:researcher` agents rather than doing inline research.
+
+**Detection**: If `$ARGUMENTS` contains words like "research", "compare", "explore examples", "best practices", "how do others", or describes gathering external information — this is an upfront research task.
+
+**Pattern**: Spawn one or more `pbr:researcher` agents in parallel, then synthesize their findings inline:
+
+```
+Task({
+  subagent_type: "pbr:researcher",
+  prompt: "<research_assignment>
+    Topic: {specific research question from user's request}
+    Output: Return findings as structured markdown in your response.
+    Mode: external-research
+
+    {detailed research instructions}
+  </research_assignment>"
+})
+```
+
+After researchers complete, synthesize findings inline and continue the Socratic conversation with the user about what was discovered.
+
+---
+
 ## Mid-Conversation Research
 
 When a knowledge gap emerges during the conversation — you're unsure about a library, pattern, or approach — surface it explicitly.
@@ -117,12 +155,31 @@ When a knowledge gap emerges during the conversation — you're unsure about a l
 
 **If research now:**
 
-Display to the user: `◐ Spawning researcher...`
+Display to the user: `◆ Spawning researcher...`
+
+**Learnings injection (opt-in):** Check for relevant tech stack learnings:
+
+```bash
+node {resolved_plugin_root}/scripts/pbr-tools.cjs learnings query --tags "stack,tech" 2>/dev/null
+```
+
+If non-empty JSON array returned:
+
+- Write to temp file: `node {resolved_plugin_root}/scripts/pbr-tools.cjs learnings query --tags "stack,tech" > /tmp/pbr-learnings-$$.md`
+- Note path as `{learnings_temp_path}`; add as item 3 in the researcher's `files_to_read` block below
+
+If no learnings or command fails: omit the extra files_to_read entry.
 
 ```
 Task({
   subagent_type: "pbr:researcher",
-  prompt: "<research_assignment>
+  prompt: "<files_to_read>
+    CRITICAL: Read these files BEFORE any other action:
+    1. .planning/CONTEXT.md — locked decisions and constraints (if exists)
+    2. .planning/STATE.md — current project state (if exists)
+    {if learnings_temp_path exists}3. {learnings_temp_path} — cross-project learnings (tech stack patterns from past PBR projects){/if}
+  </files_to_read>
+  <research_assignment>
     Topic: {specific research question}
     Output file: .planning/research/{topic-slug}.md
     Mode: project-research
@@ -134,7 +191,15 @@ Task({
 })
 ```
 
-After the researcher completes, display: `✓ Research complete — results in .planning/research/{topic-slug}.md`
+If `{learnings_temp_path}` was produced above, replace `{if...}{/if}` with the actual line. If no learnings were found, omit item 3 entirely.
+
+After the researcher completes, check for completion markers in the Task() output:
+
+- If `## RESEARCH COMPLETE` is present: proceed normally
+- If `## RESEARCH BLOCKED` is present: display the blocker reason and offer to retry:
+  `⚠ Research blocked: {reason}. Try a different angle or continue without research.`
+
+Display: `✓ Research complete — results in .planning/research/{topic-slug}.md`
 
 Then:
 - Read ONLY the frontmatter and summary section of the research file (not the full document)
@@ -209,6 +274,8 @@ Do NOT create any artifacts until the user selects "Approve all" on the final se
 
 ### Step 4: Create Artifacts
 
+**CRITICAL (no hook) -- DO NOT SKIP: Create target directories and write artifact files.**
+
 **Directory creation:** Before writing any artifact, ensure the target directory exists. Create `.planning/notes/`, `.planning/seeds/`, `.planning/research/`, or `.planning/todos/pending/` as needed if they don't already exist.
 
 Create only the approved artifacts. A single explore session can produce multiple outputs across different types.
@@ -234,11 +301,11 @@ After creating artifacts (or if user chose "Skip"), display:
 
 {Smart routing — pick the most relevant primary command:}
 - If a todo was created: **Manage tasks** → `/pbr:todo`
-- If a phase decision was captured: **Plan the phase** → `/pbr:plan {N}`
-- If a new phase was added: **Discuss the new phase** → `/pbr:discuss {N}`
-- If research questions were logged: **Plan with research** → `/pbr:plan {N}`
-- If current milestone is complete (STATE.md status is "milestone-complete"): **Start next milestone** → `/pbr:milestone new`
-- Default: **See project status** → `/pbr:status`
+- If a phase decision was captured: **Plan the phase** → `/pbr:plan-phase {N}`
+- If a new phase was added: **Discuss the new phase** → `/pbr:discuss-phase {N}`
+- If research questions were logged: **Plan with research** → `/pbr:plan-phase {N}`
+- If current milestone is complete (STATE.md status is "milestone-complete"): **Start next milestone** → `/pbr:new-milestone`
+- Default: **See project status** → `/pbr:progress`
 
 `{primary command}`
 
@@ -247,9 +314,9 @@ After creating artifacts (or if user chose "Skip"), display:
 
 
 **Also available:**
-- `/pbr:status` — see project status
+- `/pbr:progress` — see project status
 - `/pbr:continue` — execute next logical step
-- `/pbr:milestone new` — start a new milestone with new phases
+- `/pbr:new-milestone` — start a new milestone with new phases
 
 
 ```
@@ -347,6 +414,8 @@ Stage only the files created during this session. Do not stage unrelated changes
 
 ## Error Handling
 
+Reference: `skills/shared/error-reporting.md` for branded error output patterns.
+
 ### Researcher agent fails
 If a mid-conversation researcher Task() fails, display:
 ```
@@ -368,8 +437,6 @@ If the briefing Task() fails:
 
 ## Anti-Patterns
 
-Reference: `skills/shared/universal-anti-patterns.md` for rules that apply to ALL skills.
-
 Additionally for this skill:
 
 1. **DO NOT** act like an interviewer — be a thinking partner

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

@@ -2,6 +2,7 @@
 name: health
 description: "Check planning directory integrity. Find and fix corrupted state."
 allowed-tools: Read, Write, Bash, Glob, Grep, AskUserQuestion
+argument-hint: "[--repair]"
 ---
 
 **STOP — DO NOT READ THIS FILE. You are already reading it. This prompt was injected into your context by Claude Code's plugin system. Using the Read tool on this SKILL.md file wastes ~7,600 tokens. Begin executing Step 1 immediately.**
@@ -20,17 +21,28 @@ Then proceed to Step 1.
 
 # /pbr:health — Planning Directory Diagnostics
 
-You are running the **health** skill. Your job is to validate the integrity of the `.planning/` directory, report problems, and suggest targeted fixes. You never auto-repair anything.
+You are running the **health** skill. Your job is to validate the integrity of the `.planning/` directory, report problems, and suggest targeted fixes.
 
 This skill runs **inline**. It is read-only by default, but offers an optional **auto-fix** flow for common corruption patterns (see the Auto-Fix section below).
 
+## References
+
+- `references/questioning.md` — Questioning philosophy for diagnostic probing
+- `references/ui-brand.md` — Status symbols, banners, checkpoint boxes
+
+## Argument Parsing
+
+Check if the user passed `--repair`:
+- `--repair`: Skip the AskUserQuestion prompt in the Auto-Fix section and automatically apply ALL fixes (equivalent to selecting "Fix all"). Still create backups before any destructive operations.
+- No flag: Use the interactive AskUserQuestion flow as described below (default behavior).
+
 ---
 
 ## How Checks Work
 
-Each check follows the common pattern. Read `skills/health/templates/check-pattern.md.tmpl` for the shared execution flow: target files, validate against rules, classify as PASS/FAIL/WARN/INFO, and record the result with a fix suggestion for any failures.
+Each check follows the common pattern. Read `${CLAUDE_SKILL_DIR}/templates/check-pattern.md.tmpl` for the shared execution flow: target files, validate against rules, classify as PASS/FAIL/WARN/INFO, and record the result with a fix suggestion for any failures.
 
-Read `skills/health/templates/output-format.md.tmpl` for the output format: summary table, status indicators, issues list, optional recent decisions, and final result line.
+Read `${CLAUDE_SKILL_DIR}/templates/output-format.md.tmpl` for the output format: summary table, status indicators, issues list, optional recent decisions, and final result line.
 
 ---
 
@@ -50,11 +62,36 @@ Validate `.planning/` exists with required scaffolding: `STATE.md`, `config.json
 
 No .planning/ directory found.
 
-**To fix:** Run `/pbr:begin` to initialize.
+**To fix:** Run `/pbr:new-project` to initialize.
 ```
 Stop all further checks.
 - PASS: All three required files exist
-- FAIL: List each missing file — "Run `/pbr:begin` to re-initialize, or create the file manually."
+- FAIL: List each missing file — "Run `/pbr:new-project` to re-initialize, or create the file manually."
+
+**Advisory checks — WARN if missing, do not FAIL:**
+
+- `.planning/PROJECT.md`
+  If missing: `⚠ PROJECT.md not found. Run /pbr:new-project to generate it, or create from plugins/pbr/templates/PROJECT.md.tmpl.`
+  If present: Check for `## Context` section (merged from legacy CONTEXT.md). If missing: `⚠ PROJECT.md has no ## Context section. Run /pbr:new-project to regenerate, or add manually.`
+
+- `.planning/REQUIREMENTS.md`
+  If missing: `⚠ REQUIREMENTS.md not found. Run /pbr:new-project to generate it, or create from plugins/pbr/templates/REQUIREMENTS.md.tmpl.`
+
+**Merged state validation:**
+
+- `.planning/STATE.md` ## History section:
+  If STATE.md exists but has no `## History` section: `⚠ STATE.md has no ## History section. History will be tracked once a milestone completes.`
+
+- `.phase-manifest.json` for completed phases:
+  For each phase marked as verified/complete in ROADMAP.md, check if `.planning/phases/{NN}-{slug}/.phase-manifest.json` exists.
+  If missing: `⚠ Phase {N} has no .phase-manifest.json. Undo operations will fall back to git log scanning.`
+
+**Legacy file detection:**
+
+- If `.planning/CONTEXT.md` exists alongside `PROJECT.md` with `## Context` section: `⚠ Legacy CONTEXT.md detected alongside merged PROJECT.md. Run /pbr:new-project to migrate — the legacy file can be removed.`
+- If `.planning/HISTORY.md` exists alongside `STATE.md` with `## History` section: `⚠ Legacy HISTORY.md detected alongside merged STATE.md. Run /pbr:new-project to migrate — the legacy file can be removed.`
+
+These files are generated by /pbr:new-project. Absence is expected on projects created before v2.15.
 
 ### Check 2: Config Validity
 
@@ -80,7 +117,7 @@ Glob all `PLAN*.md` and `SUMMARY*.md` in `.planning/phases/`. Match by plan numb
 
 - PASS: All pairings valid, no orphaned summaries
 - FAIL (orphaned summary): SUMMARY has no matching PLAN — "Verify and remove or re-pair."
-- WARN (missing summary in complete phase): Phase marked complete but plan has no SUMMARY — "Execute with `/pbr:build` or mark phase incomplete."
+- WARN (missing summary in complete phase): Phase marked complete but plan has no SUMMARY — "Execute with `/pbr:execute-phase` or mark phase incomplete."
 
 ### Check 5: STATE.md Accuracy
 
@@ -128,9 +165,9 @@ Read `.planning/config.json` and check for fields referenced by skills:
 - `planning.commit_docs` (import, discuss, quick skills) — must be a boolean; validate that the value is strictly `true` or `false`, not a string or number
 
 - PASS: All expected fields present with correct types
-- WARN (missing fields): Report each missing field and which skill uses it — "Run `/pbr:config` to set all options."
+- WARN (missing fields): Report each missing field and which skill uses it — "Run `/pbr:settings` to set all options."
 
-### Check 10: Orphaned Crash Recovery Files
+### Check 10: Orphaned Crash Recovery & Lock Files
 
 The executor creates `.PROGRESS-{plan_id}` files as crash recovery breadcrumbs during builds and deletes them after `SUMMARY.md` is written. Similarly, `.checkpoint-manifest.json` files track checkpoint state during execution. If the executor crashes mid-build, these files remain and could confuse future runs.
 
@@ -142,13 +179,20 @@ Glob for `.planning/phases/**/.PROGRESS-*` and `.planning/phases/**/.checkpoint-
   Orphaned progress files detected:
   - .planning/phases/02-auth/.PROGRESS-02-01 (executor may have crashed)
   ```
-  Fix suggestion: "These are crash recovery breadcrumbs from interrupted builds. Safe to delete if no `/pbr:build` is currently running. Remove with `rm <path>`."
+  Fix suggestion: "These are crash recovery breadcrumbs from interrupted builds. Safe to delete if no `/pbr:execute-phase` is currently running. Remove with `rm <path>`."
 - WARN (orphaned checkpoint manifests): List each file:
   ```
   Orphaned checkpoint manifests detected:
   - .planning/phases/02-auth/.checkpoint-manifest.json (stale build checkpoint)
   ```
-  Fix suggestion: "Checkpoint manifests are leftover from interrupted builds. Safe to delete if no `/pbr:build` is currently running. Remove with `rm <path>`."
+  Fix suggestion: "Checkpoint manifests are leftover from interrupted builds. Safe to delete if no `/pbr:execute-phase` is currently running. Remove with `rm <path>`."
+
+Also check for `.planning/.active-skill`:
+
+- If the file does not exist: no action needed (PASS for this sub-check)
+- If the file exists, check its age by comparing the file modification time to the current time:
+  - If older than 1 hour: WARN with fix suggestion: "Stale .active-skill lock file detected (set {age} ago). No PBR skill appears to be running. Safe to delete with `rm .planning/.active-skill`."
+  - If younger than 1 hour: INFO: "Active skill lock exists ({content}). A PBR skill may be running."
 
 ---
 
@@ -160,7 +204,7 @@ After running all 10 checks and collecting results, if any of the following auto
 
 | Pattern | Detection | Fix Action |
 |---------|-----------|------------|
-| Missing STATE.md frontmatter | Check 5 finds STATE.md without `---` block | Regenerate frontmatter from ROADMAP.md phase data (current_phase, total_phases, status) |
+| Missing STATE.md frontmatter | Check 5 finds STATE.md without `---` block | Regenerate frontmatter from ROADMAP.md phase data (current_phase, phase_slug, status) |
 | STATE.md phase_slug mismatch | Check 5/7 finds phase_slug doesn't match current phase directory name | Correct phase_slug to match the actual directory name in `.planning/phases/` |
 | Missing config.json | Check 1/2 finds no `.planning/config.json` | Create with default config template (same as `/pbr:setup` defaults) |
 | Orphaned .active-skill file | Check 10 or general scan finds `.planning/.active-skill` older than 1 hour | Delete the stale `.active-skill` file |
@@ -171,7 +215,20 @@ After running all 10 checks and collecting results, if any of the following auto
 
 After displaying health check results, if any auto-fixable issues were detected:
 
-1. Count the auto-fixable issues and present:
+**CRITICAL — Before ANY auto-fix that modifies or regenerates STATE.md (frontmatter regeneration, phase_slug correction, or line compaction), you MUST create a timestamped backup first. DO NOT SKIP THIS STEP.**
+
+```
+mkdir -p .planning/backups
+cp .planning/STATE.md .planning/backups/STATE-$(date +%Y%m%dT%H%M%S).md
+```
+
+This ensures the user can recover the original STATE.md if the fix produces incorrect results.
+
+1. Count the auto-fixable issues.
+
+   **If `--repair` flag was passed**: Skip the question and go directly to "Fix all" (step 2). Display: "Auto-repair mode: applying {N} fixes..."
+
+   **Otherwise**: Present the choice:
 
    Use AskUserQuestion:
      question: "Found {N} auto-fixable issues. How should we handle them?"
@@ -181,7 +238,7 @@ After displaying health check results, if any auto-fixable issues were detected:
        - label: "Review each"   description: "Show each fix and confirm individually"
        - label: "Skip"          description: "Do nothing — just report"
 
-2. If "Fix all": Apply all fixes in order, then display a summary:
+2. If "Fix all" (or `--repair`): Apply all fixes in order, then display a summary:
    ```
    Auto-fix results:
    - Fixed: {description of fix 1}
@@ -200,8 +257,6 @@ After displaying health check results, if any auto-fixable issues were detected:
 
 4. If "Skip": Do nothing, continue to the rest of the output.
 
-**Note:** When auto-fix is active, the health skill is no longer strictly read-only. The `allowed-tools` frontmatter must include `Write` and `AskUserQuestion` for auto-fix to work. Update the frontmatter accordingly.
-
 ---
 
 ## Bonus: Recent Decisions
@@ -210,6 +265,8 @@ After all checks, look for `.planning/logs/decisions.jsonl`. If it exists, displ
 
 ---
 
+Reference: `skills/shared/error-reporting.md` for branded error output patterns.
+
 ## Completion
 
 After all checks complete, display the branded result:
@@ -230,7 +287,7 @@ After all checks complete, display the branded result:
 
 **Continue your workflow** — planning directory is healthy
 
-`/pbr:status`
+`/pbr:progress`
 
 <sub>`/clear` first → fresh context window</sub>
 
@@ -238,7 +295,7 @@ After all checks complete, display the branded result:
 
 **Also available:**
 - `/pbr:continue` — execute next logical step
-- `/pbr:config` — adjust settings
+- `/pbr:settings` — adjust settings
 
 
 ```