agentcash 0.3.4 → 0.3.6

package/dist/esm/{server-7D6YY3KG.js → server-WCNK52XR.js}

@@ -1,55 +1,45 @@
 import {
   buildRequest,
+  createFetchWithPayment,
   requestSchema
-} from "./chunk-XXKBL2AC.js";
+} from "./chunk-VVTMCXSK.js";
 import {
-  getTempoBalance,
-  getTempoChainId,
-  getTempoRpcUrl,
-  getTempoTokenAddress,
-  submitErrorReport
-} from "./chunk-GIYROB7O.js";
-import {
-  fetchOpenApiSpec,
-  getEndpointSchema,
-  getIndexEntry,
+  TEMPO_RPC_URL,
+  checkEndpoint,
+  detectPaymentProtocols,
+  discoverResources,
   getInputSchema,
   getOriginIndex,
   getSiwxExtension,
-  safeCreatePaymentPayload,
+  getTempoBalance,
+  getWalletInfo,
   safeCreateSIWxPayload,
+  safeGetMppChallenge,
   safeGetPaymentRequired,
-  safeGetPaymentSettlement,
-  tokenStringToNumber,
-  x402Err,
-  x402Ok
-} from "./chunk-NQNMVKGY.js";
-import "./chunk-FJSHGCIM.js";
+  submitErrorReport
+} from "./chunk-FM2E2QVT.js";
+import "./chunk-DZC5MTYY.js";
 import {
   DEFAULT_NETWORK,
   getWallet,
   redeemInviteCode,
-  safeStringifyJson
-} from "./chunk-GCS3RSLB.js";
-import {
-  getBalance,
-  getDepositLink,
-  openDepositLink
-} from "./chunk-CZBCIWYU.js";
+  safeStringifyJson,
+  toJsonObject
+} from "./chunk-EVE4PTLY.js";
 import {
   err,
-  fetchErr,
   fetchHttpErr,
-  fetchOk,
+  getBalance,
+  getDepositLink,
   isFetchError,
   log,
   ok,
+  openDepositLink,
   resultFromPromise,
-  resultFromThrowable,
   safeFetch,
   safeFetchJson,
   safeParseResponse
-} from "./chunk-KD2ZZXT7.js";
+} from "./chunk-PJFATGPH.js";
 import "./chunk-ISR6DJ53.js";
 
 // src/server/index.ts
@@ -57,12 +47,12 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { randomBytes } from "crypto";
 
-// src/server/tools/x402-fetch.ts
+// src/server/tools/fetch.ts
 import { z } from "zod";
-import { formatUnits as formatUnits2 } from "viem";
 import { x402Client, x402HTTPClient } from "@x402/core/client";
 import { ExactEvmScheme } from "@x402/evm/exact/client";
-import { Mpay, tempo } from "mpay/client";
+import { Mpay, tempo as tempoMethod } from "mpay/client";
+import { tempo } from "viem/chains";
 
 // src/server/tools/response/lib.ts
 var parsedResponseToToolContentPart = (data) => {
@@ -252,67 +242,12 @@ Insufficient Tempo balance for this payment.`
   return balance;
 };
 
-// src/shared/protocol.ts
-function detectPaymentProtocols(response) {
-  const protocols = [];
-  const wwwAuth = response.headers.get("WWW-Authenticate");
-  if (wwwAuth?.startsWith("Payment")) {
-    protocols.push("mpp");
-  }
-  const paymentRequired = response.headers.get("payment-required");
-  if (paymentRequired) {
-    protocols.push("x402");
-  }
-  if (protocols.length === 0) {
-    protocols.push("x402");
-  }
-  return protocols;
-}
-
-// src/shared/neverthrow/mpp/index.ts
-import { Challenge, Receipt } from "mpay";
-var errorType = "mpp";
-var mppOk = (value) => ok(value);
-var mppErr = (surface3, error) => err(errorType, surface3, error);
-var mppResultFromPromise = (surface3, promise, error) => resultFromPromise(errorType, surface3, promise, error);
-var mppResultFromThrowable = (surface3, fn, error) => resultFromThrowable(errorType, surface3, fn, error);
-var safeGetMppChallenge = (surface3, response) => {
-  return mppResultFromThrowable(
-    surface3,
-    () => Challenge.fromResponse(response),
-    (error) => ({
-      cause: "parse_mpp_challenge",
-      message: error instanceof Error ? error.message : "Failed to parse MPP challenge from response"
-    })
-  );
-};
-var safeCreateMppCredential = (surface3, mpayClient, response) => {
-  return mppResultFromPromise(
-    surface3,
-    mpayClient.createCredential(response),
-    (error) => ({
-      cause: "create_mpp_credential",
-      message: error instanceof Error ? error.message : "Failed to create MPP credential"
-    })
-  );
-};
-var safeGetMppReceipt = (surface3, response) => {
-  return mppResultFromThrowable(
-    surface3,
-    () => Receipt.fromResponse(response),
-    (error) => ({
-      cause: "parse_mpp_receipt",
-      message: error instanceof Error ? error.message : "Failed to parse MPP receipt from response"
-    })
-  );
-};
-
-// src/server/tools/x402-fetch.ts
+// src/server/tools/fetch.ts
 var toolName = "fetch";
 var fetchInputSchema = requestSchema.extend({
   paymentMethod: z.enum(["x402", "mpp", "auto"]).default("auto").optional().describe("Payment protocol to use. Defaults to auto-detect.")
 });
-var registerFetchX402ResourceTool = ({
+var registerFetchTool = ({
   server,
   account,
   flags,
@@ -322,7 +257,7 @@ var registerFetchX402ResourceTool = ({
     toolName,
     {
       title: "Fetch",
-      description: `HTTP fetch with automatic x402 payment. Detects 402 responses, signs payment, retries with payment headers. Returns response data + payment details (price, tx hash) if paid. Check balance with get_wallet_info first.`,
+      description: `HTTP fetch with automatic payment. Detects 402 responses, signs payment, retries with payment headers. Returns response data + payment details (price, tx hash) if paid. Check balance with get_wallet_info first.`,
       inputSchema: fetchInputSchema,
       annotations: {
         readOnlyHint: true,
@@ -338,28 +273,37 @@ var registerFetchX402ResourceTool = ({
           { network: DEFAULT_NETWORK, client: new ExactEvmScheme(account) }
         ]
       });
-      coreClient.onBeforePaymentCreation(async ({ selectedRequirements }) => {
-        const amount = tokenStringToNumber(selectedRequirements.amount);
-        await checkBalance({
-          surface: toolName,
-          server,
-          address: account.address,
-          amountNeeded: amount,
-          message: (balance) => `This request costs ${amount} USDC. Your current balance is ${balance} USDC.`,
-          flags
-        });
-      });
       const x402HttpClient = new x402HTTPClient(coreClient);
-      const tempoChainId = getTempoChainId();
-      const tempoRpcUrl = getTempoRpcUrl();
       const mpayClient = Mpay.create({
         methods: [
-          tempo({
+          tempoMethod({
             account,
-            rpcUrl: { [tempoChainId]: tempoRpcUrl }
+            rpcUrl: { [tempo.id]: TEMPO_RPC_URL }
           })
         ]
       });
+      const beforePayment = async (ctx) => {
+        if (ctx.protocol === "x402") {
+          await checkBalance({
+            surface: toolName,
+            server,
+            address: account.address,
+            amountNeeded: ctx.amount,
+            message: (balance) => `This request costs ${ctx.amount} USDC. Your current balance is ${balance} USDC.`,
+            flags
+          });
+        } else {
+          await checkTempoBalance({
+            surface: toolName,
+            server,
+            address: account.address,
+            tokenAddress: ctx.currency,
+            amountNeeded: ctx.amount,
+            decimals: 6,
+            message: (balance) => `This request costs ${ctx.amount} tokens. Your current Tempo balance is ${balance}.`
+          });
+        }
+      };
       const provider = flags.provider ?? account.address;
       const request = buildRequest({
         input,
@@ -367,13 +311,13 @@ var registerFetchX402ResourceTool = ({
         sessionId,
         provider
       });
-      const fetchResult = await safeWrapFetchWithPayment({
-        x402HttpClient,
-        mpayClient,
+      const fetchResult = await createFetchWithPayment({
+        surface: toolName,
+        clients: { x402: x402HttpClient, mpp: mpayClient },
         paymentMethod,
         account,
-        server,
-        flags
+        flags,
+        beforePayment
       })(request);
       if (fetchResult.isErr()) {
         return mcpError(fetchResult);
@@ -388,209 +332,11 @@ var registerFetchX402ResourceTool = ({
       }
       return mcpSuccessResponse(
         parseResponseResult.value,
-        paymentInfo ?? void 0
+        paymentInfo
       );
     }
   );
 };
-function safeWrapFetchWithPayment(config) {
-  const { x402HttpClient, paymentMethod } = config;
-  return async (request) => {
-    const clonedRequest = request.clone();
-    const fallbackRequest = request.clone();
-    const probeResult = await safeFetch(toolName, request);
-    if (probeResult.isErr()) {
-      return fetchErr(toolName, 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(response, clonedRequest, config);
-      }
-      return handleX402Payment(response, clonedRequest, x402HttpClient);
-    }
-    const available = detectPaymentProtocols(response);
-    let preferred;
-    if (available.length === 1) {
-      preferred = available[0];
-    } else {
-      preferred = await pickByBalance(response, config);
-    }
-    const fallback = available.length > 1 ? preferred === "mpp" ? "x402" : "mpp" : null;
-    const result = preferred === "mpp" ? await handleMppPayment(response, clonedRequest, config) : await handleX402Payment(response, clonedRequest, x402HttpClient);
-    if (result.isErr() && fallback) {
-      return fallback === "mpp" ? handleMppPayment(response, fallbackRequest, config) : handleX402Payment(response, fallbackRequest, x402HttpClient);
-    }
-    return result;
-  };
-}
-async function pickByBalance(response, config) {
-  const { account, flags } = config;
-  const x402BalanceResult = await resultFromPromise(
-    "balance",
-    toolName,
-    getBalance({
-      address: account.address,
-      flags,
-      surface: toolName
-    }).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(toolName, response);
-  if (challengeResult.isOk()) {
-    const currency = challengeResult.value.request.currency;
-    const decimals = challengeResult.value.request.decimals ?? 6;
-    if (currency) {
-      const tempoResult = await resultFromPromise(
-        "tempo",
-        toolName,
-        getTempoBalance({
-          address: account.address,
-          tokenAddress: currency
-        }),
-        () => ({
-          cause: "tempo_balance",
-          message: "Tempo balance check failed"
-        })
-      );
-      if (tempoResult.isOk()) {
-        mppBalance = Number(formatUnits2(tempoResult.value.balance, decimals));
-      }
-    }
-  }
-  log.info(`Protocol selection \u2014 x402: $${x402Balance}, mpp: $${mppBalance}`);
-  return x402Balance >= mppBalance ? "x402" : "mpp";
-}
-async function handleX402Payment(response, clonedRequest, client) {
-  const paymentRequiredResult = await safeGetPaymentRequired(
-    toolName,
-    client,
-    response
-  );
-  if (paymentRequiredResult.isErr()) {
-    return paymentRequiredResult;
-  }
-  const paymentRequired = paymentRequiredResult.value;
-  const paymentPayloadResult = await safeCreatePaymentPayload(
-    toolName,
-    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(toolName, {
-      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(toolName, clonedRequest).andThen((paidResponse) => {
-    const settlementResult = safeGetPaymentSettlement(
-      toolName,
-      client,
-      paidResponse
-    );
-    return x402Ok({
-      response: paidResponse,
-      paymentInfo: {
-        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(response, clonedRequest, config) {
-  const { mpayClient, account, server } = config;
-  if (clonedRequest.headers.has("Authorization")) {
-    return mppErr(toolName, {
-      cause: "mpp_payment_already_attempted",
-      message: "MPP payment already attempted"
-    });
-  }
-  const challengeResult = safeGetMppChallenge(toolName, 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 (amount && currency) {
-    const numericAmount = Number(formatUnits2(BigInt(amount), decimals));
-    await checkTempoBalance({
-      surface: toolName,
-      server,
-      address: account.address,
-      tokenAddress: currency,
-      amountNeeded: numericAmount,
-      decimals,
-      message: (balance) => `This request costs ${numericAmount} tokens. Your current Tempo balance is ${balance}.`
-    });
-  }
-  const credentialResult = await safeCreateMppCredential(
-    toolName,
-    mpayClient,
-    response
-  );
-  if (credentialResult.isErr()) {
-    return credentialResult;
-  }
-  const credential = credentialResult.value;
-  clonedRequest.headers.set("Authorization", credential);
-  return await safeFetch(toolName, clonedRequest).andThen((paidResponse) => {
-    const receiptResult = safeGetMppReceipt(toolName, paidResponse);
-    const priceDisplay = amount ? Number(formatUnits2(BigInt(amount), decimals)).toLocaleString("en-US", {
-      style: "currency",
-      currency: "USD"
-    }) : void 0;
-    return mppOk({
-      response: paidResponse,
-      paymentInfo: {
-        ...priceDisplay ? { price: priceDisplay } : {},
-        ...receiptResult.isOk() ? {
-          payment: {
-            success: true,
-            transactionHash: receiptResult.value.reference
-          }
-        } : {}
-      }
-    });
-  });
-}
 
 // src/server/tools/auth-fetch.ts
 import { x402Client as x402Client2, x402HTTPClient as x402HTTPClient2 } from "@x402/core/client";
@@ -648,8 +394,8 @@ var registerAuthTools = ({
       const paymentRequired = getPaymentRequiredResult.value;
       const siwxExtension = getSiwxExtension(paymentRequired.extensions);
       if (!siwxExtension) {
-        return mcpErrorJson({
-          message: "Endpoint returned 402 but no sign-in-with-x extension found",
+        return mcpSuccessJson({
+          error: "Endpoint returned 402 but no sign-in-with-x extension found",
           statusCode: 402,
           extensions: Object.keys(paymentRequired.extensions ?? {}),
           hint: "This endpoint may require payment instead of authentication. Use execute_call for paid requests."
@@ -692,7 +438,6 @@ var registerAuthTools = ({
 
 // src/server/tools/wallet.ts
 import { z as z2 } from "zod";
-import { formatUnits as formatUnits3 } from "viem";
 var chainBalanceSchema = z2.object({
   chain: z2.string().describe("Chain name"),
   balance: z2.number().describe("USDC balance on this chain")
@@ -723,43 +468,34 @@ var registerWalletTools = ({
       }
     },
     async () => {
-      const [balanceResult, tempoResult] = await Promise.all([
-        getBalance({
-          address,
-          flags,
-          surface: "get_wallet_info"
-        }),
-        getTempoBalance({ address, tokenAddress: getTempoTokenAddress() }).then((r) => Number(formatUnits3(r.balance, 6))).catch((e) => {
-          log.debug(`Failed to fetch Tempo balance: ${e}`);
-          return null;
-        })
-      ]);
-      if (balanceResult.isErr()) {
-        return mcpError(balanceResult);
+      const result = await getWalletInfo("get_wallet_info", address, flags);
+      if (result.isErr()) {
+        return mcpError(result);
       }
-      const baseBalance = balanceResult.value.balance;
-      const tempoBalance = tempoResult ?? 0;
-      const totalBalance = baseBalance + tempoBalance;
-      const chains = [
-        { chain: "Base", balance: baseBalance },
-        { chain: "Tempo", balance: tempoBalance }
-      ];
       return mcpSuccessStructuredJson({
-        address,
-        balance: totalBalance,
-        chains,
-        isNewWallet: totalBalance === 0,
-        depositLink: getDepositLink(address, flags),
-        ...totalBalance < 2.5 && totalBalance > 0 ? { message: "Your balance is low. Consider topping it up" } : {}
+        address: result.value.address,
+        balance: result.value.balance,
+        chains: result.value.chains.map((c) => ({ ...c })),
+        isNewWallet: result.value.isNewWallet,
+        depositLink: result.value.depositLink,
+        ...result.value.message ? { message: result.value.message } : {}
       });
     }
   );
 };
 
 // src/server/tools/check-endpoint.ts
-import { x402Client as x402Client3, x402HTTPClient as x402HTTPClient3 } from "@x402/core/client";
+import z3 from "zod";
 var toolName3 = "check_endpoint_schema";
-var registerCheckX402EndpointTool = ({
+var checkEndpointInputSchema = z3.object({
+  url: z3.url().describe("The endpoint URL"),
+  method: z3.enum(["GET", "POST", "PUT", "DELETE", "PATCH"]).optional().describe(
+    "HTTP method to check. If omitted, all methods are probed in parallel."
+  ),
+  body: z3.unknown().optional().describe("Request body for POST/PUT/PATCH methods"),
+  headers: z3.record(z3.string(), z3.string()).optional().describe("Additional headers to include").default({})
+});
+var registerCheckEndpointTool = ({
   server,
   account,
   sessionId
@@ -768,8 +504,8 @@ var registerCheckX402EndpointTool = ({
     toolName3,
     {
       title: "Check Endpoint Schema",
-      description: `Probe endpoint to check if x402-protected. Returns pricing, input schema, payment methods. Use before fetch to preview costs. No payment made.`,
-      inputSchema: requestSchema,
+      description: `Probe endpoint to check if payment-protected. By default checks only the HTTP methods declared in the endpoint's OpenAPI spec (falls back to all methods if no spec is available). Returns pricing, input schema, and payment methods for each method that responds with 402 or 2xx. Use before fetch to preview costs. No payment made.`,
+      inputSchema: checkEndpointInputSchema,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
@@ -779,124 +515,31 @@ var registerCheckX402EndpointTool = ({
     },
     async (input) => {
       log.info("Querying endpoint", input);
-      const cachedSchemaResult = await resultFromPromise(
-        "openapi",
-        toolName3,
-        getEndpointSchema(input.url, input.method),
-        (e) => ({
-          cause: "cache_lookup",
-          message: e instanceof Error ? e.message : String(e)
-        })
-      );
-      if (cachedSchemaResult.isErr()) {
-        log.debug(
-          `Cache lookup failed for ${input.url}, falling back to 402 probe`
-        );
-      } else if (cachedSchemaResult.value) {
-        const cachedSchema = cachedSchemaResult.value;
-        const origin = new URL(input.url).origin;
-        const path = new URL(input.url).pathname || "/";
-        const method = (input.method ?? "POST").toUpperCase();
-        const indexEntry = getIndexEntry(origin, path, method);
+      const { url, results } = await checkEndpoint({
+        surface: toolName3,
+        url: input.url,
+        methods: input.method ? [input.method] : void 0,
+        body: input.body,
+        headers: {
+          ...input.headers,
+          "X-Wallet-Address": account.address,
+          ...sessionId ? { "X-Session-ID": sessionId } : {}
+        },
+        includeMethodErrors: !!input.method
+      });
+      if (results.length === 0) {
         return mcpSuccessJson({
-          source: "openapi",
-          requiresPayment: true,
-          schema: cachedSchema,
-          ...indexEntry?.price ? { estimatedPrice: indexEntry.price } : {},
-          ...indexEntry?.protocols ? { protocols: indexEntry.protocols } : {},
-          ...indexEntry?.summary ? { summary: indexEntry.summary } : {}
+          message: "No methods returned 402 or 2xx for this endpoint.",
+          url
         });
       }
-      const responseResult = await safeFetch(
-        toolName3,
-        buildRequest({ input, address: account.address, sessionId })
-      );
-      if (responseResult.isErr()) {
-        return mcpError(responseResult);
-      }
-      const response = responseResult.value;
-      if (response.status !== 402) {
-        if (!response.ok) {
-          return mcpErrorFetch(toolName3, response);
-        }
-        const parseResponseResult = await safeParseResponse(toolName3, response);
-        if (parseResponseResult.isErr()) {
-          return mcpError(parseResponseResult);
-        }
-        return mcpSuccessResponse(parseResponseResult.value, {
-          requiresPayment: false
-        });
-      }
-      const protocols = detectPaymentProtocols(response);
-      const paymentMethods = [];
-      if (protocols.includes("mpp")) {
-        const challengeResult = safeGetMppChallenge(toolName3, response);
-        if (challengeResult.isOk()) {
-          const challenge = challengeResult.value;
-          const currency = challenge.request.currency;
-          const amount = challenge.request.amount;
-          const decimals = challenge.request.decimals ?? 6;
-          let schema;
-          const endpointSchemaResult = await resultFromPromise(
-            "openapi",
-            toolName3,
-            getEndpointSchema(input.url, input.method),
-            (e) => ({
-              cause: "schema_fetch",
-              message: e instanceof Error ? e.message : String(e)
-            })
-          );
-          if (endpointSchemaResult.isOk() && endpointSchemaResult.value) {
-            schema = endpointSchemaResult.value;
-          } else if (endpointSchemaResult.isErr()) {
-            log.debug(`Failed to fetch OpenAPI schema for: ${input.url}`);
-          }
-          paymentMethods.push({
-            protocol: "mpp",
-            method: challenge.method,
-            intent: challenge.intent,
-            realm: challenge.realm,
-            ...challenge.description ? { description: challenge.description } : {},
-            ...amount ? { price: tokenStringToNumber(amount, decimals) } : {},
-            ...currency ? { currency } : {},
-            ...schema ? { schema } : {},
-            network: `tempo:${challenge.method}`
-          });
-        }
-      }
-      if (protocols.includes("x402")) {
-        const client = new x402HTTPClient3(new x402Client3());
-        const paymentRequiredResult = await safeGetPaymentRequired(
-          toolName3,
-          client,
-          response
-        );
-        if (paymentRequiredResult.isOk()) {
-          const { resource, extensions, accepts } = paymentRequiredResult.value;
-          for (const accept of accepts) {
-            paymentMethods.push({
-              protocol: "x402",
-              ...resource,
-              schema: getInputSchema(extensions),
-              price: tokenStringToNumber(accept.amount),
-              network: accept.network,
-              asset: accept.asset
-            });
-          }
-        }
-      }
-      return mcpSuccessJson({
-        requiresPayment: true,
-        protocols,
-        statusCode: response.status,
-        paymentMethods
-      });
+      return mcpSuccessJson(toJsonObject({ url, results }));
     }
   );
 };
 
 // src/server/tools/redeem-invite.ts
-import z3 from "zod";
+import z4 from "zod";
 var registerRedeemInviteTool = ({
   server,
   account: { address },
@@ -907,13 +550,13 @@ var registerRedeemInviteTool = ({
     {
       title: "Redeem Invite",
       description: `Redeem an invite code for free USDC on Base. One-time use per code. Returns amount received and transaction hash. Use get_wallet_info after to verify balance.`,
-      inputSchema: z3.object({
-        code: z3.string().min(1).describe("The invite code")
+      inputSchema: z4.object({
+        code: z4.string().min(1).describe("The invite code")
       }),
-      outputSchema: z3.object({
-        redeemed: z3.literal(true),
-        amount: z3.string().describe('Amount with unit (e.g., "5 USDC")'),
-        txHash: z3.string().describe("Transaction hash on Base")
+      outputSchema: z4.object({
+        redeemed: z4.literal(true),
+        amount: z4.string().describe('Amount with unit (e.g., "5 USDC")'),
+        txHash: z4.string().describe("Transaction hash on Base")
       }),
       annotations: {
         readOnlyHint: false,
@@ -946,7 +589,7 @@ var registerRedeemInviteTool = ({
 };
 
 // src/server/tools/telemetry.ts
-import z4 from "zod";
+import z5 from "zod";
 var toolName4 = "report_error";
 var registerTelemetryTools = ({
   server,
@@ -958,18 +601,18 @@ var registerTelemetryTools = ({
     {
       title: "Report Error",
       description: "EMERGENCY ONLY. Report critical MCP tool bugs. Do NOT use for normal errors (balance, network, 4xx) - those are recoverable.",
-      inputSchema: z4.object({
-        tool: z4.string().describe("MCP tool name"),
-        resource: z4.string().optional().describe("x402 resource URL"),
-        summary: z4.string().describe("1-2 sentence summary"),
-        errorMessage: z4.string().describe("Error message"),
-        stack: z4.string().optional().describe("Stack trace"),
-        fullReport: z4.string().optional().describe("Detailed report with context, logs, repro steps")
+      inputSchema: z5.object({
+        tool: z5.string().describe("MCP tool name"),
+        resource: z5.string().optional().describe("Resource URL"),
+        summary: z5.string().describe("1-2 sentence summary"),
+        errorMessage: z5.string().describe("Error message"),
+        stack: z5.string().optional().describe("Stack trace"),
+        fullReport: z5.string().optional().describe("Detailed report with context, logs, repro steps")
       }),
-      outputSchema: z4.object({
-        submitted: z4.literal(true),
-        reportId: z4.string().describe("Unique report ID for tracking"),
-        message: z4.string().describe("Confirmation message")
+      outputSchema: z5.object({
+        submitted: z5.literal(true),
+        reportId: z5.string().describe("Unique report ID for tracking"),
+        message: z5.string().describe("Confirmation message")
       }),
       annotations: {
         readOnlyHint: false,
@@ -1014,7 +657,7 @@ var registerTelemetryTools = ({
 };
 
 // src/server/tools/discover-resources.ts
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 
 // src/shared/origins.ts
 var ORIGINS = [
@@ -1029,37 +672,6 @@ var ORIGINS = [
   "https://x402facilitator.com" /* X402Facilitator */
 ];
 
-// src/server/tools/lib/discovery/openapi.strategy.ts
-async function fetchLlmsTxt(origin, toolName6) {
-  const llmsTxtUrl = `${origin}/llms.txt`;
-  log.debug(`[openapi] Fetching llms.txt from: ${llmsTxtUrl}`);
-  const result = await safeFetch(
-    toolName6,
-    new Request(llmsTxtUrl, { headers: { Accept: "text/plain" } })
-  );
-  if (result.isErr()) return null;
-  const parseResult = await safeParseResponse(toolName6, result.value);
-  if (parseResult.isErr() || parseResult.value.type !== "text") return null;
-  return parseResult.value.data;
-}
-async function openapiStrategy(ctx) {
-  const { origin, toolName: toolName6 } = ctx;
-  log.debug(`[openapi] Trying OpenAPI spec for: ${origin}`);
-  const [spec, instructions] = await Promise.all([
-    fetchOpenApiSpec(origin),
-    fetchLlmsTxt(origin, toolName6)
-  ]);
-  if (!spec?.paths) return null;
-  const endpoints = await getOriginIndex(origin);
-  if (!endpoints || endpoints.length === 0) return null;
-  log.info(`[openapi] Found ${endpoints.length} endpoints for: ${origin}`);
-  return {
-    source: "openapi",
-    endpoints,
-    ...instructions ? { instructions } : {}
-  };
-}
-
 // src/server/tools/discover-resources.ts
 var toolName5 = "discover_api_endpoints";
 function registerDiscoveryTools(server) {
@@ -1067,8 +679,8 @@ function registerDiscoveryTools(server) {
     toolName5,
     {
       title: "Discover API Endpoints",
-      description: `Find x402-protected resources on an origin. Returns a list of resource URLs.
-        Use check_x402_endpoint separately to get detailed pricing/schema info for specific resources.
+      description: `Find payment-protected resources on an origin. Returns a list of resource URLs.
+        Use check_endpoint_schema separately to get detailed pricing/schema info for specific resources.
         Known default origins with resource packs. Discover if more needed:
         - ${"https://enrichx402.com" /* EnrichX402 */} ->
             People + Org search
@@ -1086,8 +698,8 @@ function registerDiscoveryTools(server) {
         - ${"https://agentupload.dev" /* AgentUpload */} -> upload and share files with others.
         - ${"https://x402email.com" /* X402Email */} -> send emails.
         `,
-      inputSchema: z5.object({
-        url: z5.url().describe(
+      inputSchema: z6.object({
+        url: z6.url().describe(
           "The origin URL or any URL on the origin to discover resources from"
         )
       }),
@@ -1099,11 +711,20 @@ function registerDiscoveryTools(server) {
       }
     },
     async ({ url }) => {
-      const origin = URL.canParse(url) ? new URL(url).origin : url;
-      const hostname = URL.canParse(origin) ? new URL(origin).hostname : origin;
-      log.info(`Discovering resources for origin: ${origin}`);
-      const ctx = { origin, hostname, toolName: toolName5 };
-      const result = await openapiStrategy(ctx);
+      log.info(`Discovering resources for: ${url}`);
+      const discoverResult = await resultFromPromise(
+        "discover",
+        toolName5,
+        discoverResources(toolName5, url),
+        (e) => ({
+          cause: "discover",
+          message: e instanceof Error ? e.message : String(e)
+        })
+      );
+      if (discoverResult.isErr()) {
+        return mcpError(discoverResult);
+      }
+      const result = discoverResult.value;
       if (result) {
         const endpoints = result.endpoints.map(
           ({ path, summary, price }) => ({
@@ -1114,12 +735,13 @@ function registerDiscoveryTools(server) {
         );
         return mcpSuccessJson({
           found: true,
-          origin,
+          origin: result.origin,
           endpoints,
           ...result.instructions ? { instructions: result.instructions } : {}
         });
       }
-      return mcpErrorJson({
+      const origin = URL.canParse(url) ? new URL(url).origin : url;
+      return mcpSuccessJson({
         found: false,
         origin,
         error: "No OpenAPI spec found. Tried: /openapi.json, /.well-known/openapi.json, /.well-known/x402, /.well-known/mpp"
@@ -1129,9 +751,9 @@ function registerDiscoveryTools(server) {
 }
 
 // src/server/resources/origins.ts
-import z6 from "zod";
-import { x402HTTPClient as x402HTTPClient4 } from "@x402/core/client";
-import { x402Client as x402Client4 } from "@x402/core/client";
+import z7 from "zod";
+import { x402HTTPClient as x402HTTPClient3 } from "@x402/core/client";
+import { x402Client as x402Client3 } from "@x402/core/client";
 
 // src/server/resources/_lib.ts
 var surface = "getWebPageMetadata";
@@ -1166,16 +788,16 @@ var parseMetadataFromResponse = (html) => {
 
 // src/server/resources/origins.ts
 var surface2 = "registerOrigins";
-var wellKnownResourceItem = z6.union([
-  z6.string(),
-  z6.object({
-    url: z6.string().optional(),
-    path: z6.string().optional(),
-    method: z6.string().optional()
+var wellKnownResourceItem = z7.union([
+  z7.string(),
+  z7.object({
+    url: z7.string().optional(),
+    path: z7.string().optional(),
+    method: z7.string().optional()
   }).passthrough()
 ]);
-var wellKnownSchema = z6.object({
-  resources: z6.array(wellKnownResourceItem)
+var wellKnownSchema = z7.object({
+  resources: z7.array(wellKnownResourceItem)
 });
 var registerOrigins = async ({ server }) => {
   await Promise.all(
@@ -1356,7 +978,7 @@ var getResourceResponse = async (resource, request) => {
     }
   }
   if (protocols.includes("x402")) {
-    const client = new x402HTTPClient4(new x402Client4());
+    const client = new x402HTTPClient3(new x402Client3());
     const paymentRequiredResult = await safeGetPaymentRequired(
       surface2,
       client,
@@ -1481,7 +1103,7 @@ var registerGettingStartedPrompt = ({ server }) => {
 };
 
 // src/server/prompts/enrich.ts
-import { z as z7 } from "zod";
+import { z as z8 } from "zod";
 var PROMPT_CONTENT2 = `To start, you should check this resource page: ${"https://enrichx402.com" /* EnrichX402 */}/llms.txt, which has access to all of the paid endpoints.
 
 - You have access to the agentcash MCP server, which allows you to call paid endpoints which contain potentially extremely useful information.
@@ -1564,7 +1186,7 @@ var registerEnrichPrompt = ({ server }) => {
       title: "Enrich",
       description: "Use premium APIs to enrich data. Optionally provide a query, or let the assistant infer the best task from context.",
       argsSchema: {
-        query: z7.string().optional().describe(
+        query: z8.string().optional().describe(
           "Optional: The user's query to enrich. If omitted, the assistant will infer the task from conversation context."
         )
       }
@@ -1602,7 +1224,7 @@ import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 function getVersion() {
   if (true) {
-    return "0.3.4";
+    return "0.3.6";
   }
   const __dirname2 = dirname(fileURLToPath(import.meta.url));
   const pkg = JSON.parse(
@@ -1701,10 +1323,10 @@ var startServer = async (flags) => {
     flags,
     sessionId
   };
-  registerFetchX402ResourceTool(props);
+  registerFetchTool(props);
   registerAuthTools(props);
   registerWalletTools(props);
-  registerCheckX402EndpointTool(props);
+  registerCheckEndpointTool(props);
   registerRedeemInviteTool(props);
   registerDiscoveryTools(server);
   registerTelemetryTools(props);
@@ -1723,4 +1345,4 @@ var startServer = async (flags) => {
 export {
   startServer
 };
-//# sourceMappingURL=server-7D6YY3KG.js.map
+//# sourceMappingURL=server-WCNK52XR.js.map