A list load that failed — a transport error, or a result the SDK's era codec rejects as invalid — reported nothing. The connect-time refresh is fired with no caller to await it (`void this.refresh()`), so its rejection became an unhandled rejection: the header said "Connected", the panel rendered an empty list indistinguishable from a server that has none, and the failed exchange showed in the Protocol panel as a clean success. Two surfaces now tell the truth: - ManagedListState records the failure as observable state (`getError` + an `errorChange` event) and still re-throws, so App's auth-recovery wrapper keeps working. The four `useManaged*` hooks expose it via a shared `useManagedListError`, and the Tools/Prompts/Resources sidebars render a `ListLoadError` alert with the reason and a Retry. - A response the client refused is attributed back to its Protocol entry (`markResponseRejected` → `responseRejected` → `MessageEntry.clientError`), which now renders an Error status and a "Rejected by the Inspector" alert rather than the green resultType badge alone. The SDK gives no request id with a decode failure, so the id is recovered by correlation; see the comment on `markResponseRejected` for why that is exact. Also stops `listAllTools` from dropping a failing excluded-tools walk on the floor — it stays non-fatal but is logged. Closes #1953 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SW1p8E2uiyyLx4RKwrwSrt
186 lines
7.1 KiB
TypeScript
186 lines
7.1 KiB
TypeScript
/**
|
|
* MessageLogState: holds the message log, subscribes to the protocol "message"
|
|
* event. Protocol emits per-entry; this manager owns the list and emits both
|
|
* `message` (single entry) and `messagesChange` (full list) on append/update,
|
|
* and `messagesChange` on clear. Clears on disconnect — the disconnect handler
|
|
* is the canonical session boundary. We do NOT clear on the subsequent
|
|
* `connect` event because state managers (Tools/Prompts/Resources/Templates)
|
|
* fire their initial list requests *synchronously* inside their own connect
|
|
* listeners; clearing here too would wipe `pendingRequestEntries` after those
|
|
* requests were tracked but before their responses came back, leaving the
|
|
* history with unmatched responses.
|
|
*
|
|
* Ported from v1.5/main. v2 substitutes `InspectorClientProtocol` for the
|
|
* concrete `InspectorClient` since the runtime class is not yet ported.
|
|
*/
|
|
|
|
import type { InspectorClientProtocol } from "../inspectorClientProtocol.js";
|
|
import type { MessageEntry } from "../types.js";
|
|
import { isTerminalStatus } from "../types.js";
|
|
import type { InspectorClientEventMap } from "../inspectorClientEventTarget.js";
|
|
import {
|
|
TypedEventTarget,
|
|
type TypedEventGeneric,
|
|
} from "../typedEventTarget.js";
|
|
|
|
export interface MessageLogStateEventMap {
|
|
message: MessageEntry;
|
|
messagesChange: MessageEntry[];
|
|
}
|
|
|
|
export interface MessageLogStateOptions {
|
|
/**
|
|
* Maximum number of messages to store (0 = unlimited, not recommended).
|
|
* When exceeded, oldest entries are dropped. Default 1000.
|
|
*/
|
|
maxMessages?: number;
|
|
}
|
|
|
|
export class MessageLogState extends TypedEventTarget<MessageLogStateEventMap> {
|
|
private messages: MessageEntry[] = [];
|
|
/** Pending request entries by JSON-RPC message id for matching responses. */
|
|
private pendingRequestEntries = new Map<string | number, MessageEntry>();
|
|
private client: InspectorClientProtocol | null = null;
|
|
private unsubscribe: (() => void) | null = null;
|
|
private readonly maxMessages: number;
|
|
|
|
constructor(
|
|
client: InspectorClientProtocol,
|
|
options: MessageLogStateOptions = {},
|
|
) {
|
|
super();
|
|
this.maxMessages = options.maxMessages ?? 1000;
|
|
this.client = client;
|
|
|
|
const pushEntry = (entry: MessageEntry): void => {
|
|
if (this.maxMessages > 0 && this.messages.length >= this.maxMessages) {
|
|
this.messages.shift();
|
|
}
|
|
this.messages.push(entry);
|
|
this.dispatchTypedEvent("message", entry);
|
|
this.dispatchTypedEvent("messagesChange", this.getMessages());
|
|
};
|
|
|
|
const onMessage = (
|
|
event: TypedEventGeneric<InspectorClientEventMap, "message">,
|
|
): void => {
|
|
const entry = event.detail;
|
|
if (entry.direction === "request") {
|
|
const reqId =
|
|
"id" in entry.message
|
|
? (entry.message as { id?: string | number }).id
|
|
: undefined;
|
|
if (reqId !== undefined) {
|
|
this.pendingRequestEntries.set(reqId, entry);
|
|
}
|
|
pushEntry(entry);
|
|
return;
|
|
}
|
|
if (entry.direction === "response") {
|
|
const messageId =
|
|
"id" in entry.message
|
|
? (entry.message as { id?: string | number }).id
|
|
: undefined;
|
|
const requestEntry =
|
|
messageId !== undefined
|
|
? this.pendingRequestEntries.get(messageId)
|
|
: undefined;
|
|
if (requestEntry) {
|
|
this.pendingRequestEntries.delete(messageId!);
|
|
requestEntry.response = entry.message as MessageEntry["response"];
|
|
requestEntry.duration =
|
|
entry.timestamp.getTime() - requestEntry.timestamp.getTime();
|
|
this.dispatchTypedEvent("message", requestEntry);
|
|
this.dispatchTypedEvent("messagesChange", this.getMessages());
|
|
return;
|
|
}
|
|
}
|
|
pushEntry(entry);
|
|
};
|
|
|
|
// A response the client rejected after the fact (the wire frame was valid
|
|
// JSON-RPC, but the SDK codec refused the result). Annotate the entry that
|
|
// carries that JSON-RPC id so it stops rendering as a clean success — the
|
|
// request entry when the response was folded into it, otherwise the
|
|
// standalone response entry. Searched newest-first: ids are unique within
|
|
// a session, and the failing exchange is by construction a recent one.
|
|
const onResponseRejected = (
|
|
event: TypedEventGeneric<InspectorClientEventMap, "responseRejected">,
|
|
): void => {
|
|
const { id, reason } = event.detail;
|
|
for (let i = this.messages.length - 1; i >= 0; i--) {
|
|
const entry = this.messages[i]!;
|
|
const entryId = (entry.message as { id?: string | number }).id;
|
|
if (entryId !== id) continue;
|
|
if (entry.direction === "notification") continue;
|
|
// A request entry with no response yet isn't the one being rejected —
|
|
// keep looking for the standalone response frame.
|
|
if (entry.direction === "request" && !entry.response) continue;
|
|
entry.clientError = reason;
|
|
this.dispatchTypedEvent("message", entry);
|
|
this.dispatchTypedEvent("messagesChange", this.getMessages());
|
|
return;
|
|
}
|
|
};
|
|
|
|
const onStatusChange = (): void => {
|
|
if (isTerminalStatus(this.client?.getStatus())) {
|
|
this.messages = [];
|
|
this.pendingRequestEntries.clear();
|
|
this.dispatchTypedEvent("messagesChange", []);
|
|
}
|
|
};
|
|
this.client.addEventListener("message", onMessage);
|
|
this.client.addEventListener("responseRejected", onResponseRejected);
|
|
this.client.addEventListener("statusChange", onStatusChange);
|
|
this.unsubscribe = () => {
|
|
if (this.client) {
|
|
this.client.removeEventListener("message", onMessage);
|
|
this.client.removeEventListener("responseRejected", onResponseRejected);
|
|
this.client.removeEventListener("statusChange", onStatusChange);
|
|
}
|
|
this.client = null;
|
|
};
|
|
}
|
|
|
|
getMessages(predicate?: (entry: MessageEntry) => boolean): MessageEntry[] {
|
|
if (predicate) {
|
|
return this.messages.filter(predicate);
|
|
}
|
|
return [...this.messages];
|
|
}
|
|
|
|
/**
|
|
* Remove messages from history. When `predicate` is provided, removes only
|
|
* entries for which predicate returns true. When omitted, clears all messages.
|
|
* Dispatches messagesChange only if the list actually changed.
|
|
*/
|
|
clearMessages(predicate?: (entry: MessageEntry) => boolean): void {
|
|
const before = this.messages.length;
|
|
this.messages = predicate ? this.messages.filter((m) => !predicate(m)) : [];
|
|
// Drop pending-request bookkeeping for any entry that was just removed.
|
|
// Without this, a later response matching an evicted request id would
|
|
// mutate a Map-only entry that is no longer reachable from `messages`,
|
|
// silently dropping the response.
|
|
if (predicate) {
|
|
const survivors = new Set(this.messages);
|
|
for (const [id, entry] of this.pendingRequestEntries) {
|
|
if (!survivors.has(entry)) {
|
|
this.pendingRequestEntries.delete(id);
|
|
}
|
|
}
|
|
} else {
|
|
this.pendingRequestEntries.clear();
|
|
}
|
|
if (this.messages.length !== before) {
|
|
this.dispatchTypedEvent("messagesChange", this.getMessages());
|
|
}
|
|
}
|
|
|
|
destroy(): void {
|
|
this.unsubscribe?.();
|
|
this.unsubscribe = null;
|
|
this.messages = [];
|
|
this.pendingRequestEntries.clear();
|
|
}
|
|
}
|