x402-surface-check 0.2.39 → 0.2.41

package/README.md

@@ -20,7 +20,7 @@ npx --yes x402-surface-check --strict-proof https://api.example.com/openapi.json
 
 ## What It Checks
 
-- Manifest endpoint discovery from `items[]`, `endpoints[]`, marketplace `skills[]` / `catalog.skills[]`, object-valued `endpoints`, string-valued endpoint maps, `tools` maps, `resources[]`, `x402Endpoints`, category arrays, raw resource URL strings, method-prefixed resource strings, and OpenAPI paths
+- Manifest endpoint discovery from `items[]`, `endpoints[]`, marketplace `skills[]` / `catalog.skills[]`, `agents[].tools[]` resource URLs, object-valued `endpoints`, string-valued endpoint maps, `tools` maps, `resources[]`, `x402Endpoints`, category arrays, raw resource URL strings, method-prefixed resource strings, and OpenAPI paths
 - Streamable HTTP MCP tool catalogs via safe JSON-RPC `tools/list` probes with `Accept: application/json, text/event-stream`
 - Object-valued manifest endpoint query examples, public catalog/discovery GETs, and payment-bearing two-phase operations without treating expected public catalog reads as failed payment gates
 - Linked discovery documents via `discovery_url`, `discoveryUrl`, `resources_url`, `resourcesUrl`, string `discovery` links, nested `discovery.x402_json` / OpenAPI links, or manifest-level OpenAPI links
@@ -38,7 +38,7 @@ npx --yes x402-surface-check --strict-proof https://api.example.com/openapi.json
 - Placeholder recipients such as zero addresses and Solana system-program values
 - Testnet or staging rails such as Base Sepolia and Solana devnet
 - HTTPS resource URLs and stable resource metadata
-- Resource binding across top-level `resource.url` and every accept leg, including localhost/private-development resource URLs that should not ship in production
+- Resource binding across top-level `resource.url`; legacy/v1 accept-leg resource echoes; and localhost/private-development resource URLs that should not ship in production
 - Timeout/expiry metadata on challenges, so payment capabilities have an explicit bounded freshness window
 - Payment-metadata privacy checks for sensitive resource query context, email/SSN/token-like values, prompt/private-context strings, and credential-like URLs in body or header-carried challenges
 - Browser CORS allowance for the requesting origin, common x402/MPP retry headers, and exposed challenge/session headers on the actual 402 response

package/bin/x402-surface-check.mjs

@@ -376,6 +376,22 @@ function marketplaceSkillPriceUsd(skill) {
   return numberFromDecimal(value)
 }
 
+function endpointRawPath(endpoint) {
+  if (!endpoint || typeof endpoint !== 'object') return undefined
+  const values = [
+    endpoint.url,
+    endpoint.endpoint,
+    endpoint.resourceUrl,
+    endpoint.resourceURL,
+    endpoint.resource_url,
+    endpoint.resource?.url,
+    endpoint.resource?.uri,
+    endpoint.resource,
+    endpoint.path,
+  ]
+  return values.find(value => typeof value === 'string' && value.trim())
+}
+
 function manifestEndpointUrl(rawPath, endpoint, baseUrl, sourceUrl) {
   const url = new URL(endpointUrl(rawPath, baseUrl, sourceUrl))
   const parameters = endpoint?.parameters
@@ -432,7 +448,7 @@ function endpointEntries(document, sourceUrl, limit) {
   for (const skillList of marketplaceSkillLists) {
     for (const skill of skillList) {
       if (!skill || typeof skill !== 'object') continue
-      const rawPath = skill.endpoint ?? skill.url ?? skill.path
+      const rawPath = endpointRawPath(skill)
       if (!rawPath) continue
       if (redactedCredentialUrl(rawPath)) continue
       entries.push({
@@ -445,9 +461,41 @@ function endpointEntries(document, sourceUrl, limit) {
     }
   }
 
+  const agentCatalogLists = [
+    document.agents,
+    document.catalog?.agents,
+    document.marketplace?.agents,
+  ].filter(Array.isArray)
+
+  for (const agentList of agentCatalogLists) {
+    for (const agent of agentList) {
+      if (!agent || typeof agent !== 'object' || !Array.isArray(agent.tools)) continue
+      const agentName = agent.agentId ?? agent.agent_id ?? agent.slug ?? agent.id ?? agent.name
+      for (const tool of agent.tools) {
+        if (!tool || typeof tool !== 'object') continue
+        const rawPath = endpointRawPath(tool)
+        if (!rawPath) continue
+        if (redactedCredentialUrl(rawPath)) continue
+        const method = String(tool.method ?? 'POST').toUpperCase()
+        const paymentSignal = Math.max(manifestEndpointPaymentSignal(agent), manifestEndpointPaymentSignal(tool))
+        const hasPathParameters = /\{[^}]+\}/.test(String(rawPath))
+        if (paymentSignal === 0 && (method !== 'GET' || hasPathParameters)) continue
+        const toolName = tool.slug ?? tool.id ?? tool.name ?? String(rawPath).split('/').filter(Boolean).at(-1)
+        entries.push({
+          name: agentName && toolName ? `${agentName}/${toolName}` : toolName ?? agentName ?? String(rawPath),
+          url: manifestEndpointUrl(rawPath, tool, baseUrl, sourceUrl),
+          method,
+          expectedPriceUsd: marketplaceSkillPriceUsd(tool) ?? marketplaceSkillPriceUsd(agent),
+          requestBody: marketplaceSkillBody(tool) ?? marketplaceSkillBody(agent),
+          publicDiscovery: paymentSignal === 0,
+        })
+      }
+    }
+  }
+
   if (Array.isArray(document.endpoints)) {
     for (const endpoint of document.endpoints) {
-      const rawPath = endpoint?.url ?? endpoint?.endpoint ?? endpoint?.path
+      const rawPath = endpointRawPath(endpoint)
       if (!rawPath) continue
       entries.push({
         name: endpoint.id ?? endpoint.name ?? String(rawPath).split('/').filter(Boolean).at(-1) ?? String(rawPath),
@@ -487,7 +535,7 @@ function endpointEntries(document, sourceUrl, limit) {
   if (Array.isArray(document.tools)) {
     for (const tool of document.tools) {
       if (!tool || typeof tool !== 'object') continue
-      const rawPath = tool.url ?? tool.endpoint ?? tool.path
+      const rawPath = endpointRawPath(tool)
       if (!rawPath) continue
       const method = String(tool.method ?? 'POST').toUpperCase()
       const paymentSignal = manifestEndpointPaymentSignal(tool)
@@ -516,7 +564,7 @@ function endpointEntries(document, sourceUrl, limit) {
       }
       if (!endpoint || typeof endpoint !== 'object') continue
       const keyPath = key.match(/^(GET|POST|PUT|PATCH|DELETE)\s+(\S+)/i)?.[2] ?? key
-      const rawPath = endpoint.url ?? endpoint.endpoint ?? endpoint.path ?? keyPath
+      const rawPath = endpointRawPath(endpoint) ?? keyPath
       if (!rawPath) continue
       const method = String(endpoint.method ?? 'POST').toUpperCase()
       const paymentSignal = manifestEndpointPaymentSignal(endpoint)
@@ -535,7 +583,7 @@ function endpointEntries(document, sourceUrl, limit) {
   if (Array.isArray(document.items)) {
     for (const item of document.items) {
       if (item?.type && item.type !== 'http') continue
-      const rawPath = item?.resource ?? item?.url ?? item?.endpoint ?? item?.path
+      const rawPath = endpointRawPath(item)
       if (!rawPath) continue
       entries.push({
         name: item.metadata?.name ?? item.id ?? item.name ?? String(rawPath).split('/').filter(Boolean).at(-1) ?? String(rawPath),
@@ -588,7 +636,7 @@ function endpointEntries(document, sourceUrl, limit) {
     }
 
     if (!resource || typeof resource !== 'object') continue
-    const rawPath = resource.url ?? resource.endpoint ?? resource.resource ?? resource.path
+    const rawPath = endpointRawPath(resource)
     if (!rawPath) continue
     entries.push({
       name: resource.id
@@ -945,6 +993,10 @@ function challengeResourceValue(challenge) {
     ?? ''
 }
 
+function isX402V2Challenge(challenge) {
+  return Number(challenge?.x402Version) === 2
+}
+
 function hasFreshnessMetadata(challenge, accept) {
   return [
     challenge?.expires,
@@ -1356,7 +1408,7 @@ function findingList(documentResult, challengeResults, preflightResults, entries
     if (!topResource && populatedAcceptResources.length === 0) {
       findings.push(`P2 - ${result.name} challenge does not expose a signed/intended resource URL at the top level or in any accept leg.`)
     }
-    else if (accepts.length > 0 && populatedAcceptResources.length < accepts.length) {
+    else if (!isX402V2Challenge(result.body.json) && accepts.length > 0 && populatedAcceptResources.length < accepts.length) {
       findings.push(`P2 - ${result.name} challenge does not repeat the resource URL in every accept leg for spend-map and replay binding.`)
     }
     if (topResource && populatedAcceptResources.some(resource => resource !== topResource)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402-surface-check",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "description": "No-payment x402 public-surface checker for manifests, OpenAPI specs, and HTTP 402 challenges.",
   "type": "module",
   "bin": {