mppx 0.6.31 → 0.7.0

package/src/tempo/{client → legacy/client}/SessionManager.ts

@@ -1,16 +1,18 @@
 import type { Hex } from 'ox'
 import { parseUnits, type Account as viem_Account, type Address } from 'viem'
 
-import * as Challenge from '../../Challenge.js'
-import * as Fetch from '../../client/internal/Fetch.js'
-import * as PaymentCredential from '../../Credential.js'
-import * as AcceptPayment from '../../internal/AcceptPayment.js'
-import type * as Account from '../../viem/Account.js'
-import type * as Client from '../../viem/Client.js'
-import { deserializeSessionReceipt } from '../session/Receipt.js'
-import { parseEvent } from '../session/Sse.js'
-import type { SessionCredentialPayload, SessionReceipt } from '../session/Types.js'
-import * as Ws from '../session/Ws.js'
+import * as Challenge from '../../../Challenge.js'
+import * as Fetch from '../../../client/internal/Fetch.js'
+import * as Constants from '../../../Constants.js'
+import * as PaymentCredential from '../../../Credential.js'
+import * as AcceptPayment from '../../../internal/AcceptPayment.js'
+import type * as Account from '../../../viem/Account.js'
+import type * as Client from '../../../viem/Client.js'
+import { deserializeSessionReceipt } from '../../session/precompile/Protocol.js'
+import type { SessionReceipt } from '../../session/precompile/Protocol.js'
+import { parseEvent } from '../../session/precompile/Protocol.js'
+import * as Ws from '../../session/precompile/Protocol.js'
+import type { LegacySessionCredentialPayload } from '../session/Types.js'
 import type { ChannelEntry } from './ChannelOps.js'
 import { session as sessionPlugin } from './Session.js'
 
@@ -46,13 +48,20 @@ const WebSocketReadyState = {
 // Keep protocol/policy close codes on the server side and use an app-defined code here.
 const ClientWebSocketProtocolErrorCloseCode = 3008
 
+/** Auto-driving legacy client manager for HTTP, SSE, and WebSocket sessions. */
 export type SessionManager = {
+  /** Active legacy channel ID, when opened or recovered. */
   readonly channelId: Hex.Hex | undefined
+  /** Local cumulative voucher authorization in raw token units. */
   readonly cumulative: bigint
+  /** Whether the manager currently has an open local channel. */
   readonly opened: boolean
 
+  /** Opens a legacy contract-backed channel before the first paid request. */
   open(options?: { deposit?: bigint }): Promise<void>
+  /** Performs the HTTP 402 challenge/retry flow and returns receipt metadata. */
   fetch(input: RequestInfo | URL, init?: SessionRequestInit): Promise<PaymentResponse>
+  /** Opens a paid SSE stream and responds to voucher requests. */
   sse(
     input: RequestInfo | URL,
     init?: SessionRequestInit & {
@@ -60,6 +69,7 @@ export type SessionManager = {
       signal?: AbortSignal | undefined
     },
   ): Promise<AsyncIterable<string>>
+  /** Opens a paid WebSocket session and manages in-band payment frames. */
   ws(
     input: string | URL,
     init?: {
@@ -69,13 +79,19 @@ export type SessionManager = {
       signal?: AbortSignal | undefined
     },
   ): Promise<WebSocket>
+  /** Cooperatively closes the active legacy channel. */
   close(): Promise<SessionReceipt | undefined>
 }
 
+/** HTTP response enriched with latest legacy session metadata. */
 export type PaymentResponse = Response & {
+  /** Parsed payment receipt, when the response included one. */
   receipt: SessionReceipt | null
+  /** Last session challenge observed by the manager. */
   challenge: Challenge.Challenge | null
+  /** Active channel ID, when available. */
   channelId: Hex.Hex | null
+  /** Local cumulative voucher authorization in raw token units. */
   cumulative: bigint
 }
 
@@ -250,7 +266,7 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
   }
 
   function toPaymentResponse(response: Response): PaymentResponse {
-    const receiptHeader = response.headers.get('Payment-Receipt')
+    const receiptHeader = response.headers.get(Constants.Headers.paymentReceipt)
     const receipt = receiptHeader ? deserializeSessionReceipt(receiptHeader) : null
     updateSpentFromReceipt(receipt)
     return Object.assign(response, {
@@ -425,13 +441,13 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
       if (!lastUrl) throw new Error('No URL available — call fetch() or sse() before open().')
       const response = await fetchFn(lastUrl, {
         method: 'POST',
-        headers: { Authorization: credential },
+        headers: { [Constants.Headers.authorization]: credential },
       })
       if (!response.ok) {
         const body = await response.text().catch(() => '')
-        const wwwAuth = response.headers.get('WWW-Authenticate') ?? ''
+        const wwwAuth = response.headers.get(Constants.Headers.wwwAuthenticate) ?? ''
         throw new Error(
-          `Open request failed with status ${response.status}${body ? `: ${body}` : ''}${wwwAuth ? ` [WWW-Authenticate: ${wwwAuth}]` : ''}`,
+          `Open request failed with status ${response.status}${body ? `: ${body}` : ''}${wwwAuth ? ` [${Constants.Headers.wwwAuthenticate}: ${wwwAuth}]` : ''}`,
         )
       }
     },
@@ -504,7 +520,10 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
                   })
                   const voucherResponse = await fetchFn(input, {
                     method: 'POST',
-                    headers: { Authorization: credential },
+                    headers: {
+                      Accept: 'text/event-stream',
+                      [Constants.Headers.authorization]: credential,
+                    },
                   })
                   if (!voucherResponse.ok) {
                     throw new Error(`Voucher POST failed with status ${voucherResponse.status}`)
@@ -575,7 +594,8 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
       activeSocketChallenge = challenge
       wsDeliveredChunks = 0n
       wsTickCost = BigInt(challenge.request.amount as string)
-      const openCredential = PaymentCredential.deserialize<SessionCredentialPayload>(credential)
+      const openCredential =
+        PaymentCredential.deserialize<LegacySessionCredentialPayload>(credential)
       activeSocketChannelId = openCredential.payload.channelId
       const rawSocket = new WebSocketImpl(wsUrl, protocols)
       activeSocket = rawSocket
@@ -819,7 +839,7 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
 
       const response = await fetchFn(lastUrl, {
         method: 'POST',
-        headers: { Authorization: credential },
+        headers: { [Constants.Headers.authorization]: credential },
       })
       if (!response.ok) {
         const body = await response.text().catch(() => '')
@@ -835,12 +855,12 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
             return body
           }
         })()
-        const wwwAuth = response.headers.get('WWW-Authenticate') ?? ''
+        const wwwAuth = response.headers.get(Constants.Headers.wwwAuthenticate) ?? ''
         throw new Error(
-          `Close request failed with status ${response.status}${detail ? `: ${detail}` : ''}${wwwAuth ? ` [WWW-Authenticate: ${wwwAuth}]` : ''}`,
+          `Close request failed with status ${response.status}${detail ? `: ${detail}` : ''}${wwwAuth ? ` [${Constants.Headers.wwwAuthenticate}: ${wwwAuth}]` : ''}`,
         )
       }
-      const receiptHeader = response.headers.get('Payment-Receipt')
+      const receiptHeader = response.headers.get(Constants.Headers.paymentReceipt)
       const receipt = receiptHeader ? deserializeSessionReceipt(receiptHeader) : undefined
 
       return receipt
@@ -850,6 +870,7 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
   return self
 }
 
+/** Type helpers for the legacy auto-driving session manager. */
 export declare namespace sessionManager {
   type Parameters = Account.getResolver.Parameters &
     Client.getResolver.Parameters & {

package/src/tempo/legacy/client/index.ts

@@ -0,0 +1,6 @@
+/** Legacy contract-backed session client method. */
+export { session } from './Session.js'
+/** Legacy contract-backed session manager. */
+export { sessionManager } from './SessionManager.js'
+/** Legacy client session manager types. */
+export type { PaymentResponse, SessionManager } from './SessionManager.js'

package/src/tempo/legacy/index.ts

@@ -0,0 +1,6 @@
+/** Legacy contract-backed session client surface. */
+export * as Client from './client/index.js'
+/** Legacy contract-backed session server surface. */
+export * as Server from './server/index.js'
+/** Legacy contract-backed session channel primitives. */
+export * as Session from './session/index.js'

package/src/tempo/{server → legacy/server}/Session.test.ts

@@ -21,10 +21,8 @@ import { waitForTransactionReceipt } from 'viem/actions'
 import { Account as TempoAccount, Actions, Addresses } from 'viem/tempo'
 import { beforeAll, beforeEach, describe, expect, expectTypeOf, test } from 'vp/test'
 import { WebSocketServer } from 'ws'
-import { nodeEnv } from '~test/config.js'
+import { tempoNetwork } from '~test/config.js'
 import * as Http from '~test/Http.js'
-
-const isLocalnet = nodeEnv === 'localnet'
 import {
   closeChannelOnChain,
   deployEscrow,
@@ -32,7 +30,7 @@ import {
   signOpenChannel,
   signTopUpChannel,
   topUpChannel,
-} from '~test/tempo/session.js'
+} from '~test/tempo/legacy/session.js'
 import { accounts, asset, chain, client, fundAccount, http } from '~test/tempo/viem.js'
 
 import {
@@ -40,21 +38,22 @@ import {
   ChannelNotFoundError,
   InsufficientBalanceError,
   InvalidSignatureError,
-} from '../../Errors.js'
-import * as NodeRequest from '../../server/Request.js'
-import * as Store from '../../Store.js'
-import { sessionManager } from '../client/SessionManager.js'
+} from '../../../Errors.js'
+import * as NodeRequest from '../../../server/Request.js'
+import * as Store from '../../../Store.js'
 import {
   chainId as chainIdDefaults,
   escrowContract as escrowContractDefaults,
-} from '../internal/defaults.js'
-import type * as Methods from '../Methods.js'
+} from '../../internal/defaults.js'
+import type * as Methods from '../../Methods.js'
+import { deserializeSessionReceipt } from '../../session/precompile/Protocol.js'
+import { serializeSessionReceipt } from '../../session/precompile/Protocol.js'
+import type { SessionReceipt } from '../../session/precompile/Protocol.js'
+import * as TempoWs from '../../session/server/Ws.js'
+import { sessionManager } from '../client/SessionManager.js'
 import * as ChannelStore from '../session/ChannelStore.js'
-import { deserializeSessionReceipt } from '../session/Receipt.js'
-import { serializeSessionReceipt } from '../session/Receipt.js'
-import type { SessionCredentialPayload, SessionReceipt } from '../session/Types.js'
+import type { LegacySessionCredentialPayload } from '../session/Types.js'
 import { signVoucher } from '../session/Voucher.js'
-import * as TempoWs from '../session/Ws.js'
 import { charge, session, settle } from './Session.js'
 
 const payer = accounts[2]
@@ -62,6 +61,7 @@ const delegatedSigner = accounts[4]
 const recipientAccount = accounts[0]
 const recipient = accounts[0].address
 const currency = asset
+const isLocalnet = tempoNetwork === 'localnet'
 
 let escrowContract: Address
 let saltCounter = 0
@@ -112,7 +112,7 @@ describe.runIf(isLocalnet)('session', () => {
   function createHandler(overrides: Partial<session.Parameters> = {}) {
     return Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: rawStore,
           getClient: () => client,
           account: recipientAccount,
@@ -2285,7 +2285,7 @@ describe.runIf(isLocalnet)('session', () => {
           })
         }
 
-        const credential = Credential.deserialize<SessionCredentialPayload>(authorization)
+        const credential = Credential.deserialize<LegacySessionCredentialPayload>(authorization)
         if (credential.payload.action === 'open') {
           return new Response('ok', {
             status: 200,
@@ -4201,7 +4201,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4243,7 +4243,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4286,7 +4286,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4336,7 +4336,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4381,7 +4381,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('behavior: withReceipt accepts async generator and returns Response', async () => {
       const handler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             account: accounts[0],
             currency: asset,
             escrowContract,
@@ -4401,7 +4401,7 @@ describe.runIf(isLocalnet)('session', () => {
 
       if (result.status === 200) {
         // async generator function should be accepted and return Response
-        const response = result.withReceipt(async function* (_stream) {
+        const response = result.withReceipt(async function* (_stream: unknown) {
           yield 'token'
         })
         expectTypeOf(response).toEqualTypeOf<Response>()
@@ -4426,7 +4426,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('behavior: non-SSE session withReceipt only accepts Response', async () => {
       const handler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             account: accounts[0],
             currency: asset,
             escrowContract,
@@ -4453,7 +4453,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4488,7 +4488,7 @@ describe.runIf(isLocalnet)('session', () => {
         }
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
-          return result.withReceipt(async function* (stream) {
+          return result.withReceipt(async function* (stream: { charge(): Promise<void> }) {
             await stream.charge()
             yield 'chunk-1'
             await stream.charge()
@@ -4531,7 +4531,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4616,7 +4616,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const route = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4699,7 +4699,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4734,7 +4734,7 @@ describe.runIf(isLocalnet)('session', () => {
         }
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
-          return result.withReceipt(async function* (stream) {
+          return result.withReceipt(async function* (stream: { charge(): Promise<void> }) {
             await stream.charge()
             yield 'chunk-1'
             await stream.charge()
@@ -4773,7 +4773,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4793,7 +4793,7 @@ describe.runIf(isLocalnet)('session', () => {
         if (result.status === 402) return result.challenge
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
-          return result.withReceipt(async function* (stream) {
+          return result.withReceipt(async function* (stream: { charge(): Promise<void> }) {
             await stream.charge()
             yield 'chunk-1'
             await stream.charge()
@@ -4845,7 +4845,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4958,7 +4958,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5071,7 +5071,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5181,7 +5181,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('rejects websocket receipts bound to a different channel', async () => {
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: Store.memory(),
             getClient: () => client,
             account: recipientAccount,
@@ -5268,7 +5268,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5361,7 +5361,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('rejects close-ready receipts beyond local voucher state', async () => {
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: Store.memory(),
             getClient: () => client,
             account: recipientAccount,
@@ -5470,7 +5470,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5572,7 +5572,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('rejects tx-bearing open receipts replayed during websocket close', async () => {
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: Store.memory(),
             getClient: () => client,
             account: recipientAccount,
@@ -5691,7 +5691,7 @@ describe('monotonicity and TOCTOU (unit tests)', () => {
 
   function seedChannel(
     store: ChannelStore.ChannelStore,
-    overrides: Partial<ChannelStore.State> = {},
+    overrides: Partial<ChannelStore.BaseState & ChannelStore.LegacyContractBackendState> = {},
   ) {
     return store.updateChannel(testChannelId, () => ({
       channelId: testChannelId,
@@ -6031,7 +6031,7 @@ describe('session default currency resolution', () => {
   test('challenge contains USDC currency (mainnet default)', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockMainnetClient,
           account: mockAccount,
@@ -6058,7 +6058,7 @@ describe('session default currency resolution', () => {
   test('challenge contains pathUSD currency when testnet: true', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockTestnetClient,
           account: mockAccount,
@@ -6085,7 +6085,7 @@ describe('session default currency resolution', () => {
   test('challenge contains pathUSD currency (unknown chain)', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockTestnetClient,
           account: mockAccount,
@@ -6111,7 +6111,7 @@ describe('session default currency resolution', () => {
   test('explicit currency in challenge overrides testnet default', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockClient,
           account: mockAccount,
@@ -6140,7 +6140,7 @@ describe('session default currency resolution', () => {
   test('handler.session throws for zero-amount routes', () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockClient,
           account: mockAccount,

package/src/tempo/{server → legacy/server}/Session.ts

@@ -20,6 +20,7 @@ import {
 } from 'viem'
 import { tempo as tempo_chain } from 'viem/tempo/chains'
 
+import * as Constants from '../../../Constants.js'
 import {
   AmountExceedsDepositError,
   BadRequestError,
@@ -29,18 +30,25 @@ import {
   InsufficientBalanceError,
   InvalidSignatureError,
   VerificationFailedError,
-} from '../../Errors.js'
-import type { Challenge, Credential } from '../../index.js'
-import type { LooseOmit, NoExtraKeys } from '../../internal/types.js'
-import * as Method from '../../Method.js'
-import * as Store from '../../Store.js'
-import * as Client from '../../viem/Client.js'
-import type * as z from '../../zod.js'
-import * as Account from '../internal/account.js'
-import * as defaults from '../internal/defaults.js'
-import * as FeePayer from '../internal/fee-payer.js'
-import type * as types from '../internal/types.js'
-import * as Methods from '../Methods.js'
+} from '../../../Errors.js'
+import type { Challenge, Credential } from '../../../index.js'
+import type { LooseOmit, NoExtraKeys } from '../../../internal/types.js'
+import * as Method from '../../../Method.js'
+import * as Store from '../../../Store.js'
+import * as Client from '../../../viem/Client.js'
+import type * as z from '../../../zod.js'
+import * as Account from '../../internal/account.js'
+import * as defaults from '../../internal/defaults.js'
+import * as FeePayer from '../../internal/fee-payer.js'
+import type * as types from '../../internal/types.js'
+import * as Methods from '../../Methods.js'
+import {
+  captureRequestBodyProbe,
+  isSessionContentRequest,
+} from '../../server/internal/request-body.js'
+import * as Transport from '../../server/internal/transport.js'
+import { createSessionReceipt } from '../../session/precompile/Protocol.js'
+import type { SessionReceipt } from '../../session/precompile/Protocol.js'
 import {
   broadcastOpenTransaction,
   broadcastTopUpTransaction,
@@ -50,11 +58,8 @@ import {
   settleOnChain,
 } from '../session/Chain.js'
 import * as ChannelStore from '../session/ChannelStore.js'
-import { createSessionReceipt } from '../session/Receipt.js'
-import type { SessionCredentialPayload, SessionReceipt, SignedVoucher } from '../session/Types.js'
+import type { LegacySessionCredentialPayload, LegacySignedVoucher } from '../session/Types.js'
 import { parseVoucherFromPayload, verifyVoucher } from '../session/Voucher.js'
-import { captureRequestBodyProbe, isSessionContentRequest } from './internal/request-body.js'
-import * as Transport from './internal/transport.js'
 
 /** Challenge methodDetails shape for session methods. */
 type SessionMethodDetails = {
@@ -63,6 +68,7 @@ type SessionMethodDetails = {
   channelId?: Hex | undefined
   minVoucherDelta?: string | undefined
   feePayer?: boolean | undefined
+  sessionProtocol?: Constants.SessionProtocol | undefined
 }
 
 /**
@@ -183,11 +189,13 @@ export function session<const parameters extends session.Parameters>(
         chainId,
         escrowContract: resolvedEscrow,
         feePayer: resolvedFeePayer,
+        sessionProtocol: Constants.SessionProtocols.v1,
       }
     },
 
     async verify({ credential, envelope, request }) {
-      const { challenge, payload } = credential as Credential.Credential<SessionCredentialPayload>
+      const { challenge, payload } =
+        credential as Credential.Credential<LegacySessionCredentialPayload>
 
       const resolvedRequest = (() => {
         const parsed = Methods.session.schema.request.safeParse(request)
@@ -315,7 +323,7 @@ export function session<const parameters extends session.Parameters>(
     // during verification. Non-billable requests are treated as management
     // updates; billable requests fall through to the application handler.
     respond({ credential, envelope, input }) {
-      const { payload } = credential as Credential.Credential<SessionCredentialPayload>
+      const { payload } = credential as Credential.Credential<LegacySessionCredentialPayload>
       const request = envelope?.capturedRequest ?? captureRequestBodyProbe(input)
 
       if (payload.action === 'close') return new Response(null, { status: 204 })
@@ -333,6 +341,7 @@ function isSseNegotiationRequest(input: Pick<Method.CapturedRequest, 'headers'>)
   return input.headers.get('Accept')?.includes('text/event-stream') ?? false
 }
 
+/** Type helpers for the legacy contract-backed session server method. */
 export declare namespace session {
   type Defaults = LooseOmit<
     Method.RequestDefaults<typeof Methods.session>,
@@ -537,7 +546,7 @@ async function verifyAndAcceptVoucher(parameters: {
   challenge: Challenge.Challenge
   channel: ChannelStore.State
   channelId: Hex
-  voucher: SignedVoucher
+  voucher: LegacySignedVoucher
   onChain: OnChainChannel
 }): Promise<SessionReceipt> {
   const { store, minVoucherDelta, challenge, channel, channelId, voucher, onChain } = parameters
@@ -635,7 +644,7 @@ async function handleOpen(
   store: ChannelStore.ChannelStore,
   client: viem_Client,
   challenge: Challenge.Challenge,
-  payload: SessionCredentialPayload & { action: 'open' },
+  payload: LegacySessionCredentialPayload & { action: 'open' },
   methodDetails: SessionMethodDetails,
   feePayer: viem_Account | undefined,
   isSponsored: boolean,
@@ -774,7 +783,7 @@ async function handleTopUp(
   store: ChannelStore.ChannelStore,
   client: viem_Client,
   challenge: Challenge.Challenge,
-  payload: SessionCredentialPayload & { action: 'topUp' },
+  payload: LegacySessionCredentialPayload & { action: 'topUp' },
   methodDetails: SessionMethodDetails,
   feePayer: viem_Account | undefined,
   isSponsored: boolean,
@@ -824,7 +833,7 @@ async function handleVoucher(
   client: viem_Client,
   minVoucherDelta: bigint,
   challenge: Challenge.Challenge,
-  payload: SessionCredentialPayload & { action: 'voucher' },
+  payload: LegacySessionCredentialPayload & { action: 'voucher' },
   methodDetails: SessionMethodDetails,
   channelStateTtl: number,
   lastOnChainVerified: Map<Hex, number>,
@@ -896,7 +905,7 @@ async function handleClose(
   store: ChannelStore.ChannelStore,
   client: viem_Client,
   challenge: Challenge.Challenge,
-  payload: SessionCredentialPayload & { action: 'close' },
+  payload: LegacySessionCredentialPayload & { action: 'close' },
   methodDetails: SessionMethodDetails,
   account?: viem_Account,
   feePayer?: viem_Account,

package/src/tempo/legacy/server/index.ts

@@ -0,0 +1,4 @@
+/** Legacy contract-backed session server method. */
+export { session } from './Session.js'
+/** Legacy contract-backed one-shot settle helper. */
+export { settle } from './Session.js'