@zeroxyz/cli 1.19.0 → 1.20.0

package/dist/index.js

@@ -78449,7 +78449,7 @@ init_esm_shims();
 // ../sdk/dist/index.js
 init_esm_shims();
 
-// ../sdk/dist/chunk-CYB4Y3ID.js
+// ../sdk/dist/chunk-FWHVWIO2.js
 init_esm_shims();
 
 // ../../node_modules/.pnpm/viem@2.52.2_bufferutil@4.1.0_typescript@5.9.3_utf-8-validate@6.0.6_zod@4.3.6/node_modules/viem/_esm/index.js
@@ -117572,69 +117572,6 @@ function createSIWxClientHook(signer) {
   };
 }
 
-// ../../node_modules/.pnpm/@x402+fetch@2.9.0_bufferutil@4.1.0_typescript@5.9.3_utf-8-validate@6.0.6/node_modules/@x402/fetch/dist/esm/index.mjs
-init_esm_shims();
-function wrapFetchWithPayment(fetch2, client) {
-  const httpClient = client instanceof x402HTTPClient ? client : new x402HTTPClient(client);
-  return async (input, init) => {
-    const request3 = new Request(input, init);
-    const clonedRequest = request3.clone();
-    const response = await fetch2(request3);
-    if (response.status !== 402) {
-      return response;
-    }
-    let paymentRequired;
-    try {
-      const getHeader = (name) => response.headers.get(name);
-      let body;
-      try {
-        const responseText = await response.text();
-        if (responseText) {
-          body = JSON.parse(responseText);
-        }
-      } catch {
-      }
-      paymentRequired = httpClient.getPaymentRequiredResponse(getHeader, body);
-    } catch (error48) {
-      throw new Error(
-        `Failed to parse payment requirements: ${error48 instanceof Error ? error48.message : "Unknown error"}`
-      );
-    }
-    const hookHeaders = await httpClient.handlePaymentRequired(paymentRequired);
-    if (hookHeaders) {
-      const hookRequest = clonedRequest.clone();
-      for (const [key, value] of Object.entries(hookHeaders)) {
-        hookRequest.headers.set(key, value);
-      }
-      const hookResponse = await fetch2(hookRequest);
-      if (hookResponse.status !== 402) {
-        return hookResponse;
-      }
-    }
-    let paymentPayload;
-    try {
-      paymentPayload = await client.createPaymentPayload(paymentRequired);
-    } catch (error48) {
-      throw new Error(
-        `Failed to create payment payload: ${error48 instanceof Error ? error48.message : "Unknown error"}`
-      );
-    }
-    const paymentHeaders = httpClient.encodePaymentSignatureHeader(paymentPayload);
-    if (clonedRequest.headers.has("PAYMENT-SIGNATURE") || clonedRequest.headers.has("X-PAYMENT")) {
-      throw new Error("Payment already attempted");
-    }
-    for (const [key, value] of Object.entries(paymentHeaders)) {
-      clonedRequest.headers.set(key, value);
-    }
-    clonedRequest.headers.set(
-      "Access-Control-Expose-Headers",
-      "PAYMENT-RESPONSE,X-PAYMENT-RESPONSE"
-    );
-    const secondResponse = await fetch2(clonedRequest);
-    return secondResponse;
-  };
-}
-
 // ../../node_modules/.pnpm/mppx@0.6.9_@modelcontextprotocol+sdk@1.29.0_@cfworker+json-schema@4.1.1_zod@4.3.6__expr_0954cd65f6aa59a781b5373f235842da/node_modules/mppx/dist/index.js
 init_esm_shims();
 
@@ -143831,7 +143768,7 @@ config(en_default2());
 // ../../node_modules/.pnpm/zod@4.3.6/node_modules/zod/index.js
 var zod_default = external_exports3;
 
-// ../sdk/dist/chunk-CYB4Y3ID.js
+// ../sdk/dist/chunk-FWHVWIO2.js
 var createManagedAccount = (client, address2, opts = {}) => {
   const signOptions = {
     // expectedAddress pins verification to this adapter's frozen address.
@@ -144497,6 +144434,9 @@ var Payments = class {
       input.walletAddress
     );
     let capturedAmount = null;
+    let pendingAmountUnits = 0n;
+    let identityChallengeHandled = false;
+    let paidChallengeHandled = false;
     let capturedNetwork;
     let preflightError = null;
     const x402 = registerExactEvmScheme(new x402Client(), { signer: account });
@@ -144525,11 +144465,25 @@ var Payments = class {
         };
       }
       const rawAmountUnits = BigInt(rawAmount);
-      capturedAmount = formatUnits(rawAmountUnits, 6);
+      pendingAmountUnits = rawAmountUnits;
+      const challengeAmount = formatUnits(rawAmountUnits, 6);
+      if (rawAmountUnits === 0n) {
+        if (identityChallengeHandled || paidChallengeHandled) {
+          return {
+            abort: true,
+            reason: "Only one zero-value identity challenge is allowed, and it must precede payment."
+          };
+        }
+      } else if (paidChallengeHandled) {
+        return {
+          abort: true,
+          reason: "A positive-value x402 payment was already attempted for this fetch; refusing a second charge."
+        };
+      }
       if (maxPayUnits !== null && rawAmountUnits > maxPayUnits) {
         return {
           abort: true,
-          reason: `Payment of ${capturedAmount} USDC exceeds maxPay ${input.maxPay}`
+          reason: `Payment of ${challengeAmount} USDC exceeds maxPay ${input.maxPay}`
         };
       }
       const detected = networkToChain(capturedNetwork);
@@ -144549,9 +144503,10 @@ var Payments = class {
       }
       if (balance !== null && balance < rawAmountUnits) {
         const have = formatUnits(balance, 6);
+        const requiredAmount = formatUnits(rawAmountUnits, 6);
         preflightError = new ZeroInsufficientFundsError(
-          `wallet has ${have} USDC on Base, needs ${capturedAmount}.`,
-          { have, need: capturedAmount }
+          `wallet has ${have} USDC on Base, needs ${requiredAmount}.`,
+          { have, need: requiredAmount }
         );
         return { abort: true, reason: preflightError.message };
       }
@@ -144562,18 +144517,64 @@ var Payments = class {
     const httpClient = new x402HTTPClient(x402).onPaymentRequired(
       createSIWxClientHook(account)
     );
-    const wrappedFetch = wrapFetchWithPayment(
-      withSynthesizedX402Header(configuredFetch),
-      httpClient
-    );
+    const paymentFetch = withSynthesizedX402Header(configuredFetch);
     let response;
     try {
-      response = await wrappedFetch(input.url, {
+      const request22 = new Request(input.url, {
         method: input.method ?? "GET",
         headers: input.headers,
         body: input.body,
         signal: input.signal
       });
+      response = await paymentFetch(request22.clone());
+      for (let paymentStage = 0; paymentStage < 2; paymentStage++) {
+        if (response.status !== 402) break;
+        const parseChallenge = async (challengeResponse) => {
+          let body;
+          try {
+            const text = await challengeResponse.clone().text();
+            if (text) body = JSON.parse(text);
+          } catch {
+          }
+          return httpClient.getPaymentRequiredResponse(
+            (name) => challengeResponse.headers.get(name),
+            body
+          );
+        };
+        let paymentRequired = await parseChallenge(response);
+        const hookHeaders = await httpClient.handlePaymentRequired(paymentRequired);
+        if (hookHeaders) {
+          const hookRequest = request22.clone();
+          for (const [key, value] of Object.entries(hookHeaders)) {
+            hookRequest.headers.set(key, value);
+          }
+          response = await paymentFetch(hookRequest);
+          if (response.status === 402) {
+            paymentRequired = await parseChallenge(response);
+          } else {
+            break;
+          }
+        }
+        pendingAmountUnits = 0n;
+        const paymentPayload = await x402.createPaymentPayload(paymentRequired);
+        if (pendingAmountUnits === 0n) {
+          identityChallengeHandled = true;
+          capturedAmount = "0";
+        } else {
+          paidChallengeHandled = true;
+          capturedAmount = formatUnits(pendingAmountUnits, 6);
+        }
+        const paymentHeaders = httpClient.encodePaymentSignatureHeader(paymentPayload);
+        const paidRequest = request22.clone();
+        for (const [key, value] of Object.entries(paymentHeaders)) {
+          paidRequest.headers.set(key, value);
+        }
+        paidRequest.headers.set(
+          "Access-Control-Expose-Headers",
+          "PAYMENT-RESPONSE,X-PAYMENT-RESPONSE"
+        );
+        response = await paymentFetch(paidRequest);
+      }
     } catch (err) {
       if (preflightError) throw preflightError;
       if (err instanceof ZeroError) throw err;
@@ -145141,8 +145142,17 @@ var cancelBody2 = (response) => {
   } catch {
   }
 };
-var detectPaymentRequirement = async (response) => {
+var detectPaymentRequirement = async (response, preferredProtocol) => {
   if (response.status !== 402) return null;
+  const wwwAuth = response.headers.get("www-authenticate");
+  const advertisesMpp = wwwAuth ? splitWwwAuthenticateChallenges(wwwAuth).some((challenge2) => {
+    const scheme = challenge2.trim().split(/\s+/)[0]?.toLowerCase() ?? "";
+    return MPP_SCHEME_TOKENS.has(scheme);
+  }) : false;
+  if (preferredProtocol === "mpp") {
+    cancelBody2(response);
+    return advertisesMpp ? { protocol: "mpp", raw: { "www-authenticate": wwwAuth } } : { protocol: "unknown", raw: { requestedProtocol: "mpp" } };
+  }
   const x402Header = response.headers.get("payment-required") ?? response.headers.get("x-payment-required");
   if (x402Header) {
     cancelBody2(response);
@@ -145172,15 +145182,13 @@ var detectPaymentRequirement = async (response) => {
     } catch {
     }
   }
-  const wwwAuth = response.headers.get("www-authenticate");
-  if (wwwAuth) {
-    const schemes = splitWwwAuthenticateChallenges(wwwAuth).map(
-      (challenge2) => challenge2.trim().split(/\s+/)[0]?.toLowerCase() ?? ""
-    );
-    if (schemes.some((scheme) => MPP_SCHEME_TOKENS.has(scheme))) {
-      cancelBody2(response);
-      return { protocol: "mpp", raw: { "www-authenticate": wwwAuth } };
-    }
+  if (preferredProtocol === "x402") {
+    cancelBody2(response);
+    return { protocol: "unknown", raw: { requestedProtocol: "x402" } };
+  }
+  if (advertisesMpp) {
+    cancelBody2(response);
+    return { protocol: "mpp", raw: { "www-authenticate": wwwAuth } };
   }
   cancelBody2(response);
   return { protocol: "unknown", raw: {} };
@@ -145506,7 +145514,10 @@ var clientFetch = async (client, url4, opts = {}) => {
     return result2;
   }
   if (response.status === 402) {
-    const requirement = await detectPaymentRequirement(response);
+    const requirement = await detectPaymentRequirement(
+      response,
+      opts.paymentProtocol
+    );
     if (requirement?.protocol === "x402" || requirement?.protocol === "mpp") {
       const payCall = requirement.protocol === "x402" ? client.payments.pay : client.payments.payMpp;
       try {
@@ -145578,7 +145589,7 @@ var clientFetch = async (client, url4, opts = {}) => {
     } else if (requirement?.protocol === "unknown") {
       const result2 = errorFetchResult(
         startedAt,
-        "Capability returned 402 with an unrecognized payment protocol. Neither x402 nor MPP markers were detected in the response headers or body.",
+        opts.paymentProtocol ? `Capability did not advertise the requested ${opts.paymentProtocol} payment protocol.` : "Capability returned 402 with an unrecognized payment protocol. Neither x402 nor MPP markers were detected in the response headers or body.",
         "unrecognized_402_protocol",
         capabilityIdRequested,
         "payment_failed",
@@ -145760,7 +145771,7 @@ var clientFetch = async (client, url4, opts = {}) => {
   return result;
 };
 var package_default = {
-  version: "0.13.0"
+  version: "0.14.0"
 };
 var SDK_VERSION2 = package_default.version;
 var agentAuthMetadataSchema = external_exports3.object({
@@ -147902,7 +147913,7 @@ var placeholderFor = (fieldName, propSchema) => String(sampleValueFor(fieldName,
 
 // package.json
 var package_default2 = {
-  version: "1.19.0"};
+  version: "1.20.0"};
 
 // src/app.ts
 init_esm_shims();
@@ -149528,6 +149539,9 @@ var fetchCommand = (appContext) => new Command("fetch").description(
   "--data-stdin",
   "Read the request body from stdin (equivalent to `-d @-`)."
 ).option("-H, --header <header...>", "Headers in Key:Value format").option("--max-pay <amount>", "Maximum per-call spend limit (USDC)").option(
+  "--protocol <protocol>",
+  "Force payment protocol when multiple are offered (x402 or mpp)"
+).option(
   "--wallet-address <address>",
   "Pay/sign from this profile wallet instead of the primary (managed signing; must be a delegated wallet on your profile)"
 ).option(
@@ -149548,6 +149562,11 @@ var fetchCommand = (appContext) => new Command("fetch").description(
 ).action(
   async (url4, options) => {
     try {
+      if (options.protocol && !["x402", "mpp"].includes(options.protocol)) {
+        throw new Error(
+          `Invalid protocol "${options.protocol}". Must be x402 or mpp.`
+        );
+      }
       const { analyticsService, client, walletAddress, lowBalanceWarning } = appContext.services;
       const fromToken = options.capability ? isShortToken(options.capability) : false;
       const effectiveCapRef = options.capability;
@@ -149668,6 +149687,9 @@ var fetchCommand = (appContext) => new Command("fetch").description(
           headers,
           ...resolvedBody !== void 0 && { body: resolvedBody },
           ...options.maxPay && { maxPay: options.maxPay },
+          ...options.protocol && {
+            paymentProtocol: options.protocol
+          },
           ...options.walletAddress && {
             walletAddress: options.walletAddress
           },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeroxyz/cli",
-	"version": "1.19.0",
+	"version": "1.20.0",
 	"type": "module",
 	"bin": {
 		"zero": "dist/index.js",