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>
174 lines
4.7 KiB
TypeScript
174 lines
4.7 KiB
TypeScript
import type { OAuthTokens } from "@modelcontextprotocol/client";
|
||
import type { OAuthStorage } from "../storage.js";
|
||
import type { EnterpriseManagedAuthIdpConfig } from "../../client/types.js";
|
||
import {
|
||
completeIdpOidcAuthorization,
|
||
getValidIdToken,
|
||
startIdpOidcAuthorization,
|
||
} from "./idpOidc.js";
|
||
import {
|
||
discoverEmaResourceContext,
|
||
type EmaResourceContext,
|
||
} from "./resourceContext.js";
|
||
import { exchangeIdJag, redeemIdJagForAccessToken } from "./wire.js";
|
||
|
||
export interface EmaFlowConfig {
|
||
serverUrl: string;
|
||
idp: EnterpriseManagedAuthIdpConfig;
|
||
resourceClientId?: string;
|
||
resourceClientSecret?: string;
|
||
scope?: string;
|
||
redirectUrl: string;
|
||
storage: OAuthStorage;
|
||
fetchFn?: typeof fetch;
|
||
}
|
||
|
||
export type TrySilentEmaAuthResult =
|
||
| { status: "success" }
|
||
| { status: "no_idp_session" }
|
||
| { status: "mint_failed"; error: Error };
|
||
|
||
function wrapEmaMintError(err: unknown): Error {
|
||
const message = err instanceof Error ? err.message : String(err);
|
||
return new Error(`EMA legs 2–3 (resource token mint): ${message}`, {
|
||
cause: err,
|
||
});
|
||
}
|
||
|
||
export async function mintEmaResourceTokens(
|
||
config: EmaFlowConfig,
|
||
resourceContext?: EmaResourceContext,
|
||
): Promise<OAuthTokens> {
|
||
const ctx =
|
||
resourceContext ??
|
||
(await discoverEmaResourceContext(
|
||
config.serverUrl,
|
||
config.scope,
|
||
config.fetchFn,
|
||
));
|
||
if (!config.resourceClientId) {
|
||
throw new Error(
|
||
"EMA requires resource authorization server clientId (per-server oauth.clientId)",
|
||
);
|
||
}
|
||
if (!config.resourceClientSecret?.trim()) {
|
||
throw new Error(
|
||
"EMA requires resource authorization server client secret in server OAuth settings (Test Client secret from xaa.dev resource registration)",
|
||
);
|
||
}
|
||
|
||
const idToken = await getValidIdToken({
|
||
idp: config.idp,
|
||
storage: config.storage,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
if (!idToken) {
|
||
throw new Error("Valid IdP ID Token required for EMA token mint");
|
||
}
|
||
|
||
const audience = ctx.resourceAsUrl.href.replace(/\/$/, "");
|
||
const idJag = await exchangeIdJag({
|
||
idp: config.idp,
|
||
idToken,
|
||
audience,
|
||
resource: ctx.resourceUrl?.href,
|
||
scope: ctx.scope,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
|
||
return redeemIdJagForAccessToken({
|
||
resourceAsUrl: ctx.resourceAsUrl,
|
||
idJag,
|
||
resourceClientId: config.resourceClientId,
|
||
resourceClientSecret: config.resourceClientSecret,
|
||
resource: ctx.resourceUrl?.href,
|
||
scope: ctx.scope,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
}
|
||
|
||
/** Silent path: cached IdP session + legs 2–3. */
|
||
export async function trySilentEmaAuth(
|
||
config: EmaFlowConfig,
|
||
): Promise<TrySilentEmaAuthResult> {
|
||
const idToken = await getValidIdToken({
|
||
idp: config.idp,
|
||
storage: config.storage,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
if (!idToken) {
|
||
return { status: "no_idp_session" };
|
||
}
|
||
try {
|
||
const tokens = await mintEmaResourceTokens(config);
|
||
await config.storage.saveTokens(config.serverUrl, tokens, {
|
||
enterpriseManaged: true,
|
||
});
|
||
return { status: "success" };
|
||
} catch (err) {
|
||
return { status: "mint_failed", error: wrapEmaMintError(err) };
|
||
}
|
||
}
|
||
|
||
export async function startEmaIdpAuthorization(
|
||
config: EmaFlowConfig,
|
||
): Promise<URL> {
|
||
const { authorizationUrl } = await startIdpOidcAuthorization({
|
||
idp: config.idp,
|
||
redirectUrl: config.redirectUrl,
|
||
storage: config.storage,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
return authorizationUrl;
|
||
}
|
||
|
||
export async function completeEmaIdpAuthorizationAndMint(
|
||
config: EmaFlowConfig,
|
||
authorizationCode: string,
|
||
): Promise<OAuthTokens> {
|
||
try {
|
||
await completeIdpOidcAuthorization({
|
||
idp: config.idp,
|
||
authorizationCode,
|
||
redirectUrl: config.redirectUrl,
|
||
storage: config.storage,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
} catch (err) {
|
||
const message = err instanceof Error ? err.message : String(err);
|
||
throw new Error(`EMA leg 1 (IdP authorization code exchange): ${message}`, {
|
||
cause: err,
|
||
});
|
||
}
|
||
|
||
let tokens: OAuthTokens;
|
||
try {
|
||
tokens = await mintEmaResourceTokens(config);
|
||
} catch (err) {
|
||
throw wrapEmaMintError(err);
|
||
}
|
||
|
||
await config.storage.saveTokens(config.serverUrl, tokens, {
|
||
enterpriseManaged: true,
|
||
});
|
||
return tokens;
|
||
}
|
||
|
||
/** Re-run legs 2–3 on 401 when IdP session is still valid. */
|
||
export async function refreshEmaResourceTokens(
|
||
config: EmaFlowConfig,
|
||
): Promise<OAuthTokens | undefined> {
|
||
const idToken = await getValidIdToken({
|
||
idp: config.idp,
|
||
storage: config.storage,
|
||
fetchFn: config.fetchFn,
|
||
});
|
||
if (!idToken) {
|
||
return undefined;
|
||
}
|
||
const tokens = await mintEmaResourceTokens(config);
|
||
await config.storage.saveTokens(config.serverUrl, tokens, {
|
||
enterpriseManaged: true,
|
||
});
|
||
return tokens;
|
||
}
|