@agentcash/router 1.14.1 → 1.15.0

package/dist/index.cjs

@@ -131,6 +131,75 @@ var init_evm = __esm({
   }
 });
 
+// src/kv-store/facilitator-supported.ts
+function createCachedSupportedFetch(fetchLive, options = {}) {
+  const { kv, cacheKey, ttlSeconds = FACILITATOR_SUPPORTED_TTL_SECONDS, fallback } = options;
+  const kvKey = kv && cacheKey ? `${FACILITATOR_SUPPORTED_KV_PREFIX}${cacheKey}` : void 0;
+  let inflight;
+  return () => {
+    if (inflight) return inflight;
+    const attempt = fetchSupported(fetchLive, kv, kvKey, ttlSeconds, fallback);
+    inflight = attempt;
+    attempt.catch(() => {
+      if (inflight === attempt) inflight = void 0;
+    });
+    return attempt;
+  };
+}
+function withCachedSupported(inner, options = {}) {
+  return {
+    verify: inner.verify.bind(inner),
+    settle: inner.settle.bind(inner),
+    getSupported: createCachedSupportedFetch(() => inner.getSupported(), options)
+  };
+}
+async function fetchSupported(fetchLive, kv, kvKey, ttlSeconds, fallback) {
+  if (kv && kvKey) {
+    const cached = await readKvCache(kv, kvKey);
+    if (cached) return cached;
+  }
+  const fresh = await tryFetchLive(fetchLive, fallback);
+  if (fresh === null) return fallback();
+  if (kv && kvKey) await writeKvCache(kv, kvKey, fresh, ttlSeconds);
+  return fresh;
+}
+async function tryFetchLive(fetchLive, fallback) {
+  try {
+    return await fetchLive();
+  } catch (err) {
+    if (!fallback) throw err;
+    console.warn(
+      `[x402] facilitator /supported failed, using hardcoded baseline: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return null;
+  }
+}
+async function readKvCache(kv, key) {
+  try {
+    const cached = await kv.get(key);
+    return isKindsResponse(cached) ? cached : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function writeKvCache(kv, key, value, ttlSeconds) {
+  try {
+    await kv.setNxEx(key, value, ttlSeconds);
+  } catch {
+  }
+}
+function isKindsResponse(value) {
+  return typeof value === "object" && value !== null && Array.isArray(value.kinds);
+}
+var FACILITATOR_SUPPORTED_TTL_SECONDS, FACILITATOR_SUPPORTED_KV_PREFIX;
+var init_facilitator_supported = __esm({
+  "src/kv-store/facilitator-supported.ts"() {
+    "use strict";
+    FACILITATOR_SUPPORTED_TTL_SECONDS = 60 * 60;
+    FACILITATOR_SUPPORTED_KV_PREFIX = "x402:facilitator-supported:";
+  }
+});
+
 // src/protocols/x402/solana.ts
 function isSolanaNetwork(network) {
   return network.startsWith("solana:");
@@ -164,7 +233,8 @@ function matchesSupportedKind(requirement, kind) {
 async function fetchFacilitatorSupported(facilitator) {
   const authHeaders = await getSupportedHeadersForFacilitator(facilitator);
   const response = await fetch(`${facilitatorBaseUrl(facilitator)}/supported`, {
-    headers: authHeaders
+    headers: authHeaders,
+    signal: AbortSignal.timeout(SUPPORTED_FETCH_TIMEOUT_MS)
   });
   if (!response.ok) {
     throw new Error(`Facilitator /supported failed with status ${response.status}`);
@@ -173,7 +243,18 @@ async function fetchFacilitatorSupported(facilitator) {
   if (!Array.isArray(body.kinds)) {
     throw new Error("Facilitator /supported response did not include kinds");
   }
-  return body.kinds;
+  return { kinds: body.kinds };
+}
+function getCachedSupportedFetch(facilitator, kv) {
+  let fetcher = supportedFetchers.get(facilitator);
+  if (!fetcher) {
+    fetcher = createCachedSupportedFetch(() => fetchFacilitatorSupported(facilitator), {
+      kv,
+      cacheKey: facilitator.url
+    });
+    supportedFetchers.set(facilitator, fetcher);
+  }
+  return fetcher;
 }
 function enrichRequirementFromKind(requirement, kinds) {
   const kind = kinds.find((candidate) => matchesSupportedKind(requirement, candidate));
@@ -192,31 +273,32 @@ function enrichRequirementFromKind(requirement, kinds) {
   const kindExtra = kind.extra ?? {};
   const requirementFeatures = requirementExtra.features ?? {};
   const kindFeatures = kindExtra.features ?? {};
+  const features = { ...requirementFeatures, ...kindFeatures };
   return {
     ...requirement,
     ...kind.asset && !requirement.asset ? { asset: kind.asset } : {},
     extra: {
       ...requirementExtra,
       ...kindExtra,
-      features: {
-        ...requirementFeatures,
-        ...kindFeatures,
-        xSettlementAccountSupported: true
-      }
+      ...Object.keys(features).length > 0 ? { features } : {}
     }
   };
 }
-async function enrichRequirementsFromFacilitatorSupported(facilitator, requirements) {
-  const kinds = await fetchFacilitatorSupported(facilitator);
+async function enrichRequirementsFromFacilitatorSupported(facilitator, requirements, kv) {
+  const { kinds } = await getCachedSupportedFetch(facilitator, kv)();
   return requirements.map((requirement) => enrichRequirementFromKind(requirement, kinds));
 }
 function isSolanaRequirement(requirement) {
   return isSolanaNetwork(requirement.network);
 }
+var SUPPORTED_FETCH_TIMEOUT_MS, supportedFetchers;
 var init_solana = __esm({
   "src/protocols/x402/solana.ts"() {
     "use strict";
+    init_facilitator_supported();
     init_facilitators();
+    SUPPORTED_FETCH_TIMEOUT_MS = 1e4;
+    supportedFetchers = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -298,72 +380,6 @@ var init_facilitators = __esm({
   }
 });
 
-// src/kv-store/facilitator-supported.ts
-function withCachedSupported(inner, options = {}) {
-  const { kv, cacheKey, ttlSeconds = FACILITATOR_SUPPORTED_TTL_SECONDS, fallback } = options;
-  const kvKey = kv && cacheKey ? `${FACILITATOR_SUPPORTED_KV_PREFIX}${cacheKey}` : void 0;
-  let inflight;
-  return {
-    verify: inner.verify.bind(inner),
-    settle: inner.settle.bind(inner),
-    getSupported: () => {
-      if (inflight) return inflight;
-      const attempt = fetchSupported(inner, kv, kvKey, ttlSeconds, fallback);
-      inflight = attempt;
-      attempt.catch(() => {
-        if (inflight === attempt) inflight = void 0;
-      });
-      return attempt;
-    }
-  };
-}
-async function fetchSupported(inner, kv, kvKey, ttlSeconds, fallback) {
-  if (kv && kvKey) {
-    const cached = await readKvCache(kv, kvKey);
-    if (cached) return cached;
-  }
-  const fresh = await tryFetchLive(inner, fallback);
-  if (fresh === null) return fallback();
-  if (kv && kvKey) await writeKvCache(kv, kvKey, fresh, ttlSeconds);
-  return fresh;
-}
-async function tryFetchLive(inner, fallback) {
-  try {
-    return await inner.getSupported();
-  } catch (err) {
-    if (!fallback) throw err;
-    console.warn(
-      `[x402] facilitator /supported failed, using hardcoded baseline: ${err instanceof Error ? err.message : String(err)}`
-    );
-    return null;
-  }
-}
-async function readKvCache(kv, key) {
-  try {
-    const cached = await kv.get(key);
-    return isSupportedResponse(cached) ? cached : void 0;
-  } catch {
-    return void 0;
-  }
-}
-async function writeKvCache(kv, key, value, ttlSeconds) {
-  try {
-    await kv.setNxEx(key, value, ttlSeconds);
-  } catch {
-  }
-}
-function isSupportedResponse(value) {
-  return typeof value === "object" && value !== null && Array.isArray(value.kinds);
-}
-var FACILITATOR_SUPPORTED_TTL_SECONDS, FACILITATOR_SUPPORTED_KV_PREFIX;
-var init_facilitator_supported = __esm({
-  "src/kv-store/facilitator-supported.ts"() {
-    "use strict";
-    FACILITATOR_SUPPORTED_TTL_SECONDS = 60 * 60;
-    FACILITATOR_SUPPORTED_KV_PREFIX = "x402:facilitator-supported:";
-  }
-});
-
 // src/protocols/x402/facilitator-clients.ts
 function createFacilitatorClients(facilitatorsByNetwork, HTTPFacilitatorClient, kvStore) {
   return getResolvedX402FacilitatorGroups(facilitatorsByNetwork).map((group) => {
@@ -411,14 +427,7 @@ function mergeKindExtras(scoped, live) {
 function buildSupportedKinds(group) {
   return group.networks.flatMap((network) => {
     if (group.family === "solana") {
-      return [
-        {
-          x402Version: 2,
-          scheme: "exact",
-          network,
-          extra: { features: { xSettlementAccountSupported: true } }
-        }
-      ];
+      return [{ x402Version: 2, scheme: "exact", network }];
     }
     return [
       { x402Version: 2, scheme: "exact", network },
@@ -1997,7 +2006,17 @@ function buildCustomRequirement(price, accept) {
 
 // src/protocols/x402/challenge.ts
 async function buildX402Challenge(opts) {
-  const { server, routeEntry, request, price, accepts, facilitatorsByNetwork, extensions, report } = opts;
+  const {
+    server,
+    routeEntry,
+    request,
+    price,
+    accepts,
+    facilitatorsByNetwork,
+    extensions,
+    report,
+    kvStore
+  } = opts;
   const { encodePaymentRequiredHeader } = await import("@x402/core/http");
   const resource = buildChallengeResource(request, routeEntry);
   const requirements = await buildChallengeRequirements(
@@ -2005,9 +2024,9 @@ async function buildX402Challenge(opts) {
     request,
     price,
     accepts,
-    resource,
     facilitatorsByNetwork,
-    report
+    report,
+    kvStore
   );
   const paymentRequired = await server.createPaymentRequiredResponse(
     requirements,
@@ -2018,18 +2037,19 @@ async function buildX402Challenge(opts) {
   const encoded = encodePaymentRequiredHeader(paymentRequired);
   return { encoded, requirements };
 }
-async function buildChallengeRequirements(server, request, price, accepts, resource, facilitatorsByNetwork, report) {
+async function buildChallengeRequirements(server, request, price, accepts, facilitatorsByNetwork, report, kvStore) {
   const requirements = await buildExpectedRequirements(server, request, price, accepts, report);
   if (!needsFacilitatorEnrichment(accepts)) return requirements;
-  return enrichChallengeRequirements(requirements, resource, facilitatorsByNetwork, report);
+  return enrichChallengeRequirements(requirements, facilitatorsByNetwork, report, kvStore);
 }
 function needsFacilitatorEnrichment(accepts) {
   return hasSolanaAccepts(accepts);
 }
-async function enrichGroup(group) {
+async function enrichGroup(group, kvStore) {
   const accepted = await enrichRequirementsFromFacilitatorSupported(
     group.facilitator,
-    group.items.map(({ requirement }) => requirement)
+    group.items.map(({ requirement }) => requirement),
+    kvStore
   );
   if (accepted.length !== group.items.length) {
     throw new Error(
@@ -2038,13 +2058,13 @@ async function enrichGroup(group) {
   }
   return accepted;
 }
-async function enrichChallengeRequirements(requirements, resource, facilitatorsByNetwork, report) {
+async function enrichChallengeRequirements(requirements, facilitatorsByNetwork, report, kvStore) {
   const groups = collectEnrichmentGroups(requirements, facilitatorsByNetwork);
   if (groups.length === 0) return requirements;
   const results = await Promise.all(
     groups.map(async (group) => {
       try {
-        return { success: true, group, accepted: await enrichGroup(group) };
+        return { success: true, group, accepted: await enrichGroup(group, kvStore) };
       } catch (err) {
         const label = group.facilitator.url ?? group.facilitator.network;
         const reason = err instanceof Error ? err.message : String(err);
@@ -2370,7 +2390,8 @@ async function buildX402ChallengeContribution(args) {
     accepts,
     facilitatorsByNetwork: deps.x402FacilitatorsByNetwork,
     extensions,
-    report
+    report,
+    kvStore: deps.kvStore
   });
   return { headers: { [HEADERS.X402_PAYMENT_REQUIRED]: encoded } };
 }
@@ -5392,6 +5413,7 @@ function createRouter(config) {
     network,
     x402FacilitatorsByNetwork: void 0,
     x402Accepts,
+    kvStore,
     mppx: null,
     tempoClient: null,
     mppSessionConfig: config.mpp?.session && config.mpp.operatorKey ? { depositMultiplier: config.mpp.session.depositMultiplier ?? 10 } : null

package/dist/index.d.cts

@@ -545,6 +545,7 @@ interface RouterDeps {
     network: string;
     x402FacilitatorsByNetwork?: Record<string, ResolvedX402Facilitator>;
     x402Accepts: X402AcceptConfig[];
+    kvStore?: KvStore;
     mppx?: {
         charge: MppxMiddleware<{
             amount: string;
@@ -1024,9 +1025,6 @@ declare function createRouter<const C extends RouterConfig>(config: C): ServiceR
  * });
  * ```
  */
-type ExtractEnvPriceKeys<O> = [O] extends [{
-    prices: infer P extends Record<string, string>;
-}] ? Extract<keyof P, string> : never;
-declare function createRouterFromEnv<const O extends CreateRouterFromEnvOptions>(options: O): ServiceRouter<ExtractEnvPriceKeys<O>>;
+declare function createRouterFromEnv<const O extends CreateRouterFromEnvOptions>(options: O): ServiceRouter<ExtractPriceKeys<O>>;
 
 export { BASE_MAINNET_NETWORK, BASE_USDC_ADDRESS, BASE_USDC_DECIMALS, type CheckoutSessionContext, type CheckoutSessionFn, type CheckoutSessionResponse, type CreateRouterFromEnvOptions, DEFAULT_SOLANA_FACILITATOR_URL, DEFAULT_TEMPO_RPC_URL, type DiscoveryConfig, type HandlerContext, HttpError, type KvStore, type MppProtocolInfo, type PaidOptions, type ProtocolType, RouteDefinitionError, type RouterConfig, RouterConfigError, type RouterConfigIssue, type RouterConfigIssueCode, type RouterConfigIssueSeverity, type RouterPlugin, SOLANA_MAINNET_NETWORK, type ServiceRouter, type SettlementErrorContext, type SettlementLifecycleContext, type SettlementSettledContext, TEMPO_USDC_ADDRESS, TEMPO_USDC_DECIMALS, type X402FacilitatorsConfig, ZERO_EVM_ADDRESS, createRouter, createRouterFromEnv, routerConfigFromEnv };

package/dist/index.d.ts

@@ -545,6 +545,7 @@ interface RouterDeps {
     network: string;
     x402FacilitatorsByNetwork?: Record<string, ResolvedX402Facilitator>;
     x402Accepts: X402AcceptConfig[];
+    kvStore?: KvStore;
     mppx?: {
         charge: MppxMiddleware<{
             amount: string;
@@ -1024,9 +1025,6 @@ declare function createRouter<const C extends RouterConfig>(config: C): ServiceR
  * });
  * ```
  */
-type ExtractEnvPriceKeys<O> = [O] extends [{
-    prices: infer P extends Record<string, string>;
-}] ? Extract<keyof P, string> : never;
-declare function createRouterFromEnv<const O extends CreateRouterFromEnvOptions>(options: O): ServiceRouter<ExtractEnvPriceKeys<O>>;
+declare function createRouterFromEnv<const O extends CreateRouterFromEnvOptions>(options: O): ServiceRouter<ExtractPriceKeys<O>>;
 
 export { BASE_MAINNET_NETWORK, BASE_USDC_ADDRESS, BASE_USDC_DECIMALS, type CheckoutSessionContext, type CheckoutSessionFn, type CheckoutSessionResponse, type CreateRouterFromEnvOptions, DEFAULT_SOLANA_FACILITATOR_URL, DEFAULT_TEMPO_RPC_URL, type DiscoveryConfig, type HandlerContext, HttpError, type KvStore, type MppProtocolInfo, type PaidOptions, type ProtocolType, RouteDefinitionError, type RouterConfig, RouterConfigError, type RouterConfigIssue, type RouterConfigIssueCode, type RouterConfigIssueSeverity, type RouterPlugin, SOLANA_MAINNET_NETWORK, type ServiceRouter, type SettlementErrorContext, type SettlementLifecycleContext, type SettlementSettledContext, TEMPO_USDC_ADDRESS, TEMPO_USDC_DECIMALS, type X402FacilitatorsConfig, ZERO_EVM_ADDRESS, createRouter, createRouterFromEnv, routerConfigFromEnv };

package/dist/index.js

@@ -109,6 +109,75 @@ var init_evm = __esm({
   }
 });
 
+// src/kv-store/facilitator-supported.ts
+function createCachedSupportedFetch(fetchLive, options = {}) {
+  const { kv, cacheKey, ttlSeconds = FACILITATOR_SUPPORTED_TTL_SECONDS, fallback } = options;
+  const kvKey = kv && cacheKey ? `${FACILITATOR_SUPPORTED_KV_PREFIX}${cacheKey}` : void 0;
+  let inflight;
+  return () => {
+    if (inflight) return inflight;
+    const attempt = fetchSupported(fetchLive, kv, kvKey, ttlSeconds, fallback);
+    inflight = attempt;
+    attempt.catch(() => {
+      if (inflight === attempt) inflight = void 0;
+    });
+    return attempt;
+  };
+}
+function withCachedSupported(inner, options = {}) {
+  return {
+    verify: inner.verify.bind(inner),
+    settle: inner.settle.bind(inner),
+    getSupported: createCachedSupportedFetch(() => inner.getSupported(), options)
+  };
+}
+async function fetchSupported(fetchLive, kv, kvKey, ttlSeconds, fallback) {
+  if (kv && kvKey) {
+    const cached = await readKvCache(kv, kvKey);
+    if (cached) return cached;
+  }
+  const fresh = await tryFetchLive(fetchLive, fallback);
+  if (fresh === null) return fallback();
+  if (kv && kvKey) await writeKvCache(kv, kvKey, fresh, ttlSeconds);
+  return fresh;
+}
+async function tryFetchLive(fetchLive, fallback) {
+  try {
+    return await fetchLive();
+  } catch (err) {
+    if (!fallback) throw err;
+    console.warn(
+      `[x402] facilitator /supported failed, using hardcoded baseline: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return null;
+  }
+}
+async function readKvCache(kv, key) {
+  try {
+    const cached = await kv.get(key);
+    return isKindsResponse(cached) ? cached : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function writeKvCache(kv, key, value, ttlSeconds) {
+  try {
+    await kv.setNxEx(key, value, ttlSeconds);
+  } catch {
+  }
+}
+function isKindsResponse(value) {
+  return typeof value === "object" && value !== null && Array.isArray(value.kinds);
+}
+var FACILITATOR_SUPPORTED_TTL_SECONDS, FACILITATOR_SUPPORTED_KV_PREFIX;
+var init_facilitator_supported = __esm({
+  "src/kv-store/facilitator-supported.ts"() {
+    "use strict";
+    FACILITATOR_SUPPORTED_TTL_SECONDS = 60 * 60;
+    FACILITATOR_SUPPORTED_KV_PREFIX = "x402:facilitator-supported:";
+  }
+});
+
 // src/protocols/x402/solana.ts
 function isSolanaNetwork(network) {
   return network.startsWith("solana:");
@@ -142,7 +211,8 @@ function matchesSupportedKind(requirement, kind) {
 async function fetchFacilitatorSupported(facilitator) {
   const authHeaders = await getSupportedHeadersForFacilitator(facilitator);
   const response = await fetch(`${facilitatorBaseUrl(facilitator)}/supported`, {
-    headers: authHeaders
+    headers: authHeaders,
+    signal: AbortSignal.timeout(SUPPORTED_FETCH_TIMEOUT_MS)
   });
   if (!response.ok) {
     throw new Error(`Facilitator /supported failed with status ${response.status}`);
@@ -151,7 +221,18 @@ async function fetchFacilitatorSupported(facilitator) {
   if (!Array.isArray(body.kinds)) {
     throw new Error("Facilitator /supported response did not include kinds");
   }
-  return body.kinds;
+  return { kinds: body.kinds };
+}
+function getCachedSupportedFetch(facilitator, kv) {
+  let fetcher = supportedFetchers.get(facilitator);
+  if (!fetcher) {
+    fetcher = createCachedSupportedFetch(() => fetchFacilitatorSupported(facilitator), {
+      kv,
+      cacheKey: facilitator.url
+    });
+    supportedFetchers.set(facilitator, fetcher);
+  }
+  return fetcher;
 }
 function enrichRequirementFromKind(requirement, kinds) {
   const kind = kinds.find((candidate) => matchesSupportedKind(requirement, candidate));
@@ -170,31 +251,32 @@ function enrichRequirementFromKind(requirement, kinds) {
   const kindExtra = kind.extra ?? {};
   const requirementFeatures = requirementExtra.features ?? {};
   const kindFeatures = kindExtra.features ?? {};
+  const features = { ...requirementFeatures, ...kindFeatures };
   return {
     ...requirement,
     ...kind.asset && !requirement.asset ? { asset: kind.asset } : {},
     extra: {
       ...requirementExtra,
       ...kindExtra,
-      features: {
-        ...requirementFeatures,
-        ...kindFeatures,
-        xSettlementAccountSupported: true
-      }
+      ...Object.keys(features).length > 0 ? { features } : {}
     }
   };
 }
-async function enrichRequirementsFromFacilitatorSupported(facilitator, requirements) {
-  const kinds = await fetchFacilitatorSupported(facilitator);
+async function enrichRequirementsFromFacilitatorSupported(facilitator, requirements, kv) {
+  const { kinds } = await getCachedSupportedFetch(facilitator, kv)();
   return requirements.map((requirement) => enrichRequirementFromKind(requirement, kinds));
 }
 function isSolanaRequirement(requirement) {
   return isSolanaNetwork(requirement.network);
 }
+var SUPPORTED_FETCH_TIMEOUT_MS, supportedFetchers;
 var init_solana = __esm({
   "src/protocols/x402/solana.ts"() {
     "use strict";
+    init_facilitator_supported();
     init_facilitators();
+    SUPPORTED_FETCH_TIMEOUT_MS = 1e4;
+    supportedFetchers = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -276,72 +358,6 @@ var init_facilitators = __esm({
   }
 });
 
-// src/kv-store/facilitator-supported.ts
-function withCachedSupported(inner, options = {}) {
-  const { kv, cacheKey, ttlSeconds = FACILITATOR_SUPPORTED_TTL_SECONDS, fallback } = options;
-  const kvKey = kv && cacheKey ? `${FACILITATOR_SUPPORTED_KV_PREFIX}${cacheKey}` : void 0;
-  let inflight;
-  return {
-    verify: inner.verify.bind(inner),
-    settle: inner.settle.bind(inner),
-    getSupported: () => {
-      if (inflight) return inflight;
-      const attempt = fetchSupported(inner, kv, kvKey, ttlSeconds, fallback);
-      inflight = attempt;
-      attempt.catch(() => {
-        if (inflight === attempt) inflight = void 0;
-      });
-      return attempt;
-    }
-  };
-}
-async function fetchSupported(inner, kv, kvKey, ttlSeconds, fallback) {
-  if (kv && kvKey) {
-    const cached = await readKvCache(kv, kvKey);
-    if (cached) return cached;
-  }
-  const fresh = await tryFetchLive(inner, fallback);
-  if (fresh === null) return fallback();
-  if (kv && kvKey) await writeKvCache(kv, kvKey, fresh, ttlSeconds);
-  return fresh;
-}
-async function tryFetchLive(inner, fallback) {
-  try {
-    return await inner.getSupported();
-  } catch (err) {
-    if (!fallback) throw err;
-    console.warn(
-      `[x402] facilitator /supported failed, using hardcoded baseline: ${err instanceof Error ? err.message : String(err)}`
-    );
-    return null;
-  }
-}
-async function readKvCache(kv, key) {
-  try {
-    const cached = await kv.get(key);
-    return isSupportedResponse(cached) ? cached : void 0;
-  } catch {
-    return void 0;
-  }
-}
-async function writeKvCache(kv, key, value, ttlSeconds) {
-  try {
-    await kv.setNxEx(key, value, ttlSeconds);
-  } catch {
-  }
-}
-function isSupportedResponse(value) {
-  return typeof value === "object" && value !== null && Array.isArray(value.kinds);
-}
-var FACILITATOR_SUPPORTED_TTL_SECONDS, FACILITATOR_SUPPORTED_KV_PREFIX;
-var init_facilitator_supported = __esm({
-  "src/kv-store/facilitator-supported.ts"() {
-    "use strict";
-    FACILITATOR_SUPPORTED_TTL_SECONDS = 60 * 60;
-    FACILITATOR_SUPPORTED_KV_PREFIX = "x402:facilitator-supported:";
-  }
-});
-
 // src/protocols/x402/facilitator-clients.ts
 function createFacilitatorClients(facilitatorsByNetwork, HTTPFacilitatorClient, kvStore) {
   return getResolvedX402FacilitatorGroups(facilitatorsByNetwork).map((group) => {
@@ -389,14 +405,7 @@ function mergeKindExtras(scoped, live) {
 function buildSupportedKinds(group) {
   return group.networks.flatMap((network) => {
     if (group.family === "solana") {
-      return [
-        {
-          x402Version: 2,
-          scheme: "exact",
-          network,
-          extra: { features: { xSettlementAccountSupported: true } }
-        }
-      ];
+      return [{ x402Version: 2, scheme: "exact", network }];
     }
     return [
       { x402Version: 2, scheme: "exact", network },
@@ -1958,7 +1967,17 @@ function buildCustomRequirement(price, accept) {
 
 // src/protocols/x402/challenge.ts
 async function buildX402Challenge(opts) {
-  const { server, routeEntry, request, price, accepts, facilitatorsByNetwork, extensions, report } = opts;
+  const {
+    server,
+    routeEntry,
+    request,
+    price,
+    accepts,
+    facilitatorsByNetwork,
+    extensions,
+    report,
+    kvStore
+  } = opts;
   const { encodePaymentRequiredHeader } = await import("@x402/core/http");
   const resource = buildChallengeResource(request, routeEntry);
   const requirements = await buildChallengeRequirements(
@@ -1966,9 +1985,9 @@ async function buildX402Challenge(opts) {
     request,
     price,
     accepts,
-    resource,
     facilitatorsByNetwork,
-    report
+    report,
+    kvStore
   );
   const paymentRequired = await server.createPaymentRequiredResponse(
     requirements,
@@ -1979,18 +1998,19 @@ async function buildX402Challenge(opts) {
   const encoded = encodePaymentRequiredHeader(paymentRequired);
   return { encoded, requirements };
 }
-async function buildChallengeRequirements(server, request, price, accepts, resource, facilitatorsByNetwork, report) {
+async function buildChallengeRequirements(server, request, price, accepts, facilitatorsByNetwork, report, kvStore) {
   const requirements = await buildExpectedRequirements(server, request, price, accepts, report);
   if (!needsFacilitatorEnrichment(accepts)) return requirements;
-  return enrichChallengeRequirements(requirements, resource, facilitatorsByNetwork, report);
+  return enrichChallengeRequirements(requirements, facilitatorsByNetwork, report, kvStore);
 }
 function needsFacilitatorEnrichment(accepts) {
   return hasSolanaAccepts(accepts);
 }
-async function enrichGroup(group) {
+async function enrichGroup(group, kvStore) {
   const accepted = await enrichRequirementsFromFacilitatorSupported(
     group.facilitator,
-    group.items.map(({ requirement }) => requirement)
+    group.items.map(({ requirement }) => requirement),
+    kvStore
   );
   if (accepted.length !== group.items.length) {
     throw new Error(
@@ -1999,13 +2019,13 @@ async function enrichGroup(group) {
   }
   return accepted;
 }
-async function enrichChallengeRequirements(requirements, resource, facilitatorsByNetwork, report) {
+async function enrichChallengeRequirements(requirements, facilitatorsByNetwork, report, kvStore) {
   const groups = collectEnrichmentGroups(requirements, facilitatorsByNetwork);
   if (groups.length === 0) return requirements;
   const results = await Promise.all(
     groups.map(async (group) => {
       try {
-        return { success: true, group, accepted: await enrichGroup(group) };
+        return { success: true, group, accepted: await enrichGroup(group, kvStore) };
       } catch (err) {
         const label = group.facilitator.url ?? group.facilitator.network;
         const reason = err instanceof Error ? err.message : String(err);
@@ -2331,7 +2351,8 @@ async function buildX402ChallengeContribution(args) {
     accepts,
     facilitatorsByNetwork: deps.x402FacilitatorsByNetwork,
     extensions,
-    report
+    report,
+    kvStore: deps.kvStore
   });
   return { headers: { [HEADERS.X402_PAYMENT_REQUIRED]: encoded } };
 }
@@ -5353,6 +5374,7 @@ function createRouter(config) {
     network,
     x402FacilitatorsByNetwork: void 0,
     x402Accepts,
+    kvStore,
     mppx: null,
     tempoClient: null,
     mppSessionConfig: config.mpp?.session && config.mpp.operatorKey ? { depositMultiplier: config.mpp.session.depositMultiplier ?? 10 } : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcash/router",
-  "version": "1.14.1",
+  "version": "1.15.0",
   "description": "Unified route builder for Next.js App Router APIs with x402, MPP, SIWX, and API key auth",
   "type": "module",
   "exports": {
@@ -65,7 +65,7 @@
   },
   "scripts": {
     "build": "tsup",
-    "typecheck": "tsc --noEmit && tsc -p tests/tsconfig.json --noEmit",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint src/ tests/ --max-warnings 0",
     "lint:fix": "eslint src/ tests/ --fix",
     "format": "prettier --write 'src/**/*.ts' 'tests/**/*.ts' 'examples/fortune/**/*.ts' 'examples/fortune/**/*.md' '*.json' '*.mjs'",