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>
44 lines
1.8 KiB
TypeScript
44 lines
1.8 KiB
TypeScript
import type { CallToolResult, Tool } from "@modelcontextprotocol/client";
|
|
import type { JsonSchemaType, jsonSchemaValidator } from "@modelcontextprotocol/client";
|
|
|
|
/**
|
|
* Validate a delivered tool result's `structuredContent` against the tool's
|
|
* declared `outputSchema`, mirroring the SDK client's strict check but WITHOUT
|
|
* throwing. Returns a human-readable error message when a strict client would
|
|
* reject the payload, or `undefined` when it's valid (or there's nothing to
|
|
* check).
|
|
*
|
|
* Used by {@link InspectorClient.callTool}'s `skipOutputValidation` path: MCP
|
|
* Apps forward the result verbatim to the running view, so the host must not
|
|
* reject it — but it should still surface the mismatch as a non-fatal advisory.
|
|
*
|
|
* @param provider A JSON Schema validator provider (the SDK's Ajv provider).
|
|
* @param tool The tool that was called (carries the declared outputSchema).
|
|
* @param result The delivered CallToolResult.
|
|
*/
|
|
export function validateToolOutput(
|
|
provider: jsonSchemaValidator,
|
|
tool: Tool,
|
|
result: CallToolResult,
|
|
): string | undefined {
|
|
if (!tool.outputSchema) return undefined;
|
|
const structured = result.structuredContent;
|
|
if (structured == null) {
|
|
// Strict clients reject "has outputSchema but no structuredContent" unless
|
|
// the result is itself an error.
|
|
return result.isError
|
|
? undefined
|
|
: `Tool "${tool.name}" declares an output schema but returned no structured content`;
|
|
}
|
|
try {
|
|
const validate = provider.getValidator(
|
|
tool.outputSchema as unknown as JsonSchemaType,
|
|
);
|
|
const validation = validate(structured);
|
|
return validation.valid ? undefined : validation.errorMessage;
|
|
} catch {
|
|
// A malformed schema (validator compilation failure) shouldn't block the
|
|
// call or produce a misleading warning.
|
|
return undefined;
|
|
}
|
|
}
|