inspector/core/mcp/state/messageLogState.ts
Cliff Hall dc31c28102
fix(core): make "error" the canonical terminal status on a mid-session crash (#1490) (#1493)
* fix(core): make "error" the canonical terminal status on a mid-session crash (#1490)

On a real mid-session transport crash many SDK transports fire BOTH
`onclose` and `onerror` in a transport-dependent order. The `onclose`
guard (`if status !== "disconnected"`) let a trailing `onclose`
downgrade a crash's `"error"` status back to `"disconnected"`, so the
persistent terminal status differed by ordering:

- onerror-then-onclose → "disconnected"
- onclose-then-onerror → "error"

`onclose` now treats `"error"` as terminal (only `"connected"`/
`"connecting"` → `"disconnected"`), so `"error"` is the canonical resting
status in both orderings. It still emits the `disconnect` event exactly
once so session-teardown consumers fire identically either way.

Because the state managers gated list/message/subscription/task teardown
on `getStatus() === "disconnected"`, holding the status at `"error"`
would have left them stale in the onerror-first ordering — swapping one
ordering-dependence for another. Introduce `isTerminalStatus()`
(disconnected || error) and key every teardown guard off it so they
clear identically regardless of crash ordering.

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

* fix(core): single disconnect event when explicitly disconnecting from "error" (#1490 re-review)

Addresses the non-blocking observation from the PR review: explicitly
calling disconnect() from a held-"error" status could fire the
`disconnect` event twice. close() can trigger the transport's onclose
synchronously; onclose (holding status at "error") fired `disconnect`,
then disconnect()'s own guard saw status still != "disconnected" and
fired it again — a timing-dependence on whether the SDK closes sync.

Add a `disconnecting` ownership flag: onclose defers its status set +
`disconnect` event to disconnect() while it is set, so the
explicit-disconnect path emits exactly one `disconnect` regardless of
sync/async close. Crash-path onclose (flag unset) is unchanged.

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

* test(core): deterministically pin the sync-close disconnect double-fire (#1490 re-review)

The real-stdio test asserts the single-disconnect invariant but may not
exercise the sync-close branch (the one that double-fired) if the SDK
stdio transport closes asynchronously. Add a test that overrides the SDK
client's close() to invoke the transport's onclose synchronously,
forcing the exact timing the `disconnecting` flag guards. Verified it
asserts 2 (fails) without the flag and 1 (passes) with it.

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

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-15 10:15:29 -04:00

161 lines
5.7 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);
};
const onStatusChange = (): void => {
if (isTerminalStatus(this.client?.getStatus())) {
this.messages = [];
this.pendingRequestEntries.clear();
this.dispatchTypedEvent("messagesChange", []);
}
};
this.client.addEventListener("message", onMessage);
this.client.addEventListener("statusChange", onStatusChange);
this.unsubscribe = () => {
if (this.client) {
this.client.removeEventListener("message", onMessage);
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();
}
}