@sienklogic/plan-build-run 2.49.0 → 2.51.0

package/CHANGELOG.md

@@ -5,6 +5,33 @@ All notable changes to Plan-Build-Run will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.51.0](https://github.com/SienkLogic/plan-build-run/compare/plan-build-run-v2.50.0...plan-build-run-v2.51.0) (2026-03-01)
+
+
+### Features
+
+* **53-02:** add ci-poll and rollback CLI commands to pbr-tools ([c26434a](https://github.com/SienkLogic/plan-build-run/commit/c26434ac4d58ba8e0849205109f1978222131377))
+
+
+### Bug Fixes
+
+* **53-02:** sync ci-poll and rollback CLI updates to cursor-pbr and copilot-pbr ([ab78f09](https://github.com/SienkLogic/plan-build-run/commit/ab78f09db8e7e653d49d3b1bff366ae95bae98bc))
+
+## [2.50.0](https://github.com/SienkLogic/plan-build-run/compare/plan-build-run-v2.49.0...plan-build-run-v2.50.0) (2026-03-01)
+
+
+### Features
+
+* **52-04:** replace 4 milestone banners with tmpl refs; condense 5 plan SKILL.md sections to < 600 lines ([3e383c4](https://github.com/SienkLogic/plan-build-run/commit/3e383c45d4cfdb51298a2d2531f51752132368a0))
+* **53-01:** add cleanup section and CRITICAL markers to build, consolidate plan pre-planner briefing ([7c14693](https://github.com/SienkLogic/plan-build-run/commit/7c14693e7790728e00d5e4d080e19f54648bc156))
+* **53-02:** GREEN - implement ciPoll and rollback in lib/build.js ([d2ffa30](https://github.com/SienkLogic/plan-build-run/commit/d2ffa309eab8bf10981e88ded12c8e2b4029ad28))
+* **53-02:** register ci-poll and rollback in pbr-tools.js dispatcher ([88c551e](https://github.com/SienkLogic/plan-build-run/commit/88c551e82d3acb1d807bd302c758d041cb0577c0))
+
+
+### Bug Fixes
+
+* **52-05:** remove blank lines to bring build SKILL.md to 868 lines (< 870 target) ([6cd9549](https://github.com/SienkLogic/plan-build-run/commit/6cd954972c33540462cb08f6a192604879b8e6df))
+
 ## [2.49.0](https://github.com/SienkLogic/plan-build-run/compare/plan-build-run-v2.48.0...plan-build-run-v2.49.0) (2026-03-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sienklogic/plan-build-run",
-  "version": "2.49.0",
+  "version": "2.51.0",
   "description": "Plan it, Build it, Run it — structured development workflow for Claude Code",
   "keywords": [
     "claude-code",

package/plugins/copilot-pbr/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pbr",
   "displayName": "Plan-Build-Run",
-  "version": "2.49.0",
+  "version": "2.51.0",
   "description": "Plan-Build-Run — Structured development workflow for GitHub Copilot CLI. Solves context rot through disciplined agent delegation, structured planning, atomic execution, and goal-backward verification.",
   "author": {
     "name": "SienkLogic",

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

@@ -487,19 +487,17 @@ Use AskUserQuestion (pattern: multi-option-failure from `skills/shared/gate-prom
 - If yes: warn user that those plans will also need to be skipped or adjusted
 
 **If user selects 'Rollback':**
-- Read `last_good_commit` from `.checkpoint-manifest.json`
-- If `last_good_commit` exists:
-  - Show the user: "Rolling back to commit {sha} (last verified good state). This will soft-reset {N} commits."
-  - Run: `git reset --soft {last_good_commit}`
-  - Delete the failed plan's SUMMARY.md file if it was created
-  - **CRITICAL — Invalidate downstream dependencies:**
-    - Check if any plans in later waves depend on the rolled-back plan
-    - For each downstream plan that depends on it: delete its SUMMARY.md (forces re-execution)
-    - Remove ALL downstream dependent plans from `checkpoints_resolved` in the manifest
-    - If downstream phases (outside this build) have `dependency_fingerprints` referencing this phase, warn: "Downstream phases may need re-planning with `/pbr:plan <N>` since Phase {current} was partially rolled back."
-  - Update the checkpoint manifest: remove the failed plan from `checkpoints_resolved`
-  - Continue to next wave or stop based on user preference
-- If no `last_good_commit`: warn "No rollback point available (this was the first plan). Use abort instead."
+Run the rollback CLI:
+
+```bash
+node ${PLUGIN_ROOT}/scripts/pbr-tools.js rollback .planning/phases/{NN}-{slug}/.checkpoint-manifest.json
+```
+
+Returns `{ ok, rolled_back_to, plans_invalidated, files_deleted, warnings }`.
+
+- If `ok` is `true`: display "Rolled back to commit {rolled_back_to}. {plans_invalidated.length} downstream plans invalidated."
+  Show any warnings. Continue to next wave or stop based on user preference.
+- If `ok` is `false`: display the error message. Suggest "Use abort instead."
 
 **If user selects 'Abort':**
 - Update STATE.md with current progress
@@ -544,19 +542,21 @@ If `config.ci.gate_enabled` is `true` AND `config.git.branching` is not `none`:
 
 1. Push current commits: `git push`
 2. Wait 5 seconds for CI to trigger
-3. Check: `gh run list --branch $(git branch --show-current) --limit 1 --json status,conclusion,url`
-4. If in_progress: poll every 15 seconds up to `config.ci.wait_timeout_seconds`
-5. If failed/timed out: show warning box:
-
+3. Get the current run ID:
+   ```bash
+   gh run list --branch $(git branch --show-current) --limit 1 --json databaseId -q '.[0].databaseId'
    ```
-   ⚠ CI Status: {conclusion}
-   Run: {url}
-   Options: [Wait] [Continue anyway] [Abort]
+4. Poll CI status using CLI:
+   ```bash
+   node ${PLUGIN_ROOT}/scripts/pbr-tools.js ci-poll <run-id> [--timeout <seconds>]
    ```
-
-6. Use AskUserQuestion to present options: Wait / Continue anyway / Abort
-7. If "Continue anyway": log deviation — `DEVIATION: CI gate bypassed for wave {N}`
-8. If "Abort": stop build, update STATE.md
+   Returns `{ status, conclusion, url, next_action, elapsed_seconds }`.
+5. If `next_action` is `"continue"`: proceed to next wave
+6. If `next_action` is `"wait"`: re-run ci-poll after 15 seconds (repeat up to `config.ci.wait_timeout_seconds`)
+7. If `next_action` is `"abort"` or `status` is `"failed"`:
+   Show warning box and use AskUserQuestion: Wait / Continue anyway / Abort
+8. If "Continue anyway": log deviation — `DEVIATION: CI gate bypassed for wave {N}`
+9. If "Abort": stop build, update STATE.md
 
 #### 6f. Update STATE.md
 
@@ -669,6 +669,8 @@ This ensures that `/pbr:review` after a `--gaps-only` build sees the updated ver
 
 **8-pre-c. Codebase map incremental update (conditional):**
 
+**CRITICAL (no hook): Run codebase map update if conditions are met. Do NOT skip this step.**
+
 Only run if ALL of these are true:
 - `.planning/codebase/` directory exists (project was previously scanned with `/pbr:scan`)
 - Build was not aborted
@@ -779,6 +781,8 @@ Write `.planning/.auto-next` containing the next logical command (e.g., `/pbr:pl
 
 **8e-ii. Check Pending Todos:**
 
+**CRITICAL (no hook): Check pending todos after build. Do NOT skip this step.**
+
 After completing the build, check if any pending todos are now satisfied:
 
 1. Check if `.planning/todos/pending/` exists and contains files
@@ -895,3 +899,9 @@ If `git.branching` is `phase` but we're not on the phase branch:
 | `.planning/STATE.md` | Updated progress | Steps 6f, 8b |
 | `.planning/.auto-next` | Next command signal (if auto_continue enabled) | Step 8e |
 | Project source files | Actual code | Step 6 (executors) |
+
+---
+
+## Cleanup
+
+Delete `.planning/.active-skill` if it exists. This must happen on all paths (success, partial, and failure) before reporting results.

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

@@ -243,61 +243,51 @@ After the researcher completes, check the agent output for a completion marker:
 
 ---
 
-### Step 4.5: Seed Scanning (inline, before planning)
-
-Before invoking the planner, scan `.planning/seeds/` for seeds whose trigger matches the current phase:
-
-1. Glob for `.planning/seeds/*.md`
-2. For each seed file, read its frontmatter and check the `trigger` field
-3. A seed matches if ANY of these are true:
-   - `trigger` equals the phase slug (e.g., `trigger: authentication`) — **preferred**
-   - `trigger` is a substring of the phase directory name (e.g., `trigger: auth` matches `03-authentication`)
-   - `trigger` equals the current phase number as integer (e.g., `trigger: 3`) — backward compatible but NOT recommended for new seeds (breaks with decimal phases like 3.1)
-   - `trigger` equals `*` (always matches)
-4. If matching seeds are found, present them to the user:
-   ```
-   Found {N} seeds related to Phase {NN}:
-     - {seed_name}: {seed description}
-     - {seed_name}: {seed description}
-   ```
-
-   Use the yes-no-pick pattern from `skills/shared/gate-prompts.md`:
-     question: "Include these {N} seeds in planning?"
-     header: "Seeds?"
-     options:
-       - label: "Yes, all"     description: "Include all {N} matching seeds"
-       - label: "Let me pick"  description: "Choose which seeds to include"
-       - label: "No"           description: "Proceed without seeds"
-5. If "Yes, all": include all matching seed content in the planner's context
-6. If "Let me pick": present individual seeds for selection
-7. If "No" or "Other": proceed without seeds
-8. If no matching seeds found: proceed silently
+### Step 4.5: Pre-Planner Briefing (delegated)
 
----
+**CRITICAL (no hook): Run pre-planner briefing before spawning the planner. Do NOT skip this step.**
+
+Consolidate seed scanning and deferred idea surfacing into a single lightweight Task():
+
+```
+Task({
+  subagent_type: "pbr:general",
+  model: "haiku",
+  prompt: "Pre-planner briefing for Phase {NN} ({phase-slug}).
+
+1. SEED SCANNING:
+   Run: `node ${PLUGIN_ROOT}/scripts/pbr-tools.js seeds match {phase-slug} {phase-number}`
+   If `matched` is non-empty, output a ## Seeds section listing each seed name, description, and content.
+   If empty, output: ## Seeds\nNo matching seeds found.
+
+2. DEFERRED IDEAS:
+   Read `.planning/CONTEXT.md`. If it has a section containing 'deferred' or 'ideas' (case-insensitive),
+   extract items that mention Phase {NN} or keywords matching the phase slug.
+   If relevant items found, output a ## Deferred Ideas section listing them.
+   If none found, output: ## Deferred Ideas\nNo relevant deferred items.
+
+Output format: Return both sections as markdown. End with ## BRIEFING COMPLETE."
+})
+```
 
-### Step 4.6: Surface Deferred Ideas (inline, before planning)
-
-Before invoking the planner, check `.planning/CONTEXT.md` for deferred ideas that may be relevant to this phase:
-
-1. If `.planning/CONTEXT.md` does NOT exist, skip this step silently
-2. If it exists, scan for sections named "Deferred Ideas", "Deferred", "Ideas", or "Seeds" (case-insensitive heading match)
-3. For each deferred item found, check relevance to the current phase by comparing the item text against the phase goal, requirements, and slug
-4. If relevant deferred items are found, present them to the user:
-   ```
-   Found {N} deferred idea(s) from previous discussions that may be relevant to Phase {NN}:
-     - {deferred item summary}
-     - {deferred item summary}
-   ```
-   Use the yes-no pattern from `skills/shared/gate-prompts.md`:
-     question: "Include these deferred ideas in the planning context?"
-     header: "Deferred Ideas"
-     options:
-       - label: "Yes"  description: "Pass relevant deferred ideas to the planner"
-       - label: "No"   description: "Proceed without deferred ideas"
-5. If "Yes": append the relevant deferred items to the context bundle for the planner prompt (add them to the `<project_context>` block under a `Deferred ideas to consider:` heading)
-6. If "No" or no relevant items found: proceed without changes
-
-This is a lightweight relevance filter — do NOT invoke an agent for this. Just match keywords from the deferred items against the phase goal and requirement text.
+After the Task() completes:
+- If `## Seeds` section contains matches: present them to the user via the yes-no-pick pattern from `skills/shared/gate-prompts.md`:
+  question: "Include these {N} seeds in planning?"
+  header: "Seeds?"
+  options:
+    - label: "Yes, all"     description: "Include all {N} matching seeds"
+    - label: "Let me pick"  description: "Choose which seeds to include"
+    - label: "No"           description: "Proceed without seeds"
+- If "Yes, all": include seed content in planner context
+- If "Let me pick": present individual seeds for selection
+- If "No": proceed without seeds
+
+- If `## Deferred Ideas` section has items: present via the yes-no pattern from `skills/shared/gate-prompts.md`:
+  question: "Include these deferred ideas in planning context?"
+- If "Yes": append to planner context under `Deferred ideas to consider:`
+- If "No": proceed without changes
+
+- If both sections are empty: proceed silently to Step 5 (no AskUserQuestion needed)
 
 ---
 

package/plugins/cursor-pbr/.cursor-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pbr",
   "displayName": "Plan-Build-Run",
-  "version": "2.49.0",
+  "version": "2.51.0",
   "description": "Plan-Build-Run — Structured development workflow for Cursor. Solves context rot through disciplined subagent delegation, structured planning, atomic execution, and goal-backward verification.",
   "author": {
     "name": "SienkLogic",

package/plugins/cursor-pbr/skills/build/SKILL.md

@@ -488,19 +488,17 @@ Use AskUserQuestion (pattern: multi-option-failure from `skills/shared/gate-prom
 - If yes: warn user that those plans will also need to be skipped or adjusted
 
 **If user selects 'Rollback':**
-- Read `last_good_commit` from `.checkpoint-manifest.json`
-- If `last_good_commit` exists:
-  - Show the user: "Rolling back to commit {sha} (last verified good state). This will soft-reset {N} commits."
-  - Run: `git reset --soft {last_good_commit}`
-  - Delete the failed plan's SUMMARY.md file if it was created
-  - **CRITICAL — Invalidate downstream dependencies:**
-    - Check if any plans in later waves depend on the rolled-back plan
-    - For each downstream plan that depends on it: delete its SUMMARY.md (forces re-execution)
-    - Remove ALL downstream dependent plans from `checkpoints_resolved` in the manifest
-    - If downstream phases (outside this build) have `dependency_fingerprints` referencing this phase, warn: "Downstream phases may need re-planning with `/pbr:plan <N>` since Phase {current} was partially rolled back."
-  - Update the checkpoint manifest: remove the failed plan from `checkpoints_resolved`
-  - Continue to next wave or stop based on user preference
-- If no `last_good_commit`: warn "No rollback point available (this was the first plan). Use abort instead."
+Run the rollback CLI:
+
+```bash
+node ${PLUGIN_ROOT}/scripts/pbr-tools.js rollback .planning/phases/{NN}-{slug}/.checkpoint-manifest.json
+```
+
+Returns `{ ok, rolled_back_to, plans_invalidated, files_deleted, warnings }`.
+
+- If `ok` is `true`: display "Rolled back to commit {rolled_back_to}. {plans_invalidated.length} downstream plans invalidated."
+  Show any warnings. Continue to next wave or stop based on user preference.
+- If `ok` is `false`: display the error message. Suggest "Use abort instead."
 
 **If user selects 'Abort':**
 - Update STATE.md with current progress
@@ -545,18 +543,20 @@ If `config.ci.gate_enabled` is `true` AND `config.git.branching` is not `none`:
 
 1. Push current commits: `git push`
 2. Wait 5 seconds for CI to trigger
-3. Check: `gh run list --branch $(git branch --show-current) --limit 1 --json status,conclusion,url`
-4. If in_progress: poll every 15 seconds up to `config.ci.wait_timeout_seconds`
-5. If failed/timed out: show warning box:
-
+3. Get the current run ID:
+   ```bash
+   gh run list --branch $(git branch --show-current) --limit 1 --json databaseId -q '.[0].databaseId'
    ```
-   ⚠ CI Status: {conclusion}
-   Run: {url}
-   Options: [Wait] [Continue anyway] [Abort]
+4. Poll CI status using CLI:
+   ```bash
+   node ${PLUGIN_ROOT}/scripts/pbr-tools.js ci-poll <run-id> [--timeout <seconds>]
    ```
-
-6. Use AskUserQuestion to present options: Wait / Continue anyway / Abort
-7. If "Continue anyway": log deviation — `DEVIATION: CI gate bypassed for wave {N}`
+   Returns `{ status, conclusion, url, next_action, elapsed_seconds }`.
+5. If `next_action` is `"continue"`: proceed to next wave
+6. If `next_action` is `"wait"`: re-run ci-poll after 15 seconds (repeat up to `config.ci.wait_timeout_seconds`)
+7. If `next_action` is `"abort"` or `status` is `"failed"`:
+   Show warning box and use AskUserQuestion: Wait / Continue anyway / Abort
+8. If "Continue anyway": log deviation — `DEVIATION: CI gate bypassed for wave {N}`
 8. If "Abort": stop build, update STATE.md
 
 #### 6f. Update STATE.md
@@ -670,6 +670,8 @@ This ensures that `/pbr:review` after a `--gaps-only` build sees the updated ver
 
 **8-pre-c. Codebase map incremental update (conditional):**
 
+**CRITICAL (no hook): Run codebase map update if conditions are met. Do NOT skip this step.**
+
 Only run if ALL of these are true:
 - `.planning/codebase/` directory exists (project was previously scanned with `/pbr:scan`)
 - Build was not aborted
@@ -780,6 +782,8 @@ Write `.planning/.auto-next` containing the next logical command (e.g., `/pbr:pl
 
 **8e-ii. Check Pending Todos:**
 
+**CRITICAL (no hook): Check pending todos after build. Do NOT skip this step.**
+
 After completing the build, check if any pending todos are now satisfied:
 
 1. Check if `.planning/todos/pending/` exists and contains files
@@ -894,3 +898,9 @@ If `git.branching` is `phase` but we're not on the phase branch:
 | `.planning/STATE.md` | Updated progress | Steps 6f, 8b |
 | `.planning/.auto-next` | Next command signal (if auto_continue enabled) | Step 8e |
 | Project source files | Actual code | Step 6 (executors) |
+
+---
+
+## Cleanup
+
+Delete `.planning/.active-skill` if it exists. This must happen on all paths (success, partial, and failure) before reporting results.

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

@@ -244,61 +244,51 @@ After the researcher completes, check the agent output for a completion marker:
 
 ---
 
-### Step 4.5: Seed Scanning (inline, before planning)
-
-Before invoking the planner, scan `.planning/seeds/` for seeds whose trigger matches the current phase:
-
-1. Glob for `.planning/seeds/*.md`
-2. For each seed file, read its frontmatter and check the `trigger` field
-3. A seed matches if ANY of these are true:
-   - `trigger` equals the phase slug (e.g., `trigger: authentication`) — **preferred**
-   - `trigger` is a substring of the phase directory name (e.g., `trigger: auth` matches `03-authentication`)
-   - `trigger` equals the current phase number as integer (e.g., `trigger: 3`) — backward compatible but NOT recommended for new seeds (breaks with decimal phases like 3.1)
-   - `trigger` equals `*` (always matches)
-4. If matching seeds are found, present them to the user:
-   ```
-   Found {N} seeds related to Phase {NN}:
-     - {seed_name}: {seed description}
-     - {seed_name}: {seed description}
-   ```
-
-   Use the yes-no-pick pattern from `skills/shared/gate-prompts.md`:
-     question: "Include these {N} seeds in planning?"
-     header: "Seeds?"
-     options:
-       - label: "Yes, all"     description: "Include all {N} matching seeds"
-       - label: "Let me pick"  description: "Choose which seeds to include"
-       - label: "No"           description: "Proceed without seeds"
-5. If "Yes, all": include all matching seed content in the planner's context
-6. If "Let me pick": present individual seeds for selection
-7. If "No" or "Other": proceed without seeds
-8. If no matching seeds found: proceed silently
+### Step 4.5: Pre-Planner Briefing (delegated)
 
----
+**CRITICAL (no hook): Run pre-planner briefing before spawning the planner. Do NOT skip this step.**
+
+Consolidate seed scanning and deferred idea surfacing into a single lightweight Task():
+
+```
+Task({
+  subagent_type: "pbr:general",
+  model: "haiku",
+  prompt: "Pre-planner briefing for Phase {NN} ({phase-slug}).
+
+1. SEED SCANNING:
+   Run: `node ${PLUGIN_ROOT}/scripts/pbr-tools.js seeds match {phase-slug} {phase-number}`
+   If `matched` is non-empty, output a ## Seeds section listing each seed name, description, and content.
+   If empty, output: ## Seeds\nNo matching seeds found.
+
+2. DEFERRED IDEAS:
+   Read `.planning/CONTEXT.md`. If it has a section containing 'deferred' or 'ideas' (case-insensitive),
+   extract items that mention Phase {NN} or keywords matching the phase slug.
+   If relevant items found, output a ## Deferred Ideas section listing them.
+   If none found, output: ## Deferred Ideas\nNo relevant deferred items.
+
+Output format: Return both sections as markdown. End with ## BRIEFING COMPLETE."
+})
+```
 
-### Step 4.6: Surface Deferred Ideas (inline, before planning)
-
-Before invoking the planner, check `.planning/CONTEXT.md` for deferred ideas that may be relevant to this phase:
-
-1. If `.planning/CONTEXT.md` does NOT exist, skip this step silently
-2. If it exists, scan for sections named "Deferred Ideas", "Deferred", "Ideas", or "Seeds" (case-insensitive heading match)
-3. For each deferred item found, check relevance to the current phase by comparing the item text against the phase goal, requirements, and slug
-4. If relevant deferred items are found, present them to the user:
-   ```
-   Found {N} deferred idea(s) from previous discussions that may be relevant to Phase {NN}:
-     - {deferred item summary}
-     - {deferred item summary}
-   ```
-   Use the yes-no pattern from `skills/shared/gate-prompts.md`:
-     question: "Include these deferred ideas in the planning context?"
-     header: "Deferred Ideas"
-     options:
-       - label: "Yes"  description: "Pass relevant deferred ideas to the planner"
-       - label: "No"   description: "Proceed without deferred ideas"
-5. If "Yes": append the relevant deferred items to the context bundle for the planner prompt (add them to the `<project_context>` block under a `Deferred ideas to consider:` heading)
-6. If "No" or no relevant items found: proceed without changes
-
-This is a lightweight relevance filter — do NOT invoke an agent for this. Just match keywords from the deferred items against the phase goal and requirement text.
+After the Task() completes:
+- If `## Seeds` section contains matches: present them to the user via the yes-no-pick pattern from `skills/shared/gate-prompts.md`:
+  question: "Include these {N} seeds in planning?"
+  header: "Seeds?"
+  options:
+    - label: "Yes, all"     description: "Include all {N} matching seeds"
+    - label: "Let me pick"  description: "Choose which seeds to include"
+    - label: "No"           description: "Proceed without seeds"
+- If "Yes, all": include seed content in planner context
+- If "Let me pick": present individual seeds for selection
+- If "No": proceed without seeds
+
+- If `## Deferred Ideas` section has items: present via the yes-no pattern from `skills/shared/gate-prompts.md`:
+  question: "Include these deferred ideas in planning context?"
+- If "Yes": append to planner context under `Deferred ideas to consider:`
+- If "No": proceed without changes
+
+- If both sections are empty: proceed silently to Step 5 (no AskUserQuestion needed)
 
 ---
 

package/plugins/pbr/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pbr",
-  "version": "2.49.0",
+  "version": "2.51.0",
   "description": "Plan-Build-Run — Structured development workflow for Claude Code. Solves context rot through disciplined subagent delegation, structured planning, atomic execution, and goal-backward verification.",
   "author": {
     "name": "SienkLogic",