@antseed/node 0.2.93 → 0.2.95

package/dist/payments/buyer-free-usage-manager.js

@@ -0,0 +1,280 @@
+import { randomBytes } from 'node:crypto';
+import { peerIdToAddress } from '../types/peer.js';
+import { debugLog, debugWarn } from '../utils/debug.js';
+import { computeFreeUsageChannelId, computeFreeUsageMetadataHash, encodeFreeUsageMetadata, makeFreeUsageDomain, signFreeUsageAuth, signFreeUsageOpen, } from './evm/signatures.js';
+import { CHANNEL_KIND, CHANNEL_ROLE, CHANNEL_STATUS } from './channel-store.js';
+import { advanceUsageMetadata, RequestServiceTracker } from './channel-usage-accounting.js';
+const DEFAULT_OPEN_ACK_TIMEOUT_MS = 30_000;
+export class BuyerFreeUsageManager {
+    _identity;
+    _config;
+    _sellerAddressResolver;
+    _channelStore;
+    _domain;
+    _sessions = new Map();
+    _sellerLocks = new Map();
+    _openAckWaiters = new Map();
+    _requestService = new RequestServiceTracker();
+    constructor(identity, config, sellerAddressResolver, channelStore) {
+        this._identity = identity;
+        this._config = config;
+        this._sellerAddressResolver = sellerAddressResolver;
+        this._channelStore = channelStore;
+        this._domain = makeFreeUsageDomain(config.chainId, config.freeUsageContractAddress);
+        this._hydrateFromStore();
+    }
+    _hydrateFromStore() {
+        if (!this._channelStore)
+            return;
+        const activeChannels = this._channelStore.getActiveChannelsByBuyer(CHANNEL_ROLE.BUYER, this._identity.wallet.address, CHANNEL_KIND.FREE);
+        for (const channel of activeChannels) {
+            if (this._sessions.has(channel.peerId))
+                continue;
+            const metadata = this._channelStore.getChannelMetadata(channel);
+            this._sessions.set(channel.peerId, {
+                channelId: channel.sessionId,
+                // Salt is only needed to create a fresh open signature; hydrated
+                // sessions are already opened and only sign usage auths.
+                salt: '0x' + '00'.repeat(32),
+                deadline: channel.deadline,
+                sellerEvmAddr: channel.sellerEvmAddr,
+                cumulativeInputTokens: metadata.cumulativeInputTokens,
+                cumulativeOutputTokens: metadata.cumulativeOutputTokens,
+                cumulativeRequestCount: metadata.cumulativeRequestCount,
+                latestSequence: BigInt(channel.requestCount),
+                services: metadata.services,
+                openedAck: true,
+                latestMetadata: metadata,
+                openSig: channel.latestBuyerSig,
+            });
+        }
+    }
+    trackRequestService(requestId, service) {
+        this._requestService.track(requestId, service);
+    }
+    async prepareOpen(peer, paymentMux) {
+        const existing = this._sessions.get(peer.peerId);
+        const nowSec = Math.floor(Date.now() / 1000);
+        if (existing && existing.deadline > nowSec + 30)
+            return;
+        const sellerEvmAddr = await this._resolveSellerAddr(peer);
+        const salt = '0x' + randomBytes(32).toString('hex');
+        const channelId = computeFreeUsageChannelId(this._identity.wallet.address, sellerEvmAddr, salt);
+        const deadline = nowSec + this._config.defaultAuthDurationSecs;
+        const openSig = await signFreeUsageOpen(this._identity.wallet, this._domain, {
+            channelId,
+            deadline: BigInt(deadline),
+        });
+        const metadata = {
+            cumulativeInputTokens: 0n,
+            cumulativeOutputTokens: 0n,
+            cumulativeRequestCount: 0n,
+            services: [],
+        };
+        const session = {
+            channelId,
+            salt,
+            deadline,
+            sellerEvmAddr,
+            cumulativeInputTokens: 0n,
+            cumulativeOutputTokens: 0n,
+            cumulativeRequestCount: 0n,
+            latestSequence: 0n,
+            services: [],
+            openedAck: false,
+            latestMetadata: metadata,
+            openSig,
+        };
+        this._sessions.set(peer.peerId, session);
+        try {
+            paymentMux.sendFreeUsageOpen({ channelId, salt, deadline, openSig });
+        }
+        catch (err) {
+            if (existing) {
+                this._sessions.set(peer.peerId, existing);
+            }
+            else {
+                this._sessions.delete(peer.peerId);
+            }
+            throw err;
+        }
+        debugLog(`[BuyerFreeUsage] Open sent to ${peer.peerId.slice(0, 12)}... channel=${channelId.slice(0, 18)}...`);
+    }
+    async waitForOpenAck(sellerPeerId, timeoutMs = this._config.openAckTimeoutMs ?? DEFAULT_OPEN_ACK_TIMEOUT_MS) {
+        const session = this._sessions.get(sellerPeerId);
+        if (!session) {
+            throw new Error(`free usage channel for ${sellerPeerId.slice(0, 12)}... was not prepared`);
+        }
+        if (session.openedAck)
+            return;
+        await new Promise((resolve, reject) => {
+            const waiter = {
+                session,
+                resolve,
+                reject,
+                timer: setTimeout(() => {
+                    this._removeOpenAckWaiter(sellerPeerId, waiter);
+                    if (this._sessions.get(sellerPeerId) === session && !session.openedAck) {
+                        this._sessions.delete(sellerPeerId);
+                        this._channelStore?.updateChannelStatus(session.channelId, CHANNEL_STATUS.TIMEOUT);
+                    }
+                    reject(new Error(`timed out waiting for free usage open ack from ${sellerPeerId.slice(0, 12)}...`));
+                }, timeoutMs),
+            };
+            let waiters = this._openAckWaiters.get(sellerPeerId);
+            if (!waiters) {
+                waiters = new Set();
+                this._openAckWaiters.set(sellerPeerId, waiters);
+            }
+            waiters.add(waiter);
+        });
+    }
+    handleAck(sellerPeerId, payload) {
+        const session = this._sessions.get(sellerPeerId);
+        if (!session || session.channelId !== payload.channelId)
+            return;
+        session.openedAck = true;
+        this._persistSession(sellerPeerId, session, session.openSig, null, null);
+        this._retireOtherActiveSessions(sellerPeerId, session.channelId);
+        this._resolveOpenAckWaiters(sellerPeerId, session);
+        debugLog(`[BuyerFreeUsage] Ack from ${sellerPeerId.slice(0, 12)}... channel=${payload.channelId.slice(0, 18)}...` +
+            `${payload.acceptedSequence ? ` sequence=${payload.acceptedSequence}` : ''}`);
+    }
+    onPeerDisconnect(sellerPeerId) {
+        this._sessions.delete(sellerPeerId);
+        this._sellerLocks.delete(sellerPeerId);
+        this._rejectOpenAckWaiters(sellerPeerId, new Error(`peer ${sellerPeerId.slice(0, 12)}... disconnected before free usage open ack`));
+    }
+    async handleNeedAuth(sellerPeerId, payload, paymentMux) {
+        const lock = (this._sellerLocks.get(sellerPeerId) ?? Promise.resolve()).then(async () => {
+            await this._handleNeedAuthInner(sellerPeerId, payload, paymentMux);
+        });
+        this._sellerLocks.set(sellerPeerId, lock.catch(() => { }));
+        return lock;
+    }
+    async _handleNeedAuthInner(sellerPeerId, payload, paymentMux) {
+        const session = this._sessions.get(sellerPeerId);
+        if (!session || session.channelId !== payload.channelId) {
+            debugWarn(`[BuyerFreeUsage] NeedFreeUsageAuth for unknown channel ${payload.channelId.slice(0, 18)}...`);
+            return;
+        }
+        const requiredSequence = BigInt(payload.requiredSequence);
+        if (requiredSequence <= session.latestSequence) {
+            return;
+        }
+        const inputTokens = BigInt(payload.inputTokens ?? '0');
+        const outputTokens = BigInt(payload.outputTokens ?? '0');
+        const attributedService = this._requestService.get(payload.requestId) ?? payload.service;
+        const metadata = advanceUsageMetadata(session.latestMetadata, attributedService, {
+            amount: 0n,
+            inputTokens,
+            cachedInputTokens: 0n,
+            outputTokens,
+            requests: 1n,
+        });
+        const metadataHash = computeFreeUsageMetadataHash(metadata);
+        const encodedMetadata = encodeFreeUsageMetadata(metadata);
+        const usageSig = await signFreeUsageAuth(this._identity.wallet, this._domain, {
+            channelId: session.channelId,
+            sequence: requiredSequence,
+            metadataHash,
+            deadline: BigInt(session.deadline),
+        });
+        paymentMux.sendFreeUsageAuth({
+            channelId: session.channelId,
+            cumulativeInputTokens: metadata.cumulativeInputTokens.toString(),
+            cumulativeOutputTokens: metadata.cumulativeOutputTokens.toString(),
+            sequence: requiredSequence.toString(),
+            metadataHash,
+            metadata: encodedMetadata,
+            deadline: session.deadline,
+            usageSig,
+        });
+        session.latestSequence = requiredSequence;
+        session.cumulativeInputTokens = metadata.cumulativeInputTokens;
+        session.cumulativeOutputTokens = metadata.cumulativeOutputTokens;
+        session.cumulativeRequestCount = metadata.cumulativeRequestCount;
+        session.services = metadata.services;
+        session.latestMetadata = metadata;
+        this._requestService.take(payload.requestId);
+        this._persistSession(sellerPeerId, session, null, usageSig, encodedMetadata);
+        debugLog(`[BuyerFreeUsage] UsageAuth sent to ${sellerPeerId.slice(0, 12)}... ` +
+            `channel=${session.channelId.slice(0, 18)}... sequence=${session.latestSequence}`);
+    }
+    async _resolveSellerAddr(peer) {
+        if (!this._sellerAddressResolver)
+            return peerIdToAddress(peer.peerId);
+        return this._sellerAddressResolver.resolveSellerAddress(peer.peerId, peer.metadata);
+    }
+    _resolveOpenAckWaiters(sellerPeerId, session) {
+        const waiters = this._openAckWaiters.get(sellerPeerId);
+        if (!waiters)
+            return;
+        for (const waiter of [...waiters]) {
+            if (waiter.session !== session)
+                continue;
+            this._removeOpenAckWaiter(sellerPeerId, waiter);
+            waiter.resolve();
+        }
+    }
+    _rejectOpenAckWaiters(sellerPeerId, err) {
+        const waiters = this._openAckWaiters.get(sellerPeerId);
+        if (!waiters)
+            return;
+        for (const waiter of [...waiters]) {
+            this._removeOpenAckWaiter(sellerPeerId, waiter);
+            waiter.reject(err);
+        }
+    }
+    _removeOpenAckWaiter(sellerPeerId, waiter) {
+        clearTimeout(waiter.timer);
+        const waiters = this._openAckWaiters.get(sellerPeerId);
+        if (!waiters)
+            return;
+        waiters.delete(waiter);
+        if (waiters.size === 0)
+            this._openAckWaiters.delete(sellerPeerId);
+    }
+    _retireOtherActiveSessions(sellerPeerId, keepSessionId) {
+        if (!this._channelStore)
+            return;
+        const activeChannels = this._channelStore.getActiveChannelsByBuyer(CHANNEL_ROLE.BUYER, this._identity.wallet.address, CHANNEL_KIND.FREE);
+        for (const channel of activeChannels) {
+            if (channel.peerId !== sellerPeerId || channel.sessionId === keepSessionId)
+                continue;
+            this._channelStore.updateChannelStatus(channel.sessionId, CHANNEL_STATUS.GHOST);
+        }
+    }
+    _persistSession(sellerPeerId, session, openSig, usageSig, encodedMetadata) {
+        if (!this._channelStore)
+            return;
+        const now = Date.now();
+        const existing = this._channelStore.getChannel(session.channelId);
+        this._channelStore.upsertChannel({
+            sessionId: session.channelId,
+            peerId: sellerPeerId,
+            role: CHANNEL_ROLE.BUYER,
+            channelKind: CHANNEL_KIND.FREE,
+            sellerEvmAddr: session.sellerEvmAddr,
+            buyerEvmAddr: this._identity.wallet.address,
+            nonce: 0,
+            authMax: '0',
+            deadline: session.deadline,
+            previousSessionId: '0x' + '00'.repeat(32),
+            previousConsumption: session.cumulativeOutputTokens.toString(),
+            tokensDelivered: session.cumulativeInputTokens.toString(),
+            requestCount: Number(session.cumulativeRequestCount),
+            reservedAt: existing?.reservedAt ?? now,
+            settledAt: null,
+            settledAmount: null,
+            status: CHANNEL_STATUS.ACTIVE,
+            latestBuyerSig: openSig ?? existing?.latestBuyerSig ?? null,
+            latestSpendingAuthSig: usageSig ?? existing?.latestSpendingAuthSig ?? null,
+            latestMetadata: encodedMetadata ?? existing?.latestMetadata ?? null,
+            createdAt: existing?.createdAt ?? now,
+            updatedAt: now,
+        });
+        this._channelStore.replaceMetadataServiceTotals(session.channelId, session.services);
+    }
+}
+//# sourceMappingURL=buyer-free-usage-manager.js.map

package/dist/payments/buyer-free-usage-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buyer-free-usage-manager.js","sourceRoot":"","sources":["../../src/payments/buyer-free-usage-manager.ts"],"names":[],"mappings":"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"}

package/dist/payments/buyer-payment-manager.d.ts

@@ -5,7 +5,7 @@ import type { SpendingAuthPayload, AuthAckPayload, NeedAuthPayload } from '../ty
 import { DepositsClient } from './evm/deposits-client.js';
 import type { SellerAddressResolver } from '../discovery/seller-address-resolver.js';
 import type { PeerMetadata } from '../discovery/peer-metadata.js';
-import { ChannelStore, type StoredChannel } from './channel-store.js';
+import { ChannelStore, CHANNEL_STATUS, type StoredChannel } from './channel-store.js';
 import { type ServicePricing } from './pricing.js';
 export interface BuyerPaymentConfig {
     rpcUrl: string;
@@ -79,7 +79,7 @@ export declare class BuyerPaymentManager {
     /** Clean up all in-memory state for a seller when the session ends. */
     cleanupSession(sellerPeerId: string): void;
     getActiveSession(sellerPeerId: string): StoredChannel | null;
-    retireSession(sellerPeerId: string, status: Extract<StoredChannel['status'], 'settled' | 'timeout' | 'ghost'>, settledAmount?: bigint): void;
+    retireSession(sellerPeerId: string, status: typeof CHANNEL_STATUS.SETTLED | typeof CHANNEL_STATUS.TIMEOUT | typeof CHANNEL_STATUS.GHOST, settledAmount?: bigint): void;
     canReplayReserveAuth(sellerPeerId: string): boolean;
     clearLockConfirmation(sellerPeerId: string): void;
     resendCurrentSpendingAuth(sellerPeerId: string, paymentMux: PaymentMux): Promise<string>;
@@ -87,7 +87,6 @@ export declare class BuyerPaymentManager {
     resendReserveAuth(sellerPeerId: string, paymentMux: PaymentMux): Promise<string>;
     private _reopenOverdraftWindowIfCollapsed;
     private _needsCeilingAdvance;
-    private _withServiceMetadata;
     /**
      * Both signPerRequestAuth (buyer-initiated) and handleNeedAuth (seller-initiated)
      * can fire for the same request when the proactive auth doesn't fully cover the
@@ -95,7 +94,6 @@ export declare class BuyerPaymentManager {
      * records its requestId here so the other path attributes only the amount delta.
      */
     private readonly _serviceTokensCounted;
-    private _markServiceTokensCounted;
     private _persistServiceMetadata;
     private _sendUpdatedSpendingAuth;
     private _topUpAfterSpendAuthBestEffort;

package/dist/payments/buyer-payment-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buyer-payment-manager.d.ts","sourceRoot":"","sources":["../../src/payments/buyer-payment-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buyer-payment-manager.d.ts","sourceRoot":"","sources":["../../src/payments/buyer-payment-manager.ts"],"names":[],"mappings":"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"}

package/dist/payments/buyer-payment-manager.js

@@ -1,8 +1,10 @@
 import { randomBytes } from 'node:crypto';
 import { DepositsClient } from './evm/deposits-client.js';
-import { signSpendingAuth, signReserveAuth, makeChannelsDomain, computeMetadataHash, encodeMetadata, getServiceMetadataId, ZERO_METADATA, ZERO_METADATA_HASH, computeChannelId, } from './evm/signatures.js';
+import { signSpendingAuth, signReserveAuth, makeChannelsDomain, computeMetadataHash, encodeMetadata, ZERO_METADATA, ZERO_METADATA_HASH, computeChannelId, } from './evm/signatures.js';
 import { debugLog, debugWarn } from '../utils/debug.js';
 import { peerIdToAddress } from '../types/peer.js';
+import { CHANNEL_ROLE, CHANNEL_STATUS } from './channel-store.js';
+import { advanceUsageMetadata, CountedRequestTracker, RequestServiceTracker } from './channel-usage-accounting.js';
 import { estimateCostFromBytes, computeCostUsdc } from './pricing.js';
 /** Default tolerance: accept seller claims up to 1.4x buyer's estimate. */
 const DEFAULT_COST_TOLERANCE = 1.4;
@@ -35,7 +37,7 @@ export class BuyerPaymentManager {
     /** requestId -> service/model the buyer requested (from its own request body).
      *  Used in handleNeedAuth to validate cost with the correct pricing tier
      *  without trusting the seller's claim of which service was used. */
-    _requestService = new Map();
+    _requestService = new RequestServiceTracker();
     /** sellerPeerId -> full pricing map (defaults + per-service overrides from peer metadata / 402) */
     _sessionPricing = new Map();
     /** Cumulative response token totals per seller, tracked independently of signing metadata. */
@@ -65,25 +67,12 @@ export class BuyerPaymentManager {
     }
     /** Hydrate cumulative tracking maps from persisted active buyer sessions. */
     _hydrateFromStore() {
-        const activeChannels = this._channelStore.getActiveChannelsByBuyer('buyer', this._identity.wallet.address);
+        const activeChannels = this._channelStore.getActiveChannelsByBuyer(CHANNEL_ROLE.BUYER, this._identity.wallet.address);
         for (const channel of activeChannels) {
             const peerId = channel.peerId;
             const persistedCumulative = BigInt(channel.authMax);
-            const persistedServiceTotals = this._channelStore.getServiceTotals(channel.sessionId);
             this._cumulativeAmount.set(peerId, persistedCumulative);
-            this._metadata.set(peerId, {
-                cumulativeInputTokens: BigInt(channel.tokensDelivered),
-                cumulativeOutputTokens: BigInt(channel.previousConsumption),
-                cumulativeRequestCount: BigInt(channel.requestCount),
-                services: persistedServiceTotals.map((total) => ({
-                    serviceId: total.serviceId,
-                    cumulativeAmount: BigInt(total.cumulativeAmount),
-                    cumulativeInputTokens: BigInt(total.cumulativeInputTokens),
-                    cumulativeCachedInputTokens: BigInt(total.cumulativeCachedInputTokens),
-                    cumulativeOutputTokens: BigInt(total.cumulativeOutputTokens),
-                    cumulativeRequestCount: BigInt(total.cumulativeRequestCount),
-                })),
-            });
+            this._metadata.set(peerId, this._channelStore.getChannelMetadata(channel));
             // Hydrate verifiedCost to authMax so _maxSignable can grow beyond maxPerRequestUsdc.
             // Without this, maxSignable = 0 + maxPerRequestUsdc after restart, permanently capping
             // the cumulative and causing non-monotonic SpendingAuth rejections on the seller.
@@ -123,7 +112,7 @@ export class BuyerPaymentManager {
         this._responseTokenTotals.delete(sellerPeerId);
     }
     getActiveSession(sellerPeerId) {
-        return this._channelStore.getActiveChannelByPeerAndBuyer(sellerPeerId, 'buyer', this._identity.wallet.address);
+        return this._channelStore.getActiveChannelByPeerAndBuyer(sellerPeerId, CHANNEL_ROLE.BUYER, this._identity.wallet.address);
     }
     retireSession(sellerPeerId, status, settledAmount) {
         const session = this.getActiveSession(sellerPeerId);
@@ -257,59 +246,15 @@ export class BuyerPaymentManager {
     _needsCeilingAdvance(requestedAmount, maxSignable, ceiling) {
         return requestedAmount > maxSignable && maxSignable >= ceiling;
     }
-    _withServiceMetadata(metadata, service, delta) {
-        if (!service || service.trim().length === 0)
-            return metadata;
-        const serviceId = getServiceMetadataId(service);
-        const byServiceId = new Map();
-        for (const entry of metadata.services ?? []) {
-            byServiceId.set(entry.serviceId, { ...entry });
-        }
-        const existing = byServiceId.get(serviceId) ?? {
-            serviceId,
-            cumulativeAmount: 0n,
-            cumulativeInputTokens: 0n,
-            cumulativeCachedInputTokens: 0n,
-            cumulativeOutputTokens: 0n,
-            cumulativeRequestCount: 0n,
-        };
-        byServiceId.set(serviceId, {
-            serviceId,
-            cumulativeAmount: existing.cumulativeAmount + delta.amount,
-            cumulativeInputTokens: existing.cumulativeInputTokens + delta.inputTokens,
-            cumulativeCachedInputTokens: existing.cumulativeCachedInputTokens + delta.cachedInputTokens,
-            cumulativeOutputTokens: existing.cumulativeOutputTokens + delta.outputTokens,
-            cumulativeRequestCount: existing.cumulativeRequestCount + delta.requests,
-        });
-        return {
-            ...metadata,
-            services: [...byServiceId.values()].sort((a, b) => a.serviceId < b.serviceId ? -1 : a.serviceId > b.serviceId ? 1 : 0),
-        };
-    }
     /**
      * Both signPerRequestAuth (buyer-initiated) and handleNeedAuth (seller-initiated)
      * can fire for the same request when the proactive auth doesn't fully cover the
      * seller's required cumulative. Whichever path counts a request's tokens first
      * records its requestId here so the other path attributes only the amount delta.
      */
-    _serviceTokensCounted = new Set();
-    _markServiceTokensCounted(requestId) {
-        if (this._serviceTokensCounted.size >= 512) {
-            const oldest = this._serviceTokensCounted.values().next().value;
-            if (oldest !== undefined)
-                this._serviceTokensCounted.delete(oldest);
-        }
-        this._serviceTokensCounted.add(requestId);
-    }
+    _serviceTokensCounted = new CountedRequestTracker();
     _persistServiceMetadata(sessionId, metadata) {
-        this._channelStore.replaceServiceTotals(sessionId, (metadata.services ?? []).map((service) => ({
-            serviceId: service.serviceId,
-            cumulativeAmount: service.cumulativeAmount.toString(),
-            cumulativeInputTokens: service.cumulativeInputTokens.toString(),
-            cumulativeCachedInputTokens: service.cumulativeCachedInputTokens.toString(),
-            cumulativeOutputTokens: service.cumulativeOutputTokens.toString(),
-            cumulativeRequestCount: service.cumulativeRequestCount.toString(),
-        })));
+        this._channelStore.replaceMetadataServiceTotals(sessionId, metadata.services);
     }
     async _sendUpdatedSpendingAuth(session, sellerPeerId, cumulativeAmount, metadata, paymentMux) {
         const metadataHashHex = computeMetadataHash(metadata);
@@ -416,7 +361,7 @@ export class BuyerPaymentManager {
         const session = {
             sessionId: channelId,
             peerId: sellerPeerId,
-            role: 'buyer',
+            role: CHANNEL_ROLE.BUYER,
             sellerEvmAddr,
             buyerEvmAddr: this._identity.wallet.address,
             nonce: 0,
@@ -429,7 +374,7 @@ export class BuyerPaymentManager {
             reservedAt: now,
             settledAt: null,
             settledAmount: null,
-            status: 'active',
+            status: CHANNEL_STATUS.ACTIVE,
             latestBuyerSig: null,
             latestSpendingAuthSig: null,
             latestMetadata: null,
@@ -631,29 +576,19 @@ export class BuyerPaymentManager {
         this._cumulativeAmount.set(sellerPeerId, newAmount);
         const signedDelta = newAmount - prevAmount;
         // Update cumulative metadata
-        const prev = this._metadata.get(sellerPeerId) ?? ZERO_METADATA;
-        const totalsMeta = {
-            cumulativeInputTokens: prev.cumulativeInputTokens + estimatedInputTokens,
-            cumulativeOutputTokens: prev.cumulativeOutputTokens + estimatedOutputTokens,
-            cumulativeRequestCount: prev.cumulativeRequestCount + 1n,
-            services: prev.services ?? [],
-        };
         // If handleNeedAuth already counted this request (seller-initiated NeedAuth
         // raced ahead), skip service attribution entirely: service totals are
         // documented as lower bounds, so undercounting beats double-counting.
-        const alreadyCounted = responseStats.requestId != null && this._serviceTokensCounted.has(responseStats.requestId);
-        const newMeta = alreadyCounted
-            ? totalsMeta
-            : this._withServiceMetadata(totalsMeta, responseStats.service, {
-                amount: signedDelta,
-                inputTokens: estimatedInputTokens,
-                cachedInputTokens: estimatedCachedInputTokens,
-                outputTokens: estimatedOutputTokens,
-                requests: 1n,
-            });
-        if (responseStats.requestId != null && !alreadyCounted) {
-            this._markServiceTokensCounted(responseStats.requestId);
-        }
+        const alreadyCounted = this._serviceTokensCounted.has(responseStats.requestId);
+        const newMeta = advanceUsageMetadata(this._metadata.get(sellerPeerId), alreadyCounted ? undefined : responseStats.service, {
+            amount: signedDelta,
+            inputTokens: estimatedInputTokens,
+            cachedInputTokens: estimatedCachedInputTokens,
+            outputTokens: estimatedOutputTokens,
+            requests: 1n,
+        });
+        if (!alreadyCounted)
+            this._serviceTokensCounted.mark(responseStats.requestId);
         this._metadata.set(sellerPeerId, newMeta);
         this._persistServiceMetadata(session.sessionId, newMeta);
         debugLog(`[BuyerPayment] signPerRequestAuth #${newMeta.cumulativeRequestCount}: ` +
@@ -701,7 +636,7 @@ export class BuyerPaymentManager {
             debugWarn(`[BuyerPayment] NeedAuth for unknown seller: ${sellerPeerId.slice(0, 12)}...`);
             return;
         }
-        const buyerService = payload.requestId ? this._requestService.get(payload.requestId) : undefined;
+        const buyerService = this._requestService.get(payload.requestId);
         const requiredCumulativeAmount = BigInt(payload.requiredCumulativeAmount);
         const currentCumulative = this._cumulativeAmount.get(sellerPeerId) ?? 0n;
         // Reject stale/lower NeedAuth (monotonicity guard)
@@ -709,8 +644,7 @@ export class BuyerPaymentManager {
             debugLog(`[BuyerPayment] NeedAuth stale: required=${requiredCumulativeAmount} <= current=${currentCumulative} — ignoring`);
             return;
         }
-        if (payload.requestId)
-            this._requestService.delete(payload.requestId);
+        this._requestService.take(payload.requestId);
         let acceptedServiceCost = 0n;
         const reportedInputTokens = BigInt(payload.inputTokens ?? '0');
         const reportedCachedInputTokens = BigInt(payload.cachedInputTokens ?? '0');
@@ -791,30 +725,20 @@ export class BuyerPaymentManager {
         const serviceAmountDelta = acceptedServiceCost > 0n
             ? (acceptedServiceCost < signedDelta ? acceptedServiceCost : signedDelta)
             : 0n;
-        const prevMeta = this._metadata.get(sellerPeerId) ?? ZERO_METADATA;
-        const totalsMeta = {
-            cumulativeInputTokens: prevMeta.cumulativeInputTokens + reportedInputTokens,
-            cumulativeOutputTokens: prevMeta.cumulativeOutputTokens + reportedOutputTokens,
-            cumulativeRequestCount: prevMeta.cumulativeRequestCount + 1n,
-            services: prevMeta.services ?? [],
-        };
         // If signPerRequestAuth already counted this request (buyer-initiated auth
         // raced ahead but didn't fully cover the seller's required cumulative), skip
         // service attribution entirely: service totals are documented as lower
         // bounds, so undercounting beats double-counting.
-        const alreadyCounted = payload.requestId != null && this._serviceTokensCounted.has(payload.requestId);
-        const newMeta = alreadyCounted
-            ? totalsMeta
-            : this._withServiceMetadata(totalsMeta, buyerService, {
-                amount: serviceAmountDelta,
-                inputTokens: reportedInputTokens,
-                cachedInputTokens: reportedCachedInputTokens,
-                outputTokens: reportedOutputTokens,
-                requests: 1n,
-            });
-        if (payload.requestId != null && !alreadyCounted) {
-            this._markServiceTokensCounted(payload.requestId);
-        }
+        const alreadyCounted = this._serviceTokensCounted.has(payload.requestId);
+        const newMeta = advanceUsageMetadata(this._metadata.get(sellerPeerId), alreadyCounted ? undefined : buyerService, {
+            amount: serviceAmountDelta,
+            inputTokens: reportedInputTokens,
+            cachedInputTokens: reportedCachedInputTokens,
+            outputTokens: reportedOutputTokens,
+            requests: 1n,
+        });
+        if (!alreadyCounted)
+            this._serviceTokensCounted.mark(payload.requestId);
         this._metadata.set(sellerPeerId, newMeta);
         // Send via PaymentMux
         try {
@@ -956,7 +880,7 @@ export class BuyerPaymentManager {
     }
     /** Register which service the buyer requested for a given requestId. */
     trackRequestService(requestId, service) {
-        this._requestService.set(requestId, service);
+        this._requestService.track(requestId, service);
     }
     /** Get the live response token totals for a seller, or null if none recorded this session. */
     getResponseTokenTotals(sellerPeerId) {