* feat(web): two-step URL elicitation completion (#1415) Replace accept-on-open with an explicit completion step for URL elicitations. Opening the URL now only transitions the panel to its waiting state; the elicitation resolves with `accept` only when the user clicks the revealed "I've completed it" action, or with `cancel`. - ElicitationUrlPanel: add `onComplete`, reveal the completion button and relabel open→"Reopen in Browser" while `isWaiting`. - PendingClientRequestModal: wire local `isWaiting`; open no longer sends a response. Removed the accept-on-open comment that pointed here. - Tests cover open→waiting→complete and open→cancel, and assert opening alone does not resolve the elicitation. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): handle URL-elicitation-required (-32042) error path Implements the spec's "URL mode with elicitation required error" flow (2025-11-25). When a tools/call returns a `-32042` UrlElicitationRequired error, the client now surfaces the required URL elicitation(s) and retries the call once completed, instead of showing a bare error. Core (InspectorClient.callTool): - Detect `-32042` (typed UrlElicitationRequiredError or generic McpError) via the new `getUrlElicitationsFromError` helper. - Surface each carried elicitation in order through the existing pending- elicitation queue / modal (reusing the two-step "Open → I've completed it" UI), then re-issue the original call once all are accepted. A decline/cancel aborts with a clear message; a bounded retry count guards a server that keeps returning the error. - `ElicitationCreateMessage.completeIfPending()` lets the optional `notifications/elicitation/complete` auto-advance/auto-accept an open URL elicitation; the completion-notification handler now resolves (was: only removed) the pending entry. - Extracted `attemptToolCall` / `dispatchFailedToolCall` from the old callTool body to support the retry loop without duplicating bookkeeping. Web (App): - A non-spec `-32042` with no elicitations (nothing to open) shows a dedicated yellow toast linking to a new UrlElicitationErrorModal with the raw error body, mirroring the output-schema-validation toast. Tests: helper unit tests, completeIfPending unit tests, callTool error-path retry/cancel/no-list/ordinary-error tests (injected fake client), the new modal (test + stories), and an App toast test. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): abort URL-elicitation error path on a repeated URL Guard the -32042 retry loop: if the server's retry error re-requests a URL the user already completed earlier in the same call, completing it again can't make progress, so callTool aborts with a new typed UrlElicitationLoopError instead of re-prompting (which would loop until the retry cap). The web layer detects it and shows a "URL elicitation loop" toast naming the repeated URL rather than a generic failure. Tests: core abort-on-repeat test (URL presented once, two attempts, then loop error) and an App loop-toast test. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(web): let Copy-URL reach the URL-elicitation completion step Address review of #1436: the "I've completed it" action was gated behind clicking "Open in Browser" (only that set isWaiting), so a user who used Copy URL to finish the flow externally could only Cancel. Copying the URL now also moves the panel into the waiting state, exposing the completion step. Also trims the now-redundant second sentence of the waiting hint. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor(core): address review of error-path URL elicitation Review follow-ups on #1436 (all non-blocking): - Remove the leftover bare block scope in attemptToolCall (extraction artifact); body de-indented one level. - Log a warning when callTool gives up after the URL-elicitation retry cap is hit, so a server that keeps demanding new elicitations is diagnosable rather than looking like an ordinary failure. - Assert the dispatch-once invariant on the loop-abort and cancel-abort paths (exactly one failed toolCallResultChange event). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * style(core): fix attemptToolCall body indentation Run prettier over the extracted attemptToolCall method body, which was left over-indented by 2 spaces after the bare-block removal in 0754b43d. core/ is outside clients/web's format:check scope, so npm run validate did not catch it. Whitespace-only; the pre-existing line 658 wrap (also outside the format scope) is left as-is, out of scope for this PR. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(core): settle pending elicitations on disconnect to avoid callTool hang Address review of #1436: an error-path `awaitUrlElicitation` promise only settled via respond, but `disconnect()` cleared `pendingElicitations` wholesale — so a disconnect mid-elicitation (server crash, manual disconnect, transport close) left `callTool` (and the UI's in-flight toolCallState) hanging forever. - Add `ElicitationCreateMessage.cancel()`: settles a pending elicitation as `{ action: "cancel" }` without calling `onRemove` (the queue is cleared by the caller, so it must not splice mid-iteration). - `disconnect()` now cancels each pending elicitation before clearing the array, and dispatches `pendingElicitationsChange` (it already did so for samples) so the modal closes on a transport-close teardown too. Tests: disconnect-mid-elicitation settles callTool (no hang); cancel() unit tests (resolves-without-remove, no-op once responded). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
113 lines
3.6 KiB
TypeScript
113 lines
3.6 KiB
TypeScript
import type {
|
|
ElicitRequest,
|
|
ElicitResult,
|
|
} from "@modelcontextprotocol/sdk/types.js";
|
|
import { RELATED_TASK_META_KEY } from "@modelcontextprotocol/sdk/types.js";
|
|
|
|
export type { ElicitRequest, ElicitResult };
|
|
|
|
/**
|
|
* Data shape of a pending elicitation request tracked by the InspectorClient.
|
|
* v2's state/screen layer consumes this interface; the runtime class below
|
|
* (ElicitationCreateMessage) implements it.
|
|
*/
|
|
export interface InspectorPendingElicitation {
|
|
id: string;
|
|
timestamp: Date;
|
|
request: ElicitRequest;
|
|
taskId?: string;
|
|
}
|
|
|
|
/**
|
|
* Represents a pending elicitation request from the server
|
|
*/
|
|
export class ElicitationCreateMessage {
|
|
public readonly id: string;
|
|
public readonly timestamp: Date;
|
|
public readonly request: ElicitRequest;
|
|
public readonly taskId?: string;
|
|
private resolvePromise?: (result: ElicitResult) => void;
|
|
/** Set only for task-augmented elicit; used when user declines so server's tasks/result receives an error */
|
|
private rejectCallback?: (error: Error) => void;
|
|
private onRemove: (id: string) => void;
|
|
|
|
constructor(
|
|
request: ElicitRequest,
|
|
resolve: (result: ElicitResult) => void,
|
|
onRemove: (id: string) => void,
|
|
reject?: (error: Error) => void,
|
|
) {
|
|
this.onRemove = onRemove;
|
|
this.id = `elicitation-${crypto.randomUUID()}`;
|
|
this.timestamp = new Date();
|
|
this.request = request;
|
|
// Extract taskId from request params metadata if present
|
|
const relatedTask = request.params?._meta?.[RELATED_TASK_META_KEY];
|
|
this.taskId = relatedTask?.taskId;
|
|
this.resolvePromise = resolve;
|
|
this.rejectCallback = reject;
|
|
}
|
|
|
|
/**
|
|
* Reject the elicitation (e.g. when user declines). Only has effect when this
|
|
* request was task-augmented; then the server's tasks/result will receive the error.
|
|
*/
|
|
reject(error: Error): void {
|
|
if (this.rejectCallback) {
|
|
this.rejectCallback(error);
|
|
this.rejectCallback = undefined;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Respond to the elicitation request with a result
|
|
*/
|
|
async respond(result: ElicitResult): Promise<void> {
|
|
if (!this.resolvePromise) {
|
|
throw new Error("Request already resolved");
|
|
}
|
|
this.resolvePromise(result);
|
|
this.resolvePromise = undefined;
|
|
// Remove from pending list after responding
|
|
this.remove();
|
|
}
|
|
|
|
/**
|
|
* Resolve this elicitation as accepted, but only if it is still pending.
|
|
*
|
|
* Used by the URL-mode `notifications/elicitation/complete` handler to
|
|
* auto-advance an open URL elicitation when the server signals the
|
|
* out-of-band flow finished. It is a no-op once the user has already
|
|
* responded — that guard (plus the modal's own once-guard) keeps `respond()`
|
|
* from throwing its "already resolved" error on a race between the manual
|
|
* "I've completed it" click and the server's completion notification.
|
|
*/
|
|
completeIfPending(): void {
|
|
if (this.resolvePromise) {
|
|
void this.respond({ action: "accept" });
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Settle a still-pending elicitation as cancelled, without removing it from
|
|
* the queue. Used by `disconnect()` teardown so an awaiting caller — notably
|
|
* the error-path `awaitUrlElicitation` that blocks `callTool` — doesn't hang
|
|
* forever when the pending queue is dropped wholesale. No-op once already
|
|
* resolved; deliberately does not call `onRemove` (the caller clears the
|
|
* queue itself, so we must not splice it mid-iteration).
|
|
*/
|
|
cancel(): void {
|
|
if (this.resolvePromise) {
|
|
this.resolvePromise({ action: "cancel" });
|
|
this.resolvePromise = undefined;
|
|
}
|
|
this.rejectCallback = undefined;
|
|
}
|
|
|
|
/**
|
|
* Remove this pending elicitation from the list
|
|
*/
|
|
remove(): void {
|
|
this.onRemove(this.id);
|
|
}
|
|
}
|