@sienklogic/plan-build-run 2.10.0 → 2.12.0

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

@@ -8,9 +8,9 @@ description: "Save your current session state for later resumption."
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PAUSING SESSION
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PAUSING SESSION                            ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -118,6 +118,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`
@@ -164,17 +166,17 @@ 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**
 
@@ -182,7 +184,6 @@ Remaining: {count} plans in this phase
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
 ```
 
 ---

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

@@ -20,9 +20,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.
@@ -112,6 +112,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 ${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
@@ -471,6 +472,8 @@ Use the approve-revise-abort pattern from `skills/shared/gate-prompts.md`:
 
 ### 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?"
@@ -480,11 +483,14 @@ Use the approve-revise-abort pattern from `skills/shared/gate-prompts.md`:
 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
@@ -495,6 +501,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>`
 
@@ -503,13 +510,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.
 
 ---
 
@@ -597,13 +606,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:
@@ -611,9 +624,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
 

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

@@ -32,7 +32,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/copilot-pbr/skills/quick/SKILL.md

@@ -18,9 +18,9 @@ This skill **spawns a single Task(agent_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.
@@ -249,17 +249,17 @@ 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
 
@@ -267,13 +267,10 @@ Files: {list of files changed}
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
-
 **Also available:**
 - `/pbr:continue` — execute next logical step
 - `/pbr:todo list` — see pending todos
 
-───────────────────────────────────────────────────────────────
 ```
 
 **If partial:**

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

@@ -8,9 +8,9 @@ description: "Pick up where you left off. Restores context and suggests next act
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► RESUMING SESSION
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► RESUMING SESSION                           ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -144,9 +144,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}
 
@@ -179,9 +179,10 @@ Blockers:
 
 **If only one clear next action exists**, present it with branded routing:
 ```
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **{explanation from continue-here}**
 
@@ -189,7 +190,6 @@ 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`):

package/plugins/copilot-pbr/skills/review/SKILL.md

@@ -19,9 +19,9 @@ Additionally for this skill:
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► REVIEWING PHASE {N}
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► REVIEWING PHASE {N}                        ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Where `{N}` is the phase number from `$ARGUMENTS`. Then proceed to Step 1.
@@ -62,6 +62,7 @@ Execute these steps in order.
 
 1. Parse `$ARGUMENTS` for phase number and `--auto-fix` flag
 2. Read `.planning/config.json`
+   **CRITICAL: Write .active-skill NOW.** Write the text "review" to `.planning/.active-skill` using the Write tool.
 3. Resolve depth profile: run `node ${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 directory exists at `.planning/phases/{NN}-{slug}/`
@@ -535,6 +536,10 @@ Ask user: "Would you like to proceed with gap-closure plans without root cause a
 
 ---
 
+## Cleanup
+
+Delete `.planning/.active-skill` if it exists. This must happen on all paths (success, partial, and failure) before reporting results.
+
 ## Completion
 
 After review completes, always present a clear next action:
@@ -543,9 +548,9 @@ After review completes, always present a clear next action:
 
 Display the "Phase Complete" banner inline:
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PHASE {N} COMPLETE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PHASE {N} COMPLETE                         ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Phase {N}: {Name}**
 
@@ -576,9 +581,9 @@ Then the branded "Next Up" block:
 
 **If gaps remain:**
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PHASE {N} GAPS FOUND
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PHASE {N} GAPS FOUND                       ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Phase {N}: {name}** — {count} gaps remaining
 
@@ -605,9 +610,9 @@ Then the branded "Next Up" block:
 
 Display the "Milestone Complete" banner inline:
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► MILESTONE COMPLETE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► MILESTONE COMPLETE                         ║
+╚══════════════════════════════════════════════════════════════╝
 
 {N} phases completed
 All phase goals verified

package/plugins/copilot-pbr/skills/scan/SKILL.md

@@ -8,9 +8,9 @@ description: "Analyze an existing codebase. Maps structure, architecture, conven
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► SCANNING CODEBASE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► SCANNING CODEBASE                          ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -177,9 +177,9 @@ Agent that failed: {focus_area} mapper
 Read key findings from each file (frontmatter or first section) and display using the branded stage banner from `references/ui-formatting.md`:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► SCAN COMPLETE ✓
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► SCAN COMPLETE ✓                            ║
+╚══════════════════════════════════════════════════════════════╝
 
 Project: {type} ({scale})
 Stack: {primary language} + {framework}
@@ -206,9 +206,10 @@ Top concerns:
 
 Then use the "Next Up" routing block:
 ```
-───────────────────────────────────────────────────────────────
 
-## ▶ Next Up
+╔══════════════════════════════════════════════════════════════╗
+║  ▶ NEXT UP                                                   ║
+╚══════════════════════════════════════════════════════════════╝
 
 **Start a project** — use the scan results to plan your work
 
@@ -216,13 +217,10 @@ Then use the "Next Up" routing block:
 
 <sub>`/clear` first → fresh context window</sub>
 
-───────────────────────────────────────────────────────────────
-
 **Also available:**
 - `/pbr:milestone new` — create a milestone to address concerns
 - `/pbr:status` — see project status
 
-───────────────────────────────────────────────────────────────
 ```
 
 ### Step 7: Git Integration

package/plugins/copilot-pbr/skills/setup/SKILL.md

@@ -8,9 +8,9 @@ description: "Onboarding wizard. Initialize project, select models, verify setup
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► SETUP
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► SETUP                                      ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -21,14 +21,29 @@ You are running the **setup** skill. This is an interactive onboarding wizard th
 
 ---
 
-## Step 1: Detect Project State
+## Step 1: Detect Project State — Idempotency Guard
 
 Check if `.planning/` directory exists in the current working directory.
 
 **If `.planning/` exists**:
-- Read `.planning/config.json` to check current settings
-- Tell the user: "Existing Plan-Build-Run project detected. This wizard will review your configuration."
-- Skip to Step 3 (model selection)
+- Check for existing core files: `STATE.md`, `ROADMAP.md`, `config.json`
+- If ANY of these exist, present a checkpoint:
+
+  Use AskUserQuestion:
+    question: "Existing project detected with {list of found files}. How should we proceed?"
+    header: "Setup"
+    options:
+      - label: "Resume"       description: "Keep existing .planning/ and review configuration (recommended)"
+      - label: "Reset"        description: "Archive current .planning/ to .planning.bak/ and start fresh"
+      - label: "Abort"        description: "Cancel setup — keep everything as-is"
+
+  - If "Resume": Tell the user: "Keeping existing project. Reviewing configuration." Skip to Step 3 (model selection)
+  - If "Reset": Run `mv .planning .planning.bak` (creating a backup), then proceed with fresh setup below
+  - If "Abort": Display "Setup cancelled. Run `/pbr:status` to see current project state." and stop
+
+- If `.planning/` exists but has NONE of the core files (empty or only has subdirs):
+  - Tell the user: "Found empty .planning/ directory. Proceeding with initialization."
+  - Continue to fresh setup below
 
 **If `.planning/` does NOT exist**:
 - Ask the user:
@@ -48,10 +63,14 @@ If "No", display: "Run `/pbr:begin` when you're ready to start a project. It inc
 
 If "Yes", create the minimal `.planning/` structure:
 
+**CRITICAL: Create .planning/ directory structure NOW. Do NOT skip this step.**
+
 ```bash
 mkdir -p .planning/phases .planning/todos/pending .planning/todos/done .planning/logs .planning/research
 ```
 
+**CRITICAL: Write .planning/config.json NOW. Do NOT skip this step.**
+
 Create `.planning/config.json` with defaults:
 ```json
 {
@@ -120,6 +139,8 @@ Create `.planning/config.json` with defaults:
 }
 ```
 
+**CRITICAL: Write .planning/STATE.md NOW. Do NOT skip this step.**
+
 Create `.planning/STATE.md`:
 ```markdown
 ---
@@ -240,11 +261,13 @@ This project uses [Plan-Build-Run](https://github.com/SienkLogic/plan-build-run)
 
 ## Step 5: Verification
 
+**CRITICAL: Run validation checks NOW to confirm setup succeeded. Do NOT skip this step.**
+
 Run a quick health check:
 
 1. Verify `.planning/config.json` is valid JSON
 2. Verify `.planning/STATE.md` exists and is parseable
-3. Verify hook scripts are accessible: `node ${CLAUDE_PLUGIN_ROOT}/scripts/progress-tracker.js` from the project directory
+3. Verify hook scripts are accessible: `node ${PLUGIN_ROOT}/scripts/progress-tracker.js` from the project directory
 4. Check that `npm test` works (if package.json exists)
 
 Display results:

package/plugins/copilot-pbr/skills/shared/error-reporting.md

@@ -1,4 +1,3 @@
-<!-- canonical: ../../../pbr/skills/shared/error-reporting.md -->
 # Error Reporting Fragment
 
 Standard error display formats for all skills. Reference `references/ui-formatting.md` for the full brand guide.
@@ -78,3 +77,5 @@ Blocked: {short reason}
 ```
 
 This format is used by validate-commit.js and check-dangerous-commands.js. The `decision: "block"` and `reason` fields in the JSON output follow this pattern.
+
+Block reasons should always include a "To fix:" line with actionable guidance so the user or agent knows how to resolve the block.

package/plugins/copilot-pbr/skills/shared/progress-display.md

@@ -1,4 +1,3 @@
-<!-- canonical: ../../../pbr/skills/shared/progress-display.md -->
 # Progress Display Fragment
 
 Standard progress display formats for all skills. Reference `references/ui-formatting.md` for the full brand guide.

package/plugins/copilot-pbr/skills/shared/universal-anti-patterns.md

@@ -24,11 +24,15 @@ These rules prevent context rot -- quality degradation as the context window fil
 8. **Never** read `.planning/logs/` files -- only the health skill reads these.
 9. **Do not** re-read full file contents when frontmatter is sufficient -- frontmatter contains status, key_files, commits, and provides fields.
 
+## Task/Subagent Rules (apply to every skill)
+
+10. **Never** invoke `Skill()` inside a `Task()` subagent -- the Skill tool is not available in subagent contexts. Subagents spawned by `Task()` cannot resolve `/pbr:*` skill prefixes, so `Skill({ skill: "pbr:plan" })` will silently fail. Instead, chain skills at the orchestrator level (return control to the orchestrator, then call `Skill()` from there). For subagent work, use `subagent_type: "pbr:{agent}"` which auto-loads agent definitions.
+
 ## Behavioral Rules (apply to every skill)
 
-10. **Do not** re-litigate decisions that are already locked in CONTEXT.md -- respect locked decisions unconditionally.
-11. **Do not** create artifacts the user did not approve -- always confirm before writing new planning documents.
-12. **Do not** modify files outside the skill's stated scope -- check the "Files Created/Modified" table in each skill.
-13. **Do not** suggest multiple next actions without clear priority -- one primary suggestion, alternatives listed secondary.
-14. **Do not** use `git add .` or `git add -A` -- stage specific files only.
-15. **Do not** include sensitive information (API keys, passwords, tokens) in planning documents or commits.
+11. **Do not** re-litigate decisions that are already locked in CONTEXT.md -- respect locked decisions unconditionally.
+12. **Do not** create artifacts the user did not approve -- always confirm before writing new planning documents.
+13. **Do not** modify files outside the skill's stated scope -- check the "Files Created/Modified" table in each skill.
+14. **Do not** suggest multiple next actions without clear priority -- one primary suggestion, alternatives listed secondary.
+15. **Do not** use `git add .` or `git add -A` -- stage specific files only.
+16. **Do not** include sensitive information (API keys, passwords, tokens) in planning documents or commits.

package/plugins/copilot-pbr/skills/status/SKILL.md

@@ -8,9 +8,9 @@ description: "Show current project status and suggest what to do next."
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► PROJECT STATUS
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► PROJECT STATUS                             ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.

package/plugins/copilot-pbr/skills/statusline/SKILL.md

@@ -10,9 +10,9 @@ description: "Install or configure the PBR status line in Claude Code."
 **Before ANY tool calls**, display this banner:
 
 ```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- PLAN-BUILD-RUN ► STATUS LINE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+╔══════════════════════════════════════════════════════════════╗
+║  PLAN-BUILD-RUN ► STATUS LINE                                ║
+╚══════════════════════════════════════════════════════════════╝
 ```
 
 Then proceed to Step 1.
@@ -76,9 +76,12 @@ If "Install":
 
 **CRITICAL: Use Read tool to read the file, then Write to update it. Do NOT use sed or other text manipulation on JSON files.**
 
+**CRITICAL: Back up settings.json NOW.** Write the original content to `~/.claude/settings.json.bak` before making any changes.
+
 1. Read `~/.claude/settings.json`
-2. Parse the JSON
-3. Set `statusLine` to:
+2. Write the original content to `~/.claude/settings.json.bak`
+3. Parse the JSON
+4. Set `statusLine` to:
    ```json
    {
      "type": "command",
@@ -86,7 +89,7 @@ If "Install":
    }
    ```
    Where `SCRIPT_PATH` is the resolved absolute path from Step 1. Use forward slashes even on Windows.
-4. Write the updated JSON back (preserve all other settings, use 2-space indentation)
+5. Write the updated JSON back (preserve all other settings, use 2-space indentation)
 
 ### Step 4: Verify and confirm
 
@@ -113,8 +116,9 @@ Customize per-project via .planning/config.json:
 
 1. Read `~/.claude/settings.json`
 2. If no `statusLine` key: inform user "No status line configured." and stop
-3. Remove the `statusLine` key from the JSON
-4. Write the updated file
+3. **CRITICAL: Back up settings.json NOW.** Write the original content to `~/.claude/settings.json.bak` before making any changes.
+4. Remove the `statusLine` key from the JSON
+5. Write the updated file
 5. Display: `✓ PBR status line removed. Restart Claude Code to take effect.`
 
 ---