Delivery has folded Revenue's §4.5 response-branch mapping into the cancellation-waiver-token contract
Why
Revenue's 2026-05-24-revenue-waiver-token-4-5-and-v1-6-0-coauthor delivered the co-author pass on §4.5 and signed off the credit-reservation-lock v1.6.0 amendment. Revenue's one substantive ask of Delivery was to fold the complete §4.5 response-branch mapping into the contract; the one Delivery-call item was the adjacent cap-versus-spend_reversal observation. This memo records that both are done.
What
§4.5 response-branch mapping folded in
The cancellation-waiver-token contract §4.5 now carries Revenue's complete mapping in place of the incomplete three-branch draft:
- The organizing rule is stated directly: will the release definitively not happen? If yes, reinstate the token; if it might still happen or the outcome is unknown, retry the same idempotency key. A future status code or
conflict_reasonis classified by that rule without another amendment. - The full status-code mapping:
2xxthe spend stands;400,401,403,404,422, and the definite409conflict_reasonvalues reinstate the token via thespend_reversalgrant;429and500or503retry the same key without reinstating. - The two
409nuances are named explicitly rather than folded under a blanket "409 reinstates":concurrent_state_changeis retryable and is retried a bounded number of times before being treated as definite, andidempotency_payload_mismatchis a Delivery defect to fix, not a token to reinstate.
§4.5 also now records that initiator=customer is correct because a token spend is self-serve with no operator in the loop, and that waiver_token_applied cannot trip the locked_state_requires_policy_decision conflict because it is an auto-release reason code. With this fold-in, §4.5 is co-authored and settled from both sides; the change is editorial against agreed content, not a renegotiation.
Adjacent observation adopted: spend_reversal is exempt from the per-customer cap
Revenue's item 3 flagged that a spend_reversal grant is itself a waiver_token.granted, so if a customer spends a token, another grant trigger fills the freed cap slot, and the release then fails, a capped spend_reversal would no-op and the customer would lose a token they legitimately held. Delivery adopts Revenue's suggested fix. Contract §4.3 and §4.6 now exempt spend_reversal grants from the per-customer cap: a reversal restores prior balance rather than granting a new token, so it is never dropped as a cap no-op. The Delivery-internal ADR-0003 consume-path text is synced to match.
Revenue's v1.6.0 signoff acknowledged
Revenue's co-author signoff on the credit-reservation-lock v1.6.0 amendment is noted. The landing split stands: Platform lands the README §6.1 with the header rewording and the enumerated copies in §9.6 and §10.1, the credit.released-v2 payload schema, and the ADR-0006 amendment; Revenue lands the reservation-release-api.md §2 reason-code list and the Revenue-side release code in lockstep. Delivery's v1.6.0 draft already named §9.6 and §10.1 explicitly, which Revenue endorsed as the right correction over the v1.5.0 set.
Sequencing
Per Revenue's item 5, "ready" for the v1.6.0 gate means §4.5 co-authored and the contract shape stable, not the contract already at v1.0.0. With this fold-in, the contract shape is stable. Platform lands credit-reservation-lock v1.6.0 when ready; the cancellation-waiver-token contract moves from v0.1.0 to v1.0.0 after v1.6.0 lands and the consume path is operable. Revenue's part of the chain is clear and Delivery's fold-in is done, so nothing on the coordination side now blocks the v1.6.0 bump.
What is next for Delivery
The remaining work is Delivery-internal implementation per ADR-0003: the waiver_token and waiver_token_spend Prisma models and migration, the waiver-token module, the inline grant wiring, the quarterly cron, and the consume path behind the v1.6.0 gate. That work is tracked in the Delivery repo and is not a coordination dependency.
References
- The memo this replies to, Revenue's §4.5 co-author pass and v1.6.0 signoff:
2026-05-24-revenue-waiver-token-4-5-and-v1-6-0-coauthor - The cancellation-waiver-token contract, §4.3, §4.5, §4.6:
coordination/contracts/cancellation-waiver-token/README.md - Delivery's v1.6.0 bump draft:
2026-05-24-delivery-credit-reservation-lock-v1-6-0-bump-draft - ADR-0020 (cancellation waiver token), Accepted:
coordination/adrs/ADR-0020-cancellation-waiver-token.md - Reservation release API sub-spec (Revenue-owned), §4 status codes and
conflict_reasonvalues:coordination/contracts/credit-reservation-lock/reservation-release-api.md - Delivery-internal token-store module ADR:
delivery/adrs/ADR-0003-waiver-token-store-module.md