@haven_ai/sdk 0.9.0-alpha.0 → 0.10.0-alpha.0

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkZDKNPNI3_cjs = require('./chunk-ZDKNPNI3.cjs');
-var chunk7UTWSJC5_cjs = require('./chunk-7UTWSJC5.cjs');
-var chunk4Z6ATE44_cjs = require('./chunk-4Z6ATE44.cjs');
+var chunk22FJ4JQO_cjs = require('./chunk-22FJ4JQO.cjs');
+var chunk6LEXYQ7J_cjs = require('./chunk-6LEXYQ7J.cjs');
+var chunkH37YVYZA_cjs = require('./chunk-H37YVYZA.cjs');
 var viem = require('viem');
 var ethers = require('ethers');
 var async_hooks = require('async_hooks');
@@ -15,7 +15,7 @@ function signHash(privateKey, hash) {
     const sig = signingKey.sign(hash);
     return sig.serialized;
   } catch (err) {
-    throw new chunk4Z6ATE44_cjs.HavenSigningError(
+    throw new chunkH37YVYZA_cjs.HavenSigningError(
       `Failed to sign hash: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -31,7 +31,7 @@ async function signTypedDataVerbatim(privateKey, typedData, label) {
       typedData.message
     );
   } catch (err) {
-    throw new chunk4Z6ATE44_cjs.HavenSigningError(
+    throw new chunkH37YVYZA_cjs.HavenSigningError(
       `Failed to sign ${label}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -46,7 +46,7 @@ function addressFromKey(privateKey) {
   try {
     return new ethers.ethers.Wallet(privateKey).address;
   } catch (err) {
-    throw new chunk4Z6ATE44_cjs.HavenSigningError(
+    throw new chunkH37YVYZA_cjs.HavenSigningError(
       `Invalid private key: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -62,7 +62,7 @@ function verifySignature(hash, signature, expectedAddress) {
 var DEFAULT_BASE_URL = "http://localhost:3001";
 var DEFAULT_REQUEST_TIMEOUT = 3e4;
 function withoutClientHeader(headers) {
-  const target = chunkZDKNPNI3_cjs.HAVEN_CLIENT_HEADER.toLowerCase();
+  const target = chunk22FJ4JQO_cjs.HAVEN_CLIENT_HEADER.toLowerCase();
   return Object.fromEntries(Object.entries(headers).filter(([name]) => name.toLowerCase() !== target));
 }
 var HavenApiTransport = class {
@@ -78,7 +78,7 @@ var HavenApiTransport = class {
     this.baseUrl = (config.baseUrl ?? DEFAULT_BASE_URL).replace(/\/+$/, "");
     this.requestTimeout = config.requestTimeout ?? DEFAULT_REQUEST_TIMEOUT;
     this.defaultHeaders = { ...config.defaultHeaders ?? {} };
-    this.clientIdentity = config.clientIdentity ?? chunkZDKNPNI3_cjs.SDK_CLIENT_IDENTITY;
+    this.clientIdentity = config.clientIdentity ?? chunk22FJ4JQO_cjs.SDK_CLIENT_IDENTITY;
   }
   /**
    * The newest `client_update` the backend sent (#3303): inside a
@@ -91,7 +91,7 @@ var HavenApiTransport = class {
   }
   recordClientUpdate(data) {
     if (data === null || typeof data !== "object" || Array.isArray(data)) return;
-    const hint = chunkZDKNPNI3_cjs.readClientUpdate(data.client_update);
+    const hint = chunk22FJ4JQO_cjs.readClientUpdate(data.client_update);
     if (!hint) return;
     this.lastClientUpdate = hint;
     const store = this.requestContext.getStore();
@@ -124,7 +124,7 @@ var HavenApiTransport = class {
           // JOIN `x-haven-client` and `X-Haven-Client` into one unparseable
           // value), so neither `defaultHeaders` nor a dispatch context can
           // misname the client; `clientIdentity` is the one way to set it.
-          [chunkZDKNPNI3_cjs.HAVEN_CLIENT_HEADER]: this.clientIdentity
+          [chunk22FJ4JQO_cjs.HAVEN_CLIENT_HEADER]: this.clientIdentity
         },
         body: body ? JSON.stringify(body) : void 0,
         signal: controller.signal
@@ -137,15 +137,15 @@ var HavenApiTransport = class {
         const rawDetails = record.details ?? record.detail;
         const detailsText = typeof rawDetails === "string" ? rawDetails : rawDetails != null ? JSON.stringify(rawDetails) : void 0;
         const message = errorText && detailsText ? `${errorText}: ${detailsText}` : errorText ?? detailsText ?? "API request failed";
-        throw new chunk4Z6ATE44_cjs.HavenApiError(message, res.status, data);
+        throw new chunkH37YVYZA_cjs.HavenApiError(message, res.status, data);
       }
       return data;
     } catch (err) {
-      if (err instanceof chunk4Z6ATE44_cjs.HavenApiError) throw err;
+      if (err instanceof chunkH37YVYZA_cjs.HavenApiError) throw err;
       if (err instanceof Error && err.name === "AbortError") {
-        throw new chunk4Z6ATE44_cjs.HavenApiError(`Request to ${path} timed out`, 408);
+        throw new chunkH37YVYZA_cjs.HavenApiError(`Request to ${path} timed out`, 408);
       }
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `Request to ${path} failed: ${err instanceof Error ? err.message : String(err)}`,
         0
       );
@@ -168,13 +168,13 @@ async function fetchUnsignedTaxDeclaration(client) {
   if (reason === "feature_disabled" || reason === "disabled" || reason === "no_company_details" || reason === "vies_not_valid") {
     return { available: false, reason };
   }
-  throw new chunk4Z6ATE44_cjs.HavenApiError(
+  throw new chunkH37YVYZA_cjs.HavenApiError(
     "The tax-declaration endpoint answered a body that is neither the \xA72.1 content nor a named unavailability reason.",
     502
   );
 }
 async function resolveTaxDeclarationHeader(client, input) {
-  if (chunkZDKNPNI3_cjs.isErc7710Option(input.accepted)) {
+  if (chunk22FJ4JQO_cjs.isErc7710Option(input.accepted)) {
     return { header: void 0 };
   }
   let content;
@@ -186,7 +186,7 @@ async function resolveTaxDeclarationHeader(client, input) {
   if (!content.available) {
     return { header: void 0 };
   }
-  const signed = chunkZDKNPNI3_cjs.buildSignedTaxDeclaration({
+  const signed = chunk22FJ4JQO_cjs.buildSignedTaxDeclaration({
     content: content.declaration,
     network: input.accepted.network,
     delegateKey: input.delegateKey
@@ -195,19 +195,19 @@ async function resolveTaxDeclarationHeader(client, input) {
     `[haven-sdk] signing x402 tax declaration taxId=${JSON.stringify(content.declaration.taxId)} jurisdiction=${JSON.stringify(content.declaration.jurisdiction)} principalId=${signed.declaration.principalId}
 `
   );
-  return { header: chunkZDKNPNI3_cjs.encodeTaxDeclarationHeader(signed) };
+  return { header: chunk22FJ4JQO_cjs.encodeTaxDeclarationHeader(signed) };
 }
 function withTaxDeclarationHeader(init, header) {
   if (!header) {
-    if (init?.headers && new Headers(init.headers).has(chunkZDKNPNI3_cjs.X_TAX_DECLARATION_HEADER)) {
+    if (init?.headers && new Headers(init.headers).has(chunk22FJ4JQO_cjs.X_TAX_DECLARATION_HEADER)) {
       const headers2 = new Headers(init.headers);
-      headers2.delete(chunkZDKNPNI3_cjs.X_TAX_DECLARATION_HEADER);
+      headers2.delete(chunk22FJ4JQO_cjs.X_TAX_DECLARATION_HEADER);
       return { ...init, headers: headers2 };
     }
     return init ?? {};
   }
   const headers = new Headers(init?.headers);
-  headers.set(chunkZDKNPNI3_cjs.X_TAX_DECLARATION_HEADER, header);
+  headers.set(chunk22FJ4JQO_cjs.X_TAX_DECLARATION_HEADER, header);
   return { ...init, headers };
 }
 
@@ -373,29 +373,29 @@ function paymentStateStatusCode(status, fallback = 502) {
   return PAYMENT_STATE_STATUS_CODES[status] ?? fallback;
 }
 function phaseForStatus(status) {
-  if (status === "pending_signature") return chunk4Z6ATE44_cjs.AgentPaymentPhase.AgentSignatureRequired;
-  if (status === "submitted") return chunk4Z6ATE44_cjs.AgentPaymentPhase.PaymentSubmitted;
-  if (status === "confirmed") return chunk4Z6ATE44_cjs.AgentPaymentPhase.PaymentConfirmed;
-  if (status === "pending" || status === "pending_approval") return chunk4Z6ATE44_cjs.AgentPaymentPhase.UserApprovalRequired;
-  if (status === "approved") return chunk4Z6ATE44_cjs.AgentPaymentPhase.UserExecutionRequired;
-  if (status === "proposed") return chunk4Z6ATE44_cjs.AgentPaymentPhase.WaitingForAdditionalApprovals;
-  if (status === "executed") return chunk4Z6ATE44_cjs.AgentPaymentPhase.FundingSent;
-  if (status === "rejected") return chunk4Z6ATE44_cjs.AgentPaymentPhase.Rejected;
-  if (status === "expired") return chunk4Z6ATE44_cjs.AgentPaymentPhase.Expired;
-  if (status === "failed") return chunk4Z6ATE44_cjs.AgentPaymentPhase.Failed;
+  if (status === "pending_signature") return chunkH37YVYZA_cjs.AgentPaymentPhase.AgentSignatureRequired;
+  if (status === "submitted") return chunkH37YVYZA_cjs.AgentPaymentPhase.PaymentSubmitted;
+  if (status === "confirmed") return chunkH37YVYZA_cjs.AgentPaymentPhase.PaymentConfirmed;
+  if (status === "pending" || status === "pending_approval") return chunkH37YVYZA_cjs.AgentPaymentPhase.UserApprovalRequired;
+  if (status === "approved") return chunkH37YVYZA_cjs.AgentPaymentPhase.UserExecutionRequired;
+  if (status === "proposed") return chunkH37YVYZA_cjs.AgentPaymentPhase.WaitingForAdditionalApprovals;
+  if (status === "executed") return chunkH37YVYZA_cjs.AgentPaymentPhase.FundingSent;
+  if (status === "rejected") return chunkH37YVYZA_cjs.AgentPaymentPhase.Rejected;
+  if (status === "expired") return chunkH37YVYZA_cjs.AgentPaymentPhase.Expired;
+  if (status === "failed") return chunkH37YVYZA_cjs.AgentPaymentPhase.Failed;
   return null;
 }
 function nextActionForStatus(status) {
-  if (status === "pending_signature") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.SignAndSubmitPayment;
-  if (status === "submitted") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.CheckStatusLater;
-  if (status === "confirmed") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.None;
-  if (status === "pending" || status === "pending_approval") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "approved") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "proposed") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "executed") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "rejected") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "expired") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.RequestAgainIfUserStillWantsIt;
-  if (status === "failed") return chunk4Z6ATE44_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "pending_signature") return chunkH37YVYZA_cjs.AgentPaymentNextAction.SignAndSubmitPayment;
+  if (status === "submitted") return chunkH37YVYZA_cjs.AgentPaymentNextAction.CheckStatusLater;
+  if (status === "confirmed") return chunkH37YVYZA_cjs.AgentPaymentNextAction.None;
+  if (status === "pending" || status === "pending_approval") return chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "approved") return chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "proposed") return chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "executed") return chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "rejected") return chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "expired") return chunkH37YVYZA_cjs.AgentPaymentNextAction.RequestAgainIfUserStillWantsIt;
+  if (status === "failed") return chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser;
   return null;
 }
 function messageForState(label, status, paymentId, nextAction) {
@@ -469,17 +469,17 @@ function throwPaymentStateError(label, raw) {
   const statusCode = paymentStateStatusCode(raw.status);
   const state = paymentStateFromRaw(label, raw);
   if (state) {
-    throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(state.message, statusCode, state, raw);
+    throw new chunkH37YVYZA_cjs.HavenPaymentStateError(state.message, statusCode, state, raw);
   }
   if (raw.status === "pending_approval") {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       `${label} exceeds the agent's on-chain budget and was declined; no approval is pending and none will arrive (payment_id: ${raw.payment_id}).`,
       statusCode,
       raw
     );
   }
   if (raw.status === "expired") {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       `${label} expired before it could be completed (payment_id: ${raw.payment_id}).`,
       statusCode,
       raw
@@ -487,7 +487,7 @@ function throwPaymentStateError(label, raw) {
   }
   const paymentId = raw.payment_id ? ` (payment_id: ${raw.payment_id})` : "";
   const message = raw.error ?? `${label} ${raw.status}${paymentId}`;
-  throw new chunk4Z6ATE44_cjs.HavenApiError(message, statusCode, raw);
+  throw new chunkH37YVYZA_cjs.HavenApiError(message, statusCode, raw);
 }
 
 // src/x402-retry-target.ts
@@ -519,7 +519,7 @@ function isSecureX402RetryTarget(url) {
   return RESERVED_SUFFIXES.some((suffix) => host.endsWith(suffix));
 }
 var INSECURE_RETRY_TARGET_CODE = "INSECURE_RETRY_TARGET";
-var HavenInsecureRetryTargetError = class extends chunk4Z6ATE44_cjs.HavenError {
+var HavenInsecureRetryTargetError = class extends chunkH37YVYZA_cjs.HavenError {
   constructor(url) {
     super(
       `Refusing to send a payment header to ${url}: the paid x402 retry must go to an https URL (or a loopback / reserved test host). The merchant's challenge declared this resource URL; retry with the https URL you quoted (pass it as \`url\`), and report a merchant whose challenge downgrades the scheme.`,
@@ -537,7 +537,7 @@ function assertSecureX402RetryTarget(url) {
 
 // src/merchant-egress.ts
 var MERCHANT_EGRESS_REFUSED_CODE = "MERCHANT_EGRESS_REFUSED";
-var MerchantEgressRefusedError = class extends chunk4Z6ATE44_cjs.HavenError {
+var MerchantEgressRefusedError = class extends chunkH37YVYZA_cjs.HavenError {
   url;
   refusal;
   beforeRequest;
@@ -550,7 +550,7 @@ var MerchantEgressRefusedError = class extends chunk4Z6ATE44_cjs.HavenError {
   }
 };
 var MERCHANT_EGRESS_RESPONSE_CAP_CODE = "MERCHANT_EGRESS_RESPONSE_CAP";
-var MerchantEgressResponseCapError = class extends chunk4Z6ATE44_cjs.HavenError {
+var MerchantEgressResponseCapError = class extends chunkH37YVYZA_cjs.HavenError {
   url;
   limitBytes;
   constructor(message, limitBytes, url) {
@@ -698,7 +698,7 @@ var McpMerchantTransport = class {
         return await this.fetchImpl(url, { ...init, signal });
       } catch (err) {
         if (timeoutSignal.aborted) {
-          throw new chunk4Z6ATE44_cjs.MerchantTimeoutError(`Merchant request timed out after ${timeoutMs}ms: ${url}`);
+          throw new chunkH37YVYZA_cjs.MerchantTimeoutError(`Merchant request timed out after ${timeoutMs}ms: ${url}`);
         }
         throw err;
       }
@@ -781,7 +781,7 @@ var McpMerchantTransport = class {
       }
     } catch (err) {
       if (timeoutSignal.aborted) {
-        throw new chunk4Z6ATE44_cjs.MerchantTimeoutError(`Merchant request timed out after ${timeoutMs}ms: ${currentUrl}`);
+        throw new chunkH37YVYZA_cjs.MerchantTimeoutError(`Merchant request timed out after ${timeoutMs}ms: ${currentUrl}`);
       }
       throw err;
     }
@@ -869,7 +869,7 @@ var McpMerchantTransport = class {
       text = await response.clone().text();
     } catch (err) {
       if (err instanceof MerchantEgressResponseCapError) throw err;
-      if (isBodyPhaseTimeout(err)) throw new chunk4Z6ATE44_cjs.MerchantTimeoutError(`Merchant response body read timed out.`);
+      if (isBodyPhaseTimeout(err)) throw new chunkH37YVYZA_cjs.MerchantTimeoutError(`Merchant response body read timed out.`);
       return void 0;
     }
     if ((response.headers.get("content-type") ?? "").includes("text/event-stream")) {
@@ -894,7 +894,7 @@ var McpMerchantTransport = class {
       text = await response.clone().text();
     } catch (err) {
       if (err instanceof MerchantEgressResponseCapError) throw err;
-      if (isBodyPhaseTimeout(err)) throw new chunk4Z6ATE44_cjs.MerchantTimeoutError(`Merchant response body read timed out.`);
+      if (isBodyPhaseTimeout(err)) throw new chunkH37YVYZA_cjs.MerchantTimeoutError(`Merchant response body read timed out.`);
       return response;
     }
     const message = selectJsonRpcResult(parseSseJsonRpcMessages(text));
@@ -956,8 +956,8 @@ var McpMerchantTransport = class {
   async deliverPayment(url, init, paymentHeader) {
     assertSecureX402RetryTarget(url);
     const headers = new Headers(init?.headers);
-    const send = chunkZDKNPNI3_cjs.x402PaymentHeaderNamesFor(paymentHeader);
-    for (const name of chunkZDKNPNI3_cjs.X402_PAYMENT_HEADER_NAMES) {
+    const send = chunk22FJ4JQO_cjs.x402PaymentHeaderNamesFor(paymentHeader);
+    for (const name of chunk22FJ4JQO_cjs.X402_PAYMENT_HEADER_NAMES) {
       if (send.includes(name)) headers.set(name, paymentHeader);
       else headers.delete(name);
     }
@@ -1044,7 +1044,7 @@ function mcpToolResultOf(value) {
 function extractMcpPaymentRequired(toolResult) {
   if (toolResult.isError !== true) return void 0;
   if (isRecord(toolResult.structuredContent)) {
-    const parsed = chunkZDKNPNI3_cjs.normalizePaymentRequired(toolResult.structuredContent);
+    const parsed = chunk22FJ4JQO_cjs.normalizePaymentRequired(toolResult.structuredContent);
     if (parsed) return parsed;
   }
   if (Array.isArray(toolResult.content)) {
@@ -1056,7 +1056,7 @@ function extractMcpPaymentRequired(toolResult) {
       } catch {
         continue;
       }
-      const parsed = chunkZDKNPNI3_cjs.normalizePaymentRequired(candidate);
+      const parsed = chunk22FJ4JQO_cjs.normalizePaymentRequired(candidate);
       if (parsed) return parsed;
     }
   }
@@ -1080,7 +1080,7 @@ function withMcpPaymentMeta(init, paymentHeader) {
   if (!request) return init;
   let envelope;
   try {
-    envelope = chunkZDKNPNI3_cjs.decodeBase64Json(paymentHeader);
+    envelope = chunk22FJ4JQO_cjs.decodeBase64Json(paymentHeader);
   } catch {
     return init;
   }
@@ -1096,7 +1096,7 @@ function withMcpPaymentMeta(init, paymentHeader) {
   };
 }
 function encodeMcpSettlementReceipt(settlement) {
-  return chunkZDKNPNI3_cjs.encodeBase64Json(settlement);
+  return chunk22FJ4JQO_cjs.encodeBase64Json(settlement);
 }
 function parseJsonRpcToolsCall(body) {
   if (typeof body !== "string") return void 0;
@@ -1214,7 +1214,7 @@ function deriveReadiness(status, allowances) {
   return allowances.some((allowance) => safeBigInt(allowance.remainingAtomic) > 0n) ? "ready" : "needs_approval";
 }
 function formatRemainingDisplay(tokenAddress, tokenSymbol, remainingAtomic) {
-  const token = chunkZDKNPNI3_cjs.resolveTokenFromAddress(tokenAddress);
+  const token = chunk22FJ4JQO_cjs.resolveTokenFromAddress(tokenAddress);
   return token ? `${formatAtomicAmount(safeBigInt(remainingAtomic), token.decimals)} ${tokenSymbol}` : `${remainingAtomic} ${tokenSymbol} (atomic; unknown decimals)`;
 }
 function formatTokenAmount(atomic, decimals) {
@@ -1225,6 +1225,19 @@ function formatTokenAmount(atomic, decimals) {
   const fracPart = digits.slice(digits.length - decimals).replace(/0+$/, "");
   return fracPart ? `${intPart}.${fracPart}` : intPart;
 }
+function mapSupersession(raw) {
+  if (typeof raw !== "object" || raw === null) return null;
+  const { agent_id: replacementAgentId, superseded_at: supersededAt } = raw;
+  if (typeof replacementAgentId !== "string" || replacementAgentId === "") return null;
+  if (typeof supersededAt !== "string" || supersededAt === "") return null;
+  return {
+    replacementAgentId,
+    supersededAt,
+    warning: `This agent was replaced on its machine by agent ${replacementAgentId} at ${supersededAt}. This session is still running as the old agent: restart the agent runtime so it loads the new agent, and ask the user to remove this agent on its Haven agent page if it is no longer used \u2014 it keeps any budget it still holds until then.`,
+    nextAction: chunkH37YVYZA_cjs.AgentPaymentNextAction.StopAndTellUser,
+    nextToolOmittedReason: "The next step is the user's: restart this session, and remove the superseded agent in the Haven dashboard. No Haven tool does either."
+  };
+}
 function mapTaskBudget(raw) {
   return {
     id: raw.id,
@@ -1290,7 +1303,7 @@ function summarizePendingSubBudget(row) {
   };
 }
 function summarizeTaskBudget(taskBudget) {
-  const token = chunkZDKNPNI3_cjs.resolveTokenFromAddress(taskBudget.tokenAddress);
+  const token = chunk22FJ4JQO_cjs.resolveTokenFromAddress(taskBudget.tokenAddress);
   const maxDisplay = token ? `${formatAtomicAmount(safeBigInt(taskBudget.maxAtomic), token.decimals)} ${token.symbol}` : `${taskBudget.maxAtomic} (atomic; unknown decimals)`;
   const spendDisplay = (atomic) => {
     if (atomic === null) return null;
@@ -1418,7 +1431,7 @@ var AccountReads = class {
   async listTaskBudgetsSummary() {
     try {
       const raw = await this.transport.get("/task-budgets?status=live").catch((error) => {
-        if (error instanceof chunk4Z6ATE44_cjs.HavenApiError && error.statusCode === 400) {
+        if (error instanceof chunkH37YVYZA_cjs.HavenApiError && error.statusCode === 400) {
           return this.transport.get("/task-budgets?status=all");
         }
         throw error;
@@ -1460,6 +1473,7 @@ var AccountReads = class {
       accountAddress: raw.account_address,
       delegateAddress: raw.delegate_address,
       chainId: raw.chain_id,
+      supersededBy: mapSupersession(raw.superseded_by),
       allowances: raw.allowances.map((allowance) => ({
         id: allowance.id,
         tokenAddress: allowance.token_address,
@@ -1525,7 +1539,7 @@ var AccountReads = class {
       payment: payment2,
       allowance: null,
       warnings: [{
-        code: chunk4Z6ATE44_cjs.AgentPaymentWarningCode.AllowanceCheckUnavailable,
+        code: chunkH37YVYZA_cjs.AgentPaymentWarningCode.AllowanceCheckUnavailable,
         message: `Could not read the post-purchase allowance/budget for payment ${paymentId} (${detail}). The payment itself succeeded \u2014 the on-chain policy remains the actual spend gate; this only affects the remaining-budget figure reported here.`
       }]
     });
@@ -1618,7 +1632,7 @@ var AccountReads = class {
    */
   async getReceipt(paymentId) {
     const { receipt } = await this.transport.get(`/payments/${paymentId}/receipt`);
-    return { receipt, verification: chunk7UTWSJC5_cjs.verifyPaymentReceipt(receipt) };
+    return { receipt, verification: chunk6LEXYQ7J_cjs.verifyPaymentReceipt(receipt) };
   }
   async fetchAgent() {
     const raw = await this.transport.get("/machine-payments/agent");
@@ -1632,7 +1646,8 @@ var AccountReads = class {
       accountAddress: raw.account_address,
       delegateAddress: raw.delegate_address,
       chainId: raw.chain_id,
-      executionRail: raw.execution_rail === "delegation" ? "delegation" : "legacy"
+      executionRail: raw.execution_rail === "delegation" ? "delegation" : "legacy",
+      supersededBy: mapSupersession(raw.superseded_by)
     };
   }
 };
@@ -1653,7 +1668,7 @@ function isWaitTimeout(err) {
 async function waitForSweepTx(tx) {
   let receipt;
   try {
-    receipt = await tx.wait(1, chunk4Z6ATE44_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS);
+    receipt = await tx.wait(1, chunkH37YVYZA_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS);
   } catch (err) {
     if (!isWaitTimeout(err)) throw err;
     return { txHash: tx.hash, confirmation: "unconfirmed" };
@@ -1667,16 +1682,16 @@ var DelegateSweepApi = class {
   }
   options;
   async sweepDelegate() {
-    if (!this.options.delegateKey) throw new chunk4Z6ATE44_cjs.HavenSigningError("delegateKey is required for sweepDelegate.");
+    if (!this.options.delegateKey) throw new chunkH37YVYZA_cjs.HavenSigningError("delegateKey is required for sweepDelegate.");
     const agent = await this.options.getAgent();
-    if (!agent.delegateAddress) throw new chunk4Z6ATE44_cjs.HavenApiError("Agent has no delegate address.", 422);
+    if (!agent.delegateAddress) throw new chunkH37YVYZA_cjs.HavenApiError("Agent has no delegate address.", 422);
     const rpcUrl = this.options.chainRpcs[agent.chainId];
-    if (!rpcUrl) throw new chunk4Z6ATE44_cjs.HavenApiError(`chainRpcs[${agent.chainId}] must be configured to sweep the delegate wallet.`, 422);
+    if (!rpcUrl) throw new chunkH37YVYZA_cjs.HavenApiError(`chainRpcs[${agent.chainId}] must be configured to sweep the delegate wallet.`, 422);
     const provider = createJsonRpcProvider(rpcUrl);
     const wallet = createWallet(this.options.delegateKey, provider);
     const transfers = [];
-    if (chunkZDKNPNI3_cjs.isSweepableChain(agent.chainId)) {
-      const contract = createErc20Contract(chunkZDKNPNI3_cjs.sweepUsdcAddress(agent.chainId), ["function balanceOf(address) view returns (uint256)", "function transfer(address to, uint256 amount) returns (bool)"], wallet);
+    if (chunk22FJ4JQO_cjs.isSweepableChain(agent.chainId)) {
+      const contract = createErc20Contract(chunk22FJ4JQO_cjs.sweepUsdcAddress(agent.chainId), ["function balanceOf(address) view returns (uint256)", "function transfer(address to, uint256 amount) returns (bool)"], wallet);
       const balance2 = await contract.balanceOf(agent.delegateAddress);
       if (balance2 > 0n) {
         const tx = await contract.transfer(agent.accountAddress, balance2);
@@ -1764,7 +1779,7 @@ function snapshotRequestBody(body) {
   if (body == null) return void 0;
   if (typeof body === "string") return body;
   if (body instanceof URLSearchParams) return body.toString();
-  throw new chunk4Z6ATE44_cjs.HavenApiError(
+  throw new chunkH37YVYZA_cjs.HavenApiError(
     "Quote helpers can only capture resumable request bodies that are strings or URLSearchParams. For streams, blobs, or binary bodies, preserve the original request yourself and call the matching resume method with fresh init.",
     400
   );
@@ -1785,12 +1800,12 @@ function requestInitFromSnapshot(request) {
   };
 }
 function noCompatiblePaymentOptionError(accepts) {
-  const erc7710Only = chunkZDKNPNI3_cjs.selectErc7710PaymentOption(accepts) !== null;
+  const erc7710Only = chunk22FJ4JQO_cjs.selectErc7710PaymentOption(accepts) !== null;
   const unsupportedOnly = !erc7710Only && accepts.some(
-    (opt) => opt !== null && typeof opt === "object" && !chunkZDKNPNI3_cjs.isErc7710Option(opt) && (chunkZDKNPNI3_cjs.x402AssetTransferMethod(opt) !== null || opt.extra?.paymentFlow !== void 0)
+    (opt) => opt !== null && typeof opt === "object" && !chunk22FJ4JQO_cjs.isErc7710Option(opt) && (chunk22FJ4JQO_cjs.x402AssetTransferMethod(opt) !== null || opt.extra?.paymentFlow !== void 0)
   );
   const offeredSchemes = nonExactSchemesOnly(accepts);
-  return new chunk4Z6ATE44_cjs.HavenApiError(
+  return new chunkH37YVYZA_cjs.HavenApiError(
     "No compatible payment option found in x402 requirements. Haven supports standard x402 exact payments on Base USDC." + (offeredSchemes ? ` The merchant offered only ${offeredSchemes}; Haven pays only the 'exact' scheme. For a request with a body, this often means the body or its Content-Type was missing or invalid: send the full request again (method, body, and Content-Type: application/json for a JSON API).` : erc7710Only ? " The only Haven-compatible option this merchant advertises is tagged extra.assetTransferMethod: 'erc7710' (direct settlement), which this EIP-3009 payment path cannot settle \u2014 the limitation is the settlement scheme, not the asset. Paying this merchant requires a delegation-rail erc7710 flow (settleX402Erc7710, or the hosted MCP purchase tools)." : unsupportedOnly ? " Every option this merchant advertises asks for a transfer method or payment flow Haven cannot construct (for example extra.assetTransferMethod: 'permit2', or an unrecognized extra.paymentFlow). No payment intent was created and no funds moved." : ""),
     400
   );
@@ -1809,15 +1824,15 @@ function nonExactSchemesOnly(accepts) {
   return schemes.map((s) => `'${s}'`).join(", ");
 }
 function buildX402Quote(paymentRequired, request, idempotencyKey, mcpTransport) {
-  const standard = chunkZDKNPNI3_cjs.selectStandardPaymentOption(paymentRequired.accepts);
-  const option = standard ?? chunkZDKNPNI3_cjs.selectErc7710PaymentOption(paymentRequired.accepts);
+  const standard = chunk22FJ4JQO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+  const option = standard ?? chunk22FJ4JQO_cjs.selectErc7710PaymentOption(paymentRequired.accepts);
   if (!option) {
     throw noCompatiblePaymentOptionError(paymentRequired.accepts);
   }
-  const token = chunkZDKNPNI3_cjs.resolveTokenFromAddress(option.asset, option.network);
+  const token = chunk22FJ4JQO_cjs.resolveTokenFromAddress(option.asset, option.network);
   return {
     rail: "x402",
-    idempotencyKey: idempotencyKey ?? chunkZDKNPNI3_cjs.buildX402IdempotencyKey(paymentRequired, option),
+    idempotencyKey: idempotencyKey ?? chunk22FJ4JQO_cjs.buildX402IdempotencyKey(paymentRequired, option),
     paymentRequired,
     accepted: option,
     acceptedScheme: standard ? "standard" : "erc7710",
@@ -1831,8 +1846,8 @@ function buildX402Quote(paymentRequired, request, idempotencyKey, mcpTransport)
     resourceUrlDiffersFromRequest: paymentRequired.resource.url !== request.url,
     description: paymentRequired.resource.description ?? option.description ?? null,
     mimeType: paymentRequired.resource.mimeType ?? option.mimeType ?? null,
-    amountAtomic: chunkZDKNPNI3_cjs.x402AuthorizationAmount(option),
-    amount: decimalFromUsdcAtomic(chunkZDKNPNI3_cjs.x402AuthorizationAmount(option)),
+    amountAtomic: chunk22FJ4JQO_cjs.x402AuthorizationAmount(option),
+    amount: decimalFromUsdcAtomic(chunk22FJ4JQO_cjs.x402AuthorizationAmount(option)),
     token: token?.symbol ?? "USDC",
     // #1351: null when the asset is unrecognised on this network — the
     // `token` fallback above is a LABEL, not evidence of 6 decimals, and a
@@ -1871,7 +1886,7 @@ function buildX402Receipt(input) {
       payTo: input.merchantTo ?? input.accepted.payTo
     },
     x402: {
-      amount: chunkZDKNPNI3_cjs.x402AuthorizationAmount(input.accepted),
+      amount: chunk22FJ4JQO_cjs.x402AuthorizationAmount(input.accepted),
       token: input.token,
       network: input.accepted.network,
       asset: input.accepted.asset,
@@ -1880,7 +1895,7 @@ function buildX402Receipt(input) {
   };
 }
 function buildX402ResumeState(input) {
-  const token = chunkZDKNPNI3_cjs.resolveTokenFromAddress(input.accepted.asset, input.accepted.network);
+  const token = chunk22FJ4JQO_cjs.resolveTokenFromAddress(input.accepted.asset, input.accepted.network);
   return {
     rail: "x402",
     paymentId: input.paymentId,
@@ -1891,8 +1906,8 @@ function buildX402ResumeState(input) {
     request: input.request,
     resourceUrl: input.paymentRequired.resource.url,
     description: input.paymentRequired.resource.description ?? input.accepted.description ?? null,
-    amountAtomic: chunkZDKNPNI3_cjs.x402AuthorizationAmount(input.accepted),
-    amount: decimalFromUsdcAtomic(chunkZDKNPNI3_cjs.x402AuthorizationAmount(input.accepted)),
+    amountAtomic: chunk22FJ4JQO_cjs.x402AuthorizationAmount(input.accepted),
+    amount: decimalFromUsdcAtomic(chunk22FJ4JQO_cjs.x402AuthorizationAmount(input.accepted)),
     token: token?.symbol ?? "USDC",
     asset: input.accepted.asset,
     network: input.accepted.network,
@@ -1901,7 +1916,7 @@ function buildX402ResumeState(input) {
   };
 }
 function attachX402ResumeState(err, paymentRequired, accepted, idempotencyKey, request) {
-  if (!(err instanceof chunk4Z6ATE44_cjs.HavenPaymentStateError)) return;
+  if (!(err instanceof chunkH37YVYZA_cjs.HavenPaymentStateError)) return;
   if (err.state.rail !== "x402") return;
   err.resumeState = buildX402ResumeState({
     paymentId: err.state.paymentId,
@@ -1922,17 +1937,17 @@ function attachResumeState(err, input) {
 }
 function assertCanResumeX402(status, paymentRequired, option) {
   if (status.rail !== "x402") {
-    throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(
+    throw new chunkH37YVYZA_cjs.HavenPaymentStateError(
       `Payment ${status.paymentId} is ${status.rail}, not x402.`,
       409,
       status
     );
   }
-  if (status.nextAction !== chunk4Z6ATE44_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
-    throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
+  if (status.nextAction !== chunkH37YVYZA_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
+    throw new chunkH37YVYZA_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
   }
   if (!status.txHash) {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       `x402 payment ${status.paymentId} is ready to retry but has no Haven transaction hash.`,
       502,
       status,
@@ -1940,7 +1955,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   if (status.resourceUrl && status.resourceUrl !== paymentRequired.resource.url) {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       "x402 resume request does not match the approved resource URL.",
       409,
       { status, paymentRequired },
@@ -1948,7 +1963,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   if (status.merchantAddress && !sameAddress(status.merchantAddress, option.payTo)) {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       "x402 resume request does not match the approved merchant.",
       409,
       { status, selectedPayment: option },
@@ -1957,7 +1972,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
   }
   const optionChainId = chainIdFromNetwork(option.network);
   if (status.chainId && optionChainId && status.chainId !== optionChainId) {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       "x402 resume request does not match the approved network.",
       409,
       { status, selectedPayment: option },
@@ -1965,7 +1980,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   if (status.token && status.token !== "USDC") {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       "x402 resume request does not match the approved token.",
       409,
       { status, selectedPayment: option },
@@ -1973,9 +1988,9 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   const approvedAmount = status.amount ? normalizeDecimal(status.amount) : "";
-  const requestedAmount = normalizeDecimal(decimalFromUsdcAtomic(chunkZDKNPNI3_cjs.x402AuthorizationAmount(option)));
+  const requestedAmount = normalizeDecimal(decimalFromUsdcAtomic(chunk22FJ4JQO_cjs.x402AuthorizationAmount(option)));
   if (approvedAmount && approvedAmount !== requestedAmount) {
-    throw new chunk4Z6ATE44_cjs.HavenApiError(
+    throw new chunkH37YVYZA_cjs.HavenApiError(
       "x402 resume request does not match the approved amount.",
       409,
       { status, selectedPayment: option },
@@ -2031,7 +2046,7 @@ var X402FundingLeg = class {
     const cached = this.receiptCache.get(idempotencyKey);
     if (!cached || cached.expiresAt <= Date.now()) return void 0;
     if (!sameX402TaskBudget(cached.taskBudgetId, taskBudgetId) || !sameX402TaskBudget(cached.subBudgetId, subBudgetId)) {
-      throw new chunk4Z6ATE44_cjs.X402TaskBudgetMismatchError(
+      throw new chunkH37YVYZA_cjs.X402TaskBudgetMismatchError(
         `The x402 idempotency key '${idempotencyKey}' was already used under a different authorizing budget (task '${cached.taskBudgetId ?? "none"}' vs '${taskBudgetId ?? "none"}', sub '${cached.subBudgetId ?? "none"}' vs '${subBudgetId ?? "none"}'). Pass a new idempotencyKey to pay under this budget.`,
         idempotencyKey,
         cached.taskBudgetId,
@@ -2052,7 +2067,7 @@ var X402FundingLeg = class {
       url: paymentRequired.resource.url,
       payTo: this.delegateAddress,
       merchantPayTo: option.payTo,
-      amount: chunkZDKNPNI3_cjs.x402AuthorizationAmount(option),
+      amount: chunk22FJ4JQO_cjs.x402AuthorizationAmount(option),
       asset: option.asset,
       network: option.network,
       description: paymentRequired.resource.description,
@@ -2071,41 +2086,41 @@ var X402FundingLeg = class {
       ...subBudgetId ? { subBudgetId } : {}
     });
     const state = paymentStateFromRaw("x402 payment", raw);
-    const executedReplay = raw.success && raw.tx_hash ? "idempotency-collision" : state?.nextAction === chunk4Z6ATE44_cjs.AgentPaymentNextAction.RetryOriginalX402Request ? "approval-resume" : null;
+    const executedReplay = raw.success && raw.tx_hash ? "idempotency-collision" : state?.nextAction === chunkH37YVYZA_cjs.AgentPaymentNextAction.RetryOriginalX402Request ? "approval-resume" : null;
     if (executedReplay) {
       const canFund = await this.delegateCanFund(
         raw.chain_id ?? state?.chainId ?? chainIdFromNetwork(option.network),
         option.asset,
-        chunkZDKNPNI3_cjs.x402AuthorizationAmount(option)
+        chunk22FJ4JQO_cjs.x402AuthorizationAmount(option)
       );
       const refuse = executedReplay === "idempotency-collision" ? canFund !== true : canFund === false;
       if (refuse) {
         const settledReceipt = state && executedReplay === "approval-resume" ? this.receiptFromStatus(paymentRequired, option, void 0, state) : this.receiptFromAuthorization(paymentRequired, option, void 0, raw);
-        throw new chunk4Z6ATE44_cjs.X402AlreadySettledError(
+        throw new chunkH37YVYZA_cjs.X402AlreadySettledError(
           canFund === false ? "This x402 payment already settled \u2014 the delegate no longer holds the funds to authorize it again. To buy the same item a second time, pass a distinct `idempotencyKey`; the synthesised key intentionally collapses repeat calls for the same product within a 5-minute window so a retried request cannot pay twice." : "This x402 payment already settled, and whether the delegate can still fund a new authorization could not be verified (no `chainRpcs` entry for this chain). Refusing rather than issue an authorization that may be unfundable. To buy the same item a second time, pass a distinct `idempotencyKey`; to finish an interrupted payment, resume it by `paymentId`.",
           settledReceipt,
           canFund === false ? "settled" : "unverifiable"
         );
       }
     }
-    const paymentHeader = await this.createPaymentHeader(paymentRequired, option);
+    const paymentHeader = await this.createPaymentHeader(paymentRequired, option, raw.payment_id ?? state?.paymentId);
     if (raw.success && raw.tx_hash) {
       const receipt2 = this.receiptFromAuthorization(paymentRequired, option, paymentHeader, raw);
       this.cacheReceipt(idempotencyKey, paymentHeader, receipt2, taskBudgetId, subBudgetId);
       return receipt2;
     }
-    if (state?.nextAction === chunk4Z6ATE44_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
+    if (state?.nextAction === chunkH37YVYZA_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
       const receipt2 = this.receiptFromStatus(paymentRequired, option, paymentHeader, state);
       this.cacheReceipt(idempotencyKey, paymentHeader, receipt2, taskBudgetId, subBudgetId);
       return receipt2;
     }
     this.assertSignableAuthorizationState("x402 payment", raw);
     if (!raw.sign_data?.hash) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
+      throw new chunkH37YVYZA_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
     }
     const sig = await this.signForData(raw.sign_data, {
       asset: option.asset,
-      amount: chunkZDKNPNI3_cjs.x402AuthorizationAmount(option)
+      amount: chunk22FJ4JQO_cjs.x402AuthorizationAmount(option)
     });
     const execResult = await this.post(
       `/payments/${raw.payment_id}/sign`,
@@ -2123,27 +2138,54 @@ var X402FundingLeg = class {
     return receipt;
   }
   // ── Header minting ───────────────────────────────────────────────
-  async createPaymentHeader(paymentRequired, option) {
+  /**
+   * Mint the merchant-facing X-PAYMENT header with the delegate key.
+   *
+   * #3888: when `paymentId` is given, the EIP-3009 nonce is the shared
+   * derivation from that Haven payment id instead of the x402 library's
+   * random draw — that is what lets the backend attribute the merchant's
+   * `AuthorizationUsed(delegate, nonce)` settlement to this payment when the
+   * agent never reports it, and what makes a resume/retry re-sign of a
+   * settled payment carry the SAME nonce (the merchant refuses it as already
+   * used, closing the #3475 re-pay hazard). The signed typed data stays the
+   * library's own: the nonce only overwrites the field on the unsigned
+   * payload `preparePaymentHeader` built. Without a payment id the library's
+   * random nonce is kept — an install too old to name its payment behaves
+   * exactly as before.
+   */
+  async createPaymentHeader(paymentRequired, option, paymentId) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError("delegateKey is required to sign x402 payment headers.");
+      throw new chunkH37YVYZA_cjs.HavenSigningError("delegateKey is required to sign x402 payment headers.");
     }
     const account = accounts.privateKeyToAccount(this.delegateKey);
-    const requirements = chunkZDKNPNI3_cjs.toStandardPaymentRequirements(paymentRequired, option);
-    const header = await schemes.exact.evm.createPaymentHeader(
-      account,
-      paymentRequired.x402Version,
-      requirements
-    );
+    const requirements = chunk22FJ4JQO_cjs.toStandardPaymentRequirements(paymentRequired, option);
+    let header;
+    if (paymentId) {
+      const unsigned = schemes.exact.evm.preparePaymentHeader(
+        account.address,
+        paymentRequired.x402Version,
+        requirements
+      );
+      unsigned.payload.authorization.nonce = chunk22FJ4JQO_cjs.deriveX402PaymentNonce(paymentId);
+      const signed = await schemes.exact.evm.signPaymentHeader(account, requirements, unsigned);
+      header = schemes.exact.evm.encodePayment(signed);
+    } else {
+      header = await schemes.exact.evm.createPaymentHeader(
+        account,
+        paymentRequired.x402Version,
+        requirements
+      );
+    }
     if (paymentRequired.x402Version < 2) return header;
-    const payment = chunkZDKNPNI3_cjs.decodeBase64Json(header);
-    return chunkZDKNPNI3_cjs.encodeBase64Json(chunkZDKNPNI3_cjs.x402V2PaymentEnvelope(paymentRequired, option, payment.payload));
+    const payment = chunk22FJ4JQO_cjs.decodeBase64Json(header);
+    return chunk22FJ4JQO_cjs.encodeBase64Json(chunk22FJ4JQO_cjs.x402V2PaymentEnvelope(paymentRequired, option, payment.payload));
   }
   // ── Receipt mapping ──────────────────────────────────────────────
   receiptFromAuthorization(paymentRequired, option, paymentHeader, raw, execResult) {
     const txHash = execResult?.tx_hash ?? raw.tx_hash ?? "";
     const chainId = execResult?.chain_id ?? raw.chain_id ?? chainIdFromNetwork(option.network);
     const token = execResult?.token ?? raw.token ?? "USDC";
-    const amount = execResult?.amount ?? raw.amount ?? decimalFromUsdcAtomic(chunkZDKNPNI3_cjs.x402AuthorizationAmount(option));
+    const amount = execResult?.amount ?? raw.amount ?? decimalFromUsdcAtomic(chunk22FJ4JQO_cjs.x402AuthorizationAmount(option));
     const to = execResult?.to ?? raw.to ?? this.delegateAddress ?? "";
     const explorerUrl = execResult?.explorer_url ?? raw.explorer_url ?? explorerUrlOrEmpty(chainId, txHash);
     const merchantTo = execResult?.merchant_to ?? raw.merchant_to ?? option.payTo;
@@ -2165,7 +2207,7 @@ var X402FundingLeg = class {
   }
   receiptFromStatus(paymentRequired, option, paymentHeader, status) {
     if (!status.txHash) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `x402 payment ${status.paymentId} is ready to retry but has no Haven transaction hash.`,
         502,
         status,
@@ -2176,7 +2218,7 @@ var X402FundingLeg = class {
       paymentId: status.paymentId,
       txHash: status.txHash,
       token: status.token || "USDC",
-      amount: status.amount || decimalFromUsdcAtomic(chunkZDKNPNI3_cjs.x402AuthorizationAmount(option)),
+      amount: status.amount || decimalFromUsdcAtomic(chunk22FJ4JQO_cjs.x402AuthorizationAmount(option)),
       to: this.delegateAddress ?? "",
       resourceUrl: paymentRequired.resource.url,
       explorerUrl: explorerUrlOrEmpty(status.chainId, status.txHash),
@@ -2204,7 +2246,7 @@ var X402FundingLeg = class {
     const provider = createJsonRpcProvider(rpcUrl);
     const onChainReceipt = await provider.waitForTransaction(txHash, 1, timeoutMs);
     if (!onChainReceipt || onChainReceipt.status !== 1) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "Funding tx did not confirm on-chain within the timeout window.",
         500,
         { txHash, chainId }
@@ -2253,7 +2295,7 @@ var X402FundingLeg = class {
 };
 function getPaymentHeaderValidBefore(paymentHeader) {
   try {
-    const payment = chunkZDKNPNI3_cjs.decodeBase64Json(
+    const payment = chunk22FJ4JQO_cjs.decodeBase64Json(
       paymentHeader
     );
     const payload = payment.payload;
@@ -2308,7 +2350,7 @@ var X402Erc7710 = class {
    */
   async settle(paymentRequired, options = {}) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "delegateKey is required for x402 payments. Pass it in the HavenClient config."
       );
     }
@@ -2333,21 +2375,21 @@ var X402Erc7710 = class {
   async prepare(paymentRequired, options = {}) {
     const delegationRail = options.delegationRail ?? (await this.getAgent()).executionRail === "delegation";
     if (!delegationRail) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "erc7710 settlement requires a delegation-rail account; this one is not on it. Use authorizeX402() for the standard EIP-3009 path.",
         400
       );
     }
-    const selection = chunkZDKNPNI3_cjs.selectX402SettlementScheme(paymentRequired.accepts, { delegationRail });
+    const selection = chunk22FJ4JQO_cjs.selectX402SettlementScheme(paymentRequired.accepts, { delegationRail });
     if (!selection || selection.scheme !== "erc7710") {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "This merchant does not advertise an erc7710 settlement option (no accepts[] entry carries extra.assetTransferMethod: 'erc7710'). Use authorizeX402() for the standard EIP-3009 path.",
         400
       );
     }
     const option = selection.option;
     const merchantPayTo = option.payTo;
-    const amountAtomic = chunkZDKNPNI3_cjs.x402AuthorizationAmount(option);
+    const amountAtomic = chunk22FJ4JQO_cjs.x402AuthorizationAmount(option);
     const raw = await this.post("/x402", {
       url: options.resourceUrl ?? paymentRequired.resource?.url,
       // #2373: the full 402 challenge, persisted verbatim by the backend
@@ -2391,24 +2433,24 @@ var X402Erc7710 = class {
       ...options.subBudgetId ? { subBudgetId: options.subBudgetId } : {}
     });
     if (!raw.payment_id) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("No payment_id returned from x402/authorize", 500, raw);
+      throw new chunkH37YVYZA_cjs.HavenApiError("No payment_id returned from x402/authorize", 500, raw);
     }
     if (raw.status === "confirmed" && raw.tx_hash) {
       const requestedUrl = options.resourceUrl ?? paymentRequired.resource?.url;
       const samePurchase = typeof raw.to === "string" && raw.to.toLowerCase() === merchantPayTo.toLowerCase() && raw.resource_url === requestedUrl;
       if (!samePurchase) {
-        throw new chunk4Z6ATE44_cjs.HavenApiError(
+        throw new chunkH37YVYZA_cjs.HavenApiError(
           `Idempotency key already belongs to confirmed payment ${raw.payment_id}, which is not this erc7710 purchase (different payee or resource). Nothing was signed and nothing was charged. Check that payment's status before buying again: a funded but undelivered EIP-3009 payment is recovered, not paid twice. Otherwise use a new idempotency key for this purchase.`,
           409,
           raw,
           raw.payment_id
         );
       }
-      throw new chunk4Z6ATE44_cjs.X402Erc7710AlreadySettledError(raw.payment_id, raw.tx_hash, raw);
+      throw new chunkH37YVYZA_cjs.X402Erc7710AlreadySettledError(raw.payment_id, raw.tx_hash, raw);
     }
     const signData = raw.sign_data;
     if (signData?.signature_scheme !== "eip712_delegation" || !signData.typed_data) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `x402/authorize did not return an erc7710 settlement child (signature_scheme was ${JSON.stringify(signData?.signature_scheme)}). Refusing to sign a payload this path did not ask for.`,
         500,
         raw
@@ -2440,9 +2482,9 @@ var X402Erc7710 = class {
     try {
       settled = await this.post(`/x402/${paymentId}/settle`, { signature });
     } catch (err) {
-      const body = err instanceof chunk4Z6ATE44_cjs.HavenApiError ? err.body : void 0;
-      if (err instanceof chunk4Z6ATE44_cjs.HavenApiError && err.statusCode === 409 && body?.code === "payment_already_settled" && typeof body.tx_hash === "string") {
-        throw new chunk4Z6ATE44_cjs.X402Erc7710AlreadySettledError(
+      const body = err instanceof chunkH37YVYZA_cjs.HavenApiError ? err.body : void 0;
+      if (err instanceof chunkH37YVYZA_cjs.HavenApiError && err.statusCode === 409 && body?.code === "payment_already_settled" && typeof body.tx_hash === "string") {
+        throw new chunkH37YVYZA_cjs.X402Erc7710AlreadySettledError(
           typeof body.payment_id === "string" ? body.payment_id : paymentId,
           body.tx_hash,
           body
@@ -2451,7 +2493,7 @@ var X402Erc7710 = class {
       throw err;
     }
     if (!settled.payment_header) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "x402 settle returned no payment_header \u2014 the merchant cannot be retried.",
         500,
         settled
@@ -2461,9 +2503,9 @@ var X402Erc7710 = class {
   }
 };
 function settlementExpectationFromQuote(settlement) {
-  const chainId = chunk4Z6ATE44_cjs.chainIdForNetwork(settlement.network);
+  const chainId = chunkH37YVYZA_cjs.chainIdForNetwork(settlement.network);
   if (chainId === void 0) {
-    throw new chunk4Z6ATE44_cjs.HavenSigningError(
+    throw new chunkH37YVYZA_cjs.HavenSigningError(
       `Refusing to sign the x402 settlement child: the merchant's network ${JSON.stringify(settlement.network)} is not one this SDK can verify a settlement child on.`
     );
   }
@@ -2513,7 +2555,7 @@ function x402ToolReceipt(receipt) {
   };
 }
 function toolError(err) {
-  if (err instanceof chunk4Z6ATE44_cjs.HavenPaymentStateError) {
+  if (err instanceof chunkH37YVYZA_cjs.HavenPaymentStateError) {
     return {
       success: false,
       payment_id: err.state.paymentId,
@@ -2558,7 +2600,7 @@ function toolError(err) {
       error: err.message
     };
   }
-  if (err instanceof chunk4Z6ATE44_cjs.HavenApiError) {
+  if (err instanceof chunkH37YVYZA_cjs.HavenApiError) {
     return {
       success: false,
       status_code: err.statusCode,
@@ -2602,14 +2644,14 @@ var MerchantCompletion = class {
   }
   async retryRequest(url, initialInit, paymentRequired, receipt) {
     if (!receipt.accepted) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("No accepted x402 option was recorded for payment retry", 500);
+      throw new chunkH37YVYZA_cjs.HavenApiError("No accepted x402 option was recorded for payment retry", 500);
     }
     if (!receipt.paymentHeader) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("No x402 payment header was returned for payment retry", 500);
+      throw new chunkH37YVYZA_cjs.HavenApiError("No x402 payment header was returned for payment retry", 500);
     }
     let retryInit = initialInit;
     if (this.getTaxDeclarationHeader && this.delegateKey) {
-      const scheme = chunkZDKNPNI3_cjs.x402PaymentHeaderNamesFor(receipt.paymentHeader);
+      const scheme = chunk22FJ4JQO_cjs.x402PaymentHeaderNamesFor(receipt.paymentHeader);
       const isEip3009 = scheme.length > 1;
       if (isEip3009) {
         const resolved = await this.getTaxDeclarationHeader({
@@ -2644,7 +2686,7 @@ var MerchantCompletion = class {
           delegate_to: receipt.to
         }
       });
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "x402 retry failed after Haven funded the delegate wallet; reconciliation may be required.",
         inBandRejection ? X402_RETRY_REJECTED_STATUS : merchant.merchant_status,
         {
@@ -2674,7 +2716,7 @@ var MerchantCompletion = class {
       merchantStatus: retryResponse.status,
       challengePayload: paymentRequired,
       selectedPayment: receipt.accepted,
-      paymentProofHeaderName: chunkZDKNPNI3_cjs.x402PaymentHeaderNamesSent(receipt.paymentHeader),
+      paymentProofHeaderName: chunk22FJ4JQO_cjs.x402PaymentHeaderNamesSent(receipt.paymentHeader),
       paymentProofHeader: receipt.paymentHeader,
       protocolReceiptHeaderName,
       protocolReceiptHeader
@@ -2733,18 +2775,18 @@ var MerchantCompletion = class {
   async resolveCompletionContext(input) {
     const status = await this.getPaymentStatus(input.paymentId);
     if (status.rail !== "x402") {
-      throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(
+      throw new chunkH37YVYZA_cjs.HavenPaymentStateError(
         `Payment ${status.paymentId} is ${status.rail}, not x402.`,
         409,
         status
       );
     }
-    const readyForMerchantCompletion = input.noFundingLeg ? status.kind === "payment_intent" && status.status === "submitted" : status.nextAction === chunk4Z6ATE44_cjs.AgentPaymentNextAction.RetryOriginalX402Request || status.kind === "payment_intent" && status.status === "confirmed" && status.phase === chunk4Z6ATE44_cjs.AgentPaymentPhase.PaymentConfirmed && status.nextAction === chunk4Z6ATE44_cjs.AgentPaymentNextAction.None;
+    const readyForMerchantCompletion = input.noFundingLeg ? status.kind === "payment_intent" && status.status === "submitted" : status.nextAction === chunkH37YVYZA_cjs.AgentPaymentNextAction.RetryOriginalX402Request || status.kind === "payment_intent" && status.status === "confirmed" && status.phase === chunkH37YVYZA_cjs.AgentPaymentPhase.PaymentConfirmed && status.nextAction === chunkH37YVYZA_cjs.AgentPaymentNextAction.None;
     if (!readyForMerchantCompletion) {
-      throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
+      throw new chunkH37YVYZA_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
     }
     if (!input.noFundingLeg && !status.txHash) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `x402 payment ${status.paymentId} is ready for merchant completion but has no Haven transaction hash.`,
         502,
         status,
@@ -2753,7 +2795,7 @@ var MerchantCompletion = class {
     }
     const approvedResourceUrl = status.resourceUrl ?? status.x402?.resourceUrl ?? null;
     if (approvedResourceUrl && approvedResourceUrl !== input.url) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "x402 merchant completion does not match the approved resource URL.",
         409,
         { status, url: input.url },
@@ -2839,7 +2881,7 @@ var MerchantCompletion = class {
    */
   async reportMerchantOutcome(input) {
     if (!Number.isInteger(input.merchantStatus) || input.merchantStatus < 100 || input.merchantStatus > 599) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `merchant_status must be an integer HTTP status from 100 to 599 (received ${input.merchantStatus}).`,
         400,
         void 0,
@@ -2848,7 +2890,7 @@ var MerchantCompletion = class {
     }
     const looksAccepted = input.merchantStatus >= 200 && input.merchantStatus < 300;
     if (looksAccepted !== (input.outcome === "accepted")) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `outcome "${input.outcome}" contradicts merchant_status ${input.merchantStatus}: report "accepted" only for a 2xx and "rejected" only for a non-2xx.`,
         400,
         void 0,
@@ -2857,14 +2899,14 @@ var MerchantCompletion = class {
     }
     const status = await this.getPaymentStatus(input.paymentId);
     if (status.rail !== "x402") {
-      throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(
+      throw new chunkH37YVYZA_cjs.HavenPaymentStateError(
         `Payment ${status.paymentId} is ${status.rail}, not x402 \u2014 there is no merchant retry to report.`,
         409,
         status
       );
     }
     if (status.status !== "confirmed" || !status.txHash) {
-      throw new chunk4Z6ATE44_cjs.HavenPaymentStateError(
+      throw new chunkH37YVYZA_cjs.HavenPaymentStateError(
         `Payment ${status.paymentId} has no confirmed Haven funding transaction to anchor a merchant report to (status ${status.status}). ${status.message}`,
         paymentStateStatusCode(status.status, 409),
         status
@@ -2872,7 +2914,7 @@ var MerchantCompletion = class {
     }
     const resourceUrl = status.resourceUrl ?? status.x402?.resourceUrl ?? null;
     if (!resourceUrl) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         `Payment ${status.paymentId} has no recorded resource URL, so a merchant report cannot be stored.`,
         409,
         status,
@@ -2943,7 +2985,7 @@ var MerchantCompletion = class {
       await this.post("/machine-payments/evidence", body);
       return { outcome: "confirmed" };
     } catch (err) {
-      const statusCode = err instanceof chunk4Z6ATE44_cjs.HavenApiError ? err.statusCode : void 0;
+      const statusCode = err instanceof chunkH37YVYZA_cjs.HavenApiError ? err.statusCode : void 0;
       if (statusCode !== EVIDENCE_RETRYABLE_STATUS) {
         const reason = refusalReasonFromBody(err);
         return {
@@ -2989,7 +3031,7 @@ var MerchantCompletion = class {
    */
   async reportSettlementEvidence(paymentId, settlementTxHash) {
     if (isZeroSettlementTxHash(settlementTxHash)) {
-      throw new chunk4Z6ATE44_cjs.HavenZeroSettlementHashError(paymentId);
+      throw new chunkH37YVYZA_cjs.HavenZeroSettlementHashError(paymentId);
     }
     return this.reportEvidence({
       paymentId,
@@ -3020,7 +3062,7 @@ var MerchantCompletion = class {
   }
 };
 function refusalReasonFromBody(err) {
-  if (!(err instanceof chunk4Z6ATE44_cjs.HavenApiError)) return void 0;
+  if (!(err instanceof chunkH37YVYZA_cjs.HavenApiError)) return void 0;
   const body = err.body;
   if (body === null || typeof body !== "object" || Array.isArray(body)) return void 0;
   const reason = body.reason;
@@ -3037,7 +3079,7 @@ function parseMerchantSettlement(header) {
 }
 function parseProtocolReceiptHeader(value) {
   try {
-    return chunkZDKNPNI3_cjs.decodeBase64Json(value);
+    return chunk22FJ4JQO_cjs.decodeBase64Json(value);
   } catch {
     try {
       return JSON.parse(value);
@@ -3054,7 +3096,7 @@ function x402TypedDataDigest(typedData) {
   try {
     return viem.hashTypedData(typedData);
   } catch (err) {
-    throw new chunk4Z6ATE44_cjs.HavenSigningError(
+    throw new chunkH37YVYZA_cjs.HavenSigningError(
       `The x402 funding intent carried a sign_data.typed_data that is not a valid EIP-712 payload (needs domain, types, primaryType, message), so its digest cannot be derived and no signer could accept it. Underlying error: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -3084,6 +3126,9 @@ function mapCatalogEntry(entry) {
     priceAtomic: entry.price_atomic,
     asset: entry.asset,
     network: entry.network,
+    // #3839: conditional like `merchant` — absent (not null) when the backend
+    // does not send the field, so an older backend's exact shape is unchanged.
+    ...entry.asset_transfer_methods !== void 0 ? { assetTransferMethods: entry.asset_transfer_methods } : {},
     status: entry.status,
     verifiedAt: entry.verified_at,
     source: entry.source,
@@ -3166,7 +3211,7 @@ var HavenClient = class {
     this.x402Wallet = config.x402Wallet;
     this.egressPolicy = config.merchantEgress;
     this.merchantTransport = new McpMerchantTransport({ merchantTimeout: config.merchantTimeout, egress: config.merchantEgress });
-    this.confirmationTimeout = config.confirmationTimeout ?? chunk4Z6ATE44_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS;
+    this.confirmationTimeout = config.confirmationTimeout ?? chunkH37YVYZA_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS;
     this.pollingInterval = config.pollingInterval ?? DEFAULT_POLLING_INTERVAL;
     this.chainRpcs = config.chainRpcs ?? {};
     if (this.delegateKey) {
@@ -3247,7 +3292,7 @@ var HavenClient = class {
    */
   async pay(request) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "Cannot use pay() without a delegateKey. Use createIntent() + submitSignature() for manual signing."
       );
     }
@@ -3303,15 +3348,15 @@ var HavenClient = class {
    * on-chain allowance — there is nothing to sign until the user approves.
    */
   async createX402Intent(paymentRequired, options = {}) {
-    const option = chunkZDKNPNI3_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+    const option = chunk22FJ4JQO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
     if (!option) {
       throw noCompatiblePaymentOptionError(paymentRequired.accepts);
     }
     const fundingTo = options.delegateAddress ?? (await this.getAgent()).delegateAddress;
     if (!fundingTo) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("Authenticated agent has no delegate address registered.", 502);
+      throw new chunkH37YVYZA_cjs.HavenApiError("Authenticated agent has no delegate address registered.", 502);
     }
-    const idempotencyKey = options.idempotencyKey ?? chunkZDKNPNI3_cjs.buildX402IdempotencyKey(paymentRequired, option);
+    const idempotencyKey = options.idempotencyKey ?? chunk22FJ4JQO_cjs.buildX402IdempotencyKey(paymentRequired, option);
     const raw = await this.post("/x402", {
       url: paymentRequired.resource.url,
       payTo: fundingTo,
@@ -3322,7 +3367,7 @@ var HavenClient = class {
       // of a silent reroute to the erc7710 settlement branch (the #1358
       // review's open-budget misroute). Legacy-rail backends ignore the field.
       settlementScheme: "eip3009",
-      amount: chunkZDKNPNI3_cjs.x402AuthorizationAmount(option),
+      amount: chunk22FJ4JQO_cjs.x402AuthorizationAmount(option),
       asset: option.asset,
       network: option.network,
       description: paymentRequired.resource.description,
@@ -3347,15 +3392,15 @@ var HavenClient = class {
       throwPaymentStateError("x402 payment", raw);
     }
     if (!raw.sign_data?.hash) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
+      throw new chunkH37YVYZA_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
     }
     if (raw.sign_data.signature_scheme !== void 0 && !raw.sign_data.typed_data) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         `This account's x402 funding intent declares signature scheme '${raw.sign_data.signature_scheme}' but carried no typed_data to sign. Refusing to fall back to the bare hash \u2014 the account would reject that signature on-chain. This is a backend contract violation; report it rather than working around it.`
       );
     }
     if (!raw.x402_expected_auth) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("No x402 expected-context binding returned from x402/authorize", 500, raw);
+      throw new chunkH37YVYZA_cjs.HavenApiError("No x402 expected-context binding returned from x402/authorize", 500, raw);
     }
     return {
       paymentId: raw.payment_id,
@@ -3366,7 +3411,7 @@ var HavenClient = class {
       accepted: option,
       resourceUrl: paymentRequired.resource.url,
       merchantTo: raw.merchant_to ?? option.payTo,
-      amountAtomic: chunkZDKNPNI3_cjs.x402AuthorizationAmount(option),
+      amountAtomic: chunk22FJ4JQO_cjs.x402AuthorizationAmount(option),
       asset: option.asset,
       network: option.network,
       expectedAuth: raw.x402_expected_auth,
@@ -3391,13 +3436,13 @@ var HavenClient = class {
    */
   sign(hash) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "Cannot sign without a delegateKey. Pass the private key in HavenClient config, or sign externally."
       );
     }
     const signature = signHash(this.delegateKey, hash);
     if (!verifySignature(hash, signature, this.delegateAddress)) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "Local signature verification failed \u2014 recovered address does not match delegate key."
       );
     }
@@ -3415,29 +3460,29 @@ var HavenClient = class {
    */
   async signForData(signData, settlementExpectation, fundingExpectation) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "Cannot sign without a delegateKey. Pass the private key in HavenClient config, or sign externally."
       );
     }
     const scheme = signData.signature_scheme;
     if (scheme === "eip191_userop") {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "The session rail is retired \u2014 'eip191_userop' intents can no longer be signed. Re-onboard the account on the delegation rail."
       );
     }
     if (scheme === "eip712_userop") {
       if (!signData.typed_data) {
-        throw new chunk4Z6ATE44_cjs.HavenSigningError(
+        throw new chunkH37YVYZA_cjs.HavenSigningError(
           "sign_data.signature_scheme is eip712_userop but typed_data is missing \u2014 refusing to sign the bare hash (the account would reject it)."
         );
       }
-      chunk4Z6ATE44_cjs.assertUserOpTypedDataBinding(signData.typed_data, signData.hash);
-      chunkZDKNPNI3_cjs.assertBoundDirectPaymentUserOp(
+      chunkH37YVYZA_cjs.assertUserOpTypedDataBinding(signData.typed_data, signData.hash);
+      chunk22FJ4JQO_cjs.assertBoundDirectPaymentUserOp(
         signData.typed_data,
         this.delegateAddress
       );
       if (fundingExpectation) {
-        chunkZDKNPNI3_cjs.assertFundingLegPaysDelegate(signData.typed_data, {
+        chunk22FJ4JQO_cjs.assertFundingLegPaysDelegate(signData.typed_data, {
           delegateAddress: this.delegateAddress,
           asset: fundingExpectation.asset,
           amount: fundingExpectation.amount
@@ -3447,24 +3492,24 @@ var HavenClient = class {
     }
     if (scheme === "eip712_delegation") {
       if (!signData.typed_data) {
-        throw new chunk4Z6ATE44_cjs.HavenSigningError(
+        throw new chunkH37YVYZA_cjs.HavenSigningError(
           "sign_data.signature_scheme is eip712_delegation but typed_data is missing \u2014 refusing to sign the bare hash (the settlement would be rejected on redemption)."
         );
       }
       if (!settlementExpectation) {
-        throw new chunkZDKNPNI3_cjs.HavenTypedDataRefusedError(
+        throw new chunk22FJ4JQO_cjs.HavenTypedDataRefusedError(
           "Refusing to sign an x402 settlement child without an independent expectation of what it must pay (the merchant's 402). Pay erc7710 merchants through settleX402Erc7710(), which supplies it."
         );
       }
-      chunkZDKNPNI3_cjs.assertOwnSettlementChild(signData.typed_data, settlementExpectation, this.delegateAddress);
+      chunk22FJ4JQO_cjs.assertOwnSettlementChild(signData.typed_data, settlementExpectation, this.delegateAddress);
       return signSettlementDelegationTypedData(this.delegateKey, signData.typed_data);
     }
     if (scheme === void 0) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "sign_data.signature_scheme is required \u2014 the legacy AllowanceModule rail that signed the bare hash is retired (#2850). Refusing to guess a signing scheme."
       );
     }
-    throw new chunk4Z6ATE44_cjs.HavenSigningError(
+    throw new chunkH37YVYZA_cjs.HavenSigningError(
       `Unknown sign_data.signature_scheme '${scheme}' \u2014 refusing to guess a signing scheme. Update @haven_ai/sdk.`
     );
   }
@@ -3654,7 +3699,7 @@ var HavenClient = class {
    */
   async getPaymentStatusWithPostPurchaseAllowance(paymentId) {
     const status = await this.getPaymentStatus(paymentId);
-    if (status.rail === chunk4Z6ATE44_cjs.AgentPaymentRail.X402 && status.phase === chunk4Z6ATE44_cjs.AgentPaymentPhase.PaymentConfirmed) {
+    if (status.rail === chunkH37YVYZA_cjs.AgentPaymentRail.X402 && status.phase === chunkH37YVYZA_cjs.AgentPaymentPhase.PaymentConfirmed) {
       const { allowance, warnings } = await this.getPostPurchaseAllowanceSummary(paymentId);
       return { ...status, allowance, ...warnings.length > 0 ? { warnings } : {} };
     }
@@ -3904,7 +3949,7 @@ var HavenClient = class {
       }
       await sleep(this.pollingInterval);
     }
-    throw new chunk4Z6ATE44_cjs.HavenTimeoutError(paymentId);
+    throw new chunkH37YVYZA_cjs.HavenTimeoutError(paymentId);
   }
   // ── x402 Protocol Support ────────────────────────────────────────
   /**
@@ -3918,24 +3963,24 @@ var HavenClient = class {
    */
   async authorizeX402(paymentRequired, options = {}) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "delegateKey is required for x402 payments. Pass it in the HavenClient config."
       );
     }
     if (!this.delegateAddress) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
+      throw new chunkH37YVYZA_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
     }
-    const option = chunkZDKNPNI3_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+    const option = chunk22FJ4JQO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
     if (!option) {
       throw noCompatiblePaymentOptionError(paymentRequired.accepts);
     }
-    const idempotencyKey = options.idempotencyKey ?? chunkZDKNPNI3_cjs.buildX402IdempotencyKey(paymentRequired, option);
+    const idempotencyKey = options.idempotencyKey ?? chunk22FJ4JQO_cjs.buildX402IdempotencyKey(paymentRequired, option);
     const cached = this.fundingLeg.cachedReceipt(idempotencyKey, options.taskBudgetId, options.subBudgetId);
     if (cached) return cached;
     const inFlight = this.inFlightX402.get(idempotencyKey);
     if (inFlight) {
       if (!sameX402TaskBudget(this.inFlightX402TaskBudget.get(idempotencyKey), options.taskBudgetId) || !sameX402TaskBudget(this.inFlightX402SubBudget.get(idempotencyKey), options.subBudgetId)) {
-        throw new chunk4Z6ATE44_cjs.X402TaskBudgetMismatchError(
+        throw new chunkH37YVYZA_cjs.X402TaskBudgetMismatchError(
           `The x402 idempotency key '${idempotencyKey}' has an in-flight payment created under a different authorizing budget (task '${this.inFlightX402TaskBudget.get(idempotencyKey) ?? "none"}' vs '${options.taskBudgetId ?? "none"}', sub '${this.inFlightX402SubBudget.get(idempotencyKey) ?? "none"}' vs '${options.subBudgetId ?? "none"}'). Pass a new idempotencyKey to pay under this budget.`,
           idempotencyKey,
           this.inFlightX402TaskBudget.get(idempotencyKey),
@@ -3990,16 +4035,16 @@ var HavenClient = class {
         if (err instanceof MerchantEgressResponseCapError) throw err;
         body = void 0;
       }
-      throw new chunk4Z6ATE44_cjs.X402UnexpectedStatusError(
+      throw new chunkH37YVYZA_cjs.X402UnexpectedStatusError(
         `Expected an x402 quote response with HTTP 402, got HTTP ${response.status}.`,
         response.status || 400,
         body
       );
     }
     if (response.headers.get("MACHINE-PAYMENT-CHALLENGE")) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError("quoteX402 only supports standard x402 Payment Required responses.", 400);
+      throw new chunkH37YVYZA_cjs.HavenApiError("quoteX402 only supports standard x402 Payment Required responses.", 400);
     }
-    const paymentRequired = await chunkZDKNPNI3_cjs.parsePaymentRequiredResponse(response);
+    const paymentRequired = await chunk22FJ4JQO_cjs.parsePaymentRequiredResponse(response);
     const mcpTransport = await this.merchantTransport.detect(url, paymentRequired, response);
     return buildX402Quote(paymentRequired, request, options.idempotencyKey, mcpTransport);
   }
@@ -4017,7 +4062,7 @@ var HavenClient = class {
     const wallet = await this.merchantCompletion.resolveWalletForMerchantCall();
     const sessionId = await this.merchantTransport.initialize(url, init, wallet);
     if (!sessionId) {
-      throw new chunk4Z6ATE44_cjs.HavenApiError(
+      throw new chunkH37YVYZA_cjs.HavenApiError(
         "The merchant did not establish an MCP session before the x402 quote. No payment was created.",
         502,
         { mcpSessionNotEstablished: true }
@@ -4091,18 +4136,18 @@ var HavenClient = class {
   }
   async resumeAuthorizedX402(input) {
     if (!this.delegateKey) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError(
+      throw new chunkH37YVYZA_cjs.HavenSigningError(
         "delegateKey is required for x402 payments. Pass it in the HavenClient config."
       );
     }
     if (!this.delegateAddress) {
-      throw new chunk4Z6ATE44_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
+      throw new chunkH37YVYZA_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
     }
-    const option = chunkZDKNPNI3_cjs.selectStandardPaymentOption(input.paymentRequired.accepts);
+    const option = chunk22FJ4JQO_cjs.selectStandardPaymentOption(input.paymentRequired.accepts);
     if (!option) {
       throw noCompatiblePaymentOptionError(input.paymentRequired.accepts);
     }
-    const idempotencyKey = input.idempotencyKey ?? chunkZDKNPNI3_cjs.buildX402IdempotencyKey(input.paymentRequired, option);
+    const idempotencyKey = input.idempotencyKey ?? chunk22FJ4JQO_cjs.buildX402IdempotencyKey(input.paymentRequired, option);
     const cached = this.fundingLeg.cachedReceipt(idempotencyKey, input.taskBudgetId);
     if (cached) return cached;
     const status = await this.getPaymentStatus(input.paymentId);
@@ -4110,16 +4155,16 @@ var HavenClient = class {
     const canFund = await this.fundingLeg.delegateCanFund(
       status.chainId ?? chainIdFromNetwork(option.network),
       option.asset,
-      chunkZDKNPNI3_cjs.x402AuthorizationAmount(option)
+      chunk22FJ4JQO_cjs.x402AuthorizationAmount(option)
     );
     if (canFund === false) {
-      throw new chunk4Z6ATE44_cjs.X402AlreadySettledError(
+      throw new chunkH37YVYZA_cjs.X402AlreadySettledError(
         `x402 payment ${status.paymentId} has already settled \u2014 the delegate no longer holds the funds to authorize it again, so there is nothing left to resume.`,
         this.fundingLeg.receiptFromStatus(input.paymentRequired, option, void 0, status),
         "settled"
       );
     }
-    const paymentHeader = await this.fundingLeg.createPaymentHeader(input.paymentRequired, option);
+    const paymentHeader = await this.fundingLeg.createPaymentHeader(input.paymentRequired, option, status.paymentId);
     const receipt = this.fundingLeg.receiptFromStatus(input.paymentRequired, option, paymentHeader, status);
     this.fundingLeg.cacheReceipt(idempotencyKey, paymentHeader, receipt, input.taskBudgetId);
     return receipt;
@@ -4134,13 +4179,13 @@ var HavenClient = class {
     const url = input.url ?? input.request?.url;
     if (!paymentRequired) {
       if (!url) {
-        throw new chunk4Z6ATE44_cjs.HavenApiError("x402 resume requires the original URL or a captured request snapshot.", 400);
+        throw new chunkH37YVYZA_cjs.HavenApiError("x402 resume requires the original URL or a captured request snapshot.", 400);
       }
       const response = await this.merchantTransport.fetch(url, initialInit, this.merchantTransport.budgetFor("quote"), this.merchantTransport.capFor("quote"));
       if (response.status !== 402) {
-        throw new chunk4Z6ATE44_cjs.HavenApiError("Expected the original x402 request to return HTTP 402 before resuming.", 400);
+        throw new chunkH37YVYZA_cjs.HavenApiError("Expected the original x402 request to return HTTP 402 before resuming.", 400);
       }
-      paymentRequired = await chunkZDKNPNI3_cjs.parsePaymentRequiredResponse(response);
+      paymentRequired = await chunk22FJ4JQO_cjs.parsePaymentRequiredResponse(response);
     }
     const receipt = await this.resumeAuthorizedX402({
       paymentId: input.paymentId,
@@ -4193,7 +4238,7 @@ var HavenClient = class {
       nativeChallenge = true;
     } else {
       try {
-        paymentRequired = await chunkZDKNPNI3_cjs.parsePaymentRequiredResponse(response);
+        paymentRequired = await chunk22FJ4JQO_cjs.parsePaymentRequiredResponse(response);
       } catch (err) {
         if (err instanceof MerchantEgressResponseCapError) throw err;
         return response;
@@ -4204,8 +4249,8 @@ var HavenClient = class {
       if (mcpSessionId) requestInit = this.merchantTransport.withSessionHeaders(requestInit, mcpSessionId);
     }
     const request = snapshotX402Request(url, requestInit);
-    const option = chunkZDKNPNI3_cjs.selectStandardPaymentOption(paymentRequired.accepts);
-    const idempotencyKey = options.idempotencyKey ?? (option ? chunkZDKNPNI3_cjs.buildX402IdempotencyKey(paymentRequired, option) : void 0);
+    const option = chunk22FJ4JQO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+    const idempotencyKey = options.idempotencyKey ?? (option ? chunk22FJ4JQO_cjs.buildX402IdempotencyKey(paymentRequired, option) : void 0);
     let receipt;
     try {
       receipt = await this.authorizeX402(paymentRequired, options);
@@ -4333,7 +4378,7 @@ var HavenClient = class {
           txHash: evidenceTxHash,
           resourceUrl: evidenceContext.resourceUrl,
           merchantStatus: surfaced.status,
-          paymentProofHeaderName: chunkZDKNPNI3_cjs.x402PaymentHeaderNamesSent(input.paymentHeader),
+          paymentProofHeaderName: chunk22FJ4JQO_cjs.x402PaymentHeaderNamesSent(input.paymentHeader),
           paymentProofHeader: input.paymentHeader,
           protocolReceiptHeaderName,
           protocolReceiptHeader,
@@ -4452,7 +4497,7 @@ var HavenClient = class {
     try {
       raw = await this.get(`/x402/by-idempotency-key/${encodeURIComponent(key)}`);
     } catch (err) {
-      if (err instanceof chunk4Z6ATE44_cjs.HavenApiError && err.statusCode === 404) return null;
+      if (err instanceof chunkH37YVYZA_cjs.HavenApiError && err.statusCode === 404) return null;
       throw err;
     }
     return {
@@ -4587,6 +4632,7 @@ function sleep(ms) {
 function composeDescription(d) {
   return [d.summary, d.selectionGuidance, d.behavior, d.nextActionGuidance].filter(Boolean).join(" ");
 }
+var FUNDING_LEG_DISCOVERY_GUIDANCE = `funding_leg_expected is a catalog hint: among equivalent entries prefer false (erc7710, no funding leg); "unknown" is no preference; never hide true entries. A recipient-pinned budget can pay erc7710 merchants only. The quote's expected_funding_leg is authoritative.`;
 var toolDescriptions = {
   quoteX402: {
     summary: "Inspect an HTTP 402 x402 paid resource without creating a Haven payment, signature, approval, or on-chain transaction.",
@@ -4671,7 +4717,7 @@ var toolDescriptions = {
   discoverTools: {
     summary: "Step 1 of a purchase: discover payable services from Haven's curated merchant catalog \u2014 names, prices, the next call.",
     selectionGuidance: "Use this when the user asks what the agent can buy, pay for, or which paid services exist \u2014 or when you need a resource URL for a service the user described. Use verified=verified for entries Haven watched pass a live quote probe (operator-curated or self-submitted) \u2014 domain_verified is the only ownership claim; never treat these badges as proof of merchant honesty, quality, or reliability. Do NOT use for balance, budget, or spend-limit questions \u2014 use haven_get_allowances. Do NOT use to pay \u2014 each returned entry names the next tool to call.",
-    behavior: "Use each entry's suggested_tool + suggested_arguments first; an entry without them says why. Read-only lookup against Haven's curated catalog; entries are periodically re-verified against the live merchant and degraded entries are flagged. Use category for a case-insensitive category filter (for example, VPN or vpn), or search for a product name, category, or description term. Returns name, description, price, rail, resource URL, tool_name, tool_arguments, the hint, and the provenance badges source/domain_verified/verified_payable. The catalog price (price_display/price_atomic, marked price_is_indicative) is a last-verified hint, NOT authoritative \u2014 the real price comes from the merchant's live 402 at pay time. Never creates a payment, signature, or approval.",
+    behavior: "Use each entry's suggested_tool + suggested_arguments first; an entry without them says why. Read-only lookup against Haven's curated catalog; entries are periodically re-verified against the live merchant and degraded entries are flagged. Use category for a case-insensitive category filter (for example, VPN or vpn), or search for a product name, category, or description term. Returns name, description, price, rail, resource URL, tool_name, tool_arguments, the hint, and the provenance badges source/domain_verified/verified_payable. " + FUNDING_LEG_DISCOVERY_GUIDANCE + " The catalog price (price_display/price_atomic, marked price_is_indicative) is a last-verified hint, NOT authoritative \u2014 the real price comes from the merchant's live 402 at pay time. Never creates a payment, signature, or approval.",
     nextActionGuidance: `Call suggested_tool with suggested_arguments VERBATIM (no hint: read suggested_tool_omitted_reason). Confirm the price from the live quote or pay result, not the catalog; if the next tool takes a cap, pass the user's cap as max_amount_human in whole tokens ("no more than 1 USDC" \u2192 max_amount_human: "1"), never atomic units by hand.`
   },
   submitCatalogEntry: {
@@ -4913,9 +4959,17 @@ var havenTools = {
   openai: openaiTools
 };
 
+// src/catalog-funding-leg.ts
+function catalogFundingLegExpected(assetTransferMethods) {
+  if (typeof assetTransferMethods !== "string") return "unknown";
+  const methods = assetTransferMethods.split(",").map((method) => method.trim()).filter((method) => method.length > 0);
+  if (methods.length === 0) return "unknown";
+  return !methods.includes("erc7710");
+}
+
 // src/agent-guidance.ts
 var AGENT_SECRET_HYGIENE_SENTENCE = "Do not print private keys, API keys, credential file contents, or config secrets in chat or logs.";
-var AGENT_CLIENT_UPDATE_SENTENCE = "If a Haven result carries `client_update`, that client is out of date: run its `upgrade_command` as given, then any repair line it prints, then retry. `required: true` means payments are refused until you do.";
+var AGENT_CLIENT_UPDATE_SENTENCE = "If a Haven result carries `client_update`, that client is out of date: run its `upgrade_command` exactly as given \u2014 a connector command may name your pair with `--name <slug>` \u2014 then any repair line it prints, then retry. `required: true` means payments are refused until you do.";
 var AGENT_LOCAL_KEY_SENTENCE = "The Haven connector generates the signing key locally and sends Haven only the public signing address plus proof.";
 var AGENT_NETWORK_ACCESS_SENTENCE = "Network access is expected: this command downloads the npm package and contacts the Haven API, so if your environment is sandboxed, run it with network access enabled or request network access escalation; that changes the execution environment, not the command, and is not a command modification.";
 var AGENT_JSON_MODE_SENTENCE = "If you are an AI agent running this command yourself rather than a human pasting it, you should append --json: the connector then emits one machine-readable, secret-free result object on stdout with progress on stderr, and returns promptly instead of blocking while it waits for the budget approval.";
@@ -4963,7 +5017,7 @@ haven budget grant <agentId> --amount <n> --token USDC --period <minutes> [--rec
 haven budget revoke <agentId> <delegationHash> [--wait]
 \`\`\`
 
-The CLI never signs: it prints a dashboard link, your user opens it and signs with their passkey or wallet. \`--wait\` polls until the human's signature lands. The hash for \`revoke\` is in \`haven agents show <agentId>\`.
+The CLI never signs: it prints a dashboard link, your user opens it and signs with their passkey or wallet. \`--wait\` polls until the human's signature lands. The hash for \`revoke\` is in \`haven budget show <agentId> --hashes\`.
 
 ## Hand-off scripts
 
@@ -5305,7 +5359,25 @@ the FINAL URL after redirects \u2014 and retry the merchant with the
 \`SIGN-IN-WITH-X\` header it returns: the delegate
 wallet signs in as the wallet that paid, moving no funds. NEVER follow a
 redirect with \`SIGN-IN-WITH-X\` (or a resulting session token) attached; if
-the final origin differs, re-sign there. On THIS path Haven never sends the
+the final origin differs, re-sign there.
+
+Sign in BEFORE a multi-call flow: if a merchant documents or offers a
+sign-in session (its docs, or a 402 whose \`sign-in-with-x\` extension names
+a free sign-in route), do not pay call by call. Send the unsigned sign-in
+request yourself, take the \`sign-in-with-x\` extension from its 402, and
+call \`mcp__haven-signer__haven_sign_siwx\` with it. The session token (often
+about 2 h) waives the merchant's micro-fees, so make every now-free call
+YOURSELF with the \`SIGN-IN-WITH-X\` header set \u2014 never pass a merchant
+session token to \`mcp__haven__haven_quote_x402\` or
+\`mcp__haven__haven_pay_x402_quote\` (their unpaid probe refuses a 200 with
+X402_PROBE_NOT_PAYMENT_REQUIRED) \u2014 and pay only where the merchant still
+charges (on Bitrefill, \`invoice/pay\`; keep sending the session token
+there). Sign at the FINAL URL after redirects, and never forward
+\`SIGN-IN-WITH-X\` or a session token across a redirect. If the signer's
+tools/list has no \`haven_sign_siwx\` (a signer older than 0.9.0-alpha.0),
+or the sign-in is refused, pay each call normally instead.
+
+On THIS path Haven never sends the
 paid request (it sends only unpaid probes):
 on the **EIP-3009** scheme (the pay result names
 \`mcp__haven-signer__haven_sign_x402\`), that tool returns both
@@ -5424,6 +5496,20 @@ check on in-flight payments. Do not poll in a tight loop.
   reports a missing or invalid credential, tell the user to re-run the Haven
   connector command.
 
+## Stale tool list
+
+Every hosted Haven result carries \`contract_fingerprint\` and
+\`server_version\` at the top level of its JSON. If a result's
+\`contract_fingerprint\` differs from the one in the server instructions you
+loaded at connect, or a \`next_arguments\` doesn't fit the schema you loaded
+for the hosted tool it names, your tool list is stale \u2014 reconnect or restart
+the session before continuing, and never hand-build or reshape a payload to
+make it fit; defer to the live schema and the \`next_arguments\` Haven returns.
+(A misfit on a signer tool is signer skew, not a stale list.) If a payment is
+already prepared or funded, keep its \`payment_id\`: after reconnecting,
+resume through \`haven_get_payment_status\` or \`haven_resume_x402_payment\`
+(\`haven_sweep_delegate\` for a stranded bridge balance). Never pay again.
+
 ## Failure handling
 
 Haven tool failures are shaped like \`{ success: false, code, message, ... }\`
@@ -5448,7 +5534,9 @@ fields a success does; follow them first, then branch on \`code\` and surface
   "cannot settle right now" signal (a 503 \`merchant_not_ready\` with a
   \`reason_code\`) instead of a 402. No payment was created. Tell the user;
   retry later (the message carries \`retry_after_s\` when the merchant gave
-  one) \u2014 this is not a wrong or broken endpoint.
+  one) \u2014 this is not a wrong or broken endpoint. An out-of-gas refusal
+  (\`settlement_wallet_out_of_gas\`) needs the merchant's operator to top up
+  its settlement wallet first; retrying before then is refused again.
 - \`MERCHANT_REJECTED_AFTER_FUNDING\`: the merchant refused the paid retry.
   On eip3009 (\`rail\` not \`erc7710\`): Stop-and-sweep \u2014 stop retrying the
   merchant and use \`mcp__haven__haven_sweep_delegate\` to recover stranded
@@ -5576,7 +5664,7 @@ async function discoverMerchantMcpUrl(inputUrl, egress) {
     } catch (err) {
       if (err instanceof MerchantEgressRefusedError || err instanceof MerchantEgressResponseCapError) throw err;
       if (isBodyPhaseTimeout(err)) {
-        throw new chunk4Z6ATE44_cjs.MerchantTimeoutError(`Merchant discovery document read timed out after ${timeoutMs}ms.`);
+        throw new chunkH37YVYZA_cjs.MerchantTimeoutError(`Merchant discovery document read timed out after ${timeoutMs}ms.`);
       }
       continue;
     }
@@ -5595,491 +5683,499 @@ function sameUrl(a, b) {
 
 Object.defineProperty(exports, "DEFAULT_NEXT_TOOL_BY_ACTION", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.DEFAULT_NEXT_TOOL_BY_ACTION; }
+  get: function () { return chunk22FJ4JQO_cjs.DEFAULT_NEXT_TOOL_BY_ACTION; }
 });
 Object.defineProperty(exports, "ERC7710_ASSET_TRANSFER_METHOD", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.ERC7710_ASSET_TRANSFER_METHOD; }
+  get: function () { return chunk22FJ4JQO_cjs.ERC7710_ASSET_TRANSFER_METHOD; }
 });
 Object.defineProperty(exports, "HAVEN_CLIENT_HEADER", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.HAVEN_CLIENT_HEADER; }
+  get: function () { return chunk22FJ4JQO_cjs.HAVEN_CLIENT_HEADER; }
 });
 Object.defineProperty(exports, "HAVEN_MINIMUM_NODE_VERSION", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.HAVEN_MINIMUM_NODE_VERSION; }
+  get: function () { return chunk22FJ4JQO_cjs.HAVEN_MINIMUM_NODE_VERSION; }
 });
 Object.defineProperty(exports, "HavenTypedDataRefusedError", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.HavenTypedDataRefusedError; }
+  get: function () { return chunk22FJ4JQO_cjs.HavenTypedDataRefusedError; }
 });
 Object.defineProperty(exports, "MAX_TASK_BUDGET_TTL_SECONDS", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.MAX_TASK_BUDGET_TTL_SECONDS; }
+  get: function () { return chunk22FJ4JQO_cjs.MAX_TASK_BUDGET_TTL_SECONDS; }
 });
 Object.defineProperty(exports, "NEXT_TOOL_SERVER_NAMES", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.NEXT_TOOL_SERVER_NAMES; }
+  get: function () { return chunk22FJ4JQO_cjs.NEXT_TOOL_SERVER_NAMES; }
 });
 Object.defineProperty(exports, "NEXT_TOOL_SERVER_ROLES", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.NEXT_TOOL_SERVER_ROLES; }
+  get: function () { return chunk22FJ4JQO_cjs.NEXT_TOOL_SERVER_ROLES; }
 });
 Object.defineProperty(exports, "SDK_CLIENT_IDENTITY", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.SDK_CLIENT_IDENTITY; }
+  get: function () { return chunk22FJ4JQO_cjs.SDK_CLIENT_IDENTITY; }
 });
 Object.defineProperty(exports, "SDK_VERSION", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.SDK_VERSION; }
+  get: function () { return chunk22FJ4JQO_cjs.SDK_VERSION; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_CHAIN_ID", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.SWEEP_BASE_CHAIN_ID; }
+  get: function () { return chunk22FJ4JQO_cjs.SWEEP_BASE_CHAIN_ID; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_SEPOLIA_CHAIN_ID", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.SWEEP_BASE_SEPOLIA_CHAIN_ID; }
+  get: function () { return chunk22FJ4JQO_cjs.SWEEP_BASE_SEPOLIA_CHAIN_ID; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_SEPOLIA_USDC_ADDRESS", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.SWEEP_BASE_SEPOLIA_USDC_ADDRESS; }
+  get: function () { return chunk22FJ4JQO_cjs.SWEEP_BASE_SEPOLIA_USDC_ADDRESS; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_USDC_ADDRESS", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.SWEEP_BASE_USDC_ADDRESS; }
+  get: function () { return chunk22FJ4JQO_cjs.SWEEP_BASE_USDC_ADDRESS; }
 });
 Object.defineProperty(exports, "TRANSFER_WITH_AUTHORIZATION_TYPES", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.TRANSFER_WITH_AUTHORIZATION_TYPES; }
+  get: function () { return chunk22FJ4JQO_cjs.TRANSFER_WITH_AUTHORIZATION_TYPES; }
 });
 Object.defineProperty(exports, "TYPED_DATA_NOT_ALLOWED", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.TYPED_DATA_NOT_ALLOWED; }
+  get: function () { return chunk22FJ4JQO_cjs.TYPED_DATA_NOT_ALLOWED; }
 });
 Object.defineProperty(exports, "X402PaymentHeaderValidationError", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402PaymentHeaderValidationError; }
+  get: function () { return chunk22FJ4JQO_cjs.X402PaymentHeaderValidationError; }
 });
 Object.defineProperty(exports, "X402_LEGACY_PAYMENT_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_LEGACY_PAYMENT_HEADER_NAME; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_LEGACY_PAYMENT_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_MAX_AUTHORIZATION_WINDOW_SECONDS", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_MAX_AUTHORIZATION_WINDOW_SECONDS; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_MAX_AUTHORIZATION_WINDOW_SECONDS; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_PAYMENT_HEADER_NAME; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_PAYMENT_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_HEADER_NAMES_SENT", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_PAYMENT_HEADER_NAMES_SENT; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_PAYMENT_HEADER_NAMES_SENT; }
+});
+Object.defineProperty(exports, "X402_PAYMENT_NONCE_TAG", {
+  enumerable: true,
+  get: function () { return chunk22FJ4JQO_cjs.X402_PAYMENT_NONCE_TAG; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_REQUIRED_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_PAYMENT_REQUIRED_HEADER_NAME; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_PAYMENT_REQUIRED_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_RESPONSE_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_PAYMENT_RESPONSE_HEADER_NAME; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_PAYMENT_RESPONSE_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_SETTLEMENT_FORWARD_MARGIN_SECONDS", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.X402_SETTLEMENT_FORWARD_MARGIN_SECONDS; }
+  get: function () { return chunk22FJ4JQO_cjs.X402_SETTLEMENT_FORWARD_MARGIN_SECONDS; }
 });
 Object.defineProperty(exports, "assertBoundDirectPaymentUserOp", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.assertBoundDirectPaymentUserOp; }
+  get: function () { return chunk22FJ4JQO_cjs.assertBoundDirectPaymentUserOp; }
 });
 Object.defineProperty(exports, "assertOwnTaskBudgetCloseUserOp", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.assertOwnTaskBudgetCloseUserOp; }
+  get: function () { return chunk22FJ4JQO_cjs.assertOwnTaskBudgetCloseUserOp; }
 });
 Object.defineProperty(exports, "assertOwnTaskChild", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.assertOwnTaskChild; }
+  get: function () { return chunk22FJ4JQO_cjs.assertOwnTaskChild; }
 });
 Object.defineProperty(exports, "buildSweepAuthorizationMessage", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.buildSweepAuthorizationMessage; }
+  get: function () { return chunk22FJ4JQO_cjs.buildSweepAuthorizationMessage; }
 });
 Object.defineProperty(exports, "buildSweepTypedData", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.buildSweepTypedData; }
+  get: function () { return chunk22FJ4JQO_cjs.buildSweepTypedData; }
 });
 Object.defineProperty(exports, "buildX402ExpectedMessage", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.buildX402ExpectedMessage; }
+  get: function () { return chunk22FJ4JQO_cjs.buildX402ExpectedMessage; }
 });
 Object.defineProperty(exports, "compareNodeVersions", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.compareNodeVersions; }
+  get: function () { return chunk22FJ4JQO_cjs.compareNodeVersions; }
 });
 Object.defineProperty(exports, "createNextStepBuilder", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.createNextStepBuilder; }
+  get: function () { return chunk22FJ4JQO_cjs.createNextStepBuilder; }
 });
 Object.defineProperty(exports, "decodeBase64Json", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.decodeBase64Json; }
+  get: function () { return chunk22FJ4JQO_cjs.decodeBase64Json; }
 });
 Object.defineProperty(exports, "decodeBase64Utf8", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.decodeBase64Utf8; }
+  get: function () { return chunk22FJ4JQO_cjs.decodeBase64Utf8; }
 });
 Object.defineProperty(exports, "defaultNextToolFor", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.defaultNextToolFor; }
+  get: function () { return chunk22FJ4JQO_cjs.defaultNextToolFor; }
+});
+Object.defineProperty(exports, "deriveX402PaymentNonce", {
+  enumerable: true,
+  get: function () { return chunk22FJ4JQO_cjs.deriveX402PaymentNonce; }
 });
 Object.defineProperty(exports, "encodeBase64Json", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.encodeBase64Json; }
+  get: function () { return chunk22FJ4JQO_cjs.encodeBase64Json; }
 });
 Object.defineProperty(exports, "encodeBase64Utf8", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.encodeBase64Utf8; }
+  get: function () { return chunk22FJ4JQO_cjs.encodeBase64Utf8; }
 });
 Object.defineProperty(exports, "encodePaymentProof", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.encodePaymentProof; }
+  get: function () { return chunk22FJ4JQO_cjs.encodePaymentProof; }
 });
 Object.defineProperty(exports, "hashDelegation", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.hashDelegation; }
+  get: function () { return chunk22FJ4JQO_cjs.hashDelegation; }
 });
 Object.defineProperty(exports, "havenClientIdentity", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.havenClientIdentity; }
+  get: function () { return chunk22FJ4JQO_cjs.havenClientIdentity; }
 });
 Object.defineProperty(exports, "isErc7710Option", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.isErc7710Option; }
+  get: function () { return chunk22FJ4JQO_cjs.isErc7710Option; }
 });
 Object.defineProperty(exports, "isSupportedNodeVersion", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.isSupportedNodeVersion; }
+  get: function () { return chunk22FJ4JQO_cjs.isSupportedNodeVersion; }
 });
 Object.defineProperty(exports, "isSweepableChain", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.isSweepableChain; }
+  get: function () { return chunk22FJ4JQO_cjs.isSweepableChain; }
 });
 Object.defineProperty(exports, "isTaskChildTypedData", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.isTaskChildTypedData; }
+  get: function () { return chunk22FJ4JQO_cjs.isTaskChildTypedData; }
 });
 Object.defineProperty(exports, "normalizePaymentRequired", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.normalizePaymentRequired; }
+  get: function () { return chunk22FJ4JQO_cjs.normalizePaymentRequired; }
 });
 Object.defineProperty(exports, "parseNextTool", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.parseNextTool; }
+  get: function () { return chunk22FJ4JQO_cjs.parseNextTool; }
 });
 Object.defineProperty(exports, "parsePaymentRequired", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.parsePaymentRequired; }
+  get: function () { return chunk22FJ4JQO_cjs.parsePaymentRequired; }
 });
 Object.defineProperty(exports, "parsePaymentRequiredResponse", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.parsePaymentRequiredResponse; }
+  get: function () { return chunk22FJ4JQO_cjs.parsePaymentRequiredResponse; }
 });
 Object.defineProperty(exports, "readClientUpdate", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.readClientUpdate; }
+  get: function () { return chunk22FJ4JQO_cjs.readClientUpdate; }
 });
 Object.defineProperty(exports, "renderNextTool", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.renderNextTool; }
+  get: function () { return chunk22FJ4JQO_cjs.renderNextTool; }
 });
 Object.defineProperty(exports, "resolveTokenBySymbol", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.resolveTokenBySymbol; }
+  get: function () { return chunk22FJ4JQO_cjs.resolveTokenBySymbol; }
 });
 Object.defineProperty(exports, "resolveTokenFromAddress", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.resolveTokenFromAddress; }
+  get: function () { return chunk22FJ4JQO_cjs.resolveTokenFromAddress; }
 });
 Object.defineProperty(exports, "selectErc7710PaymentOption", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.selectErc7710PaymentOption; }
+  get: function () { return chunk22FJ4JQO_cjs.selectErc7710PaymentOption; }
 });
 Object.defineProperty(exports, "selectPaymentOption", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.selectPaymentOption; }
+  get: function () { return chunk22FJ4JQO_cjs.selectPaymentOption; }
 });
 Object.defineProperty(exports, "selectStandardPaymentOption", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.selectStandardPaymentOption; }
+  get: function () { return chunk22FJ4JQO_cjs.selectStandardPaymentOption; }
 });
 Object.defineProperty(exports, "selectX402SettlementScheme", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.selectX402SettlementScheme; }
+  get: function () { return chunk22FJ4JQO_cjs.selectX402SettlementScheme; }
 });
 Object.defineProperty(exports, "sweepUsdcAddress", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.sweepUsdcAddress; }
+  get: function () { return chunk22FJ4JQO_cjs.sweepUsdcAddress; }
 });
 Object.defineProperty(exports, "sweepUsdcDomain", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.sweepUsdcDomain; }
+  get: function () { return chunk22FJ4JQO_cjs.sweepUsdcDomain; }
 });
 Object.defineProperty(exports, "toStandardPaymentRequirements", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.toStandardPaymentRequirements; }
+  get: function () { return chunk22FJ4JQO_cjs.toStandardPaymentRequirements; }
 });
 Object.defineProperty(exports, "unsupportedNodeVersionMessage", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.unsupportedNodeVersionMessage; }
+  get: function () { return chunk22FJ4JQO_cjs.unsupportedNodeVersionMessage; }
 });
 Object.defineProperty(exports, "validateStandardX402PaymentHeader", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.validateStandardX402PaymentHeader; }
+  get: function () { return chunk22FJ4JQO_cjs.validateStandardX402PaymentHeader; }
 });
 Object.defineProperty(exports, "x402AssetTransferMethod", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.x402AssetTransferMethod; }
+  get: function () { return chunk22FJ4JQO_cjs.x402AssetTransferMethod; }
 });
 Object.defineProperty(exports, "x402AuthorizationAmount", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.x402AuthorizationAmount; }
+  get: function () { return chunk22FJ4JQO_cjs.x402AuthorizationAmount; }
 });
 Object.defineProperty(exports, "x402FacilitatorAddresses", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.x402FacilitatorAddresses; }
+  get: function () { return chunk22FJ4JQO_cjs.x402FacilitatorAddresses; }
 });
 Object.defineProperty(exports, "x402PaymentHeaderNamesFor", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.x402PaymentHeaderNamesFor; }
+  get: function () { return chunk22FJ4JQO_cjs.x402PaymentHeaderNamesFor; }
 });
 Object.defineProperty(exports, "x402RetryHeadersFor", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.x402RetryHeadersFor; }
+  get: function () { return chunk22FJ4JQO_cjs.x402RetryHeadersFor; }
 });
 Object.defineProperty(exports, "x402V2PaymentEnvelope", {
   enumerable: true,
-  get: function () { return chunkZDKNPNI3_cjs.x402V2PaymentEnvelope; }
+  get: function () { return chunk22FJ4JQO_cjs.x402V2PaymentEnvelope; }
 });
 Object.defineProperty(exports, "RECEIPT_VERSION", {
   enumerable: true,
-  get: function () { return chunk7UTWSJC5_cjs.RECEIPT_VERSION; }
+  get: function () { return chunk6LEXYQ7J_cjs.RECEIPT_VERSION; }
 });
 Object.defineProperty(exports, "verifyPaymentReceipt", {
   enumerable: true,
-  get: function () { return chunk7UTWSJC5_cjs.verifyPaymentReceipt; }
+  get: function () { return chunk6LEXYQ7J_cjs.verifyPaymentReceipt; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_FAILURE_CODE_VALUES", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AGENT_PAYMENT_FAILURE_CODE_VALUES; }
+  get: function () { return chunkH37YVYZA_cjs.AGENT_PAYMENT_FAILURE_CODE_VALUES; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_NEXT_ACTION_VALUES", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AGENT_PAYMENT_NEXT_ACTION_VALUES; }
+  get: function () { return chunkH37YVYZA_cjs.AGENT_PAYMENT_NEXT_ACTION_VALUES; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_PHASE_VALUES", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AGENT_PAYMENT_PHASE_VALUES; }
+  get: function () { return chunkH37YVYZA_cjs.AGENT_PAYMENT_PHASE_VALUES; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_RAIL_VALUES", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AGENT_PAYMENT_RAIL_VALUES; }
+  get: function () { return chunkH37YVYZA_cjs.AGENT_PAYMENT_RAIL_VALUES; }
 });
 Object.defineProperty(exports, "AgentPaymentFailureCode", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentFailureCode; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentFailureCode; }
 });
 Object.defineProperty(exports, "AgentPaymentFailureCodeDescriptions", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentFailureCodeDescriptions; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentFailureCodeDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentFailureCodeSchema", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentFailureCodeSchema; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentFailureCodeSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentNextAction", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentNextAction; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentNextAction; }
 });
 Object.defineProperty(exports, "AgentPaymentNextActionDescriptions", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentNextActionDescriptions; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentNextActionDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentNextActionSchema", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentNextActionSchema; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentNextActionSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentPhase", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentPhase; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentPhase; }
 });
 Object.defineProperty(exports, "AgentPaymentPhaseDescriptions", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentPhaseDescriptions; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentPhaseDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentPhaseSchema", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentPhaseSchema; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentPhaseSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentRail", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentRail; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentRail; }
 });
 Object.defineProperty(exports, "AgentPaymentRailDescriptions", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentRailDescriptions; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentRailDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentRailSchema", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentRailSchema; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentRailSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentWarningCode", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.AgentPaymentWarningCode; }
+  get: function () { return chunkH37YVYZA_cjs.AgentPaymentWarningCode; }
 });
 Object.defineProperty(exports, "CONNECTOR_PACKAGE_NAME", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.CONNECTOR_PACKAGE_NAME; }
+  get: function () { return chunkH37YVYZA_cjs.CONNECTOR_PACKAGE_NAME; }
 });
 Object.defineProperty(exports, "DEFAULT_CONFIRMATION_TIMEOUT_MS", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS; }
+  get: function () { return chunkH37YVYZA_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS; }
 });
 Object.defineProperty(exports, "DIRECT_SIGN_CONTEXT_VERSION", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.DIRECT_SIGN_CONTEXT_VERSION; }
+  get: function () { return chunkH37YVYZA_cjs.DIRECT_SIGN_CONTEXT_VERSION; }
 });
 Object.defineProperty(exports, "ENTRY_POINT_V07", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.ENTRY_POINT_V07; }
+  get: function () { return chunkH37YVYZA_cjs.ENTRY_POINT_V07; }
 });
 Object.defineProperty(exports, "HAVEN_CONNECTOR_CHANNEL", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HAVEN_CONNECTOR_CHANNEL; }
+  get: function () { return chunkH37YVYZA_cjs.HAVEN_CONNECTOR_CHANNEL; }
 });
 Object.defineProperty(exports, "HYBRID_DELEGATOR_DOMAIN_NAME", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HYBRID_DELEGATOR_DOMAIN_NAME; }
+  get: function () { return chunkH37YVYZA_cjs.HYBRID_DELEGATOR_DOMAIN_NAME; }
 });
 Object.defineProperty(exports, "HYBRID_DELEGATOR_DOMAIN_VERSION", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HYBRID_DELEGATOR_DOMAIN_VERSION; }
+  get: function () { return chunkH37YVYZA_cjs.HYBRID_DELEGATOR_DOMAIN_VERSION; }
 });
 Object.defineProperty(exports, "HavenApiError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenApiError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenApiError; }
 });
 Object.defineProperty(exports, "HavenError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenError; }
 });
 Object.defineProperty(exports, "HavenPaymentStateError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenPaymentStateError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenPaymentStateError; }
 });
 Object.defineProperty(exports, "HavenSigningError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenSigningError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenSigningError; }
 });
 Object.defineProperty(exports, "HavenTimeoutError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenTimeoutError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenTimeoutError; }
 });
 Object.defineProperty(exports, "HavenUnsupportedSignerVersionError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenUnsupportedSignerVersionError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenUnsupportedSignerVersionError; }
 });
 Object.defineProperty(exports, "HavenUserOpBindingError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenUserOpBindingError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenUserOpBindingError; }
 });
 Object.defineProperty(exports, "HavenZeroSettlementHashError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.HavenZeroSettlementHashError; }
+  get: function () { return chunkH37YVYZA_cjs.HavenZeroSettlementHashError; }
 });
 Object.defineProperty(exports, "MerchantTimeoutError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.MerchantTimeoutError; }
+  get: function () { return chunkH37YVYZA_cjs.MerchantTimeoutError; }
 });
 Object.defineProperty(exports, "PACKED_USER_OPERATION_FIELDS", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.PACKED_USER_OPERATION_FIELDS; }
+  get: function () { return chunkH37YVYZA_cjs.PACKED_USER_OPERATION_FIELDS; }
 });
 Object.defineProperty(exports, "ROOT_AUTHORITY", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.ROOT_AUTHORITY; }
+  get: function () { return chunkH37YVYZA_cjs.ROOT_AUTHORITY; }
 });
 Object.defineProperty(exports, "SIGNER_UPDATE_FALLBACK", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.SIGNER_UPDATE_FALLBACK; }
+  get: function () { return chunkH37YVYZA_cjs.SIGNER_UPDATE_FALLBACK; }
 });
 Object.defineProperty(exports, "SignerRefusalCode", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.SignerRefusalCode; }
+  get: function () { return chunkH37YVYZA_cjs.SignerRefusalCode; }
 });
 Object.defineProperty(exports, "TASK_SIGN_CONTEXT_VERSION", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.TASK_SIGN_CONTEXT_VERSION; }
+  get: function () { return chunkH37YVYZA_cjs.TASK_SIGN_CONTEXT_VERSION; }
 });
 Object.defineProperty(exports, "X402AlreadySettledError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.X402AlreadySettledError; }
+  get: function () { return chunkH37YVYZA_cjs.X402AlreadySettledError; }
 });
 Object.defineProperty(exports, "X402Erc7710AlreadySettledError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.X402Erc7710AlreadySettledError; }
+  get: function () { return chunkH37YVYZA_cjs.X402Erc7710AlreadySettledError; }
 });
 Object.defineProperty(exports, "X402TaskBudgetMismatchError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.X402TaskBudgetMismatchError; }
+  get: function () { return chunkH37YVYZA_cjs.X402TaskBudgetMismatchError; }
 });
 Object.defineProperty(exports, "X402UnexpectedStatusError", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.X402UnexpectedStatusError; }
+  get: function () { return chunkH37YVYZA_cjs.X402UnexpectedStatusError; }
 });
 Object.defineProperty(exports, "assertUserOpTypedDataBinding", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.assertUserOpTypedDataBinding; }
+  get: function () { return chunkH37YVYZA_cjs.assertUserOpTypedDataBinding; }
 });
 Object.defineProperty(exports, "connectorRerunCommand", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.connectorRerunCommand; }
+  get: function () { return chunkH37YVYZA_cjs.connectorRerunCommand; }
 });
 Object.defineProperty(exports, "connectorSpec", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.connectorSpec; }
+  get: function () { return chunkH37YVYZA_cjs.connectorSpec; }
 });
 Object.defineProperty(exports, "connectorUpgradeCommand", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.connectorUpgradeCommand; }
+  get: function () { return chunkH37YVYZA_cjs.connectorUpgradeCommand; }
 });
 Object.defineProperty(exports, "deriveDelegateAccountAddress", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.deriveDelegateAccountAddress; }
+  get: function () { return chunkH37YVYZA_cjs.deriveDelegateAccountAddress; }
 });
 Object.defineProperty(exports, "isConnectorChannel", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.isConnectorChannel; }
+  get: function () { return chunkH37YVYZA_cjs.isConnectorChannel; }
 });
 Object.defineProperty(exports, "isPackedUserOperationTypedData", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.isPackedUserOperationTypedData; }
+  get: function () { return chunkH37YVYZA_cjs.isPackedUserOperationTypedData; }
 });
 Object.defineProperty(exports, "packedUserOperationHash", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.packedUserOperationHash; }
+  get: function () { return chunkH37YVYZA_cjs.packedUserOperationHash; }
 });
 Object.defineProperty(exports, "resolveConnectorChannel", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.resolveConnectorChannel; }
+  get: function () { return chunkH37YVYZA_cjs.resolveConnectorChannel; }
 });
 Object.defineProperty(exports, "signerUpdateFallback", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.signerUpdateFallback; }
+  get: function () { return chunkH37YVYZA_cjs.signerUpdateFallback; }
 });
 Object.defineProperty(exports, "verifySettlementChild", {
   enumerable: true,
-  get: function () { return chunk4Z6ATE44_cjs.verifySettlementChild; }
+  get: function () { return chunkH37YVYZA_cjs.verifySettlementChild; }
 });
 exports.AGENT_APPROVAL_RELAY_JSON_SENTENCE = AGENT_APPROVAL_RELAY_JSON_SENTENCE;
 exports.AGENT_APPROVAL_RELAY_PROSE_SENTENCE = AGENT_APPROVAL_RELAY_PROSE_SENTENCE;
@@ -6111,6 +6207,7 @@ exports.SKILL_FOLDER_NAME = SKILL_FOLDER_NAME;
 exports.addressFromKey = addressFromKey;
 exports.assertPublicHttpsMerchantUrl = assertPublicHttpsMerchantUrl;
 exports.assertSecureX402RetryTarget = assertSecureX402RetryTarget;
+exports.catalogFundingLegExpected = catalogFundingLegExpected;
 exports.composeDescription = composeDescription;
 exports.discoverMerchantMcpUrl = discoverMerchantMcpUrl;
 exports.formatTokenAmount = formatTokenAmount;