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>
164 lines
6.4 KiB
TypeScript
164 lines
6.4 KiB
TypeScript
/**
|
|
* Type-safe EventTarget for InspectorClient events.
|
|
* Extends the generic TypedEventTarget with InspectorClientEventMap; TypedEvent
|
|
* is provided as a type alias for use in listener signatures.
|
|
*
|
|
* v2 note: the v1.5 event map referenced SamplingCreateMessage / ElicitationCreateMessage
|
|
* classes (with embedded promise resolvers) and OAuth events from the auth subsystem.
|
|
* The auth subsystem and the runtime promise-based pending classes are not yet ported to
|
|
* v2 — see #1243 scope. Pending requests are typed with the v2 wrapper types
|
|
* (InspectorPendingSampling / InspectorPendingElicitation); OAuth events are deliberately
|
|
* omitted here and will be added when the auth subsystem is ported.
|
|
*/
|
|
|
|
import {
|
|
TypedEventTarget,
|
|
type TypedEventGeneric,
|
|
} from "./typedEventTarget.js";
|
|
import type {
|
|
ConnectionStatus,
|
|
MessageEntry,
|
|
StderrLogEntry,
|
|
FetchRequestEntry,
|
|
PromptGetInvocation,
|
|
ResourceReadInvocation,
|
|
ResourceTemplateReadInvocation,
|
|
} from "./types.js";
|
|
import type { Tool, ServerCapabilities, Implementation, Root, Progress, ProgressToken, Task, CallToolResult, ProtocolError } from "@modelcontextprotocol/client";
|
|
import type { SamplingCreateMessage } from "./samplingCreateMessage.js";
|
|
import type { ElicitationCreateMessage } from "./elicitationCreateMessage.js";
|
|
import type { JsonValue } from "../json/jsonUtils.js";
|
|
import type { OAuthTokens } from "@modelcontextprotocol/client";
|
|
import type { AuthChallenge } from "../auth/challenge.js";
|
|
|
|
/** Task with createdAt optional so we can emit synthetic tasks (e.g. on result/error) that omit it. */
|
|
export type TaskWithOptionalCreatedAt = Omit<Task, "createdAt"> & {
|
|
createdAt?: string;
|
|
};
|
|
|
|
/**
|
|
* Maps event names to their detail types for CustomEvents
|
|
*/
|
|
export interface InspectorClientEventMap {
|
|
statusChange: ConnectionStatus;
|
|
toolsChange: Tool[];
|
|
capabilitiesChange: ServerCapabilities | undefined;
|
|
serverInfoChange: Implementation | undefined;
|
|
instructionsChange: string | undefined;
|
|
protocolVersionChange: string | undefined;
|
|
message: MessageEntry;
|
|
stderrLog: StderrLogEntry;
|
|
fetchRequest: FetchRequestEntry;
|
|
/** Fired when an in-flight fetch's response body is read asynchronously. */
|
|
fetchRequestBodyUpdate: { id: string; responseBody: string };
|
|
/**
|
|
* Fired whenever the client transitions `status` to `"error"` from a path
|
|
* that is NOT an awaited promise — i.e. a mid-session transport failure
|
|
* (stdio subprocess crash, SSE stream drop, HTTP 5xx) surfaced via the
|
|
* transport's `onerror`. The `Error` carries the reason (`.message`,
|
|
* optional `.cause`). Handshake failures are NOT dispatched here: they
|
|
* reject the awaited `connect()` promise, so the caller already has the
|
|
* error and a second surface would double-report it. Consumers that don't
|
|
* subscribe directly can read the last error via `useInspectorClient`'s
|
|
* `lastError`.
|
|
*/
|
|
error: Error;
|
|
resourceUpdated: { uri: string };
|
|
progressNotification: Progress & { progressToken?: ProgressToken };
|
|
toolCallResultChange: {
|
|
toolName: string;
|
|
params: Record<string, JsonValue>;
|
|
result: CallToolResult | null;
|
|
timestamp: Date;
|
|
success: boolean;
|
|
error?: string;
|
|
metadata?: Record<string, string>;
|
|
/** Non-fatal outputSchema mismatch detected on the skipOutputValidation path. */
|
|
outputValidationError?: string;
|
|
};
|
|
resourceContentChange: {
|
|
uri: string;
|
|
content: ResourceReadInvocation;
|
|
timestamp: Date;
|
|
};
|
|
resourceTemplateContentChange: {
|
|
uriTemplate: string;
|
|
content: ResourceTemplateReadInvocation;
|
|
params: Record<string, string>;
|
|
timestamp: Date;
|
|
};
|
|
promptContentChange: {
|
|
name: string;
|
|
content: PromptGetInvocation;
|
|
timestamp: Date;
|
|
};
|
|
pendingSamplesChange: SamplingCreateMessage[];
|
|
newPendingSample: SamplingCreateMessage;
|
|
pendingElicitationsChange: ElicitationCreateMessage[];
|
|
newPendingElicitation: ElicitationCreateMessage;
|
|
rootsChange: Root[];
|
|
resourceSubscriptionsChange: string[];
|
|
// Task events
|
|
/** Fired only from server notification notifications/tasks/status. */
|
|
taskStatusChange: { taskId: string; task: Task };
|
|
/** Fired from callToolStream for each task update. */
|
|
toolCallTaskUpdated: {
|
|
taskId: string;
|
|
task: TaskWithOptionalCreatedAt;
|
|
result?: CallToolResult;
|
|
error?: ProtocolError;
|
|
};
|
|
/** Fired from getRequestorTask() and callToolStream (client-origin task updates). */
|
|
requestorTaskUpdated: {
|
|
taskId: string;
|
|
task: TaskWithOptionalCreatedAt;
|
|
result?: CallToolResult;
|
|
error?: ProtocolError;
|
|
};
|
|
taskCancelled: { taskId: string };
|
|
/**
|
|
* Fired from callToolStream when a progress notification arrives for a
|
|
* task-augmented tool call, tagged with the taskId callToolStream owns so
|
|
* consumers can correlate progress → task (the generic progressNotification
|
|
* event carries only the caller's progressToken, not the taskId).
|
|
*/
|
|
requestorTaskProgress: { taskId: string; progress: Progress };
|
|
tasksChange: Task[];
|
|
// Signal events (no payload)
|
|
connect: void;
|
|
disconnect: void;
|
|
// List changed notification events
|
|
toolsListChanged: void;
|
|
resourcesListChanged: void;
|
|
resourceTemplatesListChanged: void;
|
|
promptsListChanged: void;
|
|
tasksListChanged: void;
|
|
// Session persistence (dispatched by client; FetchRequestLogState listens and saves)
|
|
saveSession: { sessionId: string };
|
|
// OAuth events (#1302 — fired by the ported oauthManager / InspectorClient)
|
|
oauthComplete: { tokens: OAuthTokens };
|
|
oauthAuthorizationRequired: { url: URL };
|
|
oauthError: { error: Error };
|
|
/** Ambient (SSE) auth challenge while no command-scoped send is active. */
|
|
authChallengeAmbient: { challenge: AuthChallenge };
|
|
/** Command-scoped direct-transport auth challenge (no ambient toast). */
|
|
authChallengeCommand: { challenge: AuthChallenge };
|
|
/** Ambient auth recovery completed (remote auth state pushed). */
|
|
authChallengeRecovered: { challenge: AuthChallenge };
|
|
/** Interactive auth required; App orchestrates redirect (step-up modal or reauth). */
|
|
authChallengeInteractive: {
|
|
challenge: AuthChallenge;
|
|
authorizationUrl: URL;
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Type alias for InspectorClient typed events (for listener signatures).
|
|
*/
|
|
export type TypedEvent<K extends keyof InspectorClientEventMap> =
|
|
TypedEventGeneric<InspectorClientEventMap, K>;
|
|
|
|
/**
|
|
* Type-safe EventTarget for InspectorClient events.
|
|
*/
|
|
export class InspectorClientEventTarget extends TypedEventTarget<InspectorClientEventMap> {}
|