b33532c024
Closes #1910 `_meta` was typed `Record<string, string>` end to end in the Inspector — on disk as a `{ key, value }[]` pair array, in the Server Settings form as key/value rows, and in every request verb's per-call metadata parameter. Nothing in the MCP spec restricts a `_meta` value to a string, and the SDK models the field as a `z.looseObject`, so the restriction was ours alone. Widen the whole path to `RequestMetadata` (`Record<string, JsonValue>`): - Per-server default metadata is a JSON **object** on disk and in memory. The pre-#1910 pair array is still read (`normalizeStoredMetadata`) so an existing `mcp.json` keeps working; it is never written back, so a save migrates the entry. - The Server Settings → Request Metadata section is a JSON editor (`JsonObjectInput`) instead of key/value rows — rows cannot express an object value. It keeps the typed text as the display source and emits only parsed JSON, the same draft split `SchemaJsonField` uses, so the box stays typeable; invalid text is flagged inline and not applied. - The CLI stops flattening `--metadata` / `--tool-metadata` through `metaValueToString`. Those values were already JSON-parsed, so `trace={"id":"abc"}` used to reach the wire as the *string* `{"id":"abc"}` and now reaches it as an object. - `servers/show` redaction replaces a sensitive key's whole value rather than a string, so a structured value cannot leak through its members. - `progressTokenOf` narrows the reserved `progressToken` key back to `string | number` before it reaches the SDK; any other JSON still travels inside `_meta` but wires up no progress callback. 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>
86 lines
2.8 KiB
TypeScript
86 lines
2.8 KiB
TypeScript
/**
|
|
* PagedResourceTemplatesState: holds an aggregated list of resource templates
|
|
* loaded via loadPage(cursor). Does not load on connect; caller drives loading.
|
|
* Clears on disconnect.
|
|
*
|
|
* Intentionally does NOT subscribe to `resourceTemplatesListChanged`: cursors
|
|
* are tied to the server's prior list, so a list change mid-pagination would
|
|
* invalidate them. The caller decides how to react.
|
|
*
|
|
* 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 { ResourceTemplateType as ResourceTemplate } from "@modelcontextprotocol/client";
|
|
import { isTerminalStatus } from "../types.js";
|
|
import type { RequestMetadata } from "../types.js";
|
|
import { TypedEventTarget } from "../typedEventTarget.js";
|
|
|
|
export interface PagedResourceTemplatesStateEventMap {
|
|
resourceTemplatesChange: ResourceTemplate[];
|
|
}
|
|
|
|
export interface LoadPageResult {
|
|
resourceTemplates: ResourceTemplate[];
|
|
nextCursor?: string;
|
|
}
|
|
|
|
export class PagedResourceTemplatesState extends TypedEventTarget<PagedResourceTemplatesStateEventMap> {
|
|
private resourceTemplates: ResourceTemplate[] = [];
|
|
private client: InspectorClientProtocol | null = null;
|
|
private unsubscribe: (() => void) | null = null;
|
|
|
|
constructor(client: InspectorClientProtocol) {
|
|
super();
|
|
this.client = client;
|
|
const onStatusChange = (): void => {
|
|
if (isTerminalStatus(this.client?.getStatus())) {
|
|
this.resourceTemplates = [];
|
|
this.dispatchTypedEvent("resourceTemplatesChange", []);
|
|
}
|
|
};
|
|
this.client.addEventListener("statusChange", onStatusChange);
|
|
this.unsubscribe = () => {
|
|
if (this.client) {
|
|
this.client.removeEventListener("statusChange", onStatusChange);
|
|
}
|
|
this.client = null;
|
|
};
|
|
}
|
|
|
|
getResourceTemplates(): ResourceTemplate[] {
|
|
return [...this.resourceTemplates];
|
|
}
|
|
|
|
clear(): void {
|
|
this.resourceTemplates = [];
|
|
this.dispatchTypedEvent("resourceTemplatesChange", this.resourceTemplates);
|
|
}
|
|
|
|
async loadPage(
|
|
cursor?: string,
|
|
metadata?: RequestMetadata,
|
|
): Promise<LoadPageResult> {
|
|
const c = this.client;
|
|
if (!c || c.getStatus() !== "connected") {
|
|
return { resourceTemplates: [], nextCursor: undefined };
|
|
}
|
|
const result = await c.listResourceTemplates(cursor, metadata);
|
|
this.resourceTemplates =
|
|
cursor === undefined
|
|
? [...result.resourceTemplates]
|
|
: [...this.resourceTemplates, ...result.resourceTemplates];
|
|
this.dispatchTypedEvent("resourceTemplatesChange", this.resourceTemplates);
|
|
return {
|
|
resourceTemplates: result.resourceTemplates,
|
|
nextCursor: result.nextCursor,
|
|
};
|
|
}
|
|
|
|
destroy(): void {
|
|
this.unsubscribe?.();
|
|
this.unsubscribe = null;
|
|
this.resourceTemplates = [];
|
|
}
|
|
}
|