mppx 0.6.31 → 0.8.0

package/src/Method.ts

@@ -59,6 +59,7 @@ export type Client<
   method extends Method = Method,
   context extends z.ZodMiniType | undefined = z.ZodMiniType | undefined,
 > = method & {
+  canHandleChallenge?: CanHandleChallengeFn | undefined
   context?: context
   createCredential: CreateCredentialFn<
     method,
@@ -130,18 +131,21 @@ export type Server<
   defaults extends ExactPartial<z.input<method['schema']['request']>> = {},
   transportOverride = undefined,
   extensions extends object = {},
+  alias extends string | undefined = string | undefined,
 > = method & {
+  alias?: alias | undefined
   authorize?: AuthorizeFn<method> | undefined
   defaults?: defaults | undefined
   extensions?: extensions | undefined
   html?: Html.Options | undefined
+  preflight?: PreflightFn<method> | undefined
   request?: RequestFn<method> | undefined
   respond?: RespondFn<method> | undefined
   stableBinding?: StableBindingFn<method> | undefined
   transport?: transportOverride | undefined
   verify: VerifyFn<method>
 }
-export type AnyServer = Server<any, any, any, any>
+export type AnyServer = Server<any, any, any, any, any>
 
 /** Credential creation function for a single method. */
 export type CreateCredentialFn<method extends Method, context = unknown> = (
@@ -154,6 +158,9 @@ export type CreateCredentialFn<method extends Method, context = unknown> = (
   } & ([keyof context] extends [never] ? unknown : { context: context }),
 ) => Promise<string>
 
+/** Predicate used when multiple client implementations share a wire method/intent. */
+export type CanHandleChallengeFn = (parameters: { challenge: Challenge.Challenge }) => boolean
+
 /** Request transform function for a single method. */
 export type RequestFn<method extends Method> = (
   options: RequestContext<method>,
@@ -188,6 +195,22 @@ export type AuthorizeResult = {
   response?: globalThis.Response | undefined
 }
 
+/**
+ * Optional HTTP preflight hook for method-specific management requests.
+ *
+ * Called before the normal challenge/verification path. Returning a response
+ * fully handles the request.
+ */
+export type PreflightFn<method extends Method> = (parameters: {
+  capturedRequest?: CapturedRequest | undefined
+  credential: Credential.Credential | null
+  expires?: string | undefined
+  input: globalThis.Request
+  options: z.input<method['schema']['request']>
+  realm: string
+  secretKey: string
+}) => MaybePromise<globalThis.Response | undefined>
+
 /**
  * Produces the stable request fields used to bind credentials to a route.
  *
@@ -252,9 +275,10 @@ export function toClient<
   const method extends Method,
   const context extends z.ZodMiniType | undefined = undefined,
 >(method: method, options: toClient.Options<method, context>): Client<method, context> {
-  const { context, createCredential } = options
+  const { canHandleChallenge, context, createCredential } = options
   return {
     ...method,
+    canHandleChallenge,
     context,
     createCredential,
   } as Client<method, context>
@@ -262,6 +286,7 @@ export function toClient<
 
 export declare namespace toClient {
   type Options<method extends Method, context extends z.ZodMiniType | undefined = undefined> = {
+    canHandleChallenge?: CanHandleChallengeFn | undefined
     context?: context
     createCredential: CreateCredentialFn<
       method,
@@ -291,15 +316,24 @@ export function toServer<
   const defaults extends RequestDefaults<method> = {},
   const transportOverride extends Transport.AnyTransport | undefined = undefined,
   const extensions extends object = {},
+  const options extends toServer.Options<
+    method,
+    defaults,
+    transportOverride,
+    extensions,
+    string | undefined
+  > = toServer.Options<method, defaults, transportOverride, extensions, string | undefined>,
 >(
   method: method,
-  options: toServer.Options<method, defaults, transportOverride, extensions>,
-): Server<method, defaults, transportOverride, extensions> {
+  options: options,
+): Server<method, defaults, transportOverride, extensions, toServer.Alias<options>> {
   const {
+    alias,
     authorize,
     defaults,
     extensions,
     html,
+    preflight,
     request,
     respond,
     stableBinding,
@@ -308,29 +342,36 @@ export function toServer<
   } = options
   return {
     ...method,
+    alias,
     authorize,
     defaults,
     extensions,
     html,
+    preflight,
     request,
     respond,
     stableBinding,
     transport,
     verify,
-  } as Server<method, defaults, transportOverride, extensions>
+  } as Server<method, defaults, transportOverride, extensions, toServer.Alias<options>>
 }
 
 export declare namespace toServer {
+  type Alias<options> = options extends { alias: infer alias extends string } ? alias : undefined
+
   type Options<
     method extends Method,
     defaults extends RequestDefaults<method> = {},
     transportOverride extends Transport.AnyTransport | undefined = undefined,
     extensions extends object = {},
+    alias extends string | undefined = undefined,
   > = {
+    alias?: alias | undefined
     authorize?: AuthorizeFn<method> | undefined
     defaults?: defaults | undefined
     extensions?: extensions | undefined
     html?: Html.Options | undefined
+    preflight?: PreflightFn<method> | undefined
     request?: RequestFn<method> | undefined
     respond?: RespondFn<method> | undefined
     stableBinding?: StableBindingFn<method> | undefined

package/src/PaymentRequest.ts

@@ -9,9 +9,9 @@ import type * as z from './zod.js'
  *
  * @example
  * ```ts
- * import { Request } from 'mppx'
+ * import { PaymentRequest } from 'mppx'
  *
- * const request: Request.Request = {
+ * const request: PaymentRequest.Request = {
  *   amount: '1000000',
  *   currency: '0x20c0000000000000000000000000000000000001',
  *   recipient: '0x742d35Cc6634C0532925a3b844Bc9e7595f8fE00',
@@ -29,9 +29,9 @@ export type Request<request extends Record<string, unknown> = Record<string, unk
  *
  * @example
  * ```ts
- * import { Request } from 'mppx'
+ * import { PaymentRequest } from 'mppx'
  *
- * const request = Request.deserialize(serialized)
+ * const request = PaymentRequest.deserialize(serialized)
  * ```
  */
 export function deserialize(encoded: string): Request {
@@ -47,9 +47,9 @@ export function deserialize(encoded: string): Request {
  *
  * @example
  * ```ts
- * import { Request } from 'mppx'
+ * import { PaymentRequest } from 'mppx'
  *
- * const request = Request.from({
+ * const request = PaymentRequest.from({
  *   amount: '1000000',
  *   currency: '0x20c0000000000000000000000000000000000001',
  *   recipient: '0x742d35Cc6634C0532925a3b844Bc9e7595f8fE00',
@@ -69,10 +69,10 @@ export function from<const request extends Request>(request: request): request {
  *
  * @example
  * ```ts
- * import { Request } from 'mppx'
+ * import { PaymentRequest } from 'mppx'
  * import { Methods } from 'mppx/tempo'
  *
- * const request = Request.fromMethod(Methods.charge, {
+ * const request = PaymentRequest.fromMethod(Methods.charge, {
  *   amount: '1000000',
  *   currency: '0x20c0000000000000000000000000000000000001',
  *   recipient: '0x742d35Cc6634C0532925a3b844Bc9e7595f8fE00',
@@ -96,9 +96,9 @@ export function fromMethod<const method extends Method.Method>(
  *
  * @example
  * ```ts
- * import { Request } from 'mppx'
+ * import { PaymentRequest } from 'mppx'
  *
- * const serialized = Request.serialize(request)
+ * const serialized = PaymentRequest.serialize(request)
  * // => "eyJhbW91bnQiOiIxMDAwMDAwIiwiY3VycmVuY3kiOiIweC4uLiJ9"
  * ```
  */

package/src/Receipt.ts

@@ -1,5 +1,6 @@
 import { Base64 } from 'ox'
 
+import * as Constants from './Constants.js'
 import * as z from './zod.js'
 
 /**
@@ -126,7 +127,7 @@ export function serialize(receipt: Receipt): string {
  * ```
  */
 export function fromResponse(response: Response): Receipt {
-  const header = response.headers.get('Payment-Receipt')
-  if (!header) throw new Error('Missing Payment-Receipt header.')
+  const header = response.headers.get(Constants.Headers.paymentReceipt)
+  if (!header) throw new Error(`Missing ${Constants.Headers.paymentReceipt} header.`)
   return deserialize(header)
 }

package/src/cli/cli.test.ts

@@ -4,16 +4,16 @@ import * as os from 'node:os'
 import * as path from 'node:path'
 import { pathToFileURL } from 'node:url'
 
-import { decodeFunctionData, erc20Abi, parseUnits, type Address } from 'viem'
+import { decodeFunctionData, parseUnits, type Address } from 'viem'
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'
 import { Addresses, Transaction } from 'viem/tempo'
 import { afterAll, describe, expect, test } from 'vp/test'
 import * as Http from '~test/Http.js'
-import { rpcUrl } from '~test/tempo/prool.js'
-import { deployEscrow, escrowAbi } from '~test/tempo/session.js'
+import { rpcUrl } from '~test/tempo/rpc.js'
 import { accounts, asset, chain, client, fundAccount } from '~test/tempo/viem.js'
 
 import * as Challenge from '../Challenge.js'
+import * as Constants from '../Constants.js'
 import * as Credential from '../Credential.js'
 import * as Method from '../Method.js'
 import * as Receipt from '../Receipt.js'
@@ -22,7 +22,9 @@ import { toNodeListener } from '../server/Mppx.js'
 import * as Store from '../Store.js'
 import { stripe as stripe_server } from '../stripe/server/Methods.js'
 import { tempo } from '../tempo/server/Methods.js'
-import type { SessionCredentialPayload } from '../tempo/session/Types.js'
+import { escrowAbi } from '../tempo/session/precompile/escrow.abi.js'
+import { tip20ChannelEscrow } from '../tempo/session/precompile/Protocol.js'
+import type { SessionCredentialPayload } from '../tempo/session/precompile/Protocol.js'
 import * as z from '../zod.js'
 import cli from './cli.js'
 
@@ -440,7 +442,7 @@ describe('basic charge (examples/basic)', () => {
     const server = Mppx_server.create({
       methods: [tempo.charge({ getClient: () => client })],
       realm: 'cli-test-basic',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const httpServer = await Http.createServer(async (req, res) => {
@@ -482,7 +484,7 @@ describe('basic charge (examples/basic)', () => {
     const server = Mppx_server.create({
       methods: [unsupportedMethod, tempoMethod],
       realm: 'cli-test-multi-offer',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const httpServer = await Http.createServer(async (req, res) => {
@@ -561,7 +563,7 @@ describe('basic charge (examples/basic)', () => {
     const server = Mppx_server.create({
       methods: [betaMethod, alphaMethod],
       realm: 'cli-test-config-offers',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const configDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mppx-cli-config-'))
@@ -665,7 +667,7 @@ export default defineConfig({
       const server = Mppx_server.create({
         methods: [tempo.charge({ getClient: () => client })],
         realm: 'localhost',
-        secretKey: 'cli-test-secret',
+        secretKey: 'cli-test-secret-cli-test-secret-32',
       })
       let authorization: string | undefined
 
@@ -719,7 +721,7 @@ export default defineConfig({
           }),
         ],
         realm: 'localhost',
-        secretKey: 'cli-test-secret',
+        secretKey: 'cli-test-secret-cli-test-secret-32',
       })
       let authorization: string | undefined
 
@@ -763,7 +765,7 @@ export default defineConfig({
     const server = Mppx_server.create({
       methods: [tempo.charge({ getClient: () => client })],
       realm: 'cli-test-no-account',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const httpServer = await Http.createServer(async (req, res) => {
@@ -798,7 +800,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
     await fundAccount({ address: testAccount.address, token: Addresses.pathUsd })
     await fundAccount({ address: testAccount.address, token: asset })
 
-    const escrow = await deployEscrow()
+    const escrow = tip20ChannelEscrow
     const store = Store.memory()
     const server = Mppx_server.create({
       methods: [
@@ -814,7 +816,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
         }),
       ],
       realm: 'cli-test-multifetch',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const httpServer = await Http.createServer(async (req, res) => {
@@ -840,11 +842,11 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
     }
   })
 
-  test('prefers CLI deposit over server suggestedDeposit', { timeout: 120_000 }, async () => {
+  test('uses server suggestedDeposit within CLI max deposit', { timeout: 120_000 }, async () => {
     await fundAccount({ address: testAccount.address, token: Addresses.pathUsd })
     await fundAccount({ address: testAccount.address, token: asset })
 
-    const escrow = await deployEscrow()
+    const escrow = tip20ChannelEscrow
     let openCredential: SessionCredentialPayload | undefined
 
     const httpServer = await Http.createServer(async (req, res) => {
@@ -867,6 +869,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
                 methodDetails: {
                   chainId: chain.id,
                   escrowContract: escrow,
+                  sessionProtocol: Constants.SessionProtocols.v2,
                 },
               },
             }),
@@ -897,27 +900,18 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
 
       const transaction = Transaction.deserialize(openCredential.transaction)
       if (!('calls' in transaction)) throw new Error('unexpected transaction type')
-      const [approveCall, openCall] = transaction.calls as readonly [
-        { to?: Address; data?: `0x${string}` },
-        { to?: Address; data?: `0x${string}` },
-      ]
-      const approve = decodeFunctionData({ abi: erc20Abi, data: approveCall.data ?? '0x' })
+      const [openCall] = transaction.calls as readonly [{ to?: Address; data?: `0x${string}` }]
       const open = decodeFunctionData({ abi: escrowAbi, data: openCall.data ?? '0x' })
-      const approveArgs = approve.args as readonly [Address, bigint]
-      const openArgs = open.args as readonly [Address, Address, bigint, string, Address]
-
-      expect(approveCall.to).toBe(asset)
-      expect(approve.functionName).toBe('approve')
-      expect(approveArgs[0].toLowerCase()).toBe(escrow.toLowerCase())
-      expect(approveArgs[1]).toBe(10_000_000n)
+      const openArgs = open.args as readonly [Address, Address, Address, bigint, string, Address]
 
       expect(openCall.to?.toLowerCase()).toBe(escrow.toLowerCase())
       expect(open.functionName).toBe('open')
       expect(openArgs[0].toLowerCase()).toBe(accounts[0].address.toLowerCase())
-      expect(openArgs[1].toLowerCase()).toBe(asset.toLowerCase())
-      expect(openArgs[2]).toBe(10_000_000n)
-      expect(openArgs[3]).toEqual(expect.any(String))
-      expect(openArgs[4].toLowerCase()).toBe(testAccount.address.toLowerCase())
+      expect(openArgs[1]).toBe('0x0000000000000000000000000000000000000000')
+      expect(openArgs[2].toLowerCase()).toBe(asset.toLowerCase())
+      expect(openArgs[3]).toBe(7_000_000n)
+      expect(openArgs[4]).toEqual(expect.any(String))
+      expect(openArgs[5].toLowerCase()).toBe(testAccount.address.toLowerCase())
     } finally {
       httpServer.close()
     }
@@ -927,7 +921,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
     await fundAccount({ address: testAccount.address, token: Addresses.pathUsd })
     await fundAccount({ address: testAccount.address, token: asset })
 
-    const escrow = await deployEscrow()
+    const escrow = tip20ChannelEscrow
     const store = Store.memory()
     const tickAmount = '0.001'
     const server = Mppx_server.create({
@@ -944,7 +938,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
         }),
       ],
       realm: 'cli-test-double-charge',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     // Track voucher cumulative amounts from credential payloads
@@ -991,7 +985,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
     await fundAccount({ address: testAccount.address, token: Addresses.pathUsd })
     await fundAccount({ address: testAccount.address, token: asset })
 
-    const escrow = await deployEscrow()
+    const escrow = tip20ChannelEscrow
     const store = Store.memory()
     const server = Mppx_server.create({
       methods: [
@@ -1007,7 +1001,7 @@ describe('session multi-fetch (examples/session/multi-fetch)', () => {
         }),
       ],
       realm: 'cli-test-close-action',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     // Track the credential payload action from the close request
@@ -1069,7 +1063,7 @@ describe('session sse (examples/session/sse)', () => {
     await fundAccount({ address: testAccount.address, token: Addresses.pathUsd })
     await fundAccount({ address: testAccount.address, token: asset })
 
-    const escrow = await deployEscrow()
+    const escrow = tip20ChannelEscrow
     const store = Store.memory()
     const server = Mppx_server.create({
       methods: [
@@ -1085,7 +1079,7 @@ describe('session sse (examples/session/sse)', () => {
         }),
       ],
       realm: 'cli-test-sse',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const httpServer = await Http.createServer(async (req, res) => {
@@ -1152,7 +1146,7 @@ describe('stripe charge', () => {
         }),
       ],
       realm: 'cli-test-stripe',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const sptServer = await Http.createServer(async (_req, res) => {
@@ -1192,7 +1186,7 @@ describe('stripe charge', () => {
         }),
       ],
       realm: 'cli-test-stripe-nokey',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const appServer = await Http.createServer(async (req, res) => {
@@ -1225,7 +1219,7 @@ describe('stripe charge', () => {
         }),
       ],
       realm: 'cli-test-stripe-live',
-      secretKey: 'cli-test-secret',
+      secretKey: 'cli-test-secret-cli-test-secret-32',
     })
 
     const appServer = await Http.createServer(async (req, res) => {
@@ -1251,9 +1245,10 @@ describe('stripe charge', () => {
 
 // ---------------------------------------------------------------------------
 // account [action]
-// TODO: investigate account tests timing out in CI (secret-tool/gnome-keyring hangs)
+// Keychain tests are opt-in because macOS/Linux keychain commands can block on
+// developer machines without an unlocked keychain daemon.
 // ---------------------------------------------------------------------------
-describe.skipIf(!!process.env.CI)('account', () => {
+describe.runIf(process.env.MPPX_TEST_KEYCHAIN === 'true')('account', () => {
   const binPath = path.resolve(import.meta.dirname, '../bin.ts')
   const cwd = path.resolve(import.meta.dirname, '../..')
   const accountEnv = {
@@ -1675,7 +1670,7 @@ export default defineConfig({
       const server = Mppx_server.create({
         methods: [tempo.charge({ getClient: () => client })],
         realm: 'cli-sign-zero',
-        secretKey: 'cli-test-secret',
+        secretKey: 'cli-test-secret-cli-test-secret-32',
       })
 
       const httpServer = await Http.createServer(async (req, res) => {
@@ -1741,7 +1736,7 @@ export default defineConfig({
           }),
         ],
         realm: 'cli-sign-zero-testnet',
-        secretKey: 'cli-test-secret',
+        secretKey: 'cli-test-secret-cli-test-secret-32',
       })
 
       const httpServer = await Http.createServer(async (req, res) => {

package/src/cli/cli.ts

@@ -11,6 +11,7 @@ import { tempo as tempoMainnet } from 'viem/tempo/chains'
 import * as Challenge from '../Challenge.js'
 import { normalizeHeaders } from '../client/internal/Fetch.js'
 import * as Mppx from '../client/Mppx.js'
+import * as Constants from '../Constants.js'
 import { validate as validateDiscovery } from '../discovery/Validate.js'
 import { createDefaultStore, createKeychain, resolveAccountName } from './account.js'
 import { loadConfig, resolveAcceptPayment, selectChallenge } from './internal.js'
@@ -32,6 +33,7 @@ import {
   printResponseHeaders,
   prompt,
   resolveChain,
+  resolveFundingNetwork,
   resolveRpcUrl,
 } from './utils.js'
 
@@ -373,7 +375,7 @@ const cli = Cli.create('mppx', {
       const { challenge, plugin, method: configMethod } = selected
       const selectedChallengeResponse = new Response(null, {
         status: 402,
-        headers: { 'WWW-Authenticate': Challenge.serialize(challenge) },
+        headers: { [Constants.Headers.wwwAuthenticate]: Challenge.serialize(challenge) },
       })
 
       let tokenSymbol = (challenge.request.currency as string | undefined) ?? ''
@@ -547,7 +549,7 @@ const cli = Cli.create('mppx', {
 
       if (!handled) {
         // Default: print receipt + body
-        const receiptHeader = credentialResponse.headers.get('Payment-Receipt')
+        const receiptHeader = credentialResponse.headers.get(Constants.Headers.paymentReceipt)
         if (receiptHeader && c.options.verbose >= 1) {
           try {
             const receiptJson = JSON.parse(Base64.toString(receiptHeader)) as Record<
@@ -704,8 +706,9 @@ const account = Cli.create('account', {
       const addrDisplay = explorerUrl
         ? link(`${explorerUrl}/address/${acct.address}`, acct.address)
         : acct.address
-      const rpcUrl = resolveRpcUrl(c.options.rpcUrl, { network: c.options.network })
-      resolveChain({ network: c.options.network, rpcUrl })
+      const fundingNetwork = resolveFundingNetwork(c.options)
+      const rpcUrl = resolveRpcUrl(c.options.rpcUrl, { network: fundingNetwork })
+      resolveChain({ network: fundingNetwork, rpcUrl })
         .then((chain) => createClient({ chain, transport: http(rpcUrl) }))
         .then((client) =>
           import('viem/tempo').then(({ Actions }) =>
@@ -715,6 +718,11 @@ const account = Cli.create('account', {
       return outputResult(c, { address: acct.address, name: resolvedName }, () => {
         console.log(`Account "${resolvedName}" saved to keychain.`)
         console.log(pc.dim(`Address ${addrDisplay}`))
+        console.log(
+          pc.dim(
+            `Fund testnet tokens: mppx account fund --account ${resolvedName} --network testnet`,
+          ),
+        )
       })
     },
   })
@@ -840,8 +848,9 @@ const account = Cli.create('account', {
           return c.error({ code: 'ACCOUNT_NOT_FOUND', message: 'No account found.', exitCode: 69 })
       }
       const acct = privateKeyToAccount(key as `0x${string}`)
-      const rpcUrl = resolveRpcUrl(c.options.rpcUrl, { network: c.options.network })
-      const chain = await resolveChain({ network: c.options.network, rpcUrl })
+      const fundingNetwork = resolveFundingNetwork(c.options)
+      const rpcUrl = resolveRpcUrl(c.options.rpcUrl, { network: fundingNetwork })
+      const chain = await resolveChain({ network: fundingNetwork, rpcUrl })
       const client = createClient({ chain, transport: http(rpcUrl) })
       if (!structured) console.log(`Funding "${accountName}" on ${chainName(chain)}`)
       try {
@@ -864,14 +873,18 @@ const account = Cli.create('account', {
           },
         )
       } catch (err) {
+        const message = err instanceof Error ? err.message : String(err)
         if (structured)
           return c.error({
             code: 'FUNDING_FAILED',
-            message: err instanceof Error ? err.message : String(err),
+            message,
             exitCode: 1,
           })
-        console.error('Funding failed:', err instanceof Error ? err.message : err)
-        return undefined as never
+        return c.error({
+          code: 'FUNDING_FAILED',
+          message: `Funding failed: ${message}`,
+          exitCode: 1,
+        })
       }
     },
   })
@@ -1145,7 +1158,7 @@ const sign = Cli.create('sign', {
     const wwwAuth = Challenge.serialize(challenge)
     const fakeResponse = new Response(null, {
       status: 402,
-      headers: { 'WWW-Authenticate': wwwAuth },
+      headers: { [Constants.Headers.wwwAuthenticate]: wwwAuth },
     })
 
     let credential: string

package/src/cli/mcp.test.ts

@@ -48,6 +48,14 @@ function createLineClient(child: ChildProcessWithoutNullStreams) {
   child.stderr.setEncoding('utf8')
   child.stdout.on('data', (chunk) => {
     buffer += chunk
+    drainLines()
+    drainJsonBuffer()
+  })
+  child.stderr.on('data', (chunk) => {
+    stderr += chunk
+  })
+
+  function drainLines() {
     for (;;) {
       const index = buffer.indexOf('\n')
       if (index === -1) break
@@ -60,10 +68,16 @@ function createLineClient(child: ChildProcessWithoutNullStreams) {
         nonJsonLines.push(line)
       }
     }
-  })
-  child.stderr.on('data', (chunk) => {
-    stderr += chunk
-  })
+  }
+
+  function drainJsonBuffer() {
+    const text = buffer.trim()
+    if (!text) return
+    try {
+      messages.push(JSON.parse(text))
+      buffer = ''
+    } catch {}
+  }
 
   return {
     get nonJsonLines() {
@@ -88,9 +102,9 @@ function createLineClient(child: ChildProcessWithoutNullStreams) {
         await new Promise((resolve) => setTimeout(resolve, 20))
       }
       throw new Error(
-        `Timed out waiting for MCP response ${id}. stderr=${stderr} nonJson=${JSON.stringify(
-          nonJsonLines,
-        )}`,
+        `Timed out waiting for MCP response ${id}. stderr=${stderr} buffer=${JSON.stringify(
+          buffer,
+        )} nonJson=${JSON.stringify(nonJsonLines)}`,
       )
     },
   }