@contextvm/sdk 0.11.8 → 0.11.10

package/dist/esm/transport/nostr-client-transport.js

@@ -1,21 +1,20 @@
-import { InitializeResultSchema, ListPromptsResultSchema, ListResourcesResultSchema, ListResourceTemplatesResultSchema, ListToolsResultSchema, NotificationSchema, isJSONRPCRequest, isJSONRPCNotification, isJSONRPCResultResponse, isJSONRPCErrorResponse, } from '@modelcontextprotocol/sdk/types.js';
-import { CTXVM_MESSAGES_KIND, DEFAULT_BOOTSTRAP_RELAY_URLS, DEFAULT_TIMEOUT_MS, EPHEMERAL_GIFT_WRAP_KIND, GIFT_WRAP_KIND, decryptMessage, DEFAULT_LRU_SIZE, INITIALIZE_METHOD, NOSTR_TAGS, } from '../core/index.js';
+import { NotificationSchema, isJSONRPCRequest, isJSONRPCNotification, } from '@modelcontextprotocol/sdk/types.js';
+import { DEFAULT_BOOTSTRAP_RELAY_URLS, DEFAULT_TIMEOUT_MS, DEFAULT_LRU_SIZE, INITIALIZE_METHOD, } from '../core/index.js';
 import { LruCache } from '../core/utils/lru-cache.js';
 import { BaseNostrTransport, } from './base-nostr-transport.js';
-import { getNostrEventTag } from '../core/utils/serializers.js';
-import { verifyEvent } from 'nostr-tools/pure';
-import { EncryptionMode, GiftWrapMode } from '../core/interfaces.js';
 import { ClientCorrelationStore, } from './nostr-client/correlation-store.js';
 import { parseServerIdentity } from './nostr-client/server-identity.js';
 import { resolveOperationalRelays } from './nostr-client/relay-resolution.js';
 import { StatelessModeHandler } from './nostr-client/stateless-mode-handler.js';
-import { queryTags, withTimeout } from '../core/utils/utils.js';
 import { OversizedTransferReceiver, } from './oversized-transfer/index.js';
-import { OpenStreamReceiver, buildOpenStreamAbortFrame, buildOpenStreamPingFrame, buildOpenStreamPongFrame, } from './open-stream/index.js';
-import { DEFAULT_OPEN_STREAM_CLOSE_GRACE_PERIOD_MS, DEFAULT_OPEN_STREAM_IDLE_TIMEOUT_MS, DEFAULT_OPEN_STREAM_PROBE_TIMEOUT_MS, DEFAULT_MAX_BUFFERED_BYTES_PER_STREAM, DEFAULT_MAX_BUFFERED_CHUNKS_PER_STREAM, } from './open-stream/constants.js';
-import { parseDiscoveredPeerCapabilities } from './discovery-tags.js';
+import { ClientCapabilityNegotiator } from './capability-negotiator.js';
+import { ClientInboundCoordinator } from './nostr-client/inbound-coordinator.js';
+import { ServerMetadataStore } from './nostr-client/server-metadata-store.js';
+import { ClientOutboundSender } from './nostr-client/outbound-sender.js';
+import { ClientInboundNotificationDispatcher } from './nostr-client/inbound-notification-dispatcher.js';
+import { ClientEventPipeline } from './nostr-client/event-pipeline.js';
+import { ClientOpenStreamFactory } from './nostr-client/open-stream-factory.js';
 import { DEFAULT_CHUNK_SIZE, DEFAULT_OVERSIZED_THRESHOLD, } from './oversized-transfer/constants.js';
-import { sendOversizedClientRequest } from './nostr-client/oversized-client-sender.js';
 /**
  * A client transport layer for CTXVM that uses Nostr events for communication.
  * Implements the Transport interface from the @modelcontextprotocol/sdk.
@@ -28,21 +27,13 @@ export class NostrClientTransport extends BaseNostrTransport {
      * @throws Error if serverPubkey is not a valid supported server identifier
      */
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         super('nostr-client-transport', {
             ...options,
             relayHandler: (_a = options.relayHandler) !== null && _a !== void 0 ? _a : [],
         });
         this.pendingOutboundOpenStreamResolvers = [];
         this.onmessageWithContext = undefined;
-        /** Whether the server has advertised ephemeral gift wrap support via Nostr tags. */
-        this.serverSupportsEphemeralGiftWraps = false;
-        /** Whether the server has advertised CEP-22 oversized transfer support. */
-        this.serverSupportsOversizedTransfer = false;
-        /** Whether the server has advertised CEP-41 open stream support. */
-        this.serverSupportsOpenStream = false;
-        /** Whether this client has already sent its discovery tags to the server. */
-        this.hasSentDiscoveryTags = false;
         /**
          * Deduplicate inbound events to avoid redundant work.
          *
@@ -64,6 +55,7 @@ export class NostrClientTransport extends BaseNostrTransport {
             },
         });
         this.statelessHandler = new StatelessModeHandler();
+        this.metadataStore = new ServerMetadataStore();
         const ot = options.oversizedTransfer;
         this.oversizedEnabled = (_e = ot === null || ot === void 0 ? void 0 : ot.enabled) !== null && _e !== void 0 ? _e : true;
         this.oversizedThreshold = (_f = ot === null || ot === void 0 ? void 0 : ot.thresholdBytes) !== null && _f !== void 0 ? _f : DEFAULT_OVERSIZED_THRESHOLD;
@@ -71,55 +63,65 @@ export class NostrClientTransport extends BaseNostrTransport {
         this.oversizedAcceptTimeoutMs = (_h = ot === null || ot === void 0 ? void 0 : ot.acceptTimeoutMs) !== null && _h !== void 0 ? _h : DEFAULT_TIMEOUT_MS;
         this.oversizedReceiver = new OversizedTransferReceiver((_j = ot === null || ot === void 0 ? void 0 : ot.policy) !== null && _j !== void 0 ? _j : {}, this.logger);
         this.openStreamEnabled = (_l = (_k = options.openStream) === null || _k === void 0 ? void 0 : _k.enabled) !== null && _l !== void 0 ? _l : false;
-        this.openStreamPolicy = (_m = options.openStream) === null || _m === void 0 ? void 0 : _m.policy;
-        this.openStreamReceiver = new OpenStreamReceiver({
-            maxConcurrentStreams: (_p = (_o = options.openStream) === null || _o === void 0 ? void 0 : _o.policy) === null || _p === void 0 ? void 0 : _p.maxConcurrentStreams,
-            maxBufferedChunksPerStream: (_r = (_q = options.openStream) === null || _q === void 0 ? void 0 : _q.policy) === null || _r === void 0 ? void 0 : _r.maxBufferedChunksPerStream,
-            maxBufferedBytesPerStream: (_t = (_s = options.openStream) === null || _s === void 0 ? void 0 : _s.policy) === null || _t === void 0 ? void 0 : _t.maxBufferedBytesPerStream,
-            idleTimeoutMs: (_v = (_u = options.openStream) === null || _u === void 0 ? void 0 : _u.policy) === null || _v === void 0 ? void 0 : _v.idleTimeoutMs,
-            probeTimeoutMs: (_x = (_w = options.openStream) === null || _w === void 0 ? void 0 : _w.policy) === null || _x === void 0 ? void 0 : _x.probeTimeoutMs,
-            closeGracePeriodMs: (_z = (_y = options.openStream) === null || _y === void 0 ? void 0 : _y.policy) === null || _z === void 0 ? void 0 : _z.closeGracePeriodMs,
-            getSessionOptions: (progressToken) => {
-                let progress = 0;
-                return {
-                    sendPing: async (nonce) => {
-                        progress += 1;
-                        await this.send({
-                            jsonrpc: '2.0',
-                            method: 'notifications/progress',
-                            params: buildOpenStreamPingFrame({
-                                progressToken,
-                                progress,
-                                nonce,
-                            }),
-                        });
-                    },
-                    sendPong: async (nonce) => {
-                        progress += 1;
-                        await this.send({
-                            jsonrpc: '2.0',
-                            method: 'notifications/progress',
-                            params: buildOpenStreamPongFrame({
-                                progressToken,
-                                progress,
-                                nonce,
-                            }),
-                        });
-                    },
-                    sendAbort: async (reason) => {
-                        progress += 1;
-                        await this.send({
-                            jsonrpc: '2.0',
-                            method: 'notifications/progress',
-                            params: buildOpenStreamAbortFrame({
-                                progressToken,
-                                progress,
-                                reason,
-                            }),
-                        });
-                    },
-                };
-            },
+        this.openStreamFactory = new ClientOpenStreamFactory({
+            openStreamEnabled: this.openStreamEnabled,
+            policy: (_m = options.openStream) === null || _m === void 0 ? void 0 : _m.policy,
+            send: this.send.bind(this),
+            logger: this.logger,
+            onerror: (error) => { var _a; return (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error); },
+        });
+        this.capabilityNegotiator = new ClientCapabilityNegotiator({
+            encryptionMode: this.encryptionMode,
+            giftWrapMode: this.giftWrapMode,
+            oversizedEnabled: this.oversizedEnabled,
+            openStreamEnabled: this.openStreamEnabled,
+            composeOutboundTags: this.composeOutboundTags.bind(this),
+        });
+        this.inboundNotificationDispatcher =
+            new ClientInboundNotificationDispatcher({
+                openStreamReceiver: this.openStreamFactory.getReceiver(),
+                oversizedReceiver: this.oversizedReceiver,
+                handleResponse: this.handleResponse.bind(this),
+                handleNotification: this.handleNotification.bind(this),
+                logger: this.logger,
+                onerror: (error) => { var _a; return (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error); },
+            });
+        this.eventPipeline = new ClientEventPipeline({
+            signer: this.signer,
+            seenEventIds: this.seenEventIds,
+            serverPubkey: this.serverPubkey,
+            giftWrapMode: this.giftWrapMode,
+            logger: this.logger,
+            onerror: (error) => { var _a; return (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error); },
+        });
+        this.inboundCoordinator = new ClientInboundCoordinator({
+            capabilityNegotiator: this.capabilityNegotiator,
+            correlationStore: this.correlationStore,
+            notificationDispatcher: this.inboundNotificationDispatcher,
+            metadataStore: this.metadataStore,
+            unwrapEvent: this.eventPipeline.unwrap.bind(this.eventPipeline),
+            convertNostrEventToMcpMessage: this.convertNostrEventToMcpMessage.bind(this),
+            handleResponse: this.handleResponse.bind(this),
+            handleNotification: this.handleNotification.bind(this),
+            logger: this.logger,
+            onerror: (error) => { var _a; return (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error); },
+        });
+        this.outboundSender = new ClientOutboundSender({
+            serverPubkey: this.serverPubkey,
+            correlationStore: this.correlationStore,
+            capabilityNegotiator: this.capabilityNegotiator,
+            oversizedEnabled: this.oversizedEnabled,
+            oversizedThreshold: this.oversizedThreshold,
+            oversizedChunkSize: this.oversizedChunkSize,
+            oversizedAcceptTimeoutMs: this.oversizedAcceptTimeoutMs,
+            serverSupportsOversizedTransfer: () => this.metadataStore.getServerSupportsOversizedTransfer(),
+            createRecipientTags: this.createRecipientTags.bind(this),
+            sendMcpMessage: this.sendMcpMessage.bind(this),
+            waitForAccept: this.oversizedReceiver.waitForAccept.bind(this.oversizedReceiver),
+            getOriginalRequestContext: this.getOriginalRequestContext.bind(this),
+            resolvePendingOpenStream: this.resolvePendingOutboundOpenStream.bind(this),
+            measurePublishedMcpMessageSize: this.measurePublishedMcpMessageSize.bind(this),
+            resolveSafeOversizedChunkSize: this.resolveSafeOversizedChunkSize.bind(this),
             logger: this.logger,
         });
     }
@@ -129,49 +131,7 @@ export class NostrClientTransport extends BaseNostrTransport {
      * Intended to be called by payments wrappers (e.g. `withClientPayments()`).
      */
     setClientPmis(pmis) {
-        this.clientPmis = pmis;
-    }
-    getClientCapabilityTags() {
-        const tags = [];
-        if (this.encryptionMode !== EncryptionMode.DISABLED) {
-            tags.push([NOSTR_TAGS.SUPPORT_ENCRYPTION]);
-        }
-        if (this.encryptionMode !== EncryptionMode.DISABLED &&
-            this.giftWrapMode !== GiftWrapMode.PERSISTENT) {
-            tags.push([NOSTR_TAGS.SUPPORT_ENCRYPTION_EPHEMERAL]);
-        }
-        if (this.oversizedEnabled) {
-            tags.push([NOSTR_TAGS.SUPPORT_OVERSIZED_TRANSFER]);
-        }
-        if (this.openStreamEnabled) {
-            tags.push([NOSTR_TAGS.SUPPORT_OPEN_STREAM]);
-        }
-        return tags;
-    }
-    getClientNegotiationTags() {
-        const tags = [];
-        if (this.clientPmis) {
-            tags.push(...this.clientPmis.map((pmi) => ['pmi', pmi]));
-        }
-        return tags;
-    }
-    getPendingClientDiscoveryTags() {
-        return this.hasSentDiscoveryTags ? [] : this.getClientCapabilityTags();
-    }
-    buildOutboundClientTags(params) {
-        const { baseTags, includeDiscovery } = params;
-        return this.composeOutboundTags({
-            baseTags,
-            discoveryTags: includeDiscovery
-                ? this.getPendingClientDiscoveryTags()
-                : [],
-            negotiationTags: includeDiscovery ? this.getClientNegotiationTags() : [],
-        });
-    }
-    markClientDiscoveryTagsSent() {
-        if (this.getPendingClientDiscoveryTags().length > 0) {
-            this.hasSentDiscoveryTags = true;
-        }
+        this.capabilityNegotiator.setClientPmis(pmis);
     }
     /**
      * Starts the transport, connecting to the relay and setting up event listeners.
@@ -221,9 +181,10 @@ export class NostrClientTransport extends BaseNostrTransport {
                 pending.reject(pendingOpenStreamError);
             }
             this.correlationStore.clear();
+            this.metadataStore.clear();
             this.seenEventIds.clear();
             this.oversizedReceiver.clear();
-            this.openStreamReceiver.clear();
+            this.openStreamFactory.getReceiver().clear();
             (_a = this.onclose) === null || _a === void 0 ? void 0 : _a.call(this);
         }
         catch (error) {
@@ -248,7 +209,7 @@ export class NostrClientTransport extends BaseNostrTransport {
                 }
                 return;
             }
-            await this.sendRequest(message);
+            await this.outboundSender.sendRequest(message);
         }
         catch (error) {
             (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error instanceof Error ? error : new Error(String(error)));
@@ -264,118 +225,6 @@ export class NostrClientTransport extends BaseNostrTransport {
             });
         }
     }
-    /**
-     * Sends a request and registers it for correlation tracking.
-     * @param message - The JSON-RPC message to send
-     * @returns The ID of the published Nostr event
-     */
-    async sendRequest(message) {
-        var _a, _b;
-        const isRequest = isJSONRPCRequest(message);
-        const tags = this.buildOutboundClientTags({
-            baseTags: this.createRecipientTags(this.serverPubkey),
-            includeDiscovery: isRequest,
-        });
-        const giftWrapKind = this.chooseOutboundGiftWrapKind();
-        // --- CEP-22 Oversized Transfer (proactive path) ---
-        if (this.oversizedEnabled && isRequest) {
-            const progressToken = (_b = (_a = message.params) === null || _a === void 0 ? void 0 : _a._meta) === null || _b === void 0 ? void 0 : _b.progressToken;
-            if (progressToken !== undefined) {
-                const serialized = JSON.stringify(message);
-                const publishedEventSize = await this.measurePublishedMcpMessageSize(message, this.serverPubkey, CTXVM_MESSAGES_KIND, tags, undefined, giftWrapKind);
-                if (publishedEventSize > this.oversizedThreshold) {
-                    await this.sendOversizedRequest(message, serialized, String(progressToken), giftWrapKind);
-                    return 'oversized-transfer';
-                }
-            }
-        }
-        const eventId = await this.sendMcpMessage(message, this.serverPubkey, CTXVM_MESSAGES_KIND, tags, undefined, (eventId) => {
-            var _a, _b;
-            const progressToken = isRequest
-                ? (_b = (_a = message.params) === null || _a === void 0 ? void 0 : _a._meta) === null || _b === void 0 ? void 0 : _b.progressToken
-                : undefined;
-            const originalRequestContext = isRequest
-                ? this.getOriginalRequestContext(message)
-                : undefined;
-            this.correlationStore.registerRequest(eventId, {
-                originalRequestId: isRequest ? message.id : null,
-                isInitialize: isRequest && message.method === INITIALIZE_METHOD,
-                progressToken: progressToken !== undefined ? String(progressToken) : undefined,
-                originalRequestContext,
-            });
-            if (isRequest &&
-                message.method === 'tools/call' &&
-                progressToken !== undefined) {
-                const pending = this.pendingOutboundOpenStreamResolvers.shift();
-                if (pending) {
-                    const normalizedProgressToken = String(progressToken);
-                    pending.resolve({
-                        progressToken: normalizedProgressToken,
-                        stream: this.createOutboundOpenStreamSession(normalizedProgressToken),
-                    });
-                }
-            }
-        }, giftWrapKind);
-        if (isRequest) {
-            this.markClientDiscoveryTagsSent();
-        }
-        return eventId;
-    }
-    //Splits an oversized request into CEP-22 transfer frames and sends them sequentially. Waits for an `accept` frame from the server when the server's support is not yet known.
-    async sendOversizedRequest(originalMessage, serialized, progressToken, giftWrapKind) {
-        const frameRecipientTags = this.createRecipientTags(this.serverPubkey);
-        const startFrameTags = this.buildOutboundClientTags({
-            baseTags: frameRecipientTags,
-            includeDiscovery: true,
-        });
-        const chunkSizeBytes = await this.resolveSafeOversizedChunkSize({
-            desiredChunkSizeBytes: this.oversizedChunkSize,
-            maxPublishedEventBytes: this.oversizedThreshold,
-            recipientPublicKey: this.serverPubkey,
-            kind: CTXVM_MESSAGES_KIND,
-            progressToken,
-            progress: this.serverSupportsOversizedTransfer ? 2 : 3,
-            tags: frameRecipientTags,
-            giftWrapKind,
-        });
-        const endFrameEventId = await sendOversizedClientRequest(serialized, progressToken, {
-            chunkSizeBytes,
-            acceptTimeoutMs: this.oversizedAcceptTimeoutMs,
-            serverPubkey: this.serverPubkey,
-            serverSupportsOversizedTransfer: this.serverSupportsOversizedTransfer,
-            giftWrapKind,
-            startFrameTags,
-            continuationFrameTags: frameRecipientTags,
-        }, {
-            sendMcpMessage: this.sendMcpMessage.bind(this),
-            waitForAccept: this.oversizedReceiver.waitForAccept.bind(this.oversizedReceiver),
-            logger: this.logger,
-        });
-        // Register the original request for correlating the final response.
-        if (endFrameEventId) {
-            this.correlationStore.registerRequest(endFrameEventId, {
-                originalRequestId: originalMessage.id,
-                isInitialize: originalMessage.method === INITIALIZE_METHOD,
-                progressToken,
-                originalRequestContext: this.getOriginalRequestContext(originalMessage),
-            });
-        }
-        this.markClientDiscoveryTagsSent();
-    }
-    chooseOutboundGiftWrapKind() {
-        // Strict modes are deterministic.
-        if (this.giftWrapMode === GiftWrapMode.PERSISTENT)
-            return GIFT_WRAP_KIND;
-        if (this.giftWrapMode === GiftWrapMode.EPHEMERAL)
-            return EPHEMERAL_GIFT_WRAP_KIND;
-        if (this.serverSupportsEphemeralGiftWraps) {
-            return EPHEMERAL_GIFT_WRAP_KIND;
-        }
-        const supportsEphemeralFromInit = queryTags(this.serverInitializeEvent, NOSTR_TAGS.SUPPORT_ENCRYPTION_EPHEMERAL).isFlag;
-        return supportsEphemeralFromInit
-            ? EPHEMERAL_GIFT_WRAP_KIND
-            : GIFT_WRAP_KIND;
-    }
     getOriginalRequestContext(message) {
         var _a, _b, _c;
         if (!isJSONRPCRequest(message))
@@ -419,63 +268,14 @@ export class NostrClientTransport extends BaseNostrTransport {
      * Returns the CEP-41 stream session for a progress token, creating it lazily if needed.
      */
     getOrCreateOpenStreamSession(progressToken) {
-        return this.openStreamReceiver.getOrCreateSession(progressToken);
+        return this.openStreamFactory.getOrCreateSession(progressToken);
     }
     /**
      * Returns an outbound CEP-41 session whose local abort publishes an abort
      * notification to the server.
      */
     createOutboundOpenStreamSession(progressToken) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const existing = this.openStreamReceiver.getSession(progressToken);
-        if (existing) {
-            return existing;
-        }
-        let progress = 0;
-        return this.openStreamReceiver.createSession({
-            progressToken,
-            maxBufferedChunks: (_b = (_a = this.openStreamPolicy) === null || _a === void 0 ? void 0 : _a.maxBufferedChunksPerStream) !== null && _b !== void 0 ? _b : DEFAULT_MAX_BUFFERED_CHUNKS_PER_STREAM,
-            maxBufferedBytes: (_d = (_c = this.openStreamPolicy) === null || _c === void 0 ? void 0 : _c.maxBufferedBytesPerStream) !== null && _d !== void 0 ? _d : DEFAULT_MAX_BUFFERED_BYTES_PER_STREAM,
-            idleTimeoutMs: (_f = (_e = this.openStreamPolicy) === null || _e === void 0 ? void 0 : _e.idleTimeoutMs) !== null && _f !== void 0 ? _f : DEFAULT_OPEN_STREAM_IDLE_TIMEOUT_MS,
-            probeTimeoutMs: (_h = (_g = this.openStreamPolicy) === null || _g === void 0 ? void 0 : _g.probeTimeoutMs) !== null && _h !== void 0 ? _h : DEFAULT_OPEN_STREAM_PROBE_TIMEOUT_MS,
-            closeGracePeriodMs: (_k = (_j = this.openStreamPolicy) === null || _j === void 0 ? void 0 : _j.closeGracePeriodMs) !== null && _k !== void 0 ? _k : DEFAULT_OPEN_STREAM_CLOSE_GRACE_PERIOD_MS,
-            sendPing: async (nonce) => {
-                progress += 1;
-                await this.send({
-                    jsonrpc: '2.0',
-                    method: 'notifications/progress',
-                    params: buildOpenStreamPingFrame({
-                        progressToken,
-                        progress,
-                        nonce,
-                    }),
-                });
-            },
-            sendPong: async (nonce) => {
-                progress += 1;
-                await this.send({
-                    jsonrpc: '2.0',
-                    method: 'notifications/progress',
-                    params: buildOpenStreamPongFrame({
-                        progressToken,
-                        progress,
-                        nonce,
-                    }),
-                });
-            },
-            sendAbort: async (reason) => {
-                progress += 1;
-                await this.send({
-                    jsonrpc: '2.0',
-                    method: 'notifications/progress',
-                    params: buildOpenStreamAbortFrame({
-                        progressToken,
-                        progress,
-                        reason,
-                    }),
-                });
-            },
-        });
+        return this.openStreamFactory.createOutboundSession(progressToken);
     }
     /**
      * Resolves the next outbound CEP-41 session created from an SDK-generated progress token.
@@ -485,11 +285,22 @@ export class NostrClientTransport extends BaseNostrTransport {
             this.pendingOutboundOpenStreamResolvers.push({ resolve, reject });
         });
     }
+    /** Resolves the next outbound open-stream placeholder with an active session. */
+    resolvePendingOutboundOpenStream(progressToken) {
+        const pending = this.pendingOutboundOpenStreamResolvers.shift();
+        if (!pending) {
+            return;
+        }
+        pending.resolve({
+            progressToken,
+            stream: this.createOutboundOpenStreamSession(progressToken),
+        });
+    }
     /**
      * Returns the CEP-41 stream session for a progress token when it already exists.
      */
     getOpenStreamSession(progressToken) {
-        return this.openStreamReceiver.getSession(progressToken);
+        return this.openStreamFactory.getSession(progressToken);
     }
     /**
      * Emulates the server's initialize response for stateless clients.
@@ -517,281 +328,79 @@ export class NostrClientTransport extends BaseNostrTransport {
      * @param event - The incoming Nostr event
      */
     async processIncomingEvent(event) {
-        var _a, _b;
-        try {
-            let nostrEvent = event;
-            if (event.kind === GIFT_WRAP_KIND ||
-                event.kind === EPHEMERAL_GIFT_WRAP_KIND) {
-                if (!this.isGiftWrapKindAllowed(event.kind)) {
-                    this.logger.debug('Skipping gift wrap due to GiftWrapMode policy', {
-                        eventId: event.id,
-                        kind: event.kind,
-                    });
-                    return;
-                }
-                // Deduplicate gift-wrap envelopes before any expensive decryption.
-                if (this.seenEventIds.has(event.id)) {
-                    this.logger.debug('Skipping duplicate gift-wrapped event', {
-                        eventId: event.id,
-                    });
-                    return;
-                }
-                this.seenEventIds.set(event.id, true);
-                try {
-                    const decryptedContent = await withTimeout(decryptMessage(event, this.signer), DEFAULT_TIMEOUT_MS, 'Decrypt message timed out');
-                    nostrEvent = JSON.parse(decryptedContent);
-                    // Verify the inner event's cryptographic signature to prevent
-                    // identity forgery. Without this check an attacker can place the
-                    // server's pubkey inside the plaintext and spoof responses. (Fixes #64)
-                    if (!verifyEvent(nostrEvent)) {
-                        this.logger.error('Rejecting decrypted inner event with invalid signature', {
-                            innerEventId: nostrEvent.id,
-                            innerPubkey: nostrEvent.pubkey,
-                            outerEventId: event.id,
-                        });
-                        return;
-                    }
-                }
-                catch (decryptError) {
-                    this.logger.error('Failed to decrypt gift-wrapped event', {
-                        error: decryptError instanceof Error
-                            ? decryptError.message
-                            : String(decryptError),
-                        stack: decryptError instanceof Error ? decryptError.stack : undefined,
-                        eventId: event.id,
-                        pubkey: event.pubkey,
-                    });
-                    (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, decryptError instanceof Error
-                        ? decryptError
-                        : new Error('Failed to decrypt gift-wrapped event'));
-                    return;
-                }
-            }
-            if (nostrEvent.pubkey !== this.serverPubkey) {
-                this.logger.debug('Skipping event from unexpected server pubkey:', {
-                    receivedPubkey: nostrEvent.pubkey,
-                    expectedPubkey: this.serverPubkey,
-                    eventId: nostrEvent.id,
-                });
-                return;
-            }
-            if (event.kind !== GIFT_WRAP_KIND &&
-                event.kind !== EPHEMERAL_GIFT_WRAP_KIND) {
-                if (!verifyEvent(nostrEvent)) {
-                    this.logger.error('Rejecting unencrypted event with invalid signature', {
-                        eventId: nostrEvent.id,
-                        pubkey: nostrEvent.pubkey,
-                    });
-                    return;
-                }
-            }
-            this.learnServerDiscovery(nostrEvent);
-            const eTag = getNostrEventTag(nostrEvent.tags, 'e');
-            if (!this.serverInitializeEvent && eTag) {
-                try {
-                    const content = JSON.parse(nostrEvent.content);
-                    const parse = InitializeResultSchema.safeParse(content.result);
-                    if (parse.success) {
-                        this.serverInitializeEvent = nostrEvent;
-                        this.logger.info('Received server initialize event', {
-                            eventId: nostrEvent.id,
-                        });
-                    }
-                }
-                catch (_c) {
-                    this.logger.debug('Event is not a valid initialize response', {
-                        eventId: nostrEvent.id,
-                    });
-                }
-            }
-            const mcpMessage = this.convertNostrEventToMcpMessage(nostrEvent);
-            if (!mcpMessage) {
-                this.logger.error('Skipping invalid Nostr event with malformed JSON content', { eventId: nostrEvent.id, pubkey: nostrEvent.pubkey });
-                return;
-            }
-            // Message classification MUST be based on JSON-RPC type, not on the presence of an `e` tag.
-            // CEP-8 notifications are correlated (include `e`) but are still notifications.
-            if (isJSONRPCResultResponse(mcpMessage) ||
-                isJSONRPCErrorResponse(mcpMessage)) {
-                if (!eTag) {
-                    this.logger.warn('Received JSON-RPC response without correlation `e` tag', {
-                        eventId: nostrEvent.id,
-                    });
-                    return;
-                }
-                if (!this.correlationStore.hasPendingRequest(eTag)) {
-                    this.logger.warn('Received response for unknown/expired request', {
-                        eventId: nostrEvent.id,
-                        eTag,
-                        reason: 'Request not found in pending set - may be duplicate or late response',
-                    });
-                    return;
-                }
-                // Capture outer Nostr event envelope for capability list JSON-RPC responses.
-                // This allows consumers to inspect Nostr tags (e.g. CEP-8 `cap` tags)
-                // that are not present in the JSON-RPC payload.
-                if (isJSONRPCResultResponse(mcpMessage)) {
-                    const result = mcpMessage.result;
-                    if (ListToolsResultSchema.safeParse(result).success) {
-                        this.serverToolsListEvent = nostrEvent;
-                    }
-                    else if (ListResourcesResultSchema.safeParse(result).success) {
-                        this.serverResourcesListEvent = nostrEvent;
-                    }
-                    else if (ListResourceTemplatesResultSchema.safeParse(result).success) {
-                        this.serverResourceTemplatesListEvent = nostrEvent;
-                    }
-                    else if (ListPromptsResultSchema.safeParse(result).success) {
-                        this.serverPromptsListEvent = nostrEvent;
-                    }
-                }
-                this.handleResponse(eTag, mcpMessage);
-                return;
-            }
-            if (isJSONRPCNotification(mcpMessage)) {
-                this.handleNotification(nostrEvent.id, eTag !== null && eTag !== void 0 ? eTag : undefined, mcpMessage);
-                return;
-            }
-            this.logger.warn('Received unsupported JSON-RPC message type', {
-                eventId: nostrEvent.id,
-                hasETag: !!eTag,
-            });
-        }
-        catch (error) {
-            this.logger.error('Error handling incoming Nostr event', {
-                error: error instanceof Error ? error.message : String(error),
-                stack: error instanceof Error ? error.stack : undefined,
-                eventId: event.id,
-                pubkey: event.pubkey,
-                kind: event.kind,
-            });
-            (_b = this.onerror) === null || _b === void 0 ? void 0 : _b.call(this, error instanceof Error
-                ? error
-                : new Error('Failed to handle incoming Nostr event'));
-        }
+        await this.inboundCoordinator.processIncomingEvent(event);
     }
     /**
      * Gets the server's initialize event if received.
      * @returns The server initialize event or undefined
      */
     getServerInitializeEvent() {
-        return this.serverInitializeEvent;
+        return this.metadataStore.getServerInitializeEvent();
     }
     /**
      * Gets the parsed initialize result from the server's initialize event content.
      * @returns The parsed initialize result or undefined when unavailable or invalid
      */
     getServerInitializeResult() {
-        if (!this.serverInitializeEvent) {
-            return undefined;
-        }
-        try {
-            const content = JSON.parse(this.serverInitializeEvent.content);
-            const parse = InitializeResultSchema.safeParse(content.result);
-            return parse.success ? parse.data : undefined;
-        }
-        catch (_a) {
-            return undefined;
-        }
+        return this.metadataStore.getServerInitializeResult();
     }
     /**
      * Returns whether the server initialize event advertises encrypted transport support.
      * @returns True when the initialize event contains the support_encryption tag
      */
     serverSupportsEncryption() {
-        return queryTags(this.serverInitializeEvent, NOSTR_TAGS.SUPPORT_ENCRYPTION)
-            .isFlag;
+        return this.metadataStore.serverSupportsEncryption();
     }
     /**
      * Returns whether the server initialize event advertises ephemeral gift wrap support.
      * @returns True when the initialize event contains the support_encryption_ephemeral tag
      */
     serverSupportsEphemeralEncryption() {
-        return queryTags(this.serverInitializeEvent, NOSTR_TAGS.SUPPORT_ENCRYPTION_EPHEMERAL).isFlag;
+        return this.metadataStore.serverSupportsEphemeralEncryption();
     }
     /**
      * Gets the server name tag from the initialize event.
      * @returns The name tag value or undefined
      */
     getServerInitializeName() {
-        var _a, _b;
-        return getNostrEventTag((_b = (_a = this.serverInitializeEvent) === null || _a === void 0 ? void 0 : _a.tags) !== null && _b !== void 0 ? _b : [], NOSTR_TAGS.NAME);
+        return this.metadataStore.getServerInitializeName();
     }
     /**
      * Gets the server about tag from the initialize event.
      * @returns The about tag value or undefined
      */
     getServerInitializeAbout() {
-        var _a, _b;
-        return getNostrEventTag((_b = (_a = this.serverInitializeEvent) === null || _a === void 0 ? void 0 : _a.tags) !== null && _b !== void 0 ? _b : [], NOSTR_TAGS.ABOUT);
+        return this.metadataStore.getServerInitializeAbout();
     }
     /**
      * Gets the server website tag from the initialize event.
      * @returns The website tag value or undefined
      */
     getServerInitializeWebsite() {
-        var _a, _b;
-        return getNostrEventTag((_b = (_a = this.serverInitializeEvent) === null || _a === void 0 ? void 0 : _a.tags) !== null && _b !== void 0 ? _b : [], NOSTR_TAGS.WEBSITE);
+        return this.metadataStore.getServerInitializeWebsite();
     }
     /**
      * Gets the server picture tag from the initialize event.
      * @returns The picture tag value or undefined
      */
     getServerInitializePicture() {
-        var _a, _b;
-        return getNostrEventTag((_b = (_a = this.serverInitializeEvent) === null || _a === void 0 ? void 0 : _a.tags) !== null && _b !== void 0 ? _b : [], NOSTR_TAGS.PICTURE);
+        return this.metadataStore.getServerInitializePicture();
     }
     /** Gets the server's most recently observed tools/list event envelope, if any. */
     getServerToolsListEvent() {
-        return this.serverToolsListEvent;
+        return this.metadataStore.getServerToolsListEvent();
     }
     /** Gets the server's most recently observed resources/list event envelope, if any. */
     getServerResourcesListEvent() {
-        return this.serverResourcesListEvent;
+        return this.metadataStore.getServerResourcesListEvent();
     }
     /** Gets the server's most recently observed resources/templates/list event envelope, if any. */
     getServerResourceTemplatesListEvent() {
-        return this.serverResourceTemplatesListEvent;
+        return this.metadataStore.getServerResourceTemplatesListEvent();
     }
     /** Gets the server's most recently observed prompts/list event envelope, if any. */
     getServerPromptsListEvent() {
-        return this.serverPromptsListEvent;
-    }
-    learnServerDiscovery(event) {
-        if (!Array.isArray(event.tags)) {
-            return;
-        }
-        const discovered = parseDiscoveredPeerCapabilities(event.tags);
-        if (discovered.discoveryTags.length === 0) {
-            return;
-        }
-        this.serverSupportsEphemeralGiftWraps || (this.serverSupportsEphemeralGiftWraps = discovered.supportsEphemeralEncryption);
-        this.serverSupportsOversizedTransfer || (this.serverSupportsOversizedTransfer = discovered.supportsOversizedTransfer);
-        this.serverSupportsOpenStream || (this.serverSupportsOpenStream = discovered.supportsOpenStream);
-        if (!this.serverInitializeEvent) {
-            this.serverInitializeEvent = event;
-            this.logger.info('Learned server discovery tags from inbound event', {
-                eventId: event.id,
-            });
-            return;
-        }
-        const currentHasInitializeResult = InitializeResultSchema.safeParse(this.getInitializeResultCandidate(event)).success;
-        const existingHasInitializeResult = InitializeResultSchema.safeParse(this.getInitializeResultCandidate(this.serverInitializeEvent)).success;
-        if (!existingHasInitializeResult && currentHasInitializeResult) {
-            this.serverInitializeEvent = event;
-            this.logger.info('Upgraded learned server discovery event to initialize response', {
-                eventId: event.id,
-            });
-        }
-    }
-    getInitializeResultCandidate(event) {
-        try {
-            const content = JSON.parse(event.content);
-            return content.result;
-        }
-        catch (_a) {
-            return undefined;
-        }
+        return this.metadataStore.getServerPromptsListEvent();
     }
     async resolveOperationalRelayHandler() {
         var _a, _b, _c;
@@ -838,7 +447,7 @@ export class NostrClientTransport extends BaseNostrTransport {
      * @param mcpMessage - The JSON-RPC notification message
      */
     handleNotification(eventId, correlatedEventId, mcpMessage) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         try {
             const result = NotificationSchema.safeParse(mcpMessage);
             if (!result.success) {
@@ -857,59 +466,8 @@ export class NostrClientTransport extends BaseNostrTransport {
                 });
                 return;
             }
-            // CEP-22: intercept oversized-transfer frames and do NOT forward raw frames.
-            if (isJSONRPCNotification(mcpMessage) &&
-                mcpMessage.method === 'notifications/progress' &&
-                OpenStreamReceiver.isOpenStreamFrame(mcpMessage)) {
-                this.openStreamReceiver
-                    .processFrame(mcpMessage)
-                    .catch((err) => {
-                    var _a;
-                    this.logger.error('Open stream error (client)', {
-                        error: err instanceof Error ? err.message : String(err),
-                    });
-                    (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, err instanceof Error ? err : new Error(String(err)));
-                });
-                (_a = this.onmessage) === null || _a === void 0 ? void 0 : _a.call(this, mcpMessage);
-                (_b = this.onmessageWithContext) === null || _b === void 0 ? void 0 : _b.call(this, mcpMessage, {
-                    eventId,
-                    correlatedEventId,
-                });
-                return;
-            }
-            if (isJSONRPCNotification(mcpMessage) &&
-                mcpMessage.method === 'notifications/progress' &&
-                OversizedTransferReceiver.isOversizedFrame(mcpMessage)) {
-                this.oversizedReceiver
-                    .processFrame(mcpMessage)
-                    .then((synthetic) => {
-                    if (synthetic !== null) {
-                        if (isJSONRPCResultResponse(synthetic) ||
-                            isJSONRPCErrorResponse(synthetic)) {
-                            if (correlatedEventId) {
-                                this.handleResponse(correlatedEventId, synthetic);
-                            }
-                            else {
-                                this.logger.warn('Oversized response completed without correlation `e` tag', {
-                                    eventId,
-                                });
-                            }
-                            return;
-                        }
-                        this.handleNotification(eventId, correlatedEventId, synthetic);
-                    }
-                })
-                    .catch((err) => {
-                    var _a;
-                    this.logger.error('Oversized transfer error (client)', {
-                        error: err instanceof Error ? err.message : String(err),
-                    });
-                    (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, err instanceof Error ? err : new Error(String(err)));
-                });
-                return;
-            }
-            (_c = this.onmessage) === null || _c === void 0 ? void 0 : _c.call(this, mcpMessage);
-            (_d = this.onmessageWithContext) === null || _d === void 0 ? void 0 : _d.call(this, mcpMessage, {
+            (_a = this.onmessage) === null || _a === void 0 ? void 0 : _a.call(this, mcpMessage);
+            (_b = this.onmessageWithContext) === null || _b === void 0 ? void 0 : _b.call(this, mcpMessage, {
                 eventId,
                 correlatedEventId,
             });
@@ -919,11 +477,17 @@ export class NostrClientTransport extends BaseNostrTransport {
                 error: error instanceof Error ? error.message : String(error),
                 stack: error instanceof Error ? error.stack : undefined,
             });
-            (_e = this.onerror) === null || _e === void 0 ? void 0 : _e.call(this, error instanceof Error
+            (_c = this.onerror) === null || _c === void 0 ? void 0 : _c.call(this, error instanceof Error
                 ? error
                 : new Error('Failed to handle incoming notification'));
         }
     }
+    buildOutboundClientTags(params) {
+        return this.capabilityNegotiator.buildOutboundTags(params);
+    }
+    chooseOutboundGiftWrapKind() {
+        return this.capabilityNegotiator.chooseOutboundGiftWrapKind();
+    }
     /**
      * Test-only accessor for internal state.
      * @internal
@@ -937,13 +501,13 @@ export class NostrClientTransport extends BaseNostrTransport {
             discoveryRelayUrls: [...this.discoveryRelayUrls],
             fallbackOperationalRelayUrls: [...this.fallbackOperationalRelayUrls],
             relayUrls: (_c = (_b = (_a = this.relayHandler).getRelayUrls) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : [],
-            serverInitializeEvent: this.serverInitializeEvent,
-            serverToolsListEvent: this.serverToolsListEvent,
-            serverResourcesListEvent: this.serverResourcesListEvent,
-            serverResourceTemplatesListEvent: this.serverResourceTemplatesListEvent,
-            serverPromptsListEvent: this.serverPromptsListEvent,
+            serverInitializeEvent: this.metadataStore.getServerInitializeEvent(),
+            serverToolsListEvent: this.metadataStore.getServerToolsListEvent(),
+            serverResourcesListEvent: this.metadataStore.getServerResourcesListEvent(),
+            serverResourceTemplatesListEvent: this.metadataStore.getServerResourceTemplatesListEvent(),
+            serverPromptsListEvent: this.metadataStore.getServerPromptsListEvent(),
             oversizedReceiver: this.oversizedReceiver,
-            openStreamReceiver: this.openStreamReceiver,
+            openStreamReceiver: this.openStreamFactory.getReceiver(),
         };
     }
 }