SDK v2 migration (behavior-neutral, versionNegotiation: 'legacy') (#1624)

Migrate all three clients + core + test-servers from @modelcontextprotocol/sdk@1.29 to SDK v2 (2.0.0-beta.4), keeping behavior identical against legacy (2025-11-25) servers. Foundation for the SDK V2 + New Spec stack. Packages - Split @modelcontextprotocol/sdk -> @modelcontextprotocol/client (Client, transports, OAuth, error taxonomy, protocol types) + core (Zod schemas); stdio -> client/stdio, Ajv -> client/validators/ajv. Test-servers -> @modelcontextprotocol/server (+ server-legacy/sse). Deterministic import rewrite (schemas -> core, everything else -> client); the codemod misroutes client code to /server so it was not used for path routing. - new Client(..., { versionNegotiation: { mode: 'legacy' } }) — nothing 2026-era goes on the wire. Runtime (core/mcp/inspectorClient.ts) - Error taxonomy: McpError -> ProtocolError, ErrorCode -> ProtocolErrorCode; RequestTimeout -> SdkError/SdkErrorCode. - Handlers take method strings; task methods (tasks/*, notifications/tasks/*) use the 3-arg custom form (excluded from v2's spec-method set). - Legacy tasks kept working (per project requirement): requestor tasks re- implemented over raw client.request + explicit deprecated schemas; experimental.tasks.callToolStream replaced by a local pollTaskToolCall async generator (with _progressHandlers revival so task-execution progress still reaches the caller). Receiver (server-initiated) tasks: the v2 Client validates a sampling/elicit handler result and rejects the legacy { task } response with -32602 — installReceiverTaskResponseBypass swaps the wrapped entry in the private _requestHandlers map for the task-augmented branch so { task } reaches the wire (fixes server-initiated sampling-via-task). - Pagination: list verbs use raw client.request({method}, List*ResultSchema) for single-page behavior (v2's client.listX() auto-aggregate all pages). Web / auth / apps - Rename local JsonSchemaType -> InspectorFormSchema + add toFormSchema() structural narrowing at the SDK-schema -> form boundary. - ext-apps still peers on SDK v1: one compat boundary with documented casts (remove when ext-apps#702 lands a v2 peer). - OAuth provider saveClientInformation reconciled with v2's OAuthClientInformationContext; InvalidClientMetadataError re-homed as a local class (server-legacy/auth is not browser-safe). - vitest.shared.mts dedupes @modelcontextprotocol/client+core to one copy so vi.mock intercepts the SUT's import. Accepted v2 behavior changes (per #1624 / spec §9.2): unknown-tool call rejects with -32602; cancellation is stream-abort (no guaranteed notifications/cancelled frame); output-schema strictness restored via the Inspector's own Ajv check on the default path. npm run ci green: validate (web 3087 / cli 212 / tui 274 / launcher 5), coverage (>=90 per-file, all clients), smoke (launcher/cli/web), storybook (410). Closes #1624 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-15 10:44:24 -04:00 · 2026-07-15 10:44:24 -04:00 · 19a6df7ad3
commit 19a6df7ad3
parent 8d33e76f97
183 changed files with 2545 additions and 2123 deletions
--- a/clients/web/package-lock.json
+++ b/clients/web/package-lock.json
@ -6,7 +6,6 @@
  "packages": {
    "": {
      "name": "@modelcontextprotocol/inspector-web",
-      "version": "2.0.0",
      "dependencies": {
        "@dnd-kit/core": "^6.3.1",
        "@dnd-kit/sortable": "^8.0.0",
@ -17,8 +16,11 @@
        "@mantine/form": "^8.3.17",
        "@mantine/hooks": "^8.3.17",
        "@mantine/notifications": "^8.3.17",
-        "@modelcontextprotocol/ext-apps": "^1.7.1",
-        "@modelcontextprotocol/sdk": "^1.29.0",
+        "@modelcontextprotocol/client": "2.0.0-beta.4",
+        "@modelcontextprotocol/core": "2.0.0-beta.4",
+        "@modelcontextprotocol/ext-apps": "^1.7.4",
+        "@modelcontextprotocol/server": "2.0.0-beta.4",
+        "@modelcontextprotocol/server-legacy": "2.0.0-beta.4",
        "@napi-rs/keyring": "^1.3.0",
        "ajv": "^8.17.1",
        "atomically": "^2.1.1",
@ -1438,10 +1440,40 @@
        "react": ">=16"
      }
    },
+    "node_modules/@modelcontextprotocol/client": {
+      "version": "2.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.4.tgz",
+      "integrity": "sha512-VNHA/UXDk7mCpVl+jOg5B4WMRRD2OEl+it360Lhi6HiCbrIB2f6pZ0cqSDKXQVUtZvqnhdQHzZAM9h8EKWhq/A==",
+      "license": "MIT",
+      "dependencies": {
+        "@modelcontextprotocol/core": "2.0.0-beta.4",
+        "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.4",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0-beta.4.tgz",
+      "integrity": "sha512-nsMXd4wQBKzmph6r+WOhum+mXjDYljTAqwY/XUg3hLtvNOQ8+JVqBSJOVCMJvx9lXhTpTOPrGZ3BuNiaNPjSvg==",
+      "license": "MIT",
+      "dependencies": {
+        "zod": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
    "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/*"
@ -1472,6 +1504,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",
@ -1507,6 +1540,46 @@
        }
      }
    },
+    "node_modules/@modelcontextprotocol/server": {
+      "version": "2.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0-beta.4.tgz",
+      "integrity": "sha512-pjMZcNEt1dOq0aJCcY3b7w1Ayh+qmQN2xlfTELcGV9yiAjEGIczBPBLWWW0k0zzo5T8kiv15jtKPsWeHGxLvLg==",
+      "license": "MIT",
+      "dependencies": {
+        "@modelcontextprotocol/core": "2.0.0-beta.4",
+        "zod": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@modelcontextprotocol/server-legacy": {
+      "version": "2.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server-legacy/-/server-legacy-2.0.0-beta.4.tgz",
+      "integrity": "sha512-GaEa7mfjTqevGuz2taFj2fqb3FthxFvWOmoI/wbLmiK1XRnxdYsAaaJG/lgSlA+W6XWJ1+u+6oZ7610TowkjMA==",
+      "deprecated": "This package is a frozen copy of v1's SSE transport and OAuth Authorization Server helpers for migration purposes only. Use StreamableHTTP from @modelcontextprotocol/server and a dedicated OAuth server in production. Will not receive new features.",
+      "license": "MIT",
+      "dependencies": {
+        "@modelcontextprotocol/core": "2.0.0-beta.4",
+        "content-type": "^1.0.5",
+        "cors": "^2.8.5",
+        "express-rate-limit": "^8.2.1",
+        "pkce-challenge": "^5.0.0",
+        "raw-body": "^3.0.0",
+        "zod": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "peerDependencies": {
+        "express": "^4.18.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "express": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@napi-rs/keyring": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/@napi-rs/keyring/-/keyring-1.3.0.tgz",
@ -3733,6 +3806,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"
      },
@ -6070,7 +6144,8 @@
      "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/json-stable-stringify-without-jsonify": {
      "version": "1.0.1",
@ -10341,6 +10416,7 @@
      "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.28 || ^4"
      }
--- a/clients/web/package.json
+++ b/clients/web/package.json
@ -41,8 +41,11 @@
    "@mantine/form": "^8.3.17",
    "@mantine/hooks": "^8.3.17",
    "@mantine/notifications": "^8.3.17",
-    "@modelcontextprotocol/ext-apps": "^1.7.1",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/client": "2.0.0-beta.4",
+    "@modelcontextprotocol/core": "2.0.0-beta.4",
+    "@modelcontextprotocol/ext-apps": "^1.7.4",
+    "@modelcontextprotocol/server": "2.0.0-beta.4",
+    "@modelcontextprotocol/server-legacy": "2.0.0-beta.4",
    "@napi-rs/keyring": "^1.3.0",
    "ajv": "^8.17.1",
    "atomically": "^2.1.1",
--- a/clients/web/server/vite-base-config.ts
+++ b/clients/web/server/vite-base-config.ts
@ -12,7 +12,7 @@ import { rmSync } from "node:fs";
 import { join } from "node:path";

 const NODE_ONLY_OPTIMIZE_DEPS_EXCLUDE = [
-  "@modelcontextprotocol/sdk/client/stdio.js",
+  "@modelcontextprotocol/client/stdio",
  // `atomically` is reached only through `core/storage/store-io.ts`,
  // which is imported by `core/mcp/remote/node/server.ts` (the Hono
  // app). The module never lands in the browser graph; excluding it
@ -52,7 +52,7 @@ export function getViteDevOptimizeDeps() {
    exclude: [...NODE_ONLY_OPTIMIZE_DEPS_EXCLUDE],
    force: true,
    ignoreOutdatedRequests: true,
-    include: ["ajv", "@modelcontextprotocol/sdk/validation/ajv"],
+    include: ["ajv", "@modelcontextprotocol/client/validators/ajv"],
  };
 }

--- a/clients/web/src/App.test.tsx
+++ b/clients/web/src/App.test.tsx
@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
-import { ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
+import { ProtocolErrorCode, ProtocolError } from "@modelcontextprotocol/client";
 import { UrlElicitationLoopError } from "@inspector/core/mcp/urlElicitation.js";
 import { ToolCallCancelledError } from "@inspector/core/mcp/toolCallCancelledError.js";
 import {
@ -1107,8 +1107,8 @@ describe("App task wiring", () => {
        callTool: ReturnType<typeof vi.fn>;
      }
    ).callTool.mockRejectedValueOnce(
-      new McpError(
-        ErrorCode.UrlElicitationRequired,
+      new ProtocolError(
+        ProtocolErrorCode.UrlElicitationRequired,
        "This request requires browser-based authorization.",
      ),
    );
--- a/clients/web/src/App.tsx
+++ b/clients/web/src/App.tsx
@ -19,7 +19,7 @@ import type {
  ProgressToken,
  Task,
  Tool,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import { InspectorClient } from "@inspector/core/mcp/index.js";
 import { getServerType } from "@inspector/core/mcp/config.js";
 import type {
@ -451,7 +451,7 @@ function errorMessage(err: unknown): string {
  return err instanceof Error ? err.message : String(err);
 }

-// Pretty-print a thrown error for the URL-elicitation details modal: an McpError
+// Pretty-print a thrown error for the URL-elicitation details modal: a ProtocolError
 // carries a `code`/`data` worth showing alongside the message, so include them
 // when present; otherwise fall back to the plain message.
 function formatErrorDetails(err: unknown): string {
--- a/clients/web/src/components/elements/AnnotationBadge/AnnotationBadge.tsx
+++ b/clients/web/src/components/elements/AnnotationBadge/AnnotationBadge.tsx
@ -1,5 +1,5 @@
 import { Badge } from "@mantine/core";
-import type { Role } from "@modelcontextprotocol/sdk/types.js";
+import type { Role } from "@modelcontextprotocol/client";
 import { filledBadgeColor } from "../filledBadgeColor";

 export type AnnotationFacet =
--- a/clients/web/src/components/elements/AppRenderer/AppRenderer.stories.tsx
+++ b/clients/web/src/components/elements/AppRenderer/AppRenderer.stories.tsx
@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { Box } from "@mantine/core";
 import type { ReactNode } from "react";
 import type { AppBridge } from "@modelcontextprotocol/ext-apps/app-bridge";
-import type { Tool } from "@modelcontextprotocol/sdk/types.js";
+import type { Tool } from "@modelcontextprotocol/client";
 import { fn } from "storybook/test";
 import { AppRenderer, type BridgeFactory } from "./AppRenderer";

--- a/clients/web/src/components/elements/AppRenderer/AppRenderer.test.tsx
+++ b/clients/web/src/components/elements/AppRenderer/AppRenderer.test.tsx
@ -2,7 +2,7 @@ import { createRef, StrictMode } from "react";
 import { act } from "@testing-library/react";
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import type { AppBridge } from "@modelcontextprotocol/ext-apps/app-bridge";
-import type { CallToolResult, Tool } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult, Tool } from "@modelcontextprotocol/client";
 import { renderWithMantine, screen } from "../../../test/renderWithMantine";
 import {
  AppRenderer,
--- a/clients/web/src/components/elements/AppRenderer/AppRenderer.tsx
+++ b/clients/web/src/components/elements/AppRenderer/AppRenderer.tsx
@ -17,7 +17,7 @@ import type {
  CallToolResult,
  LoggingMessageNotification,
  Tool,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import {
  currentStyles,
  currentTheme,
@ -226,7 +226,12 @@ export function AppRenderer({
    if (pendingResultRef.current !== null) {
      const result = pendingResultRef.current;
      pendingResultRef.current = null;
-      void bridge.sendToolResult(result);
+      // ext-apps' AppBridge peers on SDK v1's CallToolResult (whose
+      // `structuredContent` is typed narrower than v2's). Runtime-compatible;
+      // cast at this boundary. TODO: drop when ext-apps#702 ships a v2 peer.
+      void bridge.sendToolResult(
+        result as Parameters<typeof bridge.sendToolResult>[0],
+      );
    }
  }, []);

--- a/clients/web/src/components/elements/AppRenderer/createAppBridgeFactory.test.ts
+++ b/clients/web/src/components/elements/AppRenderer/createAppBridgeFactory.test.ts
@ -7,11 +7,8 @@
 */

 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import type {
-  Tool,
-  ReadResourceResult,
-} from "@modelcontextprotocol/sdk/types.js";
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { Tool, ReadResourceResult } from "@modelcontextprotocol/client";
+import type { Client } from "@modelcontextprotocol/client";

 // --- ext-apps mock -------------------------------------------------------
 const bridgeInstances: MockBridge[] = [];
--- a/clients/web/src/components/elements/AppRenderer/createAppBridgeFactory.ts
+++ b/clients/web/src/components/elements/AppRenderer/createAppBridgeFactory.ts
@ -8,13 +8,13 @@ import type {
  McpUiHostCapabilities,
  McpUiResourceMeta,
 } from "@modelcontextprotocol/ext-apps/app-bridge";
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { Client } from "@modelcontextprotocol/client";
 import type {
  EmbeddedResource,
  Implementation,
  ReadResourceResult,
  ResourceLink,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import {
  approveCspSources,
  buildSandboxCspPolicy,
@ -212,9 +212,17 @@ export function createAppBridgeFactory(
    // never mutates the shared HOST_CAPABILITIES constant — each app may
    // declare its own csp/permissions.
    const hostCapabilities: McpUiHostCapabilities = { ...HOST_CAPABILITIES };
-    const bridge = new AppBridge(client, HOST_INFO, hostCapabilities, {
-      hostContext: snapshotHostContext(iframe, HOST_AVAILABLE_DISPLAY_MODES),
-    });
+    // ext-apps' `AppBridge` peers on SDK v1's `Client`/`Implementation`; both
+    // are runtime-compatible with v2's. Cast at this single construction
+    // boundary. TODO: drop when ext-apps#702 ships a v2 peer release.
+    const bridge = new AppBridge(
+      client as unknown as ConstructorParameters<typeof AppBridge>[0],
+      HOST_INFO as unknown as ConstructorParameters<typeof AppBridge>[1],
+      hostCapabilities,
+      {
+        hostContext: snapshotHostContext(iframe, HOST_AVAILABLE_DISPLAY_MODES),
+      },
+    );

    // The double-iframe proxy posts `sandboxready` once it can receive content.
    // Read the tool's UI resource and hand its HTML (plus any sandbox/permission
@ -226,7 +234,9 @@ export function createAppBridgeFactory(
    bridge.addEventListener("sandboxready", () => {
      void (async () => {
        try {
-          const uri = getToolUiResourceUri(tool);
+          const uri = getToolUiResourceUri(
+            tool as Parameters<typeof getToolUiResourceUri>[0],
+          );
          if (!uri) return;
          const result = await deps.readResource(uri);
          const { html, meta } = extractHtmlAndMeta(result);
--- a/clients/web/src/components/elements/CapabilityItem/CapabilityItem.tsx
+++ b/clients/web/src/components/elements/CapabilityItem/CapabilityItem.tsx
@ -2,7 +2,7 @@ import { Group, Text } from "@mantine/core";
 import type {
  ClientCapabilities,
  ServerCapabilities,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";

 export type CapabilityKey = keyof ServerCapabilities | keyof ClientCapabilities;

--- a/clients/web/src/components/elements/ContentViewer/ContentViewer.test.tsx
+++ b/clients/web/src/components/elements/ContentViewer/ContentViewer.test.tsx
@ -3,7 +3,7 @@ import type {
  BlobResourceContents,
  ContentBlock,
  TextResourceContents,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import { renderWithMantine, screen } from "../../../test/renderWithMantine";
 import { ContentViewer } from "./ContentViewer";

--- a/clients/web/src/components/elements/ContentViewer/ContentViewer.tsx
+++ b/clients/web/src/components/elements/ContentViewer/ContentViewer.tsx
@ -4,7 +4,7 @@ import type {
  BlobResourceContents,
  ContentBlock,
  TextResourceContents,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import ReactMarkdown from "react-markdown";
 import type { Components } from "react-markdown";
 import remarkGfm from "remark-gfm";
--- a/clients/web/src/components/elements/LogEntry/LogEntry.tsx
+++ b/clients/web/src/components/elements/LogEntry/LogEntry.tsx
@ -2,7 +2,7 @@ import { Group, Stack, Text } from "@mantine/core";
 import type {
  LoggingLevel,
  LoggingMessageNotification,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import { LogLevelBadge } from "../LogLevelBadge/LogLevelBadge";
 import { accessibleTextColor } from "../accessibleTextColor";

--- a/clients/web/src/components/elements/LogLevelBadge/LogLevelBadge.test.tsx
+++ b/clients/web/src/components/elements/LogLevelBadge/LogLevelBadge.test.tsx
@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from "vitest";
-import type { LoggingLevel } from "@modelcontextprotocol/sdk/types.js";
+import type { LoggingLevel } from "@modelcontextprotocol/client";
 import { renderWithMantine, screen } from "../../../test/renderWithMantine";
 import { LogLevelBadge } from "./LogLevelBadge";

--- a/clients/web/src/components/elements/LogLevelBadge/LogLevelBadge.tsx
+++ b/clients/web/src/components/elements/LogLevelBadge/LogLevelBadge.tsx
@ -1,5 +1,5 @@
 import { Badge } from "@mantine/core";
-import type { LoggingLevel } from "@modelcontextprotocol/sdk/types.js";
+import type { LoggingLevel } from "@modelcontextprotocol/client";
 import { filledBadgeColor } from "../filledBadgeColor";

 export interface LogLevelBadgeProps {
--- a/clients/web/src/components/elements/MessageBubble/MessageBubble.test.tsx
+++ b/clients/web/src/components/elements/MessageBubble/MessageBubble.test.tsx
@ -2,7 +2,7 @@ import { describe, it, expect } from "vitest";
 import type {
  PromptMessage,
  SamplingMessage,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import { renderWithMantine, screen } from "../../../test/renderWithMantine";
 import { MessageBubble } from "./MessageBubble";

--- a/clients/web/src/components/elements/MessageBubble/MessageBubble.tsx
+++ b/clients/web/src/components/elements/MessageBubble/MessageBubble.tsx
@ -3,7 +3,7 @@ import type {
  ContentBlock,
  PromptMessage,
  SamplingMessage,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import { ContentViewer } from "../ContentViewer/ContentViewer";

 export interface MessageBubbleProps {
--- a/clients/web/src/components/elements/ProgressDisplay/ProgressDisplay.tsx
+++ b/clients/web/src/components/elements/ProgressDisplay/ProgressDisplay.tsx
@ -1,5 +1,5 @@
 import { Group, Progress, Stack, Text } from "@mantine/core";
-import type { ProgressNotification } from "@modelcontextprotocol/sdk/types.js";
+import type { ProgressNotification } from "@modelcontextprotocol/client";

 export interface ProgressDisplayProps {
  params: Pick<
--- a/Show more
+++ b/Show more