inspector/core/mcp/urlElicitation.ts
cliffhall 19a6df7ad3 SDK v2 migration (behavior-neutral, versionNegotiation: 'legacy') (#1624)
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>
2026-07-15 10:44:24 -04:00

56 lines
2.3 KiB
TypeScript

import { ProtocolErrorCode, ProtocolError, UrlElicitationRequiredError } from "@modelcontextprotocol/client";
import type { ElicitRequestURLParams } from "@modelcontextprotocol/client";
export type { ElicitRequestURLParams };
/**
* Thrown by `callTool` when the URL-elicitation error path would loop: the
* server's `-32042` retry response re-requests a URL the user already completed
* earlier in the same call. Completing it again can't make progress, so the
* call is cancelled instead of re-presenting the same URL. The web layer
* detects this (over a generic failure) to show a "same URL again" toast.
*/
export class UrlElicitationLoopError extends Error {
/** The URL the server repeated. */
readonly url: string;
constructor(url: string) {
super(
`The server asked for the same URL elicitation again (${url}); cancelling the call to avoid a loop.`,
);
this.name = "UrlElicitationLoopError";
this.url = url;
}
}
/**
* Detect a `URLElicitationRequiredError` (JSON-RPC code `-32042`) and return the
* list of URL-mode elicitations the server attached, or `null` when `error` is
* not that error.
*
* Two shapes reach us, both code `-32042`:
* - the SDK's typed {@link UrlElicitationRequiredError} (created by
* `ProtocolError.fromError` when `data.elicitations` is present), and
* - a generic {@link ProtocolError} with code `-32042` when the server omitted
* `data.elicitations` (a non-spec response — the spec requires the list).
*
* The empty array is meaningful: it signals the non-spec "no elicitations"
* case, which the caller surfaces differently (a toast pointing at the raw
* error) from the spec-compliant case (surface each URL elicitation, then retry
* the original request). A non-`-32042` error returns `null` so callers fall
* through to their generic error handling.
*/
export function getUrlElicitationsFromError(
error: unknown,
): ElicitRequestURLParams[] | null {
if (error instanceof UrlElicitationRequiredError) {
return error.elicitations ?? [];
}
if (error instanceof ProtocolError && error.code === ProtocolErrorCode.UrlElicitationRequired) {
const data = error.data as
| { elicitations?: ElicitRequestURLParams[] }
| undefined;
return data?.elicitations ?? [];
}
return null;
}