@faremeter/test-harness 0.16.0 → 0.17.1

package/dist/src/choosers.d.ts

@@ -1,12 +1,76 @@
-import type { PaymentExecer } from "@faremeter/types/client";
-export declare function chooseFirst(execers: PaymentExecer[]): PaymentExecer;
-export declare function chooseCheapest(execers: PaymentExecer[]): PaymentExecer;
-export declare function chooseMostExpensive(execers: PaymentExecer[]): PaymentExecer;
-export declare function chooseByAsset(asset: string): (execers: PaymentExecer[]) => PaymentExecer;
-export declare function chooseByNetwork(network: string): (execers: PaymentExecer[]) => PaymentExecer;
-export declare function chooseByScheme(scheme: string): (execers: PaymentExecer[]) => PaymentExecer;
-export declare function chooseByIndex(index: number): (execers: PaymentExecer[]) => PaymentExecer;
+import type { PaymentExecerV1 } from "@faremeter/types/client";
+/**
+ * Chooser that selects the first available payment option.
+ *
+ * @param execers - Available payment execers.
+ * @returns The first execer in the list.
+ * @throws If no options are available.
+ */
+export declare function chooseFirst(execers: PaymentExecerV1[]): PaymentExecerV1;
+/**
+ * Chooser that selects the cheapest payment option by maxAmountRequired.
+ *
+ * @param execers - Available payment execers.
+ * @returns The execer with the lowest amount.
+ * @throws If no options are available.
+ */
+export declare function chooseCheapest(execers: PaymentExecerV1[]): PaymentExecerV1;
+/**
+ * Chooser that selects the most expensive payment option by maxAmountRequired.
+ *
+ * @param execers - Available payment execers.
+ * @returns The execer with the highest amount.
+ * @throws If no options are available.
+ */
+export declare function chooseMostExpensive(execers: PaymentExecerV1[]): PaymentExecerV1;
+/**
+ * Creates a chooser that selects by asset name.
+ *
+ * @param asset - Asset name to match (case-insensitive).
+ * @returns A chooser function.
+ */
+export declare function chooseByAsset(asset: string): (execers: PaymentExecerV1[]) => PaymentExecerV1;
+/**
+ * Creates a chooser that selects by network name.
+ *
+ * @param network - Network name to match (case-insensitive).
+ * @returns A chooser function.
+ */
+export declare function chooseByNetwork(network: string): (execers: PaymentExecerV1[]) => PaymentExecerV1;
+/**
+ * Creates a chooser that selects by payment scheme.
+ *
+ * @param scheme - Scheme name to match (case-insensitive).
+ * @returns A chooser function.
+ */
+export declare function chooseByScheme(scheme: string): (execers: PaymentExecerV1[]) => PaymentExecerV1;
+/**
+ * Creates a chooser that selects by array index.
+ *
+ * @param index - Zero-based index of the option to select.
+ * @returns A chooser function.
+ */
+export declare function chooseByIndex(index: number): (execers: PaymentExecerV1[]) => PaymentExecerV1;
+/**
+ * Chooser that always throws, useful for testing "no suitable option" paths.
+ *
+ * @throws Always throws "No suitable payment option".
+ */
 export declare function chooseNone(): never;
-export declare function chooseWithInspection(inspector: (execers: PaymentExecer[]) => void, inner: (execers: PaymentExecer[]) => PaymentExecer): (execers: PaymentExecer[]) => PaymentExecer;
-export declare function chooseWithFilter(filter: (execer: PaymentExecer) => boolean, inner: (execers: PaymentExecer[]) => PaymentExecer): (execers: PaymentExecer[]) => PaymentExecer;
+/**
+ * Wraps a chooser to inspect options before choosing.
+ *
+ * @param inspector - Callback to inspect available options.
+ * @param inner - Chooser to delegate to after inspection.
+ * @returns A chooser that inspects then delegates.
+ */
+export declare function chooseWithInspection(inspector: (execers: PaymentExecerV1[]) => void, inner: (execers: PaymentExecerV1[]) => PaymentExecerV1): (execers: PaymentExecerV1[]) => PaymentExecerV1;
+/**
+ * Wraps a chooser to filter options before choosing.
+ *
+ * @param filter - Predicate to filter available options.
+ * @param inner - Chooser to delegate to after filtering.
+ * @returns A chooser that filters then delegates.
+ */
+export declare function chooseWithFilter(filter: (execer: PaymentExecerV1) => boolean, inner: (execers: PaymentExecerV1[]) => PaymentExecerV1): (execers: PaymentExecerV1[]) => PaymentExecerV1;
 //# sourceMappingURL=choosers.d.ts.map

package/dist/src/choosers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"choosers.d.ts","sourceRoot":"","sources":["../../src/choosers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,aAAa,CASnE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,aAAa,CAUtE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,aAAa,CAU3E;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,GACZ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,CAU7C;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,GACd,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,CAU7C;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,GACb,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,CAU7C;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,GACZ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,CAU7C;AAED,wBAAgB,UAAU,IAAI,KAAK,CAElC;AAED,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,IAAI,EAC7C,KAAK,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,GACjD,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,CAK7C;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,EAC1C,KAAK,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,GACjD,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,CAK7C"}
+{"version":3,"file":"choosers.d.ts","sourceRoot":"","sources":["../../src/choosers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,eAAe,CASvE;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,eAAe,CAU1E;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,EAAE,GACzB,eAAe,CAUjB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,GACZ,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,CAUjD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,GACd,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,CAUjD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,GACb,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,CAUjD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,GACZ,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,CAUjD;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,KAAK,CAElC;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,EAC/C,KAAK,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,GACrD,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,CAKjD;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,EAC5C,KAAK,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,GACrD,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,CAKjD"}

package/dist/src/choosers.js

@@ -1,3 +1,10 @@
+/**
+ * Chooser that selects the first available payment option.
+ *
+ * @param execers - Available payment execers.
+ * @returns The first execer in the list.
+ * @throws If no options are available.
+ */
 export function chooseFirst(execers) {
     if (execers.length === 0) {
         throw new Error("No payment options available");
@@ -8,6 +15,13 @@ export function chooseFirst(execers) {
     }
     return first;
 }
+/**
+ * Chooser that selects the cheapest payment option by maxAmountRequired.
+ *
+ * @param execers - Available payment execers.
+ * @returns The execer with the lowest amount.
+ * @throws If no options are available.
+ */
 export function chooseCheapest(execers) {
     if (execers.length === 0) {
         throw new Error("No payment options available");
@@ -17,6 +31,13 @@ export function chooseCheapest(execers) {
         ? current
         : cheapest);
 }
+/**
+ * Chooser that selects the most expensive payment option by maxAmountRequired.
+ *
+ * @param execers - Available payment execers.
+ * @returns The execer with the highest amount.
+ * @throws If no options are available.
+ */
 export function chooseMostExpensive(execers) {
     if (execers.length === 0) {
         throw new Error("No payment options available");
@@ -26,6 +47,12 @@ export function chooseMostExpensive(execers) {
         ? current
         : expensive);
 }
+/**
+ * Creates a chooser that selects by asset name.
+ *
+ * @param asset - Asset name to match (case-insensitive).
+ * @returns A chooser function.
+ */
 export function chooseByAsset(asset) {
     return (execers) => {
         const match = execers.find((e) => e.requirements.asset.toLowerCase() === asset.toLowerCase());
@@ -35,6 +62,12 @@ export function chooseByAsset(asset) {
         return match;
     };
 }
+/**
+ * Creates a chooser that selects by network name.
+ *
+ * @param network - Network name to match (case-insensitive).
+ * @returns A chooser function.
+ */
 export function chooseByNetwork(network) {
     return (execers) => {
         const match = execers.find((e) => e.requirements.network.toLowerCase() === network.toLowerCase());
@@ -44,6 +77,12 @@ export function chooseByNetwork(network) {
         return match;
     };
 }
+/**
+ * Creates a chooser that selects by payment scheme.
+ *
+ * @param scheme - Scheme name to match (case-insensitive).
+ * @returns A chooser function.
+ */
 export function chooseByScheme(scheme) {
     return (execers) => {
         const match = execers.find((e) => e.requirements.scheme.toLowerCase() === scheme.toLowerCase());
@@ -53,6 +92,12 @@ export function chooseByScheme(scheme) {
         return match;
     };
 }
+/**
+ * Creates a chooser that selects by array index.
+ *
+ * @param index - Zero-based index of the option to select.
+ * @returns A chooser function.
+ */
 export function chooseByIndex(index) {
     return (execers) => {
         const execer = execers[index];
@@ -62,15 +107,34 @@ export function chooseByIndex(index) {
         return execer;
     };
 }
+/**
+ * Chooser that always throws, useful for testing "no suitable option" paths.
+ *
+ * @throws Always throws "No suitable payment option".
+ */
 export function chooseNone() {
     throw new Error("No suitable payment option");
 }
+/**
+ * Wraps a chooser to inspect options before choosing.
+ *
+ * @param inspector - Callback to inspect available options.
+ * @param inner - Chooser to delegate to after inspection.
+ * @returns A chooser that inspects then delegates.
+ */
 export function chooseWithInspection(inspector, inner) {
     return (execers) => {
         inspector(execers);
         return inner(execers);
     };
 }
+/**
+ * Wraps a chooser to filter options before choosing.
+ *
+ * @param filter - Predicate to filter available options.
+ * @param inner - Chooser to delegate to after filtering.
+ * @returns A chooser that filters then delegates.
+ */
 export function chooseWithFilter(filter, inner) {
     return (execers) => {
         const filtered = execers.filter(filter);

package/dist/src/harness/config.d.ts

@@ -1,8 +1,18 @@
 import type { FacilitatorHandler } from "@faremeter/types/facilitator";
-import type { PaymentHandler } from "@faremeter/types/client";
+import type { PaymentHandlerV1 } from "@faremeter/types/client";
 import type { x402PaymentRequirements } from "@faremeter/types/x402";
+import type { SupportedVersionsConfig } from "@faremeter/middleware/common";
 import type { Interceptor } from "../interceptors/types.js";
+/**
+ * How the middleware handles payment verification and settlement.
+ *
+ * - `"settle-only"` - Skip verification, settle directly (faster tests).
+ * - `"verify-then-settle"` - Verify payment before settling (more realistic).
+ */
 export type SettleMode = "settle-only" | "verify-then-settle";
+/**
+ * Configuration for {@link TestHarness}.
+ */
 export type TestHarnessConfig = {
     /**
      * Payment requirements the middleware accepts.
@@ -15,15 +25,21 @@ export type TestHarnessConfig = {
      */
     facilitatorHandlers: FacilitatorHandler[];
     /**
-     * Client payment handlers.
+     * Client payment handlers (v1).
+     * Internally adapted to v2 for use with the fetch client.
      * Multiple handlers can be provided for different schemes.
      */
-    clientHandlers: PaymentHandler[];
+    clientHandlers: PaymentHandlerV1[];
     /**
      * Settlement mode for the middleware.
      * @default "settle-only"
      */
     settleMode?: SettleMode;
+    /**
+     * Protocol versions the middleware should support.
+     * Passed through to middleware without modification.
+     */
+    supportedVersions?: SupportedVersionsConfig;
     /**
      * Interceptors between test code and middleware.
      * These see all requests from the wrapped fetch to the Hono app.

package/dist/src/harness/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/harness/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,oBAAoB,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;IAE5C;;;OAGG;IACH,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAE1C;;;OAGG;IACH,cAAc,EAAE,cAAc,EAAE,CAAC;IAEjC;;;OAGG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,WAAW,EAAE,CAAC;IAEnC;;;OAGG;IACH,sBAAsB,CAAC,EAAE,WAAW,EAAE,CAAC;CACxC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/harness/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,oBAAoB,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;IAE5C;;;OAGG;IACH,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAE1C;;;;OAIG;IACH,cAAc,EAAE,gBAAgB,EAAE,CAAC;IAEnC;;;OAGG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;IAE5C;;;OAGG;IACH,kBAAkB,CAAC,EAAE,WAAW,EAAE,CAAC;IAEnC;;;OAGG;IACH,sBAAsB,CAAC,EAAE,WAAW,EAAE,CAAC;CACxC,CAAC"}

package/dist/src/harness/defaults.d.ts

@@ -1,8 +1,15 @@
-import type { x402PaymentRequirements } from "@faremeter/types/x402";
+import type { x402PaymentRequirements as x402PaymentRequirementsV1 } from "@faremeter/types/x402";
+import type { x402PaymentRequirements } from "@faremeter/types/x402v2";
 /**
- * Creates a payment requirements object with test defaults.
+ * Creates a payment requirements object with test defaults (v1 format).
  * Override specific fields by passing a partial:
  *   accepts({ maxAmountRequired: "500" })
  */
-export declare function accepts(overrides?: Partial<x402PaymentRequirements>): x402PaymentRequirements;
+export declare function accepts(overrides?: Partial<x402PaymentRequirementsV1>): x402PaymentRequirementsV1;
+/**
+ * Creates a payment requirements object with test defaults (v2 format).
+ * Override specific fields by passing a partial:
+ *   acceptsV2({ amount: "500" })
+ */
+export declare function acceptsV2(overrides?: Partial<x402PaymentRequirements>): x402PaymentRequirements;
 //# sourceMappingURL=defaults.d.ts.map

package/dist/src/harness/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/harness/defaults.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;;;GAIG;AACH,wBAAgB,OAAO,CACrB,SAAS,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAC3C,uBAAuB,CAazB"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/harness/defaults.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,IAAI,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAEvE;;;;GAIG;AACH,wBAAgB,OAAO,CACrB,SAAS,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAC7C,yBAAyB,CAa3B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,SAAS,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAC3C,uBAAuB,CAUzB"}

package/dist/src/harness/defaults.js

@@ -1,6 +1,6 @@
 import { TEST_SCHEME, TEST_NETWORK, TEST_ASSET } from "../scheme/constants.js";
 /**
- * Creates a payment requirements object with test defaults.
+ * Creates a payment requirements object with test defaults (v1 format).
  * Override specific fields by passing a partial:
  *   accepts({ maxAmountRequired: "500" })
  */
@@ -18,3 +18,19 @@ export function accepts(overrides) {
         ...overrides,
     };
 }
+/**
+ * Creates a payment requirements object with test defaults (v2 format).
+ * Override specific fields by passing a partial:
+ *   acceptsV2({ amount: "500" })
+ */
+export function acceptsV2(overrides) {
+    return {
+        scheme: TEST_SCHEME,
+        network: TEST_NETWORK,
+        amount: "100",
+        payTo: "test-receiver",
+        maxTimeoutSeconds: 30,
+        asset: TEST_ASSET,
+        ...overrides,
+    };
+}

package/dist/src/harness/harness.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from "hono";
-import type { PaymentExecer } from "@faremeter/types/client";
+import type { PaymentExecerV1 } from "@faremeter/types/client";
 import type { Interceptor } from "../interceptors/types.js";
 import type { TestHarnessConfig } from "./config.js";
 import type { ResourceHandler } from "./resource.js";
@@ -37,7 +37,7 @@ export declare class TestHarness {
      * Create a fetch function for client->middleware calls.
      * This applies client interceptors and routes to the Hono app.
      */
-    private createClientFetch;
+    createClientFetch(): typeof fetch;
     /**
      * Set the resource handler that responds after successful payment.
      */
@@ -45,10 +45,12 @@ export declare class TestHarness {
     /**
      * Create a fetch function that handles the full x402 payment flow.
      *
-     * @param opts.payerChooser - Function to choose which payment option to use
+     * @param opts.payerChooser - Function to choose which payment option to use.
+     *   Receives v1 PaymentExecerV1[] for compatibility with v1 protocol tests.
+     *   The chosen execer is converted back to v2 internally.
      */
     createFetch(opts?: {
-        payerChooser?: ((execers: PaymentExecer[]) => PaymentExecer | Promise<PaymentExecer>) | undefined;
+        payerChooser?: ((execers: PaymentExecerV1[]) => PaymentExecerV1 | Promise<PaymentExecerV1>) | undefined;
     }): typeof fetch;
     /**
      * Add an interceptor to the client chain (between test code and middleware).
@@ -66,5 +68,9 @@ export declare class TestHarness {
      * Reset harness state (interceptors, resource handler).
      */
     reset(): void;
+    /**
+     * Handle protocol body callback for both v1 and v2.
+     */
+    private handleBody;
 }
 //# sourceMappingURL=harness.d.ts.map

package/dist/src/harness/harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../../src/harness/harness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAQ5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAQ7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,iBAAiB,EAAc,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,YAAY,CAAC;AAanE;;;;;GAKG;AACH,qBAAa,WAAW;IACtB;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,eAAe,CAA2C;IAClE,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,sBAAsB,CAAqB;IAEnD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;gBAErC,MAAM,EAAE,iBAAiB;IASrC;;OAEG;IACH,OAAO,CAAC,SAAS;IAiGjB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAe7B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAmBzB;;OAEG;IACH,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAIlD;;;;OAIG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE;QACjB,YAAY,CAAC,EACT,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GACtE,SAAS,CAAC;KACf,GAAG,OAAO,KAAK;IAgBhB;;OAEG;IACH,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIpD;;OAEG;IACH,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIxD;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAOzB;;OAEG;IACH,KAAK,IAAI,IAAI;CAId"}
+{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../../src/harness/harness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAa1C,OAAO,KAAK,EAAiB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,iBAAiB,EAAc,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,YAAY,CAAC;AAYpB;;;;;GAKG;AACH,qBAAa,WAAW;IACtB;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IAEnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,eAAe,CAA2C;IAClE,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,sBAAsB,CAAqB;IAEnD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;gBAErC,MAAM,EAAE,iBAAiB;IASrC;;OAEG;IACH,OAAO,CAAC,SAAS;IAgEjB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAe7B;;;OAGG;IACH,iBAAiB,IAAI,OAAO,KAAK;IAmBjC;;OAEG;IACH,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAIlD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE;QACjB,YAAY,CAAC,EACT,CAAC,CACC,OAAO,EAAE,eAAe,EAAE,KACvB,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,GAChD,SAAS,CAAC;KACf,GAAG,OAAO,KAAK;IA+DhB;;OAEG;IACH,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIpD;;OAEG;IACH,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIxD;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAOzB;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb;;OAEG;YACW,UAAU;CA2DzB"}

package/dist/src/harness/harness.js

@@ -1,10 +1,21 @@
+/* eslint-disable @typescript-eslint/no-deprecated -- v1 test harness uses v1 types */
+/* eslint-disable @typescript-eslint/unbound-method -- exec is a function property, not a method */
 import { Hono } from "hono";
 import { createFacilitatorRoutes } from "@faremeter/facilitator";
 import { wrap } from "@faremeter/fetch";
-import { handleMiddlewareRequest, getPaymentRequiredResponse, } from "@faremeter/middleware/common";
+import { handleMiddlewareRequest, getPaymentRequiredResponse, getPaymentRequiredResponseV2, resolveSupportedVersions, } from "@faremeter/middleware/common";
+import { adaptPaymentHandlerV1ToV2 } from "@faremeter/types/client";
+import { adaptRequirementsV2ToV1 } from "@faremeter/types/x402-adapters";
+import { normalizeNetworkId } from "@faremeter/info";
 import { composeInterceptors } from "../interceptors/types.js";
 import { getURLFromRequestInfo } from "../interceptors/utils.js";
 import { defaultResourceHandler } from "./resource.js";
+/**
+ * Type guard to check if a middleware context is v1.
+ */
+function isV1Context(context) {
+    return context.protocolVersion === 1;
+}
 /**
  * TestHarness provides an in-process test environment for the x402 protocol.
  *
@@ -54,61 +65,30 @@ export class TestHarness {
             // 1. Applies middleware interceptors
             // 2. Routes to the Hono app
             const middlewareFetch = this.createMiddlewareFetch();
-            // Track state for resource handler
-            const state = {};
             const result = await handleMiddlewareRequest({
                 facilitatorURL: `${this.baseUrl}/facilitator`,
                 accepts: this.config.accepts,
+                supportedVersions: resolveSupportedVersions(this.config.supportedVersions),
                 resource: c.req.url,
                 fetch: middlewareFetch,
                 getHeader: (key) => c.req.header(key),
+                setResponseHeader: (key, value) => c.header(key, value),
                 getPaymentRequiredResponse,
-                sendJSONResponse: (status, body) => {
+                getPaymentRequiredResponseV2,
+                sendJSONResponse: (status, body, headers) => {
                     c.status(status);
-                    return c.json(body);
-                },
-                body: async (context) => {
-                    const { paymentRequirements, paymentPayload, settle, verify } = context;
-                    // Store for resource handler
-                    state.paymentRequirements = paymentRequirements;
-                    state.paymentPayload = paymentPayload;
-                    if (this.settleMode === "verify-then-settle") {
-                        const verifyResult = await verify();
-                        if (!verifyResult.success) {
-                            return verifyResult.errorResponse;
-                        }
-                        state.verifyResponse = verifyResult.facilitatorResponse;
-                        const settleResult = await settle();
-                        if (!settleResult.success) {
-                            return settleResult.errorResponse;
-                        }
-                        state.settleResponse = settleResult.facilitatorResponse;
-                    }
-                    else {
-                        const settleResult = await settle();
-                        if (!settleResult.success) {
-                            return settleResult.errorResponse;
-                        }
-                        state.settleResponse = settleResult.facilitatorResponse;
-                    }
-                    // Payment successful - call resource handler
-                    const ctx = {
-                        resource: c.req.url,
-                        request: c.req.raw,
-                        paymentRequirements,
-                        paymentPayload,
-                        settleResponse: state.settleResponse,
-                        verifyResponse: state.verifyResponse,
-                    };
-                    const resourceResult = await this.resourceHandler(ctx);
-                    // Set response headers
-                    if (resourceResult.headers) {
-                        for (const [key, value] of Object.entries(resourceResult.headers)) {
+                    if (headers) {
+                        for (const [key, value] of Object.entries(headers)) {
                             c.header(key, value);
                         }
                     }
-                    c.status(resourceResult.status);
-                    return c.json(resourceResult.body);
+                    if (body) {
+                        return c.json(body);
+                    }
+                    return c.body(null);
+                },
+                body: async (context) => {
+                    return this.handleBody(c, context);
                 },
             });
             return result;
@@ -160,16 +140,54 @@ export class TestHarness {
     /**
      * Create a fetch function that handles the full x402 payment flow.
      *
-     * @param opts.payerChooser - Function to choose which payment option to use
+     * @param opts.payerChooser - Function to choose which payment option to use.
+     *   Receives v1 PaymentExecerV1[] for compatibility with v1 protocol tests.
+     *   The chosen execer is converted back to v2 internally.
      */
     createFetch(opts) {
         const clientFetch = this.createClientFetch();
         const payerChooser = opts?.payerChooser;
+        // Adapt v1 handlers to v2 for use with the fetch client
+        const v2Handlers = this.config.clientHandlers.map((h) => adaptPaymentHandlerV1ToV2(h, normalizeNetworkId));
         return wrap(clientFetch, {
-            handlers: this.config.clientHandlers,
+            handlers: v2Handlers,
             ...(payerChooser
                 ? {
-                    payerChooser: async (execers) => payerChooser(execers),
+                    payerChooser: async (v2Execers) => {
+                        // Convert v2 execers to v1 for the callback
+                        const v1Execers = v2Execers.map((e) => ({
+                            requirements: adaptRequirementsV2ToV1(e.requirements, {
+                                url: "",
+                            }),
+                            exec: e.exec,
+                        }));
+                        // Let the callback choose using v1 types
+                        const chosenV1 = await payerChooser(v1Execers);
+                        // Find the corresponding v2 execer by matching requirements
+                        const chosenIndex = v1Execers.indexOf(chosenV1);
+                        if (chosenIndex >= 0) {
+                            const v2Execer = v2Execers[chosenIndex];
+                            if (v2Execer) {
+                                return v2Execer;
+                            }
+                        }
+                        // Fallback: wrap the v1 execer's exec with the first matching v2 requirements
+                        const matchingV2 = v2Execers.find((e) => e.requirements.scheme === chosenV1.requirements.scheme &&
+                            e.requirements.network === chosenV1.requirements.network &&
+                            e.requirements.asset === chosenV1.requirements.asset);
+                        if (matchingV2) {
+                            return {
+                                requirements: matchingV2.requirements,
+                                exec: chosenV1.exec,
+                            };
+                        }
+                        // Last resort: return first v2 execer with the chosen exec
+                        const first = v2Execers[0];
+                        if (!first) {
+                            throw new Error("No execers available");
+                        }
+                        return { requirements: first.requirements, exec: chosenV1.exec };
+                    },
                 }
                 : {}),
         });
@@ -202,4 +220,62 @@ export class TestHarness {
         this.clearInterceptors();
         this.resourceHandler = defaultResourceHandler;
     }
+    /**
+     * Handle protocol body callback for both v1 and v2.
+     */
+    async handleBody(c, context) {
+        let ctx;
+        if (isV1Context(context)) {
+            let verifyResponse;
+            if (this.settleMode === "verify-then-settle") {
+                const verifyResult = await context.verify();
+                if (!verifyResult.success)
+                    return verifyResult.errorResponse;
+                verifyResponse = verifyResult.facilitatorResponse;
+            }
+            const settleResult = await context.settle();
+            if (!settleResult.success)
+                return settleResult.errorResponse;
+            ctx = {
+                protocolVersion: 1,
+                resource: c.req.url,
+                request: c.req.raw,
+                paymentRequirements: context.paymentRequirements,
+                paymentPayload: context.paymentPayload,
+                settleResponse: settleResult.facilitatorResponse,
+                verifyResponse,
+            };
+        }
+        else {
+            let verifyResponse;
+            if (this.settleMode === "verify-then-settle") {
+                const verifyResult = await context.verify();
+                if (!verifyResult.success)
+                    return verifyResult.errorResponse;
+                verifyResponse = verifyResult.facilitatorResponse;
+            }
+            const settleResult = await context.settle();
+            if (!settleResult.success)
+                return settleResult.errorResponse;
+            ctx = {
+                protocolVersion: 2,
+                resource: c.req.url,
+                request: c.req.raw,
+                paymentRequirements: context.paymentRequirements,
+                paymentPayload: context.paymentPayload,
+                settleResponse: settleResult.facilitatorResponse,
+                verifyResponse,
+            };
+        }
+        const resourceResult = await this.resourceHandler(ctx);
+        if (resourceResult.headers) {
+            for (const [key, value] of Object.entries(resourceResult.headers)) {
+                c.header(key, value);
+            }
+        }
+        // Hono's typed API requires literal status codes and typed json bodies.
+        // These assertions satisfy the framework's type constraints.
+        c.status(resourceResult.status);
+        return c.json(resourceResult.body);
+    }
 }

package/dist/src/harness/harness.test.js

@@ -141,8 +141,9 @@ await t.test("interceptor composition", async (t) => {
                     if (matchFacilitatorSettle(url, init)) {
                         return new Response(JSON.stringify({
                             success: true,
-                            txHash: "0xshortcircuit",
-                            networkId: TEST_NETWORK,
+                            transaction: "0xshortcircuit",
+                            network: TEST_NETWORK,
+                            payer: "test-payer",
                         }), {
                             status: 200,
                             headers: { "Content-Type": "application/json" },

package/dist/src/harness/resource.d.ts

@@ -1,17 +1,51 @@
-import type { x402PaymentRequirements, x402PaymentPayload, x402SettleResponse, x402VerifyResponse } from "@faremeter/types/x402";
-export type ResourceContext = {
+import type { x402PaymentRequirements as x402PaymentRequirementsV1, x402PaymentPayload as x402PaymentPayloadV1, x402SettleResponse as x402SettleResponseV1, x402VerifyResponse as x402VerifyResponseV1 } from "@faremeter/types/x402";
+import type { x402PaymentRequirements, x402PaymentPayload, x402SettleResponse, x402VerifyResponse } from "@faremeter/types/x402v2";
+/**
+ * Common fields shared between v1 and v2 resource contexts.
+ */
+type ResourceContextBase = {
     resource: string;
     request: Request;
+};
+/**
+ * Resource context for v1 protocol.
+ */
+export type ResourceContextV1 = ResourceContextBase & {
+    protocolVersion: 1;
+    paymentRequirements: x402PaymentRequirementsV1;
+    paymentPayload: x402PaymentPayloadV1;
+    settleResponse: x402SettleResponseV1;
+    verifyResponse?: x402VerifyResponseV1 | undefined;
+};
+/**
+ * Resource context for v2 protocol.
+ */
+export type ResourceContextV2 = ResourceContextBase & {
+    protocolVersion: 2;
     paymentRequirements: x402PaymentRequirements;
     paymentPayload: x402PaymentPayload;
     settleResponse: x402SettleResponse;
     verifyResponse?: x402VerifyResponse | undefined;
 };
+/**
+ * Resource context passed to the resource handler after successful payment.
+ * Discriminated union based on protocolVersion.
+ */
+export type ResourceContext = ResourceContextV1 | ResourceContextV2;
 export type ResourceResult = {
     status: number;
     body: unknown;
     headers?: Record<string, string>;
 };
 export type ResourceHandler = (ctx: ResourceContext) => ResourceResult | Promise<ResourceResult>;
+/**
+ * Type guard to check if context is v1.
+ */
+export declare function isResourceContextV1(ctx: ResourceContext): ctx is ResourceContextV1;
+/**
+ * Type guard to check if context is v2.
+ */
+export declare function isResourceContextV2(ctx: ResourceContext): ctx is ResourceContextV2;
 export declare const defaultResourceHandler: ResourceHandler;
+export {};
 //# sourceMappingURL=resource.d.ts.map