inspector/core/mcp/inspectorClientEventTarget.ts
Bob Dickinson 13dafe457b
Guided-auth removal, OAuth smoke testing, and TUI/CLI support (#1531)
* refactor(web): update OAuth E2E tests to use new authentication method

- Replaced `runGuidedAuth` with `authenticate` in the InspectorClient OAuth end-to-end tests to support quick authentication with CIMD pre-registration.
- Updated comments to reflect the change in authentication method and its support for HTTP test metadata URLs.
- Ensured that the tests continue to validate the expected authorization URL after the change.

Additionally, imported `ensureCimdClientRegistration` in the OAuthManager to streamline client registration during the authentication process.

* Guided-auth removal, OAuth smoke testing, and TUI/CLI support

* Added CLI OAuth runner flags tests

* Added clarifying comment on port 0 binding

* README notes on TUI oauth callback port, prettier fixes for CLI tests

* CIMD validation uses inline like EMA IdP

* Fixed TUI test failures from merge

* test: bring 5 OAuth files over the 90 per-file coverage gate

The guided-auth-removal work added/touched several files that fell below
the repo's >=90 per-file coverage gate (npm run coverage). CI doesn't run
the gate (it's local-only), so validate + test:integration passed while
these gaps slipped through. Bring them all back over the line:

- core/auth/node/runner-oauth-callback.ts: test bad-URL/non-http-scheme
  throws, no-port->80 default, and IPv6 hostname bracketing. Annotate the
  provably-dead guards (empty host, out-of-range port, String(err)
  fallback, pathname "/" fallback) -- all rejected by new URL() upstream --
  with justified v8 ignore comments instead of lowering the gate.
- core/auth/cimd.ts: test the AS-doesn't-support-CIMD early return.
- core/react/useClientSettingsDraft.ts: test the functional-updater path,
  the stale-onChange-after-close prev===null guard, and the
  timer-fires-after-close value===null guard.
- ClientSettingsForm.tsx: test the CIMD checkbox toggle and CIMD URL clear.
- clients/tui/src/utils/oauthDisplay.ts: test static/dcr registration
  kinds, the expired IdP session, and the configured-scope/empty-scope
  branches of formatScopes.

npm run coverage now passes (exit 0) across web, cli, tui, launcher.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: cliffhall <cliff@futurescale.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-29 15:35:51 -04:00

162 lines
5.8 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,
McpError,
} from "@modelcontextprotocol/sdk/types.js";
import type { SamplingCreateMessage } from "./samplingCreateMessage.js";
import type { ElicitationCreateMessage } from "./elicitationCreateMessage.js";
import type { JsonValue } from "../json/jsonUtils.js";
import type { OAuthTokens } from "@modelcontextprotocol/sdk/shared/auth.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?: McpError;
};
/** Fired from getRequestorTask() and callToolStream (client-origin task updates). */
requestorTaskUpdated: {
taskId: string;
task: TaskWithOptionalCreatedAt;
result?: CallToolResult;
error?: McpError;
};
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 };
}
/**
* 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> {}