@azure-id/orc 2.1.0 → 2.2.0

package/templates/skills/orc-boundary/SKILL.md

@@ -235,22 +235,22 @@ documented defaults, out loud. Priorities and families:
 ## Calls
 
 **ONE catalogue, and it is not you:** `orc lane calls orc-boundary --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
+SHARED 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.
+a failure**. A call that neither it nor this skill names 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 orc-boundary --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[]`.
-## Waiting mid-run (`/orc-wait`)
-
-Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
-Checkpoint **none** · safe point **read-only, seconds long**. Nothing here to checkpoint, so all three modes behave identically — say so rather than asking. Never begin a wait between a dispatch and its validated return, or before the smoke gate has reported.
+command you are about to run, out loud, before running it.
+
+## Rules — the anti-slop card (`../_shared/phases/rules.md`)
+
+`orc rules slice --lane orc-boundary --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[]`.
+## Waiting mid-run (`/orc-wait`)
+
+Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
+Checkpoint **none** · safe point **read-only, seconds long**. Nothing here to checkpoint, so all three modes behave identically — say so rather than asking. Never begin a wait between a dispatch and its validated return, or before the smoke gate has reported.

package/templates/skills/orc-boundary/references/card.md

@@ -1,78 +1,81 @@
-# Reference — the boundary card
-
-Loaded at B4. One file per area: `.claude/orc/boundary/<area-slug>.md`. The slug
-is the area path with `/` → `-` (`src/payments` → `src-payments.md`), the same
-sanitisation `wiki/crosslink/<kind>/` uses — a nested path a single-level readdir
-never sees is a card that is invisible with the status check still green.
-
-## Shape
-
-```markdown
----
-area: src/payments                  # verbatim — this is the identity
-verdict: EXECUTE | ESCALATE | REFUSE
-anchored_files:                     # what staleness is computed against
-  - src/payments/ledger.ts
-  - src/payments/idempotency.ts
-verified_commit: 8a62b4f            # HEAD when the four questions were answered
-scanned_at: 100826 14:11:30
-reasons:                            # the four answers, compressed. Required.
-  - "self-verify: no — no test runner in this package"
-  - "reversible: no — writes to a live ledger"
-checklist:                          # REQUIRED when verdict is REFUSE
-  - add a test runner to this package
-  - cover the idempotency path
-escalate_to: "the payments owner"   # REQUIRED when verdict is ESCALATE
----
-
-# src/payments — REFUSE
-
-## Why
-<the derivation, in prose. Two or three sentences.>
-
-## What would make this a yes
-<the checklist again, with the lane that clears each item named.>
-
-## What an agent MAY do here today
-<the part that is fine. A card that reads as "hands off entirely" when only one
- file is dangerous costs more than it saves.>
-```
-
-## Field rules
-
-**`area`** — verbatim, never sanitised. The filename is sanitised; the identity is
-not. Same split as a crosslink kind.
-
-**`anchored_files`** — the files whose change should make this verdict
-re-examined. Over-broad (`src/**`) makes every card permanently stale; empty makes
-every card permanently fresh. Both defeat the point.
-
-**`verified_commit`** — HEAD at the moment the four questions were answered. Moved
-only by a real re-examination, never bumped to quiet a stale flag.
-
-**`reasons`** — at least the answers that DROVE the verdict. This is what makes a
-verdict arguable, and a verdict nobody can argue with is one people route around.
-
-**`checklist`** — required on REFUSE, and each item must be a thing somebody could
-actually finish. "Be more careful" is not a checklist item. Where another lane
-clears it, name the lane (`→ /orc-pact`, `→ /orc-pattern`).
-
-**`escalate_to`** — required on ESCALATE. A role is fine ("the payments owner"); a
-shrug is not.
-
-## The last section is not optional
-
-**"What an agent MAY do here today"** is what stops a card from reading as a wall.
-Most REFUSE areas contain plenty of safe work — tests, docs, a rename, a log line.
-A card that does not say so gets ignored, and an ignored card is worse than none,
-because it looks like coverage.
-
-## Staleness
-
-Computed on read by `orc boundary status`, never stored:
-`git rev-list --count <verified_commit>..HEAD -- <anchored_files>`. Non-zero =
-stale. **The skill never computes this** — same rule as the wiki tier
-(`../../_shared/detecting-artifacts.md`).
-
-A stale card is not a wrong card; it is one whose evidence has moved. Refresh is
-cheap: re-run the four questions for that area only.
+# Reference — the boundary card
+
+Loaded at B4. One file per area: `.claude/orc/boundary/<area-slug>.md`. The slug
+is the area path with `/` → `-` (`src/payments` → `src-payments.md`), the same
+sanitisation `wiki/crosslink/<kind>/` uses — a nested path a single-level readdir
+never sees is a card that is invisible with the status check still green.
+
+## Shape
+
+```markdown
+---
+area: src/payments                  # verbatim — this is the identity
+verdict: EXECUTE | ESCALATE | REFUSE
+anchored_files:                     # what staleness is computed against
+  - src/payments/ledger.ts
+  - src/payments/idempotency.ts
+verified_commit: 8a62b4f            # HEAD when the four questions were answered
+scanned_at: 100826 14:11:30
+reasons:                            # the four answers, compressed. Required.
+  - "self-verify: no — no test runner in this package"
+  - "reversible: no — writes to a live ledger"
+checklist:                          # REQUIRED when verdict is REFUSE
+  - add a test runner to this package
+  - cover the idempotency path
+escalate_to: "the payments owner"   # REQUIRED when verdict is ESCALATE
+---
+
+# src/payments — REFUSE
+
+## Why
+<the derivation, in prose. Two or three sentences.>
+
+## What would make this a yes
+<the checklist again, with the lane that clears each item named.>
+
+## What an agent MAY do here today
+<the part that is fine. A card that reads as "hands off entirely" when only one
+ file is dangerous costs more than it saves.>
+```
+
+Lists may be block (`- item`) or inline (`[a, b]`). `orc boundary status` reads
+both (v2.1.2). An item that holds a comma or a `#` goes in quotes.
+
+## Field rules
+
+**`area`** — verbatim, never sanitised. The filename is sanitised; the identity is
+not. Same split as a crosslink kind.
+
+**`anchored_files`** — the files whose change should make this verdict
+re-examined. Over-broad (`src/**`) makes every card permanently stale; empty makes
+every card permanently fresh. Both defeat the point.
+
+**`verified_commit`** — HEAD at the moment the four questions were answered. Moved
+only by a real re-examination, never bumped to quiet a stale flag.
+
+**`reasons`** — at least the answers that DROVE the verdict. This is what makes a
+verdict arguable, and a verdict nobody can argue with is one people route around.
+
+**`checklist`** — required on REFUSE, and each item must be a thing somebody could
+actually finish. "Be more careful" is not a checklist item. Where another lane
+clears it, name the lane (`→ /orc-pact`, `→ /orc-pattern`).
+
+**`escalate_to`** — required on ESCALATE. A role is fine ("the payments owner"); a
+shrug is not.
+
+## The last section is not optional
+
+**"What an agent MAY do here today"** is what stops a card from reading as a wall.
+Most REFUSE areas contain plenty of safe work — tests, docs, a rename, a log line.
+A card that does not say so gets ignored, and an ignored card is worse than none,
+because it looks like coverage.
+
+## Staleness
+
+Computed on read by `orc boundary status`, never stored:
+`git rev-list --count <verified_commit>..HEAD -- <anchored_files>`. Non-zero =
+stale. **The skill never computes this** — same rule as the wiki tier
+(`../../_shared/detecting-artifacts.md`).
+
+A stale card is not a wrong card; it is one whose evidence has moved. Refresh is
+cheap: re-run the four questions for that area only.

package/templates/skills/orc-boundary/references/gate.md

@@ -1,113 +1,113 @@
-# Reference — the boundary gate inside `/orc` (`boundary_gate`)
-
-Loaded by the spine at Phase 1. This is the CONSUMER half: `/orc` reads cards, it
-never writes one.
-
-`boundary_gate: off | warn | block` — default **`warn`**.
-
-| Mode | What changes |
-|---|---|
-| `off` | nothing. Cards are ignored entirely. |
-| `warn` | the preflight line, plus a per-task verdict printed before each wave. No dispatch changes. |
-| `block` | additionally: a REFUSE task is LIFTED OUT of its wave and never dispatched. |
-
-`block` changes dispatch behaviour on upgrade, which is why it is not the default.
-Print the active mode whenever a verdict is shown — a gate whose mode is invisible
-gets blamed for things it did not do.
-
-## Phase 1 — preflight, one line
-
-`orc boundary status --json` with the other probes. Print the `line` field
-VERBATIM:
-
-```
-bound : 9 execute · 2 escalate · 1 refuse (2 stale)
-```
-
-Never re-word it, never compute the counts. No cards at all:
-
-```
-bound : none — /orc-boundary writes them; no card means an area is UNKNOWN, not safe
-```
-
-## Phase 3 — per wave
-
-Before dispatching wave W, resolve each task's area by matching its
-`declared_files` against every card's `anchored_files` (longest match wins), then:
-
-**EXECUTE** — dispatch normally. Nothing printed beyond the wave table.
-
-**ESCALATE** — dispatch normally, and record the named human on the task. **Ship
-is gated on that sign-off**, using the EXISTING pause machinery — the stop sequence
-at the wave boundary, with the escalation named in the stop reason. No new stop
-mechanic, no new config key.
-
-**REFUSE** —
-
-- `warn`: print the verdict and its checklist, then dispatch anyway. The user was
-  told; the run is theirs.
-- `block`: **lift that ONE task out of the wave. The wave proceeds with the
-  rest.** Blocking the whole wave punishes the tasks that were fine, and a gate
-  that costs a wave gets switched off. Print:
-
-```
-boundary → wave 2: T04 lifted out (REFUSE · src/payments)
-  the wave runs with T03, T05.
-  T04 comes back when:
-    □ add a test runner to this package
-    □ cover the idempotency path            → /orc-pattern
-  Not blocked for you — say "do T04 anyway" and it dispatches.
-```
-
-That last line is required. The gate constrains ORC, not the user.
-
-A lifted task's dependents are **requeued, not cancelled**: the existing
-`REPLAN wave=<n>` path already handles a task that did not land, and this is that
-case with a different cause.
-
-**A task in an area with NO card** is dispatched normally and reported as
-`boundary: unknown` on its dispatch line. Unknown is not REFUSE — refusing
-everything uncarded would make the first run after install useless.
-
-### Extra — a REFUSE area never goes foreign, in either mode
-
-A task whose area is **REFUSE never routes to a non-Claude worker** whatever the
-route table says (`extra_enabled`, `../../_shared/extra-dispatch.md`), and this
-holds in `warn` mode too — where the task still dispatches, but to Claude. It is
-the second hard hold-back beside the cited-risk one, and it is deliberately
-*wider* than the `block` mode it sits next to.
-
-The reason is that the two verdicts are answering different questions. `block`
-decides whether ORC should attempt the task at all, and `warn` says the user
-accepted that risk. Neither of them asked whether the work should leave the
-machine — and a REFUSE is, by construction, an area where ORC **cannot verify
-its own output** (that is one of the four questions the verdict is derived from).
-Handing exactly that work to the executor with the weakest fence and no
-`actual_model` line compounds the one condition the card was written about.
-
-Print it with the verdict, and name it in the `extra:` preflight's held-back
-count. **A card that caused a hold-back must say so on its own card**, so the
-next reader learns it from the boundary lane rather than from a routing table
-they were not looking at. `unknown` is not REFUSE here either — an uncarded area
-routes by the ordinary rules.
-
-## `/orc-route`
-
-A plan with any REFUSE task **cannot route to `/orc-fast`**: fast has one executor
-and no wave to lift anything out of, so the gate has nowhere to act. Report it in
-the not-possible column with the verdict named, exactly like the other blocking
-conditions.
-
-## `/orc-ultra`
-
-The implementation judge may score against the area's card: an implementation that
-did the REFUSE-listed thing anyway is a blocking finding with an anchor
-(`.claude/orc/boundary/<area>.md`) and a consequence already written down.
-
-## The trace verb
-
-`BOUNDARY <verdict> task=<id> :: <area>` per gated task, and
-`BOUNDARY lift task=<id> :: <area>` when `block` removes one. Carried in the phase
-packet like every other verb — handed to `orc-trace-writer-haiku-4-5`, never
-written directly. `/orc-retro` reads them to answer the question this whole lane
-exists for: how much work did we stop attempting, and was that right?
+# Reference — the boundary gate inside `/orc` (`boundary_gate`)
+
+Loaded by the spine at Phase 1. This is the CONSUMER half: `/orc` reads cards, it
+never writes one.
+
+`boundary_gate: off | warn | block` — default **`warn`**.
+
+| Mode | What changes |
+|---|---|
+| `off` | nothing. Cards are ignored entirely. |
+| `warn` | the preflight line, plus a per-task verdict printed before each wave. No dispatch changes. |
+| `block` | additionally: a REFUSE task is LIFTED OUT of its wave and never dispatched. |
+
+`block` changes dispatch behaviour on upgrade, which is why it is not the default.
+Print the active mode whenever a verdict is shown — a gate whose mode is invisible
+gets blamed for things it did not do.
+
+## Phase 1 — preflight, one line
+
+`orc boundary status --json` with the other probes. Print the `line` field
+VERBATIM:
+
+```
+bound : 9 execute · 2 escalate · 1 refuse (2 stale)
+```
+
+Never re-word it, never compute the counts. No cards at all:
+
+```
+bound : none — /orc-boundary writes them; no card means an area is UNKNOWN, not safe
+```
+
+## Phase 3 — per wave
+
+Before dispatching wave W, resolve each task's area by matching its
+`declared_files` against every card's `anchored_files` (longest match wins), then:
+
+**EXECUTE** — dispatch normally. Nothing printed beyond the wave table.
+
+**ESCALATE** — dispatch normally, and record the named human on the task. **Ship
+is gated on that sign-off**, using the EXISTING pause machinery — the stop sequence
+at the wave boundary, with the escalation named in the stop reason. No new stop
+mechanic, no new config key.
+
+**REFUSE** —
+
+- `warn`: print the verdict and its checklist, then dispatch anyway. The user was
+  told; the run is theirs.
+- `block`: **lift that ONE task out of the wave. The wave proceeds with the
+  rest.** Blocking the whole wave punishes the tasks that were fine, and a gate
+  that costs a wave gets switched off. Print:
+
+```
+boundary → wave 2: T04 lifted out (REFUSE · src/payments)
+  the wave runs with T03, T05.
+  T04 comes back when:
+    □ add a test runner to this package
+    □ cover the idempotency path            → /orc-pattern
+  Not blocked for you — say "do T04 anyway" and it dispatches.
+```
+
+That last line is required. The gate constrains ORC, not the user.
+
+A lifted task's dependents are **requeued, not cancelled**: the existing
+`REPLAN wave=<n>` path already handles a task that did not land, and this is that
+case with a different cause.
+
+**A task in an area with NO card** is dispatched normally and reported as
+`boundary: unknown` on its dispatch line. Unknown is not REFUSE — refusing
+everything uncarded would make the first run after install useless.
+
+### Extra — a REFUSE area never goes foreign, in either mode
+
+A task whose area is **REFUSE never routes to a non-Claude worker** whatever the
+route table says (`extra_enabled`, `../../_shared/extra-dispatch.md`), and this
+holds in `warn` mode too — where the task still dispatches, but to Claude. It is
+the second hard hold-back beside the cited-risk one, and it is deliberately
+*wider* than the `block` mode it sits next to.
+
+The reason is that the two verdicts are answering different questions. `block`
+decides whether ORC should attempt the task at all, and `warn` says the user
+accepted that risk. Neither of them asked whether the work should leave the
+machine — and a REFUSE is, by construction, an area where ORC **cannot verify
+its own output** (that is one of the four questions the verdict is derived from).
+Handing exactly that work to the executor with the weakest fence and no
+`actual_model` line compounds the one condition the card was written about.
+
+Print it with the verdict, and name it in the `extra:` preflight's held-back
+count. **A card that caused a hold-back must say so on its own card**, so the
+next reader learns it from the boundary lane rather than from a routing table
+they were not looking at. `unknown` is not REFUSE here either — an uncarded area
+routes by the ordinary rules.
+
+## `/orc-route`
+
+A plan with any REFUSE task **cannot route to `/orc-fast`**: fast has one executor
+and no wave to lift anything out of, so the gate has nowhere to act. Report it in
+the not-possible column with the verdict named, exactly like the other blocking
+conditions.
+
+## `/orc-ultra`
+
+The implementation judge may score against the area's card: an implementation that
+did the REFUSE-listed thing anyway is a blocking finding with an anchor
+(`.claude/orc/boundary/<area>.md`) and a consequence already written down.
+
+## The trace verb
+
+`BOUNDARY <verdict> task=<id> :: <area>` per gated task, and
+`BOUNDARY lift task=<id> :: <area>` when `block` removes one. Carried in the phase
+packet like every other verb — handed to `orc-trace-writer-haiku-5-high`, never
+written directly. `/orc-retro` reads them to answer the question this whole lane
+exists for: how much work did we stop attempting, and was that right?

package/templates/skills/orc-brainstorm/SKILL.md

@@ -363,22 +363,22 @@ preflight line and has no gate to honour.
 ## Calls
 
 **ONE catalogue, and it is not you:** `orc lane calls orc-brainstorm --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
+SHARED 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.
+a failure**. A call that neither it nor this skill names 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 orc-brainstorm --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[]`.
-## Waiting mid-run (`/orc-wait`)
-
-Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
-Checkpoint **snapshot** · safe point **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.
+command you are about to run, out loud, before running it.
+
+## Rules — the anti-slop card (`../_shared/phases/rules.md`)
+
+`orc rules slice --lane orc-brainstorm --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[]`.
+## Waiting mid-run (`/orc-wait`)
+
+Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
+Checkpoint **snapshot** · safe point **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.

package/templates/skills/orc-budget/SKILL.md

@@ -234,22 +234,22 @@ preflight line and has no gate to honour.
 ## Calls
 
 **ONE catalogue, and it is not you:** `orc lane calls orc-budget --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
+SHARED 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.
+a failure**. A call that neither it nor this skill names 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 orc-budget --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[]`.
-## Waiting mid-run (`/orc-wait`)
-
-Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
-Checkpoint **none** · safe point **read-only, seconds long**. Nothing here to checkpoint, so all three modes behave identically — say so rather than asking. Never begin a wait between a dispatch and its validated return, or before the smoke gate has reported.
+command you are about to run, out loud, before running it.
+
+## Rules — the anti-slop card (`../_shared/phases/rules.md`)
+
+`orc rules slice --lane orc-budget --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[]`.
+## Waiting mid-run (`/orc-wait`)
+
+Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
+Checkpoint **none** · safe point **read-only, seconds long**. Nothing here to checkpoint, so all three modes behave identically — say so rather than asking. Never begin a wait between a dispatch and its validated return, or before the smoke gate has reported.

package/templates/skills/orc-challenge/README.md

@@ -135,7 +135,7 @@ one.
 
 ## Reading order for a new maintainer
 
-`../_shared/phases/intake.md` (it defines what every later file grades against) →
+`references/intake.md` (it defines what every later file grades against) →
 `council.md` → `sealed-slice.md` → `rubric.md` → `conservation.md` →
 `cycle-state.md` → `fix-brief.md`. Then `examples/tsd-two-iterations.md` for the
 whole thing end to end, and `examples/council-full-roster.md` for a run where

package/templates/skills/orc-challenge/SKILL.md

@@ -115,7 +115,7 @@ themselves are this lane's own and stay here.
 ## C1 — Intake (ONE round, ASK — never guess)
 
 Full field list, the round format and the "I don't know yet" exit:
-`../_shared/phases/intake.md`. It ends by running `orc challenge init`, which **freezes
+`references/intake.md`. It ends by running `orc challenge init`, which **freezes
 `goals.md`, `template.md` and the COUNCIL ROSTER**.
 
 **Question 7 is the P0 council ask**, rendered from `orc challenge roles --kind
@@ -284,22 +284,22 @@ documented defaults, out loud. Priorities and families:
 ## Calls
 
 **ONE catalogue, and it is not you:** `orc lane calls orc-challenge --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
+SHARED 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.
+a failure**. A call that neither it nor this skill names 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 orc-challenge --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[]`.
-## Waiting mid-run (`/orc-wait`)
-
-Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
-Checkpoint **cycle** · safe point **after a cycle records**. `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.
+command you are about to run, out loud, before running it.
+
+## Rules — the anti-slop card (`../_shared/phases/rules.md`)
+
+`orc rules slice --lane orc-challenge --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[]`.
+## Waiting mid-run (`/orc-wait`)
+
+Canonical: `../_shared/wait.md`. **`a lane that waits without a hand-back` has broken this contract.**
+Checkpoint **cycle** · safe point **after a cycle records**. `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.

package/templates/skills/orc-challenge/examples/council-full-roster.md

@@ -15,7 +15,7 @@ for a PRD includes the two lenses that never block.
 > /orc-challenge docs/prd-self-serve.md
 ```
 
-The first six questions are unchanged (`../../_shared/phases/intake.md`). Question 7 is
+The first six questions are unchanged (`references/intake.md`). Question 7 is
 rendered from `orc challenge roles --kind prd --json` — **the skill never
 hand-lists the lenses**:
 

package/templates/skills/orc-claude/SKILL.md

@@ -74,7 +74,7 @@ set in "Behavior trace").
    does not change this role) with: `mode`, `repo_root`,
    `budget` (from a `budget=N` argument, else null), and the paths to
    `references/template.md` + `references/refresh.md`. **Trace:** emit
-   `DISPATCH orc-claude-writer :: <mode> expect=opus-5/low` just before the
+   `DISPATCH orc-claude-writer :: <mode> expect=opus-5-5/low` just before the
    spawn (the expectation is derived from the agent NAME you actually
    dispatched, never from this line's default; the hook then adds
    `SPAWN`/`RETURN` on its own).
@@ -175,7 +175,7 @@ Dispatch-only lane: emit ONLY the markers it can truthfully witness — **not**
 `PHASE`/`SCORE`/`FINDING`/`VERDICT`, because scan/generate/report run INSIDE
 the writer sub-agent and there is no scoring or review here. The marker set, in
 order (actor `orc`, plus the hook's `SPAWN`/`RETURN`): `DISPATCH
-orc-claude-writer :: <mode> expect=opus-5/low` before the spawn (the mode
+orc-claude-writer :: <mode> expect=opus-5-5/low` before the spawn (the mode
 rides in this tail and in `FINISH`, so no separate mode marker) · `VERIFY writer
 actual=<model>/<effort>` · `FINISH :: <mode_ran> CLAUDE.md v<X.Y.Z>`, where
 `mode_ran` may be `noop`. A noop refresh still traces the full cycle.
@@ -207,11 +207,11 @@ documented defaults, out loud. Priorities and families:
 ## Calls
 
 **ONE catalogue, and it is not you:** `orc lane calls orc-claude --json` names every
-CLI call this lane makes, each with its exit-code contract, its cost, when to run
+SHARED 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.
+a failure**. A call that neither it nor this skill names 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.
 

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

@@ -50,7 +50,7 @@ dispatches the trace writer ONCE at run end to append them (`SPAWN`/`RETURN`
 come from the `orc-trace.js` hook as they occur):
 
 ```
-[120726 09:14:02.110] writer   DISPATCH orc-claude-writer :: refresh expect=opus-5/low
+[120726 09:14:02.110] writer   DISPATCH orc-claude-writer :: refresh expect=opus-5-5/low
 [120726 09:14:02.230] hook     SPAWN orc-claude-writer-opus-5-low
 [120726 09:15:47.900] hook     RETURN
 [120726 09:15:48.010] writer   VERIFY writer actual=claude-opus-5-5/low ✅ MATCH

package/templates/skills/orc-diy/SKILL.md

@@ -60,8 +60,8 @@ SKILL.md as a spine — the flow names every subskill and schema it needs.
 
 ## Lane contract (`../_shared/lane-contract.md` — read it ONLY when a call exits ≠ 0)
 
-- **Calls:** `orc lane calls orc-diy --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.
+- **Calls:** `orc lane calls orc-diy --json` names shared calls and exit codes.
+  **An exit code is an ANSWER where it says so, not a failure.** Own calls are here; make no other.
 - **Config:** `orc lane config orc-diy --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`).