@sienklogic/plan-build-run 2.10.0 → 2.11.0

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

@@ -12,9 +12,9 @@ argument-hint: "<phase-number> [--from <filepath>] [--skip-checker]"
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► IMPORTING PLAN
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► IMPORTING PLAN                             ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -51,11 +51,12 @@ Reference: `skills/shared/config-loading.md` for the tooling shortcut and config
 1. Parse `$ARGUMENTS` for phase number
 2. Parse optional `--from <filepath>` flag (path to the external document to import)
 3. Parse optional `--skip-checker` flag (skip plan validation step)
-4. Validate:
+4. **CRITICAL: Write .active-skill NOW.** Write the text "import" to `.planning/.active-skill` using the Write tool.
+5. Validate:
    - Phase exists in ROADMAP.md
    - Phase directory exists at `.planning/phases/{NN}-{slug}/`
-5. If no phase number given, read current phase from `.planning/STATE.md`
-6. Check for existing plans in the phase directory (glob for `*-PLAN.md`)
+6. If no phase number given, read current phase from `.planning/STATE.md`
+7. Check for existing plans in the phase directory (glob for `*-PLAN.md`)
    - If plans exist: ask user via AskUserQuestion: "Phase {N} already has plans. Replace them with imported plans?"
    - If yes: note that existing plans will be overwritten in Step 7
    - If no: stop
@@ -323,7 +324,7 @@ Follow the revision loop with:
 
 ### Step 7: Write PLAN.md Files (inline)
 
-Write each plan to `.planning/phases/{NN}-{slug}/{phase}-{plan_num}-PLAN.md`.
+Write each plan to `.planning/phases/{NN}-{slug}/PLAN-{plan_num}.md`.
 
 If existing plans are being replaced (user confirmed in Step 1):
 - Delete existing `*-PLAN.md` files in the phase directory before writing new ones
@@ -381,14 +382,18 @@ docs({phase}): import plans for phase {N} ({count} plans, {wave_count} waves)
 
 ---
 
-### Step 10: Confirm (inline)
+### Step 10: Cleanup
+
+Delete `.planning/.active-skill` if it exists. This must happen on all paths (success, partial, and failure) before reporting results.
+
+### Step 11: Confirm (inline)
 
 Present a summary of the import using the branded banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► IMPORT COMPLETE ✓
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► IMPORT COMPLETE ✓                          ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Phase {N}: {name}** — {plan_count} plans imported
 
@@ -407,9 +412,11 @@ Wave execution order:
 Must-haves coverage: {count} truths across {plan_count} plans
 Requirements traced: {count}/{total} REQ-IDs covered
 
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Build Phase {N}** — execute these imported plans
 
@@ -417,19 +424,21 @@ Requirements traced: {count}/{total} REQ-IDs covered
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
+
 
 **Also available:**
 - `/pbr:plan {N}` — re-plan from scratch if import needs rework
 - `/pbr:discuss {N}` — talk through details before building
 
-───────────────────────────────────────────────────────────────
+
 ```
 
 ---
 
 ## Error Handling
 
+**IMPORTANT:** On ALL error exits below, delete `.planning/.active-skill` if it exists before displaying the error message.
+
 ### Phase not found
 If the specified phase does not exist in ROADMAP.md, display:
 ```
@@ -498,7 +507,7 @@ Present remaining issues and ask user to decide: proceed or intervene.
 
 | File | Purpose | When |
 |------|---------|------|
-| `.planning/phases/{NN}-{slug}/{phase}-{NN}-PLAN.md` | Imported plan files | Step 7 |
+| `.planning/phases/{NN}-{slug}/PLAN-{NN}.md` | Imported plan files | Step 7 |
 | `.planning/ROADMAP.md` | Plans Complete + Status updated to `planned` | Step 8a |
 | `.planning/STATE.md` | Updated with plan status and import source | Step 8b |
 | `.planning/CONTEXT.md` | Updated if blockers surfaced new locked decisions | Step 8d |

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

@@ -4,6 +4,7 @@ description: "Manage milestones: new, complete, audit, gaps."
 allowed-tools: Read, Write, Bash, Glob, Grep, Task, AskUserQuestion
 argument-hint: "new|complete|audit|gaps [version]"
 ---
+<!-- markdownlint-disable MD012 MD046 -->
 
 **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.**
 
@@ -12,9 +13,9 @@ argument-hint: "new|complete|audit|gaps [version]"
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► MILESTONE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► MILESTONE                                  ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -159,9 +160,9 @@ Start a new milestone cycle with new phases.
 
 10. **Confirm** with branded output:
     ```
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     PLAN-BUILD-RUN ► MILESTONE CREATED ✓
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    ╔══════════════════════════════════════════════════════════════╗
+    ║  PLAN-BUILD-RUN ► MILESTONE CREATED ✓                        ║
+    ╚══════════════════════════════════════════════════════════════╝
 
     **Milestone: {name}** — {count} phases
 
@@ -170,9 +171,11 @@ Start a new milestone cycle with new phases.
     {N+1}. {name}
     ...
 
-    ───────────────────────────────────────────────────────────────
 
-    ## ▶ Next Up
+
+    ╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
     **Phase {N}: {name}** — start with discussion or planning
 
@@ -180,13 +183,13 @@ Start a new milestone cycle with new phases.
 
     <sub>`/clear` first → fresh context window</sub>
 
-    ───────────────────────────────────────────────────────────────
+
 
     **Also available:**
     - `/pbr:plan {N}` — skip discussion, plan directly
     - `/pbr:status` — see project status
 
-    ───────────────────────────────────────────────────────────────
+
     ```
 
 ---
@@ -263,14 +266,40 @@ Archive a completed milestone and prepare for the next one.
 
 5. **Archive milestone documents:**
 
+   **CRITICAL: Pre-flight safety checks BEFORE archiving. Do NOT skip this step.**
+
+   Before creating or moving anything, verify the destination is safe:
+   - Check if `.planning/milestones/{version}/` already exists
+   - If it exists AND contains files (phases/, STATS.md, etc.), STOP and display:
+     ```
+     ╔══════════════════════════════════════════════════════════════╗
+     ║  ERROR                                                       ║
+     ╚══════════════════════════════════════════════════════════════╝
+
+     Archive destination `.planning/milestones/{version}/` already contains files.
+     Completing this milestone would overwrite the existing archive.
+
+     **To fix:** Run `/pbr:health` or manually inspect `.planning/milestones/{version}/`.
+     Use a different version number (e.g., {version}.1) or remove the existing archive first.
+     ```
+     Ask the user via AskUserQuestion whether to use a different version or abort.
+   - Verify each source phase directory exists before attempting to move it
+   - If any source phase directory is missing, warn but continue with the phases that do exist
+
+   **CRITICAL: Create the archive directory .planning/milestones/{version}/ NOW. Do NOT skip this step.**
+
    Create a versioned archive directory and move phase directories into it:
    - `.planning/milestones/{version}/ROADMAP.md` — snapshot of ROADMAP.md at completion
-   - `.planning/milestones/{version}/REQUIREMENTS.md` — snapshot of REQUIREMENTS.md
+   - `.planning/milestones/{version}/REQUIREMENTS.md` — **CRITICAL: Copy REQUIREMENTS.md to archive NOW. Do NOT skip this step.** Snapshot of REQUIREMENTS.md
    - `.planning/milestones/{version}/STATS.md` — milestone statistics
    - `.planning/milestones/{version}/phases/{NN}-{slug}/` — move each milestone phase directory from `.planning/phases/` into the archive
 
+   **CRITICAL: Move phase directories from .planning/phases/ to archive NOW. Do NOT skip this step.**
+
    **Move phases:** For each phase belonging to this milestone, move (not copy) its directory from `.planning/phases/{NN}-{slug}/` to `.planning/milestones/{version}/phases/{NN}-{slug}/`. This keeps the active phases directory clean for the next milestone.
 
+   **CRITICAL: Write STATS.md to .planning/milestones/{version}/STATS.md NOW. Do NOT skip this step.**
+
    **Stats file content:**
 
    Read `skills/milestone/templates/stats-file.md.tmpl` for the stats file format. Fill in all `{variable}` placeholders with actual data gathered in Steps 3-4.
@@ -290,6 +319,8 @@ Archive a completed milestone and prepare for the next one.
 
    - Move validated requirements from active to completed section
 
+**CRITICAL: Update ROADMAP.md with collapsed milestone section NOW. Do NOT skip this step.**
+
 7. **Collapse completed phases in ROADMAP.md:**
    Replace detailed phase entries with collapsed summaries:
 
@@ -304,6 +335,8 @@ Archive a completed milestone and prepare for the next one.
    | {N+1}. {name} | Completed |
    ```
 
+**CRITICAL: Update STATE.md to mark milestone as complete NOW. Do NOT skip this step.**
+
 7b. **Update STATE.md:**
    - Update `.planning/STATE.md` to mark the milestone as complete
    - Clear the current milestone field or set status to "completed"
@@ -334,9 +367,9 @@ Archive a completed milestone and prepare for the next one.
 
 10. **Confirm** with branded output:
     ```
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     PLAN-BUILD-RUN ► MILESTONE COMPLETE 🎉
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    ╔══════════════════════════════════════════════════════════════╗
+    ║  PLAN-BUILD-RUN ► MILESTONE COMPLETE 🎉                      ║
+    ╚══════════════════════════════════════════════════════════════╝
 
     **{version}**
 
@@ -348,9 +381,11 @@ Archive a completed milestone and prepare for the next one.
     Archived to: .planning/milestones/{version}/
     Git tag: {version}
 
-    ───────────────────────────────────────────────────────────────
 
-    ## ▶ Next Up
+
+    ╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
     **Start the next milestone** — plan new features
 
@@ -358,13 +393,13 @@ Archive a completed milestone and prepare for the next one.
 
     <sub>`/clear` first → fresh context window</sub>
 
-    ───────────────────────────────────────────────────────────────
+
 
     **Also available:**
     - `/pbr:status` — see project status
     - `/pbr:help` — see all commands
 
-    ───────────────────────────────────────────────────────────────
+
     ```
 
 ---
@@ -429,15 +464,17 @@ Verify milestone completion with cross-phase integration checks.
 
    **If PASSED:**
    ```
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-    PLAN-BUILD-RUN ► MILESTONE AUDIT PASSED ✓
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+   ╔══════════════════════════════════════════════════════════════╗
+   ║  PLAN-BUILD-RUN ► MILESTONE AUDIT PASSED ✓                   ║
+   ╚══════════════════════════════════════════════════════════════╝
 
    All phases verified, integration checks passed, requirements covered.
 
-   ───────────────────────────────────────────────────────────────
 
-   ## ▶ Next Up
+
+   ╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
    **Complete the milestone** — archive and tag
 
@@ -445,28 +482,30 @@ Verify milestone completion with cross-phase integration checks.
 
    <sub>`/clear` first → fresh context window</sub>
 
-   ───────────────────────────────────────────────────────────────
+
 
    **Also available:**
    - `/pbr:milestone gaps` — address any minor issues first
    - `/pbr:status` — see project status
 
-   ───────────────────────────────────────────────────────────────
+
    ```
 
    **If GAPS FOUND:**
    ```
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-    PLAN-BUILD-RUN ► MILESTONE AUDIT — GAPS FOUND ⚠
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+   ╔══════════════════════════════════════════════════════════════╗
+   ║  PLAN-BUILD-RUN ► MILESTONE AUDIT — GAPS FOUND ⚠             ║
+   ╚══════════════════════════════════════════════════════════════╝
 
    Found {count} gaps:
    - {gap 1}
    - {gap 2}
 
-   ───────────────────────────────────────────────────────────────
 
-   ## ▶ Next Up
+
+   ╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
    **Close the gaps** — create fix phases
 
@@ -474,26 +513,28 @@ Verify milestone completion with cross-phase integration checks.
 
    <sub>`/clear` first → fresh context window</sub>
 
-   ───────────────────────────────────────────────────────────────
+
 
    **Also available:**
    - `/pbr:milestone complete` — proceed despite gaps
    - `/pbr:status` — see project status
 
-   ───────────────────────────────────────────────────────────────
+
    ```
 
    **If TECH DEBT:**
    ```
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-    PLAN-BUILD-RUN ► MILESTONE AUDIT — TECH DEBT ⚠
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+   ╔══════════════════════════════════════════════════════════════╗
+   ║  PLAN-BUILD-RUN ► MILESTONE AUDIT — TECH DEBT ⚠              ║
+   ╚══════════════════════════════════════════════════════════════╝
 
    Milestone functional but has {count} tech debt items.
 
-   ───────────────────────────────────────────────────────────────
 
-   ## ▶ Next Up
+
+   ╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
    **Address tech debt or proceed**
 
@@ -502,7 +543,7 @@ Verify milestone completion with cross-phase integration checks.
 
    <sub>`/clear` first → fresh context window</sub>
 
-   ───────────────────────────────────────────────────────────────
+
    ```
 
 ---
@@ -585,17 +626,19 @@ Create phases to close gaps found during an audit.
 
 9. **Confirm** with branded output:
    ```
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-    PLAN-BUILD-RUN ► GAP PHASES CREATED ✓
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+   ╔══════════════════════════════════════════════════════════════╗
+   ║  PLAN-BUILD-RUN ► GAP PHASES CREATED ✓                       ║
+   ╚══════════════════════════════════════════════════════════════╝
 
    Created {count} gap-closure phase(s):
    - Phase {N}: {name}
    - Phase {N+1}: {name}
 
-   ───────────────────────────────────────────────────────────────
 
-   ## ▶ Next Up
+
+   ╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
    **Plan the first gap-closure phase**
 
@@ -603,12 +646,12 @@ Create phases to close gaps found during an audit.
 
    <sub>`/clear` first → fresh context window</sub>
 
-   ───────────────────────────────────────────────────────────────
+
 
    **Also available:**
    - `/pbr:status` — see project status
 
-   ───────────────────────────────────────────────────────────────
+
    ```
 
 ---

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

@@ -12,9 +12,9 @@ argument-hint: "<text> | list | promote <index> [--global]"
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► NOTE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► NOTE                                       ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.

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

@@ -11,9 +11,9 @@ allowed-tools: Read, Write, Bash, Glob
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PAUSING SESSION
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PAUSING SESSION                            ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -121,6 +121,8 @@ Determine the logical next action (same routing logic as `/pbr:status`):
 
 ### Step 4: Write .continue-here.md
 
+**CRITICAL: Write pause state NOW before displaying confirmation. Do NOT skip this step.**
+
 Write the handoff file to the current phase directory:
 
 **Path:** `.planning/phases/{NN}-{phase-name}/.continue-here.md`
@@ -167,17 +169,19 @@ git commit -m "wip(planning): save session state — phase {N} plan {M}"
 Display branded confirmation:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► SESSION SAVED ✓
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► SESSION SAVED ✓                            ║
+╚══════════════════════════════════════════════════════════════╝
 
 Position: Phase {N} — {phase name}, Plan {M}
 Completed: {count} plans this session
 Remaining: {count} plans in this phase
 
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Resume in your next session**
 
@@ -185,7 +189,7 @@ Remaining: {count} plans in this phase
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
+
 ```
 
 ---

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

@@ -24,9 +24,9 @@ Additionally for this skill:
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PLANNING PHASE {N}
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PLANNING PHASE {N}                         ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Where `{N}` is the phase number from `$ARGUMENTS`. Then proceed to Step 1.
@@ -116,6 +116,7 @@ Reference: `skills/shared/config-loading.md` for the tooling shortcut (`state lo
 
 1. Parse `$ARGUMENTS` for phase number and flags
 2. Read `.planning/config.json` for settings (see config-loading.md for field reference)
+   **CRITICAL: Write .active-skill NOW.** Write the text "plan" to `.planning/.active-skill` using the Write tool.
 3. Resolve depth profile: run `node ${CLAUDE_PLUGIN_ROOT}/scripts/pbr-tools.js config resolve-depth` to get the effective feature/gate settings for the current depth. Store the result for use in later gating decisions.
 4. Validate:
    - Phase exists in ROADMAP.md
@@ -501,6 +502,8 @@ Use AskUserQuestion (pattern: approve-revise-abort from `skills/shared/gate-prom
 
 ### Subcommand: `add`
 
+**CRITICAL: Write .active-skill NOW.** Write the text "plan" to `.planning/.active-skill` using the Write tool.
+
 1. Read `.planning/ROADMAP.md`
 2. Calculate next phase number (last phase + 1)
 3. Ask user: "What's the goal for this new phase?"
@@ -510,11 +513,14 @@ Use AskUserQuestion (pattern: approve-revise-abort from `skills/shared/gate-prom
 7. Create phase directory: `.planning/phases/{NN}-{slug}/`
 8. Update STATE.md if needed
 9. Suggest: `/pbr:plan {N}` to plan the new phase
+10. Delete `.planning/.active-skill` if it exists.
 
 ### Subcommand: `insert <N>`
 
 Reference: `skills/plan/decimal-phase-calc.md` for decimal numbering rules.
 
+**CRITICAL: Write .active-skill NOW.** Write the text "plan" to `.planning/.active-skill` using the Write tool.
+
 1. Read `.planning/ROADMAP.md`
 2. Calculate decimal phase number:
    - If inserting at position 3: becomes 3.1
@@ -525,6 +531,7 @@ Reference: `skills/plan/decimal-phase-calc.md` for decimal numbering rules.
 5. Create phase directory: `.planning/phases/{NN.M}-{slug}/`
 6. Update dependencies of subsequent phases if affected
 7. Suggest: `/pbr:plan {N.M}` to plan the new phase
+8. Delete `.planning/.active-skill` if it exists.
 
 ### Subcommand: `remove <N>`
 
@@ -533,13 +540,15 @@ Reference: `skills/plan/decimal-phase-calc.md` for decimal numbering rules.
    - Phase must exist
    - Phase must be in `pending` or `not started` status (cannot remove completed/in-progress phases)
    - No other phases depend on this phase (or user confirms breaking dependencies)
-3. Confirm with user: "Remove Phase {N}: {name}? This will delete the phase directory and renumber subsequent phases."
-4. If confirmed:
+3. **CRITICAL: Write .active-skill NOW.** Write the text "plan" to `.planning/.active-skill` using the Write tool.
+4. Confirm with user: "Remove Phase {N}: {name}? This will delete the phase directory and renumber subsequent phases."
+5. If confirmed:
    - Delete `.planning/phases/{NN}-{slug}/` directory
    - Remove phase from ROADMAP.md
    - Renumber subsequent phases (N+1 becomes N, etc.)
    - Update all `depends_on` references in ROADMAP.md
    - Update STATE.md if needed
+6. Delete `.planning/.active-skill` if it exists.
 
 ---
 
@@ -635,13 +644,17 @@ Present remaining issues and ask user to decide: proceed or intervene.
 | File | Purpose | When |
 |------|---------|------|
 | `.planning/phases/{NN}-{slug}/RESEARCH.md` | Phase-specific research | Step 4 |
-| `.planning/phases/{NN}-{slug}/{phase}-{NN}-PLAN.md` | Executable plan files | Step 5 |
+| `.planning/phases/{NN}-{slug}/PLAN-{NN}.md` | Executable plan files | Step 5 |
 | `.planning/CONTEXT.md` | Updated with assumptions | Step 3 (--assumptions) |
 | `.planning/ROADMAP.md` | Plans Complete + Status → `planned`; updated for add/insert/remove | Step 8, Subcommands |
 | `.planning/STATE.md` | Updated with plan status | Step 8 |
 
 ---
 
+## Cleanup
+
+Delete `.planning/.active-skill` if it exists. This must happen on all paths (success, partial, and failure) before reporting results.
+
 ## Completion
 
 After planning completes, present:
@@ -649,9 +662,9 @@ After planning completes, present:
 Use the branded stage banner from `references/ui-formatting.md`:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PLANNING PHASE {N} ✓
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PLANNING PHASE {N} ✓                       ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Phase {N}: {name}** — {plan_count} plans created
 
@@ -667,9 +680,11 @@ Wave execution:
 
 Then use the "Next Up" routing block:
 ```
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Build Phase {N}** — execute these plans
 
@@ -677,11 +692,11 @@ Then use the "Next Up" routing block:
 
 <sub>/clear first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
+
 
 **Also available:**
 - /pbr:plan {N} --assumptions — review assumptions first
 - /pbr:discuss {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.