fix(rm-02): narrow inventory drift guarantee

.woodpecker/ci.yml

@@ -68,15 +68,25 @@ steps:
       - bash packages/mosaic/framework/tools/quality/scripts/test-upgrade-durable-snapshot.sh
       - bash packages/mosaic/framework/tools/quality/scripts/test-install-migration.sh
 
+  # Anti-inert-gate registry. Deliberately unconditional: no path filter and no
+  # step-level `when`, because a gate can be disabled by changes outside its own path.
+  gate-verify:
+    image: *node_image
+    commands:
+      - *enable_pnpm
+      - pnpm gate:verify
+    depends_on:
+      - install
+      - sanitization
+      - upgrade-guard
+
   typecheck:
     image: *node_image
     commands:
       - *enable_pnpm
       - pnpm typecheck
     depends_on:
-      - install
-      - sanitization
-      - upgrade-guard
+      - gate-verify
 
   # lint, format, and test are independent — run in parallel after typecheck
   lint:

docs/ADMIN-GUIDE/README.md

@@ -0,0 +1,3 @@
+# Administrator Guide
+
+- [Gate registry operations](quality-gate-registry.md)

docs/ADMIN-GUIDE/quality-gate-registry.md

@@ -0,0 +1,35 @@
+# Gate Registry Operations
+
+## Routine verification
+
+Run `pnpm gate:verify` from a dependency-installed checkout. Exit zero means registry observations matched their declared `actual` values; it does **not** assert required-behavior conformance while deltas remain. Open `DEFECT` records are checked descriptions of current behavior with tracked owners, never successful gate outcomes.
+
+Investigate any of these immediately:
+
+- `GATE VERIFY FAILED` — registry structure, observed behavior, provenance, claim binding, source/deployment identity, or negative-control detection changed. The verifier aggregates independent phase failures, so repair the responsible stable-ID diagnostics as well as any accompanying stale-fixture error; do not treat the generic error as a substitute.
+- `unregistered gate` — an executable appeared under a declared gate root without a registry entry.
+- `no negative control` — a gate has no must-fail case.
+- `DEPLOYED IDENTITY UNAVAILABLE` — the runner cannot reach the installed enforcing copy. The pinned observation is checked, but live equality is not asserted.
+- `HISTORY_PROVENANCE_FORBIDDEN` — a history assertion path was reintroduced at the repository layer; remove it and keep RM-60 as the tracked external-boundary owner.
+
+## Updating a gate
+
+1. Add or change the criterion, its exact criterion-side `caseRefs`, and matching case-side `criterionIds`. Preserve recursive closed-schema validation for every nested object; new fields require explicit key and type handling.
+2. Observe the must-fail case fail for its own stated reason; moving the binding to any undeclared case must fail verification.
+3. Declare an exact inerting mutation and observe the verifier detect it.
+4. If required and actual behavior differ, add a tracked remediation owner and justification.
+5. If meaning changed, append provenance; never replace the original silently.
+6. For an installed counterpart, verify live byte identity and update the observed digest only from measured evidence.
+7. Run focused verifier tests, `pnpm gate:verify`, and the repository baseline gates.
+
+Do not add an ownerless exception or describe an open delta as pass/green/OK.
+
+## CI behavior
+
+Woodpecker runs `gate-verify` on every pull request and protected-main push without path filtering. This is deliberate: changes outside gate files can make a gate inert. The step needs no local history preparation because RM-02 asserts no history-provenance property.
+
+**DOES:** PR CI executes current-tree verification unprivileged and fail-closed. It compares the manifest and verifier inventory separately with `gates/required-gates.baseline.json`, and consumed case evidence carries a subject checked against its gate definition. **Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.** The registered shrink-both, overclaim, and per-gate evidence-subject controls must remain red for their stated reasons.
+
+**DOES NOT:** No local git state in the PR checkout is trustworthy as a history anchor because PR-controlled lifecycle code executes before the gate. The verifier has no history-verification path, and its closed current-tree observation renderer has no history/ancestry/lineage success class. Do not add a local ref, config, remote URL, source constant, or author-positioned path as a replacement anchor.
+
+`scripts/gate-history-exclusion-control.mjs` enforces the output incapacity by testing alternate success wording and production renderer wiring; its registered fixture proves adding a prohibited success class goes red. RM-60 is the tracked owner of the provider-controlled/protected pre-execution boundary. If a bootstrap override is ever proposed before RM-60, it requires a separate explicit, loud, audited, retiring, negative-controlled design; RM-02 contains no override.

docs/DEVELOPER-GUIDE/README.md

@@ -0,0 +1,3 @@
+# Developer Guide
+
+- [Gate registry and negative controls](quality-gate-registry.md)

docs/DEVELOPER-GUIDE/quality-gate-registry.md

@@ -0,0 +1,43 @@
+# Gate Registry and Negative Controls
+
+`gates/gates.manifest.json` is the machine-readable registry for the initial RM-02 gate slice. Run:
+
+```bash
+pnpm gate:verify
+```
+
+## Registered slice
+
+The registry covers root typecheck, lint, and format checks; RM-01 checkout preflight; the Mosaic CI queue guard; and root Husky pre-commit/pre-push hooks. It does not imply repository-wide coverage. Framework scripts, package-local build/test scripts, templates, and deployment/release scripts remain assigned to RM-54.
+
+Every gate declares exact invocations, observed and required outcomes, criterion bindings, and a single exact inerting mutation. Every case result carries an evidence-side subject that is compared with the gate definition when the result is consumed; the population control mutates that evidence-side subject independently for every required gate. Every must-fail case requires a non-empty reason diagnostic. The verifier rejects a stale, ambiguous, crashing, or ineffective mutation. Fixture and mutation writes reject path traversal and final-component symlinks. Every nested manifest object used by outcomes, mutations, fixtures, deployments, defects, compatibility, provenance, coverage, and merge assertions has closed keys and strict field types; a misspelling cannot silently turn a required comparison into an absent optional field. Independent validation phases collect labeled failures instead of letting one thrown fixture, claim, discovery, deployment, mutation, or compatibility error mask already-known stable-ID diagnostics. This proves detection of the **declared** inerting mutation, not every possible semantic weakening.
+
+## Required versus actual
+
+A case may record different `required` and `actual` outcomes only with a tracked owner. The verifier checks current reality against `actual`, prints each difference as `DEFECT (owner: ...)`, and fails when behavior changes without a matching registry update. A defect is never described as passing, green, or OK.
+
+The queue guard currently has RM-03-owned deltas. In particular, its stdin/heredoc classifier does not consume piped status JSON, so terminal-success, no-status, and terminal-failure payloads become `unknown`; unknown and malformed states exit zero; push purpose defaults to `main`. RM-02 records these observations and does not edit the guard.
+
+## Criteria, prose, and compatibility
+
+Each criterion declares exact `caseRefs`; the verifier compares those semantic declarations bidirectionally with case-side `criterionIds` and requires at least one must-fail case. Moving a criterion ID to an unrelated case therefore fails as both a missing declared exercising case and an undeclared binding. Registered meta-negative controls misbind a criterion, remove meaning provenance, and misbind a prose claim, and each must make structure verification red for its stated reason.
+
+Designated governing prose uses `GATE-CLAIM:<id>` markers. Each claim also names the exact must-fail `caseRef` that exercises its criterion; unknown, positive-only, unrelated, unbound, or registered-but-missing claims fail. Orchestrator-owned claims from `TASKS.md` are bound through `docs/remediation/GATE-CLAIMS.md`, which records source headings and anchored text without changing task tracking. Marker completeness still requires RM-54 review because arbitrary English claims cannot be inferred safely.
+
+Compatibility checks detect direct contradictions in declared finite constructions. The verifier combines referenced case fixtures and environments in one isolated tree, rejects conflicting fixture/environment values, executes the construction's exact invocation, and checks its exact outcome. They do not prove semantic consistency of arbitrary natural language.
+
+Restatements preserve original text, current text, reason, finding/task, and date.
+
+## Source and deployed identity
+
+A gate with an external installed counterpart declares it explicitly. When the installed queue guard is reachable, its bytes must equal repository source and an internal drift control is observed red. In CI the operator-home installation may be outside the container; the verifier checks the pinned observed source digest, reports `DEPLOYED IDENTITY UNAVAILABLE (owner: RM-04)`, and does not infer live equality.
+
+## Current-tree and history-provenance boundary
+
+**DOES:** Every PR evaluates the current checkout's registered gates and declared inerting mutations directly, unprivileged and fail-closed. The seven-gate population, verifier inventory, and `gates/required-gates.baseline.json` are compared inside the checkout. Evidence-side subjects are consumed and compared with gate definitions for every gate. **Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.**
+
+**DOES NOT:** This repository layer establishes history provenance at all. `pnpm install` executes PR-controlled lifecycle code before `gate:verify`, so no local ref, git config, remote URL, constant, or author-positioned path in the checkout can anchor a history claim. An observation saying “unverifiable” while returning zero would be a green wearing a disclaimer, so the claim and history verifier path are removed.
+
+The production output path uses a closed current-tree observation renderer; history, ancestry, and provider-lineage success are not representable observation classes. `scripts/gate-history-exclusion-control.mjs` exercises alternate success wording and production renderer wiring. Its registered must-fail case turns red if a prohibited success class is added or renderer consumption is bypassed. RM-60 owns the provider-controlled/protected pre-execution boundary needed before history provenance can be asserted. No bootstrap override exists in RM-02.
+
+Universal checks first prove populations non-empty. The production profile reads the same-checkout baseline before comparing the verifier inventory and manifest separately, while `gateRefs` on the D-38/D-40 criteria must exactly span every registered gate. Population controls mutate evidence-side subjects and type-strict comparison inputs one gate at a time and require rejection across the complete inventory. A registered prose-claim control fails when the same-checkout mechanism is described as an adversarial protection.

docs/PRD.md

@@ -14,6 +14,63 @@
 
 ---
 
+## RM-02 Gate Registry and Negative-Control Verifier (#1029)
+
+### Problem and objective
+
+Existing deterministic gates can return success without enforcing their stated property. RM-02 introduces a machine-readable registry and an unconditional CI verifier that distinguishes required behavior from observed behavior, proves every registered negative control can detect its own failure reason, and makes source/deployment drift visible.
+
+### Scope
+
+**In scope:** root typecheck, lint, and format gates; RM-01 checkout preflight; the Mosaic CI queue guard; root Husky pre-commit and pre-push hooks; criterion bindings; modeled compatibility; meaning-change provenance; security/integrity prose claim markers; source-versus-deployed identity; unprivileged current-tree PR verification; independent required-inventory comparison; evidence-side subject consumption; and enforced structural exclusion of history provenance until RM-60 provides protected external authority.
+
+**Out of scope:** fixing the queue guard (RM-03); exhaustive registration of every repository executable (RM-54); semantic proof that arbitrary English criteria are mutually satisfiable (RM-54/RM-55); history provenance before RM-60's provider-controlled/protected execution boundary; and a same-authority trust anchor for repository-authored evidence (RM-25/RM-59).
+
+### Normative requirements
+
+1. `RM02-REQ-01`: The JSON registry SHALL give every gate and criterion a stable ID and SHALL declare exact invocation, input classes, cases, exact observed and required exit codes, reason diagnostics, and criterion bindings.
+2. `RM02-REQ-02`: Every gate SHALL have at least one observed-red must-fail case. The verifier SHALL reject missing, stale, ambiguous, or ineffective declared inert mutations and SHALL name an externally inerted gate.
+3. `RM02-REQ-03`: Every acceptance criterion SHALL declare exact criterion-side `caseRefs` that match case-side `criterionIds` bidirectionally and include a case that can fail for that criterion's stated reason. Moving a binding to an unrelated case SHALL fail verification. Security/integrity prose claims in the designated governing documents SHALL carry bound `GATE-CLAIM:<id>` markers and declare the exact must-fail case exercising the claim criterion.
+4. `RM02-REQ-04`: Declared finite compatibility scenarios SHALL execute together and direct modeled contradictions SHALL fail. This does not claim semantic consistency of arbitrary English.
+5. `RM02-REQ-05`: Restated criteria SHALL retain original text, current text, reason, finding/task, and dated meaning-change history.
+6. `RM02-REQ-06`: An observed behavior differing from required behavior SHALL be reported as `DEFECT` with a tracked owner; an ownerless delta SHALL fail verification. Such a gate SHALL never be described as passing, green, or OK.
+7. `RM02-REQ-07`: Executables under declared gate roots SHALL fail with `unregistered gate` when absent from the registry. The initial coverage boundary SHALL explicitly list exclusions and bind the broader inventory to RM-54.
+8. `RM02-REQ-08`: Every gate with a deployed counterpart SHALL register source/deployed byte identity and a must-fail drift control. Gates without a deployed counterpart SHALL say so explicitly.
+9. `RM02-REQ-09`: CI SHALL run `pnpm gate:verify` on every pull request without path filtering and on protected-main pushes.
+10. `RM02-REQ-10` (restated): PR CI SHALL perform unprivileged, fail-closed current-tree verification only. The production observation renderer SHALL be a closed current-tree-only output type with no representable history-provenance success state. A registered must-fail control SHALL turn red if history/ancestry/lineage success is added to that renderer or if production output bypasses the renderer. RM-60 owns the provider-controlled/protected pre-execution boundary required to establish history provenance.
+11. `RM02-REQ-11` (`D-46`): The required seven-gate inventory SHALL be read from a same-checkout baseline and compared separately with both the verifier inventory and manifest. Shrinking the verifier inventory and manifest together while leaving the baseline intact SHALL fail for the removed gate. **Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.**
+12. `RM02-REQ-12` (`D-38`): Every consumed case result SHALL carry an evidence-side subject independently declared from the gate definition. The verifier SHALL compare that evidence subject with the gate definition when consuming the result. A population control SHALL mutate the evidence-side subject independently for every required gate and observe rejection for every gate.
+13. `RM02-REQ-13` (`D-40`): For every gate listed in the required inventory baseline, each discriminator and comparison input SHALL have a recursively closed, type-strict schema. Unknown, misspelled, wrong-type, or present-but-empty nested assertion fields SHALL fail rather than disabling an assertion.
+14. `RM02-REQ-14` (`D-46`): No universally quantified registry check SHALL run until its population is proven non-empty and compared with the same-checkout baseline. The required seven-gate inventory, criteria, prose claims, and compatibility scenarios SHALL reject empty populations before reporting that all registered cases ran.
+
+#### RM02-REQ-10 meaning-change provenance
+
+- **Original:** “assert that every merged commit passed every required gate, evaluated AGAINST THAT COMMIT'S OWN TREE — not against current main.”
+- **Restatement:** The repository verifier performs current-tree verification and is structurally incapable of asserting history provenance. RM-60 supplies the provider-controlled/protected pre-execution boundary before any repository-controlled lifecycle code executes.
+- **Reason:** `pnpm install` executes PR-controlled lifecycle code before `gate:verify`; therefore no local ref, git config, remote URL, constant, or author-positioned path in the checkout is a trustworthy history anchor. A local disclaimer would be a green wearing a note, not a property. The history-provenance claim is removed rather than weakened.
+
+### Acceptance criteria
+
+1. `RM02-AC-01`: A healthy current tree returns zero while prominently reporting the queue guard's required-versus-actual `DEFECT (owner: RM-03)` delta.
+2. `RM02-AC-02`: Externally mutate any registered gate at its declared inerting point so its failure path succeeds; verification returns nonzero and names that gate. The verifier's internal meta-control is observed red before its healthy result is trusted.
+3. `RM02-AC-03`: An executable added under a declared gate root without an entry returns nonzero and includes `unregistered gate`.
+4. `RM02-AC-04`: A gate with zero must-fail cases returns nonzero and includes `no negative control`.
+5. `RM02-AC-05`: Unbound or semantically misbound criteria, prose claims bound to unrelated cases, unbound governing prose markers, ownerless behavior deltas, stale mutations, source/deployed drift, and modeled compatibility conflicts each return nonzero with the responsible stable ID. A simultaneous stale fixture or independent phase error SHALL NOT mask responsible stable-ID diagnostics. Registered meta-negative controls move a criterion binding, remove meaning provenance, and redirect a prose claim to an unrelated case; each is observed red for its stated reason.
+6. `RM02-AC-06`: CI configuration invokes the verifier unconditionally on every pull request.
+7. `RM02-AC-07`: PR output states adjacent `DOES`/`DOES NOT` boundaries: the repository layer verifies current-tree registered cases, same-checkout inventory drift, and evidence-side subject consumption; it does not establish history provenance at all. **Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.**
+8. `RM02-AC-08`: Registered must-fail controls reject an emptied registry; shrinking the verifier inventory and manifest together; overstating the same-checkout inventory boundary; adding history/ancestry/lineage success to the closed observation renderer or bypassing renderer consumption; a misspelled nested outcome field; a wrong outcome field type; and a present-but-empty outcome pattern.
+9. `RM02-AC-09`: Population controls iterate every gate listed in the baseline and prove consumed evidence-subject mismatch and wrong-type comparison input are rejected for each gate. `RM02-EVIDENCE-SUBJECT-BINDING`, `RM02-TYPE-STRICT-SCHEMA`, `RM02-HISTORY-PROVENANCE-EXCLUDED`, and `RM02-NONEMPTY-ANCHORED-QUANTIFICATION` are bidirectionally bound to their must-fail controls.
+
+### Risks, dependencies, and verification boundary
+
+- **DOES:** The repository verifier proves declared current-tree controls, modeled scenarios, bidirectional criterion/case relationships, source/deployed equality at execution time, a same-checkout seven-gate baseline comparison, and evidence-side subject consumption.
+- **DOES NOT:** This layer establishes no history provenance. PR-controlled lifecycle code executes before the gate, so no local git state in the checkout is trustworthy as a history anchor. RM-60 owns the provider-controlled/protected pre-execution boundary. The production verifier has no history verifier path, and its closed current-tree observation renderer cannot represent a history-provenance success state.
+- **Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.** A registered claim control fails if the checked artifacts overstate this boundary.
+- The verifier does **not** infer arbitrary-English semantics or defend against an actor able to rewrite the gate, registry, verifier, controls, and baseline consistently.
+- `ASSUMPTION:` RM-54 is the owner for expanding registration and prose-marker coverage beyond this approved seven-gate slice; rationale: the remediation task graph already assigns the fleet-wide inert-gate audit there.
+
+---
+
 ## Problem Statement
 
 Jarvis (v0.2.0) is a self-hosted AI assistant with a Python FastAPI backend and Next.js frontend. It handles chat, projects, tasks, and LLM routing but lacks orchestration depth, agent coordination, shared memory, and remote access. The Mosaic framework (`~/.config/mosaic`) provides agent guides, shell-based orchestration tools, and quality rails — but these are loose scripts, not an integrated platform. The `@mosaicstack/*` packages in mosaic-mono-v0 began consolidating these into TypeScript packages (brain, queue, coord, cli, prdy, quality-rails) but have no UI, no auth, and no agent runtime integration.

docs/SITEMAP.md

@@ -1,5 +1,11 @@
 # Documentation Sitemap
 
+## Gate verification
+
+- [Developer gate registry guide](DEVELOPER-GUIDE/quality-gate-registry.md) — manifest schema, negative controls, evidence-side subjects, and the enforced RM-60 history-provenance exclusion. Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.
+- [Gate registry operations](ADMIN-GUIDE/quality-gate-registry.md) — routine verification, failure interpretation, registry updates, and unconditional CI behavior.
+- [RM-02 governing claim index](remediation/GATE-CLAIMS.md) — marker bindings for orchestrator-owned remediation claims without modifying task tracking.
+
 ## Compaction refresh lease broker
 
 - [Internal broker protocol](architecture/lease-broker-protocol.md) — kernel identity, ancestry and generation invariants, framed requests, responses, and persisted cycle bindings.

docs/plans/2026-08-01-rm-02-gate-registry.md

@@ -0,0 +1,95 @@
+# RM-02 Gate Registry Implementation Plan
+
+> **For Pi:** Use test-driven development and execute each task RED → GREEN → refactor.
+
+**Goal:** Build a machine-readable seven-gate registry and an unconditional CI verifier that detects inert gates, binds criteria to observed negative controls, records defects honestly, and verifies the current PR tree unprivileged and fail-closed.
+
+**Architecture:** A dependency-free Node CLI reads `gates/gates.manifest.json` and the same-checkout `gates/required-gates.baseline.json`, validates closed schemas and references, then runs typed cases in isolated main-disk fixtures. Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary. Gate-specific fixture setup remains declarative; exact invocations, evidence-side subjects, and exact observed/required exits stay in JSON. The production verifier is structurally incapable of asserting history provenance; RM-60 owns the provider-controlled/protected pre-execution boundary.
+
+**Tech Stack:** Node.js ESM, `node:test`, JSON, shell gates, pnpm, Woodpecker CI.
+
+---
+
+### Task 1: Meta-negative-control kernel
+
+**Files:**
+
+- Create: `scripts/gate-verify.test.mjs`
+- Create: `scripts/gate-verify.mjs`
+
+1. Write a black-box fixture whose gate failure branch has already been changed to success.
+2. Run `node --test scripts/gate-verify.test.mjs`; require failure because the absent verifier does not name the inert gate.
+3. Implement manifest loading, exact process execution, and named mismatch reporting only.
+4. Re-run and require the external inert mutation to produce verifier nonzero while the test passes.
+5. Add an internally applied declared mutation and require a healthy fixture to report its negative control armed.
+
+### Task 2: Registry structural clauses
+
+**Files:**
+
+- Modify: `scripts/gate-verify.test.mjs`
+- Modify: `scripts/gate-verify.mjs`
+
+Add failing tests, one behavior at a time, for: `unregistered gate`; `no negative control`; unbound criterion; unbound `GATE-CLAIM`; ownerless required/actual delta; stale/ambiguous/ineffective mutation; direct modeled conflict; missing meaning-change provenance. Implement the minimum validator after each observed RED.
+
+### Task 3: Gate fixtures and seven-gate manifest
+
+**Files:**
+
+- Create: `gates/gates.manifest.json`
+- Create: `gates/fixtures/quality-case.mjs`
+- Create: `gates/fixtures/preflight-case.mjs`
+- Create: `gates/fixtures/queue-case.sh`
+- Create: `gates/fixtures/hook-case.sh`
+- Modify: `scripts/gate-verify.test.mjs`
+
+Register typecheck, lint, format, RM-01 preflight, queue guard, pre-commit, and pre-push. For each, first run its known-bad case against an intentionally inert fixture and observe verifier RED; then restore the real gate behavior and require its exact observed exit/reason. Record queue defects as required/actual deltas owned by RM-03, never as pass/green/OK.
+
+### Task 4: Source-versus-deployed identity
+
+**Files:**
+
+- Modify: `gates/gates.manifest.json`
+- Modify: `scripts/gate-verify.test.mjs`
+- Modify: `scripts/gate-verify.mjs`
+
+Write and observe a failing test with a byte-mutated deployed counterpart. Implement byte equality and internal drift mutation controls. Declare `none` explicitly for gates without deployed counterparts.
+
+### Task 5: Prose claims and compatibility constructions
+
+**Files:**
+
+- Modify: `docs/remediation/MISSION.md`
+- Modify: `docs/remediation/TASKS.md` only if coordinator authorization overrides the worker prohibition; otherwise place markers in an RM-02 claim index that references immutable source anchors.
+- Modify: `gates/gates.manifest.json`
+- Modify: verifier tests/implementation.
+
+Enumerate current security/integrity claims, bind each marker/id to a negative case, and reject unbound markers. Execute finite compatibility scenarios and clearly document that arbitrary English consistency is outside the model.
+
+### Task 6: Current-tree boundary and enforced history-provenance exclusion
+
+**Files:**
+
+- Create: `gates/required-gates.baseline.json`
+- Create: `scripts/gate-history-exclusion-control.mjs`
+- Create: `scripts/gate-inventory-shrink-control.mjs`
+- Modify: `scripts/gate-verify.mjs`
+- Modify: `gates/gates.manifest.json`
+
+Verify current-tree behavior only. Remove the anchor-dependent history verifier and provider-history consumption because PR-controlled lifecycle code executes before the gate and makes every local git anchor untrustworthy. Use a closed current-tree observation renderer and register a must-fail control that turns red if history/ancestry/lineage success becomes representable or production output bypasses renderer consumption. Compare the verifier inventory and manifest separately against the same-checkout baseline, register must-fail attacks that shrink either paired representation, and register an overclaim control. Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary. State both directions: current-tree controls, inventory shape, and evidence subjects are enforced here; history provenance is not established until RM-60 provides a provider-controlled/protected pre-execution boundary.
+
+### Task 7: CI and documentation
+
+**Files:**
+
+- Modify: `package.json`
+- Modify: `.woodpecker/ci.yml`
+- Create/update: `docs/DEVELOPER-GUIDE/quality-gate-registry.md`
+- Create/update: `docs/ADMIN-GUIDE/quality-gate-registry.md`
+- Modify: `docs/SITEMAP.md`
+
+Add `gate:verify`; run it in an unconditional PR/main CI step. Document invocation, defect semantics, coverage/exclusions, marker syntax, replay/provider boundaries, and source/deployed identity.
+
+### Task 8: Verification and delivery
+
+Run focused tests, `pnpm gate:verify`, checkout tests, typecheck, lint, format, and applicable integration tests. Run Codex code and security review; remediate and re-review. Verify authorship, commit, execute queue guard before push, push, create PR via Mosaic wrapper, and send exact-head review request to rev-974 through the coordinator. Do not merge without coordinator authorization.

docs/remediation/GATE-CLAIMS.md

@@ -0,0 +1,40 @@
+# RM-02 Governing Claim Index
+
+This index binds remediation claims that live in orchestrator-owned `TASKS.md` without modifying that file. The source heading and quoted text are the reviewable anchor; `gate:verify` enforces each marker-to-criterion binding. Marker completeness beyond this approved slice remains RM-54.
+
+## Prose is an enforceable claim
+
+<!-- GATE-CLAIM:PROSE-IS-A-CLAIM -->
+
+- Source: `docs/remediation/TASKS.md`, heading `D-20 — the orchestrator's own documentation overclaimed, and a reviewer disproved it empirically`.
+- Anchored text: “The defect was not in the code — it was in this file.”
+
+## Generated-state verification scope
+
+<!-- GATE-CLAIM:GENERATED-STATE-SCOPE -->
+
+- Source: `docs/remediation/TASKS.md`, heading `D-19 — an integrity property that cannot exist at the layer it was specified`.
+- Anchored text: “a verifier that cannot detect the attack is not a verifier.”
+
+## Execution trust boundary
+
+<!-- GATE-CLAIM:EXECUTION-TRUST-BOUNDARY -->
+
+- Source: RM-02 ruling recorded under `docs/remediation/TASKS.md`, RM-02 clause 4, D-25.
+- Anchored text: “SELF-VERIFICATION BY THE AUDITED PARTY IS NOT VERIFICATION.”
+- Dependency: RM-60/#1031, cross-referenced with RM-59.
+
+## Same-checkout inventory drift boundary
+
+<!-- GATE-CLAIM:INVENTORY-DRIFT-BOUNDARY -->
+
+- Source: RM-02 ruling after D-48/CWE-353 reproduced against the round-4 baseline.
+- Boundary: Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.
+- Negative control: `checkout-preflight/inventory-claim-overstatement` rewrites the boundary as protection and must go red.
+
+## Criterion restatement provenance
+
+<!-- GATE-CLAIM:CRITERION-RESTATEMENT -->
+
+- Source: `docs/remediation/TASKS.md`, heading `D-18 — two pre-registered criteria were mutually unsatisfiable, discoverable only at implementation`.
+- Anchored text: “Both criteria were pre-registered. They cannot both be satisfied.”

docs/remediation/MISSION.md

@@ -12,6 +12,8 @@ gate/program; the LLM handles only genuine judgment.
 
 ### First-class principle — observe the property, not the exit code
 
+<!-- GATE-CLAIM:OBSERVE-PROPERTY -->
+
 > **No write is done until the requested PROPERTY is observed. A success exit code is not evidence.**
 >
 > **Success output is designed to be believed.** That is the whole reason the inert-gate class exists
@@ -30,6 +32,8 @@ gate/program; the LLM handles only genuine judgment.
 
 ### First-class principle — pre-registration prevents retrofitting, and nothing else
 
+<!-- GATE-CLAIM:PREREGISTRATION-BOUNDARY -->
+
 > **A pre-registered check set can fail in three distinct ways:**
 >
 > | mode                        | the set is…                                       | found as |
@@ -56,6 +60,8 @@ gate/program; the LLM handles only genuine judgment.
 
 ### Corollary — never ship an integrity claim dressed as a property
 
+<!-- GATE-CLAIM:ARTIFACT-INTEGRITY-BOUNDARY -->
+
 > A verification artifact that can be forged by whoever it is meant to catch verifies nothing. If a
 > manifest, marker, ledger, or receipt is writable by the same actor whose behaviour it certifies, it
 > **certifies the attack.** Such an artifact must sit inside the integrity envelope it belongs to,
@@ -68,6 +74,8 @@ gate/program; the LLM handles only genuine judgment.
 
 ### First-class principle — when a property cannot exist at the layer it was specified
 
+<!-- GATE-CLAIM:IMPOSSIBLE-LAYER-BOUNDARY -->
+
 > Some required properties are **impossible at the layer that asked for them** — not hard, impossible.
 > A local check cannot defend against an actor who can rewrite the check itself. When that happens,
 > there are exactly three honest moves, and all three are mandatory:

docs/scratchpads/1019-zero-timeout-harness.md

@@ -1,71 +0,0 @@
-# #1019 — Zero-timeout queue-guard harness race
-
-- **Issue:** #1019 (parent status remains `believed-fixed, pending jarvis validation`; do not close)
-- **Branch:** `fix/1019-ci-queue-timeout-harness`
-- **Owner:** `be-coder-08`
-- **Base:** `origin/main` at `5916aeefd6ed12bcac086c6834c7f6c4ae38e1bc`
-- **Charter:** `/home/hermes/agent-work/tl-mosaic/CHARTER-1019-HARNESS-FIX.md`
-
-## Objective
-
-Make `test-ci-queue-wait-tristate.sh` deterministic without changing any asserted outcome. Remove the indiscriminate zero-timeout race, require every status-classification case to prove the provider was observed, and prove the harness-controlled virtual clock is active.
-
-## Scope
-
-- In scope: `packages/mosaic/framework/tools/git/test-ci-queue-wait-tristate.sh` only, plus this evidence scratchpad.
-- Out of scope: guard parsers, D2/D3 behavior, installer/reseed staleness, PR #1060, and issue closure.
-
-## Acceptance criteria
-
-1. RED deterministically reproduces deadline pre-emption before the provider call.
-2. Every case that intends status classification positively proves provider observation.
-3. Pending observes `pending` before deterministic virtual-time expiration.
-4. The virtual clock has a positive interception control; a broken-clock mutant makes the suite red.
-5. The exact CI-base image passes the final harness repeatedly with zero failures.
-6. Baseline gates, independent code/security review, exact-head CI, and coordinator-authorized squash merge pass.
-
-## Plan
-
-1. Add deterministic RED instrumentation for the known merge/provider-unreachable pre-emption.
-2. Replace global `-t 0` with a nonzero timeout interpreted under an event-driven virtual clock; stub sleep without wall waiting.
-3. Add provider-observation and virtual-clock positive controls without changing outcome assertions.
-4. Run focused shell checks, repeat in exact CI-base image, baseline gates, and independent reviews.
-5. Commit with both identity layers, queue-guard plus direct Woodpecker terminal-state verification, push, self-post PR, verify poster/head/CI, obtain coordinator merge authorization, then squash merge without closing #1019.
-
-## Budget
-
-- No explicit token cap supplied. Keep scope to one harness file and one scratchpad; stop/report at the charter's 60% context gate.
-
-## Evidence
-
-- RED, deterministic pre-provider expiry: `evidence/1019-harness-fix/red-pre-provider-expiry.log` — rc 1; merge/provider-unreachable got rc 124 instead of 75, omitted CANNOT_ASSERT, did not observe the status provider, and wrote no additional audit record (four named failures).
-- GREEN host focused harness: `evidence/1019-harness-fix/green-host.log` — rc 0, all outcome classes passed.
-- Load-bearing clock negative control: a temporary same-directory mutant replaced the virtual `date` body with `/bin/date`; `evidence/1019-harness-fix/red-clock-not-intercepted.log` — rc 1 with named `virtual clock interception did not run` failures. The mutant file was removed after the run.
-- Exact CI-base repeat: `git.mosaicstack.dev/mosaicstack/stack/ci-base:latest`, repository mounted read-only, harness work under container `/tmp`; `evidence/1019-harness-fix/ci-image-repeat/summary.log` — **100 pass / 0 fail / 100 total**.
-- Synchronization design: provider-status observation creates the event marker; virtual time is 1000 before the event and 1002 afterward. Pending alone reaches the stubbed no-op sleep and a post-observation deadline check. `-t 1` is uniquely load-bearing because removing it restores the 900-second default deadline at virtual time 1900, which 1002 does not cross. The numeric timeout is subject semantics under virtual time, not a wall-clock synchronization duration.
-
-## Review remediation — semantic timeout vs. liveness bound
-
-Security review found that virtual time remained at 1000 forever before provider observation and stubbed sleep never waited. A regression looping before the status endpoint—or blocking in the first provider call—therefore could prevent `run_guard` from returning, so the post-return provider assertion could never fire.
-
-**General rule:** A timeout usually serves two purposes: semantics and liveness. Removing wall time from semantic synchronization can silently remove the only independent hang bound. Preserve deterministic virtual time for subject semantics, but provide a separately implemented real-clock liveness watchdog and prove that watchdog fires.
-
-Remediation:
-
-- Every guard subject invocation is launched by absolute `/usr/bin/python3` in a new session. Python's internal monotonic `wait(timeout=...)` provides real-clock liveness independently of PATH; expiry kills the entire isolated process group, so neither PATH-front shims nor a blocked provider descendant can retain the capture pipe.
-- Watchdog expiry returns distinct harness rc 90 plus `FAIL HANG watchdog`, separate from subject timeout rc 124.
-- A first attempt using absolute `/usr/bin/timeout -s KILL` passed on GNU coreutils but failed in the exact Alpine CI-base image: BusyBox killed the immediate wrapper while the guard/provider descendants survived and retained the command-substitution pipe. The process-group kill is therefore required behavior, not portability polish.
-- A committed positive control hangs the branch-provider stub before the status endpoint. It must terminate through the watchdog, emit the hang-specific diagnostic, return rc 90, and prove the status provider was never reached.
-- RED before remediation: a temporary ordinary-success mutant hung before provider observation; only an external control could kill the suite (rc 137), and there was no internal hang-specific diagnostic (`red-watchdog-absent.log`).
-- The watchdog mutant/control is load-bearing: removing the internal watchdog leaves the control unable to produce its required rc 90 and diagnostic.
-
-Post-review evidence:
-
-- Host focused harness with process-group watchdog: rc 0 (`green-watchdog-process-group-host.log`).
-- Exact Alpine CI-base focused harness with process-group watchdog: rc 0 (`green-watchdog-ci-image.log`).
-- Hanging ordinary-success mutant: suite rc 1; success returned rc 90, emitted `FAIL HANG watchdog`, and loudly reported that provider/clock observation did not occur (`red-watchdog-fires.log`).
-- Removed-`-t 1` mutant: suite rc 1; pending was terminated by the watchdog instead of producing `ASSERTED_NOT_READY`, proving the explicit timeout is load-bearing (`red-timeout-argument-removed.log`).
-
-## 60% context hold
-
-Stopped before baseline/review/commit as required by the charter. Remaining: inspect final diff, shell/static/baseline gates, independent code/security review, remediation if any, identity-bound commit/trailer verification, mandatory queue guard plus direct terminal Woodpecker `mosaic` enumeration, push, self-posted PR/provider poster read-back, exact-head terminal-green CI, coordinator merge authorization, squash merge, main CI verification, and leave #1019 unclosed as `believed-fixed, pending jarvis validation`.

docs/scratchpads/1029-rm-02-gate-registry.md

@@ -0,0 +1,107 @@
+# RM-02 Gate Registry Scratchpad (#1029)
+
+## Objective
+
+Deliver the seven-gate registry and RED-first anti-inert verifier on `feat/rm-02-gate-registry`, preserving required-versus-actual defects without laundering them as success.
+
+## Constraints and boundaries
+
+- Do not modify `ci-queue-wait.sh`; RM-03 owns that fix.
+- Do not modify `docs/remediation/TASKS.md`; workers cannot edit orchestrator tracking.
+- Every declared behavior must be observed, not inferred from an exit code.
+- Repository-local evidence does not establish same-authority tamper resistance; RM-25/RM-59 own the external trust anchor.
+- Coverage is seven logical gates; broader inventory is RM-54.
+- Budget assumption: no explicit token ceiling was supplied. Keep implementation dependency-free (stock Node), avoid repeated full monorepo installs, and keep generated test artifacts under the worktree/main disk.
+
+## Plan
+
+1. Update PRD and tracking references.
+2. Write black-box meta-negative-control first and observe it fail for the missing verifier behavior.
+3. Implement minimal manifest parser/case runner/mutation detector; observe meta-control succeed.
+4. Add schema, coverage, provenance, prose marker, compatibility, discovery, deployment identity, and defect-delta tests RED-first.
+5. Register seven gates with exact cases and run each case.
+6. Add prospective per-commit replay and bounded provider-evidence reporting.
+7. Wire unconditional Woodpecker CI and update developer/admin documentation.
+8. Run situational and baseline verification, independent Codex review, remediate, commit, queue guard, push, PR, coordinator/reviewer handoff.
+
+## Progress
+
+- 2026-08-01: Design approved by `mos-remediation`; rulings A-E and source/deployed identity addition incorporated.
+- 2026-08-01: Isolated worktree created from `origin/main` f65e9ea6; RM-01 f58b3699 verified as ancestor.
+- 2026-08-01: Git author set to `f10-coder <[email protected]>`; provider issue #1029 created with `MOSAIC_GIT_IDENTITY=f10-coder`.
+- 2026-08-01: Source/deployed queue-guard SHA-256 observed equal (`19cda2f...`); this observation is not yet an enforced property.
+
+## Tests and RED-first evidence
+
+- Meta-negative RED first: `node --test scripts/gate-verify.test.mjs` failed because the absent verifier did not name externally inerted `meta-fixture`.
+- Structural RED: nine tests failed before implementation for internal mutation, unregistered executable, missing negative control, ownerless delta, unbound criterion/claim, modeled conflict, missing provenance, and deployment drift.
+- Clause hardening RED: positive-only security criterion and missing registered claim marker both passed incorrectly before validation was added.
+- CI wiring RED: package script and unconditional Woodpecker step tests both failed before wiring.
+- History RED: history test failed with missing module before own-tree manifest selection/provider classification was implemented.
+- `pnpm gate:verify`: exit 0; seven gates each reported `META-NEGATIVE-CONTROL ... observed red`; queue source/deployed drift control observed red; six queue behavior deltas printed as `DEFECT (owner: RM-03)`.
+- Focused Node tests: 54/54 pass after third-round hardening (36 verifier/wiring plus 18 history/provider tests).
+- `pnpm typecheck`: pass (45/45 Turbo tasks).
+- `pnpm lint`: pass (25/25 Turbo tasks).
+- `pnpm format:check`: pass.
+- `pnpm test`: repository suites reached 45/46 Turbo tasks; all application/package tests shown passed, then the known host-specific wake assertion aborted exit 97 (`BASH_LINENO convention violated`, #973/D-16). No test was edited or bypassed. CI remains the authoritative full-suite environment.
+
+## Self-surfaced defect
+
+The queue guard's `get_state_from_status_json` runs `python3 - <<'PY'` while provider JSON is piped to the shell function. The heredoc owns stdin, so Python never reads provider JSON. Terminal success, no-status, terminal failure, and malformed payloads all classify as `unknown`; the associated fail-open outcomes are recorded under RM-03. No queue-guard source was modified.
+
+## Independent review remediation
+
+- Final pre-commit Codex code review found three blockers: a tautological deployment drift control, independently observed rather than combined compatibility cases, and unauthorized edits to orchestrator-owned `TASKS.md`.
+- Deployment identity now uses one shared file comparator for both live equality and a temporary drifted deployed copy; a test makes that comparator inert and proves the meta-control fails.
+- Compatibility scenarios now merge referenced fixtures/environments into one isolated construction and execute an exact scenario invocation; a test proves two independently valid fixtures coexist in the combined run.
+- `TASKS.md` changes were reverted. `docs/remediation/GATE-CLAIMS.md` binds source headings and anchored text without editing orchestrator tracking.
+- Codex security review found the Bubblewrap replay shared the runner PID namespace. Replay now unshares PID, IPC, and UTS namespaces, and an abuse-case test proves a sibling runner PID is invisible.
+- Second review found empty reason diagnostics, final-symlink fixture writes, and lifecycle-script mutation of authoritative history files. Must-fail cases now require a reason pattern; writes use no-follow semantics; and replay snapshots every archived file before install and rejects any changed, deleted, or type/mode-shifted source before executing the verifier. Dedicated negative tests cover all three.
+- Third code review found ambiguous duplicate provider steps and order-sensitive JSON outcome comparison. Provider evidence now requires exactly one `gate-verify` step in the authoritative rerun, and structural equality normalizes object keys. Both regressions have RED-first tests. Third security review reported no findings.
+- Initial PR pipeline #2177 exposed Woodpecker's shallow boundary: the activation parent object was present but marked shallow, so `merge-base --is-ancestor` correctly refused to infer ancestry. The unconditional gate step now unshallows before ancestry/provenance checks; its wiring test was observed RED before the CI fix.
+- Pipeline #2178 then proved the unprivileged Docker runner cannot establish Bubblewrap namespaces. A privileged experiment remained uncommitted and was rejected after Codex correctly rated it CRITICAL: PR-controlled code executes before an in-repository sandbox and could directly use the granted capability.
+- `mos-remediation` and `rev-974` independently ruled Option C. RM02-REQ-10 now retains its original text, restatement, and reason: PR CI verifies only the current tree, unprivileged and fail-closed; isolated own-tree replay is deferred to RM-60/#1031's external pre-execution authority, cross-referenced with RM-59. Future protected post-merge replay is detection with quarantine/revert, never pre-merge prevention.
+- RED-first boundary test proved the old path executed an inert intermediate verifier. The revised path states adjacent `DOES`/`DOES NOT` claims, validates historical manifest provenance without executing it, and infers no replay success. Direct sandbox tests remain hard-fail; unprivileged CI asserts terminal refusal instead of treating replay as success. Pipelines #2179/#2180/#2181 exposed two runner refusal forms: namespace denial as `spawnSync bwrap` with `error.code=EPERM`, and a test image without Bubblewrap as `error.code=ENOENT`. The replay diagnostic now preserves spawn errors. Parent-generated launcher/entry metadata distinguishes refusal before sandbox entry from child-controlled output; the detector recognizes exact `spawnSync bwrap` provenance for `EPERM`/`EACCES`/`ENOENT` and known namespace-refusal text only when the entry command provably did not run. Focused negative assertions reject unrelated `spawnSync git EPERM`, verifier output that merely says `bwrap ENOENT`, and exact namespace-denial impersonation without provenance or after sandbox entry.
+- Exact-head independent review at `38f1b249` found one valid diagnostic-masking blocker: canonical verification knew four stable-ID rebinding failures but a thrown stale fixture replacement reached the outer catch first and emitted only the generic error. RED-first reproduction confirmed the canonical path omitted both responsible criterion IDs. Verification now collects labeled failures independently across claims, discovery, deployment, case execution/outcome checks, mutation, and compatibility, preserving structural stable-ID failures alongside the stale-fixture signal. The canonical regression test requires both missing-binding IDs and the generic fixture error.
+- Exact-head independent review at `9b4d4beb` found two valid blockers. RED-first controls reproduced both: denial-looking child stderr was accepted as sandbox unavailability, and moving meaning/prose criterion IDs to an unrelated type-error case left `gate:verify` green. Bubblewrap execution now emits a parent-generated random entry marker and returns parent-owned launcher/entry metadata; unavailability requires Bubblewrap launcher provenance plus proof entry never ran, so exact denial impersonation from plain or entered-child results is rejected. Criterion objects now declare exact `caseRefs`, checked bidirectionally against case-side `criterionIds`; prose claims declare an exact must-fail `caseRef`. Registered must-fail cases move a criterion binding, remove meaning provenance, and redirect a prose claim, each producing its stable reason. The review freeze was deliberately lifted before remediation.
+- Option C security review reported no findings. Code review rejected an initial unrelated typecheck binding for the new security criterion. It was replaced with a dedicated registered `privileged-pr-gate` case: the fixture injects a privilege key into the gate step, the wiring control rejects it for that exact reason, and `gate:verify` observes the boundary negative control. Follow-up hardening uses a closed exact gate-step construction, rejects privilege across the entire pipeline, rejects non-canonical/merged YAML keys, and pins the unrestricted PR/main trigger block; quoted/escaped/alias/merge/duplicate/filter bypass tests pass. Final Codex code review approved with no findings.
+
+- Exact-head review at `83d2ecb2` found four silent-defeat paths. Genuine RED-first tests on the pre-fix code proved: author-controlled HEAD/parent/introduction seams produced no boundary failure; cross-commit duplicate pipeline number 7 returned terminal-success; and misspelling `outputPattern` as `outputPatern` in required/actual left canonical verification green. Fixes derive the seam from Git, validate provider identity globally before subject filtering, and recursively close/type-check nested schemas. New registry criteria `RM02-EVIDENCE-SUBJECT-BINDING`, `RM02-TYPE-STRICT-SCHEMA`, and `RM02-HISTORY-BOUNDARY` are bidirectionally bound to eight registered must-fail controls. The broad nested-object typo table and exact derived-boundary test are regression guards added after implementation, not claimed as RED-first. Pre-commit Codex review then found that global evidence failure was only observed—not failed—when HEAD was the sole prospective commit, and that non-object collection entries threw before normalization. Both were reproduced RED-first, then fixed by one collection validator used before iteration and by per-commit assessment. Follow-up review found collection validation still omitted exactly-one-gate-step cardinality for unrelated subjects; a focused test reproduced terminal-success RED-first, and collection validation now rejects that ambiguity globally. Security review then found present-but-empty outcome patterns were truthy-optional assertion bypasses; a reason-specific test reproduced that they lacked the required schema diagnostic, and present pattern fields now require non-whitespace content.
+
+- Exact-head review at `32b490a7` found three population-level blockers. Genuine RED-first tests proved a gate change before author-delayed registry introduction fell outside the range, and empty criteria/gates/prose/scenario populations returned zero. History now anchors at the provider target merge-base; delayed introduction is a registered must-fail control. Production verification requires non-empty populations and a hardcoded seven-gate ID/source inventory before quantified checks. D-38/D-40 criteria now quantify over `gateRefs` exactly spanning every registered gate; each gate declares its evidence subject, and population controls mutate evidence subject and comparison type for every gate. The history record states both bootstrap directions: sound against a branch author unable to rewrite main, not sound against compromised/rewritten main, with residual owned by Builds 1-2. Pre-commit review rejected an initial production CLI `--fixture-profile` test relaxation as a vacuity bypass. That flag was removed; synthetic fixtures now use a non-executable test-support runner, while regression tests prove the shipped CLI rejects the flag and production population checks remain mandatory. Follow-up review then proved deleting `gateRefs` skipped population validation; a RED-first loop reproduced all three deletions, and the three general criterion IDs now require the field before exact-span validation.
+
+## Documentation checklist
+
+- PRD, developer guide, admin guide, governing claim index, sitemap, plan, and scratchpad updated.
+- User/API documentation not applicable: no user workflow or API changed.
+- Independent review documentation check pending rev-974 at the revised exact head.
+- Canonical documentation remains in-repository; no external publication requested.
+
+## Rebase onto RM-61
+
+- Rebasing `f9746b23` onto main `f4fd5967` completed mechanically with no conflicts.
+- The first post-rebase `pnpm gate:verify` correctly failed because the old activation seam `f65e9ea6` made the newly merged pre-registry RM-61 commit part of prospective history even though that commit predates the registry. An initial manifest update to `f4fd5967` had the right value but retained an author-controlled mechanism. Independent mutation proved HEAD, HEAD's parent, and the introduction commit could each make history coverage vacuous or partial. The manifest field is now forbidden; the verifier derives the boundary as the parent of the first first-parent registry-introduction commit, and registered must-fail controls reject all three unsafe candidates.
+
+## Risks/blockers
+
+- Current queue guard intentionally has required-versus-actual deltas owned by RM-03.
+- Provider CI cannot report the currently executing pipeline as terminal success; current-commit evidence must be labeled pending and becomes historical current-tree evidence only after provider completion.
+- Isolated per-commit execution requires RM-60/#1031. Until that external authority exists, no replay success is claimed. A future protected post-merge failure requires quarantine/revert.
+- CI containers may not expose the operator-home deployed queue guard. In that layer the verifier checks the pinned observed digest and reports live identity unavailable under RM-04; it does not infer live equality.
+
+## coder-mos2 remediation — fourth round
+
+- Coordinator correction loaded: Blocker 2 requires a genuine shrink-both control against an independent inventory baseline; Blocker 3 requires evidence-side subjects consumed against gate definitions for every gate; anchor-dependent history provenance must be removed rather than relabelled because PR lifecycle code makes all local git state untrustworthy before verification.
+- Boundary to preserve in both directions: this repository layer DOES verify current-tree registered cases, independently anchored inventory shape, evidence subject consumption, and an enforced absence of history-provenance claims. It DOES NOT establish history provenance at all. RM-60 owns the provider-controlled/protected pre-execution boundary required for that property; no local ref, config, URL, constant, or author-positioned path is treated as an anchor.
+- TDD plan: add three genuine red-first controls before implementation: shrink verifier inventory plus manifest together; mutate evidence-side subject for every gate; and reject the currently enabled history verifier/import/report path. Existing controls retained as regression guards and labelled honestly.
+- Identity observation before first commit: `git var GIT_AUTHOR_IDENT` returned `coder-mos2 <[email protected]>` using process-scoped author/committer variables; shared repository config was not modified.
+- Genuine RED-first evidence: `node --test scripts/gate-remediation.test.mjs` produced 0/3 passing on frozen head `fbb61912`: source+manifest shrink exited zero, no evidence-side case subjects existed, and the production verifier still imported/invoked history verification. These were failures for the three stated blocker reasons, not regression guards.
+- Sixth mutation found before review: after the first baseline implementation, shrinking the new baseline and manifest together while leaving the verifier inventory unchanged still exited zero. A new test observed that attack RED first. Inventory equality diagnostics are now bidirectional, and the registered shrink control attacks both source+manifest and baseline+manifest pairs.
+- Regression guards retained and honestly labelled: manifest-only shrink, exact `gateRefs` span, production fixture-profile rejection, and broad nested schema checks already blocked before this round.
+- Current focused evidence before independent review: remediation controls 4/4; verifier/wiring/remediation suite 39/39; canonical `pnpm gate:verify` exits zero while reporting six RM-03-owned `DEFECT` deltas and all seven gate meta-negative controls observed red.
+- Independent Codex code review requested changes on two valid blockers. First, the evidence population control called the subject helper directly rather than traversing production result consumption. It now creates one lightweight executed fixture per required gate, invokes the real `verifyRegistry` path, and fails to observe rejection if the production consumer is removed; a regression mutation proves that coupling. Second, a lexical history blacklist overclaimed structural incapacity. Production output now passes through a closed current-tree observation renderer with no history/ancestry/lineage success class; the exclusion control tests three alternate success wordings plus exact production renderer wiring, and the registered must-fail fixture adds a prohibited class.
+- Codex review test attempts were unrunnable in its read-only sandbox (`EROFS`/`EPERM`); the reviewer disclosed this rather than substituting a passing variant. Local writable-worktree tests remain the runnable evidence.
+- Renderer remediation: every non-error production observation and final summary now routes through the closed current-tree output renderer. The exclusion control additionally requires one stdout sink, exactly two `GATE VERIFY FAILED` stderr sinks, no console sinks, and renderer use for both per-observation and final-summary paths. Regression attacks cover allowlisted history/ancestry/lineage wording, writer assertion removal, direct final-success stdout, and direct success stderr; focused suite 41/41, `pnpm gate:verify` green with six declared RM-03 deltas, and format check green.
+- Coordinator ruling after CWE-353: retain the same-checkout inventory comparison but narrow its claim. Canonical current boundary: “Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.” This supersedes the earlier “independent/anchored” wording in the historical entries above; those entries remain as append-only evidence, not current claims.
+- Genuine RED-first overclaim control: before claim remediation, `node scripts/gate-inventory-claim-control.mjs` exited 84 and named every artifact missing the narrowed boundary plus each current overclaim. The registered `inventory-claim-overstatement` case now rewrites the baseline purpose to a protection claim and must exit 84 with `INVENTORY_CLAIM_OVERSTATED`. Existing shrink-pair controls remain regression guards for the same-checkout drift property, not adversarial-integrity claims.
+- Follow-up code review found a genuine propagation/control gap: `docs/PRD.md` still said “independent seven-gate baseline,” and the first forbidden regex did not match the intervening qualifier. The reviewer observed the control green against that overclaim. The PRD now says same-checkout, the detector rejects `independent … baseline` across bounded same-line qualifiers, the registered mutation uses the exact qualified wording, and a focused behavioral test requires exit 84 for it. Follow-up security review passed with risk `none` and explicitly accepted the narrowed RM-60 boundary.

docs/scratchpads/pr-merge-message-field.md

@@ -1,99 +0,0 @@
-# PR merge squash message field
-
-- **Charter:** `/home/hermes/agent-work/CHARTER-PRMERGE-MESSAGE-FIELD.md`
-- **Owner:** `be-coder-08`
-- **Branch:** `fix/pr-merge-message-field`
-- **Base:** remote `main` / local `origin/main` at `85d2108e4ed15c744ad3b87a5b629e7b2d39405a`
-- **Estate:** HOMELAB tooling shared by HOMELAB and USC
-
-## Objective
-
-Add an optional, identity-checked Gitea squash message to `pr-merge.sh` so genuine multi-author PRs retain non-poster branch authors without weakening hardcoded squash behavior.
-
-## Binding requirements
-
-1. `Do` remains hardcoded to `squash`; no provider/repository default may select merge style.
-2. A verified trailer uses a PR commit's linked `author.login` and that same commit's author email. No `/users/{login}` primary-email lookup occurs. Recorded rationale: this asks only what the provider can answer.
-3. A commit with `author.login` null blocks before merge, prints both the null provider fact and commit email fact, and names the escalation principal.
-4. The BLOCK arm must be observed firing; a normal canonical single-author API payload remains explicit squash plus its reviewed `head_commit_id`.
-5. Every provider mutation is read back from the provider; no real PR is merged during tests.
-
-## Derived interface decisions
-
-- Add `--co-author-trailers` rather than accepting arbitrary message text. The wrapper enumerates PR commits and constructs trailers, making an unchecked `Co-authored-by` line unexpressible.
-- Require `--escalate-to PRINCIPAL` with `--co-author-trailers`, so the BLOCK diagnostic always names a principal rather than a generic role.
-- Do not expose `MergeTitleField` separately. When trailers exist, set it from the provider PR title and set `MergeMessageField` only to construction-generated trailers. This preserves one provider source for the title and avoids an unrelated caller-controlled degree of freedom.
-- Preserve first-commit order and emit one trailer per distinct non-poster `author.login`, using that first linked commit's own email.
-
-## Canonical delivery plan
-
-1. Port the capability into the installed source of truth, `packages/mosaic/framework/tools/git/pr-merge.sh`; do not retain `infra/fleet/tools/git` as a second copy.
-2. Preserve canonical `--expect-head`, exact head branch/repository/SHA queue inspection, Gitea atomic head pinning, GitHub `--match-head-commit`, and delete-after-merge semantics.
-3. Do not port the deployed-only `--skip-queue-guard` bypass. Add the focused harness to the canonical framework-shell suite and re-establish RED/GREEN on the packaged baseline.
-4. Deliver through a reviewed package release followed by `mosaic update` with its default framework reseed. The installer snapshots, manifest-syncs framework-owned `tools/**`, and rolls back on failure.
-5. Before either estate relies on the change, require installed/package hash equality, `MergeMessageField` presence, and a green focused harness. Release/reseed ownership is currently unassigned and blocks activation after source merge.
-
-## Evidence
-
-- RED against the byte-identical deployed baseline (`sha256 08a65e8584c5…`): rc 1 with eight named failures. The wrapper rejected `--co-author-trailers`; the null-login path emitted none of the required BLOCK facts/principal; and both verified/ordinary API paths failed the stdin-config credential assertion (ordinary path exposed the fixture token through curl argv). Log: `/home/hermes/agent-work/be-coder-08/evidence/prmerge-message-field-red.log`.
-- GREEN on the deployed-baseline candidate: verified linked multi-author payload, null-login BLOCK, required named principal, explicit squash, stdin-config token transport, and absence of `/users` lookup all passed. Log: `/home/hermes/agent-work/be-coder-08/evidence/prmerge-message-field-green.log`.
-- RED against canonical packaged baseline `c581ef48…`: rc 1 with 32 assertions. It rejects the new option, and the first harness version did not satisfy canonical head branch/repository/SHA metadata. Log: `/home/hermes/agent-work/be-coder-08/evidence/prmerge-packaged-baseline-red.log`. The port adapts the fixture rather than weakening canonical head controls.
-- Provider capability probe against `git.mosaicstack.dev`: authenticated `be-coder-08` POST to deliberately nonexistent PR `2147483647` with both message fields returned JSON HTTP 404; the unauthenticated same request returned JSON HTTP 401 (not the charter's predicted 403). The authenticated-vs-unauthenticated differential proves write authorization resolved while no mergeable subject existed. `tl-mosaic` ruled the literal non-load-bearing: preserve the observed 404/401 pair and do not manufacture a 403 case. No cause was inferred and no real PR was targeted.
-- Provider-generated trailer behavior is not treated as exclusive or absent. The wrapper's VERIFIED/BLOCK decision binds each requested non-poster trailer to commit `author.login` plus that commit's email; it does not assume `MergeMessageField` is the squash's only trailer source. The poster is omitted from the constructed list because the resulting squash author already records the poster; any additional provider-generated trailer is outside this change's unmeasured mechanism.
-- An early candidate SHA-256 `5de32876990e4f26920448cb3220cc7f1146d558b4dd2bc1ee1a2abee2f2cbe6` passed the initial harness, then author-side review found credential-fallback and argv-exposure defects. The live deployed wrapper was atomically restored to baseline SHA-256 `08a65e8584c52c6d41ea1c686f8b95585c21e4b37320a2447eba09359a0e02c1`; the remediated candidate remains only in the worktree.
-
-## Remediation and current review state
-
-1. Token and Basic Auth now use stdin curl configuration, not argv. PR title, contributor email, and the JSON payload also remain out of child argv.
-2. Each credential attempt binds commit inspection and merge. A token failure during either inspection or mutation causes Basic fallback to repeat inspection before mutation; the payload pins the inspected `head_commit_id`.
-3. Focused tests cover token-resolution fail-closed behavior, both HTTP-401 fallback seams, metadata/credential argv absence, null-login BLOCK, explicit squash, canonical reviewed-head binding, unchanged ordinary payload, and retained log-safe provider diagnostics. Token-resolution RED: `/home/hermes/agent-work/be-coder-08/evidence/prmerge-token-resolution-red.log`.
-4. Codex review rounds 3–5 requested retained provider error text, log-safe provider diagnostics, fail-closed credential fallback, stable value-option parsing, and PR-title trailer-injection prevention. These are remediated with regression assertions. A post-remediation independent review is still required.
-5. **Accepted linkage limitation:** `author.login` resolution proves that the commit address maps to a registered provider account. It does not prove that the named principal authored the commit because Git author metadata is self-asserted. This gate checks attribution linkage, not authorship; commit signing is out of scope and currently unadopted. Coordinators explicitly ruled that this does not add a third state.
-6. Codex's sandbox could not execute the harness because its checkout was read-only; that environmental limitation is recorded separately from host-side test results.
-
-## Disposable provider fixture acceptance
-
-- Use a retained scratch repository only, with two branch authors and `author != committer` on at least one commit.
-- Arm A supplies a message-field trailer for one non-poster; record whether that value lands without forcing the partial-pair result into under-specified `APPENDS`/`REPLACES` labels. Demonstrate an absence control.
-- Arm B includes a registered trailer for a different non-poster on a branch commit; record whether it survives or drops. Verify identity through an existing commit whose `author.login` resolves and demonstrate an absence control.
-- Parse landed trailers key-agnostically with `^[A-Za-z-]+-[Bb]y:` and record generated poster pair presence/absence plus resulting poster attribution.
-- Record `/users/<login>` status and raw email only as non-gating estate telemetry. Never read `active`, `visibility`, or any profile field as an identity gate.
-- Use distinct principals: poster `be-coder-08`, merger `Mos`, Arm A `be-coder-07`, and Arm B `be-coder-06`. Capture every trailer-shaped line verbatim and in order. Zero trailer lines means the generator did not fire and the run is `VOID`, not evidence that either arm dropped.
-- Report the same read-back evidence to `mos-claude` on socket `default` and `tl-mosaic` on socket `mosaic-fleet`. Report values rather than mechanism inferences and stop on any poster-attribution regression.
-
-## Fixture preflight
-
-- Retained public repository: `mosaicstack/prmerge-trailer-fixture`; PR `#1`, posted by `be-coder-08` and reserved for merge by `Mos`.
-- Existing `mosaicstack/stack` commits resolve `be-coder-07` and `be-coder-06` through `author.login`; exact addresses are `[email protected]` and `[email protected]`.
-- Non-gating HOMELAB telemetry for authenticated reader `be-coder-08`: `/api/v1/users/be-coder-06` returned HTTP 200 with raw `email` value `[email protected]`.
-- Provider preflight showed PR commit enumeration is newest-first. A new RED test proved that deriving `head_commit_id` from the final array element selected the wrong commit. The candidate now reads `.head.sha` from the authenticated PR endpoint before enumeration, verifies it appears in the commit set, and atomically pins that SHA in the explicit squash payload. RED: `/home/hermes/agent-work/be-coder-08/evidence/prmerge-head-order-red.log`.
-- Fixture PR head `f6ba6e5105031fa21f5ff7bd8e4379d99c16e1de` has `author.login=be-coder-07`, `committer.login=be-coder-08`, and branch-message trailer `Co-authored-by: be-coder-06 <[email protected]>`.
-
-## Fixture result
-
-- `Mos` merged retained fixture PR `#1` through staged candidate SHA-256 `60e779a85fd13b729d859ea7c986d1e9b1641b97991611329226c1b3113ffb6e`; resulting squash commit: `3f550715d9bc716426fd355a65fe997b3a90fa7d` with one parent.
-- Provider read-back: poster/commit author `be-coder-08`, committer/merger `Mos`. The run is non-void.
-- Trailer-shaped lines, verbatim and in order:
-  1. `Co-authored-by: be-coder-07 <[email protected]>`
-  2. `Co-authored-by: be-coder-08 <[email protected]>`
-- Arm A supplied field value (`be-coder-07`) landed. Arm B branch trailer (`be-coder-06`) dropped. Both fabricated absence controls remained absent. No `Co-committed-by:` line landed.
-- The candidate payload construction explicitly excludes the poster and supplied only the Arm A `be-coder-07` line. Therefore the landed poster line was provider-generated, not candidate-composed. The raw result supports `FIELD LANDS`, `BRANCH DROPS`, and `POSTER GENERATED`; it does not support a claim that candidate code supplied the poster. Evidence: `/home/hermes/agent-work/be-coder-08/evidence/prmerge-fixture-readback.log` and the retained provider object.
-- Retained fixture PR `#2` measured the N=2 shape needed by `#1030`: supplied `be-coder-07` then `be-coder-06`; both landed in that order, followed by the provider-generated poster line. No truncation or dedup occurred at N=2. Resulting squash: `39db9d13aed0…`.
-
-## Current hold point
-
-PR `mosaicstack/stack#1066` is open. Its first frozen head `f4b162fa…` was terminal-green in Woodpecker `mosaic` pipeline `#2225`, but that evidence becomes stale when the canonical port moves the head. The deployed wrapper remains baseline `08a65e85…`; no manual copy will occur. Canonical port tests, commit amendment, rebase, one guarded force-with-lease, exact-head CI, and new independent review remain. Even after source merge, activation remains blocked on an assigned package-release/reseed owner and installed-byte read-back.
-
-## Security review 96 remediation
-
-Exact reviewed predecessor head: `1ceb11058f64dd7f4a817ceb2124f980a1c4dd23`.
-
-RED-first focused harness produced 10 named failures: all curl calls lacked size/time/connect bounds; raw ESC email reached mutation; oversized and stalled curl failures were discarded and reached mutation; nonempty Basic output with resolver rc 91 authorized mutation.
-
-Security remediation:
-
-- Removed the cross-principal HTTP-401 Basic fallback. Both inspection-401 and merge-401 paths now refuse without Basic resolution or mutation; `get_gitea_basic_auth` references in the merge subject are 0.
-- Applied `--max-filesize`, `--max-time`, and `--connect-timeout` to all 3/3 provider curl sites and fail closed on curl transport rc at all 3/3 sites.
-- Required linked email bytes to be ASCII and printable before constructing `MergeMessageField`; guarded construction sites 1/1.
-
-GREEN: message-field, exact-head, empty-UID/API, queue branch/repository/SHA, bash syntax, ShellCheck, and diff check pass. R7 total-removal mutants went RED: email guard 3 rows; bound switches 1 row; transport-rc guards 4 rows; HTTP-401 refusal 3 rows. R7 bound: mutants prove total removal only; explicit denominators above prove site coverage.

docs/scratchpads/rm-03-queue-guard.md

@@ -1,120 +0,0 @@
-# RM-03 — CI Queue Guard Repair
-
-- **Task:** RM-03
-- **Issue:** #1019
-- **Branch:** `fix/rm-03-queue-guard`
-- **Owner:** coder-mos1
-- **Reviewer:** rev-974 (independent; author != reviewer)
-- **Started:** 2026-08-01
-
-## Objective
-
-Repair the mandatory CI queue guard so it reads provider payloads, blocks asserted non-green CI, distinguishes provider unavailability from a real non-green result, and inspects the branch actually being pushed or merged.
-
-## Constraints
-
-- Worktree only: `/home/hermes/agent-work/rm-03`; never mutate `/src/mosaic-stack`.
-- JSON payload travels through stdin; never argv. Large payload must remain below no ARG_MAX dependency.
-- TDD is mandatory. Every behavior case must be observed red before implementation.
-- No bypass flags or hook suppression.
-- Do not cite the existing guard's green as evidence; D-23 establishes it is zero-information.
-- Gate-ready is a frozen exact head. Any push after a merge-gate verdict voids that verdict.
-- No merge: coordinator holds the merge hand pending Jason.
-
-## Design
-
-1. Feed JSON to `python3 -c` on stdin, including pending-context rendering.
-2. Classify valid green as `READY`; pending/failure/no-status/malformed/mixed as `ASSERTED_NOT_READY`; provider/credential/transport inability as `CANNOT_ASSERT`.
-3. `ASSERTED_NOT_READY` exits nonzero. `CANNOT_ASSERT` emits a loud diagnostic and appends a local JSONL audit record. Push degrades to exit 0; merge holds with distinct retryable exit 75 until provider recovery, then self-clears without manual reset. Inability to write the audit exits nonzero.
-4. Derive the current branch when `-B` is omitted. The merge wrapper passes the exact PR head branch, repository, and full commit SHA—not its `main` base—so fork PRs cannot resolve against an adjacent base-repository branch.
-
-## Test matrix
-
-| Case | Required outcome |
-| --- | --- |
-| success | exit 0; terminal-success |
-| pending | nonzero after bounded timeout |
-| failure | nonzero |
-| no-status | nonzero |
-| malformed | nonzero |
-| >=150 KiB payload | unchanged classification; never rc126 |
-| provider unreachable on push | loud audited CANNOT_ASSERT; degraded exit 0 |
-| provider unreachable on merge | loud audited CANNOT_ASSERT; retryable exit 75/HOLD |
-| audit unavailable | nonzero |
-| implicit push branch | provider URL uses checked-out feature branch |
-| merge wrapper | queue guard receives exact PR head branch/repository/full SHA |
-
-## RED-first evidence
-
-Observed against the unmodified `origin/main` implementation before source edits:
-
-- `bash packages/mosaic/framework/tools/git/test-ci-queue-wait-tristate.sh` → rc 1 with 15 failed assertions.
-- Success payload was reported `state=unknown`.
-- Pending, failure, no-status, and malformed payloads each exited 0 and omitted `ASSERTED_NOT_READY`.
-- The 160 KiB payload produced rc 141 because Python never consumed the pipe; it did not classify success.
-- Provider-unreachable exited 7 with no `CANNOT_ASSERT` audit record.
-- Implicit push queried `/branches/main`, not `/branches/fix/rm-03-fixture`.
-- Audit-unavailable emitted no audit diagnostic.
-- A credential-resolution hard-block mutant was then run before trusting that added case: `credential-unresolvable` returned rc 1 and omitted `CANNOT_ASSERT`; the matrix returned rc 1 with two named assertion failures.
-- Review-blocker controls were observed red: structurally invalid `statuses` string and null-entry payloads each exited 0 as `terminal-success`; unsupported-platform discovery exited 1 without diagnostic or audit (seven named assertion failures total).
-- After the push/merge asymmetry ruling, merge-side provider unavailability was observed red at rc 0; its registered case required distinct retryable rc 75.
-- Aggregate `state=success` with zero contexts was observed red: it exited 0 as `terminal-success`; the registered case requires `no-status`/nonzero.
-- Fork/exact-head controls were observed red: `pr-merge.sh` omitted the fork repository and full SHA, and an ignored-arguments mutant re-resolved through `/branches/` instead of the exact fork commit (two named failures).
-- GitHub check-run-only success/pending/failure were each misclassified as `no-status`; the RED run had five named failures and proved the Checks API was never queried.
-- The first merge-pin control was unrunnable because one `local` declaration referenced a variable before assignment under `set -u`; this was disclosed and corrected rather than counted. The runnable RED then showed Gitea payload `{"Do":"squash"}` lacked `head_commit_id`; a separate GitHub run showed `gh pr merge 123 --squash` lacked `--match-head-commit`.
-- A stale-verdict mutant removed the `--expect-head` comparison and was observed red because a moved head reached the provider merge call.
-- `bash packages/mosaic/framework/tools/git/test-pr-merge-queue-branch.sh` initially returned rc 1; captured call was `--purpose merge -B main -t 900 -i 15`.
-
-Logs remain untracked under the worktree as `.mosaic-test-work-red-*.log` and will not be committed.
-
-## Progress
-
-- [x] Mission, remediation charter, task evidence, board, issue #1019, and superseded PR #1023 read.
-- [x] Isolated worktree created and identity configured coherently.
-- [x] Mutant tests authored and observed red.
-- [x] Implementation green.
-- [x] Baseline and focused situational gates green; full package suite has an unrelated framework-shell environment abort recorded below.
-- [ ] Independent review clean (rev-974 requested changes at `44ffa99a`; bypass remediation committed and awaiting re-review).
-- [ ] PR CI terminal-green at exact head by full step scan.
-- [ ] Merge-gate verdict issued against frozen head.
-
-## Scope disposition
-
-- The five framework guides are consequential documentation: they define the purpose-aware tri-state contract, including audited push degradation and merge HOLD.
-- The agent templates are consequential because they ship the same queue-guard instructions into newly seeded agent contracts; leaving them binary/stale would contradict the repaired tool.
-- `pr-merge.sh` is consequential: it must inspect the PR's exact head branch/repository/SHA and enforce the exact-head merge pin.
-- `pr-metadata.sh` is consequential only as the normalized source of that head branch/repository/SHA. Its diff is limited to exposing those fields on GitHub and Gitea.
-- `test-pr-merge-gitea-empty-uid.sh` changes because exact-head Gitea merges now always use the API path (the only path that can send `head_commit_id`), superseding the prior tea-empty-identity fallback behavior.
-
-## Review remediation
-
-- rev-974 independently proved that the documented `--skip-queue-guard` merge option bypassed an exit-99 guard stub, reached the provider merge payload, printed success, and exited 0 at head `44ffa99a`.
-- RED-first reproduction was added to `test-pr-merge-head-pin.sh` before the production fix: `FAIL merge-bypass: --skip-queue-guard reached the provider merge path`, suite rc 1. The test-only commit is `241113e6`.
-- Production remediation `37aae650` removes the option from parsing, usage, help, and examples. Every merge-capable path now invokes the queue guard; `--dry-run` alone omits it and has a regression proving that it exits before provider dispatch and creates no merge payload.
-- Existing Gitea merge tests now exercise a successful guard response rather than bypassing the guard.
-
-## Risks / boundaries
-
-- The local JSONL audit is durable operational evidence but not tamper-resistant against the same UID. RM-03 does not claim otherwise.
-- Push-side audited exit 0 is an explicit owner ruling (Option B), accepted to avoid bricking recovery work; merge-side CANNOT_ASSERT remains retryable exit 75/HOLD. The automated security reviewer continues to flag the deliberate push availability tradeoff.
-- Source/deployed-copy equality is owned by RM-02/D-22; this branch changes repository source and its tests only.
-
-## Test evidence
-
-Fresh after rescue checkpoint `b7175012`:
-
-- Focused situational matrix: tri-state, GitHub checks pagination, branch-absent, merge head branch/repository/SHA, exact-head pin, and Gitea exact-head API regressions all passed.
-- `bash -n` on the three production shell scripts passed.
-- `shellcheck -x -P packages/mosaic/framework/tools/git ...` on all changed shell scripts passed.
-- `pnpm typecheck` passed (45/45 Turbo tasks).
-- `pnpm lint` passed (25/25 Turbo tasks).
-- `pnpm format:check` passed.
-- `pnpm --filter @mosaicstack/mosaic test`: Vitest passed 1508/1508 on the confirmation run; framework-shell then aborted at the pre-existing wake coordinate assertion with exit 97: `BASH_LINENO ... probe reported [3 5], expected [3 4] ... (#973)`. This is outside the RM-03 diff and is disclosed rather than substituted or called green.
-- The prior package-suite attempt had one transient, out-of-diff `install-ordering-guard.spec.ts` failure (1/1508); its isolated rerun passed 19/19 and the confirmation full Vitest run passed 1508/1508.
-- After bypass remediation: all six focused RM-03 queue/merge regressions passed, including bypass refusal and dry-run non-dispatch; shell syntax and source-aware ShellCheck passed; `pnpm typecheck`, `pnpm lint`, and `pnpm format:check` passed.
-- Fresh `test:framework-shell` reached and passed every RM-03 test, then again aborted at the unrelated wake coordinate assertion with exit 97; it remains explicitly non-green rather than substituted.
-- An ad hoc raw Prettier invocation over `.template` and `.sh` files was unrunnable because no parser is registered for those extensions; it was not used as a substitute for canonical `pnpm format:check`.
-
-## Final evidence
-
-Pending.

gates/required-gates.baseline.json

@@ -0,0 +1,34 @@
+{
+  "schemaVersion": 1,
+  "purpose": "Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.",
+  "gates": [
+    {
+      "id": "quality-typecheck",
+      "source": "package.json"
+    },
+    {
+      "id": "quality-lint",
+      "source": "package.json"
+    },
+    {
+      "id": "quality-format",
+      "source": "package.json"
+    },
+    {
+      "id": "checkout-preflight",
+      "source": "scripts/preflight.mjs"
+    },
+    {
+      "id": "ci-queue-wait",
+      "source": "packages/mosaic/framework/tools/git/ci-queue-wait.sh"
+    },
+    {
+      "id": "hook-pre-commit",
+      "source": ".husky/pre-commit"
+    },
+    {
+      "id": "hook-pre-push",
+      "source": ".husky/pre-push"
+    }
+  ]
+}

package.json

@@ -6,6 +6,7 @@
     "build": "turbo run build",
     "dev": "turbo run dev",
     "lint": "turbo run lint",
+    "gate:verify": "node scripts/gate-verify.mjs",
     "preflight": "node scripts/preflight.mjs",
     "clean:generated": "node scripts/clean-generated.mjs",
     "typecheck": "pnpm preflight && turbo run typecheck",

packages/mosaic/framework/guides/CI-CD-PIPELINES.md

@@ -925,16 +925,14 @@ Woodpecker note:
 Before pushing a branch or merging a PR, guard against overlapping project pipelines:
 
 ```bash
-~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push
-~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>
+~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main
+~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main
 ```
 
 Behavior:
 
-- If pipeline state is running/queued/pending, wait until queue clears; timeout is `ASSERTED_NOT_READY` and exits nonzero.
-- Failure, missing status, malformed status, or any other provider-asserted non-green state is `ASSERTED_NOT_READY` and exits nonzero.
-- Credential, transport, or provider unavailability is `CANNOT_ASSERT`: the guard emits a loud diagnostic and durable JSONL audit record. For push it exits 0 so recovery work is not bricked. For merge it returns distinct retryable exit 75 and holds until provider recovery; rerunning then self-clears without manual reset. This result is never evidence that CI was clear. If the audit cannot be written, the guard exits nonzero.
-- `pr-merge.sh` resolves and guards the exact PR head repository and full SHA automatically, including fork PRs.
+- If pipeline state is running/queued/pending, wait until queue clears.
+- If timeout or API/auth failure occurs, treat as `blocked`, report exact failed wrapper command, and stop.
 
 ## Gitea as Unified Platform
 

packages/mosaic/framework/guides/CODE-REVIEW.md

@@ -13,7 +13,7 @@ Merge strategy enforcement (HARD RULE):
 - PR target for delivery is `main`.
 - Direct pushes to `main` are prohibited.
 - Merge to `main` MUST be squash-only.
-- Use `~/.config/mosaic/tools/git/pr-merge.sh -n {PR_NUMBER} -m squash --expect-head {approved_full_sha}` (or PowerShell equivalent).
+- Use `~/.config/mosaic/tools/git/pr-merge.sh -n {PR_NUMBER} -m squash` (or PowerShell equivalent).
 
 ## Review Checklist
 

packages/mosaic/framework/guides/E2E-DELIVERY.md

@@ -79,7 +79,7 @@ For implementation work, you MUST run this cycle in order:
 8. `pre-push queue guard` - before pushing, wait for running/queued project pipelines to clear: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
 9. `push` - push immediately after queue guard passes.
 10. `PR integration` - if external git provider is available, create/update PR to `main` and merge with required strategy via Mosaic wrappers.
-11. `pre-merge queue guard` - before merging PR, wait for running/queued project pipelines on the exact PR head to clear: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+11. `pre-merge queue guard` - before merging PR, wait for running/queued project pipelines to clear: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge`.
 12. `CI/pipeline verification` - wait for terminal CI status and require green before completion (`~/.config/mosaic/tools/git/pr-ci-wait.sh` for PR-based workflow).
 13. `issue closure` - close linked external issue (or close internal `docs/TASKS.md` task ref when provider is unavailable).
 14. `greenfield situational test` - validate required user flows in a clean environment/startup path (post-merge for trunk workflow changes).
@@ -93,8 +93,8 @@ For implementation work, you MUST run this cycle in order:
 > the gate (AGENTS.md hard gate "Merge authority"). Solo delivery proceeds
 > without asking.
 
-1. `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`
-2. `~/.config/mosaic/tools/git/pr-merge.sh -n <PR_NUMBER> -m squash --expect-head <APPROVED_FULL_SHA>`
+1. `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`
+2. `~/.config/mosaic/tools/git/pr-merge.sh -n <PR_NUMBER> -m squash`
 3. `~/.config/mosaic/tools/git/pr-ci-wait.sh -n <PR_NUMBER>`
 4. `~/.config/mosaic/tools/git/issue-close.sh -i <ISSUE_NUMBER>` (or close internal `docs/TASKS.md` ref when no provider exists)
 5. If any step fails: set status `blocked`, report the exact failed wrapper command, and stop.

packages/mosaic/framework/guides/ORCHESTRATOR.md

@@ -425,11 +425,11 @@ git push
     and checklist completed (`~/.config/mosaic/templates/docs/DOCUMENTATION-CHECKLIST.md`) when applicable.
 13. **PR + CI + Issue Closure Gate** (HARD RULE for source-code tasks):
     - Before merging, run queue guard:
-      `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`
+      `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`
     - Ensure PR exists for the task branch (create/update via wrappers if needed):
       `~/.config/mosaic/tools/git/pr-create.sh ... -B main`
     - Merge via wrapper:
-      `~/.config/mosaic/tools/git/pr-merge.sh -n {PR_NUMBER} -m squash --expect-head {approved_full_sha}`
+      `~/.config/mosaic/tools/git/pr-merge.sh -n {PR_NUMBER} -m squash`
     - Wait for terminal CI status:
       `~/.config/mosaic/tools/git/pr-ci-wait.sh -n {PR_NUMBER}`
     - Close linked issue after merge + green CI:
@@ -630,7 +630,7 @@ Construct this from the task row and pass to worker via Task tool:
 
 **MANDATORY:** This ALWAYS includes linting. If the project has a linter configured
 (ESLint, Biome, ruff, etc.), you MUST run it and fix ALL violations in files you touched.
-Do NOT leave lint warnings or errors for someone else to clean up. 6. Run REQUIRED situational tests based on changed surfaces (see `~/.config/mosaic/guides/E2E-DELIVERY.md` and `~/.config/mosaic/guides/QA-TESTING.md`). 7. If task is bug fix/security/auth/critical business logic, apply REQUIRED TDD discipline per `~/.config/mosaic/guides/QA-TESTING.md`. 8. If gates or required situational tests fail: Fix and retry. Do NOT report success with failures. 9. Commit: `git commit -m "fix({finding_id}): brief description"` 10. Before push, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B {branch}` 11. Push: `git push origin {branch}` 12. Report result as JSON (see format below)
+Do NOT leave lint warnings or errors for someone else to clean up. 6. Run REQUIRED situational tests based on changed surfaces (see `~/.config/mosaic/guides/E2E-DELIVERY.md` and `~/.config/mosaic/guides/QA-TESTING.md`). 7. If task is bug fix/security/auth/critical business logic, apply REQUIRED TDD discipline per `~/.config/mosaic/guides/QA-TESTING.md`. 8. If gates or required situational tests fail: Fix and retry. Do NOT report success with failures. 9. Commit: `git commit -m "fix({finding_id}): brief description"` 10. Before push, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main` 11. Push: `git push origin {branch}` 12. Report result as JSON (see format below)
 
 ## Git Scripts
 
@@ -638,9 +638,8 @@ For issue/PR/milestone operations, use scripts (NOT raw tea/gh):
 
 - `~/.config/mosaic/tools/git/issue-view.sh -i {N}`
 - `~/.config/mosaic/tools/git/pr-create.sh -t "Title" -b "Desc" -B main`
-- Push: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B {task_branch}`
-- Merge: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B {pr_head_branch} -R {pr_head_owner/repo} --sha {pr_head_full_sha}`
-- `~/.config/mosaic/tools/git/pr-merge.sh -n {PR_NUMBER} -m squash --expect-head {approved_full_sha}`
+- `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`
+- `~/.config/mosaic/tools/git/pr-merge.sh -n {PR_NUMBER} -m squash`
 - `~/.config/mosaic/tools/git/pr-ci-wait.sh -n {PR_NUMBER}`
 - `~/.config/mosaic/tools/git/issue-close.sh -i {N}`
 

packages/mosaic/framework/guides/TOOLS-REFERENCE.md

@@ -23,12 +23,10 @@ Mosaic wrappers at `~/.config/mosaic/tools/git/*.sh` handle platform detection a
 # Milestones
 ~/.config/mosaic/tools/git/milestone-create.sh
 
-# CI queue guard (required before push/merge; defaults to the checked-out branch)
+# CI queue guard (required before push/merge)
 ~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge
 ```
 
-The guard exits nonzero for any provider-asserted non-green, missing, or malformed CI state. If credentials or the provider are unavailable, it emits `CANNOT_ASSERT` and writes a JSONL audit record. Push degrades to exit 0 so recovery work is not bricked; merge holds with retryable exit 75 until the provider recovers, then self-clears without manual reset. Neither outcome is evidence that CI was clear. `pr-merge.sh` automatically inspects the exact PR head repository and full commit SHA rather than its `main` base; this also handles fork PRs without branch-name ambiguity. Pass `--expect-head <approved-full-sha>` to bind a commit-specific review or merge-gate verdict; Gitea uses atomic `head_commit_id` and GitHub uses `--match-head-commit`.
-
 ### Code Review (Codex)
 
 ```bash

packages/mosaic/framework/runtime/pi/mosaic-extension.ts

@@ -38,27 +38,8 @@ const RECEIPT_OBSERVER_CLIENT = join(
   'lease-broker',
   'receipt-observer-client.py',
 );
-const LEASE_PROMOTE = join(MOSAIC_HOME, 'tools', 'lease-broker', 'lease_promote.py');
 const RECOVERY_TOOL = 'mosaic_context_recover';
 
-// Lazy lease promotion: a lease is promoted on the FIRST DENIED MUTATOR, not at
-// session start. Two reasons that matter:
-//
-//  1. Promotion costs a whole model turn, because the receipt must be the entire
-//     message (hmac.compare_digest, "not a transcript substring"). Doing it at
-//     session start would collide with the Constitution's first-response mode
-//     declaration — the two cannot share a message. Deferring it means the mode
-//     declaration happens first and the receipt gets its own later turn, so no
-//     governance change is required.
-//  2. A read-only session never pays for it at all.
-//
-// Bounded so a model that will not emit the receipt verbatim degrades to the
-// current behaviour (denied mutators) rather than looping forever.
-const MAX_PROMOTION_ATTEMPTS = 3;
-let pendingReceiptChallenge: string | null = null;
-let pendingReceiptText: string | null = null;
-let promotionAttempts = 0;
-
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -145,63 +126,6 @@ function runPiLeaseRevoker(args: string[]): boolean {
   return result.status === 0;
 }
 
-/**
- * Mint a promotion challenge and return the instruction the model must follow.
- *
- * The receipt has to be the model's ENTIRE next message: the broker compares it
- * with `hmac.compare_digest`, so any surrounding prose fails. Returning it as
- * the tool_call block `reason` is what puts it in front of the model — pi feeds
- * that string back as the tool result.
- *
- * This never posts the receipt itself. `receipt-observer-client.py` would accept
- * any string, so self-posting would satisfy the broker while proving nothing;
- * the whole point of the exchange is that a live model echoes the challenge.
- */
-function beginPiPromotion(): string | undefined {
-  if (promotionAttempts >= MAX_PROMOTION_ATTEMPTS) return undefined;
-  const result = spawnSync('python3', [LEASE_PROMOTE, '--begin'], {
-    encoding: 'utf8',
-    timeout: 10_000,
-    env: process.env,
-  });
-  if (result.status !== 0) return undefined;
-  try {
-    const reply = JSON.parse(String(result.stdout)) as {
-      ok?: boolean;
-      receipt?: string;
-      receipt_challenge?: string;
-    };
-    if (reply.ok !== true || !reply.receipt || !reply.receipt_challenge) return undefined;
-    pendingReceiptChallenge = reply.receipt_challenge;
-    pendingReceiptText = reply.receipt;
-    promotionAttempts += 1;
-    return reply.receipt;
-  } catch {
-    return undefined;
-  }
-}
-
-/** Complete promotion after the model emitted the receipt and message_end
- * shipped it to the observer. Returns true when the lease reached VERIFIED. */
-function completePiPromotion(): boolean {
-  const challenge = pendingReceiptChallenge;
-  if (!challenge) return false;
-  pendingReceiptChallenge = null;
-  pendingReceiptText = null;
-  const result = spawnSync('python3', [LEASE_PROMOTE, '--complete', challenge], {
-    encoding: 'utf8',
-    timeout: 10_000,
-    env: process.env,
-  });
-  if (result.status !== 0) return false;
-  try {
-    const reply = JSON.parse(String(result.stdout)) as { state?: string };
-    return reply.state === 'VERIFIED';
-  } catch {
-    return false;
-  }
-}
-
 function checkPiMutatorGate(toolName: string): { block: true; reason: string } | undefined {
   const result = spawnSync('python3', [MUTATOR_GATE, '--runtime', 'pi'], {
     input: `${JSON.stringify({ tool_name: toolName })}\n`,
@@ -213,29 +137,6 @@ function checkPiMutatorGate(toolName: string): { block: true; reason: string } |
   const detail = String(result.stderr ?? '')
     .trim()
     .split('\n')[0];
-
-  // Only an UNVERIFIED lease is promotable. Any other denial (GATE_UNAVAILABLE,
-  // STALE_GENERATION, LEASE_EXPIRED, ANCESTRY_MISMATCH) means something is wrong
-  // that a receipt cannot fix — minting there would thrash the broker, since
-  // begin_verification revokes before it mints.
-  if (detail.includes('MUTATOR_UNVERIFIED') && pendingReceiptChallenge === null) {
-    const receipt = beginPiPromotion();
-    if (receipt) {
-      return {
-        block: true,
-        reason:
-          `${detail}\n\n` +
-          'This session holds an UNVERIFIED lease, so mutators are denied. To ' +
-          'promote it, reply with the following text and NOTHING ELSE — no ' +
-          'preamble, no explanation, no code fence, no trailing text. It is ' +
-          'compared byte-for-byte, so any extra character fails:\n\n' +
-          `${receipt}\n\n` +
-          'Emit exactly that as your entire next message. The lease will then be ' +
-          'VERIFIED and you can retry this tool.',
-      };
-    }
-  }
-
   return {
     block: true,
     reason: detail || 'BLOCKED: Mosaic mutator gate is unavailable or the lease is UNVERIFIED.',
@@ -469,29 +370,7 @@ export default function register(pi: ExtensionAPI) {
   // Pi records only a finalized assistant entry at message_end. It never uses
   // after_provider_response, which occurs before stream consumption.
   pi.on('message_end', async (event) => {
-    const message = (event as unknown as { message?: unknown }).message;
-    recordPiMessageEnd(message);
-    // Complete ONLY when the message just observed IS the receipt.
-    //
-    // message_end also fires for the message that CONTAINED the blocked tool
-    // call — i.e. one turn BEFORE the model emits the receipt. Completing there
-    // makes observe_receipt compare against the wrong text, fail, and burn the
-    // challenge before the model ever answers. Gating on an exact text match
-    // mirrors the broker's own hmac.compare_digest semantics and waits for the
-    // right turn.
-    //
-    // Order still matters within this handler: recordPiMessageEnd must have
-    // shipped the message to the observer before observe_receipt asks about it.
-    if (pendingReceiptChallenge !== null && pendingReceiptText !== null) {
-      if (assistantMessageText(message) === pendingReceiptText) {
-        if (completePiPromotion()) {
-          promotionAttempts = 0;
-        }
-        // On failure the challenge is cleared, so the next denied mutator mints
-        // a fresh one — bounded by MAX_PROMOTION_ATTEMPTS, after which the
-        // session simply stays UNVERIFIED rather than looping.
-      }
-    }
+    recordPiMessageEnd((event as unknown as { message?: unknown }).message);
   });
 
   // The recovery custom tool is the only Pi invocation that maps to the

packages/mosaic/framework/templates/agent/AGENTS.md.template

@@ -9,7 +9,7 @@
 2. Do NOT ask for routine confirmation before required push/merge/issue-close/release/tag actions.
 3. Completion is forbidden at PR-open stage.
 4. Completion requires merged PR to `main` + terminal green CI + linked issue/internal task closed.
-5. Before push or merge, run the queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+5. Before push or merge, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 6. For issue/PR/milestone operations, use Mosaic wrappers first (`~/.config/mosaic/tools/git/*.sh`).
 7. If any required wrapper command fails: report `blocked` with the exact failed wrapper command and stop.
 8. Do NOT stop at "PR created" and do NOT ask "should I merge?" for routine flow.
@@ -88,7 +88,7 @@ Reference:
 5. Do not mark implementation complete until PR is merged.
 6. Do not mark implementation complete until CI/pipeline status is terminal green.
 7. Close linked issues/tasks only after merge + green CI.
-8. Before push or merge, run the CI queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+8. Before push or merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 
 ## Container Release Strategy (When Applicable)
 

packages/mosaic/framework/templates/agent/CLAUDE.md.template

@@ -147,9 +147,9 @@ Do NOT stop at "PR created" and do NOT ask "should I merge?" or "should I close
 5. Ensure `docs/PRD.md` or `docs/PRD.json` exists and is current before coding.
 6. Create scratchpad: `docs/scratchpads/{task-id}-{short-name}.md` and include issue/internal ref.
 7. Update `docs/TASKS.md` status + issue/internal ref before coding.
-8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
+8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main`.
 9. Open PR to `main` for delivery changes (no direct push to `main`).
-10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`.
 11. Merge PRs that pass required checks and review gates with squash strategy only.
 12. Reference issues/internal refs in commits (`Fixes #123`, `Refs #123`, or `Refs TASKS:T1`).
 13. Close issue/internal task only after testing and documentation gates pass, PR merge is complete, and CI/pipeline status is terminal green.

packages/mosaic/framework/templates/agent/projects/django/AGENTS.md.template

@@ -9,7 +9,7 @@
 2. Do NOT ask for routine confirmation before required push/merge/issue-close/release/tag actions.
 3. Completion is forbidden at PR-open stage.
 4. Completion requires merged PR to `main` + terminal green CI + linked issue/internal task closed.
-5. Before push or merge, run the queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+5. Before push or merge, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 6. For issue/PR/milestone operations, use Mosaic wrappers first (`~/.config/mosaic/tools/git/*.sh`).
 7. If any required wrapper command fails: report `blocked` with the exact failed wrapper command and stop.
 8. Do NOT stop at "PR created" and do NOT ask "should I merge?" for routine flow.
@@ -97,7 +97,7 @@ Reference:
 5. Do not mark implementation complete until PR is merged.
 6. Do not mark implementation complete until CI/pipeline status is terminal green.
 7. Close linked issues/tasks only after merge + green CI.
-8. Before push or merge, run the CI queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+8. Before push or merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 
 
 ## Container Release Strategy (When Applicable)

packages/mosaic/framework/templates/agent/projects/django/CLAUDE.md.template

@@ -198,9 +198,9 @@ Do NOT stop at "PR created" and do NOT ask "should I merge?" or "should I close
 5. Ensure `docs/PRD.md` or `docs/PRD.json` exists and is current before coding.
 6. Create scratchpad: `docs/scratchpads/{task-id}-{short-name}.md` and include issue/internal ref.
 7. Update `docs/TASKS.md` status + issue/internal ref before coding.
-8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
+8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main`.
 9. Open PR to `main` for delivery changes (no direct push to `main`).
-10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`.
 11. Merge PRs that pass required checks and review gates with squash strategy only.
 12. Reference issues/internal refs in commits (`Fixes #123`, `Refs #123`, or `Refs TASKS:T1`).
 13. Close issue/internal task only after testing and documentation gates pass, PR merge is complete, and CI/pipeline status is terminal green.

packages/mosaic/framework/templates/agent/projects/nestjs-nextjs/AGENTS.md.template

@@ -9,7 +9,7 @@
 2. Do NOT ask for routine confirmation before required push/merge/issue-close/release/tag actions.
 3. Completion is forbidden at PR-open stage.
 4. Completion requires merged PR to `main` + terminal green CI + linked issue/internal task closed.
-5. Before push or merge, run the queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+5. Before push or merge, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 6. For issue/PR/milestone operations, use Mosaic wrappers first (`~/.config/mosaic/tools/git/*.sh`).
 7. If any required wrapper command fails: report `blocked` with the exact failed wrapper command and stop.
 8. Do NOT stop at "PR created" and do NOT ask "should I merge?" for routine flow.
@@ -101,7 +101,7 @@ Reference:
 5. Do not mark implementation complete until PR is merged.
 6. Do not mark implementation complete until CI/pipeline status is terminal green.
 7. Close linked issues/tasks only after merge + green CI.
-8. Before push or merge, run the CI queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+8. Before push or merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 
 
 ## Container Release Strategy (When Applicable)

packages/mosaic/framework/templates/agent/projects/nestjs-nextjs/CLAUDE.md.template

@@ -230,9 +230,9 @@ Do NOT stop at "PR created" and do NOT ask "should I merge?" or "should I close
 5. Ensure `docs/PRD.md` or `docs/PRD.json` exists and is current before coding.
 6. Create scratchpad: `docs/scratchpads/{task-id}-{short-name}.md` and include issue/internal ref.
 7. Update `docs/TASKS.md` status + issue/internal ref before coding.
-8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
+8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main`.
 9. Open PR to `main` for delivery changes (no direct push to `main`).
-10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`.
 11. Merge PRs that pass required checks and review gates with squash strategy only.
 12. Reference issues/internal refs in commits (`Fixes #123`, `Refs #123`, or `Refs TASKS:T1`).
 13. Close issue/internal task only after testing and documentation gates pass, PR merge is complete, and CI/pipeline status is terminal green.

packages/mosaic/framework/templates/agent/projects/python-fastapi/AGENTS.md.template

@@ -9,7 +9,7 @@
 2. Do NOT ask for routine confirmation before required push/merge/issue-close/release/tag actions.
 3. Completion is forbidden at PR-open stage.
 4. Completion requires merged PR to `main` + terminal green CI + linked issue/internal task closed.
-5. Before push or merge, run the queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+5. Before push or merge, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 6. For issue/PR/milestone operations, use Mosaic wrappers first (`~/.config/mosaic/tools/git/*.sh`).
 7. If any required wrapper command fails: report `blocked` with the exact failed wrapper command and stop.
 8. Do NOT stop at "PR created" and do NOT ask "should I merge?" for routine flow.
@@ -87,7 +87,7 @@ Reference:
 5. Do not mark implementation complete until PR is merged.
 6. Do not mark implementation complete until CI/pipeline status is terminal green.
 7. Close linked issues/tasks only after merge + green CI.
-8. Before push or merge, run the CI queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+8. Before push or merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 
 ## Container Release Strategy (When Applicable)
 

packages/mosaic/framework/templates/agent/projects/python-fastapi/CLAUDE.md.template

@@ -146,9 +146,9 @@ Do NOT stop at "PR created" and do NOT ask "should I merge?" or "should I close
 5. Ensure `docs/PRD.md` or `docs/PRD.json` exists and is current before coding.
 6. Create scratchpad: `docs/scratchpads/{task-id}-{short-name}.md` and include issue/internal ref.
 7. Update `docs/TASKS.md` status + issue/internal ref before coding.
-8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
+8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main`.
 9. Open PR to `main` for delivery changes (no direct push to `main`).
-10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`.
 11. Merge PRs that pass required checks and review gates with squash strategy only.
 12. Reference issues/internal refs in commits (`Fixes #123`, `Refs #123`, or `Refs TASKS:T1`).
 13. Close issue/internal task only after testing and documentation gates pass, PR merge is complete, and CI/pipeline status is terminal green.

packages/mosaic/framework/templates/agent/projects/python-library/AGENTS.md.template

@@ -9,7 +9,7 @@
 2. Do NOT ask for routine confirmation before required push/merge/issue-close/release/tag actions.
 3. Completion is forbidden at PR-open stage.
 4. Completion requires merged PR to `main` + terminal green CI + linked issue/internal task closed.
-5. Before push or merge, run the queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+5. Before push or merge, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 6. For issue/PR/milestone operations, use Mosaic wrappers first (`~/.config/mosaic/tools/git/*.sh`).
 7. If any required wrapper command fails: report `blocked` with the exact failed wrapper command and stop.
 8. Do NOT stop at "PR created" and do NOT ask "should I merge?" for routine flow.
@@ -84,7 +84,7 @@ Reference:
 5. Do not mark implementation complete until PR is merged.
 6. Do not mark implementation complete until CI/pipeline status is terminal green.
 7. Close linked issues/tasks only after merge + green CI.
-8. Before push or merge, run the CI queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+8. Before push or merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 
 ## Container Release Strategy (When Applicable)
 

packages/mosaic/framework/templates/agent/projects/python-library/CLAUDE.md.template

@@ -136,9 +136,9 @@ Do NOT stop at "PR created" and do NOT ask "should I merge?" or "should I close
 5. Ensure `docs/PRD.md` or `docs/PRD.json` exists and is current before coding.
 6. Create scratchpad: `docs/scratchpads/{task-id}-{short-name}.md` and include issue/internal ref.
 7. Update `docs/TASKS.md` status + issue/internal ref before coding.
-8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
+8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main`.
 9. Open PR to `main` for delivery changes (no direct push to `main`).
-10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`.
 11. Merge PRs that pass required checks and review gates with squash strategy only.
 12. Reference issues/internal refs in commits (`Fixes #123`, `Refs #123`, or `Refs TASKS:T1`).
 13. Close issue/internal task only after testing and documentation gates pass, PR merge is complete, and CI/pipeline status is terminal green.

packages/mosaic/framework/templates/agent/projects/typescript/AGENTS.md.template

@@ -9,7 +9,7 @@
 2. Do NOT ask for routine confirmation before required push/merge/issue-close/release/tag actions.
 3. Completion is forbidden at PR-open stage.
 4. Completion requires merged PR to `main` + terminal green CI + linked issue/internal task closed.
-5. Before push or merge, run the queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+5. Before push or merge, run queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 6. For issue/PR/milestone operations, use Mosaic wrappers first (`~/.config/mosaic/tools/git/*.sh`).
 7. If any required wrapper command fails: report `blocked` with the exact failed wrapper command and stop.
 8. Do NOT stop at "PR created" and do NOT ask "should I merge?" for routine flow.
@@ -85,7 +85,7 @@ Reference:
 5. Do not mark implementation complete until PR is merged.
 6. Do not mark implementation complete until CI/pipeline status is terminal green.
 7. Close linked issues/tasks only after merge + green CI.
-8. Before push or merge, run the CI queue guard against the push branch or the merge PR's exact head repository/SHA (`ci-queue-wait.sh --help`); `pr-merge.sh` supplies exact merge metadata automatically.
+8. Before push or merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push|merge -B main`.
 
 ## Container Release Strategy (When Applicable)
 

packages/mosaic/framework/templates/agent/projects/typescript/CLAUDE.md.template

@@ -133,9 +133,9 @@ Do NOT stop at "PR created" and do NOT ask "should I merge?" or "should I close
 5. Ensure `docs/PRD.md` or `docs/PRD.json` exists and is current before coding.
 6. Create scratchpad: `docs/scratchpads/{task-id}-{short-name}.md` and include issue/internal ref.
 7. Update `docs/TASKS.md` status + issue/internal ref before coding.
-8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push`.
+8. Before push, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose push -B main`.
 9. Open PR to `main` for delivery changes (no direct push to `main`).
-10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B <PR_HEAD_BRANCH> -R <PR_HEAD_OWNER/REPO> --sha <PR_HEAD_FULL_SHA>`.
+10. Before merge, run CI queue guard: `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`.
 11. Merge PRs that pass required checks and review gates with squash strategy only.
 12. Reference issues/internal refs in commits (`Fixes #123`, `Refs #123`, or `Refs TASKS:T1`).
 13. Close issue/internal task only after testing and documentation gates pass, PR merge is complete, and CI/pipeline status is terminal green.

packages/mosaic/framework/tools/_scripts/mosaic-sync-skills

@@ -153,24 +153,7 @@ if [[ $link_only -eq 1 ]]; then
   exit 0
 fi
 
-# Skills are linked into the MOSAIC-OWNED harness homes, never a base install.
-# Paths mirror the config-dir env vars the launcher injects (HARNESS_HOME_ENV in
-# commands/launch.js):
-#   claude   CLAUDE_CONFIG_DIR      -> <home>/skills
-#   pi       PI_CODING_AGENT_DIR    -> <home>/skills   (replaces ~/.pi/agent)
-#   codex    CODEX_HOME             -> <home>/skills
-#   opencode XDG_CONFIG_HOME        -> <home>/opencode/skills  (XDG adds a level)
 link_targets=(
-  "$MOSAIC_HOME/.claude/skills"
-  "$MOSAIC_HOME/.codex/skills"
-  "$MOSAIC_HOME/.opencode/opencode/skills"
-  "$MOSAIC_HOME/.pi/skills"
-)
-
-# Pre-isolation installs planted the same symlink farm directly in the operator's
-# base installs. Those are now orphaned: the launcher no longer reads them, but
-# they persist and make a "clean" base install look mosaic-managed.
-legacy_link_targets=(
   "$HOME/.claude/skills"
   "$HOME/.codex/skills"
   "$HOME/.config/opencode/skills"
@@ -262,72 +245,13 @@ prune_stale_links_in_target() {
     # -m resolves lexical dangling targets too. If resolution fails, ownership
     # is unproven and the link must be preserved.
     resolved="$(readlink -m "$link_path" 2>/dev/null || true)"
-    # $canonical_real must be length-checked BEFORE use as a prefix: if it were
-    # ever empty, "$resolved" == "$canonical_real/"* collapses to == "/"* and
-    # matches every absolute path. Combined with the is_mosaic_skill_name skip
-    # above, that inverts the function precisely — it would delete exactly the
-    # FOREIGN symlinks and keep the mosaic ones. (#1087, reported by mos-claude.)
-    if [[ -n "$resolved" && -n "$canonical_real" && "$resolved" == "$canonical_real/"* ]]; then
+    if [[ -n "$resolved" && "$resolved" == "$canonical_real/"* ]]; then
       rm -f "$link_path"
       echo "[mosaic-skills] Removed stale retired skill link: $link_path"
     fi
   done < <(find "$target_dir" -mindepth 1 -maxdepth 1 -type l -print0)
 }
 
-# Remove mosaic-owned symlinks left in a base install by a pre-isolation sync.
-#
-# Ownership is proven by RESOLUTION, not by name: only links resolving inside the
-# canonical or local skills dirs are removed. Anything else — a real directory, a
-# link elsewhere, an unresolvable link — is left untouched. This mirrors the
-# refusal in commands/skill.js ("only symlinks pointing inside the Mosaic skills
-# directory are managed") and preserves e.g. codex's own `.system` dir.
-#
-# The directory itself is kept: mosaic-doctor warns when ~/.pi/agent/skills is
-# missing, and an empty dir is the correct end state, not an absent one.
-cleanup_legacy_target() {
-  local target_dir="$1"
-  local removed=0 kept=0
-
-  [[ -d "$target_dir" ]] || return 0
-
-  while IFS= read -r -d '' link_path; do
-    local resolved owned=0
-    resolved="$(readlink -m "$link_path" 2>/dev/null || true)"
-
-    # Guard the empty-prefix trap: an unset *_real would make "$resolved" == "/"*
-    # match every absolute path and delete foreign links.
-    if [[ -n "$resolved" ]]; then
-      if [[ -n "$canonical_real" && "$resolved" == "$canonical_real/"* ]]; then
-        owned=1
-      elif [[ -n "$local_real" && "$resolved" == "$local_real/"* ]]; then
-        owned=1
-      fi
-    fi
-
-    if [[ $owned -eq 1 ]]; then
-      rm -f "$link_path"
-      removed=$((removed + 1))
-    else
-      kept=$((kept + 1))
-    fi
-  done < <(find "$target_dir" -mindepth 1 -maxdepth 1 -type l -print0)
-
-  if [[ $removed -gt 0 ]]; then
-    echo "[mosaic-skills] Legacy cleanup: removed $removed mosaic symlink(s) from $target_dir (preserved $kept foreign)"
-  fi
-}
-
-for legacy in "${legacy_link_targets[@]}"; do
-  # Skip anything that is also a current target, so isolation can never
-  # self-destruct if the two lists ever overlap.
-  skip=0
-  for target in "${link_targets[@]}"; do
-    [[ "$legacy" == "$target" ]] && skip=1
-  done
-  [[ $skip -eq 1 ]] && continue
-  cleanup_legacy_target "$legacy"
-done
-
 for target in "${link_targets[@]}"; do
   mkdir -p "$target"
 

packages/mosaic/framework/tools/git/ci-queue-wait.sh

@@ -7,9 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/detect-platform.sh"
 
-BRANCH=""
-TARGET_REPO=""
-HEAD_SHA=""
+BRANCH="main"
 TIMEOUT_SEC=900
 INTERVAL_SEC=15
 PURPOSE="merge"
@@ -17,12 +15,10 @@ REQUIRE_STATUS=0
 
 usage() {
     cat <<EOF
-Usage: $(basename "$0") [-B branch] [-R owner/repo] [--sha full-40] [-t timeout_sec] [-i interval_sec] [--purpose push|merge] [--require-status]
+Usage: $(basename "$0") [-B branch] [-t timeout_sec] [-i interval_sec] [--purpose push|merge] [--require-status]
 
 Options:
-  -B, --branch BRANCH      Branch head to inspect (default: current branch)
-  -R, --repo OWNER/REPO    Repository containing the branch (default: origin repo)
-      --sha FULL_SHA       Inspect this exact 40-character commit instead of resolving the branch
+  -B, --branch BRANCH      Branch head to inspect (default: main)
   -t, --timeout SECONDS    Max wait time in seconds (default: 900)
   -i, --interval SECONDS   Poll interval in seconds (default: 15)
       --purpose VALUE      Log context: push|merge (default: merge)
@@ -31,65 +27,63 @@ Options:
 
 Examples:
   $(basename "$0")
-  $(basename "$0") --purpose push -t 600 -i 10
+  $(basename "$0") --purpose push -B main -t 600 -i 10
 EOF
 }
 
 # get_remote_host and get_gitea_token are provided by detect-platform.sh
 
 get_state_from_status_json() {
-    # Python source comes from -c so the provider payload remains on stdin.
-    # Never move the payload to argv: commit-status responses can exceed ARG_MAX.
-    python3 -c '
+    python3 - <<'PY'
 import json
 import sys
 
 try:
     payload = json.load(sys.stdin)
-    if not isinstance(payload, dict):
-        raise ValueError("status payload is not an object")
 except Exception:
-    print("malformed")
+    print("unknown")
     raise SystemExit(0)
 
-raw_statuses = payload.get("statuses", [])
-raw_state = payload.get("state", "")
-if not isinstance(raw_statuses, list) or not isinstance(raw_state, str):
-    print("malformed")
-    raise SystemExit(0)
-statuses = raw_statuses
-state = raw_state.lower()
+statuses = payload.get("statuses") or []
+state = (payload.get("state") or "").lower()
 
 pending_values = {"pending", "queued", "running", "waiting"}
 failure_values = {"failure", "error", "failed"}
 success_values = {"success"}
 
+if state in pending_values:
+    print("pending")
+    raise SystemExit(0)
+if state in failure_values:
+    print("terminal-failure")
+    raise SystemExit(0)
+if state in success_values:
+    print("terminal-success")
+    raise SystemExit(0)
+
 values = []
 for item in statuses:
     if not isinstance(item, dict):
-        print("malformed")
-        raise SystemExit(0)
-    raw_value = item.get("status") or item.get("state")
-    if not isinstance(raw_value, str) or not raw_value:
-        print("malformed")
-        raise SystemExit(0)
-    values.append(raw_value.lower())
+        continue
+    value = (item.get("status") or item.get("state") or "").lower()
+    if value:
+        values.append(value)
 
-if any(value in pending_values for value in values) or state in pending_values:
-    print("pending")
-elif any(value in failure_values for value in values) or state in failure_values:
-    print("terminal-failure")
-elif values and all(value in success_values for value in values) and state in {"", "success"}:
-    print("terminal-success")
-elif not values:
+if not values and not state:
     print("no-status")
+elif any(v in pending_values for v in values):
+    print("pending")
+elif any(v in failure_values for v in values):
+    print("terminal-failure")
+elif values and all(v in success_values for v in values):
+    print("terminal-success")
 else:
     print("unknown")
-'
+PY
 }
 
 print_pending_contexts() {
-    python3 -c '
+    python3 - <<'PY'
 import json
 import sys
 
@@ -110,61 +104,17 @@ for item in statuses:
     if not isinstance(item, dict):
         continue
     name = item.get("context") or item.get("name") or "unknown-context"
-    value = str(item.get("status") or item.get("state") or "unknown").lower()
+    value = (item.get("status") or item.get("state") or "unknown").lower()
     target = item.get("target_url") or item.get("url") or ""
     if value in pending_values:
         found = True
-        suffix = f" ({target})" if target else ""
-        print(f"[ci-queue-wait] pending: {name}={value}{suffix}")
+        if target:
+            print(f"[ci-queue-wait] pending: {name}={value} ({target})")
+        else:
+            print(f"[ci-queue-wait] pending: {name}={value}")
 if not found:
     print("[ci-queue-wait] no pending contexts")
-'
-}
-
-record_cannot_assert() {
-    local reason="$1"
-    local audit_log="${MOSAIC_CI_QUEUE_AUDIT_LOG:-${XDG_STATE_HOME:-${HOME:-}/.local/state}/mosaic/audit/ci-queue-wait.jsonl}"
-
-    if [[ -z "$audit_log" ]] || ! mkdir -p "$(dirname "$audit_log")"; then
-        echo "Error: CANNOT_ASSERT and audit directory is unavailable; refusing degraded pass." >&2
-        return 70
-    fi
-
-    if ! python3 - "$audit_log" "$reason" "${PLATFORM:-unknown}" "$PURPOSE" "${BRANCH:-unknown}" "${OWNER:-unknown}/${REPO:-unknown}" <<'PY'
-import datetime
-import json
-import os
-import sys
-
-path, reason, platform, purpose, branch, repo = sys.argv[1:]
-record = {
-    "timestamp": datetime.datetime.now(datetime.timezone.utc).isoformat(),
-    "outcome": "CANNOT_ASSERT",
-    "reason": reason,
-    "platform": platform,
-    "purpose": purpose,
-    "disposition": "hold" if purpose == "merge" else "degraded-pass",
-    "branch": branch,
-    "repo": repo,
-}
-fd = os.open(path, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0o600)
-try:
-    os.write(fd, (json.dumps(record, separators=(",", ":")) + "\n").encode())
-finally:
-    os.close(fd)
 PY
-    then
-        echo "Error: CANNOT_ASSERT and audit write failed at ${audit_log}; refusing degraded pass." >&2
-        return 70
-    fi
-
-    if [[ "$PURPOSE" == "merge" ]]; then
-        echo "[ci-queue-wait] CANNOT_ASSERT reason=${reason} purpose=merge branch=${BRANCH:-unknown}; audited=${audit_log}; HOLD (exit 75). Retry after provider recovery; no manual reset is required." >&2
-        return 75
-    fi
-
-    echo "[ci-queue-wait] CANNOT_ASSERT reason=${reason} purpose=push branch=${BRANCH:-unknown}; audited=${audit_log}; push may proceed in degraded mode." >&2
-    return 0
 }
 
 github_get_branch_head_sha() {
@@ -178,87 +128,7 @@ github_get_commit_status_json() {
     local owner="$1"
     local repo="$2"
     local sha="$3"
-    local work_root status_file checks_file
-    work_root="${AGENT_WORK_ROOT:-${HOME:-}/.cache/mosaic/ci-queue-wait}"
-    mkdir -p "$work_root" || return 1
-    status_file=$(mktemp "$work_root/github-status.XXXXXX") || return 1
-    checks_file=$(mktemp "$work_root/github-checks.XXXXXX") || {
-        rm -f "$status_file"
-        return 1
-    }
-
-    if ! gh api --paginate --slurp "repos/${owner}/${repo}/commits/${sha}/statuses?per_page=100" > "$status_file" ||
-       ! gh api --paginate --slurp "repos/${owner}/${repo}/commits/${sha}/check-runs?per_page=100&filter=latest" > "$checks_file"; then
-        rm -f "$status_file" "$checks_file"
-        return 1
-    fi
-
-    python3 - "$status_file" "$checks_file" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as handle:
-    status_pages = json.load(handle)
-with open(sys.argv[2], encoding="utf-8") as handle:
-    check_pages = json.load(handle)
-
-if not isinstance(status_pages, list) or not isinstance(check_pages, list):
-    raise SystemExit(1)
-
-# The statuses endpoint is newest-first and can contain retries for one context.
-# Keep only the newest entry per context after flattening every page.
-combined = []
-seen_contexts = set()
-for page in status_pages:
-    if not isinstance(page, list):
-        raise SystemExit(1)
-    for status in page:
-        if not isinstance(status, dict):
-            raise SystemExit(1)
-        context = status.get("context")
-        if not isinstance(context, str) or not context or context in seen_contexts:
-            continue
-        seen_contexts.add(context)
-        combined.append(status)
-
-check_runs = []
-reported_total = 0
-for page in check_pages:
-    if not isinstance(page, dict):
-        raise SystemExit(1)
-    page_runs = page.get("check_runs") or []
-    total_count = page.get("total_count")
-    if not isinstance(page_runs, list) or not isinstance(total_count, int):
-        raise SystemExit(1)
-    reported_total = max(reported_total, total_count)
-    check_runs.extend(page_runs)
-if len(check_runs) < reported_total:
-    raise SystemExit(1)
-
-for run in check_runs:
-    if not isinstance(run, dict):
-        raise SystemExit(1)
-    status = run.get("status")
-    conclusion = run.get("conclusion")
-    if status != "completed":
-        value = "pending"
-    elif conclusion == "success":
-        value = "success"
-    elif conclusion in {"failure", "cancelled", "timed_out", "action_required", "startup_failure", "stale"}:
-        value = "failure"
-    else:
-        value = "unknown"
-    combined.append({
-        "context": run.get("name") or "github-check",
-        "status": value,
-        "target_url": run.get("html_url") or run.get("details_url") or "",
-    })
-
-json.dump({"state": "", "statuses": combined}, sys.stdout)
-PY
-    local status=$?
-    rm -f "$status_file" "$checks_file"
-    return "$status"
+    gh api "repos/${owner}/${repo}/commits/${sha}/status"
 }
 
 gitea_get_branch_head_sha() {
@@ -304,14 +174,6 @@ while [[ $# -gt 0 ]]; do
             BRANCH="$2"
             shift 2
             ;;
-        -R|--repo)
-            TARGET_REPO="$2"
-            shift 2
-            ;;
-        --sha)
-            HEAD_SHA="$2"
-            shift 2
-            ;;
         -t|--timeout)
             TIMEOUT_SEC="$2"
             shift 2
@@ -344,89 +206,45 @@ if ! [[ "$TIMEOUT_SEC" =~ ^[0-9]+$ ]] || ! [[ "$INTERVAL_SEC" =~ ^[0-9]+$ ]]; th
     echo "Error: timeout and interval must be integer seconds." >&2
     exit 1
 fi
-if [[ -n "$HEAD_SHA" && ! "$HEAD_SHA" =~ ^[0-9a-fA-F]{40}$ ]]; then
-    echo "Error: --sha must be a full 40-character hexadecimal commit SHA." >&2
-    exit 1
-fi
-if [[ -n "$TARGET_REPO" && ! "$TARGET_REPO" =~ ^[^/[:space:]]+/[^/[:space:]]+$ ]]; then
-    echo "Error: --repo must be OWNER/REPO." >&2
-    exit 1
-fi
 
-if [[ "$PURPOSE" != "push" && "$PURPOSE" != "merge" ]]; then
-    echo "Error: --purpose must be push or merge." >&2
-    exit 1
-fi
-
-OWNER="unknown"
-REPO="unknown"
-PLATFORM="unknown"
-if ! OWNER=$(get_repo_owner) || [[ -z "$OWNER" ]]; then
-    record_cannot_assert "repository-owner-unresolvable"
-    exit $?
-fi
-if ! REPO=$(get_repo_name) || [[ -z "$REPO" ]]; then
-    record_cannot_assert "repository-name-unresolvable"
-    exit $?
-fi
-if ! detect_platform > /dev/null; then
-    PLATFORM="${PLATFORM:-unknown}"
-    record_cannot_assert "unsupported-platform"
-    exit $?
-fi
+OWNER=$(get_repo_owner)
+REPO=$(get_repo_name)
+detect_platform > /dev/null
 PLATFORM="${PLATFORM:-unknown}"
 
-if [[ -n "$TARGET_REPO" ]]; then
-    OWNER="${TARGET_REPO%%/*}"
-    REPO="${TARGET_REPO##*/}"
-fi
-
-if [[ -z "$BRANCH" ]]; then
-    if ! BRANCH=$(git symbolic-ref --quiet --short HEAD) || [[ -z "$BRANCH" ]]; then
-        record_cannot_assert "current-branch-unresolvable"
-        exit $?
-    fi
-fi
-
 if [[ "$PLATFORM" == "github" ]]; then
     if ! command -v gh >/dev/null 2>&1; then
-        record_cannot_assert "github-cli-unavailable"
-        exit $?
+        echo "Error: gh CLI is required for GitHub CI queue guard." >&2
+        exit 1
     fi
+    HEAD_SHA=$(github_get_branch_head_sha "$OWNER" "$REPO" "$BRANCH")
     if [[ -z "$HEAD_SHA" ]]; then
-        if ! HEAD_SHA=$(github_get_branch_head_sha "$OWNER" "$REPO" "$BRANCH") || [[ -z "$HEAD_SHA" ]]; then
-            record_cannot_assert "branch-head-unavailable"
-            exit $?
-        fi
+        echo "Error: Could not resolve ${BRANCH} head SHA." >&2
+        exit 1
     fi
     echo "[ci-queue-wait] platform=github purpose=${PURPOSE} branch=${BRANCH} sha=${HEAD_SHA}"
 elif [[ "$PLATFORM" == "gitea" ]]; then
-    if ! HOST=$(get_remote_host) || [[ -z "$HOST" ]]; then
-        record_cannot_assert "remote-host-unresolvable"
-        exit $?
-    fi
-    if ! TOKEN=$(get_gitea_token "$HOST") || [[ -z "$TOKEN" ]]; then
-        record_cannot_assert "credential-unresolvable"
-        exit $?
+    HOST=$(get_remote_host) || {
+        echo "Error: Could not determine remote host." >&2
+        exit 1
+    }
+    TOKEN=$(get_gitea_token "$HOST") || {
+        echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
+        exit 1
+    }
+    HEAD_SHA=$(gitea_get_branch_head_sha "$HOST" "$OWNER/$REPO" "$BRANCH" "$TOKEN")
+    if [[ "$HEAD_SHA" == "__BRANCH_ABSENT__" ]]; then
+        echo "[ci-queue-wait] branch ${BRANCH} not yet on remote — no in-flight pipeline; queue clear."
+        exit 0
     fi
     if [[ -z "$HEAD_SHA" ]]; then
-        if ! HEAD_SHA=$(gitea_get_branch_head_sha "$HOST" "$OWNER/$REPO" "$BRANCH" "$TOKEN"); then
-            record_cannot_assert "branch-head-unavailable"
-            exit $?
-        fi
-        if [[ "$HEAD_SHA" == "__BRANCH_ABSENT__" ]]; then
-            echo "[ci-queue-wait] branch ${BRANCH} not yet on remote — no in-flight pipeline; queue clear."
-            exit 0
-        fi
-        if [[ -z "$HEAD_SHA" ]]; then
-            record_cannot_assert "branch-head-unavailable"
-            exit $?
-        fi
+        echo "Error: Could not resolve ${BRANCH} head SHA." >&2
+        exit 1
     fi
     echo "[ci-queue-wait] platform=gitea purpose=${PURPOSE} branch=${BRANCH} sha=${HEAD_SHA}"
 else
-    record_cannot_assert "unsupported-platform"
-    exit $?
+    echo "Error: Unsupported platform '${PLATFORM}'." >&2
+    exit 1
 fi
 
 START_TS=$(date +%s)
@@ -435,20 +253,14 @@ DEADLINE_TS=$((START_TS + TIMEOUT_SEC))
 while true; do
     NOW_TS=$(date +%s)
     if (( NOW_TS > DEADLINE_TS )); then
-        echo "Error: ASSERTED_NOT_READY state=pending; timed out waiting for CI queue to clear on ${BRANCH} after ${TIMEOUT_SEC}s." >&2
+        echo "Error: Timed out waiting for CI queue to clear on ${BRANCH} after ${TIMEOUT_SEC}s." >&2
         exit 124
     fi
 
     if [[ "$PLATFORM" == "github" ]]; then
-        if ! STATUS_JSON=$(github_get_commit_status_json "$OWNER" "$REPO" "$HEAD_SHA"); then
-            record_cannot_assert "status-provider-unreachable"
-            exit $?
-        fi
+        STATUS_JSON=$(github_get_commit_status_json "$OWNER" "$REPO" "$HEAD_SHA")
     else
-        if ! STATUS_JSON=$(gitea_get_commit_status_json "$HOST" "$OWNER/$REPO" "$HEAD_SHA" "$TOKEN"); then
-            record_cannot_assert "status-provider-unreachable"
-            exit $?
-        fi
+        STATUS_JSON=$(gitea_get_commit_status_json "$HOST" "$OWNER/$REPO" "$HEAD_SHA" "$TOKEN")
     fi
 
     STATE=$(printf '%s' "$STATUS_JSON" | get_state_from_status_json)
@@ -459,24 +271,21 @@ while true; do
             printf '%s' "$STATUS_JSON" | print_pending_contexts
             sleep "$INTERVAL_SEC"
             ;;
-        terminal-success)
-            exit 0
-            ;;
         no-status)
             if [[ "$REQUIRE_STATUS" -eq 1 ]]; then
-                echo "Error: ASSERTED_NOT_READY state=no-status; --require-status was set for ${BRANCH}." >&2
-            else
-                echo "Error: ASSERTED_NOT_READY state=no-status purpose=${PURPOSE} branch=${BRANCH}." >&2
+                echo "Error: No CI status contexts found for ${BRANCH} while --require-status is set." >&2
+                exit 1
             fi
-            exit 3
+            echo "[ci-queue-wait] no status contexts present; proceeding."
+            exit 0
             ;;
-        terminal-failure|malformed|unknown)
-            echo "Error: ASSERTED_NOT_READY state=${STATE} purpose=${PURPOSE} branch=${BRANCH}." >&2
-            exit 3
+        terminal-success|terminal-failure|unknown)
+            # Queue guard only blocks on pending/running/queued states.
+            exit 0
             ;;
         *)
-            echo "Error: ASSERTED_NOT_READY unrecognized-state=${STATE} purpose=${PURPOSE} branch=${BRANCH}." >&2
-            exit 3
+            echo "[ci-queue-wait] unrecognized state '${STATE}', proceeding conservatively."
+            exit 0
             ;;
     esac
 done

packages/mosaic/framework/tools/git/pr-merge.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # pr-merge.sh - Merge pull requests on Gitea or GitHub
-# Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--expect-head SHA] [--co-author-trailers --escalate-to PRINCIPAL]
+# Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--skip-queue-guard]
 
 set -euo pipefail
 
@@ -12,10 +12,8 @@ source "$SCRIPT_DIR/detect-platform.sh"
 PR_NUMBER=""
 MERGE_METHOD="squash"
 DELETE_BRANCH=false
+SKIP_QUEUE_GUARD=false
 DRY_RUN=false
-EXPECT_HEAD=""
-CO_AUTHOR_TRAILERS=false
-ESCALATE_TO=""
 
 usage() {
     cat <<EOF
@@ -27,18 +25,15 @@ Options:
     -n, --number NUMBER     PR number to merge (required)
     -m, --method METHOD     Merge method: squash only (default: squash)
     -d, --delete-branch     Delete the head branch after merge
+        --skip-queue-guard  Skip CI queue guard wait before merge
         --dry-run           Run metadata/login preflight without merging
-        --expect-head SHA   Refuse unless the PR head matches this full commit SHA
-        --co-author-trailers Build verified trailers from linked PR commit authors
-        --escalate-to NAME  Named principal for an unresolved-author BLOCK
     -h, --help              Show this help message
 
 Examples:
     $(basename "$0") -n 42                    # Merge PR #42
     $(basename "$0") -n 42 -m squash          # Squash merge
     $(basename "$0") -n 42 -d                 # Squash merge and delete branch
-    $(basename "$0") -n 42 --expect-head 0123456789abcdef0123456789abcdef01234567
-    $(basename "$0") -n 42 --co-author-trailers --escalate-to tl-mosaic
+    $(basename "$0") -n 42 --skip-queue-guard # Skip queue guard wait
 EOF
     exit "${1:-1}"
 }
@@ -58,30 +53,15 @@ while [[ $# -gt 0 ]]; do
             DELETE_BRANCH=true
             shift
             ;;
+        --skip-queue-guard)
+            SKIP_QUEUE_GUARD=true
+            shift
+            ;;
         --dry-run)
             DRY_RUN=true
+            SKIP_QUEUE_GUARD=true
             shift
             ;;
-        --expect-head)
-            if [[ $# -lt 2 ]]; then
-                echo "Error: --expect-head requires one full commit SHA." >&2
-                exit 1
-            fi
-            EXPECT_HEAD="$2"
-            shift 2
-            ;;
-        --co-author-trailers)
-            CO_AUTHOR_TRAILERS=true
-            shift
-            ;;
-        --escalate-to)
-            if [[ $# -lt 2 ]]; then
-                echo "Error: --escalate-to requires one principal name." >&2
-                exit 1
-            fi
-            ESCALATE_TO="$2"
-            shift 2
-            ;;
         -h|--help)
             usage 0
             ;;
@@ -106,49 +86,18 @@ if [[ "$MERGE_METHOD" != "squash" ]]; then
     echo "Error: Mosaic policy enforces squash merge only. Received '$MERGE_METHOD'." >&2
     exit 1
 fi
-if [[ -n "$EXPECT_HEAD" && ! "$EXPECT_HEAD" =~ ^[0-9a-fA-F]{40}$ ]]; then
-    echo "Error: --expect-head must be a full 40-character hexadecimal commit SHA." >&2
-    exit 1
-fi
-if [[ "$CO_AUTHOR_TRAILERS" == true && -z "$ESCALATE_TO" ]]; then
-    echo "Error: --co-author-trailers requires --escalate-to with a named principal." >&2
-    exit 1
-fi
-if [[ -n "$ESCALATE_TO" && ! "$ESCALATE_TO" =~ ^[A-Za-z0-9_.-]+$ ]]; then
-    echo "Error: --escalate-to must be one exact principal name." >&2
-    exit 1
-fi
-if [[ "$CO_AUTHOR_TRAILERS" != true && -n "$ESCALATE_TO" ]]; then
-    echo "Error: --escalate-to is valid only with --co-author-trailers." >&2
-    exit 1
-fi
 
 PR_METADATA="$("$SCRIPT_DIR/pr-metadata.sh" -n "$PR_NUMBER")"
 BASE_BRANCH="$(printf '%s' "$PR_METADATA" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("baseRefName") or "").strip())')"
-HEAD_BRANCH="$(printf '%s' "$PR_METADATA" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("headRefName") or "").strip())')"
-HEAD_SHA="$(printf '%s' "$PR_METADATA" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("headRefOid") or "").strip())')"
-HEAD_REPO="$(printf '%s' "$PR_METADATA" | python3 -c 'import json, sys; value=json.load(sys.stdin).get("headRepository") or ""; print((value.get("nameWithOwner") or value.get("full_name") or "") if isinstance(value, dict) else str(value).strip())')"
-PR_TITLE="$(printf '%s' "$PR_METADATA" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("title") or "").strip())')"
-PR_AUTHOR="$(printf '%s' "$PR_METADATA" | python3 -c 'import json, sys; value=json.load(sys.stdin).get("author") or ""; print((value.get("login") or "").strip() if isinstance(value, dict) else str(value).strip())')"
 if [[ "$BASE_BRANCH" != "main" ]]; then
     echo "Error: Mosaic policy allows merges only for PRs targeting 'main' (found '$BASE_BRANCH')." >&2
     exit 1
 fi
-if [[ -z "$HEAD_BRANCH" || -z "$HEAD_REPO" || ! "$HEAD_SHA" =~ ^[0-9a-fA-F]{40}$ ]]; then
-    echo "Error: Could not resolve the PR head branch, repository, and full commit SHA for queue inspection." >&2
-    exit 1
-fi
-if [[ -n "$EXPECT_HEAD" && "$HEAD_SHA" != "$EXPECT_HEAD" ]]; then
-    echo "Error: PR head moved: expected $EXPECT_HEAD, found $HEAD_SHA." >&2
-    exit 1
-fi
 
-if [[ "$DRY_RUN" != true ]]; then
+if [[ "$SKIP_QUEUE_GUARD" != true ]]; then
     "$SCRIPT_DIR/ci-queue-wait.sh" \
         --purpose merge \
-        -B "$HEAD_BRANCH" \
-        -R "$HEAD_REPO" \
-        --sha "$HEAD_SHA" \
+        -B "$BASE_BRANCH" \
         -t "${MOSAIC_CI_QUEUE_TIMEOUT_SEC:-900}" \
         -i "${MOSAIC_CI_QUEUE_POLL_SEC:-15}"
 fi
@@ -157,442 +106,79 @@ PLATFORM=$(detect_platform)
 OWNER=$(get_repo_owner)
 REPO=$(get_repo_name)
 
-write_curl_auth_config() {
-    local mode="$1" credential="$2"
-    printf '%s' "$credential" | python3 -c '
-import sys
-mode = sys.argv[1]
-credential = sys.stdin.read()
-if not credential or any(char in credential for char in "\r\n"):
-    raise SystemExit(1)
-escaped = credential.replace("\\", "\\\\").replace("\"", "\\\"")
-if mode == "token":
-    print(f"header = \"Authorization: token {escaped}\"")
-elif mode == "basic":
-    print(f"user = \"{escaped}\"")
-else:
-    raise SystemExit(1)
-' "$mode"
-}
+is_known_tea_empty_identity_failure() {
+    local error_file="$1"
 
-LAST_GITEA_HTTP_CODE="000"
-LAST_GITEA_ERROR=""
-MERGE_TEMP_DIRS=()
-GITEA_CURL_MAX_BYTES="${MOSAIC_GITEA_CURL_MAX_BYTES:-1048576}"
-GITEA_CURL_MAX_TIME="${MOSAIC_GITEA_CURL_MAX_TIME_SEC:-30}"
-GITEA_CURL_CONNECT_TIMEOUT="${MOSAIC_GITEA_CURL_CONNECT_TIMEOUT_SEC:-10}"
-for bound in "$GITEA_CURL_MAX_BYTES" "$GITEA_CURL_MAX_TIME" "$GITEA_CURL_CONNECT_TIMEOUT"; do
-    if [[ ! "$bound" =~ ^[1-9][0-9]*$ ]]; then
-        echo "Error: Gitea curl bounds must be positive integers; refusing request." >&2
-        exit 1
-    fi
-done
-GITEA_CURL_BOUNDS=(
-    --max-filesize "$GITEA_CURL_MAX_BYTES"
-    --max-time "$GITEA_CURL_MAX_TIME"
-    --connect-timeout "$GITEA_CURL_CONNECT_TIMEOUT"
+    python3 - "$error_file" <<'PY'
+import re
+import sys
+
+with open(sys.argv[1], encoding="utf-8", errors="replace") as handle:
+    error = handle.read()
+
+known_empty_identity = re.search(
+    r"user does not exist.*\[.*uid:\s*0,\s*name:\s*\]",
+    error,
+    flags=re.IGNORECASE | re.DOTALL,
 )
-
-format_gitea_error_response() {
-    local response_file="$1"
-    python3 - "$response_file" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], "rb") as handle:
-    raw = handle.read(65536)
-try:
-    response = json.loads(raw.decode("utf-8", errors="replace"))
-except (UnicodeDecodeError, json.JSONDecodeError):
-    message = "non-JSON response omitted"
-else:
-    if isinstance(response, dict):
-        message = response.get("message") or response.get("error")
-        if not message and response.get("errors") is not None:
-            message = json.dumps(response["errors"], separators=(",", ":"))
-    else:
-        message = None
-    if not message:
-        message = "JSON response contained no error message"
-message = str(message)
-if len(message) > 500:
-    message = message[:500] + "..."
-print(ascii(message))
+raise SystemExit(0 if known_empty_identity else 1)
 PY
 }
 
-cleanup_merge_temp_dirs() {
-    local path
-    for path in "${MERGE_TEMP_DIRS[@]}"; do
-        [[ -n "$path" ]] && rm -rf -- "$path"
-    done
-}
-trap cleanup_merge_temp_dirs EXIT
-trap 'exit 130' INT
-trap 'exit 143' TERM
-
-fetch_gitea_pr_head() {
-    local host="$1" auth_mode="$2" credential="$3" work_root="$4"
-    local response_file raw_code api_url auth_config curl_rc
-    response_file=$(mktemp "$work_root/pr-merge-pr.XXXXXX")
-    api_url="https://${host}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}"
-    if ! auth_config=$(write_curl_auth_config "$auth_mode" "$credential"); then
-        echo "Error: Could not construct Gitea authentication config; refusing request." >&2
-        rm -f "$response_file"
-        return 1
-    fi
-    raw_code=$(curl -sS -K - "${GITEA_CURL_BOUNDS[@]}" -w '%{http_code}' -o "$response_file" \
-        -H "User-Agent: curl/8" "$api_url" <<<"$auth_config")
-    curl_rc=$?
-    LAST_GITEA_HTTP_CODE="${raw_code:-000}"
-    if [[ "$curl_rc" -ne 0 ]]; then
-        LAST_GITEA_ERROR="curl transport failed (rc=$curl_rc)"
-        rm -f "$response_file"
-        return 1
-    fi
-    if [[ ! "$raw_code" =~ ^2 ]]; then
-        LAST_GITEA_ERROR=$(format_gitea_error_response "$response_file")
-        rm -f "$response_file"
-        return 1
-    fi
-    if ! python3 - "$response_file" <<'PY'
-import json
-import re
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as handle:
-    pull = json.load(handle)
-head = pull.get("head") if isinstance(pull, dict) else None
-sha = str(head.get("sha") or "") if isinstance(head, dict) else ""
-if not re.fullmatch(r"[0-9a-fA-F]{40}", sha):
-    raise SystemExit(1)
-print(sha)
-PY
-    then
-        echo "Error: Gitea PR response has no valid head SHA; refusing merge." >&2
-        rm -f "$response_file"
-        return 1
-    fi
-    rm -f "$response_file"
-}
-
-fetch_gitea_pr_commits() {
-    local host="$1" auth_mode="$2" credential="$3" work_root="$4"
-    local page page_file combined_file merged_file raw_code page_count api_url auth_config curl_rc
-    mkdir -p "$work_root"
-    if ! auth_config=$(write_curl_auth_config "$auth_mode" "$credential"); then
-        echo "Error: Could not construct Gitea authentication config; refusing request." >&2
-        return 1
-    fi
-    combined_file=$(mktemp "$work_root/pr-merge-commits.XXXXXX")
-    printf '[]' > "$combined_file"
-
-    page=1
-    while true; do
-        page_file=$(mktemp "$work_root/pr-merge-commits-page.XXXXXX")
-        api_url="https://${host}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}/commits?limit=50&page=${page}"
-        raw_code=$(curl -sS -K - "${GITEA_CURL_BOUNDS[@]}" -w '%{http_code}' -o "$page_file" \
-            -H "User-Agent: curl/8" "$api_url" <<<"$auth_config")
-        curl_rc=$?
-        LAST_GITEA_HTTP_CODE="${raw_code:-000}"
-        if [[ "$curl_rc" -ne 0 ]]; then
-            LAST_GITEA_ERROR="curl transport failed (rc=$curl_rc)"
-            rm -f "$page_file" "$combined_file"
-            return 1
-        fi
-        if [[ ! "$raw_code" =~ ^2 ]]; then
-            LAST_GITEA_ERROR=$(format_gitea_error_response "$page_file")
-            rm -f "$page_file" "$combined_file"
-            return 1
-        fi
-
-        if ! page_count=$(python3 - "$page_file" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as handle:
-    page = json.load(handle)
-if not isinstance(page, list):
-    raise SystemExit(1)
-print(len(page))
-PY
-        ); then
-            echo "Error: Gitea PR commits response is not a JSON array; refusing merge." >&2
-            rm -f "$page_file" "$combined_file"
-            return 1
-        fi
-
-        merged_file=$(mktemp "$work_root/pr-merge-commits-merged.XXXXXX")
-        if ! python3 - "$combined_file" "$page_file" > "$merged_file" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as handle:
-    combined = json.load(handle)
-with open(sys.argv[2], encoding="utf-8") as handle:
-    page = json.load(handle)
-json.dump(combined + page, sys.stdout, separators=(",", ":"))
-PY
-        then
-            echo "Error: Could not combine paginated PR commit metadata; refusing merge." >&2
-            rm -f "$page_file" "$combined_file" "$merged_file"
-            return 1
-        fi
-        mv "$merged_file" "$combined_file"
-        rm -f "$page_file"
-
-        if [[ "$page_count" -lt 50 ]]; then
-            break
-        fi
-        page=$((page + 1))
-        if [[ "$page" -gt 1000 ]]; then
-            echo "Error: PR commit pagination exceeded 1000 pages; refusing merge." >&2
-            rm -f "$combined_file"
-            return 1
-        fi
-    done
-
-    cat "$combined_file"
-    rm -f "$combined_file"
-}
-
-# LIMITATION: author.login resolution proves the commit address maps to a registered account.
-# It does NOT prove the named principal authored the commit — git author metadata is self-asserted.
-# This gate checks ATTRIBUTION LINKAGE, not AUTHORSHIP. Commit signing is out of scope and unadopted.
-build_coauthor_message_fields() {
-    local commits_file="$1" context_file="$2" head_file="$3"
-    python3 - "$commits_file" "$context_file" "$head_file" <<'PY'
-import json
-import re
-import sys
-
-commits_path, context_path, head_path = sys.argv[1:]
-with open(commits_path, encoding="utf-8") as handle:
-    commits = json.load(handle)
-head_sha = open(head_path, encoding="utf-8").read().strip()
-context_parts = open(context_path, "rb").read().split(b"\0")
-if len(context_parts) != 4 or context_parts[-1] != b"":
-    raise SystemExit(1)
-poster, title, principal = (part.decode("utf-8") for part in context_parts[:3])
-
-if not isinstance(commits, list) or not commits:
-    print(
-        f"BLOCK: provider returned no PR commits; author identity is unmeasurable. "
-        f"Refusing merge; escalate to named principal '{principal}'.",
-        file=sys.stderr,
-    )
-    raise SystemExit(75)
-if not poster:
-    print(
-        f"BLOCK: PR poster login is empty; refusing merge; "
-        f"escalate to named principal '{principal}'.",
-        file=sys.stderr,
-    )
-    raise SystemExit(75)
-
-if not re.fullmatch(r"[0-9a-fA-F]{40}", head_sha):
-    print(
-        f"BLOCK: inspected PR head SHA is invalid; refusing merge; "
-        f"escalate to named principal '{principal}'.",
-        file=sys.stderr,
-    )
-    raise SystemExit(75)
-
-seen = set()
-trailers = []
-head_seen = False
-for item in commits:
-    if not isinstance(item, dict):
-        print(f"BLOCK: malformed PR commit metadata; escalate to named principal '{principal}'.", file=sys.stderr)
-        raise SystemExit(75)
-    sha = str(item.get("sha") or "<unknown>")
-    if sha == head_sha:
-        head_seen = True
-    commit = item.get("commit") if isinstance(item.get("commit"), dict) else {}
-    commit_author = commit.get("author") if isinstance(commit.get("author"), dict) else {}
-    email = str(commit_author.get("email") or "").strip()
-    provider_author = item.get("author") if isinstance(item.get("author"), dict) else {}
-    login = str(provider_author.get("login") or "").strip()
-
-    if not login:
-        diagnostic_email = email or "<missing>"
-        print(
-            f"BLOCK: commit {sha!r} has author.login=NULL while "
-            f"commit.author.email={diagnostic_email!r}; refusing merge; "
-            f"escalate to named principal '{principal}'.",
-            file=sys.stderr,
-        )
-        raise SystemExit(75)
-    if (
-        not email.isascii()
-        or not email.isprintable()
-        or not re.fullmatch(r"[A-Za-z0-9_.-]+", login)
-        or not re.fullmatch(r"[^<>\s]+@[^<>\s]+", email)
-    ):
-        print(
-            f"BLOCK: commit {sha!r} has unusable linked identity "
-            f"author.login={login!r}, commit.author.email={email!r}; refusing merge; "
-            f"escalate to named principal '{principal}'.",
-            file=sys.stderr,
-        )
-        raise SystemExit(75)
-    if login == poster or login in seen:
-        continue
-    seen.add(login)
-    trailers.append(f"Co-authored-by: {login} <{email}>")
-
-if not head_seen:
-    print(
-        f"BLOCK: inspected PR head is absent from commit enumeration; refusing merge; "
-        f"escalate to named principal '{principal}'.",
-        file=sys.stderr,
-    )
-    raise SystemExit(75)
-if not trailers:
-    print("{}")
-    raise SystemExit(0)
-if not title:
-    print(
-        f"BLOCK: PR title is empty; refusing merge; escalate to named principal '{principal}'.",
-        file=sys.stderr,
-    )
-    raise SystemExit(75)
-if not title.isprintable() or re.match(r"^[A-Za-z-]+-[Bb]y:", title):
-    print(
-        f"BLOCK: PR title is not one printable, non-trailer line; refusing merge; "
-        f"escalate to named principal '{principal}'.",
-        file=sys.stderr,
-    )
-    raise SystemExit(75)
-
-print(json.dumps({
-    "MergeTitleField": title,
-    "MergeMessageField": "\n".join(trailers),
-}, separators=(",", ":")))
-PY
-}
-
-merge_gitea_api_attempt() {
-    local host="$1" auth_mode="$2" credential="$3"
-    local api_url attempt_dir body_file raw_code commits_file fields_file context_file head_file payload_file work_root attempt_rc auth_config curl_rc
-    LAST_GITEA_HTTP_CODE="000"
-    LAST_GITEA_ERROR=""
-    api_url="https://${host}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}/merge"
-    work_root="${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}"
-    mkdir -p "$work_root"
-    attempt_dir=$(mktemp -d "$work_root/pr-merge-attempt.XXXXXX")
-    chmod 0700 "$attempt_dir"
-    MERGE_TEMP_DIRS+=("$attempt_dir")
-    body_file=$(mktemp "$attempt_dir/api-response.XXXXXX")
-    fields_file=$(mktemp "$attempt_dir/message-fields.XXXXXX")
-    payload_file=$(mktemp "$attempt_dir/payload.XXXXXX")
-    printf '{}' > "$fields_file"
-
-    if [[ "$CO_AUTHOR_TRAILERS" == true ]]; then
-        commits_file=$(mktemp "$attempt_dir/pr-merge-commits-input.XXXXXX")
-        context_file=$(mktemp "$attempt_dir/pr-merge-message-context.XXXXXX")
-        head_file=$(mktemp "$attempt_dir/pr-merge-head-input.XXXXXX")
-        printf '%s\0%s\0%s\0' "$PR_AUTHOR" "$PR_TITLE" "$ESCALATE_TO" > "$context_file"
-        if fetch_gitea_pr_head "$host" "$auth_mode" "$credential" "$attempt_dir" > "$head_file"; then
-            :
-        else
-            attempt_rc=$?
-            rm -f "$body_file" "$fields_file" "$payload_file" "$commits_file" "$context_file" "$head_file"
-            return "$attempt_rc"
-        fi
-        if [[ "$(<"$head_file")" != "$HEAD_SHA" ]]; then
-            echo "BLOCK: authenticated PR head moved from reviewed $HEAD_SHA to $(<"$head_file"); refusing merge; escalate to named principal '$ESCALATE_TO'." >&2
-            rm -f "$body_file" "$fields_file" "$payload_file" "$commits_file" "$context_file" "$head_file"
-            return 75
-        fi
-        if fetch_gitea_pr_commits "$host" "$auth_mode" "$credential" "$attempt_dir" > "$commits_file"; then
-            :
-        else
-            attempt_rc=$?
-            rm -f "$body_file" "$fields_file" "$payload_file" "$commits_file" "$context_file" "$head_file"
-            return "$attempt_rc"
-        fi
-        if build_coauthor_message_fields "$commits_file" "$context_file" "$head_file" > "$fields_file"; then
-            :
-        else
-            attempt_rc=$?
-            rm -f "$body_file" "$fields_file" "$payload_file" "$commits_file" "$context_file" "$head_file"
-            return "$attempt_rc"
-        fi
-        rm -f "$commits_file" "$context_file" "$head_file"
-    fi
-
-    if ! python3 - "$fields_file" "$HEAD_SHA" "$DELETE_BRANCH" > "$payload_file" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as handle:
-    fields = json.load(handle)
-head_sha, delete_branch = sys.argv[2:]
-payload = {"Do": "squash", "head_commit_id": head_sha}
-if delete_branch == "true":
-    payload["delete_branch_after_merge"] = True
-payload.update(fields)
-allowed = {"Do", "head_commit_id", "delete_branch_after_merge", "MergeTitleField", "MergeMessageField"}
-if payload.get("Do") != "squash" or set(payload) - allowed:
-    raise SystemExit(1)
-print(json.dumps(payload, separators=(",", ":")))
-PY
-    then
-        rm -f "$body_file" "$fields_file" "$payload_file"
-        return 1
-    fi
-    rm -f "$fields_file"
-
-    if ! auth_config=$(write_curl_auth_config "$auth_mode" "$credential"); then
-        echo "Error: Could not construct Gitea authentication config; refusing request." >&2
-        rm -f "$body_file" "$payload_file"
-        return 1
-    fi
-    raw_code=$(curl -sS -K - "${GITEA_CURL_BOUNDS[@]}" -w '%{http_code}' -o "$body_file" \
-        -X POST -H "User-Agent: curl/8" \
-        -H 'Content-Type: application/json' \
-        --data-binary "@$payload_file" "$api_url" <<<"$auth_config")
-    curl_rc=$?
-    LAST_GITEA_HTTP_CODE="${raw_code:-000}"
-    if [[ "$curl_rc" -ne 0 ]]; then
-        LAST_GITEA_ERROR="curl transport failed (rc=$curl_rc)"
-        rm -f "$body_file" "$payload_file"
-        rm -rf -- "$attempt_dir"
-        return 1
-    fi
-    if [[ ! "$raw_code" =~ ^2 ]]; then
-        LAST_GITEA_ERROR=$(format_gitea_error_response "$body_file")
-    fi
-    rm -f "$body_file" "$payload_file"
-    rm -rf -- "$attempt_dir"
-    [[ "$raw_code" =~ ^2 ]]
-}
-
 merge_gitea_with_api() {
-    local host="$1" token attempt_rc
+    local host="$1" api_url token basic_auth body_file raw_code payload
+    api_url="https://${host}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}/merge"
+    mkdir -p "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}"
+    body_file=$(mktemp "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}/pr-merge-api-response.XXXXXX")
+    payload='{"Do":"squash"}'
 
-    if ! token=$(get_gitea_token "$host"); then
-        echo "Error: Could not resolve the required Gitea token; refusing merge without changing principals." >&2
-        return 1
+    token=$(get_gitea_token "$host" || true)
+    if [[ -n "$token" ]]; then
+        raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
+            -X POST \
+            -H "User-Agent: curl/8" \
+            -H "Authorization: token $token" \
+            -H 'Content-Type: application/json' \
+            -d "$payload" \
+            "$api_url" || true)
+        if [[ "$raw_code" =~ ^2 ]]; then
+            rm -f "$body_file"
+            return 0
+        fi
     fi
-    if [[ -z "$token" ]]; then
-        echo "Error: Required Gitea token resolved empty; refusing merge without changing principals." >&2
-        return 1
+
+    basic_auth=$(get_gitea_basic_auth "$host" || true)
+    if [[ -n "$basic_auth" ]]; then
+        raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
+            -X POST \
+            -u "$basic_auth" \
+            -H "User-Agent: curl/8" \
+            -H 'Content-Type: application/json' \
+            -d "$payload" \
+            "$api_url" || true)
+        if [[ "$raw_code" =~ ^2 ]]; then
+            rm -f "$body_file"
+            return 0
+        fi
     fi
-    if merge_gitea_api_attempt "$host" token "$token"; then
-        return 0
-    else
-        attempt_rc=$?
-    fi
-    if [[ "$attempt_rc" -eq 75 ]]; then
-        return 75
-    fi
-    if [[ "$LAST_GITEA_HTTP_CODE" != "401" ]]; then
-        echo "Error: Gitea API merge failed with the identity-bound token (HTTP ${LAST_GITEA_HTTP_CODE:-000}).${LAST_GITEA_ERROR:+ Provider response: $LAST_GITEA_ERROR}" >&2
-        return 1
-    fi
-    echo "Error: Gitea API rejected the identity-bound token with HTTP 401; refusing cross-principal credential fallback." >&2
+
+    python3 - "${raw_code:-000}" "$body_file" <<'PY' >&2
+import json
+import sys
+code, path = sys.argv[1], sys.argv[2]
+try:
+    with open(path, encoding="utf-8", errors="replace") as handle:
+        raw = handle.read(500)
+    data = json.loads(raw) if raw else {}
+    message = data.get("message") or data.get("error") or raw or "empty response"
+except Exception:
+    try:
+        message = open(path, encoding="utf-8", errors="replace").read(500) or "empty response"
+    except Exception:
+        message = "unreadable response"
+print(f"Error: Gitea API merge failed with HTTP {code}: {message}")
+PY
+    rm -f "$body_file"
     return 1
 }
 
@@ -602,10 +188,11 @@ if [[ "$DRY_RUN" == true ]]; then
             echo "Error: Cannot determine host from origin remote URL" >&2
             exit 1
         }
-        if [[ "$CO_AUTHOR_TRAILERS" == true ]]; then
-            echo "Dry run: would verify PR commit authors and merge PR #$PR_NUMBER on $HOST with authenticated Gitea API message fields (base=$BASE_BRANCH, method=squash)."
+        TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
+        if [[ -n "$TEA_LOGIN" ]]; then
+            echo "Dry run: would merge PR #$PR_NUMBER on $HOST with tea login '$TEA_LOGIN' (base=$BASE_BRANCH, method=squash)."
         else
-            echo "Dry run: would merge PR #$PR_NUMBER on $HOST with the authenticated exact-head Gitea API path (base=$BASE_BRANCH, method=squash)."
+            echo "Dry run: would merge PR #$PR_NUMBER on $HOST with authenticated Gitea API fallback (base=$BASE_BRANCH, method=squash)."
         fi
     else
         echo "Dry run: would merge PR #$PR_NUMBER on $PLATFORM (base=$BASE_BRANCH, method=squash)."
@@ -615,11 +202,7 @@ fi
 
 case "$PLATFORM" in
     github)
-        if [[ "$CO_AUTHOR_TRAILERS" == true ]]; then
-            echo "Error: --co-author-trailers currently requires the Gitea REST message-field contract." >&2
-            exit 1
-        fi
-        cmd=(gh pr merge "$PR_NUMBER" --squash --match-head-commit "$HEAD_SHA")
+        cmd=(gh pr merge "$PR_NUMBER" --squash)
         [[ "$DELETE_BRANCH" == true ]] && cmd+=(--delete-branch)
         "${cmd[@]}"
         ;;
@@ -628,9 +211,32 @@ case "$PLATFORM" in
             echo "Error: Cannot determine host from origin remote URL" >&2
             exit 1
         }
-        # Gitea's API head_commit_id is an atomic compare-and-merge precondition.
-        # tea cannot express it, so every Gitea merge uses the authenticated API path.
-        merge_gitea_with_api "$HOST"
+        TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
+
+        if [[ -n "$TEA_LOGIN" ]]; then
+            mkdir -p "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}"
+            TEA_ERROR_FILE=$(mktemp "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}/pr-merge-tea-error.XXXXXX")
+            if tea pr merge "$PR_NUMBER" --style squash --repo "$OWNER/$REPO" --login "$TEA_LOGIN" 2> "$TEA_ERROR_FILE"; then
+                rm -f "$TEA_ERROR_FILE"
+            elif is_known_tea_empty_identity_failure "$TEA_ERROR_FILE"; then
+                cat "$TEA_ERROR_FILE" >&2
+                echo "Known tea empty identity failure detected; using authenticated Gitea API merge fallback." >&2
+                rm -f "$TEA_ERROR_FILE"
+                merge_gitea_with_api "$HOST"
+            else
+                cat "$TEA_ERROR_FILE" >&2
+                rm -f "$TEA_ERROR_FILE"
+                exit 1
+            fi
+        else
+            echo "No tea login configured for $HOST; using authenticated Gitea API merge fallback." >&2
+            merge_gitea_with_api "$HOST"
+        fi
+
+        # Delete branch after merge if requested
+        if [[ "$DELETE_BRANCH" == true ]]; then
+            echo "Note: Branch deletion after merge may need to be done separately with tea" >&2
+        fi
         ;;
     *)
         echo "Error: Could not detect git platform" >&2

packages/mosaic/framework/tools/git/pr-metadata.sh

@@ -109,7 +109,7 @@ PY
 detect_platform > /dev/null
 
 if [[ "$PLATFORM" == "github" ]]; then
-    METADATA=$(gh pr view "$PR_NUMBER" --json number,title,body,state,author,headRefName,headRefOid,headRepository,baseRefName,files,labels,assignees,milestone,createdAt,updatedAt,url,isDraft)
+    METADATA=$(gh pr view "$PR_NUMBER" --json number,title,body,state,author,headRefName,baseRefName,files,labels,assignees,milestone,createdAt,updatedAt,url,isDraft)
     write_metadata "$METADATA"
 elif [[ "$PLATFORM" == "gitea" ]]; then
     OWNER=$(get_repo_owner)
@@ -182,25 +182,6 @@ if isinstance(head_ref, str) and head_ref.startswith('refs/pull/'):
         data.get('head_ref'),
         head_ref,
     )
-head_sha = first_non_empty(
-    nested(data, 'head', 'sha'),
-    nested(data, 'head', 'id'),
-    data.get('head_sha'),
-)
-head_repo = first_non_empty(
-    nested(data, 'head', 'repo', 'full_name'),
-    nested(data, 'head', 'repo', 'name_with_owner'),
-)
-if not head_repo:
-    head_repo_owner = first_non_empty(
-        nested(data, 'head', 'repo', 'owner', 'login'),
-        nested(data, 'head', 'repo', 'owner', 'username'),
-        nested(data, 'head', 'repo', 'owner_name'),
-    )
-    head_repo_name = first_non_empty(nested(data, 'head', 'repo', 'name'))
-    if head_repo_owner and head_repo_name:
-        head_repo = f'{head_repo_owner}/{head_repo_name}'
-
 base_ref = first_non_empty(
     nested(data, 'base', 'ref'),
     nested(data, 'base', 'name'),
@@ -226,8 +207,6 @@ normalized = {
     'state': data.get('state'),
     'author': nested(data, 'user', 'login') or '',
     'headRefName': head_ref,
-    'headRefOid': head_sha,
-    'headRepository': head_repo,
     'baseRefName': base_ref,
     'labels': [l.get('name', '') for l in data.get('labels', []) if isinstance(l, dict)],
     'assignees': [a.get('login', '') for a in data.get('assignees', []) if isinstance(a, dict)],

packages/mosaic/framework/tools/git/test-ci-queue-wait-branch-absent.sh

@@ -13,7 +13,7 @@
 # Covers:
 #   (a) 404 branch-absent          -> exit 0, "queue clear" message.
 #   (b) 200 existing branch + a terminal CI state -> unchanged behavior.
-#   (c) genuine API error (500)    -> loud, audited CANNOT_ASSERT; degraded exit 0.
+#   (c) genuine API error (500)    -> still fail-closed (nonzero exit).
 
 set -euo pipefail
 
@@ -62,7 +62,7 @@ case "$mode" in
     200)  code=200; body='{"commit":{"id":"deadbeefcafef00d0123456789abcdef01234567"}}' ;;
     500)  code=500; body='{"message":"internal server error"}' ;;
     no-status)         code=200; body='{}' ;;
-    terminal-success)  code=200; body='{"state":"success","statuses":[{"status":"success"}]}' ;;
+    terminal-success)  code=200; body='{"state":"success"}' ;;
     *)
         echo "curl stub: unknown mode=$mode" >&2
         exit 2
@@ -91,7 +91,6 @@ run_ci_queue_wait() {
         export MOSAIC_CREDENTIALS_FILE="$WORK_DIR/no-credentials.json"
         export GITEA_TOKEN="stub-token"
         export GITEA_URL="https://git.example.test"
-        export MOSAIC_CI_QUEUE_AUDIT_LOG="$WORK_DIR/audit/ci-queue-wait.jsonl"
         "$SCRIPT_DIR/ci-queue-wait.sh" -B "$branch" --purpose push -t 5 -i 1
     )
 }
@@ -132,26 +131,19 @@ elif [[ "$out_b" == *"queue clear"* ]]; then
     fail=1
 fi
 
-# (c) genuine API error (500) -> CANNOT_ASSERT is loud and audited, but does not brick delivery.
+# (c) genuine API error (500) -> still fail-closed, exit nonzero.
 set +e
 out_c=$(MOSAIC_STUB_BRANCH_MODE=500 run_ci_queue_wait "feat/some-branch" 2>&1)
 status_c=$?
 set -e
-if [[ "$status_c" -ne 0 ]]; then
-    echo "FAIL(c): expected degraded exit 0 for provider unavailability, got $status_c" >&2
-    echo "$out_c" >&2
-    fail=1
-elif [[ "$out_c" != *"CANNOT_ASSERT"* ]]; then
-    echo "FAIL(c): expected a loud CANNOT_ASSERT diagnostic" >&2
+if [[ "$status_c" -eq 0 ]]; then
+    echo "FAIL(c): expected a nonzero exit for a genuine 500 API error, got 0" >&2
     echo "$out_c" >&2
     fail=1
 elif [[ "$out_c" == *"queue clear"* ]]; then
     echo "FAIL(c): a genuine API error must not be reported as queue-clear" >&2
     echo "$out_c" >&2
     fail=1
-elif [[ ! -s "$WORK_DIR/audit/ci-queue-wait.jsonl" ]]; then
-    echo "FAIL(c): expected a durable CANNOT_ASSERT audit record" >&2
-    fail=1
 fi
 
 if [[ "$fail" -eq 0 ]]; then

packages/mosaic/framework/tools/git/test-ci-queue-wait-github-checks.sh

@@ -1,95 +0,0 @@
-#!/usr/bin/env bash
-# GitHub Actions uses Checks API check-runs, not only legacy commit statuses.
-
-set -u
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/ci-queue-wait-github-checks}"
-REPO_DIR="$WORK_DIR/repo"
-STUB_DIR="$WORK_DIR/stubs"
-rm -rf "$WORK_DIR"
-mkdir -p "$REPO_DIR" "$STUB_DIR"
-git -C "$REPO_DIR" init -q
-git -C "$REPO_DIR" checkout -q -b fix/github-checks
-git -C "$REPO_DIR" remote add origin https://github.com/acme/widgets.git
-
-cat > "$STUB_DIR/gh" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-endpoint=""
-for arg in "$@"; do
-    [[ "$arg" == repos/* ]] && endpoint="$arg"
-done
-printf '%s\n' "$*" >> "${MOSAIC_GH_CALL_LOG:?}"
-case "$endpoint" in
-    repos/acme/widgets/branches/fix/github-checks)
-        printf '%s\n' '0123456789abcdef0123456789abcdef01234567'
-        ;;
-    repos/acme/widgets/commits/*/statuses?per_page=100)
-        printf '%s\n' '[[]]'
-        ;;
-    repos/acme/widgets/commits/*/check-runs?per_page=100\&filter=latest)
-        case "${MOSAIC_GH_CHECK_MODE:?}" in
-            success) printf '%s\n' '[{"total_count":1,"check_runs":[{"name":"ci","status":"completed","conclusion":"success"}]}]' ;;
-            pending) printf '%s\n' '[{"total_count":1,"check_runs":[{"name":"ci","status":"in_progress","conclusion":null}]}]' ;;
-            failure) printf '%s\n' '[{"total_count":1,"check_runs":[{"name":"ci","status":"completed","conclusion":"failure"}]}]' ;;
-            late-failure) printf '%s\n' '[{"total_count":2,"check_runs":[{"name":"first-page","status":"completed","conclusion":"success"}]},{"total_count":2,"check_runs":[{"name":"later-page","status":"completed","conclusion":"failure"}]}]' ;;
-            *) exit 2 ;;
-        esac
-        ;;
-    *) echo "unexpected gh endpoint: $endpoint" >&2; exit 2 ;;
-esac
-SH
-chmod +x "$STUB_DIR/gh"
-
-run_guard() {
-    local mode="$1"
-    (
-        cd "$REPO_DIR" || exit
-        export PATH="$STUB_DIR:$PATH"
-        export MOSAIC_GH_CHECK_MODE="$mode"
-        export MOSAIC_GH_CALL_LOG="$WORK_DIR/gh-calls.log"
-        export MOSAIC_CI_QUEUE_AUDIT_LOG="$WORK_DIR/audit.jsonl"
-        "$SCRIPT_DIR/ci-queue-wait.sh" --purpose push -t 0 -i 0
-    )
-}
-
-failures=0
-assert_case() {
-    local mode="$1" expected_rc="$2" expected_state="$3" output rc
-    set +e
-    output=$(run_guard "$mode" 2>&1)
-    rc=$?
-    set -e
-    if [[ "$expected_rc" == zero && "$rc" -ne 0 ]]; then
-        echo "FAIL github-$mode: expected rc=0, got $rc" >&2
-        failures=$((failures + 1))
-    elif [[ "$expected_rc" == nonzero && "$rc" -eq 0 ]]; then
-        echo "FAIL github-$mode: expected rc!=0, got 0" >&2
-        failures=$((failures + 1))
-    fi
-    if [[ "$output" != *"state=$expected_state"* ]]; then
-        echo "FAIL github-$mode: expected state=$expected_state, got:" >&2
-        printf '%s\n' "$output" >&2
-        failures=$((failures + 1))
-    fi
-}
-
-set -e
-: > "$WORK_DIR/gh-calls.log"
-assert_case success zero terminal-success
-assert_case pending nonzero pending
-assert_case failure nonzero terminal-failure
-assert_case late-failure nonzero terminal-failure
-
-if [[ $(grep -c 'check-runs?per_page=100&filter=latest' "$WORK_DIR/gh-calls.log") -lt 4 ]]; then
-    echo "FAIL: expected every case to query all Checks API pages" >&2
-    failures=$((failures + 1))
-fi
-
-if [[ "$failures" -ne 0 ]]; then
-    echo "GitHub check-runs regression failed ($failures assertions)" >&2
-    exit 1
-fi
-
-echo "GitHub check-runs regression passed (4/4 cases, including later-page failure)"

packages/mosaic/framework/tools/git/test-ci-queue-wait-tristate.sh

@@ -1,364 +0,0 @@
-#!/usr/bin/env bash
-# Exit-asserting RM-03 regression harness for ci-queue-wait.sh.
-# Every case is a process-level assertion: a classifier-only green cannot satisfy it.
-
-set -u
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/ci-queue-wait-tristate}"
-REPO_DIR="$WORK_DIR/repo"
-STUB_DIR="$WORK_DIR/stubs"
-AUDIT_LOG="$WORK_DIR/audit/ci-queue-wait.jsonl"
-STATUS_OBSERVED="$WORK_DIR/status-observed"
-CLOCK_LOG="$WORK_DIR/clock.log"
-WATCHDOG_PYTHON="/usr/bin/python3"
-WATCHDOG_SCRIPT="$WORK_DIR/real-clock-watchdog.py"
-WATCHDOG_TIMEOUT_SEC=5
-WATCHDOG_EXIT=90
-FEATURE_BRANCH="fix/rm-03-fixture"
-
-if [[ ! -x "$WATCHDOG_PYTHON" ]]; then
-    echo "FAIL setup: required real-clock watchdog runtime is unavailable at $WATCHDOG_PYTHON" >&2
-    exit 1
-fi
-
-rm -rf "$WORK_DIR"
-mkdir -p "$REPO_DIR" "$STUB_DIR"
-cat > "$WATCHDOG_SCRIPT" <<'PY'
-import os
-import signal
-import subprocess
-import sys
-
-if len(sys.argv) < 3:
-    raise SystemExit(2)
-
-timeout_seconds = float(sys.argv[1])
-process = subprocess.Popen(sys.argv[2:], start_new_session=True)
-try:
-    return_code = process.wait(timeout=timeout_seconds)
-except subprocess.TimeoutExpired:
-    try:
-        os.killpg(process.pid, signal.SIGKILL)
-    except ProcessLookupError:
-        pass
-    process.wait()
-    print(
-        f"FAIL HANG watchdog: subject exceeded {timeout_seconds:g}s "
-        "before completing its intended path",
-        file=sys.stderr,
-    )
-    raise SystemExit(90)
-
-if return_code < 0:
-    raise SystemExit(128 - return_code)
-raise SystemExit(return_code)
-PY
-git -C "$REPO_DIR" init -q
-git -C "$REPO_DIR" checkout -q -b "$FEATURE_BRANCH"
-git -C "$REPO_DIR" remote add origin https://git.example.test/acme/widgets.git
-
-cat > "$STUB_DIR/curl" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-
-url=""
-has_write_out=0
-for arg in "$@"; do
-    case "$arg" in
-        -w) has_write_out=1 ;;
-        http://*|https://*) url="$arg" ;;
-    esac
-done
-printf '%s\n' "$url" >> "${MOSAIC_STUB_URL_LOG:?}"
-
-case "$url" in
-    */branches/*)
-        if [[ "${MOSAIC_STUB_BRANCH_MODE:-ok}" == "hang-before-provider" ]]; then
-            while :; do :; done
-        fi
-        if [[ "${MOSAIC_STUB_BRANCH_MODE:-ok}" == "unreachable" ]]; then
-            exit 7
-        fi
-        body='{"commit":{"id":"deadbeefcafef00d0123456789abcdef01234567"}}'
-        if [[ "$has_write_out" -eq 1 ]]; then
-            printf '%s\n200' "$body"
-        else
-            printf '%s' "$body"
-        fi
-        ;;
-    */status)
-        : > "${MOSAIC_STUB_STATUS_OBSERVED:?}"
-        case "${MOSAIC_STUB_STATUS_MODE:?}" in
-            success)   printf '%s' '{"state":"success","statuses":[{"status":"success"}]}' ;;
-            pending)   printf '%s' '{"state":"pending","statuses":[{"status":"pending","context":"ci/test"}]}' ;;
-            failure)   printf '%s' '{"state":"failure","statuses":[{"status":"failure"}]}' ;;
-            no-status) printf '%s' '{"state":"","statuses":[]}' ;;
-            aggregate-success-no-status) printf '%s' '{"state":"success","statuses":[]}' ;;
-            malformed) printf '%s' 'not-json' ;;
-            malformed-statuses-type) printf '%s' '{"state":"success","statuses":"corrupt"}' ;;
-            malformed-status-entry) printf '%s' '{"state":"success","statuses":[null]}' ;;
-            large-success)
-                python3 -c 'import json; print(json.dumps({"state":"success", "statuses":[{"status":"success"}], "padding":"x" * (160 * 1024)}), end="")'
-                ;;
-            unreachable) exit 7 ;;
-            *) echo "unknown status mode" >&2; exit 2 ;;
-        esac
-        ;;
-    *) echo "unexpected curl URL: $url" >&2; exit 2 ;;
-esac
-SH
-
-cat > "$STUB_DIR/date" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-
-if [[ "$#" -ne 1 || "$1" != "+%s" ]]; then
-    echo "unexpected date invocation: $*" >&2
-    exit 2
-fi
-
-if [[ -e "${MOSAIC_STUB_STATUS_OBSERVED:?}" ]]; then
-    printf 'date-phase=after-status\n' >> "${MOSAIC_STUB_CLOCK_LOG:?}"
-    printf '1002\n'
-else
-    printf 'date-phase=before-status\n' >> "${MOSAIC_STUB_CLOCK_LOG:?}"
-    printf '1000\n'
-fi
-SH
-
-cat > "$STUB_DIR/sleep" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-printf 'sleep-after-status=%s\n' "$*" >> "${MOSAIC_STUB_CLOCK_LOG:?}"
-SH
-chmod +x "$STUB_DIR/curl" "$STUB_DIR/date" "$STUB_DIR/sleep"
-
-run_guard() {
-    local status_mode="$1"
-    local audit_log="${2:-$AUDIT_LOG}"
-    shift 2 || true
-    (
-        cd "$REPO_DIR" || exit
-        export PATH="$STUB_DIR:$PATH"
-        export MOSAIC_CREDENTIALS_FILE="$WORK_DIR/no-credentials.json"
-        if [[ "$status_mode" == "credential-unresolvable" ]]; then
-            export HOME="$WORK_DIR/empty-home"
-            mkdir -p "$HOME"
-            unset GITEA_TOKEN GITEA_URL MOSAIC_GIT_IDENTITY
-            export MOSAIC_STUB_STATUS_MODE=success
-        else
-            export GITEA_TOKEN=stub-token
-            export GITEA_URL=https://git.example.test
-            export MOSAIC_STUB_STATUS_MODE="$status_mode"
-        fi
-        rm -f "$STATUS_OBSERVED" "$CLOCK_LOG"
-        export MOSAIC_STUB_URL_LOG="$WORK_DIR/urls.log"
-        export MOSAIC_STUB_STATUS_OBSERVED="$STATUS_OBSERVED"
-        export MOSAIC_STUB_CLOCK_LOG="$CLOCK_LOG"
-        export MOSAIC_CI_QUEUE_AUDIT_LOG="$audit_log"
-        # Provider observation is the synchronization event. The one-second
-        # timeout is subject semantics under virtual time, never a wall wait.
-        # The absolute Python runtime uses an internal monotonic wait and kills
-        # the subject's isolated process group. Neither operation can resolve
-        # to the virtual date/sleep stubs at the front of PATH.
-        local subject_rc
-        if "$WATCHDOG_PYTHON" "$WATCHDOG_SCRIPT" "$WATCHDOG_TIMEOUT_SEC" \
-            "$SCRIPT_DIR/ci-queue-wait.sh" --purpose "${MOSAIC_TEST_PURPOSE:-push}" -t 1 -i 1 "$@"; then
-            subject_rc=0
-        else
-            subject_rc=$?
-        fi
-        return "$subject_rc"
-    )
-}
-
-failures=0
-assert_provider_observed() {
-    local name="$1" require_expiration="${2:-0}"
-    if [[ ! -e "$STATUS_OBSERVED" ]]; then
-        echo "FAIL $name: status provider was not observed" >&2
-        failures=$((failures + 1))
-    fi
-    if [[ ! -s "$CLOCK_LOG" ]] || ! grep -q '^date-phase=before-status$' "$CLOCK_LOG"; then
-        echo "FAIL $name: virtual clock interception did not run before provider observation" >&2
-        failures=$((failures + 1))
-    fi
-    if [[ "$require_expiration" -eq 1 ]]; then
-        if ! grep -q '^sleep-after-status=' "$CLOCK_LOG" || ! grep -q '^date-phase=after-status$' "$CLOCK_LOG"; then
-            echo "FAIL $name: pending path did not expire after provider observation" >&2
-            failures=$((failures + 1))
-        fi
-    fi
-}
-
-run_assertion() {
-    local name="$1" expected_rc="$2" status_mode="$3" required_text="$4"
-    local output rc
-    shift 4
-    set +e
-    output=$(run_guard "$status_mode" "$AUDIT_LOG" "$@" 2>&1)
-    rc=$?
-    set -e
-
-    case "$expected_rc" in
-        zero)
-            if [[ "$rc" -ne 0 ]]; then
-                echo "FAIL $name: expected rc=0, got rc=$rc" >&2
-                failures=$((failures + 1))
-            fi
-            ;;
-        nonzero)
-            if [[ "$rc" -eq 0 ]]; then
-                echo "FAIL $name: expected rc!=0, got rc=0" >&2
-                failures=$((failures + 1))
-            fi
-            ;;
-        not126)
-            if [[ "$rc" -eq 126 ]]; then
-                echo "FAIL $name: payload transport hit ARG_MAX (rc=126)" >&2
-                failures=$((failures + 1))
-            fi
-            ;;
-    esac
-    if [[ "$output" != *"$required_text"* ]]; then
-        echo "FAIL $name: output missing '$required_text' (rc=$rc)" >&2
-        printf '%s\n' "$output" >&2
-        failures=$((failures + 1))
-    fi
-    if [[ "$status_mode" != "credential-unresolvable" ]]; then
-        if [[ "$status_mode" == "pending" ]]; then
-            assert_provider_observed "$name" 1
-        else
-            assert_provider_observed "$name"
-        fi
-    fi
-}
-
-set -e
-: > "$WORK_DIR/urls.log"
-run_assertion success zero success 'state=terminal-success'
-run_assertion pending nonzero pending 'ASSERTED_NOT_READY'
-run_assertion failure nonzero failure 'ASSERTED_NOT_READY'
-run_assertion no-status nonzero no-status 'ASSERTED_NOT_READY'
-run_assertion aggregate-success-no-status nonzero aggregate-success-no-status 'ASSERTED_NOT_READY'
-run_assertion malformed nonzero malformed 'ASSERTED_NOT_READY'
-run_assertion malformed-statuses-type nonzero malformed-statuses-type 'ASSERTED_NOT_READY'
-run_assertion malformed-status-entry nonzero malformed-status-entry 'ASSERTED_NOT_READY'
-run_assertion large-payload not126 large-success 'state=terminal-success'
-run_assertion credential-unresolvable zero credential-unresolvable 'CANNOT_ASSERT'
-run_assertion provider-unreachable zero unreachable 'CANNOT_ASSERT'
-
-# Positive liveness control: a subject mutant hangs before the branch lookup
-# can reach the status provider. Only the independent real-clock watchdog may
-# terminate it, and its failure must be distinct from subject timeout rc=124.
-set +e
-watchdog_output=$(MOSAIC_STUB_BRANCH_MODE=hang-before-provider run_guard success "$AUDIT_LOG" 2>&1)
-watchdog_rc=$?
-set -e
-if [[ "$watchdog_rc" -ne "$WATCHDOG_EXIT" ]]; then
-    echo "FAIL watchdog-control: expected hang-specific rc=$WATCHDOG_EXIT, got rc=$watchdog_rc" >&2
-    failures=$((failures + 1))
-fi
-if [[ "$watchdog_output" != *"FAIL HANG watchdog:"* ]]; then
-    echo "FAIL watchdog-control: expected distinct hang-specific diagnostic" >&2
-    printf '%s\n' "$watchdog_output" >&2
-    failures=$((failures + 1))
-fi
-if [[ -e "$STATUS_OBSERVED" ]]; then
-    echo "FAIL watchdog-control: hanging mutant unexpectedly reached the status provider" >&2
-    failures=$((failures + 1))
-fi
-
-if [[ ! -s "$AUDIT_LOG" ]] || ! grep -q '"outcome":"CANNOT_ASSERT"' "$AUDIT_LOG"; then
-    echo "FAIL provider-unreachable-audit: expected durable CANNOT_ASSERT JSONL record" >&2
-    failures=$((failures + 1))
-fi
-
-# Merge cannot proceed without exact-head evidence. CANNOT_ASSERT is retryable exit 75,
-# distinct from ASSERTED_NOT_READY (3/124), and still writes its audit record.
-merge_audit_lines_before=$(wc -l < "$AUDIT_LOG")
-set +e
-merge_unreachable_output=$(MOSAIC_TEST_PURPOSE=merge run_guard unreachable "$AUDIT_LOG" 2>&1)
-merge_unreachable_rc=$?
-set -e
-if [[ "$merge_unreachable_rc" -ne 75 ]]; then
-    echo "FAIL merge-provider-unreachable: expected rc=75, got rc=$merge_unreachable_rc" >&2
-    failures=$((failures + 1))
-fi
-if [[ "$merge_unreachable_output" != *"CANNOT_ASSERT"* ]]; then
-    echo "FAIL merge-provider-unreachable: expected loud CANNOT_ASSERT diagnostic" >&2
-    failures=$((failures + 1))
-fi
-assert_provider_observed merge-provider-unreachable
-merge_audit_lines_after=$(wc -l < "$AUDIT_LOG")
-if [[ "$merge_audit_lines_after" -le "$merge_audit_lines_before" ]]; then
-    echo "FAIL merge-provider-unreachable: expected an additional audit record" >&2
-    failures=$((failures + 1))
-fi
-
-# A feature-branch push with no -B must inspect the checked-out feature branch.
-if ! grep -q "/branches/$FEATURE_BRANCH" "$WORK_DIR/urls.log"; then
-    echo "FAIL implicit-branch: provider was not queried for $FEATURE_BRANCH" >&2
-    failures=$((failures + 1))
-fi
-
-# Merge callers can pin both a fork repository and the exact reviewed head SHA.
-exact_sha=0123456789abcdef0123456789abcdef01234567
-: > "$WORK_DIR/urls.log"
-run_assertion exact-fork-head zero success 'state=terminal-success' \
-    -B fix/rm-03-fixture -R contributor/widgets-fork --sha "$exact_sha"
-if ! grep -q "/repos/contributor/widgets-fork/commits/$exact_sha/status" "$WORK_DIR/urls.log"; then
-    echo "FAIL exact-fork-head: status URL did not bind fork repository and exact SHA" >&2
-    failures=$((failures + 1))
-fi
-if grep -q '/branches/' "$WORK_DIR/urls.log"; then
-    echo "FAIL exact-fork-head: explicit SHA must not be re-resolved through a branch" >&2
-    failures=$((failures + 1))
-fi
-
-# Platform/repository discovery failures use the same audited CANNOT_ASSERT path.
-audit_lines_before=$(wc -l < "$AUDIT_LOG")
-git -C "$REPO_DIR" remote set-url origin https://gitlab.com/acme/widgets.git
-set +e
-unsupported_output=$(run_guard success "$AUDIT_LOG" 2>&1)
-unsupported_rc=$?
-set -e
-git -C "$REPO_DIR" remote set-url origin https://git.example.test/acme/widgets.git
-if [[ "$unsupported_rc" -ne 0 ]]; then
-    echo "FAIL unsupported-platform: expected degraded rc=0, got rc=$unsupported_rc" >&2
-    failures=$((failures + 1))
-fi
-if [[ "$unsupported_output" != *"CANNOT_ASSERT"* ]]; then
-    echo "FAIL unsupported-platform: expected loud CANNOT_ASSERT diagnostic" >&2
-    failures=$((failures + 1))
-fi
-audit_lines_after=$(wc -l < "$AUDIT_LOG")
-if [[ "$audit_lines_after" -le "$audit_lines_before" ]]; then
-    echo "FAIL unsupported-platform: expected an additional audit record" >&2
-    failures=$((failures + 1))
-fi
-
-# A degraded pass is forbidden if the audit receipt cannot be written.
-mkdir -p "$WORK_DIR/not-a-directory"
-printf 'file' > "$WORK_DIR/not-a-directory/parent"
-set +e
-audit_failure_output=$(run_guard unreachable "$WORK_DIR/not-a-directory/parent/audit.jsonl" 2>&1)
-audit_failure_rc=$?
-set -e
-if [[ "$audit_failure_rc" -eq 0 ]]; then
-    echo "FAIL audit-unavailable: expected rc!=0, got rc=0" >&2
-    failures=$((failures + 1))
-fi
-if [[ "$audit_failure_output" != *"audit"* ]]; then
-    echo "FAIL audit-unavailable: expected loud audit failure diagnostic" >&2
-    failures=$((failures + 1))
-fi
-assert_provider_observed audit-unavailable
-
-if [[ "$failures" -ne 0 ]]; then
-    echo "ci-queue-wait tri-state regression failed ($failures assertions)" >&2
-    exit 1
-fi
-
-echo "ci-queue-wait tri-state regression passed (all outcome classes)"

packages/mosaic/framework/tools/git/test-pr-merge-gitea-empty-uid.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Regression harness for pr-merge.sh Gitea exact-head API path and input safety.
+# Regression harness for pr-merge.sh Gitea non-interactive tea empty identity fallback.
 
 set -euo pipefail
 
@@ -51,23 +51,22 @@ for arg in "$@"; do
         prev=""
         continue
     fi
-    if [[ "$prev" == "data" ]]; then
+    if [[ "$prev" == "-d" ]]; then
         post_data="$arg"
-        [[ "$post_data" == @* ]] && post_data=$(<"${post_data#@}")
         prev=""
         continue
     fi
-    if [[ "$prev" == "config" ]]; then
-        [[ "$arg" == "-" ]] && cat >/dev/null
-        prev=""
+    if [[ "$arg" == "-o" ]]; then
+        prev="-o"
         continue
     fi
-    case "$arg" in
-        -o) prev="-o" ;;
-        -d|--data|--data-binary) prev="data" ;;
-        -K|--config) prev="config" ;;
-        -w) write_code=true ;;
-    esac
+    if [[ "$arg" == "-d" ]]; then
+        prev="-d"
+        continue
+    fi
+    if [[ "$arg" == "-w" ]]; then
+        write_code=true
+    fi
 done
 emit_response() {
     local body="$1"
@@ -80,24 +79,15 @@ emit_response() {
         printf '200'
     fi
 }
-if [[ "$args" == *"/api/v1/repos/mosaicstack/stack/commits/0123456789abcdef0123456789abcdef01234567/status"* ]]; then
-    emit_response '{"state":"success","statuses":[{"context":"ci/test","status":"success"}]}'
-    exit 0
-fi
 if [[ "$args" == *"/api/v1/repos/mosaicstack/stack/pulls/123"* && "$args" != *"/api/v1/repos/mosaicstack/stack/pulls/123/merge"* ]]; then
-    emit_response '{"number":123,"title":"mock","state":"open","user":{"login":"tester"},"head":{"ref":"feature/mock","sha":"0123456789abcdef0123456789abcdef01234567","repo":{"full_name":"mosaicstack/stack"}},"base":{"ref":"main"},"labels":[],"assignees":[],"html_url":"https://git.mosaicstack.dev/mosaicstack/stack/pulls/123","mergeable":true}'
+    emit_response '{"number":123,"title":"mock","state":"open","user":{"login":"tester"},"head":{"ref":"feature/mock"},"base":{"ref":"main"},"labels":[],"assignees":[],"html_url":"https://git.mosaicstack.dev/mosaicstack/stack/pulls/123","mergeable":true}'
     exit 0
 fi
 if [[ "$args" == *"-X POST"* && "$args" == *"/api/v1/repos/mosaicstack/stack/pulls/123/merge"* ]]; then
-    POST_DATA="$post_data" python3 - <<'PY'
-import json
-import os
-payload = json.loads(os.environ["POST_DATA"])
-assert payload == {
-    "Do": "squash",
-    "head_commit_id": "0123456789abcdef0123456789abcdef01234567",
-}, payload
-PY
+    if [[ "$post_data" != '{"Do":"squash"}' ]]; then
+        echo "unexpected merge payload: $post_data" >&2
+        exit 96
+    fi
     emit_response '{"merged":true,"message":"mock merge complete"}'
     exit 0
 fi
@@ -117,8 +107,8 @@ export GITEA_URL="https://git.mosaicstack.dev"
 export GITEA_TOKEN="redacted-test-token"
 
 OUTPUT="$SANDBOX/output.log"
-if ! "$SCRIPT_DIR/pr-merge.sh" -n 123 -m squash > "$OUTPUT" 2>&1; then
-    echo "Expected pr-merge.sh to use the exact-head Gitea API path." >&2
+if ! "$SCRIPT_DIR/pr-merge.sh" -n 123 -m squash --skip-queue-guard > "$OUTPUT" 2>&1; then
+    echo "Expected pr-merge.sh to recover via Gitea API fallback." >&2
     echo "--- output ---" >&2
     sed 's/redacted-test-token/***REDACTED***/g' "$OUTPUT" >&2
     echo "--- mock log ---" >&2
@@ -137,6 +127,38 @@ if grep -q 'redacted-test-token' "$OUTPUT"; then
     exit 1
 fi
 
+cat > "$MOCK_BIN/tea" <<'EOF'
+#!/bin/bash
+set -euo pipefail
+printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
+printf '\n' >> "$PR_MERGE_TEST_LOG"
+if [[ "$*" == *"login list"* ]]; then
+    echo '[{"name":"git.mosaicstack.dev","url":"https://git.mosaicstack.dev"}]'
+    exit 0
+fi
+if [[ "$*" == *"pr merge"* ]]; then
+    echo 'tea network timeout' >&2
+    exit 2
+fi
+exit 0
+EOF
+chmod +x "$MOCK_BIN/tea"
+: > "$LOG_FILE"
+if "$SCRIPT_DIR/pr-merge.sh" -n 123 -m squash --skip-queue-guard > "$OUTPUT" 2>&1; then
+    echo "Expected arbitrary tea failure to remain blocking." >&2
+    exit 1
+fi
+if grep -q '/api/v1/repos/mosaicstack/stack/pulls/123/merge' "$LOG_FILE"; then
+    echo "Arbitrary tea failure unexpectedly used Gitea API merge fallback." >&2
+    sed 's/redacted-test-token/***REDACTED***/g' "$LOG_FILE" >&2
+    exit 1
+fi
+if ! grep -q 'tea network timeout' "$OUTPUT"; then
+    echo "Expected arbitrary tea error to be preserved in output." >&2
+    sed 's/redacted-test-token/***REDACTED***/g' "$OUTPUT" >&2
+    exit 1
+fi
+
 cat > "$MOCK_BIN/tea" <<'EOF'
 #!/bin/bash
 set -euo pipefail
@@ -155,8 +177,8 @@ EOF
 chmod +x "$MOCK_BIN/tea"
 unset GITEA_LOGIN
 : > "$LOG_FILE"
-if ! "$SCRIPT_DIR/pr-merge.sh" -n 123 -m squash > "$OUTPUT" 2>&1; then
-    echo "Expected the exact-head API path not to depend on a tea login." >&2
+if ! "$SCRIPT_DIR/pr-merge.sh" -n 123 -m squash --skip-queue-guard > "$OUTPUT" 2>&1; then
+    echo "Expected missing tea login to use authenticated Gitea API fallback." >&2
     sed 's/redacted-test-token/***REDACTED***/g' "$OUTPUT" >&2
     sed 's/redacted-test-token/***REDACTED***/g' "$LOG_FILE" >&2
     exit 1
@@ -193,7 +215,7 @@ cd "$REPO_DIR"
 git remote set-url origin https://github.com/mosaicstack/stack.git
 : > "$LOG_FILE"
 rm -f "$SENTINEL"
-if "$SCRIPT_DIR/pr-merge.sh" -n "$INJECTION" -m squash > "$OUTPUT" 2>&1; then
+if "$SCRIPT_DIR/pr-merge.sh" -n "$INJECTION" -m squash --skip-queue-guard > "$OUTPUT" 2>&1; then
     echo "Expected GitHub metacharacter PR number to be rejected." >&2
     sed 's/redacted-test-token/***REDACTED***/g' "$OUTPUT" >&2
     exit 1
@@ -218,7 +240,7 @@ git remote set-url origin https://git.mosaicstack.dev/mosaicstack/stack.git
 export GITEA_LOGIN="git.mosaicstack.dev"
 : > "$LOG_FILE"
 rm -f "$SENTINEL"
-if "$SCRIPT_DIR/pr-merge.sh" -n "$INJECTION" -m squash > "$OUTPUT" 2>&1; then
+if "$SCRIPT_DIR/pr-merge.sh" -n "$INJECTION" -m squash --skip-queue-guard > "$OUTPUT" 2>&1; then
     echo "Expected Gitea metacharacter PR number to be rejected." >&2
     sed 's/redacted-test-token/***REDACTED***/g' "$OUTPUT" >&2
     exit 1
@@ -238,4 +260,4 @@ if ! grep -q 'Invalid PR number' "$OUTPUT"; then
     exit 1
 fi
 
-echo "pr-merge.sh Gitea exact-head API regression passed"
+echo "pr-merge.sh Gitea fallback regression passed"

packages/mosaic/framework/tools/git/test-pr-merge-head-pin.sh

@@ -1,173 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2030,SC2031 # Provider arms isolate PATH/credentials in subshells.
-# The commit whose CI was guarded must be the commit the provider atomically merges.
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/pr-merge-head-pin}"
-SHA=0123456789abcdef0123456789abcdef01234567
-
-make_fixture() {
-    local name="$1" remote="$2"
-    local root="$WORK_DIR/$name"
-    local tools="$root/tools/git"
-    mkdir -p "$tools" "$root/repo"
-    cp "$SCRIPT_DIR/pr-merge.sh" "$tools/pr-merge.sh"
-    cp "$SCRIPT_DIR/detect-platform.sh" "$tools/detect-platform.sh"
-    git -C "$root/repo" init -q
-    git -C "$root/repo" remote add origin "$remote"
-    cat > "$tools/pr-metadata.sh" <<SH
-#!/usr/bin/env bash
-printf '%s\n' '{"baseRefName":"main","headRefName":"fix/pinned","headRefOid":"$SHA","headRepository":"contributor/widgets-fork"}'
-SH
-    cat > "$tools/ci-queue-wait.sh" <<'SH'
-#!/usr/bin/env bash
-exit 0
-SH
-    chmod +x "$tools"/*.sh
-}
-
-rm -rf "$WORK_DIR"
-make_fixture gitea https://git.example.test/acme/widgets.git
-make_fixture github https://github.com/acme/widgets.git
-
-cat > "$WORK_DIR/gitea/curl" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-payload=""
-out_file=""
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        -d|--data|--data-binary)
-            payload="$2"
-            [[ "$payload" == @* ]] && payload=$(<"${payload#@}")
-            shift 2
-            ;;
-        -o)
-            out_file="$2"
-            shift 2
-            ;;
-        -K|--config)
-            [[ "$2" == "-" ]] && cat >/dev/null
-            shift 2
-            ;;
-        -w|-X|-H)
-            shift 2
-            ;;
-        *) shift ;;
-    esac
-done
-printf '%s' "$payload" > "${MOSAIC_MERGE_PAYLOAD_LOG:?}"
-[[ -n "$out_file" ]] && printf '{}' > "$out_file"
-printf '200'
-SH
-chmod +x "$WORK_DIR/gitea/curl"
-
-set +e
-(
-    cd "$WORK_DIR/gitea/repo"
-    export PATH="$WORK_DIR/gitea:$PATH"
-    export GITEA_TOKEN=stub-token
-    export GITEA_URL=https://git.example.test
-    export MOSAIC_CREDENTIALS_FILE="$WORK_DIR/no-credentials.json"
-    export MOSAIC_MERGE_PAYLOAD_LOG="$WORK_DIR/gitea-payload.json"
-    env -u MOSAIC_GIT_IDENTITY "$WORK_DIR/gitea/tools/git/pr-merge.sh" -n 123
-) >"$WORK_DIR/gitea.out" 2>&1
-gitea_rc=$?
-set -e
-if [[ "$gitea_rc" -ne 0 ]]; then
-    echo "FAIL gitea-pin: merge fixture returned $gitea_rc" >&2
-    cat "$WORK_DIR/gitea.out" >&2
-    exit 1
-fi
-python3 - "$WORK_DIR/gitea-payload.json" "$SHA" <<'PY'
-import json
-import sys
-payload = json.load(open(sys.argv[1], encoding="utf-8"))
-assert set(payload) <= {"Do", "head_commit_id", "delete_branch_after_merge"}, payload
-assert payload.get("Do") == "squash", payload
-assert payload.get("head_commit_id") == sys.argv[2], payload
-PY
-
-# A merge-gate verdict is commit-bound. A stale expected head must fail before merge.
-wrong_sha=ffffffffffffffffffffffffffffffffffffffff
-rm -f "$WORK_DIR/gitea-payload-stale.json"
-set +e
-(
-    cd "$WORK_DIR/gitea/repo"
-    export PATH="$WORK_DIR/gitea:$PATH"
-    export GITEA_TOKEN=stub-token
-    export GITEA_URL=https://git.example.test
-    export MOSAIC_CREDENTIALS_FILE="$WORK_DIR/no-credentials.json"
-    export MOSAIC_MERGE_PAYLOAD_LOG="$WORK_DIR/gitea-payload-stale.json"
-    env -u MOSAIC_GIT_IDENTITY "$WORK_DIR/gitea/tools/git/pr-merge.sh" -n 123 --expect-head "$wrong_sha"
-) >"$WORK_DIR/gitea-stale.out" 2>&1
-stale_rc=$?
-set -e
-if [[ "$stale_rc" -eq 0 ]] || [[ -e "$WORK_DIR/gitea-payload-stale.json" ]]; then
-    echo "FAIL stale-verdict: moved head was not refused before provider merge" >&2
-    exit 1
-fi
-
-# A merge-capable path cannot bypass the mandatory queue guard. The legacy
-# --skip-queue-guard option must be rejected before any provider merge call.
-cat > "$WORK_DIR/gitea/tools/git/ci-queue-wait.sh" <<'SH'
-#!/usr/bin/env bash
-exit 99
-SH
-chmod +x "$WORK_DIR/gitea/tools/git/ci-queue-wait.sh"
-rm -f "$WORK_DIR/gitea-payload-bypass.json"
-set +e
-(
-    cd "$WORK_DIR/gitea/repo"
-    export PATH="$WORK_DIR/gitea:$PATH"
-    export GITEA_TOKEN=stub-token
-    export GITEA_URL=https://git.example.test
-    export MOSAIC_CREDENTIALS_FILE="$WORK_DIR/no-credentials.json"
-    export MOSAIC_MERGE_PAYLOAD_LOG="$WORK_DIR/gitea-payload-bypass.json"
-    env -u MOSAIC_GIT_IDENTITY "$WORK_DIR/gitea/tools/git/pr-merge.sh" -n 123 --skip-queue-guard
-) >"$WORK_DIR/gitea-bypass.out" 2>&1
-bypass_rc=$?
-set -e
-if [[ "$bypass_rc" -eq 0 ]] || [[ -e "$WORK_DIR/gitea-payload-bypass.json" ]]; then
-    echo "FAIL merge-bypass: --skip-queue-guard reached the provider merge path" >&2
-    exit 1
-fi
-
-# Dry-run is the only path that may omit the guard because it exits before the
-# provider merge dispatch. Prove the exit and absence of a merge payload.
-rm -f "$WORK_DIR/gitea-payload-dry-run.json"
-(
-    cd "$WORK_DIR/gitea/repo"
-    export PATH="$WORK_DIR/gitea:$PATH"
-    export GITEA_TOKEN=stub-token
-    export GITEA_URL=https://git.example.test
-    export MOSAIC_CREDENTIALS_FILE="$WORK_DIR/no-credentials.json"
-    export MOSAIC_MERGE_PAYLOAD_LOG="$WORK_DIR/gitea-payload-dry-run.json"
-    env -u MOSAIC_GIT_IDENTITY "$WORK_DIR/gitea/tools/git/pr-merge.sh" -n 123 --dry-run
-) >"$WORK_DIR/gitea-dry-run.out" 2>&1
-if [[ -e "$WORK_DIR/gitea-payload-dry-run.json" ]]; then
-    echo "FAIL dry-run: non-merging preflight reached the provider merge path" >&2
-    exit 1
-fi
-
-cat > "$WORK_DIR/github/gh" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-printf '%s\n' "$*" > "${MOSAIC_GH_MERGE_LOG:?}"
-SH
-chmod +x "$WORK_DIR/github/gh"
-(
-    cd "$WORK_DIR/github/repo"
-    export PATH="$WORK_DIR/github:$PATH"
-    export MOSAIC_GH_MERGE_LOG="$WORK_DIR/github-call.log"
-    "$WORK_DIR/github/tools/git/pr-merge.sh" -n 123
-) >"$WORK_DIR/github.out" 2>&1
-if ! grep -q -- "--match-head-commit $SHA" "$WORK_DIR/github-call.log"; then
-    echo "FAIL github-pin: merge command omitted --match-head-commit $SHA" >&2
-    cat "$WORK_DIR/github-call.log" >&2
-    exit 1
-fi
-
-echo "PR merge exact-head pin regression passed (Gitea + GitHub)"

packages/mosaic/framework/tools/git/test-pr-merge-message-field.sh

@@ -1,541 +0,0 @@
-#!/usr/bin/env bash
-# Regression harness for the optional, identity-checked Gitea squash message.
-
-set -u
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SUBJECT="${MOSAIC_TEST_SUBJECT:-$SCRIPT_DIR/pr-merge.sh}"
-WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/pr-merge-message-field}"
-ORIG_PATH="$PATH"
-failures=0
-
-rm -rf "$WORK_DIR"
-mkdir -p "$WORK_DIR"
-
-fail() {
-    echo "FAIL $1" >&2
-    failures=$((failures + 1))
-}
-
-make_case() {
-    local name="$1" case_dir
-    case_dir="$WORK_DIR/$name"
-    mkdir -p "$case_dir/bin" "$case_dir/agent"
-    cp "$SUBJECT" "$case_dir/pr-merge.sh"
-    chmod +x "$case_dir/pr-merge.sh"
-
-    cat > "$case_dir/detect-platform.sh" <<'SH'
-#!/usr/bin/env bash
-detect_platform() { PLATFORM=gitea; printf 'gitea\n'; }
-get_repo_owner() { printf 'acme\n'; }
-get_repo_name() { printf 'widgets\n'; }
-get_remote_host() { printf 'git.example.test\n'; }
-get_gitea_token() {
-    printf 'resolved\n' >> "${MOSAIC_TEST_TOKEN_RESOLUTION_LOG:?}"
-    if [[ "${MOSAIC_TEST_TOKEN_AVAILABLE:-true}" != "true" ]]; then
-        return 1
-    fi
-    printf 'fixture-token\n'
-}
-get_gitea_basic_auth() {
-    printf 'resolved\n' >> "${MOSAIC_TEST_BASIC_RESOLUTION_LOG:?}"
-    if [[ "${MOSAIC_TEST_BASIC_AVAILABLE:-false}" == "true" ]]; then
-        printf 'fixture-user:fixture-password\n'
-        return "${MOSAIC_TEST_BASIC_RC:-0}"
-    fi
-    return 1
-}
-get_gitea_login_for_host() { return 1; }
-SH
-
-    cat > "$case_dir/pr-metadata.sh" <<'SH'
-#!/usr/bin/env bash
-if [[ "${MOSAIC_TEST_TITLE_MODE:-safe}" == "injection" ]]; then
-    title='Preserve authors\n\nCo-authored-by: victim <[email protected]>'
-else
-    title='Preserve both branch authors'
-fi
-case "${MOSAIC_TEST_COMMITS_MODE:?}" in
-    verified) head_sha=2222222222222222222222222222222222222222 ;;
-    null-login|unsafe-identity) head_sha=3333333333333333333333333333333333333333 ;;
-    single) head_sha=1111111111111111111111111111111111111111 ;;
-    *) echo "unknown commits mode" >&2; exit 2 ;;
-esac
-printf '{"number":42,"title":"%s","author":"poster","baseRefName":"main","headRefName":"feature/fixture","headRefOid":"%s","headRepository":"acme/widgets"}\n' "$title" "$head_sha"
-SH
-
-    cat > "$case_dir/ci-queue-wait.sh" <<'SH'
-#!/usr/bin/env bash
-exit 0
-SH
-
-    cat > "$case_dir/bin/python3" <<'SH'
-#!/usr/bin/env bash
-for arg in "$@"; do
-    case "$arg" in
-        *"Preserve both branch authors"*|*"[email protected]"*)
-            : > "${MOSAIC_TEST_METADATA_ARGV_MARKER:?}"
-            ;;
-    esac
-done
-exec "${MOSAIC_TEST_REAL_PYTHON:?}" "$@"
-SH
-
-    cat > "$case_dir/bin/curl" <<'SH'
-#!/usr/bin/env bash
-set -eu
-
-for arg in "$@"; do
-    case "$arg" in
-        *"Preserve both branch authors"*|*"[email protected]"*)
-            : > "${MOSAIC_TEST_METADATA_ARGV_MARKER:?}"
-            ;;
-    esac
-done
-
-url=""
-method="GET"
-out_file=""
-data=""
-config=""
-auth_mode="none"
-has_max_filesize=0
-has_max_time=0
-has_connect_timeout=0
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        -o)
-            out_file="$2"
-            shift 2
-            ;;
-        -w)
-            shift 2
-            ;;
-        -X)
-            method="$2"
-            shift 2
-            ;;
-        -d|--data|--data-binary)
-            data="$2"
-            if [[ "$data" == @* ]]; then
-                data=$(<"${data#@}")
-            fi
-            shift 2
-            ;;
-        -K|--config)
-            if [[ "$2" == "-" ]]; then
-                config=$(cat)
-            fi
-            shift 2
-            ;;
-        --max-filesize)
-            has_max_filesize=1
-            shift 2
-            ;;
-        --max-time)
-            has_max_time=1
-            shift 2
-            ;;
-        --connect-timeout)
-            has_connect_timeout=1
-            shift 2
-            ;;
-        -H|--header|-u|--user)
-            if [[ "$2" == *"fixture-token"* ]]; then
-                : > "${MOSAIC_TEST_TOKEN_ARGV_MARKER:?}"
-            fi
-            if [[ "$2" == *"fixture-password"* ]]; then
-                : > "${MOSAIC_TEST_BASIC_ARGV_MARKER:?}"
-            fi
-            shift 2
-            ;;
-        http://*|https://*)
-            url="$1"
-            shift
-            ;;
-        *)
-            shift
-            ;;
-    esac
-done
-
-if [[ "$config" == *"Authorization: token fixture-token"* ]]; then
-    auth_mode="token"
-    : > "${MOSAIC_TEST_AUTH_CONFIG_MARKER:?}"
-elif [[ "$config" == *"user = \"fixture-user:fixture-password\""* ]]; then
-    auth_mode="basic"
-    : > "${MOSAIC_TEST_BASIC_CONFIG_MARKER:?}"
-fi
-printf '%s %s %s\n' "$method" "$auth_mode" "$url" >> "${MOSAIC_TEST_CURL_LOG:?}"
-printf '%s:%s:%s\n' "$has_max_filesize" "$has_max_time" "$has_connect_timeout" >> "${MOSAIC_TEST_CURL_BOUNDS_LOG:?}"
-
-case "$url" in
-    */pulls/42)
-        case "${MOSAIC_TEST_COMMITS_MODE:?}" in
-            verified) head_sha=2222222222222222222222222222222222222222 ;;
-            null-login|unsafe-identity) head_sha=3333333333333333333333333333333333333333 ;;
-            single) head_sha=1111111111111111111111111111111111111111 ;;
-            *) echo "unknown commits mode" >&2; exit 2 ;;
-        esac
-        if [[ "${MOSAIC_TEST_HEAD_MODE:-stable}" == "moved" ]]; then
-            head_sha=4444444444444444444444444444444444444444
-        fi
-        body="{\"head\":{\"sha\":\"$head_sha\"}}"
-        code=200
-        if [[ "${MOSAIC_TEST_FALLBACK_MODE:-none}" == "inspection" && "$auth_mode" == "token" ]]; then
-            body='{"message":"token rejected"}'
-            code=401
-        fi
-        ;;
-    */pulls/42/commits*)
-        case "${MOSAIC_TEST_COMMITS_MODE:?}" in
-            verified)
-                if [[ "${MOSAIC_TEST_EMAIL_MODE:-safe}" == "escape" ]]; then
-                    body='[{"sha":"2222222222222222222222222222222222222222","commit":{"author":{"name":"Alice","email":"alice+\u001b[[email protected]"}},"author":{"login":"alice"}},{"sha":"1111111111111111111111111111111111111111","commit":{"author":{"name":"Poster","email":"[email protected]"}},"author":{"login":"poster"}}]'
-                else
-                    body='[{"sha":"2222222222222222222222222222222222222222","commit":{"author":{"name":"Alice","email":"[email protected]"}},"author":{"login":"alice"}},{"sha":"1111111111111111111111111111111111111111","commit":{"author":{"name":"Poster","email":"[email protected]"}},"author":{"login":"poster"}}]'
-                fi
-                ;;
-            null-login)
-                body='[{"sha":"1111111111111111111111111111111111111111","commit":{"author":{"name":"Poster","email":"[email protected]"}},"author":{"login":"poster"}},{"sha":"3333333333333333333333333333333333333333","commit":{"author":{"name":"Unresolved Author","email":"[email protected]\n\u001b[31m"}},"author":null}]'
-                ;;
-            unsafe-identity)
-                body='[{"sha":"unsafe\n\u001b[31m","commit":{"author":{"name":"Unsafe","email":"not-an-email"}},"author":{"login":"unsafe"}},{"sha":"3333333333333333333333333333333333333333","commit":{"author":{"name":"Poster","email":"[email protected]"}},"author":{"login":"poster"}}]'
-                ;;
-            single)
-                body='[{"sha":"1111111111111111111111111111111111111111","commit":{"author":{"name":"Poster","email":"[email protected]"}},"author":{"login":"poster"}}]'
-                ;;
-            *)
-                echo "unknown commits mode" >&2
-                exit 2
-                ;;
-        esac
-        code=200
-        if [[ "${MOSAIC_TEST_FALLBACK_MODE:-none}" == "inspection" && "$auth_mode" == "token" ]]; then
-            body='{"message":"token rejected"}'
-            code=401
-        fi
-        ;;
-    */pulls/42/merge)
-        body='{}'
-        code=200
-        if [[ "${MOSAIC_TEST_FALLBACK_MODE:-none}" == "merge" && "$auth_mode" == "token" ]]; then
-            body='{"message":"token rejected"}'
-            code=401
-        elif [[ "${MOSAIC_TEST_FALLBACK_MODE:-none}" == "provider-error" ]]; then
-            body='{"message":"branch policy rejected\n\u001b[31m"}'
-            code=409
-        elif [[ "${MOSAIC_TEST_FALLBACK_MODE:-none}" == "forbidden" ]]; then
-            body='{"message":"permission denied"}'
-            code=403
-        else
-            printf '%s' "$data" > "${MOSAIC_TEST_MERGE_PAYLOAD:?}"
-        fi
-        ;;
-    */users/*)
-        body='{"message":"not found"}'
-        code=404
-        ;;
-    *)
-        body='{"message":"unexpected URL"}'
-        code=500
-        ;;
-esac
-
-if [[ -n "$out_file" ]]; then
-    printf '%s' "$body" > "$out_file"
-else
-    printf '%s' "$body"
-fi
-printf '%s' "$code"
-case "${MOSAIC_TEST_CURL_FAILURE:-none}" in
-    oversize) exit 63 ;;
-    stalled) exit 28 ;;
-esac
-SH
-
-    chmod +x "$case_dir/detect-platform.sh" "$case_dir/pr-metadata.sh" \
-        "$case_dir/ci-queue-wait.sh" "$case_dir/bin/curl" "$case_dir/bin/python3"
-    printf '%s\n' "$case_dir"
-}
-
-run_case() {
-    local case_dir="$1" mode="$2"
-    shift 2
-    MOSAIC_TEST_COMMITS_MODE="$mode" \
-    MOSAIC_TEST_CURL_LOG="$case_dir/curl.log" \
-    MOSAIC_TEST_CURL_BOUNDS_LOG="$case_dir/curl-bounds.log" \
-    MOSAIC_TEST_MERGE_PAYLOAD="$case_dir/merge-payload.json" \
-    MOSAIC_TEST_TOKEN_ARGV_MARKER="$case_dir/token-in-argv" \
-    MOSAIC_TEST_BASIC_ARGV_MARKER="$case_dir/basic-in-argv" \
-    MOSAIC_TEST_AUTH_CONFIG_MARKER="$case_dir/auth-via-config" \
-    MOSAIC_TEST_BASIC_CONFIG_MARKER="$case_dir/basic-via-config" \
-    MOSAIC_TEST_TOKEN_RESOLUTION_LOG="$case_dir/token-resolution.log" \
-    MOSAIC_TEST_BASIC_RESOLUTION_LOG="$case_dir/basic-resolution.log" \
-    MOSAIC_TEST_METADATA_ARGV_MARKER="$case_dir/metadata-in-argv" \
-    MOSAIC_TEST_REAL_PYTHON="$(command -v python3)" \
-    AGENT_WORK_ROOT="$case_dir/agent" \
-    PATH="$case_dir/bin:$ORIG_PATH" \
-        "$case_dir/pr-merge.sh" -n 42 "$@"
-}
-
-# Verified multi-author path: the non-poster trailer is built from one commit's
-# linked author.login and that same commit's author email. No /users lookup.
-verified_dir=$(make_case verified)
-set +e
-verified_output=$(run_case "$verified_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-verified_rc=$?
-set -e
-if [[ "$verified_rc" -ne 0 ]]; then
-    fail "verified multi-author merge expected rc=0, got rc=$verified_rc: $verified_output"
-elif [[ ! -s "$verified_dir/merge-payload.json" ]]; then
-    fail "verified multi-author merge did not reach the API payload"
-else
-    python3 - "$verified_dir/merge-payload.json" <<'PY' || fail "verified payload did not preserve squash and exact message fields"
-import json
-import sys
-payload = json.load(open(sys.argv[1], encoding="utf-8"))
-assert payload == {
-    "Do": "squash",
-    "head_commit_id": "2222222222222222222222222222222222222222",
-    "MergeTitleField": "Preserve both branch authors",
-    "MergeMessageField": "Co-authored-by: alice <[email protected]>",
-}, payload
-PY
-fi
-[[ -e "$verified_dir/auth-via-config" ]] || fail "verified path did not authenticate curl through stdin config"
-[[ ! -e "$verified_dir/token-in-argv" ]] || fail "verified path placed the Gitea token in curl argv"
-[[ ! -e "$verified_dir/metadata-in-argv" ]] || fail "verified path placed PR title or contributor email in child argv"
-[[ "$(wc -l < "$verified_dir/token-resolution.log")" -eq 1 ]] || fail "verified path did not bind inspection and merge to one credential resolution"
-if grep -q '/users/' "$verified_dir/curl.log" 2>/dev/null; then
-    fail "verified path performed a forbidden second /users lookup"
-fi
-if grep -qv '^1:1:1$' "$verified_dir/curl-bounds.log"; then
-    fail "verified path did not apply size/max-time/connect-time bounds to every provider download"
-fi
-
-# A linked email containing a terminal escape must block before mutation.
-escape_email_dir=$(make_case escape-email)
-set +e
-escape_email_output=$(MOSAIC_TEST_EMAIL_MODE=escape run_case "$escape_email_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-escape_email_rc=$?
-set -e
-[[ "$escape_email_rc" -ne 0 ]] || fail "control-byte email unexpectedly passed"
-[[ "$escape_email_output" == *"unusable linked identity"* ]] || fail "control-byte email refusal lost its diagnostic"
-[[ ! -e "$escape_email_dir/merge-payload.json" ]] || fail "control-byte email reached the merge API"
-
-# Curl transfer and duration failures must remain failures even with HTTP 200.
-for failure_mode in oversize stalled; do
-    failure_dir=$(make_case "curl-$failure_mode")
-    set +e
-    failure_output=$(MOSAIC_TEST_CURL_FAILURE="$failure_mode" run_case "$failure_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-    failure_rc=$?
-    set -e
-    [[ "$failure_rc" -ne 0 ]] || fail "curl $failure_mode failure was discarded: $failure_output"
-    [[ ! -e "$failure_dir/merge-payload.json" ]] || fail "curl $failure_mode failure reached the merge API"
-done
-
-# The authenticated head is re-read under the mutation credential but cannot
-# replace the canonical preflight/review head. A move blocks before enumeration
-# or mutation even though the provider returned a valid new SHA.
-moved_dir=$(make_case moved-head)
-set +e
-moved_output=$(MOSAIC_TEST_HEAD_MODE=moved \
-    run_case "$moved_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-moved_rc=$?
-set -e
-[[ "$moved_rc" -ne 0 ]] || fail "moved authenticated head unexpectedly passed"
-[[ "$moved_output" == *"authenticated PR head moved from reviewed"* ]] || fail "moved head refusal lost its diagnostic"
-[[ "$moved_output" == *"tl-mosaic"* ]] || fail "moved head refusal omitted the named escalation principal"
-[[ ! -e "$moved_dir/merge-payload.json" ]] || fail "moved head refusal reached the merge API"
-moved_sequence=$(awk '{print $1 ":" $2}' "$moved_dir/curl.log" | paste -sd, -)
-[[ "$moved_sequence" == "GET:token" ]] || fail "moved head refusal performed post-move inspection/mutation (calls=$moved_sequence)"
-
-# Token resolution failure is not an authentication response. It must fail
-# closed instead of borrowing a Basic credential under a different principal.
-token_missing_dir=$(make_case token-missing)
-set +e
-token_missing_output=$(MOSAIC_TEST_TOKEN_AVAILABLE=false MOSAIC_TEST_BASIC_AVAILABLE=true \
-    run_case "$token_missing_dir" single 2>&1)
-token_missing_rc=$?
-set -e
-[[ "$token_missing_rc" -ne 0 ]] || fail "missing token unexpectedly borrowed Basic Auth"
-[[ "$token_missing_output" == *"required Gitea token"* ]] || fail "missing token refusal lost its diagnostic"
-[[ ! -e "$token_missing_dir/basic-resolution.log" ]] || fail "missing token resolved Basic Auth after identity failure"
-[[ ! -e "$token_missing_dir/curl.log" ]] || fail "missing token reached a provider request"
-
-# A failed Basic resolver must never use its nonempty output or reach mutation.
-basic_rc_dir=$(make_case basic-resolver-rc)
-set +e
-basic_rc_output=$(MOSAIC_TEST_BASIC_AVAILABLE=true MOSAIC_TEST_BASIC_RC=91 MOSAIC_TEST_FALLBACK_MODE=inspection \
-    run_case "$basic_rc_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-basic_rc_rc=$?
-set -e
-[[ "$basic_rc_rc" -ne 0 ]] || fail "failed Basic resolver output unexpectedly authorized a merge: $basic_rc_output"
-[[ ! -e "$basic_rc_dir/merge-payload.json" ]] || fail "failed Basic resolver reached the merge API"
-
-# HTTP 401 never changes principals: inspection rejection fails closed without
-# resolving or attempting Basic Auth.
-fallback_inspect_dir=$(make_case fallback-inspection)
-set +e
-fallback_inspect_output=$(MOSAIC_TEST_BASIC_AVAILABLE=true MOSAIC_TEST_FALLBACK_MODE=inspection \
-    run_case "$fallback_inspect_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-fallback_inspect_rc=$?
-set -e
-[[ "$fallback_inspect_rc" -ne 0 ]] || fail "inspection token rejection unexpectedly changed principals"
-[[ "$fallback_inspect_output" == *"refusing cross-principal credential fallback"* ]] || fail "inspection token rejection lost its refusal diagnostic"
-[[ ! -e "$fallback_inspect_dir/basic-resolution.log" ]] || fail "inspection token rejection resolved Basic Auth"
-[[ ! -e "$fallback_inspect_dir/merge-payload.json" ]] || fail "inspection token rejection reached merge mutation"
-inspect_sequence=$(awk '{print $1 ":" $2}' "$fallback_inspect_dir/curl.log" | paste -sd, -)
-[[ "$inspect_sequence" == "GET:token" ]] || fail "inspection rejection made unexpected provider calls (calls=$inspect_sequence)"
-
-# Token rejection at merge likewise fails closed without cross-principal retry.
-fallback_merge_dir=$(make_case fallback-merge)
-set +e
-fallback_merge_output=$(MOSAIC_TEST_BASIC_AVAILABLE=true MOSAIC_TEST_FALLBACK_MODE=merge \
-    run_case "$fallback_merge_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-fallback_merge_rc=$?
-set -e
-[[ "$fallback_merge_rc" -ne 0 ]] || fail "merge token rejection unexpectedly changed principals"
-[[ "$fallback_merge_output" == *"refusing cross-principal credential fallback"* ]] || fail "merge token rejection lost its refusal diagnostic"
-[[ ! -e "$fallback_merge_dir/basic-resolution.log" ]] || fail "merge token rejection resolved Basic Auth"
-[[ ! -e "$fallback_merge_dir/merge-payload.json" ]] || fail "merge token rejection recorded a successful payload"
-merge_sequence=$(awk '{print $1 ":" $2}' "$fallback_merge_dir/curl.log" | paste -sd, -)
-[[ "$merge_sequence" == "GET:token,GET:token,POST:token" ]] || fail "merge rejection made unexpected provider calls (calls=$merge_sequence)"
-
-# BLOCK path: a commit email exists but author.login is null. It must name both
-# facts, name the escalation principal, and never reach the merge endpoint.
-null_dir=$(make_case null-login)
-set +e
-null_output=$(run_case "$null_dir" null-login --co-author-trailers --escalate-to tl-mosaic 2>&1)
-null_rc=$?
-set -e
-[[ "$null_rc" -ne 0 ]] || fail "null-login author expected a non-zero BLOCK"
-[[ "$null_output" == *"BLOCK"* ]] || fail "null-login author omitted BLOCK diagnostic"
-[[ "$null_output" == *"author.login=NULL"* ]] || fail "null-login author omitted the null provider fact"
-[[ "$null_output" == *"[email protected]"* ]] || fail "null-login author omitted the commit email fact"
-[[ "$null_output" == *'\n\x1b[31m'* ]] || fail "null-login author diagnostic did not escape control characters"
-[[ "$null_output" != *$'\033'* ]] || fail "null-login author diagnostic emitted a raw terminal escape"
-[[ "$(printf '%s\n' "$null_output" | wc -l)" -eq 1 ]] || fail "null-login author diagnostic permitted newline injection"
-[[ "$null_output" == *"tl-mosaic"* ]] || fail "null-login author omitted the named escalation principal"
-[[ ! -e "$null_dir/merge-payload.json" ]] || fail "null-login BLOCK still reached the merge API"
-
-# Every provider-derived field in alternate BLOCK diagnostics is log-safe too,
-# including an invalid non-head SHA that contains control characters.
-unsafe_dir=$(make_case unsafe-identity)
-set +e
-unsafe_output=$(run_case "$unsafe_dir" unsafe-identity --co-author-trailers --escalate-to tl-mosaic 2>&1)
-unsafe_rc=$?
-set -e
-[[ "$unsafe_rc" -ne 0 ]] || fail "unsafe identity expected a non-zero BLOCK"
-[[ "$unsafe_output" == *"unusable linked identity"* ]] || fail "unsafe identity omitted its BLOCK reason"
-[[ "$unsafe_output" == *'\n\x1b[31m'* ]] || fail "unsafe identity SHA did not escape control characters"
-[[ "$unsafe_output" != *$'\033'* ]] || fail "unsafe identity diagnostic emitted a raw terminal escape"
-[[ "$(printf '%s\n' "$unsafe_output" | wc -l)" -eq 1 ]] || fail "unsafe identity diagnostic permitted newline injection"
-[[ ! -e "$unsafe_dir/merge-payload.json" ]] || fail "unsafe identity BLOCK still reached the merge API"
-
-# The provider PR title cannot add an unchecked trailer outside the constructed
-# message field: multi-line and trailer-shaped titles block before mutation.
-title_dir=$(make_case title-injection)
-set +e
-title_output=$(MOSAIC_TEST_TITLE_MODE=injection \
-    run_case "$title_dir" verified --co-author-trailers --escalate-to tl-mosaic 2>&1)
-title_rc=$?
-set -e
-[[ "$title_rc" -ne 0 ]] || fail "title trailer injection unexpectedly passed"
-[[ "$title_output" == *"not one printable, non-trailer line"* ]] || fail "title injection refusal lost its diagnostic"
-[[ ! -e "$title_dir/merge-payload.json" ]] || fail "title injection reached the merge API"
-
-# Provider failures remain diagnosable after their temporary response file is
-# removed, but provider-controlled control characters stay log-safe.
-error_dir=$(make_case provider-error)
-set +e
-error_output=$(MOSAIC_TEST_BASIC_AVAILABLE=true MOSAIC_TEST_FALLBACK_MODE=provider-error \
-    run_case "$error_dir" single 2>&1)
-error_rc=$?
-set -e
-[[ "$error_rc" -ne 0 ]] || fail "provider error unexpectedly passed"
-[[ "$error_output" == *"HTTP 409"* ]] || fail "provider error omitted the HTTP status"
-[[ "$error_output" == *"branch policy rejected"* ]] || fail "provider error response was discarded"
-[[ "$error_output" == *'\n\x1b[31m'* ]] || fail "provider error response did not escape control characters"
-[[ "$error_output" != *$'\033'* ]] || fail "provider error response emitted a raw terminal escape"
-[[ "$error_output" != *"Basic Auth fallback"* ]] || fail "provider error advertised removed Basic Auth fallback"
-[[ ! -e "$error_dir/basic-resolution.log" ]] || fail "HTTP 409 policy denial incorrectly triggered Basic Auth fallback"
-
-# Authorization denials likewise fail closed instead of changing principals.
-forbidden_dir=$(make_case forbidden)
-set +e
-forbidden_output=$(MOSAIC_TEST_BASIC_AVAILABLE=true MOSAIC_TEST_FALLBACK_MODE=forbidden \
-    run_case "$forbidden_dir" single 2>&1)
-forbidden_rc=$?
-set -e
-[[ "$forbidden_rc" -ne 0 ]] || fail "HTTP 403 authorization denial unexpectedly passed"
-[[ "$forbidden_output" == *"HTTP 403"* ]] || fail "authorization denial omitted the HTTP status"
-[[ "$forbidden_output" != *"Basic Auth fallback"* ]] || fail "authorization denial advertised removed Basic Auth fallback"
-[[ ! -e "$forbidden_dir/basic-resolution.log" ]] || fail "HTTP 403 authorization denial incorrectly triggered Basic Auth fallback"
-
-# The BLOCK destination cannot be generic or inferred after failure: opting in
-# without a named principal is refused before any provider operation.
-principal_dir=$(make_case missing-principal)
-set +e
-principal_output=$(run_case "$principal_dir" verified --co-author-trailers 2>&1)
-principal_rc=$?
-set -e
-[[ "$principal_rc" -ne 0 ]] || fail "co-author mode without a named principal unexpectedly passed"
-[[ "$principal_output" == *"requires --escalate-to with a named principal"* ]] || fail "missing-principal refusal lost its diagnostic"
-[[ ! -e "$principal_dir/merge-payload.json" ]] || fail "missing-principal refusal reached the merge API"
-
-# A trailing value-taking option receives a stable CLI diagnostic instead of a
-# set -u unbound-variable crash.
-value_dir=$(make_case missing-principal-value)
-set +e
-value_output=$(run_case "$value_dir" verified --co-author-trailers --escalate-to 2>&1)
-value_rc=$?
-set -e
-[[ "$value_rc" -ne 0 ]] || fail "missing --escalate-to value unexpectedly passed"
-[[ "$value_output" == *"--escalate-to requires one principal name"* ]] || fail "missing --escalate-to value lost its diagnostic"
-[[ "$value_output" != *"unbound variable"* ]] || fail "missing --escalate-to value crashed under set -u"
-[[ ! -e "$value_dir/merge-payload.json" ]] || fail "missing --escalate-to value reached the merge API"
-
-# Negative control: ordinary single-author merge remains byte-for-byte payload
-# compatible and hardcoded to squash, with no optional message fields.
-single_dir=$(make_case single)
-set +e
-single_output=$(run_case "$single_dir" single 2>&1)
-single_rc=$?
-set -e
-if [[ "$single_rc" -ne 0 ]]; then
-    fail "ordinary single-author merge expected rc=0, got rc=$single_rc: $single_output"
-elif [[ ! -s "$single_dir/merge-payload.json" ]]; then
-    fail "ordinary single-author merge did not reach the API payload"
-else
-    python3 - "$single_dir/merge-payload.json" <<'PY' || fail "ordinary single-author payload changed"
-import json
-import sys
-payload = json.load(open(sys.argv[1], encoding="utf-8"))
-assert payload == {
-    "Do": "squash",
-    "head_commit_id": "1111111111111111111111111111111111111111",
-}, payload
-PY
-fi
-[[ -e "$single_dir/auth-via-config" ]] || fail "ordinary path did not authenticate curl through stdin config"
-[[ ! -e "$single_dir/token-in-argv" ]] || fail "ordinary path placed the Gitea token in curl argv"
-[[ "$(wc -l < "$single_dir/token-resolution.log")" -eq 1 ]] || fail "ordinary path did not use exactly one credential resolution"
-
-# Squash is not defaultable: an explicit non-squash method must remain refused.
-method_dir=$(make_case method-refusal)
-set +e
-method_output=$(run_case "$method_dir" single -m merge 2>&1)
-method_rc=$?
-set -e
-[[ "$method_rc" -ne 0 ]] || fail "non-squash method unexpectedly passed"
-[[ "$method_output" == *"enforces squash merge only"* ]] || fail "non-squash refusal lost its policy diagnostic"
-[[ ! -e "$method_dir/merge-payload.json" ]] || fail "non-squash refusal reached the merge API"
-
-if [[ "$failures" -ne 0 ]]; then
-    echo "pr-merge message-field regression failed ($failures assertions)" >&2
-    exit 1
-fi
-
-echo "pr-merge message-field regression passed (verified, BLOCK, and unchanged squash control)"

packages/mosaic/framework/tools/git/test-pr-merge-queue-branch.sh

@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# RM-03: pr-merge must guard the PR head branch, not its main base branch.
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/pr-merge-queue-branch}"
-FIXTURE_DIR="$WORK_DIR/tools/git"
-CALL_LOG="$WORK_DIR/queue-call.log"
-
-rm -rf "$WORK_DIR"
-mkdir -p "$FIXTURE_DIR"
-cp "$SCRIPT_DIR/pr-merge.sh" "$FIXTURE_DIR/pr-merge.sh"
-cp "$SCRIPT_DIR/detect-platform.sh" "$FIXTURE_DIR/detect-platform.sh"
-
-cat > "$FIXTURE_DIR/pr-metadata.sh" <<'SH'
-#!/usr/bin/env bash
-printf '%s\n' '{"baseRefName":"main","headRefName":"fix/rm-03-fixture","headRefOid":"0123456789abcdef0123456789abcdef01234567","headRepository":"contributor/widgets-fork"}'
-SH
-
-cat > "$FIXTURE_DIR/ci-queue-wait.sh" <<'SH'
-#!/usr/bin/env bash
-printf '%s\n' "$*" > "${MOSAIC_QUEUE_CALL_LOG:?}"
-exit 42
-SH
-chmod +x "$FIXTURE_DIR"/*.sh
-
-set +e
-(
-    cd "$WORK_DIR"
-    export MOSAIC_QUEUE_CALL_LOG="$CALL_LOG"
-    "$FIXTURE_DIR/pr-merge.sh" -n 123
-) >/dev/null 2>&1
-rc=$?
-set -e
-
-if [[ "$rc" -ne 42 ]]; then
-    echo "FAIL: expected queue stub rc=42 to propagate, got $rc" >&2
-    exit 1
-fi
-if [[ ! -s "$CALL_LOG" ]]; then
-    echo "FAIL: merge wrapper did not invoke the queue guard" >&2
-    exit 1
-fi
-if ! grep -q -- '-B fix/rm-03-fixture' "$CALL_LOG"; then
-    echo "FAIL: merge queue guard did not receive PR head branch" >&2
-    cat "$CALL_LOG" >&2
-    exit 1
-fi
-if grep -q -- '-B main' "$CALL_LOG"; then
-    echo "FAIL: merge queue guard still received the main base branch" >&2
-    cat "$CALL_LOG" >&2
-    exit 1
-fi
-if ! grep -q -- '-R contributor/widgets-fork' "$CALL_LOG"; then
-    echo "FAIL: merge queue guard did not receive the fork head repository" >&2
-    cat "$CALL_LOG" >&2
-    exit 1
-fi
-if ! grep -q -- '--sha 0123456789abcdef0123456789abcdef01234567' "$CALL_LOG"; then
-    echo "FAIL: merge queue guard did not receive the exact PR head SHA" >&2
-    cat "$CALL_LOG" >&2
-    exit 1
-fi
-
-echo "pr-merge queue branch/repository/SHA regression passed"

packages/mosaic/framework/tools/lease-broker/launch-runtime.py

@@ -8,9 +8,7 @@ import json
 import os
 import socket
 import sys
-import time
 from collections.abc import Callable, Mapping, Sequence
-from datetime import datetime, timezone
 from pathlib import Path
 from typing import Final
 
@@ -55,48 +53,6 @@ def broker_request(socket_path: Path, request: dict[str, object]) -> dict[str, o
     return value
 
 
-def _self_starttime() -> str | None:
-    """Field 22 of our own /proc stat — the anchor starttime the broker records.
-
-    Read past the comm field's parens, since a process name may contain them.
-    """
-    try:
-        raw = Path(f"/proc/{os.getpid()}/stat").read_text()
-        return raw.rsplit(")", 1)[1].split()[19]
-    except (OSError, IndexError, ValueError):
-        return None
-
-
-def _append_launch_record(environ: Mapping[str, str], record: dict[str, object]) -> None:
-    """Append one NDJSON event to the #797 Runtime Session Ledger.
-
-    `fleet/run/sessions/` is operator-classified in framework-manifest.txt and is
-    already covered by test-upgrade-manifest-guard.sh, so an upgrade can neither
-    overwrite nor prune it. Files 0600 under a 0700 dir, matching what that guard
-    asserts.
-
-    Never raises: a launch must not be denied over bookkeeping. But it also never
-    fails silently — a missing record is exactly the kind of gap that made the
-    2026-08-06 MUTATOR_UNVERIFIED investigation cost a day.
-    """
-    try:
-        mosaic_home = environ.get("MOSAIC_HOME") or str(Path.home() / ".config" / "mosaic")
-        directory = Path(mosaic_home) / "fleet" / "run" / "sessions"
-        directory.mkdir(parents=True, exist_ok=True)
-        os.chmod(directory, 0o700)
-        framed = {
-            "seq": time.time_ns() // 1_000_000,
-            "ts": datetime.now(timezone.utc).isoformat(),
-            **record,
-        }
-        path = directory / "events.ndjson"
-        descriptor = os.open(path, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0o600)
-        with os.fdopen(descriptor, "w") as handle:
-            handle.write(json.dumps(framed, separators=(",", ":")) + "\n")
-    except (OSError, ValueError, TypeError) as error:
-        print(f"[mosaic] WARNING: launch record not written: {error}", file=sys.stderr)
-
-
 def main(
     argv: Sequence[str] | None = None,
     *,
@@ -138,9 +94,8 @@ def main(
     # silent pass and never folded into the generic registration-failure
     # branch.
     try:
-        activation_capability = probe_activation_capability(source_environment)
         assert_activation_capability_matches(
-            activation_capability,
+            probe_activation_capability(source_environment),
             expected_activation_capability,
         )
     except VersionCouplingError as version_error:
@@ -173,32 +128,6 @@ def main(
         print("Mosaic lease broker registration failed; runtime launch denied.", file=sys.stderr)
         return 1
 
-    # Immutable launch record, half two. `mosaic` wrote `session.launch` with the
-    # config/provenance it knows; only this process knows the broker session id
-    # and the activation capability it just asserted. os.execvpe preserves the
-    # PID, so this PID is BOTH the anchor pid and the join key back to that
-    # record. Never fatal — bookkeeping must not deny a launch — but never
-    # silent either.
-    _append_launch_record(
-        source_environment,
-        {
-            "kind": "lease.register",
-            # Joins back to `mosaic`'s session.launch record. NOT pid: execRuntime()
-            # spawns rather than execs, so this process is a CHILD of mosaic with a
-            # different pid. This pid IS the broker anchor pid (os.execvpe below
-            # preserves it), which is a separate and still-useful fact.
-            "launch_id": source_environment.get("MOSAIC_LAUNCH_ID"),
-            "pid": os.getpid(),
-            "runtime": arguments.runtime,
-            "session_id": session_id,
-            "runtime_generation": generation,
-            "generation_file": str(generation_file),
-            "anchor_starttime": _self_starttime(),
-            "activation_capability": activation_capability,
-            "command": Path(command[0]).name,
-        },
-    )
-
     environment = dict(source_environment)
     environment["MOSAIC_LEASE_SESSION_ID"] = session_id
     environment["MOSAIC_RUNTIME_GENERATION"] = str(generation)

packages/mosaic/framework/tools/lease-broker/lease_promote.py

@@ -1,269 +0,0 @@
-#!/usr/bin/env python3
-"""Lease promotion client — the half the enforcement toolkit never shipped.
-
-The enforcement half (``daemon.py`` + ``mutator-gate.py``) ships and denies. The
-promotion half has no production caller anywhere in the package: as of 0.0.48,
-0.0.49 and 0.0.50-next.2207, ``begin_verification`` / ``observe_receipt`` /
-``promote_lease`` are invoked only by ``broker-test-client.ts``, the acceptance
-spec, unit tests, and two probes under ``docs/``. Consequence: **no lease on any
-host can reach VERIFIED**, so every mutator is denied ``MUTATOR_UNVERIFIED`` by a
-gate nothing can satisfy.
-
-THE PROTOCOL (``daemon.py:578-754``)
-------------------------------------
-  1. ``begin_verification`` — broker revokes, mints a challenge, and returns the
-     exact ``receipt`` text the MODEL must emit
-  2. *the model emits that text verbatim as its ENTIRE latest message*
-  3. the runtime adapter ships that message to the daemon-owned observer socket
-  4. ``observe_receipt``  -> ``PENDING_PROMOTION``
-  5. ``promote_lease``    -> ``VERIFIED``
-
-THIS MODULE IMPLEMENTS 1, 4 AND 5 — NEVER 2
--------------------------------------------
-Step 2 is the security property, not a formality. ``is_verbatim_receipt`` uses
-``hmac.compare_digest`` against the exact minted string — explicitly "not a
-transcript substring" (``receipt_challenge.py``). Promotion therefore requires a
-live model that received the challenge in its context and echoed it exactly.
-
-``receipt-observer-client.py`` will post ANY string as the latest assistant
-message. A promotion client that posted its own receipt would satisfy the broker
-while proving nothing — a gate-disabler indistinguishable from a working fix
-unless someone looks for it. **This module never posts a receipt.** Emitting it
-belongs to the runtime adapter, where a real model turn happens.
-
-The construction binds the exact normative source bytes, so a VERIFIED lease
-means "this agent is running THIS law", not merely "this session id is known".
-``h_source`` / ``h_payload`` are derived by the framework's own
-``normative_fragments.build_payload`` rather than reimplemented: the broker
-derives them the same way and any divergence yields ``PAYLOAD_BINDING_MISMATCH``.
-There must be exactly one implementation.
-
-Usage
------
-    lease_promote.py --begin                 # prints the receipt the MODEL must emit
-    lease_promote.py --complete <challenge>  # after the adapter observed it
-"""
-
-from __future__ import annotations
-
-import argparse
-import base64
-import json
-import os
-import socket
-import sys
-from pathlib import Path
-from typing import Final
-
-# Isolated (`python -I`) adapter invocations must still import co-located
-# framework modules; never depend on the caller's PYTHONPATH.
-_MODULE_DIRECTORY = str(Path(__file__).resolve().parent)
-if _MODULE_DIRECTORY not in sys.path:
-    sys.path.insert(0, _MODULE_DIRECTORY)
-
-from normative_fragments import NormativeFragment, build_payload  # noqa: E402
-
-MAX_FRAME: Final = 64 * 1024
-BROKER_TIMEOUT_SECONDS: Final = 3.0
-SCHEMA_VERSION: Final = 1
-MANIFEST_VERSION: Final = 1
-GENERATOR_VERSION: Final = "mosaic/lease_promote@1"
-DEFAULT_TTL_SECONDS: Final = 300
-
-# Normative sources whose exact bytes bind the lease. Sources absent on a given
-# deployment are simply not part of the binding — never fabricated.
-FRAGMENT_SOURCES: Final = (
-    "CONSTITUTION.md",
-    "AGENTS.md",
-    "SOUL.md",
-    "USER.md",
-    "STANDARDS.md",
-    "TOOLS.md",
-)
-
-
-def mosaic_home() -> Path:
-    return Path(os.environ.get("MOSAIC_HOME") or Path.home() / ".config" / "mosaic")
-
-
-def broker_socket() -> Path:
-    value = os.environ.get("MOSAIC_LEASE_BROKER_SOCKET")
-    if value:
-        return Path(value)
-    runtime_dir = os.environ.get("XDG_RUNTIME_DIR")
-    if runtime_dir:
-        return Path(runtime_dir) / "mosaic-lease" / "broker.sock"
-    return Path(f"/run/user/{os.getuid()}/mosaic-lease/broker.sock")
-
-
-def session_identity() -> tuple[str, int, str]:
-    """Session id, CURRENT generation, runtime.
-
-    The generation file wins over the env var, matching ``lease_generation.py``.
-    Sending a generation HIGHER than the broker's would revoke this session's own
-    authority (``daemon.py:342-344``), so this never guesses.
-    """
-    session_id = os.environ["MOSAIC_LEASE_SESSION_ID"]
-    runtime = os.environ["MOSAIC_LEASE_RUNTIME"]
-    state_file = os.environ.get("MOSAIC_LEASE_GENERATION_FILE")
-    if state_file:
-        try:
-            return session_id, int(Path(state_file).read_text().strip()), runtime
-        except (OSError, ValueError):
-            pass
-    return session_id, int(os.environ["MOSAIC_RUNTIME_GENERATION"]), runtime
-
-
-def build_construction(runtime: str) -> tuple[dict[str, object], object]:
-    """Assemble the wire construction and derive its hashes with the sole builder."""
-    sources = list(FRAGMENT_SOURCES) + [f"runtime/{runtime}/RUNTIME.md"]
-    wire_fragments: list[dict[str, str]] = []
-    objects: list[NormativeFragment] = []
-
-    for source_id in sources:
-        try:
-            content = (mosaic_home() / source_id).read_bytes()
-        except OSError:
-            continue
-        import hashlib
-
-        digest = hashlib.sha256(content).hexdigest()
-        wire_fragments.append(
-            {
-                "source_id": source_id,
-                "content_base64": base64.b64encode(content).decode("ascii"),
-                "expected_sha256": digest,
-            }
-        )
-        objects.append(NormativeFragment(source_id, content, digest))
-
-    if not wire_fragments:
-        raise RuntimeError("no normative sources found — refusing to build an empty binding")
-
-    result = build_payload(
-        manifest_version=MANIFEST_VERSION,
-        generator_version=GENERATOR_VERSION,
-        fragments=objects,
-    )
-    if result.injectionDecision != "ACCEPTED" or not result.promotion:
-        raise RuntimeError(f"construction refused locally: {result.source_reason}")
-
-    return (
-        {
-            "manifest_version": MANIFEST_VERSION,
-            "generator_version": GENERATOR_VERSION,
-            "fragments": wire_fragments,
-        },
-        result,
-    )
-
-
-def broker_request(payload: dict[str, object]) -> dict[str, object]:
-    raw = (json.dumps(payload, separators=(",", ":")) + "\n").encode()
-    if len(raw) > MAX_FRAME:
-        raise ValueError(
-            f"request too large ({len(raw)} bytes); broker frame cap is {MAX_FRAME}"
-        )
-    response = bytearray()
-    with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as connection:
-        connection.settimeout(BROKER_TIMEOUT_SECONDS)
-        connection.connect(str(broker_socket()))
-        connection.sendall(raw)
-        connection.shutdown(socket.SHUT_WR)
-        while len(response) <= MAX_FRAME:
-            chunk = connection.recv(4096)
-            if not chunk:
-                break
-            response.extend(chunk)
-    if len(response) > MAX_FRAME or not response.endswith(b"\n"):
-        raise ValueError("invalid broker reply")
-    value = json.loads(response)
-    if not isinstance(value, dict):
-        raise ValueError("invalid broker reply")
-    return value
-
-
-def begin(
-    ttl_seconds: int = DEFAULT_TTL_SECONDS,
-    compaction_epoch: int = 0,
-    request_epoch: int = 0,
-) -> dict[str, object]:
-    """Step 1. Returns the broker reply, including the exact ``receipt`` text."""
-    session_id, generation, runtime = session_identity()
-    construction, derived = build_construction(runtime)
-    return broker_request(
-        {
-            "action": "begin_verification",
-            "session_id": session_id,
-            "runtime_generation": generation,
-            "runtime": runtime,
-            "ttl_seconds": ttl_seconds,
-            "binding": {
-                "compaction_epoch": compaction_epoch,
-                "request_epoch": request_epoch,
-                "h_source": derived.h_source,
-                "h_payload": derived.h_payload,
-                "schema_version": SCHEMA_VERSION,
-            },
-            "construction": construction,
-        }
-    )
-
-
-def complete(challenge: str) -> dict[str, object]:
-    """Steps 4-5. Assumes the model already emitted the receipt and the adapter
-    shipped it to the observer socket."""
-    session_id, generation, _ = session_identity()
-    observed = broker_request(
-        {
-            "action": "observe_receipt",
-            "session_id": session_id,
-            "runtime_generation": generation,
-            "receipt_challenge": challenge,
-        }
-    )
-    if observed.get("ok") is not True or observed.get("state") != "PENDING_PROMOTION":
-        return {"stage": "observe_receipt", **observed}
-    promoted = broker_request(
-        {
-            "action": "promote_lease",
-            "session_id": session_id,
-            "runtime_generation": generation,
-            "receipt_challenge": challenge,
-        }
-    )
-    return {"stage": "promote_lease", **promoted}
-
-
-def main(argv: list[str] | None = None) -> int:
-    parser = argparse.ArgumentParser(description="Mosaic lease promotion client.")
-    group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument(
-        "--begin",
-        action="store_true",
-        help="mint a challenge; prints the receipt the MODEL must emit verbatim",
-    )
-    group.add_argument(
-        "--complete",
-        metavar="CHALLENGE",
-        help="observe the emitted receipt and promote the lease",
-    )
-    parser.add_argument("--ttl-seconds", type=int, default=DEFAULT_TTL_SECONDS)
-    arguments = parser.parse_args(argv)
-
-    try:
-        if arguments.begin:
-            print(json.dumps(begin(ttl_seconds=arguments.ttl_seconds), indent=2))
-        else:
-            print(json.dumps(complete(arguments.complete), indent=2))
-    except KeyError as exc:
-        print(f"missing lease environment: {exc}; not a lease-gated session", file=sys.stderr)
-        return 2
-    except (OSError, ValueError, RuntimeError, json.JSONDecodeError) as exc:
-        print(f"{type(exc).__name__}: {exc}", file=sys.stderr)
-        return 2
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

packages/mosaic/framework/tools/quality/scripts/test-upgrade-rollback.sh

@@ -39,12 +39,11 @@ ORIG_PATH="$PATH"
 # loop — which would make the control a false negative. A root dotfile is
 # operator-owned (unknown→operator), so the sync loop skips it. Clean up on exit.
 STRIPPED="$FW/.install-rollback-control.tmp.sh"
-SIGNALED="$FW/.install-signal-control.tmp.sh"
 NOEXIT="$FW/.install-noexit-control.tmp.sh"
 D1CTRL="$FW/.install-d1guard-control.tmp.sh"
 D2CTRL="$FW/.install-d2guard-control.tmp.sh"
-rm -f "$STRIPPED" "$SIGNALED" "$NOEXIT" "$D1CTRL" "$D2CTRL"
-trap 'rm -f "$STRIPPED" "$SIGNALED" "$NOEXIT" "$D1CTRL" "$D2CTRL"' EXIT
+rm -f "$STRIPPED" "$NOEXIT" "$D1CTRL" "$D2CTRL"
+trap 'rm -f "$STRIPPED" "$NOEXIT" "$D1CTRL" "$D2CTRL"' EXIT
 
 pass=0; fail=0
 chk() { if eval "$2"; then echo "  ✓ $1"; pass=$((pass + 1)); else echo "  ✗ $1"; fail=$((fail + 1)); fi; }
@@ -181,86 +180,41 @@ chk "[control] without -E the mid-sync corruption survives (no rollback)" \
 # ── Part C: an INT/TERM interrupt must terminate, not resume (blocker-A) ──────
 # A bash signal trap that merely returns lets the script continue past the
 # interrupt — restoring the snapshot, then resuming the sync and reporting
-# success. The earlier test used a child cp shim to signal its parent, making
-# child completion race Bash's interrupted wait. Concurrency is not part of the
-# guarded property: sync_framework_keep() runs in the installer's own Bash
-# process, and `kill` is a builtin. Generate two installer fixtures that signal
-# themselves at the same known mid-sync point. Their TERM handlers emit the same
-# observable before diverging, so missing signal delivery fails BOTH arms rather
-# than manufacturing a pass. The only semantic difference between fixtures is
-# the explicit `exit 1` whose load-bearing behavior this control proves.
-TERM_MARKER='[test-control] TERM handler entered'
-HANDLER_WITH_EXIT="trap 'echo \"$TERM_MARKER\" >&2; restore_snapshot; exit 1' TERM  # TEST-TERM-HANDLER"
-HANDLER_WITHOUT_EXIT="trap 'echo \"$TERM_MARKER\" >&2; restore_snapshot' TERM  # TEST-TERM-HANDLER"
-
-make_signal_installer() {
-  local output="$1" handler="$2"
-  local target_trap="trap 'restore_snapshot; exit 1' ERR INT TERM"
-  local target_cp='    cp "$abs" "$dst/$rel"'
-  local inject_open="    if [[ \"\$rel\" == \"$POISON_REL\" ]]; then"
-  local inject_kill='      kill -TERM "$$"  # TEST-TERM-INJECTION'
-  local inject_close='    fi'
-
-  if ! awk \
-    -v target_trap="$target_trap" -v target_cp="$target_cp" \
-    -v handler="$handler" -v inject_open="$inject_open" \
-    -v inject_kill="$inject_kill" -v inject_close="$inject_close" '
-      $0 == target_cp {
-        print inject_open
-        print inject_kill
-        print inject_close
-        injection_sites++
-      }
-      { print }
-      $0 == target_trap {
-        print handler
-        handler_sites++
-      }
-      END {
-        if (handler_sites != 1 || injection_sites != 1) exit 42
-      }
-    ' "$INSTALL" > "$output"; then
-    rm -f "$output"
-    fail "Could not construct the self-TERM control installer at the exact trap/copy sites"
-    exit 1
-  fi
-  chmod +x "$output"
+# success. We inject a SIGTERM mid-sync with a cp that SUCCEEDS (so set -e never
+# fires and ONLY the signal path governs), and assert the shipped installer
+# restores AND exits without reporting success. The control strips `exit 1` from
+# the trap and shows the buggy resume-to-success.
+make_term_shim() {
+  local dir="$1"
+  cat > "$dir/cp" <<SHIM
+#!/usr/bin/env bash
+dest="\${@: -1}"
+case "\$dest" in
+  */$POISON_REL)
+    kill -TERM "\$PPID" 2>/dev/null   # signal install.sh; the copy still succeeds
+    exec env PATH="$ORIG_PATH" cp "\$@" ;;
+esac
+exec env PATH="$ORIG_PATH" cp "\$@"
+SHIM
+  chmod +x "$dir/cp"
 }
 
-make_signal_installer "$SIGNALED" "$HANDLER_WITH_EXIT"
-make_signal_installer "$NOEXIT" "$HANDLER_WITHOUT_EXIT"
-signal_fixture_ready() {
-  local fixture="$1" expected_handler="$2"
-  [[ "$(grep -cF '# TEST-TERM-INJECTION' "$fixture")" -eq 1 ]] \
-    && [[ "$(grep -cF '# TEST-TERM-HANDLER' "$fixture")" -eq 1 ]] \
-    && grep -Fqx "$expected_handler" "$fixture"
-}
-signaled_fixture_ready() { signal_fixture_ready "$SIGNALED" "$HANDLER_WITH_EXIT"; }
-noexit_fixture_ready() { signal_fixture_ready "$NOEXIT" "$HANDLER_WITHOUT_EXIT"; }
-chk "[signal] shipped fixture has exactly one self-TERM injection and marked handler" \
-  "signaled_fixture_ready"
-chk "[control] no-exit fixture has exactly one self-TERM injection and marked handler" \
-  "noexit_fixture_ready"
-chk "[control] removing the explicit TERM exit changes the fixture" \
-  "! cmp -s '$SIGNALED' '$NOEXIT'"
-
-# Run one keep-mode upgrade whose own shell delivers SIGTERM synchronously at
-# the selected copy. Echoes "<exit>\t<out>\t<home>".
+# Run one keep-mode upgrade with the SIGTERM shim. Echoes "<exit>\t<out>\t<home>".
 run_signal_upgrade() {
-  local installer="$1" H OUT rc
-  H=$(mktemp -d); OUT=$(mktemp)
+  local installer="$1" H OUT SHIM rc
+  H=$(mktemp -d); OUT=$(mktemp); SHIM=$(mktemp -d)
   seed_home "$H"
+  make_term_shim "$SHIM"
   set +e
-  PATH="$ORIG_PATH" \
+  PATH="$SHIM:$ORIG_PATH" \
     MOSAIC_HOME="$H" MOSAIC_INSTALL_MODE=keep MOSAIC_SYNC_ONLY=1 bash "$installer" >"$OUT" 2>&1
   rc=$?
   set -e 2>/dev/null || true
+  rm -rf "$SHIM"
   printf '%s\t%s\t%s\n' "$rc" "$OUT" "$H"
 }
 
-IFS=$'\t' read -r rcC OUTC HC < <(run_signal_upgrade "$SIGNALED")
-chk "[signal] TERM handler observable fires exactly once" \
-  "[ \"\$(grep -cF '$TERM_MARKER' '$OUTC')\" -eq 1 ]"
+IFS=$'\t' read -r rcC OUTC HC < <(run_signal_upgrade "$INSTALL")
 chk "[signal] SIGTERM mid-sync aborts non-zero (trap exits, does not resume)" \
   "[ '$rcC' -ne 0 ]"
 chk "[signal] restore_snapshot fires on the interrupt" \
@@ -268,13 +222,13 @@ chk "[signal] restore_snapshot fires on the interrupt" \
 chk "[signal] does NOT resume to report sync success after the interrupt" \
   "! grep -q 'file phase complete' '$OUTC'"
 
-IFS=$'\t' read -r rcD OUTD HD < <(run_signal_upgrade "$NOEXIT")
-chk "[control] TERM handler observable fires exactly once" \
-  "[ \"\$(grep -cF '$TERM_MARKER' '$OUTD')\" -eq 1 ]"
-chk "[control] without 'exit 1' the handler restores before returning" \
-  "grep -q 'restoring previous state from snapshot' '$OUTD'"
-chk "[control] without 'exit 1' the installer exits zero after resuming" \
-  "[ '$rcD' -eq 0 ]"
+# Control: strip `exit 1` from the signal trap → the handler returns, the script
+# resumes past the interrupt and wrongly reports success. In $FW so SOURCE_DIR resolves.
+sed "s/trap 'restore_snapshot; exit 1' ERR INT TERM/trap 'restore_snapshot' ERR INT TERM/" \
+  "$INSTALL" > "$NOEXIT"
+chk "[control] the exit-strip actually changed the installer" \
+  "! cmp -s '$INSTALL' '$NOEXIT'"
+IFS=$'\t' read -r _rcD OUTD HD < <(run_signal_upgrade "$NOEXIT")
 chk "[control] without 'exit 1' the trap resumes and reports sync success (the bug)" \
   "grep -q 'file phase complete' '$OUTD'"
 
@@ -355,10 +309,10 @@ chk "[control] without the D2 recovery line the operator gets no snapshot pointe
 # Reap any snapshot the reset-fail runs left in /tmp (reset failed → never cleaned).
 grep -o '/[^ ]*mosaic-snapshot[^ ]*' "$OUTH" 2>/dev/null | head -1 | while read -r s; do rm -rf "$s"; done
 
-# Cleanup (generated installer controls are also removed by the EXIT trap).
+# Cleanup ($STRIPPED / $NOEXIT / $D1CTRL / $D2CTRL are also removed by the EXIT trap).
 for d in "$HA" "$REFA" "$HB" "$REFB" "$HC" "$HD" "$HE" "$REFE" "$HF" "$REFF" "$HG" "$HH"; do rm -rf "$d"; done
 rm -f "$OUTA" "$OUTB" "$OUTC" "$OUTD" "$OUTE" "$OUTF" "$OUTG" "$OUTH" \
-  "$STRIPPED" "$SIGNALED" "$NOEXIT" "$D1CTRL" "$D2CTRL"
+  "$STRIPPED" "$NOEXIT" "$D1CTRL" "$D2CTRL"
 
 echo
 echo "RESULT: $pass passed, $fail failed"

packages/mosaic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mosaicstack/mosaic",
-  "version": "0.0.49",
+  "version": "0.0.48",
   "repository": {
     "type": "git",
     "url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
@@ -25,7 +25,7 @@
     "lint": "eslint src",
     "typecheck": "tsc --noEmit",
     "test": "vitest run --passWithNoTests && pnpm run test:framework-shell",
-    "test:framework-shell": "bash framework/tools/quality/scripts/check-test-enumeration.sh && bash framework/tools/quality/scripts/test-check-test-enumeration.sh && python3 src/lease-broker/daemon_deadline_unittest.py && python3 src/lease-broker/normative_fragments_unittest.py && python3 src/lease-broker/receipt_challenge_unittest.py && python3 src/lease-broker/context_recovery_unittest.py && python3 src/lease-broker/recovery_runtime_unittest.py && python3 src/lease-broker/recovery_b1_adversarial_unittest.py && python3 src/lease-broker/framework_skill_portability_unittest.py && python3 src/mutator-gate/runtime_tools_unittest.py && python3 src/mutator-gate/runtime_launch_guard_unittest.py && python3 src/mutator-gate/version_coupling_unittest.py && python3 framework/tools/lease-broker/check-runtime-launches.py --root ../.. && bash framework/tools/codex/test-pr-diff-context.sh && bash framework/tools/qa/test-deps-preflight.sh && bash framework/tools/git/test-pr-review-gitea-comment.sh && bash framework/tools/git/test-pr-review-repo-host-override.sh && bash framework/tools/git/test-ci-queue-wait-branch-absent.sh && bash framework/tools/git/test-ci-queue-wait-tristate.sh && bash framework/tools/git/test-ci-queue-wait-github-checks.sh && bash framework/tools/git/test-pr-merge-queue-branch.sh && bash framework/tools/git/test-pr-merge-head-pin.sh && bash framework/tools/git/test-pr-merge-message-field.sh && bash framework/tools/git/test-git-credential-mosaic.sh && bash framework/tools/git/test-gitea-token-identity.sh && bash framework/tools/woodpecker/test-terminal-green-contract.sh && bash framework/tools/_scripts/test-install-ordering-guard.sh && bash framework/tools/tmux/agent-send.test.sh && bash framework/tools/wake/test-wake-store-ack.sh && bash framework/tools/wake/test-wake-store-enqueue-race.sh && bash framework/tools/wake/test-wake-digest-hmac.sh && bash framework/tools/wake/test-wake-digest-quarantine.sh && bash framework/tools/wake/test-wake-detector.sh && bash framework/tools/wake/test-wake-fn-oracle.sh && bash framework/tools/wake/test-wake-reconcile.sh && bash framework/tools/wake/test-wake-beacon.sh && bash framework/tools/wake/test-wake-preimage.sh && bash framework/tools/wake/test-wake-install.sh"
+    "test:framework-shell": "bash framework/tools/quality/scripts/check-test-enumeration.sh && bash framework/tools/quality/scripts/test-check-test-enumeration.sh && python3 src/lease-broker/daemon_deadline_unittest.py && python3 src/lease-broker/normative_fragments_unittest.py && python3 src/lease-broker/receipt_challenge_unittest.py && python3 src/lease-broker/context_recovery_unittest.py && python3 src/lease-broker/recovery_runtime_unittest.py && python3 src/lease-broker/recovery_b1_adversarial_unittest.py && python3 src/lease-broker/framework_skill_portability_unittest.py && python3 src/mutator-gate/runtime_tools_unittest.py && python3 src/mutator-gate/runtime_launch_guard_unittest.py && python3 src/mutator-gate/version_coupling_unittest.py && python3 framework/tools/lease-broker/check-runtime-launches.py --root ../.. && bash framework/tools/codex/test-pr-diff-context.sh && bash framework/tools/qa/test-deps-preflight.sh && bash framework/tools/git/test-pr-review-gitea-comment.sh && bash framework/tools/git/test-pr-review-repo-host-override.sh && bash framework/tools/git/test-ci-queue-wait-branch-absent.sh && bash framework/tools/git/test-git-credential-mosaic.sh && bash framework/tools/git/test-gitea-token-identity.sh && bash framework/tools/woodpecker/test-terminal-green-contract.sh && bash framework/tools/_scripts/test-install-ordering-guard.sh && bash framework/tools/tmux/agent-send.test.sh && bash framework/tools/wake/test-wake-store-ack.sh && bash framework/tools/wake/test-wake-store-enqueue-race.sh && bash framework/tools/wake/test-wake-digest-hmac.sh && bash framework/tools/wake/test-wake-digest-quarantine.sh && bash framework/tools/wake/test-wake-detector.sh && bash framework/tools/wake/test-wake-fn-oracle.sh && bash framework/tools/wake/test-wake-reconcile.sh && bash framework/tools/wake/test-wake-beacon.sh && bash framework/tools/wake/test-wake-preimage.sh && bash framework/tools/wake/test-wake-install.sh"
   },
   "dependencies": {
     "@mosaicstack/brain": "workspace:*",

packages/mosaic/src/commands/launch.ts

@@ -14,11 +14,9 @@ import {
   readdirSync,
   realpathSync,
   rmSync,
-  appendFileSync,
 } from 'node:fs';
-import { createHash, randomBytes } from 'node:crypto';
 import { createRequire } from 'node:module';
-import { homedir, hostname } from 'node:os';
+import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 import type { Command } from 'commander';
 import {
@@ -44,163 +42,6 @@ const RUNTIME_LABELS: Record<RuntimeName, string> = {
   pi: 'Pi',
 };
 
-// ─── Harness home isolation ──────────────────────────────────────────────────
-// Mosaic-launched runtimes read config from a dedicated home under the mosaic
-// tree — never the operator's base install. A bare `claude` / `pi` therefore
-// keeps its own config AND its own auth, and stays a working break-glass no
-// matter what mosaic does to its own tree.
-//
-// These paths are manifest-UNKNOWN, which resolves to operator ownership
-// (framework-manifest.txt rule 3, #791), so a keep-mode `mosaic update` can
-// neither overwrite nor prune them. Overwrite-mode install still would.
-//
-// opencode has no dedicated config-dir variable and follows XDG, so isolating it
-// sets XDG_CONFIG_HOME for that process tree. That is blunter than the other
-// three: it also relocates XDG lookups for anything opencode spawns.
-const HARNESS_HOME_ENV: Record<RuntimeName, string> = {
-  claude: 'CLAUDE_CONFIG_DIR',
-  pi: 'PI_CODING_AGENT_DIR',
-  codex: 'CODEX_HOME',
-  opencode: 'XDG_CONFIG_HOME',
-};
-
-/** Dedicated mosaic-owned home for a runtime: ~/.config/mosaic/.<runtime> */
-function harnessHome(runtime: RuntimeName): string {
-  return join(MOSAIC_HOME, `.${runtime}`);
-}
-
-/**
- * Env overlay pointing a runtime at its mosaic-owned home. The directory is
- * created on demand so a first launch does not fail on a missing path.
- */
-function harnessEnv(runtime: RuntimeName): Record<string, string> {
-  const key = HARNESS_HOME_ENV[runtime];
-  if (!key) return {};
-  const home = harnessHome(runtime);
-  mkdirSync(home, { recursive: true });
-  return { [key]: home };
-}
-
-// ─── Launch record (immutable provenance) ────────────────────────────────────
-// MANDATORY and MECHANICAL: every launch appends one record of what the agent
-// actually launched with, written before exec. No model involvement, no opt-out.
-//
-// WHY LAUNCH-TIME AND NOT INSPECT-LATER: pi rewrites its own argv to a bare
-// `pi`, so /proc/<pid>/cmdline DESTROYS the launch evidence. That has already
-// produced a confident wrong diagnosis ("this agent bypassed the launcher"),
-// disproved only by the parent process's argv and only because the parent had
-// not yet exited. A record written before exec is the only place this survives.
-//
-// Lands in fleet/run/sessions/ — the #797 Runtime Session Ledger path, already
-// operator-classified in framework-manifest.txt and already covered by
-// test-upgrade-manifest-guard.sh, so an upgrade can neither overwrite nor prune
-// it.
-//
-// CORRELATION is by an explicit MOSAIC_LAUNCH_ID, never by pid: execRuntime()
-// uses spawnSync, so the runtime is a CHILD with a different pid.
-// launch-runtime.py appends the matching `lease.register` event.
-//
-// NEVER records a credential value: env is captured as PRESENT NAMES ONLY, and
-// oversized argv values (the composed system prompt) become a digest + length.
-const LAUNCH_LEDGER_DIR = join(MOSAIC_HOME, 'fleet', 'run', 'sessions');
-
-const CLI_VERSION: string | null = (() => {
-  try {
-    // Resolved RELATIVELY: the package `exports` map does not expose
-    // package.json, so '@mosaicstack/mosaic/package.json' throws
-    // ERR_PACKAGE_PATH_NOT_EXPORTED. Same relative depth from src/ and dist/.
-    return (createRequire(import.meta.url)('../../package.json') as { version: string }).version;
-  } catch {
-    return null;
-  }
-})();
-
-interface NormativeFragmentDigest {
-  source_id: string;
-  sha256: string | null;
-  bytes: number | null;
-  missing?: boolean;
-}
-
-function sha256Of(value: string | Buffer): string {
-  return createHash('sha256').update(value).digest('hex');
-}
-
-/**
- * Hash the normative sources injected into the agent. This is "what the agent
- * IS" — and it is the same fragment set the lease broker hashes for promotion,
- * so an unexpected digest here is a mechanically detectable red flag rather than
- * a matter of judgement.
- */
-function normativeFragmentDigests(runtime: RuntimeName): NormativeFragmentDigest[] {
-  const candidates: Array<[string, string]> = [
-    ['CONSTITUTION.md', join(MOSAIC_HOME, 'CONSTITUTION.md')],
-    ['AGENTS.md', join(MOSAIC_HOME, 'AGENTS.md')],
-    ['SOUL.md', join(MOSAIC_HOME, 'SOUL.md')],
-    ['USER.md', join(MOSAIC_HOME, 'USER.md')],
-    ['STANDARDS.md', join(MOSAIC_HOME, 'STANDARDS.md')],
-    ['TOOLS.md', join(MOSAIC_HOME, 'TOOLS.md')],
-    [`runtime/${runtime}/RUNTIME.md`, join(MOSAIC_HOME, 'runtime', runtime, 'RUNTIME.md')],
-  ];
-  return candidates.map(([sourceId, path]) => {
-    try {
-      const bytes = readFileSync(path);
-      return { source_id: sourceId, sha256: sha256Of(bytes), bytes: bytes.length };
-    } catch {
-      return { source_id: sourceId, sha256: null, bytes: null, missing: true };
-    }
-  });
-}
-
-/** argv with oversized values replaced by a digest, so the record stays small
- * and never inlines injected content verbatim. */
-function redactArgv(argv: string[]): string[] {
-  return argv.map((a) =>
-    typeof a === 'string' && a.length > 256
-      ? `<redacted sha256:${sha256Of(a).slice(0, 16)} bytes:${a.length}>`
-      : a,
-  );
-}
-
-function recordLaunch(runtime: RuntimeName, cliArgs: string[], yolo: boolean): void {
-  try {
-    mkdirSync(LAUNCH_LEDGER_DIR, { recursive: true, mode: 0o700 });
-    // Correlation id for the lease.register half. Set into process.env so it
-    // propagates through every `...process.env` / `...baseEnv` spread below.
-    const launchId = `${Date.now().toString(36)}-${randomBytes(6).toString('hex')}`;
-    process.env['MOSAIC_LAUNCH_ID'] = launchId;
-    const record = {
-      seq: Date.now(),
-      kind: 'session.launch',
-      launch_id: launchId,
-      ts: new Date().toISOString(),
-      host: hostname(),
-      pid: process.pid,
-      runtime,
-      mode: yolo ? 'yolo' : 'normal',
-      cwd: process.cwd(),
-      cli_version: CLI_VERSION,
-      config_home: harnessHome(runtime),
-      config_home_isolated: true,
-      config_home_env: HARNESS_HOME_ENV[runtime] ?? null,
-      argv: redactArgv(cliArgs),
-      normative_fragments: normativeFragmentDigests(runtime),
-      // names only — values are never recorded
-      mosaic_env_present: Object.keys(process.env)
-        .filter((k) => k.startsWith('MOSAIC_'))
-        .sort(),
-    };
-    appendFileSync(join(LAUNCH_LEDGER_DIR, 'events.ndjson'), `${JSON.stringify(record)}\n`, {
-      mode: 0o600,
-    });
-  } catch (err) {
-    // Never block a launch on bookkeeping — but never fail silently either.
-    console.error(
-      `[mosaic] WARNING: launch record not written: ${err instanceof Error ? err.message : String(err)}`,
-    );
-  }
-}
-
 // ─── Pre-flight checks ──────────────────────────────────────────────────────
 
 function checkMosaicHome(): void {
@@ -264,11 +105,11 @@ interface SettingsAudit {
 
 function auditClaudeSettings(): SettingsAudit {
   const warnings: string[] = [];
-  const settingsPath = join(harnessHome('claude'), 'settings.json');
+  const settingsPath = join(homedir(), '.claude', 'settings.json');
   const settings = readJson(settingsPath);
 
   if (!settings) {
-    warnings.push(`${settingsPath} not found — hooks and plugins will be missing`);
+    warnings.push('~/.claude/settings.json not found — hooks and plugins will be missing');
     return { warnings };
   }
 
@@ -720,9 +561,7 @@ function skillRealPath(dir: string): string {
 /** Skill roots Pi auto-discovers natively (no `--skill` needed): its global
  * skills dir and the project-local one relative to the launch cwd. */
 function piNativeSkillRoots(cwd: string = process.cwd()): string[] {
-  // PI_CODING_AGENT_DIR replaces ~/.pi/agent (not ~/.pi), so skills live at
-  // <home>/skills — there is no extra 'agent' segment under the isolated home.
-  return [join(harnessHome('pi'), 'skills'), join(cwd, '.pi', 'skills')];
+  return [join(homedir(), '.pi', 'agent', 'skills'), join(cwd, '.pi', 'skills')];
 }
 
 /** Enumerate skill dirs under a set of roots, deduped by real path. A directory
@@ -925,13 +764,12 @@ function launchRuntime(runtime: RuntimeName, args: string[], yolo: boolean): nev
         cliArgs.push(...args);
       }
       console.log(`[mosaic] Launching ${label}${modeStr}${missionStr}...`);
-      recordLaunch('claude', cliArgs, yolo);
       execLeaseGatedRuntime('claude', cliArgs, process.env, yolo);
       break;
     }
 
     case 'codex': {
-      ensureRuntimeConfig('codex', join(harnessHome('codex'), 'instructions.md'));
+      ensureRuntimeConfig('codex', join(homedir(), '.codex', 'instructions.md'));
       const cliArgs = yolo ? ['--dangerously-bypass-approvals-and-sandbox'] : [];
       if (hasMissionNoArgs) {
         cliArgs.push(missionPrompt);
@@ -939,17 +777,14 @@ function launchRuntime(runtime: RuntimeName, args: string[], yolo: boolean): nev
         cliArgs.push(...args);
       }
       console.log(`[mosaic] Launching ${label}${modeStr}${missionStr}...`);
-      recordLaunch('codex', cliArgs, yolo);
-      execRuntime('codex', cliArgs, { ...process.env, ...harnessEnv('codex') });
+      execRuntime('codex', cliArgs);
       break;
     }
 
     case 'opencode': {
-      // opencode follows XDG, so its config resolves to $XDG_CONFIG_HOME/opencode.
-      ensureRuntimeConfig('opencode', join(harnessHome('opencode'), 'opencode', 'AGENTS.md'));
+      ensureRuntimeConfig('opencode', join(homedir(), '.config', 'opencode', 'AGENTS.md'));
       console.log(`[mosaic] Launching ${label}${modeStr}...`);
-      recordLaunch('opencode', args, yolo);
-      execRuntime('opencode', args, { ...process.env, ...harnessEnv('opencode') });
+      execRuntime('opencode', args);
       break;
     }
 
@@ -964,7 +799,6 @@ function launchRuntime(runtime: RuntimeName, args: string[], yolo: boolean): nev
         cliArgs.push(...args);
       }
       console.log(`[mosaic] Launching ${label}${modeStr}${missionStr}...`);
-      recordLaunch('pi', cliArgs, yolo);
       execLeaseGatedRuntime('pi', cliArgs);
       break;
     }
@@ -1001,7 +835,6 @@ function execLeaseGatedRuntime(
     [launcher, ...dangerousArgs, '--runtime', runtime, '--', runtime, ...args],
     {
       ...baseEnv,
-      ...harnessEnv(runtime),
       MOSAIC_LEASE_BROKER_SOCKET: defaultLeaseBrokerSocket(baseEnv),
       MOSAIC_RUNTIME_GENERATION: baseEnv['MOSAIC_RUNTIME_GENERATION'] ?? '1',
     },

scripts/gate-empty-population-control.mjs

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
+import { verifyRegistry } from './gate-verify.mjs';
+
+const root = process.cwd();
+const manifest = JSON.parse(await readFile(path.join(root, 'gates/gates.manifest.json'), 'utf8'));
+manifest.gateRoots = ['.mosaic-empty-gate-root'];
+manifest.criteria = [];
+manifest.gates = [];
+manifest.proseClaims = [];
+manifest.compatibilityScenarios = [];
+const directory = await mkdtemp(path.join(os.tmpdir(), 'gate-empty-population-'));
+try {
+  const manifestPath = path.join(directory, 'manifest.json');
+  await writeFile(manifestPath, `${JSON.stringify(manifest)}\n`);
+  const result = await verifyRegistry({
+    root,
+    manifest: manifestPath,
+    structureOnly: true,
+    fixtureProfile: false,
+  });
+  const required = ['criteria', 'gates', 'proseClaims', 'compatibilityScenarios'];
+  const missing = required.filter(
+    (population) =>
+      !result.failures.some((failure) =>
+        failure.includes(`${population} population must be non-empty and anchored`),
+      ),
+  );
+  if (missing.length > 0) {
+    process.stdout.write(`empty populations were not rejected: ${missing.join(', ')}\n`);
+    process.exitCode = 0;
+  } else {
+    process.stderr.write(
+      'empty universally quantified registry populations rejected before evaluation\n',
+    );
+    process.exitCode = 1;
+  }
+} finally {
+  await rm(directory, { recursive: true, force: true });
+}

scripts/gate-history-exclusion-control.mjs

@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+
+import { assertCurrentTreeObservation } from './gate-verify.mjs';
+
+const prohibitedReports = [
+  'HISTORY PROVENANCE VERIFIED local-ref',
+  'COMMIT ANCESTRY VERIFIED origin/main',
+  'PROVIDER LINEAGE SUCCESS pipeline-7',
+];
+const accepted = prohibitedReports.filter((report) => {
+  try {
+    assertCurrentTreeObservation(report);
+    return true;
+  } catch {
+    return false;
+  }
+});
+
+const verifier = await readFile(path.join(process.cwd(), 'scripts', 'gate-verify.mjs'), 'utf8');
+const stdoutWrites = [...verifier.matchAll(/process\.stdout\.write\s*\(/g)].length;
+const stderrWrites = [...verifier.matchAll(/process\.stderr\.write\s*\(/g)].length;
+const gatedErrorWrites = [...verifier.matchAll(/process\.stderr\.write\(`GATE VERIFY FAILED:/g)]
+  .length;
+const currentTreeWriterCalls = [...verifier.matchAll(/writeCurrentTreeOutput\s*\(/g)].length;
+const productionRendererWired =
+  stdoutWrites === 1 &&
+  stderrWrites === 2 &&
+  gatedErrorWrites === 2 &&
+  currentTreeWriterCalls === 3 &&
+  /function writeCurrentTreeOutput\(output\) \{\s*assertCurrentTreeObservation\(output\);\s*process\.stdout\.write/s.test(
+    verifier,
+  ) &&
+  /for \(const observation of observations\) \{\s*writeCurrentTreeOutput\(observation\);\s*\}/s.test(
+    verifier,
+  ) &&
+  /writeCurrentTreeOutput\(\s*`REGISTRY SUMMARY open behavior deltas:/s.test(verifier) &&
+  !/\bconsole\.(?:log|info|debug|error|warn)\s*\(/.test(verifier);
+
+if (accepted.length > 0 || !productionRendererWired) {
+  process.stderr.write(
+    `HISTORY_PROVENANCE_FORBIDDEN: closed current-tree observation renderer rejected=${prohibitedReports.length - accepted.length}/${prohibitedReports.length} production-wired=${productionRendererWired}\n`,
+  );
+  process.exit(79);
+}
+process.stdout.write('history provenance reporting capability is absent; owner RM-60\n');

scripts/gate-inventory-claim-control.mjs

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+
+const boundary =
+  "Detects accidental and incompetent inventory drift within a checkout; does NOT survive an adversary who rewrites baseline, manifest, and verifier consistently — that guarantee requires RM-60's external boundary.";
+const artifacts = [
+  'gates/required-gates.baseline.json',
+  'gates/gates.manifest.json',
+  'docs/PRD.md',
+  'docs/ADMIN-GUIDE/quality-gate-registry.md',
+  'docs/DEVELOPER-GUIDE/quality-gate-registry.md',
+  'docs/remediation/GATE-CLAIMS.md',
+  'docs/plans/2026-08-01-rm-02-gate-registry.md',
+  'docs/SITEMAP.md',
+];
+const forbidden = [
+  /\bindependent\b[^\n.]{0,80}\bbaseline\b/i,
+  /independently baselined/i,
+  /independently anchored inventory/i,
+  /protected (?:inventory )?(?:anchor|baseline)/i,
+  /inventory (?:anchor|anchored)/i,
+];
+const failures = [];
+for (const relativePath of artifacts) {
+  const contents = await readFile(path.join(process.cwd(), relativePath), 'utf8');
+  const claims =
+    relativePath === 'gates/gates.manifest.json'
+      ? JSON.parse(contents)
+          .criteria.map((criterion) => criterion.currentText)
+          .join('\n')
+      : contents;
+  if (!claims.includes(boundary)) failures.push(`${relativePath}: narrowed boundary is missing`);
+  const overclaim = forbidden.find((pattern) => pattern.test(claims));
+  if (overclaim) failures.push(`${relativePath}: inventory protection is overstated`);
+}
+if (failures.length > 0) {
+  for (const failure of failures) {
+    process.stderr.write(`INVENTORY_CLAIM_OVERSTATED: ${failure}\n`);
+  }
+  process.exit(84);
+}
+process.stdout.write('inventory drift boundary is stated in both directions; owner RM-60\n');

scripts/gate-inventory-shrink-control.mjs

@@ -0,0 +1,119 @@
+#!/usr/bin/env node
+
+import assert from 'node:assert/strict';
+import { copyFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+
+const root = process.cwd();
+const removedGateId = 'hook-pre-push';
+const inventoryEntry = "  ['hook-pre-push', '.husky/pre-push'],\n";
+
+function shrinkManifest(manifest) {
+  const removedGate = manifest.gates.find((gate) => gate.id === removedGateId);
+  assert.ok(removedGate);
+  const removedCaseRefs = new Set(
+    removedGate.cases.map((gateCase) => `${removedGateId}/${gateCase.id}`),
+  );
+  const removedCriterionIds = new Set(
+    manifest.criteria
+      .filter(
+        (criterion) =>
+          criterion.caseRefs.length > 0 &&
+          criterion.caseRefs.every((caseRef) => removedCaseRefs.has(caseRef)),
+      )
+      .map((criterion) => criterion.id),
+  );
+  manifest.gates = manifest.gates.filter((gate) => gate.id !== removedGateId);
+  manifest.criteria = manifest.criteria
+    .filter((criterion) => !removedCriterionIds.has(criterion.id))
+    .map((criterion) => ({
+      ...criterion,
+      caseRefs: criterion.caseRefs.filter((caseRef) => !removedCaseRefs.has(caseRef)),
+      ...(criterion.gateRefs
+        ? { gateRefs: criterion.gateRefs.filter((gateId) => gateId !== removedGateId) }
+        : {}),
+    }));
+  manifest.proseClaims = manifest.proseClaims.filter(
+    (claim) => !removedCriterionIds.has(claim.criterionId) && !removedCaseRefs.has(claim.caseRef),
+  );
+  manifest.compatibilityScenarios = manifest.compatibilityScenarios
+    .map((scenario) => ({
+      ...scenario,
+      caseRefs: scenario.caseRefs.filter((caseRef) => !removedCaseRefs.has(caseRef)),
+    }))
+    .filter((scenario) => scenario.caseRefs.length > 0);
+  for (const gate of manifest.gates) {
+    for (const gateCase of gate.cases) {
+      gateCase.criterionIds = gateCase.criterionIds.filter(
+        (criterionId) => !removedCriterionIds.has(criterionId),
+      );
+    }
+  }
+}
+
+async function attack(mode) {
+  const fixture = await mkdtemp(path.join(os.tmpdir(), `gate-inventory-${mode}-`));
+  try {
+    await mkdir(path.join(fixture, 'scripts'), { recursive: true });
+    await mkdir(path.join(fixture, 'gates'), { recursive: true });
+    const source = await readFile(path.join(root, 'scripts', 'gate-verify.mjs'), 'utf8');
+    if (source.split(inventoryEntry).length - 1 !== 1) {
+      throw new Error('source inventory fixture drifted');
+    }
+    await writeFile(
+      path.join(fixture, 'scripts', 'gate-verify.mjs'),
+      mode === 'source-manifest' ? source.replace(inventoryEntry, '') : source,
+    );
+    const baseline = JSON.parse(
+      await readFile(path.join(root, 'gates', 'required-gates.baseline.json'), 'utf8'),
+    );
+    if (mode === 'baseline-manifest') {
+      baseline.gates = baseline.gates.filter((gate) => gate.id !== removedGateId);
+    }
+    await writeFile(
+      path.join(fixture, 'gates', 'required-gates.baseline.json'),
+      `${JSON.stringify(baseline)}\n`,
+    );
+    const manifest = JSON.parse(
+      await readFile(path.join(root, 'gates', 'gates.manifest.json'), 'utf8'),
+    );
+    shrinkManifest(manifest);
+    await writeFile(
+      path.join(fixture, 'gates', 'gates.manifest.json'),
+      `${JSON.stringify(manifest)}\n`,
+    );
+    const result = spawnSync(
+      process.execPath,
+      [
+        path.join(fixture, 'scripts', 'gate-verify.mjs'),
+        '--root',
+        fixture,
+        '--manifest',
+        'gates/gates.manifest.json',
+        '--structure-only',
+      ],
+      { cwd: fixture, encoding: 'utf8' },
+    );
+    const combined = `${result.stdout ?? ''}\n${result.stderr ?? ''}`;
+    return (
+      result.status !== 0 &&
+      new RegExp(`(?:baseline|verifier inventory).*${removedGateId}`, 'i').test(combined)
+    );
+  } finally {
+    await rm(fixture, { recursive: true, force: true });
+  }
+}
+
+const sourceManifestRejected = await attack('source-manifest');
+const baselineManifestRejected = await attack('baseline-manifest');
+if (sourceManifestRejected && baselineManifestRejected) {
+  process.stderr.write(
+    'INVENTORY_SHRINK_REJECTED: source+manifest and baseline+manifest shrink attacks detected\n',
+  );
+  process.exit(83);
+}
+process.stdout.write(
+  `inventory shrink attack escaped: source-manifest=${sourceManifestRejected} baseline-manifest=${baselineManifestRejected}\n`,
+);

scripts/gate-population-control.mjs

@@ -0,0 +1,138 @@
+#!/usr/bin/env node
+
+import { chmod, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
+import { verifyRegistry } from './gate-verify.mjs';
+
+const mode = process.argv[2];
+const root = process.cwd();
+const source = JSON.parse(await readFile(path.join(root, 'gates/gates.manifest.json'), 'utf8'));
+const expectedGateIds = source.gates.map((gate) => gate.id);
+if (expectedGateIds.length === 0) {
+  process.stderr.write('gate population control requires a non-empty anchored inventory\n');
+  process.exit(2);
+}
+
+async function rejectedForEveryGate(mutate, diagnostic) {
+  for (const gateId of expectedGateIds) {
+    const manifest = structuredClone(source);
+    const gate = manifest.gates.find((candidate) => candidate.id === gateId);
+    mutate(gate);
+    const directory = await mkdtemp(path.join(os.tmpdir(), 'gate-population-control-'));
+    const manifestPath = path.join(directory, 'manifest.json');
+    try {
+      await writeFile(manifestPath, `${JSON.stringify(manifest)}\n`);
+      const result = await verifyRegistry({
+        root,
+        manifest: manifestPath,
+        structureOnly: true,
+        fixtureProfile: false,
+      });
+      if (!result.failures.some((failure) => diagnostic(failure, gateId))) return false;
+    } finally {
+      await rm(directory, { recursive: true, force: true });
+    }
+  }
+  return true;
+}
+
+let rejected;
+if (mode === 'evidence-subject') {
+  rejected = true;
+  for (const gateId of expectedGateIds) {
+    const directory = await mkdtemp(path.join(os.tmpdir(), 'gate-evidence-consumption-'));
+    try {
+      await mkdir(path.join(directory, 'gates'), { recursive: true });
+      const probe = path.join(directory, 'gates', 'probe.sh');
+      await writeFile(probe, '#!/bin/sh\necho EVIDENCE_PROBE >&2\nexit 7\n');
+      await chmod(probe, 0o755);
+      const manifest = {
+        schemaVersion: 1,
+        gateRoots: ['gates'],
+        governingClaimFiles: [],
+        coverageBoundary: { included: ['evidence fixture'], excluded: [], trackedBy: 'RM-02' },
+        criteria: [
+          {
+            id: 'EVIDENCE-CONSUMPTION',
+            originalText: 'Consumed evidence stays bound to its gate.',
+            currentText: 'Consumed evidence stays bound to its gate.',
+            claimType: 'integrity',
+            source: 'gate-population-control',
+            meaningChanges: [],
+            caseRefs: [`${gateId}/probe`],
+          },
+        ],
+        proseClaims: [],
+        compatibilityScenarios: [],
+        gates: [
+          {
+            id: gateId,
+            source: 'gates/probe.sh',
+            invocation: ['gates/probe.sh'],
+            deployment: { kind: 'none', reason: 'population fixture' },
+            inertMutation: {
+              file: 'gates/probe.sh',
+              find: 'exit 7',
+              replace: 'exit 0',
+              caseId: 'probe',
+              expected: { exitCode: 0 },
+            },
+            cases: [
+              {
+                id: 'probe',
+                criterionIds: ['EVIDENCE-CONSUMPTION'],
+                mustFail: true,
+                required: { exitCode: 7 },
+                actual: { exitCode: 7 },
+                evidence: { subject: 'different-gate-subject' },
+                reasonPattern: 'EVIDENCE_PROBE',
+              },
+            ],
+          },
+        ],
+      };
+      const manifestPath = path.join(directory, 'gates', 'gates.manifest.json');
+      await writeFile(manifestPath, `${JSON.stringify(manifest)}\n`);
+      const result = await verifyRegistry({
+        root: directory,
+        manifest: manifestPath,
+        structureOnly: false,
+        fixtureProfile: true,
+      });
+      if (
+        !result.failures.some(
+          (failure) =>
+            failure.includes(`gate ${gateId}: consumed evidence subject`) &&
+            failure.includes('does not match gate definition'),
+        )
+      ) {
+        rejected = false;
+        break;
+      }
+    } finally {
+      await rm(directory, { recursive: true, force: true });
+    }
+  }
+} else if (mode === 'type-strict') {
+  rejected = await rejectedForEveryGate(
+    (gate) => {
+      gate.cases[0].actual.exitCode = '0';
+    },
+    (failure, gateId) =>
+      failure.includes(
+        `${gateId}/${source.gates.find((gate) => gate.id === gateId).cases[0].id}.actual.exitCode`,
+      ) && failure.includes('expected an integer'),
+  );
+} else {
+  process.stderr.write(`unknown gate population control ${String(mode)}\n`);
+  process.exit(2);
+}
+
+if (!rejected) {
+  process.stdout.write(`${mode} population control did not reject every registered gate\n`);
+  process.exit(0);
+}
+process.stderr.write(`${mode} population control rejected every registered gate\n`);
+process.exit(1);

scripts/gate-remediation.test.mjs

@@ -0,0 +1,283 @@
+import assert from 'node:assert/strict';
+import { copyFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import test from 'node:test';
+
+const root = process.cwd();
+const verifierPath = path.join(root, 'scripts', 'gate-verify.mjs');
+const manifestPath = path.join(root, 'gates', 'gates.manifest.json');
+const requiredGateId = 'hook-pre-push';
+
+function output(result) {
+  return `${result.stdout ?? ''}\n${result.stderr ?? ''}`;
+}
+
+function shrinkManifest(manifest, removedGateId) {
+  const removedGate = manifest.gates.find((gate) => gate.id === removedGateId);
+  assert.ok(removedGate, `fixture gate ${removedGateId} must exist`);
+  const removedCaseRefs = new Set(
+    removedGate.cases.map((gateCase) => `${removedGateId}/${gateCase.id}`),
+  );
+  const removedCriterionIds = new Set(
+    manifest.criteria
+      .filter(
+        (criterion) =>
+          criterion.caseRefs.length > 0 &&
+          criterion.caseRefs.every((caseRef) => removedCaseRefs.has(caseRef)),
+      )
+      .map((criterion) => criterion.id),
+  );
+
+  manifest.gates = manifest.gates.filter((gate) => gate.id !== removedGateId);
+  manifest.criteria = manifest.criteria
+    .filter((criterion) => !removedCriterionIds.has(criterion.id))
+    .map((criterion) => ({
+      ...criterion,
+      caseRefs: criterion.caseRefs.filter((caseRef) => !removedCaseRefs.has(caseRef)),
+      ...(criterion.gateRefs
+        ? { gateRefs: criterion.gateRefs.filter((gateId) => gateId !== removedGateId) }
+        : {}),
+    }));
+  manifest.proseClaims = manifest.proseClaims.filter(
+    (claim) => !removedCriterionIds.has(claim.criterionId) && !removedCaseRefs.has(claim.caseRef),
+  );
+  manifest.compatibilityScenarios = manifest.compatibilityScenarios
+    .map((scenario) => ({
+      ...scenario,
+      caseRefs: scenario.caseRefs.filter((caseRef) => !removedCaseRefs.has(caseRef)),
+    }))
+    .filter((scenario) => scenario.caseRefs.length > 0);
+  for (const gate of manifest.gates) {
+    for (const gateCase of gate.cases) {
+      gateCase.criterionIds = gateCase.criterionIds.filter(
+        (criterionId) => !removedCriterionIds.has(criterionId),
+      );
+    }
+  }
+}
+
+test('shrinking the verifier inventory and manifest together is rejected by a same-checkout baseline', async () => {
+  const fixture = await mkdtemp(path.join(os.tmpdir(), 'rm02-shrink-both-'));
+  try {
+    await mkdir(path.join(fixture, 'scripts'), { recursive: true });
+    await mkdir(path.join(fixture, 'gates'), { recursive: true });
+    const verifier = await readFile(verifierPath, 'utf8');
+    const inventoryEntry = "  ['hook-pre-push', '.husky/pre-push'],\n";
+    assert.equal(verifier.split(inventoryEntry).length - 1, 1, 'source inventory fixture drifted');
+    await writeFile(
+      path.join(fixture, 'scripts', 'gate-verify.mjs'),
+      verifier.replace(inventoryEntry, ''),
+    );
+    await copyFile(
+      path.join(root, 'gates', 'required-gates.baseline.json'),
+      path.join(fixture, 'gates', 'required-gates.baseline.json'),
+    );
+    const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
+    shrinkManifest(manifest, requiredGateId);
+    await writeFile(
+      path.join(fixture, 'gates', 'gates.manifest.json'),
+      `${JSON.stringify(manifest)}\n`,
+    );
+
+    const result = spawnSync(
+      process.execPath,
+      [
+        path.join(fixture, 'scripts', 'gate-verify.mjs'),
+        '--root',
+        fixture,
+        '--manifest',
+        'gates/gates.manifest.json',
+        '--structure-only',
+      ],
+      { cwd: fixture, encoding: 'utf8' },
+    );
+    assert.notEqual(result.status, 0, 'shrinking source anchor and manifest together must go red');
+    assert.match(output(result), /same-checkout required-gate baseline.*hook-pre-push/i);
+  } finally {
+    await rm(fixture, { recursive: true, force: true });
+  }
+});
+
+test('shrinking the same-checkout baseline and manifest together is rejected by verifier inventory', async () => {
+  const fixture = await mkdtemp(path.join(os.tmpdir(), 'rm02-shrink-baseline-manifest-'));
+  try {
+    await mkdir(path.join(fixture, 'scripts'), { recursive: true });
+    await mkdir(path.join(fixture, 'gates'), { recursive: true });
+    await copyFile(verifierPath, path.join(fixture, 'scripts', 'gate-verify.mjs'));
+    const baseline = JSON.parse(
+      await readFile(path.join(root, 'gates', 'required-gates.baseline.json'), 'utf8'),
+    );
+    baseline.gates = baseline.gates.filter((gate) => gate.id !== requiredGateId);
+    await writeFile(
+      path.join(fixture, 'gates', 'required-gates.baseline.json'),
+      `${JSON.stringify(baseline)}\n`,
+    );
+    const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
+    shrinkManifest(manifest, requiredGateId);
+    await writeFile(
+      path.join(fixture, 'gates', 'gates.manifest.json'),
+      `${JSON.stringify(manifest)}\n`,
+    );
+
+    const result = spawnSync(
+      process.execPath,
+      [
+        path.join(fixture, 'scripts', 'gate-verify.mjs'),
+        '--root',
+        fixture,
+        '--manifest',
+        'gates/gates.manifest.json',
+        '--structure-only',
+      ],
+      { cwd: fixture, encoding: 'utf8' },
+    );
+    assert.notEqual(result.status, 0, 'shrinking baseline and manifest together must go red');
+    assert.match(output(result), /verifier inventory.*hook-pre-push.*baseline/i);
+  } finally {
+    await rm(fixture, { recursive: true, force: true });
+  }
+});
+
+test('every gate carries an evidence-side subject distinct from its definition', async () => {
+  const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
+  for (const gate of manifest.gates) {
+    assert.ok(gate.cases.length > 0, `${gate.id} must have consumable evidence`);
+    for (const gateCase of gate.cases) {
+      assert.equal(
+        gateCase.evidence?.subject,
+        gate.id,
+        `${gate.id}/${gateCase.id} must source its subject from the evidence record`,
+      );
+    }
+  }
+});
+
+test('inventory claim control rejects qualified independence wording', async () => {
+  const fixture = await mkdtemp(path.join(os.tmpdir(), 'rm02-inventory-overclaim-'));
+  const artifacts = [
+    'gates/required-gates.baseline.json',
+    'gates/gates.manifest.json',
+    'docs/PRD.md',
+    'docs/ADMIN-GUIDE/quality-gate-registry.md',
+    'docs/DEVELOPER-GUIDE/quality-gate-registry.md',
+    'docs/remediation/GATE-CLAIMS.md',
+    'docs/plans/2026-08-01-rm-02-gate-registry.md',
+    'docs/SITEMAP.md',
+  ];
+  try {
+    await mkdir(path.join(fixture, 'scripts'), { recursive: true });
+    await copyFile(
+      path.join(root, 'scripts', 'gate-inventory-claim-control.mjs'),
+      path.join(fixture, 'scripts', 'gate-inventory-claim-control.mjs'),
+    );
+    for (const relativePath of artifacts) {
+      const target = path.join(fixture, relativePath);
+      await mkdir(path.dirname(target), { recursive: true });
+      await copyFile(path.join(root, relativePath), target);
+    }
+    const prd = path.join(fixture, 'docs', 'PRD.md');
+    await writeFile(
+      prd,
+      `${await readFile(prd, 'utf8')}\nThis provides an independent seven-gate baseline comparison.\n`,
+    );
+    const result = spawnSync(
+      process.execPath,
+      [path.join(fixture, 'scripts', 'gate-inventory-claim-control.mjs')],
+      { cwd: fixture, encoding: 'utf8' },
+    );
+    assert.equal(result.status, 84, output(result));
+    assert.match(output(result), /INVENTORY_CLAIM_OVERSTATED.*docs\/PRD\.md/i);
+  } finally {
+    await rm(fixture, { recursive: true, force: true });
+  }
+});
+
+test('evidence population control depends on production result consumption wiring', async () => {
+  const fixture = await mkdtemp(path.join(os.tmpdir(), 'rm02-evidence-consumer-inert-'));
+  try {
+    await mkdir(path.join(fixture, 'scripts'), { recursive: true });
+    await mkdir(path.join(fixture, 'gates'), { recursive: true });
+    const verifier = await readFile(verifierPath, 'utf8');
+    const consumer = `        const subjectFailure = consumeEvidenceSubject(gate, result.evidence);\n        if (subjectFailure) failures.push(subjectFailure);\n`;
+    assert.equal(verifier.split(consumer).length - 1, 1, 'consumer fixture drifted');
+    await writeFile(
+      path.join(fixture, 'scripts', 'gate-verify.mjs'),
+      verifier.replace(consumer, ''),
+    );
+    await copyFile(
+      path.join(root, 'scripts', 'gate-population-control.mjs'),
+      path.join(fixture, 'scripts', 'gate-population-control.mjs'),
+    );
+    await copyFile(manifestPath, path.join(fixture, 'gates', 'gates.manifest.json'));
+    const result = spawnSync(
+      process.execPath,
+      [path.join(fixture, 'scripts', 'gate-population-control.mjs'), 'evidence-subject'],
+      { cwd: fixture, encoding: 'utf8' },
+    );
+    assert.equal(result.status, 0, output(result));
+    assert.match(output(result), /did not reject every registered gate/i);
+  } finally {
+    await rm(fixture, { recursive: true, force: true });
+  }
+});
+
+test('production verification has a closed current-tree observation renderer', async () => {
+  const verifier = await readFile(verifierPath, 'utf8');
+  assert.doesNotMatch(verifier, /from ['"]\.\/gate-history\.mjs['"]/);
+  assert.doesNotMatch(verifier, /\bverifyHistory\s*\(/);
+  assert.doesNotMatch(verifier, /history[-_ ]?provenance/i);
+  const attacks = [
+    [
+      'history wording',
+      '  /^META-NEGATIVE-CONTROL /,',
+      '  /^HISTORY PROVENANCE VERIFIED /,\n  /^META-NEGATIVE-CONTROL /,',
+    ],
+    [
+      'renamed ancestry wording',
+      '  /^META-NEGATIVE-CONTROL /,',
+      '  /^COMMIT ANCESTRY VERIFIED /,\n  /^META-NEGATIVE-CONTROL /,',
+    ],
+    [
+      'provider lineage wording',
+      '  /^META-NEGATIVE-CONTROL /,',
+      '  /^PROVIDER LINEAGE SUCCESS /,\n  /^META-NEGATIVE-CONTROL /,',
+    ],
+    ['writer assertion bypass', '  assertCurrentTreeObservation(output);\n', ''],
+    [
+      'final success stdout bypass',
+      '    writeCurrentTreeOutput(\n      `REGISTRY SUMMARY open behavior deltas: ${defects}; required-behavior conformance is not asserted while deltas remain`,\n    );',
+      "    process.stdout.write('COMMIT ANCESTRY VERIFIED\\n');",
+    ],
+    [
+      'direct success stderr bypass',
+      "    const defects = observations.filter((line) => line.startsWith('DEFECT ')).length;",
+      "    process.stderr.write('PROVIDER LINEAGE SUCCESS\\n');\n    const defects = observations.filter((line) => line.startsWith('DEFECT ')).length;",
+    ],
+  ];
+  for (const [name, find, replace] of attacks) {
+    const fixture = await mkdtemp(path.join(os.tmpdir(), 'rm02-history-renderer-'));
+    try {
+      await mkdir(path.join(fixture, 'scripts'), { recursive: true });
+      assert.equal(verifier.split(find).length - 1, 1, `${name}: fixture drifted`);
+      await writeFile(
+        path.join(fixture, 'scripts', 'gate-verify.mjs'),
+        verifier.replace(find, replace),
+      );
+      await copyFile(
+        path.join(root, 'scripts', 'gate-history-exclusion-control.mjs'),
+        path.join(fixture, 'scripts', 'gate-history-exclusion-control.mjs'),
+      );
+      const result = spawnSync(
+        process.execPath,
+        [path.join(fixture, 'scripts', 'gate-history-exclusion-control.mjs')],
+        { cwd: fixture, encoding: 'utf8' },
+      );
+      assert.equal(result.status, 79, `${name}: ${output(result)}`);
+      assert.match(output(result), /HISTORY_PROVENANCE_FORBIDDEN/);
+    } finally {
+      await rm(fixture, { recursive: true, force: true });
+    }
+  }
+});

scripts/gate-verify.test.mjs

@@ -0,0 +1,785 @@
+import assert from 'node:assert/strict';
+import { chmod, copyFile, mkdir, readFile, rm, symlink, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import test from 'node:test';
+
+const verifier = path.join(process.cwd(), 'scripts', 'gate-verify.mjs');
+const fixtureRunner = path.join(
+  process.cwd(),
+  'scripts',
+  'test-support',
+  'gate-verify-fixture-runner.mjs',
+);
+const fixtureBase = path.join(process.cwd(), '.mosaic-test-work', `gate-verify-${process.pid}`);
+
+async function fixture(name = 'case') {
+  const root = path.join(fixtureBase, name);
+  await rm(root, { recursive: true, force: true });
+  await mkdir(path.join(root, 'gates'), { recursive: true });
+  return root;
+}
+
+function baseManifest() {
+  return {
+    schemaVersion: 1,
+    gateRoots: ['gates'],
+    governingClaimFiles: [],
+    coverageBoundary: { included: ['meta fixture'], excluded: [], trackedBy: 'RM-54' },
+    criteria: [
+      {
+        id: 'META-CRIT-1',
+        originalText: 'The fixture rejects its bad input.',
+        currentText: 'The fixture rejects its bad input.',
+        claimType: 'integrity',
+        source: 'fixture',
+        meaningChanges: [],
+        caseRefs: ['meta-fixture/rejects-bad-input'],
+      },
+    ],
+    compatibilityScenarios: [],
+    proseClaims: [],
+    gates: [
+      {
+        id: 'meta-fixture',
+        source: 'gates/meta-fixture.sh',
+        invocation: ['gates/meta-fixture.sh'],
+        deployment: { kind: 'none', reason: 'test fixture only' },
+        inertMutation: {
+          file: 'gates/meta-fixture.sh',
+          find: 'exit 7',
+          replace: 'exit 0',
+          expected: { exitCode: 0 },
+        },
+        cases: [
+          {
+            id: 'rejects-bad-input',
+            criterionIds: ['META-CRIT-1'],
+            mustFail: true,
+            invocation: ['gates/meta-fixture.sh'],
+            required: { exitCode: 7 },
+            actual: { exitCode: 7 },
+            evidence: { subject: 'meta-fixture' },
+            reasonPattern: 'META_REJECT',
+          },
+        ],
+      },
+    ],
+  };
+}
+
+async function writeGate(root, contents = '#!/bin/sh\necho META_REJECT >&2\nexit 7\n') {
+  const target = path.join(root, 'gates', 'meta-fixture.sh');
+  await writeFile(target, contents);
+  await chmod(target, 0o755);
+}
+
+async function writeManifest(root, manifest) {
+  await writeFile(path.join(root, 'gates', 'gates.manifest.json'), `${JSON.stringify(manifest)}\n`);
+}
+
+function verify(root, extraArgs = []) {
+  return spawnSync(
+    process.execPath,
+    [fixtureRunner, '--root', root, '--manifest', 'gates/gates.manifest.json', ...extraArgs],
+    { cwd: root, encoding: 'utf8', env: { ...process.env, HOME: os.homedir() } },
+  );
+}
+
+function verifyProductionStructure(root, extraArgs = []) {
+  return spawnSync(
+    process.execPath,
+    [
+      verifier,
+      '--root',
+      root,
+      '--manifest',
+      'gates/gates.manifest.json',
+      '--structure-only',
+      ...extraArgs,
+    ],
+    { cwd: root, encoding: 'utf8', env: { ...process.env, HOME: os.homedir() } },
+  );
+}
+
+function output(result) {
+  return `${result.stdout}\n${result.stderr}`;
+}
+
+test.after(async () => {
+  await rm(fixtureBase, { recursive: true, force: true });
+});
+
+test('universally quantified registry checks reject empty populations before evaluation', async () => {
+  const root = await fixture('empty-registry-populations');
+  await mkdir(path.join(root, 'empty-gate-root'), { recursive: true });
+  const manifest = baseManifest();
+  manifest.gateRoots = ['empty-gate-root'];
+  manifest.criteria = [];
+  manifest.proseClaims = [];
+  manifest.compatibilityScenarios = [];
+  manifest.gates = [];
+  await writeManifest(root, manifest);
+
+  const result = verifyProductionStructure(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /criteria population.*non-empty.*anchored/i);
+  assert.match(output(result), /gates population.*non-empty.*anchored/i);
+  assert.match(output(result), /proseClaims population.*non-empty.*anchored/i);
+  assert.match(output(result), /compatibilityScenarios population.*non-empty.*anchored/i);
+});
+
+test('production verifier exposes no fixture-profile population bypass', async () => {
+  const root = await fixture('no-production-fixture-profile');
+  const result = verifyProductionStructure(root, ['--fixture-profile']);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /unknown option: --fixture-profile/i);
+});
+
+test('anchored gate inventory and population criteria cannot shrink together', async () => {
+  const source = JSON.parse(
+    await readFile(path.join(process.cwd(), 'gates', 'gates.manifest.json'), 'utf8'),
+  );
+  const root = await fixture('shrunken-gate-population');
+  await copyFile(
+    path.join(process.cwd(), 'gates', 'required-gates.baseline.json'),
+    path.join(root, 'gates', 'required-gates.baseline.json'),
+  );
+  source.gates = source.gates.filter((gate) => gate.id !== 'hook-pre-push');
+  for (const criterion of source.criteria) {
+    if (criterion.gateRefs) {
+      criterion.gateRefs = criterion.gateRefs.filter((gateId) => gateId !== 'hook-pre-push');
+    }
+    criterion.caseRefs = criterion.caseRefs.filter(
+      (caseRef) => !caseRef.startsWith('hook-pre-push/'),
+    );
+  }
+  await writeManifest(root, source);
+
+  const result = verifyProductionStructure(root);
+  assert.notEqual(result.status, 0);
+  assert.match(
+    output(result),
+    /same-checkout required-gate baseline rejects manifest drift at hook-pre-push/i,
+  );
+});
+
+test('general population criteria cannot delete their gateRefs binding', async () => {
+  const requiredCriteria = [
+    'RM02-EVIDENCE-SUBJECT-BINDING',
+    'RM02-TYPE-STRICT-SCHEMA',
+    'RM02-NONEMPTY-ANCHORED-QUANTIFICATION',
+  ];
+  for (const criterionId of requiredCriteria) {
+    const source = JSON.parse(
+      await readFile(path.join(process.cwd(), 'gates', 'gates.manifest.json'), 'utf8'),
+    );
+    const root = await fixture(`missing-gate-refs-${criterionId}`);
+    delete source.criteria.find((criterion) => criterion.id === criterionId).gateRefs;
+    await writeManifest(root, source);
+    const result = verifyProductionStructure(root);
+    assert.notEqual(result.status, 0);
+    assert.match(
+      output(result),
+      new RegExp(`${criterionId}.*gateRefs.*required`, 'i'),
+      criterionId,
+    );
+  }
+});
+
+test('general population criteria must span every registered gate', async () => {
+  const source = JSON.parse(
+    await readFile(path.join(process.cwd(), 'gates', 'gates.manifest.json'), 'utf8'),
+  );
+  const root = await fixture('incomplete-gate-refs');
+  source.criteria.find((criterion) => criterion.id === 'RM02-EVIDENCE-SUBJECT-BINDING').gateRefs =
+    source.criteria
+      .find((criterion) => criterion.id === 'RM02-EVIDENCE-SUBJECT-BINDING')
+      .gateRefs.filter((gateId) => gateId !== 'quality-lint');
+  await writeManifest(root, source);
+
+  const result = verifyProductionStructure(root);
+  assert.notEqual(result.status, 0);
+  assert.match(
+    output(result),
+    /RM02-EVIDENCE-SUBJECT-BINDING.*gate population binding is missing quality-lint/i,
+  );
+});
+
+test('an externally inerted failure branch makes verification nonzero and names the gate', async () => {
+  const root = await fixture('external-inert');
+  await writeGate(root, '#!/bin/sh\nexit 0\n');
+  await writeManifest(root, baseManifest());
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture/);
+});
+
+test('the verifier applies the declared inert mutation and observes its own control red', async () => {
+  const root = await fixture('internal-meta');
+  await writeGate(root);
+  await writeManifest(root, baseManifest());
+
+  const result = verify(root);
+  assert.equal(result.status, 0, output(result));
+  assert.match(output(result), /META-NEGATIVE-CONTROL.*meta-fixture.*observed red/i);
+});
+
+test('a mutation crash is rejected instead of counted as an observed-red control', async () => {
+  const root = await fixture('mutation-crash');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].inertMutation.replace = 'this is not valid shell (';
+  manifest.gates[0].inertMutation.expected = { exitCode: 0 };
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*mutation.*unexpected outcome/i);
+  assert.doesNotMatch(output(result), /META-NEGATIVE-CONTROL.*observed red/i);
+});
+
+test('a stale declared mutation case id is rejected instead of falling back', async () => {
+  const root = await fixture('stale-case-id');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].inertMutation.caseId = 'case-that-does-not-exist';
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*case-that-does-not-exist.*not found/i);
+});
+
+test('duplicate stable ids and unsupported schema versions are rejected', async () => {
+  const root = await fixture('closed-schema');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.schemaVersion = 99;
+  manifest.criteria.push({ ...manifest.criteria[0] });
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /unsupported schemaVersion 99/i);
+  assert.match(output(result), /duplicate criterion id META-CRIT-1/i);
+});
+
+test('misspelled nested assertion fields are rejected instead of becoming optional', async () => {
+  const root = await fixture('nested-schema-typo');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].required.outputPatern = 'META_REJECT';
+  manifest.gates[0].cases[0].actual.outputPatern = 'META_REJECT';
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /required.*unknown field outputPatern/i);
+  assert.match(output(result), /actual.*unknown field outputPatern/i);
+});
+
+test('present outcome patterns cannot be empty assertion bypasses', async () => {
+  const root = await fixture('nested-schema-empty-patterns');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].required.outputPattern = '';
+  manifest.gates[0].cases[0].actual.notOutputPattern = '   ';
+  await writeManifest(root, manifest);
+
+  const result = verify(root, ['--structure-only']);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /required.outputPattern: expected a non-empty pattern/i);
+  assert.match(output(result), /actual.notOutputPattern: expected a non-empty pattern/i);
+});
+
+test('nested discriminator and comparison fields reject wrong types', async () => {
+  const root = await fixture('nested-schema-types');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].mustFail = 'true';
+  manifest.gates[0].cases[0].required.exitCode = '7';
+  manifest.gates[0].cases[0].actual.outputPattern = 7;
+  await writeManifest(root, manifest);
+
+  const result = verify(root, ['--structure-only']);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /mustFail: expected a boolean/i);
+  assert.match(output(result), /required.exitCode: expected an integer/i);
+  assert.match(output(result), /actual.outputPattern: expected a string/i);
+});
+
+test('recursive closed-schema guards reject unknown fields in every nested assertion object', async () => {
+  const source = JSON.parse(
+    await readFile(path.join(process.cwd(), 'gates', 'gates.manifest.json'), 'utf8'),
+  );
+  const checkout = source.gates.find((gate) => gate.id === 'checkout-preflight');
+  const stale = checkout.cases.find((gateCase) => gateCase.id === 'stale-build-lock');
+  const queue = source.gates.find((gate) => gate.id === 'ci-queue-wait');
+  const queueCase = queue.cases.find((gateCase) => gateCase.id === 'terminal-success');
+  const targets = [
+    ['coverageBoundary', (manifest) => manifest.coverageBoundary],
+    ['mergeAssertions', (manifest) => manifest.mergeAssertions],
+    [
+      'meaningChanges',
+      (manifest) =>
+        manifest.criteria.find((criterion) => criterion.meaningChanges.length).meaningChanges[0],
+    ],
+    ['proseClaims', (manifest) => manifest.proseClaims[0]],
+    ['compatibility expected', (manifest) => manifest.compatibilityScenarios[0].expected],
+    [
+      'deployment',
+      (manifest) => manifest.gates.find((gate) => gate.id === 'ci-queue-wait').deployment,
+    ],
+    ['inertMutation', (manifest) => manifest.gates[0].inertMutation],
+    ['inert expected', (manifest) => manifest.gates[0].inertMutation.expected],
+    ['required', (manifest) => manifest.gates[0].cases[0].required],
+    ['actual', (manifest) => manifest.gates[0].cases[0].actual],
+    [
+      'fixture',
+      (manifest) =>
+        manifest.gates
+          .find((gate) => gate.id === 'checkout-preflight')
+          .cases.find((gateCase) => gateCase.id === 'stale-build-lock').fixture,
+    ],
+    [
+      'write entry',
+      (manifest) =>
+        manifest.gates
+          .find((gate) => gate.id === 'checkout-preflight')
+          .cases.find((gateCase) => gateCase.id === 'stale-build-lock').fixture.writeFiles[0],
+    ],
+    [
+      'replace entry',
+      (manifest) =>
+        manifest.gates
+          .find((gate) => gate.id === 'checkout-preflight')
+          .cases.find((gateCase) => gateCase.id === 'criterion-misbinding').fixture.replaceFiles[0],
+    ],
+    [
+      'defect',
+      (manifest) =>
+        manifest.gates
+          .find((gate) => gate.id === 'ci-queue-wait')
+          .cases.find((gateCase) => gateCase.id === 'terminal-success').defect,
+    ],
+  ];
+  assert.ok(stale.fixture && queueCase.defect);
+  for (const [name, select] of targets) {
+    const root = await fixture(`recursive-${name.replaceAll(' ', '-')}`);
+    const manifest = structuredClone(source);
+    select(manifest).unexpectedNestedField = true;
+    await writeManifest(root, manifest);
+    const result = verify(root, ['--structure-only']);
+    assert.notEqual(result.status, 0, `${name}: ${output(result)}`);
+    assert.match(output(result), /unknown field unexpectedNestedField/i, name);
+  }
+});
+
+test('manifest-controlled fixture paths cannot escape the sandbox', async () => {
+  const root = await fixture('path-traversal');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].fixture = {
+    writeFiles: [{ path: '../../escaped-by-manifest', content: 'bad' }],
+  };
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /path escapes sandbox/i);
+});
+
+test('fixture writes reject a final symlink and preserve its outside target', async () => {
+  const root = await fixture('final-symlink');
+  await writeGate(root);
+  const outside = path.join(fixtureBase, 'outside-sentinel');
+  await writeFile(outside, 'preserve-me\n');
+  const linked = path.join(root, 'linked-sentinel');
+  await symlink(outside, linked);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].fixture = {
+    writeFiles: [{ path: 'linked-sentinel', content: 'overwritten\n' }],
+  };
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /fixture write.*symbolic link/i);
+  assert.equal(await readFile(outside, 'utf8'), 'preserve-me\n');
+});
+
+test('an executable below a gate root without an entry is rejected', async () => {
+  const root = await fixture('unregistered');
+  await writeGate(root);
+  const extra = path.join(root, 'gates', 'forgotten.sh');
+  await writeFile(extra, '#!/bin/sh\nexit 1\n');
+  await chmod(extra, 0o755);
+  await writeManifest(root, baseManifest());
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /unregistered gate.*forgotten\.sh/i);
+});
+
+test('a must-fail case without a reason diagnostic is rejected', async () => {
+  const root = await fixture('missing-reason');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].reasonPattern = '';
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*rejects-bad-input.*reasonPattern/i);
+});
+
+test('a gate with zero must-fail cases is rejected', async () => {
+  const root = await fixture('no-negative');
+  await writeGate(root, '#!/bin/sh\nexit 0\n');
+  const manifest = baseManifest();
+  manifest.gates[0].inertMutation = {
+    file: 'gates/meta-fixture.sh',
+    find: 'exit 0',
+    replace: 'exit 1',
+  };
+  manifest.gates[0].cases = [
+    {
+      id: 'positive',
+      criterionIds: ['META-CRIT-1'],
+      mustFail: false,
+      invocation: ['gates/meta-fixture.sh'],
+      required: { exitCode: 0 },
+      actual: { exitCode: 0 },
+      reasonPattern: '',
+    },
+  ];
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*no negative control/i);
+});
+
+test('reordered but equivalent outcome fields do not create a false behavior delta', async () => {
+  const root = await fixture('reordered-outcomes');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases[0].required = { exitCode: 7, outputPattern: 'META_REJECT' };
+  manifest.gates[0].cases[0].actual = { outputPattern: 'META_REJECT', exitCode: 7 };
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.equal(result.status, 0, output(result));
+  assert.doesNotMatch(output(result), /behavior delta requires|DEFECT \(owner:/);
+});
+
+test('a required-versus-actual delta without a tracked owner is rejected', async () => {
+  const root = await fixture('ownerless-delta');
+  await writeGate(root, '#!/bin/sh\nexit 0\n');
+  const manifest = baseManifest();
+  manifest.gates[0].inertMutation.find = 'exit 0';
+  manifest.gates[0].inertMutation.replace = 'exit 7';
+  manifest.gates[0].cases[0].actual.exitCode = 0;
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*delta.*tracked owner/i);
+});
+
+test('moving criterion bindings to unrelated cases is rejected', async () => {
+  const root = await fixture('semantic-misbinding');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.criteria.push({
+    id: 'META-CRIT-2',
+    originalText: 'The fixture reports the second rejection reason.',
+    currentText: 'The fixture reports the second rejection reason.',
+    claimType: 'integrity',
+    source: 'fixture',
+    meaningChanges: [],
+    caseRefs: ['meta-fixture/rejects-second-input'],
+  });
+  manifest.gates[0].cases.push({
+    ...manifest.gates[0].cases[0],
+    id: 'rejects-second-input',
+    criterionIds: ['META-CRIT-1'],
+  });
+  manifest.gates[0].cases[0].criterionIds = ['META-CRIT-2'];
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /META-CRIT-1.*rejects-bad-input.*not bound/i);
+  assert.match(output(result), /META-CRIT-2.*rejects-second-input.*not bound/i);
+});
+
+test('canonical verification preserves binding diagnostics when a case fixture is also stale', async () => {
+  const root = await fixture('misbinding-plus-stale-fixture');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.criteria.push({
+    id: 'META-CRIT-2',
+    originalText: 'The second case rejects its own bad input.',
+    currentText: 'The second case rejects its own bad input.',
+    claimType: 'integrity',
+    source: 'fixture',
+    meaningChanges: [],
+    caseRefs: ['meta-fixture/rejects-second-input'],
+  });
+  manifest.gates[0].cases.push({
+    ...manifest.gates[0].cases[0],
+    id: 'rejects-second-input',
+    criterionIds: ['META-CRIT-1'],
+  });
+  manifest.gates[0].cases[0].criterionIds = ['META-CRIT-2'];
+  manifest.gates[0].cases[0].fixture = {
+    replaceFiles: [
+      {
+        path: 'gates/meta-fixture.sh',
+        find: 'text that is not present',
+        replace: 'irrelevant',
+      },
+    ],
+  };
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /META-CRIT-1.*rejects-bad-input.*not bound/i);
+  assert.match(output(result), /META-CRIT-2.*rejects-second-input.*not bound/i);
+  assert.match(output(result), /fixture replace.*stale or ambiguous/i);
+});
+
+test('moving meaning and prose criteria to an unrelated type error is rejected', async () => {
+  const root = await fixture('real-manifest-misbinding');
+  const manifest = JSON.parse(
+    await readFile(path.join(process.cwd(), 'gates', 'gates.manifest.json'), 'utf8'),
+  );
+  for (const gate of manifest.gates) {
+    for (const gateCase of gate.cases) {
+      gateCase.criterionIds = gateCase.criterionIds.filter(
+        (id) => !['RM02-MEANING-PROVENANCE', 'RM02-PROSE-CONTROL'].includes(id),
+      );
+    }
+  }
+  const typeError = manifest.gates
+    .find((gate) => gate.id === 'quality-typecheck')
+    .cases.find((gateCase) => gateCase.id === 'type-error');
+  typeError.criterionIds.push('RM02-MEANING-PROVENANCE', 'RM02-PROSE-CONTROL');
+  await writeManifest(root, manifest);
+
+  const result = verify(root, ['--structure-only']);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /RM02-MEANING-PROVENANCE.*missing-meaning-provenance.*not bound/i);
+  assert.match(output(result), /RM02-PROSE-CONTROL.*prose-claim-misbinding.*not bound/i);
+  assert.match(
+    output(result),
+    /RM02-(?:MEANING-PROVENANCE|PROSE-CONTROL).*undeclared exercising case quality-typecheck\/type-error/i,
+  );
+});
+
+test('a criterion with no bound case is rejected', async () => {
+  const root = await fixture('unbound-criterion');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.criteria.push({
+    id: 'ORPHAN',
+    originalText: 'This criterion is not exercised.',
+    currentText: 'This criterion is not exercised.',
+    claimType: 'quality',
+    source: 'fixture',
+    meaningChanges: [],
+  });
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /ORPHAN.*no bound case/i);
+});
+
+test('an unbound governing prose marker is rejected', async () => {
+  const root = await fixture('unbound-prose');
+  await writeGate(root);
+  await mkdir(path.join(root, 'docs'), { recursive: true });
+  await writeFile(path.join(root, 'docs', 'governing.md'), 'GATE-CLAIM:UNBOUND\n');
+  const manifest = baseManifest();
+  manifest.governingClaimFiles = ['docs/governing.md'];
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /GATE-CLAIM:UNBOUND.*unbound/i);
+});
+
+test('directly contradictory modeled scenarios are rejected', async () => {
+  const root = await fixture('conflict');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.compatibilityScenarios = [
+    {
+      id: 'ONE',
+      construction: 'same-input',
+      caseRefs: ['meta-fixture/rejects-bad-input'],
+      invocation: ['sh', '-c', 'exit 0'],
+      expected: { exitCode: 0 },
+    },
+    {
+      id: 'TWO',
+      construction: 'same-input',
+      caseRefs: ['meta-fixture/rejects-bad-input'],
+      invocation: ['sh', '-c', 'exit 1'],
+      expected: { exitCode: 1 },
+    },
+  ];
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /ONE.*TWO.*conflict/i);
+});
+
+test('compatibility scenarios execute referenced conditions as one construction', async () => {
+  const root = await fixture('combined-compatibility');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.gates[0].cases.push({
+    id: 'second-condition',
+    criterionIds: ['META-CRIT-1'],
+    mustFail: true,
+    invocation: ['sh', '-c', 'echo "$SECOND_REASON" >&2; exit 7'],
+    fixture: { writeFiles: [{ path: 'conditions/second', content: 'present\n' }] },
+    required: { exitCode: 7 },
+    actual: { exitCode: 7 },
+    evidence: { subject: 'meta-fixture' },
+    reasonPattern: 'SECOND_REASON',
+    environment: { SECOND_REASON: 'SECOND_REASON' },
+  });
+  manifest.criteria[0].caseRefs.push('meta-fixture/second-condition');
+  manifest.gates[0].cases[0].fixture = {
+    writeFiles: [{ path: 'conditions/first', content: 'present\n' }],
+  };
+  manifest.compatibilityScenarios = [
+    {
+      id: 'BOTH-CONDITIONS',
+      construction: 'both-fixtures',
+      caseRefs: ['meta-fixture/rejects-bad-input', 'meta-fixture/second-condition'],
+      invocation: ['sh', '-c', 'test -f conditions/first && test -f conditions/second'],
+      expected: { exitCode: 0 },
+    },
+  ];
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.equal(result.status, 0, output(result));
+  assert.match(output(result), /COMPATIBILITY BOTH-CONDITIONS: observed expected outcome/i);
+});
+
+test('a restated criterion without provenance is rejected', async () => {
+  const root = await fixture('provenance');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.criteria[0].currentText = 'The fixture rejects only malformed input.';
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /META-CRIT-1.*meaning-change provenance/i);
+});
+
+test('a security criterion bound only to a positive case is unregistered in substance', async () => {
+  const root = await fixture('positive-only-criterion');
+  await writeGate(root);
+  const manifest = baseManifest();
+  manifest.criteria.push({
+    id: 'POSITIVE-ONLY',
+    originalText: 'A security property.',
+    currentText: 'A security property.',
+    claimType: 'security',
+    source: 'fixture',
+    meaningChanges: [],
+  });
+  manifest.gates[0].cases.push({
+    id: 'positive-only',
+    criterionIds: ['POSITIVE-ONLY'],
+    mustFail: false,
+    invocation: ['gates/meta-fixture.sh'],
+    required: { exitCode: 7 },
+    actual: { exitCode: 7 },
+    reasonPattern: '',
+  });
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /POSITIVE-ONLY.*no must-fail case/i);
+});
+
+test('a registered prose claim whose marker is absent is rejected', async () => {
+  const root = await fixture('missing-prose-marker');
+  await writeGate(root);
+  await mkdir(path.join(root, 'docs'), { recursive: true });
+  await writeFile(path.join(root, 'docs', 'governing.md'), 'No marker here.\n');
+  const manifest = baseManifest();
+  manifest.governingClaimFiles = ['docs/governing.md'];
+  manifest.proseClaims = [{ id: 'MISSING-MARKER', criterionId: 'META-CRIT-1' }];
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /GATE-CLAIM:MISSING-MARKER.*missing/i);
+});
+
+test('source-versus-deployed byte drift is rejected and names the gate', async () => {
+  const root = await fixture('deployment-drift');
+  await writeGate(root);
+  await mkdir(path.join(root, 'deployed'), { recursive: true });
+  await writeFile(path.join(root, 'deployed', 'meta-fixture.sh'), '#!/bin/sh\nexit 0\n');
+  const manifest = baseManifest();
+  manifest.gates[0].deployment = { kind: 'file', path: 'deployed/meta-fixture.sh' };
+  await writeManifest(root, manifest);
+
+  const result = verify(root);
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*source.*deployed.*drift/i);
+});
+
+test('deployment drift meta-control fails if the shared comparator is made inert', async () => {
+  const root = await fixture('deployment-comparator-inert');
+  await writeGate(root);
+  await mkdir(path.join(root, 'deployed'), { recursive: true });
+  await copyFile(
+    path.join(root, 'gates', 'meta-fixture.sh'),
+    path.join(root, 'deployed', 'meta-fixture.sh'),
+  );
+  const manifest = baseManifest();
+  manifest.gates[0].deployment = { kind: 'file', path: 'deployed/meta-fixture.sh' };
+  await writeManifest(root, manifest);
+
+  const alteredScripts = path.join(root, 'verifier-scripts');
+  await mkdir(alteredScripts, { recursive: true });
+  const verifierSource = await readFile(verifier, 'utf8');
+  const inertSource = verifierSource.replace(
+    'return source.equals(deployed);',
+    'return true; // deliberate test-only inert comparator',
+  );
+  assert.notEqual(inertSource, verifierSource, 'shared deployment comparator mutation went stale');
+  await writeFile(path.join(alteredScripts, 'gate-verify.mjs'), inertSource);
+
+  const result = spawnSync(
+    process.execPath,
+    [
+      path.join(alteredScripts, 'gate-verify.mjs'),
+      '--root',
+      root,
+      '--manifest',
+      'gates/gates.manifest.json',
+    ],
+    { cwd: root, encoding: 'utf8', env: { ...process.env, HOME: os.homedir() } },
+  );
+  assert.notEqual(result.status, 0);
+  assert.match(output(result), /meta-fixture.*drift negative control was ineffective/i);
+});

scripts/gate-wiring.test.mjs

@@ -0,0 +1,104 @@
+import assert from 'node:assert/strict';
+import { readFile } from 'node:fs/promises';
+import test from 'node:test';
+
+const root = process.cwd();
+const expectedTriggers = `when:
+  # PR + manual CI run on any branch — the pull_request pipeline is the merge gate.
+  # push CI is restricted to protected branches (main) so a feature-branch push no
+  # longer fires a redundant SECOND pipeline alongside its PR pipeline. This ~halves
+  # CI load on the storage-constrained runner with zero loss of gating (branch
+  # protection requires no push/ci status context; main still gets full push CI).
+  - event: [pull_request, manual]
+  - event: push
+    branch: main`;
+const expectedGateStep = `    image: *node_image
+    commands:
+      - *enable_pnpm
+      - pnpm gate:verify
+    depends_on:
+      - install
+      - sanitization
+      - upgrade-guard`;
+
+export function assertUnprivilegedGateStep(pipeline) {
+  assert.doesNotMatch(
+    pipeline,
+    /privileged/i,
+    'no pull-request pipeline step may declare privilege',
+  );
+  for (const line of pipeline.split('\n')) {
+    const candidate = line.trimStart().replace(/^-\s+/, '');
+    if (/^(?:["'!<].*|[A-Za-z_][A-Za-z0-9_-]*\s+):(?:\s|$)/.test(candidate)) {
+      assert.fail(`non-canonical or merged YAML key is forbidden: ${candidate}`);
+    }
+  }
+  const triggerMatches = [...pipeline.matchAll(/^when:\n([\s\S]*?)(?=\n\n)/gm)];
+  assert.equal(triggerMatches.length, 1, 'exactly one top-level trigger is required');
+  assert.equal(
+    `when:\n${triggerMatches[0][1].trimEnd()}`,
+    expectedTriggers,
+    'top-level triggers must match closed PR/main construction',
+  );
+
+  const matches = [
+    ...pipeline.matchAll(/\n  gate-verify:\n([\s\S]*?)(?=\n  [a-z][a-z0-9-]+:|\nservices:|$)/g),
+  ];
+  assert.equal(matches.length, 1, 'exactly one gate-verify step is required');
+  // Closed textual construction by design: accepting arbitrary YAML syntax here
+  // would require a duplicate-key-preserving parser. Exact equality rejects all
+  // extra keys, quoted/escaped key spellings, aliases, and mapping merges.
+  assert.equal(
+    matches[0][1].trimEnd(),
+    expectedGateStep,
+    'gate-verify step must match closed unprivileged construction',
+  );
+}
+
+test('package.json exposes the canonical gate:verify command', async () => {
+  const packageJson = JSON.parse(await readFile(`${root}/package.json`, 'utf8'));
+  assert.equal(packageJson.scripts['gate:verify'], 'node scripts/gate-verify.mjs');
+});
+
+test('Woodpecker runs the closed unprivileged gate construction on every pipeline', async () => {
+  const pipeline = await readFile(`${root}/.woodpecker/ci.yml`, 'utf8');
+  assertUnprivilegedGateStep(pipeline);
+});
+
+test('gate wiring rejects privilege syntax, merges, duplicate keys, and trigger narrowing', async () => {
+  const pipeline = await readFile(`${root}/.woodpecker/ci.yml`, 'utf8');
+  const additions = [
+    '    privileged: *enabled\n',
+    '    "privileged": true\n',
+    "    'privileged': true\n",
+    '    privileged : true\n',
+    '    "priv\\u0069leged": true\n',
+    '    <<: *privileged-step\n',
+    '    "<<": *privileged-step\n',
+  ];
+  for (const addition of additions) {
+    const changed = pipeline.replace(
+      '  gate-verify:\n    image:',
+      `  gate-verify:\n${addition}    image:`,
+    );
+    assert.throws(() => assertUnprivilegedGateStep(changed));
+  }
+  const privilegedInstall = pipeline.replace(
+    '  install:\n    image:',
+    '  install:\n    privileged: true\n    image:',
+  );
+  const duplicate = `${pipeline}\n  gate-verify:\n    image: *node_image\n`;
+  const noPullRequest = pipeline.replace('  - event: [pull_request, manual]', '  - event: manual');
+  const filteredPullRequest = pipeline.replace(
+    '  - event: [pull_request, manual]',
+    '  - event: [pull_request, manual]\n    path: [scripts/**]',
+  );
+
+  assert.throws(() => assertUnprivilegedGateStep(privilegedInstall), /privilege/i);
+  assert.throws(() => assertUnprivilegedGateStep(duplicate), /exactly one gate-verify/);
+  assert.throws(() => assertUnprivilegedGateStep(noPullRequest), /closed PR\/main construction/);
+  assert.throws(
+    () => assertUnprivilegedGateStep(filteredPullRequest),
+    /closed PR\/main construction/,
+  );
+});

scripts/test-support/gate-verify-fixture-runner.mjs

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+
+import path from 'node:path';
+
+import { verifyRegistry } from '../gate-verify.mjs';
+
+let root;
+let manifest = 'gates/gates.manifest.json';
+let structureOnly = false;
+for (let index = 0; index < process.argv.slice(2).length; index += 1) {
+  const args = process.argv.slice(2);
+  const value = args[index];
+  if (value === '--root') root = path.resolve(args[++index]);
+  else if (value === '--manifest') manifest = args[++index];
+  else if (value === '--structure-only') structureOnly = true;
+  else throw new Error(`unknown fixture-runner option: ${value}`);
+}
+if (!root) throw new Error('fixture runner requires --root');
+const { failures, observations } = await verifyRegistry({
+  root,
+  manifest,
+  structureOnly,
+  fixtureProfile: true,
+});
+for (const observation of observations) process.stdout.write(`${observation}\n`);
+for (const failure of failures) process.stderr.write(`GATE VERIFY FAILED: ${failure}\n`);
+if (failures.length > 0) process.exitCode = 1;