agentcash 0.3.4 → 0.3.6

package/dist/esm/chunk-VVTMCXSK.js

@@ -0,0 +1,309 @@
+import {
+  detectPaymentProtocols,
+  getTempoBalance,
+  mppErr,
+  mppOk,
+  safeCreateMppCredential,
+  safeCreatePaymentPayload,
+  safeGetMppChallenge,
+  safeGetMppReceipt,
+  safeGetPaymentRequired,
+  safeGetPaymentSettlement,
+  tokenStringToNumber,
+  x402Err,
+  x402Ok
+} from "./chunk-FM2E2QVT.js";
+import {
+  fetchErr,
+  fetchOk,
+  getBalance,
+  log,
+  resultFromPromise,
+  safeFetch
+} from "./chunk-PJFATGPH.js";
+
+// src/server/tools/lib/request.ts
+import z from "zod";
+var requestSchema = z.object({
+  url: z.url().describe("The endpoint URL"),
+  method: z.enum(["GET", "POST", "PUT", "DELETE", "PATCH"]).optional().describe("HTTP method. Defaults to GET for fetch operations."),
+  body: z.unknown().optional().describe("Request body for POST/PUT/PATCH methods"),
+  headers: z.record(z.string(), z.string()).optional().describe("Additional headers to include").default({})
+});
+var buildRequest = ({
+  input,
+  address,
+  sessionId,
+  provider
+}) => {
+  return new Request(input.url, {
+    method: input.method ?? "GET",
+    body: input.body ? typeof input.body === "string" ? input.body : JSON.stringify(input.body) : void 0,
+    headers: {
+      ...input.body ? { "Content-Type": "application/json" } : {},
+      ...input.headers,
+      ...address ? { "X-Wallet-Address": address, "X-Client-ID": provider } : {},
+      ...sessionId ? { "X-Session-ID": sessionId } : {}
+    }
+  });
+};
+
+// src/shared/operations/fetch-with-payment.ts
+import { formatUnits } from "viem";
+function createFetchWithPayment(options) {
+  const { surface, clients, paymentMethod, beforePayment } = options;
+  return async (request) => {
+    const clonedRequest = request.clone();
+    const fallbackRequest = request.clone();
+    const probeResult = await safeFetch(surface, request);
+    if (probeResult.isErr()) {
+      return fetchErr(surface, probeResult.error);
+    }
+    if (probeResult.value.status !== 402) {
+      return probeResult.andThen(
+        (response2) => fetchOk({ response: response2, paymentInfo: null })
+      );
+    }
+    const response = probeResult.value;
+    if (paymentMethod !== "auto") {
+      if (paymentMethod === "mpp") {
+        return handleMppPayment(surface, response, clonedRequest, options);
+      }
+      return handleX402Payment(
+        surface,
+        response,
+        clonedRequest,
+        clients.x402,
+        beforePayment
+      );
+    }
+    const available = detectPaymentProtocols(response);
+    let preferred;
+    if (available.length === 1) {
+      preferred = available[0];
+    } else {
+      preferred = await pickByBalance(surface, response, options);
+    }
+    const fallback = available.length > 1 ? preferred === "mpp" ? "x402" : "mpp" : null;
+    const result = preferred === "mpp" ? await handleMppPayment(surface, response, clonedRequest, options) : await handleX402Payment(
+      surface,
+      response,
+      clonedRequest,
+      clients.x402,
+      beforePayment
+    );
+    if (result.isErr() && fallback) {
+      return fallback === "mpp" ? handleMppPayment(surface, response, fallbackRequest, options) : handleX402Payment(
+        surface,
+        response,
+        fallbackRequest,
+        clients.x402,
+        beforePayment
+      );
+    }
+    return result;
+  };
+}
+async function pickByBalance(surface, response, options) {
+  const { account, flags } = options;
+  const x402BalanceResult = await resultFromPromise(
+    "balance",
+    surface,
+    getBalance({
+      address: account.address,
+      flags,
+      surface
+    }).then((r) => r.isOk() ? r.value.balance : 0),
+    () => ({
+      cause: "x402_balance",
+      message: "Failed to get x402 balance"
+    })
+  );
+  if (x402BalanceResult.isErr()) {
+    log.debug("Balance comparison failed, defaulting to mpp");
+    return "mpp";
+  }
+  const x402Balance = x402BalanceResult.value;
+  let mppBalance = 0;
+  const challengeResult = safeGetMppChallenge(surface, response);
+  if (challengeResult.isOk()) {
+    const currency = challengeResult.value.request.currency;
+    const decimals = challengeResult.value.request.decimals ?? 6;
+    if (currency) {
+      const tempoResult = await resultFromPromise(
+        "tempo",
+        surface,
+        getTempoBalance({
+          address: account.address,
+          tokenAddress: currency
+        }),
+        () => ({
+          cause: "tempo_balance",
+          message: "Tempo balance check failed"
+        })
+      );
+      if (tempoResult.isOk()) {
+        mppBalance = Number(formatUnits(tempoResult.value.balance, decimals));
+      }
+    }
+  }
+  log.info(`Protocol selection \u2014 x402: $${x402Balance}, mpp: $${mppBalance}`);
+  return x402Balance >= mppBalance ? "x402" : "mpp";
+}
+async function handleX402Payment(surface, response, clonedRequest, client, beforePayment) {
+  const paymentRequiredResult = await safeGetPaymentRequired(
+    surface,
+    client,
+    response
+  );
+  if (paymentRequiredResult.isErr()) {
+    return paymentRequiredResult;
+  }
+  const paymentRequired = paymentRequiredResult.value;
+  if (beforePayment) {
+    const accept = paymentRequired.accepts[0];
+    if (accept) {
+      const amount = tokenStringToNumber(accept.amount);
+      const hookResult = await resultFromPromise(
+        "x402",
+        surface,
+        beforePayment({
+          protocol: "x402",
+          amount,
+          currency: "USDC",
+          network: accept.network
+        }),
+        (e) => ({
+          cause: "payment_already_attempted",
+          message: e instanceof Error ? e.message : "Before-payment hook failed"
+        })
+      );
+      if (hookResult.isErr()) {
+        return x402Err(surface, hookResult.error);
+      }
+    }
+  }
+  const paymentPayloadResult = await safeCreatePaymentPayload(
+    surface,
+    client,
+    paymentRequired
+  );
+  if (paymentPayloadResult.isErr()) {
+    return paymentPayloadResult;
+  }
+  const paymentPayload = paymentPayloadResult.value;
+  const paymentHeaders = client.encodePaymentSignatureHeader(paymentPayload);
+  if (clonedRequest.headers.has("PAYMENT-SIGNATURE") || clonedRequest.headers.has("X-PAYMENT")) {
+    return x402Err(surface, {
+      cause: "payment_already_attempted",
+      message: "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"
+  );
+  return await safeFetch(surface, clonedRequest).andThen((paidResponse) => {
+    const settlementResult = safeGetPaymentSettlement(
+      surface,
+      client,
+      paidResponse
+    );
+    return x402Ok({
+      response: paidResponse,
+      paymentInfo: {
+        protocol: "x402",
+        price: tokenStringToNumber(
+          paymentPayload.accepted.amount
+        ).toLocaleString("en-US", {
+          style: "currency",
+          currency: "USD"
+        }),
+        ...settlementResult.isOk() ? {
+          payment: {
+            success: settlementResult.value.success,
+            transactionHash: settlementResult.value.transaction
+          }
+        } : {}
+      }
+    });
+  });
+}
+async function handleMppPayment(surface, response, clonedRequest, options) {
+  const { clients, beforePayment } = options;
+  const mpayClient = clients.mpp;
+  if (clonedRequest.headers.has("Authorization")) {
+    return mppErr(surface, {
+      cause: "mpp_payment_already_attempted",
+      message: "MPP payment already attempted"
+    });
+  }
+  const challengeResult = safeGetMppChallenge(surface, response);
+  if (challengeResult.isErr()) {
+    return challengeResult;
+  }
+  const challenge = challengeResult.value;
+  const amount = challenge.request.amount;
+  const decimals = challenge.request.decimals ?? 6;
+  const currency = challenge.request.currency;
+  if (beforePayment && amount && currency) {
+    const numericAmount = Number(formatUnits(BigInt(amount), decimals));
+    const hookResult = await resultFromPromise(
+      "mpp",
+      surface,
+      beforePayment({
+        protocol: "mpp",
+        amount: numericAmount,
+        currency,
+        network: `tempo:${challenge.method}`
+      }),
+      (e) => ({
+        cause: "mpp_payment_already_attempted",
+        message: e instanceof Error ? e.message : "Before-payment hook failed"
+      })
+    );
+    if (hookResult.isErr()) {
+      return mppErr(surface, hookResult.error);
+    }
+  }
+  const credentialResult = await safeCreateMppCredential(
+    surface,
+    mpayClient,
+    response
+  );
+  if (credentialResult.isErr()) {
+    return credentialResult;
+  }
+  const credential = credentialResult.value;
+  clonedRequest.headers.set("Authorization", credential);
+  return await safeFetch(surface, clonedRequest).andThen((paidResponse) => {
+    const receiptResult = safeGetMppReceipt(surface, paidResponse);
+    const priceDisplay = amount ? Number(formatUnits(BigInt(amount), decimals)).toLocaleString("en-US", {
+      style: "currency",
+      currency: "USD"
+    }) : void 0;
+    return mppOk({
+      response: paidResponse,
+      paymentInfo: {
+        protocol: "mpp",
+        ...priceDisplay ? { price: priceDisplay } : {},
+        ...receiptResult.isOk() ? {
+          payment: {
+            success: true,
+            transactionHash: receiptResult.value.reference
+          }
+        } : {}
+      }
+    });
+  });
+}
+
+export {
+  requestSchema,
+  buildRequest,
+  createFetchWithPayment
+};
+//# sourceMappingURL=chunk-VVTMCXSK.js.map

package/dist/esm/chunk-VVTMCXSK.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/server/tools/lib/request.ts","../../src/shared/operations/fetch-with-payment.ts"],"sourcesContent":["import z from 'zod';\n\nimport type { Address } from 'viem';\n\nexport const requestSchema = z.object({\n  url: z.url().describe('The endpoint URL'),\n  method: z\n    .enum(['GET', 'POST', 'PUT', 'DELETE', 'PATCH'])\n    .optional()\n    .describe('HTTP method. Defaults to GET for fetch operations.'),\n  body: z\n    .unknown()\n    .optional()\n    .describe('Request body for POST/PUT/PATCH methods'),\n  headers: z\n    .record(z.string(), z.string())\n    .optional()\n    .describe('Additional headers to include')\n    .default({}),\n});\n\ninterface BuildRequestProps {\n  input: z.infer<typeof requestSchema>;\n  address?: Address;\n  sessionId?: string;\n  provider?: string;\n}\n\nexport const buildRequest = ({\n  input,\n  address,\n  sessionId,\n  provider,\n}: BuildRequestProps) => {\n  return new Request(input.url, {\n    method: input.method ?? 'GET',\n    body: input.body\n      ? typeof input.body === 'string'\n        ? input.body\n        : JSON.stringify(input.body)\n      : undefined,\n    headers: {\n      ...(input.body ? { 'Content-Type': 'application/json' } : {}),\n      ...input.headers,\n      ...(address\n        ? { 'X-Wallet-Address': address, 'X-Client-ID': provider }\n        : {}),\n      ...(sessionId ? { 'X-Session-ID': sessionId } : {}),\n    },\n  });\n};\n","import { formatUnits } from 'viem';\n\nimport type { x402HTTPClient } from '@x402/core/client';\nimport type { Mpay } from 'mpay/client';\nimport type { Address } from 'viem';\nimport type { GlobalFlags } from '@/types';\n\nimport { resultFromPromise } from '@agentcash/neverthrow';\n\nimport { fetchErr, fetchOk, safeFetch } from '@/shared/neverthrow/fetch';\nimport {\n  safeCreatePaymentPayload,\n  safeGetPaymentRequired,\n  safeGetPaymentSettlement,\n  x402Err,\n  x402Ok,\n} from '@/shared/neverthrow/x402';\nimport {\n  safeGetMppChallenge,\n  safeCreateMppCredential,\n  safeGetMppReceipt,\n  mppErr,\n  mppOk,\n} from '@/shared/neverthrow/mpp';\n\nimport { log } from '@/shared/log';\nimport { detectPaymentProtocols } from '@/shared/protocol';\nimport { tokenStringToNumber } from '@/shared/token';\nimport { getBalance } from '@/shared/balance';\nimport { getTempoBalance } from '@/shared/tempo-balance';\n\n/**\n * Hook called before a payment is executed.\n * Throw to abort. Return to proceed.\n * Matches existing checkBalance/checkTempoBalance throw-to-abort behavior.\n */\nexport type BeforePaymentHook = (ctx: {\n  protocol: 'x402' | 'mpp';\n  amount: number;\n  currency: string;\n  network: string;\n}) => Promise<void>;\n\nexport interface PaymentClients {\n  x402: x402HTTPClient;\n  mpp: ReturnType<typeof Mpay.create>;\n}\n\nexport interface PaymentInfo {\n  protocol: 'x402' | 'mpp';\n  price?: string;\n  payment?: {\n    success: boolean;\n    transactionHash?: string;\n  };\n}\n\nexport interface FetchWithPaymentResult {\n  response: Response;\n  paymentInfo: PaymentInfo | null;\n}\n\nexport interface FetchWithPaymentOptions {\n  surface: string;\n  clients: PaymentClients;\n  paymentMethod: 'x402' | 'mpp' | 'auto';\n  account: { address: Address };\n  flags: GlobalFlags;\n  beforePayment?: BeforePaymentHook;\n}\n\n/**\n * Create a fetch function with automatic dual-protocol payment handling.\n *\n * 1. Makes initial request\n * 2. If 402 response, detects protocol(s)\n * 3. Calls beforePayment hook (for balance checks)\n * 4. Creates payment credential/payload\n * 5. Retries request with payment headers\n */\nexport function createFetchWithPayment(options: FetchWithPaymentOptions) {\n  const { surface, clients, paymentMethod, beforePayment } = options;\n\n  return async (request: Request) => {\n    const clonedRequest = request.clone();\n    const fallbackRequest = request.clone();\n\n    const probeResult = await safeFetch(surface, request);\n\n    if (probeResult.isErr()) {\n      return fetchErr(surface, probeResult.error);\n    }\n\n    // Not a 402 response — return as-is\n    if (probeResult.value.status !== 402) {\n      return probeResult.andThen(response =>\n        fetchOk<FetchWithPaymentResult>({ response, paymentInfo: null })\n      );\n    }\n\n    const response = probeResult.value;\n\n    // User explicitly chose a protocol — use that, no fallback\n    if (paymentMethod !== 'auto') {\n      if (paymentMethod === 'mpp') {\n        return handleMppPayment(surface, response, clonedRequest, options);\n      }\n      return handleX402Payment(\n        surface,\n        response,\n        clonedRequest,\n        clients.x402,\n        beforePayment\n      );\n    }\n\n    // Auto: detect available protocols, pick by higher balance\n    const available = detectPaymentProtocols(response);\n\n    let preferred: 'x402' | 'mpp';\n\n    if (available.length === 1) {\n      preferred = available[0]!;\n    } else {\n      // Both protocols available — pick by balance\n      preferred = await pickByBalance(surface, response, options);\n    }\n\n    const fallback =\n      available.length > 1 ? (preferred === 'mpp' ? 'x402' : 'mpp') : null;\n\n    const result =\n      preferred === 'mpp'\n        ? await handleMppPayment(surface, response, clonedRequest, options)\n        : await handleX402Payment(\n            surface,\n            response,\n            clonedRequest,\n            clients.x402,\n            beforePayment\n          );\n\n    if (result.isErr() && fallback) {\n      // Preferred failed — try fallback with a fresh request clone\n      return fallback === 'mpp'\n        ? handleMppPayment(surface, response, fallbackRequest, options)\n        : handleX402Payment(\n            surface,\n            response,\n            fallbackRequest,\n            clients.x402,\n            beforePayment\n          );\n    }\n\n    return result;\n  };\n}\n\n/**\n * Pick the preferred protocol by comparing wallet balances.\n * Falls back to 'mpp' if both balances fail to fetch.\n */\nasync function pickByBalance(\n  surface: string,\n  response: Response,\n  options: FetchWithPaymentOptions\n): Promise<'x402' | 'mpp'> {\n  const { account, flags } = options;\n\n  // Get x402 (USDC on Base) balance\n  const x402BalanceResult = await resultFromPromise(\n    'balance',\n    surface,\n    getBalance({\n      address: account.address,\n      flags,\n      surface,\n    }).then(r => (r.isOk() ? r.value.balance : 0)),\n    () => ({\n      cause: 'x402_balance' as const,\n      message: 'Failed to get x402 balance',\n    })\n  );\n\n  if (x402BalanceResult.isErr()) {\n    log.debug('Balance comparison failed, defaulting to mpp');\n    return 'mpp';\n  }\n\n  const x402Balance = x402BalanceResult.value;\n\n  // Get MPP (Tempo) balance — need token address from the challenge\n  let mppBalance = 0;\n  const challengeResult = safeGetMppChallenge(surface, response);\n  if (challengeResult.isOk()) {\n    const currency = challengeResult.value.request.currency as\n      | string\n      | undefined;\n    const decimals =\n      (challengeResult.value.request.decimals as number | undefined) ?? 6;\n    if (currency) {\n      const tempoResult = await resultFromPromise(\n        'tempo',\n        surface,\n        getTempoBalance({\n          address: account.address,\n          tokenAddress: currency as Address,\n        }),\n        () => ({\n          cause: 'tempo_balance' as const,\n          message: 'Tempo balance check failed',\n        })\n      );\n      if (tempoResult.isOk()) {\n        mppBalance = Number(formatUnits(tempoResult.value.balance, decimals));\n      }\n    }\n  }\n\n  log.info(`Protocol selection — x402: $${x402Balance}, mpp: $${mppBalance}`);\n  return x402Balance >= mppBalance ? 'x402' : 'mpp';\n}\n\nasync function handleX402Payment(\n  surface: string,\n  response: Response,\n  clonedRequest: Request,\n  client: x402HTTPClient,\n  beforePayment?: BeforePaymentHook\n) {\n  const paymentRequiredResult = await safeGetPaymentRequired(\n    surface,\n    client,\n    response\n  );\n\n  if (paymentRequiredResult.isErr()) {\n    return paymentRequiredResult;\n  }\n\n  const paymentRequired = paymentRequiredResult.value;\n\n  // Call beforePayment hook (e.g. balance check) before signing\n  if (beforePayment) {\n    const accept = paymentRequired.accepts[0];\n    if (accept) {\n      const amount = tokenStringToNumber(accept.amount);\n      const hookResult = await resultFromPromise(\n        'x402',\n        surface,\n        beforePayment({\n          protocol: 'x402',\n          amount,\n          currency: 'USDC',\n          network: accept.network,\n        }),\n        e => ({\n          cause: 'payment_already_attempted' as const,\n          message:\n            e instanceof Error ? e.message : 'Before-payment hook failed',\n        })\n      );\n      if (hookResult.isErr()) {\n        return x402Err(surface, hookResult.error);\n      }\n    }\n  }\n\n  const paymentPayloadResult = await safeCreatePaymentPayload(\n    surface,\n    client,\n    paymentRequired\n  );\n\n  if (paymentPayloadResult.isErr()) {\n    return paymentPayloadResult;\n  }\n\n  const paymentPayload = paymentPayloadResult.value;\n\n  // Encode payment header\n  const paymentHeaders = client.encodePaymentSignatureHeader(paymentPayload);\n\n  // Check if this is already a retry to prevent infinite loops\n  if (\n    clonedRequest.headers.has('PAYMENT-SIGNATURE') ||\n    clonedRequest.headers.has('X-PAYMENT')\n  ) {\n    return x402Err(surface, {\n      cause: 'payment_already_attempted',\n      message: 'Payment already attempted',\n    });\n  }\n\n  // Add payment headers to cloned request\n  for (const [key, value] of Object.entries(paymentHeaders)) {\n    clonedRequest.headers.set(key, value);\n  }\n  clonedRequest.headers.set(\n    'Access-Control-Expose-Headers',\n    'PAYMENT-RESPONSE,X-PAYMENT-RESPONSE'\n  );\n\n  // Retry the request with payment\n  return await safeFetch(surface, clonedRequest).andThen(paidResponse => {\n    const settlementResult = safeGetPaymentSettlement(\n      surface,\n      client,\n      paidResponse\n    );\n\n    return x402Ok<FetchWithPaymentResult>({\n      response: paidResponse,\n      paymentInfo: {\n        protocol: 'x402',\n        price: tokenStringToNumber(\n          paymentPayload.accepted.amount\n        ).toLocaleString('en-US', {\n          style: 'currency',\n          currency: 'USD',\n        }),\n        ...(settlementResult.isOk()\n          ? {\n              payment: {\n                success: settlementResult.value.success,\n                transactionHash: settlementResult.value.transaction,\n              },\n            }\n          : {}),\n      },\n    });\n  });\n}\n\nasync function handleMppPayment(\n  surface: string,\n  response: Response,\n  clonedRequest: Request,\n  options: FetchWithPaymentOptions\n) {\n  const { clients, beforePayment } = options;\n  const mpayClient = clients.mpp;\n\n  // Prevent retry loops\n  if (clonedRequest.headers.has('Authorization')) {\n    return mppErr(surface, {\n      cause: 'mpp_payment_already_attempted',\n      message: 'MPP payment already attempted',\n    });\n  }\n\n  // Parse the challenge from the WWW-Authenticate header\n  const challengeResult = safeGetMppChallenge(surface, response);\n\n  if (challengeResult.isErr()) {\n    return challengeResult;\n  }\n\n  const challenge = challengeResult.value;\n\n  // Extract payment info from challenge request\n  const amount = challenge.request.amount as string | undefined;\n  const decimals = (challenge.request.decimals as number | undefined) ?? 6;\n  const currency = challenge.request.currency as string | undefined;\n\n  // Call beforePayment hook (e.g. balance check)\n  if (beforePayment && amount && currency) {\n    const numericAmount = Number(formatUnits(BigInt(amount), decimals));\n    const hookResult = await resultFromPromise(\n      'mpp',\n      surface,\n      beforePayment({\n        protocol: 'mpp',\n        amount: numericAmount,\n        currency,\n        network: `tempo:${challenge.method}`,\n      }),\n      e => ({\n        cause: 'mpp_payment_already_attempted' as const,\n        message: e instanceof Error ? e.message : 'Before-payment hook failed',\n      })\n    );\n    if (hookResult.isErr()) {\n      return mppErr(surface, hookResult.error);\n    }\n  }\n\n  // Create credential (signs transaction on Tempo)\n  const credentialResult = await safeCreateMppCredential(\n    surface,\n    mpayClient,\n    response\n  );\n\n  if (credentialResult.isErr()) {\n    return credentialResult;\n  }\n\n  const credential = credentialResult.value;\n\n  // Set Authorization header on cloned request\n  clonedRequest.headers.set('Authorization', credential);\n\n  // Retry the fetch with the credential\n  return await safeFetch(surface, clonedRequest).andThen(paidResponse => {\n    // Parse the receipt for transaction hash\n    const receiptResult = safeGetMppReceipt(surface, paidResponse);\n\n    const priceDisplay = amount\n      ? Number(formatUnits(BigInt(amount), decimals)).toLocaleString('en-US', {\n          style: 'currency',\n          currency: 'USD',\n        })\n      : undefined;\n\n    return mppOk<FetchWithPaymentResult>({\n      response: paidResponse,\n      paymentInfo: {\n        protocol: 'mpp',\n        ...(priceDisplay ? { price: priceDisplay } : {}),\n        ...(receiptResult.isOk()\n          ? {\n              payment: {\n                success: true,\n                transactionHash: receiptResult.value.reference,\n              },\n            }\n          : {}),\n      },\n    });\n  });\n}\n"],"mappings":"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","names":["response"]}

package/dist/esm/{commands-DUIGMEXV.js → commands-DE2RIAL5.js}

@@ -1,35 +1,34 @@
 import {
   buildRequest,
-  requestSchema
-} from "./chunk-XXKBL2AC.js";
-import {
   createFetchWithPayment,
-  getWalletInfo,
-  submitErrorReport
-} from "./chunk-GIYROB7O.js";
+  requestSchema
+} from "./chunk-VVTMCXSK.js";
 import {
+  TEMPO_RPC_URL,
   checkEndpoint,
   discoverResources,
-  safeGetPaymentSettlement,
-  tokenStringToNumber
-} from "./chunk-NQNMVKGY.js";
-import "./chunk-FJSHGCIM.js";
+  getWalletInfo,
+  submitErrorReport
+} from "./chunk-FM2E2QVT.js";
+import "./chunk-DZC5MTYY.js";
 import {
   DEFAULT_NETWORK,
   getWallet,
   redeemInviteCode,
-  safeParseJson
-} from "./chunk-GCS3RSLB.js";
-import "./chunk-CZBCIWYU.js";
+  safeParseJson,
+  toJsonObject
+} from "./chunk-EVE4PTLY.js";
 import {
   safeParseResponse
-} from "./chunk-KD2ZZXT7.js";
+} from "./chunk-PJFATGPH.js";
 import "./chunk-ISR6DJ53.js";
 
 // src/cli/commands/fetch.ts
 import { randomBytes } from "crypto";
 import { x402Client, x402HTTPClient } from "@x402/core/client";
 import { ExactEvmScheme } from "@x402/evm/exact/client";
+import { Mpay, tempo as tempoMethod } from "mpay/client";
+import { tempo } from "viem/chains";
 
 // src/cli/output/types.ts
 var errorCodeToExitCode = {
@@ -233,7 +232,7 @@ function parseRequestInput(surface, args, flags) {
   }
   const inputResult = requestSchema.safeParse({
     url: args.url,
-    method: args.method ?? "GET",
+    method: args.method,
     body: parsedBody,
     headers: parsedHeaders ?? {}
   });
@@ -262,20 +261,34 @@ async function fetchCommand(args, flags) {
       { network: DEFAULT_NETWORK, client: new ExactEvmScheme(account) }
     ]
   });
-  const client = new x402HTTPClient(coreClient);
+  const x402HttpClient = new x402HTTPClient(coreClient);
+  const mpayClient = Mpay.create({
+    methods: [
+      tempoMethod({
+        account,
+        rpcUrl: { [tempo.id]: TEMPO_RPC_URL }
+      })
+    ]
+  });
   const provider = flags.provider ?? account.address;
+  const paymentMethod = args.paymentMethod ?? "auto";
   const request = buildRequest({
     input,
     address: account.address,
     sessionId,
     provider
   });
-  const fetchWithPay = createFetchWithPayment(SURFACE, client);
-  const fetchResult = await fetchWithPay(request);
+  const fetchResult = await createFetchWithPayment({
+    surface: SURFACE,
+    clients: { x402: x402HttpClient, mpp: mpayClient },
+    paymentMethod,
+    account,
+    flags
+  })(request);
   if (fetchResult.isErr()) {
     return outputAndExit(fromNeverthrowError(fetchResult), flags);
   }
-  const { response, paymentPayload } = fetchResult.value;
+  const { response, paymentInfo } = fetchResult.value;
   if (!response.ok) {
     const parseResult = await safeParseResponse(SURFACE, response);
     const details = { statusCode: response.status };
@@ -304,23 +317,11 @@ async function fetchCommand(args, flags) {
   if (parseResponseResult.isErr()) {
     return outputAndExit(fromNeverthrowError(parseResponseResult), flags);
   }
-  const settlementResult = safeGetPaymentSettlement(SURFACE, client, response);
   const data = parseResponseResult.value.type === "json" ? parseResponseResult.value.data : parseResponseResult.value.type === "text" ? parseResponseResult.value.data : { type: parseResponseResult.value.type };
-  const metadata = settlementResult.isOk() || paymentPayload !== void 0 ? {
-    ...paymentPayload !== void 0 ? {
-      price: tokenStringToNumber(
-        paymentPayload.accepted.amount
-      ).toLocaleString("en-US", {
-        style: "currency",
-        currency: "USD"
-      })
-    } : {},
-    ...settlementResult.isOk() ? {
-      payment: {
-        success: settlementResult.value.success,
-        transactionHash: settlementResult.value.transaction
-      }
-    } : {}
+  const metadata = paymentInfo ? {
+    protocol: paymentInfo.protocol,
+    ...paymentInfo.price ? { price: paymentInfo.price } : {},
+    ...paymentInfo.payment ? { payment: paymentInfo.payment } : {}
   } : void 0;
   outputAndExit(successResponse(data, metadata), flags);
 }
@@ -332,96 +333,44 @@ async function checkCommand(args, flags) {
   const { account } = await getWalletOrExit(flags);
   const sessionId = randomBytes2(16).toString("hex");
   const input = parseRequestInput(SURFACE2, args, flags);
-  const request = buildRequest({
-    input,
-    address: account.address,
-    sessionId
+  const result = await checkEndpoint({
+    surface: SURFACE2,
+    url: input.url,
+    methods: input.method ? [input.method] : void 0,
+    body: input.body,
+    headers: {
+      ...input.headers ?? {},
+      "X-Wallet-Address": account.address,
+      "X-Session-ID": sessionId
+    },
+    includeMethodErrors: !!input.method
   });
-  const result = await checkEndpoint(SURFACE2, request);
-  if (result.isErr()) {
-    return outputAndExit(fromNeverthrowError(result), flags);
-  }
-  const value = result.value;
-  if (value instanceof Response) {
-    const response = value;
-    const parseResult = await safeParseResponse(SURFACE2, response);
-    const details = { statusCode: response.status };
-    if (parseResult.isOk()) {
-      const { type } = parseResult.value;
-      if (type === "json") {
-        details.body = parseResult.value.data;
-      } else if (type === "text") {
-        details.body = parseResult.value.data;
-      } else {
-        details.bodyType = type;
-      }
-    }
-    return outputAndExit(
-      errorResponse({
-        code: "HTTP_ERROR",
-        message: `HTTP ${response.status}: ${response.statusText}`,
-        surface: SURFACE2,
-        cause: "http",
-        details
-      }),
-      flags
-    );
-  }
-  if ("requiresPayment" in value && value.requiresPayment) {
-    return outputAndExit(
-      successResponse({
-        requiresPayment: true,
-        statusCode: value.statusCode,
-        routeDetails: value.routeDetails
-      }),
-      flags
-    );
-  }
-  if ("parsedResponse" in value) {
-    const { parsedResponse } = value;
-    const data = parsedResponse.type === "json" ? parsedResponse.data : parsedResponse.type === "text" ? parsedResponse.data : { type: parsedResponse.type };
-    return outputAndExit(
-      successResponse({
-        requiresPayment: false,
-        statusCode: value.statusCode,
-        data
-      }),
-      flags
-    );
-  }
-  return outputAndExit(
-    errorResponse({
-      code: "GENERAL_ERROR",
-      message: "Unexpected response format",
-      surface: SURFACE2,
-      cause: "unknown"
-    }),
-    flags
-  );
+  return outputAndExit(successResponse(toJsonObject(result)), flags);
 }
 
 // src/cli/commands/discover.ts
 async function discoverCommand(args, flags) {
   const result = await discoverResources("cli:discover", args.url);
-  if (result.isOk()) {
+  if (result) {
     return outputAndExit(
       successResponse({
         found: true,
-        origin: result.value.origin,
-        source: result.value.source,
-        endpoints: result.value.endpoints.map((e) => ({ ...e })),
-        ...result.value.instructions ? { instructions: result.value.instructions } : {}
+        origin: result.origin,
+        source: result.source,
+        endpoints: result.endpoints.map((e) => ({ ...e })),
+        ...result.instructions ? { instructions: result.instructions } : {}
       }),
       flags
     );
   }
+  const origin = URL.canParse(args.url) ? new URL(args.url).origin : args.url;
   return outputAndExit(
     errorResponse({
       code: "GENERAL_ERROR",
-      message: result.error.message,
-      surface: result.error.surface,
-      cause: result.error.cause,
-      details: { origin: result.error.origin }
+      message: `No OpenAPI spec found for ${origin}. Tried: /openapi.json, /.well-known/openapi.json, /.well-known/x402, /.well-known/mpp`,
+      surface: "cli:discover",
+      cause: "not_found",
+      details: { origin }
     }),
     flags
   );
@@ -503,7 +452,7 @@ async function reportErrorCommand(args, flags) {
 
 // src/cli/commands/server.ts
 async function serverCommand(flags) {
-  const { startServer } = await import("./server-7D6YY3KG.js");
+  const { startServer } = await import("./server-WCNK52XR.js");
   await startServer(flags);
 }
 export {
@@ -515,4 +464,4 @@ export {
   walletInfoCommand,
   walletRedeemCommand
 };
-//# sourceMappingURL=commands-DUIGMEXV.js.map
+//# sourceMappingURL=commands-DE2RIAL5.js.map