@assistant-ui/react-mcp 0.0.17 → 0.0.19

package/dist/resources/McpServerResource.js

@@ -15,6 +15,39 @@ const useMcpServerResource = (props) => {
 	const [authorizationUrl, setAuthorizationUrl] = useState(null);
 	const clientRef = useRef(null);
 	const transportRef = useRef(null);
+	const pendingTransportRef = useRef(null);
+	const transportCloseQueueRef = useRef(Promise.resolve());
+	const connectionGenerationRef = useRef(0);
+	const pendingDisposalRef = useRef(null);
+	const mountedRef = useRef(true);
+	const closeTransportSafely = async (transport) => {
+		try {
+			await transport.close();
+		} catch {}
+	};
+	const closeQueuedTransports = (transports) => {
+		const task = transportCloseQueueRef.current.then(async () => {
+			await Promise.all(transports.map(closeTransportSafely));
+		});
+		transportCloseQueueRef.current = task;
+		return task;
+	};
+	const closePendingTransport = async () => {
+		const transport_0 = pendingTransportRef.current;
+		pendingTransportRef.current = null;
+		await closeQueuedTransports(transport_0 ? [transport_0] : []);
+	};
+	const closeTransports = async () => {
+		const pendingTransport = pendingTransportRef.current;
+		const activeTransport = transportRef.current;
+		pendingTransportRef.current = null;
+		transportRef.current = null;
+		clientRef.current = null;
+		const transports_0 = new Set([pendingTransport, activeTransport].filter((transport_1) => transport_1 !== null));
+		await closeQueuedTransports([...transports_0]);
+	};
+	const isCurrentConnection = (generation) => mountedRef.current && generation === connectionGenerationRef.current;
+	const createInterruptedAuthError = (cause) => new Error(`MCP server "${props.id}" authorization was interrupted before completion.`, cause === void 0 ? void 0 : { cause });
 	const withConnectionTimeout = useEffectEvent(async (promise, phase, startedAt) => {
 		const timeoutMs = props.connectionTimeout;
 		if (timeoutMs === void 0) return await promise;
@@ -50,16 +83,19 @@ const useMcpServerResource = (props) => {
 		}
 		return new StreamableHTTPClientTransport(new URL(props.url));
 	});
-	const finalizeConnect = useEffectEvent(async (transport) => {
+	const finalizeConnect = useEffectEvent(async (transport_2, generation_0) => {
 		const client = new Client({
 			name: "assistant-ui-mcp",
 			version: "0.0.0"
 		});
 		const startedAt_0 = Date.now();
-		await withConnectionTimeout(client.connect(transport), "connecting", startedAt_0);
+		await withConnectionTimeout(client.connect(transport_2), "connecting", startedAt_0);
+		if (!isCurrentConnection(generation_0)) return false;
 		const list = await withConnectionTimeout(client.listTools(), "listing tools", startedAt_0);
+		if (!isCurrentConnection(generation_0)) return false;
+		pendingTransportRef.current = null;
 		clientRef.current = client;
-		transportRef.current = transport;
+		transportRef.current = transport_2;
 		setTools(list.tools.map((t) => {
 			const info = {
 				name: t.name,
@@ -69,62 +105,79 @@ const useMcpServerResource = (props) => {
 			return info;
 		}));
 		setConnectionState("connected");
+		return true;
 	});
-	const closeTransport = async () => {
-		const t_0 = transportRef.current;
-		transportRef.current = null;
-		clientRef.current = null;
-		if (t_0) try {
-			await t_0.close();
-		} catch {}
-	};
 	const doConnect = useEffectEvent(async () => {
-		await closeTransport();
+		const generation_1 = ++connectionGenerationRef.current;
+		await closeTransports();
+		if (!isCurrentConnection(generation_1)) return;
 		setConnectionState("connecting");
 		setLastError(null);
 		setAuthorizationUrl(null);
 		setTools([]);
-		let transport_0 = null;
+		let transport_3 = null;
 		try {
-			transport_0 = await buildTransport();
-			await finalizeConnect(transport_0);
+			transport_3 = await buildTransport();
+			if (!isCurrentConnection(generation_1)) {
+				await closeQueuedTransports([transport_3]);
+				return;
+			}
+			pendingTransportRef.current = transport_3;
+			await finalizeConnect(transport_3, generation_1);
 		} catch (err) {
+			if (!isCurrentConnection(generation_1)) return;
 			if (err instanceof UnauthorizedError) {
-				transportRef.current = transport_0;
+				pendingTransportRef.current = null;
+				transportRef.current = transport_3;
 				setConnectionState("authRequired");
 			} else {
-				if (transport_0) try {
-					await transport_0.close();
-				} catch {}
+				if (transport_3) {
+					pendingTransportRef.current = null;
+					await closeQueuedTransports([transport_3]);
+				}
 				setLastError({ message: err instanceof Error ? err.message : String(err) });
 				setConnectionState("error");
 			}
 		}
 	});
 	const doDisconnect = useEffectEvent(async () => {
+		connectionGenerationRef.current += 1;
 		setTools([]);
 		setAuthorizationUrl(null);
 		setConnectionState("disconnected");
-		await closeTransport();
+		await closeTransports();
 	});
 	const doCompleteAuth = useEffectEvent(async (callbackUrl) => {
+		const generation_2 = ++connectionGenerationRef.current;
+		await closePendingTransport();
+		if (!isCurrentConnection(generation_2)) throw createInterruptedAuthError();
 		setConnectionState("authPending");
 		setLastError(null);
 		try {
 			const code = new URL(callbackUrl).searchParams.get("code");
 			if (!code) throw new Error("missing authorization code in callback URL");
-			let transport_1 = transportRef.current;
-			if (!transport_1) {
-				transport_1 = await buildTransport();
-				transportRef.current = transport_1;
+			let transport_4 = transportRef.current;
+			if (!transport_4) {
+				transport_4 = await buildTransport();
+				if (!isCurrentConnection(generation_2)) {
+					await closeQueuedTransports([transport_4]);
+					throw createInterruptedAuthError();
+				}
 			}
-			await transport_1.finishAuth(code);
+			transportRef.current = null;
+			clientRef.current = null;
+			pendingTransportRef.current = transport_4;
+			await transport_4.finishAuth(code);
+			if (!isCurrentConnection(generation_2)) throw createInterruptedAuthError();
 			setAuthorizationUrl(null);
-			await finalizeConnect(transport_1);
+			if (!await finalizeConnect(transport_4, generation_2)) throw createInterruptedAuthError();
 		} catch (err_0) {
-			await closeTransport();
-			setLastError({ message: err_0 instanceof Error ? err_0.message : String(err_0) });
+			const error = err_0 instanceof Error ? err_0 : new Error(String(err_0));
+			if (!isCurrentConnection(generation_2)) throw createInterruptedAuthError(error);
+			await closeTransports();
+			setLastError({ message: error.message });
 			setConnectionState("error");
+			throw error;
 		}
 	});
 	const tryAutoConnect = useEffectEvent(async (signal) => {
@@ -145,14 +198,21 @@ const useMcpServerResource = (props) => {
 		doConnect();
 	});
 	useEffect(() => {
+		const previousDisposal = pendingDisposalRef.current;
+		if (previousDisposal) previousDisposal.cancelled = true;
+		const pendingDisposal = { cancelled: false };
+		pendingDisposalRef.current = pendingDisposal;
+		mountedRef.current = true;
 		const signal_0 = { cancelled: false };
 		tryAutoConnect(signal_0);
 		return () => {
+			mountedRef.current = false;
 			signal_0.cancelled = true;
-			const t_1 = transportRef.current;
-			transportRef.current = null;
-			clientRef.current = null;
-			if (t_1) t_1.close().catch(() => {});
+			queueMicrotask(() => {
+				if (pendingDisposal.cancelled) return;
+				connectionGenerationRef.current += 1;
+				closeTransports();
+			});
 		};
 	}, []);
 	const state = useMemo(() => ({
@@ -193,10 +253,15 @@ const useMcpServerResource = (props) => {
 				arguments: args
 			});
 		},
-		readResource: async (uri) => {
+		listResources: async (params) => {
 			const client_1 = clientRef.current;
 			if (!client_1) throw new Error(`MCP server "${props.id}" is not connected`);
-			return await client_1.readResource({ uri });
+			return await client_1.listResources(params);
+		},
+		readResource: async (uri) => {
+			const client_2 = clientRef.current;
+			if (!client_2) throw new Error(`MCP server "${props.id}" is not connected`);
+			return await client_2.readResource({ uri });
 		},
 		completeAuth: doCompleteAuth
 	};

package/dist/resources/McpServerResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","ClientOutput","Client","StreamableHTTPClientTransport","StreamableHTTPClientTransportOptions","UnauthorizedError","Transport","createOAuthProvider","buildHeaders","assertValidServerId","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPServerKind","MCPServerState","MCPToolInfo","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","onRemove","Promise","useMcpServerResource","props","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","clientRef","transportRef","withConnectionTimeout","promise","T","phase","startedAt","timeoutMs","undefined","remainingMs","Date","now","timeoutError","Error","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","buildTransport","type","authProvider","serverId","config","onAuthorizationUrl","toString","URL","persisted","loadAuthState","headers","transportOpts","requestInit","finalizeConnect","transport","client","version","connect","list","listTools","current","map","t","info","inputSchema","description","closeTransport","close","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","code","searchParams","get","finishAuth","tryAutoConnect","signal","cancelled","token","tokens","catch","state","getState","disconnect","remove","clearAuthState","callTool","args","arguments","Record","readResource","uri","completeAuth","McpServerResource"],"sources":["../../src/resources/McpServerResource.ts"],"sourcesContent":["import { useState, useRef, useEffect, useMemo, useEffectEvent } from \"react\";\nimport { resource } from \"@assistant-ui/tap\";\nimport type { ClientOutput } from \"@assistant-ui/store\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport {\n  StreamableHTTPClientTransport,\n  type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport { UnauthorizedError } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport { createOAuthProvider } from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\nimport type { MCPStorage } from \"./storage/types\";\nimport type {\n  MCPAuthConfig,\n  MCPConnectionState,\n  MCPServerKind,\n  MCPServerState,\n  MCPToolInfo,\n} from \"../mcp-scope\";\n\nexport type McpServerResourceProps = {\n  id: string;\n  kind: MCPServerKind;\n  name: string;\n  url: string;\n  icon?: string | undefined;\n  auth: MCPAuthConfig;\n  storage: MCPStorage;\n  redirectUri: string;\n  autoConnect: boolean;\n  connectionTimeout?: number | undefined;\n  onRemove: () => Promise<void>;\n};\n\nconst useMcpServerResource = (\n  props: McpServerResourceProps,\n): ClientOutput<\"mcpServer\"> => {\n  assertValidServerId(props.id);\n  const [connectionState, setConnectionState] =\n    useState<MCPConnectionState>(\"disconnected\");\n  const [tools, setTools] = useState<MCPToolInfo[]>([]);\n  const [lastError, setLastError] = useState<{ message: string } | null>(null);\n  const [authorizationUrl, setAuthorizationUrl] = useState<string | null>(null);\n\n  const clientRef = useRef<Client | null>(null);\n  const transportRef = useRef<StreamableHTTPClientTransport | null>(null);\n\n  const withConnectionTimeout = useEffectEvent(\n    async <T>(\n      promise: Promise<T>,\n      phase: \"connecting\" | \"listing tools\",\n      startedAt: number,\n    ): Promise<T> => {\n      const timeoutMs = props.connectionTimeout;\n      if (timeoutMs === undefined) return await promise;\n      const remainingMs = timeoutMs - (Date.now() - startedAt);\n      const timeoutError = () =>\n        new Error(\n          `MCP server \"${props.id}\" timed out while ${phase} after ${timeoutMs}ms.`,\n        );\n      if (remainingMs <= 0) throw timeoutError();\n\n      let timeout: ReturnType<typeof setTimeout> | undefined;\n      try {\n        return await Promise.race([\n          promise,\n          new Promise<never>((_, reject) => {\n            timeout = setTimeout(() => reject(timeoutError()), remainingMs);\n          }),\n        ]);\n      } finally {\n        if (timeout !== undefined) clearTimeout(timeout);\n      }\n    },\n  );\n\n  const buildTransport = useEffectEvent(\n    async (): Promise<StreamableHTTPClientTransport> => {\n      if (props.auth.type === \"oauth\") {\n        const authProvider = createOAuthProvider({\n          serverId: props.id,\n          config: props.auth,\n          storage: props.storage,\n          redirectUri: props.redirectUri,\n          onAuthorizationUrl: (url) => setAuthorizationUrl(url.toString()),\n        });\n        return new StreamableHTTPClientTransport(new URL(props.url), {\n          authProvider,\n        });\n      }\n      if (props.auth.type === \"bearer\") {\n        const persisted = await props.storage.loadAuthState(props.id);\n        const headers = buildHeaders(props.auth, persisted);\n        const transportOpts: StreamableHTTPClientTransportOptions = {};\n        if (headers) transportOpts.requestInit = { headers };\n        return new StreamableHTTPClientTransport(\n          new URL(props.url),\n          transportOpts,\n        );\n      }\n      return new StreamableHTTPClientTransport(new URL(props.url));\n    },\n  );\n\n  const finalizeConnect = useEffectEvent(\n    async (transport: StreamableHTTPClientTransport) => {\n      const client = new Client({\n        name: \"assistant-ui-mcp\",\n        version: \"0.0.0\",\n      });\n      const startedAt = Date.now();\n      // SDK's StreamableHTTPClientTransport.sessionId is `string | undefined`\n      // but Transport.sessionId is declared `string?` — under\n      // exactOptionalPropertyTypes the SDK's own classes don't satisfy its\n      // Transport interface. Cast to bridge the gap.\n      await withConnectionTimeout(\n        client.connect(transport as unknown as Transport),\n        \"connecting\",\n        startedAt,\n      );\n      // Defer ref assignment until listTools() also succeeds — otherwise a\n      // post-connect failure leaves stale refs that `callTool()` would\n      // happily walk into, producing confusing SDK errors instead of\n      // \"not connected\".\n      const list = await withConnectionTimeout(\n        client.listTools(),\n        \"listing tools\",\n        startedAt,\n      );\n      clientRef.current = client;\n      transportRef.current = transport;\n      setTools(\n        list.tools.map((t) => {\n          const info: MCPToolInfo = {\n            name: t.name,\n            inputSchema: t.inputSchema,\n          };\n          if (t.description !== undefined) info.description = t.description;\n          return info;\n        }),\n      );\n      setConnectionState(\"connected\");\n    },\n  );\n\n  const closeTransport = async () => {\n    const t = transportRef.current;\n    transportRef.current = null;\n    clientRef.current = null;\n    if (t) {\n      try {\n        await t.close();\n      } catch {\n        // ignore close errors\n      }\n    }\n  };\n\n  const doConnect = useEffectEvent(async () => {\n    // Close any prior transport/client so a re-connect doesn't leak.\n    await closeTransport();\n    setConnectionState(\"connecting\");\n    setLastError(null);\n    setAuthorizationUrl(null);\n    // Clear tools so a reconnect (error → connect, or authRequired\n    // → connect) doesn't expose the previous attempt's tool list.\n    setTools([]);\n    let transport: StreamableHTTPClientTransport | null = null;\n    try {\n      transport = await buildTransport();\n      // Don't assign to transportRef until connect succeeds — otherwise a\n      // failed `listTools()` leaves an orphaned transport that future\n      // doConnect / doDisconnect calls treat as live.\n      await finalizeConnect(transport);\n    } catch (err) {\n      if (err instanceof UnauthorizedError) {\n        // OAuth: keep the transport alive so completeAuth can call\n        // finishAuth on it. Closing it before storing would leave a\n        // closed transport on transportRef.\n        transportRef.current = transport;\n        setConnectionState(\"authRequired\");\n      } else {\n        if (transport) {\n          try {\n            await transport.close();\n          } catch {\n            // ignore close errors\n          }\n        }\n        setLastError({\n          message: err instanceof Error ? err.message : String(err),\n        });\n        setConnectionState(\"error\");\n      }\n    }\n  });\n\n  const doDisconnect = useEffectEvent(async () => {\n    setTools([]);\n    setAuthorizationUrl(null);\n    setConnectionState(\"disconnected\");\n    await closeTransport();\n  });\n\n  const doCompleteAuth = useEffectEvent(async (callbackUrl: string) => {\n    setConnectionState(\"authPending\");\n    setLastError(null);\n    try {\n      const url = new URL(callbackUrl);\n      const code = url.searchParams.get(\"code\");\n      if (!code) throw new Error(\"missing authorization code in callback URL\");\n      let transport = transportRef.current;\n      if (!transport) {\n        transport = await buildTransport();\n        transportRef.current = transport;\n      }\n      await transport.finishAuth(code);\n      setAuthorizationUrl(null);\n      await finalizeConnect(transport);\n    } catch (err) {\n      await closeTransport();\n      setLastError({\n        message: err instanceof Error ? err.message : String(err),\n      });\n      setConnectionState(\"error\");\n    }\n  });\n\n  const tryAutoConnect = useEffectEvent(\n    async (signal: { cancelled: boolean }) => {\n      if (!props.autoConnect) return;\n      if (props.auth.type === \"none\") {\n        void doConnect();\n        return;\n      }\n      // Static connector token short-circuits the storage read.\n      if (props.auth.type === \"bearer\" && props.auth.token) {\n        void doConnect();\n        return;\n      }\n      const persisted = await props.storage.loadAuthState(props.id);\n      if (signal.cancelled) return;\n      if (props.auth.type === \"oauth\") {\n        if (!persisted?.tokens) return;\n      } else if (!persisted?.token) {\n        return;\n      }\n      void doConnect();\n    },\n  );\n\n  // Auto-connect on mount when usable auth exists.\n  useEffect(() => {\n    const signal = { cancelled: false };\n    void tryAutoConnect(signal);\n    return () => {\n      signal.cancelled = true;\n      const t = transportRef.current;\n      transportRef.current = null;\n      clientRef.current = null;\n      if (t) t.close().catch(() => {});\n    };\n  }, []);\n\n  const state = useMemo<MCPServerState>(\n    () => ({\n      id: props.id,\n      kind: props.kind,\n      name: props.name,\n      url: props.url,\n      icon: props.icon,\n      connectionState,\n      lastError,\n      tools,\n      authorizationUrl,\n    }),\n    [\n      props.id,\n      props.kind,\n      props.name,\n      props.url,\n      props.icon,\n      connectionState,\n      lastError,\n      tools,\n      authorizationUrl,\n    ],\n  );\n\n  return {\n    getState: () => state,\n    connect: doConnect,\n    disconnect: doDisconnect,\n    remove: async () => {\n      await doDisconnect();\n      await props.storage.clearAuthState(props.id);\n      await props.onRemove();\n    },\n    callTool: async (name, args) => {\n      const client = clientRef.current;\n      if (!client) {\n        throw new Error(`MCP server \"${props.id}\" is not connected`);\n      }\n      return await client.callTool({\n        name,\n        arguments: args as Record<string, unknown> | undefined,\n      });\n    },\n    readResource: async (uri) => {\n      const client = clientRef.current;\n      if (!client) {\n        throw new Error(`MCP server \"${props.id}\" is not connected`);\n      }\n      return await client.readResource({ uri });\n    },\n    completeAuth: doCompleteAuth,\n  };\n};\n\nexport const McpServerResource = resource(useMcpServerResource);\n"],"mappings":"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"}
+{"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","ClientOutput","Client","StreamableHTTPClientTransport","StreamableHTTPClientTransportOptions","UnauthorizedError","Transport","createOAuthProvider","buildHeaders","assertValidServerId","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPServerKind","MCPServerState","MCPToolInfo","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","onRemove","Promise","useMcpServerResource","props","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","clientRef","transportRef","pendingTransportRef","transportCloseQueueRef","resolve","connectionGenerationRef","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","current","then","all","map","closePendingTransport","closeTransports","pendingTransport","activeTransport","Set","filter","isCurrentConnection","generation","createInterruptedAuthError","cause","Error","undefined","withConnectionTimeout","promise","T","phase","startedAt","timeoutMs","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","buildTransport","type","authProvider","serverId","config","onAuthorizationUrl","toString","URL","persisted","loadAuthState","headers","transportOpts","requestInit","finalizeConnect","client","version","connect","list","listTools","t","info","inputSchema","description","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","code","searchParams","get","finishAuth","connected","error","tryAutoConnect","signal","token","tokens","previousDisposal","pendingDisposal","queueMicrotask","state","getState","disconnect","remove","clearAuthState","callTool","args","arguments","Record","listResources","params","readResource","uri","completeAuth","McpServerResource"],"sources":["../../src/resources/McpServerResource.ts"],"sourcesContent":["import { useState, useRef, useEffect, useMemo, useEffectEvent } from \"react\";\nimport { resource } from \"@assistant-ui/tap\";\nimport type { ClientOutput } from \"@assistant-ui/store\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport {\n  StreamableHTTPClientTransport,\n  type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport { UnauthorizedError } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport { createOAuthProvider } from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\nimport type { MCPStorage } from \"./storage/types\";\nimport type {\n  MCPAuthConfig,\n  MCPConnectionState,\n  MCPServerKind,\n  MCPServerState,\n  MCPToolInfo,\n} from \"../mcp-scope\";\n\nexport type McpServerResourceProps = {\n  id: string;\n  kind: MCPServerKind;\n  name: string;\n  url: string;\n  icon?: string | undefined;\n  auth: MCPAuthConfig;\n  storage: MCPStorage;\n  redirectUri: string;\n  autoConnect: boolean;\n  connectionTimeout?: number | undefined;\n  onRemove: () => Promise<void>;\n};\n\nconst useMcpServerResource = (\n  props: McpServerResourceProps,\n): ClientOutput<\"mcpServer\"> => {\n  assertValidServerId(props.id);\n  const [connectionState, setConnectionState] =\n    useState<MCPConnectionState>(\"disconnected\");\n  const [tools, setTools] = useState<MCPToolInfo[]>([]);\n  const [lastError, setLastError] = useState<{ message: string } | null>(null);\n  const [authorizationUrl, setAuthorizationUrl] = useState<string | null>(null);\n\n  const clientRef = useRef<Client | null>(null);\n  const transportRef = useRef<StreamableHTTPClientTransport | null>(null);\n  const pendingTransportRef = useRef<StreamableHTTPClientTransport | null>(\n    null,\n  );\n  const transportCloseQueueRef = useRef(Promise.resolve());\n  const connectionGenerationRef = useRef(0);\n  const pendingDisposalRef = useRef<{ cancelled: boolean } | null>(null);\n  const mountedRef = useRef(true);\n\n  const closeTransportSafely = async (\n    transport: StreamableHTTPClientTransport,\n  ): Promise<void> => {\n    try {\n      await transport.close();\n    } catch {\n      // ignore close errors\n    }\n  };\n\n  const closeQueuedTransports = (\n    transports: StreamableHTTPClientTransport[],\n  ): Promise<void> => {\n    const task = transportCloseQueueRef.current.then(async () => {\n      await Promise.all(transports.map(closeTransportSafely));\n    });\n    transportCloseQueueRef.current = task;\n    return task;\n  };\n\n  const closePendingTransport = async () => {\n    const transport = pendingTransportRef.current;\n    pendingTransportRef.current = null;\n    await closeQueuedTransports(transport ? [transport] : []);\n  };\n\n  const closeTransports = async () => {\n    const pendingTransport = pendingTransportRef.current;\n    const activeTransport = transportRef.current;\n    pendingTransportRef.current = null;\n    transportRef.current = null;\n    clientRef.current = null;\n\n    const transports = new Set(\n      [pendingTransport, activeTransport].filter(\n        (transport): transport is StreamableHTTPClientTransport =>\n          transport !== null,\n      ),\n    );\n    await closeQueuedTransports([...transports]);\n  };\n\n  const isCurrentConnection = (generation: number) =>\n    mountedRef.current && generation === connectionGenerationRef.current;\n\n  const createInterruptedAuthError = (cause?: unknown) =>\n    new Error(\n      `MCP server \"${props.id}\" authorization was interrupted before completion.`,\n      cause === undefined ? undefined : { cause },\n    );\n\n  const withConnectionTimeout = useEffectEvent(\n    async <T>(\n      promise: Promise<T>,\n      phase: \"connecting\" | \"listing tools\",\n      startedAt: number,\n    ): Promise<T> => {\n      const timeoutMs = props.connectionTimeout;\n      if (timeoutMs === undefined) return await promise;\n      const remainingMs = timeoutMs - (Date.now() - startedAt);\n      const timeoutError = () =>\n        new Error(\n          `MCP server \"${props.id}\" timed out while ${phase} after ${timeoutMs}ms.`,\n        );\n      if (remainingMs <= 0) throw timeoutError();\n\n      let timeout: ReturnType<typeof setTimeout> | undefined;\n      try {\n        return await Promise.race([\n          promise,\n          new Promise<never>((_, reject) => {\n            timeout = setTimeout(() => reject(timeoutError()), remainingMs);\n          }),\n        ]);\n      } finally {\n        if (timeout !== undefined) clearTimeout(timeout);\n      }\n    },\n  );\n\n  const buildTransport = useEffectEvent(\n    async (): Promise<StreamableHTTPClientTransport> => {\n      if (props.auth.type === \"oauth\") {\n        const authProvider = createOAuthProvider({\n          serverId: props.id,\n          config: props.auth,\n          storage: props.storage,\n          redirectUri: props.redirectUri,\n          onAuthorizationUrl: (url) => setAuthorizationUrl(url.toString()),\n        });\n        return new StreamableHTTPClientTransport(new URL(props.url), {\n          authProvider,\n        });\n      }\n      if (props.auth.type === \"bearer\") {\n        const persisted = await props.storage.loadAuthState(props.id);\n        const headers = buildHeaders(props.auth, persisted);\n        const transportOpts: StreamableHTTPClientTransportOptions = {};\n        if (headers) transportOpts.requestInit = { headers };\n        return new StreamableHTTPClientTransport(\n          new URL(props.url),\n          transportOpts,\n        );\n      }\n      return new StreamableHTTPClientTransport(new URL(props.url));\n    },\n  );\n\n  const finalizeConnect = useEffectEvent(\n    async (\n      transport: StreamableHTTPClientTransport,\n      generation: number,\n    ): Promise<boolean> => {\n      const client = new Client({\n        name: \"assistant-ui-mcp\",\n        version: \"0.0.0\",\n      });\n      const startedAt = Date.now();\n      // SDK's StreamableHTTPClientTransport.sessionId is `string | undefined`\n      // but Transport.sessionId is declared `string?` — under\n      // exactOptionalPropertyTypes the SDK's own classes don't satisfy its\n      // Transport interface. Cast to bridge the gap.\n      await withConnectionTimeout(\n        client.connect(transport as unknown as Transport),\n        \"connecting\",\n        startedAt,\n      );\n      if (!isCurrentConnection(generation)) return false;\n      // Defer ref assignment until listTools() also succeeds — otherwise a\n      // post-connect failure leaves stale refs that `callTool()` would\n      // happily walk into, producing confusing SDK errors instead of\n      // \"not connected\".\n      const list = await withConnectionTimeout(\n        client.listTools(),\n        \"listing tools\",\n        startedAt,\n      );\n      if (!isCurrentConnection(generation)) return false;\n\n      pendingTransportRef.current = null;\n      clientRef.current = client;\n      transportRef.current = transport;\n      setTools(\n        list.tools.map((t) => {\n          const info: MCPToolInfo = {\n            name: t.name,\n            inputSchema: t.inputSchema,\n          };\n          if (t.description !== undefined) info.description = t.description;\n          return info;\n        }),\n      );\n      setConnectionState(\"connected\");\n      return true;\n    },\n  );\n\n  const doConnect = useEffectEvent(async () => {\n    const generation = ++connectionGenerationRef.current;\n    // Close any prior transport/client so a re-connect doesn't leak.\n    await closeTransports();\n    if (!isCurrentConnection(generation)) return;\n\n    setConnectionState(\"connecting\");\n    setLastError(null);\n    setAuthorizationUrl(null);\n    // Clear tools so a reconnect (error → connect, or authRequired\n    // → connect) doesn't expose the previous attempt's tool list.\n    setTools([]);\n    let transport: StreamableHTTPClientTransport | null = null;\n    try {\n      transport = await buildTransport();\n      if (!isCurrentConnection(generation)) {\n        await closeQueuedTransports([transport]);\n        return;\n      }\n      pendingTransportRef.current = transport;\n      // Don't assign to transportRef until connect succeeds — otherwise a\n      // failed `listTools()` leaves an orphaned transport that future\n      // doConnect / doDisconnect calls treat as live.\n      await finalizeConnect(transport, generation);\n    } catch (err) {\n      if (!isCurrentConnection(generation)) return;\n\n      if (err instanceof UnauthorizedError) {\n        // OAuth: keep the transport alive so completeAuth can call\n        // finishAuth on it. Closing it before storing would leave a\n        // closed transport on transportRef.\n        pendingTransportRef.current = null;\n        transportRef.current = transport;\n        setConnectionState(\"authRequired\");\n      } else {\n        if (transport) {\n          pendingTransportRef.current = null;\n          await closeQueuedTransports([transport]);\n        }\n        setLastError({\n          message: err instanceof Error ? err.message : String(err),\n        });\n        setConnectionState(\"error\");\n      }\n    }\n  });\n\n  const doDisconnect = useEffectEvent(async () => {\n    connectionGenerationRef.current += 1;\n    setTools([]);\n    setAuthorizationUrl(null);\n    setConnectionState(\"disconnected\");\n    await closeTransports();\n  });\n\n  const doCompleteAuth = useEffectEvent(async (callbackUrl: string) => {\n    const generation = ++connectionGenerationRef.current;\n    await closePendingTransport();\n    if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n\n    setConnectionState(\"authPending\");\n    setLastError(null);\n    try {\n      const url = new URL(callbackUrl);\n      const code = url.searchParams.get(\"code\");\n      if (!code) throw new Error(\"missing authorization code in callback URL\");\n      let transport = transportRef.current;\n      if (!transport) {\n        transport = await buildTransport();\n        if (!isCurrentConnection(generation)) {\n          await closeQueuedTransports([transport]);\n          throw createInterruptedAuthError();\n        }\n      }\n      transportRef.current = null;\n      clientRef.current = null;\n      pendingTransportRef.current = transport;\n      await transport.finishAuth(code);\n      if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n      setAuthorizationUrl(null);\n      const connected = await finalizeConnect(transport, generation);\n      if (!connected) throw createInterruptedAuthError();\n    } catch (err) {\n      const error = err instanceof Error ? err : new Error(String(err));\n      if (!isCurrentConnection(generation))\n        throw createInterruptedAuthError(error);\n\n      await closeTransports();\n      setLastError({\n        message: error.message,\n      });\n      setConnectionState(\"error\");\n      throw error;\n    }\n  });\n\n  const tryAutoConnect = useEffectEvent(\n    async (signal: { cancelled: boolean }) => {\n      if (!props.autoConnect) return;\n      if (props.auth.type === \"none\") {\n        void doConnect();\n        return;\n      }\n      // Static connector token short-circuits the storage read.\n      if (props.auth.type === \"bearer\" && props.auth.token) {\n        void doConnect();\n        return;\n      }\n      const persisted = await props.storage.loadAuthState(props.id);\n      if (signal.cancelled) return;\n      if (props.auth.type === \"oauth\") {\n        if (!persisted?.tokens) return;\n      } else if (!persisted?.token) {\n        return;\n      }\n      void doConnect();\n    },\n  );\n\n  // Auto-connect on mount when usable auth exists.\n  useEffect(() => {\n    const previousDisposal = pendingDisposalRef.current;\n    if (previousDisposal) previousDisposal.cancelled = true;\n    const pendingDisposal = { cancelled: false };\n    pendingDisposalRef.current = pendingDisposal;\n    mountedRef.current = true;\n    const signal = { cancelled: false };\n    void tryAutoConnect(signal);\n    return () => {\n      mountedRef.current = false;\n      signal.cancelled = true;\n      // Defer disposal so StrictMode can replay setup before closing the transport.\n      queueMicrotask(() => {\n        if (pendingDisposal.cancelled) return;\n        connectionGenerationRef.current += 1;\n        void closeTransports();\n      });\n    };\n  }, []);\n\n  const state = useMemo<MCPServerState>(\n    () => ({\n      id: props.id,\n      kind: props.kind,\n      name: props.name,\n      url: props.url,\n      icon: props.icon,\n      connectionState,\n      lastError,\n      tools,\n      authorizationUrl,\n    }),\n    [\n      props.id,\n      props.kind,\n      props.name,\n      props.url,\n      props.icon,\n      connectionState,\n      lastError,\n      tools,\n      authorizationUrl,\n    ],\n  );\n\n  return {\n    getState: () => state,\n    connect: doConnect,\n    disconnect: doDisconnect,\n    remove: async () => {\n      await doDisconnect();\n      await props.storage.clearAuthState(props.id);\n      await props.onRemove();\n    },\n    callTool: async (name, args) => {\n      const client = clientRef.current;\n      if (!client) {\n        throw new Error(`MCP server \"${props.id}\" is not connected`);\n      }\n      return await client.callTool({\n        name,\n        arguments: args as Record<string, unknown> | undefined,\n      });\n    },\n    listResources: async (params) => {\n      const client = clientRef.current;\n      if (!client) {\n        throw new Error(`MCP server \"${props.id}\" is not connected`);\n      }\n      return await client.listResources(params);\n    },\n    readResource: async (uri) => {\n      const client = clientRef.current;\n      if (!client) {\n        throw new Error(`MCP server \"${props.id}\" is not connected`);\n      }\n      return await client.readResource({ uri });\n    },\n    completeAuth: doCompleteAuth,\n  };\n};\n\nexport const McpServerResource = resource(useMcpServerResource);\n"],"mappings":"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"}

package/dist/resources/storage/McpCustomStorage.d.ts

@@ -1,5 +1,4 @@
 import { MCPStorage } from "./types.js";
-
 //#region src/resources/storage/McpCustomStorage.d.ts
 declare const McpCustomStorage: import("@assistant-ui/tap").Resource<MCPStorage, [impl: MCPStorage]>;
 //#endregion

package/dist/resources/storage/McpCustomStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpCustomStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpCustomStorage.ts"],"mappings":";;;cAOa,gBAAA,8BAAgB,QAAA,CAAA,UAAA,GAAA,IAAA,EAAA,UAAA"}
+{"version":3,"file":"McpCustomStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpCustomStorage.ts"],"mappings":";;cAOa,8CAAgB,SAAA,aAAA,MAAA"}

package/dist/resources/storage/McpLocalStorage.d.ts

@@ -1,11 +1,16 @@
+import { MCPCustomServerRecord } from "../../mcp-scope.js";
+import { MCPPersistedAuthState } from "../../auth/types.js";
 import { MCPStorage } from "./types.js";
-
 //#region src/resources/storage/McpLocalStorage.d.ts
 type McpLocalStorageOptions = {
-  /** Namespace prefix for keys. Default "aui-mcp". */keyPrefix?: string; /** Override the underlying Storage. Defaults to globalThis.localStorage. */
+  /** Namespace prefix for keys. Default "aui-mcp". */
+  keyPrefix?: string;
+  /** Override the underlying Storage. Defaults to globalThis.localStorage. */
   storage?: Storage;
 };
+declare const normalizeCustomServerRecords: (value: unknown) => MCPCustomServerRecord[];
+declare const normalizePersistedAuthState: (value: unknown) => MCPPersistedAuthState | null;
 declare const McpLocalStorage: import("@assistant-ui/tap").Resource<MCPStorage, [opts?: McpLocalStorageOptions | undefined]>;
 //#endregion
-export { McpLocalStorage, McpLocalStorageOptions };
+export { McpLocalStorage, McpLocalStorageOptions, normalizeCustomServerRecords, normalizePersistedAuthState };
 //# sourceMappingURL=McpLocalStorage.d.ts.map

package/dist/resources/storage/McpLocalStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpLocalStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"mappings":";;;KAKY,sBAAA;sDAEV,SAAA,WAFgC;EAIhC,OAAA,GAAU,OAAO;AAAA;AAAA,cAmEN,eAAA,8BAAe,QAAA,CAAA,UAAA,GAAA,IAAA,GAAA,sBAAA"}
+{"version":3,"file":"McpLocalStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"mappings":";;;;KAUY;;EAEV;;EAEA,UAAU;;cAiGC,+BACX,mBACC;cAsBU,8BACX,mBACC;cAsEU,6CAAe,SAAA,aAAA,OAAA"}

package/dist/resources/storage/McpLocalStorage.js

@@ -1,4 +1,6 @@
+import { assertValidServerId } from "../../utils/serverId.js";
 import { resource } from "@assistant-ui/tap";
+import { OAuthClientInformationFullSchema, OAuthTokensSchema } from "@modelcontextprotocol/sdk/shared/auth.js";
 //#region src/resources/storage/McpLocalStorage.ts
 function resolveStorage(opts) {
 	if (opts.storage) return opts.storage;
@@ -9,6 +11,67 @@ function resolveStorage(opts) {
 	}
 	return null;
 }
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isOptionalString = (value) => value === void 0 || typeof value === "string";
+const isNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
+const isOptionalNonEmptyString = (value) => value === void 0 || isNonEmptyString(value);
+const isOptionalStringArray = (value) => value === void 0 || Array.isArray(value) && value.every((item) => typeof item === "string");
+const isOptionalConnectionTimeout = (value) => value === void 0 || typeof value === "number" && Number.isFinite(value) && value >= 0;
+const isValidServerId = (id) => {
+	try {
+		assertValidServerId(id);
+		return true;
+	} catch {
+		return false;
+	}
+};
+const isMCPAuthConfig = (auth) => {
+	if (!isRecord(auth)) return false;
+	switch (auth.type) {
+		case "none": return true;
+		case "bearer": return isOptionalNonEmptyString(auth.token);
+		case "oauth": return isOptionalStringArray(auth.scopes) && isOptionalString(auth.authorizationEndpoint) && isOptionalString(auth.tokenEndpoint) && isOptionalString(auth.registrationEndpoint) && isOptionalString(auth.clientId) && isOptionalString(auth.clientSecret);
+		default: return false;
+	}
+};
+const isCustomServerRecord = (value) => {
+	if (!isRecord(value)) return false;
+	if (typeof value.id !== "string" || !isValidServerId(value.id)) return false;
+	return isNonEmptyString(value.name) && isNonEmptyString(value.url) && Number.isFinite(value.createdAt) && isMCPAuthConfig(value.auth) && isOptionalConnectionTimeout(value.connectionTimeout);
+};
+const normalizeCustomServerRecord = (value) => {
+	if (isCustomServerRecord(value)) return value;
+	if (!isRecord(value)) return null;
+	const record = { ...value };
+	delete record.connectionTimeout;
+	return isCustomServerRecord(record) ? record : null;
+};
+const normalizeCustomServerRecords = (value) => {
+	if (!Array.isArray(value)) return [];
+	return value.flatMap((item) => {
+		const record = normalizeCustomServerRecord(item);
+		return record === null ? [] : [record];
+	});
+};
+const normalizeOAuthTokens = (value) => {
+	const result = OAuthTokensSchema.safeParse(value);
+	return result.success ? result.data : void 0;
+};
+const normalizeClientInformation = (value) => {
+	const result = OAuthClientInformationFullSchema.safeParse(value);
+	return result.success ? result.data : void 0;
+};
+const normalizePersistedAuthState = (value) => {
+	if (!isRecord(value)) return null;
+	const state = {};
+	if (isNonEmptyString(value.token)) state.token = value.token;
+	if (isNonEmptyString(value.codeVerifier)) state.codeVerifier = value.codeVerifier;
+	const tokens = normalizeOAuthTokens(value.tokens);
+	if (tokens) state.tokens = tokens;
+	const clientInformation = normalizeClientInformation(value.clientInformation);
+	if (clientInformation) state.clientInformation = clientInformation;
+	return Object.keys(state).length > 0 ? state : null;
+};
 const useMcpLocalStorage = (opts = {}) => {
 	const prefix = opts.keyPrefix ?? "aui-mcp";
 	const customServersKey = `${prefix}:custom-servers`;
@@ -37,11 +100,11 @@ const useMcpLocalStorage = (opts = {}) => {
 		} catch {}
 	};
 	return {
-		loadCustomServers: async () => read(customServersKey, []),
+		loadCustomServers: async () => normalizeCustomServerRecords(read(customServersKey, [])),
 		saveCustomServers: async (records) => {
 			write(customServersKey, records);
 		},
-		loadAuthState: async (id) => read(authKey(id), null),
+		loadAuthState: async (id) => normalizePersistedAuthState(read(authKey(id), null)),
 		saveAuthState: async (id, state) => {
 			write(authKey(id), state);
 		},
@@ -52,6 +115,6 @@ const useMcpLocalStorage = (opts = {}) => {
 };
 const McpLocalStorage = resource(useMcpLocalStorage);
 //#endregion
-export { McpLocalStorage };
+export { McpLocalStorage, normalizeCustomServerRecords, normalizePersistedAuthState };
 
 //# sourceMappingURL=McpLocalStorage.js.map

package/dist/resources/storage/McpLocalStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpLocalStorage.js","names":["resource","MCPCustomServerRecord","MCPPersistedAuthState","MCPStorage","McpLocalStorageOptions","keyPrefix","storage","Storage","resolveStorage","opts","globalThis","localStorage","useMcpLocalStorage","prefix","customServersKey","authKey","id","read","key","fallback","T","raw","getItem","JSON","parse","write","value","setItem","stringify","remove","removeItem","loadCustomServers","saveCustomServers","records","loadAuthState","saveAuthState","state","clearAuthState","McpLocalStorage"],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport type { MCPCustomServerRecord } from \"../../mcp-scope\";\nimport type { MCPPersistedAuthState } from \"../../auth/types\";\nimport type { MCPStorage } from \"./types\";\n\nexport type McpLocalStorageOptions = {\n  /** Namespace prefix for keys. Default \"aui-mcp\". */\n  keyPrefix?: string;\n  /** Override the underlying Storage. Defaults to globalThis.localStorage. */\n  storage?: Storage;\n};\n\nfunction resolveStorage(opts: McpLocalStorageOptions): Storage | null {\n  if (opts.storage) return opts.storage;\n  if (typeof globalThis !== \"undefined\" && \"localStorage\" in globalThis) {\n    try {\n      return (globalThis as { localStorage: Storage }).localStorage;\n    } catch {\n      return null;\n    }\n  }\n  return null;\n}\n\nconst useMcpLocalStorage = (opts: McpLocalStorageOptions = {}): MCPStorage => {\n  const prefix = opts.keyPrefix ?? \"aui-mcp\";\n  const customServersKey = `${prefix}:custom-servers`;\n  const authKey = (id: string) => `${prefix}:auth:${id}`;\n  const storage = resolveStorage(opts);\n\n  const read = <T>(key: string, fallback: T): T => {\n    if (!storage) return fallback;\n    try {\n      const raw = storage.getItem(key);\n      if (raw == null) return fallback;\n      return JSON.parse(raw) as T;\n    } catch {\n      return fallback;\n    }\n  };\n\n  const write = (key: string, value: unknown): void => {\n    if (!storage) return;\n    try {\n      storage.setItem(key, JSON.stringify(value));\n    } catch {\n      // quota or serialization failure — silently drop\n    }\n  };\n\n  const remove = (key: string): void => {\n    if (!storage) return;\n    try {\n      storage.removeItem(key);\n    } catch {\n      // ignore\n    }\n  };\n\n  return {\n    loadCustomServers: async () =>\n      read<MCPCustomServerRecord[]>(customServersKey, []),\n    saveCustomServers: async (records) => {\n      write(customServersKey, records);\n    },\n    loadAuthState: async (id) =>\n      read<MCPPersistedAuthState | null>(authKey(id), null),\n    saveAuthState: async (id, state) => {\n      write(authKey(id), state);\n    },\n    clearAuthState: async (id) => {\n      remove(authKey(id));\n    },\n  };\n};\n\nexport const McpLocalStorage = resource(useMcpLocalStorage);\n"],"mappings":";;AAYA,SAASQ,eAAeC,MAA8C;CACpE,IAAIA,KAAKH,SAAS,OAAOG,KAAKH;CAC9B,IAAI,OAAOI,eAAe,eAAe,kBAAkBA,YACzD,IAAI;EACF,OAAQA,WAAyCC;CACnD,QAAQ;EACN,OAAO;CACT;CAEF,OAAO;AACT;AAEA,MAAMC,sBAAsBH,OAA+B,CAAC,MAAkB;CAC5E,MAAMI,SAASJ,KAAKJ,aAAa;CACjC,MAAMS,mBAAmB,GAAGD,OAAM;CAClC,MAAME,WAAWC,OAAe,GAAGH,OAAM,QAASG;CAClD,MAAMV,UAAUE,eAAeC,IAAI;CAEnC,MAAMQ,QAAWC,KAAaC,aAAmB;EAC/C,IAAI,CAACb,SAAS,OAAOa;EACrB,IAAI;GACF,MAAME,MAAMf,QAAQgB,QAAQJ,GAAG;GAC/B,IAAIG,OAAO,MAAM,OAAOF;GACxB,OAAOI,KAAKC,MAAMH,GAAG;EACvB,QAAQ;GACN,OAAOF;EACT;CACF;CAEA,MAAMM,SAASP,KAAaQ,UAAyB;EACnD,IAAI,CAACpB,SAAS;EACd,IAAI;GACFA,QAAQqB,QAAQT,KAAKK,KAAKK,UAAUF,KAAK,CAAC;EAC5C,QAAQ,CACN;CAEJ;CAEA,MAAMG,UAAUX,QAAsB;EACpC,IAAI,CAACZ,SAAS;EACd,IAAI;GACFA,QAAQwB,WAAWZ,GAAG;EACxB,QAAQ,CACN;CAEJ;CAEA,OAAO;EACLa,mBAAmB,YACjBd,KAA8BH,kBAAkB,CAAA,CAAE;EACpDkB,mBAAmB,OAAOC,YAAY;GACpCR,MAAMX,kBAAkBmB,OAAO;EACjC;EACAC,eAAe,OAAOlB,OACpBC,KAAmCF,QAAQC,EAAE,GAAG,IAAI;EACtDmB,eAAe,OAAOnB,IAAIoB,UAAU;GAClCX,MAAMV,QAAQC,EAAE,GAAGoB,KAAK;EAC1B;EACAC,gBAAgB,OAAOrB,OAAO;GAC5Ba,OAAOd,QAAQC,EAAE,CAAC;EACpB;CACF;AACF;AAEA,MAAasB,kBAAkBtC,SAASY,kBAAkB"}
+{"version":3,"file":"McpLocalStorage.js","names":["resource","OAuthClientInformationFullSchema","OAuthTokensSchema","MCPAuthConfig","MCPCustomServerRecord","MCPPersistedAuthState","assertValidServerId","MCPStorage","McpLocalStorageOptions","keyPrefix","storage","Storage","resolveStorage","opts","globalThis","localStorage","isRecord","value","Record","Array","isArray","isOptionalString","undefined","isNonEmptyString","trim","length","isOptionalNonEmptyString","isOptionalStringArray","every","item","isOptionalConnectionTimeout","Number","isFinite","isValidServerId","id","isMCPAuthConfig","auth","type","token","scopes","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","isCustomServerRecord","name","url","createdAt","connectionTimeout","normalizeCustomServerRecord","record","normalizeCustomServerRecords","flatMap","normalizeOAuthTokens","result","safeParse","success","data","normalizeClientInformation","normalizePersistedAuthState","state","codeVerifier","tokens","clientInformation","Object","keys","useMcpLocalStorage","prefix","customServersKey","authKey","read","key","fallback","T","raw","getItem","JSON","parse","write","setItem","stringify","remove","removeItem","loadCustomServers","saveCustomServers","records","loadAuthState","saveAuthState","clearAuthState","McpLocalStorage"],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport {\n  OAuthClientInformationFullSchema,\n  OAuthTokensSchema,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport type { MCPAuthConfig, MCPCustomServerRecord } from \"../../mcp-scope\";\nimport type { MCPPersistedAuthState } from \"../../auth/types\";\nimport { assertValidServerId } from \"../../utils/serverId\";\nimport type { MCPStorage } from \"./types\";\n\nexport type McpLocalStorageOptions = {\n  /** Namespace prefix for keys. Default \"aui-mcp\". */\n  keyPrefix?: string;\n  /** Override the underlying Storage. Defaults to globalThis.localStorage. */\n  storage?: Storage;\n};\n\nfunction resolveStorage(opts: McpLocalStorageOptions): Storage | null {\n  if (opts.storage) return opts.storage;\n  if (typeof globalThis !== \"undefined\" && \"localStorage\" in globalThis) {\n    try {\n      return (globalThis as { localStorage: Storage }).localStorage;\n    } catch {\n      return null;\n    }\n  }\n  return null;\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  typeof value === \"object\" && value !== null && !Array.isArray(value);\n\nconst isOptionalString = (value: unknown): value is string | undefined =>\n  value === undefined || typeof value === \"string\";\n\nconst isNonEmptyString = (value: unknown): value is string =>\n  typeof value === \"string\" && value.trim().length > 0;\n\nconst isOptionalNonEmptyString = (\n  value: unknown,\n): value is string | undefined =>\n  value === undefined || isNonEmptyString(value);\n\nconst isOptionalStringArray = (value: unknown): value is string[] | undefined =>\n  value === undefined ||\n  (Array.isArray(value) && value.every((item) => typeof item === \"string\"));\n\nconst isOptionalConnectionTimeout = (\n  value: unknown,\n): value is number | undefined =>\n  value === undefined ||\n  (typeof value === \"number\" && Number.isFinite(value) && value >= 0);\n\nconst isValidServerId = (id: string): boolean => {\n  try {\n    assertValidServerId(id);\n    return true;\n  } catch {\n    return false;\n  }\n};\n\nconst isMCPAuthConfig = (auth: unknown): auth is MCPAuthConfig => {\n  if (!isRecord(auth)) return false;\n\n  switch (auth.type) {\n    case \"none\":\n      return true;\n    case \"bearer\":\n      return isOptionalNonEmptyString(auth.token);\n    case \"oauth\":\n      return (\n        isOptionalStringArray(auth.scopes) &&\n        isOptionalString(auth.authorizationEndpoint) &&\n        isOptionalString(auth.tokenEndpoint) &&\n        isOptionalString(auth.registrationEndpoint) &&\n        isOptionalString(auth.clientId) &&\n        isOptionalString(auth.clientSecret)\n      );\n    default:\n      return false;\n  }\n};\n\nconst isCustomServerRecord = (\n  value: unknown,\n): value is MCPCustomServerRecord => {\n  if (!isRecord(value)) return false;\n  if (typeof value.id !== \"string\" || !isValidServerId(value.id)) {\n    return false;\n  }\n  return (\n    isNonEmptyString(value.name) &&\n    isNonEmptyString(value.url) &&\n    Number.isFinite(value.createdAt) &&\n    isMCPAuthConfig(value.auth) &&\n    isOptionalConnectionTimeout(value.connectionTimeout)\n  );\n};\n\nconst normalizeCustomServerRecord = (\n  value: unknown,\n): MCPCustomServerRecord | null => {\n  if (isCustomServerRecord(value)) return value;\n  if (!isRecord(value)) return null;\n\n  const record = { ...value };\n  delete record.connectionTimeout;\n  return isCustomServerRecord(record) ? record : null;\n};\n\nexport const normalizeCustomServerRecords = (\n  value: unknown,\n): MCPCustomServerRecord[] => {\n  if (!Array.isArray(value)) return [];\n  return value.flatMap((item) => {\n    const record = normalizeCustomServerRecord(item);\n    return record === null ? [] : [record];\n  });\n};\n\nconst normalizeOAuthTokens = (\n  value: unknown,\n): MCPPersistedAuthState[\"tokens\"] | undefined => {\n  const result = OAuthTokensSchema.safeParse(value);\n  return result.success ? result.data : undefined;\n};\n\nconst normalizeClientInformation = (\n  value: unknown,\n): MCPPersistedAuthState[\"clientInformation\"] | undefined => {\n  const result = OAuthClientInformationFullSchema.safeParse(value);\n  return result.success ? result.data : undefined;\n};\n\nexport const normalizePersistedAuthState = (\n  value: unknown,\n): MCPPersistedAuthState | null => {\n  if (!isRecord(value)) return null;\n\n  const state: MCPPersistedAuthState = {};\n  if (isNonEmptyString(value.token)) state.token = value.token;\n  if (isNonEmptyString(value.codeVerifier)) {\n    state.codeVerifier = value.codeVerifier;\n  }\n\n  const tokens = normalizeOAuthTokens(value.tokens);\n  if (tokens) state.tokens = tokens;\n\n  const clientInformation = normalizeClientInformation(value.clientInformation);\n  if (clientInformation) state.clientInformation = clientInformation;\n\n  return Object.keys(state).length > 0 ? state : null;\n};\n\nconst useMcpLocalStorage = (opts: McpLocalStorageOptions = {}): MCPStorage => {\n  const prefix = opts.keyPrefix ?? \"aui-mcp\";\n  const customServersKey = `${prefix}:custom-servers`;\n  const authKey = (id: string) => `${prefix}:auth:${id}`;\n  const storage = resolveStorage(opts);\n\n  const read = <T>(key: string, fallback: T): T => {\n    if (!storage) return fallback;\n    try {\n      const raw = storage.getItem(key);\n      if (raw == null) return fallback;\n      return JSON.parse(raw) as T;\n    } catch {\n      return fallback;\n    }\n  };\n\n  const write = (key: string, value: unknown): void => {\n    if (!storage) return;\n    try {\n      storage.setItem(key, JSON.stringify(value));\n    } catch {\n      // quota or serialization failure — silently drop\n    }\n  };\n\n  const remove = (key: string): void => {\n    if (!storage) return;\n    try {\n      storage.removeItem(key);\n    } catch {\n      // ignore\n    }\n  };\n\n  return {\n    loadCustomServers: async () =>\n      normalizeCustomServerRecords(read<unknown>(customServersKey, [])),\n    saveCustomServers: async (records) => {\n      write(customServersKey, records);\n    },\n    loadAuthState: async (id) =>\n      normalizePersistedAuthState(read<unknown>(authKey(id), null)),\n    saveAuthState: async (id, state) => {\n      write(authKey(id), state);\n    },\n    clearAuthState: async (id) => {\n      remove(authKey(id));\n    },\n  };\n};\n\nexport const McpLocalStorage = resource(useMcpLocalStorage);\n"],"mappings":"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"}

package/dist/resources/storage/McpMemoryStorage.d.ts

@@ -1,5 +1,4 @@
 import { MCPStorage } from "./types.js";
-
 //#region src/resources/storage/McpMemoryStorage.d.ts
 declare const McpMemoryStorage: import("@assistant-ui/tap").Resource<MCPStorage, []>;
 //#endregion

package/dist/resources/storage/McpMemoryStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpMemoryStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpMemoryStorage.ts"],"mappings":";;;cAuBa,gBAAA,8BAAgB,QAAA,CAAA,UAAA"}
+{"version":3,"file":"McpMemoryStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpMemoryStorage.ts"],"mappings":";;cAuBa,8CAAgB,SAAA"}

package/dist/resources/storage/types.d.ts

@@ -1,7 +1,6 @@
 import { MCPCustomServerRecord } from "../../mcp-scope.js";
 import { MCPPersistedAuthState } from "../../auth/types.js";
 import { ResourceElement } from "@assistant-ui/tap";
-
 //#region src/resources/storage/types.d.ts
 type MCPStorage = {
   loadCustomServers: () => Promise<MCPCustomServerRecord[]>;

package/dist/resources/storage/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/resources/storage/types.ts"],"mappings":";;;;;KAIY,UAAA;EACV,iBAAA,QAAyB,OAAA,CAAQ,qBAAA;EACjC,iBAAA,GAAoB,OAAA,EAAS,qBAAA,OAA4B,OAAA;EACzD,aAAA,GAAgB,QAAA,aAAqB,OAAA,CAAQ,qBAAA;EAC7C,aAAA,GACE,QAAA,UACA,KAAA,EAAO,qBAAA,KACJ,OAAA;EACL,cAAA,GAAiB,QAAA,aAAqB,OAAA;AAAA;AAAA,KAG5B,iBAAA,GAAoB,eAAe,CAAC,UAAA"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/resources/storage/types.ts"],"mappings":";;;;KAIY;EACV,yBAAyB,QAAQ;EACjC,oBAAoB,SAAS,4BAA4B;EACzD,gBAAgB,qBAAqB,QAAQ;EAC7C,gBACE,kBACA,OAAO,0BACJ;EACL,iBAAiB,qBAAqB;;KAG5B,oBAAoB,gBAAgB"}

package/dist/utils/serverId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serverId.d.ts","names":[],"sources":["../../src/utils/serverId.ts"],"mappings":";iBAIgB,mBAAA,CAAoB,EAAU;AAAA,iBAgB9B,qBAAA,CAAsB,GAAqB,EAAhB,QAAQ"}
+{"version":3,"file":"serverId.d.ts","names":[],"sources":["../../src/utils/serverId.ts"],"mappings":";iBAIgB,oBAAoB;iBAgBpB,sBAAsB,KAAK"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-mcp",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "MCP server configuration and connection primitives for @assistant-ui",
   "keywords": [
     "mcp",
@@ -28,11 +28,11 @@
   "sideEffects": false,
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@radix-ui/react-primitive": "^2.1.6",
-    "@assistant-ui/core": "0.2.20",
-    "@assistant-ui/store": "0.2.19",
-    "@assistant-ui/tap": "0.9.3",
-    "assistant-stream": "0.3.25"
+    "@radix-ui/react-primitive": "^2.1.10",
+    "@assistant-ui/core": "0.2.22",
+    "@assistant-ui/store": "0.2.21",
+    "@assistant-ui/tap": "0.9.5",
+    "assistant-stream": "0.3.27"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "@types/react": "^19.2.17",
-    "react": "^19.2.7",
-    "vitest": "^4.1.9",
-    "@assistant-ui/x-buildutils": "0.0.17"
+    "react": "^19.2.8",
+    "vitest": "^4.1.10",
+    "@assistant-ui/x-buildutils": "0.0.19"
   },
   "publishConfig": {
     "access": "public",

package/src/hooks/useMcpOAuthCallback.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+import { createMcpOAuthCallbackError } from "./useMcpOAuthCallback";
+
+describe("createMcpOAuthCallbackError", () => {
+  it("adds MCP OAuth callback context without a server id", () => {
+    const cause = new Error('missing "state" parameter');
+    const error = createMcpOAuthCallbackError(cause, null);
+
+    expect(error.message).toBe(
+      'MCP OAuth callback failed: missing "state" parameter',
+    );
+    expect(error.cause).toBe(cause);
+  });
+
+  it("adds MCP OAuth callback context with a server id", () => {
+    const cause = new Error("invalid_grant");
+    const error = createMcpOAuthCallbackError(cause, "github");
+
+    expect(error.message).toBe(
+      'MCP OAuth callback for server "github" failed: invalid_grant',
+    );
+    expect(error.cause).toBe(cause);
+  });
+});