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>
107 lines
3.6 KiB
TypeScript
107 lines
3.6 KiB
TypeScript
import { describe, it, expect, afterEach } from "vitest";
|
|
import { InspectorClient } from "@inspector/core/mcp/inspectorClient.js";
|
|
import { createTransportNode } from "@inspector/core/mcp/node/transport.js";
|
|
import {
|
|
createTestServerHttp,
|
|
type TestServerHttp,
|
|
createTestServerInfo,
|
|
createMcpAppDemoTool,
|
|
createMcpAppDemoResource,
|
|
MCP_APP_DEMO_URI,
|
|
} from "@modelcontextprotocol/inspector-test-server";
|
|
import type { Tool } from "@modelcontextprotocol/client";
|
|
|
|
/**
|
|
* Exercises the `mcp_app_demo` preset added in #1557 end-to-end: it confirms the
|
|
* `_meta` plumbing through the composable test server's tool/resource
|
|
* definitions surfaces on `tools/list` and `resources/read`, which is what the
|
|
* downstream Apps-host and CLI `--app-info` tests rely on.
|
|
*/
|
|
describe("mcp_app_demo preset", () => {
|
|
let client: InspectorClient | null = null;
|
|
let server: TestServerHttp | null = null;
|
|
|
|
afterEach(async () => {
|
|
if (client) {
|
|
try {
|
|
await client.disconnect();
|
|
} catch {
|
|
// Ignore disconnect errors
|
|
}
|
|
client = null;
|
|
}
|
|
if (server) {
|
|
try {
|
|
await server.stop();
|
|
} catch {
|
|
// Ignore server stop errors
|
|
}
|
|
server = null;
|
|
}
|
|
});
|
|
|
|
async function connect(): Promise<InspectorClient> {
|
|
server = createTestServerHttp({
|
|
serverInfo: createTestServerInfo("mcp-app-demo-test", "1.0.0"),
|
|
tools: [createMcpAppDemoTool()],
|
|
resources: [createMcpAppDemoResource()],
|
|
});
|
|
await server.start();
|
|
const connected = new InspectorClient(
|
|
{ type: "streamable-http", url: server.url },
|
|
{ environment: { transport: createTransportNode } },
|
|
);
|
|
await connected.connect();
|
|
client = connected;
|
|
return connected;
|
|
}
|
|
|
|
it("exposes tool-level _meta.ui.resourceUri on tools/list", async () => {
|
|
const connected = await connect();
|
|
const { tools } = await connected.listTools();
|
|
const tool = tools.find((t) => t.name === "mcp_app_demo");
|
|
expect(tool).toBeDefined();
|
|
const meta = (tool as Tool)._meta as
|
|
| { ui?: { resourceUri?: string; visibility?: string[] } }
|
|
| undefined;
|
|
expect(meta?.ui?.resourceUri).toBe(MCP_APP_DEMO_URI);
|
|
expect(meta?.ui?.visibility).toEqual(["model", "app"]);
|
|
});
|
|
|
|
it("exposes resource-level _meta.ui on resources/read", async () => {
|
|
const connected = await connect();
|
|
const invocation = await connected.readResource(MCP_APP_DEMO_URI);
|
|
const contents = invocation.result.contents;
|
|
expect(contents).toHaveLength(1);
|
|
const entry = contents[0];
|
|
expect(entry.mimeType).toBe("text/html");
|
|
expect("text" in entry ? String(entry.text) : "").toContain("mcp-app-demo");
|
|
const meta = entry._meta as
|
|
| {
|
|
ui?: {
|
|
csp?: { connectDomains?: string[]; resourceDomains?: string[] };
|
|
permissions?: { clipboard?: boolean };
|
|
prefersBorder?: boolean;
|
|
};
|
|
}
|
|
| undefined;
|
|
expect(meta?.ui?.csp).toEqual({
|
|
connectDomains: [],
|
|
resourceDomains: [],
|
|
});
|
|
expect(meta?.ui?.permissions).toEqual({ clipboard: false });
|
|
expect(meta?.ui?.prefersBorder).toBe(true);
|
|
});
|
|
|
|
it("echoes the input title from the tool handler", async () => {
|
|
const connected = await connect();
|
|
const { tools } = await connected.listTools();
|
|
const tool = tools.find((t) => t.name === "mcp_app_demo")!;
|
|
const result = await connected.callTool(tool, { title: "Widget A" });
|
|
expect(result.success).toBe(true);
|
|
const content = result.result!.content;
|
|
const text =
|
|
content[0] && "text" in content[0] ? String(content[0].text) : "";
|
|
expect(text).toBe('mcp_app_demo rendered with title="Widget A"');
|
|
});
|
|
});
|