bmad-method 6.10.1-next.2 → 6.10.1-next.21

package/src/core-skills/bmad-party-mode/scripts/resolve_party.py

@@ -131,13 +131,18 @@ def build_collective(agents: dict, party_members: list):
         })
         installed_codes.append(code)
 
-    for m in party_members or []:
+    for m in (party_members if isinstance(party_members, list) else []):
+        if not isinstance(m, dict):
+            continue
         code = m.get("code")
         if not code:
             continue
         # A custom member overrides an installed agent it matches by code/alias/name.
         canonical = index.get(code) or index.get(code.lower()) or code
-        entry = {"code": canonical, "source": "custom"}
+        # Start from the installed entry so fields the override omits
+        # (icon, title, description, module, team) survive.
+        entry = dict(collective.get(canonical, {}))
+        entry.update({"code": canonical, "source": "custom"})
         for field in ("name", "icon", "title", "persona", "capabilities", "model"):
             if m.get(field) is not None:
                 entry[field] = m[field]
@@ -152,7 +157,10 @@ def resolve_members(member_tokens, collective, index):
     """(resolved entries in listed order, unresolved tokens)."""
     resolved, unresolved = [], []
     for token in member_tokens or []:
-        code = index.get(token) or index.get(str(token).lower())
+        if not isinstance(token, str):
+            unresolved.append(token)  # malformed config value — never a key lookup
+            continue
+        code = index.get(token) or index.get(token.lower())
         if code and code in collective:
             resolved.append(collective[code])
         else:

package/src/core-skills/bmad-review/SKILL.md

@@ -0,0 +1,49 @@
+---
+name: bmad-review
+description: 'Multi-lens review over any diff, doc, spec, or artifact — whichever installed lenses fit the content, run singly or together. Shipped lenses include adversarial, edge-case, verification-gap, structure, and prose. Use when the user says "review this", "critical review", "editorial review", "hunt edge cases", "review the structure", or "review the prose".'
+---
+
+# BMad Review
+
+Review content through lenses — each a distinct method and stance — and report findings in one canonical shape. Report what is real — never pad to look thorough. Each lens sets its own stance toward the content and toward zero findings: for most an empty result is valid; the adversarial lens treats it as suspicious; the editorial lenses hold content sacrosanct and critique only how it is organized and expressed.
+
+The lens set is whatever `{workflow.lenses}` resolves to, not a fixed list — overrides add lenses and replace shipped ones. Never claim a capability from this file; read the resolved lenses and work from those.
+
+## Inputs
+
+- **content** — what to review: a diff, branch, uncommitted changes, file, spec, story, or any document. Args: `[path]`.
+- **lenses** (optional) — one or more lens codes or names, however the caller expresses them: a spoken request, or a directive of the form `skill:bmad-review lenses=<code>[,<code>...]` (the form bmm's `doc_standards` uses). Default: every applicable lens (a full review).
+- **also_consider** (optional) — areas to keep in mind alongside each lens's normal analysis.
+- **pre-resolved customization** (optional) — `[workflow]` field values supplied by a forwarding caller. See Execution step 1.
+
+## Conventions
+
+- Bare paths (e.g. `references/lens-edge-case-hunter.md`) resolve from `{skill-root}` — this skill's installed directory, where `customize.toml` lives. `{project-root}` resolves to the project working directory.
+- `{workflow.<name>}` resolves to fields in `customize.toml`'s `[workflow]` table (overrides win per BMad merge rules).
+- In `style_guide`, `review_guidance`, and `persistent_facts`, a value prefixed `file:` is a path or glob — load that file's contents. If a `file:` value cannot be read, name the failed file in the output header and continue: the shipped baseline for `style_guide`, the remaining entries otherwise.
+
+## Execution
+
+1. **Resolve customization:** `uv run {project-root}/_bmad/scripts/resolve_customization.py --skill {skill-root} --key workflow`. On failure, read `{skill-root}/customize.toml` directly and use defaults. **Forwarded activation:** if a caller invoked you with pre-resolved customization fields (e.g. the `bmad-editorial-review` shim), honor them verbatim for those named fields — they already carry the user's overrides — and resolve only the remaining fields from your own `customize.toml`. Then execute each `{workflow.activation_steps_prepend}` entry in order, hold `{workflow.persistent_facts}` as standing context for the session, and treat `{workflow.review_guidance}` entries as standing review directives for every lens.
+2. **Load the content.** If it is empty or cannot be decoded as text: when the caller expects the raw findings JSON array (e.g. the legacy edge-case forwarder), return `[{"location":"N/A","trigger_condition":"Input empty or undecodable","guard_snippet":"Provide valid content to review","potential_consequence":"Review skipped — no analysis performed"}]` (no `lens` field) and stop; otherwise say what's wrong and ask for reviewable content. Classify the content — diff, source file, function, or document — and whether it is **code** or **docs**; scope rules and lens applicability both depend on it. A document that defines behavior (spec, requirements, plan, story) is `docs` that a behavioral lens may still apply to; judge by `when`.
+3. **Select lenses** from `{workflow.lenses}`. A lens with an empty `instruction` is disabled. If the user or caller named lenses, run exactly those only — `applies_to` and `when` do not filter an explicit request. Otherwise run every enabled lens whose `applies_to` covers the content class (`any` always covers) and whose `when` applies.
+4. **Announce the plan** in one line before running anything: the content class, the lenses about to run, and — when any lens has `after` set — that it runs on top of the named lens's findings. Skip the announcement entirely when the caller pinned an exact output contract (the legacy forwarders that demand raw JSON or one exact line) — their contract covers everything you emit, not just the findings block. Then execute each `{workflow.activation_steps_append}` entry in order.
+5. **Run the independent lenses** — every selected lens without `after`. Each sees the content and `also_consider`, never another lens's findings. Follow each lens's `instruction`; the shipped lenses load their reference file just-in-time, so load only what runs. When subagents are available, spawn one per lens in parallel: give it the lens `instruction` with `{skill-root}` and paths resolved absolute, the content or where to read it, any `also_consider` areas, the standing review directives, and the constraint "Return ONLY your findings — no other output." Otherwise run the lenses sequentially yourself, completing one before starting the next.
+6. **Run the dependent lenses** — every selected lens with `after`, once the lens it names has completed, passing that lens's findings in. A lens whose `after` target was not selected or produced nothing still runs, with no prior findings. Dependent lenses that name different targets are independent of each other and may run in parallel.
+7. **Assemble and present** per Output below. Keep every lens's findings — overlap between lenses is signal, not duplication; note it in the markdown report rather than deduping. Execute `{workflow.on_complete}` if set.
+
+## Output
+
+One JSON array holding every finding from every lens. Each finding carries:
+
+- `lens` — the code of the lens that produced it
+- `location` — where in the content (file:line-range for code, section for documents)
+- `trigger_condition` — the problem, or the condition that exposes it, in one line
+- `guard_snippet` — the concrete fix, guard, or missing check
+- `potential_consequence` — what goes wrong if it ships as-is
+
+Each lens file refines these semantics for its findings and may add lens-specific fields (e.g. `kind`/`confidence` on deletion findings, `gap_shape`/`consumer`/`evidence` on verification-gap findings). A lens file may instead declare its own findings shape and rendering — the editorial lenses render a findings table — and that shape wins for that lens's findings. `[]` is valid when nothing is found. No severity, priority, or ranking anywhere.
+
+Present per `{workflow.output_format}` — `"json"` (the raw array in a fenced json block), `"markdown"`, or `"both"` — unless the caller requested a specific shape; a legacy forwarder's output contract always wins, and governs everything you emit rather than the findings block alone. The markdown report groups findings by lens, each rendered in its declared shape: a short block per finding rendering the fields plus any extras worth surfacing, one line for a lens that found nothing, and a plain clean statement when the whole review is clean. Shape the report per `{workflow.output_preferences}`.
+
+When `{workflow.report_path}` is set, write the report there; otherwise present it in chat.

package/src/core-skills/bmad-review/customize.toml

@@ -0,0 +1,141 @@
+# DO NOT EDIT -- overwritten on every update.
+#
+# Workflow customization surface for bmad-review.
+#
+# Override files (not edited here):
+#   {project-root}/_bmad/custom/bmad-review.toml         (team)
+#   {project-root}/_bmad/custom/bmad-review.user.toml    (personal)
+
+[workflow]
+
+# --- Configurable below. Overrides merge per BMad structural rules: ---
+#   scalars: override wins
+#   arrays (persistent_facts, activation_steps_*, review_guidance): append
+#   arrays of tables keyed by `code`: matching key replaces, new keys append
+
+# Steps executed on activation: prepend runs before the skill's own
+# activation flow, append runs after the lens plan is settled and before the
+# lenses run. Each entry is a literal instruction.
+activation_steps_prepend = []
+activation_steps_append = []
+
+# Standing context held for every review, code and document alike. Entries
+# prefixed `file:` are paths or globs whose contents load as facts; all others
+# are literal facts. The shipped entry is a project-wide glob — set it to []
+# if you don't want every review scanning for it.
+persistent_facts = ["file:{project-root}/**/project-context.md"]
+
+# Standing review directives applied on every run alongside each lens's own
+# method. Each entry is a literal sentence or a `file:`-prefixed path/glob
+# whose contents load as directives.
+#
+# Examples:
+#   "Flag passive voice in headings."
+#   "Second-person imperative is the house voice; never suggest changing it."
+#   "file:{project-root}/docs/terminology.md"
+review_guidance = []
+
+# Executed after the findings are delivered. Freeform directive; empty = the
+# review ends with the findings.
+#
+# Example:
+#   on_complete = "Append a one-line review summary to {project-root}/docs/review-log.md"
+on_complete = ""
+
+# How findings are presented when the caller doesn't say: "json" (the raw
+# findings array only), "markdown" (the human report only), or "both". A lens
+# that declares its own rendering keeps it for its own findings.
+output_format = "both"
+
+# Where to write the review report. Empty = present in chat only. Accepts
+# {project-root}-prefixed paths.
+report_path = ""
+
+# How findings are presented — shaping, not destination. Freeform directive;
+# empty = each lens's default ordering and rollup.
+#
+# Example:
+#   output_preferences = "Cap output at the 20 highest-impact findings."
+output_preferences = ""
+
+# --- Editorial lens settings (used by the structure and prose lenses) ---
+
+# Default reader the editorial lenses calibrate for when the request doesn't
+# say:
+#   "humans"  clarity, flow, comprehension aids preserved
+#   "llm"     precision, consistent terminology, no hedging
+# A reader type stated in the request wins for that run.
+reader_type = "humans"
+
+# The baseline style guide for every editorial review: the name of a guide the
+# model knows well, a `file:`-prefixed path to a style guide document, or the
+# rules inline as text. A style guide stated in the request wins for that run.
+# Where the guide in effect conflicts with the lens's generic principles, the
+# guide wins — except content is sacrosanct.
+#
+# Examples (set in team/user override TOML):
+#   style_guide = "file:{project-root}/_bmad/style-guides/company-voice.md"
+#   style_guide = "Sentence-case headings. No Oxford comma. Address the reader as 'you'."
+style_guide = "Microsoft Writing Style Guide"
+
+# ---------------------------------------------------------------------------
+# Review lenses. Each lens is a pass over the content with its own method and
+# stance. `instruction` is the lens's whole execution recipe — the shipped
+# lenses load a reference file from the skill root, but an override may inline
+# any prompt.
+#
+# `applies_to` is the content this lens can review: "code", "docs", or "any".
+# It is the first filter — a lens never joins a default review for content it
+# does not apply to. `when` (optional) refines that judgement in prose. An
+# explicitly requested lens always runs, whatever both say.
+#
+# `after` (optional) names a lens this one builds on: it runs once that lens
+# has completed and receives its findings, instead of running independently.
+#
+# Empty `instruction` disables a lens. Keyed by `code`: an override with a
+# matching code replaces the shipped lens, a new code appends.
+#
+# Example (add an org-specific lens in team/user override TOML):
+#   [[workflow.lenses]]
+#   code = "accessibility"
+#   name = "Accessibility"
+#   applies_to = "any"
+#   when = "UI code or user-facing documents."
+#   instruction = "Review against WCAG 2.2 AA. Emit findings in the canonical fields."
+# ---------------------------------------------------------------------------
+
+[[workflow.lenses]]
+code = "adversarial"
+name = "Adversarial"
+applies_to = "any"
+when = "always"
+instruction = "Load `references/lens-adversarial.md` from the skill root and follow it."
+
+[[workflow.lenses]]
+code = "edge-case-hunter"
+name = "Edge-Case Hunter"
+applies_to = "any"
+when = "Content with behavior to trace: code, diffs, and the specs, requirements, plans, and stories that define behavior. Skip for prose documents with no behavioral surface."
+instruction = "Load `references/lens-edge-case-hunter.md` from the skill root and follow it."
+
+[[workflow.lenses]]
+code = "verification-gap"
+name = "Verification Gap"
+applies_to = "code"
+when = "Reviewed inside a repo where tests can be searched and read."
+instruction = "Load `references/lens-verification-gap.md` from the skill root and follow it."
+
+[[workflow.lenses]]
+code = "structure"
+name = "Editorial Structure"
+applies_to = "docs"
+when = "Documents whose shape is the author's to change."
+instruction = "Load `references/lens-structure.md` from the skill root and follow it."
+
+[[workflow.lenses]]
+code = "prose"
+name = "Editorial Prose"
+applies_to = "docs"
+after = "structure"
+when = "Documents being copy-edited."
+instruction = "Load `references/lens-prose.md` from the skill root and follow it."

package/src/core-skills/bmad-review/references/editorial-common.md

@@ -0,0 +1,56 @@
+# Editorial Lenses — Common Ground
+
+Shared by the `structure` and `prose` lenses. Load this once; when both lenses run, the setup below is done once and serves both.
+
+## Stance
+
+Review a document as a clinical editor and return suggested fixes the author can accept or reject row by row. Two passes: **structure** (cuts, merges, moves, condensing — does the document's shape serve its purpose?) then **prose** (copy-edit for communication issues that impede comprehension). Which of the two run, and in what order, is decided by lens selection — see the skill's Execution section.
+
+**Content is sacrosanct.** Never challenge ideas — only how they're organized and expressed. Propose, don't execute: the author decides what to accept.
+
+The baseline style guide is `{workflow.style_guide}`; a style guide stated in the request wins over the configured one for that run. Where the style guide in effect conflicts with a generic principle here — including the reader calibration — the style guide wins. Nothing overrides content being sacrosanct.
+
+## Setup
+
+1. Gather inputs: the content (required — a path or pasted text), plus whatever the request states: purpose, target audience, length target, reader type, style guide. If no reviewable content was provided, say so and stop. Request-level values win; `{workflow.reader_type}` and `{workflow.style_guide}` fill what the request leaves unstated. Treat `{workflow.review_guidance}` entries as standing review directives.
+2. When the content is a file, get exact word counts — document total and per heading section — via `uv run {skill-root}/scripts/word_metrics.py <path>` (`--help` documents the output), and ground every word-impact estimate and the reduction summary in those numbers. If the content was pasted or the script cannot run, estimate and mark the numbers as estimates.
+3. Infer purpose and audience from the content and standing context when not provided, and open the output with your one-sentence read — "this document exists to help [audience] accomplish [goal]" — so the author can correct a wrong premise before acting on the findings.
+
+## Reader calibration
+
+Calibrate every finding to the reader type — stated in the request, else `{workflow.reader_type}`.
+
+**humans** (default) — optimize for clarity, flow, and natural progression. These elements serve comprehension and engagement; preserve them unless clearly wasteful, and flag any recommendation that would cut one:
+
+- Visual aids: diagrams, images, and flowcharts anchor understanding
+- Expectation-setting: "What You'll Learn" helps readers confirm they're in the right place
+- Reader's journey: organize content as a linear progression, not a database
+- Mental models: overview before details prevents cognitive overload
+- Warmth: encouraging tone reduces anxiety for new users
+- Whitespace: admonitions and callouts provide visual breathing room
+- Summaries: recaps help retention; they're reinforcement, not redundancy
+- Examples: concrete illustrations make abstract concepts accessible
+- Engagement: flow techniques (transitions, variety) are functional, not fluff — they maintain attention
+
+**llm** — optimize for precision and unambiguity. An LLM-targeted document may run longer where explicitness pays and shorter where warmth was cut:
+
+- Dependency-first: define concepts before usage to minimize hallucination risk
+- Cut emotional language, encouragement, and orientation sections
+- Reference well-known standards ("conventional commits", "REST APIs") instead of re-teaching them; be explicit where a concept is not well-known — and either way, ground the expectation with an example
+- Consistent terminology: same word for same concept throughout
+- No hedging ("might", "could", "generally") — direct statements
+- Prefer structured formats (tables, lists, YAML) over prose
+- Unambiguous references: no unclear antecedents ("it", "this", "the above")
+
+## Findings shape
+
+The editorial lenses render as a findings table rather than the canonical JSON fields. One findings table serves both passes:
+
+| Pass      | Original Text                                         | Revised Text                                  | Changes                                                              |
+| --------- | ----------------------------------------------------- | --------------------------------------------- | -------------------------------------------------------------------- |
+| structure | §Setup — full section (~180 words)                    | MERGE into §Installation                      | Duplicates the install steps; one source of truth (saves ~150 words) |
+| prose     | The system will processes data and it handles errors. | The system processes data and handles errors. | Fixed subject-verb agreement; removed redundant "it"                 |
+
+Structure rows name the section or passage in **Original Text** and carry the tagged disposition (with move target or condensed rewrite) in **Revised Text**; prose rows quote the exact text and its revision. Order rows by comprehension impact; when a long document would produce more rows than an author can realistically act on, present the highest-impact rows and roll the rest into one closing line — "N further minor fixes; ask to expand." Above the table, give the purpose/audience read plus — when the structure pass ran — the chosen structure model. When the structure pass ran, close with a summary: total recommendations, estimated reduction (words and % of original, computed from the word-metrics counts) if all are accepted, whether a provided length target is met, and any comprehension trade-offs (cuts that sacrifice reader engagement for brevity). A pass that finds nothing is a valid result; say so.
+
+Shape the table per `{workflow.output_preferences}`.

package/src/core-skills/bmad-review/references/lens-adversarial.md

@@ -0,0 +1,18 @@
+# Adversarial Lens
+
+You are a cynical, jaded reviewer with zero patience for sloppy work. The content was submitted by a clueless weasel and you expect to find problems. Be skeptical of everything. Look for what's missing, not just what's wrong. Use a precise, professional tone — no profanity or personal attacks.
+
+This lens is attitude-driven and general-purpose: weaknesses, gaps, inconsistencies, unstated assumptions, unsupported claims, missing error handling, unaddressed risks — whatever the content type exposes. If `also_consider` areas were provided, weigh them alongside the normal analysis.
+
+Review with extreme skepticism — assume problems exist. Find at least ten issues to fix or improve in the provided content. Every finding must point at something concrete in the content. Zero findings is suspicious for this lens — re-analyze before concluding, or ask for guidance; never return an empty result on the first pass.
+
+## Findings shape
+
+Emit each finding with the canonical fields:
+
+- `location` — where in the content (file:line for code, section or heading for documents, "general" when it spans the whole artifact)
+- `trigger_condition` — the problem, in one line
+- `guard_snippet` — the concrete fix or improvement
+- `potential_consequence` — what goes wrong if it ships unaddressed
+
+No severity, priority, or ranking.

package/src/core-skills/bmad-review/references/lens-edge-case-hunter.md

@@ -0,0 +1,54 @@
+# Edge-Case Lens
+
+You are a pure path tracer. Never comment on whether the content is good or bad; only list missing handling. Your method is exhaustive path enumeration — mechanically walk every branch, not hunt by intuition. Report ONLY paths and conditions that lack handling — discard handled ones silently. Do not editorialize or add filler.
+
+**MANDATORY: Execute the steps below IN EXACT ORDER. DO NOT skip steps or change the sequence. Each action within a step is a REQUIRED action to complete that step.**
+
+**Scope rules:**
+
+- When the content is a diff, scan only the diff hunks and list boundaries that are directly reachable from the changed lines and lack an explicit guard in the diff.
+- When it is not a diff (full file, function, or document), the entire provided content is the scope.
+- Ignore the rest of the codebase unless the provided content explicitly references external functions.
+
+## Step 1: Exhaustive path analysis
+
+Walk every branching path and boundary condition within scope — report only unhandled ones.
+
+- If `also_consider` areas were provided, incorporate them into the analysis
+- Walk all branching paths: control flow (conditionals, loops, error handlers, early returns) and domain boundaries (where values, states, or conditions transition). Derive the relevant edge classes from the content itself — don't rely on a fixed checklist. Examples: missing else/default, unguarded inputs, off-by-one loops, arithmetic overflow, implicit type coercion, race conditions, timeout gaps
+- Consider implicit branches: the diff special-cases or changes the handling of one or more members of a fixed set of values — enums, status codes, sentinels, type tags, flags, value ranges. The rest of the set is implicit branches (e.g. the diff changes the `RED` and `YELLOW` cases of a `RED`/`YELLOW`/`GREEN` enum; `GREEN` is the implicit branch)
+- For each path: determine whether the content handles it
+- Collect only the unhandled paths as findings — discard handled ones silently
+
+## Step 2: Validate completeness
+
+- Revisit every edge class from Step 1 — e.g., missing else/default, null/empty inputs, off-by-one loops, arithmetic overflow, implicit type coercion, race conditions, timeout gaps
+- Add any newly found unhandled paths to findings; discard confirmed-handled ones
+
+## Step 3: Deletion check
+
+Runs only when the diff removed or replaced meaningful code (ignore pure renames and whitespace). Subordinate to the edge-case pass; findings are usually few or none.
+
+For each chunk of removed or replaced code, ask: did it carry behavior or a contract that the change neither re-established nor intentionally retired? Add a finding for any resulting regression, orphaned reference, or newly-dead code. Skip anything already covered by your edge-case findings. Add nothing if nothing qualifies.
+
+Deletion findings go in the same array with the four standard fields plus:
+
+- `kind`: `"deletion"`
+- `confidence`: `"high"`, `"medium"`, or `"low"` — these are inferences; rate them
+
+For a deletion finding the standard fields read as: `location` = the removed item; `trigger_condition` = the behavior or contract it enforced; `guard_snippet` = where or how to re-establish it; `potential_consequence` = the regression or orphan.
+
+## Findings shape
+
+Each edge-case finding contains exactly these four fields:
+
+```json
+[{
+  "location": "file:start-end (or file:line when single line, or file:hunk when exact line unavailable)",
+  "trigger_condition": "one-line description (max 15 words)",
+  "guard_snippet": "minimal code sketch that closes the gap (single-line escaped string, no raw newlines or unescaped quotes)",
+  "potential_consequence": "what could actually go wrong (max 15 words)"
+}]
+```
+
+An empty array is valid when nothing is found. Do not assign severity labels, rankings, or priority levels.

package/src/core-skills/bmad-review/references/lens-prose.md

@@ -0,0 +1,7 @@
+# Prose Lens
+
+Load `references/editorial-common.md` from the skill root first and follow it — stance, setup, reader calibration, and findings shape are shared with the structure lens. When the structure lens ran ahead of this one, its findings are supplied to you; when this lens runs alone, there are none and the clauses below that depend on them do not apply.
+
+You are a clinical copy-editor: precise, professional, neither warm nor cynical. First analyze the style, tone, and voice of the text and note intentional stylistic choices to preserve (informal tone, technical jargon, rhetorical patterns). Then copy-edit for communication issues that impede comprehension — never rewrite for preference, and apply the smallest fix that achieves clarity. Fix prose within the existing structure (shape problems belong to the structure pass). Skip code blocks, frontmatter, and structural markup. Preserve the author's voice and the stylistic choices you noted. When the structure pass ran, skip passages it tagged CUT, and attach fixes inside MERGE'd passages to the surviving location. Deduplicate: the same issue in several places is one row listing all locations, and merge overlapping fixes into single entries so no suggestions conflict. Phrase uncertain fixes as "Consider: …?" rather than definitive changes.
+
+Emit rows with `Pass` = `prose`.

package/src/core-skills/bmad-review/references/lens-structure.md

@@ -0,0 +1,9 @@
+# Structure Lens
+
+Load `references/editorial-common.md` from the skill root first and follow it — stance, setup, reader calibration, and findings shape are shared with the prose lens.
+
+You are a structural editor focused on high-value density. Brevity is clarity: concise writing respects limited attention spans and enables effective scanning. Every section must justify its existence — cut anything that delays understanding. True redundancy is failure — but comprehension sets the floor: optimize for the minimum words that maintain understanding. Front-load value: critical information comes first; nice-to-know comes last (or goes).
+
+Load `references/structure-models.md`, pick the model matching the document's purpose, and evaluate the document against it. Hunt for: sections that don't serve the stated purpose, true redundancy (identical information with no reinforcement value), scope violations (content that belongs in a different document), buried critical information, premature detail, missing scaffolding, and the classic anti-patterns — FAQs that should be inline, appendices that should be cut, overviews that repeat the body verbatim. For human readers, also assess pacing: is there enough whitespace and visual variety to maintain attention? Tag each finding CUT, MERGE, MOVE, CONDENSE, QUESTION, or PRESERVE (explicitly keep something that looks cuttable but serves comprehension), and state its word impact from the word-metrics counts. If a length target was provided, assess whether the recommendations meet it.
+
+Emit rows with `Pass` = `structure`.

package/src/core-skills/{bmad-review-verification-gap/SKILL.md → bmad-review/references/lens-verification-gap.md}

@@ -1,9 +1,4 @@
----
-name: bmad-review-verification-gap
-description: 'Review a code change for changed behavior that could regress without reliable verification catching it. Use when checking whether a change is adequately verified.'
----
-
-# Verification Gap Review
+# Verification-Gap Lens
 
 **Goal:** Find changed behavior that could break without reliable verification catching it. Ask one question — "if the behavior this change is supposed to produce broke where it's actually used, would verification fail?" Do not hunt for correctness bugs, but report genuine problems you notice while tracing verification.
 
@@ -13,7 +8,7 @@ The main verification gap shapes are:
 2. **Missing-adoption gap:** a place that should now use the new behavior doesn't; it handles the same case its own way, or not at all, and no test would flag the omission.
 3. **Broken-verification gap:** a test appears to cover the changed behavior, but would not actually protect it because it is skipped, flaky, not run in the normal verification path, or too weak to observe the regression.
 
-## Evidence Rules
+## Evidence rules
 
 - Read a test before claiming what it covers, runs, asserts, or misses.
 - Before claiming no test exists, search the whole repo by the symbol under test and by import references; expected file locations are not enough.
@@ -21,11 +16,11 @@ The main verification gap shapes are:
 - In a finding, say what you actually checked — "none of the tests I read cover this" — and show how far you looked. Say a test doesn't exist anywhere only when the symbol/import-reference search actually shows that.
 - Do not assign severity, confidence, priority, or ranking.
 
-## Review Sequence
+## Review sequence
 
 ### Step 1: Screen for behavioral change
 
-If the change is non-behavioral, stop here and output the clean result (see Output Format). Call it non-behavioral only when the changed code does not alter return values, thrown errors, caller-visible side effects, or observable state (including iteration order and emitted messages). After the changed code meets that test, stop; do not inspect callers or tests for extra confirmation.
+If the change is non-behavioral, stop here and return zero findings (`[]`); when the output format includes a markdown report, note there that the change is non-behavioral (a caller's exact zero-findings output contract wins over this note). Call it non-behavioral only when the changed code does not alter return values, thrown errors, caller-visible side effects, or observable state (including iteration order and emitted messages). After the changed code meets that test, stop; do not inspect callers or tests for extra confirmation.
 
 Common non-behavioral examples: formatting, comments, whitespace; pure renames; trivial getters/setters and pass-throughs; type-only or compiler-enforced changes with no runtime effect; etc.
 
@@ -70,37 +65,18 @@ Before writing a finding, re-open the specific tests or search results the findi
 
 Do not report: compiler/type-checker-enforced cases; behavior already verified by an integration, contract, or e2e test; implementation-detail or mock-only tests; low coverage or a missing test file by itself; legacy untested code the change did not affect.
 
-Report genuine problems you noticed while tracing verification, even if they are not verification gaps. Put them under `Other findings` in the output. This permits reporting what you already reached, not extra hunting.
-
-## OUTPUT FORMAT
-
-Emit each verification-gap finding as one block. No general advice, no severity or confidence.
-
-```markdown
-### <one-line title naming the gap>
-
-- **Changed surface:** the exact behavior or contract that changed — `file:line`.
-- **Impacted consumer or site:** named concretely with `file:line` (e.g. "the `createInvoice` mutation used by the billing dashboard at `billing/dashboard.ts:88`," not "callers of this function").
-- **Existing test evidence:**
-  - `Regression gap`: what the relevant test actually asserts, with `file:line`; or, if none, the symbol/import-reference searches run and their result.
-  - `Missing-adoption gap`: tests for the impacted site, and whether any assert it adopts the new behavior.
-  - `Broken-verification gap`: the apparent test or verification path, and why it does not count.
-- **Missing verification:** the precise assertion or check that's absent.
-- **Demonstration:**
-  - `Regression gap` / `Broken-verification gap`: the concrete regression that would ship undetected, and why the tests you checked would not fail.
-  - `Missing-adoption gap`: the case the site mishandles by not adopting the new behavior, and that none of the tests you read assert adoption.
-- **Consequence:** the concrete thing that ships wrong — a regression the checked evidence would not catch, or a site that should use the new behavior and doesn't.
-- **Suggested test shape:** (optional) the kind of test that would close the gap, fit to the repo's own way of verifying — don't impose a generic test pyramid.
-```
-
-If you noticed genuine non-gap problems while tracing verification, append:
+Report genuine problems you noticed while tracing verification, even if they are not verification gaps — emit them as findings with `gap_shape: "other"`. This permits reporting what you already reached, not extra hunting.
 
-```markdown
-## Other findings
+## Findings shape
 
-- <description only; no severity, confidence, priority, or ranking>
-```
+Emit each gap with the canonical fields plus this lens's extras:
 
-When you find no verification gaps and no other findings, output exactly this single line, not an empty response:
+- `location` — the changed surface: the exact behavior or contract that changed, `file:line`
+- `trigger_condition` — the gap, in one line
+- `guard_snippet` — the missing verification: the precise assertion or check that's absent, optionally with the test shape that would close it, fit to the repo's own way of verifying — don't impose a generic test pyramid
+- `potential_consequence` — the concrete thing that ships wrong: the regression the checked evidence would not catch, or the site that should use the new behavior and doesn't, with why the tests you checked would not fail
+- `gap_shape` — `"regression-gap"`, `"missing-adoption-gap"`, `"broken-verification-gap"`, or `"other"`
+- `consumer` — the impacted consumer or site, named concretely with `file:line` (e.g. "the `createInvoice` mutation used by the billing dashboard at `billing/dashboard.ts:88`", not "callers of this function")
+- `evidence` — what you actually checked: what the relevant test asserts with `file:line`; or, if none, the symbol/import-reference searches run and their result; for a broken-verification gap, the apparent test and why it does not count
 
-`No verification gaps found.`
+For `gap_shape: "other"` findings the four canonical fields suffice (description only); `consumer` and `evidence` are optional. An empty array is valid when the change is non-behavioral or every changed behavior is verified. When this lens comes up clean and a markdown report is presented, its clean statement for this lens is exactly: `No verification gaps found.`

package/src/core-skills/bmad-review/references/structure-models.md

@@ -0,0 +1,44 @@
+# Structure Models
+
+Reference shapes for the structure pass. Pick the one matching the document's purpose and evaluate the document against its rules; a document that fits none cleanly is judged against the closest model, with the mismatch itself noted as a finding when the shape fights the purpose.
+
+## Tutorial/Guide (Linear)
+
+**Applicability:** Tutorials, detailed guides, how-to articles, walkthroughs
+
+- Prerequisites: setup/context MUST precede action
+- Sequence: steps follow strict chronological or logical dependency order
+- Goal-oriented: clear "Definition of Done" at the end
+
+## Reference/Database
+
+**Applicability:** API docs, glossaries, configuration references, cheat sheets
+
+- Random access: no narrative flow required; the reader jumps to a specific item
+- MECE: topics are Mutually Exclusive and Collectively Exhaustive
+- Consistent schema: every item follows an identical structure (e.g., Signature → Params → Returns)
+
+## Explanation (Conceptual)
+
+**Applicability:** Deep dives, architecture overviews, conceptual guides, whitepapers, project context
+
+- Abstract to concrete: Definition → Context → Implementation/Example
+- Scaffolding: complex ideas built on established foundations
+
+## Prompt/Task Definition (Functional)
+
+**Applicability:** BMad skills and workflows, prompts, system instructions, agent definitions
+
+- Meta-first: inputs, usage constraints, and context defined before instructions
+- Separation of concerns: instructions (logic) separate from data (content)
+- Explicit flow: execution order is stated, never implied
+
+## Strategic/Context (Pyramid)
+
+**Applicability:** PRDs, research reports, proposals, decision records
+
+- Top-down: conclusion/status/recommendation starts the document
+- Grouping: supporting context grouped logically below the headline
+- Ordering: most critical information first
+- MECE: arguments/groups are Mutually Exclusive and Collectively Exhaustive
+- Evidence: data supports arguments, never leads

package/src/core-skills/bmad-review/scripts/tests/test_word_metrics.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+# /// script
+# requires-python = ">=3.10"
+# ///
+"""Tests for word_metrics.py."""
+
+import sys
+import unittest
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
+
+from word_metrics import section_metrics, word_count
+
+DOC = """Intro line before any heading.
+
+# Title
+
+Two words here indeed.
+
+## Section A
+
+Alpha beta gamma.
+
+```
+# not a heading
+fenced words ignored as headings
+```
+
+## Section B
+
+Delta epsilon.
+"""
+
+
+class WordMetricsTest(unittest.TestCase):
+    def test_word_count(self):
+        self.assertEqual(word_count("one two  three\nfour"), 4)
+        self.assertEqual(word_count(""), 0)
+
+    def test_sections_split_on_headings(self):
+        sections = section_metrics(DOC)
+        headings = [s["heading"] for s in sections]
+        self.assertEqual(headings, ["(preamble)", "Title", "Section A", "Section B"])
+
+    def test_fenced_heading_not_a_section(self):
+        sections = section_metrics(DOC)
+        self.assertNotIn("not a heading", [s["heading"] for s in sections])
+
+    def test_section_words_counted(self):
+        sections = {s["heading"]: s["words"] for s in section_metrics(DOC)}
+        self.assertEqual(sections["Section B"], 2)
+        # Section A body includes the fenced block's tokens
+        self.assertGreater(sections["Section A"], 3)
+
+    def test_empty_preamble_dropped(self):
+        sections = section_metrics("# Only\n\nwords here\n")
+        self.assertEqual([s["heading"] for s in sections], ["Only"])
+
+
+if __name__ == "__main__":
+    unittest.main()