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>
162 lines
5.4 KiB
TypeScript
162 lines
5.4 KiB
TypeScript
/**
|
|
* v2-shaped OAuth orchestrator for standard MCP resource authorization.
|
|
*
|
|
* **Upgrade path:** On `@modelcontextprotocol/client` v2, replace this module
|
|
* with `export { auth as mcpAuth, type AuthOptions as McpAuthOptions } from
|
|
* "@modelcontextprotocol/client"` and delete `authorizeWithoutRefresh`.
|
|
*
|
|
* Until then, `mcpAuth` delegates to SDK v1 `auth()` except when
|
|
* `forceReauthorization: true` — then it runs discovery + `startAuthorization`
|
|
* (the same path v2 `auth()` takes when refresh cannot widen scope).
|
|
*/
|
|
|
|
import { auth as sdkAuth, discoverOAuthServerInfo, isHttpsUrl, registerClient, selectResourceURL, startAuthorization } from "@modelcontextprotocol/client";
|
|
import type { OAuthClientProvider } from "@modelcontextprotocol/client";
|
|
import type { FetchLike } from "@modelcontextprotocol/client";
|
|
/**
|
|
* Thrown when the OAuth client metadata the Inspector would register is
|
|
* invalid (e.g. a non-HTTPS `clientMetadataUrl`). SDK v2 moved the original
|
|
* `InvalidClientMetadataError` into `@modelcontextprotocol/server-legacy`,
|
|
* whose `/auth` entry pulls in Node/Express server handlers that must never
|
|
* reach the browser bundle. This local class preserves the thrown type and
|
|
* message for the Inspector's client-side validation without that dependency.
|
|
*/
|
|
export class InvalidClientMetadataError extends Error {
|
|
constructor(message: string) {
|
|
super(message);
|
|
this.name = "InvalidClientMetadataError";
|
|
}
|
|
}
|
|
|
|
export type McpAuthResult = "AUTHORIZED" | "REDIRECT";
|
|
|
|
/**
|
|
* Options aligned with v2 SDK `AuthOptions`. v2-only fields are accepted now
|
|
* and forwarded on upgrade; v1 passthrough ignores unsupported fields.
|
|
*/
|
|
export interface McpAuthOptions {
|
|
serverUrl: string | URL;
|
|
authorizationCode?: string;
|
|
/** RFC 9207 callback `iss` — forwarded on v2 upgrade; ignored by v1 SDK `auth()`. */
|
|
iss?: string;
|
|
scope?: string;
|
|
resourceMetadataUrl?: URL;
|
|
fetchFn?: FetchLike;
|
|
/** v2 SEP-2468 — ignored until SDK v2 upgrade. */
|
|
skipIssuerMetadataValidation?: boolean;
|
|
/**
|
|
* Skip refresh and start an authorization-code flow. Required for step-up
|
|
* when the union scope exceeds the current token grant (RFC 6749 §6).
|
|
*/
|
|
forceReauthorization?: boolean;
|
|
}
|
|
|
|
export async function mcpAuth(
|
|
provider: OAuthClientProvider,
|
|
options: McpAuthOptions,
|
|
): Promise<McpAuthResult> {
|
|
if (options.forceReauthorization) {
|
|
if (options.authorizationCode !== undefined) {
|
|
throw new Error(
|
|
"forceReauthorization cannot be combined with authorizationCode",
|
|
);
|
|
}
|
|
return authorizeWithoutRefresh(provider, options);
|
|
}
|
|
|
|
return sdkAuth(provider, {
|
|
serverUrl: options.serverUrl,
|
|
authorizationCode: options.authorizationCode,
|
|
scope: options.scope,
|
|
resourceMetadataUrl: options.resourceMetadataUrl,
|
|
fetchFn: options.fetchFn,
|
|
});
|
|
}
|
|
|
|
async function authorizeWithoutRefresh(
|
|
provider: OAuthClientProvider,
|
|
options: McpAuthOptions,
|
|
): Promise<"REDIRECT"> {
|
|
const { serverUrl, scope, resourceMetadataUrl, fetchFn } = options;
|
|
|
|
const serverInfo = await discoverOAuthServerInfo(serverUrl, {
|
|
resourceMetadataUrl,
|
|
fetchFn,
|
|
});
|
|
const {
|
|
authorizationServerUrl,
|
|
authorizationServerMetadata: metadata,
|
|
resourceMetadata,
|
|
} = serverInfo;
|
|
|
|
await provider.saveDiscoveryState?.({
|
|
authorizationServerUrl: String(authorizationServerUrl),
|
|
resourceMetadataUrl: resourceMetadataUrl?.toString(),
|
|
resourceMetadata,
|
|
authorizationServerMetadata: metadata,
|
|
});
|
|
|
|
const resource = await selectResourceURL(
|
|
serverUrl,
|
|
provider,
|
|
resourceMetadata,
|
|
);
|
|
|
|
const resolvedScope =
|
|
scope ||
|
|
resourceMetadata?.scopes_supported?.join(" ") ||
|
|
provider.clientMetadata.scope;
|
|
|
|
let clientInformation = await Promise.resolve(provider.clientInformation());
|
|
if (!clientInformation) {
|
|
const supportsUrlBasedClientId =
|
|
metadata?.client_id_metadata_document_supported === true;
|
|
const clientMetadataUrl = provider.clientMetadataUrl;
|
|
if (clientMetadataUrl && !isHttpsUrl(clientMetadataUrl)) {
|
|
throw new InvalidClientMetadataError(
|
|
`clientMetadataUrl must be a valid HTTPS URL with a non-root pathname, got: ${clientMetadataUrl}`,
|
|
);
|
|
}
|
|
const shouldUseUrlBasedClientId =
|
|
supportsUrlBasedClientId && clientMetadataUrl;
|
|
if (shouldUseUrlBasedClientId) {
|
|
clientInformation = { client_id: clientMetadataUrl };
|
|
await provider.saveClientInformation?.(clientInformation);
|
|
} else {
|
|
if (!provider.saveClientInformation) {
|
|
throw new Error(
|
|
"OAuth client information must be saveable for dynamic registration",
|
|
);
|
|
}
|
|
const fullInformation = await registerClient(authorizationServerUrl, {
|
|
metadata,
|
|
clientMetadata: provider.clientMetadata,
|
|
scope: resolvedScope,
|
|
fetchFn,
|
|
});
|
|
await provider.saveClientInformation(fullInformation);
|
|
clientInformation = fullInformation;
|
|
}
|
|
}
|
|
|
|
const state = provider.state ? await provider.state() : undefined;
|
|
const redirectUrl = provider.redirectUrl;
|
|
if (!redirectUrl) {
|
|
throw new Error("redirectUrl is required for authorization_code flow");
|
|
}
|
|
const { authorizationUrl, codeVerifier } = await startAuthorization(
|
|
authorizationServerUrl,
|
|
{
|
|
metadata,
|
|
clientInformation,
|
|
state,
|
|
redirectUrl,
|
|
scope: resolvedScope,
|
|
resource,
|
|
},
|
|
);
|
|
|
|
await provider.saveCodeVerifier(codeVerifier);
|
|
await provider.redirectToAuthorization(authorizationUrl);
|
|
return "REDIRECT";
|
|
}
|