@rosenfan/matrix 0.1.3 → 0.1.4

package/.claude/skills/matrix/SKILL.md

@@ -3,25 +3,21 @@ name: matrix
 description: Route, initialize, resume, and govern a persistent Matrix development workflow. Use when the user starts a feature, change, bug fix, or asks to resume managed development.
 ---
 
-# Matrix
-
-Use Matrix as the development-workflow entrypoint. Its source of truth is the current repository's `.matrix/`; never infer a phase from chat history.
-
-Read `artifact_language` from `matrix workflow inspect`. Keep required Markdown heading tokens unchanged, but write every user-facing artifact body, explanation, and handoff in that language: English for `en`, Chinese for `zh-CN`.
-
-## Route
+# Matrix
 
-First run:
+Use Matrix as the development-workflow entrypoint. Its source of truth is the current repository's `.matrix/`; never infer a phase from chat history.
 
-```powershell
-matrix workflow inspect
-```
+Read `artifact_language` from `node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect`. Keep required Markdown heading tokens unchanged, but write every user-facing artifact body, explanation, and handoff in that language: English for `en`, Chinese for `zh-CN`.
 
-If and only if the `matrix` executable is reported as absent, run the bundled fallback from this Skill directory instead:
+## Route
 
-```powershell
-node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect
-```
+For every workflow command, run the Runtime bundled with this project Skill so the project compatibility authority wins over a different global launcher:
+
+```powershell
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect
+```
+
+Use the global `matrix` command for `init`, `update`, and bootstrap only. A trusted 0.1.4 launcher auto-delegates only to an exact, hash-verified 0.1.4 project Runtime. A different or unidentified project release remains authoritative but must be invoked through the exact direct command returned by the launcher. Older launchers cannot provide this cross-release check and must not be used as the project workflow entrypoint.
 
 - If an active change exists, show its phase and frozen `orchestration`, report any Arch installation-integrity failure, and enter the returned `next_skill` only when the Runtime permits continuation.
 - If no active change exists, classify the request: reproducible small bug → `$matrix-hotfix` with workflow `hotfix`; bounded small change with no public API/schema/architecture impact → `$matrix-tweak` with workflow `tweak`; otherwise full Matrix with workflow `full`.
@@ -29,7 +25,7 @@ node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect
 - Before `init`, derive a short kebab-case change id and an accurate title. Start with `full` unless a shortcut clearly applies.
 
 ```powershell
-matrix workflow init <change-id> --workflow <full|hotfix|tweak> --orchestration <prim|arch> --title "<title>"
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs init <change-id> --workflow <full|hotfix|tweak> --orchestration <prim|arch> --title "<title>"
 ```
 
 An explicit mode wins; otherwise Runtime uses the project `default_orchestration`. The resolved value is immutable for the change and is shown in init, inspect, and the initialized Event. Then enter `$matrix-open`.
@@ -37,9 +33,9 @@ An explicit mode wins; otherwise Runtime uses the project `default_orchestration
 ## Orchestration
 
 - **Prim** uses Matrix's own capability in every phase and never requires Matt Skills.
-- **Arch** conditionally invokes the initialization-verified ten-Skill cohort when documented task-fact triggers are present.
+- **Arch** conditionally invokes the ten reviewed automatic capabilities frozen by the active Change. Matrix 0.1.4 reviews all 25 official Matt Skills v1.2.3 roles and installs only the 23 compatible Skills project-locally; `implement` and raw `resolving-merge-conflicts` are excluded.
 
-Both orchestration modes use the same selected workflow profile. `full` uses `open → design → build → verify → archive`; `hotfix` and `tweak` share one internal `lightweight` profile, `open → build → verify → archive`, with different evidence policies. Companion Skills never write Matrix state, transition, commit, archive, or create competing workflow artifacts.
+Both orchestration modes use the same selected workflow profile. `full` uses `open → design → build → verify → archive`; `hotfix` and `tweak` share one internal `lightweight` profile, `open → build → verify → archive`, with different evidence policies. Companion Skills never write Matrix state, transition, commit, archive, or create competing workflow artifacts.
 
 A correctly installed Arch capability that fails gets at most one Matrix-owned fallback for the same bounded capability, with failure and evidence recorded. A missing, modified, or incomplete Arch installation must be repaired with `matrix init --with-mattpocock`; never switch the active change to Prim.
 
@@ -48,11 +44,11 @@ A correctly installed Arch capability that fails gets at most one Matrix-owned f
 Use Runtime commands instead of editing Matrix state:
 
 ```powershell
-matrix workflow return design --reason design-gap
-matrix workflow return build --reason verification-failed
-matrix workflow return design --reason acceptance-or-design-gap
-matrix workflow return design --reason acceptance-or-design-gap # from Archive, before terminal archive
-matrix workflow abort --reason <requirement-cancelled|superseded|no-longer-valuable|blocked|other>
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason design-gap
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs return build --reason verification-failed
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason acceptance-or-design-gap
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason acceptance-or-design-gap # from Archive, before terminal archive
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs abort --reason <requirement-cancelled|superseded|no-longer-valuable|blocked|other>
 ```
 
 Return preserves the change but moves the current `verification.md` into revisioned evidence history, so the returned phase must produce fresh current evidence. Abort preserves the last phase and moves the terminal change into `.matrix/archive/`; it never undoes worktree changes.
@@ -60,14 +56,14 @@ Return preserves the change but moves the current `verification.md` into revisio
 If any mutation reports `WORKFLOW_RECOVERY_REQUIRED`, stop normal phase work and run the read-only diagnosis:
 
 ```powershell
-matrix workflow doctor
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs doctor
 ```
 
 Never infer a repair target or strategy. Use only the exact command returned by doctor:
 
 ```powershell
-matrix workflow doctor --repair --transaction <id> --strategy <continue|rollback>
-matrix workflow doctor --repair --lock <id>
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs doctor --repair --transaction <id> --strategy <continue|rollback>
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs doctor --repair --lock <id>
 ```
 
 ## Optional Claude handoff
@@ -77,16 +73,15 @@ Use it only when the user explicitly chooses Codex design with Claude Code imple
 
 ## Cross-Cutting Skills
 
-### Handoff (`handoff`)
-When context is running low and work needs to continue in a fresh session, use `handoff` at any stage boundary. It compacts the conversation into a handoff document with suggested skills for the next agent. Save to the OS temp directory, not the workspace.
+Matrix never nests user-invoked Matt Skills. When relevant, explain the reason and ask the user to invoke one explicitly: `setup-matt-pocock-skills` for one-time setup, `improve-codebase-architecture` for an out-of-band scan, `wayfinder` for generating a separate large-effort candidate, `handoff` at a context boundary, or `to-questionnaire` when another person owns blocking facts. `ask-matt`, `grill-with-docs`, `triage`, `to-spec`, `to-tickets`, `grill-me`, `teach`, and `wait-what` remain standalone. Matrix does not install or manage `implement` or raw `resolving-merge-conflicts`; preserve pre-existing copies as unmanaged extras and never suggest them inside an active Change.
 
 ## Rules
 
-- A phase can advance only through `matrix workflow transition`; run its guard first.
-- A phase can move backward only through one of the documented `matrix workflow return` intents.
-- Full Build approval binds proposal, design, and plan. Lightweight Build approval binds its compact proposal, requires `transition build --confirmed`, and rejects project implementation changes made after initialization but before approval.
-- A successful Archive is always a two-step optimistic commit: run `matrix workflow archive --dry-run`, then pass its exact hash to `matrix workflow archive --expect-preflight <sha256>`. Never bypass the preflight.
-- `matrix workflow doctor` is read-only. Every transaction or stale-lock repair must explicitly bind the identity reported by doctor; do not edit or delete `.matrix/transactions/` or `.matrix/workflow.lock`.
+- A phase can advance only through `node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition`; run its guard first.
+- A phase can move backward only through one of the documented `node <matrix-skill-directory>/scripts/matrix-runtime.mjs return` intents.
+- Full Build approval binds proposal, design, and plan. Lightweight Build approval binds its compact proposal, requires `transition build --confirmed`, and rejects project implementation changes made after initialization but before approval.
+- A successful Archive is always a two-step optimistic commit: run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs archive --dry-run`, then pass its exact hash to `node <matrix-skill-directory>/scripts/matrix-runtime.mjs archive --expect-preflight <sha256>`. Never bypass the preflight.
+- `node <matrix-skill-directory>/scripts/matrix-runtime.mjs doctor` is read-only. Every transaction or stale-lock repair must explicitly bind the identity reported by doctor; do not edit or delete `.matrix/transactions/` or `.matrix/workflow.lock`.
 - Do not replace required evidence with an assertion that work is complete.
 - Pause for user confirmation at material architecture/scope decisions and before archive/commit.
-- On shortcut scope expansion, run `matrix workflow return design --reason design-gap`; Runtime upgrades the change to `full`. Never silently continue the old contract.
+- On shortcut scope expansion, run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason design-gap`; Runtime upgrades the change to `full`. Never silently continue the old contract.

package/.claude/skills/matrix/scripts/matrix_state.py

@@ -21,13 +21,9 @@ def primary_runtime() -> str | None:
     return shutil.which("matrix")
 
 
-def runtime_command(args: list[str]) -> list[str]:
-    primary = primary_runtime()
-    if primary is not None:
-        return [primary, "workflow", *args, "--json"]
-
-    development = development_runtime()
-    if development is not None:
+def runtime_command(args: list[str]) -> list[str]:
+    development = development_runtime()
+    if development is not None:
         if not development.is_file():
             raise RuntimeError(f"Configured Matrix development runtime was not found: {development}")
         node = shutil.which("node")
@@ -37,10 +33,14 @@ def runtime_command(args: list[str]) -> list[str]:
 
     bundled = Path(__file__).with_name("matrix-runtime.mjs")
     node = shutil.which("node")
-    if node is not None and bundled.exists():
-        return [node, str(bundled), *args]
-
-    raise RuntimeError("Matrix CLI is absent and the bundled workflow runtime was not found.")
+    if node is not None and bundled.exists():
+        return [node, str(bundled), *args]
+
+    primary = primary_runtime()
+    if primary is not None:
+        return [primary, "workflow", *args, "--json"]
+
+    raise RuntimeError("Matrix CLI is absent and the bundled workflow runtime was not found.")
 
 
 def run_runtime(args: list[str]) -> int:

package/.claude/skills/matrix-archive/SKILL.md

@@ -3,11 +3,11 @@ name: matrix-archive
 description: Close and archive a verified Matrix change. Use when the active Matrix phase is archive.
 ---
 
-# Matrix Archive
-
-This is the final Matrix phase. Read the proposal, plan, and verification evidence; summarize changed behavior, verification, residual risks, and follow-up work. Ask for explicit confirmation before committing or archiving.
-
-Write archive summaries and handoff prose in `artifact_language`; keep Runtime-required English heading tokens unchanged.
+# Matrix Archive
+
+This is the final Matrix phase. Read the proposal, plan, and verification evidence; summarize changed behavior, verification, residual risks, and follow-up work. Ask for explicit confirmation before committing or archiving.
+
+Write archive summaries and handoff prose in `artifact_language`; keep Runtime-required English heading tokens unchanged.
 
 Archive is Matrix-owned in both Prim and Arch. Do not invoke companion implementation, review, or architecture capabilities here.
 
@@ -16,12 +16,12 @@ Archive is Matrix-owned in both Prim and Arch. Do not invoke companion implement
 Run the read-only preflight and review its bounded effect summary. Then submit exactly the hash returned by that preflight:
 
 ```powershell
-matrix workflow archive --dry-run
-matrix workflow archive --expect-preflight <sha256-returned-by-dry-run>
-```
-
-Bare Archive is rejected. Runtime reacquires the project Archive boundary and recomputes the entire protected change-directory manifest before committing.
-For hotfix/tweak, ask for explicit confirmation after reviewing the preflight, then use the returned command with `--confirmed`. Runtime rejects a shortcut Archive without it.
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs archive --dry-run
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs archive --expect-preflight <sha256-returned-by-dry-run>
+```
+
+Bare Archive is rejected. Runtime reacquires the project Archive boundary and recomputes the entire protected change-directory manifest before committing.
+For hotfix/tweak, ask for explicit confirmation after reviewing the preflight, then use the returned command with `--confirmed`. Runtime rejects a shortcut Archive without it.
 
 - `ARCHIVE_PREFLIGHT_CHANGED`: run dry-run again and review the new summary.
 - `ARCHIVE_BUSY`: retry later. Do not remove or take over the lock; stale-lock recovery belongs to the later doctor/repair change.
@@ -30,7 +30,7 @@ For hotfix/tweak, ask for explicit confirmation after reviewing the preflight, t
 If acceptance criteria or design must change while awaiting confirmation, use the sole Archive recovery path:
 
 ```powershell
-matrix workflow return design --reason acceptance-or-design-gap
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason acceptance-or-design-gap
 ```
 
 After successful commit, the change is under `.matrix/archive/` and the workflow is complete.

package/.claude/skills/matrix-build/SKILL.md

@@ -3,11 +3,11 @@ name: matrix-build
 description: Implement the frozen active Matrix plan with test-first vertical slices. Use when the active Matrix phase is build.
 ---
 
-# Matrix Build
-
-Run `matrix workflow inspect` and implement only its approved Contract. Full and `legacy-full` read proposal/design/plan. `lightweight` reads the approved compact proposal and must not backfill Design artifacts.
-
-Write build evidence and user-facing explanations in `artifact_language`; preserve any Runtime-required English heading tokens.
+# Matrix Build
+
+Run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect` and implement only its approved Contract. Full and `legacy-full` read proposal/design/plan. `lightweight` reads the approved compact proposal and must not backfill Design artifacts.
+
+Write build evidence and user-facing explanations in `artifact_language`; preserve any Runtime-required English heading tokens.
 
 ## Prim
 
@@ -15,18 +15,21 @@ Use Matrix's own implementation and test discipline.
 
 ## Arch
 
-- invoke `tdd` when the change modifies observable behavior at a testable seam;
-- invoke `diagnosing-bugs` only when an actual failure exists and root cause is not established;
-- invoke `resolving-merge-conflicts` only for an in-progress merge or rebase conflict.
+- invoke `tdd` when the change modifies observable behavior at a testable seam;
+- invoke `diagnosing-bugs` only when an actual failure exists and root cause is not established;
+- invoke `writing-for-agents` when the approved Contract changes agent-facing instructions;
+- invoke `wizard` only to generate and statically verify human-run shell steps required by the Contract; never execute the wizard end-to-end or collect secrets.
+
+Resolve an in-progress merge/rebase through Matrix-owned conflict handling. Do not invoke raw `resolving-merge-conflicts`, because it can stage, continue, and commit outside Matrix lifecycle ownership. Never invoke `implement` inside an active Change.
 
 Announce each triggered capability and reason. No companion may commit, review, transition, archive, or broaden scope. A correctly installed capability gets at most one Matrix-owned fallback for that same capability; record the Skill, failure, fallback, and evidence. Installation-integrity failure stops the phase.
 
 ## Scope Discipline
 
-If implementation exposes a scope or design change, **stop and run**; a lightweight change is upgraded to full by this Return:
+If implementation exposes a scope or design change, **stop and run**; a lightweight change is upgraded to full by this Return:
 
 ```powershell
-matrix workflow return design --reason design-gap
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason design-gap
 ```
 
 Then enter `$matrix-design`; do not amend the plan silently. The Runtime preserves old verification evidence in revision history and requires fresh evidence after the redesigned plan returns to Build.
@@ -35,10 +38,10 @@ Then enter `$matrix-design`; do not amend the plan silently. The Runtime preserv
 
 1. Implement the approved plan in bounded vertical slices.
 2. Use only triggered Arch capabilities.
-3. Record common facts under `## Build evidence`. Hotfix also requires `## Reproduction evidence` and `## Root cause`; tweak also requires `## Scope evidence`.
+3. Record common facts under `## Build evidence`. Hotfix also requires `## Reproduction evidence` and `## Root cause`; tweak also requires `## Scope evidence`.
 4. Run the guard and transition, then enter `$matrix-verify`.
 
 ```powershell
-matrix workflow guard build
-matrix workflow transition verify
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard build
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition verify
 ```

package/.claude/skills/matrix-claude/SKILL.md

@@ -3,11 +3,11 @@ name: matrix-claude
 description: Export a frozen Matrix design as a bounded Claude Code task package without changing Matrix workflow state. Use when Codex should design and Claude Code should implement.
 ---
 
-# Matrix Claude Handoff
-
-This is an optional Matrix sidecar, not a Matrix phase. It must not call `transition`, `archive`, or write `matrix.yaml` or `events.jsonl`. It supports only a matching full or legacy-full three-artifact Contract; new lightweight hotfix/tweak changes are intentionally unsupported.
-
-Use `artifact_language` from inspect for human-readable handoff text while retaining the stable machine-readable headings and metadata keys.
+# Matrix Claude Handoff
+
+This is an optional Matrix sidecar, not a Matrix phase. It must not call `transition`, `archive`, or write `matrix.yaml` or `events.jsonl`. It supports only a matching full or legacy-full three-artifact Contract; new lightweight hotfix/tweak changes are intentionally unsupported.
+
+Use `artifact_language` from inspect for human-readable handoff text while retaining the stable machine-readable headings and metadata keys.
 
 ## When to Use
 
@@ -21,7 +21,7 @@ Use `$matrix-claude` when:
 The exporter performs this read-only check before writing anything:
 
 ```powershell
-matrix workflow guard build
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard build
 ```
 
 If `matrix` is genuinely absent from PATH, use the bundled runtime from the installed root Matrix Skill. Do not fall back when the primary command starts and returns an error.
@@ -34,11 +34,11 @@ Treat explicit invocation of `$matrix-claude` as the user's choice of Claude Cod
 
 ```powershell
 # Generic project: only exports a Matrix artifact.
-matrix workflow export --task-id <ID> --target generic
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs export --task-id <ID> --target generic
 
 # FnSec: exports its formal task package. Add --apply-fnsec-board only when
 # active.md is NO_ACTIVE_OBJECTIVE; an existing task is never overwritten.
-matrix workflow export --task-id <ID> --target fnsec --apply-fnsec-board
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs export --task-id <ID> --target fnsec --apply-fnsec-board
 ```
 
 ## Task Package Contents
@@ -78,12 +78,12 @@ After Claude Code completes and evidence is present:
 
 1. Run build guard to verify evidence:
    ```powershell
-   matrix workflow guard build
+   node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard build
    ```
 
 2. If guard passes, transition to verify:
    ```powershell
-   matrix workflow transition verify
+   node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition verify
    ```
 
 3. Enter `$matrix-verify` to继续验证流程

package/.claude/skills/matrix-design/SKILL.md

@@ -3,13 +3,13 @@ name: matrix-design
 description: Design and freeze the active Matrix change before implementation. Use when the active Matrix phase is design or when build scope requires redesign.
 ---
 
-# Matrix Design
-
-Design is used by `full` and resumable legacy shortcut changes only. A new lightweight hotfix/tweak moves directly from Open to Build and must not create Design artifacts merely to satisfy the full guard.
-
-Use `artifact_language` from `matrix workflow inspect` for all design and plan prose. Keep Runtime-required English heading tokens unchanged.
-
-Run `matrix workflow inspect`, read the active proposal and frozen `orchestration`, then write `artifacts/design.md` with `## Decisions`, `## Boundaries`, `## Test seams`, and `## Risks`; write `artifacts/plan.md` with `## Steps`, `## Validation`, and `## Stop conditions`.
+# Matrix Design
+
+Design is used by `full` and resumable legacy shortcut changes only. A new lightweight hotfix/tweak moves directly from Open to Build and must not create Design artifacts merely to satisfy the full guard.
+
+Use `artifact_language` from `node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect` for all design and plan prose. Keep Runtime-required English heading tokens unchanged.
+
+Run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect`, read the active proposal and frozen `orchestration`, then write `artifacts/design.md` with `## Decisions`, `## Boundaries`, `## Test seams`, and `## Risks`; write `artifacts/plan.md` with `## Steps`, `## Validation`, and `## Stop conditions`.
 
 ## Prim
 
@@ -19,15 +19,17 @@ Use Matrix's own capability to investigate the repository and design the change.
 
 Invoke only capabilities whose task-fact trigger is proven:
 
-- `domain-modeling` for unclear vocabulary, invariants, or architectural decisions;
-- `research` when required external facts cannot be established from the repository;
-- `wayfinder` when module ownership or dependency seams are unknown;
-- `prototype` when a material design decision needs disposable empirical evidence;
-- `codebase-design` when a deep-module, interface, or test-seam decision remains.
+- `domain-modeling` for unclear vocabulary, invariants, or architectural decisions;
+- `research` when required external facts cannot be established from the repository;
+- `prototype` when a material design decision needs disposable empirical evidence;
+- `codebase-design` when a deep-module, interface, or test-seam decision remains;
+- `writing-for-agents` when the Contract creates or changes Skills, `AGENTS.md`, `CLAUDE.md`, or documents reached through agent pointers.
 
 Order follows actual dependencies; never run a fixed companion sequence. Announce each invocation and reason. A correctly installed capability gets at most one same-capability Matrix fallback; installation-integrity failure stops the phase.
 
-Long-lived domain, ADR, or research artifacts follow repository conventions, and material conclusions must be synchronized into the canonical design or plan. Prototypes default to an OS temporary directory unless the approved design promotes a project path. Companion output cannot own Matrix state or create a competing plan.
+Long-lived domain, ADR, or research artifacts follow repository conventions, and material conclusions must be synchronized into the canonical design or plan. Prototypes default to an OS temporary directory unless the approved design promotes a project path. Companion output cannot own Matrix state or create a competing plan.
+
+`wayfinder` and `improve-codebase-architecture` are explicit handoffs outside the active Design. Recommend one only when its purpose fits, then let the user invoke it; a selected result may enter a separate governed Change.
 
 ## Process
 
@@ -37,7 +39,7 @@ Long-lived domain, ADR, or research artifacts follow repository conventions, and
 4. Run the guard, then choose the implementation actor.
 
 ```powershell
-matrix workflow guard design
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard design
 ```
 
 ## Implementation Decision Point
@@ -49,7 +51,7 @@ After the design guard passes, the user chooses:
 Run transition and enter `$matrix-build`:
 
 ```powershell
-matrix workflow transition build
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition build
 ```
 
 Then enter `$matrix-build` to implement directly in this session.
@@ -64,8 +66,8 @@ First approve the frozen contract by transitioning to Build, then run `$matrix-c
 After Claude Code completes and returns results, run the Build guard and enter `$matrix-verify`:
 
 ```powershell
-matrix workflow guard build
-matrix workflow transition verify
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard build
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition verify
 ```
 
 Then enter `$matrix-verify` to verify the implementation.

package/.claude/skills/matrix-hotfix/SKILL.md

@@ -5,4 +5,4 @@ description: Run a constrained Matrix workflow for a reproducible small bug. Use
 
 # Matrix Hotfix
 
-Start through `$matrix` with workflow `hotfix`. It uses the shared lightweight lifecycle `open → build → verify → archive`; there is no separate hotfix state machine. Before Build, record expected/actual behavior and a reproducible failure signal, present the compact Contract, and wait for confirmation. Build records reproduction and root-cause evidence; Verify records regression evidence. If the bug requires architecture, public API, schema, or broad coordination, use controlled Return to upgrade the change to full.
+Start through `$matrix` with workflow `hotfix`. It uses the shared lightweight lifecycle `open → build → verify → archive`; there is no separate hotfix state machine. Before Build, record expected/actual behavior and a reproducible failure signal, present the compact Contract, and wait for confirmation. Build records reproduction and root-cause evidence; Verify records regression evidence. If the bug requires architecture, public API, schema, or broad coordination, use controlled Return to upgrade the change to full.

package/.claude/skills/matrix-open/SKILL.md

@@ -3,16 +3,16 @@ name: matrix-open
 description: Open or resume the Matrix open phase by clarifying a development request into an evidence-backed proposal. Use after $matrix initializes a change or when the active Matrix phase is open.
 ---
 
-# Matrix Open
-
-Run `matrix workflow inspect` and follow its `profile` and `evidence_policy`.
-
-Use its `artifact_language` for all proposal prose. Keep the required English heading tokens exactly as specified for Runtime guards; only the text beneath them is localized.
-
-- **full**: produce `proposal.md` with `## Goal`, `## Scope`, `## Non-goals`, `## Acceptance`, and `## Risks`, then continue to Design.
-- **lightweight**: produce the complete compact Contract before editing project implementation. Include `## Goal`, `## Scope`, `## Non-goals`, `## Approach`, `## Acceptance`, `## Validation`, `## Risks`, and `## Upgrade conditions`.
-- **hotfix evidence**: also include `## Expected behavior`, `## Actual behavior`, and `## Reproduction`.
-- **tweak evidence**: also include `## Current behavior`, `## Preserved behavior`, and `## Diff boundary`.
+# Matrix Open
+
+Run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect` and follow its `profile` and `evidence_policy`.
+
+Use its `artifact_language` for all proposal prose. Keep the required English heading tokens exactly as specified for Runtime guards; only the text beneath them is localized.
+
+- **full**: produce `proposal.md` with `## Goal`, `## Scope`, `## Non-goals`, `## Acceptance`, and `## Risks`, then continue to Design.
+- **lightweight**: produce the complete compact Contract before editing project implementation. Include `## Goal`, `## Scope`, `## Non-goals`, `## Approach`, `## Acceptance`, `## Validation`, `## Risks`, and `## Upgrade conditions`.
+- **hotfix evidence**: also include `## Expected behavior`, `## Actual behavior`, and `## Reproduction`.
+- **tweak evidence**: also include `## Current behavior`, `## Preserved behavior`, and `## Diff boundary`.
 
 ## Prim
 
@@ -20,7 +20,9 @@ Use Matrix's own capability to clarify the request and write the proposal.
 
 ## Arch
 
-Invoke `grilling` only when material ambiguity remains or the user asks to stress-test the request. Invoke `domain-modeling` only when domain vocabulary, invariants, or an architectural decision is unclear. Announce the capability and reason before invoking it; selecting Arch already authorizes triggered capabilities.
+Invoke `grilling` only when material ambiguity remains or the user asks to stress-test the request. Invoke `domain-modeling` only when domain vocabulary, invariants, or an architectural decision is unclear. Announce the capability and reason before invoking it; selecting Arch already authorizes triggered capabilities.
+
+If progress is blocked by facts or decisions owned by another person, explain why `to-questionnaire` fits and ask the user to invoke it. Do not invoke the wrapper yourself.
 
 Companion output is evidence for the Matrix proposal. It must not create another workflow, proposal, confirmation state, or phase transition. If a correctly installed capability fails, perform at most one Matrix-owned fallback for that same capability and record the failure and evidence. Installation-integrity failures require `matrix init --with-mattpocock` and are not eligible for fallback.
 
@@ -28,13 +30,13 @@ Companion output is evidence for the Matrix proposal. It must not create another
 
 1. Resolve only ambiguities required by the active workflow.
 2. Write the canonical proposal and synchronize material companion conclusions into it.
-3. For full, ask for confirmation when scope or risk is material, then enter Design.
-4. For lightweight, always present the compact Contract and wait for explicit confirmation before entering Build.
-
-```powershell
-matrix workflow guard open
-# full
-matrix workflow transition design
-# hotfix/tweak, only after explicit confirmation
-matrix workflow transition build --confirmed
-```
+3. For full, ask for confirmation when scope or risk is material, then enter Design.
+4. For lightweight, always present the compact Contract and wait for explicit confirmation before entering Build.
+
+```powershell
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard open
+# full
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition design
+# hotfix/tweak, only after explicit confirmation
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition build --confirmed
+```

package/.claude/skills/matrix-status/SKILL.md

@@ -8,8 +8,8 @@ description: Inspect the active Matrix workflow and report its disk-backed phase
 Run the same Matrix state kernel used by the main entry and every phase Skill:
 
 ```powershell
-matrix workflow inspect
-matrix workflow doctor
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs doctor
 ```
 
-Report the returned change id, workflow, `profile`, `evidence_policy`, frozen `orchestration`, phase, guard result, `next_skill`, Workflow health, unfinished transactions, available strategies, and exact recovery commands. If Arch integrity fails, identify the affected platform/Skill facts and report `matrix init --with-mattpocock`; do not reinterpret the change as Prim. Both commands are read-only. Do not infer status from conversation history, run `--repair`, or modify state. If the guard is failing, name the missing evidence and direct the user to the current phase Skill.
+Report the returned change id, workflow, `profile`, `evidence_policy`, frozen `orchestration`, phase, guard result, `next_skill`, Workflow health, unfinished transactions, available strategies, and exact recovery commands. If Arch integrity fails, identify the affected platform/Skill facts and report `matrix init --with-mattpocock`; do not reinterpret the change as Prim. Both commands are read-only. Do not infer status from conversation history, run `--repair`, or modify state. If the guard is failing, name the missing evidence and direct the user to the current phase Skill.

package/.claude/skills/matrix-tweak/SKILL.md

@@ -5,4 +5,4 @@ description: Run a lightweight Matrix workflow for a bounded small development c
 
 # Matrix Tweak
 
-Start through `$matrix` with workflow `tweak`. It uses the shared lightweight lifecycle `open → build → verify → archive`; there is no separate tweak state machine or Design phase. Before editing implementation, define current/preserved behavior, the diff boundary, acceptance, and validation in the compact proposal, present it, and wait for confirmation. Build and Verify must prove scope and diff alignment. Use controlled Return to upgrade to full when the change crosses module, API, schema, or architecture boundaries.
+Start through `$matrix` with workflow `tweak`. It uses the shared lightweight lifecycle `open → build → verify → archive`; there is no separate tweak state machine or Design phase. Before editing implementation, define current/preserved behavior, the diff boundary, acceptance, and validation in the compact proposal, present it, and wait for confirmation. Build and Verify must prove scope and diff alignment. Use controlled Return to upgrade to full when the change crosses module, API, schema, or architecture boundaries.

package/.claude/skills/matrix-verify/SKILL.md

@@ -3,11 +3,11 @@ name: matrix-verify
 description: Verify the active Matrix change against its plan and review its diff. Use when the active Matrix phase is verify.
 ---
 
-# Matrix Verify
-
-Run the approved Contract's acceptance commands and record their output summaries under `## Test evidence` in `artifacts/verification.md`.
-
-Write verification prose in `artifact_language` from inspect while preserving the required English evidence headings.
+# Matrix Verify
+
+Run the approved Contract's acceptance commands and record their output summaries under `## Test evidence` in `artifacts/verification.md`.
+
+Write verification prose in `artifact_language` from inspect while preserving the required English evidence headings.
 
 ## Input Sources
 
@@ -31,36 +31,51 @@ If these are missing (e.g., Claude Code didn't produce complete evidence), retur
 
 ## Orchestration
 
-Run `matrix workflow inspect` and read the frozen mode.
-
-- **Prim**: Matrix performs the Standards and Spec review itself.
-- **Arch**: invoke `code-review` to produce both review axes; announce the invocation and reason.
+Run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs inspect` and read the frozen mode.
 
-Review findings are inputs to Matrix Verify; a companion cannot decide the phase outcome, broaden approved architecture, transition, or archive. Do not invoke post-review architecture wrappers. A correctly installed review capability gets at most one same-capability Matrix fallback; installation-integrity failure stops verification.
+- **Prim**: Matrix performs the Standards and Spec review itself.
+- **Arch**: invoke `code-review` to produce both review axes; announce the invocation and reason.
+
+Review findings are inputs to Matrix Verify; a companion cannot decide the phase outcome, broaden approved architecture, transition, or archive. Do not invoke post-review architecture wrappers. A correctly installed review capability gets at most one same-capability Matrix fallback; installation-integrity failure stops verification.
+
+Under `## Review evidence`, preserve two substantive subsections named `### Standards` and `### Spec`. Arch must then ask the project Runtime to bind those results to the current revision:
+
+```powershell
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs review --source code-review --fixed-point <ref> --standards <passed|failed> --spec <passed|failed>
+```
+
+If `code-review` cannot run because the Git baseline is unavailable, the committed HEAD diff is empty, staged/unstaged/untracked candidate files exist, or the capability actually fails, document that limitation and use the single bounded fallback for this revision:
+
+```powershell
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs review --source matrix-fallback --reason <git-baseline-unavailable|empty-head-diff|uncommitted-worktree|capability-execution-failed> [--fixed-point <ref-for-empty-head-diff-or-uncommitted-worktree>] --standards <passed|failed> --spec <passed|failed>
+```
+
+Never label fallback output as a successful `code-review` run. `empty-head-diff` requires the fixed point so Runtime can verify the empty three-dot diff. `uncommitted-worktree` requires a fixed point and Runtime binds the staged, unstaged, and untracked candidate content into `candidate_hash`; any later change makes the receipt stale. If a receipt already exists or either axis failed, use a controlled Return before another attempt.
 
 ## Failure Handling
 
 If verification or review fails:
-- If the issue is in the implementation, run `matrix workflow return build --reason verification-failed`, then enter `$matrix-build` or ask Claude Code to fix.
-- If the issue is in the acceptance criteria or design, run `matrix workflow return design --reason acceptance-or-design-gap`, then enter `$matrix-design`.
+- If the issue is in the implementation, run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs return build --reason verification-failed`, then enter `$matrix-build` or ask Claude Code to fix.
+- If the issue is in the acceptance criteria or design, run `node <matrix-skill-directory>/scripts/matrix-runtime.mjs return design --reason acceptance-or-design-gap`, then enter `$matrix-design`.
 
-Both Return paths rotate the current `verification.md` into revisioned evidence history. Do not copy stale conclusions back into the new current evidence.
+Both Return paths rotate the current `verification.md` and any `review-receipt.json` into revisioned evidence history. Do not copy stale conclusions or receipts back into the new current evidence.
 
 If documents or public behavior changed, record the required synchronization work before the guard.
 
 ## Process
 
 1. Check that `artifacts/verification.md` exists with `## Build evidence`
-2. Run the approved validation commands (full plan or lightweight proposal)
-3. Record test output under `## Test evidence`
-4. Produce both Standards and Spec review axes through the selected orchestration mode
-6. Record findings under `## Review evidence`
-7. Run the guard
-8. If it passes, transition to archive and enter `$matrix-archive`
+2. Run the approved validation commands (full plan or lightweight proposal)
+3. Record test output under `## Test evidence`
+4. Produce both Standards and Spec review axes through the selected orchestration mode
+5. Record findings under `## Review evidence` with `### Standards` and `### Spec`
+6. In Arch, record the Runtime review receipt for the current revision
+7. Run the guard
+8. If it passes, transition to archive and enter `$matrix-archive`
 
 ```powershell
-matrix workflow guard verify
-matrix workflow transition archive
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs guard verify
+node <matrix-skill-directory>/scripts/matrix-runtime.mjs transition archive
 ```
 
 ## Evidence Requirements
@@ -68,6 +83,7 @@ matrix workflow transition archive
 The guard checks for:
 
 1. **Test evidence** — Output from running the plan's validation commands
-2. **Review evidence** — Findings from the two-axis code review
+2. **Review evidence** — Separate Standards and Spec findings from the selected review path
+3. **Arch review receipt** — Runtime-bound identity for the current Contract, evidence, workspace, and normal or fallback source
 
-Full requires Test and Review evidence. Hotfix additionally requires `## Regression evidence`; tweak additionally requires `## Scope review evidence`.
+Full requires Test and Review evidence. Hotfix additionally requires `## Regression evidence`; tweak additionally requires `## Scope review evidence`.