@haven_ai/sdk 0.6.0-alpha.0 → 0.7.0-alpha.0

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkCK4NLLMO_cjs = require('./chunk-CK4NLLMO.cjs');
-var chunkS42QSWJY_cjs = require('./chunk-S42QSWJY.cjs');
+var chunkJ6DQEBK2_cjs = require('./chunk-J6DQEBK2.cjs');
+var chunk3SVPI4LS_cjs = require('./chunk-3SVPI4LS.cjs');
 var viem = require('viem');
 var ethers = require('ethers');
 var async_hooks = require('async_hooks');
@@ -14,7 +14,7 @@ function signHash(privateKey, hash) {
     const sig = signingKey.sign(hash);
     return sig.serialized;
   } catch (err) {
-    throw new chunkS42QSWJY_cjs.HavenSigningError(
+    throw new chunk3SVPI4LS_cjs.HavenSigningError(
       `Failed to sign hash: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -30,7 +30,7 @@ async function signTypedDataVerbatim(privateKey, typedData, label) {
       typedData.message
     );
   } catch (err) {
-    throw new chunkS42QSWJY_cjs.HavenSigningError(
+    throw new chunk3SVPI4LS_cjs.HavenSigningError(
       `Failed to sign ${label}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -45,7 +45,7 @@ function addressFromKey(privateKey) {
   try {
     return new ethers.ethers.Wallet(privateKey).address;
   } catch (err) {
-    throw new chunkS42QSWJY_cjs.HavenSigningError(
+    throw new chunk3SVPI4LS_cjs.HavenSigningError(
       `Invalid private key: ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -61,7 +61,7 @@ function verifySignature(hash, signature, expectedAddress) {
 var DEFAULT_BASE_URL = "http://localhost:3001";
 var DEFAULT_REQUEST_TIMEOUT = 3e4;
 function withoutClientHeader(headers) {
-  const target = chunkCK4NLLMO_cjs.HAVEN_CLIENT_HEADER.toLowerCase();
+  const target = chunkJ6DQEBK2_cjs.HAVEN_CLIENT_HEADER.toLowerCase();
   return Object.fromEntries(Object.entries(headers).filter(([name]) => name.toLowerCase() !== target));
 }
 var HavenApiTransport = class {
@@ -77,7 +77,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 ?? chunkCK4NLLMO_cjs.SDK_CLIENT_IDENTITY;
+    this.clientIdentity = config.clientIdentity ?? chunkJ6DQEBK2_cjs.SDK_CLIENT_IDENTITY;
   }
   /**
    * The newest `client_update` the backend sent (#3303): inside a
@@ -90,7 +90,7 @@ var HavenApiTransport = class {
   }
   recordClientUpdate(data) {
     if (data === null || typeof data !== "object" || Array.isArray(data)) return;
-    const hint = chunkCK4NLLMO_cjs.readClientUpdate(data.client_update);
+    const hint = chunkJ6DQEBK2_cjs.readClientUpdate(data.client_update);
     if (!hint) return;
     this.lastClientUpdate = hint;
     const store = this.requestContext.getStore();
@@ -123,7 +123,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.
-          [chunkCK4NLLMO_cjs.HAVEN_CLIENT_HEADER]: this.clientIdentity
+          [chunkJ6DQEBK2_cjs.HAVEN_CLIENT_HEADER]: this.clientIdentity
         },
         body: body ? JSON.stringify(body) : void 0,
         signal: controller.signal
@@ -136,15 +136,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 chunkS42QSWJY_cjs.HavenApiError(message, res.status, data);
+        throw new chunk3SVPI4LS_cjs.HavenApiError(message, res.status, data);
       }
       return data;
     } catch (err) {
-      if (err instanceof chunkS42QSWJY_cjs.HavenApiError) throw err;
+      if (err instanceof chunk3SVPI4LS_cjs.HavenApiError) throw err;
       if (err instanceof Error && err.name === "AbortError") {
-        throw new chunkS42QSWJY_cjs.HavenApiError(`Request to ${path} timed out`, 408);
+        throw new chunk3SVPI4LS_cjs.HavenApiError(`Request to ${path} timed out`, 408);
       }
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         `Request to ${path} failed: ${err instanceof Error ? err.message : String(err)}`,
         0
       );
@@ -161,7 +161,18 @@ function mapParties(raw) {
     treasuryAccount: raw.treasury_account,
     delegate: raw.delegate,
     delegateAccount: raw.delegate_account,
-    merchant: raw.merchant
+    merchant: raw.merchant,
+    // #3332: additive — absent unless the wire shape carries it.
+    ...raw.buyer ? {
+      buyer: {
+        legalName: raw.buyer.legal_name,
+        country: raw.buyer.country,
+        orgNumber: raw.buyer.org_number,
+        vatNumber: raw.buyer.vat_number,
+        viesStatus: raw.buyer.vies_status,
+        viesCheckedAt: raw.buyer.vies_checked_at
+      }
+    } : {}
   };
 }
 function mapPaymentResult(raw, buildExplorerUrl2) {
@@ -205,6 +216,9 @@ function mapPaymentStatusResult(raw) {
     expiresAt: raw.expires_at,
     chainId: raw.chain_id,
     message: raw.message,
+    // #3420: the delivered half of the settle vocabulary, additive — absent
+    // from the raw payload (older backend) stays absent here.
+    ...raw.delivered === true ? { delivered: true } : {},
     fee: raw.fee ? {
       amount: raw.fee.amount,
       token: raw.fee.token,
@@ -287,29 +301,29 @@ function paymentStateStatusCode(status, fallback = 502) {
   return PAYMENT_STATE_STATUS_CODES[status] ?? fallback;
 }
 function phaseForStatus(status) {
-  if (status === "pending_signature") return chunkS42QSWJY_cjs.AgentPaymentPhase.AgentSignatureRequired;
-  if (status === "submitted") return chunkS42QSWJY_cjs.AgentPaymentPhase.PaymentSubmitted;
-  if (status === "confirmed") return chunkS42QSWJY_cjs.AgentPaymentPhase.PaymentConfirmed;
-  if (status === "pending" || status === "pending_approval") return chunkS42QSWJY_cjs.AgentPaymentPhase.UserApprovalRequired;
-  if (status === "approved") return chunkS42QSWJY_cjs.AgentPaymentPhase.UserExecutionRequired;
-  if (status === "proposed") return chunkS42QSWJY_cjs.AgentPaymentPhase.WaitingForAdditionalApprovals;
-  if (status === "executed") return chunkS42QSWJY_cjs.AgentPaymentPhase.FundingSent;
-  if (status === "rejected") return chunkS42QSWJY_cjs.AgentPaymentPhase.Rejected;
-  if (status === "expired") return chunkS42QSWJY_cjs.AgentPaymentPhase.Expired;
-  if (status === "failed") return chunkS42QSWJY_cjs.AgentPaymentPhase.Failed;
+  if (status === "pending_signature") return chunk3SVPI4LS_cjs.AgentPaymentPhase.AgentSignatureRequired;
+  if (status === "submitted") return chunk3SVPI4LS_cjs.AgentPaymentPhase.PaymentSubmitted;
+  if (status === "confirmed") return chunk3SVPI4LS_cjs.AgentPaymentPhase.PaymentConfirmed;
+  if (status === "pending" || status === "pending_approval") return chunk3SVPI4LS_cjs.AgentPaymentPhase.UserApprovalRequired;
+  if (status === "approved") return chunk3SVPI4LS_cjs.AgentPaymentPhase.UserExecutionRequired;
+  if (status === "proposed") return chunk3SVPI4LS_cjs.AgentPaymentPhase.WaitingForAdditionalApprovals;
+  if (status === "executed") return chunk3SVPI4LS_cjs.AgentPaymentPhase.FundingSent;
+  if (status === "rejected") return chunk3SVPI4LS_cjs.AgentPaymentPhase.Rejected;
+  if (status === "expired") return chunk3SVPI4LS_cjs.AgentPaymentPhase.Expired;
+  if (status === "failed") return chunk3SVPI4LS_cjs.AgentPaymentPhase.Failed;
   return null;
 }
 function nextActionForStatus(status) {
-  if (status === "pending_signature") return chunkS42QSWJY_cjs.AgentPaymentNextAction.SignAndSubmitPayment;
-  if (status === "submitted") return chunkS42QSWJY_cjs.AgentPaymentNextAction.CheckStatusLater;
-  if (status === "confirmed") return chunkS42QSWJY_cjs.AgentPaymentNextAction.None;
-  if (status === "pending" || status === "pending_approval") return chunkS42QSWJY_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "approved") return chunkS42QSWJY_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "proposed") return chunkS42QSWJY_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "executed") return chunkS42QSWJY_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "rejected") return chunkS42QSWJY_cjs.AgentPaymentNextAction.StopAndTellUser;
-  if (status === "expired") return chunkS42QSWJY_cjs.AgentPaymentNextAction.RequestAgainIfUserStillWantsIt;
-  if (status === "failed") return chunkS42QSWJY_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "pending_signature") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.SignAndSubmitPayment;
+  if (status === "submitted") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.CheckStatusLater;
+  if (status === "confirmed") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.None;
+  if (status === "pending" || status === "pending_approval") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "approved") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "proposed") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "executed") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "rejected") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.StopAndTellUser;
+  if (status === "expired") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.RequestAgainIfUserStillWantsIt;
+  if (status === "failed") return chunk3SVPI4LS_cjs.AgentPaymentNextAction.StopAndTellUser;
   return null;
 }
 function messageForState(label, status, paymentId, nextAction) {
@@ -383,17 +397,17 @@ function throwPaymentStateError(label, raw) {
   const statusCode = paymentStateStatusCode(raw.status);
   const state = paymentStateFromRaw(label, raw);
   if (state) {
-    throw new chunkS42QSWJY_cjs.HavenPaymentStateError(state.message, statusCode, state, raw);
+    throw new chunk3SVPI4LS_cjs.HavenPaymentStateError(state.message, statusCode, state, raw);
   }
   if (raw.status === "pending_approval") {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       `${label} expired before it could be completed (payment_id: ${raw.payment_id}).`,
       statusCode,
       raw
@@ -401,7 +415,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 chunkS42QSWJY_cjs.HavenApiError(message, statusCode, raw);
+  throw new chunk3SVPI4LS_cjs.HavenApiError(message, statusCode, raw);
 }
 
 // src/x402-retry-target.ts
@@ -433,7 +447,7 @@ function isSecureX402RetryTarget(url) {
   return RESERVED_SUFFIXES.some((suffix) => host.endsWith(suffix));
 }
 var INSECURE_RETRY_TARGET_CODE = "INSECURE_RETRY_TARGET";
-var HavenInsecureRetryTargetError = class extends chunkS42QSWJY_cjs.HavenError {
+var HavenInsecureRetryTargetError = class extends chunk3SVPI4LS_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.`,
@@ -475,7 +489,7 @@ var McpMerchantTransport = class {
       return await this.fetchImpl(url, { ...init, signal });
     } catch (err) {
       if (timeoutSignal.aborted) {
-        throw new chunkS42QSWJY_cjs.MerchantTimeoutError(`Merchant request timed out after ${timeoutMs}ms: ${url}`);
+        throw new chunk3SVPI4LS_cjs.MerchantTimeoutError(`Merchant request timed out after ${timeoutMs}ms: ${url}`);
       }
       throw err;
     }
@@ -612,8 +626,8 @@ var McpMerchantTransport = class {
   async deliverPayment(url, init, paymentHeader) {
     assertSecureX402RetryTarget(url);
     const headers = new Headers(init?.headers);
-    const send = chunkCK4NLLMO_cjs.x402PaymentHeaderNamesFor(paymentHeader);
-    for (const name of chunkCK4NLLMO_cjs.X402_PAYMENT_HEADER_NAMES) {
+    const send = chunkJ6DQEBK2_cjs.x402PaymentHeaderNamesFor(paymentHeader);
+    for (const name of chunkJ6DQEBK2_cjs.X402_PAYMENT_HEADER_NAMES) {
       if (send.includes(name)) headers.set(name, paymentHeader);
       else headers.delete(name);
     }
@@ -700,7 +714,7 @@ function mcpToolResultOf(value) {
 function extractMcpPaymentRequired(toolResult) {
   if (toolResult.isError !== true) return void 0;
   if (isRecord(toolResult.structuredContent)) {
-    const parsed = chunkCK4NLLMO_cjs.normalizePaymentRequired(toolResult.structuredContent);
+    const parsed = chunkJ6DQEBK2_cjs.normalizePaymentRequired(toolResult.structuredContent);
     if (parsed) return parsed;
   }
   if (Array.isArray(toolResult.content)) {
@@ -712,7 +726,7 @@ function extractMcpPaymentRequired(toolResult) {
       } catch {
         continue;
       }
-      const parsed = chunkCK4NLLMO_cjs.normalizePaymentRequired(candidate);
+      const parsed = chunkJ6DQEBK2_cjs.normalizePaymentRequired(candidate);
       if (parsed) return parsed;
     }
   }
@@ -736,7 +750,7 @@ function withMcpPaymentMeta(init, paymentHeader) {
   if (!request) return init;
   let envelope;
   try {
-    envelope = chunkCK4NLLMO_cjs.decodeBase64Json(paymentHeader);
+    envelope = chunkJ6DQEBK2_cjs.decodeBase64Json(paymentHeader);
   } catch {
     return init;
   }
@@ -752,7 +766,7 @@ function withMcpPaymentMeta(init, paymentHeader) {
   };
 }
 function encodeMcpSettlementReceipt(settlement) {
-  return chunkCK4NLLMO_cjs.encodeBase64Json(settlement);
+  return chunkJ6DQEBK2_cjs.encodeBase64Json(settlement);
 }
 function parseJsonRpcToolsCall(body) {
   if (typeof body !== "string") return void 0;
@@ -838,22 +852,93 @@ function selectJsonRpcResult(messages) {
   return messages.find((message) => "result" in message || "error" in message) ?? messages.at(-1);
 }
 var RECEIPT_VERSION = "haven-receipt-1";
+var DELEGATION_MANAGER_CHAIN_IDS = /* @__PURE__ */ new Set([8453, 84532]);
+var EIP712_DOMAIN_TYPEHASH = viem.keccak256(
+  viem.toBytes("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)")
+);
+function delegationDomainSeparator(chainId) {
+  return viem.keccak256(
+    viem.encodeAbiParameters(
+      [{ type: "bytes32" }, { type: "bytes32" }, { type: "bytes32" }, { type: "uint256" }, { type: "address" }],
+      [
+        EIP712_DOMAIN_TYPEHASH,
+        viem.keccak256(viem.toBytes("DelegationManager")),
+        viem.keccak256(viem.toBytes("1")),
+        BigInt(chainId),
+        chunk3SVPI4LS_cjs.DELEGATION_MANAGER
+      ]
+    )
+  );
+}
+function delegationDigest(structHash, chainId) {
+  return viem.keccak256(viem.concatHex(["0x1901", delegationDomainSeparator(chainId), structHash]));
+}
 function defaultRecover(hash, signature) {
   return ethers.ethers.recoverAddress(hash, signature);
 }
-function verifyPaymentReceipt(receipt, recover = defaultRecover) {
-  const { delegate, signHash: signHash2, signature } = receipt.authorization;
-  if (!signature) return { verified: false, reason: "missing_signature" };
+var NOT_A_SIGNED_RECEIPT = { verified: false, reason: "not_a_signed_receipt" };
+function match(delegate, hash, signature, recover) {
   let recovered;
   try {
-    recovered = recover(signHash2, signature);
+    recovered = recover(hash, signature);
   } catch {
-    return { verified: false, reason: "bad_signature" };
+    return { ok: false, reason: "bad_signature" };
   }
   if (recovered.toLowerCase() !== delegate.toLowerCase()) {
-    return { verified: false, reason: "signer_mismatch", recoveredSigner: recovered };
+    return { ok: false, reason: "signer_mismatch", recoveredSigner: recovered };
+  }
+  return { ok: true, recoveredSigner: recovered };
+}
+function finish(result, verifiedOver) {
+  if (result.ok) {
+    return { verified: true, recoveredSigner: result.recoveredSigner, verifiedOver };
+  }
+  return result.recoveredSigner !== void 0 ? { verified: false, reason: result.reason, recoveredSigner: result.recoveredSigner } : { verified: false, reason: result.reason };
+}
+function verifyPaymentReceipt(receipt, recover = defaultRecover) {
+  if (typeof receipt !== "object" || receipt === null) return NOT_A_SIGNED_RECEIPT;
+  const source = receipt;
+  if (typeof source.authorization !== "object" || source.authorization === null) {
+    return NOT_A_SIGNED_RECEIPT;
+  }
+  const auth = source.authorization;
+  const { delegate, signHash: signHash2, signature, signatureScheme } = auth;
+  if (typeof delegate !== "string" || delegate === "" || typeof signHash2 !== "string" || signHash2 === "") {
+    return NOT_A_SIGNED_RECEIPT;
+  }
+  if (typeof signature !== "string" || signature === "") {
+    return { verified: false, reason: "missing_signature" };
+  }
+  const chainId = typeof source.onChain?.chainId === "number" ? source.onChain.chainId : void 0;
+  const digestVerifiable = chainId !== void 0 && DELEGATION_MANAGER_CHAIN_IDS.has(chainId);
+  if (signatureScheme === "eip712_userop") {
+    return { verified: false, reason: "not_verifiable_offline" };
+  }
+  if (signatureScheme === "eip712_delegation") {
+    if (!digestVerifiable) {
+      return { verified: false, reason: "not_verifiable_offline" };
+    }
+    let digest;
+    try {
+      digest = delegationDigest(signHash2, chainId);
+    } catch {
+      return { verified: false, reason: "bad_signature" };
+    }
+    return finish(match(delegate, digest, signature, recover), "delegation_digest");
   }
-  return { verified: true, recoveredSigner: recovered };
+  const raw = match(delegate, signHash2, signature, recover);
+  if (raw.ok) return finish(raw, "sign_hash");
+  if (digestVerifiable) {
+    let digest;
+    try {
+      digest = delegationDigest(signHash2, chainId);
+    } catch {
+      return finish(raw, "sign_hash");
+    }
+    const delegated = match(delegate, digest, signature, recover);
+    if (delegated.ok) return finish(delegated, "delegation_digest");
+  }
+  return finish(raw, "sign_hash");
 }
 
 // src/account-reads.ts
@@ -876,9 +961,17 @@ function deriveReadiness(status, allowances) {
   return allowances.some((allowance) => safeBigInt(allowance.remainingAtomic) > 0n) ? "ready" : "needs_approval";
 }
 function formatRemainingDisplay(tokenAddress, tokenSymbol, remainingAtomic) {
-  const token = chunkCK4NLLMO_cjs.resolveTokenFromAddress(tokenAddress);
+  const token = chunkJ6DQEBK2_cjs.resolveTokenFromAddress(tokenAddress);
   return token ? `${formatAtomicAmount(safeBigInt(remainingAtomic), token.decimals)} ${tokenSymbol}` : `${remainingAtomic} ${tokenSymbol} (atomic; unknown decimals)`;
 }
+function formatTokenAmount(atomic, decimals) {
+  const value = safeBigInt(atomic);
+  if (value < 0n) return "0";
+  const digits = value.toString().padStart(decimals + 1, "0");
+  const intPart = digits.slice(0, digits.length - decimals) || "0";
+  const fracPart = digits.slice(digits.length - decimals).replace(/0+$/, "");
+  return fracPart ? `${intPart}.${fracPart}` : intPart;
+}
 function mapTaskBudget(raw) {
   return {
     id: raw.id,
@@ -900,7 +993,7 @@ function mapTaskBudget(raw) {
   };
 }
 function summarizeTaskBudget(taskBudget) {
-  const token = chunkCK4NLLMO_cjs.resolveTokenFromAddress(taskBudget.tokenAddress);
+  const token = chunkJ6DQEBK2_cjs.resolveTokenFromAddress(taskBudget.tokenAddress);
   const maxDisplay = token ? `${formatAtomicAmount(safeBigInt(taskBudget.maxAtomic), token.decimals)} ${token.symbol}` : `${taskBudget.maxAtomic} (atomic; unknown decimals)`;
   return {
     id: taskBudget.id,
@@ -912,6 +1005,13 @@ function summarizeTaskBudget(taskBudget) {
     expiresAt: taskBudget.expiresAt
   };
 }
+function compactReceipt(receipt) {
+  const row = { ...receipt };
+  delete row.challengePayload;
+  delete row.selectedPayment;
+  delete row.protocolReceiptPayload;
+  return row;
+}
 var AccountReads = class {
   transport;
   getPaymentStatus;
@@ -1040,7 +1140,7 @@ var AccountReads = class {
       payment: payment2,
       allowance: null,
       warnings: [{
-        code: chunkS42QSWJY_cjs.AgentPaymentWarningCode.AllowanceCheckUnavailable,
+        code: chunk3SVPI4LS_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.`
       }]
     });
@@ -1062,22 +1162,22 @@ var AccountReads = class {
     try {
       const tokenAddress = payment.asset ?? payment.x402?.asset ?? null;
       if (!tokenAddress) return unavailable("the settled payment does not carry a resolvable token address", payment);
-      const match = allowanceResult.value.allowances.find(
+      const match2 = allowanceResult.value.allowances.find(
         (allowance) => allowance.tokenAddress.toLowerCase() === tokenAddress.toLowerCase()
       );
-      if (!match) return unavailable("no allowance/budget row matches the settled token", payment);
-      const token = chunkCK4NLLMO_cjs.resolveTokenFromAddress(match.tokenAddress);
-      const remainingDisplay = token ? `${formatAtomicAmount(safeBigInt(match.onchain.remaining), token.decimals)} ${match.tokenSymbol}` : void 0;
+      if (!match2) return unavailable("no allowance/budget row matches the settled token", payment);
+      const token = chunkJ6DQEBK2_cjs.resolveTokenFromAddress(match2.tokenAddress);
+      const remainingDisplay = token ? `${formatAtomicAmount(safeBigInt(match2.onchain.remaining), token.decimals)} ${match2.tokenSymbol}` : void 0;
       const rail = agentResult.value.executionRail;
       return {
         payment,
         allowance: {
           rail,
-          remaining_atomic: match.onchain.remaining,
+          remaining_atomic: match2.onchain.remaining,
           ...remainingDisplay ? { remaining_display: remainingDisplay } : {},
-          token_symbol: match.tokenSymbol,
-          token_address: match.tokenAddress,
-          reset_period: match.resetPeriodMin,
+          token_symbol: match2.tokenSymbol,
+          token_address: match2.tokenAddress,
+          reset_period: match2.resetPeriodMin,
           source: rail === "delegation" ? "active_delegations" : "allowance_module"
         },
         warnings: []
@@ -1097,8 +1197,13 @@ var AccountReads = class {
     if (options.cursor) params.set("cursor", options.cursor);
     const query = params.size > 0 ? `?${params.toString()}` : "";
     const raw = await this.transport.get(`/machine-payments/receipts${query}`);
+    const receipts = raw.receipts.map(mapPaymentReceipt);
     return {
-      receipts: raw.receipts.map(mapPaymentReceipt),
+      // #3423 (owner decision, opt-in): `compact` drops the three bulky
+      // payload echoes (the merchant's full 402 challenge, the selected
+      // option, and the merchant's PAYMENT-RESPONSE) from each row. The keys
+      // are absent, not null, and the default shape is unchanged.
+      receipts: options.compact ? receipts.map(compactReceipt) : receipts,
       total: typeof raw.total === "number" ? raw.total : null,
       hasMore: typeof raw.has_more === "boolean" ? raw.has_more : null,
       nextCursor: typeof raw.next_cursor === "string" ? raw.next_cursor : null
@@ -1141,7 +1246,7 @@ function isWaitTimeout(err) {
 async function waitForSweepTx(tx) {
   let receipt;
   try {
-    receipt = await tx.wait(1, chunkS42QSWJY_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS);
+    receipt = await tx.wait(1, chunk3SVPI4LS_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS);
   } catch (err) {
     if (!isWaitTimeout(err)) throw err;
     return { txHash: tx.hash, confirmation: "unconfirmed" };
@@ -1155,16 +1260,16 @@ var DelegateSweepApi = class {
   }
   options;
   async sweepDelegate() {
-    if (!this.options.delegateKey) throw new chunkS42QSWJY_cjs.HavenSigningError("delegateKey is required for sweepDelegate.");
+    if (!this.options.delegateKey) throw new chunk3SVPI4LS_cjs.HavenSigningError("delegateKey is required for sweepDelegate.");
     const agent = await this.options.getAgent();
-    if (!agent.delegateAddress) throw new chunkS42QSWJY_cjs.HavenApiError("Agent has no delegate address.", 422);
+    if (!agent.delegateAddress) throw new chunk3SVPI4LS_cjs.HavenApiError("Agent has no delegate address.", 422);
     const rpcUrl = this.options.chainRpcs[agent.chainId];
-    if (!rpcUrl) throw new chunkS42QSWJY_cjs.HavenApiError(`chainRpcs[${agent.chainId}] must be configured to sweep the delegate wallet.`, 422);
+    if (!rpcUrl) throw new chunk3SVPI4LS_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 (chunkCK4NLLMO_cjs.isSweepableChain(agent.chainId)) {
-      const contract = createErc20Contract(chunkCK4NLLMO_cjs.sweepUsdcAddress(agent.chainId), ["function balanceOf(address) view returns (uint256)", "function transfer(address to, uint256 amount) returns (bool)"], wallet);
+    if (chunkJ6DQEBK2_cjs.isSweepableChain(agent.chainId)) {
+      const contract = createErc20Contract(chunkJ6DQEBK2_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);
@@ -1252,7 +1357,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 chunkS42QSWJY_cjs.HavenApiError(
+  throw new chunk3SVPI4LS_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
   );
@@ -1273,25 +1378,25 @@ function requestInitFromSnapshot(request) {
   };
 }
 function noCompatiblePaymentOptionError(accepts) {
-  const erc7710Only = chunkCK4NLLMO_cjs.selectErc7710PaymentOption(accepts) !== null;
+  const erc7710Only = chunkJ6DQEBK2_cjs.selectErc7710PaymentOption(accepts) !== null;
   const unsupportedOnly = !erc7710Only && accepts.some(
-    (opt) => opt !== null && typeof opt === "object" && !chunkCK4NLLMO_cjs.isErc7710Option(opt) && (chunkCK4NLLMO_cjs.x402AssetTransferMethod(opt) !== null || opt.extra?.paymentFlow !== void 0)
+    (opt) => opt !== null && typeof opt === "object" && !chunkJ6DQEBK2_cjs.isErc7710Option(opt) && (chunkJ6DQEBK2_cjs.x402AssetTransferMethod(opt) !== null || opt.extra?.paymentFlow !== void 0)
   );
-  return new chunkS42QSWJY_cjs.HavenApiError(
+  return new chunk3SVPI4LS_cjs.HavenApiError(
     "No compatible payment option found in x402 requirements. Haven supports standard x402 exact payments on Base USDC." + (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
   );
 }
 function buildX402Quote(paymentRequired, request, idempotencyKey, mcpTransport) {
-  const standard = chunkCK4NLLMO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
-  const option = standard ?? chunkCK4NLLMO_cjs.selectErc7710PaymentOption(paymentRequired.accepts);
+  const standard = chunkJ6DQEBK2_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+  const option = standard ?? chunkJ6DQEBK2_cjs.selectErc7710PaymentOption(paymentRequired.accepts);
   if (!option) {
     throw noCompatiblePaymentOptionError(paymentRequired.accepts);
   }
-  const token = chunkCK4NLLMO_cjs.resolveTokenFromAddress(option.asset, option.network);
+  const token = chunkJ6DQEBK2_cjs.resolveTokenFromAddress(option.asset, option.network);
   return {
     rail: "x402",
-    idempotencyKey: idempotencyKey ?? chunkCK4NLLMO_cjs.buildX402IdempotencyKey(paymentRequired, option),
+    idempotencyKey: idempotencyKey ?? chunkJ6DQEBK2_cjs.buildX402IdempotencyKey(paymentRequired, option),
     paymentRequired,
     accepted: option,
     acceptedScheme: standard ? "standard" : "erc7710",
@@ -1305,8 +1410,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: chunkCK4NLLMO_cjs.x402AuthorizationAmount(option),
-    amount: decimalFromUsdcAtomic(chunkCK4NLLMO_cjs.x402AuthorizationAmount(option)),
+    amountAtomic: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option),
+    amount: decimalFromUsdcAtomic(chunkJ6DQEBK2_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
@@ -1345,7 +1450,7 @@ function buildX402Receipt(input) {
       payTo: input.merchantTo ?? input.accepted.payTo
     },
     x402: {
-      amount: chunkCK4NLLMO_cjs.x402AuthorizationAmount(input.accepted),
+      amount: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(input.accepted),
       token: input.token,
       network: input.accepted.network,
       asset: input.accepted.asset,
@@ -1354,7 +1459,7 @@ function buildX402Receipt(input) {
   };
 }
 function buildX402ResumeState(input) {
-  const token = chunkCK4NLLMO_cjs.resolveTokenFromAddress(input.accepted.asset, input.accepted.network);
+  const token = chunkJ6DQEBK2_cjs.resolveTokenFromAddress(input.accepted.asset, input.accepted.network);
   return {
     rail: "x402",
     paymentId: input.paymentId,
@@ -1365,8 +1470,8 @@ function buildX402ResumeState(input) {
     request: input.request,
     resourceUrl: input.paymentRequired.resource.url,
     description: input.paymentRequired.resource.description ?? input.accepted.description ?? null,
-    amountAtomic: chunkCK4NLLMO_cjs.x402AuthorizationAmount(input.accepted),
-    amount: decimalFromUsdcAtomic(chunkCK4NLLMO_cjs.x402AuthorizationAmount(input.accepted)),
+    amountAtomic: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(input.accepted),
+    amount: decimalFromUsdcAtomic(chunkJ6DQEBK2_cjs.x402AuthorizationAmount(input.accepted)),
     token: token?.symbol ?? "USDC",
     asset: input.accepted.asset,
     network: input.accepted.network,
@@ -1375,7 +1480,7 @@ function buildX402ResumeState(input) {
   };
 }
 function attachX402ResumeState(err, paymentRequired, accepted, idempotencyKey, request) {
-  if (!(err instanceof chunkS42QSWJY_cjs.HavenPaymentStateError)) return;
+  if (!(err instanceof chunk3SVPI4LS_cjs.HavenPaymentStateError)) return;
   if (err.state.rail !== "x402") return;
   err.resumeState = buildX402ResumeState({
     paymentId: err.state.paymentId,
@@ -1396,17 +1501,17 @@ function attachResumeState(err, input) {
 }
 function assertCanResumeX402(status, paymentRequired, option) {
   if (status.rail !== "x402") {
-    throw new chunkS42QSWJY_cjs.HavenPaymentStateError(
+    throw new chunk3SVPI4LS_cjs.HavenPaymentStateError(
       `Payment ${status.paymentId} is ${status.rail}, not x402.`,
       409,
       status
     );
   }
-  if (status.nextAction !== chunkS42QSWJY_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
-    throw new chunkS42QSWJY_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
+  if (status.nextAction !== chunk3SVPI4LS_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
+    throw new chunk3SVPI4LS_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
   }
   if (!status.txHash) {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       `x402 payment ${status.paymentId} is ready to retry but has no Haven transaction hash.`,
       502,
       status,
@@ -1414,7 +1519,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   if (status.resourceUrl && status.resourceUrl !== paymentRequired.resource.url) {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       "x402 resume request does not match the approved resource URL.",
       409,
       { status, paymentRequired },
@@ -1422,7 +1527,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   if (status.merchantAddress && !sameAddress(status.merchantAddress, option.payTo)) {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       "x402 resume request does not match the approved merchant.",
       409,
       { status, selectedPayment: option },
@@ -1431,7 +1536,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
   }
   const optionChainId = chainIdFromNetwork(option.network);
   if (status.chainId && optionChainId && status.chainId !== optionChainId) {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       "x402 resume request does not match the approved network.",
       409,
       { status, selectedPayment: option },
@@ -1439,7 +1544,7 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   if (status.token && status.token !== "USDC") {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       "x402 resume request does not match the approved token.",
       409,
       { status, selectedPayment: option },
@@ -1447,9 +1552,9 @@ function assertCanResumeX402(status, paymentRequired, option) {
     );
   }
   const approvedAmount = status.amount ? normalizeDecimal(status.amount) : "";
-  const requestedAmount = normalizeDecimal(decimalFromUsdcAtomic(chunkCK4NLLMO_cjs.x402AuthorizationAmount(option)));
+  const requestedAmount = normalizeDecimal(decimalFromUsdcAtomic(chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option)));
   if (approvedAmount && approvedAmount !== requestedAmount) {
-    throw new chunkS42QSWJY_cjs.HavenApiError(
+    throw new chunk3SVPI4LS_cjs.HavenApiError(
       "x402 resume request does not match the approved amount.",
       409,
       { status, selectedPayment: option },
@@ -1464,6 +1569,10 @@ function readX402ReceiptPayer(raw) {
 }
 
 // src/x402-funding-leg.ts
+function sameX402TaskBudget(a, b) {
+  if (a === void 0 || b === void 0) return a === b;
+  return a.toLowerCase() === b.toLowerCase();
+}
 var X402FundingLeg = class {
   delegateKey;
   delegateAddress;
@@ -1489,25 +1598,40 @@ var X402FundingLeg = class {
     this.assertSignableAuthorizationState = options.assertSignableAuthorizationState;
   }
   // ── Receipt cache ────────────────────────────────────────────────
-  /** A still-valid cached receipt for this key, or undefined. */
-  cachedReceipt(idempotencyKey) {
+  /**
+   * #3392: each cached receipt records the authorizing budget id(s) it was
+   * created under (absent when none) — `taskBudgetId` since #3329, and since
+   * #3330 `subBudgetId` (agent B's grant). A call naming a DIFFERENT
+   * combination is refused here — before any network call — instead of
+   * silently returning a receipt paid under another budget. Absent-vs-absent
+   * and equal ids (case-insensitive) hit as before.
+   */
+  cachedReceipt(idempotencyKey, taskBudgetId, subBudgetId) {
     const cached = this.receiptCache.get(idempotencyKey);
-    if (cached && cached.expiresAt > Date.now()) return cached.receipt;
-    return void 0;
+    if (!cached || cached.expiresAt <= Date.now()) return void 0;
+    if (!sameX402TaskBudget(cached.taskBudgetId, taskBudgetId) || !sameX402TaskBudget(cached.subBudgetId, subBudgetId)) {
+      throw new chunk3SVPI4LS_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,
+        taskBudgetId
+      );
+    }
+    return cached.receipt;
   }
-  cacheReceipt(idempotencyKey, paymentHeader, receipt) {
+  cacheReceipt(idempotencyKey, paymentHeader, receipt, taskBudgetId, subBudgetId) {
     const expiresAt = getPaymentHeaderValidBefore(paymentHeader);
     if (expiresAt > Date.now()) {
-      this.receiptCache.set(idempotencyKey, { expiresAt, receipt });
+      this.receiptCache.set(idempotencyKey, { expiresAt, taskBudgetId, subBudgetId, receipt });
     }
   }
   // ── Authorization ────────────────────────────────────────────────
-  async authorize(paymentRequired, option, idempotencyKey, taskBudgetId) {
+  async authorize(paymentRequired, option, idempotencyKey, taskBudgetId, subBudgetId) {
     const raw = await this.post("/x402", {
       url: paymentRequired.resource.url,
       payTo: this.delegateAddress,
       merchantPayTo: option.payTo,
-      amount: chunkCK4NLLMO_cjs.x402AuthorizationAmount(option),
+      amount: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option),
       asset: option.asset,
       network: option.network,
       description: paymentRequired.resource.description,
@@ -1518,20 +1642,25 @@ var X402FundingLeg = class {
       settlementScheme: "eip3009",
       // #3329: `/x402` bodies are camelCase (`X402AuthorizeRequest`) — do not
       // switch this to `task_budget_id`, which is only the `POST /payments` key.
-      ...taskBudgetId ? { taskBudgetId } : {}
+      ...taskBudgetId ? { taskBudgetId } : {},
+      // #3330: same camelCase channel one level deeper — agent B pays through
+      // the sub-budget agent A granted it (`[funding, B grant, A parent-child,
+      // A budget]`). Mutually exclusive with `taskBudgetId` server-side; the
+      // backend refuses a body naming both.
+      ...subBudgetId ? { subBudgetId } : {}
     });
     const state = paymentStateFromRaw("x402 payment", raw);
-    const executedReplay = raw.success && raw.tx_hash ? "idempotency-collision" : state?.nextAction === chunkS42QSWJY_cjs.AgentPaymentNextAction.RetryOriginalX402Request ? "approval-resume" : null;
+    const executedReplay = raw.success && raw.tx_hash ? "idempotency-collision" : state?.nextAction === chunk3SVPI4LS_cjs.AgentPaymentNextAction.RetryOriginalX402Request ? "approval-resume" : null;
     if (executedReplay) {
       const canFund = await this.delegateCanFund(
         raw.chain_id ?? state?.chainId ?? chainIdFromNetwork(option.network),
         option.asset,
-        chunkCK4NLLMO_cjs.x402AuthorizationAmount(option)
+        chunkJ6DQEBK2_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 chunkS42QSWJY_cjs.X402AlreadySettledError(
+        throw new chunk3SVPI4LS_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"
@@ -1541,21 +1670,21 @@ var X402FundingLeg = class {
     const paymentHeader = await this.createPaymentHeader(paymentRequired, option);
     if (raw.success && raw.tx_hash) {
       const receipt2 = this.receiptFromAuthorization(paymentRequired, option, paymentHeader, raw);
-      this.cacheReceipt(idempotencyKey, paymentHeader, receipt2);
+      this.cacheReceipt(idempotencyKey, paymentHeader, receipt2, taskBudgetId, subBudgetId);
       return receipt2;
     }
-    if (state?.nextAction === chunkS42QSWJY_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
+    if (state?.nextAction === chunk3SVPI4LS_cjs.AgentPaymentNextAction.RetryOriginalX402Request) {
       const receipt2 = this.receiptFromStatus(paymentRequired, option, paymentHeader, state);
-      this.cacheReceipt(idempotencyKey, paymentHeader, receipt2);
+      this.cacheReceipt(idempotencyKey, paymentHeader, receipt2, taskBudgetId, subBudgetId);
       return receipt2;
     }
     this.assertSignableAuthorizationState("x402 payment", raw);
     if (!raw.sign_data?.hash) {
-      throw new chunkS42QSWJY_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
+      throw new chunk3SVPI4LS_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
     }
     const sig = await this.signForData(raw.sign_data, {
       asset: option.asset,
-      amount: chunkCK4NLLMO_cjs.x402AuthorizationAmount(option)
+      amount: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option)
     });
     const execResult = await this.post(
       `/payments/${raw.payment_id}/sign`,
@@ -1569,31 +1698,31 @@ var X402FundingLeg = class {
       execResult.chain_id ?? chainIdFromNetwork(option.network)
     );
     const receipt = this.receiptFromAuthorization(paymentRequired, option, paymentHeader, raw, execResult);
-    this.cacheReceipt(idempotencyKey, paymentHeader, receipt);
+    this.cacheReceipt(idempotencyKey, paymentHeader, receipt, taskBudgetId, subBudgetId);
     return receipt;
   }
   // ── Header minting ───────────────────────────────────────────────
   async createPaymentHeader(paymentRequired, option) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError("delegateKey is required to sign x402 payment headers.");
+      throw new chunk3SVPI4LS_cjs.HavenSigningError("delegateKey is required to sign x402 payment headers.");
     }
     const account = accounts.privateKeyToAccount(this.delegateKey);
-    const requirements = chunkCK4NLLMO_cjs.toStandardPaymentRequirements(paymentRequired, option);
+    const requirements = chunkJ6DQEBK2_cjs.toStandardPaymentRequirements(paymentRequired, option);
     const header = await schemes.exact.evm.createPaymentHeader(
       account,
       paymentRequired.x402Version,
       requirements
     );
     if (paymentRequired.x402Version < 2) return header;
-    const payment = chunkCK4NLLMO_cjs.decodeBase64Json(header);
-    return chunkCK4NLLMO_cjs.encodeBase64Json(chunkCK4NLLMO_cjs.x402V2PaymentEnvelope(paymentRequired, option, payment.payload));
+    const payment = chunkJ6DQEBK2_cjs.decodeBase64Json(header);
+    return chunkJ6DQEBK2_cjs.encodeBase64Json(chunkJ6DQEBK2_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(chunkCK4NLLMO_cjs.x402AuthorizationAmount(option));
+    const amount = execResult?.amount ?? raw.amount ?? decimalFromUsdcAtomic(chunkJ6DQEBK2_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;
@@ -1615,7 +1744,7 @@ var X402FundingLeg = class {
   }
   receiptFromStatus(paymentRequired, option, paymentHeader, status) {
     if (!status.txHash) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         `x402 payment ${status.paymentId} is ready to retry but has no Haven transaction hash.`,
         502,
         status,
@@ -1626,7 +1755,7 @@ var X402FundingLeg = class {
       paymentId: status.paymentId,
       txHash: status.txHash,
       token: status.token || "USDC",
-      amount: status.amount || decimalFromUsdcAtomic(chunkCK4NLLMO_cjs.x402AuthorizationAmount(option)),
+      amount: status.amount || decimalFromUsdcAtomic(chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option)),
       to: this.delegateAddress ?? "",
       resourceUrl: paymentRequired.resource.url,
       explorerUrl: explorerUrlOrEmpty(status.chainId, status.txHash),
@@ -1654,7 +1783,7 @@ var X402FundingLeg = class {
     const provider = createJsonRpcProvider(rpcUrl);
     const onChainReceipt = await provider.waitForTransaction(txHash, 1, timeoutMs);
     if (!onChainReceipt || onChainReceipt.status !== 1) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         "Funding tx did not confirm on-chain within the timeout window.",
         500,
         { txHash, chainId }
@@ -1703,7 +1832,7 @@ var X402FundingLeg = class {
 };
 function getPaymentHeaderValidBefore(paymentHeader) {
   try {
-    const payment = chunkCK4NLLMO_cjs.decodeBase64Json(
+    const payment = chunkJ6DQEBK2_cjs.decodeBase64Json(
       paymentHeader
     );
     const payload = payment.payload;
@@ -1758,7 +1887,7 @@ var X402Erc7710 = class {
    */
   async settle(paymentRequired, options = {}) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_cjs.HavenSigningError(
         "delegateKey is required for x402 payments. Pass it in the HavenClient config."
       );
     }
@@ -1783,21 +1912,21 @@ var X402Erc7710 = class {
   async prepare(paymentRequired, options = {}) {
     const delegationRail = options.delegationRail ?? (await this.getAgent()).executionRail === "delegation";
     if (!delegationRail) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_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 = chunkCK4NLLMO_cjs.selectX402SettlementScheme(paymentRequired.accepts, { delegationRail });
+    const selection = chunkJ6DQEBK2_cjs.selectX402SettlementScheme(paymentRequired.accepts, { delegationRail });
     if (!selection || selection.scheme !== "erc7710") {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_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 = chunkCK4NLLMO_cjs.x402AuthorizationAmount(option);
+    const amountAtomic = chunkJ6DQEBK2_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
@@ -1835,14 +1964,30 @@ var X402Erc7710 = class {
       ...options.mcpCallContext ? { mcpCallContext: options.mcpCallContext } : {},
       // #3329: `/x402` bodies are camelCase (`X402AuthorizeRequest`) — do not
       // switch this to `task_budget_id`, which is only the `POST /payments` key.
-      ...options.taskBudgetId ? { taskBudgetId: options.taskBudgetId } : {}
+      ...options.taskBudgetId ? { taskBudgetId: options.taskBudgetId } : {},
+      // #3330: same camelCase channel one level deeper; mutually exclusive
+      // with `taskBudgetId` server-side.
+      ...options.subBudgetId ? { subBudgetId: options.subBudgetId } : {}
     });
     if (!raw.payment_id) {
-      throw new chunkS42QSWJY_cjs.HavenApiError("No payment_id returned from x402/authorize", 500, raw);
+      throw new chunk3SVPI4LS_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 chunk3SVPI4LS_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 chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_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
@@ -1870,12 +2015,22 @@ var X402Erc7710 = class {
    * hosted boundary) is irrelevant here.
    */
   async submit(paymentId, signature) {
-    const settled = await this.post(
-      `/x402/${paymentId}/settle`,
-      { signature }
-    );
+    let settled;
+    try {
+      settled = await this.post(`/x402/${paymentId}/settle`, { signature });
+    } catch (err) {
+      const body = err instanceof chunk3SVPI4LS_cjs.HavenApiError ? err.body : void 0;
+      if (err instanceof chunk3SVPI4LS_cjs.HavenApiError && err.statusCode === 409 && body?.code === "payment_already_settled" && typeof body.tx_hash === "string") {
+        throw new chunk3SVPI4LS_cjs.X402Erc7710AlreadySettledError(
+          typeof body.payment_id === "string" ? body.payment_id : paymentId,
+          body.tx_hash,
+          body
+        );
+      }
+      throw err;
+    }
     if (!settled.payment_header) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         "x402 settle returned no payment_header \u2014 the merchant cannot be retried.",
         500,
         settled
@@ -1885,9 +2040,9 @@ var X402Erc7710 = class {
   }
 };
 function settlementExpectationFromQuote(settlement) {
-  const chainId = chunkS42QSWJY_cjs.chainIdForNetwork(settlement.network);
+  const chainId = chunk3SVPI4LS_cjs.chainIdForNetwork(settlement.network);
   if (chainId === void 0) {
-    throw new chunkS42QSWJY_cjs.HavenSigningError(
+    throw new chunk3SVPI4LS_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.`
     );
   }
@@ -1937,7 +2092,7 @@ function x402ToolReceipt(receipt) {
   };
 }
 function toolError(err) {
-  if (err instanceof chunkS42QSWJY_cjs.HavenPaymentStateError) {
+  if (err instanceof chunk3SVPI4LS_cjs.HavenPaymentStateError) {
     return {
       success: false,
       payment_id: err.state.paymentId,
@@ -1982,7 +2137,7 @@ function toolError(err) {
       error: err.message
     };
   }
-  if (err instanceof chunkS42QSWJY_cjs.HavenApiError) {
+  if (err instanceof chunk3SVPI4LS_cjs.HavenApiError) {
     return {
       success: false,
       status_code: err.statusCode,
@@ -2019,10 +2174,10 @@ var MerchantCompletion = class {
   }
   async retryRequest(url, initialInit, paymentRequired, receipt) {
     if (!receipt.accepted) {
-      throw new chunkS42QSWJY_cjs.HavenApiError("No accepted x402 option was recorded for payment retry", 500);
+      throw new chunk3SVPI4LS_cjs.HavenApiError("No accepted x402 option was recorded for payment retry", 500);
     }
     if (!receipt.paymentHeader) {
-      throw new chunkS42QSWJY_cjs.HavenApiError("No x402 payment header was returned for payment retry", 500);
+      throw new chunk3SVPI4LS_cjs.HavenApiError("No x402 payment header was returned for payment retry", 500);
     }
     const retryResponse = await this.merchantTransport.deliverPaymentRecoveringSession(
       url,
@@ -2047,7 +2202,7 @@ var MerchantCompletion = class {
           delegate_to: receipt.to
         }
       });
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         "x402 retry failed after Haven funded the delegate wallet; reconciliation may be required.",
         inBandRejection ? X402_RETRY_REJECTED_STATUS : merchant.merchant_status,
         {
@@ -2080,7 +2235,7 @@ var MerchantCompletion = class {
       merchantStatus: retryResponse.status,
       challengePayload: paymentRequired,
       selectedPayment: receipt.accepted,
-      paymentProofHeaderName: chunkCK4NLLMO_cjs.x402PaymentHeaderNamesSent(receipt.paymentHeader),
+      paymentProofHeaderName: chunkJ6DQEBK2_cjs.x402PaymentHeaderNamesSent(receipt.paymentHeader),
       paymentProofHeader: receipt.paymentHeader,
       protocolReceiptHeaderName,
       protocolReceiptHeader
@@ -2121,18 +2276,18 @@ var MerchantCompletion = class {
   async resolveCompletionContext(input) {
     const status = await this.getPaymentStatus(input.paymentId);
     if (status.rail !== "x402") {
-      throw new chunkS42QSWJY_cjs.HavenPaymentStateError(
+      throw new chunk3SVPI4LS_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 === chunkS42QSWJY_cjs.AgentPaymentNextAction.RetryOriginalX402Request || status.kind === "payment_intent" && status.status === "confirmed" && status.phase === chunkS42QSWJY_cjs.AgentPaymentPhase.PaymentConfirmed && status.nextAction === chunkS42QSWJY_cjs.AgentPaymentNextAction.None;
+    const readyForMerchantCompletion = input.noFundingLeg ? status.kind === "payment_intent" && status.status === "submitted" : status.nextAction === chunk3SVPI4LS_cjs.AgentPaymentNextAction.RetryOriginalX402Request || status.kind === "payment_intent" && status.status === "confirmed" && status.phase === chunk3SVPI4LS_cjs.AgentPaymentPhase.PaymentConfirmed && status.nextAction === chunk3SVPI4LS_cjs.AgentPaymentNextAction.None;
     if (!readyForMerchantCompletion) {
-      throw new chunkS42QSWJY_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
+      throw new chunk3SVPI4LS_cjs.HavenPaymentStateError(status.message, paymentStateStatusCode(status.status, 409), status);
     }
     if (!input.noFundingLeg && !status.txHash) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         `x402 payment ${status.paymentId} is ready for merchant completion but has no Haven transaction hash.`,
         502,
         status,
@@ -2141,7 +2296,7 @@ var MerchantCompletion = class {
     }
     const approvedResourceUrl = status.resourceUrl ?? status.x402?.resourceUrl ?? null;
     if (approvedResourceUrl && approvedResourceUrl !== input.url) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         "x402 merchant completion does not match the approved resource URL.",
         409,
         { status, url: input.url },
@@ -2227,7 +2382,7 @@ var MerchantCompletion = class {
    */
   async reportMerchantOutcome(input) {
     if (!Number.isInteger(input.merchantStatus) || input.merchantStatus < 100 || input.merchantStatus > 599) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         `merchant_status must be an integer HTTP status from 100 to 599 (received ${input.merchantStatus}).`,
         400,
         void 0,
@@ -2236,7 +2391,7 @@ var MerchantCompletion = class {
     }
     const looksAccepted = input.merchantStatus >= 200 && input.merchantStatus < 300;
     if (looksAccepted !== (input.outcome === "accepted")) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_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,
@@ -2245,14 +2400,14 @@ var MerchantCompletion = class {
     }
     const status = await this.getPaymentStatus(input.paymentId);
     if (status.rail !== "x402") {
-      throw new chunkS42QSWJY_cjs.HavenPaymentStateError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenPaymentStateError(
+      throw new chunk3SVPI4LS_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
@@ -2260,7 +2415,7 @@ var MerchantCompletion = class {
     }
     const resourceUrl = status.resourceUrl ?? status.x402?.resourceUrl ?? null;
     if (!resourceUrl) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         `Payment ${status.paymentId} has no recorded resource URL, so a merchant report cannot be stored.`,
         409,
         status,
@@ -2313,7 +2468,7 @@ var MerchantCompletion = class {
         await this.post("/machine-payments/evidence", body);
         return { outcome: "confirmed" };
       } catch (err) {
-        const statusCode = err instanceof chunkS42QSWJY_cjs.HavenApiError ? err.statusCode : void 0;
+        const statusCode = err instanceof chunk3SVPI4LS_cjs.HavenApiError ? err.statusCode : void 0;
         const retryable = statusCode === EVIDENCE_RETRYABLE_STATUS;
         if (!retryable) {
           return { outcome: "refused", statusCode: statusCode ?? 0 };
@@ -2350,7 +2505,7 @@ var MerchantCompletion = class {
    */
   async reportSettlementEvidence(paymentId, settlementTxHash) {
     if (isZeroSettlementTxHash(settlementTxHash)) {
-      throw new chunkS42QSWJY_cjs.HavenZeroSettlementHashError(paymentId);
+      throw new chunk3SVPI4LS_cjs.HavenZeroSettlementHashError(paymentId);
     }
     return this.reportEvidence({
       paymentId,
@@ -2370,7 +2525,7 @@ function parseMerchantSettlement(header) {
 }
 function parseProtocolReceiptHeader(value) {
   try {
-    return chunkCK4NLLMO_cjs.decodeBase64Json(value);
+    return chunkJ6DQEBK2_cjs.decodeBase64Json(value);
   } catch {
     try {
       return JSON.parse(value);
@@ -2387,7 +2542,7 @@ function x402TypedDataDigest(typedData) {
   try {
     return viem.hashTypedData(typedData);
   } catch (err) {
-    throw new chunkS42QSWJY_cjs.HavenSigningError(
+    throw new chunk3SVPI4LS_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)}`
     );
   }
@@ -2436,6 +2591,15 @@ var HavenClient = class {
   pollingInterval;
   chainRpcs;
   inFlightX402 = /* @__PURE__ */ new Map();
+  /**
+   * #3392: the task budget each in-flight x402 entry was created under
+   * (`undefined` = none). A call joining an in-flight entry under a
+   * different budget is refused before any network call — never silently
+   * charged to another budget's payment.
+   */
+  inFlightX402TaskBudget = /* @__PURE__ */ new Map();
+  /** #3330: the sub-budget each in-flight entry was created under, same pin as `inFlightX402TaskBudget`. */
+  inFlightX402SubBudget = /* @__PURE__ */ new Map();
   /**
    * The EIP-3009 funding-leg lifecycle (#1618). The facade holds a reference
    * and delegates; it does not reimplement any of it.
@@ -2469,7 +2633,7 @@ var HavenClient = class {
     });
     this.x402Wallet = config.x402Wallet;
     this.merchantTransport = new McpMerchantTransport({ merchantTimeout: config.merchantTimeout });
-    this.confirmationTimeout = config.confirmationTimeout ?? chunkS42QSWJY_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS;
+    this.confirmationTimeout = config.confirmationTimeout ?? chunk3SVPI4LS_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS;
     this.pollingInterval = config.pollingInterval ?? DEFAULT_POLLING_INTERVAL;
     this.chainRpcs = config.chainRpcs ?? {};
     if (this.delegateKey) {
@@ -2538,7 +2702,7 @@ var HavenClient = class {
    */
   async pay(request) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_cjs.HavenSigningError(
         "Cannot use pay() without a delegateKey. Use createIntent() + submitSignature() for manual signing."
       );
     }
@@ -2559,7 +2723,10 @@ var HavenClient = class {
       amount: request.amount,
       to: request.to,
       ...request.idempotencyKey ? { idempotency_key: request.idempotencyKey } : {},
-      ...request.taskBudgetId ? { task_budget_id: request.taskBudgetId } : {}
+      ...request.taskBudgetId ? { task_budget_id: request.taskBudgetId } : {},
+      // #3330: `POST /payments` is snake_case — agent B pays through the
+      // sub-budget A granted it; the backend refuses a body naming both ids.
+      ...request.subBudgetId ? { sub_budget_id: request.subBudgetId } : {}
     });
     if (raw.status === "pending_approval") {
       throwPaymentStateError("Payment", raw);
@@ -2588,15 +2755,15 @@ var HavenClient = class {
    * on-chain allowance — there is nothing to sign until the user approves.
    */
   async createX402Intent(paymentRequired, options = {}) {
-    const option = chunkCK4NLLMO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+    const option = chunkJ6DQEBK2_cjs.selectStandardPaymentOption(paymentRequired.accepts);
     if (!option) {
       throw noCompatiblePaymentOptionError(paymentRequired.accepts);
     }
     const fundingTo = options.delegateAddress ?? (await this.getAgent()).delegateAddress;
     if (!fundingTo) {
-      throw new chunkS42QSWJY_cjs.HavenApiError("Authenticated agent has no delegate address registered.", 502);
+      throw new chunk3SVPI4LS_cjs.HavenApiError("Authenticated agent has no delegate address registered.", 502);
     }
-    const idempotencyKey = options.idempotencyKey ?? chunkCK4NLLMO_cjs.buildX402IdempotencyKey(paymentRequired, option);
+    const idempotencyKey = options.idempotencyKey ?? chunkJ6DQEBK2_cjs.buildX402IdempotencyKey(paymentRequired, option);
     const raw = await this.post("/x402", {
       url: paymentRequired.resource.url,
       payTo: fundingTo,
@@ -2607,7 +2774,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: chunkCK4NLLMO_cjs.x402AuthorizationAmount(option),
+      amount: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option),
       asset: option.asset,
       network: option.network,
       description: paymentRequired.resource.description,
@@ -2623,21 +2790,24 @@ var HavenClient = class {
       // #3329: `/x402` bodies are camelCase (`X402AuthorizeRequest`), unlike
       // `POST /payments`'s snake_case `task_budget_id` above — the two
       // surfaces use different conventions, so this key is NOT `task_budget_id`.
-      ...options.taskBudgetId ? { taskBudgetId: options.taskBudgetId } : {}
+      ...options.taskBudgetId ? { taskBudgetId: options.taskBudgetId } : {},
+      // #3330: same camelCase channel one level deeper (`X402AuthorizeRequest`);
+      // mutually exclusive with `taskBudgetId` server-side.
+      ...options.subBudgetId ? { subBudgetId: options.subBudgetId } : {}
     });
     if (raw.status !== "pending_signature") {
       throwPaymentStateError("x402 payment", raw);
     }
     if (!raw.sign_data?.hash) {
-      throw new chunkS42QSWJY_cjs.HavenApiError("No sign_hash returned from x402/authorize", 500, raw);
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenApiError("No x402 expected-context binding returned from x402/authorize", 500, raw);
+      throw new chunk3SVPI4LS_cjs.HavenApiError("No x402 expected-context binding returned from x402/authorize", 500, raw);
     }
     return {
       paymentId: raw.payment_id,
@@ -2648,7 +2818,7 @@ var HavenClient = class {
       accepted: option,
       resourceUrl: paymentRequired.resource.url,
       merchantTo: raw.merchant_to ?? option.payTo,
-      amountAtomic: chunkCK4NLLMO_cjs.x402AuthorizationAmount(option),
+      amountAtomic: chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option),
       asset: option.asset,
       network: option.network,
       expectedAuth: raw.x402_expected_auth,
@@ -2673,13 +2843,13 @@ var HavenClient = class {
    */
   sign(hash) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_cjs.HavenSigningError(
         "Local signature verification failed \u2014 recovered address does not match delegate key."
       );
     }
@@ -2697,29 +2867,29 @@ var HavenClient = class {
    */
   async signForData(signData, settlementExpectation, fundingExpectation) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenSigningError(
+        throw new chunk3SVPI4LS_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)."
         );
       }
-      chunkS42QSWJY_cjs.assertUserOpTypedDataBinding(signData.typed_data, signData.hash);
-      chunkCK4NLLMO_cjs.assertBoundDirectPaymentUserOp(
+      chunk3SVPI4LS_cjs.assertUserOpTypedDataBinding(signData.typed_data, signData.hash);
+      chunkJ6DQEBK2_cjs.assertBoundDirectPaymentUserOp(
         signData.typed_data,
         this.delegateAddress
       );
       if (fundingExpectation) {
-        chunkCK4NLLMO_cjs.assertFundingLegPaysDelegate(signData.typed_data, {
+        chunkJ6DQEBK2_cjs.assertFundingLegPaysDelegate(signData.typed_data, {
           delegateAddress: this.delegateAddress,
           asset: fundingExpectation.asset,
           amount: fundingExpectation.amount
@@ -2729,24 +2899,24 @@ var HavenClient = class {
     }
     if (scheme === "eip712_delegation") {
       if (!signData.typed_data) {
-        throw new chunkS42QSWJY_cjs.HavenSigningError(
+        throw new chunk3SVPI4LS_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 chunkCK4NLLMO_cjs.HavenTypedDataRefusedError(
+        throw new chunkJ6DQEBK2_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."
         );
       }
-      chunkCK4NLLMO_cjs.assertOwnSettlementChild(signData.typed_data, settlementExpectation, this.delegateAddress);
+      chunkJ6DQEBK2_cjs.assertOwnSettlementChild(signData.typed_data, settlementExpectation, this.delegateAddress);
       return signSettlementDelegationTypedData(this.delegateKey, signData.typed_data);
     }
     if (scheme === void 0) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenSigningError(
+    throw new chunk3SVPI4LS_cjs.HavenSigningError(
       `Unknown sign_data.signature_scheme '${scheme}' \u2014 refusing to guess a signing scheme. Update @haven_ai/sdk.`
     );
   }
@@ -2930,7 +3100,7 @@ var HavenClient = class {
    */
   async getPaymentStatusWithPostPurchaseAllowance(paymentId) {
     const status = await this.getPaymentStatus(paymentId);
-    if (status.rail === chunkS42QSWJY_cjs.AgentPaymentRail.X402 && status.phase === chunkS42QSWJY_cjs.AgentPaymentPhase.PaymentConfirmed) {
+    if (status.rail === chunk3SVPI4LS_cjs.AgentPaymentRail.X402 && status.phase === chunk3SVPI4LS_cjs.AgentPaymentPhase.PaymentConfirmed) {
       const { allowance, warnings } = await this.getPostPurchaseAllowanceSummary(paymentId);
       return { ...status, allowance, ...warnings.length > 0 ? { warnings } : {} };
     }
@@ -3003,7 +3173,12 @@ var HavenClient = class {
   async listReceipts(options = {}) {
     return this.accountReads.listReceipts(options);
   }
-  /** #3128: one page of receipts with `total`, `hasMore` and `nextCursor`. */
+  /**
+   * One page of receipts with `total`, `hasMore` and `nextCursor` (#3128).
+   * `compact: true` (#3423) drops each row's
+   * `challengePayload`, `selectedPayment` and `protocolReceiptPayload`; the
+   * default shape is unchanged.
+   */
   async listReceiptsPage(options = {}) {
     return this.accountReads.listReceiptsPage(options);
   }
@@ -3128,7 +3303,7 @@ var HavenClient = class {
       }
       await sleep(this.pollingInterval);
     }
-    throw new chunkS42QSWJY_cjs.HavenTimeoutError(paymentId);
+    throw new chunk3SVPI4LS_cjs.HavenTimeoutError(paymentId);
   }
   // ── x402 Protocol Support ────────────────────────────────────────
   /**
@@ -3142,24 +3317,42 @@ var HavenClient = class {
    */
   async authorizeX402(paymentRequired, options = {}) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_cjs.HavenSigningError(
         "delegateKey is required for x402 payments. Pass it in the HavenClient config."
       );
     }
     if (!this.delegateAddress) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
+      throw new chunk3SVPI4LS_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
     }
-    const option = chunkCK4NLLMO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+    const option = chunkJ6DQEBK2_cjs.selectStandardPaymentOption(paymentRequired.accepts);
     if (!option) {
       throw noCompatiblePaymentOptionError(paymentRequired.accepts);
     }
-    const idempotencyKey = options.idempotencyKey ?? chunkCK4NLLMO_cjs.buildX402IdempotencyKey(paymentRequired, option);
-    const cached = this.fundingLeg.cachedReceipt(idempotencyKey);
+    const idempotencyKey = options.idempotencyKey ?? chunkJ6DQEBK2_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) return inFlight;
-    const promise = this.fundingLeg.authorize(paymentRequired, option, idempotencyKey, options.taskBudgetId);
+    if (inFlight) {
+      if (!sameX402TaskBudget(this.inFlightX402TaskBudget.get(idempotencyKey), options.taskBudgetId) || !sameX402TaskBudget(this.inFlightX402SubBudget.get(idempotencyKey), options.subBudgetId)) {
+        throw new chunk3SVPI4LS_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),
+          options.taskBudgetId
+        );
+      }
+      return inFlight;
+    }
+    const promise = this.fundingLeg.authorize(
+      paymentRequired,
+      option,
+      idempotencyKey,
+      options.taskBudgetId,
+      options.subBudgetId
+    );
     this.inFlightX402.set(idempotencyKey, promise);
+    this.inFlightX402TaskBudget.set(idempotencyKey, options.taskBudgetId);
+    this.inFlightX402SubBudget.set(idempotencyKey, options.subBudgetId);
     try {
       return await promise;
     } catch (err) {
@@ -3171,6 +3364,8 @@ var HavenClient = class {
       throw err;
     } finally {
       this.inFlightX402.delete(idempotencyKey);
+      this.inFlightX402TaskBudget.delete(idempotencyKey);
+      this.inFlightX402SubBudget.delete(idempotencyKey);
     }
   }
   /**
@@ -3193,16 +3388,16 @@ var HavenClient = class {
       } catch {
         body = void 0;
       }
-      throw new chunkS42QSWJY_cjs.X402UnexpectedStatusError(
+      throw new chunk3SVPI4LS_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 chunkS42QSWJY_cjs.HavenApiError("quoteX402 only supports standard x402 Payment Required responses.", 400);
+      throw new chunk3SVPI4LS_cjs.HavenApiError("quoteX402 only supports standard x402 Payment Required responses.", 400);
     }
-    const paymentRequired = await chunkCK4NLLMO_cjs.parsePaymentRequiredResponse(response);
+    const paymentRequired = await chunkJ6DQEBK2_cjs.parsePaymentRequiredResponse(response);
     const mcpTransport = await this.merchantTransport.detect(url, paymentRequired, response);
     return buildX402Quote(paymentRequired, request, options.idempotencyKey, mcpTransport);
   }
@@ -3220,7 +3415,7 @@ var HavenClient = class {
     const wallet = await this.merchantCompletion.resolveWalletForMerchantCall();
     const sessionId = await this.merchantTransport.initialize(url, init, wallet);
     if (!sessionId) {
-      throw new chunkS42QSWJY_cjs.HavenApiError(
+      throw new chunk3SVPI4LS_cjs.HavenApiError(
         "The merchant did not establish an MCP session before the x402 quote. No payment was created.",
         502,
         { mcpSessionNotEstablished: true }
@@ -3294,29 +3489,29 @@ var HavenClient = class {
   }
   async resumeAuthorizedX402(input) {
     if (!this.delegateKey) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError(
+      throw new chunk3SVPI4LS_cjs.HavenSigningError(
         "delegateKey is required for x402 payments. Pass it in the HavenClient config."
       );
     }
     if (!this.delegateAddress) {
-      throw new chunkS42QSWJY_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
+      throw new chunk3SVPI4LS_cjs.HavenSigningError("delegateAddress could not be derived from delegateKey.");
     }
-    const option = chunkCK4NLLMO_cjs.selectStandardPaymentOption(input.paymentRequired.accepts);
+    const option = chunkJ6DQEBK2_cjs.selectStandardPaymentOption(input.paymentRequired.accepts);
     if (!option) {
       throw noCompatiblePaymentOptionError(input.paymentRequired.accepts);
     }
-    const idempotencyKey = input.idempotencyKey ?? chunkCK4NLLMO_cjs.buildX402IdempotencyKey(input.paymentRequired, option);
-    const cached = this.fundingLeg.cachedReceipt(idempotencyKey);
+    const idempotencyKey = input.idempotencyKey ?? chunkJ6DQEBK2_cjs.buildX402IdempotencyKey(input.paymentRequired, option);
+    const cached = this.fundingLeg.cachedReceipt(idempotencyKey, input.taskBudgetId);
     if (cached) return cached;
     const status = await this.getPaymentStatus(input.paymentId);
     assertCanResumeX402(status, input.paymentRequired, option);
     const canFund = await this.fundingLeg.delegateCanFund(
       status.chainId ?? chainIdFromNetwork(option.network),
       option.asset,
-      chunkCK4NLLMO_cjs.x402AuthorizationAmount(option)
+      chunkJ6DQEBK2_cjs.x402AuthorizationAmount(option)
     );
     if (canFund === false) {
-      throw new chunkS42QSWJY_cjs.X402AlreadySettledError(
+      throw new chunk3SVPI4LS_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"
@@ -3324,7 +3519,7 @@ var HavenClient = class {
     }
     const paymentHeader = await this.fundingLeg.createPaymentHeader(input.paymentRequired, option);
     const receipt = this.fundingLeg.receiptFromStatus(input.paymentRequired, option, paymentHeader, status);
-    this.fundingLeg.cacheReceipt(idempotencyKey, paymentHeader, receipt);
+    this.fundingLeg.cacheReceipt(idempotencyKey, paymentHeader, receipt, input.taskBudgetId);
     return receipt;
   }
   async resumeX402Payment(input) {
@@ -3337,13 +3532,13 @@ var HavenClient = class {
     const url = input.url ?? input.request?.url;
     if (!paymentRequired) {
       if (!url) {
-        throw new chunkS42QSWJY_cjs.HavenApiError("x402 resume requires the original URL or a captured request snapshot.", 400);
+        throw new chunk3SVPI4LS_cjs.HavenApiError("x402 resume requires the original URL or a captured request snapshot.", 400);
       }
       const response = await this.merchantTransport.fetch(url, initialInit);
       if (response.status !== 402) {
-        throw new chunkS42QSWJY_cjs.HavenApiError("Expected the original x402 request to return HTTP 402 before resuming.", 400);
+        throw new chunk3SVPI4LS_cjs.HavenApiError("Expected the original x402 request to return HTTP 402 before resuming.", 400);
       }
-      paymentRequired = await chunkCK4NLLMO_cjs.parsePaymentRequiredResponse(response);
+      paymentRequired = await chunkJ6DQEBK2_cjs.parsePaymentRequiredResponse(response);
     }
     const receipt = await this.resumeAuthorizedX402({
       paymentId: input.paymentId,
@@ -3396,7 +3591,7 @@ var HavenClient = class {
       nativeChallenge = true;
     } else {
       try {
-        paymentRequired = await chunkCK4NLLMO_cjs.parsePaymentRequiredResponse(response);
+        paymentRequired = await chunkJ6DQEBK2_cjs.parsePaymentRequiredResponse(response);
       } catch {
         return response;
       }
@@ -3406,8 +3601,8 @@ var HavenClient = class {
       if (mcpSessionId) requestInit = this.merchantTransport.withSessionHeaders(requestInit, mcpSessionId);
     }
     const request = snapshotX402Request(url, requestInit);
-    const option = chunkCK4NLLMO_cjs.selectStandardPaymentOption(paymentRequired.accepts);
-    const idempotencyKey = options.idempotencyKey ?? (option ? chunkCK4NLLMO_cjs.buildX402IdempotencyKey(paymentRequired, option) : void 0);
+    const option = chunkJ6DQEBK2_cjs.selectStandardPaymentOption(paymentRequired.accepts);
+    const idempotencyKey = options.idempotencyKey ?? (option ? chunkJ6DQEBK2_cjs.buildX402IdempotencyKey(paymentRequired, option) : void 0);
     let receipt;
     try {
       receipt = await this.authorizeX402(paymentRequired, options);
@@ -3534,7 +3729,7 @@ var HavenClient = class {
           txHash: evidenceTxHash,
           resourceUrl: evidenceContext.resourceUrl,
           merchantStatus: surfaced.status,
-          paymentProofHeaderName: chunkCK4NLLMO_cjs.x402PaymentHeaderNamesSent(input.paymentHeader),
+          paymentProofHeaderName: chunkJ6DQEBK2_cjs.x402PaymentHeaderNamesSent(input.paymentHeader),
           paymentProofHeader: input.paymentHeader,
           protocolReceiptHeaderName,
           protocolReceiptHeader
@@ -3751,7 +3946,7 @@ var toolDescriptions = {
   // deleted `/demo/mpp/*` route. Use the x402 fragments above instead.
   getPaymentStatus: {
     summary: "Fetch structured Haven payment status for agent recovery.",
-    behavior: "State: phase, nextAction, rail, amount, merchant, resource, idempotency, message; parties: treasury/delegate/delegateAccount/merchant. awaiting_settlement_evidence: poll once, else unverified.",
+    behavior: "State: phase, nextAction, rail, amount, merchant, resource, idempotency, message; delivered when the merchant answered; parties: treasury/delegate/delegateAccount/merchant. awaiting_settlement_evidence: poll once, else unverified. delivered_unverified: terminal, stop.",
     nextActionGuidance: ""
   },
   getResumeState: {
@@ -3786,9 +3981,9 @@ var toolDescriptions = {
     nextActionGuidance: ""
   },
   verifyReceipt: {
-    summary: "Verify a payment receipt offline \u2014 confirm the agent authorised the transfer.",
-    selectionGuidance: "Use this to check a receipt you already hold; it needs no network and does not trust Haven. Use the history tool to fetch receipts in the first place.",
-    behavior: "Recovers the signer from the receipt authorisation and confirms it matches the agent delegate. Returns verified true/false with the recovered signer or a reason. Pure and local \u2014 no backend call.",
+    summary: "Verify a signed payment receipt offline \u2014 confirm the agent delegate signed its authorisation.",
+    selectionGuidance: "Takes the signed bundle from GET /payments/{id}/receipt, not a haven_list_receipts row \u2014 a row carries no signature and returns not_a_signed_receipt. No network.",
+    behavior: "Never throws. An erc7710 bundle verifies over the delegation digest the delegate signed; a direct or eip3009 bundle returns not_verifiable_offline. verified true means only that the delegate signed the hash named by verifiedOver \u2014 payment facts are Haven-asserted and settlement is not proven; check settlementTxHash on an explorer.",
     nextActionGuidance: ""
   },
   payMcpTool: {
@@ -4075,7 +4270,7 @@ Your user gives you a **budget on their own account** \u2014 not their wallet, a
 
 Four of the six steps are your user's \u2014 each needs a human signature or a human decision. The rest is yours. If they already have a funded account, start at step 3.
 
-1. **HUMAN \u2014 create the account.** Name, email, password, then a passkey (Face ID / Touch ID) or a wallet. Never offer to enter any of it: you must not have their password, and the passkey is bound to their device. With a terminal, \`npx @haven_ai/cli@<channel> login --api <api-url>\` afterwards gets you a scoped session for steps 3-4 (that flag or \`HAVEN_API_URL\`, on the first command \u2014 the session then remembers the backend; **the CLI's built-in default is Haven's hosted production backend**, so on any other deployment an omitted flag connects you somewhere real and wrong rather than failing) \u2014 they approve a code in the browser, you never hold their password. The \`<channel>\` in that command is the tag your deployment names \u2014 read it from \`/.well-known/haven.json\` (\`packages.cli.channel\`), never a tag you pick. Do not hold the process open while you wait: under \`--json\`, pass \`--no-wait\` to get the link object back at once, then poll it with \`haven login --poll <device_code>\` \u2014 one round per invocation, exit 3 while it is still pending, 0 once approved. It can set up agents and read the account; it cannot sign, approve a budget, move funds, or rotate any agent's keys.
+1. **HUMAN \u2014 create the account.** Name, email, password, then a passkey (Face ID / Touch ID) or a wallet. Never offer to enter any of it: you must not have their password, and the passkey is bound to their device. With a terminal, \`<packages.cli.one_liner> login --api <api-url>\` afterwards gets you a scoped session for steps 3-4 (that flag or \`HAVEN_API_URL\`, on the first command \u2014 the session then remembers the backend; **the CLI's built-in default is Haven's hosted production backend**, so on any other deployment an omitted flag connects you somewhere real and wrong rather than failing) \u2014 they approve a code in the browser, you never hold their password. That command is the manifest's \`packages.cli.one_liner\` (\`/.well-known/haven.json\`) \u2014 run it as given: \`packages.cli.channel\` serves the full spec. Do not hold the process open while you wait: under \`--json\`, pass \`--no-wait\` to get the link object back at once, then poll it with \`haven login --poll <device_code>\` \u2014 one round per invocation, exit 3 while it is still pending, 0 once approved. It can set up agents and read the account; it cannot sign, approve a budget, move funds, or rotate any agent's keys.
 2. **HUMAN \u2014 fund it.** USDC only, no ETH: Haven sponsors the gas. \`/.well-known/haven.json\` names \`chains.default\` as the deployment's expected chain, but after login \`haven wallets funding\` prints the address, the amount and which chain in one place; confirm that chain before you message your user. Without a CLI session, the dashboard's funding card shows the address and amount and its Receive-funds screen names the chain; never assume one: a testnet deployment and production both call themselves Haven. Before you write that message, read the manifest: \`environment\` says whether this deployment is \`production\`, and each \`chains.supported\` entry says whether that chain is a \`testnet\`. Real money is at stake only on a non-testnet chain of a \`production\` deployment \u2014 tell your user which case theirs is.
 3. **HUMAN \u2014 create the agent, set its budget**, and paste you the **setup prompt** it hands back. With a CLI session (step 1) you can do this step yourself: \`haven agents connect --name <n> --budget <amount> --token USDC --period <minutes>\` prints the same connector command and approval link; add \`--run\` to do step 4 too.
 4. **YOU \u2014 run the connector command** in that prompt (below). It makes your signing key locally, registering only the public address.
@@ -4153,7 +4348,7 @@ Nothing here needs you to. Steps 1-3 are links: hand your user the full \`<host>
 
 ## If something breaks
 
-If a Haven result carries \`client_update\`, that client is out of date: update it \u2014 \`upgrade_command\` names the package and channel \u2014 then retry. \`required: true\` means payments are refused until you do. What changed: [/releases](/releases).
+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. What changed: [/releases](/releases).
 
 ## Vocabulary
 
@@ -4173,12 +4368,12 @@ Start by reading {{HAVEN_ORIGIN}}/for-agents.md \u2014 it is written for you and
 
 Then:
 
-1. Run \`npx @haven_ai/cli@<channel> login\`. The \`<channel>\` in that command is the tag your deployment names \u2014 read it from \`/.well-known/haven.json\` (\`packages.cli.channel\`), never a tag you pick. It prints a link and a code and does not need my password \u2014 it must never ask for it. Give me the link straight away and wait for me to approve it in my browser.
+1. Run \`<packages.cli.one_liner> login\`. That command is the manifest's \`packages.cli.one_liner\` (\`/.well-known/haven.json\`) \u2014 run it as given: \`packages.cli.channel\` serves the full spec. It prints a link and a code and does not need my password \u2014 it must never ask for it. Give me the link straight away and wait for me to approve it in my browser.
 2. Once I have approved, run \`haven agents connect --name <a name you choose> --budget <amount> --token USDC --period <minutes>\` with the budget I tell you. If I have not given you one, ask me before running it. Add \`--run\` to complete the connection in the same step.
 3. ${AGENT_APPROVAL_RELAY_JSON_SENTENCE}
 4. Once I have approved the budget, verify with the \`haven_get_agent\` tool: \`ready\` means you can pay, \`needs_approval\` means my approval has not landed yet.
 
-Two things only I can do: approving that budget with my passkey, and funding the account with USDC on Base \u2014 no ETH, Haven sponsors the gas. Tell me if either is missing rather than working around it.
+Two things only I can do: approving that budget with my passkey, and funding the account with USDC \u2014 no ETH, Haven sponsors the gas. Tell me if either is missing rather than working around it.
 
 ${AGENT_SECRET_HYGIENE_SENTENCE}`;
 
@@ -4322,28 +4517,43 @@ the budget in the Haven dashboard, or wait for the period reset.
 4. Then FOLLOW THE RESPONSE'S GUIDANCE FIELDS: \`next_action\`, \`next_tool\`,
    and \`next_arguments\` name the exact next call \u2014 act on those first; the
    prose in this section is fallback and debugging detail. If the catalog
-   entry is missing or degraded, the response instead names
-   \`mcp__haven__haven_pay_mcp_tool\` (merchant URL, tool name, arguments) as
-   the manual fallback.
+   row is a plain-HTTP x402 paywall (no MCP tool metadata), the response
+   instead names \`mcp__haven__haven_quote_x402\` with the entry's resource
+   URL as \`url\`. If an MCP row is degraded or has no tool name, the response
+   instead names \`mcp__haven__haven_pay_mcp_tool\` (merchant URL, tool name,
+   arguments) as the manual fallback.
 
-**Signing:** \`mcp__haven-signer__haven_sign_x402\` with \`payment_id\` ONLY \u2014
+**Signing:** which signer tool to call depends on the settlement scheme the
+prepare/pay response already named as \`next_tool\` \u2014 follow that field, never
+hard-code a choice. **erc7710** (direct settlement \u2014 chosen per merchant when
+its 402 advertises \`assetTransferMethod: "erc7710"\` AND your account is on
+the delegation rail; never a blanket default): \`mcp__haven-signer__haven_sign\`
+with \`payment_id\` ONLY; the signer fetches the settlement child itself.
+**EIP-3009** (the bridge \u2014 used otherwise, whenever the merchant offers a
+standard entry): \`mcp__haven-signer__haven_sign_x402\` with \`payment_id\` ONLY \u2014
 the local signer fetches the exact signing bytes AND \`payment_required\`
-itself, so never relay \`typed_data\` or the 402 blob yourself. If the signer
-reports its fetched context carried no \`payment_required\` (older backend),
-re-call with \`payment_required\` added verbatim. Fallback for an older signer
-or backend: re-run the quote/prepare tool with the SAME \`idempotency_key\`
-plus \`include_signing_payload=true\`, then pass \`payload_hash\`,
-\`x402_expected\` (the nested \`x402.expected\` object), and
+itself, so never relay \`typed_data\` or the 402 blob yourself. A merchant
+that advertises ONLY erc7710 against an account that is NOT on the
+delegation rail is refused outright \u2014 it does not fall back to EIP-3009. If
+the signer reports its fetched context carried no \`payment_required\` (older
+backend), re-call with \`payment_required\` added verbatim. Fallback for an
+older signer or backend: re-run the quote/prepare tool with the SAME
+\`idempotency_key\` plus \`include_signing_payload=true\`, then pass
+\`payload_hash\`, \`x402_expected\` (the nested \`x402.expected\` object), and
 \`typed_data\`/\`typed_data_b64\` through unchanged.
 
-**Settle:** \`mcp__haven__haven_settle_mcp_tool\` with \`payment_id\`,
-\`signature\`, and \`payment_header\` ONLY \u2014 Haven rehydrates the merchant call
+**Settle:** \`mcp__haven__haven_settle_mcp_tool\` with \`payment_id\` and
+\`signature\` always. On **erc7710**, pass no \`payment_header\` \u2014 Haven
+assembles it at settle, so there is nothing to build locally and no funding
+transaction to wait for. On **EIP-3009**, also pass \`payment_header\` (from
+\`haven_sign_x402\`) ONLY. Either way Haven rehydrates the merchant call
 context (\`merchant_url\`, \`tool_name\`, \`arguments\`, \`mcp_transport\`)
 server-side from \`payment_id\`. Pass those four fields explicitly only as a
 version-skew fallback when Haven has no stored context for the id \u2014 both or
-none together, never just one. If the settle result carries \`settled: false\`,
-funding has not confirmed \u2014 follow the result's guidance fields and check
-status later, do not re-pay.
+none together, never just one. On **EIP-3009**, \`settled: false\` means
+funding has not confirmed; on **erc7710** it means the merchant delivered but
+settlement is not yet verified. Either way, follow the result's guidance
+fields and do not re-pay.
 
 Step-by-step alternative (also key-safe; for an older signer or backend, or
 when you already have a merchant URL and tool name instead of a
@@ -4535,455 +4745,475 @@ function sameUrl(a, b) {
 
 Object.defineProperty(exports, "DEFAULT_NEXT_TOOL_BY_ACTION", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.DEFAULT_NEXT_TOOL_BY_ACTION; }
+  get: function () { return chunkJ6DQEBK2_cjs.DEFAULT_NEXT_TOOL_BY_ACTION; }
 });
 Object.defineProperty(exports, "ERC7710_ASSET_TRANSFER_METHOD", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.ERC7710_ASSET_TRANSFER_METHOD; }
+  get: function () { return chunkJ6DQEBK2_cjs.ERC7710_ASSET_TRANSFER_METHOD; }
 });
 Object.defineProperty(exports, "HAVEN_CLIENT_HEADER", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.HAVEN_CLIENT_HEADER; }
+  get: function () { return chunkJ6DQEBK2_cjs.HAVEN_CLIENT_HEADER; }
 });
 Object.defineProperty(exports, "HAVEN_MINIMUM_NODE_VERSION", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.HAVEN_MINIMUM_NODE_VERSION; }
+  get: function () { return chunkJ6DQEBK2_cjs.HAVEN_MINIMUM_NODE_VERSION; }
 });
 Object.defineProperty(exports, "HavenTypedDataRefusedError", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.HavenTypedDataRefusedError; }
+  get: function () { return chunkJ6DQEBK2_cjs.HavenTypedDataRefusedError; }
 });
 Object.defineProperty(exports, "MAX_TASK_BUDGET_TTL_SECONDS", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.MAX_TASK_BUDGET_TTL_SECONDS; }
+  get: function () { return chunkJ6DQEBK2_cjs.MAX_TASK_BUDGET_TTL_SECONDS; }
 });
 Object.defineProperty(exports, "NEXT_TOOL_SERVER_NAMES", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.NEXT_TOOL_SERVER_NAMES; }
+  get: function () { return chunkJ6DQEBK2_cjs.NEXT_TOOL_SERVER_NAMES; }
 });
 Object.defineProperty(exports, "NEXT_TOOL_SERVER_ROLES", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.NEXT_TOOL_SERVER_ROLES; }
+  get: function () { return chunkJ6DQEBK2_cjs.NEXT_TOOL_SERVER_ROLES; }
 });
 Object.defineProperty(exports, "SDK_CLIENT_IDENTITY", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.SDK_CLIENT_IDENTITY; }
+  get: function () { return chunkJ6DQEBK2_cjs.SDK_CLIENT_IDENTITY; }
 });
 Object.defineProperty(exports, "SDK_VERSION", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.SDK_VERSION; }
+  get: function () { return chunkJ6DQEBK2_cjs.SDK_VERSION; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_CHAIN_ID", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.SWEEP_BASE_CHAIN_ID; }
+  get: function () { return chunkJ6DQEBK2_cjs.SWEEP_BASE_CHAIN_ID; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_SEPOLIA_CHAIN_ID", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.SWEEP_BASE_SEPOLIA_CHAIN_ID; }
+  get: function () { return chunkJ6DQEBK2_cjs.SWEEP_BASE_SEPOLIA_CHAIN_ID; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_SEPOLIA_USDC_ADDRESS", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.SWEEP_BASE_SEPOLIA_USDC_ADDRESS; }
+  get: function () { return chunkJ6DQEBK2_cjs.SWEEP_BASE_SEPOLIA_USDC_ADDRESS; }
 });
 Object.defineProperty(exports, "SWEEP_BASE_USDC_ADDRESS", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.SWEEP_BASE_USDC_ADDRESS; }
+  get: function () { return chunkJ6DQEBK2_cjs.SWEEP_BASE_USDC_ADDRESS; }
 });
 Object.defineProperty(exports, "TRANSFER_WITH_AUTHORIZATION_TYPES", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.TRANSFER_WITH_AUTHORIZATION_TYPES; }
+  get: function () { return chunkJ6DQEBK2_cjs.TRANSFER_WITH_AUTHORIZATION_TYPES; }
 });
 Object.defineProperty(exports, "TYPED_DATA_NOT_ALLOWED", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.TYPED_DATA_NOT_ALLOWED; }
+  get: function () { return chunkJ6DQEBK2_cjs.TYPED_DATA_NOT_ALLOWED; }
 });
 Object.defineProperty(exports, "X402PaymentHeaderValidationError", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402PaymentHeaderValidationError; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402PaymentHeaderValidationError; }
 });
 Object.defineProperty(exports, "X402_LEGACY_PAYMENT_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_LEGACY_PAYMENT_HEADER_NAME; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_LEGACY_PAYMENT_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_MAX_AUTHORIZATION_WINDOW_SECONDS", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_MAX_AUTHORIZATION_WINDOW_SECONDS; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_MAX_AUTHORIZATION_WINDOW_SECONDS; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_PAYMENT_HEADER_NAME; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_PAYMENT_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_HEADER_NAMES_SENT", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_PAYMENT_HEADER_NAMES_SENT; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_PAYMENT_HEADER_NAMES_SENT; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_REQUIRED_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_PAYMENT_REQUIRED_HEADER_NAME; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_PAYMENT_REQUIRED_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_PAYMENT_RESPONSE_HEADER_NAME", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_PAYMENT_RESPONSE_HEADER_NAME; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_PAYMENT_RESPONSE_HEADER_NAME; }
 });
 Object.defineProperty(exports, "X402_SETTLEMENT_FORWARD_MARGIN_SECONDS", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.X402_SETTLEMENT_FORWARD_MARGIN_SECONDS; }
+  get: function () { return chunkJ6DQEBK2_cjs.X402_SETTLEMENT_FORWARD_MARGIN_SECONDS; }
 });
 Object.defineProperty(exports, "assertBoundDirectPaymentUserOp", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.assertBoundDirectPaymentUserOp; }
+  get: function () { return chunkJ6DQEBK2_cjs.assertBoundDirectPaymentUserOp; }
 });
 Object.defineProperty(exports, "assertOwnTaskBudgetCloseUserOp", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.assertOwnTaskBudgetCloseUserOp; }
+  get: function () { return chunkJ6DQEBK2_cjs.assertOwnTaskBudgetCloseUserOp; }
 });
 Object.defineProperty(exports, "assertOwnTaskChild", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.assertOwnTaskChild; }
+  get: function () { return chunkJ6DQEBK2_cjs.assertOwnTaskChild; }
 });
 Object.defineProperty(exports, "buildSweepAuthorizationMessage", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.buildSweepAuthorizationMessage; }
+  get: function () { return chunkJ6DQEBK2_cjs.buildSweepAuthorizationMessage; }
 });
 Object.defineProperty(exports, "buildSweepTypedData", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.buildSweepTypedData; }
+  get: function () { return chunkJ6DQEBK2_cjs.buildSweepTypedData; }
 });
 Object.defineProperty(exports, "buildX402ExpectedMessage", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.buildX402ExpectedMessage; }
+  get: function () { return chunkJ6DQEBK2_cjs.buildX402ExpectedMessage; }
 });
 Object.defineProperty(exports, "compareNodeVersions", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.compareNodeVersions; }
+  get: function () { return chunkJ6DQEBK2_cjs.compareNodeVersions; }
 });
 Object.defineProperty(exports, "createNextStepBuilder", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.createNextStepBuilder; }
+  get: function () { return chunkJ6DQEBK2_cjs.createNextStepBuilder; }
 });
 Object.defineProperty(exports, "decodeBase64Json", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.decodeBase64Json; }
+  get: function () { return chunkJ6DQEBK2_cjs.decodeBase64Json; }
 });
 Object.defineProperty(exports, "decodeBase64Utf8", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.decodeBase64Utf8; }
+  get: function () { return chunkJ6DQEBK2_cjs.decodeBase64Utf8; }
 });
 Object.defineProperty(exports, "defaultNextToolFor", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.defaultNextToolFor; }
+  get: function () { return chunkJ6DQEBK2_cjs.defaultNextToolFor; }
 });
 Object.defineProperty(exports, "encodeBase64Json", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.encodeBase64Json; }
+  get: function () { return chunkJ6DQEBK2_cjs.encodeBase64Json; }
 });
 Object.defineProperty(exports, "encodeBase64Utf8", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.encodeBase64Utf8; }
+  get: function () { return chunkJ6DQEBK2_cjs.encodeBase64Utf8; }
 });
 Object.defineProperty(exports, "encodePaymentProof", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.encodePaymentProof; }
+  get: function () { return chunkJ6DQEBK2_cjs.encodePaymentProof; }
 });
 Object.defineProperty(exports, "hashDelegation", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.hashDelegation; }
+  get: function () { return chunkJ6DQEBK2_cjs.hashDelegation; }
 });
 Object.defineProperty(exports, "havenClientIdentity", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.havenClientIdentity; }
+  get: function () { return chunkJ6DQEBK2_cjs.havenClientIdentity; }
 });
 Object.defineProperty(exports, "isErc7710Option", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.isErc7710Option; }
+  get: function () { return chunkJ6DQEBK2_cjs.isErc7710Option; }
 });
 Object.defineProperty(exports, "isSupportedNodeVersion", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.isSupportedNodeVersion; }
+  get: function () { return chunkJ6DQEBK2_cjs.isSupportedNodeVersion; }
 });
 Object.defineProperty(exports, "isSweepableChain", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.isSweepableChain; }
+  get: function () { return chunkJ6DQEBK2_cjs.isSweepableChain; }
 });
 Object.defineProperty(exports, "isTaskChildTypedData", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.isTaskChildTypedData; }
+  get: function () { return chunkJ6DQEBK2_cjs.isTaskChildTypedData; }
 });
 Object.defineProperty(exports, "normalizePaymentRequired", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.normalizePaymentRequired; }
+  get: function () { return chunkJ6DQEBK2_cjs.normalizePaymentRequired; }
 });
 Object.defineProperty(exports, "parseNextTool", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.parseNextTool; }
+  get: function () { return chunkJ6DQEBK2_cjs.parseNextTool; }
 });
 Object.defineProperty(exports, "parsePaymentRequired", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.parsePaymentRequired; }
+  get: function () { return chunkJ6DQEBK2_cjs.parsePaymentRequired; }
 });
 Object.defineProperty(exports, "parsePaymentRequiredResponse", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.parsePaymentRequiredResponse; }
+  get: function () { return chunkJ6DQEBK2_cjs.parsePaymentRequiredResponse; }
 });
 Object.defineProperty(exports, "readClientUpdate", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.readClientUpdate; }
+  get: function () { return chunkJ6DQEBK2_cjs.readClientUpdate; }
 });
 Object.defineProperty(exports, "renderNextTool", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.renderNextTool; }
+  get: function () { return chunkJ6DQEBK2_cjs.renderNextTool; }
+});
+Object.defineProperty(exports, "resolveTokenBySymbol", {
+  enumerable: true,
+  get: function () { return chunkJ6DQEBK2_cjs.resolveTokenBySymbol; }
 });
 Object.defineProperty(exports, "resolveTokenFromAddress", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.resolveTokenFromAddress; }
+  get: function () { return chunkJ6DQEBK2_cjs.resolveTokenFromAddress; }
 });
 Object.defineProperty(exports, "selectErc7710PaymentOption", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.selectErc7710PaymentOption; }
+  get: function () { return chunkJ6DQEBK2_cjs.selectErc7710PaymentOption; }
 });
 Object.defineProperty(exports, "selectPaymentOption", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.selectPaymentOption; }
+  get: function () { return chunkJ6DQEBK2_cjs.selectPaymentOption; }
 });
 Object.defineProperty(exports, "selectStandardPaymentOption", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.selectStandardPaymentOption; }
+  get: function () { return chunkJ6DQEBK2_cjs.selectStandardPaymentOption; }
 });
 Object.defineProperty(exports, "selectX402SettlementScheme", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.selectX402SettlementScheme; }
+  get: function () { return chunkJ6DQEBK2_cjs.selectX402SettlementScheme; }
 });
 Object.defineProperty(exports, "sweepUsdcAddress", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.sweepUsdcAddress; }
+  get: function () { return chunkJ6DQEBK2_cjs.sweepUsdcAddress; }
 });
 Object.defineProperty(exports, "sweepUsdcDomain", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.sweepUsdcDomain; }
+  get: function () { return chunkJ6DQEBK2_cjs.sweepUsdcDomain; }
 });
 Object.defineProperty(exports, "toStandardPaymentRequirements", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.toStandardPaymentRequirements; }
+  get: function () { return chunkJ6DQEBK2_cjs.toStandardPaymentRequirements; }
 });
 Object.defineProperty(exports, "unsupportedNodeVersionMessage", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.unsupportedNodeVersionMessage; }
+  get: function () { return chunkJ6DQEBK2_cjs.unsupportedNodeVersionMessage; }
 });
 Object.defineProperty(exports, "validateStandardX402PaymentHeader", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.validateStandardX402PaymentHeader; }
+  get: function () { return chunkJ6DQEBK2_cjs.validateStandardX402PaymentHeader; }
 });
 Object.defineProperty(exports, "x402AssetTransferMethod", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.x402AssetTransferMethod; }
+  get: function () { return chunkJ6DQEBK2_cjs.x402AssetTransferMethod; }
 });
 Object.defineProperty(exports, "x402AuthorizationAmount", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.x402AuthorizationAmount; }
+  get: function () { return chunkJ6DQEBK2_cjs.x402AuthorizationAmount; }
 });
 Object.defineProperty(exports, "x402FacilitatorAddresses", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.x402FacilitatorAddresses; }
+  get: function () { return chunkJ6DQEBK2_cjs.x402FacilitatorAddresses; }
 });
 Object.defineProperty(exports, "x402V2PaymentEnvelope", {
   enumerable: true,
-  get: function () { return chunkCK4NLLMO_cjs.x402V2PaymentEnvelope; }
+  get: function () { return chunkJ6DQEBK2_cjs.x402V2PaymentEnvelope; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_FAILURE_CODE_VALUES", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AGENT_PAYMENT_FAILURE_CODE_VALUES; }
+  get: function () { return chunk3SVPI4LS_cjs.AGENT_PAYMENT_FAILURE_CODE_VALUES; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_NEXT_ACTION_VALUES", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AGENT_PAYMENT_NEXT_ACTION_VALUES; }
+  get: function () { return chunk3SVPI4LS_cjs.AGENT_PAYMENT_NEXT_ACTION_VALUES; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_PHASE_VALUES", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AGENT_PAYMENT_PHASE_VALUES; }
+  get: function () { return chunk3SVPI4LS_cjs.AGENT_PAYMENT_PHASE_VALUES; }
 });
 Object.defineProperty(exports, "AGENT_PAYMENT_RAIL_VALUES", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AGENT_PAYMENT_RAIL_VALUES; }
+  get: function () { return chunk3SVPI4LS_cjs.AGENT_PAYMENT_RAIL_VALUES; }
 });
 Object.defineProperty(exports, "AgentPaymentFailureCode", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentFailureCode; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentFailureCode; }
 });
 Object.defineProperty(exports, "AgentPaymentFailureCodeDescriptions", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentFailureCodeDescriptions; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentFailureCodeDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentFailureCodeSchema", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentFailureCodeSchema; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentFailureCodeSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentNextAction", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentNextAction; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentNextAction; }
 });
 Object.defineProperty(exports, "AgentPaymentNextActionDescriptions", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentNextActionDescriptions; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentNextActionDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentNextActionSchema", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentNextActionSchema; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentNextActionSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentPhase", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentPhase; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentPhase; }
 });
 Object.defineProperty(exports, "AgentPaymentPhaseDescriptions", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentPhaseDescriptions; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentPhaseDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentPhaseSchema", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentPhaseSchema; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentPhaseSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentRail", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentRail; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentRail; }
 });
 Object.defineProperty(exports, "AgentPaymentRailDescriptions", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentRailDescriptions; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentRailDescriptions; }
 });
 Object.defineProperty(exports, "AgentPaymentRailSchema", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentRailSchema; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentRailSchema; }
 });
 Object.defineProperty(exports, "AgentPaymentWarningCode", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.AgentPaymentWarningCode; }
+  get: function () { return chunk3SVPI4LS_cjs.AgentPaymentWarningCode; }
 });
 Object.defineProperty(exports, "CONNECTOR_PACKAGE_NAME", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.CONNECTOR_PACKAGE_NAME; }
+  get: function () { return chunk3SVPI4LS_cjs.CONNECTOR_PACKAGE_NAME; }
 });
 Object.defineProperty(exports, "DEFAULT_CONFIRMATION_TIMEOUT_MS", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS; }
+  get: function () { return chunk3SVPI4LS_cjs.DEFAULT_CONFIRMATION_TIMEOUT_MS; }
 });
 Object.defineProperty(exports, "DIRECT_SIGN_CONTEXT_VERSION", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.DIRECT_SIGN_CONTEXT_VERSION; }
+  get: function () { return chunk3SVPI4LS_cjs.DIRECT_SIGN_CONTEXT_VERSION; }
 });
 Object.defineProperty(exports, "ENTRY_POINT_V07", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.ENTRY_POINT_V07; }
+  get: function () { return chunk3SVPI4LS_cjs.ENTRY_POINT_V07; }
 });
 Object.defineProperty(exports, "HAVEN_CONNECTOR_CHANNEL", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HAVEN_CONNECTOR_CHANNEL; }
+  get: function () { return chunk3SVPI4LS_cjs.HAVEN_CONNECTOR_CHANNEL; }
 });
 Object.defineProperty(exports, "HYBRID_DELEGATOR_DOMAIN_NAME", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HYBRID_DELEGATOR_DOMAIN_NAME; }
+  get: function () { return chunk3SVPI4LS_cjs.HYBRID_DELEGATOR_DOMAIN_NAME; }
 });
 Object.defineProperty(exports, "HYBRID_DELEGATOR_DOMAIN_VERSION", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HYBRID_DELEGATOR_DOMAIN_VERSION; }
+  get: function () { return chunk3SVPI4LS_cjs.HYBRID_DELEGATOR_DOMAIN_VERSION; }
 });
 Object.defineProperty(exports, "HavenApiError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenApiError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenApiError; }
 });
 Object.defineProperty(exports, "HavenError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenError; }
 });
 Object.defineProperty(exports, "HavenPaymentStateError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenPaymentStateError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenPaymentStateError; }
 });
 Object.defineProperty(exports, "HavenSigningError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenSigningError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenSigningError; }
 });
 Object.defineProperty(exports, "HavenTimeoutError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenTimeoutError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenTimeoutError; }
 });
 Object.defineProperty(exports, "HavenUnsupportedSignerVersionError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenUnsupportedSignerVersionError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenUnsupportedSignerVersionError; }
 });
 Object.defineProperty(exports, "HavenUserOpBindingError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenUserOpBindingError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenUserOpBindingError; }
 });
 Object.defineProperty(exports, "HavenZeroSettlementHashError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.HavenZeroSettlementHashError; }
+  get: function () { return chunk3SVPI4LS_cjs.HavenZeroSettlementHashError; }
 });
 Object.defineProperty(exports, "MerchantTimeoutError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.MerchantTimeoutError; }
+  get: function () { return chunk3SVPI4LS_cjs.MerchantTimeoutError; }
 });
 Object.defineProperty(exports, "PACKED_USER_OPERATION_FIELDS", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.PACKED_USER_OPERATION_FIELDS; }
+  get: function () { return chunk3SVPI4LS_cjs.PACKED_USER_OPERATION_FIELDS; }
 });
 Object.defineProperty(exports, "ROOT_AUTHORITY", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.ROOT_AUTHORITY; }
+  get: function () { return chunk3SVPI4LS_cjs.ROOT_AUTHORITY; }
 });
 Object.defineProperty(exports, "SIGNER_UPDATE_FALLBACK", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.SIGNER_UPDATE_FALLBACK; }
+  get: function () { return chunk3SVPI4LS_cjs.SIGNER_UPDATE_FALLBACK; }
 });
 Object.defineProperty(exports, "SignerRefusalCode", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.SignerRefusalCode; }
+  get: function () { return chunk3SVPI4LS_cjs.SignerRefusalCode; }
+});
+Object.defineProperty(exports, "TASK_SIGN_CONTEXT_VERSION", {
+  enumerable: true,
+  get: function () { return chunk3SVPI4LS_cjs.TASK_SIGN_CONTEXT_VERSION; }
 });
 Object.defineProperty(exports, "X402AlreadySettledError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.X402AlreadySettledError; }
+  get: function () { return chunk3SVPI4LS_cjs.X402AlreadySettledError; }
+});
+Object.defineProperty(exports, "X402Erc7710AlreadySettledError", {
+  enumerable: true,
+  get: function () { return chunk3SVPI4LS_cjs.X402Erc7710AlreadySettledError; }
+});
+Object.defineProperty(exports, "X402TaskBudgetMismatchError", {
+  enumerable: true,
+  get: function () { return chunk3SVPI4LS_cjs.X402TaskBudgetMismatchError; }
 });
 Object.defineProperty(exports, "X402UnexpectedStatusError", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.X402UnexpectedStatusError; }
+  get: function () { return chunk3SVPI4LS_cjs.X402UnexpectedStatusError; }
 });
 Object.defineProperty(exports, "assertUserOpTypedDataBinding", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.assertUserOpTypedDataBinding; }
+  get: function () { return chunk3SVPI4LS_cjs.assertUserOpTypedDataBinding; }
 });
 Object.defineProperty(exports, "connectorRerunCommand", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.connectorRerunCommand; }
+  get: function () { return chunk3SVPI4LS_cjs.connectorRerunCommand; }
 });
 Object.defineProperty(exports, "connectorSpec", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.connectorSpec; }
+  get: function () { return chunk3SVPI4LS_cjs.connectorSpec; }
+});
+Object.defineProperty(exports, "connectorUpgradeCommand", {
+  enumerable: true,
+  get: function () { return chunk3SVPI4LS_cjs.connectorUpgradeCommand; }
 });
 Object.defineProperty(exports, "deriveDelegateAccountAddress", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.deriveDelegateAccountAddress; }
+  get: function () { return chunk3SVPI4LS_cjs.deriveDelegateAccountAddress; }
 });
 Object.defineProperty(exports, "isConnectorChannel", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.isConnectorChannel; }
+  get: function () { return chunk3SVPI4LS_cjs.isConnectorChannel; }
 });
 Object.defineProperty(exports, "isPackedUserOperationTypedData", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.isPackedUserOperationTypedData; }
+  get: function () { return chunk3SVPI4LS_cjs.isPackedUserOperationTypedData; }
 });
 Object.defineProperty(exports, "packedUserOperationHash", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.packedUserOperationHash; }
+  get: function () { return chunk3SVPI4LS_cjs.packedUserOperationHash; }
 });
 Object.defineProperty(exports, "resolveConnectorChannel", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.resolveConnectorChannel; }
+  get: function () { return chunk3SVPI4LS_cjs.resolveConnectorChannel; }
 });
 Object.defineProperty(exports, "signerUpdateFallback", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.signerUpdateFallback; }
+  get: function () { return chunk3SVPI4LS_cjs.signerUpdateFallback; }
 });
 Object.defineProperty(exports, "verifySettlementChild", {
   enumerable: true,
-  get: function () { return chunkS42QSWJY_cjs.verifySettlementChild; }
+  get: function () { return chunk3SVPI4LS_cjs.verifySettlementChild; }
 });
 exports.AGENT_APPROVAL_RELAY_JSON_SENTENCE = AGENT_APPROVAL_RELAY_JSON_SENTENCE;
 exports.AGENT_APPROVAL_RELAY_PROSE_SENTENCE = AGENT_APPROVAL_RELAY_PROSE_SENTENCE;
@@ -5009,6 +5239,7 @@ exports.addressFromKey = addressFromKey;
 exports.assertSecureX402RetryTarget = assertSecureX402RetryTarget;
 exports.composeDescription = composeDescription;
 exports.discoverMerchantMcpUrl = discoverMerchantMcpUrl;
+exports.formatTokenAmount = formatTokenAmount;
 exports.havenTools = havenTools;
 exports.isSecureX402RetryTarget = isSecureX402RetryTarget;
 exports.isZeroSettlementTxHash = isZeroSettlementTxHash;