diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb419382c..8443d1e5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  workflow_dispatch:
 
 permissions:
   contents: read
diff --git a/README.md b/README.md
index 2fd89ffee..45d87b410 100644
--- a/README.md
+++ b/README.md
@@ -122,9 +122,15 @@ resources:
 ## Getting Started
 
 ```bash
-npm install -S @modelcontextprotocol/ext-apps
+npm install -S @modelcontextprotocol/ext-apps \
+  @modelcontextprotocol/client @modelcontextprotocol/server @modelcontextprotocol/core
 ```
 
+Peer dependencies are the MCP TypeScript SDK v2 packages
+(`@modelcontextprotocol/client`, `/server`, `/core` at `2.0.0-beta.3`). Install
+the ones your entry point needs — Views use `client` + `core`, server helpers
+use `server`, and `app-bridge` uses all three.
+
 **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 a129d5ddd..77308a32e 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 deps stay external so consumers share a single instance (zod
+// instanceof / schema.extend() break with duplicates; MCP packages must
+// match the host's installed v2 SDK). Bundled into *-with-deps variants.
+const PEER_EXTERNALS = [
+  "@modelcontextprotocol/client",
+  "@modelcontextprotocol/core",
+  "@modelcontextprotocol/server",
+  "zod",
+];
 
 await Promise.all([
   buildJs("src/app.ts", {
diff --git a/docs/migrate_from_openai_apps.md b/docs/migrate_from_openai_apps.md
index d91281b41..78e822901 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() {
@@ -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,
diff --git a/docs/patterns.tsx b/docs/patterns.tsx
index 6b876926b..1690bd6d9 100644
--- a/docs/patterns.tsx
+++ b/docs/patterns.tsx
@@ -17,16 +17,13 @@ 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 { ReadResourceResultSchema } from "@modelcontextprotocol/core";
 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";
 
 /**
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 3e00796c5..a041ac45a 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -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/server @modelcontextprotocol/node @modelcontextprotocol/express express cors
 npm install -D typescript vite vite-plugin-singlefile @types/express @types/cors @types/node tsx concurrently cross-env
 ```
 
@@ -178,7 +178,7 @@ 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";
 
@@ -240,10 +240,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 type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import type { Request, Response } from "express";
 import { createServer } from "./server.js";
@@ -263,7 +263,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-host/package.json b/examples/basic-host/package.json
index 1b45dcf18..5b735fc67 100644
--- a/examples/basic-host/package.json
+++ b/examples/basic-host/package.json
@@ -11,8 +11,8 @@
     "dev": "cross-env NODE_ENV=development concurrently \"npm run watch\" \"npm run serve\""
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
     "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 31e36983e..5ef11d88b 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";
 
@@ -94,7 +98,7 @@ export function callTool(
   input: Record<string, unknown>,
 ): ToolCallInfo {
   log.info("Calling tool", name, "with input", input);
-  const resultPromise = serverInfo.client.callTool({ name, arguments: input }) as Promise<CallToolResult>;
+  const resultPromise = serverInfo.client.callTool({ name, arguments: input });
 
   const tool = serverInfo.tools.get(name);
   if (!tool) {
diff --git a/examples/basic-host/src/index.tsx b/examples/basic-host/src/index.tsx
index 3d488a792..00c0d52b2 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 76426326d..0e78df9a7 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 { 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-preact/package.json b/examples/basic-server-preact/package.json
index 512720205..fa0c65b25 100644
--- a/examples/basic-server-preact/package.json
+++ b/examples/basic-server-preact/package.json
@@ -24,8 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 bf14ea599..133a0e196 100644
--- a/examples/basic-server-preact/server.ts
+++ b/examples/basic-server-preact/server.ts
@@ -1,5 +1,5 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import type { CallToolResult, 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";
diff --git a/examples/basic-server-preact/src/mcp-app.tsx b/examples/basic-server-preact/src/mcp-app.tsx
index a8bdc68b8..351a8ec21 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 ec187b68a..7b40b8118 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 type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+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-react/package.json b/examples/basic-server-react/package.json
index e4d12333f..06177e22a 100644
--- a/examples/basic-server-react/package.json
+++ b/examples/basic-server-react/package.json
@@ -34,8 +34,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 23f6dda5a..bfff3170a 100644
--- a/examples/basic-server-react/server.ts
+++ b/examples/basic-server-react/server.ts
@@ -1,6 +1,6 @@
 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 } from "@modelcontextprotocol/server";
+import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 
diff --git a/examples/basic-server-react/src/mcp-app.tsx b/examples/basic-server-react/src/mcp-app.tsx
index 6bb554025..6ddecc114 100644
--- a/examples/basic-server-react/src/mcp-app.tsx
+++ b/examples/basic-server-react/src/mcp-app.tsx
@@ -1,17 +1,17 @@
 /**
  * @file App that demonstrates a few features using MCP Apps SDK + React.
  */
-import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps";
+import type { App, CallToolResult, McpUiHostContext } from "@modelcontextprotocol/ext-apps";
 import { useApp } from "@modelcontextprotocol/ext-apps/react";
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { StrictMode, useCallback, useEffect, useState } from "react";
 import { createRoot } from "react-dom/client";
 import styles from "./mcp-app.module.css";
 
-
 function extractTime(callToolResult: CallToolResult): string {
-  const { text } = callToolResult.content?.find((c) => c.type === "text")!;
-  return text;
+  const sc = callToolResult.structuredContent as { time?: string } | undefined;
+  if (sc?.time) return sc.time;
+  const { text } = callToolResult.content?.find((c) => c.type === "text") ?? {};
+  return text ?? "";
 }
 
 
diff --git a/examples/basic-server-solid/main.ts b/examples/basic-server-solid/main.ts
index c8d9de225..095ef8dfd 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 8f75ac8c2..c61b95e6c 100644
--- a/examples/basic-server-solid/package.json
+++ b/examples/basic-server-solid/package.json
@@ -24,8 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 2ed2d9356..9c7259d7c 100644
--- a/examples/basic-server-solid/server.ts
+++ b/examples/basic-server-solid/server.ts
@@ -1,5 +1,5 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import type { CallToolResult, 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";
diff --git a/examples/basic-server-solid/src/mcp-app.tsx b/examples/basic-server-solid/src/mcp-app.tsx
index 66d47f3f6..2d78b7b33 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 6c50a254f..a48a8711f 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 { 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-svelte/package.json b/examples/basic-server-svelte/package.json
index f877bf7c8..54b4bc0c0 100644
--- a/examples/basic-server-svelte/package.json
+++ b/examples/basic-server-svelte/package.json
@@ -24,8 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 da603ca8d..6604df724 100644
--- a/examples/basic-server-svelte/server.ts
+++ b/examples/basic-server-svelte/server.ts
@@ -1,5 +1,5 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import type { CallToolResult, 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";
diff --git a/examples/basic-server-svelte/src/App.svelte b/examples/basic-server-svelte/src/App.svelte
index fde128dde..cabcc317d 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 286fa34f0..4de733187 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 5d47f2cdc..d37d0109a 100644
--- a/examples/basic-server-vanillajs/package.json
+++ b/examples/basic-server-vanillajs/package.json
@@ -24,8 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 5b2daf704..56dd0ee4b 100644
--- a/examples/basic-server-vanillajs/server.ts
+++ b/examples/basic-server-vanillajs/server.ts
@@ -1,6 +1,6 @@
 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 } from "@modelcontextprotocol/server";
+import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
diff --git a/examples/basic-server-vanillajs/src/mcp-app.ts b/examples/basic-server-vanillajs/src/mcp-app.ts
index c3168c214..6b5084a3a 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 669a07189..c465ebdd0 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 { 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-vue/package.json b/examples/basic-server-vue/package.json
index d27ddc91b..a704bf871 100644
--- a/examples/basic-server-vue/package.json
+++ b/examples/basic-server-vue/package.json
@@ -24,8 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 5aa72de03..5733f65a2 100644
--- a/examples/basic-server-vue/server.ts
+++ b/examples/basic-server-vue/server.ts
@@ -1,5 +1,5 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import type { CallToolResult, 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";
diff --git a/examples/basic-server-vue/src/App.vue b/examples/basic-server-vue/src/App.vue
index 196ad64da..d7b79971a 100644
--- a/examples/basic-server-vue/src/App.vue
+++ b/examples/basic-server-vue/src/App.vue
@@ -7,14 +7,13 @@ 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")!;
   return text;
 }
 
-
 const app = ref<App | null>(null);
 const hostContext = ref<McpUiHostContext | undefined>();
 const serverTime = ref("Loading...");
@@ -67,7 +66,10 @@ async function handleGetTime() {
   if (!app.value) return;
   try {
     console.info("Calling get-time tool...");
-    const result = await app.value.callServerTool({ name: "get-time", arguments: {} });
+    const result = await app.value.callServerTool({
+      name: "get-time",
+      arguments: {},
+    });
     console.info("get-time result:", result);
     serverTime.value = extractTime(result);
   } catch (e) {
@@ -108,17 +110,22 @@ async function handleOpenLink() {
 <template>
   <main
     class="main"
-    :style="hostContext?.safeAreaInsets && {
-      paddingTop: hostContext.safeAreaInsets.top + 'px',
-      paddingRight: hostContext.safeAreaInsets.right + 'px',
-      paddingBottom: hostContext.safeAreaInsets.bottom + 'px',
-      paddingLeft: hostContext.safeAreaInsets.left + 'px',
-    }"
+    :style="
+      hostContext?.safeAreaInsets && {
+        paddingTop: hostContext.safeAreaInsets.top + 'px',
+        paddingRight: hostContext.safeAreaInsets.right + 'px',
+        paddingBottom: hostContext.safeAreaInsets.bottom + 'px',
+        paddingLeft: hostContext.safeAreaInsets.left + 'px',
+      }
+    "
   >
     <p class="notice">Watch activity in the DevTools console!</p>
 
     <div class="action">
-      <p><strong>Server Time:</strong> <code class="server-time">{{ serverTime }}</code></p>
+      <p>
+        <strong>Server Time:</strong>
+        <code class="server-time">{{ serverTime }}</code>
+      </p>
       <button @click="handleGetTime">Get Server Time</button>
     </div>
 
@@ -128,12 +135,12 @@ async function handleOpenLink() {
     </div>
 
     <div class="action">
-      <input type="text" v-model="logText">
+      <input type="text" v-model="logText" />
       <button @click="handleSendLog">Send Log</button>
     </div>
 
     <div class="action">
-      <input type="url" v-model="linkUrl">
+      <input type="url" v-model="linkUrl" />
       <button @click="handleOpenLink">Open Link</button>
     </div>
   </main>
@@ -190,11 +197,16 @@ async function handleOpenLink() {
     cursor: pointer;
 
     &:hover {
-      background-color: color-mix(in srgb, var(--color-accent) 85%, var(--color-background-inverse));
+      background-color: color-mix(
+        in srgb,
+        var(--color-accent) 85%,
+        var(--color-background-inverse)
+      );
     }
 
     &:focus-visible {
-      outline: calc(var(--border-width-regular) * 2) solid var(--color-ring-primary);
+      outline: calc(var(--border-width-regular) * 2) solid
+        var(--color-ring-primary);
       outline-offset: var(--border-width-regular);
     }
   }
diff --git a/examples/budget-allocator-server/main.ts b/examples/budget-allocator-server/main.ts
index cc488f0b1..16c7db37d 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 { 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/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json
index 19a1d2554..011a1857f 100644
--- a/examples/budget-allocator-server/package.json
+++ b/examples/budget-allocator-server/package.json
@@ -26,8 +26,10 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 04fba11fe..ccedb697f 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
diff --git a/examples/cohort-heatmap-server/main.ts b/examples/cohort-heatmap-server/main.ts
index d59903b34..3f92f5c07 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 { 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/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json
index 8d1268b5c..3c57bb2b7 100644
--- a/examples/cohort-heatmap-server/package.json
+++ b/examples/cohort-heatmap-server/package.json
@@ -26,8 +26,10 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 6d07144a2..6648715ad 100644
--- a/examples/cohort-heatmap-server/server.ts
+++ b/examples/cohort-heatmap-server/server.ts
@@ -1,5 +1,5 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import type { ReadResourceResult } from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -178,7 +178,7 @@ 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,
+      inputSchema: GetCohortDataInputSchema,
       outputSchema: CohortDataSchema.shape,
       _meta: { ui: { resourceUri } },
     },
diff --git a/examples/customer-segmentation-server/main.ts b/examples/customer-segmentation-server/main.ts
index 130076c58..808df8482 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 { 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/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json
index 4511de903..09bab3b36 100644
--- a/examples/customer-segmentation-server/package.json
+++ b/examples/customer-segmentation-server/package.json
@@ -26,8 +26,10 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 244415d1f..2257b686e 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -100,7 +100,7 @@ export function createServer(): McpServer {
         title: "Get Customer Data",
         description:
           "Returns customer data with segment information for visualization. Optionally filter by segment.",
-        inputSchema: GetCustomerDataInputSchema.shape,
+        inputSchema: GetCustomerDataInputSchema,
         outputSchema: GetCustomerDataOutputSchema.shape,
         _meta: { ui: { resourceUri } },
       },
diff --git a/examples/debug-server/main.ts b/examples/debug-server/main.ts
index 3c89a975b..49a00cb9f 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 { 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/debug-server/package.json b/examples/debug-server/package.json
index 3417a8fe9..71bc681f3 100644
--- a/examples/debug-server/package.json
+++ b/examples/debug-server/package.json
@@ -34,8 +34,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "zod": "^4.1.13"
   },
   "devDependencies": {
diff --git a/examples/debug-server/server.ts b/examples/debug-server/server.ts
index fd3452a19..716403cef 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} 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 c45787e2b..247cca63a 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 { 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/integration-server/package.json b/examples/integration-server/package.json
index f6715a4ff..62bf835cd 100644
--- a/examples/integration-server/package.json
+++ b/examples/integration-server/package.json
@@ -15,8 +15,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 e44689d24..24ffdb49b 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -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 7f0b18c27..281a35674 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 f3ed6cd27..b740d55b1 100644
--- a/examples/lazy-auth-server/package.json
+++ b/examples/lazy-auth-server/package.json
@@ -23,7 +23,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "cors": "^2.8.5",
     "express": "^5.1.0",
     "jose": "^6.0.0"
diff --git a/examples/lazy-auth-server/server.ts b/examples/lazy-auth-server/server.ts
index fe7b1acb5..d6d3ce54f 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 {
+  McpServer,
+  UrlElicitationRequiredError,
+  type CallToolResult,
+  type ReadResourceResult,
+} from "@modelcontextprotocol/server";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 import cors from "cors";
 import express, { type Express, type Request, type Response } from "express";
 import { SignJWT, jwtVerify } from "jose";
@@ -722,7 +722,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer {
         "URL elicitation via elicitInput. Blocks until the client accepts; sends ElicitCompleteNotification before returning.",
       inputSchema: {},
     },
-    async (_args, extra): Promise<CallToolResult> => {
+    async (_args, ctx): Promise<CallToolResult> => {
       const eid = crypto.randomUUID();
       // Defer notifier creation — checks client capabilities which throws if
       // client doesn't advertise elicitation. Create lazily after elicitInput
@@ -735,7 +735,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: ctx.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
@@ -1031,7 +1031,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 f91f57b6e..b1915c460 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 { 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/map-server/package.json b/examples/map-server/package.json
index 5dc23fe20..52d6ead09 100644
--- a/examples/map-server/package.json
+++ b/examples/map-server/package.json
@@ -26,8 +26,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 10125a641..815b6f6ad 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} 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 39d7c2a22..d3090c7a4 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 1ff848a3e..5def90860 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 { 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 {
@@ -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 4d960f175..e6a63f110 100644
--- a/examples/pdf-server/package.json
+++ b/examples/pdf-server/package.json
@@ -26,8 +26,11 @@
   },
   "dependencies": {
     "@cantoo/pdf-lib": "^2.6.5",
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 33a03f1fd..0b2a5eb4d 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 93dedfdc9..0f4bd119b 100644
--- a/examples/pdf-server/server.ts
+++ b/examples/pdf-server/server.ts
@@ -13,18 +13,16 @@
 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 { McpServer, type Server } from "@modelcontextprotocol/server";
 import {
   registerAppResource,
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import {
-  RootsListChangedNotificationSchema,
-  type CallToolResult,
-  type ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+import type {
+  CallToolResult,
+  ReadResourceResult,
+} 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.
@@ -41,22 +39,46 @@ import type { PDFDocumentProxy } from "pdfjs-dist/types/src/display/api.js";
  * PDF Standard-14 fonts from CDN. Used by both server and viewer so we
  * declare a single well-known origin in CSP connectDomains.
  *
- * pdf.js in Node defaults to NodeStandardFontDataFactory (fs.readFile) which
- * can't fetch URLs, so we pass {@link FetchStandardFontDataFactory} alongside.
+ * pdf.js in Node defaults to NodeBinaryDataFactory (fs.readFile) which
+ * can't fetch URLs, so we pass {@link FetchBinaryDataFactory} alongside.
  * The browser viewer uses the DOM factory by default and just needs the URL.
  */
 export const STANDARD_FONT_DATA_URL = `https://unpkg.com/pdfjs-dist@${PDFJS_VERSION}/standard_fonts/`;
 const STANDARD_FONT_ORIGIN = "https://unpkg.com";
 
-/** pdf.js font factory that uses fetch() instead of fs.readFile. */
-class FetchStandardFontDataFactory {
-  baseUrl: string | null;
-  constructor({ baseUrl = null }: { baseUrl?: string | null }) {
-    this.baseUrl = baseUrl;
+/**
+ * pdf.js BinaryDataFactory that uses fetch() instead of fs.readFile
+ * (pdfjs-dist ≥5.7 consolidated StandardFontDataFactory into BinaryDataFactory).
+ */
+class FetchBinaryDataFactory {
+  cMapUrl: string | null;
+  standardFontDataUrl: string | null;
+  wasmUrl: string | null;
+  constructor({
+    cMapUrl = null,
+    standardFontDataUrl = null,
+    wasmUrl = null,
+  }: {
+    cMapUrl?: string | null;
+    standardFontDataUrl?: string | null;
+    wasmUrl?: string | null;
+  } = {}) {
+    this.cMapUrl = cMapUrl;
+    this.standardFontDataUrl = standardFontDataUrl;
+    this.wasmUrl = wasmUrl;
   }
-  async fetch({ filename }: { filename: string }): Promise<Uint8Array> {
-    if (!this.baseUrl) throw new Error("standardFontDataUrl not provided");
-    const url = `${this.baseUrl}${filename}`;
+  async fetch({
+    kind,
+    filename,
+  }: {
+    kind: "cMapUrl" | "standardFontDataUrl" | "wasmUrl";
+    filename: string;
+  }): Promise<Uint8Array> {
+    const baseUrl = this[kind];
+    if (!baseUrl) {
+      throw new Error(`Ensure that the \`${kind}\` API parameter is provided.`);
+    }
+    const url = `${baseUrl}${filename}`;
     const res = await globalThis.fetch(url);
     if (!res.ok) throw new Error(`Failed to fetch ${url}: ${res.status}`);
     return new Uint8Array(await res.arrayBuffer());
@@ -65,7 +87,7 @@ class FetchStandardFontDataFactory {
 import type {
   PrimitiveSchemaDefinition,
   ElicitResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import { z } from "zod";
 
 // =============================================================================
@@ -1050,7 +1072,7 @@ async function probeFormFields(
         disableStream: true,
         rangeChunkSize: 64 * 1024,
         standardFontDataUrl: STANDARD_FONT_DATA_URL,
-        StandardFontDataFactory: FetchStandardFontDataFactory,
+        BinaryDataFactory: FetchBinaryDataFactory,
         verbosity: VerbosityLevel.ERRORS,
       }).promise,
     );
@@ -1282,7 +1304,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 +1314,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 +1401,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 +1410,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 +1497,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 +1513,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 +2450,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 +2547,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 (
         {
@@ -2543,7 +2567,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
           overwrite,
           commands,
         },
-        extra,
+        ctx,
       ): Promise<CallToolResult> => {
         // Build the list of commands to process
         const commandList: InteractCommand[] = commands
@@ -2600,7 +2624,7 @@ Example — add a signature image and a stamp, then screenshot to verify:
           const result = await processInteractCommand(
             uuid,
             commandList[i],
-            extra.signal,
+            ctx.mcpReq.signal,
           );
           if (result.isError) {
             const errText = result.content
@@ -2657,7 +2681,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 +2694,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 +2724,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 +2733,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 +2763,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 +2775,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 +2805,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 +2852,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 a953e242a..2bd1c9044 100644
--- a/examples/pdf-server/src/mcp-app.ts
+++ b/examples/pdf-server/src/mcp-app.ts
@@ -12,8 +12,8 @@ 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 } from "@modelcontextprotocol/client";
+import type { 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 a5cbf5b22..cb4e010ab 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 06895a49a..5bdc53041 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 type { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node";
 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 99948cc2d..4355317a1 100644
--- a/examples/quickstart/package.json
+++ b/examples/quickstart/package.json
@@ -15,8 +15,10 @@
     "start": "concurrently --raw \"cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch\" \"tsx watch main.ts\""
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "cors": "^2.8.5",
     "express": "^5.1.0"
   },
diff --git a/examples/quickstart/server.ts b/examples/quickstart/server.ts
index eb3c3b1ab..e580dadb4 100644
--- a/examples/quickstart/server.ts
+++ b/examples/quickstart/server.ts
@@ -3,7 +3,7 @@ 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";
 
diff --git a/examples/say-server/package.json b/examples/say-server/package.json
index a0076e6b9..2ebc099e6 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 dbd3ab6ae..1b7816b4d 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 { 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/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json
index aa1e668ef..dce203663 100644
--- a/examples/scenario-modeler-server/package.json
+++ b/examples/scenario-modeler-server/package.json
@@ -26,8 +26,10 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 b59851c40..df7450cb2 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -305,7 +305,7 @@ export function createServer(): McpServer {
         title: "Get Scenario Data",
         description:
           "Returns SaaS scenario templates and optionally computes custom projections for given inputs",
-        inputSchema: GetScenarioDataInputSchema.shape,
+        inputSchema: GetScenarioDataInputSchema,
         outputSchema: GetScenarioDataOutputSchema.shape,
         _meta: { ui: { resourceUri } },
       },
diff --git a/examples/shadertoy-server/main.ts b/examples/shadertoy-server/main.ts
index ac8f6ad8e..b1000a26b 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 { 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/shadertoy-server/package.json b/examples/shadertoy-server/package.json
index ccf15a45c..26d3bf32e 100644
--- a/examples/shadertoy-server/package.json
+++ b/examples/shadertoy-server/package.json
@@ -24,8 +24,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 5238c40b7..b22a0ae16 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} 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 8b143a7ae..5dcf76952 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 { 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/sheet-music-server/package.json b/examples/sheet-music-server/package.json
index ca9fa909f..5227b08cd 100644
--- a/examples/sheet-music-server/package.json
+++ b/examples/sheet-music-server/package.json
@@ -24,8 +24,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 cfd319b51..b831ae25c 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} 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 365a56046..c55c79973 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 12e8cea06..e5fdf568c 100644
--- a/examples/system-monitor-server/package.json
+++ b/examples/system-monitor-server/package.json
@@ -26,8 +26,10 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 8fac5f2f9..4a6ca0e96 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
diff --git a/examples/threejs-server/main.ts b/examples/threejs-server/main.ts
index 13a2084a8..ef16e26e2 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 cfb5686a6..8468ae356 100644
--- a/examples/threejs-server/package.json
+++ b/examples/threejs-server/package.json
@@ -26,8 +26,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 ae320df80..dbc595f9c 100644
--- a/examples/threejs-server/server.ts
+++ b/examples/threejs-server/server.ts
@@ -8,8 +8,11 @@ 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 } from "@modelcontextprotocol/server";
+import type {
+  CallToolResult,
+  ReadResourceResult,
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -161,7 +164,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 +175,7 @@ export function createServer(): McpServer {
           .positive()
           .default(400)
           .describe("Height in pixels"),
-      },
+      }),
       outputSchema: z.object({
         success: z.boolean(),
       }),
@@ -192,9 +195,8 @@ export function createServer(): McpServer {
     {
       title: "Learn Three.js",
       description: "Get documentation and examples for using the Three.js View",
-      inputSchema: {},
     },
-    async () => {
+    async (): Promise<CallToolResult> => {
       return {
         content: [{ type: "text", text: THREEJS_DOCUMENTATION }],
       };
diff --git a/examples/threejs-server/src/mcp-app-wrapper.tsx b/examples/threejs-server/src/mcp-app-wrapper.tsx
index 34194b15f..44fee0c67 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 68db8dc7d..e86ad7c16 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 dcba3d7c0..26dc4b568 100644
--- a/examples/transcript-server/package.json
+++ b/examples/transcript-server/package.json
@@ -24,8 +24,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 56bf88d99..cd848e6d9 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import {
diff --git a/examples/video-resource-server/main.ts b/examples/video-resource-server/main.ts
index 082fa5abc..1983373c6 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 b0d04aff1..15afa8914 100644
--- a/examples/video-resource-server/package.json
+++ b/examples/video-resource-server/package.json
@@ -24,8 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 2cb317e41..6f2419803 100644
--- a/examples/video-resource-server/server.ts
+++ b/examples/video-resource-server/server.ts
@@ -9,14 +9,11 @@ import {
   registerAppTool,
   RESOURCE_MIME_TYPE,
 } from "@modelcontextprotocol/ext-apps/server";
-import {
-  McpServer,
-  ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer, ResourceTemplate } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/server";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -135,14 +132,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 88ed913ee..2a3f8f91d 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 cc7b3a221..bfeeffbaa 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 fe511ad0f..81a759a75 100644
--- a/examples/wiki-explorer-server/package.json
+++ b/examples/wiki-explorer-server/package.json
@@ -26,8 +26,11 @@
     "serve": "bun --watch main.ts"
   },
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/express": "2.0.0-beta.3",
     "@modelcontextprotocol/ext-apps": "^1.7.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/node": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "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 59d5e18ee..a4bb3ec1e 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 { McpServer } from "@modelcontextprotocol/server";
 import type {
   CallToolResult,
   ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
+} 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 291292dee..9833d9c25 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 29e905875..82b954b55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,9 @@
       },
       "devDependencies": {
         "@boneskull/typedoc-plugin-mermaid": "^0.2.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/core": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "@playwright/test": "1.57.0",
         "@types/bun": "^1.3.2",
         "@types/node": "20.19.27",
@@ -50,7 +52,9 @@
         "node": ">=20"
       },
       "peerDependencies": {
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/core": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "zod": "^3.25.0 || ^4.0.0"
@@ -68,8 +72,8 @@
       "name": "@modelcontextprotocol/ext-apps-basic-host",
       "version": "1.7.4",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "zod": "^4.1.13"
@@ -89,30 +93,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/basic-host/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-host/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/basic-server-preact": {
       "name": "@modelcontextprotocol/server-basic-preact",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "preact": "^10.0.0",
@@ -133,30 +123,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/basic-server-preact/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-server-preact/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/basic-server-react": {
       "name": "@modelcontextprotocol/server-basic-react",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -180,30 +155,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/basic-server-react/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-server-react/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/basic-server-solid": {
       "name": "@modelcontextprotocol/server-basic-solid",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "solid-js": "1.9.10",
@@ -224,30 +185,16 @@
         "vite-plugin-solid": "^2.11.12"
       }
     },
-    "examples/basic-server-solid/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-server-solid/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/basic-server-svelte": {
       "name": "@modelcontextprotocol/server-basic-svelte",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "svelte": "^5.0.0",
@@ -268,30 +215,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/basic-server-svelte/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-server-svelte/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/basic-server-vanillajs": {
       "name": "@modelcontextprotocol/server-basic-vanillajs",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -310,30 +243,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/basic-server-vanillajs/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-server-vanillajs/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/basic-server-vue": {
       "name": "@modelcontextprotocol/server-basic-vue",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "vue": "^3.5.0",
@@ -354,30 +273,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/basic-server-vue/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/basic-server-vue/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/budget-allocator-server": {
       "name": "@modelcontextprotocol/server-budget-allocator",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -397,30 +301,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/budget-allocator-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/budget-allocator-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/cohort-heatmap-server": {
       "name": "@modelcontextprotocol/server-cohort-heatmap",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -444,30 +333,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/cohort-heatmap-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/cohort-heatmap-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/customer-segmentation-server": {
       "name": "@modelcontextprotocol/server-customer-segmentation",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -487,30 +361,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/customer-segmentation-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/customer-segmentation-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/debug-server": {
       "name": "@modelcontextprotocol/server-debug",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "zod": "^4.1.13"
       },
       "bin": {
@@ -529,28 +388,14 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/debug-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/debug-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/integration-server": {
       "version": "1.7.4",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -573,30 +418,14 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/integration-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/integration-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/lazy-auth-server": {
       "name": "@modelcontextprotocol/server-lazy-auth",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "jose": "^6.0.0"
@@ -615,30 +444,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/lazy-auth-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/lazy-auth-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/map-server": {
       "name": "@modelcontextprotocol/server-map",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -657,31 +472,17 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/map-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/map-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/pdf-server": {
       "name": "@modelcontextprotocol/server-pdf",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
         "@cantoo/pdf-lib": "^2.6.5",
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "pdfjs-dist": "^5.0.0",
@@ -701,29 +502,11 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/pdf-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/pdf-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/qr-server": {
       "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": {
@@ -731,8 +514,10 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0"
       },
@@ -748,23 +533,12 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/quickstart/node_modules/@types/node": {
-      "version": "22.19.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.5.tgz",
-      "integrity": "sha512-HfF8+mYcHPcPypui3w3mvzuIErlNOh2OAG+BCeBZCEwyiD5ls2SiCwEyT47OELtf7M3nHxBdu0FsmzdKxkN52Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
     "examples/say-server": {
       "name": "@modelcontextprotocol/server-say",
       "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": {
@@ -772,8 +546,10 @@
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -798,30 +574,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/scenario-modeler-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/scenario-modeler-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/shadertoy-server": {
       "name": "@modelcontextprotocol/server-shadertoy",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -840,30 +601,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/shadertoy-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/shadertoy-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/sheet-music-server": {
       "name": "@modelcontextprotocol/server-sheet-music",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "abcjs": "^6.4.4",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -883,30 +629,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/sheet-music-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/sheet-music-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/system-monitor-server": {
       "name": "@modelcontextprotocol/server-system-monitor",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "chart.js": "^4.4.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -927,30 +658,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/system-monitor-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/system-monitor-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/threejs-server": {
       "name": "@modelcontextprotocol/server-threejs",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "react": "^19.2.0",
@@ -976,30 +693,15 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/threejs-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/threejs-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/transcript-server": {
       "name": "@modelcontextprotocol/server-transcript",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -1019,30 +721,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/transcript-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/transcript-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/video-resource-server": {
       "name": "@modelcontextprotocol/server-video-resource",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cors": "^2.8.5",
         "express": "^5.1.0",
         "zod": "^4.1.13"
@@ -1061,30 +749,16 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/video-resource-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/video-resource-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "examples/wiki-explorer-server": {
       "name": "@modelcontextprotocol/server-wiki-explorer",
       "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
+        "@modelcontextprotocol/client": "2.0.0-beta.3",
+        "@modelcontextprotocol/express": "2.0.0-beta.3",
         "@modelcontextprotocol/ext-apps": "^1.7.0",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/node": "2.0.0-beta.3",
+        "@modelcontextprotocol/server": "2.0.0-beta.3",
         "cheerio": "^1.0.0",
         "cors": "^2.8.5",
         "express": "^5.1.0",
@@ -1105,31 +779,14 @@
         "vite-plugin-singlefile": "^2.3.0"
       }
     },
-    "examples/wiki-explorer-server/node_modules/@types/node": {
-      "version": "22.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
-      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.20.0"
-      }
-    },
-    "examples/wiki-explorer-server/node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@babel/code-frame": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz",
-      "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/helper-validator-identifier": "^7.29.7",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -1138,9 +795,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.6.tgz",
-      "integrity": "sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1148,21 +805,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz",
-      "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/generator": "^7.28.6",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.28.6",
-        "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -1189,14 +846,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz",
-      "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
+      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -1206,27 +863,27 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
-      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz",
+      "integrity": "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
-      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.28.6",
-        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -1246,9 +903,9 @@
       }
     },
     "node_modules/@babel/helper-globals": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1256,29 +913,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
-      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
-      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1288,9 +945,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
-      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
+      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1298,27 +955,27 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1326,26 +983,26 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
-      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
+      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz",
-      "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
+      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.6"
+        "@babel/types": "^7.29.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1355,13 +1012,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
-      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.29.7.tgz",
+      "integrity": "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1371,17 +1028,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz",
-      "integrity": "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.29.7.tgz",
+      "integrity": "sha512-WsZulLVBUHXVj2cUcPVx6UE21TpalB6bHbSFErKT0Ib++ax24jjXe73FqlWvdylFOjiuPHYi6VCcgRad1ItN+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/plugin-syntax-jsx": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/helper-annotate-as-pure": "^7.29.7",
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/plugin-syntax-jsx": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1391,13 +1048,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz",
-      "integrity": "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.29.7.tgz",
+      "integrity": "sha512-Xfy3UVMF04+ypnFbkhvfqtmvwfe92qwQdbGZVonhE+6v35GzlofmOnA1szaZqzb9xYWr0nl1e5EMmzi0DNON1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.27.1"
+        "@babel/plugin-transform-react-jsx": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1407,13 +1064,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.27.1.tgz",
-      "integrity": "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.29.7.tgz",
+      "integrity": "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1423,13 +1080,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.27.1.tgz",
-      "integrity": "sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.29.7.tgz",
+      "integrity": "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1439,33 +1096,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
-      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz",
-      "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
+      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/generator": "^7.28.6",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.6",
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.28.6",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1473,22 +1130,22 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz",
-      "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
+      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@boneskull/typedoc-plugin-mermaid": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@boneskull/typedoc-plugin-mermaid/-/typedoc-plugin-mermaid-0.2.0.tgz",
-      "integrity": "sha512-ggbGNwn6of9ddmOL5/C6+8/REAoqiQ1uyt34AkJxYEev6rZSLBo938rJjHgjodmU3uE7DVptp5fUxAnW1qfVUw==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@boneskull/typedoc-plugin-mermaid/-/typedoc-plugin-mermaid-0.2.1.tgz",
+      "integrity": "sha512-Y786WignjXQ0E/PYh75epnsK/YpNTADk7Ol406sE7rS8b3SPdKxoYmAen8XCJrl2ZjQlvHXGdhT+F/VWHYPPlw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -1505,9 +1162,9 @@
       }
     },
     "node_modules/@cantoo/pdf-lib": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.6.5.tgz",
-      "integrity": "sha512-3eMHEaqKHt/G/q+6QjT06A3lz0S/a8x3+myiSN7FNeL3uWcedO0lpfs6TWofa4C03Z1wz3tWeHoa4CsI7DrTSA==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.7.2.tgz",
+      "integrity": "sha512-M+NYHU8nk8/XhaggiF7khx4R1GHxBOCKM0YmbKQZDga8BDxLmOC5b9HUEd9bmlIZQayRzz8kE/797MCSPEMhAA==",
       "license": "MIT",
       "dependencies": {
         "@pdf-lib/standard-fonts": "^1.0.0",
@@ -1550,9 +1207,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
-      "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz",
+      "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2010,16 +1667,16 @@
       }
     },
     "node_modules/@gerrit0/mini-shiki": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.21.0.tgz",
-      "integrity": "sha512-9PrsT5DjZA+w3lur/aOIx3FlDeHdyCEFlv9U+fmsVyjPZh61G5SYURQ/1ebe2U63KbDmI2V8IhIUegWb8hjOyg==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.23.0.tgz",
+      "integrity": "sha512-bEMORlG0cqdjVyCEuU0cDQbORWX+kYCeo0kV1lbxF5bt4r7SID2l9bqsxJEM0zndaxpOUT7riCyIVEuqq/Ynxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/engine-oniguruma": "^3.21.0",
-        "@shikijs/langs": "^3.21.0",
-        "@shikijs/themes": "^3.21.0",
-        "@shikijs/types": "^3.21.0",
+        "@shikijs/engine-oniguruma": "^3.23.0",
+        "@shikijs/langs": "^3.23.0",
+        "@shikijs/themes": "^3.23.0",
+        "@shikijs/types": "^3.23.0",
         "@shikijs/vscode-textmate": "^10.0.2"
       }
     },
@@ -2036,9 +1693,9 @@
       }
     },
     "node_modules/@img/colour": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz",
-      "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
+      "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2133,6 +1790,9 @@
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2150,6 +1810,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2167,6 +1830,9 @@
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2184,6 +1850,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2201,6 +1870,9 @@
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2218,6 +1890,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2235,6 +1910,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2252,6 +1930,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -2269,6 +1950,9 @@
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2292,6 +1976,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2315,6 +2002,9 @@
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2338,6 +2028,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2361,6 +2054,9 @@
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2384,6 +2080,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2407,6 +2106,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2430,6 +2132,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -2576,10 +2281,56 @@
       "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==",
       "license": "MIT"
     },
+    "node_modules/@modelcontextprotocol/client": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.3.tgz",
+      "integrity": "sha512-o9z9YCGNxWNdklPdjcD0tr8pocC9OgjdArqgx3OjPMlTe0M/SSPC2olOJs5ueq77HSpz36mND0f0KteqEhKF3A==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.5",
+        "eventsource": "^3.0.2",
+        "eventsource-parser": "^3.0.0",
+        "jose": "^6.1.3",
+        "pkce-challenge": "^5.0.0",
+        "zod": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@modelcontextprotocol/core": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0-beta.3.tgz",
+      "integrity": "sha512-NqcrMybYMnTxVTjEhCAPiDmpkkRivjHcjMdjGB97s6JuM+jVkYDzhQaF1z0n6eS0gnKjvLI1l60t1617g44kow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "zod": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@modelcontextprotocol/express": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/express/-/express-2.0.0-beta.3.tgz",
+      "integrity": "sha512-CDJ38z1eqtKK2fXGJnH+icIGoAj2ZZRfFPnTDVE59btTzJ7wqfDa/Rh1PO+c/vFhMQuhe8/CQX36vNiGkR4dbw==",
+      "license": "MIT",
+      "dependencies": {
+        "cors": "^2.8.5"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "peerDependencies": {
+        "@modelcontextprotocol/server": "^2.0.0-beta.3",
+        "express": "^4.18.0 || ^5.0.0"
+      }
+    },
     "node_modules/@modelcontextprotocol/ext-apps": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.7.1.tgz",
-      "integrity": "sha512-J3WdG1A4JSSKnSWKyU+895dBVYBV2Utgtf7fUsUK45mlkETm53a/1DR6Pm3hUGKqLLQthZLmpxOg8VPzJi/lyg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.7.4.tgz",
+      "integrity": "sha512-QQqysE549cf/Y0VabBmAACXhj92EhB3t8yVct2BHbkWiPTFA1S91EqTVjYXXcZEefXU0pmHcdObhsNMcomJIOQ==",
       "license": "MIT",
       "workspaces": [
         "examples/*"
@@ -2609,6 +2360,27 @@
       "resolved": "examples/basic-host",
       "link": true
     },
+    "node_modules/@modelcontextprotocol/node": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/node/-/node-2.0.0-beta.3.tgz",
+      "integrity": "sha512-jmrJEKjPCBU+vu1YRcYaoyeRnB3VwuV2qBeEHlqgfJWN9sp6zisFqRXGZwVgRuZ2aZkEi1gO5JNSxarR8R/8Ig==",
+      "license": "MIT",
+      "dependencies": {
+        "@hono/node-server": "^1.19.9"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "peerDependencies": {
+        "@modelcontextprotocol/server": "^2.0.0-beta.3",
+        "hono": "^4.11.4"
+      },
+      "peerDependenciesMeta": {
+        "hono": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@modelcontextprotocol/quickstart": {
       "resolved": "examples/quickstart",
       "link": true
@@ -2618,6 +2390,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",
@@ -2653,6 +2426,18 @@
         }
       }
     },
+    "node_modules/@modelcontextprotocol/server": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0-beta.3.tgz",
+      "integrity": "sha512-EQxVIWf2XMAgjR38ZRZnX1iiOWH42tT/YJG8N4dVjAnrEGSEfPirR6FYfDC72yuNSvVYbPDTD1H3KHLLHPd18A==",
+      "license": "MIT",
+      "dependencies": {
+        "zod": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/@modelcontextprotocol/server-basic-preact": {
       "resolved": "examples/basic-server-preact",
       "link": true
@@ -2746,9 +2531,9 @@
       "link": true
     },
     "node_modules/@napi-rs/canvas": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.88.tgz",
-      "integrity": "sha512-/p08f93LEbsL5mDZFQ3DBxcPv/I4QG9EDYRRq1WNlCOXVfAHBTHMSVMwxlqG/AtnSfUr9+vgfN7MKiyDo0+Weg==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.100.tgz",
+      "integrity": "sha512-xglYA6q3XO5P3BNJYxVZ1IV7DLVjp1Py6nwag88YntrS+3vKHyYcMqXVS4ZztJmwz2uGvz1FWhI/4LgbR5uQDA==",
       "license": "MIT",
       "optional": true,
       "workspaces": [
@@ -2762,23 +2547,23 @@
         "url": "https://github.com/sponsors/Brooooooklyn"
       },
       "optionalDependencies": {
-        "@napi-rs/canvas-android-arm64": "0.1.88",
-        "@napi-rs/canvas-darwin-arm64": "0.1.88",
-        "@napi-rs/canvas-darwin-x64": "0.1.88",
-        "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.88",
-        "@napi-rs/canvas-linux-arm64-gnu": "0.1.88",
-        "@napi-rs/canvas-linux-arm64-musl": "0.1.88",
-        "@napi-rs/canvas-linux-riscv64-gnu": "0.1.88",
-        "@napi-rs/canvas-linux-x64-gnu": "0.1.88",
-        "@napi-rs/canvas-linux-x64-musl": "0.1.88",
-        "@napi-rs/canvas-win32-arm64-msvc": "0.1.88",
-        "@napi-rs/canvas-win32-x64-msvc": "0.1.88"
+        "@napi-rs/canvas-android-arm64": "0.1.100",
+        "@napi-rs/canvas-darwin-arm64": "0.1.100",
+        "@napi-rs/canvas-darwin-x64": "0.1.100",
+        "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.100",
+        "@napi-rs/canvas-linux-arm64-gnu": "0.1.100",
+        "@napi-rs/canvas-linux-arm64-musl": "0.1.100",
+        "@napi-rs/canvas-linux-riscv64-gnu": "0.1.100",
+        "@napi-rs/canvas-linux-x64-gnu": "0.1.100",
+        "@napi-rs/canvas-linux-x64-musl": "0.1.100",
+        "@napi-rs/canvas-win32-arm64-msvc": "0.1.100",
+        "@napi-rs/canvas-win32-x64-msvc": "0.1.100"
       }
     },
     "node_modules/@napi-rs/canvas-android-arm64": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.88.tgz",
-      "integrity": "sha512-KEaClPnZuVxJ8smUWjV1wWFkByBO/D+vy4lN+Dm5DFH514oqwukxKGeck9xcKJhaWJGjfruGmYGiwRe//+/zQQ==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.100.tgz",
+      "integrity": "sha512-hjhCKhntPv9+t4ckHymdx0phYNcVW+GKQR6Lzw2zE+pOVjOplSmtx9nNNknTjbEDLcuLZqA1y8ufKg1XfgftzQ==",
       "cpu": [
         "arm64"
       ],
@@ -2796,9 +2581,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-darwin-arm64": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.88.tgz",
-      "integrity": "sha512-Xgywz0dDxOKSgx3eZnK85WgGMmGrQEW7ZLA/E7raZdlEE+xXCozobgqz2ZvYigpB6DJFYkqnwHjqCOTSDGlFdg==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.100.tgz",
+      "integrity": "sha512-2PcswRaC7Ly645DGt88///zuFDhJxJYdKAs1uU3mfk1atYkXufgcgLfBpk6Tm12nCQBaNt1wpybuPZ4qOhTo8A==",
       "cpu": [
         "arm64"
       ],
@@ -2816,9 +2601,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-darwin-x64": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.88.tgz",
-      "integrity": "sha512-Yz4wSCIQOUgNucgk+8NFtQxQxZV5NO8VKRl9ePKE6XoNyNVC8JDqtvhh3b3TPqKK8W5p2EQpAr1rjjm0mfBxdg==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.100.tgz",
+      "integrity": "sha512-ePNZtj7pNIva/siZMg+HmbeozkIjqUIYdoymH8HaA3qK7LfzFN4WMBM8G6HQ9ZC+H3+Dnn5pqtiXpgLykaPOhw==",
       "cpu": [
         "x64"
       ],
@@ -2836,9 +2621,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-arm-gnueabihf": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.88.tgz",
-      "integrity": "sha512-9gQM2SlTo76hYhxHi2XxWTAqpTOb+JtxMPEIr+H5nAhHhyEtNmTSDRtz93SP7mGd2G3Ojf2oF5tP9OdgtgXyKg==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.100.tgz",
+      "integrity": "sha512-d5cDB48oWFGU8/XPhUOFAlySgb/VAu7D+s8fi55K1Pcfg8aPplHWqMgibhVLU8ky7Pyg/fuiVLz4Nf3JrSTuUA==",
       "cpu": [
         "arm"
       ],
@@ -2856,12 +2641,15 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-arm64-gnu": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.88.tgz",
-      "integrity": "sha512-7qgaOBMXuVRk9Fzztzr3BchQKXDxGbY+nwsovD3I/Sx81e+sX0ReEDYHTItNb0Je4NHbAl7D0MKyd4SvUc04sg==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.100.tgz",
+      "integrity": "sha512-rDxgxRu69RvDlX/bh9o22DxLsGr8EqsNgotL9+RwQE1S0b0cqeatqsw6aW45mukm0B42DIAaAacKaYQ8cqS1nw==",
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2876,12 +2664,15 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-arm64-musl": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.88.tgz",
-      "integrity": "sha512-kYyNrUsHLkoGHBc77u4Unh067GrfiCUMbGHC2+OTxbeWfZkPt2o32UOQkhnSswKd9Fko/wSqqGkY956bIUzruA==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.100.tgz",
+      "integrity": "sha512-K3mDW66N+xT2/V439u1alFANiBUjdEx2gLiNYnCmUsva5jZMxWTjafBYwTzYK+EMFMHrUoabuU+T1BIP5CgbYQ==",
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2896,12 +2687,15 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-riscv64-gnu": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.88.tgz",
-      "integrity": "sha512-HVuH7QgzB0yavYdNZDRyAsn/ejoXB0hn8twwFnOqUbCCdkV+REna7RXjSR7+PdfW0qMQ2YYWsLvVBT5iL/mGpw==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.100.tgz",
+      "integrity": "sha512-mooqUBTIsccZpnoQC4NgrC1v6C1vof39etLNMnBwCY+p0gajWJvAHLGQ6g/gGyS5YrpDW+GefSN4+Cvcr08UWw==",
       "cpu": [
         "riscv64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2916,12 +2710,15 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-x64-gnu": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.88.tgz",
-      "integrity": "sha512-hvcvKIcPEQrvvJtJnwD35B3qk6umFJ8dFIr8bSymfrSMem0EQsfn1ztys8ETIFndTwdNWJKWluvxztA41ivsEw==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.100.tgz",
+      "integrity": "sha512-1eCvkDCazm7FFhsT7DfGOdSaHgZVK3bt/dSBl5EWHOWmnz+I7j8tPseJqqD81NF+MH21jKUK4wQSDjN0mdhnTg==",
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2936,12 +2733,15 @@
       }
     },
     "node_modules/@napi-rs/canvas-linux-x64-musl": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.88.tgz",
-      "integrity": "sha512-eSMpGYY2xnZSQ6UxYJ6plDboxq4KeJ4zT5HaVkUnbObNN6DlbJe0Mclh3wifAmquXfrlgTZt6zhHsUgz++AK6g==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.100.tgz",
+      "integrity": "sha512-20arT6lnI19S68qNlii73TSEDbECNgzMz2EpldC1V3mZFuRkeujXkcebRk0LRJe9SEUAooYiLokfMViY8IX7yA==",
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2956,9 +2756,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-win32-arm64-msvc": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.88.tgz",
-      "integrity": "sha512-qcIFfEgHrchyYqRrxsCeTQgpJZ/GqHiqPcU/Fvw/ARVlQeDX1VyFH+X+0gCR2tca6UJrq96vnW+5o7buCq+erA==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.100.tgz",
+      "integrity": "sha512-DZFFT1wIAg37LJw37yhMRFfjATd3vTQzjZ1Yki8u2vhO6Hi5VE6BVaGQ1aaDu7xb4iMErz+9EOwjpS7xcxFeBw==",
       "cpu": [
         "arm64"
       ],
@@ -2976,9 +2776,9 @@
       }
     },
     "node_modules/@napi-rs/canvas-win32-x64-msvc": {
-      "version": "0.1.88",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.88.tgz",
-      "integrity": "sha512-ROVqbfS4QyZxYkqmaIBBpbz/BQvAR+05FXM5PAtTYVc0uyY8Y4BHJSMdGAaMf6TdIVRsQsiq+FG/dH9XhvWCFQ==",
+      "version": "0.1.100",
+      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.100.tgz",
+      "integrity": "sha512-MyT1j3mHC2+Lu4pBi9mKyMJhtP6U7k7EldY7sj/uS5gJA65gTXt8MefJQXLJo5d/vZbuWmfxzkEUNc/urV3pHA==",
       "cpu": [
         "x64"
       ],
@@ -2996,9 +2796,9 @@
       }
     },
     "node_modules/@oclif/core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.8.0.tgz",
-      "integrity": "sha512-jteNUQKgJHLHFbbz806aGZqf+RJJ7t4gwF4MYa8fCwCxQ8/klJNWc0MvaJiBebk7Mc+J39mdlsB4XraaCKznFw==",
+      "version": "4.11.14",
+      "resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.11.14.tgz",
+      "integrity": "sha512-cZ5Ktd+rT0PO+o7KBH4vRFTgg+xMLf8F41WK39p8MkXEViZA/Qqe+4lzZT6102zgUxMORET1HtF9t5w8CB3tnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3012,11 +2812,11 @@
         "indent-string": "^4.0.0",
         "is-wsl": "^2.2.0",
         "lilconfig": "^3.1.3",
-        "minimatch": "^9.0.5",
-        "semver": "^7.7.3",
+        "minimatch": "^10.2.5",
+        "semver": "^7.8.1",
         "string-width": "^4.2.3",
         "supports-color": "^8",
-        "tinyglobby": "^0.2.14",
+        "tinyglobby": "^0.2.17",
         "widest-line": "^3.1.0",
         "wordwrap": "^1.0.0",
         "wrap-ansi": "^7.0.0"
@@ -3025,36 +2825,10 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@oclif/core/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@oclif/core/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@oven/bun-darwin-aarch64": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-darwin-aarch64/-/bun-darwin-aarch64-1.3.10.tgz",
-      "integrity": "sha512-PXgg5gqcS/rHwa1hF0JdM1y5TiyejVrMHoBmWY/DjtfYZoFTXie1RCFOkoG0b5diOOmUcuYarMpH7CSNTqwj+w==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-darwin-aarch64/-/bun-darwin-aarch64-1.3.14.tgz",
+      "integrity": "sha512-Omj20SuiHBOUjUBIyqtkNjSUIjOtEOJwmbix/ZyFH4BaQ6OZTaaRWIR4TjHVz0yadHgli6lLTiAh1uarnvD49A==",
       "cpu": [
         "arm64"
       ],
@@ -3066,9 +2840,9 @@
       ]
     },
     "node_modules/@oven/bun-darwin-x64": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-darwin-x64/-/bun-darwin-x64-1.3.10.tgz",
-      "integrity": "sha512-Nhssuh7GBpP5PiDSOl3+qnoIG7PJo+ec2oomDevnl9pRY6x6aD2gRt0JE+uf+A8Om2D6gjeHCxjEdrw5ZHE8mA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-darwin-x64/-/bun-darwin-x64-1.3.14.tgz",
+      "integrity": "sha512-FFj3QdU/OhlDyZOJ8CWfN5eWLpRlT4qjZg7lMQi7jA6GuoY5ajlO1zWLP/MuHYRSbXQUvV52RejNi8DVnAp13w==",
       "cpu": [
         "x64"
       ],
@@ -3080,9 +2854,9 @@
       ]
     },
     "node_modules/@oven/bun-darwin-x64-baseline": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-darwin-x64-baseline/-/bun-darwin-x64-baseline-1.3.10.tgz",
-      "integrity": "sha512-w1gaTlqU0IJCmJ1X+PGHkdNU1n8Gemx5YKkjhkJIguvFINXEBB5U1KG82QsT65Tk4KyNMfbLTlmy4giAvUoKfA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-darwin-x64-baseline/-/bun-darwin-x64-baseline-1.3.14.tgz",
+      "integrity": "sha512-OSfsTZstc898HHElhU4NccaBGOSSDn5VfahiVTnidZ9B/+wb7WTyfZJaBeJcfjwJ9H2W9uTh2TGtl3UfcXgV9g==",
       "cpu": [
         "x64"
       ],
@@ -3093,10 +2867,38 @@
         "darwin"
       ]
     },
+    "node_modules/@oven/bun-freebsd-aarch64": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-freebsd-aarch64/-/bun-freebsd-aarch64-1.3.14.tgz",
+      "integrity": "sha512-LIKrXaFxAHybVO5Pf+9XP2FHUj/5APvXTUKk9dqHm5iFz4oH+W24cmhjkJirNujh9hKeTyrpWSe3no9JZKowIw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@oven/bun-freebsd-x64": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-freebsd-x64/-/bun-freebsd-x64-1.3.14.tgz",
+      "integrity": "sha512-uwD+fGUH1ADpIF3B1U2jWzzb20QwRLZfj5QZ28GUCGrAJ/nTmWrD6YYGsblCY1wuhldRez3lU40AyuvSCyLYmw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@oven/bun-linux-aarch64": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-linux-aarch64/-/bun-linux-aarch64-1.3.10.tgz",
-      "integrity": "sha512-OUgPHfL6+PM2Q+tFZjcaycN3D7gdQdYlWnwMI31DXZKY1r4HINWk9aEz9t/rNaHg65edwNrt7dsv9TF7xK8xIA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-aarch64/-/bun-linux-aarch64-1.3.14.tgz",
+      "integrity": "sha512-X5SsPZHs+iYO8R/efIcRtc7gT2Q2DgPfliCxEkx4cXBumwkw0c/EsHMNwH3EgGpCDaZ7IYVPhpCG/xBOQHEwZw==",
       "cpu": [
         "arm64"
       ],
@@ -3107,10 +2909,24 @@
         "linux"
       ]
     },
+    "node_modules/@oven/bun-linux-aarch64-android": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-aarch64-android/-/bun-linux-aarch64-android-1.3.14.tgz",
+      "integrity": "sha512-y4kq5b85lsrmFb9Xvi4w9mA5IEFJkLMrSmYn06q24KjL9rUWDWO3VFZEtteZxUN5+ec3Zm5S8OnJw1umaCbVjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
     "node_modules/@oven/bun-linux-aarch64-musl": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-linux-aarch64-musl/-/bun-linux-aarch64-musl-1.3.10.tgz",
-      "integrity": "sha512-Ui5pAgM7JE9MzHokF0VglRMkbak3lTisY4Mf1AZutPACXWgKJC5aGrgnHBfkl7QS6fEeYb0juy1q4eRznRHOsw==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-aarch64-musl/-/bun-linux-aarch64-musl-1.3.14.tgz",
+      "integrity": "sha512-jmqOA92Cd1NL/1XBd4bFkJLxQ86K0RW7ohxS2qzzAvuitO4JiIxjjTeCspoU44zCozH72HpfZfUE2On31OjnWA==",
       "cpu": [
         "arm64"
       ],
@@ -3122,9 +2938,9 @@
       ]
     },
     "node_modules/@oven/bun-linux-x64": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64/-/bun-linux-x64-1.3.10.tgz",
-      "integrity": "sha512-bzUgYj/PIZziB/ZesIP9HUyfvh6Vlf3od+TrbTTyVEuCSMKzDPQVW/yEbRp0tcHO3alwiEXwJDrWrHAguXlgiQ==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64/-/bun-linux-x64-1.3.14.tgz",
+      "integrity": "sha512-7OVTAKvwfPmSbIV1HpdOoVVx5VRc427GuPPne93N6vk4eQBPId9nXmZDh9/zGaKPdbVjVtQSZafWQoUjx38Utw==",
       "cpu": [
         "x64"
       ],
@@ -3135,10 +2951,24 @@
         "linux"
       ]
     },
+    "node_modules/@oven/bun-linux-x64-android": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-android/-/bun-linux-x64-android-1.3.14.tgz",
+      "integrity": "sha512-qe9e1d+3VAEU7nAA2ol9Jvmy/o99PVMSgZhHn7Q/9O3YcDrfEqyQ8zm4zoe5qTEo8HZH0dN03Le0Ys2eQPs7eg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
     "node_modules/@oven/bun-linux-x64-baseline": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-baseline/-/bun-linux-x64-baseline-1.3.10.tgz",
-      "integrity": "sha512-oqvMDYpX6dGJO03HgO5bXuccEsH3qbdO3MaAiAlO4CfkBPLUXz3N0DDElg5hz0L6ktdDVKbQVE5lfe+LAUISQg==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-baseline/-/bun-linux-x64-baseline-1.3.14.tgz",
+      "integrity": "sha512-q/8EdOC0yUE8FPeoOVq8/Pw5I9/tJaYmUfO/uDUAREx8IUnOJH1RJ5A3BjFqre8pvJoiZA9AovPJq5FnNNjSxA==",
       "cpu": [
         "x64"
       ],
@@ -3150,9 +2980,9 @@
       ]
     },
     "node_modules/@oven/bun-linux-x64-musl": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-musl/-/bun-linux-x64-musl-1.3.10.tgz",
-      "integrity": "sha512-poVXvOShekbexHq45b4MH/mRjQKwACAC8lHp3Tz/hEDuz0/20oncqScnmKwzhBPEpqJvydXficXfBYuSim8opw==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-musl/-/bun-linux-x64-musl-1.3.14.tgz",
+      "integrity": "sha512-GBCB/k/sIqcr06eTNgg7g46qiUv35Jasx4XiccJ/n7RGqrE4RWUD/XJBbWFprVPjvqd59+QtSnS99XGqvftHfg==",
       "cpu": [
         "x64"
       ],
@@ -3164,9 +2994,9 @@
       ]
     },
     "node_modules/@oven/bun-linux-x64-musl-baseline": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-musl-baseline/-/bun-linux-x64-musl-baseline-1.3.10.tgz",
-      "integrity": "sha512-/hOZ6S1VsTX6vtbhWVL9aAnOrdpuO54mAGUWpTdMz7dFG5UBZ/VUEiK0pBkq9A1rlBk0GeD/6Y4NBFl8Ha7cRA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-musl-baseline/-/bun-linux-x64-musl-baseline-1.3.14.tgz",
+      "integrity": "sha512-n6iE71G4lQE4XkrZhQQcL5YUlxDbnq6nqV7zeQi33PMsLT/0kYE+RvHOtBWZ3w0wMdXZfINmp63hIb9ijUBGtw==",
       "cpu": [
         "x64"
       ],
@@ -3178,9 +3008,9 @@
       ]
     },
     "node_modules/@oven/bun-windows-aarch64": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-windows-aarch64/-/bun-windows-aarch64-1.3.10.tgz",
-      "integrity": "sha512-GXbz2swvN2DLw2dXZFeedMxSJtI64xQ9xp9Eg7Hjejg6mS2E4dP1xoQ2yAo2aZPi/2OBPAVaGzppI2q20XumHA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-windows-aarch64/-/bun-windows-aarch64-1.3.14.tgz",
+      "integrity": "sha512-T7s3x/BsVKQObGU6QDkZeI6wKynzqGbBH1yI77jrrj5siElclxr3DQrDIk8CV4G5/SJq2HHq4kpLyYY2DKCSmA==",
       "cpu": [
         "arm64"
       ],
@@ -3192,9 +3022,9 @@
       ]
     },
     "node_modules/@oven/bun-windows-x64": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-windows-x64/-/bun-windows-x64-1.3.10.tgz",
-      "integrity": "sha512-qaS1In3yfC/Z/IGQriVmF8GWwKuNqiw7feTSJWaQhH5IbL6ENR+4wGNPniZSJFaM/SKUO0e/YCRdoVBvgU4C1g==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-windows-x64/-/bun-windows-x64-1.3.14.tgz",
+      "integrity": "sha512-mUFWL3BoYkNpjd8e9PqROiFF/1Xeotq20mABJsiQH62jM1g5zqWh4khw1RZ6bX8Q8fWvlPaxG1PjofkmjUi3vg==",
       "cpu": [
         "x64"
       ],
@@ -3206,9 +3036,9 @@
       ]
     },
     "node_modules/@oven/bun-windows-x64-baseline": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@oven/bun-windows-x64-baseline/-/bun-windows-x64-baseline-1.3.10.tgz",
-      "integrity": "sha512-gh3UAHbUdDUG6fhLc1Csa4IGdtghue6U8oAIXWnUqawp6lwb3gOCRvp25IUnLF5vUHtgfMxuEUYV7YA2WxVutw==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@oven/bun-windows-x64-baseline/-/bun-windows-x64-baseline-1.3.14.tgz",
+      "integrity": "sha512-uIjLUC1S9DWgICzuoMba7vurBJnBruE4S5CxnvmZkdqWVXRzx1Rgu636HoH+k0qeaQCFh3jeG3JQ1y6fRHv0sw==",
       "cpu": [
         "x64"
       ],
@@ -3254,37 +3084,39 @@
       }
     },
     "node_modules/@preact/preset-vite": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/@preact/preset-vite/-/preset-vite-2.10.2.tgz",
-      "integrity": "sha512-K9wHlJOtkE+cGqlyQ5v9kL3Ge0Ql4LlIZjkUTL+1zf3nNdF88F9UZN6VTV8jdzBX9Fl7WSzeNMSDG7qECPmSmg==",
+      "version": "2.10.5",
+      "resolved": "https://registry.npmjs.org/@preact/preset-vite/-/preset-vite-2.10.5.tgz",
+      "integrity": "sha512-p0vJpxiVO7KWWazWny3LUZ+saXyZKWv6Ju0bYMWNJRp2YveufRPgSUB1C4MTqGJfz07EehMgfN+AJNwQy+w6Iw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.22.15",
-        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
-        "@prefresh/vite": "^2.4.1",
-        "@rollup/pluginutils": "^4.1.1",
+        "@babel/plugin-transform-react-jsx": "^7.27.1",
+        "@babel/plugin-transform-react-jsx-development": "^7.27.1",
+        "@prefresh/vite": "^2.4.11",
+        "@rollup/pluginutils": "^5.0.0",
         "babel-plugin-transform-hook-names": "^1.0.2",
-        "debug": "^4.3.4",
+        "debug": "^4.4.3",
+        "magic-string": "^0.30.21",
         "picocolors": "^1.1.1",
-        "vite-prerender-plugin": "^0.5.3"
+        "vite-prerender-plugin": "^0.5.8",
+        "zimmerframe": "^1.1.4"
       },
       "peerDependencies": {
         "@babel/core": "7.x",
-        "vite": "2.x || 3.x || 4.x || 5.x || 6.x || 7.x"
+        "vite": "2.x || 3.x || 4.x || 5.x || 6.x || 7.x || 8.x"
       }
     },
     "node_modules/@prefresh/babel-plugin": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@prefresh/babel-plugin/-/babel-plugin-0.5.2.tgz",
-      "integrity": "sha512-AOl4HG6dAxWkJ5ndPHBgBa49oo/9bOiJuRDKHLSTyH+Fd9x00shTXpdiTj1W41l6oQIwUOAgJeHMn4QwIDpHkA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@prefresh/babel-plugin/-/babel-plugin-0.5.3.tgz",
+      "integrity": "sha512-57LX2SHs4BX2s1IwCjNzTE2OJeEepRCNf1VTEpbNcUyHfMO68eeOWGDIt4ob9aYlW6PEWZ1SuwNikuoIXANDtQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@prefresh/core": {
-      "version": "1.5.9",
-      "resolved": "https://registry.npmjs.org/@prefresh/core/-/core-1.5.9.tgz",
-      "integrity": "sha512-IKBKCPaz34OFVC+adiQ2qaTF5qdztO2/4ZPf4KsRTgjKosWqxVXmEbxCiUydYZRY8GVie+DQlKzQr9gt6HQ+EQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/@prefresh/core/-/core-1.5.10.tgz",
+      "integrity": "sha512-7yPTFbG56sutaFu8krp3B4a200KOFUvrtlllKWRuLjsYXo9UUucHOZRcer+gtgMkFTpv6ob8TGcTwA32bSwa1w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -3299,14 +3131,14 @@
       "license": "MIT"
     },
     "node_modules/@prefresh/vite": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/@prefresh/vite/-/vite-2.4.11.tgz",
-      "integrity": "sha512-/XjURQqdRiCG3NpMmWqE9kJwrg9IchIOWHzulCfqg2sRe/8oQ1g5De7xrk9lbqPIQLn7ntBkKdqWXIj4E9YXyg==",
+      "version": "2.4.12",
+      "resolved": "https://registry.npmjs.org/@prefresh/vite/-/vite-2.4.12.tgz",
+      "integrity": "sha512-FY1fzXpUjiuosznMV0YM7XAOPZjB5FIdWS0W24+XnlxYkt9hNAwwsiKYn+cuTEoMtD/ZVazS5QVssBr9YhpCQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.22.1",
-        "@prefresh/babel-plugin": "0.5.2",
+        "@prefresh/babel-plugin": "^0.5.2",
         "@prefresh/core": "^1.5.0",
         "@prefresh/utils": "^1.2.0",
         "@rollup/pluginutils": "^4.2.1"
@@ -3316,6 +3148,20 @@
         "vite": ">=2.0.0"
       }
     },
+    "node_modules/@prefresh/vite/node_modules/@rollup/pluginutils": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+      "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "estree-walker": "^2.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.27",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
@@ -3324,23 +3170,45 @@
       "license": "MIT"
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
-      "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz",
+      "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "estree-walker": "^2.0.1",
-        "picomatch": "^2.2.2"
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils/node_modules/picomatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.1.tgz",
-      "integrity": "sha512-d6FinEBLdIiK+1uACUttJKfgZREXrF0Qc2SmLII7W2AD8FfiZ9Wjd+rD/iRuf5s5dWrr1GgwXCvPqOuDquOowA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
       "cpu": [
         "arm"
       ],
@@ -3352,9 +3220,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.1.tgz",
-      "integrity": "sha512-YjG/EwIDvvYI1YvYbHvDz/BYHtkY4ygUIXHnTdLhG+hKIQFBiosfWiACWortsKPKU/+dUwQQCKQM3qrDe8c9BA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
       "cpu": [
         "arm64"
       ],
@@ -3366,9 +3234,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.1.tgz",
-      "integrity": "sha512-mjCpF7GmkRtSJwon+Rq1N8+pI+8l7w5g9Z3vWj4T7abguC4Czwi3Yu/pFaLvA3TTeMVjnu3ctigusqWUfjZzvw==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
       "cpu": [
         "arm64"
       ],
@@ -3380,9 +3248,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.1.tgz",
-      "integrity": "sha512-haZ7hJ1JT4e9hqkoT9R/19XW2QKqjfJVv+i5AGg57S+nLk9lQnJ1F/eZloRO3o9Scy9CM3wQ9l+dkXtcBgN5Ew==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
       "cpu": [
         "x64"
       ],
@@ -3394,9 +3262,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.1.tgz",
-      "integrity": "sha512-czw90wpQq3ZsAVBlinZjAYTKduOjTywlG7fEeWKUA7oCmpA8xdTkxZZlwNJKWqILlq0wehoZcJYfBvOyhPTQ6w==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
       "cpu": [
         "arm64"
       ],
@@ -3408,9 +3276,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.1.tgz",
-      "integrity": "sha512-KVB2rqsxTHuBtfOeySEyzEOB7ltlB/ux38iu2rBQzkjbwRVlkhAGIEDiiYnO2kFOkJp+Z7pUXKyrRRFuFUKt+g==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
       "cpu": [
         "x64"
       ],
@@ -3422,13 +3290,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.1.tgz",
-      "integrity": "sha512-L+34Qqil+v5uC0zEubW7uByo78WOCIrBvci69E7sFASRl0X7b/MB6Cqd1lky/CtcSVTydWa2WZwFuWexjS5o6g==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3436,13 +3307,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.1.tgz",
-      "integrity": "sha512-n83O8rt4v34hgFzlkb1ycniJh7IR5RCIqt6mz1VRJD6pmhRi0CXdmfnLu9dIUS6buzh60IvACM842Ffb3xd6Gg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3450,13 +3324,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.1.tgz",
-      "integrity": "sha512-Nql7sTeAzhTAja3QXeAI48+/+GjBJ+QmAH13snn0AJSNL50JsDqotyudHyMbO2RbJkskbMbFJfIJKWA6R1LCJQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3464,13 +3341,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.1.tgz",
-      "integrity": "sha512-+pUymDhd0ys9GcKZPPWlFiZ67sTWV5UU6zOJat02M1+PiuSGDziyRuI/pPue3hoUwm2uGfxdL+trT6Z9rxnlMA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3478,13 +3358,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.1.tgz",
-      "integrity": "sha512-VSvgvQeIcsEvY4bKDHEDWcpW4Yw7BtlKG1GUT4FzBUlEKQK0rWHYBqQt6Fm2taXS+1bXvJT6kICu5ZwqKCnvlQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3492,13 +3375,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.1.tgz",
-      "integrity": "sha512-4LqhUomJqwe641gsPp6xLfhqWMbQV04KtPp7/dIp0nzPxAkNY1AbwL5W0MQpcalLYk07vaW9Kp1PBhdpZYYcEw==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3506,13 +3392,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.1.tgz",
-      "integrity": "sha512-tLQQ9aPvkBxOc/EUT6j3pyeMD6Hb8QF2BTBnCQWP/uu1lhc9AIrIjKnLYMEroIz/JvtGYgI9dF3AxHZNaEH0rw==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3520,13 +3409,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.1.tgz",
-      "integrity": "sha512-RMxFhJwc9fSXP6PqmAz4cbv3kAyvD1etJFjTx4ONqFP9DkTkXsAMU4v3Vyc5BgzC+anz7nS/9tp4obsKfqkDHg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3534,13 +3426,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.1.tgz",
-      "integrity": "sha512-QKgFl+Yc1eEk6MmOBfRHYF6lTxiiiV3/z/BRrbSiW2I7AFTXoBFvdMEyglohPj//2mZS4hDOqeB0H1ACh3sBbg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3548,13 +3443,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.1.tgz",
-      "integrity": "sha512-RAjXjP/8c6ZtzatZcA1RaQr6O1TRhzC+adn8YZDnChliZHviqIjmvFwHcxi4JKPSDAt6Uhf/7vqcBzQJy0PDJg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3562,13 +3460,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.1.tgz",
-      "integrity": "sha512-wcuocpaOlaL1COBYiA89O6yfjlp3RwKDeTIA0hM7OpmhR1Bjo9j31G1uQVpDlTvwxGn2nQs65fBFL5UFd76FcQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3576,13 +3477,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.1.tgz",
-      "integrity": "sha512-77PpsFQUCOiZR9+LQEFg9GClyfkNXj1MP6wRnzYs0EeWbPcHs02AXu4xuUbM1zhwn3wqaizle3AEYg5aeoohhg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3590,13 +3494,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.1.tgz",
-      "integrity": "sha512-5cIATbk5vynAjqqmyBjlciMJl1+R/CwX9oLk/EyiFXDWd95KpHdrOJT//rnUl4cUcskrd0jCCw3wpZnhIHdD9w==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3604,9 +3511,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.1.tgz",
-      "integrity": "sha512-cl0w09WsCi17mcmWqqglez9Gk8isgeWvoUZ3WiJFYSR3zjBQc2J5/ihSjpl+VLjPqjQ/1hJRcqBfLjssREQILw==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
       "cpu": [
         "x64"
       ],
@@ -3618,9 +3525,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.1.tgz",
-      "integrity": "sha512-4Cv23ZrONRbNtbZa37mLSueXUCtN7MXccChtKpUnQNgF010rjrjfHx3QxkS2PI7LqGT5xXyYs1a7LbzAwT0iCA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
       "cpu": [
         "arm64"
       ],
@@ -3632,9 +3539,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.1.tgz",
-      "integrity": "sha512-i1okWYkA4FJICtr7KpYzFpRTHgy5jdDbZiWfvny21iIKky5YExiDXP+zbXzm3dUcFpkEeYNHgQ5fuG236JPq0g==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
       "cpu": [
         "arm64"
       ],
@@ -3646,9 +3553,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.1.tgz",
-      "integrity": "sha512-u09m3CuwLzShA0EYKMNiFgcjjzwqtUMLmuCJLeZWjjOYA3IT2Di09KaxGBTP9xVztWyIWjVdsB2E9goMjZvTQg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
       "cpu": [
         "ia32"
       ],
@@ -3660,9 +3567,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.1.tgz",
-      "integrity": "sha512-k+600V9Zl1CM7eZxJgMyTUzmrmhB/0XZnF4pRypKAlAgxmedUA+1v9R+XOFv56W4SlHEzfeMtzujLJD22Uz5zg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
       "cpu": [
         "x64"
       ],
@@ -3674,9 +3581,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.1.tgz",
-      "integrity": "sha512-lWMnixq/QzxyhTV6NjQJ4SFo1J6PvOX8vUx5Wb4bBPsEb+8xZ89Bz6kOXpfXj9ak9AHTQVQzlgzBEc1SyM27xQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
       "cpu": [
         "x64"
       ],
@@ -3688,40 +3595,40 @@
       ]
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.21.0.tgz",
-      "integrity": "sha512-OYknTCct6qiwpQDqDdf3iedRdzj6hFlOPv5hMvI+hkWfCKs5mlJ4TXziBG9nyabLwGulrUjHiCq3xCspSzErYQ==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.23.0.tgz",
+      "integrity": "sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.21.0",
+        "@shikijs/types": "3.23.0",
         "@shikijs/vscode-textmate": "^10.0.2"
       }
     },
     "node_modules/@shikijs/langs": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.21.0.tgz",
-      "integrity": "sha512-g6mn5m+Y6GBJ4wxmBYqalK9Sp0CFkUqfNzUy2pJglUginz6ZpWbaWjDB4fbQ/8SHzFjYbtU6Ddlp1pc+PPNDVA==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.23.0.tgz",
+      "integrity": "sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.21.0"
+        "@shikijs/types": "3.23.0"
       }
     },
     "node_modules/@shikijs/themes": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.21.0.tgz",
-      "integrity": "sha512-BAE4cr9EDiZyYzwIHEk7JTBJ9CzlPuM4PchfcA5ao1dWXb25nv6hYsoDiBq2aZK9E3dlt3WB78uI96UESD+8Mw==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.23.0.tgz",
+      "integrity": "sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.21.0"
+        "@shikijs/types": "3.23.0"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.21.0.tgz",
-      "integrity": "sha512-zGrWOxZ0/+0ovPY7PvBU2gIS9tmhSUUt30jAcNV0Bq0gb2S98gwfjIs1vxlmH5zM7/4YxLamT6ChlqqAJmPPjA==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
+      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3743,9 +3650,9 @@
       "license": "MIT"
     },
     "node_modules/@sveltejs/acorn-typescript": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.10.tgz",
-      "integrity": "sha512-4WfKk68eTih+MiJD4fSbxN7E8kVBmTMPWHUPYjvl2N0rMs53YLTT8/YjKU5Dtnz5LqDjl7LEw4U7lXR2W3J5WA==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.11.tgz",
+      "integrity": "sha512-LFuZUkjJ9iF7JZye/aG5XM0SFcQ5VyL0oVX4WJ9dc0Va3R3s0OauX1BESVCb+YN/ol8TAfqGDDAQsTG627Y5kw==",
       "license": "MIT",
       "peerDependencies": {
         "acorn": "^8.9.0"
@@ -3855,13 +3762,13 @@
       }
     },
     "node_modules/@types/bun": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@types/bun/-/bun-1.3.6.tgz",
-      "integrity": "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@types/bun/-/bun-1.3.14.tgz",
+      "integrity": "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bun-types": "1.3.6"
+        "bun-types": "1.3.14"
       }
     },
     "node_modules/@types/connect": {
@@ -3892,9 +3799,9 @@
       "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "license": "MIT"
     },
     "node_modules/@types/express": {
@@ -3910,9 +3817,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.1.tgz",
-      "integrity": "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.2.tgz",
+      "integrity": "sha512-d3KvEXBSo/lOAMc2u6fkyDHBvetBHeqD7wm/AcXfLpSOQwlmG9D/aQ0SFswVjv05p7ullQS7Mjohj6/VdbZuTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3923,9 +3830,9 @@
       }
     },
     "node_modules/@types/hast": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.5.tgz",
+      "integrity": "sha512-rp/ezSWaD1m44dPKICGhiskI13nVr7qTloFwDa/IYkhhf5nzwP+zIQcIJh3WIFSBOy/H1PzB40jPjMDksN4F+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3950,9 +3857,9 @@
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+      "version": "6.15.1",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.1.tgz",
+      "integrity": "sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==",
       "dev": true,
       "license": "MIT"
     },
@@ -3964,9 +3871,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.2.8",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.8.tgz",
-      "integrity": "sha512-3MbSL37jEchWZz2p2mjntRZtPt837ij10ApxKfgmXCTuHWagYg7iA5bqPw6C8BMPfwidlvfPI/fxOc42HLhcyg==",
+      "version": "19.2.17",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz",
+      "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4048,13 +3955,13 @@
       "license": "MIT"
     },
     "node_modules/@typescript/vfs": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.6.2.tgz",
-      "integrity": "sha512-hoBwJwcbKHmvd2QVebiytN1aELvpk9B74B4L1mFm/XT1Q/VOYAWl2vQ9AWRFtQq8zmz6enTpfTV8WRc4ATjW/g==",
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.6.4.tgz",
+      "integrity": "sha512-PJFXFS4ZJKiJ9Qiuix6Dz/OwEIqHD7Dme1UwZhTK11vR+5dqW2ACbdndWQexBzCx+CPuMe5WBYQWCsFyGlQLlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.1.1"
+        "debug": "^4.4.3"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -4096,14 +4003,14 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz",
-      "integrity": "sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.39.tgz",
+      "integrity": "sha512-16KBTEXAJCpDr0mwlw+AZyhu8iyC7R3S2vBwsI7QnWJU6X3WKc9VKeNEZpiMdZ569qWhz9574L3vV55qRL0Vtw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@vue/shared": "3.5.27",
-        "entities": "^7.0.0",
+        "@babel/parser": "^7.29.7",
+        "@vue/shared": "3.5.39",
+        "entities": "^7.0.1",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
@@ -4121,103 +4028,103 @@
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz",
-      "integrity": "sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.39.tgz",
+      "integrity": "sha512-oQPigALqYbNxTNPvNgSOe+czwVExfbVF02lz8jP0S3AXJiu3jxYDygNUiqSep4ezzW8XgnubqH63My2A7JR/vg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.27",
-        "@vue/shared": "3.5.27"
+        "@vue/compiler-core": "3.5.39",
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz",
-      "integrity": "sha512-sHZu9QyDPeDmN/MRoshhggVOWE5WlGFStKFwu8G52swATgSny27hJRWteKDSUUzUH+wp+bmeNbhJnEAel/auUQ==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.39.tgz",
+      "integrity": "sha512-d0ki86iOyN8LoZPBmk5SJWNwHP19CnDDCfuo//+2WJa2g5Ke0Jay983PIBIcSSzldC68I8DrD5GrHV3OSDfodg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@vue/compiler-core": "3.5.27",
-        "@vue/compiler-dom": "3.5.27",
-        "@vue/compiler-ssr": "3.5.27",
-        "@vue/shared": "3.5.27",
+        "@babel/parser": "^7.29.7",
+        "@vue/compiler-core": "3.5.39",
+        "@vue/compiler-dom": "3.5.39",
+        "@vue/compiler-ssr": "3.5.39",
+        "@vue/shared": "3.5.39",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.21",
-        "postcss": "^8.5.6",
+        "postcss": "^8.5.15",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz",
-      "integrity": "sha512-Sj7h+JHt512fV1cTxKlYhg7qxBvack+BGncSpH+8vnN+KN95iPIcqB5rsbblX40XorP+ilO7VIKlkuu3Xq2vjw==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.39.tgz",
+      "integrity": "sha512-Ce7/wvwMHai74bdszfXExdazFigYnlF9zgCmEQUcM1j0fOymlouZ7XilTYNo8oUjhlnjYOZbGrcYKuqjz89Ucw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.27",
-        "@vue/shared": "3.5.27"
+        "@vue/compiler-dom": "3.5.39",
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.27.tgz",
-      "integrity": "sha512-vvorxn2KXfJ0nBEnj4GYshSgsyMNFnIQah/wczXlsNXt+ijhugmW+PpJ2cNPe4V6jpnBcs0MhCODKllWG+nvoQ==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.39.tgz",
+      "integrity": "sha512-TpsuBJ9gGlZa5d23XcM2y8EXanz9dZeVDQBXRwzy46ItgvM+rWpzs+UVM0wcRLxGvcav0HE5jz2gNL53xlRAog==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.27"
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.27.tgz",
-      "integrity": "sha512-fxVuX/fzgzeMPn/CLQecWeDIFNt3gQVhxM0rW02Tvp/YmZfXQgcTXlakq7IMutuZ/+Ogbn+K0oct9J3JZfyk3A==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.39.tgz",
+      "integrity": "sha512-9GLtNyRvPAUMbX+7ono0RC2j0guo2LXVi8LvcmAooImACUKm0oFf0jjwbX8/H0AE/t1nxhAkn8RSl9PMCzzxZw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.27",
-        "@vue/shared": "3.5.27"
+        "@vue/reactivity": "3.5.39",
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.27.tgz",
-      "integrity": "sha512-/QnLslQgYqSJ5aUmb5F0z0caZPGHRB8LEAQ1s81vHFM5CBfnun63rxhvE/scVb/j3TbBuoZwkJyiLCkBluMpeg==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.39.tgz",
+      "integrity": "sha512-7Y6aAGboKcXAZ3ECuUy7RrS5yy2r47dhTp2SKaJmYxjopImaVFaNa5Ne66NwGovsrxVAl5S5rwc7m22UG7Lmww==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.27",
-        "@vue/runtime-core": "3.5.27",
-        "@vue/shared": "3.5.27",
+        "@vue/reactivity": "3.5.39",
+        "@vue/runtime-core": "3.5.39",
+        "@vue/shared": "3.5.39",
         "csstype": "^3.2.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.27.tgz",
-      "integrity": "sha512-qOz/5thjeP1vAFc4+BY3Nr6wxyLhpeQgAE/8dDtKo6a6xdk+L4W46HDZgNmLOBUDEkFXV3G7pRiUqxjX0/2zWA==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.39.tgz",
+      "integrity": "sha512-yZSakiAGw85rZfG7UM8akMnIF+FmeiNk47uvHf2nVBBSe+dIKUhZuZq9+XgJhbV3nS5Z4ALH23/MpXofW+mbcw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.27",
-        "@vue/shared": "3.5.27"
+        "@vue/compiler-ssr": "3.5.39",
+        "@vue/shared": "3.5.39"
       },
       "peerDependencies": {
-        "vue": "3.5.27"
+        "vue": "3.5.39"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.27.tgz",
-      "integrity": "sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.39.tgz",
+      "integrity": "sha512-l1rrBtBfTnmxvtsvdQDXltUUy8S1Y+ZaqdfUzmAnJkTd8Z8rv5v/ytW+TKiqEOWyHPoqtPlNFSs0lhRmYVSHVA==",
       "license": "MIT"
     },
     "node_modules/@webgpu/types": {
-      "version": "0.1.69",
-      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.69.tgz",
-      "integrity": "sha512-RPmm6kgRbI8e98zSD3RVACvnuktIja5+yLgDAkTmxLr90BEwdTXRQWNLF3ETTTyH/8mKhznZuN5AveXYFEsMGQ==",
+      "version": "0.1.71",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.71.tgz",
+      "integrity": "sha512-mMy8/ODcKhab808co15eW+yN+HgXoQxRQHTiBV9Mrvl1r0ufnid7YOcI+gi4eUWSWl9ezD6TW2KXccrL8HCh2A==",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/abcjs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/abcjs/-/abcjs-6.6.0.tgz",
-      "integrity": "sha512-lYS+qwOOxFcFY5ZjNmS1l4RT6BxGd2juBOzLD5/PfLZ+jd0zz29CMI/SwxCWb0+cdKjTBc/EHO43lUGB93FaAw==",
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/abcjs/-/abcjs-6.6.4.tgz",
+      "integrity": "sha512-KNbRE9Uk7KgJu6TWCEph3rqSifcCN243qRMALysRngEzbuv6JuFJrSKbLI1Bpw/XyXFTFEzoFF1WHWBHsoofyA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -4248,9 +4155,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "version": "8.17.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
+      "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -4260,10 +4167,11 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+      "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -4280,6 +4188,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"
       },
@@ -4394,9 +4303,9 @@
       }
     },
     "node_modules/babel-plugin-jsx-dom-expressions": {
-      "version": "0.40.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.40.6.tgz",
-      "integrity": "sha512-v3P1MW46Lm7VMpAkq0QfyzLWWkC8fh+0aE5Km4msIgDx5kjenHU0pF2s+4/NH8CQn/kla6+Hvws+2AF7bfV5qQ==",
+      "version": "0.40.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.40.7.tgz",
+      "integrity": "sha512-/O6JWUmjv03OI9lL2ry9bUjpD5S3PclM55RRJEyCdcFZ5W2SEA/59d+l2hNsk3gI6kiWRdRPdOtqZmsQzFN1pQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4423,6 +4332,13 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/babel-plugin-jsx-dom-expressions/node_modules/html-entities": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
+      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/babel-plugin-transform-hook-names": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-hook-names/-/babel-plugin-transform-hook-names-1.0.2.tgz",
@@ -4453,20 +4369,26 @@
       }
     },
     "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.18",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.18.tgz",
-      "integrity": "sha512-e23vBV1ZLfjb9apvfPk4rHVu2ry6RIr2Wfs+O324okSidrX7pTAnEJPCh/O5BtRlr7QtZI7ktOP3vsqr7Z5XoA==",
+      "version": "2.10.43",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.43.tgz",
+      "integrity": "sha512-AjYpR78kDWAY3Efj+cDTFH9t9SCoL7OoTp1BOb0mQV7S+6CiLwnWM3FyxhJtdPufDFKzmCSFoUncKjWgJEZTCQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
-        "baseline-browser-mapping": "dist/cli.js"
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/bezier-js": {
@@ -4494,21 +4416,34 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz",
-      "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz",
+      "integrity": "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==",
       "license": "MIT",
       "dependencies": {
         "bytes": "^3.1.2",
-        "content-type": "^1.0.5",
+        "content-type": "^2.0.0",
         "debug": "^4.4.3",
-        "http-errors": "^2.0.0",
-        "iconv-lite": "^0.7.0",
+        "http-errors": "^2.0.1",
+        "iconv-lite": "^0.7.2",
         "on-finished": "^2.4.1",
-        "qs": "^6.14.1",
-        "raw-body": "^3.0.1",
-        "type-is": "^2.0.1"
+        "qs": "^6.15.2",
+        "raw-body": "^3.0.2",
+        "type-is": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/body-parser/node_modules/content-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz",
+      "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -4518,9 +4453,9 @@
       }
     },
     "node_modules/body-parser/node_modules/iconv-lite": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
-      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
+      "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==",
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -4540,14 +4475,16 @@
       "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
+      "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/braces": {
@@ -4564,9 +4501,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
-      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "version": "4.28.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.6.tgz",
+      "integrity": "sha512-FQBYNK15VMslhLHpA7+n+n1GOlF1kId2xcCg7/j95f24AOF6VDYMNH4mFxF7KuaTdv627faazpOAjFzMrfJOUw==",
       "dev": true,
       "funding": [
         {
@@ -4584,11 +4521,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.9.0",
-        "caniuse-lite": "^1.0.30001759",
-        "electron-to-chromium": "^1.5.263",
-        "node-releases": "^2.0.27",
-        "update-browserslist-db": "^1.2.0"
+        "baseline-browser-mapping": "^2.10.42",
+        "caniuse-lite": "^1.0.30001803",
+        "electron-to-chromium": "^1.5.389",
+        "node-releases": "^2.0.51",
+        "update-browserslist-db": "^1.2.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4597,10 +4534,38 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/browserslist/node_modules/caniuse-lite": {
+      "version": "1.0.30001805",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001805.tgz",
+      "integrity": "sha512-52noaS3DubycKSXaU30TwPGIp+POyQSUVa5jBEq3vkRkY0kjyb3LQgvhU6WGyCcyXqVLWO0Cw0Q6BSdD0kUfVA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/browserslist/node_modules/electron-to-chromium": {
+      "version": "1.5.389",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.389.tgz",
+      "integrity": "sha512-cEto7aeOqBfU1D+c5py5pE+ooscKE75JifxLBdFUZsqAxRS6y7kebtxAZvICszSl05gPjYHDTjY+lXpyGvpJbg==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/bun": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/bun/-/bun-1.3.10.tgz",
-      "integrity": "sha512-S/CXaXXIyA4CMjdMkYQ4T2YMqnAn4s0ysD3mlsY4bUiOCqGlv28zck4Wd4H4kpvbekx15S9mUeLQ7Uxd0tYTLA==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/bun/-/bun-1.3.14.tgz",
+      "integrity": "sha512-aB6GVd42x1Y5ie1K16SF+oLGtgSkwX9hgoDdIW88pjvfTccU8F1vfpoOt34QLv0dZ1v3XimtaxPlZUG81Gx9Zg==",
       "cpu": [
         "arm64",
         "x64"
@@ -4611,6 +4576,8 @@
       "os": [
         "darwin",
         "linux",
+        "android",
+        "freebsd",
         "win32"
       ],
       "bin": {
@@ -4618,24 +4585,28 @@
         "bunx": "bin/bunx.exe"
       },
       "optionalDependencies": {
-        "@oven/bun-darwin-aarch64": "1.3.10",
-        "@oven/bun-darwin-x64": "1.3.10",
-        "@oven/bun-darwin-x64-baseline": "1.3.10",
-        "@oven/bun-linux-aarch64": "1.3.10",
-        "@oven/bun-linux-aarch64-musl": "1.3.10",
-        "@oven/bun-linux-x64": "1.3.10",
-        "@oven/bun-linux-x64-baseline": "1.3.10",
-        "@oven/bun-linux-x64-musl": "1.3.10",
-        "@oven/bun-linux-x64-musl-baseline": "1.3.10",
-        "@oven/bun-windows-aarch64": "1.3.10",
-        "@oven/bun-windows-x64": "1.3.10",
-        "@oven/bun-windows-x64-baseline": "1.3.10"
+        "@oven/bun-darwin-aarch64": "1.3.14",
+        "@oven/bun-darwin-x64": "1.3.14",
+        "@oven/bun-darwin-x64-baseline": "1.3.14",
+        "@oven/bun-freebsd-aarch64": "1.3.14",
+        "@oven/bun-freebsd-x64": "1.3.14",
+        "@oven/bun-linux-aarch64": "1.3.14",
+        "@oven/bun-linux-aarch64-android": "1.3.14",
+        "@oven/bun-linux-aarch64-musl": "1.3.14",
+        "@oven/bun-linux-x64": "1.3.14",
+        "@oven/bun-linux-x64-android": "1.3.14",
+        "@oven/bun-linux-x64-baseline": "1.3.14",
+        "@oven/bun-linux-x64-musl": "1.3.14",
+        "@oven/bun-linux-x64-musl-baseline": "1.3.14",
+        "@oven/bun-windows-aarch64": "1.3.14",
+        "@oven/bun-windows-x64": "1.3.14",
+        "@oven/bun-windows-x64-baseline": "1.3.14"
       }
     },
     "node_modules/bun-types": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/bun-types/-/bun-types-1.3.6.tgz",
-      "integrity": "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ==",
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/bun-types/-/bun-types-1.3.14.tgz",
+      "integrity": "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4869,14 +4840,14 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.1.1.tgz",
-      "integrity": "sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz",
+      "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^7.1.0",
-        "string-width": "^8.0.0"
+        "slice-ansi": "^8.0.0",
+        "string-width": "^8.2.0"
       },
       "engines": {
         "node": ">=20"
@@ -4886,14 +4857,14 @@
       }
     },
     "node_modules/cli-truncate/node_modules/string-width": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.0.tgz",
-      "integrity": "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz",
+      "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-east-asian-width": "^1.3.0",
-        "strip-ansi": "^7.1.0"
+        "get-east-asian-width": "^1.5.0",
+        "strip-ansi": "^7.1.2"
       },
       "engines": {
         "node": ">=20"
@@ -4997,23 +4968,16 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/concurrently": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz",
-      "integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==",
+      "version": "9.2.4",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.4.tgz",
+      "integrity": "sha512-TZ0CEhyzvFjgtAvHTusDMgj7wNdihCh7LLLrzdUOXIhdlnL2JBBGA9eJxR24rtqgmdjh3OA3hrN1rCHj6HM8qA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "4.1.2",
         "rxjs": "7.8.2",
-        "shell-quote": "1.8.3",
+        "shell-quote": "1.9.0",
         "supports-color": "8.1.1",
         "tree-kill": "1.2.2",
         "yargs": "17.7.2"
@@ -5030,9 +4994,9 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
-      "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz",
+      "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -5077,9 +5041,9 @@
       }
     },
     "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
+      "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==",
       "license": "MIT",
       "dependencies": {
         "object-assign": "^4",
@@ -5087,6 +5051,10 @@
       },
       "engines": {
         "node": ">= 0.10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/cross-env": {
@@ -5619,9 +5587,9 @@
       }
     },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -5708,9 +5676,9 @@
       "license": "MIT"
     },
     "node_modules/esrap": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.11.tgz",
-      "integrity": "sha512-gPdx+I+BjYEinNMQaBXFjbaJVyoPMU4ZODg5mE+M4DqVG9VusAVHHjcBX+zqyITlI0DIARwDMMzZwAWj36dRoQ==",
+      "version": "2.2.13",
+      "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.13.tgz",
+      "integrity": "sha512-m8jH5hZgJE2RRUK/jjkGPcJEDAV+dYnZYFkosQaPTcE+Yw4xynXHOo6FUdwaWBtdR3b1MMa7wEDTSHeR2VWsGA==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
@@ -5740,9 +5708,9 @@
       }
     },
     "node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
       "dev": true,
       "license": "MIT"
     },
@@ -5759,9 +5727,9 @@
       }
     },
     "node_modules/eventsource-parser": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz",
-      "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.1.0.tgz",
+      "integrity": "sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -5815,6 +5783,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"
       },
@@ -5832,12 +5801,13 @@
       "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",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz",
+      "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==",
       "funding": [
         {
           "type": "github",
@@ -5848,29 +5818,37 @@
           "url": "https://opencollective.com/fastify"
         }
       ],
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/fflate": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
-      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz",
+      "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.6.tgz",
+      "integrity": "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.0.1"
       }
     },
+    "node_modules/filelist/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz",
+      "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5940,9 +5918,9 @@
       }
     },
     "node_modules/force-graph": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/force-graph/-/force-graph-1.51.0.tgz",
-      "integrity": "sha512-aTnihCmiMA0ItLJLCbrQYS9mzriopW24goFPgUnKAAmAlPogTSmFWqoBPMXzIfPb7bs04Hur5zEI4WYgLW3Sig==",
+      "version": "1.51.4",
+      "resolved": "https://registry.npmjs.org/force-graph/-/force-graph-1.51.4.tgz",
+      "integrity": "sha512-TdJ2KbkoiDQ7NIRx8IPGD0mAXXpLhamS7c+b7W98b0MHG7lphnda1VOQX/98UDTsttIAdH4TcP0l0MauSnLK8w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6029,9 +6007,9 @@
       }
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz",
-      "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
+      "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6088,19 +6066,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/get-tsconfig": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.0.tgz",
-      "integrity": "sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "resolve-pkg-maps": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -6149,9 +6114,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -6171,24 +6136,35 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.23",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz",
-      "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==",
+      "version": "4.12.30",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.30.tgz",
+      "integrity": "sha512-emn+JoJjrN9YTpRDS5it/UI2SO9BAE37T6I3d963RxcZ81G9A4pr2SZTEiiaiKbzx+NKRg5BZ89fCL7gCJCUog==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16.9.0"
       }
     },
     "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ],
       "license": "MIT"
     },
     "node_modules/htmlparser2": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz",
-      "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.1.0.tgz",
+      "integrity": "sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==",
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
         {
@@ -6200,14 +6176,14 @@
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.3",
-        "domutils": "^3.2.1",
-        "entities": "^6.0.0"
+        "domutils": "^3.2.2",
+        "entities": "^7.0.1"
       }
     },
     "node_modules/htmlparser2/node_modules/entities": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -6316,6 +6292,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"
       }
@@ -6479,9 +6456,9 @@
       }
     },
     "node_modules/jose": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz",
-      "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz",
+      "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -6511,13 +6488,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",
@@ -6576,10 +6555,20 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
-      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz",
+      "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "uc.micro": "^2.0.0"
@@ -6693,9 +6682,9 @@
       }
     },
     "node_modules/log-update/node_modules/ansi-escapes": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz",
-      "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
+      "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6728,6 +6717,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
+      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
     "node_modules/log-update/node_modules/string-width": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
@@ -6791,15 +6797,25 @@
       }
     },
     "node_modules/markdown-it": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
-      "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz",
+      "integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "^4.4.0",
-        "linkify-it": "^5.0.0",
+        "entities": "^4.5.0",
+        "linkify-it": "^5.0.2",
         "mdurl": "^2.0.0",
         "punycode.js": "^2.3.1",
         "uc.micro": "^2.1.0"
@@ -6921,16 +6937,19 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
-        "node": "*"
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/ms": {
@@ -6940,9 +6959,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.12",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
-      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
+      "version": "3.3.16",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
+      "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
       "funding": [
         {
           "type": "github",
@@ -6987,23 +7006,26 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.27",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
-      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
+      "version": "2.0.51",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz",
+      "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/nodemon": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz",
-      "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==",
+      "version": "3.1.14",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.14.tgz",
+      "integrity": "sha512-jakjZi93UtB3jHMWsXL68FXSAosbLfY0In5gtKq3niLSkrWznrVBzXFNOEMJUfc9+Ke7SHWoAZsiMkNP3vq6Jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "chokidar": "^3.5.2",
         "debug": "^4",
         "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.1.2",
+        "minimatch": "^10.2.1",
         "pstree.remy": "^1.1.8",
         "semver": "^7.5.3",
         "simple-update-notifier": "^2.0.0",
@@ -7199,9 +7221,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.1.tgz",
-      "integrity": "sha512-fvU78fIjZ+SBM9YwCknCvKOUKkLVqtWDVctl0s7xIqfmfb38t2TT4ZU2gHm+Z8xGwgW+QWEU3oQSAzIbo89Ggw==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
+      "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -7209,15 +7231,15 @@
       }
     },
     "node_modules/pdfjs-dist": {
-      "version": "5.4.530",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.4.530.tgz",
-      "integrity": "sha512-r1hWsSIGGmyYUAHR26zSXkxYWLXLMd6AwqcaFYG9YUZ0GBf5GvcjJSeo512tabM4GYFhxhl5pMCmPr7Q72Rq2Q==",
+      "version": "5.7.284",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.7.284.tgz",
+      "integrity": "sha512-h4EdYQczmGhbOlqc3PPZwxevn7ApdWPbovAuWXOB/DjIyigSnwfy2oze7c6mRcSr9XgLp3eN3EeL4DyySTPMFw==",
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=20.16.0 || >=22.3.0"
+        "node": ">=22.13.0 || >=24"
       },
       "optionalDependencies": {
-        "@napi-rs/canvas": "^0.1.84"
+        "@napi-rs/canvas": "^0.1.100"
       }
     },
     "node_modules/picocolors": {
@@ -7296,9 +7318,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "version": "8.5.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.18.tgz",
+      "integrity": "sha512-xdB1oSLHbz1vRWgCDalrCqEFTWzFlhqFC5tIHLMOSUIjhm3XXQ1qrFy8S/ESr1JYRRXqM3c1QFiMZUJdUTqyMQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -7324,19 +7346,27 @@
       }
     },
     "node_modules/preact": {
-      "version": "10.28.2",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.28.2.tgz",
-      "integrity": "sha512-lbteaWGzGHdlIuiJ0l2Jq454m6kcpI1zNje6d8MlGAFlYvP2GO4ibnat7P74Esfz4sPTdM6UxtTwh/d3pwM9JA==",
+      "version": "10.29.7",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.29.7.tgz",
+      "integrity": "sha512-DCHYrK/B10yUD3ZjLfhZ3WIE/9Vf9VFUODcRE2dRomTYDpJk6z6L9wecSfhfE6M9ZTHUdyQkoC46arIDhEV84Q==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
+      },
+      "peerDependencies": {
+        "preact-render-to-string": ">=5"
+      },
+      "peerDependenciesMeta": {
+        "preact-render-to-string": {
+          "optional": true
+        }
       }
     },
     "node_modules/prettier": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz",
-      "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
+      "version": "3.9.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.5.tgz",
+      "integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -7380,12 +7410,13 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.15.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
-      "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==",
+      "version": "6.15.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
+      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.1.0"
+        "es-define-property": "^1.0.1",
+        "side-channel": "^1.1.1"
       },
       "engines": {
         "node": ">=0.6"
@@ -7395,12 +7426,16 @@
       }
     },
     "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.3.0.tgz",
+      "integrity": "sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/raw-body": {
@@ -7419,9 +7454,9 @@
       }
     },
     "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
-      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
+      "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==",
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -7435,24 +7470,24 @@
       }
     },
     "node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz",
+      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.3"
+        "react": "^19.2.7"
       }
     },
     "node_modules/react-refresh": {
@@ -7493,20 +7528,11 @@
       "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"
       }
     },
-    "node_modules/resolve-pkg-maps": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-      }
-    },
     "node_modules/restore-cursor": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
@@ -7532,13 +7558,13 @@
       "license": "MIT"
     },
     "node_modules/rollup": {
-      "version": "4.60.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.1.tgz",
-      "integrity": "sha512-VmtB2rFU/GroZ4oL8+ZqXgSA38O6GR8KSIvWmEFv63pQ0G6KaBH9s07PO8XTXP4vI+3UJUEypOfjkGfmSBBR0w==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.8"
+        "@types/estree": "1.0.9"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -7548,31 +7574,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.60.1",
-        "@rollup/rollup-android-arm64": "4.60.1",
-        "@rollup/rollup-darwin-arm64": "4.60.1",
-        "@rollup/rollup-darwin-x64": "4.60.1",
-        "@rollup/rollup-freebsd-arm64": "4.60.1",
-        "@rollup/rollup-freebsd-x64": "4.60.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.60.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.60.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.60.1",
-        "@rollup/rollup-linux-arm64-musl": "4.60.1",
-        "@rollup/rollup-linux-loong64-gnu": "4.60.1",
-        "@rollup/rollup-linux-loong64-musl": "4.60.1",
-        "@rollup/rollup-linux-ppc64-gnu": "4.60.1",
-        "@rollup/rollup-linux-ppc64-musl": "4.60.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.60.1",
-        "@rollup/rollup-linux-riscv64-musl": "4.60.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.60.1",
-        "@rollup/rollup-linux-x64-gnu": "4.60.1",
-        "@rollup/rollup-linux-x64-musl": "4.60.1",
-        "@rollup/rollup-openbsd-x64": "4.60.1",
-        "@rollup/rollup-openharmony-arm64": "4.60.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.60.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.60.1",
-        "@rollup/rollup-win32-x64-gnu": "4.60.1",
-        "@rollup/rollup-win32-x64-msvc": "4.60.1",
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -7615,9 +7641,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -7766,9 +7792,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz",
+      "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7779,14 +7805,14 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz",
+      "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
+        "object-inspect": "^1.13.4",
+        "side-channel-list": "^1.0.1",
         "side-channel-map": "^1.0.1",
         "side-channel-weakmap": "^1.0.2"
       },
@@ -7798,13 +7824,13 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7916,17 +7942,17 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
-      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz",
+      "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "is-fullwidth-code-point": "^5.0.0"
+        "ansi-styles": "^6.2.3",
+        "is-fullwidth-code-point": "^5.1.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
@@ -7991,13 +8017,13 @@
       }
     },
     "node_modules/stack-trace": {
-      "version": "1.0.0-pre2",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz",
-      "integrity": "sha512-2ztBJRek8IVofG9DBJqdy2N5kulaacX30Nz7xmkYF6ale9WBVmIy6mFBchvGX7Vx/MyjBhx+Rcxqrj+dbOnQ6A==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0.tgz",
+      "integrity": "sha512-H6D7134xi6qONvh7ZHKgviXf+rd3vhGBSvebPZCaUkd8zvQ+7PtDw6CljPTe4cXWNf2IKZGNqw6VJXSb9IgBpA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/statuses": {
@@ -8058,13 +8084,13 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
         "node": ">=12"
@@ -8090,9 +8116,9 @@
       }
     },
     "node_modules/svelte": {
-      "version": "5.56.1",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.1.tgz",
-      "integrity": "sha512-eArsJmvl3xZVuTYD852PzIEdg2wgDdIZ1NEsIPbzAukHwi284B18No4nK2rCO9AwsWUDza4Cjvmoa4HaojTl5g==",
+      "version": "5.56.4",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.4.tgz",
+      "integrity": "sha512-/d0QHehmRuJW8gVz395MTkPcPozxzdjBMBE8oEYGz8O3b9KTMzzQ9ZHJQLuFKOHOPQbU6kx/X4iid/EBBzH7iw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/remapping": "^2.3.4",
@@ -8106,7 +8132,7 @@
         "clsx": "^2.1.1",
         "devalue": "^5.8.1",
         "esm-env": "^1.2.1",
-        "esrap": "^2.2.9",
+        "esrap": "^2.2.12",
         "is-reference": "^3.0.3",
         "locate-character": "^3.0.0",
         "magic-string": "^0.30.11",
@@ -8117,9 +8143,9 @@
       }
     },
     "node_modules/systeminformation": {
-      "version": "5.31.7",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.7.tgz",
-      "integrity": "sha512-/8NC53e5nP9nmhn42/ncdOkyJnOoue/Vy+tJOyUGd1Yv66G069wK4rrziwhrqDETgk78CudTQupw5z19S5uoZw==",
+      "version": "5.31.16",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.16.tgz",
+      "integrity": "sha512-37NsFaeaqwYxanLgdJAGWj8OXIRgvSBsDXGhlC0uUoHyl9nf4HrNsZjqtQ9Gc99bj9FQpffzYccPVuQ6gpjfqg==",
       "license": "MIT",
       "os": [
         "darwin",
@@ -8143,214 +8169,214 @@
       }
     },
     "node_modules/text-camel-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-camel-case/-/text-camel-case-1.2.9.tgz",
-      "integrity": "sha512-wKYs9SgRxYizJE1mneR7BbLNlGw2IYzJAS8XwkWIry0CTbO1gvvPkFsx5Z1/hr+VqUaBqx9q3yKd30HpZLdMsQ==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-camel-case/-/text-camel-case-1.2.11.tgz",
+      "integrity": "sha512-2ZsM/gOlB1tyza+8lGLvs6gtPuZ9qEYuKPa+gwo38m65wkY4k323SK4hT7ku8r5wIKyspUYIWSk1aB9/Jjxr7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-pascal-case": "1.2.9"
+        "text-pascal-case": "^1.2.11"
       }
     },
     "node_modules/text-capital-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-capital-case/-/text-capital-case-1.2.9.tgz",
-      "integrity": "sha512-X5zV8U8pxtq2xS2t46lgAWqZdDbgWMKq03MQSNwY2CJdQCsdTNh144E2Q/q9wBxWzSBUXn+jRc9kF+Gs8/pGhA==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-capital-case/-/text-capital-case-1.2.11.tgz",
+      "integrity": "sha512-30A7B7+VUvevEmPE0xWK1Z2z0ncl/JTjSUBLfjpoXrkwuPpmNTVbjHShRTN3cX9GIuZn/P3jvR+TO9JiTZcl8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9",
-        "text-upper-case-first": "1.2.9"
+        "text-no-case": "^1.2.11",
+        "text-upper-case-first": "^1.2.11"
       }
     },
     "node_modules/text-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-case/-/text-case-1.2.9.tgz",
-      "integrity": "sha512-zZVdA8rMcjx9zhekdUuOPZShc25UTV7W8/ddKbgbPtfCEvIiToPtWiSd2lXLSuiGMovNhJ4+Tw49xll9o9ts+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "text-camel-case": "1.2.9",
-        "text-capital-case": "1.2.9",
-        "text-constant-case": "1.2.9",
-        "text-dot-case": "1.2.9",
-        "text-header-case": "1.2.9",
-        "text-is-lower-case": "1.2.9",
-        "text-is-upper-case": "1.2.9",
-        "text-kebab-case": "1.2.9",
-        "text-lower-case": "1.2.9",
-        "text-lower-case-first": "1.2.9",
-        "text-no-case": "1.2.9",
-        "text-param-case": "1.2.9",
-        "text-pascal-case": "1.2.9",
-        "text-path-case": "1.2.9",
-        "text-sentence-case": "1.2.9",
-        "text-snake-case": "1.2.9",
-        "text-swap-case": "1.2.9",
-        "text-title-case": "1.2.9",
-        "text-upper-case": "1.2.9",
-        "text-upper-case-first": "1.2.9"
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-case/-/text-case-1.2.11.tgz",
+      "integrity": "sha512-LbdWNQeuXWbfav+pxBxvaefkziffMYeSA53BHp52cgJa9rjiC0dkjum9AKrH8iQWoQJ4InGPSGexLeerGFaZ1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "text-camel-case": "^1.2.11",
+        "text-capital-case": "^1.2.11",
+        "text-constant-case": "^1.2.11",
+        "text-dot-case": "^1.2.11",
+        "text-header-case": "^1.2.11",
+        "text-is-lower-case": "^1.2.11",
+        "text-is-upper-case": "^1.2.11",
+        "text-kebab-case": "^1.2.11",
+        "text-lower-case": "^1.2.11",
+        "text-lower-case-first": "^1.2.11",
+        "text-no-case": "^1.2.11",
+        "text-param-case": "^1.2.11",
+        "text-pascal-case": "^1.2.11",
+        "text-path-case": "^1.2.11",
+        "text-sentence-case": "^1.2.11",
+        "text-snake-case": "^1.2.11",
+        "text-swap-case": "^1.2.11",
+        "text-title-case": "^1.2.11",
+        "text-upper-case": "^1.2.11",
+        "text-upper-case-first": "^1.2.11"
       }
     },
     "node_modules/text-constant-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-constant-case/-/text-constant-case-1.2.9.tgz",
-      "integrity": "sha512-Vosm6nC7Gag+JFakJHwqS9AXRNgl07j5KZ7srU9cYuKRzYwrxzeJ4RpEogRBNHw7CfmOm0j5FGEznblWtu7pIw==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-constant-case/-/text-constant-case-1.2.11.tgz",
+      "integrity": "sha512-XnTBILsa7UpMWncUCchqIybZlg15FUcrlyNaWIJ8ybPy54qcoN513EXFswueyizuAgyJFXPCwwSFbSji6kw/Uw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9",
-        "text-upper-case": "1.2.9"
+        "text-no-case": "^1.2.11",
+        "text-upper-case": "^1.2.11"
       }
     },
     "node_modules/text-dot-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-dot-case/-/text-dot-case-1.2.9.tgz",
-      "integrity": "sha512-N83hsnvGdSO9q9AfNSB9Cy1LFDNN2MCx53LcxtaPoDWPUTk47fv0JlvIY1tgY0wyzCiThF03kVj3jworvAOScA==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-dot-case/-/text-dot-case-1.2.11.tgz",
+      "integrity": "sha512-7SLKiT45KZO0qad0+p+GvC0+F+6pZ851HJcTcBJiSF88HsK/e1qErlGLtVBT6hkTHIaAj48WfSyQr4lZRv1xJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9"
+        "text-no-case": "^1.2.11"
       }
     },
     "node_modules/text-header-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-header-case/-/text-header-case-1.2.9.tgz",
-      "integrity": "sha512-TqryEKcYisQAfWLbtT3xPnZlMZ/mySO1uS+LUg+B0eNuqgETrSzVpXIUj5E6Zf/EyJHgpZf4VndbAXtOMJuT4w==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-header-case/-/text-header-case-1.2.11.tgz",
+      "integrity": "sha512-7OBHd2g7X+aH6rXMC3cANFh6yvhXjXkyumw2NaRwJRIk343pP2e1SQCTCfowPDmmi8wkZVqz1fdWNq5LwvcBOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-capital-case": "1.2.9"
+        "text-capital-case": "^1.2.11"
       }
     },
     "node_modules/text-is-lower-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-is-lower-case/-/text-is-lower-case-1.2.9.tgz",
-      "integrity": "sha512-cEurrWSnYVYqL8FSwl5cK4mdfqF7qNDCcKJgXI3NnfTesiB8umxAhdlQoErrRYI1xEvYr2WN0MI333EehUhQjg==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-is-lower-case/-/text-is-lower-case-1.2.11.tgz",
+      "integrity": "sha512-dBqPAkNmX7eTM7ZbS3D/UBCQ5i9EXt5tujF2wIGGbZ1+aN8bY7Qda4mDpxgd6Hbzf/z10uQWRNzupl99wFQ8CQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/text-is-upper-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-is-upper-case/-/text-is-upper-case-1.2.9.tgz",
-      "integrity": "sha512-HxsWr3VCsXXiLlhD0c+Ey+mS2lOTCiSJbkepjaXNHl2bp33KiscQaiG0qLwQmmpZQm4SJCg2s9FkndxS0RNDLQ==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-is-upper-case/-/text-is-upper-case-1.2.11.tgz",
+      "integrity": "sha512-MZeUIYEYfKZ2FSeg0vnHCH4mHXLgGzes+iz2K+4BYnhnkEa2svKA1nNjQAqTUiVNHOPqPCuzmUr1LsyQZ73uyA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/text-kebab-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-kebab-case/-/text-kebab-case-1.2.9.tgz",
-      "integrity": "sha512-nOUyNR5Ej2B9D/wyyXfwUEv26+pQuOb1pEX+ojE37mCIWo8QeOxw5y6nxuqDmG7NrEPzbO6265UMV+EICH13Cw==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-kebab-case/-/text-kebab-case-1.2.11.tgz",
+      "integrity": "sha512-RIg9iN6VwH+JrX9dFdm1nd1efPGR9LjNc0CiQz496sQETeKGkDEzxES/ZzxbkerrAL2DFEMGdLXckzDz1OEDBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9"
+        "text-no-case": "^1.2.11"
       }
     },
     "node_modules/text-lower-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-lower-case/-/text-lower-case-1.2.9.tgz",
-      "integrity": "sha512-53AOnDrhPpiAUQkgY1SHleKUXp/u7GsqRX13NcCREZscmtjLLJ099uxMRjkK7q2KwHkFYVPl9ytkQlTkTQLS0w==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-lower-case/-/text-lower-case-1.2.11.tgz",
+      "integrity": "sha512-txTy6y0y8M23Lhf0mk8WcvXTqlf4OQ3AGnDsRB6o3uMNfIa0CJDol2s1PdKNa63rt5B2277zkZCCn6Xeq//big==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/text-lower-case-first": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-lower-case-first/-/text-lower-case-first-1.2.9.tgz",
-      "integrity": "sha512-iiphHTV7PVH0MljrEQUA9iBE7jfDpXoi4RQju3WzZU3BRVbS6540cNZgxR19hWa0z6z/7cJTH0Ls9LPBaiUfKg==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-lower-case-first/-/text-lower-case-first-1.2.11.tgz",
+      "integrity": "sha512-QR483XLyuyIpq8tKu1ds3Q1jfsgfaa/p9rtoQKHe6Rv5ah9ic/SUzTGN0MQ7UIS9APADd8SUPn5TTh1Z2/ACyg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/text-no-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-no-case/-/text-no-case-1.2.9.tgz",
-      "integrity": "sha512-IcCt328KaapimSrytP4ThfC8URmHZb2DgOqCL9BYvGjpxY2lDiqCkIQk9sClZtwcELs2gTnq83a7jNc573FTLA==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-no-case/-/text-no-case-1.2.11.tgz",
+      "integrity": "sha512-wazS7FEq0Ct3aJzeE8MEMcSs0eW4+/X/fwdotv/rG66bLS+g1T0pa0gUsbBGjjLFs191AIXVIry+bYE0uaaBBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-lower-case": "1.2.9"
+        "text-lower-case": "^1.2.11"
       }
     },
     "node_modules/text-param-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-param-case/-/text-param-case-1.2.9.tgz",
-      "integrity": "sha512-nR/Ju9amY3aQS1en2CUCgqN/ZiZIVdDyjlJ3xX5J92ChBevGuA4o9K10fh3JGMkbzK97Vcb+bWQJ4Q+Svz+GyQ==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-param-case/-/text-param-case-1.2.11.tgz",
+      "integrity": "sha512-3EMMAMLSz/mJXOnATNnrS+dZAvghpq09VhOVYDOkUnbm5zlYc6iU5AZOKVDpiAVVllQ9P1h5IKVZzsEYrdIRGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-dot-case": "1.2.9"
+        "text-dot-case": "^1.2.11"
       }
     },
     "node_modules/text-pascal-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-pascal-case/-/text-pascal-case-1.2.9.tgz",
-      "integrity": "sha512-o6ZxMGjWDTUW54pcghpXes+C2PqbYRMdU5mHrIhueb6z6nq1NueiIOeCUdrSjN/3wXfhCmnFjK7/d9aRGZNqSg==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-pascal-case/-/text-pascal-case-1.2.11.tgz",
+      "integrity": "sha512-BNhQ1O/g/Q4dH5gPyLIJLDLDknl2dipBwV629ScsiZCKJaCLGXYhTXp23rp9Htg3O5OSSsiU3mqDKq+pBmwTSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9"
+        "text-no-case": "^1.2.11"
       }
     },
     "node_modules/text-path-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-path-case/-/text-path-case-1.2.9.tgz",
-      "integrity": "sha512-s8cJ6r5TkJp5ticXMgtxd7f12odEN4d1CfX5u4aoz6jcUtBR2lDqzIhVimkqWFMJ4UKPSrmilUha8Xc2BPi+ow==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-path-case/-/text-path-case-1.2.11.tgz",
+      "integrity": "sha512-FsJU4BmMdtLtmnBK/XRJPqTwLF8yFiTEClHjxlQjSAG5Xt9R4p6D1WNaM1CI2dG5Lr4rsFM4jiVC620m0AsRbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-dot-case": "1.2.9"
+        "text-dot-case": "^1.2.11"
       }
     },
     "node_modules/text-sentence-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-sentence-case/-/text-sentence-case-1.2.9.tgz",
-      "integrity": "sha512-/G/Yi5kZfUa1edFRV4O3lGZAkbDZTFvlwW8CYfH7szkEGe2k2MYEYbOyAkGRVQEGV6V6JiuUAaP3VS9c1tB6nQ==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-sentence-case/-/text-sentence-case-1.2.11.tgz",
+      "integrity": "sha512-ApiVsvdLy+Wb8x7mZRVuoy8VO12jJ22G2djVM3ZZbUhXVIkqGgHxmiXRwdhRPoWGojK9n53m7jviJgBVNdRn+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9",
-        "text-upper-case-first": "1.2.9"
+        "text-no-case": "^1.2.11",
+        "text-upper-case-first": "^1.2.11"
       }
     },
     "node_modules/text-snake-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-snake-case/-/text-snake-case-1.2.9.tgz",
-      "integrity": "sha512-+ZrqK19ynF/TLQZ7ynqVrL2Dy04uu9syYZwsm8PhzUdsY3XrwPy6QiRqhIEFqhyWbShPcfyfmheer5UEQqFxlw==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-snake-case/-/text-snake-case-1.2.11.tgz",
+      "integrity": "sha512-NOEQvjyyVABB41SS8dUx423Y6hWS+Z4TrAAJg1xzCkOD3q9y0JtdJjCvCA1FWI8oDu+HiIOp/N446uDM8j54XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-dot-case": "1.2.9"
+        "text-dot-case": "^1.2.11"
       }
     },
     "node_modules/text-swap-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-swap-case/-/text-swap-case-1.2.9.tgz",
-      "integrity": "sha512-g5fp12ldktYKK9wdHRMvvtSCQrZYNv/D+ZGLumDsvAY4q9T5bCMO2IWMkIP1F5gVQrysdHH6Xv877P/pjUq1iw==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-swap-case/-/text-swap-case-1.2.11.tgz",
+      "integrity": "sha512-PBmC5xvZdDZ4suikydpeXH0s4JV2XHelMj9/OEXEbA3oLpdV2A+B4BspVDWVw7C2Gi5eCareqk/7EE8I1/WwgQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/text-title-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-title-case/-/text-title-case-1.2.9.tgz",
-      "integrity": "sha512-RAtC9cdmPp41ns5/HXZBsaQg71BsHT7uZpj2ojTtuFa8o2dNuRYYOrSmy5YdLRIAJQ6WK5hQVpV3jHuq7a+4Tw==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-title-case/-/text-title-case-1.2.11.tgz",
+      "integrity": "sha512-V1GZy0XlqdkYUQm0tqm1jqtYlXJqFVMreBCTUReOaz8d/JbozTSpZrcakIeV8+1bN7LsvfhPFhA5zREiax6YIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "text-no-case": "1.2.9",
-        "text-upper-case-first": "1.2.9"
+        "text-no-case": "^1.2.11",
+        "text-upper-case-first": "^1.2.11"
       }
     },
     "node_modules/text-upper-case": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-upper-case/-/text-upper-case-1.2.9.tgz",
-      "integrity": "sha512-K/0DNT7a4z8eah2spARtoJllTZyrNTo6Uc0ujhN/96Ir9uJ/slpahfs13y46H9osL3daaLl3O7iXOkW4xtX6bg==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-upper-case/-/text-upper-case-1.2.11.tgz",
+      "integrity": "sha512-BfTL7yB1YIRlVGNdZUvno013hOq2cRs07fDR2ApppOXRDuKrEmsLDEY82xXlDzQHELp0jexqkI+NeyPIl6MtMw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/text-upper-case-first": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/text-upper-case-first/-/text-upper-case-first-1.2.9.tgz",
-      "integrity": "sha512-wEDD1B6XqJmEV+xEnBJd+2sBCHZ+7fvA/8Rv/o8+dAsp05YWjYP/kjB8sPH6zqzW0s6jtehIg4IlcKjcYxk2CQ==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/text-upper-case-first/-/text-upper-case-first-1.2.11.tgz",
+      "integrity": "sha512-vgfbwKo8TEJbRsapR9LWWvIJRnv8u9aXVa6cyYOAQQmurCx54Cnt59x5fKdiq+hFaBJ51AbzCgMpbP3p65/pHQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -8368,14 +8394,14 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
+      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -8403,9 +8429,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8540,14 +8566,13 @@
       "license": "0BSD"
     },
     "node_modules/tsx": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz",
-      "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.0.tgz",
+      "integrity": "sha512-eUdUIaCr963q2h5u3+QwvYp0+eqPvn+egeqZUm0hwERCqqx1E3kK5ehbGCvqSE5MQAULr67ww0cA3jKc3YkM1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "~0.27.0",
-        "get-tsconfig": "^4.7.5"
+        "esbuild": "~0.28.0"
       },
       "bin": {
         "tsx": "dist/cli.mjs"
@@ -8560,9 +8585,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
-      "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
+      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
       "cpu": [
         "ppc64"
       ],
@@ -8577,9 +8602,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/android-arm": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
-      "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
+      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
       "cpu": [
         "arm"
       ],
@@ -8594,9 +8619,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/android-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
-      "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
+      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
       "cpu": [
         "arm64"
       ],
@@ -8611,9 +8636,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/android-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
-      "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
+      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
       "cpu": [
         "x64"
       ],
@@ -8628,9 +8653,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
-      "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
+      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
       "cpu": [
         "arm64"
       ],
@@ -8645,9 +8670,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
-      "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
+      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
       ],
@@ -8662,9 +8687,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
-      "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
       "cpu": [
         "arm64"
       ],
@@ -8679,9 +8704,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
-      "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
       "cpu": [
         "x64"
       ],
@@ -8696,9 +8721,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-arm": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
-      "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
+      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
       "cpu": [
         "arm"
       ],
@@ -8713,9 +8738,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
-      "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
+      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
       "cpu": [
         "arm64"
       ],
@@ -8730,9 +8755,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
-      "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
+      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
       "cpu": [
         "ia32"
       ],
@@ -8747,9 +8772,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
-      "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
+      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
       "cpu": [
         "loong64"
       ],
@@ -8764,9 +8789,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
-      "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
+      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
       "cpu": [
         "mips64el"
       ],
@@ -8781,9 +8806,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
-      "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
+      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
       "cpu": [
         "ppc64"
       ],
@@ -8798,9 +8823,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
-      "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
+      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
       "cpu": [
         "riscv64"
       ],
@@ -8815,9 +8840,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
-      "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
+      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
       "cpu": [
         "s390x"
       ],
@@ -8832,9 +8857,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
-      "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
+      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
       "cpu": [
         "x64"
       ],
@@ -8849,9 +8874,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
-      "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
       "cpu": [
         "arm64"
       ],
@@ -8866,9 +8891,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
-      "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
       "cpu": [
         "x64"
       ],
@@ -8883,9 +8908,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
-      "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
       "cpu": [
         "arm64"
       ],
@@ -8900,9 +8925,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
-      "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
       "cpu": [
         "x64"
       ],
@@ -8917,9 +8942,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
-      "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
+      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
       "cpu": [
         "arm64"
       ],
@@ -8934,9 +8959,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
-      "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
+      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
       "cpu": [
         "x64"
       ],
@@ -8951,9 +8976,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
-      "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
+      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
       "cpu": [
         "arm64"
       ],
@@ -8968,9 +8993,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
-      "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
+      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
       "cpu": [
         "ia32"
       ],
@@ -8985,9 +9010,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/win32-x64": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
-      "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
+      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
       "cpu": [
         "x64"
       ],
@@ -9002,9 +9027,9 @@
       }
     },
     "node_modules/tsx/node_modules/esbuild": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
-      "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
+      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -9015,32 +9040,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.2",
-        "@esbuild/android-arm": "0.27.2",
-        "@esbuild/android-arm64": "0.27.2",
-        "@esbuild/android-x64": "0.27.2",
-        "@esbuild/darwin-arm64": "0.27.2",
-        "@esbuild/darwin-x64": "0.27.2",
-        "@esbuild/freebsd-arm64": "0.27.2",
-        "@esbuild/freebsd-x64": "0.27.2",
-        "@esbuild/linux-arm": "0.27.2",
-        "@esbuild/linux-arm64": "0.27.2",
-        "@esbuild/linux-ia32": "0.27.2",
-        "@esbuild/linux-loong64": "0.27.2",
-        "@esbuild/linux-mips64el": "0.27.2",
-        "@esbuild/linux-ppc64": "0.27.2",
-        "@esbuild/linux-riscv64": "0.27.2",
-        "@esbuild/linux-s390x": "0.27.2",
-        "@esbuild/linux-x64": "0.27.2",
-        "@esbuild/netbsd-arm64": "0.27.2",
-        "@esbuild/netbsd-x64": "0.27.2",
-        "@esbuild/openbsd-arm64": "0.27.2",
-        "@esbuild/openbsd-x64": "0.27.2",
-        "@esbuild/openharmony-arm64": "0.27.2",
-        "@esbuild/sunos-x64": "0.27.2",
-        "@esbuild/win32-arm64": "0.27.2",
-        "@esbuild/win32-ia32": "0.27.2",
-        "@esbuild/win32-x64": "0.27.2"
+        "@esbuild/aix-ppc64": "0.28.1",
+        "@esbuild/android-arm": "0.28.1",
+        "@esbuild/android-arm64": "0.28.1",
+        "@esbuild/android-x64": "0.28.1",
+        "@esbuild/darwin-arm64": "0.28.1",
+        "@esbuild/darwin-x64": "0.28.1",
+        "@esbuild/freebsd-arm64": "0.28.1",
+        "@esbuild/freebsd-x64": "0.28.1",
+        "@esbuild/linux-arm": "0.28.1",
+        "@esbuild/linux-arm64": "0.28.1",
+        "@esbuild/linux-ia32": "0.28.1",
+        "@esbuild/linux-loong64": "0.28.1",
+        "@esbuild/linux-mips64el": "0.28.1",
+        "@esbuild/linux-ppc64": "0.28.1",
+        "@esbuild/linux-riscv64": "0.28.1",
+        "@esbuild/linux-s390x": "0.28.1",
+        "@esbuild/linux-x64": "0.28.1",
+        "@esbuild/netbsd-arm64": "0.28.1",
+        "@esbuild/netbsd-x64": "0.28.1",
+        "@esbuild/openbsd-arm64": "0.28.1",
+        "@esbuild/openbsd-x64": "0.28.1",
+        "@esbuild/openharmony-arm64": "0.28.1",
+        "@esbuild/sunos-x64": "0.28.1",
+        "@esbuild/win32-arm64": "0.28.1",
+        "@esbuild/win32-ia32": "0.28.1",
+        "@esbuild/win32-x64": "0.28.1"
       }
     },
     "node_modules/type-fest": {
@@ -9057,31 +9082,48 @@
       }
     },
     "node_modules/type-is": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz",
+      "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==",
       "license": "MIT",
       "dependencies": {
-        "content-type": "^1.0.5",
+        "content-type": "^2.0.0",
         "media-typer": "^1.1.0",
         "mime-types": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/type-is/node_modules/content-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz",
+      "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/typedoc": {
-      "version": "0.28.16",
-      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.16.tgz",
-      "integrity": "sha512-x4xW77QC3i5DUFMBp0qjukOTnr/sSg+oEs86nB3LjDslvAmwe/PUGDWbe3GrIqt59oTqoXK5GRK9tAa0sYMiog==",
+      "version": "0.28.20",
+      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.20.tgz",
+      "integrity": "sha512-uSKqkh8Cr48vllnEy+jdaAgOeR6Y+QCBW7usgUsKj7gJEfR7stw9U/fE49LBnj2tPRKPY0c0EBJSWe9Appmplg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@gerrit0/mini-shiki": "^3.17.0",
+        "@gerrit0/mini-shiki": "^3.23.0",
         "lunr": "^2.3.9",
-        "markdown-it": "^14.1.0",
-        "minimatch": "^9.0.5",
-        "yaml": "^2.8.1"
+        "markdown-it": "^14.3.0",
+        "minimatch": "^10.2.5",
+        "yaml": "^2.9.0"
       },
       "bin": {
         "typedoc": "bin/typedoc"
@@ -9091,7 +9133,7 @@
         "pnpm": ">= 10"
       },
       "peerDependencies": {
-        "typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x"
+        "typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x || 6.0.x"
       }
     },
     "node_modules/typedoc-github-theme": {
@@ -9107,32 +9149,6 @@
         "typedoc": "~0.28.0"
       }
     },
-    "node_modules/typedoc/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/typedoc/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
@@ -9162,9 +9178,9 @@
       "license": "MIT"
     },
     "node_modules/undici": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.7.tgz",
-      "integrity": "sha512-H/nlJ/h0ggGC+uRL3ovD+G0i4bqhvsDOpbDv7At5eFLlj2b41L8QliGbnl2H7SnDiYhENphh1tQFJZf+MyfLsQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz",
+      "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
@@ -9227,9 +9243,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz",
-      "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz",
+      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9302,9 +9318,9 @@
       }
     },
     "node_modules/vite-plugin-singlefile": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-singlefile/-/vite-plugin-singlefile-2.3.0.tgz",
-      "integrity": "sha512-DAcHzYypM0CasNLSz/WG0VdKOCxGHErfrjOoyIPiNxTPTGmO6rRD/te93n1YL/s+miXq66ipF1brMBikf99c6A==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/vite-plugin-singlefile/-/vite-plugin-singlefile-2.3.3.tgz",
+      "integrity": "sha512-XVnGH0QzbOa8fxRSsHdCarVN1BSBXNi7uLMQYlrGRN5apdHkk62XQWRJhVever0lnfuyBkwn+kvVChdm/OoOUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9314,8 +9330,13 @@
         "node": ">18.0.0"
       },
       "peerDependencies": {
-        "rollup": "^4.44.1",
-        "vite": "^5.4.11 || ^6.0.0 || ^7.0.0"
+        "rollup": "^4.59.0",
+        "vite": "^5.4.21 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
     "node_modules/vite-plugin-solid": {
@@ -9380,9 +9401,9 @@
       }
     },
     "node_modules/vite/node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9393,9 +9414,9 @@
       }
     },
     "node_modules/vitefu": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.1.tgz",
-      "integrity": "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.3.tgz",
+      "integrity": "sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==",
       "dev": true,
       "license": "MIT",
       "workspaces": [
@@ -9404,7 +9425,7 @@
         "tests/projects/workspace/packages/*"
       ],
       "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "vite": {
@@ -9413,16 +9434,16 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.27.tgz",
-      "integrity": "sha512-aJ/UtoEyFySPBGarREmN4z6qNKpbEguYHMmXSiOGk69czc+zhs0NF6tEFrY8TZKAl8N/LYAkd4JHVd5E/AsSmw==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.39.tgz",
+      "integrity": "sha512-xmZCYabFGcirU8r0fTuvl/LICc1OU620rnqepaJDL/a141ZigkG7AyaxQLdqJ02ZRYzWe6YPaDHeQx7MfknQfA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.27",
-        "@vue/compiler-sfc": "3.5.27",
-        "@vue/runtime-dom": "3.5.27",
-        "@vue/server-renderer": "3.5.27",
-        "@vue/shared": "3.5.27"
+        "@vue/compiler-dom": "3.5.39",
+        "@vue/compiler-sfc": "3.5.39",
+        "@vue/runtime-dom": "3.5.39",
+        "@vue/server-renderer": "3.5.39",
+        "@vue/shared": "3.5.39"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -9555,9 +9576,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz",
+      "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -9606,21 +9627,22 @@
       "license": "MIT"
     },
     "node_modules/zod": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz",
-      "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
+      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
     "node_modules/zod-to-json-schema": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz",
-      "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==",
+      "version": "3.25.2",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz",
+      "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==",
       "license": "ISC",
+      "peer": true,
       "peerDependencies": {
-        "zod": "^3.25 || ^4"
+        "zod": "^3.25.28 || ^4"
       }
     }
   }
diff --git a/package.json b/package.json
index 8c6ead57b..ffa0925e1 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,9 @@
   "author": "Olivier Chafik",
   "devDependencies": {
     "@boneskull/typedoc-plugin-mermaid": "^0.2.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/core": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "@playwright/test": "1.57.0",
     "@types/bun": "^1.3.2",
     "@types/node": "20.19.27",
@@ -108,7 +110,9 @@
     "zod": "^4.1.13"
   },
   "peerDependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/client": "2.0.0-beta.3",
+    "@modelcontextprotocol/core": "2.0.0-beta.3",
+    "@modelcontextprotocol/server": "2.0.0-beta.3",
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "zod": "^3.25.0 || ^4.0.0"
diff --git a/plugins/mcp-apps/skills/convert-web-app/SKILL.md b/plugins/mcp-apps/skills/convert-web-app/SKILL.md
index 5db2d946c..7c40a8ce5 100644
--- a/plugins/mcp-apps/skills/convert-web-app/SKILL.md
+++ b/plugins/mcp-apps/skills/convert-web-app/SKILL.md
@@ -115,7 +115,7 @@ 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/server @modelcontextprotocol/node zod
 npm install -D tsx vite vite-plugin-singlefile
 ```
 
@@ -126,8 +126,8 @@ Use `npm install` to add dependencies rather than manually writing version numbe
 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";
diff --git a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md
index 5bd12191d..9f86b73a3 100644
--- a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md
+++ b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md
@@ -110,7 +110,7 @@ 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/server @modelcontextprotocol/node @modelcontextprotocol/express zod express cors
 npm install -D typescript vite vite-plugin-singlefile concurrently cross-env @types/node @types/express @types/cors
 ```
 
diff --git a/scripts/generate-schemas.ts b/scripts/generate-schemas.ts
index 109f35247..b56e20545 100644
--- a/scripts/generate-schemas.ts
+++ b/scripts/generate-schemas.ts
@@ -12,7 +12,7 @@
  *
  * ts-to-zod generates `import { z } from "zod"`. We rewrite this to
  * `import { z } from "zod/v4"` because the generated schemas compose with
- * schemas imported from `@modelcontextprotocol/sdk/types.js`, which the SDK
+ * schemas imported from `@modelcontextprotocol/core`, which the v2 SDK
  * constructs via `zod/v4`. Mixing schemas from the v3 and v4 APIs at runtime
  * fails with errors like `keyValidator._parse is not a function` (v3 internals
  * calling into v4 objects, or vice versa). The `zod/v4` subpath is exported by
@@ -22,10 +22,24 @@
  *
  * **Problem**: ts-to-zod cannot resolve types imported from external packages.
  * When it encounters types like `ContentBlock`, `CallToolResult`, `Implementation`,
- * `RequestId`, and `Tool` from `@modelcontextprotocol/sdk`, it generates `z.any()`
- * as a placeholder.
+ * `RequestId`, and `Tool` from `@modelcontextprotocol/client`, it generates
+ * `z.any()` as a placeholder.
  *
- * **Solution**: Import the schemas from MCP SDK and remove the z.any() placeholders.
+ * **Solution**: Import the matching schemas from `@modelcontextprotocol/core`
+ * (v2 public Zod-schema package) and remove the z.any() placeholders. Cast each
+ * imported schema to `z.ZodType<T>` using the matching TypeScript types from
+ * `@modelcontextprotocol/client`. Without the cast, core's inferred shapes
+ * reference `JSONObject` (and similar) that TypeScript cannot name when emitting
+ * `.d.ts` for composed schemas (`TS4023`).
+ *
+ * TODO(sdk-v2): remove the `z.ZodType<T>` re-binding once
+ * `@modelcontextprotocol/core` exports its JSON type names
+ * (`JSONObject` / `JSONValue` / `JSONArray`) — they are declared in core's
+ * `.d.mts` but not exported, which is what makes them unnameable downstream.
+ * `@modelcontextprotocol/client` already exports the same names, so this is a
+ * small upstream fix; an issue draft is tracked in the ext-apps v2 migration
+ * notes. If upstream declines, revisit this layer's architecture (e.g. emit
+ * param-level schemas locally instead of composing core's).
  *
  * ### 3. Index Signatures (`z.record().and()` → `z.object().passthrough()`)
  *
@@ -69,18 +83,28 @@ const SCHEMA_TEST_OUTPUT_FILE = join(GENERATED_DIR, "schema.test.ts");
 const JSON_SCHEMA_OUTPUT_FILE = join(GENERATED_DIR, "schema.json");
 
 /**
- * External types from MCP SDK that ts-to-zod can't resolve.
- * With PascalCase naming (via getSchemaName), generated placeholders match MCP SDK exports.
+ * External types from MCP that ts-to-zod can't resolve.
+ * With PascalCase naming (via getSchemaName), generated placeholders match
+ * `@modelcontextprotocol/core` exports. Schema values come from core; TypeScript
+ * types come from `@modelcontextprotocol/client` (same v2 surface as
+ * `spec.types.ts`). Schemas are cast to `z.ZodType<T>` so declaration emit
+ * does not try to name core-internal aliases like `JSONObject` (TS4023).
  */
 const EXTERNAL_TYPE_SCHEMAS = [
-  "ContentBlockSchema",
-  "CallToolResultSchema",
-  "EmbeddedResourceSchema",
-  "ImplementationSchema",
-  "RequestIdSchema",
-  "ResourceLinkSchema",
-  "ToolSchema",
-];
+  { schema: "ContentBlockSchema", type: "ContentBlock" },
+  { schema: "CallToolResultSchema", type: "CallToolResult" },
+  { schema: "EmbeddedResourceSchema", type: "EmbeddedResource" },
+  { schema: "ImplementationSchema", type: "Implementation" },
+  { schema: "RequestIdSchema", type: "RequestId" },
+  { schema: "ResourceLinkSchema", type: "ResourceLink" },
+  { schema: "ToolSchema", type: "Tool" },
+] as const;
+
+/** Public Zod-schema package for MCP protocol schemas (v2). */
+const MCP_SCHEMA_PACKAGE = "@modelcontextprotocol/core";
+
+/** v2 TypeScript types package — matches imports in spec.types.ts. */
+const MCP_TYPES_PACKAGE = "@modelcontextprotocol/client";
 
 async function main() {
   console.log("🔧 Generating Zod schemas from spec.types.ts...\n");
@@ -161,7 +185,7 @@ async function generateJsonSchema() {
     ) {
       const typeName = name.replace(/Schema$/, "");
       try {
-        // Use unrepresentable: "any" to handle external types (MCP SDK schemas)
+        // Use unrepresentable: "any" to handle external types (MCP core schemas)
         // that can't be directly represented in JSON Schema
         jsonSchema.$defs[typeName] = toJSONSchema(schema as $ZodType, {
           unrepresentable: "any",
@@ -184,20 +208,38 @@ async function generateJsonSchema() {
  * Post-process generated schemas for project compatibility.
  */
 function postProcess(content: string): string {
-  // 1. Rewrite to zod/v4 and add MCP SDK schema imports.
+  // 1. Rewrite to zod/v4 and add MCP core schema imports.
   // zod/v4 aligns with the SDK's own zod import — composing v3 and v4
   // schema instances throws at parse time. See header comment for details.
-  const mcpImports = EXTERNAL_TYPE_SCHEMAS.join(",\n  ");
+  //
+  // Import schemas from @modelcontextprotocol/core, then re-bind as
+  // z.ZodType<T> with T from @modelcontextprotocol/client so .d.ts emit does
+  // not try to name core-internal aliases (JSONObject → TS4023).
+  const typeImports = EXTERNAL_TYPE_SCHEMAS.map((e) => e.type).join(",\n  ");
+  const schemaImports = EXTERNAL_TYPE_SCHEMAS.map(
+    (e) => `${e.schema} as ${e.schema}FromCore`,
+  ).join(",\n  ");
+  const schemaBindings = EXTERNAL_TYPE_SCHEMAS.map(
+    (e) =>
+      `const ${e.schema}: z.ZodType<${e.type}> = ${e.schema}FromCore as z.ZodType<${e.type}>;`,
+  ).join("\n");
+
   content = content.replace(
     'import { z } from "zod";',
     `import { z } from "zod/v4";
+import type {
+  ${typeImports},
+} from "${MCP_TYPES_PACKAGE}";
 import {
-  ${mcpImports},
-} from "@modelcontextprotocol/sdk/types.js";`,
+  ${schemaImports},
+} from "${MCP_SCHEMA_PACKAGE}";
+
+${schemaBindings}
+`,
   );
 
-  // 2. Remove z.any() placeholders for external types (now imported from MCP SDK)
-  for (const schema of EXTERNAL_TYPE_SCHEMAS) {
+  // 2. Remove z.any() placeholders for external types (now imported from MCP core)
+  for (const { schema } of EXTERNAL_TYPE_SCHEMAS) {
     content = content.replace(
       new RegExp(`(?:export )?const ${schema} = z\\.any\\(\\);\\n?`, "g"),
       "",
@@ -213,7 +255,7 @@ import {
   content = content.replace(
     "// Generated by ts-to-zod",
     `// Generated by ts-to-zod
-// Post-processed for Zod v3/v4 compatibility and MCP SDK integration
+// Post-processed for Zod v3/v4 compatibility and MCP core schema integration
 // Run: npm run generate:schemas`,
   );
 
diff --git a/scripts/typedoc-plugin-v2-sdk-links.mjs b/scripts/typedoc-plugin-v2-sdk-links.mjs
new file mode 100644
index 000000000..08565a094
--- /dev/null
+++ b/scripts/typedoc-plugin-v2-sdk-links.mjs
@@ -0,0 +1,28 @@
+/**
+ * TypeDoc plugin that resolves {@link} declaration references inherited from
+ * MCP TypeScript SDK v2 declaration comments (e.g. `index.inputRequired` in
+ * `@modelcontextprotocol/server`'s Server.createMessage JSDoc).
+ *
+ * These references are module-local (`index.<symbol>`), so TypeDoc's
+ * `externalSymbolLinkMappings` — which only matches `package!symbol`
+ * references — cannot resolve them. Without this plugin they fail validation
+ * (`--treatValidationWarningsAsErrors`).
+ */
+
+const V2_SDK_DOCS = "https://ts.sdk.modelcontextprotocol.io/v2/";
+
+/** Declaration references, as written in v2 SDK comments, mapped to docs URLs. */
+const KNOWN_V2_REFS = new Map([["index.inputRequired", V2_SDK_DOCS]]);
+
+/**
+ * TypeDoc plugin entry point.
+ * @param {import('typedoc').Application} app
+ */
+export function load(app) {
+  app.converter.addUnknownSymbolResolver((ref) => {
+    const name = ref.symbolReference?.path?.map((p) => p.path).join(".");
+    if (name && KNOWN_V2_REFS.has(name)) {
+      return KNOWN_V2_REFS.get(name);
+    }
+  });
+}
diff --git a/src/app-bridge.examples.ts b/src/app-bridge.examples.ts
index d5dc5bc74..ca37d56c9 100644
--- a/src/app-bridge.examples.ts
+++ b/src/app-bridge.examples.ts
@@ -7,17 +7,12 @@
  * @module
  */
 
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import {
-  CallToolResult,
-  CallToolResultSchema,
-  CreateMessageRequest,
-  CreateMessageResult,
-  ListResourcesResultSchema,
-  ReadResourceResultSchema,
-  ListPromptsResultSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+  Client,
+  type Transport,
+  type CreateMessageRequest,
+  type CreateMessageResult,
+} from "@modelcontextprotocol/client";
 import { AppBridge, PostMessageTransport } from "./app-bridge.js";
 import type { McpUiDisplayMode } from "./types.js";
 
@@ -223,7 +218,6 @@ function AppBridge_oncalltool_forwardToServer(
   bridge.oncalltool = async (params, extra) => {
     return mcpClient.request(
       { method: "tools/call", params },
-      CallToolResultSchema,
       { signal: extra.signal },
     );
   };
@@ -261,7 +255,6 @@ function AppBridge_onlistresources_returnResources(
   bridge.onlistresources = async (params, extra) => {
     return mcpClient.request(
       { method: "resources/list", params },
-      ListResourcesResultSchema,
       { signal: extra.signal },
     );
   };
@@ -279,7 +272,6 @@ function AppBridge_onreadresource_returnResource(
   bridge.onreadresource = async (params, extra) => {
     return mcpClient.request(
       { method: "resources/read", params },
-      ReadResourceResultSchema,
       { signal: extra.signal },
     );
   };
@@ -297,7 +289,6 @@ function AppBridge_onlistprompts_returnPrompts(
   bridge.onlistprompts = async (params, extra) => {
     return mcpClient.request(
       { method: "prompts/list", params },
-      ListPromptsResultSchema,
       { signal: extra.signal },
     );
   };
@@ -444,10 +435,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.test.ts b/src/app-bridge.test.ts
index a4fe1de1e..0a26b5455 100644
--- a/src/app-bridge.test.ts
+++ b/src/app-bridge.test.ts
@@ -1,17 +1,13 @@
 import { describe, it, expect, beforeEach, afterEach, spyOn } from "bun:test";
-import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import type { ServerCapabilities } from "@modelcontextprotocol/sdk/types.js";
+import { InMemoryTransport } from "@modelcontextprotocol/client";
+import type { Client, ServerCapabilities } from "@modelcontextprotocol/client";
 import {
   EmptyResultSchema,
   ListPromptsResultSchema,
   ListResourcesResultSchema,
   ListResourceTemplatesResultSchema,
-  PromptListChangedNotificationSchema,
   ReadResourceResultSchema,
-  ResourceListChangedNotificationSchema,
-  ToolListChangedNotificationSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/core";
 import { z } from "zod/v4";
 
 import { App } from "./app";
@@ -34,11 +30,18 @@ const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
  */
 function createMockClient(
   serverCapabilities: ServerCapabilities = {},
-): Pick<Client, "getServerCapabilities" | "request" | "notification"> {
+): Pick<
+  Client,
+  | "getServerCapabilities"
+  | "request"
+  | "notification"
+  | "setNotificationHandler"
+> {
   return {
     getServerCapabilities: () => serverCapabilities,
     request: async () => ({}) as never,
     notification: async () => {},
+    setNotificationHandler: () => {},
   };
 }
 
@@ -2313,9 +2316,12 @@ describe("App <-> AppBridge integration", () => {
 
     it("sendToolListChanged sends notification to app", async () => {
       const receivedNotifications: unknown[] = [];
-      app.setNotificationHandler(ToolListChangedNotificationSchema, (n) => {
-        receivedNotifications.push(n.params);
-      });
+      app.setNotificationHandler(
+        "notifications/tools/list_changed",
+        (n: { params?: unknown }) => {
+          receivedNotifications.push(n.params);
+        },
+      );
 
       await bridge.connect(bridgeTransport);
       await app.connect(appTransport);
@@ -2328,9 +2334,12 @@ describe("App <-> AppBridge integration", () => {
 
     it("sendResourceListChanged sends notification to app", async () => {
       const receivedNotifications: unknown[] = [];
-      app.setNotificationHandler(ResourceListChangedNotificationSchema, (n) => {
-        receivedNotifications.push(n.params);
-      });
+      app.setNotificationHandler(
+        "notifications/resources/list_changed",
+        (n: { params?: unknown }) => {
+          receivedNotifications.push(n.params);
+        },
+      );
 
       await bridge.connect(bridgeTransport);
       await app.connect(appTransport);
@@ -2343,9 +2352,12 @@ describe("App <-> AppBridge integration", () => {
 
     it("sendPromptListChanged sends notification to app", async () => {
       const receivedNotifications: unknown[] = [];
-      app.setNotificationHandler(PromptListChangedNotificationSchema, (n) => {
-        receivedNotifications.push(n.params);
-      });
+      app.setNotificationHandler(
+        "notifications/prompts/list_changed",
+        (n: { params?: unknown }) => {
+          receivedNotifications.push(n.params);
+        },
+      );
 
       await bridge.connect(bridgeTransport);
       await app.connect(appTransport);
@@ -2758,15 +2770,17 @@ describe("isToolVisibilityAppOnly", () => {
         testHostInfo,
         testHostCapabilities,
       );
+      const TestParams = z.object({});
+      const TestResult = z.object({});
       bridge2.setRequestHandler(
-        // @ts-expect-error — exercising throw path with raw schema
-        { shape: { method: { value: "test/method" } } },
+        "test/method",
+        { params: TestParams, result: TestResult },
         () => ({}),
       );
       expect(() => {
         bridge2.setRequestHandler(
-          // @ts-expect-error — exercising throw path with raw schema
-          { shape: { method: { value: "test/method" } } },
+          "test/method",
+          { params: TestParams, result: TestResult },
           () => ({}),
         );
       }).toThrow(/already registered/);
@@ -2777,9 +2791,11 @@ describe("isToolVisibilityAppOnly", () => {
       app2.addEventListener("toolinput", () => {});
       expect(() => {
         app2.setNotificationHandler(
-          // @ts-expect-error — exercising throw path with raw schema
+          "ui/notifications/tool-input",
           {
-            shape: { method: { value: "ui/notifications/tool-input" } },
+            params: z.object({
+              arguments: z.record(z.string(), z.unknown()).optional(),
+            }),
           },
           () => {},
         );
diff --git a/src/app-bridge.ts b/src/app-bridge.ts
index 23383c40f..a8050f3a7 100644
--- a/src/app-bridge.ts
+++ b/src/app-bridge.ts
@@ -1,58 +1,54 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import {
+  Client,
+  type Implementation,
+  type RequestOptions,
+  type Transport,
+} from "@modelcontextprotocol/client";
+import { Server, type ServerOptions } from "@modelcontextprotocol/server";
+import type {
   CallToolRequest,
-  CallToolRequestSchema,
   CallToolResult,
-  CallToolResultSchema,
   CreateMessageRequest,
-  CreateMessageRequestSchema,
   CreateMessageResult,
   CreateMessageResultWithTools,
   EmptyResult,
-  Implementation,
   ListPromptsRequest,
-  ListPromptsRequestSchema,
   ListPromptsResult,
-  ListPromptsResultSchema,
   ListResourcesRequest,
-  ListResourcesRequestSchema,
   ListResourcesResult,
-  ListResourcesResultSchema,
   ListResourceTemplatesRequest,
-  ListResourceTemplatesRequestSchema,
   ListResourceTemplatesResult,
-  ListResourceTemplatesResultSchema,
   ListToolsRequest,
-  ListToolsRequestSchema,
-  ListToolsResultSchema,
+  ListToolsResult,
   LoggingMessageNotification,
-  LoggingMessageNotificationSchema,
   PingRequest,
-  PingRequestSchema,
   PromptListChangedNotification,
-  PromptListChangedNotificationSchema,
   ReadResourceRequest,
-  ReadResourceRequestSchema,
   ReadResourceResult,
-  ReadResourceResultSchema,
   ResourceListChangedNotification,
-  ResourceListChangedNotificationSchema,
-  Tool,
   ToolListChangedNotification,
-  ToolListChangedNotificationSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "./types";
+import {
+  CallToolResultSchema,
+  EmptyResultSchema,
+  ListPromptsResultSchema,
+  ListResourcesResultSchema,
+  ListResourceTemplatesResultSchema,
+  ListToolsResultSchema,
+  LoggingMessageNotificationSchema,
+  ReadResourceResultSchema,
+} from "@modelcontextprotocol/core";
 import {
-  Protocol,
-  ProtocolOptions,
-  RequestOptions,
-} from "@modelcontextprotocol/sdk/shared/protocol.js";
-import { ProtocolWithEvents } from "./events";
+  MethodClaimRegistry,
+  NotificationEventEmitter,
+  methodOf,
+  paramsSchemaOf,
+  toRequestHandlerExtra,
+  warnIfRequestHandlerReplaced,
+  type RequestHandlerExtra,
+} from "./events";
 
 import {
-  type AppNotification,
-  type AppRequest,
-  type AppResult,
   type McpUiSandboxResourceReadyNotification,
   type McpUiSizeChangedNotification,
   type McpUiToolCancelledNotification,
@@ -71,15 +67,19 @@ import {
   McpUiInitializeRequest,
   McpUiInitializeRequestSchema,
   McpUiInitializeResult,
+  McpUiInitializeResultSchema,
   McpUiMessageRequest,
   McpUiMessageRequestSchema,
   McpUiMessageResult,
+  McpUiMessageResultSchema,
   McpUiOpenLinkRequest,
   McpUiOpenLinkRequestSchema,
   McpUiOpenLinkResult,
+  McpUiOpenLinkResultSchema,
   McpUiDownloadFileRequest,
   McpUiDownloadFileRequestSchema,
   McpUiDownloadFileResult,
+  McpUiDownloadFileResultSchema,
   McpUiResourceTeardownRequest,
   McpUiResourceTeardownResultSchema,
   McpUiRequestTeardownNotification,
@@ -90,6 +90,7 @@ import {
   McpUiRequestDisplayModeRequest,
   McpUiRequestDisplayModeRequestSchema,
   McpUiRequestDisplayModeResult,
+  McpUiRequestDisplayModeResultSchema,
   McpUiResourcePermissions,
   McpUiToolMeta,
 } from "./types";
@@ -122,14 +123,16 @@ export { PostMessageTransport } from "./message-transport";
  * });
  * ```
  */
-export function getToolUiResourceUri(tool: Partial<Tool>): string | undefined {
+export function getToolUiResourceUri(tool: object): string | undefined {
   // Try new nested format first: _meta.ui.resourceUri
-  const uiMeta = tool._meta?.ui as McpUiToolMeta | undefined;
+  const uiMeta = (tool as { _meta?: { ui?: McpUiToolMeta } })._meta?.ui;
   let uri: unknown = uiMeta?.resourceUri;
 
   // Fall back to deprecated flat format: _meta["ui/resourceUri"]
   if (uri === undefined) {
-    uri = tool._meta?.[RESOURCE_URI_META_KEY];
+    uri = (tool as { _meta?: Record<string, unknown> })._meta?.[
+      RESOURCE_URI_META_KEY
+    ];
   }
 
   if (typeof uri === "string" && uri.startsWith("ui://")) {
@@ -146,8 +149,8 @@ export function getToolUiResourceUri(tool: Partial<Tool>): string | undefined {
  * @param tool - Tool object with visibility metadata
  * @returns True if the tool is visible to the model only, false otherwise
  */
-export function isToolVisibilityModelOnly(tool: Partial<Tool>): boolean {
-  const uiMeta = tool._meta?.ui as McpUiToolMeta | undefined;
+export function isToolVisibilityModelOnly(tool: object): boolean {
+  const uiMeta = (tool as { _meta?: { ui?: McpUiToolMeta } })._meta?.ui;
   const visibility = uiMeta?.visibility;
   if (!visibility) return false;
   if (visibility.length === 1 && visibility[0] === "model") return true;
@@ -160,8 +163,8 @@ export function isToolVisibilityModelOnly(tool: Partial<Tool>): boolean {
  * @param tool - Tool object with visibility metadata
  * @returns True if the tool is visible to the app only, false otherwise
  */
-export function isToolVisibilityAppOnly(tool: Partial<Tool>): boolean {
-  const uiMeta = tool._meta?.ui as McpUiToolMeta | undefined;
+export function isToolVisibilityAppOnly(tool: object): boolean {
+  const uiMeta = (tool as { _meta?: { ui?: McpUiToolMeta } })._meta?.ui;
   const visibility = uiMeta?.visibility;
   if (!visibility) return false;
   if (visibility.length === 1 && visibility[0] === "app") return true;
@@ -203,10 +206,10 @@ export function buildAllowAttribute(
  *
  * @property hostContext - Optional initial host context to provide to the view
  *
- * @see `ProtocolOptions` from @modelcontextprotocol/sdk for available options
+ * @see `ServerOptions` from @modelcontextprotocol/server for available options
  * @see {@link McpUiHostContext `McpUiHostContext`} for the hostContext structure
  */
-export type HostOptions = ProtocolOptions & {
+export type HostOptions = ServerOptions & {
   hostContext?: McpUiHostContext;
 };
 
@@ -227,10 +230,6 @@ export const SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION];
  *
  * @internal
  */
-type RequestHandlerExtra = Parameters<
-  Parameters<AppBridge["setRequestHandler"]>[1]
->[1];
-
 /**
  * Maps DOM-style event names to their notification `params` types.
  *
@@ -303,53 +302,13 @@ export type AppBridgeEventMap = {
  * await bridge.connect(transport);
  * ```
  */
-export class AppBridge extends ProtocolWithEvents<
-  AppRequest,
-  AppNotification,
-  AppResult,
-  AppBridgeEventMap
-> {
+export class AppBridge extends Server {
   private _appCapabilities?: McpUiAppCapabilities;
   private _hostContext: McpUiHostContext = {};
   private _appInfo?: Implementation;
   private _initializedReceived = false;
-
-  /**
-   * Wrap every handler registered via `replaceRequestHandler` with a check
-   * that the View has sent `ui/notifications/initialized`. Warns (never
-   * throws) so lenient hosts keep working while still surfacing the
-   * misordering that leaves strict hosts with a permanently hidden iframe.
-   * `ui/initialize` and `ping` use `setRequestHandler` directly and are
-   * intentionally exempt.
-   *
-   * @see {@link https://github.com/anthropics/claude-ai-mcp/issues/149 claude-ai-mcp#149}
-   */
-  private _baseReplaceRequestHandler = this.replaceRequestHandler;
-  protected override replaceRequestHandler: Protocol<
-    AppRequest,
-    AppNotification,
-    AppResult
-  >["setRequestHandler"] = (schema, handler) => {
-    this._baseReplaceRequestHandler(schema, (request, extra) => {
-      if (!this._initializedReceived) {
-        console.warn(
-          `[ext-apps] AppBridge received '${request.method}' before ` +
-            `ui/notifications/initialized. The View is calling host ` +
-            `methods before completing the handshake; it should await ` +
-            `app.connect() first.`,
-        );
-      }
-      return handler(request, extra);
-    });
-  };
-
-  protected readonly eventSchemas = {
-    sizechange: McpUiSizeChangedNotificationSchema,
-    sandboxready: McpUiSandboxProxyReadyNotificationSchema,
-    initialized: McpUiInitializedNotificationSchema,
-    requestteardown: McpUiRequestTeardownNotificationSchema,
-    loggingmessage: LoggingMessageNotificationSchema,
-  };
+  private readonly _claims = new MethodClaimRegistry();
+  private readonly _events!: NotificationEventEmitter<AppBridgeEventMap>;
 
   /**
    * Create a new AppBridge instance.
@@ -384,40 +343,222 @@ export class AppBridge extends ProtocolWithEvents<
    * };
    * ```
    */
+  /** Host UI capabilities (openLinks, serverTools, …) — distinct from Server._capabilities. */
+  private _hostCapabilities: McpUiHostCapabilities;
+
   constructor(
     private _client: Client | null,
     private _hostInfo: Implementation,
-    private _capabilities: McpUiHostCapabilities,
+    hostCapabilities: McpUiHostCapabilities,
     options?: HostOptions,
   ) {
-    super(options);
+    const { hostContext, ...serverOptions } = options ?? {};
+    // AppBridge proxies tools/resources/prompts/logging between view and MCP
+    // server. Declare the corresponding Server capabilities so v2's
+    // assertRequestHandlerCapability / assertNotificationCapability allow
+    // handler registration and list_changed notifications. (v1 AppBridge
+    // stubbed these checks as no-ops.)
+    // NOTE: must not use a constructor param named `_capabilities` — that
+    // would overwrite Server's MCP capability store.
+    super(_hostInfo, {
+      ...serverOptions,
+      capabilities: {
+        tools: { listChanged: true },
+        resources: { listChanged: true, subscribe: true },
+        prompts: { listChanged: true },
+        logging: {},
+        ...serverOptions.capabilities,
+      },
+    });
+    this._hostCapabilities = hostCapabilities;
+
+    // Server declares `oninitialized` as a class field (own data property).
+    // Delete it so AppBridge's prototype getter/setter for
+    // `ui/notifications/initialized` is not shadowed.
+    delete (this as { oninitialized?: unknown }).oninitialized;
+    Object.defineProperty(this, "oninitialized", {
+      get: () => this.getEventHandler("initialized"),
+      set: (
+        callback:
+          | ((params: McpUiInitializedNotification["params"]) => void)
+          | undefined,
+      ) => {
+        this.setEventHandler("initialized", callback);
+      },
+      enumerable: true,
+      configurable: true,
+    });
+
+    this._events = new NotificationEventEmitter<AppBridgeEventMap>(
+      {
+        sizechange: {
+          method: methodOf(McpUiSizeChangedNotificationSchema),
+          params: paramsSchemaOf(McpUiSizeChangedNotificationSchema),
+        },
+        sandboxready: {
+          method: methodOf(McpUiSandboxProxyReadyNotificationSchema),
+          params: paramsSchemaOf(McpUiSandboxProxyReadyNotificationSchema),
+        },
+        initialized: {
+          method: methodOf(McpUiInitializedNotificationSchema),
+          params: paramsSchemaOf(McpUiInitializedNotificationSchema),
+        },
+        requestteardown: {
+          method: methodOf(McpUiRequestTeardownNotificationSchema),
+          params: paramsSchemaOf(McpUiRequestTeardownNotificationSchema),
+        },
+        loggingmessage: {
+          method: methodOf(LoggingMessageNotificationSchema),
+          params: paramsSchemaOf(LoggingMessageNotificationSchema),
+        },
+      },
+      (method, paramsSchema, dispatch) => {
+        this._claims.claim(method);
+        Server.prototype.setNotificationHandler.call(
+          this,
+          method,
+          { params: paramsSchema },
+          (params: unknown) => dispatch(params),
+        );
+      },
+    );
 
     this.addEventListener("initialized", () => {
       this._initializedReceived = true;
     });
 
-    this._hostContext = options?.hostContext || {};
+    this._hostContext = hostContext || {};
 
-    this.setRequestHandler(McpUiInitializeRequestSchema, (request) =>
-      this._oninitialize(request),
+    this.setRequestHandler(
+      "ui/initialize",
+      {
+        params: paramsSchemaOf(McpUiInitializeRequestSchema),
+        result: McpUiInitializeResultSchema,
+      },
+      (params: McpUiInitializeRequest["params"]) =>
+        this._onUiInitialize(params),
     );
 
-    this.setRequestHandler(PingRequestSchema, (request, extra) => {
-      this.onping?.(request.params, extra);
-      return {};
-    });
+    this.setRequestHandler(
+      "ping",
+      (
+        request: PingRequest,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
+        this.onping?.(request.params, toRequestHandlerExtra(ctx));
+        return {};
+      },
+    );
 
     // Default handler for requestDisplayMode - returns current mode from host context.
     // Hosts can override this by setting bridge.onrequestdisplaymode = ...
-    this.replaceRequestHandler(
-      McpUiRequestDisplayModeRequestSchema,
-      (request) => {
+    this._replaceRequestHandler(
+      "ui/request-display-mode",
+      {
+        params: paramsSchemaOf(McpUiRequestDisplayModeRequestSchema),
+        result: McpUiRequestDisplayModeResultSchema,
+      },
+      () => {
         const currentMode = this._hostContext.displayMode ?? "inline";
         return { mode: currentMode };
       },
     );
   }
 
+  /**
+   * Shadowed with double-set protection. Arrow field so Protocol/Server
+   * constructors (ping, initialize, …) still hit the base implementation.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  override setRequestHandler = (...args: any[]): void => {
+    const method = args[0] as string;
+    this._claims.assertAndClaim(method, "setRequestHandler");
+    (Server.prototype.setRequestHandler as Function).apply(this, args);
+  };
+
+  /**
+   * Shadowed with double-set protection. Arrow field — see setRequestHandler.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  override setNotificationHandler = (...args: any[]): void => {
+    const method = args[0] as string;
+    this._claims.assertAndClaim(method, "setNotificationHandler");
+    (Server.prototype.setNotificationHandler as Function).apply(this, args);
+  };
+
+  /**
+   * Replace a request handler (on* replace semantics), wrapping with the
+   * initialized-received warning. `ui/initialize` and `ping` use
+   * setRequestHandler directly and are intentionally exempt.
+   *
+   * @see {@link https://github.com/anthropics/claude-ai-mcp/issues/149 claude-ai-mcp#149}
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private _replaceRequestHandler = (...args: any[]): void => {
+    const method = args[0] as string;
+    this._claims.claim(method);
+    const warn = () => {
+      if (!this._initializedReceived) {
+        console.warn(
+          `[ext-apps] AppBridge received '${method}' before ` +
+            `ui/notifications/initialized. The View is calling host ` +
+            `methods before completing the handshake; it should await ` +
+            `app.connect() first.`,
+        );
+      }
+    };
+    if (typeof args[1] === "function") {
+      const handler = args[1];
+      (Server.prototype.setRequestHandler as Function).call(
+        this,
+        method,
+        (request: unknown, ctx: unknown) => {
+          warn();
+          return handler(request, ctx);
+        },
+      );
+    } else {
+      const schemas = args[1];
+      const handler = args[2];
+      (Server.prototype.setRequestHandler as Function).call(
+        this,
+        method,
+        schemas,
+        (params: unknown, ctx: unknown) => {
+          warn();
+          return handler(params, ctx);
+        },
+      );
+    }
+  };
+
+  private setEventHandler<K extends keyof AppBridgeEventMap>(
+    event: K,
+    handler: ((params: AppBridgeEventMap[K]) => void) | undefined,
+  ): void {
+    this._events.setEventHandler(event, handler);
+  }
+
+  private getEventHandler<K extends keyof AppBridgeEventMap>(
+    event: K,
+  ): ((params: AppBridgeEventMap[K]) => void) | undefined {
+    return this._events.getEventHandler(event);
+  }
+
+  addEventListener<K extends keyof AppBridgeEventMap>(
+    event: K,
+    handler: (params: AppBridgeEventMap[K]) => void,
+  ): void {
+    this._events.addEventListener(event, handler);
+  }
+
+  removeEventListener<K extends keyof AppBridgeEventMap>(
+    event: K,
+    handler: (params: AppBridgeEventMap[K]) => void,
+  ): void {
+    this._events.removeEventListener(event, handler);
+  }
+
   /**
    * Get the view's capabilities discovered during initialization.
    *
@@ -588,18 +729,17 @@ export class AppBridge extends ProtocolWithEvents<
    * @see {@link sendToolInput `sendToolInput`} for sending tool arguments to the View
    * @deprecated Use {@link addEventListener `addEventListener("initialized", handler)`} instead — it composes with other listeners and supports cleanup via {@link removeEventListener `removeEventListener`}.
    */
-  get oninitialized():
-    | ((params: McpUiInitializedNotification["params"]) => void)
-    | undefined {
-    return this.getEventHandler("initialized");
-  }
-  set oninitialized(
-    callback:
-      | ((params: McpUiInitializedNotification["params"]) => void)
-      | undefined,
-  ) {
-    this.setEventHandler("initialized", callback);
-  }
+  /**
+   * Called when the view completes initialization.
+   *
+   * Implemented via `Object.defineProperty` in the constructor so it does not
+   * conflict with Server's `oninitialized` class field (MCP
+   * `notifications/initialized`). Public Apps API unchanged.
+   *
+   * @see {@link McpUiInitializedNotification `McpUiInitializedNotification`} for the notification type
+   * @deprecated Use {@link addEventListener `addEventListener("initialized", handler)`} instead.
+   */
+  declare oninitialized: (() => void) | undefined;
 
   /**
    * Register a handler for message requests from the view.
@@ -650,13 +790,20 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<McpUiMessageResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced("onmessage", this._onmessage, callback);
+    warnIfRequestHandlerReplaced("onmessage", this._onmessage, callback);
     this._onmessage = callback;
-    this.replaceRequestHandler(
-      McpUiMessageRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "ui/message",
+      {
+        params: paramsSchemaOf(McpUiMessageRequestSchema),
+        result: McpUiMessageResultSchema,
+      },
+      (
+        params: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onmessage) throw new Error("No onmessage handler set");
-        return this._onmessage(request.params, extra);
+        return this._onmessage(params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -719,13 +866,20 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<McpUiOpenLinkResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced("onopenlink", this._onopenlink, callback);
+    warnIfRequestHandlerReplaced("onopenlink", this._onopenlink, callback);
     this._onopenlink = callback;
-    this.replaceRequestHandler(
-      McpUiOpenLinkRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "ui/open-link",
+      {
+        params: paramsSchemaOf(McpUiOpenLinkRequestSchema),
+        result: McpUiOpenLinkResultSchema,
+      },
+      (
+        params: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onopenlink) throw new Error("No onopenlink handler set");
-        return this._onopenlink(request.params, extra);
+        return this._onopenlink(params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -787,18 +941,25 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<McpUiDownloadFileResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "ondownloadfile",
       this._ondownloadfile,
       callback,
     );
     this._ondownloadfile = callback;
-    this.replaceRequestHandler(
-      McpUiDownloadFileRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "ui/download-file",
+      {
+        params: paramsSchemaOf(McpUiDownloadFileRequestSchema),
+        result: McpUiDownloadFileResultSchema,
+      },
+      (
+        params: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._ondownloadfile)
           throw new Error("No ondownloadfile handler set");
-        return this._ondownloadfile(request.params, extra);
+        return this._ondownloadfile(params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -887,18 +1048,25 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<McpUiRequestDisplayModeResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "onrequestdisplaymode",
       this._onrequestdisplaymode,
       callback,
     );
     this._onrequestdisplaymode = callback;
-    this.replaceRequestHandler(
-      McpUiRequestDisplayModeRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "ui/request-display-mode",
+      {
+        params: paramsSchemaOf(McpUiRequestDisplayModeRequestSchema),
+        result: McpUiRequestDisplayModeResultSchema,
+      },
+      (
+        params: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onrequestdisplaymode)
           throw new Error("No onrequestdisplaymode handler set");
-        return this._onrequestdisplaymode(request.params, extra);
+        return this._onrequestdisplaymode(params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -984,18 +1152,25 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<EmptyResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "onupdatemodelcontext",
       this._onupdatemodelcontext,
       callback,
     );
     this._onupdatemodelcontext = callback;
-    this.replaceRequestHandler(
-      McpUiUpdateModelContextRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "ui/update-model-context",
+      {
+        params: paramsSchemaOf(McpUiUpdateModelContextRequestSchema),
+        result: EmptyResultSchema,
+      },
+      (
+        params: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onupdatemodelcontext)
           throw new Error("No onupdatemodelcontext handler set");
-        return this._onupdatemodelcontext(request.params, extra);
+        return this._onupdatemodelcontext(params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -1017,14 +1192,13 @@ export class AppBridge extends ProtocolWithEvents<
    * bridge.oncalltool = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "tools/call", params },
-   *     CallToolResultSchema,
    *     { signal: extra.signal },
    *   );
    * };
    * ```
    *
-   * @see `CallToolRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `CallToolResult` from @modelcontextprotocol/sdk for the result type
+   * @see `CallToolRequest` from @modelcontextprotocol/client for the request type
+   * @see `CallToolResult` from @modelcontextprotocol/client for the result type
    */
   private _oncalltool?: (
     params: CallToolRequest["params"],
@@ -1041,13 +1215,16 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<CallToolResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback);
+    warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback);
     this._oncalltool = callback;
-    this.replaceRequestHandler(
-      CallToolRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "tools/call",
+      (
+        request: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._oncalltool) throw new Error("No oncalltool handler set");
-        return this._oncalltool(request.params, extra);
+        return this._oncalltool(request.params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -1078,8 +1255,8 @@ export class AppBridge extends ProtocolWithEvents<
    * };
    * ```
    *
-   * @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
    */
   set oncreatesamplingmessage(
     callback: (
@@ -1088,9 +1265,12 @@ export class AppBridge extends ProtocolWithEvents<
     ) => Promise<CreateMessageResult | CreateMessageResultWithTools>,
   ) {
     this.setRequestHandler(
-      CreateMessageRequestSchema,
-      async (request, extra) => {
-        return callback(request.params, extra);
+      "sampling/createMessage",
+      async (
+        request: CreateMessageRequest,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
+        return callback(request.params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -1107,12 +1287,12 @@ export class AppBridge extends ProtocolWithEvents<
    * @example
    * ```typescript
    * // In your MCP client notification handler:
-   * mcpClient.setNotificationHandler(ToolListChangedNotificationSchema, () => {
+   * mcpClient.setNotificationHandler("notifications/tools/list_changed", () => {
    *   bridge.sendToolListChanged();
    * });
    * ```
    *
-   * @see `ToolListChangedNotification` from @modelcontextprotocol/sdk for the notification type
+   * @see `ToolListChangedNotification` from @modelcontextprotocol/client for the notification type
    */
   sendToolListChanged(params: ToolListChangedNotification["params"] = {}) {
     return this.notification({
@@ -1138,14 +1318,13 @@ export class AppBridge extends ProtocolWithEvents<
    * bridge.onlistresources = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "resources/list", params },
-   *     ListResourcesResultSchema,
    *     { signal: extra.signal },
    *   );
    * };
    * ```
    *
-   * @see `ListResourcesRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ListResourcesResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ListResourcesRequest` from @modelcontextprotocol/client for the request type
+   * @see `ListResourcesResult` from @modelcontextprotocol/client for the result type
    */
   private _onlistresources?: (
     params: ListResourcesRequest["params"],
@@ -1162,18 +1341,24 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<ListResourcesResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "onlistresources",
       this._onlistresources,
       callback,
     );
     this._onlistresources = callback;
-    this.replaceRequestHandler(
-      ListResourcesRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "resources/list",
+      (
+        request: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onlistresources)
           throw new Error("No onlistresources handler set");
-        return this._onlistresources(request.params, extra);
+        return this._onlistresources(
+          request.params,
+          toRequestHandlerExtra(ctx),
+        );
       },
     );
   }
@@ -1201,8 +1386,8 @@ export class AppBridge extends ProtocolWithEvents<
    * };
    * ```
    *
-   * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ListResourceTemplatesResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/client for the request type
+   * @see `ListResourceTemplatesResult` from @modelcontextprotocol/client for the result type
    */
   private _onlistresourcetemplates?: (
     params: ListResourceTemplatesRequest["params"],
@@ -1219,18 +1404,24 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<ListResourceTemplatesResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "onlistresourcetemplates",
       this._onlistresourcetemplates,
       callback,
     );
     this._onlistresourcetemplates = callback;
-    this.replaceRequestHandler(
-      ListResourceTemplatesRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "resources/templates/list",
+      (
+        request: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onlistresourcetemplates)
           throw new Error("No onlistresourcetemplates handler set");
-        return this._onlistresourcetemplates(request.params, extra);
+        return this._onlistresourcetemplates(
+          request.params,
+          toRequestHandlerExtra(ctx),
+        );
       },
     );
   }
@@ -1252,14 +1443,13 @@ export class AppBridge extends ProtocolWithEvents<
    * bridge.onreadresource = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "resources/read", params },
-   *     ReadResourceResultSchema,
    *     { signal: extra.signal },
    *   );
    * };
    * ```
    *
-   * @see `ReadResourceRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ReadResourceResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ReadResourceRequest` from @modelcontextprotocol/client for the request type
+   * @see `ReadResourceResult` from @modelcontextprotocol/client for the result type
    */
   private _onreadresource?: (
     params: ReadResourceRequest["params"],
@@ -1276,18 +1466,21 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<ReadResourceResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "onreadresource",
       this._onreadresource,
       callback,
     );
     this._onreadresource = callback;
-    this.replaceRequestHandler(
-      ReadResourceRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "resources/read",
+      (
+        request: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onreadresource)
           throw new Error("No onreadresource handler set");
-        return this._onreadresource(request.params, extra);
+        return this._onreadresource(request.params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -1304,12 +1497,12 @@ export class AppBridge extends ProtocolWithEvents<
    * @example
    * ```typescript
    * // In your MCP client notification handler:
-   * mcpClient.setNotificationHandler(ResourceListChangedNotificationSchema, () => {
+   * mcpClient.setNotificationHandler("notifications/resources/list_changed", () => {
    *   bridge.sendResourceListChanged();
    * });
    * ```
    *
-   * @see `ResourceListChangedNotification` from @modelcontextprotocol/sdk for the notification type
+   * @see `ResourceListChangedNotification` from @modelcontextprotocol/client for the notification type
    */
   sendResourceListChanged(
     params: ResourceListChangedNotification["params"] = {},
@@ -1337,14 +1530,13 @@ export class AppBridge extends ProtocolWithEvents<
    * bridge.onlistprompts = async (params, extra) => {
    *   return mcpClient.request(
    *     { method: "prompts/list", params },
-   *     ListPromptsResultSchema,
    *     { signal: extra.signal },
    *   );
    * };
    * ```
    *
-   * @see `ListPromptsRequest` from @modelcontextprotocol/sdk for the request type
-   * @see `ListPromptsResult` from @modelcontextprotocol/sdk for the result type
+   * @see `ListPromptsRequest` from @modelcontextprotocol/client for the request type
+   * @see `ListPromptsResult` from @modelcontextprotocol/client for the result type
    */
   private _onlistprompts?: (
     params: ListPromptsRequest["params"],
@@ -1361,18 +1553,21 @@ export class AppBridge extends ProtocolWithEvents<
         ) => Promise<ListPromptsResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
+    warnIfRequestHandlerReplaced(
       "onlistprompts",
       this._onlistprompts,
       callback,
     );
     this._onlistprompts = callback;
-    this.replaceRequestHandler(
-      ListPromptsRequestSchema,
-      async (request, extra) => {
+    this._replaceRequestHandler(
+      "prompts/list",
+      (
+        request: any,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onlistprompts)
           throw new Error("No onlistprompts handler set");
-        return this._onlistprompts(request.params, extra);
+        return this._onlistprompts(request.params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -1389,12 +1584,12 @@ export class AppBridge extends ProtocolWithEvents<
    * @example
    * ```typescript
    * // In your MCP client notification handler:
-   * mcpClient.setNotificationHandler(PromptListChangedNotificationSchema, () => {
+   * mcpClient.setNotificationHandler("notifications/prompts/list_changed", () => {
    *   bridge.sendPromptListChanged();
    * });
    * ```
    *
-   * @see `PromptListChangedNotification` from @modelcontextprotocol/sdk for the notification type
+   * @see `PromptListChangedNotification` from @modelcontextprotocol/client for the notification type
    */
   sendPromptListChanged(params: PromptListChangedNotification["params"] = {}) {
     return this.notification({
@@ -1403,46 +1598,6 @@ export class AppBridge extends ProtocolWithEvents<
     });
   }
 
-  /**
-   * Verify that the guest supports the capability required for the given request method.
-   * @internal
-   */
-  assertCapabilityForMethod(method: AppRequest["method"]): void {
-    // TODO
-  }
-
-  /**
-   * Verify that a request handler is registered and supported for the given method.
-   * @internal
-   */
-  assertRequestHandlerCapability(method: AppRequest["method"]): void {
-    // TODO
-  }
-
-  /**
-   * Verify that the host supports the capability required for the given notification method.
-   * @internal
-   */
-  assertNotificationCapability(method: AppNotification["method"]): void {
-    // TODO
-  }
-
-  /**
-   * Verify that task creation is supported for the given request method.
-   * @internal
-   */
-  protected assertTaskCapability(_method: string): void {
-    throw new Error("Tasks are not supported in MCP Apps");
-  }
-
-  /**
-   * Verify that task handler is supported for the given method.
-   * @internal
-   */
-  protected assertTaskHandlerCapability(_method: string): void {
-    throw new Error("Task handlers are not supported in MCP Apps");
-  }
-
   /**
    * Get the host capabilities passed to the constructor.
    *
@@ -1451,17 +1606,17 @@ export class AppBridge extends ProtocolWithEvents<
    * @see {@link McpUiHostCapabilities `McpUiHostCapabilities`} for the capabilities structure
    */
   getCapabilities(): McpUiHostCapabilities {
-    return this._capabilities;
+    return this._hostCapabilities;
   }
 
   /**
    * Handle the ui/initialize request from the guest.
    * @internal
    */
-  private async _oninitialize(
-    request: McpUiInitializeRequest,
+  private async _onUiInitialize(
+    params: McpUiInitializeRequest["params"],
   ): Promise<McpUiInitializeResult> {
-    const requestedVersion = request.params.protocolVersion;
+    const requestedVersion = params.protocolVersion;
 
     if (this._appInfo !== undefined) {
       console.warn(
@@ -1472,8 +1627,8 @@ export class AppBridge extends ProtocolWithEvents<
       );
     }
 
-    this._appCapabilities = request.params.appCapabilities;
-    this._appInfo = request.params.appInfo;
+    this._appCapabilities = params.appCapabilities;
+    this._appInfo = params.appInfo;
 
     const protocolVersion = SUPPORTED_PROTOCOL_VERSIONS.includes(
       requestedVersion,
@@ -1636,10 +1791,10 @@ export class AppBridge extends ProtocolWithEvents<
    *
    * @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);
    * ```
    *
@@ -1764,12 +1919,15 @@ export class AppBridge extends ProtocolWithEvents<
    * @param options - Request options (timeout, abort signal, etc.)
    * @returns Promise resolving to the tool call result
    */
-  callTool(params: CallToolRequest["params"], options?: RequestOptions) {
+  callTool(
+    params: CallToolRequest["params"],
+    options?: RequestOptions,
+  ): Promise<CallToolResult> {
     return this.request(
       { method: "tools/call", params },
       CallToolResultSchema,
       options,
-    );
+    ) as Promise<CallToolResult>;
   }
 
   /**
@@ -1781,12 +1939,15 @@ export class AppBridge extends ProtocolWithEvents<
    * @param options - Request options (timeout, abort signal, etc.)
    * @returns Promise resolving to the list of tools
    */
-  listTools(params: ListToolsRequest["params"], options?: RequestOptions) {
+  listTools(
+    params: ListToolsRequest["params"],
+    options?: RequestOptions,
+  ): Promise<ListToolsResult> {
     return this.request(
       { method: "tools/list", params },
       ListToolsResultSchema,
       options,
-    );
+    ) as Promise<ListToolsResult>;
   }
 
   /**
@@ -1860,44 +2021,44 @@ export class AppBridge extends ProtocolWithEvents<
 
       if (serverCapabilities.tools) {
         this.oncalltool = async (params, extra) => {
+          // Use request() (not callTool) so options like signal forward 1:1.
           return this._client!.request(
             { method: "tools/call", params },
-            CallToolResultSchema,
             { signal: extra.signal },
           );
         };
         if (serverCapabilities.tools.listChanged) {
           this._client.setNotificationHandler(
-            ToolListChangedNotificationSchema,
+            "notifications/tools/list_changed",
             (n) => this.sendToolListChanged(n.params),
           );
         }
       }
       if (serverCapabilities.resources) {
+        // Prefer request() over listResources/listResourceTemplates so a
+        // missing cursor is forwarded as a single page (v2 list* verbs
+        // auto-aggregate when cursor is absent).
         this.onlistresources = async (params, extra) => {
           return this._client!.request(
             { method: "resources/list", params },
-            ListResourcesResultSchema,
             { signal: extra.signal },
           );
         };
         this.onlistresourcetemplates = async (params, extra) => {
           return this._client!.request(
             { method: "resources/templates/list", params },
-            ListResourceTemplatesResultSchema,
             { signal: extra.signal },
           );
         };
         this.onreadresource = async (params, extra) => {
           return this._client!.request(
             { method: "resources/read", params },
-            ReadResourceResultSchema,
             { signal: extra.signal },
           );
         };
         if (serverCapabilities.resources.listChanged) {
           this._client.setNotificationHandler(
-            ResourceListChangedNotificationSchema,
+            "notifications/resources/list_changed",
             (n) => this.sendResourceListChanged(n.params),
           );
         }
@@ -1906,13 +2067,12 @@ export class AppBridge extends ProtocolWithEvents<
         this.onlistprompts = async (params, extra) => {
           return this._client!.request(
             { method: "prompts/list", params },
-            ListPromptsResultSchema,
             { signal: extra.signal },
           );
         };
         if (serverCapabilities.prompts.listChanged) {
           this._client.setNotificationHandler(
-            PromptListChangedNotificationSchema,
+            "notifications/prompts/list_changed",
             (n) => this.sendPromptListChanged(n.params),
           );
         }
diff --git a/src/app.examples.ts b/src/app.examples.ts
index 81bdd4440..15dadd802 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 { Tool, SamplingMessage } from "@modelcontextprotocol/client";
+import type { McpServer, ToolCallback } from "./server/index.js";
 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 adfad5c77..494c3dc92 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,39 +1,42 @@
 import {
+  Client,
+  type ClientOptions,
+  type Implementation,
   type RequestOptions,
-  mergeCapabilities,
-  ProtocolOptions,
-} from "@modelcontextprotocol/sdk/shared/protocol.js";
-
+  type Transport,
+} from "@modelcontextprotocol/client";
 import {
+  CreateMessageResultSchema,
+  CreateMessageResultWithToolsSchema,
+  EmptyResultSchema,
+} from "@modelcontextprotocol/core";
+import type {
   CallToolRequest,
-  CallToolRequestSchema,
   CallToolResult,
-  CallToolResultSchema,
   CreateMessageRequest,
   CreateMessageResult,
-  CreateMessageResultSchema,
   CreateMessageResultWithTools,
-  CreateMessageResultWithToolsSchema,
-  EmptyResultSchema,
-  Implementation,
   ListResourcesRequest,
   ListResourcesResult,
-  ListResourcesResultSchema,
   ListToolsRequest,
-  ListToolsRequestSchema,
   ListToolsResult,
   LoggingMessageNotification,
-  PingRequestSchema,
   ReadResourceRequest,
   ReadResourceResult,
-  ReadResourceResultSchema,
   Tool,
   ToolAnnotations,
   ToolListChangedNotification,
-} from "@modelcontextprotocol/sdk/types.js";
-import { AppNotification, AppRequest, AppResult } from "./types";
-import { ProtocolWithEvents } from "./events";
-export { ProtocolWithEvents };
+} from "./types";
+import {
+  MethodClaimRegistry,
+  NotificationEventEmitter,
+  mergeCapabilities,
+  methodOf,
+  paramsSchemaOf,
+  toRequestHandlerExtra,
+  warnIfRequestHandlerReplaced,
+  type RequestHandlerExtra,
+} from "./events";
 import { PostMessageTransport } from "./message-transport";
 import {
   LATEST_PROTOCOL_VERSION,
@@ -55,6 +58,7 @@ import {
   McpUiResourceTeardownRequest,
   McpUiResourceTeardownRequestSchema,
   McpUiResourceTeardownResult,
+  McpUiResourceTeardownResultSchema,
   McpUiRequestTeardownNotification,
   McpUiSizeChangedNotification,
   McpUiToolCancelledNotification,
@@ -68,7 +72,6 @@ import {
   McpUiRequestDisplayModeRequest,
   McpUiRequestDisplayModeResultSchema,
 } from "./types";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import {
   StandardSchemaV1,
   standardSchemaToJsonSchema,
@@ -81,6 +84,7 @@ export type {
   StandardSchemaWithJSON,
 } from "./standard-schema";
 
+export type { RequestHandlerExtra } from "./events";
 export { PostMessageTransport } from "./message-transport";
 export * from "./types";
 export {
@@ -160,11 +164,11 @@ 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 MCP TypeScript SDK v2 with `App`-specific configuration.
  *
- * @see `ProtocolOptions` from @modelcontextprotocol/sdk for inherited options
+ * @see `ClientOptions` from @modelcontextprotocol/client for inherited options
  */
-export type AppOptions = ProtocolOptions & {
+export type AppOptions = ClientOptions & {
   /**
    * Automatically report size changes to the host using `ResizeObserver`.
    *
@@ -204,10 +208,6 @@ export type AppOptions = ProtocolOptions & {
   allowUnsafeEval?: boolean;
 };
 
-type RequestHandlerExtra = Parameters<
-  Parameters<App["setRequestHandler"]>[1]
->[1];
-
 /**
  * Result of an app-registered tool callback. When `Out` is provided,
  * `structuredContent` is required and typed (unless `isError: true`).
@@ -228,7 +228,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.
  */
@@ -246,7 +246,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 = {
@@ -271,9 +271,9 @@ export type RegisteredAppTool = {
 /**
  * Maps DOM-style event names to their notification `params` types.
  *
- * Used by {@link App `App`} (which extends {@link ProtocolWithEvents `ProtocolWithEvents`})
- * to provide type-safe `addEventListener` / `removeEventListener` and
- * singular `on*` handler support.
+ * Used by {@link App `App`} (which composes an internal notification event
+ * emitter) to provide type-safe `addEventListener` / `removeEventListener`
+ * and singular `on*` handler support.
  */
 export type AppEventMap = {
   toolinput: McpUiToolInputNotification["params"];
@@ -306,13 +306,13 @@ export type AppEventMap = {
  *
  * ## Inherited Methods
  *
- * As a subclass of {@link ProtocolWithEvents `ProtocolWithEvents`}, `App` inherits:
- * - `setRequestHandler()` - Register handlers for requests from host
- * - `setNotificationHandler()` - Register handlers for notifications from host
+ * As a subclass of v2 `Client`, `App` provides:
+ * - `setRequestHandler()` - Register handlers for requests from host (shadowed with double-set protection)
+ * - `setNotificationHandler()` - Register handlers for notifications from host (shadowed with double-set protection)
  * - `addEventListener()` - Append a listener for a notification event (multi-listener)
  * - `removeEventListener()` - Remove a previously added listener
  *
- * @see {@link ProtocolWithEvents `ProtocolWithEvents`} for the DOM-model event system
+ * @see {@link AppEventMap} for the DOM-model event names and payloads
  *
  * ## Notification Setters (DOM-model `on*` handlers)
  *
@@ -342,17 +342,14 @@ export type AppEventMap = {
  * await app.connect();
  * ```
  */
-export class App extends ProtocolWithEvents<
-  AppRequest,
-  AppNotification,
-  AppResult,
-  AppEventMap
-> {
+export class App extends Client {
   private _hostCapabilities?: McpUiHostCapabilities;
   private _hostInfo?: Implementation;
   private _hostContext?: McpUiHostContext;
   private _registeredTools: { [name: string]: RegisteredAppTool } = {};
   private _initializedSent = false;
+  private readonly _claims = new MethodClaimRegistry();
+  private readonly _events!: NotificationEventEmitter<AppEventMap>;
 
   /**
    * Warn if a host-bound method is called before {@link connect `connect`} has
@@ -378,14 +375,6 @@ export class App extends ProtocolWithEvents<
     console.warn(`${msg}. This will throw in a future release.`);
   }
 
-  protected readonly eventSchemas = {
-    toolinput: McpUiToolInputNotificationSchema,
-    toolinputpartial: McpUiToolInputPartialNotificationSchema,
-    toolresult: McpUiToolResultNotificationSchema,
-    toolcancelled: McpUiToolCancelledNotificationSchema,
-    hostcontextchanged: McpUiHostContextChangedNotificationSchema,
-  };
-
   /**
    * Events the host typically sends once, shortly after the handshake.
    * Registering a handler for one of these *after* {@link connect `connect`}
@@ -427,29 +416,33 @@ export class App extends ProtocolWithEvents<
     console.warn(msg);
   }
 
-  protected override setEventHandler<K extends keyof AppEventMap>(
+  private setEventHandler<K extends keyof AppEventMap>(
     event: K,
     handler: ((params: AppEventMap[K]) => void) | undefined,
   ): void {
     if (handler) this._assertHandlerTiming(event);
-    super.setEventHandler(event, handler);
+    this._events.setEventHandler(event, handler);
+  }
+
+  private getEventHandler<K extends keyof AppEventMap>(
+    event: K,
+  ): ((params: AppEventMap[K]) => void) | undefined {
+    return this._events.getEventHandler(event);
   }
 
-  override addEventListener<K extends keyof AppEventMap>(
+  addEventListener<K extends keyof AppEventMap>(
     event: K,
     handler: (params: AppEventMap[K]) => void,
   ): void {
     this._assertHandlerTiming(event);
-    super.addEventListener(event, handler);
+    this._events.addEventListener(event, handler);
   }
 
-  protected override onEventDispatch<K extends keyof AppEventMap>(
+  removeEventListener<K extends keyof AppEventMap>(
     event: K,
-    params: AppEventMap[K],
+    handler: (params: AppEventMap[K]) => void,
   ): void {
-    if (event === "hostcontextchanged") {
-      this._hostContext = { ...this._hostContext, ...params };
-    }
+    this._events.removeEventListener(event, handler);
   }
 
   /**
@@ -468,35 +461,129 @@ export class App extends ProtocolWithEvents<
    * );
    * ```
    */
+  /** App UI capabilities — distinct from Client._capabilities. */
+  private _appCapabilities: McpUiAppCapabilities;
+
   constructor(
     private _appInfo: Implementation,
-    private _capabilities: McpUiAppCapabilities = {},
+    appCapabilities: McpUiAppCapabilities = {},
     private options: AppOptions = { autoResize: true },
   ) {
-    super(options);
+    const {
+      autoResize: _autoResize,
+      strict: _strict,
+      allowUnsafeEval: _allowUnsafeEval,
+      ...clientOptions
+    } = options;
+    // NOTE: must not use a constructor param named `_capabilities` — that
+    // would overwrite Client's MCP capability store.
+    super(_appInfo, clientOptions);
+    this._appCapabilities = appCapabilities;
+
+    this._events = new NotificationEventEmitter<AppEventMap>(
+      {
+        toolinput: {
+          method: methodOf(McpUiToolInputNotificationSchema),
+          params: paramsSchemaOf(McpUiToolInputNotificationSchema),
+        },
+        toolinputpartial: {
+          method: methodOf(McpUiToolInputPartialNotificationSchema),
+          params: paramsSchemaOf(McpUiToolInputPartialNotificationSchema),
+        },
+        toolresult: {
+          method: methodOf(McpUiToolResultNotificationSchema),
+          params: paramsSchemaOf(McpUiToolResultNotificationSchema),
+        },
+        toolcancelled: {
+          method: methodOf(McpUiToolCancelledNotificationSchema),
+          params: paramsSchemaOf(McpUiToolCancelledNotificationSchema),
+        },
+        hostcontextchanged: {
+          method: methodOf(McpUiHostContextChangedNotificationSchema),
+          params: paramsSchemaOf(McpUiHostContextChangedNotificationSchema),
+        },
+      },
+      (method, paramsSchema, dispatch) => {
+        this._claims.claim(method);
+        Client.prototype.setNotificationHandler.call(
+          this,
+          method,
+          { params: paramsSchema },
+          (params: unknown) => dispatch(params),
+        );
+      },
+      (event, params) => {
+        if (event === "hostcontextchanged") {
+          this._hostContext = { ...this._hostContext, ...params };
+        }
+      },
+    );
 
     if (!options.allowUnsafeEval) {
       z.config({ jitless: true });
     }
 
-    this.setRequestHandler(PingRequestSchema, (request) => {
+    this.setRequestHandler("ping", (request: { params?: unknown }) => {
       console.log("Received ping:", request.params);
       return {};
     });
 
     // Eagerly register the hostcontextchanged event slot so that
-    // onEventDispatch (which merges into _hostContext) fires even if the
+    // onDispatch (which merges into _hostContext) fires even if the
     // user never assigns onhostcontextchanged or calls addEventListener.
     this.setEventHandler("hostcontextchanged", undefined);
   }
 
-  private registerCapabilities(capabilities: McpUiAppCapabilities): void {
+  /**
+   * Shadowed with double-set protection. Arrow field so Protocol's constructor
+   * (which registers ping/cancelled/progress) still hits the base implementation.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  override setRequestHandler = (...args: any[]): void => {
+    const method = args[0] as string;
+    this._claims.assertAndClaim(method, "setRequestHandler");
+    (Client.prototype.setRequestHandler as Function).apply(this, args);
+  };
+
+  /**
+   * Shadowed with double-set protection. Arrow field — see setRequestHandler.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  override setNotificationHandler = (...args: any[]): void => {
+    const method = args[0] as string;
+    this._claims.assertAndClaim(method, "setNotificationHandler");
+    (Client.prototype.setNotificationHandler as Function).apply(this, args);
+  };
+
+  /**
+   * Replace a request handler, bypassing double-set protection (on* replace semantics).
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private _replaceRequestHandler = (...args: any[]): void => {
+    const method = args[0] as string;
+    this._claims.claim(method);
+    (Client.prototype.setRequestHandler as Function).apply(this, args);
+  };
+
+  /** Tools capability check formerly in assertRequestHandlerCapability. */
+  private _assertToolsCapability(method: string): void {
+    if (!this._appCapabilities.tools) {
+      throw new Error(
+        `Client does not support tool capability (required for ${method})`,
+      );
+    }
+  }
+
+  private _registerAppCapabilities(capabilities: McpUiAppCapabilities): void {
     if (this.transport) {
       throw new Error(
         "Cannot register capabilities after transport is established",
       );
     }
-    this._capabilities = mergeCapabilities(this._capabilities, capabilities);
+    this._appCapabilities = mergeCapabilities(
+      this._appCapabilities,
+      capabilities,
+    );
   }
 
   registerTool<
@@ -519,7 +606,7 @@ export class App extends ProtocolWithEvents<
     }
     const app = this;
     const notify = () => {
-      if (app._initializedSent && app._capabilities.tools?.listChanged) {
+      if (app._initializedSent && app._appCapabilities.tools?.listChanged) {
         void app.sendToolListChanged();
       }
     };
@@ -591,8 +678,8 @@ export class App extends ProtocolWithEvents<
     // to declare { tools: {} } in the constructor just to use registerTool.
     // Only do this pre-connect; post-connect the capability was already
     // advertised (or wasn't) and can't change.
-    if (!this._capabilities.tools && !this.transport) {
-      this.registerCapabilities({ tools: { listChanged: true } });
+    if (!this._appCapabilities.tools && !this.transport) {
+      this._registerAppCapabilities({ tools: { listChanged: true } });
     }
 
     this.ensureToolHandlersInitialized();
@@ -924,7 +1011,7 @@ export class App extends ProtocolWithEvents<
    * without replacing.
    *
    * Notification params are automatically merged into the internal host context
-   * via {@link onEventDispatch `onEventDispatch`} before any handler or listener
+   * via the event emitter's onDispatch hook before any handler or listener
    * fires. This means {@link getHostContext `getHostContext`} will return the
    * updated values even before your callback runs.
    *
@@ -1002,13 +1089,20 @@ export class App extends ProtocolWithEvents<
         ) => McpUiResourceTeardownResult | Promise<McpUiResourceTeardownResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced("onteardown", this._onteardown, callback);
+    warnIfRequestHandlerReplaced("onteardown", this._onteardown, callback);
     this._onteardown = callback;
-    this.replaceRequestHandler(
-      McpUiResourceTeardownRequestSchema,
-      (request, extra) => {
+    this._replaceRequestHandler(
+      "ui/resource-teardown",
+      {
+        params: paramsSchemaOf(McpUiResourceTeardownRequestSchema),
+        result: McpUiResourceTeardownResultSchema,
+      },
+      (
+        params: McpUiResourceTeardownRequest["params"],
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
         if (!this._onteardown) throw new Error("No onteardown handler set");
-        return this._onteardown(request.params, extra);
+        return this._onteardown(params, toRequestHandlerExtra(ctx));
       },
     );
   }
@@ -1056,12 +1150,19 @@ export class App extends ProtocolWithEvents<
         ) => Promise<CallToolResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback);
+    warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback);
     this._oncalltool = callback;
-    this.replaceRequestHandler(CallToolRequestSchema, (request, extra) => {
-      if (!this._oncalltool) throw new Error("No oncalltool handler set");
-      return this._oncalltool(request.params, extra);
-    });
+    this._assertToolsCapability("tools/call");
+    this._replaceRequestHandler(
+      "tools/call",
+      (
+        request: CallToolRequest,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
+        if (!this._oncalltool) throw new Error("No oncalltool handler set");
+        return this._oncalltool(request.params, toRequestHandlerExtra(ctx));
+      },
+    );
   }
 
   /**
@@ -1123,78 +1224,19 @@ export class App extends ProtocolWithEvents<
         ) => Promise<ListToolsResult>)
       | undefined,
   ) {
-    this.warnIfRequestHandlerReplaced(
-      "onlisttools",
-      this._onlisttools,
-      callback,
-    );
+    warnIfRequestHandlerReplaced("onlisttools", this._onlisttools, callback);
     this._onlisttools = callback;
-    this.replaceRequestHandler(ListToolsRequestSchema, (request, extra) => {
-      if (!this._onlisttools) throw new Error("No onlisttools handler set");
-      return this._onlisttools(request.params, extra);
-    });
-  }
-
-  /**
-   * Verify that the host supports the capability required for the given request method.
-   * @internal
-   */
-  assertCapabilityForMethod(method: AppRequest["method"]): void {
-    switch (method) {
-      case "sampling/createMessage":
-        if (!this._hostCapabilities?.sampling) {
-          throw new Error(
-            `Host does not support sampling (required for ${method})`,
-          );
-        }
-        break;
-    }
-  }
-
-  /**
-   * Verify that the app declared the capability required for the given request method.
-   * @internal
-   */
-  assertRequestHandlerCapability(method: AppRequest["method"]): void {
-    switch (method) {
-      case "tools/call":
-      case "tools/list":
-        if (!this._capabilities.tools) {
-          throw new Error(
-            `Client does not support tool capability (required for ${method})`,
-          );
-        }
-        return;
-      case "ping":
-      case "ui/resource-teardown":
-        return;
-      default:
-        throw new Error(`No handler for method ${method} registered`);
-    }
-  }
-
-  /**
-   * Verify that the app supports the capability required for the given notification method.
-   * @internal
-   */
-  assertNotificationCapability(_method: AppNotification["method"]): void {
-    // TODO
-  }
-
-  /**
-   * Verify that task creation is supported for the given request method.
-   * @internal
-   */
-  protected assertTaskCapability(_method: string): void {
-    throw new Error("Tasks are not supported in MCP Apps");
-  }
-
-  /**
-   * Verify that task handler is supported for the given method.
-   * @internal
-   */
-  protected assertTaskHandlerCapability(_method: string): void {
-    throw new Error("Task handlers are not supported in MCP Apps");
+    this._assertToolsCapability("tools/list");
+    this._replaceRequestHandler(
+      "tools/list",
+      (
+        request: ListToolsRequest,
+        ctx: { sessionId?: string; mcpReq: { signal: AbortSignal } },
+      ) => {
+        if (!this._onlisttools) throw new Error("No onlisttools handler set");
+        return this._onlisttools(request.params, toRequestHandlerExtra(ctx));
+      },
+    );
   }
 
   /**
@@ -1243,18 +1285,18 @@ export class App extends ProtocolWithEvents<
           `Did you mean: callServerTool({ name: "${params}", arguments: { ... } })?`,
       );
     }
-    return await this.request(
+    return (await this.request(
       { method: "tools/call", params },
-      CallToolResultSchema,
       {
         // Hosts may interpose long-running or user-interactive steps before the
         // tool result arrives. Opting in here lets a host heartbeat keep the
         // request alive past the default timeout; callers can still override.
+        // v2 RequestOptions: onprogress + resetTimeoutOnProgress (unchanged names).
         onprogress: () => {},
         resetTimeoutOnProgress: true,
         ...options,
       },
-    );
+    )) as CallToolResult;
   }
 
   /**
@@ -1302,11 +1344,10 @@ export class App extends ProtocolWithEvents<
     options?: RequestOptions,
   ): Promise<ReadResourceResult> {
     this._assertInitialized("readServerResource");
-    return await this.request(
+    return (await this.request(
       { method: "resources/read", params },
-      ReadResourceResultSchema,
       options,
-    );
+    )) as ReadResourceResult;
   }
 
   /**
@@ -1350,11 +1391,10 @@ export class App extends ProtocolWithEvents<
     options?: RequestOptions,
   ): Promise<ListResourcesResult> {
     this._assertInitialized("listServerResources");
-    return await this.request(
+    return (await this.request(
       { method: "resources/list", params },
-      ListResourcesResultSchema,
       options,
-    );
+    )) as ListResourcesResult;
   }
 
   /**
@@ -1415,8 +1455,8 @@ export class App extends ProtocolWithEvents<
    * }
    * ```
    *
-   * @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 },
@@ -1431,14 +1471,20 @@ export class App extends ProtocolWithEvents<
     options?: RequestOptions,
   ): Promise<CreateMessageResult | CreateMessageResultWithTools> {
     this._assertInitialized("createSamplingMessage");
+    // Moved from v1 assertCapabilityForMethod — check before sending.
+    if (!this._hostCapabilities?.sampling) {
+      throw new Error(
+        "Host does not support sampling (required for sampling/createMessage)",
+      );
+    }
     const resultSchema = params.tools
       ? CreateMessageResultWithToolsSchema
       : CreateMessageResultSchema;
-    return await this.request(
+    return (await this.request(
       { method: "sampling/createMessage", params },
       resultSchema,
       options,
-    );
+    )) as CreateMessageResult | CreateMessageResultWithTools;
   }
 
   /**
@@ -1953,14 +1999,17 @@ export class App extends ProtocolWithEvents<
       );
     }
     this._initializedSent = false;
+    // Public reconnect guard: skip MCP initialize so negotiated protocol
+    // version stays undefined and Client._shouldDropInbound never arms.
+    transport.sessionId = transport.sessionId ?? "ext-apps-view-no-mcp-init";
     await super.connect(transport);
 
     try {
       const result = await this.request(
-        <McpUiInitializeRequest>{
+        {
           method: "ui/initialize",
           params: {
-            appCapabilities: this._capabilities,
+            appCapabilities: this._appCapabilities,
             appInfo: this._appInfo,
             protocolVersion: LATEST_PROTOCOL_VERSION,
           },
diff --git a/src/events.ts b/src/events.ts
index 4d17ca4f2..4218d0cad 100644
--- a/src/events.ts
+++ b/src/events.ts
@@ -1,39 +1,12 @@
-import { Protocol } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import {
-  Request,
-  Notification,
-  Result,
-} from "@modelcontextprotocol/sdk/types.js";
-import { ZodLiteral, ZodObject } from "zod/v4";
-
-type MethodSchema = ZodObject<{ method: ZodLiteral<string> }>;
-
-/**
- * Per-event state: a singular `on*` handler (replace semantics) plus a
- * listener array (`addEventListener` semantics), mirroring the DOM model
- * where `el.onclick` and `el.addEventListener("click", …)` coexist.
- */
-interface EventSlot<T = unknown> {
-  onHandler?: ((params: T) => void) | undefined;
-  listeners: ((params: T) => void)[];
-}
-
 /**
- * Intermediate base class that adds DOM-style event support on top of the
- * MCP SDK's `Protocol`.
- *
- * The base `Protocol` class stores one handler per method:
- * `setRequestHandler()` and `setNotificationHandler()` replace any existing
- * handler for the same method silently. This class introduces a two-channel
- * event model inspired by the DOM:
+ * DOM-style notification event fan-out and double-set protection for
+ * {@link App} / {@link AppBridge}, composed onto v2 Client/Server rather than
+ * subclassing Protocol.
  *
  * ### Singular `on*` handler (like `el.onclick`)
  *
- * Subclasses expose `get`/`set` pairs that delegate to
- * {@link setEventHandler `setEventHandler`} /
- * {@link getEventHandler `getEventHandler`}. Assigning replaces the previous
- * handler; assigning `undefined` clears it. `addEventListener` listeners are
- * unaffected.
+ * Assigning replaces the previous handler; assigning `undefined` clears it.
+ * `addEventListener` listeners are unaffected.
  *
  * ### Multi-listener (`addEventListener` / `removeEventListener`)
  *
@@ -42,55 +15,138 @@ interface EventSlot<T = unknown> {
  *
  * ### Dispatch order
  *
- * When a notification arrives for a mapped event:
- * 1. {@link onEventDispatch `onEventDispatch`} (subclass side-effects)
+ * 1. Optional `onDispatch` side-effects (e.g. merge host context)
  * 2. The singular `on*` handler (if set)
  * 3. All `addEventListener` listeners in insertion order
  *
  * ### Double-set protection
  *
- * Direct calls to {@link setRequestHandler `setRequestHandler`} /
- * {@link setNotificationHandler `setNotificationHandler`} throw if a handler
- * for the same method has already been registered (through any path), so
- * accidental overwrites surface as errors instead of silent bugs.
+ * {@link MethodClaimRegistry} tracks methods claimed by event registration or
+ * internal handlers. App/AppBridge shadow `setRequestHandler` /
+ * `setNotificationHandler` to throw when the same method is claimed twice.
+ */
+
+import type { StandardSchemaV1 } from "@modelcontextprotocol/client";
+
+/**
+ * Request-handler context passed to App/AppBridge `on*` request callbacks.
  *
- * @typeParam EventMap - Maps event names to the listener's `params` type.
+ * Preserves the v1-era `extra.signal` surface used by hosts and examples.
+ * Mapped internally from the v2 handler context (`ctx`).
  */
-export abstract class ProtocolWithEvents<
-  SendRequestT extends Request,
-  SendNotificationT extends Notification,
-  SendResultT extends Result,
-  EventMap extends Record<string, unknown>,
-> extends Protocol<SendRequestT, SendNotificationT, SendResultT> {
-  private _registeredMethods = new Set<string>();
-  private _eventSlots = new Map<keyof EventMap, EventSlot>();
+export type RequestHandlerExtra = {
+  signal: AbortSignal;
+  sessionId?: string;
+};
 
-  /**
-   * Event name → notification schema. Subclasses populate this so that
-   * the event system can lazily register a dispatcher with the correct
-   * schema on first use.
-   */
-  protected abstract readonly eventSchemas: {
-    [K in keyof EventMap]: MethodSchema;
+/**
+ * Adapt v2 handler context to the public `extra` shape.
+ */
+export function toRequestHandlerExtra(ctx: {
+  sessionId?: string;
+  mcpReq: { signal: AbortSignal };
+}): RequestHandlerExtra {
+  return {
+    signal: ctx.mcpReq.signal,
+    sessionId: ctx.sessionId,
   };
+}
+
+/**
+ * Deep-merge capability objects (replaces v1 `mergeCapabilities`).
+ */
+export function mergeCapabilities<T extends object>(base: T, additional: T): T {
+  const result = { ...(base as Record<string, unknown>) };
+  for (const [key, value] of Object.entries(additional)) {
+    const existing = result[key];
+    if (
+      existing &&
+      typeof existing === "object" &&
+      !Array.isArray(existing) &&
+      value &&
+      typeof value === "object" &&
+      !Array.isArray(value)
+    ) {
+      result[key] = mergeCapabilities(
+        existing as Record<string, unknown>,
+        value as Record<string, unknown>,
+      );
+    } else {
+      result[key] = value;
+    }
+  }
+  return result as T;
+}
+
+/**
+ * Tracks JSON-RPC methods claimed by event registration or internal handlers
+ * so accidental double-registration via `setRequestHandler` /
+ * `setNotificationHandler` throws instead of silently replacing.
+ */
+export class MethodClaimRegistry {
+  private readonly _methods = new Set<string>();
+
+  /** Record a claim without throwing (replace / first-register paths). */
+  claim(method: string): void {
+    this._methods.add(method);
+  }
+
+  /** Throw if already claimed, then claim. */
+  assertAndClaim(method: string, via: string): void {
+    if (this._methods.has(method)) {
+      throw new Error(
+        `Handler for "${method}" already registered (via ${via}). ` +
+          `Use addEventListener() to attach multiple listeners, ` +
+          `or the on* setter for replace semantics.`,
+      );
+    }
+    this._methods.add(method);
+  }
 
-  /**
-   * Called once per incoming notification, before any handlers or listeners
-   * fire. Subclasses may override to perform side effects such as merging
-   * notification params into cached state.
-   */
-  protected onEventDispatch<K extends keyof EventMap>(
-    _event: K,
-    _params: EventMap[K],
-  ): void {}
+  has(method: string): boolean {
+    return this._methods.has(method);
+  }
+}
+
+interface EventSlot<T = unknown> {
+  onHandler?: ((params: T) => void) | undefined;
+  listeners: ((params: T) => void)[];
+}
 
-  // ── Event system (DOM model) ────────────────────────────────────────
+export type EventMethodSchema = {
+  method: string;
+  params: StandardSchemaV1;
+};
+
+/**
+ * Registers one v2 notification handler per event method and fans out to
+ * `on*` + `addEventListener` listeners.
+ */
+export class NotificationEventEmitter<
+  EventMap extends Record<string, unknown>,
+> {
+  private readonly _eventSlots = new Map<keyof EventMap, EventSlot>();
+
+  constructor(
+    private readonly _eventSchemas: {
+      [K in keyof EventMap]: EventMethodSchema;
+    },
+    /**
+     * Called once per event on first use. Must register a v2
+     * `setNotificationHandler(method, { params }, handler)` and claim the
+     * method in the caller's {@link MethodClaimRegistry}.
+     */
+    private readonly _registerDispatcher: (
+      method: string,
+      paramsSchema: StandardSchemaV1,
+      dispatch: (params: unknown) => void,
+    ) => void,
+    private readonly _onDispatch?: <K extends keyof EventMap>(
+      event: K,
+      params: EventMap[K],
+    ) => void,
+  ) {}
 
-  /**
-   * Lazily create the event slot and register a single dispatcher with the
-   * base `Protocol`. The dispatcher fans out to the `on*` handler and all
-   * `addEventListener` listeners.
-   */
   private _ensureEventSlot<K extends keyof EventMap>(
     event: K,
   ): EventSlot<EventMap[K]> {
@@ -98,39 +154,25 @@ export abstract class ProtocolWithEvents<
       | EventSlot<EventMap[K]>
       | undefined;
     if (!slot) {
-      const schema = this.eventSchemas[event];
+      const schema = this._eventSchemas[event];
       if (!schema) {
         throw new Error(`Unknown event: ${String(event)}`);
       }
       slot = { listeners: [] };
       this._eventSlots.set(event, slot as EventSlot);
 
-      // Claim this method so direct setNotificationHandler calls throw.
-      const method = schema.shape.method.value;
-      this._registeredMethods.add(method);
-
-      const s = slot; // stable reference for the closure
-      super.setNotificationHandler(schema, (n) => {
-        const params = (n as { params: EventMap[K] }).params;
-        this.onEventDispatch(event, params);
-        // 1. Singular on* handler
-        s.onHandler?.(params);
-        // 2. addEventListener listeners — snapshot to tolerate removal during
-        //    dispatch (e.g., a listener that calls removeEventListener on itself)
-        for (const l of [...s.listeners]) l(params);
+      const s = slot;
+      this._registerDispatcher(schema.method, schema.params, (params) => {
+        const p = params as EventMap[K];
+        this._onDispatch?.(event, p);
+        s.onHandler?.(p);
+        for (const l of [...s.listeners]) l(p);
       });
     }
     return slot;
   }
 
-  /**
-   * Set or clear the singular `on*` handler for an event.
-   *
-   * Replace semantics — like the DOM's `el.onclick = fn`. Assigning
-   * `undefined` clears the handler without affecting `addEventListener`
-   * listeners.
-   */
-  protected setEventHandler<K extends keyof EventMap>(
+  setEventHandler<K extends keyof EventMap>(
     event: K,
     handler: ((params: EventMap[K]) => void) | undefined,
   ): void {
@@ -144,31 +186,13 @@ export abstract class ProtocolWithEvents<
     slot.onHandler = handler;
   }
 
-  /**
-   * Get the singular `on*` handler for an event, or `undefined` if none is
-   * set. `addEventListener` listeners are not reflected here.
-   */
-  protected getEventHandler<K extends keyof EventMap>(
+  getEventHandler<K extends keyof EventMap>(
     event: K,
   ): ((params: EventMap[K]) => void) | undefined {
     return (this._eventSlots.get(event) as EventSlot<EventMap[K]> | undefined)
       ?.onHandler;
   }
 
-  /**
-   * Add a listener for a notification event.
-   *
-   * Unlike the singular `on*` handler, calling this multiple times appends
-   * listeners rather than replacing them. All registered listeners fire in
-   * insertion order after the `on*` handler when the notification arrives.
-   *
-   * Registration is lazy: the first call (for a given event, from either
-   * this method or the `on*` setter) registers a dispatcher with the base
-   * `Protocol`.
-   *
-   * @param event - Event name (a key of the `EventMap` type parameter).
-   * @param handler - Listener invoked with the notification `params`.
-   */
   addEventListener<K extends keyof EventMap>(
     event: K,
     handler: (params: EventMap[K]) => void,
@@ -176,11 +200,6 @@ export abstract class ProtocolWithEvents<
     this._ensureEventSlot(event).listeners.push(handler);
   }
 
-  /**
-   * Remove a previously registered event listener. The dispatcher stays
-   * registered even if the listener array becomes empty; future
-   * notifications simply have no listeners to call.
-   */
   removeEventListener<K extends keyof EventMap>(
     event: K,
     handler: (params: EventMap[K]) => void,
@@ -192,88 +211,44 @@ export abstract class ProtocolWithEvents<
     const idx = slot.listeners.indexOf(handler);
     if (idx !== -1) slot.listeners.splice(idx, 1);
   }
+}
 
-  // ── Handler registration with double-set protection ─────────────────
-
-  // The two overrides below are arrow-function class fields rather than
-  // prototype methods so that Protocol's constructor — which registers its
-  // own ping/cancelled/progress handlers via `this.setRequestHandler`
-  // before our fields initialize — hits the base implementation and skips
-  // tracking. Converting these to proper methods would crash with
-  // `_registeredMethods` undefined during super().
-
-  /**
-   * Registers a request handler. Throws if a handler for the same method
-   * has already been registered — use the `on*` setter (replace semantics)
-   * or `addEventListener` (multi-listener) for notification events.
-   *
-   * @throws {Error} if a handler for this method is already registered.
-   */
-  override setRequestHandler: Protocol<
-    SendRequestT,
-    SendNotificationT,
-    SendResultT
-  >["setRequestHandler"] = (schema, handler) => {
-    this._assertMethodNotRegistered(schema, "setRequestHandler");
-    super.setRequestHandler(schema, handler);
-  };
-
-  /**
-   * Registers a notification handler. Throws if a handler for the same
-   * method has already been registered — use the `on*` setter (replace
-   * semantics) or `addEventListener` (multi-listener) for mapped events.
-   *
-   * @throws {Error} if a handler for this method is already registered.
-   */
-  override setNotificationHandler: Protocol<
-    SendRequestT,
-    SendNotificationT,
-    SendResultT
-  >["setNotificationHandler"] = (schema, handler) => {
-    this._assertMethodNotRegistered(schema, "setNotificationHandler");
-    super.setNotificationHandler(schema, handler);
-  };
-
-  /**
-   * Warn if a request handler `on*` setter is replacing a previously-set
-   * handler. Call from each request setter before updating the backing field.
-   */
-  protected warnIfRequestHandlerReplaced(
-    name: string,
-    previous: unknown,
-    next: unknown,
-  ): void {
-    if (previous && next) {
-      console.warn(
-        `[MCP Apps] ${name} handler replaced. ` +
-          `Previous handler will no longer be called.`,
-      );
-    }
+/**
+ * Warn if a request-handler `on*` setter is replacing a previously-set
+ * handler. Call from each request setter before updating the backing field.
+ */
+export function warnIfRequestHandlerReplaced(
+  name: string,
+  previous: unknown,
+  next: unknown,
+): void {
+  if (previous && next) {
+    console.warn(
+      `[MCP Apps] ${name} handler replaced. ` +
+        `Previous handler will no longer be called.`,
+    );
   }
+}
 
-  /**
-   * Replace a request handler, bypassing double-set protection. Used by
-   * `on*` request-handler setters that need replace semantics.
-   */
-  protected replaceRequestHandler: Protocol<
-    SendRequestT,
-    SendNotificationT,
-    SendResultT
-  >["setRequestHandler"] = (schema, handler) => {
-    const method = (schema as MethodSchema).shape.method.value;
-    this._registeredMethods.add(method);
-    super.setRequestHandler(schema, handler);
-  };
+/**
+ * Extract the `params` Zod schema from a generated `{ method, params }` schema.
+ */
+export function paramsSchemaOf<
+  S extends { shape: { params: StandardSchemaV1 } },
+>(schema: S): S["shape"]["params"] {
+  return schema.shape.params;
+}
 
-  private _assertMethodNotRegistered(schema: unknown, via: string): void {
-    const method = (schema as MethodSchema).shape.method.value;
-    if (this._registeredMethods.has(method)) {
-      throw new Error(
-        `Handler for "${method}" already registered (via ${via}). ` +
-          `Use addEventListener() to attach multiple listeners, ` +
-          `or the on* setter for replace semantics.`,
-      );
-    }
-    this._registeredMethods.add(method);
+/**
+ * Extract the literal method string from a generated `{ method, params }` schema.
+ */
+export function methodOf<
+  S extends { shape: { method: { value?: string; values?: Set<string> } } },
+>(schema: S): string {
+  const method = schema.shape.method;
+  if (typeof method.value === "string") return method.value;
+  if (method.values && method.values.size > 0) {
+    return method.values.values().next().value as string;
   }
+  throw new Error("Could not extract method literal from schema");
 }
diff --git a/src/generated/schema.json b/src/generated/schema.json
index 80b4ac60d..5f2124a95 100644
--- a/src/generated/schema.json
+++ b/src/generated/schema.json
@@ -596,7 +596,9 @@
                           "propertyNames": {
                             "type": "string"
                           },
-                          "additionalProperties": {}
+                          "additionalProperties": {
+                            "$ref": "#/$defs/__schema0"
+                          }
                         },
                         "required": {
                           "type": "array",
@@ -611,25 +613,10 @@
                     "outputSchema": {
                       "type": "object",
                       "properties": {
-                        "type": {
-                          "type": "string",
-                          "const": "object"
-                        },
-                        "properties": {
-                          "type": "object",
-                          "propertyNames": {
-                            "type": "string"
-                          },
-                          "additionalProperties": {}
-                        },
-                        "required": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
+                        "$schema": {
+                          "type": "string"
                         }
                       },
-                      "required": ["type"],
                       "additionalProperties": {}
                     },
                     "annotations": {
@@ -1286,7 +1273,40 @@
         }
       },
       "required": ["method", "params"],
-      "additionalProperties": false
+      "additionalProperties": false,
+      "$defs": {
+        "__schema0": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            },
+            {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {
+                "$ref": "#/$defs/__schema0"
+              }
+            },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/__schema0"
+              }
+            }
+          ]
+        }
+      }
     },
     "McpUiHostContext": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1359,7 +1379,9 @@
                       "propertyNames": {
                         "type": "string"
                       },
-                      "additionalProperties": {}
+                      "additionalProperties": {
+                        "$ref": "#/$defs/__schema0"
+                      }
                     },
                     "required": {
                       "type": "array",
@@ -1374,25 +1396,10 @@
                 "outputSchema": {
                   "type": "object",
                   "properties": {
-                    "type": {
-                      "type": "string",
-                      "const": "object"
-                    },
-                    "properties": {
-                      "type": "object",
-                      "propertyNames": {
-                        "type": "string"
-                      },
-                      "additionalProperties": {}
-                    },
-                    "required": {
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      }
+                    "$schema": {
+                      "type": "string"
                     }
                   },
-                  "required": ["type"],
                   "additionalProperties": {}
                 },
                 "annotations": {
@@ -2044,7 +2051,40 @@
           "additionalProperties": false
         }
       },
-      "additionalProperties": {}
+      "additionalProperties": {},
+      "$defs": {
+        "__schema0": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            },
+            {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {
+                "$ref": "#/$defs/__schema0"
+              }
+            },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/__schema0"
+              }
+            }
+          ]
+        }
+      }
     },
     "McpUiHostCss": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -2942,7 +2982,9 @@
                           "propertyNames": {
                             "type": "string"
                           },
-                          "additionalProperties": {}
+                          "additionalProperties": {
+                            "$ref": "#/$defs/__schema0"
+                          }
                         },
                         "required": {
                           "type": "array",
@@ -2957,25 +2999,10 @@
                     "outputSchema": {
                       "type": "object",
                       "properties": {
-                        "type": {
-                          "type": "string",
-                          "const": "object"
-                        },
-                        "properties": {
-                          "type": "object",
-                          "propertyNames": {
-                            "type": "string"
-                          },
-                          "additionalProperties": {}
-                        },
-                        "required": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
+                        "$schema": {
+                          "type": "string"
                         }
                       },
-                      "required": ["type"],
                       "additionalProperties": {}
                     },
                     "annotations": {
@@ -3637,7 +3664,40 @@
         "hostCapabilities",
         "hostContext"
       ],
-      "additionalProperties": {}
+      "additionalProperties": {},
+      "$defs": {
+        "__schema0": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            },
+            {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {
+                "$ref": "#/$defs/__schema0"
+              }
+            },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/__schema0"
+              }
+            }
+          ]
+        }
+      }
     },
     "McpUiInitializedNotification": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -5669,13 +5729,7 @@
                 ]
               }
             },
-            "structuredContent": {
-              "type": "object",
-              "propertyNames": {
-                "type": "string"
-              },
-              "additionalProperties": {}
-            },
+            "structuredContent": {},
             "isError": {
               "type": "boolean"
             }
diff --git a/src/generated/schema.ts b/src/generated/schema.ts
index 43687374e..7dd746d4b 100644
--- a/src/generated/schema.ts
+++ b/src/generated/schema.ts
@@ -1,16 +1,39 @@
 // Generated by ts-to-zod
-// Post-processed for Zod v3/v4 compatibility and MCP SDK integration
+// Post-processed for Zod v3/v4 compatibility and MCP core schema integration
 // Run: npm run generate:schemas
 import { z } from "zod/v4";
+import type {
+  ContentBlock,
+  CallToolResult,
+  EmbeddedResource,
+  Implementation,
+  RequestId,
+  ResourceLink,
+  Tool,
+} from "@modelcontextprotocol/client";
 import {
-  ContentBlockSchema,
-  CallToolResultSchema,
-  EmbeddedResourceSchema,
-  ImplementationSchema,
-  RequestIdSchema,
-  ResourceLinkSchema,
-  ToolSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+  ContentBlockSchema as ContentBlockSchemaFromCore,
+  CallToolResultSchema as CallToolResultSchemaFromCore,
+  EmbeddedResourceSchema as EmbeddedResourceSchemaFromCore,
+  ImplementationSchema as ImplementationSchemaFromCore,
+  RequestIdSchema as RequestIdSchemaFromCore,
+  ResourceLinkSchema as ResourceLinkSchemaFromCore,
+  ToolSchema as ToolSchemaFromCore,
+} from "@modelcontextprotocol/core";
+
+const ContentBlockSchema: z.ZodType<ContentBlock> =
+  ContentBlockSchemaFromCore as z.ZodType<ContentBlock>;
+const CallToolResultSchema: z.ZodType<CallToolResult> =
+  CallToolResultSchemaFromCore as z.ZodType<CallToolResult>;
+const EmbeddedResourceSchema: z.ZodType<EmbeddedResource> =
+  EmbeddedResourceSchemaFromCore as z.ZodType<EmbeddedResource>;
+const ImplementationSchema: z.ZodType<Implementation> =
+  ImplementationSchemaFromCore as z.ZodType<Implementation>;
+const RequestIdSchema: z.ZodType<RequestId> =
+  RequestIdSchemaFromCore as z.ZodType<RequestId>;
+const ResourceLinkSchema: z.ZodType<ResourceLink> =
+  ResourceLinkSchemaFromCore as z.ZodType<ResourceLink>;
+const ToolSchema: z.ZodType<Tool> = ToolSchemaFromCore as z.ZodType<Tool>;
 
 /**
  * @description Color theme preference for the host environment.
diff --git a/src/message-transport-v2-compat.test.ts b/src/message-transport-v2-compat.test.ts
new file mode 100644
index 000000000..b06e5135d
--- /dev/null
+++ b/src/message-transport-v2-compat.test.ts
@@ -0,0 +1,27 @@
+import { describe, it, expect } from "bun:test";
+import type { Transport as TransportV2 } from "@modelcontextprotocol/client";
+
+import { PostMessageTransport } from "./message-transport";
+
+/**
+ * Compile-time assertion: PostMessageTransport must remain assignable to the
+ * v2 SDK `Transport` interface exported from `@modelcontextprotocol/client`.
+ * If this line errors under `tsc`, a v1/v2 shape regression was introduced.
+ */
+const _postMessageTransportIsV2Transport: TransportV2 =
+  null as unknown as PostMessageTransport;
+void _postMessageTransportIsV2Transport;
+
+describe("PostMessageTransport v2 Transport compat", () => {
+  it("exposes the v2-only optional Transport members as unset", () => {
+    // Minimal runtime smoke test so this file is not type-only empty.
+    // postMessage is a shared channel — hasPerRequestStream stays undefined.
+    const transport = new PostMessageTransport(
+      { postMessage() {} } as unknown as Window,
+      {} as MessageEventSource,
+    );
+
+    expect(transport.hasPerRequestStream).toBeUndefined();
+    expect(transport.setSupportedProtocolVersions).toBeUndefined();
+  });
+});
diff --git a/src/message-transport.test.ts b/src/message-transport.test.ts
index d5f509204..2a115f3f9 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/message-transport.ts b/src/message-transport.ts
index 9d195435a..160a31360 100644
--- a/src/message-transport.ts
+++ b/src/message-transport.ts
@@ -1,12 +1,10 @@
 import {
-  JSONRPCMessage,
-  JSONRPCMessageSchema,
-  MessageExtraInfo,
-} from "@modelcontextprotocol/sdk/types.js";
-import {
-  Transport,
-  TransportSendOptions,
-} from "@modelcontextprotocol/sdk/shared/transport.js";
+  type JSONRPCMessage,
+  type MessageExtraInfo,
+  type Transport,
+  type TransportSendOptions,
+} from "@modelcontextprotocol/client";
+import { JSONRPCMessageSchema } from "@modelcontextprotocol/core";
 import { TOOL_INPUT_PARTIAL_METHOD } from "./spec.types";
 
 /**
@@ -14,7 +12,12 @@ import { TOOL_INPUT_PARTIAL_METHOD } from "./spec.types";
  *
  * This transport enables bidirectional communication between MCP Apps running in
  * iframes and their host applications using the browser's `postMessage` API. It
- * implements the MCP SDK's `Transport` interface.
+ * implements the MCP TypeScript SDK `Transport` interface from
+ * `@modelcontextprotocol/client` (also used by `@modelcontextprotocol/server`).
+ * Optional v2 members ({@link hasPerRequestStream},
+ * {@link setSupportedProtocolVersions}) and extended
+ * {@link TransportSendOptions} fields are accepted but unused — postMessage is
+ * a shared single channel, not a per-request HTTP stream.
  *
  * ## Security
  *
@@ -121,9 +124,20 @@ export class PostMessageTransport implements Transport {
    * to all frames. The receiver should validate the message source for security.
    *
    * @param message - JSON-RPC message to send
-   * @param options - Optional send options (currently unused)
+   * @param options - Optional send options (accepted for v1/v2 SDK compatibility;
+   *   unused — postMessage has no per-request stream or HTTP headers)
    */
-  async send(message: JSONRPCMessage, options?: TransportSendOptions) {
+  async send(
+    message: JSONRPCMessage,
+    // Widen beyond v1 TransportSendOptions so callers using the v2 SDK can pass
+    // requestSignal / onRequestStreamEnd / headers without type errors. All are
+    // ignored: this transport shares one postMessage channel.
+    options?: TransportSendOptions & {
+      requestSignal?: AbortSignal;
+      onRequestStreamEnd?: () => void;
+      headers?: Readonly<Record<string, string>>;
+    },
+  ) {
     // Skip debug log for high-frequency streaming notifications — these
     // can fire dozens of times per second and flood the console.
     if ((message as { method?: string }).method !== TOOL_INPUT_PARTIAL_METHOD) {
@@ -187,4 +201,18 @@ export class PostMessageTransport implements Transport {
    * @param version - The negotiated protocol version string
    */
   setProtocolVersion?: (version: string) => void;
+
+  /**
+   * v2 SDK: `true` when the transport opens one underlying request per outbound
+   * JSON-RPC message (Streamable HTTP POST-per-request). Left unset — postMessage
+   * shares a single channel, so per-request abort/stream options are ignored.
+   */
+  readonly hasPerRequestStream?: boolean;
+
+  /**
+   * v2 SDK: sets supported protocol versions for transport-level header
+   * validation. Optional no-op hook for hosts that call it during connect;
+   * postMessage has no HTTP version headers to validate.
+   */
+  setSupportedProtocolVersions?: (versions: string[]) => void;
 }
diff --git a/src/react/useApp.tsx b/src/react/useApp.tsx
index 61892464a..0e64a74d6 100644
--- a/src/react/useApp.tsx
+++ b/src/react/useApp.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from "react";
-import { Implementation } from "@modelcontextprotocol/sdk/types.js";
-import { Client } from "@modelcontextprotocol/sdk/client";
+import type { Implementation } from "@modelcontextprotocol/client";
 import {
   App,
   AppOptions,
diff --git a/src/server/index.examples.ts b/src/server/index.examples.ts
index d583ae85c..40c714277 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
diff --git a/src/server/index.test.ts b/src/server/index.test.ts
index 1853cc05a..5de341f9e 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 c90514acd..fb9e7cdb7 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -40,28 +40,53 @@ import {
   McpUiClientCapabilities,
 } from "../app.js";
 import type {
-  BaseToolCallback,
+  CallToolResult,
+  ClientCapabilities,
+  InputRequiredResult,
   McpServer,
+  ReadResourceCallback as _ReadResourceCallback,
+  ReadResourceResult,
+  RegisteredResource,
   RegisteredTool,
   ResourceMetadata,
+  ServerContext,
+  ToolAnnotations,
   ToolCallback,
-  ReadResourceCallback as _ReadResourceCallback,
-  RegisteredResource,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
-import type {
-  AnySchema,
-  ZodRawShapeCompat,
-} from "@modelcontextprotocol/sdk/server/zod-compat.js";
+} from "@modelcontextprotocol/server";
+import type { z } from "zod";
 import type { StandardSchemaWithJSON } from "../standard-schema";
-import type {
-  ClientCapabilities,
-  ReadResourceResult,
-  ToolAnnotations,
-} from "@modelcontextprotocol/sdk/types.js";
+
+/**
+ * Plain record of Zod field schemas (e.g. `{ name: z.string() }`).
+ *
+ * Matches the deprecated raw-shape form accepted by v2 `McpServer.registerTool`
+ * (auto-wrapped with `z.object()`). Not re-exported from
+ * `@modelcontextprotocol/server`, so defined locally.
+ */
+type ZodRawShape = Record<string, z.ZodType>;
+
+type InferRawShape<S extends ZodRawShape> = z.infer<z.ZodObject<S>>;
+
+type ToolHandlerResult =
+  | CallToolResult
+  | InputRequiredResult
+  | Promise<CallToolResult | InputRequiredResult>;
+
+/**
+ * Tool handler accepting either a Standard Schema `inputSchema` or a deprecated
+ * Zod raw-shape `inputSchema` (same dual form as v2 `McpServer.registerTool`).
+ */
+type AppToolCallback<
+  Args extends undefined | ZodRawShape | StandardSchemaWithJSON,
+> = Args extends StandardSchemaWithJSON
+  ? ToolCallback<Args>
+  : Args extends ZodRawShape
+    ? (args: InferRawShape<Args>, ctx: ServerContext) => ToolHandlerResult
+    : ToolCallback<undefined>;
 
 // Re-exports for convenience
 export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE };
-export type { ResourceMetadata, ToolCallback };
+export type { McpServer, ResourceMetadata, ToolCallback };
 
 /**
  * Base tool configuration matching the standard MCP server tool options.
@@ -70,8 +95,8 @@ export type { ResourceMetadata, ToolCallback };
 export interface ToolConfig {
   title?: string;
   description?: string;
-  inputSchema?: ZodRawShapeCompat | StandardSchemaWithJSON;
-  outputSchema?: ZodRawShapeCompat | StandardSchemaWithJSON;
+  inputSchema?: ZodRawShape | StandardSchemaWithJSON;
+  outputSchema?: ZodRawShape | StandardSchemaWithJSON;
   annotations?: ToolAnnotations;
   _meta?: Record<string, unknown>;
 }
@@ -215,8 +240,8 @@ export interface McpUiAppResourceConfig extends ResourceMetadata {
  * @see {@link registerAppResource `registerAppResource`} to register the HTML resource referenced by the tool
  */
 export function registerAppTool<
-  OutputArgs extends ZodRawShapeCompat | StandardSchemaWithJSON,
-  InputArgs extends undefined | ZodRawShapeCompat | StandardSchemaWithJSON =
+  OutputArgs extends ZodRawShape | StandardSchemaWithJSON,
+  InputArgs extends undefined | ZodRawShape | StandardSchemaWithJSON =
     undefined,
 >(
   server: Pick<McpServer, "registerTool">,
@@ -225,15 +250,7 @@ export function registerAppTool<
     inputSchema?: InputArgs;
     outputSchema?: OutputArgs;
   },
-  // The widened constraint signals the v2 API shape, but NOTE: McpServer in
-  // sdk@1.x still calls zod internals at runtime, so non-zod schemas will fail
-  // here until we depend on sdk v2. Zod (which all current callers use) is
-  // unaffected. The cast below bridges the 1.x type signature.
-  cb: ToolCallback<
-    InputArgs extends undefined | ZodRawShapeCompat | AnySchema
-      ? InputArgs
-      : AnySchema
-  >,
+  cb: AppToolCallback<InputArgs>,
 ): RegisteredTool {
   // Normalize metadata for backward compatibility:
   // - If _meta.ui.resourceUri is set, also set the legacy flat key
@@ -251,8 +268,8 @@ export function registerAppTool<
     normalizedMeta = { ...meta, ui: { ...uiMeta, resourceUri: legacyUri } };
   }
 
-  // Cast bridges the widened StandardSchemaWithJSON constraint to the
-  // sdk@1.x zod-typed signature. Drops once we depend on sdk v2.
+  // Cast bridges Standard Schema vs deprecated Zod raw-shape overloads on
+  // McpServer.registerTool (same dual form the SDK itself uses internally).
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return server.registerTool(
     name,
@@ -269,7 +286,7 @@ export type McpUiReadResourceResult = ReadResourceResult & {
 };
 export type McpUiReadResourceCallback = (
   uri: URL,
-  extra: Parameters<_ReadResourceCallback>[1],
+  ctx: Parameters<_ReadResourceCallback>[1],
 ) => McpUiReadResourceResult | Promise<McpUiReadResourceResult>;
 export type ReadResourceCallback = McpUiReadResourceCallback;
 
diff --git a/src/spec.types.ts b/src/spec.types.ts
index 7a8b33761..5a6470184 100644
--- a/src/spec.types.ts
+++ b/src/spec.types.ts
@@ -18,7 +18,7 @@ import type {
   RequestId,
   ResourceLink,
   Tool,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 
 /**
  * Current protocol version supported by this SDK.
diff --git a/src/test-transport-harness.ts b/src/test-transport-harness.ts
new file mode 100644
index 000000000..934530cee
--- /dev/null
+++ b/src/test-transport-harness.ts
@@ -0,0 +1,108 @@
+/**
+ * Shared test harness for view↔host transport pairs.
+ *
+ * Used by the v2 migration spike and Phase 3 invariant regression tests.
+ * Prefer {@link createLinkedPostMessagePair} when exercising production
+ * PostMessageTransport wiring; fall back to InMemoryTransport for speed.
+ */
+import type { JSONRPCMessage, Transport } from "@modelcontextprotocol/client";
+
+import { PostMessageTransport } from "./message-transport";
+
+export type Listener = (event: MessageEvent) => void;
+
+/** Minimal `window` stub for bun's DOM-less test environment. */
+export function createFakeWindow() {
+  const listeners = new Map<string, Set<Listener>>();
+  return {
+    addEventListener(type: string, listener: Listener) {
+      if (!listeners.has(type)) listeners.set(type, new Set());
+      listeners.get(type)!.add(listener);
+    },
+    removeEventListener(type: string, listener: Listener) {
+      listeners.get(type)?.delete(listener);
+    },
+    dispatch(type: string, event: unknown) {
+      listeners.get(type)?.forEach((l) => l(event as MessageEvent));
+    },
+  };
+}
+
+/**
+ * Two PostMessageTransports sharing one fake `window`, cross-wired so each
+ * side's postMessage arrives as a MessageEvent with the peer as `source`.
+ */
+export function createLinkedPostMessagePair(): {
+  viewTransport: PostMessageTransport;
+  hostTransport: PostMessageTransport;
+} {
+  const viewWindow = { id: "view" };
+  const hostWindow = { id: "host" };
+
+  const hostAsTarget = {
+    postMessage(data: unknown) {
+      (
+        globalThis as unknown as { window: ReturnType<typeof createFakeWindow> }
+      ).window.dispatch("message", { source: viewWindow, data });
+    },
+  };
+  const viewAsTarget = {
+    postMessage(data: unknown) {
+      (
+        globalThis as unknown as { window: ReturnType<typeof createFakeWindow> }
+      ).window.dispatch("message", { source: hostWindow, data });
+    },
+  };
+
+  const viewTransport = new PostMessageTransport(
+    hostAsTarget as unknown as Window,
+    hostWindow as unknown as MessageEventSource,
+  );
+  const hostTransport = new PostMessageTransport(
+    viewAsTarget as unknown as Window,
+    viewWindow as unknown as MessageEventSource,
+  );
+
+  return { viewTransport, hostTransport };
+}
+
+export type ProtocolVersionCapture = {
+  versions: string[];
+};
+
+/** Spy `transport.setProtocolVersion` and record every call. */
+export function captureProtocolVersion(
+  transport: Transport,
+): ProtocolVersionCapture {
+  const versions: string[] = [];
+  const previous = transport.setProtocolVersion?.bind(transport);
+  transport.setProtocolVersion = (version: string) => {
+    versions.push(version);
+    previous?.(version);
+  };
+  return { versions };
+}
+
+export type WireCapture = {
+  messages: JSONRPCMessage[];
+  methods: () => Array<string | undefined>;
+};
+
+/** Spy `transport.send` and record every outbound JSON-RPC message. */
+export function captureWire(transport: Transport): WireCapture {
+  const messages: JSONRPCMessage[] = [];
+  const previous = transport.send.bind(transport);
+  transport.send = async (message, options) => {
+    messages.push(message);
+    return previous(message, options);
+  };
+  return {
+    messages,
+    methods: () =>
+      messages
+        .map((m) =>
+          "method" in m ? (m.method as string | undefined) : undefined,
+        )
+        .filter((m): m is string => typeof m === "string"),
+  };
+}
diff --git a/src/types.ts b/src/types.ts
index 7fc6b7188..578721004 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -136,8 +136,34 @@ export {
   McpUiToolMetaSchema,
 } from "./generated/schema.js";
 
-// Re-export SDK types used in protocol type unions
-import {
+// Re-export MCP protocol types used in AppRequest/AppNotification/AppResult unions
+import type {
+  CallToolRequest,
+  CallToolResult,
+  CreateMessageRequest,
+  CreateMessageResult,
+  CreateMessageResultWithTools,
+  EmptyResult,
+  ListPromptsRequest,
+  ListPromptsResult,
+  ListResourcesRequest,
+  ListResourcesResult,
+  ListResourceTemplatesRequest,
+  ListResourceTemplatesResult,
+  ListToolsRequest,
+  ListToolsResult,
+  LoggingMessageNotification,
+  PingRequest,
+  PromptListChangedNotification,
+  ReadResourceRequest,
+  ReadResourceResult,
+  ResourceListChangedNotification,
+  Tool,
+  ToolAnnotations,
+  ToolListChangedNotification,
+} from "@modelcontextprotocol/client";
+
+export type {
   CallToolRequest,
   CallToolResult,
   CreateMessageRequest,
@@ -158,8 +184,10 @@ import {
   ReadResourceRequest,
   ReadResourceResult,
   ResourceListChangedNotification,
+  Tool,
+  ToolAnnotations,
   ToolListChangedNotification,
-} from "@modelcontextprotocol/sdk/types.js";
+};
 
 /**
  * All request types in the MCP Apps protocol.
diff --git a/src/v2-invariants.test.ts b/src/v2-invariants.test.ts
new file mode 100644
index 000000000..1e0fb0a7f
--- /dev/null
+++ b/src/v2-invariants.test.ts
@@ -0,0 +1,233 @@
+/**
+ * Phase 3 regression guards for the v2 SDK migration.
+ *
+ * Load-bearing invariant: the view↔host iframe link must NEVER negotiate an
+ * MCP protocol version. App.connect() sets a synthetic transport.sessionId
+ * before super.connect() so v2 Client.connect() takes the session-resumption
+ * path and skips MCP initialize. If a modern (2026-07-28) era were negotiated,
+ * Client._shouldDropInbound would silently drop ALL inbound requests on App.
+ *
+ * Coverage note (vs src/app-bridge.test.ts):
+ * - Teardown round-trips, bridge→app ping, registerTool/listTools/callTool,
+ *   and createSamplingMessage are already covered there — not duplicated here.
+ * - This file focuses on the no-negotiation CI guard, the missing app→bridge
+ *   ping direction, App→bridge tools/list_changed, and the modern-era drop
+ *   canary (bare Client, not App).
+ */
+import { describe, it, expect, beforeEach, afterEach } from "bun:test";
+import {
+  Client,
+  InMemoryTransport,
+  type DiscoverResult,
+  type Transport,
+} from "@modelcontextprotocol/client";
+
+import { App } from "./app";
+import { AppBridge, type McpUiHostCapabilities } from "./app-bridge";
+import {
+  captureProtocolVersion,
+  captureWire,
+  createFakeWindow,
+  createLinkedPostMessagePair,
+} from "./test-transport-harness";
+
+const flush = () => new Promise((resolve) => setTimeout(resolve, 20));
+
+const testHostInfo = { name: "InvariantHost", version: "1.0.0" };
+const testAppInfo = { name: "InvariantApp", version: "1.0.0" };
+const testHostCapabilities: McpUiHostCapabilities = {
+  openLinks: {},
+  serverTools: {},
+  logging: {},
+};
+
+/** Modern protocol revision that arms Client._shouldDropInbound. */
+const MODERN_PROTOCOL_VERSION = "2026-07-28";
+
+function modernPrior(): DiscoverResult {
+  return {
+    supportedVersions: [MODERN_PROTOCOL_VERSION],
+    capabilities: {},
+    serverInfo: { name: "canary-server", version: "1.0.0" },
+  };
+}
+
+// ---------------------------------------------------------------------------
+// 1. No-negotiation invariant (CI guard) — real App + AppBridge
+// ---------------------------------------------------------------------------
+
+describe("v2 invariants — no MCP negotiation on App↔AppBridge", () => {
+  let restoreConsole: () => void;
+  let app: App;
+  let bridge: AppBridge;
+  let viewTransport: Transport;
+  let hostTransport: Transport;
+  let viewWire: ReturnType<typeof captureWire>;
+  let hostWire: ReturnType<typeof captureWire>;
+  let viewVersions: string[];
+  let hostVersions: string[];
+
+  beforeEach(async () => {
+    (globalThis as { window?: unknown }).window = createFakeWindow();
+    const origDebug = console.debug;
+    const origError = console.error;
+    console.debug = () => {};
+    console.error = () => {};
+    restoreConsole = () => {
+      console.debug = origDebug;
+      console.error = origError;
+    };
+
+    const pair = createLinkedPostMessagePair();
+    viewTransport = pair.viewTransport as unknown as Transport;
+    hostTransport = pair.hostTransport as unknown as Transport;
+
+    viewWire = captureWire(viewTransport);
+    hostWire = captureWire(hostTransport);
+    viewVersions = captureProtocolVersion(viewTransport).versions;
+    hostVersions = captureProtocolVersion(hostTransport).versions;
+
+    app = new App(
+      testAppInfo,
+      { tools: { listChanged: true } },
+      { autoResize: false },
+    );
+    bridge = new AppBridge(null, testHostInfo, testHostCapabilities);
+
+    await bridge.connect(hostTransport);
+    await app.connect(viewTransport);
+  });
+
+  afterEach(async () => {
+    await app.close().catch(() => {});
+    await bridge.close().catch(() => {});
+    restoreConsole();
+    delete (globalThis as { window?: unknown }).window;
+  });
+
+  it("keeps negotiated protocol version undefined after ui/initialize", () => {
+    expect(app.getNegotiatedProtocolVersion()).toBeUndefined();
+    expect(app.getServerCapabilities()).toBeUndefined();
+    expect(bridge.getNegotiatedProtocolVersion()).toBeUndefined();
+    expect(bridge.getClientCapabilities()).toBeUndefined();
+  });
+
+  it("never sends MCP initialize or notifications/initialized on the wire", () => {
+    const methods = [...viewWire.methods(), ...hostWire.methods()];
+
+    expect(methods).toContain("ui/initialize");
+    expect(methods).toContain("ui/notifications/initialized");
+    expect(methods).not.toContain("initialize");
+    expect(methods).not.toContain("notifications/initialized");
+    expect(methods).not.toContain("server/discover");
+  });
+
+  it("never calls transport.setProtocolVersion", () => {
+    expect(viewVersions).toEqual([]);
+    expect(hostVersions).toEqual([]);
+  });
+
+  it("still delivers host→view tools/call (drop hazard not armed)", async () => {
+    app.registerTool("echo", {}, async () => ({
+      content: [{ type: "text" as const, text: "pong-tool" }],
+    }));
+
+    const list = await bridge.listTools({});
+    expect(list.tools.map((t) => t.name)).toContain("echo");
+
+    const result = await bridge.callTool({ name: "echo", arguments: {} });
+    expect(result.content).toEqual([{ type: "text", text: "pong-tool" }]);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Gaps vs app-bridge.test.ts: app→bridge ping + App→bridge list_changed
+// ---------------------------------------------------------------------------
+
+describe("v2 invariants — coverage gaps (App↔AppBridge)", () => {
+  let app: App;
+  let bridge: AppBridge;
+  let appTransport: InMemoryTransport;
+  let bridgeTransport: InMemoryTransport;
+
+  beforeEach(async () => {
+    [appTransport, bridgeTransport] = InMemoryTransport.createLinkedPair();
+    app = new App(
+      testAppInfo,
+      { tools: { listChanged: true } },
+      { autoResize: false },
+    );
+    bridge = new AppBridge(null, testHostInfo, testHostCapabilities);
+    await bridge.connect(bridgeTransport);
+    await app.connect(appTransport);
+  });
+
+  afterEach(async () => {
+    await appTransport.close();
+    await bridgeTransport.close();
+  });
+
+  it("app.ping() round-trips to the bridge (app→bridge direction)", async () => {
+    // bridge→app ping is covered in app-bridge.test.ts; this is the reverse.
+    const result = await app.ping();
+    expect(result).toEqual({});
+  });
+
+  it("notifications/tools/list_changed from App reaches the bridge", async () => {
+    let listChangedHits = 0;
+    bridge.setNotificationHandler("notifications/tools/list_changed", () => {
+      listChangedHits += 1;
+    });
+
+    const tool = app.registerTool("changing", {}, async () => ({
+      content: [],
+    }));
+    await flush();
+    // registerTool notifies when already initialized.
+    expect(listChangedHits).toBeGreaterThanOrEqual(1);
+
+    const afterRegister = listChangedHits;
+    tool.disable();
+    await flush();
+    expect(listChangedHits).toBeGreaterThan(afterRegister);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// 6. Drop-hazard canary — documents the danger App.connect() avoids
+// ---------------------------------------------------------------------------
+
+describe("v2 invariants — modern-era inbound drop canary", () => {
+  it("connect({ prior }) modern era drops inbound requests (onerror)", async () => {
+    // Public API only: ConnectOptions.prior adopts a DiscoverResult and sets
+    // _negotiatedProtocolVersion to a modern revision without poking privates.
+    // Against a live v2 Server, versionNegotiation:'auto' also works, but
+    // prior is the zero-round-trip public path that deterministically arms
+    // the drop (see typescript-sdk modernEraInboundDrop.test.ts).
+    const [clientTx, serverTx] = InMemoryTransport.createLinkedPair();
+    const client = new Client({ name: "drop-canary", version: "1.0.0" });
+    const errors: Error[] = [];
+    client.onerror = (error) => {
+      errors.push(error);
+    };
+
+    await client.connect(clientTx, { prior: modernPrior() });
+    expect(client.getNegotiatedProtocolVersion()).toBe(MODERN_PROTOCOL_VERSION);
+
+    // Misbehaving "modern" peer sends a server→client request. The channel
+    // is deleted in the 2026 era — Client must drop it, not answer.
+    await serverTx.send({
+      jsonrpc: "2.0",
+      id: "rogue-1",
+      method: "ping",
+      params: {},
+    });
+    await flush();
+
+    expect(
+      errors.some((e) => e.message.includes("Dropped inbound request")),
+    ).toBe(true);
+
+    await client.close();
+  });
+});
diff --git a/src/v2-migration-spike.test.ts b/src/v2-migration-spike.test.ts
new file mode 100644
index 000000000..fc3786a9d
--- /dev/null
+++ b/src/v2-migration-spike.test.ts
@@ -0,0 +1,371 @@
+/**
+ * Phase 0 gating spike: migrate ext-apps View/Host JSON-RPC off v1 SDK onto
+ * v2 `@modelcontextprotocol/client` + `@modelcontextprotocol/server` WITHOUT
+ * ever negotiating an MCP protocol version on the view↔host link.
+ *
+ * Background (v2 Client, packages/client/src/client/client.ts):
+ * - `Client.connect()` always runs MCP `initialize` (legacy) or `server/discover`
+ *   (auto/pin) unless a reconnect path is taken.
+ * - `Client._shouldDropInbound` silently drops ALL inbound requests when
+ *   `_negotiatedProtocolVersion` is a modern (2026-07-28) version. If the
+ *   negotiated version stays `undefined`, the drop never arms.
+ *
+ * Strategy under test (public API only — no protected/private overrides):
+ * set `transport.sessionId` before `Client.connect()`. Documented in
+ * typescript-sdk `docs/migration/upgrade-to-v2.md` ("connect() skips the
+ * initialize handshake when the transport already exposes a sessionId").
+ *
+ * Transport: published `InMemoryTransport` from `@modelcontextprotocol/client`
+ * (also re-exported by `@modelcontextprotocol/server`). Additionally exercises
+ * ext-apps `PostMessageTransport` with the fake-window harness from
+ * `message-transport.test.ts`.
+ */
+import { describe, it, expect, beforeEach, afterEach } from "bun:test";
+import {
+  Client,
+  InMemoryTransport,
+  type Transport,
+} from "@modelcontextprotocol/client";
+import { Server } from "@modelcontextprotocol/server";
+import { z } from "zod";
+
+import {
+  captureProtocolVersion,
+  createFakeWindow,
+  createLinkedPostMessagePair,
+} from "./test-transport-harness";
+
+// ---------------------------------------------------------------------------
+// Custom method schemas (vendor-prefixed; 3-arg setRequestHandler / request)
+// ---------------------------------------------------------------------------
+
+const UiInitializeParams = z.object({
+  appInfo: z.object({ name: z.string(), version: z.string() }),
+});
+const UiInitializeResult = z.object({
+  hostCapabilities: z.object({ openLinks: z.boolean().optional() }).optional(),
+});
+
+const UiResourceTeardownParams = z.object({
+  reason: z.string(),
+});
+const UiResourceTeardownResult = z.object({
+  closed: z.literal(true),
+});
+
+// ---------------------------------------------------------------------------
+// Subclasses — public API only (no underscore / protected overrides)
+// ---------------------------------------------------------------------------
+
+class SpikeAppClient extends Client {
+  /** Counts how many times the ui/resource-teardown handler ran. */
+  teardownHits = 0;
+  pingHits = 0;
+  toolsCallHits = 0;
+
+  wireHostFacingHandlers(): void {
+    this.setRequestHandler(
+      "ui/resource-teardown",
+      { params: UiResourceTeardownParams, result: UiResourceTeardownResult },
+      async (params) => {
+        this.teardownHits += 1;
+        expect(params.reason).toBeTruthy();
+        return { closed: true as const };
+      },
+    );
+
+    // Spec method — 2-arg form (no schema bundle).
+    this.setRequestHandler("ping", async () => {
+      this.pingHits += 1;
+      return {};
+    });
+
+    // Host also sends tools/call toward the view in production; confirm the
+    // Client will accept a handler and answer without MCP initialize.
+    this.setRequestHandler("tools/call", async (request) => {
+      this.toolsCallHits += 1;
+      return {
+        content: [
+          {
+            type: "text" as const,
+            text: `called:${String(request.params.name)}`,
+          },
+        ],
+      };
+    });
+  }
+}
+
+class SpikeAppServer extends Server {
+  wireViewFacingHandlers(): void {
+    this.setRequestHandler(
+      "ui/initialize",
+      { params: UiInitializeParams, result: UiInitializeResult },
+      async (params) => {
+        expect(params.appInfo.name).toBeTruthy();
+        return { hostCapabilities: { openLinks: true } };
+      },
+    );
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Public escape hatch: pretends this is a session resume so Client.connect
+ * attaches the transport via Protocol.connect and returns WITHOUT running
+ * `_legacyHandshake` / `_connectNegotiated`.
+ *
+ * Source: Client.connect sessionId branch
+ * (typescript-sdk packages/client/src/client/client.ts ~941–952).
+ */
+function skipMcpInitialize(transport: Transport): void {
+  transport.sessionId = transport.sessionId ?? "ext-apps-spike-no-mcp-init";
+}
+
+async function connectWithoutMcpInitialize(
+  client: SpikeAppClient,
+  server: SpikeAppServer,
+  clientTransport: Transport,
+  serverTransport: Transport,
+): Promise<{ clientVersions: string[]; serverVersions: string[] }> {
+  const clientCapture = captureProtocolVersion(clientTransport);
+  const serverCapture = captureProtocolVersion(serverTransport);
+
+  skipMcpInitialize(clientTransport);
+
+  client.wireHostFacingHandlers();
+  server.wireViewFacingHandlers();
+
+  // Server.connect is Protocol.connect (Server does not override) — attach only.
+  await server.connect(serverTransport);
+  await client.connect(clientTransport);
+
+  return {
+    clientVersions: clientCapture.versions,
+    serverVersions: serverCapture.versions,
+  };
+}
+
+async function assertNoNegotiationRoundTrip(
+  client: SpikeAppClient,
+  server: SpikeAppServer,
+  protocolVersionsSet: string[],
+): Promise<void> {
+  // Q2: negotiated version / capabilities stay undefined; setProtocolVersion never fired.
+  expect(client.getServerCapabilities()).toBeUndefined();
+  expect(client.getNegotiatedProtocolVersion()).toBeUndefined();
+  expect(server.getClientCapabilities()).toBeUndefined();
+  expect(server.getNegotiatedProtocolVersion()).toBeUndefined();
+  expect(protocolVersionsSet).toEqual([]);
+
+  // Custom ui/initialize: client → server (replaces MCP initialize for Apps).
+  const initResult = await client.request(
+    {
+      method: "ui/initialize",
+      params: { appInfo: { name: "spike-app", version: "0.0.0" } },
+    },
+    UiInitializeResult,
+  );
+  expect(initResult).toEqual({ hostCapabilities: { openLinks: true } });
+
+  // Still no MCP negotiation after custom handshake.
+  expect(client.getNegotiatedProtocolVersion()).toBeUndefined();
+  expect(server.getNegotiatedProtocolVersion()).toBeUndefined();
+  expect(protocolVersionsSet).toEqual([]);
+
+  // Server → client custom request must REACH the Client handler.
+  const teardown = await server.request(
+    {
+      method: "ui/resource-teardown",
+      params: { reason: "unmount" },
+    },
+    UiResourceTeardownResult,
+  );
+  expect(teardown).toEqual({ closed: true });
+  expect(client.teardownHits).toBe(1);
+
+  // Server → client ping (spec method).
+  const pingResult = await server.ping();
+  expect(pingResult).toEqual({});
+  expect(client.pingHits).toBe(1);
+
+  // Server → client tools/call (spec method the host proxies in production).
+  const toolResult = await server.request({
+    method: "tools/call",
+    params: { name: "demo", arguments: {} },
+  });
+  expect(toolResult).toMatchObject({
+    content: [{ type: "text", text: "called:demo" }],
+  });
+  expect(client.toolsCallHits).toBe(1);
+}
+
+// ---------------------------------------------------------------------------
+// Q1 — Does Client.connect auto-send MCP initialize?
+// ---------------------------------------------------------------------------
+
+describe("v2 migration spike — Q1 Client.connect initialize behavior", () => {
+  it("auto-sends MCP initialize on a fresh connect (no public skip option on ConnectOptions)", async () => {
+    const [clientTransport, serverTransport] =
+      InMemoryTransport.createLinkedPair();
+
+    const outbound: Array<{ method?: string }> = [];
+    const originalSend = clientTransport.send.bind(clientTransport);
+    clientTransport.send = async (message, options) => {
+      outbound.push(message as { method?: string });
+      return originalSend(message, options);
+    };
+
+    const client = new Client({ name: "q1-client", version: "1.0.0" });
+    const server = new Server(
+      { name: "q1-server", version: "1.0.0" },
+      { capabilities: {} },
+    );
+
+    await server.connect(serverTransport);
+    await client.connect(clientTransport);
+
+    const methods = outbound.map((m) => m.method).filter(Boolean);
+    expect(methods).toContain("initialize");
+    expect(methods).toContain("notifications/initialized");
+    expect(client.getNegotiatedProtocolVersion()).toBeDefined();
+    expect(client.getServerCapabilities()).toBeDefined();
+
+    // Documented public ConnectOptions / ClientOptions surface (no skipInitialize):
+    // - ConnectOptions.prior → adopts DiscoverResult (SETS modern negotiated version)
+    // - ClientOptions.versionNegotiation → 'legacy' | 'auto' | { pin } (all handshake)
+    // - transport.sessionId already set → reconnect path skips handshake (see next test)
+    await client.close();
+    await server.close();
+  });
+
+  it("skips MCP initialize when transport.sessionId is already set (documented reconnect guard)", async () => {
+    const [clientTransport, serverTransport] =
+      InMemoryTransport.createLinkedPair();
+
+    const outbound: Array<{ method?: string }> = [];
+    const originalSend = clientTransport.send.bind(clientTransport);
+    clientTransport.send = async (message, options) => {
+      outbound.push(message as { method?: string });
+      return originalSend(message, options);
+    };
+
+    clientTransport.sessionId = "preexisting-session";
+
+    const client = new Client({ name: "q1-skip-client", version: "1.0.0" });
+    const server = new Server(
+      { name: "q1-skip-server", version: "1.0.0" },
+      { capabilities: {} },
+    );
+
+    await server.connect(serverTransport);
+    await client.connect(clientTransport);
+
+    const methods = outbound.map((m) => m.method).filter(Boolean);
+    expect(methods).not.toContain("initialize");
+    expect(methods).not.toContain("server/discover");
+    expect(client.getNegotiatedProtocolVersion()).toBeUndefined();
+    expect(client.getServerCapabilities()).toBeUndefined();
+
+    await client.close();
+    await server.close();
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Q2 + Q3 — no-negotiation custom handshake + server→client requests
+// ---------------------------------------------------------------------------
+
+describe("v2 migration spike — Q2/Q3 no-negotiation strategy (InMemoryTransport)", () => {
+  it("exchanges ui/initialize then delivers server→client ui/resource-teardown + ping without MCP initialize", async () => {
+    const [clientTransport, serverTransport] =
+      InMemoryTransport.createLinkedPair();
+
+    const client = new SpikeAppClient({
+      name: "spike-view",
+      version: "0.0.0",
+    });
+    const server = new SpikeAppServer(
+      { name: "spike-host", version: "0.0.0" },
+      { capabilities: {} },
+    );
+
+    const { clientVersions, serverVersions } =
+      await connectWithoutMcpInitialize(
+        client,
+        server,
+        clientTransport,
+        serverTransport,
+      );
+
+    await assertNoNegotiationRoundTrip(client, server, [
+      ...clientVersions,
+      ...serverVersions,
+    ]);
+
+    // Q3: Server accepted inbound ui/initialize and sent outbound requests with
+    // getClientCapabilities() still undefined — no v1-style "must initialize"
+    // gate on Server.request / inbound custom handlers.
+    expect(server.getClientCapabilities()).toBeUndefined();
+
+    await client.close();
+    await server.close();
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Same checks over PostMessageTransport (fake-window harness)
+// ---------------------------------------------------------------------------
+
+describe("v2 migration spike — PostMessageTransport (fake window)", () => {
+  let restoreConsole: () => void;
+
+  beforeEach(() => {
+    (globalThis as { window?: unknown }).window = createFakeWindow();
+    const origDebug = console.debug;
+    const origError = console.error;
+    console.debug = () => {};
+    console.error = () => {};
+    restoreConsole = () => {
+      console.debug = origDebug;
+      console.error = origError;
+    };
+  });
+
+  afterEach(() => {
+    restoreConsole();
+    delete (globalThis as { window?: unknown }).window;
+  });
+
+  it("same no-negotiation round-trip over PostMessageTransport", async () => {
+    const { viewTransport, hostTransport } = createLinkedPostMessagePair();
+
+    const client = new SpikeAppClient({
+      name: "spike-view-pm",
+      version: "0.0.0",
+    });
+    const server = new SpikeAppServer(
+      { name: "spike-host-pm", version: "0.0.0" },
+      { capabilities: {} },
+    );
+
+    const { clientVersions, serverVersions } =
+      await connectWithoutMcpInitialize(
+        client,
+        server,
+        viewTransport as unknown as Transport,
+        hostTransport as unknown as Transport,
+      );
+
+    await assertNoNegotiationRoundTrip(client, server, [
+      ...clientVersions,
+      ...serverVersions,
+    ]);
+
+    await client.close();
+    await server.close();
+  });
+});
diff --git a/typedoc.config.mjs b/typedoc.config.mjs
index 4c5baa320..5f6d9e2ba 100644
--- a/typedoc.config.mjs
+++ b/typedoc.config.mjs
@@ -1,5 +1,8 @@
 import { OptionDefaults } from "typedoc";
 
+/** MCP TypeScript SDK v2 documentation site (per-symbol pages not available). */
+const V2_SDK_DOCS = "https://ts.sdk.modelcontextprotocol.io/v2/";
+
 /** @type {Partial<import('typedoc').TypeDocOptions>} */
 const config = {
   name: "MCP Apps",
@@ -28,7 +31,38 @@ const config = {
   ],
   excludePrivate: true,
   excludeInternal: false,
-  intentionallyNotExported: ["MethodSchema", "RequestHandlerExtra"],
+  intentionallyNotExported: [
+    "src/server/index.ts:ZodRawShape",
+    "src/server/index.ts:AppToolCallback",
+  ],
+  // v2 SDK symbols referenced by inherited JSDoc ({@link}s in
+  // @modelcontextprotocol/client-server declaration comments) that are not
+  // part of the ext-apps documentation. Point at the v2 SDK docs site.
+  externalSymbolLinkMappings: {
+    "@modelcontextprotocol/client": {
+      ClientOptions: V2_SDK_DOCS,
+      ConnectOptions: V2_SDK_DOCS,
+      DiscoverResult: V2_SDK_DOCS,
+      ProtocolError: V2_SDK_DOCS,
+      "Protocol.close": V2_SDK_DOCS,
+      "Protocol.notification": V2_SDK_DOCS,
+      ResponseCacheStore: V2_SDK_DOCS,
+      SdkError: V2_SDK_DOCS,
+      "SdkErrorCode.MethodNotSupportedByProtocolVersion": V2_SDK_DOCS,
+      TransportSendOptions: V2_SDK_DOCS,
+      "__type.enforceStrictCapabilities": V2_SDK_DOCS,
+    },
+    "@modelcontextprotocol/server": {
+      LoggingMessageNotification: V2_SDK_DOCS,
+      "MessageExtraInfo.classification": V2_SDK_DOCS,
+      "Protocol.close": V2_SDK_DOCS,
+      "Protocol.notification": V2_SDK_DOCS,
+      ResourceTemplate: V2_SDK_DOCS,
+      "SdkErrorCode.UnsupportedResultType": V2_SDK_DOCS,
+      Server: V2_SDK_DOCS,
+      Transport: V2_SDK_DOCS,
+    },
+  },
   blockTags: [...OptionDefaults.blockTags, "@description"],
   jsDocCompatibility: {
     exampleTag: false,
@@ -49,6 +83,7 @@ const config = {
   out: "docs/api",
   plugin: [
     "typedoc-github-theme",
+    "./scripts/typedoc-plugin-v2-sdk-links.mjs",
     "./scripts/typedoc-plugin-fix-mermaid-entities.mjs",
     "./scripts/typedoc-plugin-seo.mjs",
     "./scripts/typedoc-plugin-mcpstyle.mjs",