feat(mcp): upgrade client SDK to v2 (#39247)

Co-authored-by: Matt Carey <mcarey@cloudflare.com>
This commit is contained in:
Aiden Cline
2026-07-27 23:19:33 -05:00
committed by GitHub
parent 199e80d83e
commit fb3b8fd059
28 changed files with 271 additions and 1028 deletions
+9 -13
View File
@@ -1,8 +1,6 @@
import { describe, expect, test } from "bun:test"
import { Client } from "@modelcontextprotocol/sdk/client/index.js"
import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"
import { Server } from "@modelcontextprotocol/sdk/server/index.js"
import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js"
import { Client, InMemoryTransport } from "@modelcontextprotocol/client"
import { Server } from "@modelcontextprotocol/server"
import { McpCatalog } from "@/mcp/catalog"
import { Effect } from "effect"
@@ -52,16 +50,16 @@ describe("McpCatalog.convertTool", () => {
test("preserves output schema validation across paginated tool discovery", async () => {
const server = new Server({ name: "pagination", version: "1.0.0" }, { capabilities: { tools: {} } })
server.setRequestHandler(ListToolsRequestSchema, ({ params }) =>
server.setRequestHandler("tools/list", ({ params }) =>
Promise.resolve(
params?.cursor === "page-2"
? {
tools: [
{
name: "second",
inputSchema: { type: "object" },
inputSchema: { type: "object" as const },
outputSchema: {
type: "object",
type: "object" as const,
properties: { value: { type: "number" } },
required: ["value"],
},
@@ -72,9 +70,9 @@ test("preserves output schema validation across paginated tool discovery", async
tools: [
{
name: "first",
inputSchema: { type: "object" },
inputSchema: { type: "object" as const },
outputSchema: {
type: "object",
type: "object" as const,
properties: { value: { type: "string" } },
required: ["value"],
},
@@ -84,7 +82,7 @@ test("preserves output schema validation across paginated tool discovery", async
},
),
)
server.setRequestHandler(CallToolRequestSchema, ({ params }) =>
server.setRequestHandler("tools/call", ({ params }) =>
Promise.resolve({
content: [],
structuredContent: { value: params.name === "first" ? 42 : 1 },
@@ -98,9 +96,7 @@ test("preserves output schema validation across paginated tool discovery", async
try {
const tools = await Effect.runPromise(McpCatalog.defs(client))
expect(tools?.map((tool) => tool.name)).toEqual(["first", "second"])
await expect(client.callTool({ name: "first", arguments: {} })).rejects.toThrow(
"Structured content does not match the tool's output schema",
)
await expect(client.callTool({ name: "first", arguments: {} })).rejects.toThrow(/output schema/i)
} finally {
await Promise.all([client.close(), server.close()])
}