#1954 wired the list-load error off the aggregate managed stores only. With `paginatedLists` on, those stores deliberately skip their all-page walk, so their error is permanently null — while the paged stores that actually drive the sidebar had no error state at all and `loadPage` had a try/finally with no catch. A failing list showed an empty panel with no alert and no Retry, and the connect-time `void loadPage(undefined)` left an unhandled rejection. - Give PagedTools/Prompts/ResourcesState observable error state: an `errorChange` event plus `getError()`, set in a new catch in `loadPage`, cleared on the next success and on disconnect. The rejection is still re-thrown, matching ManagedListState — callers' auth-recovery wrappers key off it to detect a 401. - Catch the connect-time load's rejection (`.catch(() => {})`) now that the failure is recorded as state rather than lost. - Select the error by mode in `usePaginatedList`, the same way `items` already is, and read it in App.tsx from the pagination model. - Rename `useManagedListError` to `useListError`: both store families expose an identical `errorChange`, so the hook declares that one-event contract itself instead of importing ManagedListEventMap. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0177mPHAdECD18nLLCTwR5rh Signed-off-by: cliffhall <cliff@futurescale.com>
98 lines
3.7 KiB
TypeScript
98 lines
3.7 KiB
TypeScript
import { useState, useEffect, useCallback } from "react";
|
|
import type { InspectorClientProtocol } from "../mcp/inspectorClientProtocol.js";
|
|
import type { ManagedToolsState } from "../mcp/state/managedToolsState.js";
|
|
import type { ManagedToolsStateEventMap } from "../mcp/state/managedToolsState.js";
|
|
import type { Tool } from "@modelcontextprotocol/client";
|
|
import type { TypedEventGeneric } from "../mcp/typedEventTarget.js";
|
|
import { useListError } from "./useListError.js";
|
|
|
|
export interface UseManagedToolsResult {
|
|
/**
|
|
* The last fetch's failure (transport error, or a result the SDK codec
|
|
* rejected), or `null` when it succeeded. Includes the connect-time load,
|
|
* whose failure has no caller to surface it (#1953).
|
|
*/
|
|
error: Error | null;
|
|
tools: Tool[];
|
|
/** True when a `tools/list_changed` arrived since the last user refresh. */
|
|
listChanged: boolean;
|
|
refresh: () => Promise<Tool[]>;
|
|
/**
|
|
* Acknowledge the list-changed indicator without fetching the aggregate.
|
|
* Used by the paginated Refresh path, which reloads page 1 of the paged
|
|
* store (bypassing this hook's `refresh`) but must still clear the indicator
|
|
* the managed state lit on `list_changed` (#1721).
|
|
*/
|
|
clearListChanged: () => void;
|
|
}
|
|
|
|
/**
|
|
* React hook that subscribes to ManagedToolsState and returns tools + refresh.
|
|
*/
|
|
export function useManagedTools(
|
|
client: InspectorClientProtocol | null,
|
|
managedToolsState: ManagedToolsState | null,
|
|
): UseManagedToolsResult {
|
|
const [tools, setTools] = useState<Tool[]>(
|
|
managedToolsState?.getTools() ?? [],
|
|
);
|
|
const [listChanged, setListChanged] = useState<boolean>(
|
|
managedToolsState?.getListChanged() ?? false,
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (!managedToolsState) {
|
|
setTools([]);
|
|
setListChanged(false);
|
|
return;
|
|
}
|
|
setTools(managedToolsState.getTools());
|
|
setListChanged(managedToolsState.getListChanged());
|
|
const onToolsChange = (
|
|
event: TypedEventGeneric<ManagedToolsStateEventMap, "toolsChange">,
|
|
) => {
|
|
setTools(event.detail);
|
|
};
|
|
const onListChangedChange = (
|
|
event: TypedEventGeneric<ManagedToolsStateEventMap, "listChangedChange">,
|
|
) => {
|
|
setListChanged(event.detail);
|
|
};
|
|
managedToolsState.addEventListener("toolsChange", onToolsChange);
|
|
managedToolsState.addEventListener(
|
|
"listChangedChange",
|
|
onListChangedChange,
|
|
);
|
|
return () => {
|
|
managedToolsState.removeEventListener("toolsChange", onToolsChange);
|
|
managedToolsState.removeEventListener(
|
|
"listChangedChange",
|
|
onListChangedChange,
|
|
);
|
|
};
|
|
}, [managedToolsState]);
|
|
|
|
const error = useListError(managedToolsState);
|
|
|
|
const refresh = useCallback(async (): Promise<Tool[]> => {
|
|
if (!managedToolsState || !client) return [];
|
|
// A user-initiated refresh acknowledges the change — clear the indicator
|
|
// BEFORE awaiting the fetch, not after. If a `tools/list_changed` arrives
|
|
// mid-fetch, the state re-sets the flag (and auto-refreshes); clearing
|
|
// afterward would wipe that genuinely-new signal and the user would miss
|
|
// it. Clearing up front acknowledges only the change in hand.
|
|
managedToolsState.clearListChanged();
|
|
// A user-initiated refresh forces a cache-bypassing round trip
|
|
// (`cacheMode: "refresh"`) so a modern server's `ttlMs`-cached list can't
|
|
// return stale — and re-stores the fresh aggregate.
|
|
const next = await managedToolsState.refresh(undefined, "refresh");
|
|
setTools(next);
|
|
return next;
|
|
}, [client, managedToolsState]);
|
|
|
|
const clearListChanged = useCallback(() => {
|
|
managedToolsState?.clearListChanged();
|
|
}, [managedToolsState]);
|
|
|
|
return { tools, error, listChanged, refresh, clearListChanged };
|
|
}
|