mppx 0.1.1 → 0.2.1

package/src/cli.ts

@@ -42,9 +42,9 @@ cli
   .option('-L, --location', 'Follow redirects')
   .option('-X, --method <method>', 'HTTP method')
   .option('--channel <id>', 'Reuse existing stream channel ID')
+  .option('--confirm', 'Show confirmation prompts')
   .option('--deposit <amount>', 'Deposit amount for stream payments (human-readable units)')
   .option('--json <json>', 'Send JSON body (sets Content-Type and Accept, implies POST)')
-  .option('--yes', 'Skip confirmation prompts')
   .example(`${name} example.com/content`)
   .example(`${name} example.com/api --json '{"key":"value"}'`)
   .action(async (rawUrl: string | undefined, rawOptions: unknown) => {
@@ -52,6 +52,7 @@ cli
       z.object({
         account: z.optional(z.string()),
         channel: z.optional(z.coerce.string()),
+        confirm: z.optional(z.boolean()),
         data: z.optional(z.string()),
         deposit: z.optional(z.union([z.string(), z.number()])),
         fail: z.optional(z.boolean()),
@@ -65,7 +66,6 @@ cli
         silent: z.optional(z.boolean()),
         userAgent: z.optional(z.string()),
         verbose: z.optional(z.boolean()),
-        yes: z.optional(z.boolean()),
       }),
       rawOptions,
     )
@@ -76,7 +76,7 @@ cli
 
     const silent = options.silent ?? false
     const info = silent ? (_msg: string) => {} : (msg: string) => process.stderr.write(msg)
-    if (silent) options.yes = true
+    if (silent) options.confirm = false
 
     const accountName = resolveAccountName(options.account)
     const privateKey = process.env.MPPX_PRIVATE_KEY ?? (await createKeychain(accountName).get())
@@ -266,10 +266,9 @@ cli
             for (const line of rest) info(`${indent}${line}\n`)
           }
         }
-        info('\n')
-
-        if (!options.yes) {
-          const ok = await confirm(`Proceed with ${challenge.intent}?`)
+        if (options.confirm) {
+          info('\n')
+          const ok = await confirm(`Proceed with ${challenge.intent}?`, true)
           if (!ok) {
             info('Aborted.\n')
             process.exit(0)
@@ -336,7 +335,7 @@ cli
           const depositDisplay = depositRaw
             ? ` ${pc.dim(`(deposit ${depositRaw} ${tokenSymbol})`)}`
             : ''
-          info(`${pc.dim(`Channel opened ${parsed.payload.channelId}`)}${depositDisplay}\n`)
+          info(`\n${pc.dim(`Channel opened ${parsed.payload.channelId}`)}${depositDisplay}\n`)
         }
       }
 
@@ -385,11 +384,25 @@ cli
             }
             info(`\n${pc.bold(pc.green('Payment Receipt'))}\n`)
             const rows: [string, string][] = []
+            const channelId = receiptJson.channelId
+            const reference = receiptJson.reference
+            const skipReference = channelId && reference && channelId === reference
+            const receiptBalanceKeys = new Set(['acceptedCumulative', 'spent'])
             for (const [key, value] of Object.entries(receiptJson)) {
               if (value === undefined || shownKeys.has(key)) continue
-              if (key === 'reference' && typeof value === 'string' && explorerUrl)
+              if (key === 'reference' && skipReference) continue
+              if (receiptBalanceKeys.has(key) && typeof value === 'string') {
+                rows.push([
+                  key,
+                  `${value} ${pc.dim(`(${fmtBalance(BigInt(value), tokenSymbol, tokenDecimals)})`)}`,
+                ])
+              } else if (
+                (key === 'reference' || key === 'txHash') &&
+                typeof value === 'string' &&
+                explorerUrl
+              ) {
                 rows.push([key, pc.link(`${explorerUrl}/tx/${value}`, value)])
-              else rows.push([key, String(value)])
+              } else rows.push([key, String(value)])
             }
             rows.sort(([a], [b]) => a.localeCompare(b))
             const pad = Math.max(...rows.map(([k]) => k.length))
@@ -426,7 +439,7 @@ cli
               : 0n
           let _voucherSeq = 0
 
-          const termBg = await detectTerminalBg()
+          const termBg = verbose ? await detectTerminalBg() : undefined
           const chunkBgs = (() => {
             if (!termBg || !pc.isColorSupported) return undefined
             const clamp = (n: number) => Math.max(0, Math.min(255, Math.round(n)))
@@ -513,18 +526,26 @@ cli
                   const receipt = JSON.parse(data) as Record<string, unknown>
                   info(`\n\n${pc.bold(pc.green('Payment Receipt'))}\n`)
                   const rows: [string, string][] = []
+                  const skipRef =
+                    receipt.channelId &&
+                    receipt.reference &&
+                    receipt.channelId === receipt.reference
                   for (const [key, value] of Object.entries(receipt)) {
                     if (value === undefined || shownKeys.has(key)) continue
-                    if (key === 'channelId' && value === receipt.reference) continue
+                    if (key === 'reference' && skipRef) continue
                     const receiptBalanceKeys = ['acceptedCumulative', 'spent']
                     if (receiptBalanceKeys.includes(key) && typeof value === 'string') {
                       rows.push([
                         key,
                         `${value} ${pc.dim(`(${fmtBalance(BigInt(value), tokenSymbol, tokenDecimals)})`)}`,
                       ])
-                    } else if (key === 'reference' && typeof value === 'string' && explorerUrl)
+                    } else if (
+                      (key === 'reference' || key === 'txHash') &&
+                      typeof value === 'string' &&
+                      explorerUrl
+                    ) {
                       rows.push([key, pc.link(`${explorerUrl}/tx/${value}`, value)])
-                    else rows.push([key, String(value)])
+                    } else rows.push([key, String(value)])
                   }
                   rows.sort(([a], [b]) => a.localeCompare(b))
                   const rpad = Math.max(...rows.map(([k]) => k.length))
@@ -586,8 +607,23 @@ cli
               headers: { Authorization: closeCred },
             })
             if (closeRes.ok) {
+              const closeReceiptHeader = closeRes.headers.get('Payment-Receipt')
+              let closeTxHash: string | undefined
+              if (closeReceiptHeader) {
+                try {
+                  const r = JSON.parse(Base64.toString(closeReceiptHeader)) as Record<
+                    string,
+                    unknown
+                  >
+                  if (typeof r.txHash === 'string') closeTxHash = r.txHash
+                } catch {}
+              }
+              const txInfo =
+                closeTxHash && explorerUrl
+                  ? ` ${pc.dim(pc.link(`${explorerUrl}/tx/${closeTxHash}`, closeTxHash))}`
+                  : ''
               info(
-                `\n${pc.dim('Channel closed.')} ${pc.dim(`Spent ${fmtBalance(cumulativeAmount, tokenSymbol, tokenDecimals)}.`)}\n`,
+                `\n${pc.dim('Channel closed.')} ${pc.dim(`Spent ${fmtBalance(cumulativeAmount, tokenSymbol, tokenDecimals)}.`)}${txInfo}\n`,
               )
             } else {
               info(
@@ -605,10 +641,10 @@ cli
             streamChannelId &&
             streamEscrowContract &&
             streamChainId
-          if (shouldClose && !options.yes) {
+          if (shouldClose && options.confirm) {
             info('\n')
           }
-          if (shouldClose && !(options.yes || (await confirm('Close channel?')))) {
+          if (shouldClose && options.confirm && !(await confirm('Close channel?', true))) {
             info(`${pc.dim('Kept channel open.')}\n`)
           } else if (shouldClose) {
             const signature = await signVoucher(
@@ -638,8 +674,23 @@ cli
             })
             if (closeRes.ok) {
               deleteChannelState(streamChannelId!)
+              const closeReceiptHeader = closeRes.headers.get('Payment-Receipt')
+              let closeTxHash: string | undefined
+              if (closeReceiptHeader) {
+                try {
+                  const r = JSON.parse(Base64.toString(closeReceiptHeader)) as Record<
+                    string,
+                    unknown
+                  >
+                  if (typeof r.txHash === 'string') closeTxHash = r.txHash
+                } catch {}
+              }
+              const txInfo =
+                closeTxHash && explorerUrl
+                  ? ` ${pc.dim(pc.link(`${explorerUrl}/tx/${closeTxHash}`, closeTxHash))}`
+                  : ''
               info(
-                `${pc.dim('Channel closed.')} ${pc.dim(`Spent ${fmtBalance(streamCumulativeAmount, tokenSymbol, tokenDecimals)}.`)}\n`,
+                `\n${pc.dim('Channel closed.')} ${pc.dim(`Spent ${fmtBalance(streamCumulativeAmount, tokenSymbol, tokenDecimals)}.`)}${txInfo}\n`,
               )
             } else {
               const closeBody = await closeRes.text().catch(() => '')
@@ -1097,12 +1148,14 @@ function prompt(message: string): Promise<string | undefined> {
   })
 }
 
-function confirm(prompt: string): Promise<boolean> {
+function confirm(prompt: string, defaultYes = false): Promise<boolean> {
   const reader = readline.createInterface({ input: process.stdin, output: process.stderr })
   return new Promise((resolve) => {
-    reader.question(`${pc.bold(`▸ ${prompt}`)} ${pc.dim('(y/N)')} `, (answer) => {
+    const hint = defaultYes ? '(Y/n)' : '(y/N)'
+    reader.question(`${pc.bold(`▸ ${prompt}`)} ${pc.dim(hint)} `, (answer) => {
       reader.close()
-      resolve(answer.trim().toLowerCase() === 'y')
+      const trimmed = answer.trim().toLowerCase()
+      resolve(trimmed === '' ? defaultYes : trimmed === 'y')
     })
   })
 }

package/src/client/Methods.ts

@@ -1,3 +1,3 @@
-export { stripe } from '../stripe/client/MethodIntents.js'
-export { tempo } from '../tempo/client/MethodIntents.js'
+export { stripe } from '../stripe/client/index.js'
+export { tempo } from '../tempo/client/index.js'
 export { session } from '../tempo/client/Session.js'

package/src/client/Mppx.test-d.ts

@@ -1,8 +1,8 @@
 import type { Account } from 'viem'
 import { describe, expectTypeOf, test } from 'vitest'
-import * as MethodIntent from '../MethodIntent.js'
+import * as Method from '../Method.js'
 import { charge } from '../tempo/client/Charge.js'
-import * as Intents from '../tempo/Intents.js'
+import * as Methods from '../tempo/Methods.js'
 import * as z from '../zod.js'
 import * as Mppx from './Mppx.js'
 
@@ -13,8 +13,8 @@ describe('Mppx', () => {
     })
     const mppx = Mppx.create({ methods: [method] })
 
-    expectTypeOf(mppx.methods).toMatchTypeOf<readonly MethodIntent.AnyClient[]>()
-    expectTypeOf(mppx.methods[0]?.name).toEqualTypeOf<'charge'>()
+    expectTypeOf(mppx.methods).toMatchTypeOf<readonly Method.AnyClient[]>()
+    expectTypeOf(mppx.methods[0]?.intent).toEqualTypeOf<'charge'>()
   })
 
   test('has createCredential function', () => {
@@ -38,7 +38,7 @@ describe('create.Config', () => {
 
 describe('Method.toClient', () => {
   test('createCredential receives typed challenge', () => {
-    MethodIntent.toClient(Intents.charge, {
+    Method.toClient(Methods.charge, {
       async createCredential({ challenge }) {
         expectTypeOf(challenge.method).toBeString()
         expectTypeOf(challenge.intent).toBeString()
@@ -52,7 +52,7 @@ describe('Method.toClient', () => {
   })
 
   test('createCredential receives typed context when provided', () => {
-    MethodIntent.toClient(Intents.charge, {
+    Method.toClient(Methods.charge, {
       context: z.object({
         account: z.custom<Account>(),
         extra: z.optional(z.string()),

package/src/client/Mppx.test.ts

@@ -1,7 +1,7 @@
-import { Challenge, Credential, Intent, Mcp, MethodIntent, Receipt } from 'mppx'
+import { Challenge, Credential, Mcp, Method, Receipt } from 'mppx'
 import { Mppx, Transport, tempo } from 'mppx/client'
 import { Mppx as Mppx_server, tempo as tempo_server } from 'mppx/server'
-import { MethodIntents } from 'mppx/tempo'
+import { Methods } from 'mppx/tempo'
 import { afterEach, describe, expect, test } from 'vitest'
 import * as Http from '~test/Http.js'
 import { accounts, asset, client } from '~test/tempo/viem.js'
@@ -21,10 +21,10 @@ describe('Mppx.create', () => {
     })
 
     expect(mppx.methods).toHaveLength(2)
-    expect(mppx.methods[0]?.method).toBe('tempo')
-    expect(mppx.methods[0]?.name).toBe('charge')
-    expect(mppx.methods[1]?.method).toBe('tempo')
-    expect(mppx.methods[1]?.name).toBe('session')
+    expect(mppx.methods[0]?.name).toBe('tempo')
+    expect(mppx.methods[0]?.intent).toBe('charge')
+    expect(mppx.methods[1]?.name).toBe('tempo')
+    expect(mppx.methods[1]?.intent).toBe('session')
     expect(mppx.transport.name).toBe('http')
     expect(typeof mppx.createCredential).toBe('function')
     expect(typeof mppx.fetch).toBe('function')
@@ -41,15 +41,17 @@ describe('Mppx.create', () => {
   })
 
   test('behavior: with multiple methods', () => {
-    const stripeCharge = MethodIntent.fromIntent(Intent.charge, {
-      method: 'stripe',
+    const stripeCharge = Method.from({
+      name: 'stripe',
+      intent: 'charge',
       schema: {
         credential: {
-          payload: MethodIntents.charge.schema.credential.payload,
+          payload: Methods.charge.schema.credential.payload,
         },
+        request: Methods.charge.schema.request,
       },
     })
-    const stripeMethod = MethodIntent.toClient(stripeCharge, {
+    const stripeMethod = Method.toClient(stripeCharge, {
       async createCredential({ challenge }) {
         return Credential.serialize({
           challenge,
@@ -64,9 +66,9 @@ describe('Mppx.create', () => {
     })
 
     expect(mppx.methods).toHaveLength(3)
-    expect(mppx.methods[0]?.method).toBe('tempo')
-    expect(mppx.methods[1]?.method).toBe('tempo')
-    expect(mppx.methods[2]?.method).toBe('stripe')
+    expect(mppx.methods[0]?.name).toBe('tempo')
+    expect(mppx.methods[1]?.name).toBe('tempo')
+    expect(mppx.methods[2]?.name).toBe('stripe')
   })
 })
 
@@ -77,7 +79,7 @@ describe('createCredential', () => {
       methods: [tempo({ account: accounts[1], getClient: () => client })],
     })
 
-    const challenge = Challenge.fromIntent(MethodIntents.charge, {
+    const challenge = Challenge.fromMethod(Methods.charge, {
       realm,
       secretKey,
       request: {
@@ -127,21 +129,23 @@ describe('createCredential', () => {
     })
 
     await expect(mppx.createCredential(response)).rejects.toThrow(
-      'No method intent found for "unknown.charge". Available: tempo.charge, tempo.session',
+      'No method found for "unknown.charge". Available: tempo.charge, tempo.session',
     )
   })
 
   test('behavior: routes to correct method with multiple methods', async () => {
-    const stripeCharge = MethodIntent.fromIntent(Intent.charge, {
-      method: 'stripe',
+    const stripeCharge = Method.from({
+      name: 'stripe',
+      intent: 'charge',
       schema: {
         credential: {
-          payload: MethodIntents.charge.schema.credential.payload,
+          payload: Methods.charge.schema.credential.payload,
         },
+        request: Methods.charge.schema.request,
       },
     })
 
-    const stripe = MethodIntent.toClient(stripeCharge, {
+    const stripe = Method.toClient(stripeCharge, {
       async createCredential({ challenge }) {
         return Credential.serialize({
           challenge,
@@ -188,7 +192,7 @@ describe('createCredential', () => {
       methods: [tempo({ getClient: () => client })],
     })
 
-    const challenge = Challenge.fromIntent(MethodIntents.charge, {
+    const challenge = Challenge.fromMethod(Methods.charge, {
       realm,
       secretKey,
       request: {
@@ -220,7 +224,7 @@ describe('createCredential', () => {
       methods: [tempo({ account: accounts[1], getClient: () => client })],
     })
 
-    const challenge = Challenge.fromIntent(MethodIntents.charge, {
+    const challenge = Challenge.fromMethod(Methods.charge, {
       realm,
       secretKey,
       request: {
@@ -251,7 +255,7 @@ describe('createCredential', () => {
       transport: Transport.mcp(),
     })
 
-    const challenge = Challenge.fromIntent(MethodIntents.charge, {
+    const challenge = Challenge.fromMethod(Methods.charge, {
       realm,
       secretKey,
       request: {

package/src/client/Mppx.ts

@@ -1,10 +1,10 @@
 import type * as Challenge from '../Challenge.js'
-import type * as MethodIntent from '../MethodIntent.js'
+import type * as Method from '../Method.js'
 import type * as z from '../zod.js'
 import * as Fetch from './internal/Fetch.js'
 import * as Transport from './Transport.js'
 
-export type Methods = readonly (MethodIntent.AnyClient | readonly MethodIntent.AnyClient[])[]
+export type Methods = readonly (Method.AnyClient | readonly Method.AnyClient[])[]
 
 /**
  * Client-side payment handler.
@@ -27,7 +27,7 @@ export type Mppx<
 }
 
 /**
- * Creates a client-side payment handler from an array of method intents.
+ * Creates a client-side payment handler from an array of methods.
  *
  * Returns a payment handler with a `fetch` function that automatically handles
  * 402 Payment Required responses. By default, also polyfills `globalThis.fetch`.
@@ -76,10 +76,10 @@ export function create<
     async createCredential(response: Transport.ResponseOf<transport>, context?: unknown) {
       const challenge = transport.getChallenge(response as never) as Challenge.Challenge
 
-      const mi = methods.find((m) => m.method === challenge.method && m.name === challenge.intent)
+      const mi = methods.find((m) => m.name === challenge.method && m.intent === challenge.intent)
       if (!mi)
         throw new Error(
-          `No method intent found for "${challenge.method}.${challenge.intent}". Available: ${methods.map((m) => `${m.method}.${m.name}`).join(', ')}`,
+          `No method found for "${challenge.method}.${challenge.intent}". Available: ${methods.map((m) => `${m.name}.${m.intent}`).join(', ')}`,
         )
 
       const parsedContext =
@@ -128,7 +128,7 @@ export declare namespace create {
           },
         ) => Promise<string | undefined>)
       | undefined
-    /** Array of method intents to use. Accepts individual clients or tuples (e.g. from `tempo()`). */
+    /** Array of methods to use. Accepts individual clients or tuples (e.g. from `tempo()`). */
     methods: methods
     /** Whether to polyfill `globalThis.fetch` with the payment-aware wrapper. @default true */
     polyfill?: boolean | undefined
@@ -141,8 +141,8 @@ export declare namespace create {
  * Union of all context types from all methods that have context schemas.
  * @internal
  */
-type AnyContextFor<methods extends readonly MethodIntent.AnyClient[]> = {
-  [method in keyof methods]: methods[method] extends MethodIntent.Client<any, infer context>
+type AnyContextFor<methods extends readonly Method.AnyClient[]> = {
+  [method in keyof methods]: methods[method] extends Method.Client<any, infer context>
     ? context extends z.ZodMiniType
       ? z.input<context>
       : undefined
@@ -157,9 +157,9 @@ type FlattenMethods<methods extends Methods> = methods extends readonly [
   infer head,
   ...infer tail extends Methods,
 ]
-  ? head extends readonly MethodIntent.AnyClient[]
+  ? head extends readonly Method.AnyClient[]
     ? readonly [...head, ...FlattenMethods<tail>]
-    : head extends MethodIntent.AnyClient
+    : head extends Method.AnyClient
       ? readonly [head, ...FlattenMethods<tail>]
       : never
   : readonly []

package/src/client/Transport.test.ts

@@ -1,12 +1,12 @@
 import { Challenge, Credential, Mcp } from 'mppx'
 import { Transport } from 'mppx/client'
-import { MethodIntents as Intents } from 'mppx/tempo'
+import { Methods } from 'mppx/tempo'
 import { describe, expect, test } from 'vitest'
 
 const realm = 'api.example.com'
 const secretKey = 'test-secret-key'
 
-const challenge = Challenge.fromIntent(Intents.charge, {
+const challenge = Challenge.fromMethod(Methods.charge, {
   realm,
   secretKey,
   request: {
@@ -60,7 +60,7 @@ describe('http', () => {
       expect(transport.getChallenge(response)).toMatchInlineSnapshot(`
         {
           "expires": "2025-01-01T00:00:00.000Z",
-          "id": "EUAHxZRCSFB29SAs5TEcB4cQDS0uVDzl8uSYuA58aVs",
+          "id": "wv3vZAjsySM50i4f1sJCZxyOLNry0dLSOwuWDBqrXaw",
           "intent": "charge",
           "method": "tempo",
           "realm": "api.example.com",
@@ -91,7 +91,7 @@ describe('http', () => {
       const headers = result.headers as Headers
 
       expect(headers.get('Authorization')).toMatchInlineSnapshot(
-        `"Payment eyJjaGFsbGVuZ2UiOnsiZXhwaXJlcyI6IjIwMjUtMDEtMDFUMDA6MDA6MDAuMDAwWiIsImlkIjoiRVVBSHhaUkNTRkIyOVNBczVURWNCNGNRRFMwdVZEemw4dVNZdUE1OGFWcyIsImludGVudCI6ImNoYXJnZSIsIm1ldGhvZCI6InRlbXBvIiwicmVhbG0iOiJhcGkuZXhhbXBsZS5jb20iLCJyZXF1ZXN0IjoiZXlKamRYSnlaVzVqZVNJNklqQjRNakJqTURBd01EQXdNREF3TURBd01EQXdNREF3TURBd01EQXdNREF3TURBd01EQXdNREF3TVNJc0ltVjRjR2x5WlhNaU9pSXlNREkxTFRBeExUQXhWREF3T2pBd09qQXdMakF3TUZvaUxDSnlaV05wY0dsbGJuUWlPaUl3ZURjME1tUXpOVU5qTmpZek5FTXdOVE15T1RJMVlUTmlPRFEwUW1NNVpUYzFPVFZtT0daRk1EQWlMQ0poYlc5MWJuUWlPaUl4TURBd0luMCJ9LCJwYXlsb2FkIjp7InNpZ25hdHVyZSI6IjB4YWJjMTIzIiwidHlwZSI6InRyYW5zYWN0aW9uIn19"`,
+        `"Payment eyJjaGFsbGVuZ2UiOnsiZXhwaXJlcyI6IjIwMjUtMDEtMDFUMDA6MDA6MDAuMDAwWiIsImlkIjoid3YzdlpBanN5U001MGk0ZjFzSkNaeHlPTE5yeTBkTFNPd3VXREJxclhhdyIsImludGVudCI6ImNoYXJnZSIsIm1ldGhvZCI6InRlbXBvIiwicmVhbG0iOiJhcGkuZXhhbXBsZS5jb20iLCJyZXF1ZXN0IjoiZXlKaGJXOTFiblFpT2lJeE1EQXdJaXdpWTNWeWNtVnVZM2tpT2lJd2VESXdZekF3TURBd01EQXdNREF3TURBd01EQXdNREF3TURBd01EQXdNREF3TURBd01EQXdNREVpTENKbGVIQnBjbVZ6SWpvaU1qQXlOUzB3TVMwd01WUXdNRG93TURvd01DNHdNREJhSWl3aWNtVmphWEJwWlc1MElqb2lNSGczTkRKa016VkRZelkyTXpSRE1EVXpNamt5TldFellqZzBORUpqT1dVM05UazFaamhtUlRBd0luMCJ9LCJwYXlsb2FkIjp7InNpZ25hdHVyZSI6IjB4YWJjMTIzIiwidHlwZSI6InRyYW5zYWN0aW9uIn19"`,
       )
     })
 
@@ -182,7 +182,7 @@ describe('mcp', () => {
       expect(transport.getChallenge(response)).toMatchInlineSnapshot(`
         {
           "expires": "2025-01-01T00:00:00.000Z",
-          "id": "EUAHxZRCSFB29SAs5TEcB4cQDS0uVDzl8uSYuA58aVs",
+          "id": "wv3vZAjsySM50i4f1sJCZxyOLNry0dLSOwuWDBqrXaw",
           "intent": "charge",
           "method": "tempo",
           "realm": "api.example.com",
@@ -239,7 +239,7 @@ describe('mcp', () => {
               "org.paymentauth/credential": {
                 "challenge": {
                   "expires": "2025-01-01T00:00:00.000Z",
-                  "id": "EUAHxZRCSFB29SAs5TEcB4cQDS0uVDzl8uSYuA58aVs",
+                  "id": "wv3vZAjsySM50i4f1sJCZxyOLNry0dLSOwuWDBqrXaw",
                   "intent": "charge",
                   "method": "tempo",
                   "realm": "api.example.com",

package/src/client/internal/Fetch.ts

@@ -1,5 +1,5 @@
 import * as Challenge from '../../Challenge.js'
-import type * as MethodIntent from '../../MethodIntent.js'
+import type * as Method from '../../Method.js'
 import type * as z from '../../zod.js'
 
 let originalFetch: typeof globalThis.fetch | undefined
@@ -25,7 +25,7 @@ let originalFetch: typeof globalThis.fetch | undefined
  * ```
  *
  */
-export function from<const methods extends readonly MethodIntent.AnyClient[]>(
+export function from<const methods extends readonly Method.AnyClient[]>(
   config: from.Config<methods>,
 ): from.Fetch<methods> {
   const { fetch = globalThis.fetch, methods, onChallenge } = config
@@ -38,10 +38,10 @@ export function from<const methods extends readonly MethodIntent.AnyClient[]>(
 
     const challenge = Challenge.fromResponse(response)
 
-    const mi = methods.find((m) => m.method === challenge.method && m.name === challenge.intent)
+    const mi = methods.find((m) => m.name === challenge.method && m.intent === challenge.intent)
     if (!mi)
       throw new Error(
-        `No method intent found for "${challenge.method}.${challenge.intent}". Available: ${methods.map((m) => `${m.method}.${m.name}`).join(', ')}`,
+        `No method found for "${challenge.method}.${challenge.intent}". Available: ${methods.map((m) => `${m.name}.${m.intent}`).join(', ')}`,
       )
 
     const onChallengeCredential = onChallenge
@@ -63,8 +63,8 @@ export function from<const methods extends readonly MethodIntent.AnyClient[]>(
 }
 
 /** Union of all context types from all methods that have context schemas. */
-type AnyContextFor<methods extends readonly MethodIntent.AnyClient[]> = {
-  [K in keyof methods]: methods[K] extends MethodIntent.Client<any, infer contextSchema>
+type AnyContextFor<methods extends readonly Method.AnyClient[]> = {
+  [K in keyof methods]: methods[K] extends Method.Client<any, infer contextSchema>
     ? contextSchema extends z.ZodMiniType
       ? z.input<contextSchema>
       : undefined
@@ -72,12 +72,10 @@ type AnyContextFor<methods extends readonly MethodIntent.AnyClient[]> = {
 }[number]
 
 export declare namespace from {
-  type Config<
-    methods extends readonly MethodIntent.AnyClient[] = readonly MethodIntent.AnyClient[],
-  > = {
+  type Config<methods extends readonly Method.AnyClient[] = readonly Method.AnyClient[]> = {
     /** Custom fetch function to wrap. Defaults to `globalThis.fetch`. */
     fetch?: typeof globalThis.fetch
-    /** Array of method intents to use. */
+    /** Array of methods to use. */
     methods: methods
     /** Called when a 402 challenge is received, before credential creation. */
     onChallenge?:
@@ -90,16 +88,16 @@ export declare namespace from {
       | undefined
   }
 
-  type Fetch<
-    methods extends readonly MethodIntent.AnyClient[] = readonly MethodIntent.AnyClient[],
-  > = (input: RequestInfo | URL, init?: RequestInit<methods>) => Promise<Response>
+  type Fetch<methods extends readonly Method.AnyClient[] = readonly Method.AnyClient[]> = (
+    input: RequestInfo | URL,
+    init?: RequestInit<methods>,
+  ) => Promise<Response>
 
-  type RequestInit<
-    methods extends readonly MethodIntent.AnyClient[] = readonly MethodIntent.AnyClient[],
-  > = globalThis.RequestInit & {
-    /** Context to pass to the method intent's createCredential. */
-    context?: AnyContextFor<methods>
-  }
+  type RequestInit<methods extends readonly Method.AnyClient[] = readonly Method.AnyClient[]> =
+    globalThis.RequestInit & {
+      /** Context to pass to the method intent's createCredential. */
+      context?: AnyContextFor<methods>
+    }
 }
 
 /**
@@ -122,7 +120,7 @@ export declare namespace from {
  * const res = await fetch('https://api.example.com/resource')
  * ```
  */
-export function polyfill<const methods extends readonly MethodIntent.AnyClient[]>(
+export function polyfill<const methods extends readonly Method.AnyClient[]>(
   config: polyfill.Config<methods>,
 ): void {
   originalFetch = globalThis.fetch
@@ -130,9 +128,8 @@ export function polyfill<const methods extends readonly MethodIntent.AnyClient[]
 }
 
 export declare namespace polyfill {
-  type Config<
-    methods extends readonly MethodIntent.AnyClient[] = readonly MethodIntent.AnyClient[],
-  > = from.Config<methods>
+  type Config<methods extends readonly Method.AnyClient[] = readonly Method.AnyClient[]> =
+    from.Config<methods>
 }
 
 /**
@@ -159,7 +156,7 @@ export function restore(): void {
 /** @internal */
 async function resolveCredential(
   challenge: Challenge.Challenge,
-  mi: MethodIntent.AnyClient,
+  mi: Method.AnyClient,
   context: unknown,
 ): Promise<string> {
   const parsedContext = mi.context && context !== undefined ? mi.context.parse(context) : undefined

package/src/index.ts

@@ -3,9 +3,8 @@ export * as Challenge from './Challenge.js'
 export * as Credential from './Credential.js'
 export * as Errors from './Errors.js'
 export * as Expires from './Expires.js'
-export * as Intent from './Intent.js'
 export * as Mcp from './Mcp.js'
-export * as MethodIntent from './MethodIntent.js'
+export * as Method from './Method.js'
 export * as PaymentRequest from './PaymentRequest.js'
 export * as Receipt from './Receipt.js'
 export * as Store from './Store.js'

package/src/mcp-sdk/client/McpClient.test.ts

@@ -154,7 +154,7 @@ describe('McpClient.wrap', () => {
   })
 
   test('error: throws when method not found', async () => {
-    const challenge = Challenge.fromIntent(tempo_server.charge({ getClient: () => testClient }), {
+    const challenge = Challenge.fromMethod(tempo_server.charge({ getClient: () => testClient }), {
       realm,
       secretKey,
       request: {