WIP: port to concrete-Protocol approach (#1891) — mechanical pass

- import paths sdk/* → @modelcontextprotocol/{client,server}
- events.ts: ProtocolWithEvents extends Protocol (concrete), v1-schema-shim setRequestHandler
- request/notification call-shape transforms (perl)
- drop assert*Capability overrides (Protocol no longer abstract)
- server/index.ts copied from #612 port
- tsconfig: exclude *.examples.ts, docs/ (same as #612)

NOT YET: *Schema imports → specTypeSchema(), request() visibility, ~225 tsc errors remain

Author: felixweinberger

package-lock.json

@@ -76,7 +76,6 @@
   "author": "Olivier Chafik",
   "devDependencies": {
     "@boneskull/typedoc-plugin-mermaid": "^0.2.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
     "@playwright/test": "1.57.0",
     "@types/bun": "^1.3.2",
     "@types/node": "20.19.27",
@@ -107,7 +106,6 @@
     "zod": "^4.1.13"
   },
   "peerDependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
     "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"
@@ -125,5 +123,11 @@
     "seroval-plugins": "1.4.2",
     "solid-js": "1.9.10",
     "@types/node": "20.19.27"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/client": "file:../../../../../tmp/modelcontextprotocol-client-2.0.0-alpha.2.tgz",
+    "@modelcontextprotocol/express": "file:../../../../../tmp/modelcontextprotocol-express-2.0.0-alpha.2.tgz",
+    "@modelcontextprotocol/node": "file:../../../../../tmp/modelcontextprotocol-node-2.0.0-alpha.2.tgz",
+    "@modelcontextprotocol/server": "file:../../../../../tmp/modelcontextprotocol-server-2.0.0-alpha.2.tgz"
   }
 }

package.json

@@ -7,15 +7,15 @@
  * @module
  */
 
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { Client } from "@modelcontextprotocol/client";
+import type { Transport } from "@modelcontextprotocol/client";
 import {
   CallToolResult,
   CallToolResultSchema,
   ListResourcesResultSchema,
   ReadResourceResultSchema,
   ListPromptsResultSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import { AppBridge, PostMessageTransport } from "./app-bridge.js";
 import type { McpUiDisplayMode } from "./types.js";
 

src/app-bridge.examples.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach, afterEach } 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 type { Client } from "@modelcontextprotocol/client";
+import type { ServerCapabilities } from "@modelcontextprotocol/client";
 import {
   EmptyResultSchema,
   ListPromptsResultSchema,
@@ -11,7 +11,7 @@ import {
   ReadResourceResultSchema,
   ResourceListChangedNotificationSchema,
   ToolListChangedNotificationSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 
 import { App } from "./app";
 import {

src/app-bridge.test.ts

@@ -1,5 +1,5 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { Client } from "@modelcontextprotocol/client";
+import { Transport } from "@modelcontextprotocol/client";
 import {
   CallToolRequest,
   CallToolRequestSchema,
@@ -37,11 +37,11 @@ import {
   Tool,
   ToolListChangedNotification,
   ToolListChangedNotificationSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import {
   ProtocolOptions,
   RequestOptions,
-} from "@modelcontextprotocol/sdk/shared/protocol.js";
+} from "@modelcontextprotocol/client";
 import { ProtocolWithEvents } from "./events";
 
 import {
@@ -1033,10 +1033,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @see `ToolListChangedNotification` from @modelcontextprotocol/sdk for the notification type
    */
   sendToolListChanged(params: ToolListChangedNotification["params"] = {}) {
-    return this.notification({
-      method: "notifications/tools/list_changed" as const,
-      params,
-    });
+    return this.notification("notifications/tools/list_changed", params);
   }
 
   /**
@@ -1232,10 +1229,7 @@ export class AppBridge extends ProtocolWithEvents<
   sendResourceListChanged(
     params: ResourceListChangedNotification["params"] = {},
   ) {
-    return this.notification({
-      method: "notifications/resources/list_changed" as const,
-      params,
-    });
+    return this.notification("notifications/resources/list_changed", params);
   }
 
   /**
@@ -1315,10 +1309,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @see `PromptListChangedNotification` from @modelcontextprotocol/sdk for the notification type
    */
   sendPromptListChanged(params: PromptListChangedNotification["params"] = {}) {
-    return this.notification({
-      method: "notifications/prompts/list_changed" as const,
-      params,
-    });
+    return this.notification("notifications/prompts/list_changed", params);
   }
 
   /**
@@ -1462,10 +1453,7 @@ export class AppBridge extends ProtocolWithEvents<
   sendHostContextChange(
     params: McpUiHostContextChangedNotification["params"],
   ): Promise<void> | void {
-    return this.notification({
-      method: "ui/notifications/host-context-changed" as const,
-      params,
-    });
+    return this.notification("ui/notifications/host-context-changed", params);
   }
 
   /**
@@ -1491,10 +1479,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @see {@link sendToolResult `sendToolResult`} for sending results after execution
    */
   sendToolInput(params: McpUiToolInputNotification["params"]) {
-    return this.notification({
-      method: "ui/notifications/tool-input" as const,
-      params,
-    });
+    return this.notification("ui/notifications/tool-input", params);
   }
 
   /**
@@ -1527,10 +1512,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @see {@link sendToolInput `sendToolInput`} for sending complete arguments
    */
   sendToolInputPartial(params: McpUiToolInputPartialNotification["params"]) {
-    return this.notification({
-      method: "ui/notifications/tool-input-partial" as const,
-      params,
-    });
+    return this.notification("ui/notifications/tool-input-partial", params);
   }
 
   /**
@@ -1556,10 +1538,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @see {@link sendToolInput `sendToolInput`} for sending tool arguments before results
    */
   sendToolResult(params: McpUiToolResultNotification["params"]) {
-    return this.notification({
-      method: "ui/notifications/tool-result" as const,
-      params,
-    });
+    return this.notification("ui/notifications/tool-result", params);
   }
 
   /**
@@ -1593,10 +1572,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @see {@link sendToolInput `sendToolInput`} for sending tool arguments
    */
   sendToolCancelled(params: McpUiToolCancelledNotification["params"]) {
-    return this.notification({
-      method: "ui/notifications/tool-cancelled" as const,
-      params,
-    });
+    return this.notification("ui/notifications/tool-cancelled", params);
   }
 
   /**
@@ -1617,10 +1593,7 @@ export class AppBridge extends ProtocolWithEvents<
   sendSandboxResourceReady(
     params: McpUiSandboxResourceReadyNotification["params"],
   ) {
-    return this.notification({
-      method: "ui/notifications/sandbox-resource-ready" as const,
-      params,
-    });
+    return this.notification("ui/notifications/sandbox-resource-ready", params);
   }
 
   /**
@@ -1651,12 +1624,7 @@ export class AppBridge extends ProtocolWithEvents<
     params: McpUiResourceTeardownRequest["params"],
     options?: RequestOptions,
   ) {
-    return this.request(
-      {
-        method: "ui/resource-teardown" as const,
-        params,
-      },
-      McpUiResourceTeardownResultSchema,
+    return this.request("ui/resource-teardown", params, McpUiResourceTeardownResultSchema,
       options,
     );
   }
@@ -1674,9 +1642,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @returns Promise resolving to the tool call result
    */
   callTool(params: CallToolRequest["params"], options?: RequestOptions) {
-    return this.request(
-      { method: "tools/call", params },
-      CallToolResultSchema,
+    return this.request("tools/call", params, CallToolResultSchema,
       options,
     );
   }
@@ -1691,9 +1657,7 @@ export class AppBridge extends ProtocolWithEvents<
    * @returns Promise resolving to the list of tools
    */
   listTools(params: ListToolsRequest["params"], options?: RequestOptions) {
-    return this.request(
-      { method: "tools/list", params },
-      ListToolsResultSchema,
+    return this.request("tools/list", params, ListToolsResultSchema,
       options,
     );
   }

src/app-bridge.ts

@@ -7,11 +7,11 @@
  * @module
  */
 
-import type { Tool } from "@modelcontextprotocol/sdk/types.js";
+import type { Tool } from "@modelcontextprotocol/client";
 import type {
   McpServer,
   ToolCallback,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
+} from "@modelcontextprotocol/server";
 import {
   App,
   PostMessageTransport,