feat(primitives): renumber so Wait=P9 — restore skill-name↔primitive-number alignment (#23)

The productive-wait primitive returns to P9, matching the `broomva/p9`
skill repo name. Skill Freshness moves to P7, Branch+Worktree Janitor
moves to P8. This closes the Name (Pn) recall-key failure mode the
naming rule (PR #21) was designed to prevent: under the interim
P7=Wait / P8=Freshness / P9=Janitor numbering, the `broomva/p9` skill
name pointed at primitive P9 (Janitor), making `feedback_p9_reflexive.md`
ambiguous — was it about the skill (Wait) or the primitive number
(Janitor)? The 2026-05-16 renumber restores Wait = P9 = `broomva/p9`
everywhere.

Stacked on PR #21 (`feat/primitive-naming-reflex`) so this PR carries
both the naming rule and the alignment fix it makes possible.

Changes:
- SKILL.md: description-block prose + primitive table P7/P8/P9 swap +
  Short-name index in the naming-convention section. Added prose
  explaining why Wait sits at P9 (skill repo name commitment).
- references/primitives.md: TOC + section bodies P7/P8/P9 swap +
  Short-name index. Section bodies carry legacy-path callouts pointing
  at the OPPOSITE direction now (~/.config/broomva/p7/ canonical, p8/
  legacy for freshness; p8-janitor/ canonical, p9-janitor/ legacy for
  janitor). The §P9 Skill name paragraph now explains the renumber
  rationale + the "numeric soup" failure mode it closes.
- assets/templates/settings.json.snippet: skill-freshness-hook.sh's
  `_bstack_primitive` annotation flipped P8 → P7.
- assets/templates/policy.yaml.template: two comment headers updated
  to mark the ci_watch + auto_merge blocks as P9 primitives.
- assets/templates/{CLAUDE,AGENTS}.md.template: no changes — these were
  already in the target ordering (the templates have been ahead of the
  workspace this whole time, which is what made the renumber possible
  in one PR).
- scripts/doctor.sh:
  - Section 1-8 comment block updated for new numbering.
  - P_NAMES array swap (P7=Skill Freshness, P8=Janitor, P9=Wait).
  - REFLEXIVE_PRIMS now includes P9 (Wait, reasoning-enforced) and
    excludes P7 (Freshness, hook-enforced).
  - HOOK_LABELS skill-freshness-hook.sh label flipped P8 → P7.
  - SCRIPT_PATHS reordered so SCRIPT_LABELS=(P1 P2 P6 P7 P8 P9 P12)
    matches the new path-to-primitive mapping.
  - NEW Section 9 — Naming convention propagation. Lints CLAUDE.md +
    AGENTS.md for (a) presence of the Name (Pn) naming rule in prose
    and (b) a Short-name index with exactly 20 entries. Closes the
    silent-drift failure mode where governance edits could leave the
    index mismatched with the primitive count.
- tests/template_lockstep.test.sh: updated explanatory comment to
  reflect that templates and workspace canonical now agree. Kept in
  WARN mode for one release cycle to ease in-place upgrades from
  downstream workspaces still on legacy ordering.
- VERSION: 0.1.0 → 0.2.0.
- CHANGELOG.md: 0.2.0 entry covering the renumber rationale, the
  migration path (legacy env vars + config dirs still honored), the
  naming-rule propagation (PR #21 carry-forward), and the doctor
  Section 9 extension.

Workspace PR-A (companion to this PR) will follow shortly with the
runtime changes (CLAUDE.md + AGENTS.md + scripts/skill-freshness-hook.sh +
scripts/branch-janitor.sh) so the workspace mechanisms match these
declarative bstack changes. Until PR-A lands, doctor against the
workspace reports a single P9-missing-reflexive-rule gap — that's the
expected coordination signal.

Validation:
- tests/template_lockstep.test.sh: 15/15 (canonical count = 20)
- scripts/doctor.sh: 78/79 — only gap is workspace AGENTS.md P9
  missing reflexive rule, which PR-A fixes. Section 9 Name (Pn) lint
  passes for both CLAUDE.md + AGENTS.md.

Co-authored-by: Carlos D. Escobar-Valbuena <devteam@getstimulus.ai>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: 3 people

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## 0.2.0 — 2026-05-16
+
+### Primitive renumber: Wait moves back to P9 (skill-name↔primitive-number alignment)
+
+The productive-wait primitive (`broomva/p9` skill) is now **P9 (Wait)** again,
+matching the skill repo name. Freshness moves to **P7**, Janitor moves to **P8**.
+
+| Before | After |
+|---|---|
+| P7 = Wait (`broomva/p9` skill — historical name) | P7 = Skill Freshness |
+| P8 = Skill Freshness | P8 = Branch + Worktree Janitor |
+| P9 = Branch + Worktree Janitor | P9 = Wait (`broomva/p9` skill — name matches number) |
+
+**Rationale**: the interim P8-Freshness / P9-Janitor numbering broke the Name (Pn)
+recall key for Wait — the `broomva/p9` skill name no longer matched any primitive
+number, producing the exact "numeric soup" failure mode the naming rule (added
+in 0.1.x) was designed to prevent. Memory feedback file `feedback_p9_reflexive.md`
+became ambiguous (was it about the *skill* or the *primitive number*?). The
+2026-05-16 renumber restores alignment so Wait = P9 = `broomva/p9` — primitive
+number, primitive name, and skill repo name all agree.
+
+**Migration**: legacy paths kept working via fallback in `skill-freshness-hook.sh`
+(reads `~/.config/broomva/p7/` canonically, falls back to `~/.config/broomva/p8/`)
+and `branch-janitor.sh` (reads `~/.config/broomva/p8-janitor/` canonically, falls
+back to `~/.config/broomva/p9-janitor/`). Legacy env vars `BROOMVA_P8_HOME` and
+`BROOMVA_P9_JANITOR_HOME` still honored for in-place upgrades; canonical names
+are now `BROOMVA_P7_HOME` and `BROOMVA_P8_JANITOR_HOME`.
+
+### Naming convention rule propagated to bstack-loaded surfaces
+
+The "use `Name (Pn)` form in agent prose, never bare `Pn`" rule (already in
+workspace CLAUDE.md + AGENTS.md) is now restated in `SKILL.md` (naming-convention
+subsection after the primitives table) and `references/primitives.md` (top of
+file, before TOC). When `/bstack` fires and agents load these surfaces, the rule
+is visible at the entry point — closing the gap where agents reverted to bare
+`Pn` because the rule was buried only in workspace governance files.
+
+### Doctor extensions
+
+- **New Section 9 — Naming convention propagation**: `scripts/doctor.sh` now lints
+  that CLAUDE.md + AGENTS.md contain (a) the `Name (Pn)` naming rule in prose,
+  and (b) a **Short-name index** line with exactly 20 entries. Closes the
+  silent-drift failure mode where governance edits could leave the index
+  mismatched with the primitive count.
+- **Primitive-number checks updated**: Section 3 (AGENTS.md primitive sections),
+  Section 4 (reflexive trigger rules), Section 6 (hook wiring labels), and
+  Section 7 (script paths + labels) all reflect the new canonical ordering.
+
 ## 0.1.0
 
 - Initial versioned release with auto-update mechanism

SKILL.md

@@ -7,12 +7,12 @@ description: |
   the substrate. P1 captures every session as episodic memory. P2 gates
   destructive operations. P3 tracks every work unit in Linear. P4 forces every
   change through CI. P5 isolates parallel agents in worktrees. P6 keeps the
-  knowledge graph quality-controlled. P7 is the productive-wait optimizer
-  (`broomva/p9` skill — historical name) — drains a context-scoped queue
-  while a blocking operation (PR CI, deploy, build, long index) runs;
-  classifier + evaluator self-heal red CI is the reference implementation.
-  P8 nudges when installed skills go stale. P9 cleans up squash-merged
-  branches and dead worktrees. P10 binds every agent to
+  knowledge graph quality-controlled. P7 nudges when installed skills go
+  stale. P8 cleans up squash-merged branches and dead worktrees. P9 is the
+  productive-wait optimizer (`broomva/p9` skill — name matches primitive
+  number) — drains a context-scoped queue while a blocking operation (PR
+  CI, deploy, build, long index) runs; classifier + evaluator self-heal
+  red CI is the reference implementation. P10 binds every agent to
   clean-tree discipline through the PR lifecycle. P11 is the cohesion glue —
   bind every agent to validate by interacting with what they build, not just
   by reasoning + lint + CI exit codes. P12 is the long-horizon discipline —
@@ -26,7 +26,7 @@ description: |
   graph. P18 binds the format of every produced documentation artifact to
   its audience — markdown for LLM-loaded surfaces, HTML for human deliverables
   (specs, plans, reports, design exploration). P19 names the autonomous-
-  continuation family (the 2×2 of /goal | P7 watcher | /loop | P12 persist)
+  continuation family (the 2×2 of /goal | P9 watcher | /loop | P12 persist)
   and the selection discipline — pick the right mechanism for the work
   shape; compose dynamically; never return control mid-arc when a mechanism
   would keep it closed. P20 is the cross-model adversarial review gate —
@@ -91,9 +91,9 @@ The twenty primitives. Each closes one specific failure mode that drifts into en
 | **P4** | PR Pipeline | merging unreviewed code |
 | **P5** | Parallel Agents | sequential bottleneck |
 | **P6** | Knowledge Bookkeeping | knowledge graph rot |
-| **P7** | CI Watcher + Productive Wait (`broomva/p9` skill — historical name) | sleep-on-wait dead time (CI, deploys, builds — PR CI is the reference impl) |
-| **P8** | Skill Freshness Check | silent rot of `npx skills add` snapshots |
-| **P9** | Branch + Worktree Janitor | squash-merge accumulation |
+| **P7** | Skill Freshness Check | silent rot of `npx skills add` snapshots |
+| **P8** | Branch + Worktree Janitor | squash-merge accumulation |
+| **P9** | CI Watcher + Productive Wait (`broomva/p9` skill — name matches number) | sleep-on-wait dead time (CI, deploys, builds — PR CI is the reference impl) |
 | **P10** | Worktree Hygiene Discipline | dirty-tree drift across the PR lifecycle |
 | **P11** | Empirical Feedback Loop | shipping code that compiles but doesn't work |
 | **P12** | Persistent Loop Discipline (`broomva/persist` skill) | long-horizon work decaying as the context window rots |
@@ -112,9 +112,9 @@ Full reference: see [references/primitives.md](references/primitives.md).
 
 Each primitive carries a **short name** for use in agent prose. When referencing a primitive in responses, PR bodies, commit messages, code comments, knowledge-graph entries, or any human-readable surface, use the **`Name (Pn)`** form — *"applying Snapshot (P15)"*, *"via Dep-Chain (P14)"*, *"running Bookkeeping (P6)"* — not bare `P15` / `P14` / `P6`. The number is the canonical identifier (stable across renames); the name is the human-readable handle. First mention in a response uses the full form; subsequent mentions in the same response may drop to bare `Name` ("Snapshot showed clean state") but never to bare `Pn`. Anchors, section IDs (`#p15-state-snapshot-before-action`), and primitive-count headers ("Twenty irreducible primitives") stay numeric — URL stability and arithmetic respectively. Failure mode: bare `Pn` makes responses read as numeric soup; cross-session readers can't decode the reference without a lookup. The Short-name index below is the recall key.
 
-**Short-name index** (canonical numbering): Bridge (P1) · Gate (P2) · Tickets (P3) · Pipeline (P4) · Fanout (P5) · Bookkeeping (P6) · Wait (P7) · Freshness (P8) · Janitor (P9) · Hygiene (P10) · Empirical (P11) · Persist (P12) · Dream (P13) · Dep-Chain (P14) · Snapshot (P15) · Crystallize (P16) · Lens (P17) · Audience (P18) · Orchestrate (P19) · Cross-Review (P20).
+**Short-name index** (canonical numbering): Bridge (P1) · Gate (P2) · Tickets (P3) · Pipeline (P4) · Fanout (P5) · Bookkeeping (P6) · Freshness (P7) · Janitor (P8) · Wait (P9) · Hygiene (P10) · Empirical (P11) · Persist (P12) · Dream (P13) · Dep-Chain (P14) · Snapshot (P15) · Crystallize (P16) · Lens (P17) · Audience (P18) · Orchestrate (P19) · Cross-Review (P20).
 
-**Canonical statement** lives in workspace `CLAUDE.md` §Bstack Core Automation Primitives and workspace `AGENTS.md` near line 93. This SKILL.md restates the rule so it's visible at the entry point where `/bstack` loads.
+**Canonical statement** lives in workspace `CLAUDE.md` §Bstack Core Automation Primitives and workspace `AGENTS.md` near line 93. This SKILL.md restates the rule so it's visible at the entry point where `/bstack` loads. **Note**: Wait sits at P9 to match the `broomva/p9` skill repo name — the primitive number and the skill name are intentionally aligned. Skill repos that don't carry a number (e.g., `broomva/bookkeeping` = P6, `broomva/persist` = P12) take their name from the function, not the number; carrying a numeric skill name is a commitment to keep that number stable.
 
 **Canonical operating mode**: `broomva/autonomous` — when the user says "go" / "proceed" / "be autonomous" / "automerge" / any bare execution directive, `/autonomous` fires the 20-reflex pipeline that exercises every primitive above in the right sequence. Substrate without mode is dormant; mode without substrate is wishful. Compounded, they produce a self-operating workspace.
 

VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

assets/templates/policy.yaml.template

@@ -44,8 +44,8 @@ gates:
       rule: "Run smoke before commit"
       severity: warn
 
-# === P7 CI Watcher + Productive-Wait Primitive ===
-# Required by skills/p9 (bstack P7 primitive). Fails closed if absent.
+# === P9 CI Watcher + Productive-Wait Primitive ===
+# Required by skills/p9 (bstack P9 primitive — name matches number). Fails closed if absent.
 
 ci_watch:
   enabled: true
@@ -67,7 +67,7 @@ ci_heal:
     linear_label: ci-heal-escalation
     notify_hook: skills/p9/scripts/p9-escalate-notify.sh
 
-# === P7 Auto-merge actuator ===
+# === P9 Auto-merge actuator ===
 # Closes the MERGE_READY → merged gap. Default-disabled; opt-in branch class.
 
 auto_merge:

assets/templates/settings.json.snippet

@@ -8,7 +8,7 @@
             "type": "command",
             "command": "${BROOMVA_WORKSPACE}/scripts/skill-freshness-hook.sh",
             "timeout": 5,
-            "_bstack_primitive": "P8"
+            "_bstack_primitive": "P7"
           },
           {
             "type": "command",