@sienklogic/plan-build-run 2.1.0 → 2.1.1

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.
@@ -25,6 +26,11 @@ You are running the **milestone** skill. Milestones represent significant projec
 
 This skill runs **inline** for most subcommands, but spawns agents for `audit`.
 
+## References
+
+- `references/questioning.md` — Questioning patterns for milestone review decisions
+- `references/ui-brand.md` — Status symbols, banners, milestone celebration format
+
 ---
 
 ## Context Budget
@@ -38,6 +44,22 @@ Additionally for this skill:
 
 ---
 
+## Multi-Session Sync
+
+Before any phase-modifying operations (archiving phases, updating ROADMAP.md/STATE.md/PROJECT.md), acquire a claim:
+
+```
+acquireClaim(planningDir, sessionId)
+```
+
+If the claim fails (another session owns this project), display: "Another session owns this project. Use `/pbr:progress` to see active claims."
+
+On completion or error (including all exit paths), release the claim:
+
+```
+releaseClaim(planningDir, sessionId)
+```
+
 ## Core Principle
 
 **Milestones are the rhythm of the project.** They force you to step back, verify everything works together, and create a clean snapshot before moving on. Never skip the audit — integration issues hide at milestone boundaries.
@@ -56,6 +78,7 @@ Examples:
   "new User Auth"    → subcommand=new, arg="User Auth"
   "complete v1.0"    → subcommand=complete, arg="v1.0"
   "complete 1.0"     → subcommand=complete, arg="v1.0" (auto-prefix v)
+  "preview v1.0"     → subcommand=preview, arg="v1.0"
   "audit v1.0"       → subcommand=audit, arg="v1.0"
   "audit"            → subcommand=audit, arg=current milestone
   "gaps"             → subcommand=gaps, arg=most recent audit
@@ -68,6 +91,7 @@ Usage: /pbr:milestone <subcommand> [version]
 Subcommands:
   new [name]       — Start a new milestone cycle
   complete [ver]   — Archive completed milestone
+  preview [ver]    — Dry-run of complete (show what would happen)
   audit [ver]      — Verify milestone completion
   gaps             — Create phases to close audit gaps
 ```
@@ -96,7 +120,7 @@ Start a new milestone cycle with new phases.
    - Example: if phases 1-5 exist, new milestone starts at phase 6
 
 4. **Mini roadmap session:**
-   Run a condensed version of the `/pbr:begin` questioning flow:
+   Run a condensed version of the `/pbr:new-project` questioning flow:
 
    a. Ask about major components needed (via AskUserQuestion):
       - "What are the 2-5 major areas of work for this milestone?"
@@ -148,6 +172,8 @@ Start a new milestone cycle with new phases.
    - **Status:** In progress
    ```
 
+**CRITICAL (no hook) -- DO NOT SKIP: Update STATE.md frontmatter AND body with new milestone info.**
+
 8. **Update STATE.md:**
    - Set current phase to the first new phase
    - Update milestone info
@@ -157,37 +183,66 @@ Start a new milestone cycle with new phases.
    docs(planning): start milestone "{name}" (phases {start}-{end})
    ```
 
-10. **Confirm** with branded output:
-    ```
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     PLAN-BUILD-RUN ► MILESTONE CREATED ✓
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+10. **Confirm** with branded output — read `${CLAUDE_SKILL_DIR}/templates/new-output.md.tmpl` and fill in `{name}` (milestone name), `{count}` (phase count), `{N}` (first phase number).
+
+---
+
+## Subcommand: `preview`
+
+Dry-run of milestone completion — shows what would happen without making any changes.
+
+### Flow
 
-    **Milestone: {name}** — {count} phases
+1. **Determine version:**
+   - Same logic as `complete`: use `$ARGUMENTS` or ask via AskUserQuestion
 
-    Phases:
-    {N}. {name}
-    {N+1}. {name}
-    ...
+2. **Identify milestone phases:**
+   - Read ROADMAP.md to find phases belonging to this milestone
+   - List each phase with its current status (from STATE.md or VERIFICATION.md)
 
-    ───────────────────────────────────────────────────────────────
+3. **Verification status check:**
+   - For each milestone phase, check if VERIFICATION.md exists and its `result` frontmatter
+   - Flag phases that are unverified or have stale verification (SUMMARY.md newer than VERIFICATION.md)
 
-    ## ▶ Next Up
+4. **Preview archive structure:**
+   - Show what the archive directory would look like:
+     ```
+     .planning/milestones/v{version}/
+     ├── ROADMAP.md (snapshot)
+     ├── STATS.md (would be generated)
+     ├── REQUIREMENTS.md (snapshot)
+     └── phases/
+         ├── {NN}-{slug}/ (moved from .planning/phases/)
+         │   ├── PLAN-01.md
+         │   ├── SUMMARY.md
+         │   └── VERIFICATION.md
+         └── ...
+     ```
 
-    **Phase {N}: {name}** — start with discussion or planning
+5. **Show what would change:**
+   - Which phase directories would be moved
+   - What ROADMAP.md section would be collapsed
+   - What STATE.md updates would occur
+   - What git tag would be created
 
-    `/pbr:discuss {N}`
+6. **Display summary:**
+   ```
+   ╔══════════════════════════════════════════════════════════════╗
+   ║  PLAN-BUILD-RUN ► MILESTONE PREVIEW — v{version}             ║
+   ╚══════════════════════════════════════════════════════════════╝
 
-    <sub>`/clear` first → fresh context window</sub>
+   Phases to archive: {count}
+   ✓ Verified: {verified_count}
+   ⚠ Unverified: {unverified_count}
+   ⚠ Stale verification: {stale_count}
 
-    ───────────────────────────────────────────────────────────────
+   Archive location: .planning/milestones/v{version}/
+   Git tag: v{version}
 
-    **Also available:**
-    - `/pbr:plan {N}` — skip discussion, plan directly
-    - `/pbr:status` — see project status
+   Ready to complete? Run: /pbr:complete-milestone v{version}
+   ```
 
-    ───────────────────────────────────────────────────────────────
-    ```
+**CRITICAL (no hook)**: This subcommand is READ-ONLY. Do not create directories, move files, modify STATE.md, modify ROADMAP.md, or create git tags. Only read and display.
 
 ---
 
@@ -216,7 +271,7 @@ Archive a completed milestone and prepare for the next one.
        header: "Unverified"
        options:
          - label: "Continue anyway"  description: "Proceed despite unverified phases (not recommended)"
-         - label: "Stop and review"  description: "Run /pbr:review for unverified phases first"
+         - label: "Stop and review"  description: "Run /pbr:verify-work for unverified phases first"
      - If "Stop and review" or "Other": stop and suggest the review commands for each unverified phase
      - If "Continue anyway": proceed with warning noted
 
@@ -230,7 +285,7 @@ Archive a completed milestone and prepare for the next one.
      question: "{count} phases were modified after verification. Re-verify or continue?"
      header: "Stale"
      options:
-       - label: "Re-verify"        description: "Run /pbr:review for affected phases (recommended)"
+       - label: "Re-verify"        description: "Run /pbr:verify-work for affected phases (recommended)"
        - label: "Continue anyway"   description: "Proceed with potentially outdated verification"
    - If "Re-verify" or "Other": suggest the review commands for affected phases and stop
    - If "Continue anyway": proceed with warning noted
@@ -263,14 +318,43 @@ Archive a completed milestone and prepare for the next one.
 
 5. **Archive milestone documents:**
 
-   Copy/create archive files:
-   - `.planning/milestones/{version}-ROADMAP.md` — snapshot of ROADMAP.md at completion
-   - `.planning/milestones/{version}-REQUIREMENTS.md` — snapshot of REQUIREMENTS.md
-   - `.planning/milestones/{version}-STATS.md` — milestone statistics
+   **CRITICAL (no hook): 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 (no hook): 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` — **CRITICAL (no hook): 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 (no hook): 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 (no hook): 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.
+   Read `${CLAUDE_SKILL_DIR}/templates/stats-file.md.tmpl` for the stats file format. Fill in all `{variable}` placeholders with actual data gathered in Steps 3-4.
 
 6. **Update PROJECT.md:**
    - Move milestone from "Active" to "Completed"
@@ -287,13 +371,15 @@ Archive a completed milestone and prepare for the next one.
 
    - Move validated requirements from active to completed section
 
+**CRITICAL (no hook): 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:
 
    ```markdown
    ## Milestone: {name} ({version}) -- COMPLETED
 
-   Phases {start}-{end} completed on {date}. See `.planning/milestones/{version}-ROADMAP.md` for details.
+   Phases {start}-{end} completed on {date}. See `.planning/milestones/{version}/ROADMAP.md` for details.
 
    | Phase | Status |
    |-------|--------|
@@ -301,22 +387,42 @@ Archive a completed milestone and prepare for the next one.
    | {N+1}. {name} | Completed |
    ```
 
+**CRITICAL (no hook): 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"
    - Update last activity timestamp
    - Record the milestone version in the history/completed section
 
-7c. **Update HISTORY.md:**
-   - Append a milestone completion entry to `.planning/HISTORY.md`:
-     ```markdown
-     ## {date} — Milestone {version} Completed
-
-     - Milestone: {name}
-     - Phases: {start} - {end}
-     - Duration: {duration} days
-     - Key deliverables: {summary from Step 4}
+7c. **Append history to STATE.md:**
+   - Use `historyAppend()` (via `pbr-tools.js history append`) to write a milestone completion record to STATE.md ## History section:
+     ```bash
+     node ${CLAUDE_PLUGIN_ROOT}/scripts/pbr-tools.js history append milestone "Milestone {version} Completed" "Milestone: {name}\nPhases: {start} - {end}\nDuration: {duration} days\nKey deliverables: {summary from Step 4}"
      ```
+   - This writes to STATE.md ## History section (not a separate HISTORY.md file)
+
+7d. **Aggregate learnings from milestone phases:**
+
+**CRITICAL (no hook): Run learnings aggregation NOW. Do NOT skip this step.**
+
+```bash
+node ${CLAUDE_PLUGIN_ROOT}/scripts/milestone-learnings.js .planning/milestones/{version} --project {project-name-from-STATE.md}
+```
+
+- If the script outputs an error, log it but do NOT abort milestone completion — learnings aggregation is advisory.
+- Display the aggregation summary line to the user (e.g., "Learnings aggregated: 12 new, 3 updated, 0 errors").
+- After aggregation, check for triggered deferral thresholds:
+
+```bash
+node ${CLAUDE_PLUGIN_ROOT}/scripts/pbr-tools.js learnings check-thresholds
+```
+
+If any thresholds are triggered, display each as a notification:
+
+```
+Note: Learnings threshold met — {key}: {trigger}. Consider implementing the deferred feature.
+```
 
 8. **Git tag:**
    ```bash
@@ -325,44 +431,43 @@ Archive a completed milestone and prepare for the next one.
 
 9. **Commit:**
    ```bash
-   git add .planning/milestones/ .planning/ROADMAP.md .planning/PROJECT.md .planning/STATE.md .planning/HISTORY.md
+   git add .planning/milestones/ .planning/phases/ .planning/ROADMAP.md .planning/PROJECT.md .planning/STATE.md
    git commit -m "docs(planning): complete milestone {version}"
    ```
 
-10. **Confirm** with branded output:
-    ```
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     PLAN-BUILD-RUN ► MILESTONE COMPLETE 🎉
-    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-    **{version}**
-
-    Stats:
-    - {count} phases, {count} plans
-    - {count} commits, {lines} lines of code
-    - {duration} days
+9b. **Push milestone to remote:**
 
-    Archived to: .planning/milestones/{version}-*
-    Git tag: {version}
+Use AskUserQuestion to ask the user how they want to publish the milestone:
 
-    ───────────────────────────────────────────────────────────────
+```
+question: "How should this milestone be published to GitHub?"
+header: "Publish"
+options:
+  - label: "Push tag + commits"    description: "Push the v{version} tag and any unpushed commits to origin"
+  - label: "Skip for now"          description: "Keep everything local — push later manually"
+```
 
-    ## ▶ Next Up
+- If "Push tag + commits": run `git push origin main --follow-tags` to push both commits and the annotated tag in one command. Display success or error.
+- If "Skip for now": display reminder: "Tag v{version} is local only. Push when ready: `git push origin main --follow-tags`"
+- If "Other": follow user instructions (e.g., create a PR, push to a different branch, etc.)
 
-    **Start the next milestone** — plan new features
+### Post-Completion Smoke Test
 
-    `/pbr:milestone new`
+If `config.deployment.smoke_test_command` is set and non-empty:
 
-    <sub>`/clear` first → fresh context window</sub>
+1. Run the command via Bash
+2. If exit code 0: display "Smoke test passed" with command output
+3. If exit code non-zero: display advisory warning:
 
-    ───────────────────────────────────────────────────────────────
+   ```
+   ⚠ Smoke test failed (exit code {N})
+   Command: {smoke_test_command}
+   Output: {first 20 lines of output}
+   ```
 
-    **Also available:**
-    - `/pbr:status` — see project status
-    - `/pbr:help` — see all commands
+   This is advisory only — the milestone is already archived. Surface it as a potential issue for the user to investigate.
 
-    ───────────────────────────────────────────────────────────────
-    ```
+10. **Confirm** with branded output — read `${CLAUDE_SKILL_DIR}/templates/complete-output.md.tmpl` and fill in `{version}`, `{count}` (phases, plans, commits), `{lines}`, `{duration}`.
 
 ---
 
@@ -383,124 +488,30 @@ Verify milestone completion with cross-phase integration checks.
 
 3. **Spawn integration checker:**
 
-   Display to the user: `◐ Spawning integration checker...`
+   Display to the user: `◆ Spawning integration checker...`
 
-   Spawn `Task(subagent_type: "pbr:integration-checker")` with:
+   Spawn `Task(subagent_type: "pbr:integration-checker")`. Read `${CLAUDE_SKILL_DIR}/templates/integration-checker-prompt.md.tmpl`, fill in `{version or "current"}`, `{list of phase directories}`, and `{phase SUMMARY.md paths}`, then use the filled template as the Task() prompt.
 
-   ```
-   You are integration-checker. Perform cross-phase integration verification.
-
-   Milestone: {version or "current"}
-   Phases to check: {list of phase directories}
-
-   Instructions:
-   1. Read all SUMMARY.md files for the milestone phases
-   2. Build a dependency graph from provides/affects/requires fields
-   3. Verify integration points:
-      a. Every "requires" in a later phase is "provided" by an earlier phase
-      b. Every "affects" target still exists and hasn't been broken
-      c. No circular dependencies
-      d. No orphaned provides (things built but never consumed)
-   4. Check for:
-      - Broken imports/references between phases
-      - API contract mismatches
-      - Missing error handling at integration points
-      - Configuration inconsistencies
-   5. Return findings as a structured report
-   ```
+4. **Check integration-checker completion:**
 
-4. **Check requirements coverage:**
+   After the integration-checker completes, check for `## INTEGRATION CHECK COMPLETE` in the Task() output. If the marker is absent, warn: `⚠ Integration checker did not return completion marker — results may be incomplete.` Proceed with whatever findings were returned but note the incomplete status in the audit report.
+
+5. **Check requirements coverage:**
    - Read REQUIREMENTS.md
    - For each requirement tagged for this milestone:
      - Search VERIFICATION.md files for coverage
      - Search SUMMARY.md `provides` fields
      - Flag uncovered requirements
 
-5. **Write audit report:**
+6. **Write audit report:**
 
    Create `.planning/{version}-MILESTONE-AUDIT.md` using the template:
 
-   Read `skills/milestone/templates/audit-report.md.tmpl` for the audit report format. Fill in all `{variable}` placeholders with actual data from the audit.
-
-6. **Report to user** using branded banners:
-
-   **If PASSED:**
-   ```
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-    PLAN-BUILD-RUN ► MILESTONE AUDIT PASSED ✓
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-   All phases verified, integration checks passed, requirements covered.
-
-   ───────────────────────────────────────────────────────────────
+   Read `${CLAUDE_SKILL_DIR}/templates/audit-report.md.tmpl` for the audit report format. Fill in all `{variable}` placeholders with actual data from the audit.
 
-   ## ▶ Next Up
+   **Spot-check:** After writing, verify `.planning/{version}-MILESTONE-AUDIT.md` exists on disk using Glob. If missing, re-attempt the write. If still missing, display an error and include findings inline.
 
-   **Complete the milestone** — archive and tag
-
-   `/pbr:milestone complete {version}`
-
-   <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 ⚠
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-   Found {count} gaps:
-   - {gap 1}
-   - {gap 2}
-
-   ───────────────────────────────────────────────────────────────
-
-   ## ▶ Next Up
-
-   **Close the gaps** — create fix phases
-
-   `/pbr:milestone gaps`
-
-   <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 ⚠
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-   Milestone functional but has {count} tech debt items.
-
-   ───────────────────────────────────────────────────────────────
-
-   ## ▶ Next Up
-
-   **Address tech debt or proceed**
-
-   `/pbr:milestone gaps` — create cleanup phases
-   `/pbr:milestone complete` — proceed as-is
-
-   <sub>`/clear` first → fresh context window</sub>
-
-   ───────────────────────────────────────────────────────────────
-   ```
+7. **Report to user** using branded banners — read `${CLAUDE_SKILL_DIR}/templates/audit-output.md.tmpl`. The template contains all 3 variants (PASSED, GAPS FOUND, TECH DEBT). Select the appropriate section based on audit result. Fill in `{version}`, `{count}`, `{gap 1}`, `{gap 2}` as applicable.
 
 ---
 
@@ -513,7 +524,7 @@ Create phases to close gaps found during an audit.
 1. **Find most recent audit:**
    - Search for `*-MILESTONE-AUDIT.md` in `.planning/`
    - If multiple, use the most recent
-   - If none: "No audit found. Run `/pbr:milestone audit` first."
+   - If none: "No audit found. Run `/pbr:audit-milestone` first."
 
 2. **Read audit report:**
    - Extract all gaps and tech debt items
@@ -580,33 +591,7 @@ Create phases to close gaps found during an audit.
    docs(planning): add gap-closure phases from milestone audit
    ```
 
-9. **Confirm** with branded output:
-   ```
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-    PLAN-BUILD-RUN ► GAP PHASES CREATED ✓
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-   Created {count} gap-closure phase(s):
-   - Phase {N}: {name}
-   - Phase {N+1}: {name}
-
-   ───────────────────────────────────────────────────────────────
-
-   ## ▶ Next Up
-
-   **Plan the first gap-closure phase**
-
-   `/pbr:plan {N}`
-
-   <sub>`/clear` first → fresh context window</sub>
-
-   ───────────────────────────────────────────────────────────────
-
-   **Also available:**
-   - `/pbr:status` — see project status
-
-   ───────────────────────────────────────────────────────────────
-   ```
+9. **Confirm** with branded output — read `${CLAUDE_SKILL_DIR}/templates/gaps-output.md.tmpl` and fill in `{count}` (gap-closure phases created), `{N}` (first gap phase number), `{name}` (phase name).
 
 ---
 
@@ -637,58 +622,8 @@ Tags (complete only):
 
 ## Edge Cases
 
-### No ROADMAP.md exists
-- For `new`: Create one from scratch (this is a fresh start)
-- For others, display:
-```
-╔══════════════════════════════════════════════════════════════╗
-║  ERROR                                                       ║
-╚══════════════════════════════════════════════════════════════╝
-
-No roadmap found.
-
-**To fix:** Run `/pbr:begin` or `/pbr:milestone new` first.
-```
-
-### Milestone has no phases
-Display:
-```
-╔══════════════════════════════════════════════════════════════╗
-║  ERROR                                                       ║
-╚══════════════════════════════════════════════════════════════╝
-
-No phases found for this milestone.
-
-**To fix:**
-- For `complete`: Nothing to complete — add phases first.
-- For `audit`: Nothing to audit — build phases first.
-```
-
-### Audit finds no gaps
-- Status: PASSED
-- Skip the recommendations section
-- Suggest proceeding to complete
-
-### Version already exists (tag collision)
-Display:
-```
-╔══════════════════════════════════════════════════════════════╗
-║  ERROR                                                       ║
-╚══════════════════════════════════════════════════════════════╝
-
-Git tag {version} already exists.
-
-**To fix:** Use a different version number (e.g., {version}.1).
-```
-Ask for alternative via AskUserQuestion.
-
-### Partially verified milestone
-- `complete` warns but allows proceeding with user confirmation
-- `audit` treats unverified phases as gaps
-
-### Large milestone (8+ phases)
-- `audit` may take longer due to integration checking
-- Warn: "This milestone has {count} phases. The audit may take a few minutes."
+For all edge case handling, see `${CLAUDE_SKILL_DIR}/templates/edge-cases.md`.
+Key scenarios: no ROADMAP.md, no phases, no gaps found, version collision, partially verified, large milestone (8+ phases).
 
 ---