@azure-id/orc 1.9.1 → 1.9.2

package/templates/skills/_shared/opus5-only.md

@@ -22,11 +22,11 @@ mixed-model table:
 | `[90,100]` | `orc-executor-opus-5-med`  |
 
 Two bands, sharing the 90 edge with the default table's top two rows. Since
-v1.0.0 the default table's high end is ALREADY Opus 5 with effort as the dial,
+v1.0.0 the default table's high end is ALREADY Opus 5.5 with effort as the dial,
 so this mode differs from it only below 65 — a third band here would be a
 distinction the default table stopped making.
 
-**Fixed roles** — dispatch the Opus 5 variant **instead of** the default role
+**Fixed roles** — dispatch the Opus 5.5 variant **instead of** the default role
 agent: same task slice, same return contract, same phase.
 
 | Role | Default agent | Opus-5-only variant |
@@ -41,14 +41,14 @@ agent: same task slice, same return contract, same phase.
 | claude write | `orc-claude-writer-opus-4-8-high` | `orc-claude-writer-opus-5-med` |
 | retro mine | `orc-retro-sonnet-5-high` | `orc-retro-opus-5-med` |
 
-The nine roles already pinned to `claude-opus-5` — analyst, planner, reviewer,
+The nine roles already pinned to `claude-opus-5-5` — analyst, planner, reviewer,
 verifier, test-author, combiner, learn-writer, advisor, judge — are already
 compliant and dispatch unchanged (their efforts are NOT rewritten by this mode).
 
 **The wiki scan tier ladder (v0.46.0) adds NO row here, and needs no new pair.**
 Off, the ladder picks deep or light per delta. ON, this mode already forces the
 wiki scanner to `orc-wiki-scanner-opus-5-med` — so **both tiers collapse onto that
-one shipped agent** and the ladder simply stops applying. A cheaper Opus 5 scanner
+one shipped agent** and the ladder simply stops applying. A cheaper Opus 5.5 scanner
 variant for the light tier does not exist and must never be added: a pair for a
 tier that cannot occur while the flag is on is exactly the phantom this table
 exists to prevent. Ladder: `../orc-wiki/references/partial-refresh.md`.
@@ -58,7 +58,7 @@ exists to prevent. Ladder: `../orc-wiki/references/partial-refresh.md`.
 - **`orc-trace-writer-haiku-4-5` stays Haiku 4.5.** It transcribes a packet the
   orchestrator hands it — no reasoning, no source reads. It is never in the
   roster.
-- **`orc-graph-noter-sonnet-4-6-med` is not dispatched at all.** It has no Opus 5
+- **`orc-graph-noter-sonnet-4-6-med` is not dispatched at all.** It has no Opus 5.5
   variant: under the mode a code lane skips graph notes and prints
   `graph notes: skipped (opus5_only)` (`code-graph.md` §6). The graph's structure
   layer costs no model, so nothing else about the graph changes.
@@ -73,7 +73,7 @@ exists to prevent. Ladder: `../orc-wiki/references/partial-refresh.md`.
   the lane SAYS so at the gate (`orc-quick ignores opus5_only — both options are
   live`), because a shadowed setting must never be silent in either direction.
 - **`/orc-challenge` — UNAFFECTED, not exempt.** All three of its agents are
-  already `claude-opus-5` (judge high, advisor medium, reader low), so the mode
+  already `claude-opus-5-5` (judge high, advisor medium, reader low), so the mode
   has nothing to force: zero new pairs, no rename churn, no roster row. The
   reader's `low` effort is a MEASUREMENT choice, not a cost one — a
   harder-thinking cold reader reasons around exactly the gaps D4 exists to find
@@ -102,7 +102,7 @@ mode is neither shadowed nor shadowing — it is simply **NOT CONSULTED** for th
 work extra took:
 
 - **a scored task** — an extra route row covering that score outranks the mode;
-  every score no row covers still resolves on the Opus 5 ladder.
+  every score no row covers still resolves on the Opus 5.5 ladder.
 - **a POSITION** (v0.55.0 — `quick-executor`, `fast-executor`, `doc-writer`,
   `doc-checker`, `wiki-scanner-deep`, `wiki-scanner-light`) — an extra slot row
   holding that position outranks the mode's variant of that slot's agent; **a
@@ -121,7 +121,7 @@ POSITION, not the model.
 ## Tier honesty
 
 A subagent can never outrank the main session. With the mode ON, EVERY dispatch
-needs an Opus 5 main session — not just the top executor band. On a lower
+needs an Opus 5.5 main session — not just the top executor band. On a lower
 session every role silently falls back to the session model and the tier-honesty
 rule (`return-validation.md`) reports a downgrade on **every** return. That is
 correct behavior, not a bug: hooks cannot block on model, only on effort, so the

package/templates/skills/_shared/phases/analyst-gates.md

@@ -1,136 +1,136 @@
-# Phase — Analyst & plan gates   (id: `analyst-gates`)
-
-> **Library file.** Canonical since v1.0.0 W12; it was under the `orc` skill's
-> private `references/`, and other lanes already reached across into it. Read
-> by `orc`, `orc-analyze`, `orc-mini`. Layers declared: `core` only — single-
-> layer because these are the orchestrator-side gates on a returned analysis
-> or plan, and a trimmed lane runs fewer of them rather than different ones.
-> `orc lane phases <lane> --json` names the file and the layers to read.
-
-<!-- orc:layer core -->
-## Reference — Analyst, Combiner & Plan Gates (orchestrator side)
-
-The orchestrator's deterministic gates around the analyst, the
-context-combiner, and the planner. The roles themselves are defined in
-`../../orc-analyze/SKILL.md`, `../../context-combiner/SKILL.md`, and
-`../../orc/subskills/orc-planner/SKILL.md` — this file is what YOU do around their
-dispatches and returns. Load at Phase 0 (analyst dispatch) and Phase 1
-(planner return). Emit a `GATE` trace line (pass|bounce) per check when
-logging.
-
-## Deep-mode scout dispatch (yours)
-
-When the analyst runs in deep mode it returns a `scout_plan` (pass 1). You then
-dispatch ≤ `config.max_scouts` (default 3) parallel
-`orc-scout-sonnet-4-6-high` agents (`orc-scout-opus-5-low` when `opus5_only`
-— `../../_shared/opus5-only.md`; scouts fan out in PARALLEL, so this is the
-mode's largest single cost multiplier) — one coverage area each, read-only — and
-re-dispatch the analyst WITH their evidence bundles for pass 2. Same "return a
-request → you re-slice → re-dispatch" shape as `needs_context`. You never
-analyze; you only dispatch and relay.
-
-## Analyst-return gates (deterministic, before any build option)
-
-1. **Evidence spot-check:** Glob every `files[]` path in the spec +
-   Grep-verify the quoted snippet on **EVERY quote-anchored ref, whatever its
-   `status`** (v0.34.6). It used to check only `exists|conflict` — but the two
-   statuses a GOOD audit most often produces are `resolved` (a challenged row
-   the user decided) and `buildable` (the actual work), so a correctly-triaged
-   analysis was the one the gate barely checked: a real spec had zero
-   `exists|conflict` rows, so the mandated verification covered 0 of 5 refs and
-   a `file:5` citing a quote that lives at `file:4` went through. It is one
-   Grep per ref, and it is the ONLY mechanical defence against a wrong line
-   number reaching the planner. Note the causal shape: that ref started as a
-   line RANGE with no quote (auto-UNVERIFIED per hard rule 2); narrowing it to
-   one line + quote was the CORRECT fix and is what introduced the off-by-one —
-   tightening evidence granularity is itself an error surface, so the gate has
-   to be what catches it.
-2. **Derivation lint:** R# ids, statuses, and context-anchor set must match
-   between report.md and requirement-spec.md.
-
-Any miss → bounce to the analyst with the miss list (one retry, then escalate
-to the user). Refuse take-into-build when the spec has open `UNVERIFIED` or
-lacks `scope_closed: true` (a one-Grep check).
-
-## Combiner tracking (yours; full lane only)
-
-`context-combiner` (`orc-context-combiner-opus-5-high` — Opus 5 high, v0.34.0)
-merges 2+ RELATED, already-confirmed
-analyses from the same run into ONE combined requirement-spec before build.
-
-- **Track the analysis set:** hold the confirmed spec paths of every analysis
-  this run in run state (survives checkpoint/resume).
-- When the user picks "pass to context-combiner" at orc-analyze's Phase F
-  branch menu (offered only once 2+ analyses exist), dispatch
-  `orc-context-combiner-opus-5-high` with that list.
-- The return carries `combined_spec_path` + `coverage_pct` (conservation
-  proof — every source requirement accounted for; must be 100) + `dropped[]` +
-  `stale_evidence[]` + `handoff_ready` — or `combined: false` if the user chose
-  keep-separate at the combiner's relatedness challenge (then fall back to
-  per-analysis stop/build).
-- Offer the build option ONLY when `handoff_ready` is true (the combiner sets
-  it false when `coverage_pct` < 100 OR a conflict is open). On build, continue
-  at Phase 1 with the combined spec exactly like a single requirement-spec.
-
-You never combine; you only track, dispatch, and relay.
-
-## Spec staleness valve (Phase 1, before dispatching the planner)
-
-If the requirement-spec's `git_head` ≠ current HEAD (analysis and build in
-different sessions), re-run the analyst evidence spot-check (paths + quotes)
-BEFORE dispatching the planner; on misses offer re-analyze vs
-proceed-with-flagged.
-
-## Phase 1 exit gate (deterministic, before scoring)
-
-1. **Grounding spot-check:** Glob every path the plan marks
-   `disposition: exists`. A task whose declared paths lack `grounding[]`
-   entries counts as a miss.
-2. **Coverage check:** recompute the planner's coverage echo — every in-scope
-   spec R# / intent-spec DoD line must appear in ≥ 1 task's `requirements[]`;
-   an `orphan` requirement is a miss (the user may explicitly descope instead).
-3. **Graph checks:** cycle detection over `depends_on` + same-file collision
-   over `declared_files` (two tasks sharing a file need a serializing dep or a
-   merge). Both trivial at ≤ 20 tasks — never trust the planner's self-check
-   alone.
-4. **TDD/test-task collision (v0.34.4):** a `tdd_spec` entry whose target file
-   is in the `declared_files` of a task whose `facets.test_surface` is
-   `new-tests` is a miss. The paired TDD task materializes `tdd_spec` BEFORE the
-   task it guards, so that task's planned work is already on disk and
-   green by the time its wave opens — leaving only bad options (dispatch a
-   no-op, silently drop promised coverage, or re-slice mid-run). The planner
-   authored both mechanisms and folds them together itself: extend the
-   materialized file, never re-author it.
-5. **TDD disposition gate (v0.41.0)** — this gate is what lets TDD be skipped
-   safely. Skipping a test is cheap to claim and expensive to get wrong, so
-   every skip must be checkable, and it is checked in BOTH directions: a rule
-   that only ever prevents tests is a rule that deletes coverage.
-   - `disposition` outside the closed set
-     `new-surface | behavior-change | covered-by-existing | no-behavior | no-runner`
-     → miss. (Absent on a pre-v0.41.0 plan → derive from `kind`; never bounce an
-     old plan — see the legacy exception below.)
-   - `covered-by-existing` **without a resolvable `covered_by`** → miss. Glob the
-     cited `path` exactly as check 1 does for `disposition: exists`. "A test
-     already covers this" is the one claim that, if false, silently removes
-     coverage the run promised.
-   - `no-behavior` whose task has `facets.test_surface != none` → miss
-     (self-contradiction: the planner said the surface is testable and that it
-     isn't).
-   - **Safety floor:** any entry that is `covered-by-existing` or `no-behavior`
-     on a task with non-empty `facets.risk[]` → miss, no exceptions. Auth,
-     money, migration, security, concurrency and data-integrity requirements do
-     not ride on another test's coincidence.
-   - `new-surface` / `behavior-change` missing `skeleton` or `given_when_then`
-     → miss.
-   - A disposition that DEVIATES from the derivation table in
-     `../../orc/schemas/planning-output.md` without a `reason` → miss. The derivation
-     is the default; departing from it is the thing that needs justifying.
-
-Any miss → the plan is malformed: bounce it back to the planner WITH the miss
-list (one retry), then escalate to the user. **Legacy exception:** a
-pre-v0.7.0 plan resumed from an old checkpoint has no `grounding[]`
-(pre-v0.9.0: no `requirements[]`/`spec_invariants[]`; pre-v0.41.0: no
-`disposition`) — resume it without the
-missing checks; never bounce an old plan.
-
-<!-- /orc:layer -->
+# Phase — Analyst & plan gates   (id: `analyst-gates`)
+
+> **Library file.** Canonical since v1.0.0 W12; it was under the `orc` skill's
+> private `references/`, and other lanes already reached across into it. Read
+> by `orc`, `orc-analyze`, `orc-mini`. Layers declared: `core` only — single-
+> layer because these are the orchestrator-side gates on a returned analysis
+> or plan, and a trimmed lane runs fewer of them rather than different ones.
+> `orc lane phases <lane> --json` names the file and the layers to read.
+
+<!-- orc:layer core -->
+## Reference — Analyst, Combiner & Plan Gates (orchestrator side)
+
+The orchestrator's deterministic gates around the analyst, the
+context-combiner, and the planner. The roles themselves are defined in
+`../../orc-analyze/SKILL.md`, `../../context-combiner/SKILL.md`, and
+`../../orc/subskills/orc-planner/SKILL.md` — this file is what YOU do around their
+dispatches and returns. Load at Phase 0 (analyst dispatch) and Phase 1
+(planner return). Emit a `GATE` trace line (pass|bounce) per check when
+logging.
+
+## Deep-mode scout dispatch (yours)
+
+When the analyst runs in deep mode it returns a `scout_plan` (pass 1). You then
+dispatch ≤ `config.max_scouts` (default 3) parallel
+`orc-scout-sonnet-4-6-high` agents (`orc-scout-opus-5-low` when `opus5_only`
+— `../../_shared/opus5-only.md`; scouts fan out in PARALLEL, so this is the
+mode's largest single cost multiplier) — one coverage area each, read-only — and
+re-dispatch the analyst WITH their evidence bundles for pass 2. Same "return a
+request → you re-slice → re-dispatch" shape as `needs_context`. You never
+analyze; you only dispatch and relay.
+
+## Analyst-return gates (deterministic, before any build option)
+
+1. **Evidence spot-check:** Glob every `files[]` path in the spec +
+   Grep-verify the quoted snippet on **EVERY quote-anchored ref, whatever its
+   `status`** (v0.34.6). It used to check only `exists|conflict` — but the two
+   statuses a GOOD audit most often produces are `resolved` (a challenged row
+   the user decided) and `buildable` (the actual work), so a correctly-triaged
+   analysis was the one the gate barely checked: a real spec had zero
+   `exists|conflict` rows, so the mandated verification covered 0 of 5 refs and
+   a `file:5` citing a quote that lives at `file:4` went through. It is one
+   Grep per ref, and it is the ONLY mechanical defence against a wrong line
+   number reaching the planner. Note the causal shape: that ref started as a
+   line RANGE with no quote (auto-UNVERIFIED per hard rule 2); narrowing it to
+   one line + quote was the CORRECT fix and is what introduced the off-by-one —
+   tightening evidence granularity is itself an error surface, so the gate has
+   to be what catches it.
+2. **Derivation lint:** R# ids, statuses, and context-anchor set must match
+   between report.md and requirement-spec.md.
+
+Any miss → bounce to the analyst with the miss list (one retry, then escalate
+to the user). Refuse take-into-build when the spec has open `UNVERIFIED` or
+lacks `scope_closed: true` (a one-Grep check).
+
+## Combiner tracking (yours; full lane only)
+
+`context-combiner` (`orc-context-combiner-opus-5-high` — Opus 5.5 high, v0.34.0)
+merges 2+ RELATED, already-confirmed
+analyses from the same run into ONE combined requirement-spec before build.
+
+- **Track the analysis set:** hold the confirmed spec paths of every analysis
+  this run in run state (survives checkpoint/resume).
+- When the user picks "pass to context-combiner" at orc-analyze's Phase F
+  branch menu (offered only once 2+ analyses exist), dispatch
+  `orc-context-combiner-opus-5-high` with that list.
+- The return carries `combined_spec_path` + `coverage_pct` (conservation
+  proof — every source requirement accounted for; must be 100) + `dropped[]` +
+  `stale_evidence[]` + `handoff_ready` — or `combined: false` if the user chose
+  keep-separate at the combiner's relatedness challenge (then fall back to
+  per-analysis stop/build).
+- Offer the build option ONLY when `handoff_ready` is true (the combiner sets
+  it false when `coverage_pct` < 100 OR a conflict is open). On build, continue
+  at Phase 1 with the combined spec exactly like a single requirement-spec.
+
+You never combine; you only track, dispatch, and relay.
+
+## Spec staleness valve (Phase 1, before dispatching the planner)
+
+If the requirement-spec's `git_head` ≠ current HEAD (analysis and build in
+different sessions), re-run the analyst evidence spot-check (paths + quotes)
+BEFORE dispatching the planner; on misses offer re-analyze vs
+proceed-with-flagged.
+
+## Phase 1 exit gate (deterministic, before scoring)
+
+1. **Grounding spot-check:** Glob every path the plan marks
+   `disposition: exists`. A task whose declared paths lack `grounding[]`
+   entries counts as a miss.
+2. **Coverage check:** recompute the planner's coverage echo — every in-scope
+   spec R# / intent-spec DoD line must appear in ≥ 1 task's `requirements[]`;
+   an `orphan` requirement is a miss (the user may explicitly descope instead).
+3. **Graph checks:** cycle detection over `depends_on` + same-file collision
+   over `declared_files` (two tasks sharing a file need a serializing dep or a
+   merge). Both trivial at ≤ 20 tasks — never trust the planner's self-check
+   alone.
+4. **TDD/test-task collision (v0.34.4):** a `tdd_spec` entry whose target file
+   is in the `declared_files` of a task whose `facets.test_surface` is
+   `new-tests` is a miss. The paired TDD task materializes `tdd_spec` BEFORE the
+   task it guards, so that task's planned work is already on disk and
+   green by the time its wave opens — leaving only bad options (dispatch a
+   no-op, silently drop promised coverage, or re-slice mid-run). The planner
+   authored both mechanisms and folds them together itself: extend the
+   materialized file, never re-author it.
+5. **TDD disposition gate (v0.41.0)** — this gate is what lets TDD be skipped
+   safely. Skipping a test is cheap to claim and expensive to get wrong, so
+   every skip must be checkable, and it is checked in BOTH directions: a rule
+   that only ever prevents tests is a rule that deletes coverage.
+   - `disposition` outside the closed set
+     `new-surface | behavior-change | covered-by-existing | no-behavior | no-runner`
+     → miss. (Absent on a pre-v0.41.0 plan → derive from `kind`; never bounce an
+     old plan — see the legacy exception below.)
+   - `covered-by-existing` **without a resolvable `covered_by`** → miss. Glob the
+     cited `path` exactly as check 1 does for `disposition: exists`. "A test
+     already covers this" is the one claim that, if false, silently removes
+     coverage the run promised.
+   - `no-behavior` whose task has `facets.test_surface != none` → miss
+     (self-contradiction: the planner said the surface is testable and that it
+     isn't).
+   - **Safety floor:** any entry that is `covered-by-existing` or `no-behavior`
+     on a task with non-empty `facets.risk[]` → miss, no exceptions. Auth,
+     money, migration, security, concurrency and data-integrity requirements do
+     not ride on another test's coincidence.
+   - `new-surface` / `behavior-change` missing `skeleton` or `given_when_then`
+     → miss.
+   - A disposition that DEVIATES from the derivation table in
+     `../../orc/schemas/planning-output.md` without a `reason` → miss. The derivation
+     is the default; departing from it is the thing that needs justifying.
+
+Any miss → the plan is malformed: bounce it back to the planner WITH the miss
+list (one retry), then escalate to the user. **Legacy exception:** a
+pre-v0.7.0 plan resumed from an old checkpoint has no `grounding[]`
+(pre-v0.9.0: no `requirements[]`/`spec_invariants[]`; pre-v0.41.0: no
+`disposition`) — resume it without the
+missing checks; never bounce an old plan.
+
+<!-- /orc:layer -->

package/templates/skills/_shared/phases/review.md

@@ -17,7 +17,7 @@
 ## Review (load ../../orc/subskills/orc-review-verify/, spawned)
 
 Emit `PHASE review start`. Superpowers path: its review skill incl. tests
-(Sonnet 4.6 medium). OpenSpec/self path: review worker (Opus 5 medium). Pass the resolved
+(Sonnet 4.6 medium). OpenSpec/self path: review worker (Opus 5.5 medium). Pass the resolved
 `code_pattern` + its invariants + gate lines for the re-check
 (pattern-gate.md); no resolved pattern → FIRST ask for one (paste/md/none).
 FE tasks in run → pass `fe_rules[]` from `../../orc-pattern/references/` fe-a11y

package/templates/skills/_shared/phases/trace.md

@@ -314,7 +314,7 @@ For each spawn the orchestrator:
 ## Announce-on-spawn
 
 When dispatching, announce the model to the user, derived from the agent NAME
-(e.g. "Spawning orc-executor-opus-5-low → claude-opus-5 / low"). Derive it
+(e.g. "Spawning orc-executor-opus-5-low → claude-opus-5-5 / low"). Derive it
 from the name — do NOT pass the coarse `sonnet|opus|haiku` dispatch arg, which
 cannot express 4-7 vs 4-8 and would override the frontmatter pin.
 

package/templates/skills/_shared/return-validation.md

@@ -16,7 +16,7 @@ agent. It does not.
 
 What that costs, measured: one graded `/orc-quick` entry put THREE
 `orc-executor-opus-5-low` agents on the SAME task — 50m19s, 115m22s and
-100m53s, **266 minutes of Opus 5 for one authorised dispatch**, all editing the
+100m53s, **266 minutes of Opus 5.5 for one authorised dispatch**, all editing the
 same files, inside a 2h04m window. The second was dispatched 4m19s after the
 first, while the first was still working. The hook had recorded all three; no
 lane had ever read that record.

package/templates/skills/context-combiner/SKILL.md

@@ -31,7 +31,7 @@ it were a single analysis — with PROOF that no source requirement was lost.
 ## Hard rules
 
 1. **Dispatched, not self-run.** The orchestrator coordinates; the Combiner
-   subagent (Opus 5 high) reads the specs and reconciles them against each
+   subagent (Opus 5.5 high) reads the specs and reconciles them against each
    other. The combiner NEVER builds and NEVER spawns subagents.
 2. **Related only — verify + challenge.** The user asserted relatedness at the
    Phase F gate, but the combiner MUST verify real overlap (shared files,

package/templates/skills/context-combiner/schemas/combined-report.md

@@ -1,78 +1,78 @@
-# Template — Combined Analysis Report
-
-Human-readable source of truth for a MERGE of 2+ related analyses. Written to
-orc/analyzer/combined-{name}/combined-report.md. Copied OUT to
-{report_out_dir}/combined-{name}/ on "stop here".
-
-```markdown
-# Combined Analysis Report — {combined-name}
-kind: combined
-combined_from: [analysis-A, analysis-B, ...]   # source analysis names
-scope: <the shared scope X these analyses live in>
-combined_at: DDMMYY HH:MM:SS
-combined_against: <git HEAD short sha the evidence spot-check ran against>
-model: opus-5-high        # the RESOLVED model of the combiner that produced
-                          #   this — never copied from here
-
-## Relatedness check
-How the source analyses overlap — shared files, overlapping requirements,
-shared scope. If overlap was weak, the user was challenged and their decision
-is recorded here.
-- Shared files: web/reports/x (analysis-A R1, analysis-B R2)
-- Overlapping requirement: both add export to the reports module
-- Verdict: related (confirmed) | combined-anyway (user override) | ...
-
-## Merged requirements (deduped, ordered)
-Every row carries file:line evidence inherited from the source spec (the
-combiner trusts confirmed specs; it does not re-derive the code) — spot-checked
-against `combined_against`; anchors that no longer match are marked STALE and
-were challenged, never silently carried. SEMANTIC-DUPLICATE merges quote both
-original statements. PARTIAL-OVERLAP rows are split (shared + residue), never
-collapsed. `Depth` is shown when sources differ in depth.
-
-| # | Requirement (merged) | From | Depth | Code reality | Evidence (file:line) | Files/modules | Status |
-|---|----------------------|------|-------|--------------|----------------------|---------------|--------|
-| 1 | "add CSV export"     | A.R1 | deep | HTML only    | web/reports/view.x:30 | web/reports/x | buildable |
-| 2 | "reuse report auth"  | A.R2, B.R3 (dedup) | standard | guard present | web/reports/routes.x:12 (STALE — user chose proceed) | web/reports/x | exists |
-
-## Source coverage matrix (conservation proof)
-EVERY source requirement ID appears exactly once with exactly one Outcome.
-`dropped` requires a recorded user decision in combine-decisions.md. The gate
-below must show coverage_pct: 100 before this report can hand off to build.
-
-| Source ID | Outcome | Merged as | Decision ref |
-|-----------|---------|-----------|--------------|
-| A.R1 | merged | #1 | — |
-| A.R2 | deduped-into | #2 | — |
-| B.R2 | conflict-resolved | #3 | combine-decisions.md #2 |
-| B.R3 | deduped-into | #2 | — |
-| B.R4 | dropped | — | combine-decisions.md #4 (user: superseded by A.R1) |
-
-- source requirements total: {N} · accounted: {N} · coverage_pct: 100
-
-## Additional context (do not build)
-Anchored, non-actionable context merged from the sources — each item re-pointed at
-the merged requirement it serves. Dedupe ONLY when the evidence anchor is the same
-file:line AND the notes convey the same constraint — near-identical notes are kept,
-both, with their own From tags. Read for understanding; never a task. Omit this
-whole section if no source carried context.
-| Anchor (merged #) | From | From scope | Dependency | Touchpoint to respect | Evidence (file:line) |
-|-------------------|------|-----------|------------|-----------------------|----------------------|
-| 1 (CSV export) | A.ctx | reporting (Y) | consumes-output | report query already paginates; export must page too | web/reports/query.x:44 |
-
-## Cross-scope conflicts & decisions
-Every conflict/duplicate/partial-overlap/ordering issue found across sources
-(including contradictory resolved assumptions), each raised as a
-recommended-option challenge and resolved. Decisions are also checkpointed
-eagerly in combine-decisions.md.
-- CONFLICT (resolved): A.R4 wants offset paging, B.R2 wants cursor — user chose cursor.
-- DUPLICATE (merged): A.R2 and B.R3 both reuse auth — merged into #2.
-- PARTIAL-OVERLAP (split): A.R5 subsumes B.R1 — shared row #4, A-only residue row #5.
-- ORDERING (structured): before: #1 (A export) → after: #6 (B schedule).
-
-## Open questions (block handoff until resolved)
-- (none) | UNRESOLVED: ... — combiner refuses build handoff while any remain.
-
-## Handoff readiness
-- complete: yes/no   (coverage_pct == 100, all conflicts resolved, no open UNRESOLVED)
-```
+# Template — Combined Analysis Report
+
+Human-readable source of truth for a MERGE of 2+ related analyses. Written to
+orc/analyzer/combined-{name}/combined-report.md. Copied OUT to
+{report_out_dir}/combined-{name}/ on "stop here".
+
+```markdown
+# Combined Analysis Report — {combined-name}
+kind: combined
+combined_from: [analysis-A, analysis-B, ...]   # source analysis names
+scope: <the shared scope X these analyses live in>
+combined_at: DDMMYY HH:MM:SS
+combined_against: <git HEAD short sha the evidence spot-check ran against>
+model: opus-5-5-high      # the RESOLVED model of the combiner that produced
+                          #   this — never copied from here
+
+## Relatedness check
+How the source analyses overlap — shared files, overlapping requirements,
+shared scope. If overlap was weak, the user was challenged and their decision
+is recorded here.
+- Shared files: web/reports/x (analysis-A R1, analysis-B R2)
+- Overlapping requirement: both add export to the reports module
+- Verdict: related (confirmed) | combined-anyway (user override) | ...
+
+## Merged requirements (deduped, ordered)
+Every row carries file:line evidence inherited from the source spec (the
+combiner trusts confirmed specs; it does not re-derive the code) — spot-checked
+against `combined_against`; anchors that no longer match are marked STALE and
+were challenged, never silently carried. SEMANTIC-DUPLICATE merges quote both
+original statements. PARTIAL-OVERLAP rows are split (shared + residue), never
+collapsed. `Depth` is shown when sources differ in depth.
+
+| # | Requirement (merged) | From | Depth | Code reality | Evidence (file:line) | Files/modules | Status |
+|---|----------------------|------|-------|--------------|----------------------|---------------|--------|
+| 1 | "add CSV export"     | A.R1 | deep | HTML only    | web/reports/view.x:30 | web/reports/x | buildable |
+| 2 | "reuse report auth"  | A.R2, B.R3 (dedup) | standard | guard present | web/reports/routes.x:12 (STALE — user chose proceed) | web/reports/x | exists |
+
+## Source coverage matrix (conservation proof)
+EVERY source requirement ID appears exactly once with exactly one Outcome.
+`dropped` requires a recorded user decision in combine-decisions.md. The gate
+below must show coverage_pct: 100 before this report can hand off to build.
+
+| Source ID | Outcome | Merged as | Decision ref |
+|-----------|---------|-----------|--------------|
+| A.R1 | merged | #1 | — |
+| A.R2 | deduped-into | #2 | — |
+| B.R2 | conflict-resolved | #3 | combine-decisions.md #2 |
+| B.R3 | deduped-into | #2 | — |
+| B.R4 | dropped | — | combine-decisions.md #4 (user: superseded by A.R1) |
+
+- source requirements total: {N} · accounted: {N} · coverage_pct: 100
+
+## Additional context (do not build)
+Anchored, non-actionable context merged from the sources — each item re-pointed at
+the merged requirement it serves. Dedupe ONLY when the evidence anchor is the same
+file:line AND the notes convey the same constraint — near-identical notes are kept,
+both, with their own From tags. Read for understanding; never a task. Omit this
+whole section if no source carried context.
+| Anchor (merged #) | From | From scope | Dependency | Touchpoint to respect | Evidence (file:line) |
+|-------------------|------|-----------|------------|-----------------------|----------------------|
+| 1 (CSV export) | A.ctx | reporting (Y) | consumes-output | report query already paginates; export must page too | web/reports/query.x:44 |
+
+## Cross-scope conflicts & decisions
+Every conflict/duplicate/partial-overlap/ordering issue found across sources
+(including contradictory resolved assumptions), each raised as a
+recommended-option challenge and resolved. Decisions are also checkpointed
+eagerly in combine-decisions.md.
+- CONFLICT (resolved): A.R4 wants offset paging, B.R2 wants cursor — user chose cursor.
+- DUPLICATE (merged): A.R2 and B.R3 both reuse auth — merged into #2.
+- PARTIAL-OVERLAP (split): A.R5 subsumes B.R1 — shared row #4, A-only residue row #5.
+- ORDERING (structured): before: #1 (A export) → after: #6 (B schedule).
+
+## Open questions (block handoff until resolved)
+- (none) | UNRESOLVED: ... — combiner refuses build handoff while any remain.
+
+## Handoff readiness
+- complete: yes/no   (coverage_pct == 100, all conflicts resolved, no open UNRESOLVED)
+```

package/templates/skills/orc/README.md

@@ -94,11 +94,11 @@ codifier: 9 language playbooks + a11y/perf rule packs), `context-combiner`
 ## Key behaviors to know
 
 - **The orchestrator NEVER implements — it always spawns scored subagents,
-  even for tiny tasks.** Orchestrator (Opus 4.8 high, or Opus 5 / Fable 5 at
+  even for tiny tasks.** Orchestrator (Opus 4.8 high, or Opus 5.5 / Fable 5 at
   medium+) only coordinates; each task's 0–100 score (computed arithmetically
   from the planner's per-task `facets`) maps to a named executor agent via the
   single 6-band table in `config.md` (`rubric_bands` = report granularity only),
-  Haiku 4.5 [0,30) → Opus 5 low [65,90) → Opus 5 medium [90,100].
+  Haiku 4.5 [0,30) → Opus 5.5 low [65,90) → Opus 5.5 medium [90,100].
 - **Every executor slice carries** the intent-spec constraints, the task's
   sliced acceptance criteria, the standing
   house-rules card, and — when a code-pattern is resolved — your project's

package/templates/skills/orc/SKILL.md

@@ -13,7 +13,7 @@ description: >
 
 # ORC (orchestrator spine)
 
-You are the **orchestrator**: **Opus 4.8 high — or Opus 5 / Fable 5 at medium+**
+You are the **orchestrator**: **Opus 4.8 high — or Opus 5.5 / Fable 5 at medium+**
 (never downgrade yourself). You own the schemas, the dependency/conflict graph, wave
 scheduling, per-task model scoring, all checkpoint writes, user Q&A relay, and
 every decision below. Workers stay dumb and isolated.
@@ -24,8 +24,8 @@ version of a reference you haven't loaded this run. Detect the stack from the re
 
 ## Preflight gate (before Phase 0 — do this FIRST)
 
-Confirm you are **Opus 4.8 high**, or **Opus 5 / Fable 5 at medium+** (both clear
-the guard from medium up; Opus 5 also unlocks the [90,100] executor band). Effort
+Confirm you are **Opus 4.8 high**, or **Opus 5.5 / Fable 5 at medium+** (both clear
+the guard from medium up; Opus 5.5 also unlocks the [90,100] executor band). Effort
 is hard-blocked by the `orc-effort-guard.js` PreToolUse hook; the model cannot be
 (hooks can't see it) — the statusline warns. On a weaker tier **STOP immediately**
 and tell the user to switch the main session and re-run — never intake below it
@@ -69,11 +69,11 @@ themselves are this lane's own and stay here.
 
 ## Dispatched roles (you never do this work yourself)
 
-**Analyst** `orc-analyze` (Opus 5 high): doc OR bare request →
+**Analyst** `orc-analyze` (Opus 5.5 high): doc OR bare request →
 scope-bounded, code-grounded report + spec; standard or opt-in DEEP (scouts).
-**Context-combiner** (Opus 5 high): merges 2+ related confirmed analyses
+**Context-combiner** (Opus 5.5 high): merges 2+ related confirmed analyses
 into ONE combined spec; build only on `handoff_ready` with `coverage_pct` =
-100; full lane only. **Planner** `subskills/orc-planner` (Opus 5 medium):
+100; full lane only. **Planner** `subskills/orc-planner` (Opus 5.5 medium):
 request or spec → planning-output. Scout dispatch, analyst-return gates,
 combiner tracking, the `git_head` staleness valve, and the Phase 1 exit gate
 are YOURS and deterministic — load `../_shared/phases/analyst-gates.md` at their
@@ -96,7 +96,7 @@ requeue) run the same formula, inherit the original task's risk floor, and never
 dispatch below the finding-task's band. Fixed roles dispatch BY NAME (analyst /
 combiner / planner / reviewer / verifier — see `config.md`'s fixed-role table +
 `.claude/agents/MODEL-MAPPING.md`). If `opus5_only`, EVERY role (scored and fixed)
-resolves to its Opus 5 agent, FORCING over everything below — `_shared/opus5-only.md`.
+resolves to its Opus 5.5 agent, FORCING over everything below — `_shared/opus5-only.md`.
 Caveat: a subagent's model can't exceed the MAIN session's tier — run the main
 session on Opus or the Opus pins silently fall back (the original "wrong model" bug).