@azure-id/orc 1.9.2 → 2.1.0

package/templates/skills/_shared/smoke-gate.md

@@ -1,28 +1,46 @@
-# Smoke gate (read-only build + test ship gate)
-
-Canonical procedure for the smoke gate run by orc-mini (Phase M) and orc-fast
-(Phase F3). The gate is the orchestrator's INDEPENDENT check — the executor's
-`evidence` is a claim; your run is the verification (when they disagree, say
-so). Running build+test is read-only and is NOT implementation: you still
-never write code.
-
-## Procedure
-
-1. Discover the commands: prefer the wiki manifest's `commands` block when it
-   exists (recorded at scan time — don't rediscover tooling); otherwise detect
-   the stack's build + test runner once and say which you chose.
-2. Run build, then the fast test suite, once each.
-3. Verdict (emit the `VERDICT pass|fail` trace line):
-   - **GREEN** → proceed to the lane's next step (test-ask / ship).
-   - **RED** → **never offer commit/ship.** Surface the failure verbatim, then
-     ONE repair round: re-dispatch the SAME executor with the failing output
-     as `failure_reason`, and re-run this gate. A second RED → STOP and
-     surface; the lane names its escalation options (mini: stop; fast:
-     escalate to orc-mini / switch to full `/orc` / stop).
-   - **No runnable build/test** (docs-only repo) → say so explicitly; the
-     gate is N/A — never silently skip it.
-
-## What it is not
-
-Smoke, not verification: no findings classification, no criteria matrix, no
-severity ladder. A run that needs that depth belongs in the full lane.
+# Smoke gate (read-only build + test ship gate)
+
+Canonical procedure for the smoke gate run by orc-mini (Phase M) and orc-fast
+(Phase F3). The gate is the orchestrator's INDEPENDENT check — the executor's
+`evidence` is a claim; your run is the verification (when they disagree, say
+so). Running build+test is read-only and is NOT implementation: you still
+never write code.
+
+## Procedure
+
+1. Discover the commands: prefer the wiki manifest's `commands` block when it
+   exists (recorded at scan time — don't rediscover tooling); otherwise detect
+   the stack's build + test runner once and say which you chose.
+2. Run build, then the fast test suite, once each.
+3. Verdict (emit the `VERDICT pass|fail` trace line):
+   - **GREEN** → proceed to the lane's next step (test-ask / ship).
+   - **RED** → **never offer commit/ship.** Run the flaky check first
+     (§Flaky). Still red → surface the failure verbatim, then
+     ONE repair round: re-dispatch the SAME executor with the failing output
+     as `failure_reason`, and re-run this gate. A second RED → STOP and
+     surface; the lane names its escalation options (mini: stop; fast:
+     escalate to orc-mini / switch to full `/orc` / stop).
+   - **No runnable build/test** (docs-only repo) → say so explicitly; the
+     gate is N/A — never silently skip it.
+
+## Flaky — before any repair round
+
+**Everywhere a test runs** (this gate, `/orc-quick` §3.2, `/orc` verify's TDD
+gate, every repair loop): a RED test run gets ONE identical re-run of ONLY the
+failing tests, before any repair. Save both outputs, then ask the CLI — never
+judge it yourself:
+
+`orc ci flaky --first <log> --rerun <log> [--rerun-exit <n>] --json`
+
+- `--first` alone names the failing tests to re-run (`tests_failed[]`).
+- Exit 0 = **FLAKY**: every failing test passed on the re-run. Emit its
+  `gate_line` (`GATE flaky :: <tests>`), report the tests, and do NOT start a
+  repair round. A flaky run is not red and does not use a round.
+- Exit 1 = red (a test failed again, did not run, or the re-run exited ≠ 0) →
+  the repair round as usual. Exit 3 = no test name in the log → red.
+- One re-run only. Never re-run until green.
+
+## What it is not
+
+Smoke, not verification: no findings classification, no criteria matrix, no
+severity ladder. A run that needs that depth belongs in the full lane.

package/templates/skills/_shared/wait.md

@@ -110,6 +110,7 @@ the other fails the suite.
 | `/orc-pattern` | none | single dispatch |
 | `/orc-claude` | none | single dispatch |
 | `/orc-explain` | none | read-only, seconds long |
+| `/orc-fix` | none | after the record is written |
 | `/orc-route` | none | read-only, seconds long |
 | `/orc-boundary` | none | read-only, seconds long |
 | `/orc-budget` | none | read-only, seconds long |

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

@@ -1,20 +1,10 @@
 ---
 name: context-combiner
 description: >
-  Combines 2+ RELATED, already-confirmed ORC analyses (from orc-analyze) into
-  ONE merged, deduped, conflict-resolved requirement context before build. Use
-  when the user analyzed multiple related documents within the same scope and
-  chose "pass to context-combiner" at orc-analyze's Phase F. Verifies the source
-  analyses actually overlap (shared files/requirements/scope) and challenges the
-  user if they look unrelated; pools ALL source requirements into one table and
-  reconciles them (exact/semantic duplicates, partial overlaps split — never
-  collapsed, conflicts, ordering) one issue at a time; proves NOTHING WAS LOST
-  via a source coverage matrix and a 100% coverage gate before handoff;
-  spot-checks inherited evidence and marks stale anchors; writes
-  combined-report.md + combined-requirement-spec.md, which reuse the
-  requirement-spec schema, so the planner/build pipeline is unchanged. Full
-  lane only. The orchestrator DISPATCHES this to a subagent — it never
-  combines itself, and the combiner never spawns subagents.
+  Internal to /orc: merges 2+ RELATED, confirmed orc-analyze analyses into ONE
+  deduped, conflict-resolved requirement context. Dispatched when the user picks
+  "pass to context-combiner" at orc-analyze's Phase F.
+disable-model-invocation: true
 ---
 
 # CONTEXT-COMBINER
@@ -80,11 +70,9 @@ it were a single analysis — with PROOF that no source requirement was lost.
 
 ## Phases
 
-`orc lane phases context-combiner --json` is this lane's pipeline: the ordered list, where
-each phase lives, and how much of it to read. **The CLI owns the order** — never
-derive it from the headings below, and never renumber or rename one without the
-manifest, because a `read: section` pointer names a HEADING and a renamed heading
-is a pointer into nothing.
+`orc lane phases context-combiner --json` is this lane's pipeline. **The CLI owns the order**:
+never derive it from the headings below, and never rename or renumber one
+without the manifest (`../_shared/lane-contract.md` §Phases).
 
 ## Phase A — Load sources
 Read every source `requirement-spec.md` (2+) the orchestrator hands you, plus
@@ -194,29 +182,12 @@ withheld until the open conflict is resolved and coverage is complete.
 ## No mini variant
 Full lane only. `orc-analyze-mini` / `orc-mini` do not use the combiner.
 
-## Config
+## Lane contract (`../_shared/lane-contract.md` — read it ONLY when a call exits ≠ 0)
 
-Resolve with `orc lane config context-combiner --json` and obey `effective`. Never merge
-`.claude/orc.config.yaml` yourself, and never re-derive a precedence. Exit ≠ 0 →
-say so and use `../_shared/config-precedence.md`'s documented defaults, out
-loud. Nothing this lane reads is contested, gated or a stop, so it owes no
-preflight line and has no gate to honour.
-
-## Calls
-
-**ONE catalogue, and it is not you:** `orc lane calls context-combiner --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
-it, and what an EMPTY answer means. Never invent a spelling, never re-word an
-exit code, and never re-derive a state word — the CLI's state words are the only
-state words, and **an exit code is an ANSWER wherever that contract says so, not
-a failure**. A call the answer does not name is a call this lane does not make.
-Exit ≠ 0 from the catalogue itself → say the CLI is unavailable and name the
-command you are about to run, out loud, before running it.
-
-## Rules — the anti-slop card (`../_shared/phases/rules.md`)
-
-`orc rules slice --lane context-combiner --json` is the ONLY assembler; never build
-the card here. It rides under the house rules and above the task —
-**house rules > your project's rules > ORC's own packs** — and its `line` prints
-VERBATIM at preflight. Returns gain `rules_applied[]`, `rules_conflicts[]` (a gap,
-never a silent choice) and `rules_overridden[]`.
+- **Calls:** `orc lane calls context-combiner --json` names every call and its exit codes.
+  **An exit code is an ANSWER where it says so, not a failure.** Make no other call.
+- **Config:** `orc lane config context-combiner --json`. Obey `effective`. Never merge
+  `.claude/orc.config.yaml` yourself (`../_shared/config-precedence.md`). Nothing
+  here is contested, gated or a stop: no preflight line, no gate to honour.
+- **Rules:** `orc rules slice --lane context-combiner --json` is the ONLY assembler
+  (`../_shared/phases/rules.md`). Its `line` prints VERBATIM at preflight.

package/templates/skills/orc/README.md

@@ -97,8 +97,8 @@ codifier: 9 language playbooks + a11y/perf rule packs), `context-combiner`
   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.5 low [65,90) → Opus 5.5 medium [90,100].
+  single 5-band table in `config.md` (`rubric_bands` = report granularity only),
+  Sonnet 5 low [0,21) → Opus 5.5 low [41,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

@@ -3,12 +3,10 @@ name: orc
 description: >
   Use when orchestrating a multi-task build through a full pipeline: intake →
   planning → scored parallel execution → review → verify → ship. Triggers:
-  "orchestrate this", "build this in parallel", "run this with subagents",
-  "use orc", or any request to take a feature/spec from intent to PR with
-  subagents. Routes planning to Superpowers, OpenSpec, or its own planner;
-  schedules conflict-free waves; scores each task to pick the cheapest capable
-  model; checkpoints eagerly; survives compaction and fresh-session resume.
-  Stack-agnostic.
+  "orchestrate this", "build this in parallel", "run this with subagents", "use
+  orc", or any request to take a feature/spec from intent to PR with subagents.
+  Scores each task to pick the cheapest capable model, and survives compaction
+  and fresh-session resume. Stack-agnostic.
 ---
 
 # ORC (orchestrator spine)
@@ -81,7 +79,7 @@ trigger points; emit `GATE` trace lines.
 
 ## Dispatch via named agents (not prose)
 
-**`orc run inflight` before ANY re-dispatch** (0 clear · 1 in-flight · 2 unknown).
+**`orc run inflight` before ANY re-dispatch.**
 A Task error does not kill the agent behind it, and exit 2 REFUSES by default —
 `a lane that re-dispatches over a live attempt` has broken the contract. Canonical: `_shared/return-validation.md` §0.
 
@@ -89,7 +87,7 @@ Workers are model-pinned SUBAGENTS in `.claude/agents/` — the model is enforce
 not requested in prose. Score every task from the planner-emitted `facets` via
 the fixed arithmetic formula and SHOW the table with the facet vector + the
 arithmetic (`B+N+L+T+fan+U = raw`; an un-shown number is not scored); map the
-final score via the RESOLVED table in `config.md` — `opus5_only` (2-band Opus-5-only, FORCING) > `rubric_bands_override` > the default 6-band (`rubric_bands` = granularity only, never a preset); NAME it when you show scores; sibling tasks differing in ≤1 facet share a
+final score via the RESOLVED table in `config.md` — `opus5_only` (2-band Opus-5-only, FORCING) > `rubric_bands_override` > the default 5-band (`rubric_bands` = granularity only, never a preset); NAME it when you show scores; sibling tasks differing in ≤1 facet share a
 band or cite the differing facet (see `references/effort-and-mode.md`). EVERY
 dispatch is scored — fix-cycle dispatches (review-fix, verify-fix, P2-batch,
 requeue) run the same formula, inherit the original task's risk floor, and never
@@ -100,59 +98,35 @@ resolves to its Opus 5.5 agent, FORCING over everything below — `_shared/opus5
 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).
 
-## Config (read at run start)
-
-**ONE resolver, and it is not you:** `orc lane config orc --json`. Obey
-`effective`, print every line in `announce[]` VERBATIM at preflight, and honour
-`stops[]` before wave 1. Never re-derive a value, a precedence or an inertness
-from `.claude/orc.config.yaml` — a key this lane does not read is not in the
-answer, and a key another key shadows comes back already marked. Exit ≠ 0 → say
-the CLI is unavailable and fall back to `../_shared/config-precedence.md`'s
-documented defaults, out loud. Priorities and families:
-`../_shared/config-precedence.md`.
-
-## Rules — the anti-slop card (`../_shared/phases/rules.md`)
-
-`orc rules slice --lane orc --json` is the ONLY assembler; never build
-the card here. It rides under the house rules and above the task —
-**house rules > your project's rules > ORC's own packs** — and its `line` prints
-VERBATIM at preflight. Returns gain `rules_applied[]`, `rules_conflicts[]` (a gap,
-never a silent choice) and `rules_overridden[]`.
-## Calls
-
-**ONE catalogue, and it is not you:** `orc lane calls orc --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
-it, and what an EMPTY answer means. Never invent a spelling, never re-word an
-exit code, and never re-derive a state word — the CLI's state words are the only
-state words, and **an exit code is an ANSWER wherever that contract says so, not
-a failure**. A call the answer does not name is a call this lane does not make.
-Exit ≠ 0 from the catalogue itself → say the CLI is unavailable and name the
-command you are about to run, out loud, before running it.
+## Lane contract (`../_shared/lane-contract.md` — read it ONLY when a call exits ≠ 0)
+
+- **Calls:** `orc lane calls orc --json` names every call and its exit codes.
+  **An exit code is an ANSWER where it says so, not a failure.** Make no other call.
+- **Config:** `orc lane config orc --json`. Obey `effective`, print every line
+  in `announce[]` VERBATIM at preflight, and honour `stops[]` before wave 1.
+  Never merge `.claude/orc.config.yaml` yourself (`../_shared/config-precedence.md`).
+- **Rules:** `orc rules slice --lane orc --json` is the ONLY assembler
+  (`../_shared/phases/rules.md`). Its `line` prints VERBATIM at preflight.
 
 ## Behavior trace (PERMANENT — always on, no config toggle)
 
-Follow `../_shared/phases/trace.md` (ALWAYS load it at run start). The
-`orc-trace.js` hook writes the `SPAWN`/`RETURN`/`PHASE-EDGE` skeleton
-deterministically; the rich narrative is **dispatched, never remembered** — every
-`emit <VERB>` step below means RECORD that event, with its REAL timestamp, into
-the current **phase packet**; you never append a trace line yourself. Run start:
-create `log_dir`, write `log_dir/.current` = `run-orc-<slug>-<DDMMYY>-<HHMMSS>.txt`
-AND `touch the trace file` of that name in the SAME step; store `trace_path`.
+Follow `../_shared/phases/trace.md` (ALWAYS load it at run start; pairing rule,
+packet shape and run end are there). Lane token `orc`, tier **Build lanes**. The
+`orc-trace.js` hook writes the `SPAWN`/`RETURN`/`PHASE-EDGE` skeleton; the
+narrative is **dispatched, never remembered** — every `emit <VERB>` step below
+means RECORD that event, with its REAL timestamp, into the current **phase packet**. Run start: create `log_dir`, write `log_dir/.current`
+= `run-orc-<slug>-<DDMMYY>-<HHMMSS>.txt` AND `touch the trace file` of that name
+in the SAME step; store `trace_path`.
 **Under `ultra_mode` the lane segment is `ultra`, not `orc`** (`run-ultra-<slug>-…`)
 — the filename IS the per-lane data, so an ultra run named `orc` is counted as a
 plain `/orc` run forever, hiding the costliest lane in every usage report.
-**Phase close = dispatch `orc-trace-writer-haiku-4-5`** with that packet
-(`phase`, `events[]`, and `decisions` — the WHY: scoring rationale, the user's
-answers VERBATIM, what you rejected; `run_meta` on the FIRST packet only).
-**Pairing rule:** issue phase N's writer dispatch in the SAME tool block as phase
-N+1's first dispatch (a phase with no next dispatch sends it solo, before its
-user-facing output); the first packet is solo + synchronous — it repairs a
-hook-bootstrapped filename. `DISPATCH`/`VERIFY` models are derived from the agent
-NAME and checked against each return's `actual_model`/`actual_effort` — surface
-any ⛔ DOWNGRADE to the user, not just into the packet. A phase ending with
-`zero new trace lines is a protocol violation` — build and dispatch its packet
-NOW, with the events' real stamps. Run end (Phase 8 or abort): the `FINISH`
-packet goes out and RETURNS, then delete `log_dir/.current`.
+**Phase close = `orc trace write --packet -`** (exit ≠ 0 → `orc-trace-writer-haiku-4-5`).
+The first packet is solo — it repairs a hook-bootstrap filename.
+`DISPATCH`/`VERIFY` models are derived from the agent NAME and checked against
+each return's `actual_model`/`actual_effort` — surface any ⛔ DOWNGRADE to the
+user, not just into the packet. A phase ending with
+`zero new trace lines is a protocol violation` — build and write its packet
+NOW, with the events' real stamps.
 
 ## Extra — a band that executes OFF Claude (config `extra_enabled`, default false)
 
@@ -175,7 +149,7 @@ review/verify re-check the invariants + `validation_gate[]` lines. Load
 ## Ultra lane (`/orc-ultra`)
 
 `/orc-ultra` sets `ultra_mode: true` RUN-SCOPED (never persisted): full pipeline
-+ Opus 4.8 max Advisor (Phase U0) + three judge gates + forced overrides (deep
++ Opus 5.5 xhigh Advisor (Phase U0) + three judge gates + forced overrides (deep
 analyze, pattern/testgen/security on, executor tier floor); never on plain
 `/orc` or orc-mini. Load `references/ultra-mode.md` at Phase 0 when ultra_mode;
 orc-advisor / orc-judge load at their dispatch points.
@@ -214,10 +188,9 @@ them; they are never dispatched as subagents).
 
 ## Phases
 
-`orc lane phases orc --json` **is** the pipeline — the CLI owns the list and
-its order, and this table is the human index of it. Never derive the order
-from these filenames; a second idea of the pipeline is the drift the manifest
-exists to prevent.
+`orc lane phases orc --json` **is** the pipeline; this table is only its human
+index. **The CLI owns the order**: never derive it from these filenames
+(`../_shared/lane-contract.md` §Phases).
 
 **Read a row when its phase fires, not on activation.** Every row is
 `on-phase` — this spine deliberately carries no `always` phase pointer. **Read
@@ -228,8 +201,7 @@ each row.
 
 W13 gave those ten a second reader (`orc-diy`), so they moved to
 `_shared/phases/`. Intake and Integration have one consumer each and stay home
-— a file with one consumer stays home. W14 (`orc-mini`/`orc-fast`) is what adds
-a `trim` layer beside the `full` one.
+— a file with one consumer stays home.
 
 | # | Phase | File | Read | Trace |
 |---|-------|------|------|-------|
@@ -252,4 +224,4 @@ their config key is resolved by `orc lane config orc --json`, never read raw.
 ## Waiting mid-run (`/orc-wait`)
 
 Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
-Checkpoint **full** · safe point **wave or phase edge**. `soft` FORCES that checkpoint and does NOT stop if the write fails; `hard` skips it and can lose an in-flight return. Never begin a wait between a dispatch and its validated return, or before the smoke gate has reported.
+Checkpoint **full** · safe point **wave or phase edge**.

package/templates/skills/orc/config.md

@@ -26,32 +26,30 @@ the `announce[]` boundary and the CLI-absent floor:
 ## Score → model table (executor agent dispatched by name)
 
 The orchestrator scores each task 0–100, then maps to a model via this SINGLE
-canonical 6-band table, and dispatches the matching **executor agent**.
+canonical 5-band table, and dispatches the matching **executor agent**.
 `rubric_bands` sets scoring granularity only — it never selects a table.
 
 | Score | Model | Effort | Executor agent |
 |-------|-------|--------|----------------|
-| [0,30)   | claude-haiku-4-5  | —      | orc-executor-haiku-4-5 |
-| [30,40)  | claude-sonnet-4-6 | medium | orc-executor-sonnet-4-6-med |
-| [40,55)  | claude-sonnet-4-6 | high   | orc-executor-sonnet-4-6-high |
-| [55,65)  | claude-sonnet-5   | high   | orc-executor-sonnet-5-high |
-| [65,90)  | claude-opus-5-5     | low    | orc-executor-opus-5-low |
-| [90,100] | claude-opus-5-5     | medium | orc-executor-opus-5-med |
-
-(Haiku has no effort ladder — that agent carries no `effort:` field.) The risk
-floor (≥70) lands `orc-executor-opus-5-low` at minimum in THIS table. Above ~65
-the useful dial stopped being the model GENERATION and became the EFFORT, which
-is why the old four Opus rows are two. **Every band from 65 needs an Opus 5.5 MAIN
-session** or it silently falls back to the session model (the tier-honesty rule
-reports the downgrade) — two bands where it used to be one, and that is the cost
-of this table.
-
-**Four executors are named by NO band** — `orc-executor-opus-4-7-med`,
-`orc-executor-opus-4-7-high`, `orc-executor-opus-4-8-high` and
-`orc-executor-opus-5-high`. They still ship, reachable through
-`rubric_bands_override`, `orc diy`'s `fixed_executor` and `extra_fallback_agent`.
-Not deleted, because this is a TABLE change and not a model change — and an
-agent's model change is always a rename.
+| [0,21)   | claude-sonnet-5-5 | low    | orc-executor-sonnet-5-low |
+| [21,31)  | claude-sonnet-5-5 | medium | orc-executor-sonnet-5-med |
+| [31,41)  | claude-sonnet-5-5 | high   | orc-executor-sonnet-5-high |
+| [41,90)  | claude-opus-5-5   | low    | orc-executor-opus-5-low |
+| [90,100] | claude-opus-5-5   | medium | orc-executor-opus-5-med |
+
+The risk floor (≥70) lands `orc-executor-opus-5-low` at minimum in THIS table.
+Above ~65 the useful dial stopped being the model GENERATION and became the
+EFFORT, which is why the old four Opus rows are two. **Every band from score 41
+needs an Opus 5.5 MAIN session** or it silently falls back to the session model
+(the tier-honesty rule reports the downgrade) — that is the cost of this table.
+
+**Seven executors are named by NO band** — `orc-executor-haiku-4-5`,
+`orc-executor-sonnet-4-6-med`, `orc-executor-sonnet-4-6-high`,
+`orc-executor-opus-4-7-med`, `orc-executor-opus-4-7-high`,
+`orc-executor-opus-4-8-high` and `orc-executor-opus-5-high`. They still ship,
+reachable through `rubric_bands_override`, `orc diy`'s `fixed_executor` and
+`extra_fallback_agent`. Not deleted, because this is a TABLE change and not a
+model change — and an agent's model change is always a rename.
 
 ### The Opus-5-only ladder (`opus5_only`, default **false**)
 
@@ -64,10 +62,10 @@ One model, EFFORT as the cost dial. Off by default; nothing changes until set.
 
 Two bands, sharing the 90 edge with the default table's top two rows. That
 symmetry is the point: once the default table's high end is already Opus 5.5 with
-effort as the dial, this mode differs from it only BELOW 65, so a third band
+effort as the dial, this mode differs from it only BELOW 41, so a third band
 would be a distinction the default table stopped making.
 
-**Tier cost:** today TWO bands in six need an Opus 5.5 main session; with this on,
+**Tier cost:** today two bands in five, from score 41, need an Opus 5.5 main session; with this on,
 EVERY dispatch does, so a lower session downgrades every task (warn-only — a
 hook can gate effort, never model). **Scope:** it is NOT executor-only — it also
 forces every fixed role below, across every lane. orc-diy's table
@@ -84,7 +82,7 @@ un-shown number.
 |------|-------|
 | System Analyst | orc-system-analyst-opus-5-high |
 | Requirement Planner | orc-planner-opus-5-med |
-| Reviewer | orc-reviewer-opus-5-med |
+| Reviewer | orc-reviewer-opus-5-low |
 | Verifier | orc-verifier-opus-5-med |
 | Mini analyst | orc-analyze-mini-sonnet-5-high |
 | Mini planner | orc-planner-mini-sonnet-5-high |
@@ -95,7 +93,7 @@ un-shown number.
 
 Under `opus5_only`, every role above that is not already `claude-opus-5-5`
 dispatches its Opus 5.5 variant instead — plus the roles owned by other lanes
-(scout, wiki scanner, CLAUDE.md writer, retro miner, fast executor).
+(scout, wiki scanner, retro miner, fast executor).
 
 ## Where each subsystem's rule is written down
 
@@ -120,7 +118,7 @@ value participates in, and each has exactly one canonical copy.
 | Foreign dispatch | `extra_enabled` and the `extra_*` block; every armed run prints its `extra:` line at Phase 1 | `../_shared/extra-dispatch.md` |
 | Stacked PRs | the `stacked_pr*` keys gate the Phase 8 stack (full `/orc` + `/orc-ultra` only) | `../orc-pr-setup/SKILL.md` |
 | Retro | `retro_repo` is where `/orc-retro` files its report; it hard-gates on a delivery channel and does not run at all without one | `../orc-retro/SKILL.md` |
-| Paths | `log_dir` (traces, NEVER auto-deleted), `run_dir` (`.claude/orc/run` — outside the installer's blast radius), and the analyst/planner/report dirs | `../_shared/config-precedence.md` |
+| Paths | `log_dir` (traces — kept until you run `orc clear logs --apply`, or until the automatic sweep removes them: `log_retention_auto: on`, older than `log_retention_days`), `run_dir` (`.claude/orc/run` — outside the installer's blast radius), and the analyst/planner/report dirs | `../_shared/config-precedence.md` |
 | Ultra | **no config key at all** — `/orc-ultra` forces its overrides RUN-SCOPED and never writes them to `orc.config.yaml` | `references/ultra-mode.md` |
 
 **TDD — Lane policy (fixed, not configurable).** Full orc + ultra always on ·

package/templates/skills/orc/examples/full-run-mock.md

@@ -58,6 +58,7 @@ O: Code pattern? U: none. Findings (P0–P3 ladder, each P0–P2 anchored file:l
 
 ## Phase 7 — Summary
 O: 6 tasks/3 waves/6 spawns/1 pause/1 fresh-session resume · 1 needs_context · 1 escalation · verify fixed_then_passed · branch green. P2 fix-batch: none · Apply the 2 P3 cosmetics? U: no.
+O: review close → `orc gotcha observe` ×3 (P1 addressed · 2× P3 wontfix, each with `run`) → `FINDING-OUTCOME addressed=1 disputed=0 wontfix=2 open=0 pre=0 suppressed=0 :: functional.check:1/1,evolvability.documentation:0/2`
 
 ## Phase 8 — Ship (orc-pr, reads pr.md)
 O: Branch: feat/notifications. Commit? Push? PR? U: yes all.
@@ -66,7 +67,7 @@ O: ✓ committed → pushed → run/merchant-notifications/DRP-482-add-merchant-
    Log deleted · checkpoint + dispatch log KEPT · completion dispatch report shown → "Run /usage to see your remaining limits."
 
 ## What this exercises
-always-spawn (even cheap tasks get a subagent) · facet-scored arithmetic · 6-band ladder ·
+always-spawn (even cheap tasks get a subagent) · facet-scored arithmetic · 5-band ladder ·
 per-run folder run/merchant-notifications/ · usage reminder (no programmatic /usage) ·
 planner grounding spot-check catching a hallucinated path · executor evidence (verbatim
 build/test proof) · reviewer quote spot-check before any P0/P1 action ·

package/templates/skills/orc/references/effort-and-mode.md

@@ -108,7 +108,7 @@ clamp 0..100 → the RESOLVED table (below).
 
 **Which table (highest wins):** `opus5_only: true` (the 2-band Opus-5-only
 preset: `[0,90)` low · `[90,100]` medium) → `rubric_bands_override`
-(hand-written rows) → the default 6-band table. All three are in `config.md`.
+(hand-written rows) → the default 5-band table. All three are in `config.md`.
 The formula, the facets and the risk floor are IDENTICAL in every case — only
 the score→agent mapping changes. Three consequences worth stating so nobody
 re-derives them per run:
@@ -123,14 +123,14 @@ re-derives them per run:
 Show the user the full table (task, the facet vector, the arithmetic
 `B+N+L+T+fan+U = raw`, any risk floor, final, override+reason if any, dispatched
 model) BEFORE dispatching — an un-shown number is not a scored number. **Head it
-with the RESOLVED table's name** (`6-band default` / `Opus-5-only ladder
+with the RESOLVED table's name** (`5-band default` / `Opus-5-only ladder
 (opus5_only)` / `custom (rubric_bands_override)`): the same logic
 applies to the mapping as to the number.
 
 **Extra (v0.50.0, `extra_enabled`) adds a `via` column and can make the head a
 PAIR.** An Extra route row is an OVERLAY that outranks the tables above **only
 for the scores it covers**, so a run can genuinely be running two tables at once
-and the head names both (`6-band default + extra rows [0,30) [30,70)`). The
+and the head names both (`5-band default + extra rows [0,30) [30,70)`). The
 column reads `claude` or `extra:<profile> (<engine>)` and comes from
 `orc extra resolve --json` — the formula, the facets and the risk floor are
 untouched, and **the score is computed before the routing, never after it**. Two
@@ -170,14 +170,14 @@ the band is what matters. Compare a new task to these facet-by-facet.
 
 | Task | breadth·novelty·logic·test · fan_in/out · unc | Arithmetic | Band |
 |---|---|---|---|
-| Rename a config key across 4 files + its test | 5·mechanical·none·update-existing · 0/0 · low | 10+0+0+4 = **14** | haiku [0,30) |
-| New CRUD endpoint following a sibling route | 3·imitate·branching·new-tests · 1/0 · low | 6+8+8+8+5 = **35** | sonnet-4-6-med [30,40) |
-| Bug fix across 2 files with a repro test | 3·imitate·branching·new-tests · 0/0 · medium | 6+8+8+8+6 = **36** | sonnet-4-6-med [30,40) |
-| Isolated component from the design system | 3·new-surface·branching·new-tests · 0/0 · low | 6+18+8+8 = **40** | sonnet-4-6-high [40,55) |
-| Notification model + enum other tasks consume | 3·new-surface·stateful·new-tests · 0/3 · low | 6+18+16+8+9 = **57** | sonnet-5-high [55,65) |
-| Service-layer refactor behind a stable interface | 5·imitate·stateful·update-existing · 0/3 · medium | 10+8+16+4+9+6 = **53** | sonnet-4-6-high [40,55) |
-| Add role check to payment-refund endpoint | 3·imitate·branching·new-tests · 0/0 · low · **risk=[auth,money]** | 30 raw → **floor 70** | opus-5-low [65,90) |
-| Migrate orders table to split-name + backfill | 6·new-surface·stateful·new-tests · 1/3 · high · **risk=[migration,data-integrity]** | 15+18+16+8+5+9+12 = 83 (floor 70) → **83** | opus-5-low [65,90) |
+| Rename a config key across 4 files + its test | 5·mechanical·none·update-existing · 0/0 · low | 10+0+0+4 = **14** | sonnet-5-low [0,21) |
+| New CRUD endpoint following a sibling route | 3·imitate·branching·new-tests · 1/0 · low | 6+8+8+8+5 = **35** | sonnet-5-high [31,41) |
+| Bug fix across 2 files with a repro test | 3·imitate·branching·new-tests · 0/0 · medium | 6+8+8+8+6 = **36** | sonnet-5-high [31,41) |
+| Isolated component from the design system | 3·new-surface·branching·new-tests · 0/0 · low | 6+18+8+8 = **40** | sonnet-5-high [31,41) |
+| Notification model + enum other tasks consume | 3·new-surface·stateful·new-tests · 0/3 · low | 6+18+16+8+9 = **57** | opus-5-low [41,90) |
+| Service-layer refactor behind a stable interface | 5·imitate·stateful·update-existing · 0/3 · medium | 10+8+16+4+9+6 = **53** | opus-5-low [41,90) |
+| Add role check to payment-refund endpoint | 3·imitate·branching·new-tests · 0/0 · low · **risk=[auth,money]** | 30 raw → **floor 70** | opus-5-low [41,90) |
+| Migrate orders table to split-name + backfill | 6·new-surface·stateful·new-tests · 1/3 · high · **risk=[migration,data-integrity]** | 15+18+16+8+5+9+12 = 83 (floor 70) → **83** | opus-5-low [41,90) |
 
 Two disciplines the vectors encode: (1) a small diff is NOT a low score when a
 cited `risk` facet forces the floor (the refund row — 30 raw, floored to 70); (2)
@@ -188,15 +188,15 @@ applies it silently.
 ## Model ladder → the single score→model table
 
 The score→model mapping is NOT hardcoded here — it lives in `config.md` as ONE
-canonical 6-band table (there is no longer a narrow/wide preset). Read config at
+canonical 5-band table (there is no longer a narrow/wide preset). Read config at
 run start and map each task's final score through that table (or
 `rubric_bands_override`). The orchestrator dispatches the executor agent BY NAME;
 it does not request a raw model. `rubric_bands` sets only how many bands the
 rubric REPORTS (score granularity), never which table is used.
 
-The 6 bands (see config.md for the exact edges): `haiku-4-5` [0,30) ·
-`sonnet-4-6-med` [30,40) · `sonnet-4-6-high` [40,55) · `sonnet-5-high` [55,65) ·
-`opus-5-low` [65,90) · `opus-5-med` [90,100]. Effort tiers rank
+The 5 bands (see config.md for the exact edges): `sonnet-5-low` [0,21) ·
+`sonnet-5-med` [21,31) · `sonnet-5-high` [31,41) · `opus-5-low` [41,90) ·
+`opus-5-med` [90,100]. Effort tiers rank
 `low < medium < high < xhigh < max`.
 
 ## Fixed model assignments (not scored)
@@ -204,14 +204,14 @@ The 6 bands (see config.md for the exact edges): `haiku-4-5` [0,30) ·
 - **Orchestrator (you):** Opus 4.8 high — or Opus 5.5 / Fable 5 at medium+, the
   two models that clear the guard from medium up. Never downgrade yourself.
 - **Review** — Superpowers path: Sonnet 4.6, medium. OpenSpec/self path:
-  Opus 5.5, medium (`orc-reviewer-opus-5-med`).
+  Opus 5.5, low (`orc-reviewer-opus-5-low`; medium until v2.1.0).
 - **Verify:** Opus 5.5, medium (`orc-verifier-opus-5-med`).
 - **Analyst:** Opus 5.5, high. **Planner:** Opus 5.5, medium. **Test author:**
   Opus 5.5, medium. **Combiner:** Opus 5.5, high. **Ultra advisor/judge:** Opus 5.5,
   xhigh — every core fixed role is pinned to Opus 5.5 as of v0.34.0.
 - **Merge-conflict resolver:** Opus 4.8, medium.
 
-Note: every band in the table above is a real dispatch target (haiku through
+Note: every band in the table above is a real dispatch target (sonnet-5 through
 opus-5). If a model tier is unavailable in the environment, fall back UP to the
 next capable tier (never silently substitute a different family/effort).