diff --git a/AGENTS.md b/AGENTS.md
index 6bfc8cd..f850aa3 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -60,8 +60,8 @@ rm -fR  package-lock.json node_modules && \
 
 ### Key Source Files
 
-- `src/app.ts` - `App` class extends MCP Protocol, handles guest initialization, tool calls, messaging
-- `src/app-bridge.ts` - `AppBridge` class for hosts, proxies MCP requests, sends tool input/results to guests
+- `src/app.ts` - `App` subclasses the base MCP SDK `Client`, handles View initialization, tool calls, and messaging
+- `src/app-bridge.ts` - `AppBridge` subclasses the base MCP SDK `Server` for the inner iframe channel and proxies through a separate outer `Client`
 - `src/server/index.ts` - Helpers for MCP servers to register tools/resources with UI metadata
 - `src/types.ts` - Protocol types re-exported from `spec.types.ts` and Zod schemas from `generated/schema.ts` (auto-generated during build)
 - `src/message-transport.ts` - `PostMessageTransport` for iframe communication
@@ -70,12 +70,12 @@ rm -fR  package-lock.json node_modules && \
 ### Protocol Flow
 
 ```
-View (App) <--PostMessageTransport--> Host (AppBridge) <--MCP Client--> MCP Server
+View (App/Client) <--PostMessageTransport--> Host (AppBridge/Server) <--separate MCP Client--> MCP Server
 ```
 
 1. Host creates iframe with view HTML
 2. View creates `App` instance and calls `connect()` with `PostMessageTransport`
-3. View sends `ui/initialize` request, receives host capabilities and context
+3. View and Host complete the temporary inner base MCP handshake, then the View sends `ui/initialize` and receives authoritative Apps capabilities and context
 4. Host sends `sendToolInput()` with tool arguments after initialization
 5. View can call server tools via `app.callServerTool()` or send messages via `app.sendMessage()`
 6. Host sends `sendToolResult()` when tool execution completes
diff --git a/README.md b/README.md
index 2fd89ff..b3f68e7 100644
--- a/README.md
+++ b/README.md
@@ -122,9 +122,17 @@ resources:
 ## Getting Started
 
 ```bash
-npm install -S @modelcontextprotocol/ext-apps
+npm install -S @modelcontextprotocol/ext-apps \
+  @modelcontextprotocol/client@2.0.0-beta.4 \
+  @modelcontextprotocol/server@2.0.0-beta.4 \
+  @modelcontextprotocol/core@2.0.0-beta.4 \
+  zod@^4.2.0
 ```
 
+This release uses the split base MCP SDK v2 packages. Install all three at the
+exact published beta.4 version so the Apps SDK and your MCP client/server share
+one compatible protocol implementation.
+
 **New here?** Start with the
 [Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/Quickstart.html)
 to build your first MCP App.
diff --git a/build.bun.ts b/build.bun.ts
index a129d5d..837279f 100644
--- a/build.bun.ts
+++ b/build.bun.ts
@@ -31,9 +31,15 @@ function buildJs(
   });
 }
 
-// zod is a peerDependency — keep it external so consumers share a single
-// zod instance (instanceof ZodError / schema.extend() break with duplicate copies).
-const PEER_EXTERNALS = ["@modelcontextprotocol/sdk", "zod"];
+// Peer dependencies stay external in the standard entry points so consumers
+// share one base MCP SDK and Zod instance. The *-with-deps entry points keep
+// bundling these dependencies for standalone browser use.
+const PEER_EXTERNALS = [
+  "@modelcontextprotocol/client",
+  "@modelcontextprotocol/core",
+  "@modelcontextprotocol/server",
+  "zod",
+];
 
 await Promise.all([
   buildJs("src/app.ts", {
diff --git a/docs/authorization.md b/docs/authorization.md
index 59fc26c..df7adc6 100644
--- a/docs/authorization.md
+++ b/docs/authorization.md
@@ -150,7 +150,7 @@ registerAppTool(
   "get_account_balance",
   {
     description: "Get account balance",
-    inputSchema: { accountId: z.string() },
+    inputSchema: z.object({ accountId: z.string() }),
   },
   async ({ accountId }) => {
     if (!authInfo) {
diff --git a/docs/migrate_from_openai_apps.md b/docs/migrate_from_openai_apps.md
index d91281b..22d5d9f 100644
--- a/docs/migrate_from_openai_apps.md
+++ b/docs/migrate_from_openai_apps.md
@@ -66,7 +66,7 @@ The server-side changes involve updating metadata structure and using helper fun
 #### Before (OpenAI)
 
 ```typescript
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 
 function createServer() {
@@ -78,7 +78,7 @@ function createServer() {
     {
       title: "Shopping Cart",
       description: "Display the user's shopping cart",
-      inputSchema: { userId: z.string() },
+      inputSchema: z.object({ userId: z.string() }),
       annotations: { readOnlyHint: true },
       _meta: {
         "openai/outputTemplate": "ui://view/cart.html",
@@ -126,7 +126,7 @@ function createServer() {
 #### After (MCP Apps)
 
 ```typescript
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer } from "@modelcontextprotocol/server";
 import {
   registerAppTool,
   registerAppResource,
@@ -144,7 +144,7 @@ function createServer() {
     {
       title: "Shopping Cart",
       description: "Display the user's shopping cart",
-      inputSchema: { userId: z.string() },
+      inputSchema: z.object({ userId: z.string() }),
       annotations: { readOnlyHint: true },
       _meta: { ui: { resourceUri: "ui://view/cart.html" } },
     },
diff --git a/docs/overview.md b/docs/overview.md
index 28f5b23..317ab43 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -56,7 +56,11 @@ flowchart LR
 - **Host** — The chat client (e.g., Claude Desktop) that connects to servers, embeds Views in iframes, and proxies communication between them.
 - **View** — The UI running inside a sandboxed iframe. It receives tool data from the Host and can call server tools or send messages back to the chat.
 
-The View acts as an MCP client, the Host acts as a proxy, and the Server is a standard MCP server.
+The View's `App` subclasses the base MCP SDK `Client`. The Host's `AppBridge`
+subclasses the base MCP SDK `Server` for the inner iframe channel, while a
+separate outer `Client` connects the Host to the actual MCP Server. Keeping
+those two connections separate prevents iframe negotiation and capabilities
+from leaking into the server connection.
 
 ## Lifecycle
 
@@ -93,7 +97,7 @@ sequenceDiagram
 ```
 
 1. **Discovery** — The Host learns about tools and their UI resources when connecting to the server.
-2. **Initialization** — When a UI tool is called, the Host renders the iframe. The View sends `ui/initialize` and receives host context (theme, capabilities, container dimensions). This handshake ensures the View is ready before receiving data.
+2. **Initialization** — When a UI tool is called, the Host renders the iframe. The SDK first completes its temporary inner base MCP handshake, then the View sends `ui/initialize` and receives host context (theme, capabilities, container dimensions). `ui/initialize` remains authoritative for Apps capabilities and identity, and `ui/notifications/initialized` remains the public View-ready signal.
 3. **Data delivery** — The Host sends tool arguments and, once available, tool results to the View. Results include both `content` (text for the model's context) and optionally `structuredContent` (data optimized for UI rendering). This separation lets servers provide rich data to the UI without bloating the model's context.
 4. **Interactive phase** — The user interacts with the View. The View can call tools, send messages, or update context.
 5. **Teardown** — Before unmounting, the Host notifies the View so it can save state or release resources.
diff --git a/docs/patterns.md b/docs/patterns.md
index 87a6d82..884de26 100644
--- a/docs/patterns.md
+++ b/docs/patterns.md
@@ -19,7 +19,7 @@ registerAppTool(
   "update-quantity",
   {
     description: "Update item quantity in cart",
-    inputSchema: { itemId: z.string(), quantity: z.number() },
+    inputSchema: z.object({ itemId: z.string(), quantity: z.number() }),
     _meta: {
       ui: {
         resourceUri: "ui://shop/cart.html",
@@ -127,14 +127,14 @@ registerAppTool(
   {
     title: "Read Data Bytes",
     description: "Load binary data in chunks",
-    inputSchema: {
+    inputSchema: z.object({
       id: z.string().describe("Resource identifier"),
       offset: z.number().min(0).default(0).describe("Byte offset"),
       byteCount: z
         .number()
         .default(MAX_CHUNK_BYTES)
         .describe("Bytes to read"),
-    },
+    }),
     outputSchema: DataChunkSchema,
     // Hidden from model - only callable by the App
     _meta: { ui: { visibility: ["app"] } },
@@ -281,10 +281,7 @@ server.registerResource(
 
 <!-- prettier-ignore -->
 ```ts source="./patterns.tsx#binaryBlobResourceClient"
-const result = await app.request(
-  { method: "resources/read", params: { uri: `video://${videoId}` } },
-  ReadResourceResultSchema,
-);
+const result = await app.readServerResource({ uri: `video://${videoId}` });
 
 const content = result.contents[0];
 if (!content || !("blob" in content)) {
diff --git a/docs/patterns.tsx b/docs/patterns.tsx
index 6b87692..bb9eaa4 100644
--- a/docs/patterns.tsx
+++ b/docs/patterns.tsx
@@ -17,16 +17,12 @@ import { randomUUID } from "node:crypto";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
-import { ReadResourceResultSchema } from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import type { McpUiHostContext } from "../src/types.js";
 import { useEffect, useState } from "react";
 import { useApp } from "../src/react/index.js";
 import { registerAppTool } from "../src/server/index.js";
-import {
-  McpServer,
-  ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer, ResourceTemplate } from "@modelcontextprotocol/server";
 import { z } from "zod";
 
 /**
@@ -117,14 +113,14 @@ function chunkedDataServer(server: McpServer) {
     {
       title: "Read Data Bytes",
       description: "Load binary data in chunks",
-      inputSchema: {
+      inputSchema: z.object({
         id: z.string().describe("Resource identifier"),
         offset: z.number().min(0).default(0).describe("Byte offset"),
         byteCount: z
           .number()
           .default(MAX_CHUNK_BYTES)
           .describe("Bytes to read"),
-      },
+      }),
       outputSchema: DataChunkSchema,
       // Hidden from model - only callable by the App
       _meta: { ui: { visibility: ["app"] } },
@@ -252,10 +248,7 @@ function binaryBlobResourceServer(
  */
 async function binaryBlobResourceClient(app: App, videoId: string) {
   //#region binaryBlobResourceClient
-  const result = await app.request(
-    { method: "resources/read", params: { uri: `video://${videoId}` } },
-    ReadResourceResultSchema,
-  );
+  const result = await app.readServerResource({ uri: `video://${videoId}` });
 
   const content = result.contents[0];
   if (!content || !("blob" in content)) {
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 3e00796..eb6b096 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -21,7 +21,7 @@ This tutorial assumes you've built an MCP server before and are comfortable with
 
 We'll use the [MCP TypeScript SDK](https://github.com/modelcontextprotocol/typescript-sdk) to build the server.
 
-You'll also need Node.js 18+.
+You'll also need Node.js 20+.
 
 ## 1. Set up the project
 
@@ -37,7 +37,7 @@ Install the dependencies you'll need:
 
 ```bash
 npm init -y
-npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk express cors
+npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 @modelcontextprotocol/node@2.0.0-beta.4 @modelcontextprotocol/express@2.0.0-beta.4 zod@^4.2.0 express cors
 npm install -D typescript vite vite-plugin-singlefile @types/express @types/cors @types/node tsx concurrently cross-env
 ```
 
@@ -178,9 +178,10 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer } from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
+import { z } from "zod";
 
 const DIST_DIR = path.join(import.meta.dirname, "dist");
 
@@ -205,7 +206,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async () => {
@@ -240,10 +241,10 @@ export function createServer(): McpServer {
 
 <!-- prettier-ignore -->
 ```ts source="../examples/quickstart/main.ts"
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -263,7 +264,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/docs/testing-mcp-apps.md b/docs/testing-mcp-apps.md
index df1396c..e5d82b5 100644
--- a/docs/testing-mcp-apps.md
+++ b/docs/testing-mcp-apps.md
@@ -28,6 +28,10 @@ The [`basic-host`](https://github.com/modelcontextprotocol/ext-apps/tree/main/ex
    cd examples/basic-host
    ```
 
+   The root install runs the package build, including type-checking the
+   documentation snippets against the exact base MCP SDK beta.4 packages. Do
+   not bypass a failed build before testing the host.
+
 2. Start basic-host, pointing it to your MCP server:
 
    ```bash
diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json
index 1b45dcf..583d2ff 100644
--- a/examples/basic-host/package.json
+++ b/examples/basic-host/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "zod": "^4.1.13"
diff --git a/examples/basic-host/src/implementation.ts b/examples/basic-host/src/implementation.ts
index 31e3698..5f680ff 100644
--- a/examples/basic-host/src/implementation.ts
+++ b/examples/basic-host/src/implementation.ts
@@ -1,8 +1,12 @@
 import { RESOURCE_MIME_TYPE, getToolUiResourceUri, type McpUiSandboxProxyReadyNotification, AppBridge, PostMessageTransport, type McpUiResourceCsp, type McpUiResourcePermissions, buildAllowAttribute, type McpUiUpdateModelContextRequest, type McpUiMessageRequest } from "@modelcontextprotocol/ext-apps/app-bridge";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import type { CallToolResult, Resource, Tool } from "@modelcontextprotocol/sdk/types.js";
+import {
+  Client,
+  SSEClientTransport,
+  StreamableHTTPClientTransport,
+  type CallToolResult,
+  type Resource,
+  type Tool,
+} from "@modelcontextprotocol/client";
 import { getTheme, onThemeChange } from "./theme";
 import { HOST_STYLE_VARIABLES } from "./host-styles";
 
diff --git a/examples/basic-host/src/index.tsx b/examples/basic-host/src/index.tsx
index 3d488a7..00c0d52 100644
--- a/examples/basic-host/src/index.tsx
+++ b/examples/basic-host/src/index.tsx
@@ -1,5 +1,5 @@
 import { getToolUiResourceUri, McpUiToolMetaSchema } from "@modelcontextprotocol/ext-apps/app-bridge";
-import type { Tool } from "@modelcontextprotocol/sdk/types.js";
+import type { Tool } from "@modelcontextprotocol/client";
 import { Component, type ErrorInfo, type ReactNode, StrictMode, Suspense, use, useEffect, useMemo, useRef, useState } from "react";
 import { createRoot } from "react-dom/client";
 import { callTool, connectToServer, hasAppHtml, initializeApp, loadSandboxProxy, log, newAppBridge, type ServerInfo, type ToolCallInfo, type ModelContext, type AppMessage } from "./implementation";
diff --git a/examples/basic-server-preact/main.ts b/examples/basic-server-preact/main.ts
index 7642632..ffdff52 100644
--- a/examples/basic-server-preact/main.ts
+++ b/examples/basic-server-preact/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json
index 1a63232..0187827 100644
--- a/examples/basic-server-preact/package.json
+++ b/examples/basic-server-preact/package.json
@@ -24,10 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "preact": "^10.0.0",
diff --git a/examples/basic-server-preact/server.ts b/examples/basic-server-preact/server.ts
index bf14ea5..dfec94a 100644
--- a/examples/basic-server-preact/server.ts
+++ b/examples/basic-server-preact/server.ts
@@ -1,8 +1,12 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 // Works both from source (server.ts) and compiled (dist/server.js)
 const DIST_DIR = import.meta.filename.endsWith(".ts")
   ? path.join(import.meta.dirname, "dist")
@@ -28,7 +32,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time as an ISO 8601 string.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/basic-server-preact/src/mcp-app.tsx b/examples/basic-server-preact/src/mcp-app.tsx
index a8bdc68..351a8ec 100644
--- a/examples/basic-server-preact/src/mcp-app.tsx
+++ b/examples/basic-server-preact/src/mcp-app.tsx
@@ -8,7 +8,7 @@ import {
   applyHostStyleVariables,
   type McpUiHostContext,
 } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import { useCallback, useEffect, useState } from "preact/hooks";
 import { render } from "preact";
 import styles from "./mcp-app.module.css";
diff --git a/examples/basic-server-react/main.ts b/examples/basic-server-react/main.ts
index ec187b6..21c5e18 100644
--- a/examples/basic-server-react/main.ts
+++ b/examples/basic-server-react/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json
index 821fc96..dae7665 100644
--- a/examples/basic-server-react/package.json
+++ b/examples/basic-server-react/package.json
@@ -34,10 +34,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "react": "^19.2.0",
diff --git a/examples/basic-server-react/server.ts b/examples/basic-server-react/server.ts
index 23f6dda..d77c908 100644
--- a/examples/basic-server-react/server.ts
+++ b/examples/basic-server-react/server.ts
@@ -1,8 +1,12 @@
 import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
+import { z } from "zod";
 
 // Works both from source (server.ts) and compiled (dist/server.js)
 const DIST_DIR = import.meta.filename.endsWith(".ts")
@@ -29,7 +33,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time as an ISO 8601 string.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/basic-server-react/src/mcp-app.tsx b/examples/basic-server-react/src/mcp-app.tsx
index 6bb5540..2b5fbef 100644
--- a/examples/basic-server-react/src/mcp-app.tsx
+++ b/examples/basic-server-react/src/mcp-app.tsx
@@ -3,7 +3,7 @@
  */
 import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps";
 import { useApp } from "@modelcontextprotocol/ext-apps/react";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import { StrictMode, useCallback, useEffect, useState } from "react";
 import { createRoot } from "react-dom/client";
 import styles from "./mcp-app.module.css";
diff --git a/examples/basic-server-solid/main.ts b/examples/basic-server-solid/main.ts
index c8d9de2..095ef8d 100644
--- a/examples/basic-server-solid/main.ts
+++ b/examples/basic-server-solid/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json
index 997bc60..5d91407 100644
--- a/examples/basic-server-solid/package.json
+++ b/examples/basic-server-solid/package.json
@@ -24,10 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "solid-js": "1.9.10",
diff --git a/examples/basic-server-solid/server.ts b/examples/basic-server-solid/server.ts
index 2ed2d93..addb522 100644
--- a/examples/basic-server-solid/server.ts
+++ b/examples/basic-server-solid/server.ts
@@ -1,8 +1,12 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 // Works both from source (server.ts) and compiled (dist/server.js)
 const DIST_DIR = import.meta.filename.endsWith(".ts")
   ? path.join(import.meta.dirname, "dist")
@@ -28,7 +32,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time as an ISO 8601 string.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/basic-server-solid/src/mcp-app.tsx b/examples/basic-server-solid/src/mcp-app.tsx
index 66d47f3..2d78b7b 100644
--- a/examples/basic-server-solid/src/mcp-app.tsx
+++ b/examples/basic-server-solid/src/mcp-app.tsx
@@ -8,7 +8,7 @@ import {
   applyHostStyleVariables,
   type McpUiHostContext,
 } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import { createEffect, createSignal, onMount, Show } from "solid-js";
 import { render } from "solid-js/web";
 import styles from "./mcp-app.module.css";
diff --git a/examples/basic-server-svelte/main.ts b/examples/basic-server-svelte/main.ts
index 6c50a25..734ec0c 100644
--- a/examples/basic-server-svelte/main.ts
+++ b/examples/basic-server-svelte/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json
index e83772f..18bf7ab 100644
--- a/examples/basic-server-svelte/package.json
+++ b/examples/basic-server-svelte/package.json
@@ -24,10 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "svelte": "^5.0.0",
diff --git a/examples/basic-server-svelte/server.ts b/examples/basic-server-svelte/server.ts
index da603ca..9414285 100644
--- a/examples/basic-server-svelte/server.ts
+++ b/examples/basic-server-svelte/server.ts
@@ -1,8 +1,12 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 // Works both from source (server.ts) and compiled (dist/server.js)
 const DIST_DIR = import.meta.filename.endsWith(".ts")
   ? path.join(import.meta.dirname, "dist")
@@ -28,7 +32,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time as an ISO 8601 string.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/basic-server-svelte/src/App.svelte b/examples/basic-server-svelte/src/App.svelte
index fde128d..cabcc31 100644
--- a/examples/basic-server-svelte/src/App.svelte
+++ b/examples/basic-server-svelte/src/App.svelte
@@ -7,7 +7,7 @@ import {
   applyHostStyleVariables,
   type McpUiHostContext,
 } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 
 function extractTime(result: CallToolResult): string {
   const { text } = result.content?.find((c) => c.type === "text")!;
diff --git a/examples/basic-server-vanillajs/main.ts b/examples/basic-server-vanillajs/main.ts
index 286fa34..4de7331 100644
--- a/examples/basic-server-vanillajs/main.ts
+++ b/examples/basic-server-vanillajs/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json
index 64e1758..6bb75af 100644
--- a/examples/basic-server-vanillajs/package.json
+++ b/examples/basic-server-vanillajs/package.json
@@ -24,10 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "zod": "^4.1.13"
diff --git a/examples/basic-server-vanillajs/server.ts b/examples/basic-server-vanillajs/server.ts
index 5b2daf7..693d861 100644
--- a/examples/basic-server-vanillajs/server.ts
+++ b/examples/basic-server-vanillajs/server.ts
@@ -1,6 +1,9 @@
 import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -29,7 +32,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time as an ISO 8601 string.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       outputSchema: z.object({
         time: z.string(),
       }),
diff --git a/examples/basic-server-vanillajs/src/mcp-app.ts b/examples/basic-server-vanillajs/src/mcp-app.ts
index c3168c2..6b5084a 100644
--- a/examples/basic-server-vanillajs/src/mcp-app.ts
+++ b/examples/basic-server-vanillajs/src/mcp-app.ts
@@ -8,7 +8,7 @@ import {
   applyHostStyleVariables,
   type McpUiHostContext,
 } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import "./global.css";
 import "./mcp-app.css";
 
diff --git a/examples/basic-server-vue/main.ts b/examples/basic-server-vue/main.ts
index 669a071..d774269 100644
--- a/examples/basic-server-vue/main.ts
+++ b/examples/basic-server-vue/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json
index e4cd0b4..3b34aa6 100644
--- a/examples/basic-server-vue/package.json
+++ b/examples/basic-server-vue/package.json
@@ -24,10 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "vue": "^3.5.0",
diff --git a/examples/basic-server-vue/server.ts b/examples/basic-server-vue/server.ts
index 5aa72de..9adb911 100644
--- a/examples/basic-server-vue/server.ts
+++ b/examples/basic-server-vue/server.ts
@@ -1,8 +1,12 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 // Works both from source (server.ts) and compiled (dist/server.js)
 const DIST_DIR = import.meta.filename.endsWith(".ts")
   ? path.join(import.meta.dirname, "dist")
@@ -28,7 +32,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time as an ISO 8601 string.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/basic-server-vue/src/App.vue b/examples/basic-server-vue/src/App.vue
index 196ad64..a45c262 100644
--- a/examples/basic-server-vue/src/App.vue
+++ b/examples/basic-server-vue/src/App.vue
@@ -7,7 +7,7 @@ import {
   applyHostStyleVariables,
   type McpUiHostContext,
 } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 
 function extractTime(result: CallToolResult): string {
   const { text } = result.content?.find((c) => c.type === "text")!;
diff --git a/examples/budget-allocator-server/main.ts b/examples/budget-allocator-server/main.ts
index cc488f0..02c03cb 100644
--- a/examples/budget-allocator-server/main.ts
+++ b/examples/budget-allocator-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json
index 8af1a6c..5d4fe8e 100644
--- a/examples/budget-allocator-server/package.json
+++ b/examples/budget-allocator-server/package.json
@@ -29,7 +29,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "chart.js": "^4.4.0",
     "cors": "^2.8.5",
     "express": "^5.1.0",
diff --git a/examples/budget-allocator-server/server.ts b/examples/budget-allocator-server/server.ts
index 04fba11..01f5dbf 100755
--- a/examples/budget-allocator-server/server.ts
+++ b/examples/budget-allocator-server/server.ts
@@ -4,11 +4,11 @@
  * Provides budget configuration, 24 months of historical allocation data,
  * and industry benchmarks by company stage.
  */
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -270,7 +270,7 @@ export function createServer(): McpServer {
       title: "Get Budget Data",
       description:
         "Returns budget configuration with 24 months of historical allocations and industry benchmarks by company stage. The widget is interactive and exposes tools for reading/modifying allocations, adjusting budgets, and comparing against industry benchmarks.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       outputSchema: BudgetDataResponseSchema,
       _meta: { ui: { resourceUri } },
     },
diff --git a/examples/cohort-heatmap-server/main.ts b/examples/cohort-heatmap-server/main.ts
index d59903b..8b33603 100644
--- a/examples/cohort-heatmap-server/main.ts
+++ b/examples/cohort-heatmap-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json
index 99e9d9f..c54040a 100644
--- a/examples/cohort-heatmap-server/package.json
+++ b/examples/cohort-heatmap-server/package.json
@@ -29,7 +29,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "react": "^19.2.0",
diff --git a/examples/cohort-heatmap-server/server.ts b/examples/cohort-heatmap-server/server.ts
index 6d07144..129e2dc 100644
--- a/examples/cohort-heatmap-server/server.ts
+++ b/examples/cohort-heatmap-server/server.ts
@@ -1,5 +1,7 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -178,8 +180,8 @@ export function createServer(): McpServer {
       title: "Get Cohort Retention Data",
       description:
         "Returns cohort retention heatmap data showing customer retention over time by signup month",
-      inputSchema: GetCohortDataInputSchema.shape,
-      outputSchema: CohortDataSchema.shape,
+      inputSchema: GetCohortDataInputSchema,
+      outputSchema: CohortDataSchema,
       _meta: { ui: { resourceUri } },
     },
     async ({ metric, periodType, cohortCount, maxPeriods }) => {
diff --git a/examples/customer-segmentation-server/main.ts b/examples/customer-segmentation-server/main.ts
index 130076c..c788757 100644
--- a/examples/customer-segmentation-server/main.ts
+++ b/examples/customer-segmentation-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json
index 59e3eb1..ef14b32 100644
--- a/examples/customer-segmentation-server/package.json
+++ b/examples/customer-segmentation-server/package.json
@@ -29,7 +29,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "chart.js": "^4.4.0",
     "cors": "^2.8.5",
     "express": "^5.1.0",
diff --git a/examples/customer-segmentation-server/server.ts b/examples/customer-segmentation-server/server.ts
index 244415d..7cc1c1f 100644
--- a/examples/customer-segmentation-server/server.ts
+++ b/examples/customer-segmentation-server/server.ts
@@ -1,8 +1,8 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -100,8 +100,8 @@ export function createServer(): McpServer {
         title: "Get Customer Data",
         description:
           "Returns customer data with segment information for visualization. Optionally filter by segment.",
-        inputSchema: GetCustomerDataInputSchema.shape,
-        outputSchema: GetCustomerDataOutputSchema.shape,
+        inputSchema: GetCustomerDataInputSchema,
+        outputSchema: GetCustomerDataOutputSchema,
         _meta: { ui: { resourceUri } },
       },
       async ({ segment }): Promise<CallToolResult> => {
diff --git a/examples/debug-server/main.ts b/examples/debug-server/main.ts
index 3c89a97..9fb0825 100644
--- a/examples/debug-server/main.ts
+++ b/examples/debug-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json
index 02e9fbf..0e3f508 100644
--- a/examples/debug-server/package.json
+++ b/examples/debug-server/package.json
@@ -37,7 +37,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "zod": "^4.1.13"
   },
   "devDependencies": {
diff --git a/examples/debug-server/server.ts b/examples/debug-server/server.ts
index fd3452a..068f94d 100644
--- a/examples/debug-server/server.ts
+++ b/examples/debug-server/server.ts
@@ -3,11 +3,11 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import { appendFileSync } from "node:fs";
 import path from "node:path";
diff --git a/examples/integration-server/main.ts b/examples/integration-server/main.ts
index c45787e..9a42842 100644
--- a/examples/integration-server/main.ts
+++ b/examples/integration-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json
index 3f9d8bb..56fc8ed 100644
--- a/examples/integration-server/package.json
+++ b/examples/integration-server/package.json
@@ -15,10 +15,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "react": "^19.2.0",
diff --git a/examples/integration-server/server.ts b/examples/integration-server/server.ts
index e44689d..346f4f7 100644
--- a/examples/integration-server/server.ts
+++ b/examples/integration-server/server.ts
@@ -3,11 +3,11 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -33,7 +33,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       outputSchema: z.object({
         time: z.string(),
       }),
@@ -72,7 +72,7 @@ export function createServer(): McpServer {
   );
 
   // Sample downloadable resource — used to demo ResourceLink in ui/download-file
-  server.resource(
+  server.registerResource(
     SAMPLE_DOWNLOAD_URI,
     SAMPLE_DOWNLOAD_URI,
     {
diff --git a/examples/integration-server/src/mcp-app.tsx b/examples/integration-server/src/mcp-app.tsx
index 7f0b18c..281a356 100644
--- a/examples/integration-server/src/mcp-app.tsx
+++ b/examples/integration-server/src/mcp-app.tsx
@@ -3,7 +3,7 @@
  */
 import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps";
 import { useApp } from "@modelcontextprotocol/ext-apps/react";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import { StrictMode, useCallback, useEffect, useState } from "react";
 import { createRoot } from "react-dom/client";
 import styles from "./mcp-app.module.css";
diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json
index 086f20a..6aef3e1 100644
--- a/examples/lazy-auth-server/package.json
+++ b/examples/lazy-auth-server/package.json
@@ -24,10 +24,11 @@
   "dependencies": {
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
-    "jose": "^6.0.0"
+    "jose": "^6.0.0",
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/lazy-auth-server/server.ts b/examples/lazy-auth-server/server.ts
index fe7b1ac..01535eb 100644
--- a/examples/lazy-auth-server/server.ts
+++ b/examples/lazy-auth-server/server.ts
@@ -21,13 +21,13 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import {
+  McpServer,
+  UrlElicitationRequiredError,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import cors from "cors";
 import express, { type Express, type Request, type Response } from "express";
 import { SignJWT, jwtVerify } from "jose";
@@ -35,6 +35,7 @@ import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { z } from "zod";
 
 // Works both from source (server.ts) and compiled (dist/server.js). Derived
 // from import.meta.url rather than import.meta.filename/dirname, which are
@@ -605,7 +606,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
       title: "Show Auth Button",
       description:
         "Public tool: shows a button that triggers the protected get_secret tool.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri: buttonUri } },
     },
     async (): Promise<CallToolResult> => ({
@@ -638,7 +639,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
       title: "Get Secret",
       description:
         "Protected tool: returns secret data. Requires authentication.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri: secretUri } },
     },
     async (): Promise<CallToolResult> => {
@@ -682,7 +683,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
       title: "Revoke Auth Token",
       description:
         "Protected tool: revokes the caller's entire auth session (access + refresh token).",
-      inputSchema: {},
+      inputSchema: z.object({}),
     },
     async (): Promise<CallToolResult> => {
       if (!authInfo) {
@@ -720,7 +721,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
       title: "Elicit URL (session-callback)",
       description:
         "URL elicitation via elicitInput. Blocks until the client accepts; sends ElicitCompleteNotification before returning.",
-      inputSchema: {},
+      inputSchema: z.object({}),
     },
     async (_args, extra): Promise<CallToolResult> => {
       const eid = crypto.randomUUID();
@@ -735,7 +736,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
           message: "Please open this URL to continue.",
           elicitationId: eid,
         },
-        { relatedRequestId: extra.requestId, timeout: 300_000 },
+        { relatedRequestId: extra.mcpReq.id, timeout: 300_000 },
       );
       // Send completion notification before returning — lands on the same SSE
       // stream as this tool response. For Streamable HTTP this is the ONLY
@@ -767,7 +768,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
       title: "Elicit by -32042 Error",
       description:
         "Throws UrlElicitationRequiredError (-32042). Client must open the URL, then retry. On retry, if the last-issued elicitationId was completed, sends ElicitCompleteNotification and succeeds.",
-      inputSchema: {},
+      inputSchema: z.object({}),
     },
     async (): Promise<CallToolResult> => {
       // Retry path: check if the user completed the elicitation we last issued.
@@ -1031,7 +1032,7 @@ export function createApp(): Express {
     }
 
     const server = createServer(authInfo, req);
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
     res.on("close", () => {
diff --git a/examples/map-server/main.ts b/examples/map-server/main.ts
index f91f57b..8038394 100644
--- a/examples/map-server/main.ts
+++ b/examples/map-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/map-server/package.json b/examples/map-server/package.json
index b0c629a..a3639ce 100644
--- a/examples/map-server/package.json
+++ b/examples/map-server/package.json
@@ -26,10 +26,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "zod": "^4.1.13"
diff --git a/examples/map-server/server.ts b/examples/map-server/server.ts
index 10125a6..5767d46 100644
--- a/examples/map-server/server.ts
+++ b/examples/map-server/server.ts
@@ -5,11 +5,11 @@
  * - geocode: Search for places using OpenStreetMap Nominatim
  * - show-map: Display an interactive 3D globe at a given location
  */
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -148,7 +148,7 @@ export function createServer(): McpServer {
       title: "Show Map",
       description:
         "Display an interactive world map zoomed to a specific bounding box. Use the GeoCode tool to find the bounding box of a location. The widget is interactive and exposes tools for navigation (fly to locations) and querying the current view.",
-      inputSchema: {
+      inputSchema: z.object({
         west: z
           .number()
           .optional()
@@ -173,7 +173,7 @@ export function createServer(): McpServer {
           .string()
           .optional()
           .describe("Optional label to display on the map"),
-      },
+      }),
       _meta: { ui: { resourceUri } },
     },
     async ({ west, south, east, north, label }): Promise<CallToolResult> => ({
@@ -196,13 +196,13 @@ export function createServer(): McpServer {
       title: "Geocode",
       description:
         "Search for places using OpenStreetMap. Returns coordinates and bounding boxes for up to 5 matches.",
-      inputSchema: {
+      inputSchema: z.object({
         query: z
           .string()
           .describe(
             "Place name or address to search for (e.g., 'Paris', 'Golden Gate Bridge', '1600 Pennsylvania Ave')",
           ),
-      },
+      }),
     },
     async ({ query }): Promise<CallToolResult> => {
       try {
diff --git a/examples/map-server/src/mcp-app.ts b/examples/map-server/src/mcp-app.ts
index 39d7c2a..d3090c7 100644
--- a/examples/map-server/src/mcp-app.ts
+++ b/examples/map-server/src/mcp-app.ts
@@ -6,7 +6,7 @@
  * a navigate-to tool for the host to control navigation.
  */
 import { App } from "@modelcontextprotocol/ext-apps";
-import type { ContentBlock } from "@modelcontextprotocol/sdk/spec.types.js";
+import type { ContentBlock } from "@modelcontextprotocol/client";
 import { z } from "zod";
 
 // TypeScript declaration for Cesium loaded from CDN
diff --git a/examples/pdf-server/main.ts b/examples/pdf-server/main.ts
index 1ff848a..bb7b57f 100644
--- a/examples/pdf-server/main.ts
+++ b/examples/pdf-server/main.ts
@@ -6,10 +6,10 @@
 
 import fs from "node:fs";
 import path from "node:path";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import {
@@ -39,7 +39,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json
index aeb52c7..a7eb4bb 100644
--- a/examples/pdf-server/package.json
+++ b/examples/pdf-server/package.json
@@ -26,10 +26,11 @@
   },
   "dependencies": {
     "@cantoo/pdf-lib": "^2.6.5",
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "pdfjs-dist": "^5.0.0",
diff --git a/examples/pdf-server/server.test.ts b/examples/pdf-server/server.test.ts
index 33a03f1..0b2a5eb 100644
--- a/examples/pdf-server/server.test.ts
+++ b/examples/pdf-server/server.test.ts
@@ -2,8 +2,7 @@ import { describe, it, expect, beforeEach, afterEach, spyOn } from "bun:test";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
 import { getDocument } from "pdfjs-dist/legacy/build/pdf.mjs";
 import { PDFDocument } from "@cantoo/pdf-lib";
 import { makeRandomJpeg } from "../../tests/helpers/range-counting-server";
diff --git a/examples/pdf-server/server.ts b/examples/pdf-server/server.ts
index 93dedfd..e67cd47 100644
--- a/examples/pdf-server/server.ts
+++ b/examples/pdf-server/server.ts
@@ -13,18 +13,19 @@
 import { randomUUID } from "crypto";
 import fs from "node:fs";
 import path from "node:path";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import {
   registerAppResource,
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
 import {
-  RootsListChangedNotificationSchema,
+  McpServer,
   type CallToolResult,
+  type ElicitResult,
+  type PrimitiveSchemaDefinition,
   type ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+  type Server,
+} from "@modelcontextprotocol/server";
 // Stub DOMMatrix/ImageData/Path2D before pdfjs-dist loads — its legacy
 // build instantiates DOMMatrix at module scope and the @napi-rs/canvas
 // polyfill is unreliable under npx. See ./pdfjs-polyfill.ts for details.
@@ -62,10 +63,6 @@ class FetchStandardFontDataFactory {
     return new Uint8Array(await res.arrayBuffer());
   }
 }
-import type {
-  PrimitiveSchemaDefinition,
-  ElicitResult,
-} from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 
 // =============================================================================
@@ -1282,7 +1279,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer {
       refreshRoots(server.server);
     };
     server.server.setNotificationHandler(
-      RootsListChangedNotificationSchema,
+      "notifications/roots/list_changed",
       async () => {
         await refreshRoots(server.server);
       },
@@ -1292,10 +1289,12 @@ export function createServer(options: CreateServerOptions = {}): McpServer {
   const { readPdfRange } = sharedPdfCache;
 
   // Tool: list_pdfs - List available PDFs
-  server.tool(
+  server.registerTool(
     "list_pdfs",
-    "List available PDFs that can be displayed",
-    {},
+    {
+      description: "List available PDFs that can be displayed",
+      inputSchema: z.object({}),
+    },
     async (): Promise<CallToolResult> => {
       const seen = new Set<string>();
       const localFiles: string[] = [];
@@ -1377,7 +1376,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer {
       title: "Read PDF Bytes",
       description:
         "Read a range of bytes from a PDF (max 512KB per request). The model should NOT call this tool directly.",
-      inputSchema: {
+      inputSchema: z.object({
         url: z.string().describe("PDF URL or local file path"),
         offset: z.number().min(0).default(0).describe("Byte offset"),
         byteCount: z
@@ -1386,7 +1385,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer {
           .max(MAX_CHUNK_BYTES)
           .default(MAX_CHUNK_BYTES)
           .describe("Bytes to read"),
-      },
+      }),
       outputSchema: z.object({
         url: z.string(),
         bytes: z.string().describe("Base64 encoded bytes"),
@@ -1473,7 +1472,7 @@ Returns a viewUUID in structuredContent. Pass it to \`interact\`:
 
 Accepts local files (use list_pdfs), client MCP root directories, or any HTTPS URL.
 Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before display.`,
-      inputSchema: {
+      inputSchema: z.object({
         url: z
           .string()
           .default(DEFAULT_PDF)
@@ -1489,7 +1488,7 @@ Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before
                   "If true and the PDF has form fields, prompt the user to fill them before displaying",
                 ),
             }),
-      },
+      }),
       outputSchema: z.object({
         viewUUID: z
           .string()
@@ -2426,7 +2425,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
 **FORMS** — fill_form: fill fields with \`fields\` array of {name, value}.
 
 **SAVE** — save_as: write the annotated PDF (annotations + form values) to a file. Pass \`path\` (absolute path or file://) for a new location, or omit \`path\` to overwrite the original. Set \`overwrite: true\` to replace an existing file (always required when omitting \`path\`).`,
-        inputSchema: {
+        inputSchema: z.object({
           viewUUID: z
             .string()
             .describe(
@@ -2523,7 +2522,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
             .describe(
               "Array of commands to execute sequentially. More efficient than separate calls. Tip: end with get_pages+getScreenshots to verify changes.",
             ),
-        },
+        }),
       },
       async (
         {
@@ -2600,7 +2599,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
           const result = await processInteractCommand(
             uuid,
             commandList[i],
-            extra.signal,
+            extra.mcpReq.signal,
           );
           if (result.isError) {
             const errText = result.content
@@ -2657,7 +2656,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
         title: "Submit Page Data",
         description:
           "Submit rendered page data for a get_pages request (used by viewer). The model should NOT call this tool directly.",
-        inputSchema: {
+        inputSchema: z.object({
           requestId: z
             .string()
             .describe("The request ID from the get_pages command"),
@@ -2670,7 +2669,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
               }),
             )
             .describe("Page data entries"),
-        },
+        }),
         _meta: { ui: { visibility: ["app"] } },
       },
       async ({ requestId, pages }): Promise<CallToolResult> => {
@@ -2700,7 +2699,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
         title: "Submit Save Data",
         description:
           "Submit annotated PDF bytes for a save_as request (used by viewer). The model should NOT call this tool directly.",
-        inputSchema: {
+        inputSchema: z.object({
           requestId: z
             .string()
             .describe("The request ID from the save_as command"),
@@ -2709,7 +2708,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
             .string()
             .optional()
             .describe("Error message if the viewer failed to build bytes"),
-        },
+        }),
         _meta: { ui: { visibility: ["app"] } },
       },
       async ({ requestId, data, error }): Promise<CallToolResult> => {
@@ -2739,7 +2738,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
         title: "Submit Viewer State",
         description:
           "Submit a viewer-state snapshot for a get_viewer_state request (used by viewer). The model should NOT call this tool directly.",
-        inputSchema: {
+        inputSchema: z.object({
           requestId: z
             .string()
             .describe("The request ID from the get_viewer_state command"),
@@ -2751,7 +2750,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
             .string()
             .optional()
             .describe("Error message if the viewer failed to read state"),
-        },
+        }),
         _meta: { ui: { visibility: ["app"] } },
       },
       async ({ requestId, state, error }): Promise<CallToolResult> => {
@@ -2781,9 +2780,9 @@ Example — add a signature image and a stamp, then screenshot to verify:
         title: "Poll PDF Commands",
         description:
           "Poll for pending commands for a PDF viewer. The model should NOT call this tool directly.",
-        inputSchema: {
+        inputSchema: z.object({
           viewUUID: z.string().describe("The viewUUID of the PDF viewer"),
-        },
+        }),
         _meta: { ui: { visibility: ["app"] } },
       },
       async ({ viewUUID: uuid }): Promise<CallToolResult> => {
@@ -2828,10 +2827,10 @@ Example — add a signature image and a stamp, then screenshot to verify:
       title: "Save PDF",
       description:
         "Save annotated PDF bytes back to a local file. The model should NOT call this tool directly — use interact with action: save_as instead.",
-      inputSchema: {
+      inputSchema: z.object({
         url: z.string().describe("Original PDF URL or local file path"),
         data: z.string().describe("Base64-encoded PDF bytes"),
-      },
+      }),
       outputSchema: z.object({
         filePath: z.string(),
         mtimeMs: z.number(),
diff --git a/examples/pdf-server/src/mcp-app.ts b/examples/pdf-server/src/mcp-app.ts
index a953e24..45e0c74 100644
--- a/examples/pdf-server/src/mcp-app.ts
+++ b/examples/pdf-server/src/mcp-app.ts
@@ -12,8 +12,10 @@ import {
   applyDocumentTheme,
   applyHostStyleVariables,
 } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import type { ContentBlock } from "@modelcontextprotocol/sdk/spec.types.js";
+import type {
+  CallToolResult,
+  ContentBlock,
+} from "@modelcontextprotocol/client";
 import { z } from "zod";
 import * as pdfjsLib from "pdfjs-dist";
 import { AnnotationLayer, AnnotationMode, TextLayer } from "pdfjs-dist";
diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json
index a5cbf5b..cb4e010 100644
--- a/examples/qr-server/package.json
+++ b/examples/qr-server/package.json
@@ -8,7 +8,6 @@
     "build": "echo 'No build step needed for Python server'"
   },
   "dependencies": {
-    "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0"
+    "@modelcontextprotocol/ext-apps": "^1.7.0"
   }
 }
diff --git a/examples/quickstart/main.ts b/examples/quickstart/main.ts
index 06895a4..7f370a8 100644
--- a/examples/quickstart/main.ts
+++ b/examples/quickstart/main.ts
@@ -1,7 +1,7 @@
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -21,7 +21,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json
index 1003637..f741c6e 100644
--- a/examples/quickstart/package.json
+++ b/examples/quickstart/package.json
@@ -18,9 +18,10 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
-    "express": "^5.1.0"
+    "express": "^5.1.0",
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/quickstart/server.ts b/examples/quickstart/server.ts
index eb3c3b1..611d0f0 100644
--- a/examples/quickstart/server.ts
+++ b/examples/quickstart/server.ts
@@ -3,9 +3,10 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer } from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
+import { z } from "zod";
 
 const DIST_DIR = path.join(import.meta.dirname, "dist");
 
@@ -30,7 +31,7 @@ export function createServer(): McpServer {
     {
       title: "Get Time",
       description: "Returns the current server time.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } }, // Links this tool to its UI resource
     },
     async () => {
diff --git a/examples/say-server/package.json b/examples/say-server/package.json
index a0076e6..2ebc099 100644
--- a/examples/say-server/package.json
+++ b/examples/say-server/package.json
@@ -15,7 +15,6 @@
     "build": "echo 'No build step needed for Python server'"
   },
   "dependencies": {
-    "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0"
+    "@modelcontextprotocol/ext-apps": "^1.7.0"
   }
 }
diff --git a/examples/scenario-modeler-server/main.ts b/examples/scenario-modeler-server/main.ts
index dbd3ab6..cc20e63 100644
--- a/examples/scenario-modeler-server/main.ts
+++ b/examples/scenario-modeler-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json
index a7e8a9a..63a5d48 100644
--- a/examples/scenario-modeler-server/package.json
+++ b/examples/scenario-modeler-server/package.json
@@ -29,7 +29,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "chart.js": "^4.4.0",
     "cors": "^2.8.5",
     "express": "^5.1.0",
diff --git a/examples/scenario-modeler-server/server.ts b/examples/scenario-modeler-server/server.ts
index b59851c..c5fa05d 100644
--- a/examples/scenario-modeler-server/server.ts
+++ b/examples/scenario-modeler-server/server.ts
@@ -3,11 +3,11 @@ import {
   registerAppResource,
   registerAppTool,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -305,8 +305,8 @@ export function createServer(): McpServer {
         title: "Get Scenario Data",
         description:
           "Returns SaaS scenario templates and optionally computes custom projections for given inputs",
-        inputSchema: GetScenarioDataInputSchema.shape,
-        outputSchema: GetScenarioDataOutputSchema.shape,
+        inputSchema: GetScenarioDataInputSchema,
+        outputSchema: GetScenarioDataOutputSchema,
         _meta: { ui: { resourceUri } },
       },
       async (args: {
diff --git a/examples/shadertoy-server/main.ts b/examples/shadertoy-server/main.ts
index ac8f6ad..7e388f0 100644
--- a/examples/shadertoy-server/main.ts
+++ b/examples/shadertoy-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json
index 0c27501..318f017 100644
--- a/examples/shadertoy-server/package.json
+++ b/examples/shadertoy-server/package.json
@@ -27,7 +27,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "zod": "^4.1.13"
diff --git a/examples/shadertoy-server/server.ts b/examples/shadertoy-server/server.ts
index 5238c40..50c27bc 100644
--- a/examples/shadertoy-server/server.ts
+++ b/examples/shadertoy-server/server.ts
@@ -3,11 +3,11 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
diff --git a/examples/sheet-music-server/main.ts b/examples/sheet-music-server/main.ts
index 8b143a7..d7bf3a0 100644
--- a/examples/sheet-music-server/main.ts
+++ b/examples/sheet-music-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json
index 6cf175a..10d7c71 100644
--- a/examples/sheet-music-server/package.json
+++ b/examples/sheet-music-server/package.json
@@ -27,7 +27,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "abcjs": "^6.4.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
diff --git a/examples/sheet-music-server/server.ts b/examples/sheet-music-server/server.ts
index cfd319b..be7214a 100644
--- a/examples/sheet-music-server/server.ts
+++ b/examples/sheet-music-server/server.ts
@@ -1,8 +1,8 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
diff --git a/examples/system-monitor-server/main.ts b/examples/system-monitor-server/main.ts
index 365a560..c55c799 100644
--- a/examples/system-monitor-server/main.ts
+++ b/examples/system-monitor-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json
index 760d07f..5bc4a95 100644
--- a/examples/system-monitor-server/package.json
+++ b/examples/system-monitor-server/package.json
@@ -29,7 +29,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "chart.js": "^4.4.0",
     "cors": "^2.8.5",
     "express": "^5.1.0",
diff --git a/examples/system-monitor-server/server.ts b/examples/system-monitor-server/server.ts
index 8fac5f2..a17bcf6 100644
--- a/examples/system-monitor-server/server.ts
+++ b/examples/system-monitor-server/server.ts
@@ -3,11 +3,11 @@ import {
   registerAppResource,
   registerAppTool,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -135,8 +135,8 @@ export function createServer(): McpServer {
       title: "Get System Info",
       description:
         "Returns system information, including hostname, platform, CPU info, and memory.",
-      inputSchema: {},
-      outputSchema: SystemInfoSchema.shape,
+      inputSchema: z.object({}),
+      outputSchema: SystemInfoSchema,
       _meta: { ui: { resourceUri } },
     },
     (): CallToolResult => {
@@ -156,8 +156,8 @@ export function createServer(): McpServer {
       title: "Poll System Stats",
       description:
         "Returns dynamic system metrics for polling: per-core CPU timing, memory usage, and uptime. App-only.",
-      inputSchema: {},
-      outputSchema: PollStatsSchema.shape,
+      inputSchema: z.object({}),
+      outputSchema: PollStatsSchema,
       _meta: { ui: { visibility: ["app"] } },
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/threejs-server/main.ts b/examples/threejs-server/main.ts
index 13a2084..ef16e26 100644
--- a/examples/threejs-server/main.ts
+++ b/examples/threejs-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json
index 9dda288..fb97d33 100644
--- a/examples/threejs-server/package.json
+++ b/examples/threejs-server/package.json
@@ -26,10 +26,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "react": "^19.2.0",
diff --git a/examples/threejs-server/server.ts b/examples/threejs-server/server.ts
index ae320df..0a13c19 100644
--- a/examples/threejs-server/server.ts
+++ b/examples/threejs-server/server.ts
@@ -8,8 +8,10 @@ import {
   registerAppResource,
   registerAppTool,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -161,7 +163,7 @@ export function createServer(): McpServer {
       title: "Show Three.js Scene",
       description:
         "Render an interactive 3D scene with custom Three.js code. Supports transparent backgrounds (alpha: true) for seamless host UI integration. Available globals: THREE, OrbitControls, EffectComposer, RenderPass, UnrealBloomPass, canvas, width, height.",
-      inputSchema: {
+      inputSchema: z.object({
         code: z
           .string()
           .default(DEFAULT_THREEJS_CODE)
@@ -172,7 +174,7 @@ export function createServer(): McpServer {
           .positive()
           .default(400)
           .describe("Height in pixels"),
-      },
+      }),
       outputSchema: z.object({
         success: z.boolean(),
       }),
@@ -192,7 +194,7 @@ export function createServer(): McpServer {
     {
       title: "Learn Three.js",
       description: "Get documentation and examples for using the Three.js View",
-      inputSchema: {},
+      inputSchema: z.object({}),
     },
     async () => {
       return {
diff --git a/examples/threejs-server/src/mcp-app-wrapper.tsx b/examples/threejs-server/src/mcp-app-wrapper.tsx
index 34194b1..44fee0c 100644
--- a/examples/threejs-server/src/mcp-app-wrapper.tsx
+++ b/examples/threejs-server/src/mcp-app-wrapper.tsx
@@ -6,7 +6,7 @@
  */
 import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps";
 import { useApp } from "@modelcontextprotocol/ext-apps/react";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import { StrictMode, useState, useCallback, useEffect, useRef } from "react";
 import { createRoot } from "react-dom/client";
 import { z } from "zod";
diff --git a/examples/transcript-server/main.ts b/examples/transcript-server/main.ts
index 68db8dc..e86ad7c 100644
--- a/examples/transcript-server/main.ts
+++ b/examples/transcript-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -25,7 +25,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json
index ce5b737..eea4a80 100644
--- a/examples/transcript-server/package.json
+++ b/examples/transcript-server/package.json
@@ -27,7 +27,7 @@
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "zod": "^4.1.13"
diff --git a/examples/transcript-server/server.ts b/examples/transcript-server/server.ts
index 56bf88d..863eb29 100644
--- a/examples/transcript-server/server.ts
+++ b/examples/transcript-server/server.ts
@@ -1,8 +1,8 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import {
@@ -10,6 +10,7 @@ import {
   registerAppResource,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 // Works both from source (server.ts) and compiled (dist/server.js)
 const DIST_DIR = import.meta.filename.endsWith(".ts")
   ? path.join(import.meta.dirname, "dist")
@@ -33,7 +34,7 @@ export function createServer(): McpServer {
       title: "Transcribe Speech",
       description:
         "Opens a live speech transcription interface using the Web Speech API.",
-      inputSchema: {},
+      inputSchema: z.object({}),
       _meta: { ui: { resourceUri } },
     },
     async (): Promise<CallToolResult> => {
diff --git a/examples/video-resource-server/main.ts b/examples/video-resource-server/main.ts
index 082fa5a..1983373 100644
--- a/examples/video-resource-server/main.ts
+++ b/examples/video-resource-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json
index 605b8de..ea816b9 100644
--- a/examples/video-resource-server/package.json
+++ b/examples/video-resource-server/package.json
@@ -24,10 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "zod": "^4.1.13"
diff --git a/examples/video-resource-server/server.ts b/examples/video-resource-server/server.ts
index 2cb317e..8ae6240 100644
--- a/examples/video-resource-server/server.ts
+++ b/examples/video-resource-server/server.ts
@@ -12,11 +12,9 @@ import {
 import {
   McpServer,
   ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -135,14 +133,14 @@ Available videos:
 ${Object.entries(VIDEO_LIBRARY)
   .map(([id, v]) => `- ${id}: ${v.description}`)
   .join("\n")}`,
-      inputSchema: {
+      inputSchema: z.object({
         videoId: z
           .enum(Object.keys(VIDEO_LIBRARY) as [string, ...string[]])
           .default("bunny-1mb")
           .describe(
             `Video ID to play. Available: ${Object.keys(VIDEO_LIBRARY).join(", ")}`,
           ),
-      },
+      }),
       outputSchema: z.object({
         videoUri: z.string(),
         description: z.string(),
diff --git a/examples/video-resource-server/src/mcp-app.ts b/examples/video-resource-server/src/mcp-app.ts
index 88ed913..2a3f8f9 100644
--- a/examples/video-resource-server/src/mcp-app.ts
+++ b/examples/video-resource-server/src/mcp-app.ts
@@ -5,7 +5,7 @@
  * The video is served as a base64 blob and converted to a data URI for playback.
  */
 import { App, type McpUiHostContext } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import "./global.css";
 import "./mcp-app.css";
 
diff --git a/examples/wiki-explorer-server/main.ts b/examples/wiki-explorer-server/main.ts
index cc7b3a2..bfeeffb 100644
--- a/examples/wiki-explorer-server/main.ts
+++ b/examples/wiki-explorer-server/main.ts
@@ -4,10 +4,10 @@
  * Or: node dist/index.js [--stdio]
  */
 
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { createMcpExpressApp } from "@modelcontextprotocol/express";
+import type { McpServer } from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -27,7 +27,7 @@ export async function startStreamableHTTPServer(
 
   app.all("/mcp", async (req: Request, res: Response) => {
     const server = createServer();
-    const transport = new StreamableHTTPServerTransport({
+    const transport = new NodeStreamableHTTPServerTransport({
       sessionIdGenerator: undefined,
     });
 
diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json
index 62f1de8..bd31d6f 100644
--- a/examples/wiki-explorer-server/package.json
+++ b/examples/wiki-explorer-server/package.json
@@ -26,10 +26,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
     "@modelcontextprotocol/express": "2.0.0-beta.4",
     "@modelcontextprotocol/node": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
     "cheerio": "^1.0.0",
     "cors": "^2.8.5",
     "express": "^5.1.0",
diff --git a/examples/wiki-explorer-server/server.ts b/examples/wiki-explorer-server/server.ts
index 59d5e18..8bc4eb7 100644
--- a/examples/wiki-explorer-server/server.ts
+++ b/examples/wiki-explorer-server/server.ts
@@ -3,11 +3,11 @@ import {
   registerAppResource,
   registerAppTool,
 } from "@modelcontextprotocol/ext-apps/server";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  CallToolResult,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import {
+  McpServer,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import * as cheerio from "cheerio";
 import fs from "node:fs/promises";
 import path from "node:path";
diff --git a/examples/wiki-explorer-server/src/mcp-app.ts b/examples/wiki-explorer-server/src/mcp-app.ts
index 291292d..9833d9c 100644
--- a/examples/wiki-explorer-server/src/mcp-app.ts
+++ b/examples/wiki-explorer-server/src/mcp-app.ts
@@ -2,7 +2,7 @@
  * Wiki Explorer - Force-directed graph visualization of Wikipedia link networks
  */
 import { App, type McpUiHostContext } from "@modelcontextprotocol/ext-apps";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/client";
 import { z } from "zod";
 import {
   forceCenter,
diff --git a/package-lock.json b/package-lock.json
index 5514bf1..c1ae34d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,6 @@
         "@boneskull/typedoc-plugin-mermaid": "^0.2.0",
         "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/core": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
         "@modelcontextprotocol/server": "2.0.0-beta.4",
         "@playwright/test": "1.57.0",
         "@types/bun": "^1.3.2",
@@ -55,7 +54,6 @@
       "peerDependencies": {
         "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/core": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
         "@modelcontextprotocol/server": "2.0.0-beta.4",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -74,8 +72,8 @@
       "name": "@modelcontextprotocol/ext-apps-basic-host",
       "version": "1.7.4",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "zod": "^4.1.13"
@@ -100,10 +98,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "preact": "^10.0.0",
@@ -129,10 +128,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -161,10 +161,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "solid-js": "1.9.10",
@@ -190,10 +191,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "svelte": "^5.0.0",
@@ -219,10 +221,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -246,10 +249,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "vue": "^3.5.0",
@@ -278,7 +282,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -306,7 +310,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -338,7 +342,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -366,7 +370,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "zod": "^4.1.13"
       },
       "bin": {
@@ -388,10 +392,11 @@
     "examples/integration-server": {
       "version": "1.7.4",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -421,10 +426,11 @@
       "dependencies": {
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
-        "jose": "^6.0.0"
+        "jose": "^6.0.0",
+        "zod": "^4.1.13"
       },
       "bin": {
         "mcp-server-lazy-auth": "dist/index.js"
@@ -445,10 +451,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -473,10 +480,11 @@
       "license": "MIT",
       "dependencies": {
         "@cantoo/pdf-lib": "^2.6.5",
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "pdfjs-dist": "^5.0.0",
@@ -500,8 +508,7 @@
       "name": "@modelcontextprotocol/server-qr",
       "version": "1.7.4",
       "dependencies": {
-        "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0"
+        "@modelcontextprotocol/ext-apps": "^1.7.0"
       }
     },
     "examples/quickstart": {
@@ -512,9 +519,10 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
-        "express": "^5.1.0"
+        "express": "^5.1.0",
+        "zod": "^4.1.13"
       },
       "devDependencies": {
         "@types/cors": "^2.8.19",
@@ -533,8 +541,7 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
-        "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0"
+        "@modelcontextprotocol/ext-apps": "^1.7.0"
       }
     },
     "examples/scenario-modeler-server": {
@@ -545,7 +552,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -578,7 +585,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -605,7 +612,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "abcjs": "^6.4.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -633,7 +640,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -659,10 +666,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -696,7 +704,7 @@
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -721,10 +729,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -748,10 +757,11 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
         "@modelcontextprotocol/express": "2.0.0-beta.4",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
         "@modelcontextprotocol/node": "2.0.0-beta.4",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
         "cheerio": "^1.0.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -2230,7 +2240,6 @@
       "version": "2.0.0-beta.4",
       "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.4.tgz",
       "integrity": "sha512-VNHA/UXDk7mCpVl+jOg5B4WMRRD2OEl+it360Lhi6HiCbrIB2f6pZ0cqSDKXQVUtZvqnhdQHzZAM9h8EKWhq/A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/core": "2.0.0-beta.4",
@@ -2336,6 +2345,7 @@
       "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
       "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@hono/node-server": "^1.19.9",
         "ajv": "^8.17.1",
@@ -3995,6 +4005,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
       "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -4011,6 +4022,7 @@
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
       "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -5546,6 +5558,7 @@
       "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz",
       "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ip-address": "^10.2.0"
       },
@@ -5563,7 +5576,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/fast-uri": {
       "version": "3.1.2",
@@ -5579,7 +5593,8 @@
           "url": "https://opencollective.com/fastify"
         }
       ],
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/fflate": {
       "version": "0.8.2",
@@ -5906,6 +5921,7 @@
       "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz",
       "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16.9.0"
       }
@@ -6047,6 +6063,7 @@
       "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
       "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 12"
       }
@@ -6242,13 +6259,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/json-schema-typed": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
       "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
-      "license": "BSD-2-Clause"
+      "license": "BSD-2-Clause",
+      "peer": true
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -7224,6 +7243,7 @@
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9350,6 +9370,7 @@
       "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz",
       "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==",
       "license": "ISC",
+      "peer": true,
       "peerDependencies": {
         "zod": "^3.25 || ^4"
       }
diff --git a/package.json b/package.json
index 35bcdf0..ecbf386 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,6 @@
     "@boneskull/typedoc-plugin-mermaid": "^0.2.0",
     "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/core": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
     "@modelcontextprotocol/server": "2.0.0-beta.4",
     "@playwright/test": "1.57.0",
     "@types/bun": "^1.3.2",
@@ -113,7 +112,6 @@
   "peerDependencies": {
     "@modelcontextprotocol/client": "2.0.0-beta.4",
     "@modelcontextprotocol/core": "2.0.0-beta.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
     "@modelcontextprotocol/server": "2.0.0-beta.4",
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
diff --git a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md
index 02d09a4..69e41f8 100644
--- a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md
+++ b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md
@@ -77,13 +77,15 @@ Before writing any code, analyze the server's existing tools and determine which
 ## Step 2: Add Dependencies
 
 ```bash
-npm install @modelcontextprotocol/ext-apps
+npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 zod@^4.2.0
 npm install -D vite vite-plugin-singlefile
 ```
 
 Plus framework-specific dependencies if needed (e.g., `react`, `react-dom`, `@vitejs/plugin-react` for React).
 
-Use `npm install` to add dependencies rather than manually writing version numbers. This lets npm resolve the latest compatible versions. Never specify version numbers from memory.
+Use the exact base MCP SDK prerelease required by ext-apps. Existing servers
+that still import `@modelcontextprotocol/sdk` v1 must migrate those imports and
+handler schemas before adding the App integration.
 
 ## Step 3: Set Up the Build Pipeline
 
@@ -146,10 +148,14 @@ Transform plain MCP tools into App tools with UI.
 
 **Before** (plain MCP tool):
 ```typescript
-server.tool("my-tool", { param: z.string() }, async (args) => {
-  const data = await fetchData(args.param);
-  return { content: [{ type: "text", text: JSON.stringify(data) }] };
-});
+server.registerTool(
+  "my-tool",
+  { inputSchema: z.object({ param: z.string() }) },
+  async ({ param }) => {
+    const data = await fetchData(param);
+    return { content: [{ type: "text", text: JSON.stringify(data) }] };
+  },
+);
 ```
 
 **After** (App tool with UI):
@@ -158,17 +164,22 @@ import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@model
 
 const resourceUri = "ui://my-tool/mcp-app.html";
 
-registerAppTool(server, "my-tool", {
-  description: "Shows data with an interactive UI",
-  inputSchema: { param: z.string() },
-  _meta: { ui: { resourceUri } },
-}, async (args) => {
-  const data = await fetchData(args.param);
-  return {
-    content: [{ type: "text", text: JSON.stringify(data) }],   // text fallback for non-UI hosts
-    structuredContent: { data },                                 // structured data for the UI
-  };
-});
+registerAppTool(
+  server,
+  "my-tool",
+  {
+    description: "Shows data with an interactive UI",
+    inputSchema: z.object({ param: z.string() }),
+    _meta: { ui: { resourceUri } },
+  },
+  async ({ param }) => {
+    const data = await fetchData(param);
+    return {
+      content: [{ type: "text", text: JSON.stringify(data) }], // text fallback for non-UI hosts
+      structuredContent: { data }, // structured data for the UI
+    };
+  },
+);
 ```
 
 Key guidance:
@@ -187,17 +198,21 @@ import path from "node:path";
 
 const resourceUri = "ui://my-tool/mcp-app.html";
 
-registerAppResource(server, {
-  uri: resourceUri,
-  name: "My Tool UI",
-  mimeType: RESOURCE_MIME_TYPE,
-}, async () => {
-  const html = await fs.readFile(
-    path.resolve(import.meta.dirname, "dist", "mcp-app.html"),
-    "utf-8",
-  );
-  return { contents: [{ uri: resourceUri, mimeType: RESOURCE_MIME_TYPE, text: html }] };
-});
+registerAppResource(
+  server,
+  "My Tool UI",
+  resourceUri,
+  {},
+  async () => {
+    const html = await fs.readFile(
+      path.resolve(import.meta.dirname, "dist", "mcp-app.html"),
+      "utf-8",
+    );
+    return {
+      contents: [{ uri: resourceUri, mimeType: RESOURCE_MIME_TYPE, text: html }],
+    };
+  },
+);
 ```
 
 If multiple tools share the same UI, they can reference the same `resourceUri` and the same resource registration.
@@ -271,25 +286,32 @@ registerAppTool(server, "poll-data", {
 });
 ```
 
-The UI calls these via `app.callServerTool("poll-data", {})`.
+The UI calls these via
+`app.callServerTool({ name: "poll-data", arguments: {} })`.
 
 ### CSP Configuration
 
 If the UI needs to load external resources (fonts, APIs, CDNs), declare the domains:
 
 ```typescript
-registerAppResource(server, {
-  uri: resourceUri,
-  name: "My Tool UI",
-  mimeType: RESOURCE_MIME_TYPE,
-  _meta: {
-    ui: {
-      connectDomains: ["api.example.com"],      // fetch/XHR targets
-      resourceDomains: ["cdn.example.com"],      // scripts, styles, images
-      frameDomains: ["embed.example.com"],        // nested iframes
+registerAppResource(server, "My Tool UI", resourceUri, {}, async () => ({
+  contents: [
+    {
+      uri: resourceUri,
+      mimeType: RESOURCE_MIME_TYPE,
+      text: html,
+      _meta: {
+        ui: {
+          csp: {
+            connectDomains: ["https://api.example.com"], // fetch/XHR targets
+            resourceDomains: ["https://cdn.example.com"], // scripts, styles, images
+            frameDomains: ["https://embed.example.com"], // nested iframes
+          },
+        },
+      },
     },
-  },
-}, async () => { /* ... */ });
+  ],
+}));
 ```
 
 ### Streaming Partial Input
@@ -326,7 +348,14 @@ server.server.oninitialized = () => {
     }, appToolHandler);
   } else {
     // Text-only client — register plain tool
-    server.tool("my-tool", "Shows data", { param: z.string() }, plainToolHandler);
+    server.registerTool(
+      "my-tool",
+      {
+        description: "Shows data",
+        inputSchema: z.object({ param: z.string() }),
+      },
+      plainToolHandler,
+    );
   }
 };
 ```
diff --git a/plugins/mcp-apps/skills/convert-web-app/SKILL.md b/plugins/mcp-apps/skills/convert-web-app/SKILL.md
index 5db2d94..22686ef 100644
--- a/plugins/mcp-apps/skills/convert-web-app/SKILL.md
+++ b/plugins/mcp-apps/skills/convert-web-app/SKILL.md
@@ -115,19 +115,20 @@ Create a new MCP server with tool and resource registration. This wraps the exis
 ### Dependencies
 
 ```bash
-npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk zod
+npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 zod@^4.2.0
 npm install -D tsx vite vite-plugin-singlefile
 ```
 
-Use `npm install` to add dependencies rather than manually writing version numbers. This lets npm resolve the latest compatible versions. Never specify version numbers from memory.
+Use `npm install` with the exact base MCP SDK prerelease required by ext-apps.
+Do not substitute unpublished local packages or guess a different prerelease.
 
 ### Server Code
 
 Create `server.ts`:
 
 ```typescript
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
 import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -140,7 +141,9 @@ const resourceUri = "ui://my-app/mcp-app.html";
 // Register the tool — inputSchema maps to the app's data sources
 registerAppTool(server, "show-app", {
   description: "Displays the app with the given parameters",
-  inputSchema: { query: z.string().describe("The search query") },
+  inputSchema: z.object({
+    query: z.string().describe("The search query"),
+  }),
   _meta: { ui: { resourceUri } },
 }, async (args) => {
   // Process args server-side if needed
@@ -151,19 +154,29 @@ registerAppTool(server, "show-app", {
 });
 
 // Register the HTML resource
-registerAppResource(server, {
-  uri: resourceUri,
-  name: "My App UI",
-  mimeType: RESOURCE_MIME_TYPE,
-  // Add CSP domains from Step 2 if needed:
-  // _meta: { ui: { connectDomains: ["api.example.com"], resourceDomains: ["cdn.example.com"] } },
-}, async () => {
-  const html = await fs.readFile(
-    path.resolve(import.meta.dirname, "dist", "mcp-app.html"),
-    "utf-8",
-  );
-  return { contents: [{ uri: resourceUri, mimeType: RESOURCE_MIME_TYPE, text: html }] };
-});
+registerAppResource(
+  server,
+  "My App UI",
+  resourceUri,
+  {},
+  async () => {
+    const html = await fs.readFile(
+      path.resolve(import.meta.dirname, "dist", "mcp-app.html"),
+      "utf-8",
+    );
+    return {
+      contents: [
+        {
+          uri: resourceUri,
+          mimeType: RESOURCE_MIME_TYPE,
+          text: html,
+          // Add CSP domains from Step 2 if needed:
+          // _meta: { ui: { csp: { connectDomains: ["https://api.example.com"], resourceDomains: ["https://cdn.example.com"] } } },
+        },
+      ],
+    };
+  },
+);
 
 // Start the server
 const transport = new StdioServerTransport();
@@ -310,7 +323,10 @@ const data = await fetch("/api/data").then(r => r.json());
 // After (hybrid):
 async function fetchData(): Promise<any> {
   if (isMcpApp) {
-    const result = await app.callServerTool("fetch-data", {});
+    const result = await app.callServerTool({
+      name: "fetch-data",
+      arguments: {},
+    });
     return result.structuredContent;
   }
   return fetch("/api/data").then(r => r.json());
@@ -437,7 +453,8 @@ registerAppTool(server, "refresh-data", {
 });
 ```
 
-The UI calls these via `app.callServerTool("refresh-data", {})`.
+The UI calls these via
+`app.callServerTool({ name: "refresh-data", arguments: {} })`.
 
 ### Streaming Partial Input
 
diff --git a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md
index 5bd1219..fc41e70 100644
--- a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md
+++ b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md
@@ -110,11 +110,12 @@ See `/tmp/mcp-ext-apps/docs/patterns.md` for detailed recipes:
 **Always** use `npm install` to add dependencies rather than manually writing version numbers:
 
 ```bash
-npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk zod express cors
+npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 @modelcontextprotocol/node@2.0.0-beta.4 @modelcontextprotocol/express@2.0.0-beta.4 zod@^4.2.0 express cors
 npm install -D typescript vite vite-plugin-singlefile concurrently cross-env @types/node @types/express @types/cors
 ```
 
-This lets npm resolve the latest compatible versions. **Never** specify version numbers from memory.
+Use the exact base MCP SDK prerelease required by ext-apps. Do not substitute
+unpublished local packages or guess a different prerelease.
 
 ### TypeScript Server Execution
 
diff --git a/scripts/typedoc-plugin-base-sdk-links.mjs b/scripts/typedoc-plugin-base-sdk-links.mjs
new file mode 100644
index 0000000..6098918
--- /dev/null
+++ b/scripts/typedoc-plugin-base-sdk-links.mjs
@@ -0,0 +1,16 @@
+/**
+ * Resolve module-local links inherited from the base MCP SDK declarations.
+ *
+ * TypeDoc's externalSymbolLinkMappings handles package-qualified symbols, but
+ * the base SDK writes this particular reference as `index.inputRequired`.
+ */
+
+const BASE_SDK_DOCS = "https://ts.sdk.modelcontextprotocol.io/v2/";
+
+/** @param {import("typedoc").Application} app */
+export function load(app) {
+  app.converter.addUnknownSymbolResolver((ref) => {
+    const name = ref.symbolReference?.path?.map((part) => part.path).join(".");
+    if (name === "index.inputRequired") return BASE_SDK_DOCS;
+  });
+}
diff --git a/src/app-bridge.examples.ts b/src/app-bridge.examples.ts
index d5dc5bc..47ad623 100644
--- a/src/app-bridge.examples.ts
+++ b/src/app-bridge.examples.ts
@@ -7,17 +7,11 @@
  * @module
  */
 
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
-import {
-  CallToolResult,
-  CallToolResultSchema,
+import { Client, type Transport } from "@modelcontextprotocol/client";
+import type {
   CreateMessageRequest,
   CreateMessageResult,
-  ListResourcesResultSchema,
-  ReadResourceResultSchema,
-  ListPromptsResultSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import { AppBridge, PostMessageTransport } from "./app-bridge.js";
 import type { McpUiDisplayMode } from "./types.js";
 
@@ -223,8 +217,7 @@ function AppBridge_oncalltool_forwardToServer(
   bridge.oncalltool = async (params, extra) => {
     return mcpClient.request(
       { method: "tools/call", params },
-      CallToolResultSchema,
-      { signal: extra.signal },
+      { signal: extra.mcpReq.signal },
     );
   };
   //#endregion AppBridge_oncalltool_forwardToServer
@@ -245,7 +238,9 @@ function AppBridge_oncreatesamplingmessage_forwardToLlm(
   //#region AppBridge_oncreatesamplingmessage_forwardToLlm
   bridge.oncreatesamplingmessage = async (params, extra) => {
     // Apply rate limiting, user approval, cost controls here
-    return await myLlmProvider.complete(params, { signal: extra.signal });
+    return await myLlmProvider.complete(params, {
+      signal: extra.mcpReq.signal,
+    });
   };
   //#endregion AppBridge_oncreatesamplingmessage_forwardToLlm
 }
@@ -261,8 +256,7 @@ function AppBridge_onlistresources_returnResources(
   bridge.onlistresources = async (params, extra) => {
     return mcpClient.request(
       { method: "resources/list", params },
-      ListResourcesResultSchema,
-      { signal: extra.signal },
+      { signal: extra.mcpReq.signal },
     );
   };
   //#endregion AppBridge_onlistresources_returnResources
@@ -279,8 +273,7 @@ function AppBridge_onreadresource_returnResource(
   bridge.onreadresource = async (params, extra) => {
     return mcpClient.request(
       { method: "resources/read", params },
-      ReadResourceResultSchema,
-      { signal: extra.signal },
+      { signal: extra.mcpReq.signal },
     );
   };
   //#endregion AppBridge_onreadresource_returnResource
@@ -297,8 +290,7 @@ function AppBridge_onlistprompts_returnPrompts(
   bridge.onlistprompts = async (params, extra) => {
     return mcpClient.request(
       { method: "prompts/list", params },
-      ListPromptsResultSchema,
-      { signal: extra.signal },
+      { signal: extra.mcpReq.signal },
     );
   };
   //#endregion AppBridge_onlistprompts_returnPrompts
@@ -444,10 +436,10 @@ async function AppBridge_sendToolResult_afterExecution(
   args: Record<string, unknown>,
 ) {
   //#region AppBridge_sendToolResult_afterExecution
-  const result = await mcpClient.request(
-    { method: "tools/call", params: { name: "get_weather", arguments: args } },
-    CallToolResultSchema,
-  );
+  const result = await mcpClient.request({
+    method: "tools/call",
+    params: { name: "get_weather", arguments: args },
+  });
   bridge.sendToolResult(result);
   //#endregion AppBridge_sendToolResult_afterExecution
 }
diff --git a/src/app-bridge.ts b/src/app-bridge.ts
index c65510d..d353cf7 100644
--- a/src/app-bridge.ts
+++ b/src/app-bridge.ts
@@ -261,7 +261,7 @@ export type AppBridgeEventMap = {
 /**
  * Host-side bridge for communicating with a single View ({@link app!App `App`}).
  *
- * `AppBridge` extends the MCP SDK's `Protocol` class and acts as a proxy between
+ * `AppBridge` extends the base MCP SDK's public `Server` class and acts as a proxy between
  * the host application and a view running in an iframe. When an MCP client
  * is provided to the constructor, it automatically forwards MCP server capabilities
  * (tools, resources, prompts) to the view. It also handles the initialization
@@ -667,8 +667,7 @@ export class AppBridge extends Server {
    * ```typescript
    * bridge.onsandboxready = async () => {
    *   const resource = await mcpClient.request(
-   *     { method: "resources/read", params: { uri: "ui://my-app" } },
-   *     ReadResourceResultSchema
+   *     { method: "resources/read", params: { uri: "ui://my-app" } }
    *   );
    *
    *   bridge.sendSandboxResourceReady({
@@ -1154,14 +1153,13 @@ export class AppBridge extends Server {
    * bridge.oncalltool = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "tools/call", params },
-   *     CallToolResultSchema,
-   *     { signal: extra.signal },
+   *     { signal: extra.mcpReq.signal },
    *   );
    * };
    * ```
    *
-   * @see `CallToolRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `CallToolResult` from @modelcontextprotocol/sdk for the result type
+   * @see `CallToolRequest` from @modelcontextprotocol/server for the request type
+   * @see `CallToolResult` from @modelcontextprotocol/server for the result type
    */
   private _oncalltool?: (
     params: CallToolRequest["params"],
@@ -1209,12 +1207,14 @@ export class AppBridge extends Server {
    * ```ts source="./app-bridge.examples.ts#AppBridge_oncreatesamplingmessage_forwardToLlm"
    * bridge.oncreatesamplingmessage = async (params, extra) => {
    *   // Apply rate limiting, user approval, cost controls here
-   *   return await myLlmProvider.complete(params, { signal: extra.signal });
+   *   return await myLlmProvider.complete(params, {
+   *     signal: extra.mcpReq.signal,
+   *   });
    * };
    * ```
    *
-   * @see `CreateMessageRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/sdk for result types
+   * @see `CreateMessageRequest` from @modelcontextprotocol/server for the request type
+   * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/server for result types
    */
   set oncreatesamplingmessage(
     callback: (
@@ -1244,7 +1244,7 @@ export class AppBridge extends Server {
    * });
    * ```
    *
-   * @see `ToolListChangedNotification` from @modelcontextprotocol/sdk for the notification type
+   * @see `ToolListChangedNotification` from @modelcontextprotocol/server for the notification type
    */
   sendToolListChanged(params: ToolListChangedNotification["params"] = {}) {
     return this.notification({
@@ -1270,14 +1270,13 @@ export class AppBridge extends Server {
    * bridge.onlistresources = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "resources/list", params },
-   *     ListResourcesResultSchema,
-   *     { signal: extra.signal },
+   *     { signal: extra.mcpReq.signal },
    *   );
    * };
    * ```
    *
-   * @see `ListResourcesRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ListResourcesResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ListResourcesRequest` from @modelcontextprotocol/server for the request type
+   * @see `ListResourcesResult` from @modelcontextprotocol/server for the result type
    */
   private _onlistresources?: (
     params: ListResourcesRequest["params"],
@@ -1325,14 +1324,13 @@ export class AppBridge extends Server {
    * bridge.onlistresourcetemplates = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "resources/templates/list", params },
-   *     ListResourceTemplatesResultSchema,
-   *     { signal: extra.signal }
+   *     { signal: extra.mcpReq.signal }
    *   );
    * };
    * ```
    *
-   * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ListResourceTemplatesResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/server for the request type
+   * @see `ListResourceTemplatesResult` from @modelcontextprotocol/server for the result type
    */
   private _onlistresourcetemplates?: (
     params: ListResourceTemplatesRequest["params"],
@@ -1383,14 +1381,13 @@ export class AppBridge extends Server {
    * bridge.onreadresource = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "resources/read", params },
-   *     ReadResourceResultSchema,
-   *     { signal: extra.signal },
+   *     { signal: extra.mcpReq.signal },
    *   );
    * };
    * ```
    *
-   * @see `ReadResourceRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ReadResourceResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ReadResourceRequest` from @modelcontextprotocol/server for the request type
+   * @see `ReadResourceResult` from @modelcontextprotocol/server for the result type
    */
   private _onreadresource?: (
     params: ReadResourceRequest["params"],
@@ -1438,7 +1435,7 @@ export class AppBridge extends Server {
    * });
    * ```
    *
-   * @see `ResourceListChangedNotification` from @modelcontextprotocol/sdk for the notification type
+   * @see `ResourceListChangedNotification` from @modelcontextprotocol/server for the notification type
    */
   sendResourceListChanged(
     params: ResourceListChangedNotification["params"] = {},
@@ -1466,14 +1463,13 @@ export class AppBridge extends Server {
    * bridge.onlistprompts = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "prompts/list", params },
-   *     ListPromptsResultSchema,
-   *     { signal: extra.signal },
+   *     { signal: extra.mcpReq.signal },
    *   );
    * };
    * ```
    *
-   * @see `ListPromptsRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ListPromptsResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ListPromptsRequest` from @modelcontextprotocol/server for the request type
+   * @see `ListPromptsResult` from @modelcontextprotocol/server for the result type
    */
   private _onlistprompts?: (
     params: ListPromptsRequest["params"],
@@ -1520,7 +1516,7 @@ export class AppBridge extends Server {
    * });
    * ```
    *
-   * @see `PromptListChangedNotification` from @modelcontextprotocol/sdk for the notification type
+   * @see `PromptListChangedNotification` from @modelcontextprotocol/server for the notification type
    */
   sendPromptListChanged(params: PromptListChangedNotification["params"] = {}) {
     return this.notification({
@@ -1722,10 +1718,10 @@ export class AppBridge extends Server {
    *
    * @example
    * ```ts source="./app-bridge.examples.ts#AppBridge_sendToolResult_afterExecution"
-   * const result = await mcpClient.request(
-   *   { method: "tools/call", params: { name: "get_weather", arguments: args } },
-   *   CallToolResultSchema,
-   * );
+   * const result = await mcpClient.request({
+   *   method: "tools/call",
+   *   params: { name: "get_weather", arguments: args },
+   * });
    * bridge.sendToolResult(result);
    * ```
    *
diff --git a/src/app.examples.ts b/src/app.examples.ts
index 81bdd44..7d475ef 100644
--- a/src/app.examples.ts
+++ b/src/app.examples.ts
@@ -7,11 +7,8 @@
  * @module
  */
 
-import type { Tool } from "@modelcontextprotocol/sdk/types.js";
-import type {
-  McpServer,
-  ToolCallback,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { SamplingMessage, Tool } from "@modelcontextprotocol/client";
+import type { McpServer, ToolCallback } from "@modelcontextprotocol/server";
 import {
   App,
   PostMessageTransport,
@@ -369,7 +366,7 @@ async function App_createSamplingMessage_simple(app: App) {
  */
 async function App_createSamplingMessage_withTools(
   app: App,
-  messages: import("@modelcontextprotocol/sdk/types.js").SamplingMessage[],
+  messages: SamplingMessage[],
 ) {
   //#region App_createSamplingMessage_withTools
   if (!app.getHostCapabilities()?.sampling?.tools) return;
diff --git a/src/app.ts b/src/app.ts
index 3c8f5b7..7e752ce 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -174,9 +174,9 @@ export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app";
 /**
  * Options for configuring {@link App `App`} behavior.
  *
- * Extends `ProtocolOptions` from the MCP SDK with `App`-specific configuration.
+ * Extends `ClientOptions` from the base MCP SDK with `App`-specific configuration.
  *
- * @see `ProtocolOptions` from @modelcontextprotocol/sdk for inherited options
+ * @see `ClientOptions` from @modelcontextprotocol/client for inherited options
  */
 export type AppOptions = Omit<
   ClientOptions,
@@ -243,7 +243,7 @@ export type AppToolResult<
  * validated/parsed input; when `In` is `undefined`, the callback receives only
  * `extra`. When `Out` is provided, the return's `structuredContent` is typed.
  *
- * Mirrors `ToolCallback` from `@modelcontextprotocol/sdk/server/mcp.js` but is
+ * Mirrors `ToolCallback` from `@modelcontextprotocol/server` but is
  * parameterized over {@link StandardSchemaV1} instead of zod, so any
  * Standard-Schema-compatible library (Zod, ArkType, Valibot, …) can be used.
  */
@@ -261,7 +261,7 @@ export type AppToolCallback<
 
 /**
  * Handle returned by {@link App.registerTool}. Mirrors `RegisteredTool` from
- * `@modelcontextprotocol/sdk/server/mcp.js` but stores
+ * `@modelcontextprotocol/server` but stores
  * {@link StandardSchemaV1} schemas.
  */
 export type RegisteredAppTool = {
@@ -302,9 +302,8 @@ export type AppEventMap = {
  * Main class for MCP Apps to communicate with their host.
  *
  * The `App` class provides a framework-agnostic way to build interactive MCP Apps
- * that run inside host applications. It extends the MCP SDK's `Protocol` class and
- * handles the connection lifecycle, initialization handshake, and bidirectional
- * communication with the host.
+ * that run inside host applications. It extends the base MCP SDK's public
+ * `Client` class and adds the Apps handshake, lifecycle, and high-level APIs.
  *
  * ## Architecture
  *
@@ -321,7 +320,7 @@ export type AppEventMap = {
  *
  * ## Protocol and event methods
  *
- * As a subclass of the MCP SDK's `Protocol`, `App` provides:
+ * As a subclass of the base MCP SDK's `Client`, `App` provides:
  * - `setRequestHandler()` - Register handlers for requests from host
  * - `setNotificationHandler()` - Register handlers for notifications from host
  * - `addEventListener()` - Append a listener for a notification event (multi-listener)
@@ -1458,8 +1457,8 @@ export class App extends Client {
    * }
    * ```
    *
-   * @see `CreateMessageRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/sdk for result types
+   * @see `CreateMessageRequest` from @modelcontextprotocol/client for the request type
+   * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/client for result types
    */
   async createSamplingMessage(
     params: CreateMessageRequest["params"] & { tools?: undefined },
diff --git a/src/events.ts b/src/events.ts
index b891867..aff1446 100644
--- a/src/events.ts
+++ b/src/events.ts
@@ -38,9 +38,8 @@ export class EventDispatcher<EventMap extends Record<string, unknown>> {
   getHandler<K extends keyof EventMap>(
     event: K,
   ): ((params: EventMap[K]) => void) | undefined {
-    return (this._eventSlots.get(event) as
-      | EventSlot<EventMap[K]>
-      | undefined)?.onHandler;
+    return (this._eventSlots.get(event) as EventSlot<EventMap[K]> | undefined)
+      ?.onHandler;
   }
 
   /** Add a listener. Listeners run in insertion order after the handler. */
diff --git a/src/message-transport.test.ts b/src/message-transport.test.ts
index d5f5092..2a115f3 100644
--- a/src/message-transport.test.ts
+++ b/src/message-transport.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, mock } from "bun:test";
-import type { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js";
+import type { JSONRPCMessage } from "@modelcontextprotocol/client";
 
 import { PostMessageTransport } from "./message-transport";
 
diff --git a/src/server/index.examples.ts b/src/server/index.examples.ts
index d583ae8..9ceebce 100644
--- a/src/server/index.examples.ts
+++ b/src/server/index.examples.ts
@@ -9,17 +9,14 @@
 
 import * as crypto from "node:crypto";
 import * as fs from "node:fs/promises";
-import type {
-  McpServer,
-  ToolCallback,
-  ReadResourceCallback,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer, ToolCallback } from "@modelcontextprotocol/server";
 import { z } from "zod";
 import {
   registerAppTool,
   registerAppResource,
   getUiCapability,
   RESOURCE_MIME_TYPE,
+  type ReadResourceCallback,
 } from "./index.js";
 
 // Stubs for external functions used in examples
@@ -74,7 +71,7 @@ function registerAppTool_basicUsage(server: McpServer) {
     {
       title: "Get Weather",
       description: "Get current weather for a location",
-      inputSchema: { location: z.string() },
+      inputSchema: z.object({ location: z.string() }),
       _meta: {
         ui: { resourceUri: "ui://weather/view.html" },
       },
@@ -122,7 +119,7 @@ function registerAppTool_appOnlyVisibility(server: McpServer) {
     "update-quantity",
     {
       description: "Update item quantity in cart",
-      inputSchema: { itemId: z.string(), quantity: z.number() },
+      inputSchema: z.object({ itemId: z.string(), quantity: z.number() }),
       _meta: {
         ui: {
           resourceUri: "ui://shop/cart.html",
diff --git a/src/server/index.test.ts b/src/server/index.test.ts
index 1853cc0..5de341f 100644
--- a/src/server/index.test.ts
+++ b/src/server/index.test.ts
@@ -7,7 +7,7 @@ import {
   getUiCapability,
   EXTENSION_ID,
 } from "./index";
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpServer } from "@modelcontextprotocol/server";
 
 describe("registerAppTool", () => {
   it("should pass through config to server.registerTool", () => {
diff --git a/src/server/index.ts b/src/server/index.ts
index b8b3ad0..61e7438 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -150,7 +150,7 @@ export interface McpUiAppResourceConfig extends ResourceMetadata {
  *   {
  *     title: "Get Weather",
  *     description: "Get current weather for a location",
- *     inputSchema: { location: z.string() },
+ *     inputSchema: z.object({ location: z.string() }),
  *     _meta: {
  *       ui: { resourceUri: "ui://weather/view.html" },
  *     },
@@ -190,7 +190,7 @@ export interface McpUiAppResourceConfig extends ResourceMetadata {
  *   "update-quantity",
  *   {
  *     description: "Update item quantity in cart",
- *     inputSchema: { itemId: z.string(), quantity: z.number() },
+ *     inputSchema: z.object({ itemId: z.string(), quantity: z.number() }),
  *     _meta: {
  *       ui: {
  *         resourceUri: "ui://shop/cart.html",
diff --git a/typedoc.config.mjs b/typedoc.config.mjs
index 00babc4..041bf5e 100644
--- a/typedoc.config.mjs
+++ b/typedoc.config.mjs
@@ -1,5 +1,7 @@
 import { OptionDefaults } from "typedoc";
 
+const BASE_SDK_DOCS = "https://ts.sdk.modelcontextprotocol.io/v2/";
+
 /** @type {Partial<import('typedoc').TypeDocOptions>} */
 const config = {
   name: "MCP Apps",
@@ -29,6 +31,28 @@ const config = {
   excludePrivate: true,
   excludeInternal: false,
   intentionallyNotExported: ["RequestHandlerExtra"],
+  externalSymbolLinkMappings: {
+    "@modelcontextprotocol/client": {
+      ClientOptions: BASE_SDK_DOCS,
+      ConnectOptions: BASE_SDK_DOCS,
+      DiscoverResult: BASE_SDK_DOCS,
+      ProtocolError: BASE_SDK_DOCS,
+      "Protocol.close": BASE_SDK_DOCS,
+      "Protocol.notification": BASE_SDK_DOCS,
+      ResponseCacheStore: BASE_SDK_DOCS,
+      SdkError: BASE_SDK_DOCS,
+      "SdkErrorCode.MethodNotSupportedByProtocolVersion": BASE_SDK_DOCS,
+      "__type.enforceStrictCapabilities": BASE_SDK_DOCS,
+    },
+    "@modelcontextprotocol/server": {
+      LoggingMessageNotification: BASE_SDK_DOCS,
+      "McpServer.registerTool": BASE_SDK_DOCS,
+      "MessageExtraInfo.classification": BASE_SDK_DOCS,
+      "Protocol.close": BASE_SDK_DOCS,
+      "Protocol.notification": BASE_SDK_DOCS,
+      "SdkErrorCode.UnsupportedResultType": BASE_SDK_DOCS,
+    },
+  },
   blockTags: [...OptionDefaults.blockTags, "@description"],
   jsDocCompatibility: {
     exampleTag: false,
@@ -49,6 +73,7 @@ const config = {
   out: "docs/api",
   plugin: [
     "typedoc-github-theme",
+    "./scripts/typedoc-plugin-base-sdk-links.mjs",
     "./scripts/typedoc-plugin-fix-mermaid-entities.mjs",
     "./scripts/typedoc-plugin-seo.mjs",
     "./scripts/typedoc-plugin-mcpstyle.mjs",