mppx 0.7.0 → 0.8.1

package/src/tempo/session/precompile/Voucher.ts

@@ -1,4 +1,3 @@
-import { Signature } from 'ox'
 import { Channel, SignatureEnvelope } from 'ox/tempo'
 import type { Account, Address, Client, Hex } from 'viem'
 import { hashTypedData } from 'viem'
@@ -45,6 +44,24 @@ function getVoucherDigest(chainId: number, voucher: Voucher): Hex {
   }) as Hex
 }
 
+function getVoucherPayload(verifyingContract: Address, chainId: number, voucher: Voucher): Hex {
+  if (verifyingContract.toLowerCase() === Channel.address.toLowerCase())
+    return getVoucherDigest(chainId, voucher)
+  return hashTypedData({
+    domain: getVoucherDomain(verifyingContract, chainId),
+    types: voucherTypes,
+    primaryType: 'Voucher',
+    message: {
+      channelId: voucher.channelId,
+      cumulativeAmount: voucher.cumulativeAmount,
+    },
+  })
+}
+
+function isPrimitiveEnvelope(type: string): boolean {
+  return type === 'secp256k1' || type === 'p256' || type === 'webAuthn'
+}
+
 function signCanonicalTempoVoucher(
   account: Account,
   parameters: {
@@ -72,7 +89,6 @@ export async function signVoucher(
   voucher: Voucher,
   verifyingContract: Address,
   chainId: number,
-  _authorizedSigner?: Address | undefined,
 ): Promise<Hex> {
   const signature = await (async () => {
     if (verifyingContract.toLowerCase() === Channel.address.toLowerCase()) {
@@ -94,19 +110,19 @@ export async function signVoucher(
   })()
 
   const envelope = SignatureEnvelope.from(signature as SignatureEnvelope.Serialized)
-  if (envelope.type === 'keychain' && envelope.inner.type === 'secp256k1')
-    return Signature.toHex(envelope.inner.signature)
-  if (envelope.type === 'keychain' || envelope.type !== 'secp256k1')
-    throw new Error('TIP-1034 voucher signing only supports secp256k1 voucher signatures.')
+  if (!isPrimitiveEnvelope(envelope.type))
+    throw new Error(
+      `TIP-1034 vouchers require a TIP-1020 primitive signature; received "${envelope.type}".`,
+    )
 
-  return signature
+  return SignatureEnvelope.serialize(envelope)
 }
 
 /**
  * Verify a voucher signature matches the expected signer.
  *
- * Only accepts raw secp256k1 signatures — the escrow contract verifies
- * via ecrecover. Keychain, p256, and webAuthn signatures are rejected.
+ * Accepts canonical TIP-1020 primitive signatures. Keychain wrappers,
+ * multisig signatures, and magic-suffixed encodings are rejected.
  */
 export function verifyVoucher(
   escrowContract: Address,
@@ -117,25 +133,11 @@ export function verifyVoucher(
   try {
     const envelope = SignatureEnvelope.from(voucher.signature as SignatureEnvelope.Serialized)
 
-    // Reject keychain signatures — the escrow contract verifies raw ECDSA
-    // signatures against authorizedSigner, not keychain-wrapped ones.
-    if (envelope.type === 'keychain') return false
-    if (envelope.type !== 'secp256k1') return false
+    if (!isPrimitiveEnvelope(envelope.type)) return false
     if (SignatureEnvelope.serialize(envelope).toLowerCase() !== voucher.signature.toLowerCase())
       return false
 
-    const payload =
-      escrowContract.toLowerCase() === Channel.address.toLowerCase()
-        ? getVoucherDigest(chainId, voucher)
-        : hashTypedData({
-            domain: getVoucherDomain(escrowContract, chainId),
-            types: voucherTypes,
-            primaryType: 'Voucher',
-            message: {
-              channelId: voucher.channelId,
-              cumulativeAmount: voucher.cumulativeAmount,
-            },
-          })
+    const payload = getVoucherPayload(escrowContract, chainId, voucher)
     const signer = SignatureEnvelope.extractAddress({ payload, signature: envelope })
     const valid = SignatureEnvelope.verify(envelope, { address: signer, payload })
     return valid && TempoAddress.isEqual(signer, expectedSigner)

package/src/tempo/session/server/CredentialVerification.test.ts

@@ -3,6 +3,7 @@ import { describe, expect, test } from 'vp/test'
 
 import * as Channel from '../precompile/Channel.js'
 import {
+  assertOpenCredentialCoversRequest,
   requireSessionCredentialAction,
   requireSessionCredentialPayload,
   requireSessionCredentialPayloadHeader,
@@ -143,4 +144,39 @@ describe('SessionCredentialGuards', () => {
       ).toThrow('channel descriptor operator does not match server operator')
     })
   })
+
+  describe('assertOpenCredentialCoversRequest', () => {
+    test('accepts deposit and voucher amounts that cover the request', () => {
+      expect(() =>
+        assertOpenCredentialCoversRequest({
+          cumulativeAmount: 100n,
+          openDeposit: 100n,
+          requestAmount: 100n,
+        }),
+      ).not.toThrow()
+    })
+
+    test.each([
+      {
+        cumulativeAmount: 100n,
+        expected: 'open deposit is less than request amount',
+        openDeposit: 99n,
+        requestAmount: 100n,
+      },
+      {
+        cumulativeAmount: 99n,
+        expected: 'voucher amount is less than request amount',
+        openDeposit: 100n,
+        requestAmount: 100n,
+      },
+    ])('rejects insufficient open credential funding: $expected', (case_) => {
+      expect(() =>
+        assertOpenCredentialCoversRequest({
+          cumulativeAmount: case_.cumulativeAmount,
+          openDeposit: case_.openDeposit,
+          requestAmount: case_.requestAmount,
+        }),
+      ).toThrow(case_.expected)
+    })
+  })
 })

package/src/tempo/session/server/CredentialVerification.ts

@@ -113,6 +113,19 @@ export function validateChannelState(state: Chain.ChannelState, amount?: bigint)
   }
 }
 
+/** Asserts that an opening channel covers the route's requested payment. */
+export function assertOpenCredentialCoversRequest(parameters: {
+  cumulativeAmount: bigint
+  openDeposit: bigint
+  requestAmount: bigint
+}): void {
+  const { cumulativeAmount, openDeposit, requestAmount } = parameters
+  if (openDeposit < requestAmount)
+    throw new VerificationFailedError({ reason: 'open deposit is less than request amount' })
+  if (cumulativeAmount < requestAmount)
+    throw new VerificationFailedError({ reason: 'voucher amount is less than request amount' })
+}
+
 const sessionCredentialActions = [
   'open',
   'topUp',
@@ -410,6 +423,11 @@ async function handleOpenCredential(
     feePayerPolicy: parameters.feePayerPolicy,
     serializedTransaction: payload.transaction,
     async beforeBroadcast(prepared) {
+      assertOpenCredentialCoversRequest({
+        cumulativeAmount,
+        openDeposit: prepared.openDeposit,
+        requestAmount: request.amount,
+      })
       assertSameDescriptor(prepared.descriptor, payload.descriptor)
       if (cumulativeAmount > prepared.openDeposit)
         throw new AmountExceedsDepositError({ reason: 'voucher amount exceeds open deposit' })

package/src/tempo/session/server/Session.test.ts

@@ -1815,7 +1815,7 @@ describe('precompile server session unit guardrails', () => {
           }),
         ],
         realm: 'api.example.com',
-        secretKey: 'secret',
+        secretKey: 'test-secret-key-test-secret-key-32',
       }).session({ amount: '1', decimals: 0, unitType: 'request' })
     }
 
@@ -1996,7 +1996,7 @@ describe('precompile server session unit guardrails', () => {
           }),
         ],
         realm: 'api.example.com',
-        secretKey: 'secret',
+        secretKey: 'test-secret-key-test-secret-key-32',
       }).session({ amount: '1', decimals: 0, unitType: 'request' })
     }
 
@@ -2163,7 +2163,7 @@ describe('precompile server session unit guardrails', () => {
           }),
         ],
         realm: 'api.example.com',
-        secretKey: 'secret',
+        secretKey: 'test-secret-key-test-secret-key-32',
       }).session({ amount, decimals: 0, suggestedDeposit: maxDeposit.toString(), unitType })
 
       const fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
@@ -2312,7 +2312,7 @@ describe('precompile server session unit guardrails', () => {
           }),
         ],
         realm: 'api.example.com',
-        secretKey: 'secret',
+        secretKey: 'test-secret-key-test-secret-key-32',
       }).session({ amount: '1', decimals: 0, suggestedDeposit: maxDeposit.toString() })
 
       const route = async (request: Request) => {

package/src/tempo/session/server/Settlement.test.ts

@@ -1,11 +1,14 @@
 import type { Hex } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
-import { describe, expect, test } from 'vp/test'
+import { describe, expect, test, vi } from 'vp/test'
 
 import * as Challenge from '../../../Challenge.js'
 import type * as Credential from '../../../Credential.js'
+import type * as Method from '../../../Method.js'
+import { createSessionReceipt } from '../precompile/Protocol.js'
 import type * as ChannelStore from './ChannelStore.js'
 import {
+  applyVerifiedHttpAccounting,
   isSettlementDue,
   readRequestFeePayer,
   resolveCredentialFeePayer,
@@ -148,6 +151,90 @@ describe('FeePayerResolution', () => {
   })
 })
 
+describe('applyVerifiedHttpAccounting', () => {
+  const channelId = '0x0000000000000000000000000000000000000000000000000000000000000001' as Hex
+
+  function receipt() {
+    return createSessionReceipt({
+      acceptedCumulative: 200n,
+      challengeId: 'challenge-1',
+      channelId,
+      spent: 0n,
+      units: 0,
+    })
+  }
+
+  function capturedRequest(overrides: Partial<Method.CapturedRequest>): Method.CapturedRequest {
+    return {
+      hasBody: false,
+      headers: new Headers(),
+      method: 'GET',
+      url: new URL('https://api.example.com/session'),
+      ...overrides,
+    }
+  }
+
+  function chargedChannel(): ChannelStore.State {
+    return {
+      channelId,
+      spent: 75n,
+      units: 1,
+    } as ChannelStore.State
+  }
+
+  test('precharges SSE GET content and marks the receipt as prepaid', async () => {
+    const charge = vi.fn(async () => chargedChannel())
+    const markPrepaidReceipt = vi.fn((value) => value)
+
+    await applyVerifiedHttpAccounting({
+      capturedRequest: capturedRequest({ method: 'GET' }),
+      charge,
+      getRequestAmount: () => 75n,
+      markPrepaidReceipt,
+      payloadAction: 'voucher',
+      receipt: receipt(),
+      settleCharged: async () => undefined,
+      sseEnabled: true,
+    })
+
+    expect(charge).toHaveBeenCalledWith(channelId, 75n)
+    expect(markPrepaidReceipt).toHaveBeenCalledOnce()
+  })
+
+  test('does not charge SSE voucher management POSTs', async () => {
+    const charge = vi.fn(async () => chargedChannel())
+
+    const result = await applyVerifiedHttpAccounting({
+      capturedRequest: capturedRequest({ hasBody: true, method: 'POST' }),
+      charge,
+      getRequestAmount: () => 75n,
+      payloadAction: 'voucher',
+      receipt: receipt(),
+      settleCharged: async () => undefined,
+      sseEnabled: true,
+    })
+
+    expect(charge).not.toHaveBeenCalled()
+    expect(result.spent).toBe('0')
+  })
+
+  test('keeps non-SSE POST content accounting unchanged', async () => {
+    const charge = vi.fn(async () => chargedChannel())
+
+    await applyVerifiedHttpAccounting({
+      capturedRequest: capturedRequest({ hasBody: true, method: 'POST' }),
+      charge,
+      getRequestAmount: () => 75n,
+      payloadAction: 'voucher',
+      receipt: receipt(),
+      settleCharged: async () => undefined,
+      sseEnabled: false,
+    })
+
+    expect(charge).toHaveBeenCalledWith(channelId, 75n)
+  })
+})
+
 describe('SettlementSchedule', () => {
   const channelId = '0x0000000000000000000000000000000000000000000000000000000000000001' as Hex
   const salt = '0x0000000000000000000000000000000000000000000000000000000000000002' as Hex

package/src/tempo/session/server/Settlement.ts

@@ -262,8 +262,9 @@ export async function applyVerifiedHttpAccounting(
 ): Promise<SessionReceipt> {
   const { capturedRequest, payloadAction, receipt, sseEnabled } = parameters
   if (!capturedRequest) return receipt
-  if (!isSessionContentRequest(capturedRequest)) return receipt
   if (payloadAction !== 'open' && payloadAction !== 'voucher') return receipt
+  if (sseEnabled && capturedRequest.method === 'POST') return receipt
+  if (!isSessionContentRequest(capturedRequest)) return receipt
 
   const requestAmount = parameters.getRequestAmount()
   const charged = await parameters.charge(receipt.channelId, requestAmount)

package/src/tempo/session/server/Sse.ts

@@ -8,10 +8,8 @@ import {
   formatMessageEvent,
   formatNeedVoucherEvent,
   formatReceiptEvent,
-  parseEvent,
   readSessionChallengeAmount,
   requireSessionCredentialContext,
-  type SseEvent,
 } from '../precompile/Protocol.js'
 import * as ChannelStore from './ChannelStore.js'
 import { meterIterable, type SessionController } from './MeteredStream.js'

package/src/tempo/session/server/Ws.ts

@@ -4,17 +4,13 @@ import {
   createSessionReceipt,
   deserializeSessionReceipt,
   formatApplicationMessage,
-  formatAuthorizationMessage,
   formatCloseReadyMessage,
-  formatCloseRequestMessage,
   formatErrorMessage,
   formatNeedVoucherMessage,
   formatReceiptMessage,
   parseMessage,
   readSessionChallengeAmount,
   requireSessionCredentialContext,
-  type ErrorMessageParameters,
-  type Message,
   type SessionCredentialContext,
   type SessionReceipt,
 } from '../precompile/Protocol.js'

package/src/tempo/subscription/Store.ts

@@ -22,6 +22,8 @@ export type SubscriptionStore = {
   get(subscriptionId: string): Promise<SubscriptionRecord | null>
   /** Looks up a generated access key for a resolved request key. */
   getAccessKey(key: string): Promise<SubscriptionAccessKeyRecord | null>
+  /** Looks up a generated access key by its public access key address. */
+  getAccessKeyByAddress(address: string): Promise<SubscriptionAccessKeyRecord | null>
   /** Looks up the active subscription for a resolved request key. */
   getByKey(key: string): Promise<SubscriptionRecord | null>
   /** Gets or creates the server-owned access key for a resolved request key. */
@@ -104,6 +106,10 @@ export function fromStore(
     return `${accessKeyPrefix}${key}`
   }
 
+  function accessKeyAddressKey(address: string): string {
+    return `${accessKeyPrefix}address:${address.toLowerCase()}`
+  }
+
   function lookupRecordKey(key: string): string {
     return `${keyPrefix}${key}`
   }
@@ -243,6 +249,10 @@ export function fromStore(
       return (await store.get(accessKeyKey(key))) as SubscriptionAccessKeyRecord | null
     },
 
+    async getAccessKeyByAddress(address) {
+      return (await store.get(accessKeyAddressKey(address))) as SubscriptionAccessKeyRecord | null
+    },
+
     async getByKey(key) {
       return getByLookupKey(key)
     },
@@ -258,15 +268,23 @@ export function fromStore(
         keyType: account.keyType,
         privateKey,
       } satisfies SubscriptionAccessKeyRecord
-      return store.update(
-        accessKeyKey(key),
-        (current): Store.Change<unknown, SubscriptionAccessKeyRecord> => {
-          if (current) {
-            return { op: 'noop', result: current as SubscriptionAccessKeyRecord }
-          }
-          return { op: 'set', value: candidate, result: candidate }
-        },
-      )
+      return store
+        .update(
+          accessKeyKey(key),
+          (current): Store.Change<unknown, SubscriptionAccessKeyRecord> => {
+            if (current) {
+              return { op: 'noop', result: current as SubscriptionAccessKeyRecord }
+            }
+            return { op: 'set', value: candidate, result: candidate }
+          },
+        )
+        .then(async (record) => {
+          await store.update(accessKeyAddressKey(record.accessKeyAddress), (current) => {
+            if (current) return { op: 'noop', result: undefined }
+            return { op: 'set', value: record, result: undefined }
+          })
+          return record
+        })
     },
 
     async put(record) {

package/src/x402/Exact.e2e.test.ts

@@ -8,7 +8,7 @@ import * as Header from './Header.js'
 import * as RouteBinding from './internal/RouteBinding.js'
 import * as Types from './Types.js'
 
-const secretKey = 'test-secret'
+const secretKey = 'test-secret-key-test-secret-key-32'
 const transaction = `0x${'1'.repeat(64)}`
 
 describe('x402 exact e2e', () => {

package/src/x402/PublicInterface.test-d.ts

@@ -4,7 +4,7 @@ import { describe, expectTypeOf, test } from 'vp/test'
 
 import { evm as clientEvm } from '../client/index.js'
 
-const secretKey = 'test-secret'
+const secretKey = 'test-secret-key-test-secret-key-32'
 
 describe('x402 public interface', () => {
   test('server evm charge accepts known assets without transfer metadata', () => {

package/src/x402/index.ts

@@ -1,3 +1,4 @@
+/** @deprecated Use `assets` instead. */
 export * as Assets from './Assets.js'
 export * as Header from './Header.js'
 export * as Types from './Types.js'

package/dist/mcp-sdk/client/McpClient.d.ts

@@ -1,85 +0,0 @@
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { McpError } from '@modelcontextprotocol/sdk/types.js';
-import type * as Challenge from '../../Challenge.js';
-import * as core_Mcp from '../../Mcp.js';
-import type * as Method from '../../Method.js';
-import type * as z from '../../zod.js';
-type AnyClient = Method.Client<any, any>;
-export type CallToolParameters = {
-    name: string;
-    arguments?: Record<string, unknown>;
-    _meta?: Record<string, unknown>;
-};
-export type OnPaymentRequired = (challenge: Challenge.Challenge) => boolean | Promise<boolean>;
-/**
- * Result of a tool call with payment handling.
- * Extends the SDK's callTool return type with an optional payment receipt.
- */
-export type CallToolResult = Awaited<ReturnType<Client['callTool']>> & {
-    /** Payment receipt if payment was made. */
-    receipt: core_Mcp.Receipt | undefined;
-};
-/**
- * Creates a payment-aware wrapper around an MCP SDK client.
- *
- * Similar to `Fetch.from()` for HTTP, this wraps an MCP client's `callTool`
- * method to automatically handle payment challenges.
- *
- * @example
- * ```ts
- * import { Client } from '@modelcontextprotocol/sdk/client'
- * import { McpClient, tempo } from 'mppx/mcp-sdk/client'
- * import { privateKeyToAccount } from 'viem/accounts'
- *
- * const client = new Client({ name: 'my-client', version: '1.0.0' })
- * await client.connect(transport)
- *
- * const mcp = McpClient.wrap(client, {
- *   methods: [
- *     tempo({
- *       account: privateKeyToAccount('0x...'),
- *     }),
- *   ],
- * })
- *
- * // Automatically handles payment challenges
- * const result = await mcp.callTool({ name: 'premium_tool', arguments: {} })
- * console.log(result.content, result.receipt)
- * ```
- */
-export declare function wrap<const client extends Pick<Client, 'callTool'>, const methods extends readonly Method.AnyClient[]>(client: client, config: wrap.Config<methods>): wrap.McpClient<client, methods>;
-/** Union of all context types from all methods that have context schemas. */
-type AnyContextFor<methods extends readonly AnyClient[]> = {
-    [key in keyof methods]: methods[key] extends Method.Client<any, infer context> ? context extends z.ZodMiniType ? z.input<context> : undefined : undefined;
-}[number];
-export declare namespace wrap {
-    type Config<methods extends readonly Method.AnyClient[] = readonly Method.AnyClient[]> = {
-        /** Array of methods to use. */
-        methods: methods;
-        /** Optional approval hook called before creating a payment credential. */
-        onPaymentRequired?: OnPaymentRequired;
-    };
-    type McpClient<client extends Pick<Client, 'callTool'> = Pick<Client, 'callTool'>, methods extends readonly AnyClient[] = readonly AnyClient[]> = Omit<client, 'callTool'> & {
-        /** Call a tool with automatic payment handling. */
-        callTool: {
-            (params: CallToolParameters, options?: CallToolOptions<methods>): Promise<CallToolResult>;
-            (onPaymentRequired: OnPaymentRequired | null | undefined, params: CallToolParameters, options?: CallToolOptions<methods>): Promise<CallToolResult>;
-        };
-    };
-    type CallToolOptions<methods extends readonly AnyClient[] = readonly AnyClient[]> = {
-        /** Context to pass to the method intent's createCredential. */
-        context?: AnyContextFor<methods>;
-        /** Request timeout in milliseconds. */
-        timeout?: number;
-    };
-}
-/**
- * Checks if an error is a payment required error.
- */
-export declare function isPaymentRequiredError(error: unknown): error is McpError & {
-    data: {
-        challenges: Challenge.Challenge[];
-    };
-};
-export {};
-//# sourceMappingURL=McpClient.d.ts.map

package/dist/mcp-sdk/client/McpClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"McpClient.d.ts","sourceRoot":"","sources":["../../../src/mcp-sdk/client/McpClient.ts"],"names":[],"mappings":"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"}

package/dist/mcp-sdk/client/McpClient.js

@@ -1,118 +0,0 @@
-import * as Credential from '../../Credential.js';
-import * as Expires from '../../Expires.js';
-import * as AcceptPayment from '../../internal/AcceptPayment.js';
-import * as core_Mcp from '../../Mcp.js';
-/**
- * Creates a payment-aware wrapper around an MCP SDK client.
- *
- * Similar to `Fetch.from()` for HTTP, this wraps an MCP client's `callTool`
- * method to automatically handle payment challenges.
- *
- * @example
- * ```ts
- * import { Client } from '@modelcontextprotocol/sdk/client'
- * import { McpClient, tempo } from 'mppx/mcp-sdk/client'
- * import { privateKeyToAccount } from 'viem/accounts'
- *
- * const client = new Client({ name: 'my-client', version: '1.0.0' })
- * await client.connect(transport)
- *
- * const mcp = McpClient.wrap(client, {
- *   methods: [
- *     tempo({
- *       account: privateKeyToAccount('0x...'),
- *     }),
- *   ],
- * })
- *
- * // Automatically handles payment challenges
- * const result = await mcp.callTool({ name: 'premium_tool', arguments: {} })
- * console.log(result.content, result.receipt)
- * ```
- */
-export function wrap(client, config) {
-    const { methods } = config;
-    const paymentPreferences = AcceptPayment.resolve(methods);
-    const callTool = (async (first, second, third) => {
-        const hasApprovalArgument = typeof first === 'function' || first === null || first === undefined;
-        const params = (hasApprovalArgument ? second : first);
-        const options = (hasApprovalArgument ? third : second);
-        const onPaymentRequired = first === null
-            ? undefined
-            : hasApprovalArgument
-                ? (first ?? config.onPaymentRequired)
-                : config.onPaymentRequired;
-        const context = options?.context;
-        const timeout = options?.timeout;
-        try {
-            const result = await client.callTool(params, undefined, timeout !== undefined ? { timeout } : undefined);
-            return {
-                ...result,
-                receipt: result._meta?.[core_Mcp.receiptMetaKey],
-            };
-        }
-        catch (error) {
-            // Check if this is a payment required error
-            if (!isPaymentRequiredError(error))
-                throw error;
-            const challenges = error.data?.challenges;
-            if (!challenges?.length)
-                throw error;
-            const selected = AcceptPayment.selectChallenge(challenges, methods, paymentPreferences.entries);
-            if (!selected) {
-                const available = challenges.map((c) => `${c.method}.${c.intent}`).join(', ');
-                const installed = methods.map((m) => `${m.name}.${m.intent}`).join(', ');
-                throw new Error(`No compatible payment method. Server offers: ${available}. Client has: ${installed}`, { cause: error });
-            }
-            if (selected.challenge.expires)
-                Expires.assert(selected.challenge.expires, selected.challenge.id);
-            if (onPaymentRequired) {
-                const approved = await onPaymentRequired(selected.challenge);
-                if (!approved)
-                    throw new Error('Payment declined.', { cause: error });
-            }
-            const credential = await createCredential(selected.challenge, {
-                context,
-                methods,
-            });
-            const parsed = Credential.deserialize(credential);
-            const retryResult = await client.callTool({
-                ...params,
-                _meta: {
-                    ...params._meta,
-                    [core_Mcp.credentialMetaKey]: parsed,
-                },
-            }, undefined, timeout !== undefined ? { timeout } : undefined);
-            return {
-                ...retryResult,
-                receipt: retryResult._meta?.[core_Mcp.receiptMetaKey],
-            };
-        }
-    });
-    return { ...client, callTool };
-}
-/**
- * Checks if an error is a payment required error.
- */
-export function isPaymentRequiredError(error) {
-    if (typeof error !== 'object' || error === null)
-        return false;
-    if (!('code' in error) || !('message' in error))
-        return false;
-    if (error.code !== core_Mcp.paymentRequiredCode)
-        return false;
-    const data = error.data;
-    return Array.isArray(data?.challenges) && data.challenges.length > 0;
-}
-/** @internal */
-async function createCredential(challenge, config) {
-    const { context, methods } = config;
-    const mi = methods.find((m) => m.name === challenge.method && m.intent === challenge.intent);
-    if (!mi)
-        throw new Error(`No method found for "${challenge.method}.${challenge.intent}". Available: ${methods.map((m) => `${m.name}.${m.intent}`).join(', ')}`);
-    if (challenge.expires)
-        Expires.assert(challenge.expires, challenge.id);
-    const parsedContext = mi.context && context !== undefined ? mi.context.parse(context) : undefined;
-    return mi.createCredential(parsedContext !== undefined ? { challenge, context: parsedContext } : { challenge });
-}
-//# sourceMappingURL=McpClient.js.map

package/dist/mcp-sdk/client/McpClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"McpClient.js","sourceRoot":"","sources":["../../../src/mcp-sdk/client/McpClient.ts"],"names":[],"mappings":"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"}