agentcash 0.3.7 → 0.4.0

package/dist/cjs/run-server.cjs

@@ -104187,6 +104187,8 @@ var safeParse4 = (surface2, schema, value) => {
 };
 
 // src/shared/neverthrow/fetch/index.ts
+var DEFAULT_FETCH_TIMEOUT = 1e4;
+var DEFAULT_USER_FETCH_TIMEOUT = 3e4;
 var IMAGE_TYPES = /* @__PURE__ */ new Set([
   "image/png",
   "image/jpeg",
@@ -104206,19 +104208,28 @@ var fetchHttpErr = (surface2, response) => fetchErr(surface2, {
   message: response.statusText,
   response
 });
-var safeFetch = (surface2, request) => {
+var safeFetch = (surface2, request, timeout) => {
+  const signal = timeout ? AbortSignal.timeout(timeout) : void 0;
   return resultFromPromise(
     errorType2,
     surface2,
-    fetch(request),
-    (error48) => ({
-      cause: "network",
-      message: error48 instanceof Error ? error48.message : "Network error"
-    })
+    fetch(request, ...signal ? [{ signal }] : []),
+    (error48) => {
+      if (error48 instanceof DOMException && (error48.name === "TimeoutError" || error48.name === "AbortError")) {
+        return {
+          cause: "timeout",
+          message: timeout ? `Request timed out after ${timeout}ms. You can increase the timeout by passing a larger value in the 'timeout' parameter.` : "Request was aborted"
+        };
+      }
+      return {
+        cause: "network",
+        message: error48 instanceof Error ? error48.message : "Network error"
+      };
+    }
   );
 };
-var safeFetchJson = (surface2, request, schema) => {
-  return safeFetch(surface2, request).andThen((response) => {
+var safeFetchJson = (surface2, request, schema, timeout) => {
+  return safeFetch(surface2, request, timeout).andThen((response) => {
     if (!response.ok) {
       return fetchHttpErr(surface2, response);
     }
@@ -109407,11 +109418,11 @@ async function getTempoBalance({
 
 // src/shared/operations/fetch-with-payment.ts
 function createFetchWithPayment(options) {
-  const { surface: surface2, clients, paymentMethod, beforePayment } = options;
+  const { surface: surface2, clients, paymentMethod, beforePayment, timeout } = options;
   return async (request) => {
     const clonedRequest = request.clone();
     const fallbackRequest = request.clone();
-    const probeResult = await safeFetch(surface2, request);
+    const probeResult = await safeFetch(surface2, request, timeout);
     if (probeResult.isErr()) {
       return fetchErr(surface2, probeResult.error);
     }
@@ -109430,7 +109441,8 @@ function createFetchWithPayment(options) {
         response,
         clonedRequest,
         clients.x402,
-        beforePayment
+        beforePayment,
+        timeout
       );
     }
     const available = detectPaymentProtocols(response);
@@ -109446,7 +109458,8 @@ function createFetchWithPayment(options) {
       response,
       clonedRequest,
       clients.x402,
-      beforePayment
+      beforePayment,
+      timeout
     );
     if (result.isErr() && fallback) {
       return fallback === "mpp" ? handleMppPayment(surface2, response, fallbackRequest, options) : handleX402Payment(
@@ -109454,7 +109467,8 @@ function createFetchWithPayment(options) {
         response,
         fallbackRequest,
         clients.x402,
-        beforePayment
+        beforePayment,
+        timeout
       );
     }
     return result;
@@ -109506,7 +109520,7 @@ async function pickByBalance(surface2, response, options) {
   log.info(`Protocol selection \u2014 x402: $${x402Balance}, mpp: $${mppBalance}`);
   return x402Balance >= mppBalance ? "x402" : "mpp";
 }
-async function handleX402Payment(surface2, response, clonedRequest, client, beforePayment) {
+async function handleX402Payment(surface2, response, clonedRequest, client, beforePayment, timeout) {
   const paymentRequiredResult = await safeGetPaymentRequired(
     surface2,
     client,
@@ -109562,34 +109576,36 @@ async function handleX402Payment(surface2, response, clonedRequest, client, befo
     "Access-Control-Expose-Headers",
     "PAYMENT-RESPONSE,X-PAYMENT-RESPONSE"
   );
-  return await safeFetch(surface2, clonedRequest).andThen((paidResponse) => {
-    const settlementResult = safeGetPaymentSettlement(
-      surface2,
-      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
-          }
-        } : {}
-      }
-    });
-  });
+  return await safeFetch(surface2, clonedRequest, timeout).andThen(
+    (paidResponse) => {
+      const settlementResult = safeGetPaymentSettlement(
+        surface2,
+        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(surface2, response, clonedRequest, options) {
-  const { clients, beforePayment } = options;
+  const { clients, beforePayment, timeout } = options;
   const mppxClient = clients.mpp;
   if (clonedRequest.headers.has("Authorization")) {
     return mppErr(surface2, {
@@ -109635,26 +109651,31 @@ async function handleMppPayment(surface2, response, clonedRequest, options) {
   }
   const credential = credentialResult.value;
   clonedRequest.headers.set("Authorization", credential);
-  return await safeFetch(surface2, clonedRequest).andThen((paidResponse) => {
-    const receiptResult = safeGetMppReceipt(surface2, paidResponse);
-    const priceDisplay = amount2 ? Number(formatUnits(BigInt(amount2), decimals2)).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
-          }
-        } : {}
-      }
-    });
-  });
+  return await safeFetch(surface2, clonedRequest, timeout).andThen(
+    (paidResponse) => {
+      const receiptResult = safeGetMppReceipt(surface2, paidResponse);
+      const priceDisplay = amount2 ? Number(formatUnits(BigInt(amount2), decimals2)).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
+            }
+          } : {}
+        }
+      });
+    }
+  );
 }
 
 // src/server/tools/response/index.ts
@@ -109809,7 +109830,8 @@ var requestSchema = zod_default.object({
   url: zod_default.url().describe("The endpoint URL"),
   method: zod_default.enum(["GET", "POST", "PUT", "DELETE", "PATCH"]).optional().describe("HTTP method. Defaults to GET for fetch operations."),
   body: zod_default.unknown().optional().describe("Request body for POST/PUT/PATCH methods"),
-  headers: zod_default.record(zod_default.string(), zod_default.string()).optional().describe("Additional headers to include").default({})
+  headers: zod_default.record(zod_default.string(), zod_default.string()).optional().describe("Additional headers to include").default({}),
+  timeout: zod_default.number().int().positive().optional().describe("Request timeout in milliseconds")
 });
 var buildRequest2 = ({
   input,
@@ -109987,7 +110009,8 @@ var registerFetchTool = ({
         paymentMethod,
         account,
         flags,
-        beforePayment
+        beforePayment,
+        timeout: input.timeout ?? DEFAULT_USER_FETCH_TIMEOUT
       })(request);
       if (fetchResult.isErr()) {
         return mcpError(fetchResult);
@@ -110061,7 +110084,8 @@ var registerAuthTools = ({
       const httpClient = new x402HTTPClient(new x402Client());
       const firstResult = await safeFetch(
         toolName2,
-        buildRequest2({ input, address: account.address, sessionId })
+        buildRequest2({ input, address: account.address, sessionId }),
+        input.timeout ?? DEFAULT_USER_FETCH_TIMEOUT
       );
       if (firstResult.isErr()) {
         return mcpError(firstResult);
@@ -110113,7 +110137,11 @@ var registerAuthTools = ({
         sessionId
       });
       authedRequest.headers.set("SIGN-IN-WITH-X", siwxHeader);
-      const authedResult = await safeFetch(toolName2, authedRequest);
+      const authedResult = await safeFetch(
+        toolName2,
+        authedRequest,
+        input.timeout ?? DEFAULT_USER_FETCH_TIMEOUT
+      );
       if (authedResult.isErr()) {
         return mcpError(authedResult);
       }
@@ -110227,15 +110255,14 @@ async function fetchOpenApiSpec(origin) {
   if (cached2) return cached2;
   const uniqueUrls = [
     `${origin}/openapi.json`,
-    `${origin}/.well-known/openapi.json`,
-    `${origin}/.well-known/x402`,
-    `${origin}/.well-known/mpp`
+    `${origin}/.well-known/openapi.json`
   ];
   for (const url3 of uniqueUrls) {
     log.debug(`Fetching OpenAPI spec from: ${url3}`);
     const fetchResult = await safeFetch(
       "fetchOpenApiSpec",
-      new Request(url3, { headers: { Accept: "application/json" } })
+      new Request(url3, { headers: { Accept: "application/json" } }),
+      DEFAULT_FETCH_TIMEOUT
     );
     if (fetchResult.isErr()) {
       log.debug(`Failed to fetch OpenAPI spec from: ${url3}`);
@@ -110423,6 +110450,7 @@ function getIndexEntry(origin, path2, method) {
 }
 
 // src/shared/operations/check-endpoint.ts
+var TEMPO_DEFAULT_CHAIN_ID = 4217;
 var SUPPORTED_METHODS = [
   "GET",
   "POST",
@@ -110473,37 +110501,12 @@ async function probeMethod({
   headers,
   includeMethodErrors
 }) {
-  const cachedSchemaResult = await resultFromPromise(
-    "openapi",
+  const request = buildProbeRequest(url3, method, body, headers);
+  const responseResult = await safeFetch(
     surface2,
-    getEndpointSchema(url3, method),
-    (e) => ({
-      cause: "cache_lookup",
-      message: e instanceof Error ? e.message : String(e)
-    })
+    request,
+    DEFAULT_FETCH_TIMEOUT
   );
-  if (cachedSchemaResult.isOk() && cachedSchemaResult.value) {
-    const cachedSchema = cachedSchemaResult.value;
-    const origin = new URL(url3).origin;
-    const path2 = new URL(url3).pathname || "/";
-    const indexEntry = getIndexEntry(origin, path2, method);
-    return {
-      method,
-      source: "openapi",
-      requiresPayment: true,
-      schema: cachedSchema,
-      ...indexEntry?.price ? { estimatedPrice: indexEntry.price } : {},
-      ...indexEntry?.protocols ? { protocols: indexEntry.protocols } : {},
-      ...indexEntry?.summary ? { summary: indexEntry.summary } : {}
-    };
-  }
-  if (cachedSchemaResult.isErr()) {
-    log.debug(
-      `Cache lookup failed for ${method} ${url3}, falling back to 402 probe`
-    );
-  }
-  const request = buildProbeRequest(url3, method, body, headers);
-  const responseResult = await safeFetch(surface2, request);
   if (responseResult.isErr()) {
     log.debug(`${method} ${url3} probe failed`, responseResult.error);
     return null;
@@ -110513,7 +110516,6 @@ async function probeMethod({
     if (includeMethodErrors && (response.status === 404 || response.status === 405)) {
       return {
         method,
-        source: "probe",
         requiresPayment: false,
         statusCode: response.status
       };
@@ -110524,46 +110526,50 @@ async function probeMethod({
   if (response.status !== 402) {
     return {
       method,
-      source: "probe",
       requiresPayment: false,
       statusCode: response.status
     };
   }
   const protocols = detectPaymentProtocols(response);
-  const paymentMethods = [];
+  const paymentOptions = [];
+  let schema;
+  const endpointSchemaResult = await resultFromPromise(
+    "openapi",
+    surface2,
+    getEndpointSchema(url3, 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: ${url3}`);
+  }
   if (protocols.includes("mpp")) {
-    const challengeResult = safeGetMppChallenge(surface2, response);
-    if (challengeResult.isOk()) {
-      const challenge2 = challengeResult.value;
+    for (const challenge2 of parseMppChallenges(response)) {
       const currency = challenge2.request.currency;
       const amount2 = challenge2.request.amount;
       const decimals2 = challenge2.request.decimals ?? 6;
-      let schema;
-      const endpointSchemaResult = await resultFromPromise(
-        "openapi",
-        surface2,
-        getEndpointSchema(url3, 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: ${url3}`);
+      const recipient = challenge2.request.recipient;
+      const methodDetails = challenge2.request.methodDetails;
+      const chainId = methodDetails?.chainId ?? TEMPO_DEFAULT_CHAIN_ID;
+      const network = `tempo:${String(chainId)}`;
+      const description = challenge2.description ?? schema?.summary;
+      if (amount2 && currency) {
+        paymentOptions.push({
+          protocol: "mpp",
+          paymentMethod: challenge2.method,
+          intent: challenge2.intent,
+          realm: challenge2.realm,
+          price: tokenStringToNumber(amount2, decimals2),
+          network,
+          asset: currency,
+          ...recipient ? { recipient } : {},
+          ...description ? { description } : {}
+        });
       }
-      paymentMethods.push({
-        protocol: "mpp",
-        method: challenge2.method,
-        intent: challenge2.intent,
-        realm: challenge2.realm,
-        ...challenge2.description ? { description: challenge2.description } : {},
-        ...amount2 ? { price: tokenStringToNumber(amount2, decimals2) } : {},
-        ...currency ? { currency } : {},
-        ...schema ? { schema } : {},
-        network: `tempo:${challenge2.method}`
-      });
     }
   }
   if (protocols.includes("x402")) {
@@ -110575,26 +110581,74 @@ async function probeMethod({
     );
     if (paymentRequiredResult.isOk()) {
       const { resource, extensions, accepts } = paymentRequiredResult.value;
+      if (!schema) {
+        const inputSchema = getInputSchema(extensions);
+        if (inputSchema) schema = inputSchema;
+      }
       for (const accept of accepts) {
-        paymentMethods.push({
+        paymentOptions.push({
           protocol: "x402",
-          ...resource,
-          schema: getInputSchema(extensions),
           price: tokenStringToNumber(accept.amount),
           network: accept.network,
-          asset: accept.asset
+          asset: accept.asset,
+          ...accept.payTo ? { recipient: accept.payTo } : {},
+          ...resource.description ? { description: resource.description } : {},
+          ...resource.mimeType ? { mimeType: resource.mimeType } : {}
         });
       }
     }
   }
+  let estimatedPrice;
+  let summary;
+  const indexResult = resultFromThrowable(
+    "openapi",
+    surface2,
+    () => {
+      const origin = new URL(url3).origin;
+      const path2 = new URL(url3).pathname || "/";
+      return getIndexEntry(origin, path2, method);
+    },
+    (e) => ({
+      cause: "index_lookup",
+      message: e instanceof Error ? e.message : String(e)
+    })
+  );
+  if (indexResult.isOk() && indexResult.value) {
+    if (indexResult.value.price) estimatedPrice = indexResult.value.price;
+    if (indexResult.value.summary) summary = indexResult.value.summary;
+  }
   return {
     method,
-    source: "probe",
     requiresPayment: true,
     statusCode: response.status,
     protocols,
-    paymentMethods
-  };
+    paymentOptions,
+    ...schema ? { schema } : {},
+    ...estimatedPrice ? { estimatedPrice } : {},
+    ...summary ? { summary } : {}
+  };
+}
+function parseMppChallenges(response) {
+  const header = response.headers.get("WWW-Authenticate");
+  if (!header) return [];
+  const challenges = [];
+  for (const segment of header.split(/,\s*(?=Payment\s)/i)) {
+    const result = resultFromThrowable(
+      "mpp",
+      "check-endpoint",
+      () => Challenge_exports.deserialize(segment.trim()),
+      (e) => ({
+        cause: "challenge_parse",
+        message: e instanceof Error ? e.message : String(e)
+      })
+    );
+    if (result.isOk()) {
+      challenges.push(result.value);
+    } else {
+      log.debug("Failed to parse MPP challenge segment", result.error.message);
+    }
+  }
+  return challenges;
 }
 function buildProbeRequest(url3, method, body, headers) {
   const supportsBody = ["POST", "PUT", "PATCH"].includes(method);
@@ -110796,7 +110850,7 @@ var import_path2 = require("path");
 var import_url = require("url");
 function getVersion2() {
   if (true) {
-    return "0.3.7";
+    return "0.4.0";
   }
   const __dirname3 = (0, import_path2.dirname)((0, import_url.fileURLToPath)(importMetaUrl));
   const pkg = JSON.parse(
@@ -110934,7 +110988,8 @@ async function fetchLlmsTxt(surface2, origin) {
   log.debug(`Fetching llms.txt from: ${llmsTxtUrl}`);
   const result = await safeFetch(
     surface2,
-    new Request(llmsTxtUrl, { headers: { Accept: "text/plain" } })
+    new Request(llmsTxtUrl, { headers: { Accept: "text/plain" } }),
+    DEFAULT_FETCH_TIMEOUT
   );
   if (result.isErr()) return null;
   if (!result.value.ok) return null;
@@ -110951,7 +111006,7 @@ async function discoverResources(surface2, url3) {
   ]);
   if (!spec?.paths) {
     log.debug(
-      `No OpenAPI spec found for ${origin}. Tried: /openapi.json, /.well-known/openapi.json, /.well-known/x402, /.well-known/mpp`
+      `No OpenAPI spec found for ${origin}. Tried: /openapi.json, /.well-known/openapi.json`
     );
     return null;
   }
@@ -111047,7 +111102,7 @@ function registerDiscoveryTools(server) {
       return mcpSuccessJson({
         found: false,
         origin,
-        error: "No OpenAPI spec found. Tried: /openapi.json, /.well-known/openapi.json, /.well-known/x402, /.well-known/mpp"
+        error: "No OpenAPI spec found. Tried: /openapi.json, /.well-known/openapi.json"
       });
     }
   );
@@ -111256,7 +111311,7 @@ var registerOrigins = ({ server }) => {
   }
 };
 var getResourceResponse = async (resource, request) => {
-  const fetchResult = await safeFetch(surface, request);
+  const fetchResult = await safeFetch(surface, request, DEFAULT_FETCH_TIMEOUT);
   if (fetchResult.isErr()) {
     return err2("fetch", surface, {
       cause: "network",
@@ -111532,7 +111587,7 @@ var import_path3 = require("path");
 var import_url2 = require("url");
 function getVersion3() {
   if (true) {
-    return "0.3.7";
+    return "0.4.0";
   }
   const __dirname3 = (0, import_path3.dirname)((0, import_url2.fileURLToPath)(importMetaUrl));
   const pkg = JSON.parse(

package/dist/esm/{chunk-ED4QVIZH.js → chunk-32YHLL2C.js}

@@ -1,7 +1,7 @@
 import {
   getWalletInfo,
   submitErrorReport
-} from "./chunk-RP5AGYAT.js";
+} from "./chunk-P42WA7HK.js";
 
 // src/shared/operations/index.ts
 async function getWalletInfo2(surface, address, flags) {
@@ -19,4 +19,4 @@ export {
   getWalletInfo2 as getWalletInfo,
   submitErrorReport2 as submitErrorReport
 };
-//# sourceMappingURL=chunk-ED4QVIZH.js.map
+//# sourceMappingURL=chunk-32YHLL2C.js.map

package/dist/esm/chunk-32YHLL2C.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/shared/operations/index.ts"],"sourcesContent":["/**\n * Published entry point: `agentcash/operations`\n *\n * All exports return plain types (no Result<> from neverthrow) to avoid\n * leaking @agentcash/neverthrow/types into published .d.ts files.\n */\n\nimport type { Address } from 'viem';\nimport type { GlobalFlags } from '@/types';\n\n// ── Discover ──\n// Already returns plain type (DiscoveryResult | null)\nexport { discoverResources, type DiscoveryResult } from './discover';\n\n// ── Check Endpoint ──\nexport {\n  checkEndpoint,\n  type CheckEndpointOptions,\n  type CheckEndpointResult,\n  type ProbeMethodResult,\n  type PaymentOption,\n  type MppPaymentOption,\n  type X402PaymentOption,\n  type SupportedMethod,\n  SUPPORTED_METHODS,\n} from './check-endpoint';\n\n// ── Wallet Info ──\nimport { getWalletInfo as _getWalletInfo } from './wallet-info';\nexport type { WalletInfoResult } from './wallet-info';\n\nexport async function getWalletInfo(\n  surface: string,\n  address: Address,\n  flags: GlobalFlags\n) {\n  const result = await _getWalletInfo(surface, address, flags);\n  if (result.isErr()) throw new Error(result.error.message);\n  return result.value;\n}\n\n// ── Report Error ──\nimport { submitErrorReport as _submitErrorReport } from './report-error';\nexport type { ErrorReportResult } from './report-error';\n\nexport async function submitErrorReport(\n  surface: string,\n  input: {\n    tool: string;\n    summary: string;\n    errorMessage: string;\n    resource?: string;\n    stack?: string;\n    fullReport?: string;\n  },\n  address: Address,\n  dev: boolean\n) {\n  const result = await _submitErrorReport(surface, input, address, dev);\n  if (result.isErr()) throw new Error(result.error.message);\n  return result.value;\n}\n"],"mappings":";;;;;;AA+BA,eAAsBA,eACpB,SACA,SACA,OACA;AACA,QAAM,SAAS,MAAM,cAAe,SAAS,SAAS,KAAK;AAC3D,MAAI,OAAO,MAAM,EAAG,OAAM,IAAI,MAAM,OAAO,MAAM,OAAO;AACxD,SAAO,OAAO;AAChB;AAMA,eAAsBC,mBACpB,SACA,OAQA,SACA,KACA;AACA,QAAM,SAAS,MAAM,kBAAmB,SAAS,OAAO,SAAS,GAAG;AACpE,MAAI,OAAO,MAAM,EAAG,OAAM,IAAI,MAAM,OAAO,MAAM,OAAO;AACxD,SAAO,OAAO;AAChB;","names":["getWalletInfo","submitErrorReport"]}