Feat/cvm mcp sdk

.changeset/cool-streets-kneel.md

@@ -0,0 +1,5 @@
+---
+'@contextvm/sdk': minor
+---
+
+chore(deps): replace @modelcontextprotocol/sdk with @contextvm/mcp-sdk

CHANGELOG.md

@@ -709,7 +709,7 @@ Additionally, tests have been updated to reflect the new async behavior and a ne
   the new eviction protection logic.
 
   Updated dependencies:
-  - @modelcontextprotocol/sdk to 1.25.3
+  - @contextvm/mcp-sdk to 1.25.3
   - pino to 10.2.1
   - typescript-eslint to 8.53.1
 
@@ -838,7 +838,7 @@ Additionally, tests have been updated to reflect the new async behavior and a ne
 ### Patch Changes
 
 - feat: update dependencies and enhance relay pool functionality
-  - Update @modelcontextprotocol/sdk from 1.24.2 to 1.25.1
+  - Update @contextvm/mcp-sdk from 1.24.2 to 1.25.1
   - Update devDependencies: @eslint/js, @types/bun, eslint, typescript-eslint
   - Update dependencies: nostr-tools
   - Switch mock transport to use ApplesauceRelayPool

package.json

@@ -102,7 +102,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@contextvm/mcp-sdk": "^1.29.1",
     "@noble/hashes": "^2.2.0",
     "applesauce-relay": "^5.2.0",
     "canonicalize": "^2.1.0",

src/__mocks__/mock-gateway-server.ts

@@ -2,7 +2,7 @@
 import { NostrMCPGateway } from '../gateway/index.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';
 import { ApplesauceRelayPool } from '../relay/applesauce-relay-pool.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { StdioClientTransport } from '@contextvm/mcp-sdk/client/stdio';
 import { bytesToHex } from 'nostr-tools/utils';
 import { generateSecretKey } from 'nostr-tools';
 

src/__mocks__/mock-mcp-client-nostr-transport.ts

@@ -1,4 +1,4 @@
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { Client } from '@contextvm/mcp-sdk/client';
 import { NostrClientTransport } from '../transport/nostr-client-transport.js';
 import { bytesToHex } from 'nostr-tools/utils';
 import { generateSecretKey } from 'nostr-tools';

src/__mocks__/mock-mcp-server-nostr-transport.ts

@@ -1,7 +1,4 @@
-import {
-  McpServer,
-  ResourceTemplate,
-} from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer, ResourceTemplate } from '@contextvm/mcp-sdk/server/mcp';
 import { z } from 'zod';
 import { NostrServerTransport } from '../transport/nostr-server-transport.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';

src/__mocks__/mock-mcp-server.ts

@@ -1,8 +1,5 @@
-import {
-  McpServer,
-  ResourceTemplate,
-} from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { McpServer, ResourceTemplate } from '@contextvm/mcp-sdk/server/mcp';
+import { StdioServerTransport } from '@contextvm/mcp-sdk/server/stdio';
 import { z } from 'zod';
 
 // Create an MCP server

src/__mocks__/proxy-stdio-server.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { StdioServerTransport } from '@contextvm/mcp-sdk/server/stdio';
 import { NostrMCPProxy } from '../proxy/index.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';
 import { bytesToHex } from 'nostr-tools/utils';

src/core/interfaces.ts

@@ -3,7 +3,7 @@ import {
   ListResourcesRequest,
   ListResourceTemplatesRequest,
   ListToolsRequest,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import type { EventTemplate, Filter, NostrEvent } from 'nostr-tools';
 
 /**

src/core/utils/common-schema.ts

@@ -1,5 +1,5 @@
 import canonicalizePackage from 'canonicalize';
-import type { Tool } from '@modelcontextprotocol/sdk/types.js';
+import type { Tool } from '@contextvm/mcp-sdk/types.js';
 import { sha256 } from '@noble/hashes/sha2.js';
 import { bytesToHex } from '@noble/hashes/utils.js';
 

src/core/utils/serializers.ts

@@ -1,5 +1,5 @@
 import type { NostrEvent, UnsignedEvent } from 'nostr-tools';
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import { createLogger } from './logger.js';
 
 const logger = createLogger('serializers');

src/core/utils/utils.ts

@@ -2,7 +2,7 @@ import {
   JSONRPCMessage,
   JSONRPCMessageSchema,
   JSONRPCRequest,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import { NostrEvent } from 'nostr-tools';
 
 /**

src/gateway/gateway-announcement.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from 'bun:test';
 import { sleep } from 'bun';
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
+import type { Transport } from '@contextvm/mcp-sdk/shared/transport';
 import { generateSecretKey, getPublicKey } from 'nostr-tools';
 import { bytesToHex, hexToBytes } from 'nostr-tools/utils';
 import { createLogger } from '../core/utils/logger.js';

src/gateway/gateway-concurrency.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, test, expect } from 'bun:test';
 import { sleep } from 'bun';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { Client } from '@contextvm/mcp-sdk/client';
+import { StdioClientTransport } from '@contextvm/mcp-sdk/client/stdio';
 import { NostrMCPGateway } from './index.js';
 import { NostrClientTransport } from '../transport/nostr-client-transport.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';

src/gateway/gateway-per-client.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from 'bun:test';
 import { sleep } from 'bun';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { Client } from '@contextvm/mcp-sdk/client';
+import { StdioClientTransport } from '@contextvm/mcp-sdk/client/stdio';
 import { generateSecretKey, getPublicKey } from 'nostr-tools';
 import { bytesToHex, hexToBytes } from 'nostr-tools/utils';
 import { createLogger } from '../core/utils/logger.js';

src/gateway/gateway.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, test, expect } from 'bun:test';
 import { sleep } from 'bun';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { Client } from '@contextvm/mcp-sdk/client';
+import { StdioClientTransport } from '@contextvm/mcp-sdk/client/stdio';
 import { NostrMCPGateway } from './index.js';
 import { NostrClientTransport } from '../transport/nostr-client-transport.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';

src/gateway/index.ts

@@ -1,8 +1,8 @@
 import {
   isInitializeRequest,
   type JSONRPCMessage,
-} from '@modelcontextprotocol/sdk/types.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+} from '@contextvm/mcp-sdk/types.js';
+import type { Transport } from '@contextvm/mcp-sdk/shared/transport';
 import {
   NostrServerTransport,
   NostrServerTransportOptions,

src/payments/client-payments.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { Transport } from '@contextvm/mcp-sdk/shared/transport';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import { withClientPayments } from './client-payments.js';
 import type { PaymentHandlerRequest } from './types.js';
 import { NostrClientTransport } from '../transport/nostr-client-transport.js';

src/payments/client-payments.ts

@@ -1,11 +1,11 @@
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { Transport } from '@contextvm/mcp-sdk/shared/transport';
 import {
   isJSONRPCNotification,
   isJSONRPCResultResponse,
   isJSONRPCErrorResponse,
   JSONRPCNotification,
   type JSONRPCMessage,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import { NostrClientTransport } from '../transport/nostr-client-transport.js';
 import {
   PaymentHandler,

src/payments/nip57/lnurl.test.ts

@@ -72,11 +72,4 @@ describe('nip57/lnurl', () => {
       globalThis.fetch = originalFetch;
     }
   });
-
-  // Real-network smoke test (skipped by default).
-  test('fetchLnurlPayParams() works against ContextVM@coinos.io', async () => {
-    const res = await fetchLnurlPayParams({ lnAddress: 'ContextVM@coinos.io' });
-    expect(typeof res.callback).toBe('string');
-    expect(res.callback.length).toBeGreaterThan(0);
-  });
 });

src/payments/nwc-paid-capability-e2e.test.ts

@@ -7,8 +7,8 @@ import {
   test,
 } from 'bun:test';
 import { sleep } from 'bun';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { Client } from '@contextvm/mcp-sdk/client';
+import { McpServer } from '@contextvm/mcp-sdk/server/mcp';
 import { z } from 'zod';
 import { bytesToHex } from 'nostr-tools/utils';
 import { generateSecretKey, getPublicKey } from 'nostr-tools/pure';

src/payments/resolve-price.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test';
-import type { JSONRPCRequest } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCRequest } from '@contextvm/mcp-sdk/types.js';
 import { createServerPaymentsMiddleware } from './server-payments.js';
 
 describe('resolvePrice (server payments)', () => {

src/payments/server-payments.ts

@@ -1,4 +1,4 @@
-import { type JSONRPCRequest } from '@modelcontextprotocol/sdk/types.js';
+import { type JSONRPCRequest } from '@contextvm/mcp-sdk/types.js';
 import {
   CorrelatedNotificationSender,
   PaymentAcceptedNotification,

src/payments/types.ts

@@ -2,7 +2,7 @@ import type {
   JSONRPCMessage,
   JSONRPCNotification,
   JSONRPCRequest,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 
 /**
  * A priced capability pattern, consistent with server-side authorization exclusions.

src/proxy/index.ts

@@ -1,5 +1,5 @@
-import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-import { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import { Transport } from '@contextvm/mcp-sdk/shared/transport';
+import { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import {
   NostrClientTransport,
   NostrTransportOptions,

src/proxy/proxy-gateway-e2e.test.ts

@@ -7,16 +7,16 @@ import {
   expect,
 } from 'bun:test';
 import { sleep } from 'bun';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { Client } from '@contextvm/mcp-sdk/client';
 import {
   StdioClientTransport,
   StdioClientTransport as StdioClientTransportForGateway,
-} from '@modelcontextprotocol/sdk/client/stdio.js';
+} from '@contextvm/mcp-sdk/client/stdio';
 import { NostrMCPGateway } from '../gateway/index.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';
 import { generateSecretKey, getPublicKey } from 'nostr-tools';
 import { bytesToHex, hexToBytes } from 'nostr-tools/utils';
-import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { CallToolResult } from '@contextvm/mcp-sdk/types.js';
 import { ApplesauceRelayPool } from '../relay/applesauce-relay-pool.js';
 import {
   spawnMockRelayWithEnv,

src/transport/base-nostr-transport.ts

@@ -1,4 +1,4 @@
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import type { Filter, NostrEvent } from 'nostr-tools';
 import {
   EncryptionMode,

src/transport/call-tool-stream.e2e.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { Client } from '@contextvm/mcp-sdk/client';
+import { McpServer } from '@contextvm/mcp-sdk/server/mcp';
 import { generateSecretKey, getPublicKey } from 'nostr-tools/pure';
 import { bytesToHex, hexToBytes } from 'nostr-tools/utils';
 import { z } from 'zod';

src/transport/call-tool-stream.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { CallToolRequest } from '@modelcontextprotocol/sdk/types.js';
+import { Client } from '@contextvm/mcp-sdk/client';
+import type { CallToolRequest } from '@contextvm/mcp-sdk/types.js';
 import { callToolStream } from './call-tool-stream.js';
 import { OpenStreamSession } from './open-stream/index.js';
 

src/transport/call-tool-stream.ts

@@ -1,5 +1,5 @@
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { CallToolRequest } from '@modelcontextprotocol/sdk/types.js';
+import type { Client } from '@contextvm/mcp-sdk/client';
+import type { CallToolRequest } from '@contextvm/mcp-sdk/types.js';
 import type { OpenStreamSession } from './open-stream/index.js';
 import type { NostrClientTransport } from './nostr-client-transport.js';
 

src/transport/middleware.ts

@@ -1,4 +1,4 @@
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 
 /**
  * Inbound middleware hook for server transports.

src/transport/nostr-client-transport.test.ts

@@ -8,7 +8,7 @@ import {
 } from 'bun:test';
 import { sleep } from 'bun';
 import type { MockRelayInstance } from '../__mocks__/mock-relay-server.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { Client } from '@contextvm/mcp-sdk/client';
 import { NostrServerTransport } from './nostr-server-transport.js';
 import { NostrClientTransport } from './nostr-client-transport.js';
 import { PrivateKeySigner } from '../signer/private-key-signer.js';
@@ -17,15 +17,15 @@ import type { NostrEvent } from 'nostr-tools';
 import { nip19 } from 'nostr-tools';
 import { bytesToHex, hexToBytes } from 'nostr-tools/utils';
 import { ApplesauceRelayPool } from '../relay/applesauce-relay-pool.js';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@contextvm/mcp-sdk/server/mcp';
 import { z } from 'zod';
 import {
   InitializeResult,
   JSONRPCMessage,
   ListToolsResult,
   TextContent,
   ToolResultContent,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import { EncryptionMode } from '../core/interfaces.js';
 import {
   CTXVM_MESSAGES_KIND,

src/transport/nostr-client-transport.ts

@@ -5,8 +5,8 @@ import {
   isJSONRPCRequest,
   isJSONRPCNotification,
   type JSONRPCResponse,
-} from '@modelcontextprotocol/sdk/types.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+} from '@contextvm/mcp-sdk/types.js';
+import type { Transport } from '@contextvm/mcp-sdk/shared/transport';
 import {
   DEFAULT_BOOTSTRAP_RELAY_URLS,
   DEFAULT_TIMEOUT_MS,
@@ -104,7 +104,7 @@ export interface NostrTransportOptions extends Omit<
 
 /**
  * A client transport layer for CTXVM that uses Nostr events for communication.
- * Implements the Transport interface from the @modelcontextprotocol/sdk.
+ * Implements the Transport interface from the @contextvm/mcp-sdk.
  * Handles request/response correlation and optional stateless mode emulation.
  */
 export class NostrClientTransport

src/transport/nostr-client/correlation-store.ts

@@ -1,4 +1,4 @@
-import type { JSONRPCResponse } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCResponse } from '@contextvm/mcp-sdk/types.js';
 import { LruCache } from '../../core/utils/lru-cache.js';
 
 /**

src/transport/nostr-client/inbound-coordinator.ts

@@ -8,7 +8,7 @@ import {
   isJSONRPCResultResponse,
   isJSONRPCErrorResponse,
   isJSONRPCNotification,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import { type NostrEvent } from 'nostr-tools';
 import { type Logger } from '../../core/utils/logger.js';
 import { getNostrEventTag } from '../../core/utils/serializers.js';

src/transport/nostr-client/inbound-notification-dispatcher.ts

@@ -4,7 +4,7 @@ import {
   isJSONRPCNotification,
   isJSONRPCResultResponse,
   isJSONRPCErrorResponse,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import { type Logger } from '../../core/utils/logger.js';
 import { OpenStreamReceiver } from '../open-stream/index.js';
 import { OversizedTransferReceiver } from '../oversized-transfer/index.js';

src/transport/nostr-client/open-stream-factory.ts

@@ -13,7 +13,7 @@ import {
   DEFAULT_MAX_BUFFERED_CHUNKS_PER_STREAM,
 } from '../open-stream/constants.js';
 import type { OpenStreamTransportPolicy } from '../open-stream-policy.js';
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import type { Logger } from '../../core/utils/logger.js';
 
 /** Dependencies for the ClientOpenStreamFactory. */

src/transport/nostr-client/outbound-sender.ts

@@ -1,7 +1,7 @@
 import {
   type JSONRPCMessage,
   isJSONRPCRequest,
-} from '@modelcontextprotocol/sdk/types.js';
+} from '@contextvm/mcp-sdk/types.js';
 import { CTXVM_MESSAGES_KIND, INITIALIZE_METHOD } from '../../core/index.js';
 import { type Logger } from '../../core/utils/logger.js';
 import {

src/transport/nostr-client/oversized-client-sender.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test';
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import type { NostrEvent } from 'nostr-tools';
 import type { Logger } from '../../core/utils/logger.js';
 import { sendOversizedClientRequest } from './oversized-client-sender.js';

src/transport/nostr-client/oversized-client-sender.ts

@@ -1,4 +1,4 @@
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { JSONRPCMessage } from '@contextvm/mcp-sdk/types.js';
 import type { NostrEvent } from 'nostr-tools';
 import type { Logger } from '../../core/utils/logger.js';
 import { CTXVM_MESSAGES_KIND } from '../../core/constants.js';