@zeroxyz/cli 0.0.8 → 0.0.10

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command as Command8 } from "commander";
 // package.json
 var package_default = {
   name: "@zeroxyz/cli",
-  version: "0.0.8",
+  version: "0.0.10",
   type: "module",
   bin: {
     zero: "dist/index.js",
@@ -36,6 +36,8 @@ var package_default = {
     "@relayprotocol/relay-sdk": "^5.2.1",
     "@x402/core": "^2.9.0",
     "@x402/evm": "^2.9.0",
+    "@x402/extensions": "^2.9.0",
+    "@x402/fetch": "^2.9.0",
     commander: "^13.0.0",
     mppx: "^0.5.9",
     open: "^11.0.0",
@@ -149,11 +151,13 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
       if (options.data && !headers["content-type"]) {
         headers["content-type"] = "application/json";
       }
+      const log = (msg) => console.error(`  ${msg}`);
       const requestInit = {
         method: options.data ? "POST" : "GET",
         headers,
         body: options.data
       };
+      log(`Calling ${url}...`);
       const response = await fetch(url, requestInit);
       const paymentReq = detectPaymentRequirement(
         response.headers,
@@ -162,11 +166,15 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
       let finalResponse;
       let paymentMeta;
       if (paymentReq) {
+        log(
+          `Payment required (${paymentReq.protocol}) \u2014 preparing payment...`
+        );
         const result = await paymentService.handlePayment(
           url,
           requestInit,
           paymentReq,
-          options.maxPay
+          options.maxPay,
+          log
         );
         finalResponse = result.response;
         paymentMeta = {
@@ -176,6 +184,9 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
           amount: result.amount,
           asset: result.asset
         };
+        log(
+          `Paid ${result.amount} ${result.asset} via ${result.protocol} on ${result.chain}`
+        );
       } else {
         finalResponse = response;
       }
@@ -222,10 +233,25 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
               paymentMode: "charge"
             }
           });
+          console.error(`
+  Run ID: ${runResult.runId}`);
           console.error(
-            `
-  Run \`zero review ${runResult.runId}\` to rate this capability.
-`
+            `  Leave a review to help other agents discover great capabilities:`
+          );
+          console.error(
+            `  zero review ${runResult.runId} --success --accuracy 5 --value 4 --reliability 5 --content "your feedback"`
+          );
+          console.error(
+            [
+              ``,
+              `  Tips for a great review:`,
+              `    --success / --no-success   Did the API return the result you expected?`,
+              `    --accuracy  1-5            How correct was the response? (1 = wrong, 5 = perfect)`,
+              `    --value     1-5            Was it worth the price? (1 = overpriced, 5 = great deal)`,
+              `    --reliability 1-5          Did it respond quickly and without errors? (1 = flaky, 5 = rock solid)`,
+              `    --content                  Free-text is optional but helps other agents pick the best capability.`,
+              ``
+            ].join("\n")
           );
         } catch {
         }
@@ -502,7 +528,19 @@ var initCommand = (appContext2) => new Command4("init").description("Initialize
 
 // src/commands/review-command.ts
 import { Command as Command5 } from "commander";
-var reviewCommand = (appContext2) => new Command5("review").description("Submit a review for a capability run").argument("<runId>", "Run ID to review").option("--success", "The capability succeeded").option("--no-success", "The capability failed").requiredOption("--accuracy <n>", "Accuracy rating (1-5)", Number.parseInt).requiredOption("--value <n>", "Value rating (1-5)", Number.parseInt).requiredOption(
+var reviewCommand = (appContext2) => new Command5("review").description("Submit a review for a capability run").addHelpText(
+  "after",
+  `
+Tips for a great review:
+  --success / --no-success   Did the API return the result you expected?
+  --accuracy  1-5            How correct was the response? (1 = wrong, 5 = perfect)
+  --value     1-5            Was it worth the price? (1 = overpriced, 5 = great deal)
+  --reliability 1-5          Did it respond quickly and without errors? (1 = flaky, 5 = rock solid)
+  --content                  Free-text is optional but helps other agents pick the best capability.
+
+Example:
+  zero review run_abc123 --success --accuracy 5 --value 4 --reliability 5 --content "Fast, accurate translation"`
+).argument("<runId>", "Run ID to review").option("--success", "The capability succeeded").option("--no-success", "The capability failed").requiredOption("--accuracy <n>", "Accuracy rating (1-5)", Number.parseInt).requiredOption("--value <n>", "Value rating (1-5)", Number.parseInt).requiredOption(
   "--reliability <n>",
   "Reliability rating (1-5)",
   Number.parseInt
@@ -621,6 +659,7 @@ ${address}`);
     if (url) {
       await open(url);
       console.log("Opened funding page in your browser.");
+      console.log(`If it didn't open, visit: ${url}`);
       console.log(`Your wallet address: ${address}`);
       analyticsService.capture("wallet_funded", {
         method: "browser",
@@ -810,6 +849,7 @@ var capabilityResponseSchema = z2.object({
   method: z2.string(),
   headers: z2.record(z2.string(), z2.string()).nullable(),
   bodySchema: z2.record(z2.string(), z2.unknown()).nullable(),
+  responseSchema: z2.record(z2.string(), z2.unknown()).nullable(),
   example: z2.object({ request: z2.unknown(), response: z2.unknown() }).nullable(),
   tags: z2.array(z2.string()).nullable(),
   displayCostAmount: z2.string(),
@@ -922,18 +962,17 @@ var ApiService = class {
 // src/services/payment-service.ts
 import {
   adaptViemWallet,
+  convertViemChainToRelayChain,
   createClient as createRelayClient,
   getClient as getRelayClient,
   MAINNET_RELAY_API
 } from "@relayprotocol/relay-sdk";
 import { x402Client as X402Client } from "@x402/core/client";
-import {
-  decodePaymentRequiredHeader,
-  decodePaymentResponseHeader,
-  encodePaymentSignatureHeader
-} from "@x402/core/http";
+import { decodePaymentResponseHeader, x402HTTPClient } from "@x402/core/http";
 import { ExactEvmScheme } from "@x402/evm/exact/client";
-import { Challenge, Receipt } from "mppx";
+import { createSIWxClientHook } from "@x402/extensions/sign-in-with-x";
+import { wrapFetchWithPayment } from "@x402/fetch";
+import { Receipt } from "mppx";
 import { Mppx, tempo } from "mppx/client";
 import {
   createPublicClient,
@@ -949,8 +988,12 @@ var PATHUSD_TEMPO = "0x20c0000000000000000000000000000000000000";
 var BASE_CHAIN_ID = 8453;
 var TEMPO_CHAIN_ID = 4217;
 var TEMPO_TESTNET_CHAIN_ID = 42431;
-var X402_PAYMENT_MAX_ATTEMPTS = 6;
-var X402_PAYMENT_RETRY_DELAY_MS = 300;
+var DEFAULT_MAX_DEPOSIT = "100";
+var buildRelayClientOptions = () => ({
+  baseApiUrl: MAINNET_RELAY_API,
+  source: "zero-cli",
+  chains: [convertViemChainToRelayChain(base)]
+});
 var calculateBuffer = (baseBalance) => {
   const twentyFivePercent = baseBalance / 4n;
   const twoDollars = 2000000n;
@@ -986,39 +1029,14 @@ var PaymentService = class {
     this.account = account;
     this.config = config;
   }
-  x402Client = null;
-  mppxClient = null;
   relayInitialized = false;
-  getX402Client = () => {
-    if (!this.x402Client) {
-      if (!this.account) throw new Error("No wallet configured");
-      this.x402Client = new X402Client().register(
-        "eip155:*",
-        new ExactEvmScheme(this.account)
-      );
-    }
-    return this.x402Client;
-  };
-  getMppxClient = () => {
-    if (!this.mppxClient) {
-      if (!this.account) throw new Error("No wallet configured");
-      this.mppxClient = Mppx.create({
-        polyfill: false,
-        methods: [tempo({ account: this.account })]
-      });
-    }
-    return this.mppxClient;
-  };
   ensureRelayClient = () => {
     if (!this.relayInitialized) {
-      createRelayClient({
-        baseApiUrl: MAINNET_RELAY_API,
-        source: "zero-cli"
-      });
+      createRelayClient(buildRelayClientOptions());
       this.relayInitialized = true;
     }
   };
-  bridgeToTempo = async (requiredAmount) => {
+  bridgeToTempo = async (requiredAmount, onProgress) => {
     if (!this.account) throw new Error("No wallet configured");
     this.ensureRelayClient();
     const baseBalance = await this.getBalanceRaw("base");
@@ -1029,6 +1047,9 @@ var PaymentService = class {
         `Insufficient Base USDC to bridge: have ${formatUnits(baseBalance, 6)}, need ${formatUnits(bridgeAmount, 6)} (${formatUnits(requiredAmount, 6)} + ${formatUnits(buffer, 6)} buffer)`
       );
     }
+    onProgress?.(
+      `Bridging ${formatUnits(bridgeAmount, 6)} USDC from Base to Tempo...`
+    );
     const walletClient = createWalletClient({
       account: this.account,
       chain: base,
@@ -1042,7 +1063,10 @@ var PaymentService = class {
       amount: bridgeAmount.toString(),
       tradeType: "EXACT_INPUT",
       user: this.account.address,
-      recipient: this.account.address
+      recipient: this.account.address,
+      options: {
+        usePermit: true
+      }
     });
     let bridgeTxHash = null;
     await getRelayClient().actions.execute({
@@ -1056,150 +1080,141 @@ var PaymentService = class {
     });
     return bridgeTxHash;
   };
-  handlePayment = async (url, request, paymentRequirement, maxPay) => {
+  handlePayment = async (url, request, paymentRequirement, maxPay, onProgress) => {
     if (!this.account) {
       throw new Error(
         "No wallet configured \u2014 run `zero init` or set ZERO_PRIVATE_KEY"
       );
     }
     if (paymentRequirement.protocol === "x402") {
+      onProgress?.("Paying via x402 on Base...");
       return this.payX402(url, request, paymentRequirement.raw, maxPay);
     }
     if (paymentRequirement.protocol === "mpp") {
-      return this.payMpp(url, request, paymentRequirement.raw, maxPay);
+      onProgress?.("Paying via MPP on Tempo...");
+      return this.payMpp(
+        url,
+        request,
+        paymentRequirement.raw,
+        maxPay,
+        onProgress
+      );
     }
     throw new Error("Unrecognized 402 payment protocol");
   };
-  toX402RawChallenge = (headerValue) => {
-    try {
-      return JSON.parse(Buffer.from(headerValue, "base64").toString("utf8"));
-    } catch {
-      return { encoded: headerValue };
-    }
-  };
-  toX402HeaderValue = (raw) => {
-    const encoded = raw?.encoded;
-    if (typeof encoded === "string" && encoded.length > 0) {
-      return encoded;
-    }
-    return Buffer.from(JSON.stringify(raw)).toString("base64");
-  };
-  payX402 = async (url, request, raw, maxPay) => {
-    const client = this.getX402Client();
-    let currentRaw = raw;
-    let amountUsdc = "0";
-    for (let attempt = 1; attempt <= X402_PAYMENT_MAX_ATTEMPTS; attempt++) {
-      const headerValue = this.toX402HeaderValue(currentRaw);
-      const paymentRequired = decodePaymentRequiredHeader(headerValue);
-      const requirement = paymentRequired.accepts[0];
-      if (!requirement) {
-        throw new Error("No accepted payment methods in x402 challenge");
+  payX402 = async (url, request, _raw, maxPay) => {
+    if (!this.account) throw new Error("No wallet configured");
+    let capturedAmount = "0";
+    const client = new X402Client().register(
+      "eip155:*",
+      new ExactEvmScheme(this.account)
+    );
+    client.onBeforePaymentCreation(async (context) => {
+      const requirement = context.paymentRequired.accepts[0];
+      if (!requirement) return;
+      capturedAmount = formatUnits(BigInt(requirement.amount), 6);
+      if (maxPay && Number.parseFloat(capturedAmount) > Number.parseFloat(maxPay)) {
+        return {
+          abort: true,
+          reason: `Payment of ${capturedAmount} USDC exceeds --max-pay ${maxPay}`
+        };
       }
-      amountUsdc = formatUnits(BigInt(requirement.amount), 6);
-      if (maxPay && Number.parseFloat(amountUsdc) > Number.parseFloat(maxPay)) {
-        throw new Error(
-          `Payment of ${amountUsdc} USDC exceeds --max-pay ${maxPay}`
-        );
+    });
+    const httpClient = new x402HTTPClient(client).onPaymentRequired(
+      createSIWxClientHook(this.account)
+    );
+    const wrappedFetch = wrapFetchWithPayment(fetch, httpClient);
+    const response = await wrappedFetch(url, {
+      method: request.method,
+      headers: request.headers,
+      body: request.body
+    });
+    let txHash = null;
+    const paymentResponseHeader = response.headers.get("payment-response") ?? response.headers.get("x-payment-response");
+    if (paymentResponseHeader) {
+      try {
+        const settlement = decodePaymentResponseHeader(paymentResponseHeader);
+        txHash = settlement.transaction ?? null;
+      } catch {
       }
-      const paymentPayload = await client.createPaymentPayload(paymentRequired);
-      const signatureHeader = encodePaymentSignatureHeader(paymentPayload);
-      const retryResponse = await fetch(url, {
-        method: request.method,
-        headers: {
-          ...request.headers,
-          "PAYMENT-SIGNATURE": signatureHeader
-        },
-        body: request.body
-      });
-      if (retryResponse.status === 402) {
-        if (attempt >= X402_PAYMENT_MAX_ATTEMPTS) {
-          throw new Error(
-            `x402 payment failed after ${X402_PAYMENT_MAX_ATTEMPTS} attempts`
-          );
+    }
+    return {
+      response,
+      protocol: "x402",
+      chain: "base",
+      txHash,
+      amount: capturedAmount,
+      asset: "USDC"
+    };
+  };
+  payMpp = async (url, request, _raw, maxPay, onProgress) => {
+    if (!this.account) throw new Error("No wallet configured");
+    let capturedAmount = "0";
+    const mppx = Mppx.create({
+      polyfill: false,
+      methods: [
+        tempo({
+          account: this.account,
+          maxDeposit: maxPay ?? DEFAULT_MAX_DEPOSIT
+        })
+      ],
+      onChallenge: async (challenge) => {
+        const challengeRequest = challenge.request;
+        const intent = challenge.intent;
+        let requiredRaw;
+        if (intent === "session") {
+          const suggestedDeposit = challengeRequest.suggestedDeposit;
+          if (suggestedDeposit) {
+            requiredRaw = BigInt(suggestedDeposit);
+          } else {
+            const depositStr = maxPay ?? DEFAULT_MAX_DEPOSIT;
+            requiredRaw = BigInt(
+              Math.floor(Number.parseFloat(depositStr) * 1e6)
+            );
+          }
+        } else {
+          requiredRaw = BigInt(challengeRequest.amount);
         }
-        const nextHeader = retryResponse.headers.get("payment-required") ?? retryResponse.headers.get("x-payment-required");
-        if (!nextHeader) {
+        capturedAmount = formatUnits(requiredRaw, 6);
+        if (maxPay && Number.parseFloat(capturedAmount) > Number.parseFloat(maxPay)) {
           throw new Error(
-            "x402 payment retry returned 402 without payment-required header"
+            `Payment of ${capturedAmount} USDC exceeds --max-pay ${maxPay}`
           );
         }
-        currentRaw = this.toX402RawChallenge(nextHeader);
-        await new Promise(
-          (resolve) => setTimeout(resolve, attempt * X402_PAYMENT_RETRY_DELAY_MS)
-        );
-        continue;
-      }
-      let txHash = null;
-      const paymentResponseHeader = retryResponse.headers.get("payment-response") ?? retryResponse.headers.get("x-payment-response");
-      if (paymentResponseHeader) {
-        try {
-          const settlement = decodePaymentResponseHeader(paymentResponseHeader);
-          txHash = settlement.transaction ?? null;
-        } catch {
+        const methodDetails = challengeRequest.methodDetails;
+        const challengeChainId = challengeRequest.chainId ?? methodDetails?.chainId;
+        const isTestnet = challengeChainId === TEMPO_TESTNET_CHAIN_ID;
+        const balanceChain = isTestnet ? "tempo-testnet" : "tempo";
+        onProgress?.(`Checking Tempo balance...`);
+        const tempoBalance = await this.getBalanceRaw(balanceChain);
+        if (tempoBalance < requiredRaw) {
+          if (isTestnet) {
+            throw new Error(
+              `Insufficient pathUSD on Tempo testnet: have ${formatUnits(tempoBalance, 6)}, need ${capturedAmount}. Fund your wallet with the Tempo testnet faucet: https://docs.tempo.xyz/quickstart/faucet`
+            );
+          }
+          await this.bridgeToTempo(requiredRaw, onProgress);
         }
+        return void 0;
       }
-      return {
-        response: retryResponse,
-        protocol: "x402",
-        chain: "base",
-        txHash,
-        amount: amountUsdc,
-        asset: "USDC"
-      };
-    }
-    throw new Error("x402 payment failed");
-  };
-  payMpp = async (url, request, raw, maxPay) => {
-    const wwwAuth = raw?.["www-authenticate"] ?? "";
-    const challengeResponse = new Response("Payment Required", {
-      status: 402,
-      headers: { "www-authenticate": wwwAuth }
     });
-    const challenge = Challenge.fromResponse(challengeResponse);
-    const challengeRequest = challenge.request;
-    const amountRaw = challengeRequest.amount;
-    const amountUsdc = formatUnits(BigInt(amountRaw), 6);
-    if (maxPay && Number.parseFloat(amountUsdc) > Number.parseFloat(maxPay)) {
-      throw new Error(
-        `Payment of ${amountUsdc} USDC exceeds --max-pay ${maxPay}`
-      );
-    }
-    const methodDetails = challengeRequest.methodDetails;
-    const challengeChainId = challengeRequest.chainId ?? methodDetails?.chainId;
-    const isTestnet = challengeChainId === TEMPO_TESTNET_CHAIN_ID;
-    const balanceChain = isTestnet ? "tempo-testnet" : "tempo";
-    const tempoBalance = await this.getBalanceRaw(balanceChain);
-    if (tempoBalance < BigInt(amountRaw)) {
-      if (isTestnet) {
-        throw new Error(
-          `Insufficient pathUSD on Tempo testnet: have ${formatUnits(tempoBalance, 6)}, need ${amountUsdc}. Fund your wallet with the Tempo testnet faucet: https://docs.tempo.xyz/quickstart/faucet`
-        );
-      }
-      await this.bridgeToTempo(BigInt(amountRaw));
-    }
-    const mppx = this.getMppxClient();
-    const credential = await mppx.createCredential(challengeResponse);
-    const retryResponse = await fetch(url, {
+    const response = await mppx.fetch(url, {
       method: request.method,
-      headers: {
-        ...request.headers,
-        // biome-ignore lint/style/useNamingConvention: HTTP header name
-        Authorization: credential
-      },
+      headers: request.headers,
       body: request.body
     });
     let txHash = null;
     try {
-      const receipt = Receipt.fromResponse(retryResponse);
+      const receipt = Receipt.fromResponse(response);
       txHash = receipt.reference ?? null;
     } catch {
     }
     return {
-      response: retryResponse,
+      response,
       protocol: "mpp",
       chain: "tempo",
       txHash,
-      amount: amountUsdc,
+      amount: capturedAmount,
       asset: "USDC"
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeroxyz/cli",
-	"version": "0.0.8",
+	"version": "0.0.10",
 	"type": "module",
 	"bin": {
 		"zero": "dist/index.js",
@@ -30,6 +30,8 @@
 		"@relayprotocol/relay-sdk": "^5.2.1",
 		"@x402/core": "^2.9.0",
 		"@x402/evm": "^2.9.0",
+		"@x402/extensions": "^2.9.0",
+		"@x402/fetch": "^2.9.0",
 		"commander": "^13.0.0",
 		"mppx": "^0.5.9",
 		"open": "^11.0.0",