fix: examples imports

mattzcarey · mattzcarey · commit ede98ce78669 · 2025-12-24T13:55:45.000Z
diff --git a/examples/server/package.json b/examples/server/package.json
@@ -39,6 +39,7 @@
         "@modelcontextprotocol/examples-shared": "workspace:^",
         "@modelcontextprotocol/server": "workspace:^",
         "@modelcontextprotocol/express": "workspace:^",
+        "@modelcontextprotocol/node": "workspace:^",
         "cors": "catalog:runtimeServerOnly",
         "express": "catalog:runtimeServerOnly",
         "zod": "catalog:runtimeShared"
diff --git a/examples/server/src/elicitationFormExample.ts b/examples/server/src/elicitationFormExample.ts
@@ -9,7 +9,9 @@
 
 import { randomUUID } from 'node:crypto';
 
-import { createMcpExpressApp, isInitializeRequest, McpServer, StreamableHTTPServerTransport } from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import { isInitializeRequest, McpServer } from '@modelcontextprotocol/server';
 import { type Request, type Response } from 'express';
 
 // Create MCP server - it will automatically use AjvJsonSchemaValidator with sensible defaults
diff --git a/examples/server/src/elicitationUrlExample.ts b/examples/server/src/elicitationUrlExample.ts
@@ -10,18 +10,15 @@
 import { randomUUID } from 'node:crypto';
 
 import { setupAuthServer } from '@modelcontextprotocol/examples-shared';
-import type { CallToolResult, ElicitRequestURLParams, ElicitResult, OAuthMetadata } from '@modelcontextprotocol/express';
 import {
-    checkResourceAllowed,
     createMcpExpressApp,
     getOAuthProtectedResourceMetadataUrl,
-    isInitializeRequest,
     mcpAuthMetadataRouter,
-    McpServer,
-    requireBearerAuth,
-    StreamableHTTPServerTransport,
-    UrlElicitationRequiredError
+    requireBearerAuth
 } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import type { CallToolResult, ElicitRequestURLParams, ElicitResult, OAuthMetadata } from '@modelcontextprotocol/server';
+import { checkResourceAllowed, isInitializeRequest, McpServer, UrlElicitationRequiredError } from '@modelcontextprotocol/server';
 import cors from 'cors';
 import type { Request, Response } from 'express';
 import express from 'express';
diff --git a/examples/server/src/honoWebStandardStreamableHttp.ts b/examples/server/src/honoWebStandardStreamableHttp.ts
@@ -8,8 +8,8 @@
  */
 
 import { serve } from '@hono/node-server';
-import type { CallToolResult } from '@modelcontextprotocol/express';
-import { McpServer, WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/express';
+import type { CallToolResult } from '@modelcontextprotocol/server';
+import { HTTPServerTransport, McpServer } from '@modelcontextprotocol/server';
 import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import * as z from 'zod/v4';
@@ -36,7 +36,7 @@ server.registerTool(
 );
 
 // Create a stateless transport (no options = no session management)
-const transport = new WebStandardStreamableHTTPServerTransport();
+const transport = new HTTPServerTransport();
 
 // Create the Hono app
 const app = new Hono();
diff --git a/examples/server/src/inMemoryEventStore.ts b/examples/server/src/inMemoryEventStore.ts
@@ -1,4 +1,4 @@
-import type { EventStore, JSONRPCMessage } from '@modelcontextprotocol/express';
+import type { EventStore, JSONRPCMessage } from '@modelcontextprotocol/server';
 
 /**
  * Simple in-memory implementation of the EventStore interface for resumability
diff --git a/examples/server/src/jsonResponseStreamableHttp.ts b/examples/server/src/jsonResponseStreamableHttp.ts
@@ -1,7 +1,9 @@
 import { randomUUID } from 'node:crypto';
 
-import type { CallToolResult } from '@modelcontextprotocol/express';
-import { createMcpExpressApp, isInitializeRequest, McpServer, StreamableHTTPServerTransport } from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import type { CallToolResult } from '@modelcontextprotocol/server';
+import { isInitializeRequest, McpServer } from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 import * as z from 'zod/v4';
 
diff --git a/examples/server/src/mcpServerOutputSchema.ts b/examples/server/src/mcpServerOutputSchema.ts
@@ -4,7 +4,7 @@
  * This demonstrates how to easily create tools with structured output
  */
 
-import { McpServer, StdioServerTransport } from '@modelcontextprotocol/express';
+import { McpServer, StdioServerTransport } from '@modelcontextprotocol/server';
 import * as z from 'zod/v4';
 
 const server = new McpServer({
diff --git a/examples/server/src/simpleSseServer.ts b/examples/server/src/simpleSseServer.ts
@@ -1,5 +1,7 @@
-import type { CallToolResult } from '@modelcontextprotocol/express';
-import { createMcpExpressApp, McpServer, SSEServerTransport } from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { SSEServerTransport } from '@modelcontextprotocol/node';
+import type { CallToolResult } from '@modelcontextprotocol/server';
+import { McpServer } from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 import * as z from 'zod/v4';
 
diff --git a/examples/server/src/simpleStatelessStreamableHttp.ts b/examples/server/src/simpleStatelessStreamableHttp.ts
@@ -1,5 +1,7 @@
-import type { CallToolResult, GetPromptResult, ReadResourceResult } from '@modelcontextprotocol/express';
-import { createMcpExpressApp, McpServer, StreamableHTTPServerTransport } from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import type { CallToolResult, GetPromptResult, ReadResourceResult } from '@modelcontextprotocol/server';
+import { McpServer } from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 import * as z from 'zod/v4';
 
diff --git a/examples/server/src/simpleStreamableHttp.ts b/examples/server/src/simpleStreamableHttp.ts
@@ -1,27 +1,29 @@
 import { randomUUID } from 'node:crypto';
 
 import { setupAuthServer } from '@modelcontextprotocol/examples-shared';
+import {
+    createMcpExpressApp,
+    getOAuthProtectedResourceMetadataUrl,
+    mcpAuthMetadataRouter,
+    requireBearerAuth
+} from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
 import type {
     CallToolResult,
     GetPromptResult,
     OAuthMetadata,
     PrimitiveSchemaDefinition,
     ReadResourceResult,
     ResourceLink
-} from '@modelcontextprotocol/express';
+} from '@modelcontextprotocol/server';
 import {
     checkResourceAllowed,
-    createMcpExpressApp,
     ElicitResultSchema,
-    getOAuthProtectedResourceMetadataUrl,
     InMemoryTaskMessageQueue,
     InMemoryTaskStore,
     isInitializeRequest,
-    mcpAuthMetadataRouter,
-    McpServer,
-    requireBearerAuth,
-    StreamableHTTPServerTransport
-} from '@modelcontextprotocol/express';
+    McpServer
+} from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 import * as z from 'zod/v4';
 
diff --git a/examples/server/src/simpleTaskInteractive.ts b/examples/server/src/simpleTaskInteractive.ts
@@ -11,6 +11,8 @@
 
 import { randomUUID } from 'node:crypto';
 
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
 import type {
     CallToolResult,
     CreateMessageRequest,
@@ -32,19 +34,17 @@ import type {
     TaskMessageQueue,
     TextContent,
     Tool
-} from '@modelcontextprotocol/express';
+} from '@modelcontextprotocol/server';
 import {
     CallToolRequestSchema,
-    createMcpExpressApp,
     GetTaskPayloadRequestSchema,
     GetTaskRequestSchema,
     InMemoryTaskStore,
     isTerminal,
     ListToolsRequestSchema,
     RELATED_TASK_META_KEY,
-    Server,
-    StreamableHTTPServerTransport
-} from '@modelcontextprotocol/express';
+    Server
+} from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 
 // ============================================================================
diff --git a/examples/server/src/sseAndStreamableHttpCompatibleServer.ts b/examples/server/src/sseAndStreamableHttpCompatibleServer.ts
@@ -1,13 +1,9 @@
 import { randomUUID } from 'node:crypto';
 
-import type { CallToolResult } from '@modelcontextprotocol/express';
-import {
-    createMcpExpressApp,
-    isInitializeRequest,
-    McpServer,
-    SSEServerTransport,
-    StreamableHTTPServerTransport
-} from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { SSEServerTransport, StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import type { CallToolResult } from '@modelcontextprotocol/server';
+import { isInitializeRequest, McpServer } from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 import * as z from 'zod/v4';
 
diff --git a/examples/server/src/ssePollingExample.ts b/examples/server/src/ssePollingExample.ts
@@ -14,8 +14,10 @@
  */
 import { randomUUID } from 'node:crypto';
 
-import type { CallToolResult } from '@modelcontextprotocol/express';
-import { createMcpExpressApp, McpServer, StreamableHTTPServerTransport } from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import type { CallToolResult } from '@modelcontextprotocol/server';
+import { McpServer } from '@modelcontextprotocol/server';
 import cors from 'cors';
 import type { Request, Response } from 'express';
 
diff --git a/examples/server/src/standaloneSseWithGetStreamableHttp.ts b/examples/server/src/standaloneSseWithGetStreamableHttp.ts
@@ -1,7 +1,9 @@
 import { randomUUID } from 'node:crypto';
 
-import type { ReadResourceResult } from '@modelcontextprotocol/express';
-import { createMcpExpressApp, isInitializeRequest, McpServer, StreamableHTTPServerTransport } from '@modelcontextprotocol/express';
+import { createMcpExpressApp } from '@modelcontextprotocol/express';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/node';
+import type { ReadResourceResult } from '@modelcontextprotocol/server';
+import { isInitializeRequest, McpServer } from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 
 // Create an MCP server with implementation details
diff --git a/examples/server/src/toolWithSampleServer.ts b/examples/server/src/toolWithSampleServer.ts
@@ -1,6 +1,6 @@
 // Run with: pnpm tsx src/toolWithSampleServer.ts
 
-import { McpServer, StdioServerTransport } from '@modelcontextprotocol/express';
+import { McpServer, StdioServerTransport } from '@modelcontextprotocol/server';
 import * as z from 'zod/v4';
 
 const mcpServer = new McpServer({
diff --git a/examples/shared/src/demoInMemoryOAuthProvider.ts b/examples/shared/src/demoInMemoryOAuthProvider.ts
@@ -1,14 +1,15 @@
 import { randomUUID } from 'node:crypto';
 
 import type { AuthorizationParams, OAuthServerProvider } from '@modelcontextprotocol/express';
-import { createOAuthMetadata, InvalidRequestError, mcpAuthRouter, resourceUrlFromServerUrl } from '@modelcontextprotocol/express';
+import { createOAuthMetadata, mcpAuthRouter } from '@modelcontextprotocol/express';
 import type {
     AuthInfo,
     OAuthClientInformationFull,
     OAuthMetadata,
     OAuthRegisteredClientsStore,
     OAuthTokens
 } from '@modelcontextprotocol/server';
+import { InvalidRequestError, resourceUrlFromServerUrl } from '@modelcontextprotocol/server';
 import type { Request, Response } from 'express';
 import express from 'express';
 
diff --git a/examples/shared/test/demoInMemoryOAuthProvider.test.ts b/examples/shared/test/demoInMemoryOAuthProvider.test.ts
@@ -1,6 +1,6 @@
-import type { OAuthClientInformationFull } from '@modelcontextprotocol/core';
 import type { AuthorizationParams } from '@modelcontextprotocol/express';
-import { InvalidRequestError } from '@modelcontextprotocol/express';
+import type { OAuthClientInformationFull } from '@modelcontextprotocol/server';
+import { InvalidRequestError } from '@modelcontextprotocol/server';
 import { createExpressResponseMock } from '@modelcontextprotocol/test-helpers';
 import type { Response } from 'express';
 import { beforeEach, describe, expect, it } from 'vitest';
diff --git a/packages/middleware/node/test/http.test.ts b/packages/middleware/node/test/http.test.ts
@@ -15,7 +15,7 @@ import type {
 import type { EventId, EventStore, StreamId } from '@modelcontextprotocol/server';
 import { McpServer } from '@modelcontextprotocol/server';
 import type { ZodMatrixEntry } from '@modelcontextprotocol/test-helpers';
-import { listenOnRandomPort , zodTestMatrix } from '@modelcontextprotocol/test-helpers';
+import { listenOnRandomPort, zodTestMatrix } from '@modelcontextprotocol/test-helpers';
 
 import { StreamableHTTPServerTransport } from '../src/http.js';
 
diff --git a/packages/server/test/server/http.test.ts b/packages/server/test/server/http.test.ts
@@ -108,11 +108,7 @@ function parseSSEData(text: string): unknown {
     return JSON.parse(dataLine.substring(5).trim());
 }
 
-function expectErrorResponse(
-    data: unknown,
-    expectedCode: number,
-    expectedMessagePattern: RegExp
-): void {
+function expectErrorResponse(data: unknown, expectedCode: number, expectedMessagePattern: RegExp): void {
     expect(data).toMatchObject({
         jsonrpc: '2.0',
         error: expect.objectContaining({
@@ -133,9 +129,14 @@ describe.each(zodTestMatrix)('$zodVersionLabel', (entry: ZodMatrixEntry) => {
         beforeEach(async () => {
             mcpServer = new McpServer({ name: 'test-server', version: '1.0.0' }, { capabilities: { logging: {} } });
 
-            mcpServer.tool('greet', 'A simple greeting tool', { name: z.string().describe('Name to greet') }, async ({ name }): Promise<CallToolResult> => {
-                return { content: [{ type: 'text', text: `Hello, ${name}!` }] };
-            });
+            mcpServer.tool(
+                'greet',
+                'A simple greeting tool',
+                { name: z.string().describe('Name to greet') },
+                async ({ name }): Promise<CallToolResult> => {
+                    return { content: [{ type: 'text', text: `Hello, ${name}!` }] };
+                }
+            );
 
             transport = new HTTPServerTransport({
                 sessionIdGenerator: () => randomUUID()
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { EventStore, JSONRPCMessage } from '@modelcontextprotocol/express';`
	`1`	`+import type { EventStore, JSONRPCMessage } from '@modelcontextprotocol/server';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Simple in-memory implementation of the EventStore interface for resumability`