ADR-035 + ADR-036 reframe: canonical k-invariants branch + ψ-residuals discipline + uniform byte-buffer resolver surface + R = NullResolverTuple default + no axes value parameter
ADR-035 reframe (Block A):
- Title extended: "Canonical ψ-pipeline + ψ-chain Term variants + ψ-residuals discipline on verb body composition"
- Decision restructured into three coupled amendments: (1) nine ψ-Term variants, (2) canonical k-invariants branch ψ_1 → ψ_7 → ψ_8 → ψ_9 as the architectural composition for the verifiability commitment, (3) ψ-residuals discipline forbidding Term::FirstAdmit, Term::AxisInvocation, byte-comparison/concat PrimitiveOps in verb-body terms
- Conceptual model paragraph: compiled binary IS the canonical circuit; data representation minimal (input bytes + κ-label); client conceptually larger than data; complete model fuses into a single reference
- Closure check at verb!/prism_model! invocation extended with ψ-residuals walk
- Composition example switched from `betti(homology_groups(chain_complex(nerve(input))))` to canonical `k_invariants(homotopy_groups(postnikov_tower(nerve(input))))`
- Rejected alternatives 5-7 rewritten: partial-coverage / homology-branch / permit-ψ-residuals
ADR-036 reframe (Block B):
- PrismModel<H, B, A, R = NullResolverTuple> trait shape with R defaulting to NullResolverTuple; A: AxisTuple + Hasher bound (canonical hash axis bound)
- ResolverTuple trait: drop per-category accessor methods (live in marker traits); add RESOLVER_ABSENT_DISCRIMINATOR byte const
- Eight resolver traits: uniform writer-style byte-buffer surface `fn resolve(&self, input: &[u8], out: &mut [u8]) -> Result<usize, ShapeViolation>` (no typed *Record<H> returns)
- resolver! macro emits all eight Has<Category>Resolver impls unconditionally (declared fields delegate; undeclared categories delegate to NullResolverTuple Null* impls)
- pipeline::run_route<H, B, A, M, R>(input, resolvers: &R): five type params, no axes value parameter, all eight Has<Category>Resolver<A> bounds unconditionally
- Application-side instantiation: no axes value (axis methods type-associated via <A as Hasher>::initial())
- MAX_RESOLVER_TUPLE_ARITY = 16 explicit (twice AxisTuple cap)
- Replace GenericImpossibilityWitness with ShapeViolation + RESOLVER_ABSENT shape IRI + foundation-internal RESOLVER_ABSENT_DISCRIMINATOR byte
- Rejected alternatives reorganized: AxisTuple-conflation / typed-records / ad-hoc-per-category-params / global / foundation-provided-impls
Block C cross-references:
- ADR-013 Consequences: ψ-residuals, canonical k-invariants branch, byte-buffer resolver surface, RESOLVER_ABSENT_DISCRIMINATOR
- ADR-022 D4 comment block: <H, B, A: AxisTuple + Hasher, R = NullResolverTuple>; asymmetric threading rationale
- ADR-022 D4 trait declaration: same shape
- ADR-022 D5 run_route signature: drop axes value param, add unconditional Has<Category>Resolver<A> bounds
- ADR-022 D5 forward body: run_route::<H, B, A, Self, R>(input, &resolvers)
- ADR-026 G12 + TR-12 + ADR-030 closure-check: already at twenty reserved identifiers (no change)
- ADR-029 fold-rule preamble: four substrate parameters; ψ-residuals discipline
- ADR-029 ψ-Term fold-rules: byte-buffer resolver.resolve(input, out_buffer) signatures; KInvariants noted as canonical-branch terminal
- ADR-029 variant-count statement: FirstAdmit noted as verb-body-forbidden
- ADR-030 Consequences: ResolverTuple parallels AxisTuple with asymmetric threading
- ADR-031 Consequences: resolver baselines parallel axis baselines
Block D Section 4 + Section 8:
- Strategic decision row updated: canonical k-invariants branch + ψ-residuals + R = NullResolverTuple + conceptual-model framing
- Closure Across Layers paragraphs: canonical k-invariants branch + ψ-residuals + byte-buffer surface
Block E glossary:
- New: Canonical k-invariants branch (under C), NullResolverTuple, RESOLVER_ABSENT_DISCRIMINATOR, Resolver trait shape (under R/N), ψ-chain umbrella + ψ-residuals discipline (Greek-letter cluster)
- Updates: ψ-chain resolver traits to byte-buffer surface; Has<Category>Resolver<H> to all-eight-emission pattern; PrismModel to new signature + run_route call; ResolverTuple drop per-category accessor mention; ResolverCategory annotated with ψ-stage numbers; MAX_RESOLVER_TUPLE_ARITY explicit value 16; resolver! to all-eight-emission pattern; nine Term:: variant entries annotated with canonical-branch / strictly-weaker positions
Reconciliation in Sections 02/03/05/06/07/08/10 + 15288 docs:
- TC-03 substitution axes table: R = NullResolverTuple default; A: AxisTuple + Hasher bound; byte-buffer signature; ψ-residuals
- Section 03 author-input row: R optional with default
- Section 05 pipeline component: run_route<H, B, A, M, R>(input, &resolvers) signature; no axes value param
- Section 06 Scenario 1 steps 7-8: four substrate parameters, no axes value param; canonical k-invariants branch; ψ-residuals discipline
- Section 07 deployment view executable: canonical resolver branch list; type-associated axis dispatch
- Section 08 PrismModel trait + forward call: same shape
- Section 10 QS-01: canonical-branch resolver list; byte-buffer surface; ψ-residuals
- 15288 technical.adoc + technical-management.adoc: R optional with default; A: AxisTuple + Hasher; canonical k-invariants branch
All 8 validators pass; Stage 5 idempotent.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>