tersign 0.5.0 → 0.6.1

package/LICENSE

@@ -1,21 +1,202 @@
-MIT License
-
-Copyright (c) 2026 Tersign
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/NOTICE

@@ -0,0 +1,4 @@
+Tersign SDK
+Copyright 2026 The Tersign Authors
+
+This product includes software developed by The Tersign Authors (https://tersign.ai).

package/README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/tersign"><img src="https://img.shields.io/npm/v/tersign?style=flat-square" alt="npm version"></a>
-  <a href="https://github.com/tersignhq/tersign-js/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tersign?style=flat-square" alt="MIT license"></a>
+  <a href="https://github.com/tersignhq/tersign-js/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tersign?style=flat-square" alt="Apache-2.0 license"></a>
   <img src="https://img.shields.io/badge/npm-provenance%20attested-2ea44f?style=flat-square" alt="npm provenance attested">
   <img src="https://img.shields.io/badge/MCP%20registry-io.github.tersignhq%2Fevidence-1c1c1c?style=flat-square" alt="MCP registry">
 </p>
@@ -17,7 +17,7 @@
 
 ## Verify a Real Entry — Right Now
 
-No account. No API key. This is the genesis receipt, `seq 1` on the production chain:
+No account. No API key. This is the genesis receipt, `seq 1` on the production chain. It is a self-signed demo: Tersign signed it as seller and named its own key as payer, so its EIP-712 payload signature (domain `{name: "x402 receipt", version: "1", chainId: 1}`, per the x402 offer-and-receipt extension) recovers to the payload's own payer, `0x36f82906859E5B0bd076069f8cdfAea355358b14`. [`/v1/genesis`](https://tersign.ai/v1/genesis) serves the record with the recipe for each of its signatures.
 
 ```sh
 npx tersign verify 0xe5874f1ffe87f0a6dd9eb157730f67b86ee4538b125fe30fcc4e165213dd3fc4
@@ -69,7 +69,7 @@ graph LR
 
 <sub>Diagram renders on GitHub. On npm, the paragraph above IS the diagram.</sub>
 
-Refunds chain back to the original receipt via `refundOf`. Disputes attach to the digest with objective reason codes. Party statements are structurally segregated behind an `UNVERIFIED` marker — the evidence stays prompt-injection-hardened.
+A refund record references the record it corrects by digest (`refundOf`). Disputes attach to the digest with objective reason codes. Party statements are structurally segregated behind an `UNVERIFIED` marker — the evidence stays prompt-injection-hardened.
 
 ## Enter the Record
 
@@ -77,15 +77,28 @@ Refunds chain back to the original receipt via `refundOf`. Disputes attach to th
 npm i tersign
 ```
 
-`withAssure()` wraps your x402 fetch handler so every paid call issues a signed, chained receipt. The full register:
+`withAssure()` wraps your x402 fetch handler. On a settled call it signs a receipt and a compliance-fields record with your key and merges both into the `PAYMENT-RESPONSE` header, the base64 JSON settlement response x402 wallets already read; the response body is left alone. When it cannot issue them (a settlement network that is neither CAIP-2 nor a v1 name in its table, such as `"bsc"`, or a ledger error), the paid response goes out exactly as your handler returned it, with no receipt, and the error goes to `onError` (default: `console.error`); with idempotency on, a retry with the same payment id replays that response. On a 402 it adds `compliance-fields` to the `PAYMENT-REQUIRED` header. When the `Assure` is built with a ledger, the ledger counter-signs the receipt into your chain; the compliance-fields record is not counter-signed, and is bound to its receipt only by your own signature, which covers the receipt's digest. Without a ledger, both carry your signature alone.
+
+```ts
+import { privateKeyToAccount } from 'viem/accounts';
+import { Assure, withAssure } from 'tersign';
+
+const signer = privateKeyToAccount(process.env.TERSIGN_SELLER_KEY as `0x${string}`);
+const assure = new Assure({ signer, issuer: { name: 'Example API Ltd', jurisdiction: 'HK' } });
+export default { fetch: withAssure(app.fetch, { assure }) }; // app: your x402-protected Hono app
+```
+
+A wallet finds the receipt at `extensions["offer-receipt"].info.receipt` and the record at `extensions["compliance-fields"].info.record` of the decoded `PAYMENT-RESPONSE` (`X-PAYMENT-RESPONSE` on x402 v1). Sellers whose readers still parse the JSON body can pass `legacyBodyPlacement: true` for one more minor release.
+
+The full register:
 
 | Capability | In the record |
 |---|---|
 | Receipts | Seller-signed EIP-712 (x402 offer-receipt extension), keccak256 canonical digests |
-| `withAssure()` | x402 fetch-handler adapter — a receipt per paid call |
-| Compliance exports | EU Art-226b minimal tier · EN 16931 full tier · HK IRO s.51C retention |
+| `withAssure()` | x402 fetch-handler adapter — receipt + compliance-fields record in `PAYMENT-RESPONSE` on each paid call it can issue for, the paid response passed through unchanged when it cannot; `compliance-fields` advertised on 402 |
+| Compliance-fields records | MINIMAL tier (Art 226b simplified-invoice content) via `buildMinimalRecord` · ledger exports `format=art226b` · `format=s51c` — mappings, not certifications |
 | Action records | `ActionRecordV1` — GDPR-minimized; captures the content of an Art-50 disclosure so the disclosure itself is independently attested, not self-reported |
-| Refunds | Chained to the original receipt via `refundOf` |
+| Refunds | A refund record carries `refundOf`, the digest of the record it corrects · `record_refund` logs a pending refund entry on the ledger (not counter-signed) |
 | Disputes v0 | Objective reason codes, evidence submission, adjudication |
 | Venue envelopes | Internet Court (5,000-char slot) · Kleros ERC-1497 · UMA · generic |
 | Evidence packs | `format=art50` · `format=safr` (beta) |
@@ -168,7 +181,7 @@ Full URLs, readable without auth. If you are an agent, start here.
 | Bundle verifier, out-of-band | https://tersign.ai/verify/v1/ — `verify_bundle.py` · `keccak.py` · `secp256k1.py` · `SHA256SUMS`. A bundle ships its own checker; for evidence from an interested party fetch this copy and diff the two. |
 | llms.txt | https://raw.githubusercontent.com/tersignhq/tersign-js/main/llms.txt |
 | Conformance vectors (RFC 8785 + keccak256, two-sided) | https://github.com/tersignhq/evidence-record-conformance |
-| Sample action record + digests | https://github.com/tersignhq/tersign-js/blob/main/test/fixtures/compliance-record.json |
+| Sample compliance-fields record + digests | https://github.com/tersignhq/tersign-js/blob/main/test/fixtures/compliance-record.json |
 | Genesis verify | `npx tersign verify 0xe5874f1ffe87f0a6dd9eb157730f67b86ee4538b125fe30fcc4e165213dd3fc4` |
 
 ---
@@ -200,7 +213,7 @@ If a maintainer ever asks you to reopen work elsewhere because of this, that is
   <img src="https://raw.githubusercontent.com/tersignhq/.github/main/assets/seal.svg" alt="Tersign seal" width="72">
 </p>
 
-<p align="center"><sub>MIT · built and published from <a href="https://github.com/tersignhq/tersign-js">tersignhq/tersign-js</a> via trusted-publishing CI, provenance attested · Python verifier: <code>pip install tersign</code></sub></p>
+<p align="center"><sub>Apache-2.0 from 0.6.1; earlier releases were MIT · built and published from <a href="https://github.com/tersignhq/tersign-js">tersignhq/tersign-js</a> via trusted-publishing CI, provenance attested · Python verifier: <code>pip install tersign</code></sub></p>
 
 <p align="center"><sub><b>Venues rotate. The transcript endures.</b></sub></p>
 

package/dist/adapter/x402.d.ts

@@ -6,8 +6,42 @@ export interface SettlementInfo {
     network?: string | undefined;
     payer?: string | undefined;
 }
+/** Encode a JSON value the way an x402 HTTP header carries it (base64 over UTF-8 JSON). */
+export declare function encodeX402Header(value: unknown): string;
+/** Decode an x402 HTTP header value; `undefined` when it is not base64 over UTF-8 JSON. */
+export declare function decodeX402Header(value: string): unknown;
 export declare function extractPaymentPayload(headers: Headers): unknown;
 export declare function extractSettlement(headers: Headers): SettlementInfo | undefined;
+/** What a 402 advertises under `extensions["compliance-fields"].info`. Each member is a claim
+ * about the records this server emits, so set one only when it is true of every record:
+ * `tiers: ['minimal']` needs every record to carry each MINIMAL member, including `tax.amount`
+ * whenever `tax.scheme` is not `none`. The default advertises the extension with no tier or
+ * jurisdiction claim. */
+export interface ComplianceAdvertisement {
+    tiers?: ReadonlyArray<'minimal' | 'full'>;
+    jurisdictions?: ReadonlyArray<string>;
+}
+/** JSON Schema for the advertised `info` (the core v2 spec makes `schema` a required member of
+ * every PaymentRequired extension entry). */
+export declare const COMPLIANCE_FIELDS_ADVERTISEMENT_SCHEMA: {
+    readonly $schema: "https://json-schema.org/draft/2020-12/schema";
+    readonly type: "object";
+    readonly properties: {
+        readonly tiers: {
+            readonly type: "array";
+            readonly items: {
+                readonly type: "string";
+                readonly enum: readonly ["minimal", "full"];
+            };
+        };
+        readonly jurisdictions: {
+            readonly type: "array";
+            readonly items: {
+                readonly type: "string";
+            };
+        };
+    };
+};
 export interface WithAssureConfig {
     assure: Assure;
     /** describe the supply for the receipt; defaults to the request path */
@@ -20,10 +54,32 @@ export interface WithAssureConfig {
         required: boolean;
         scope: string;
     };
+    /** Advertise `compliance-fields` in a 402's `PAYMENT-REQUIRED` header (x402 v2). Default: on,
+     * with an empty claim set. `false` leaves 402 responses untouched. An entry the handler
+     * already put there is kept as it is. */
+    advertise?: false | ComplianceAdvertisement;
+    /** @deprecated Also decorate a JSON response BODY with the receipt and record (the ≤0.5
+     * placement). The `PAYMENT-RESPONSE` header carries them either way. Scheduled for removal in
+     * the next minor release after the one that introduced header placement. A body that does not
+     * parse as a JSON object is left as it is. */
+    legacyBodyPlacement?: boolean;
+    /** Called when a settled call's receipt cannot be issued: a settlement network that is neither
+     * CAIP-2 nor in the v1 table (`toCaip2Network`), a ledger error, a throwing `toSettlementContext`
+     * or `describeSupply`. The paid response then goes out exactly as the handler returned it, with
+     * no receipt or record in it. Default: one `console.error` line per failure. An error thrown by
+     * this callback, or a rejection of a promise it returns, is ignored. */
+    onError?: (err: unknown) => void;
 }
 type FetchHandler = (req: Request) => Response | Promise<Response>;
-/** Wrap an x402-protected handler: enforce idempotency on the way in, issue the signed
- * receipt + compliance record on the way out (only when the settlement header reports
- * success and the response body is JSON). */
+/** Wrap an x402-protected handler: enforce idempotency on the way in; on the way out, advertise
+ * `compliance-fields` on a 402, and — when the settlement header reports success — issue the
+ * signed receipt + compliance-fields record and merge both into that same settlement header
+ * (`PAYMENT-RESPONSE`, or `X-PAYMENT-RESPONSE` for v1), where x402 wallets read them. The
+ * response body is left untouched unless `legacyBodyPlacement` is set.
+ *
+ * Once the settlement header reports success the buyer has paid, so a failure to issue does not
+ * throw: the response goes out exactly as the handler returned it, the error goes to `onError`,
+ * and with idempotency on the payment id is completed with that delivered response, so a retry
+ * replays it instead of finding the id stuck in flight. */
 export declare function withAssure(handler: FetchHandler, cfg: WithAssureConfig): FetchHandler;
 export {};

package/dist/adapter/x402.js

@@ -1,22 +1,57 @@
-import { attachToExtensions } from '../assure.js';
+import { attachToExtensions, attachToSettlementResponse } from '../assure.js';
 import { checkIdempotency, extractPaymentId, fingerprint, REPLAY_HEADER, } from '../idempotency/middleware.js';
 /** Adapter for x402-protected fetch-style handlers ((Request) => Response) — this is the
  * shape of a Hono app (`app.fetch`), a Workers export, and Next.js route handlers, so one
  * wrapper covers the common seller stacks. An adapter pinned to the official x402 SDK's
  * middleware internals is deliberately deferred until we integrate against a pinned
  * version (its surface is still churning); this wrapper only touches the WIRE contract:
- * the payment payload request header and the settlement response header. */
-/** x402 v2 header names, with v1 fallbacks. Re-verify at integration (CLAUDE.md rule 1). */
+ * the payment payload request header, the payment-required header and the settlement
+ * response header. */
+/** x402 HTTP transport headers, v2 names first with v1 fallbacks. Verified 2026-09-29 against
+ * x402-foundation/x402 specs/transports-v2/http.md (main 5eee1e3c35): `PAYMENT-REQUIRED`
+ * (server → client, PaymentRequired), `PAYMENT-SIGNATURE` (client → server, PaymentPayload),
+ * `PAYMENT-RESPONSE` (server → client, SettlementResponse), each base64 over UTF-8 JSON; "All
+ * x402 protocol information is communicated through headers". Re-verify at integration
+ * (CLAUDE.md rule 1). */
 const PAYMENT_PAYLOAD_HEADERS = ['payment-signature', 'x-payment'];
 const SETTLEMENT_HEADERS = ['payment-response', 'x-payment-response'];
+const PAYMENT_REQUIRED_HEADER = 'payment-required';
+/** base64 → UTF-8 text, as the upstream reference decodes (`safeBase64Decode`), so a record
+ * carrying a non-ASCII issuer name or supply description survives the header round trip. Unlike
+ * the reference, invalid UTF-8 is refused rather than replaced with U+FFFD: a header this
+ * wrapper rewrites must decode exactly, or it is left alone. */
+function b64decodeUtf8(value) {
+    const binary = atob(value);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++)
+        bytes[i] = binary.charCodeAt(i);
+    return new TextDecoder('utf-8', { fatal: true }).decode(bytes);
+}
+/** UTF-8 text → base64, as the upstream reference encodes (`safeBase64Encode`). Plain `btoa`
+ * throws on any character above U+00FF. */
+function b64encodeUtf8(text) {
+    const bytes = new TextEncoder().encode(text);
+    let binary = '';
+    for (const b of bytes)
+        binary += String.fromCharCode(b);
+    return btoa(binary);
+}
 function b64json(value) {
     try {
-        return JSON.parse(atob(value));
+        return JSON.parse(b64decodeUtf8(value));
     }
     catch {
         return undefined;
     }
 }
+/** Encode a JSON value the way an x402 HTTP header carries it (base64 over UTF-8 JSON). */
+export function encodeX402Header(value) {
+    return b64encodeUtf8(JSON.stringify(value));
+}
+/** Decode an x402 HTTP header value; `undefined` when it is not base64 over UTF-8 JSON. */
+export function decodeX402Header(value) {
+    return b64json(value);
+}
 export function extractPaymentPayload(headers) {
     for (const name of PAYMENT_PAYLOAD_HEADERS) {
         const raw = headers.get(name);
@@ -25,29 +60,105 @@ export function extractPaymentPayload(headers) {
     }
     return undefined;
 }
-export function extractSettlement(headers) {
+function findSettlement(headers) {
     for (const name of SETTLEMENT_HEADERS) {
         const raw = headers.get(name);
         if (!raw)
             continue;
         const parsed = b64json(raw);
-        if (!parsed || typeof parsed !== 'object')
+        if (!isPlainRecord(parsed))
             continue;
-        return {
-            success: parsed.success === true,
-            transaction: str(parsed.transaction) ?? str(parsed.txHash),
-            network: str(parsed.network) ?? str(parsed.networkId),
-            payer: str(parsed.payer) ?? str(parsed.from),
-        };
+        return { name, response: parsed };
     }
     return undefined;
 }
+export function extractSettlement(headers) {
+    const found = findSettlement(headers);
+    return found ? settlementInfo(found.response) : undefined;
+}
+function settlementInfo(parsed) {
+    return {
+        success: parsed.success === true,
+        transaction: str(parsed.transaction) ?? str(parsed.txHash),
+        network: str(parsed.network) ?? str(parsed.networkId),
+        payer: str(parsed.payer) ?? str(parsed.from),
+    };
+}
 function str(v) {
     return typeof v === 'string' && v.length > 0 ? v : undefined;
 }
-/** Wrap an x402-protected handler: enforce idempotency on the way in, issue the signed
- * receipt + compliance record on the way out (only when the settlement header reports
- * success and the response body is JSON). */
+function isPlainRecord(v) {
+    return typeof v === 'object' && v !== null && !Array.isArray(v);
+}
+/** JSON Schema for the advertised `info` (the core v2 spec makes `schema` a required member of
+ * every PaymentRequired extension entry). */
+export const COMPLIANCE_FIELDS_ADVERTISEMENT_SCHEMA = {
+    $schema: 'https://json-schema.org/draft/2020-12/schema',
+    type: 'object',
+    properties: {
+        tiers: { type: 'array', items: { type: 'string', enum: ['minimal', 'full'] } },
+        jurisdictions: { type: 'array', items: { type: 'string' } },
+    },
+};
+function reportIssueError(err) {
+    let message;
+    try {
+        message = String(err instanceof Error ? err.message : err);
+    }
+    catch {
+        message = 'unprintable error';
+    }
+    console.error(`tersign withAssure: receipt not issued, response delivered unchanged: ${message.replace(/\s+/g, ' ')}`);
+}
+/** The legacy body placement reads a clone, so a body that is not a JSON object stays readable
+ * and goes out as it came. */
+async function jsonObjectBody(res) {
+    try {
+        const parsed = await res.clone().json();
+        return isPlainRecord(parsed) ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function withHeaders(res, headers, body = res.body) {
+    return new Response(body, { status: res.status, statusText: res.statusText, headers });
+}
+function advertiseCompliance(res, adv) {
+    if (res.status !== 402)
+        return res;
+    const raw = res.headers.get(PAYMENT_REQUIRED_HEADER);
+    if (!raw)
+        return res;
+    const required = b64json(raw);
+    if (!isPlainRecord(required))
+        return res;
+    const prior = isPlainRecord(required.extensions) ? required.extensions : {};
+    if (prior['compliance-fields'] !== undefined)
+        return res;
+    const info = {};
+    if (adv.tiers !== undefined)
+        info.tiers = [...adv.tiers];
+    if (adv.jurisdictions !== undefined)
+        info.jurisdictions = [...adv.jurisdictions];
+    const decorated = {
+        ...required,
+        extensions: { ...prior, 'compliance-fields': { info, schema: COMPLIANCE_FIELDS_ADVERTISEMENT_SCHEMA } },
+    };
+    const headers = new Headers(res.headers);
+    headers.set(PAYMENT_REQUIRED_HEADER, encodeX402Header(decorated));
+    return withHeaders(res, headers);
+}
+/** Wrap an x402-protected handler: enforce idempotency on the way in; on the way out, advertise
+ * `compliance-fields` on a 402, and — when the settlement header reports success — issue the
+ * signed receipt + compliance-fields record and merge both into that same settlement header
+ * (`PAYMENT-RESPONSE`, or `X-PAYMENT-RESPONSE` for v1), where x402 wallets read them. The
+ * response body is left untouched unless `legacyBodyPlacement` is set.
+ *
+ * Once the settlement header reports success the buyer has paid, so a failure to issue does not
+ * throw: the response goes out exactly as the handler returned it, the error goes to `onError`,
+ * and with idempotency on the payment id is completed with that delivered response, so a retry
+ * replays it instead of finding the id stuck in flight. */
 export function withAssure(handler, cfg) {
     const now = cfg.clock ?? (() => Math.floor(Date.now() / 1000));
     return async (req) => {
@@ -74,25 +185,48 @@ export function withAssure(handler, cfg) {
             }
         }
         let res = await handler(req);
-        const settlement = extractSettlement(res.headers);
-        if (settlement?.success && (res.headers.get('content-type') ?? '').includes('application/json')) {
-            const url = new URL(req.url);
-            const overrides = cfg.toSettlementContext?.(req, settlement) ?? {};
-            const ctx = {
-                network: settlement.network ?? 'eip155:8453',
-                resourceUrl: url.origin + url.pathname,
-                payer: settlement.payer ?? 'unknown',
-                settledAt: now(),
-                supplyDescription: cfg.describeSupply?.(req) ?? url.pathname,
-                ...(settlement.transaction !== undefined ? { txHash: settlement.transaction } : {}),
-                ...overrides,
-            };
-            const issued = await cfg.assure.issueFor(ctx);
-            const body = (await res.json());
-            const decorated = attachToExtensions(body, issued);
-            const headers = new Headers(res.headers);
-            headers.delete('content-length');
-            res = new Response(JSON.stringify(decorated), { status: res.status, headers });
+        if (cfg.advertise !== false)
+            res = advertiseCompliance(res, cfg.advertise ?? {});
+        const found = findSettlement(res.headers);
+        const settlement = found ? settlementInfo(found.response) : undefined;
+        if (found && settlement?.success) {
+            // Paid: nothing from here may cost the buyer the response. On any failure `res` stays the
+            // handler's own, and the idempotency entry below is completed with it.
+            try {
+                const url = new URL(req.url);
+                const overrides = cfg.toSettlementContext?.(req, settlement) ?? {};
+                const ctx = {
+                    network: settlement.network ?? 'eip155:8453',
+                    resourceUrl: url.origin + url.pathname,
+                    payer: settlement.payer ?? 'unknown',
+                    settledAt: now(),
+                    supplyDescription: cfg.describeSupply?.(req) ?? url.pathname,
+                    ...(settlement.transaction !== undefined ? { txHash: settlement.transaction } : {}),
+                    ...overrides,
+                };
+                const issued = await cfg.assure.issueFor(ctx);
+                const headers = new Headers(res.headers);
+                headers.set(found.name, encodeX402Header(attachToSettlementResponse(found.response, issued)));
+                const body = cfg.legacyBodyPlacement && (res.headers.get('content-type') ?? '').includes('application/json')
+                    ? await jsonObjectBody(res)
+                    : undefined;
+                if (body) {
+                    headers.delete('content-length');
+                    res = withHeaders(res, headers, JSON.stringify(attachToExtensions(body, issued)));
+                }
+                else {
+                    res = withHeaders(res, headers);
+                }
+            }
+            catch (err) {
+                try {
+                    // An async reporter's rejection is caught too: left unhandled it would end the process.
+                    void Promise.resolve((cfg.onError ?? reportIssueError)(err)).catch(() => { });
+                }
+                catch {
+                    // a throwing reporter must not cost the paid response either
+                }
+            }
         }
         if (onComplete) {
             const body = await res.clone().text();