npm - @assistant-ui/react-mcp - Versions diffs - 0.1.18 → 0.1.19 - Mend

@assistant-ui/react-mcp 0.1.18 → 0.1.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (148) hide show

package/dist/resources/McpServerResource.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","useResource","withKey","ClientOutput","shallowEqual","Client","StreamableHTTPClientTransport","UnauthorizedError","ClientOptions","ElicitRequest","ElicitResult","StreamableHTTPClientTransportOptions","clearOAuthProviderAuthState","createOAuthProvider","hasUsableOAuthTokens","buildHeaders","assertValidServerId","hasPersistedCredentials","isAuthStateForServerUrl","validateElicitationContent","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPElicitation","MCPElicitationResponse","MCPServerKind","MCPServerState","MCPToolInfo","createMcpId","beginMcpServerRemovalFence","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","cache","defaultTtlMs","elicitation","onRemove","Promise","McpServerResourceInstanceProps","transportCloseQueueRef","current","getConnectionDependencies","props","authDependencies","type","token","scopeId","scopes","length","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","useMcpServerResourceInstance","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","pendingElicitations","setPendingElicitations","clientRef","transportRef","pendingTransportRef","connectionGenerationRef","pendingAuthValidationRef","count","promise","resolve","elicitationResolversRef","Map","result","signal","AbortSignal","onAbort","requestedSchema","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","then","all","map","closePendingTransport","resolvePendingElicitation","entry","get","delete","removeEventListener","filter","setPendingElicitationError","error","NonNullable","has","cancelPendingElicitations","action","detachTransports","pendingTransport","activeTransport","Set","closeTransports","isCurrentConnection","generation","createInterruptedAuthError","cause","Error","undefined","withConnectionTimeout","T","phase","startedAt","timeoutMs","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","unboundAuthMessage","loadAuthState","state","unbound","buildTransport","authProvider","serverId","serverUrl","config","onAuthorizationUrl","toString","URL","headers","transportOpts","requestInit","applyToolsList","list","Array","description","inputSchema","t","info","syncTools","client","options","listPromise","listTools","finalizeConnect","clientOptions","capabilities","listChanged","autoRefresh","debounceMs","onChanged","items","defaultCacheTtlMs","version","setRequestHandler","request","context","params","set","aborted","addEventListener","once","connect","synced","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","validationGeneration","searchParams","pendingAuthValidation","resolvePromise","persisted","finishAuth","connected","tryAutoConnect","loaded","Awaited","previousDisposal","pendingDisposal","queueMicrotask","getState","disconnect","remove","releaseRemovalFence","callTool","args","arguments","Record","listResources","readResource","uri","completeAuth","answerElicitation","response","property","content","isArray","errors","properties","join","McpServerResourceInstance","McpServerResource","useMcpServerResource","dependencies","connection","setConnection","currentConnection"],"sources":["../../src/resources/McpServerResource.ts"],"sourcesContent":["import { useState, useRef, useEffect, useMemo, useEffectEvent } from \"react\";\nimport { resource, useResource, withKey } from \"@assistant-ui/tap\";\nimport type { ClientOutput } from \"@assistant-ui/store\";\nimport { shallowEqual } from \"@assistant-ui/store/internal\";\nimport {\n Client,\n StreamableHTTPClientTransport,\n UnauthorizedError,\n type ClientOptions,\n type ElicitRequest,\n type ElicitResult,\n type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/client\";\nimport {\n clearOAuthProviderAuthState,\n createOAuthProvider,\n hasUsableOAuthTokens,\n} from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\nimport {\n hasPersistedCredentials,\n isAuthStateForServerUrl,\n} from \"../utils/serverUrl\";\nimport { validateElicitationContent } from \"./validateElicitationContent\";\nimport type { MCPStorage } from \"./storage/types\";\nimport type {\n MCPAuthConfig,\n MCPConnectionState,\n MCPElicitation,\n MCPElicitationResponse,\n MCPServerKind,\n MCPServerState,\n MCPToolInfo,\n} from \"../mcp-scope\";\nimport { createMcpId } from \"../utils/createMcpId\";\nimport { beginMcpServerRemovalFence } from \"./McpServerRemovalFence\";\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 cache?: { readonly defaultTtlMs?: number } \| undefined;\n readonly elicitation?: boolean;\n onRemove: () => Promise<void>;\n};\n\ntype McpServerResourceInstanceProps = McpServerResourceProps & {\n transportCloseQueueRef: { current: Promise<void> };\n};\n\nexport const getConnectionDependencies = (\n props: McpServerResourceProps,\n): readonly unknown[] => {\n const auth = props.auth;\n const authDependencies =\n auth.type === \"bearer\"\n ? [auth.type, auth.token, props.storage.scopeId]\n : auth.type === \"oauth\"\n ? [\n auth.type,\n auth.scopes?.length,\n ...(auth.scopes ?? []),\n auth.authorizationEndpoint,\n auth.tokenEndpoint,\n auth.registrationEndpoint,\n auth.clientId,\n auth.clientSecret,\n props.storage.scopeId,\n ]\n : [auth.type];\n\n return [\n props.id,\n props.url,\n ...authDependencies,\n props.redirectUri,\n props.cache?.defaultTtlMs,\n props.elicitation !== false,\n ];\n};\n\nconst useMcpServerResourceInstance = (\n props: McpServerResourceInstanceProps,\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 const [pendingElicitations, setPendingElicitations] = useState<\n MCPElicitation[]\n >([]);\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 connectionGenerationRef = useRef(0);\n const pendingAuthValidationRef = useRef<{\n count: number;\n promise: Promise<void>;\n resolve: () => void;\n } \| null>(null);\n const elicitationResolversRef = useRef(\n new Map<\n string,\n {\n resolve: (result: ElicitResult) => void;\n signal: AbortSignal;\n onAbort: () => void;\n requestedSchema: unknown;\n }\n >(),\n );\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 = props.transportCloseQueueRef.current.then(async () => {\n await Promise.all(transports.map(closeTransportSafely));\n });\n props.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 resolvePendingElicitation = (id: string, result: ElicitResult) => {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return false;\n elicitationResolversRef.current.delete(id);\n entry.signal.removeEventListener(\"abort\", entry.onAbort);\n setPendingElicitations((current) =>\n current.filter((elicitation) => elicitation.id !== id),\n );\n entry.resolve(result);\n return true;\n };\n\n const setPendingElicitationError = (\n id: string,\n error: NonNullable<MCPElicitation[\"error\"]>,\n ) => {\n if (!elicitationResolversRef.current.has(id)) return false;\n setPendingElicitations((current) =>\n current.map((elicitation) =>\n elicitation.id === id ? { ...elicitation, error } : elicitation,\n ),\n );\n return true;\n };\n\n const cancelPendingElicitations = () => {\n for (const [id] of elicitationResolversRef.current) {\n resolvePendingElicitation(id, { action: \"cancel\" });\n }\n };\n\n const detachTransports = () => {\n cancelPendingElicitations();\n const pendingTransport = pendingTransportRef.current;\n const activeTransport = transportRef.current;\n pendingTransportRef.current = null;\n transportRef.current = null;\n clientRef.current = null;\n\n return [\n ...new Set(\n [pendingTransport, activeTransport].filter(\n (transport): transport is StreamableHTTPClientTransport =>\n transport !== null,\n ),\n ),\n ];\n };\n\n const closeTransports = async () => {\n await closeQueuedTransports(detachTransports());\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 unboundAuthMessage = () =>\n `MCP server \"${props.id}\" has saved authentication for a different URL. Authenticate again to connect to ${props.url}.`;\n\n const loadAuthState = useEffectEvent(async () => {\n const state = await props.storage.loadAuthState(props.id);\n if (isAuthStateForServerUrl(state, props.url)) {\n return { state, unbound: false };\n }\n return { state: null, unbound: hasPersistedCredentials(state) };\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 serverUrl: props.url,\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 { state, unbound } = await loadAuthState();\n const headers = buildHeaders(props.auth, state);\n if (!headers && unbound) throw new Error(unboundAuthMessage());\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 applyToolsList = useEffectEvent(\n (list: {\n tools: Array<{\n name: string;\n description?: string \| undefined;\n inputSchema: unknown;\n }>;\n }) => {\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 },\n );\n\n const syncTools = useEffectEvent(\n async (\n client: Client,\n generation: number,\n options?: { startedAt?: number \| undefined },\n ): Promise<boolean> => {\n const listPromise = client.listTools();\n const list =\n options?.startedAt === undefined\n ? await listPromise\n : await withConnectionTimeout(\n listPromise,\n \"listing tools\",\n options.startedAt,\n );\n if (!isCurrentConnection(generation)) return false;\n applyToolsList(list);\n return true;\n },\n );\n\n const finalizeConnect = useEffectEvent(\n async (\n transport: StreamableHTTPClientTransport,\n generation: number,\n ): Promise<boolean> => {\n const clientOptions: ClientOptions = {\n ...(props.elicitation === false\n ? {}\n : { capabilities: { elicitation: {} } }),\n listChanged: {\n tools: {\n autoRefresh: true,\n debounceMs: 300,\n onChanged: (error, items) => {\n if (!isCurrentConnection(generation)) return;\n if (error !== null) {\n setLastError({ message: error.message });\n return;\n }\n if (items === null) return;\n setLastError(null);\n applyToolsList({ tools: items });\n },\n },\n },\n };\n if (props.cache?.defaultTtlMs !== undefined) {\n clientOptions.defaultCacheTtlMs = props.cache.defaultTtlMs;\n }\n const client = new Client(\n {\n name: \"assistant-ui-mcp\",\n version: \"0.0.0\",\n },\n clientOptions,\n );\n if (props.elicitation !== false) {\n client.setRequestHandler(\n \"elicitation/create\",\n (request: ElicitRequest, context): Promise<ElicitResult> => {\n if (!isCurrentConnection(generation)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n if (!(\"requestedSchema\" in request.params)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n const { message, requestedSchema } = request.params;\n\n const id = createMcpId();\n const promise = new Promise<ElicitResult>((resolve) => {\n const onAbort = () => {\n resolvePendingElicitation(id, { action: \"cancel\" });\n };\n elicitationResolversRef.current.set(id, {\n resolve,\n signal: context.signal,\n onAbort,\n requestedSchema,\n });\n });\n setPendingElicitations((current) => [\n ...current,\n {\n id,\n message,\n requestedSchema,\n },\n ]);\n const entry = elicitationResolversRef.current.get(id);\n if (entry) {\n if (context.signal.aborted) {\n entry.onAbort();\n } else {\n context.signal.addEventListener(\"abort\", entry.onAbort, {\n once: true,\n });\n }\n }\n return promise;\n },\n );\n }\n const startedAt = Date.now();\n await withConnectionTimeout(\n client.connect(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 synced = await syncTools(client, generation, { startedAt });\n if (!synced) return false;\n\n pendingTransportRef.current = null;\n clientRef.current = client;\n transportRef.current = transport;\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 cancelPendingElicitations();\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 validationGeneration = connectionGenerationRef.current;\n const url = new URL(callbackUrl);\n const state = url.searchParams.get(\"state\");\n if (!state) throw new Error('missing \"state\" parameter');\n let pendingAuthValidation = pendingAuthValidationRef.current;\n if (!pendingAuthValidation) {\n let resolve!: () => void;\n const promise = new Promise<void>((resolvePromise) => {\n resolve = resolvePromise;\n });\n pendingAuthValidation = { count: 0, promise, resolve };\n pendingAuthValidationRef.current = pendingAuthValidation;\n }\n pendingAuthValidation.count += 1;\n try {\n const { state: persisted, unbound } = await loadAuthState();\n if (!isCurrentConnection(validationGeneration)) {\n throw createInterruptedAuthError();\n }\n if (unbound) throw new Error(unboundAuthMessage());\n if (!persisted?.state) {\n throw new Error(\n \"no pending OAuth authorization request for this server\",\n );\n }\n if (persisted.state !== state) {\n throw new Error(\"OAuth state does not match the authorization request\");\n }\n if (!url.searchParams.get(\"code\") && !url.searchParams.get(\"error\")) {\n throw new Error(\"missing authorization code in callback URL\");\n }\n } finally {\n pendingAuthValidation.count -= 1;\n if (pendingAuthValidation.count === 0) {\n pendingAuthValidationRef.current = null;\n pendingAuthValidation.resolve();\n }\n }\n\n // Claim the generation before a waiting auto-connect can resume.\n const generation = ++connectionGenerationRef.current;\n cancelPendingElicitations();\n await closePendingTransport();\n if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n\n setConnectionState(\"authPending\");\n setLastError(null);\n try {\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(url.searchParams);\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 generation = connectionGenerationRef.current;\n let loaded: Awaited<ReturnType<typeof loadAuthState>>;\n try {\n loaded = await loadAuthState();\n } catch (error) {\n if (signal.cancelled \|\| !isCurrentConnection(generation)) return;\n const message = error instanceof Error ? error.message : String(error);\n setLastError({\n message: `MCP server \"${props.id}\" failed to load saved authentication: ${message}`,\n });\n setConnectionState(\"error\");\n return;\n }\n if (signal.cancelled \|\| !isCurrentConnection(generation)) return;\n if (loaded.unbound) {\n setLastError({ message: unboundAuthMessage() });\n return;\n }\n const persisted = loaded.state;\n if (props.auth.type === \"oauth\") {\n if (!hasUsableOAuthTokens(persisted, props.auth)) return;\n } else if (!persisted?.token) {\n return;\n }\n const pendingAuthValidation = pendingAuthValidationRef.current;\n if (pendingAuthValidation) {\n await pendingAuthValidation.promise;\n if (signal.cancelled \|\| !isCurrentConnection(generation)) return;\n }\n void doConnect();\n },\n );\n\n // Auto-connect on mount when usable auth exists.\n useEffect(() => {\n const transportCloseQueueRef = props.transportCloseQueueRef;\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 // Auto-connect opens a transport, so it belongs to the same effect as the\n // disposal that closes it.\n // eslint-disable-next-line react-hooks/set-state-in-effect\n void tryAutoConnect(signal);\n return () => {\n mountedRef.current = false;\n signal.cancelled = true;\n const task = transportCloseQueueRef.current.then(async () => {\n await new Promise<void>((resolve) => queueMicrotask(resolve));\n if (pendingDisposal.cancelled) return;\n connectionGenerationRef.current += 1;\n await Promise.all(detachTransports().map(closeTransportSafely));\n });\n transportCloseQueueRef.current = task;\n };\n }, [props.transportCloseQueueRef]);\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 pendingElicitations,\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 pendingElicitations,\n ],\n );\n\n return {\n getState: () => state,\n connect: doConnect,\n disconnect: doDisconnect,\n remove: async () => {\n const releaseRemovalFence = beginMcpServerRemovalFence(props);\n try {\n await doDisconnect();\n await clearOAuthProviderAuthState(props.storage, props.id);\n await props.onRemove();\n } catch (err) {\n releaseRemovalFence?.();\n setLastError({\n message: err instanceof Error ? err.message : String(err),\n });\n throw err;\n }\n releaseRemovalFence?.();\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 answerElicitation: (\n id: string,\n response: MCPElicitationResponse,\n ): readonly { property: string; message: string }[] \| undefined => {\n if (response.action === \"accept\") {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return;\n\n if (\n typeof response.content !== \"object\" \|\|\n response.content === null \|\|\n Array.isArray(response.content)\n ) {\n const errors = [\n {\n property: \"content\",\n message: \"Response content must be an object.\",\n },\n ];\n setPendingElicitationError(id, {\n message: \"Invalid elicitation content: content.\",\n properties: [\"content\"],\n });\n return errors;\n }\n\n const errors = validateElicitationContent(\n entry.requestedSchema,\n response.content,\n );\n if (errors.length > 0) {\n const properties = [\n ...new Set(errors.map((error) => error.property)),\n ];\n setPendingElicitationError(id, {\n message: `Invalid elicitation content: ${properties.join(\", \")}.`,\n properties,\n });\n return errors;\n }\n\n const result: ElicitResult = {\n action: \"accept\",\n content: response.content as ElicitResult[\"content\"],\n };\n resolvePendingElicitation(id, result);\n return;\n }\n\n resolvePendingElicitation(id, { action: response.action });\n },\n };\n};\n\nconst McpServerResourceInstance = resource(useMcpServerResourceInstance);\n\nexport const McpServerResource = resource(function useMcpServerResource(\n props: McpServerResourceProps,\n): ClientOutput<\"mcpServer\"> {\n const transportCloseQueueRef = useRef(Promise.resolve());\n const dependencies = getConnectionDependencies(props);\n const [connection, setConnection] = useState({ dependencies, generation: 0 });\n let currentConnection = connection;\n if (!shallowEqual(connection.dependencies, dependencies)) {\n currentConnection = {\n dependencies,\n generation: connection.generation + 1,\n };\n setConnection(currentConnection);\n }\n\n // Storage keys remounts through its optional scopeId rather than object\n // identity, because a defaulted storage element is rebuilt on ordinary\n // renders.\n return useResource(\n withKey(\n currentConnection.generation,\n McpServerResourceInstance({ ...props, transportCloseQueueRef }),\n ),\n );\n});\n"],"mappings":"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"}
1	+ {"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","useResource","withKey","ClientOutput","shallowEqual","Client","StreamableHTTPClientTransport","UnauthorizedError","ClientOptions","ElicitRequest","ElicitResult","StreamableHTTPClientTransportOptions","clearOAuthProviderAuthState","createOAuthProvider","hasUsableOAuthTokens","buildHeaders","assertValidServerId","hasPersistedCredentials","isAuthStateForServerUrl","validateElicitationContent","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPElicitation","MCPElicitationResponse","MCPServerKind","MCPServerState","MCPToolInfo","createMcpId","beginMcpServerRemovalFence","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","cache","defaultTtlMs","elicitation","onRemove","Promise","McpServerResourceInstanceProps","transportCloseQueueRef","current","getConnectionDependencies","props","authDependencies","type","token","scopeId","scopes","length","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","useMcpServerResourceInstance","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","pendingElicitations","setPendingElicitations","clientRef","transportRef","pendingTransportRef","connectionGenerationRef","pendingAuthValidationRef","count","promise","resolve","elicitationResolversRef","Map","result","signal","AbortSignal","onAbort","requestedSchema","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","then","all","map","closePendingTransport","resolvePendingElicitation","entry","get","delete","removeEventListener","filter","setPendingElicitationError","error","NonNullable","has","cancelPendingElicitations","action","detachTransports","pendingTransport","activeTransport","Set","closeTransports","isCurrentConnection","generation","createInterruptedAuthError","cause","Error","undefined","withConnectionTimeout","T","phase","startedAt","timeoutMs","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","unboundAuthMessage","loadAuthState","state","unbound","buildTransport","authProvider","serverId","serverUrl","config","onAuthorizationUrl","toString","URL","headers","transportOpts","requestInit","applyToolsList","list","Array","description","inputSchema","t","info","syncTools","client","options","listPromise","listTools","finalizeConnect","clientOptions","capabilities","listChanged","autoRefresh","debounceMs","onChanged","items","defaultCacheTtlMs","version","setRequestHandler","request","context","params","set","mcpReq","aborted","addEventListener","once","connect","synced","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","validationGeneration","searchParams","pendingAuthValidation","resolvePromise","persisted","finishAuth","connected","tryAutoConnect","loaded","Awaited","previousDisposal","pendingDisposal","queueMicrotask","getState","disconnect","remove","releaseRemovalFence","callTool","args","arguments","Record","listResources","readResource","uri","completeAuth","answerElicitation","response","property","content","isArray","errors","properties","join","McpServerResourceInstance","McpServerResource","useMcpServerResource","dependencies","connection","setConnection","currentConnection"],"sources":["../../src/resources/McpServerResource.ts"],"sourcesContent":["import { useState, useRef, useEffect, useMemo, useEffectEvent } from \"react\";\nimport { resource, useResource, withKey } from \"@assistant-ui/tap\";\nimport type { ClientOutput } from \"@assistant-ui/store\";\nimport { shallowEqual } from \"@assistant-ui/store/internal\";\nimport {\n Client,\n StreamableHTTPClientTransport,\n UnauthorizedError,\n type ClientOptions,\n type ElicitRequest,\n type ElicitResult,\n type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/client\";\nimport {\n clearOAuthProviderAuthState,\n createOAuthProvider,\n hasUsableOAuthTokens,\n} from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\nimport {\n hasPersistedCredentials,\n isAuthStateForServerUrl,\n} from \"../utils/serverUrl\";\nimport { validateElicitationContent } from \"./validateElicitationContent\";\nimport type { MCPStorage } from \"./storage/types\";\nimport type {\n MCPAuthConfig,\n MCPConnectionState,\n MCPElicitation,\n MCPElicitationResponse,\n MCPServerKind,\n MCPServerState,\n MCPToolInfo,\n} from \"../mcp-scope\";\nimport { createMcpId } from \"../utils/createMcpId\";\nimport { beginMcpServerRemovalFence } from \"./McpServerRemovalFence\";\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 cache?: { readonly defaultTtlMs?: number } \| undefined;\n readonly elicitation?: boolean;\n onRemove: () => Promise<void>;\n};\n\ntype McpServerResourceInstanceProps = McpServerResourceProps & {\n transportCloseQueueRef: { current: Promise<void> };\n};\n\nexport const getConnectionDependencies = (\n props: McpServerResourceProps,\n): readonly unknown[] => {\n const auth = props.auth;\n const authDependencies =\n auth.type === \"bearer\"\n ? [auth.type, auth.token, props.storage.scopeId]\n : auth.type === \"oauth\"\n ? [\n auth.type,\n auth.scopes?.length,\n ...(auth.scopes ?? []),\n auth.authorizationEndpoint,\n auth.tokenEndpoint,\n auth.registrationEndpoint,\n auth.clientId,\n auth.clientSecret,\n props.storage.scopeId,\n ]\n : [auth.type];\n\n return [\n props.id,\n props.url,\n ...authDependencies,\n props.redirectUri,\n props.cache?.defaultTtlMs,\n props.elicitation !== false,\n ];\n};\n\nconst useMcpServerResourceInstance = (\n props: McpServerResourceInstanceProps,\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 const [pendingElicitations, setPendingElicitations] = useState<\n MCPElicitation[]\n >([]);\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 connectionGenerationRef = useRef(0);\n const pendingAuthValidationRef = useRef<{\n count: number;\n promise: Promise<void>;\n resolve: () => void;\n } \| null>(null);\n const elicitationResolversRef = useRef(\n new Map<\n string,\n {\n resolve: (result: ElicitResult) => void;\n signal: AbortSignal;\n onAbort: () => void;\n requestedSchema: unknown;\n }\n >(),\n );\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 = props.transportCloseQueueRef.current.then(async () => {\n await Promise.all(transports.map(closeTransportSafely));\n });\n props.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 resolvePendingElicitation = (id: string, result: ElicitResult) => {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return false;\n elicitationResolversRef.current.delete(id);\n entry.signal.removeEventListener(\"abort\", entry.onAbort);\n setPendingElicitations((current) =>\n current.filter((elicitation) => elicitation.id !== id),\n );\n entry.resolve(result);\n return true;\n };\n\n const setPendingElicitationError = (\n id: string,\n error: NonNullable<MCPElicitation[\"error\"]>,\n ) => {\n if (!elicitationResolversRef.current.has(id)) return false;\n setPendingElicitations((current) =>\n current.map((elicitation) =>\n elicitation.id === id ? { ...elicitation, error } : elicitation,\n ),\n );\n return true;\n };\n\n const cancelPendingElicitations = () => {\n for (const [id] of elicitationResolversRef.current) {\n resolvePendingElicitation(id, { action: \"cancel\" });\n }\n };\n\n const detachTransports = () => {\n cancelPendingElicitations();\n const pendingTransport = pendingTransportRef.current;\n const activeTransport = transportRef.current;\n pendingTransportRef.current = null;\n transportRef.current = null;\n clientRef.current = null;\n\n return [\n ...new Set(\n [pendingTransport, activeTransport].filter(\n (transport): transport is StreamableHTTPClientTransport =>\n transport !== null,\n ),\n ),\n ];\n };\n\n const closeTransports = async () => {\n await closeQueuedTransports(detachTransports());\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 unboundAuthMessage = () =>\n `MCP server \"${props.id}\" has saved authentication for a different URL. Authenticate again to connect to ${props.url}.`;\n\n const loadAuthState = useEffectEvent(async () => {\n const state = await props.storage.loadAuthState(props.id);\n if (isAuthStateForServerUrl(state, props.url)) {\n return { state, unbound: false };\n }\n return { state: null, unbound: hasPersistedCredentials(state) };\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 serverUrl: props.url,\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 { state, unbound } = await loadAuthState();\n const headers = buildHeaders(props.auth, state);\n if (!headers && unbound) throw new Error(unboundAuthMessage());\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 applyToolsList = useEffectEvent(\n (list: {\n tools: Array<{\n name: string;\n description?: string \| undefined;\n inputSchema: unknown;\n }>;\n }) => {\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 },\n );\n\n const syncTools = useEffectEvent(\n async (\n client: Client,\n generation: number,\n options?: { startedAt?: number \| undefined },\n ): Promise<boolean> => {\n const listPromise = client.listTools();\n const list =\n options?.startedAt === undefined\n ? await listPromise\n : await withConnectionTimeout(\n listPromise,\n \"listing tools\",\n options.startedAt,\n );\n if (!isCurrentConnection(generation)) return false;\n applyToolsList(list);\n return true;\n },\n );\n\n const finalizeConnect = useEffectEvent(\n async (\n transport: StreamableHTTPClientTransport,\n generation: number,\n ): Promise<boolean> => {\n const clientOptions: ClientOptions = {\n ...(props.elicitation === false\n ? {}\n : { capabilities: { elicitation: {} } }),\n listChanged: {\n tools: {\n autoRefresh: true,\n debounceMs: 300,\n onChanged: (error, items) => {\n if (!isCurrentConnection(generation)) return;\n if (error !== null) {\n setLastError({ message: error.message });\n return;\n }\n if (items === null) return;\n setLastError(null);\n applyToolsList({ tools: items });\n },\n },\n },\n };\n if (props.cache?.defaultTtlMs !== undefined) {\n clientOptions.defaultCacheTtlMs = props.cache.defaultTtlMs;\n }\n const client = new Client(\n {\n name: \"assistant-ui-mcp\",\n version: \"0.0.0\",\n },\n clientOptions,\n );\n if (props.elicitation !== false) {\n client.setRequestHandler(\n \"elicitation/create\",\n (request: ElicitRequest, context): Promise<ElicitResult> => {\n if (!isCurrentConnection(generation)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n if (!(\"requestedSchema\" in request.params)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n const { message, requestedSchema } = request.params;\n\n const id = createMcpId();\n const promise = new Promise<ElicitResult>((resolve) => {\n const onAbort = () => {\n resolvePendingElicitation(id, { action: \"cancel\" });\n };\n elicitationResolversRef.current.set(id, {\n resolve,\n signal: context.mcpReq.signal,\n onAbort,\n requestedSchema,\n });\n });\n setPendingElicitations((current) => [\n ...current,\n {\n id,\n message,\n requestedSchema,\n },\n ]);\n const entry = elicitationResolversRef.current.get(id);\n if (entry) {\n if (context.mcpReq.signal.aborted) {\n entry.onAbort();\n } else {\n context.mcpReq.signal.addEventListener(\"abort\", entry.onAbort, {\n once: true,\n });\n }\n }\n return promise;\n },\n );\n }\n const startedAt = Date.now();\n await withConnectionTimeout(\n client.connect(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 synced = await syncTools(client, generation, { startedAt });\n if (!synced) return false;\n\n pendingTransportRef.current = null;\n clientRef.current = client;\n transportRef.current = transport;\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 cancelPendingElicitations();\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 validationGeneration = connectionGenerationRef.current;\n const url = new URL(callbackUrl);\n const state = url.searchParams.get(\"state\");\n if (!state) throw new Error('missing \"state\" parameter');\n let pendingAuthValidation = pendingAuthValidationRef.current;\n if (!pendingAuthValidation) {\n let resolve!: () => void;\n const promise = new Promise<void>((resolvePromise) => {\n resolve = resolvePromise;\n });\n pendingAuthValidation = { count: 0, promise, resolve };\n pendingAuthValidationRef.current = pendingAuthValidation;\n }\n pendingAuthValidation.count += 1;\n try {\n const { state: persisted, unbound } = await loadAuthState();\n if (!isCurrentConnection(validationGeneration)) {\n throw createInterruptedAuthError();\n }\n if (unbound) throw new Error(unboundAuthMessage());\n if (!persisted?.state) {\n throw new Error(\n \"no pending OAuth authorization request for this server\",\n );\n }\n if (persisted.state !== state) {\n throw new Error(\"OAuth state does not match the authorization request\");\n }\n if (!url.searchParams.get(\"code\") && !url.searchParams.get(\"error\")) {\n throw new Error(\"missing authorization code in callback URL\");\n }\n } finally {\n pendingAuthValidation.count -= 1;\n if (pendingAuthValidation.count === 0) {\n pendingAuthValidationRef.current = null;\n pendingAuthValidation.resolve();\n }\n }\n\n // Claim the generation before a waiting auto-connect can resume.\n const generation = ++connectionGenerationRef.current;\n cancelPendingElicitations();\n await closePendingTransport();\n if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n\n setConnectionState(\"authPending\");\n setLastError(null);\n try {\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(url.searchParams);\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 generation = connectionGenerationRef.current;\n let loaded: Awaited<ReturnType<typeof loadAuthState>>;\n try {\n loaded = await loadAuthState();\n } catch (error) {\n if (signal.cancelled \|\| !isCurrentConnection(generation)) return;\n const message = error instanceof Error ? error.message : String(error);\n setLastError({\n message: `MCP server \"${props.id}\" failed to load saved authentication: ${message}`,\n });\n setConnectionState(\"error\");\n return;\n }\n if (signal.cancelled \|\| !isCurrentConnection(generation)) return;\n if (loaded.unbound) {\n setLastError({ message: unboundAuthMessage() });\n return;\n }\n const persisted = loaded.state;\n if (props.auth.type === \"oauth\") {\n if (!hasUsableOAuthTokens(persisted, props.auth)) return;\n } else if (!persisted?.token) {\n return;\n }\n const pendingAuthValidation = pendingAuthValidationRef.current;\n if (pendingAuthValidation) {\n await pendingAuthValidation.promise;\n if (signal.cancelled \|\| !isCurrentConnection(generation)) return;\n }\n void doConnect();\n },\n );\n\n // Auto-connect on mount when usable auth exists.\n useEffect(() => {\n const transportCloseQueueRef = props.transportCloseQueueRef;\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 // Auto-connect opens a transport, so it belongs to the same effect as the\n // disposal that closes it.\n // eslint-disable-next-line react-hooks/set-state-in-effect\n void tryAutoConnect(signal);\n return () => {\n mountedRef.current = false;\n signal.cancelled = true;\n const task = transportCloseQueueRef.current.then(async () => {\n await new Promise<void>((resolve) => queueMicrotask(resolve));\n if (pendingDisposal.cancelled) return;\n connectionGenerationRef.current += 1;\n await Promise.all(detachTransports().map(closeTransportSafely));\n });\n transportCloseQueueRef.current = task;\n };\n }, [props.transportCloseQueueRef]);\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 pendingElicitations,\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 pendingElicitations,\n ],\n );\n\n return {\n getState: () => state,\n connect: doConnect,\n disconnect: doDisconnect,\n remove: async () => {\n const releaseRemovalFence = beginMcpServerRemovalFence(props);\n try {\n await doDisconnect();\n await clearOAuthProviderAuthState(props.storage, props.id);\n await props.onRemove();\n } catch (err) {\n releaseRemovalFence?.();\n setLastError({\n message: err instanceof Error ? err.message : String(err),\n });\n throw err;\n }\n releaseRemovalFence?.();\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 answerElicitation: (\n id: string,\n response: MCPElicitationResponse,\n ): readonly { property: string; message: string }[] \| undefined => {\n if (response.action === \"accept\") {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return undefined;\n\n if (\n typeof response.content !== \"object\" \|\|\n response.content === null \|\|\n Array.isArray(response.content)\n ) {\n const errors = [\n {\n property: \"content\",\n message: \"Response content must be an object.\",\n },\n ];\n setPendingElicitationError(id, {\n message: \"Invalid elicitation content: content.\",\n properties: [\"content\"],\n });\n return errors;\n }\n\n const errors = validateElicitationContent(\n entry.requestedSchema,\n response.content,\n );\n if (errors.length > 0) {\n const properties = [\n ...new Set(errors.map((error) => error.property)),\n ];\n setPendingElicitationError(id, {\n message: `Invalid elicitation content: ${properties.join(\", \")}.`,\n properties,\n });\n return errors;\n }\n\n const result: ElicitResult = {\n action: \"accept\",\n content: response.content as ElicitResult[\"content\"],\n };\n resolvePendingElicitation(id, result);\n return undefined;\n }\n\n resolvePendingElicitation(id, { action: response.action });\n return undefined;\n },\n };\n};\n\nconst McpServerResourceInstance = resource(useMcpServerResourceInstance);\n\nexport const McpServerResource = resource(function useMcpServerResource(\n props: McpServerResourceProps,\n): ClientOutput<\"mcpServer\"> {\n const transportCloseQueueRef = useRef(Promise.resolve());\n const dependencies = getConnectionDependencies(props);\n const [connection, setConnection] = useState({ dependencies, generation: 0 });\n let currentConnection = connection;\n if (!shallowEqual(connection.dependencies, dependencies)) {\n currentConnection = {\n dependencies,\n generation: connection.generation + 1,\n };\n setConnection(currentConnection);\n }\n\n // Storage keys remounts through its optional scopeId rather than object\n // identity, because a defaulted storage element is rebuilt on ordinary\n // renders.\n return useResource(\n withKey(\n currentConnection.generation,\n McpServerResourceInstance({ ...props, transportCloseQueueRef }),\n ),\n );\n});\n"],"mappings":";;;;;;;;;;;;AA0DA,MAAasD,6BACXC,UACuB;CACvB,MAAMd,OAAOc,MAAMd;CACnB,MAAMe,mBACJf,KAAKgB,SAAS,WACV;EAAChB,KAAKgB;EAAMhB,KAAKiB;EAAOH,MAAMb,QAAQiB;CAAO,IAC7ClB,KAAKgB,SAAS,UACZ;EACEhB,KAAKgB;EACLhB,KAAKmB,QAAQC;EACb,GAAIpB,KAAKmB,UAAU,CAAA;EACnBnB,KAAKqB;EACLrB,KAAKsB;EACLtB,KAAKuB;EACLvB,KAAKwB;EACLxB,KAAKyB;EACLX,MAAMb,QAAQiB;CAAO,IAEvB,CAAClB,KAAKgB,IAAI;CAElB,OAAO;EACLF,MAAMnB;EACNmB,MAAMhB;EACN,GAAGiB;EACHD,MAAMZ;EACNY,MAAMT,OAAOC;EACbQ,MAAMP,gBAAgB;CAAK;AAE/B;AAEA,MAAMmB,gCACJZ,UAC8B;CAC9BlC,oBAAoBkC,MAAMnB,EAAE;CAC5B,MAAM,CAACgC,iBAAiBC,sBACtBrE,SAA6B,cAAc;CAC7C,MAAM,CAACsE,OAAOC,YAAYvE,SAAwB,CAAA,CAAE;CACpD,MAAM,CAACwE,WAAWC,gBAAgBzE,SAAqC,IAAI;CAC3E,MAAM,CAAC2E,kBAAkBC,uBAAuB5E,SAAwB,IAAI;CAC5E,MAAM,CAAC6E,qBAAqBC,0BAA0B9E,SAEpD,CAAA,CAAE;CAEJ,MAAM+E,YAAY9E,OAAsB,IAAI;CAC5C,MAAM+E,eAAe/E,OAA6C,IAAI;CACtE,MAAMgF,sBAAsBhF,OAC1B,IACF;CACA,MAAMiF,0BAA0BjF,OAAO,CAAC;CACxC,MAAMkF,2BAA2BlF,OAIvB,IAAI;CACd,MAAMsF,0BAA0BtF,uBAC9B,IAAIuF,IAQF,CACJ;CACA,MAAMM,qBAAqB7F,OAAsC,IAAI;CACrE,MAAM+F,aAAa/F,OAAO,IAAI;CAE9B,MAAMgG,uBAAuB,OAC3BC,cACkB;EAClB,IAAI;GACF,MAAMA,UAAUC,MAAM;EACxB,QAAQ,CACN;CAEJ;CAEA,MAAMC,yBACJC,eACkB;EAClB,MAAMC,OAAO/C,MAAMH,uBAAuBC,QAAQkD,KAAK,YAAY;GACjE,MAAMrD,QAAQsD,IAAIH,WAAWI,IAAIR,oBAAoB,CAAC;EACxD,CAAC;EACD1C,MAAMH,uBAAuBC,UAAUiD;EACvC,OAAOA;CACT;CAEA,MAAMI,wBAAwB,YAAY;EACxC,MAAMR,cAAYjB,oBAAoB5B;EACtC4B,oBAAoB5B,UAAU;EAC9B,MAAM+C,sBAAsBF,cAAY,CAACA,WAAS,IAAI,CAAA,CAAE;CAC1D;CAEA,MAAMS,6BAA6BvE,IAAYqD,WAAyB;EACtE,MAAMmB,QAAQrB,wBAAwBlC,QAAQwD,IAAIzE,EAAE;EACpD,IAAI,CAACwE,OAAO,OAAO;EACnBrB,wBAAwBlC,QAAQyD,OAAO1E,EAAE;EACzCwE,MAAMlB,OAAOqB,oBAAoB,SAASH,MAAMhB,OAAO;EACvDd,wBAAwBzB,YACtBA,QAAQ2D,QAAQhE,gBAAgBA,YAAYZ,OAAOA,EAAE,CACvD;EACAwE,MAAMtB,QAAQG,MAAM;EACpB,OAAO;CACT;CAEA,MAAMwB,8BACJ7E,MACA8E,UACG;EACH,IAAI,CAAC3B,wBAAwBlC,QAAQ+D,IAAIhF,IAAE,GAAG,OAAO;EACrD0C,wBAAwBzB,cACtBA,UAAQoD,KAAKzD,kBACXA,cAAYZ,OAAOA,OAAK;GAAE,GAAGY;GAAakE;EAAM,IAAIlE,aACtD,CACF;EACA,OAAO;CACT;CAEA,MAAMqE,kCAAkC;EACtC,KAAK,MAAM,CAACjF,SAAOmD,wBAAwBlC,SACzCsD,0BAA0BvE,MAAI,EAAEkF,QAAQ,SAAS,CAAC;CAEtD;CAEA,MAAMC,yBAAyB;EAC7BF,0BAA0B;EAC1B,MAAMG,mBAAmBvC,oBAAoB5B;EAC7C,MAAMoE,kBAAkBzC,aAAa3B;EACrC4B,oBAAoB5B,UAAU;EAC9B2B,aAAa3B,UAAU;EACvB0B,UAAU1B,UAAU;EAEpB,OAAO,CACL,GAAG,IAAIqE,IACL,CAACF,kBAAkBC,eAAe,CAAC,CAACT,QACjCd,gBACCA,gBAAc,IAClB,CACF,CAAC;CAEL;CAEA,MAAMyB,kBAAkB,YAAY;EAClC,MAAMvB,sBAAsBmB,iBAAiB,CAAC;CAChD;CAEA,MAAMK,uBAAuBC,eAC3B7B,WAAW3C,WAAWwE,eAAe3C,wBAAwB7B;CAE/D,MAAMyE,8BAA8BC,UAClC,IAAIC,MACF,eAAezE,MAAMnB,GAAE,qDACvB2F,UAAUE,KAAAA,IAAYA,KAAAA,IAAY,EAAEF,MAAM,CAC5C;CAEF,MAAMG,wBAAwB9H,eAC5B,OACEiF,SACA+C,OACAC,cACe;EACf,MAAMC,YAAY/E,MAAMV;EACxB,IAAIyF,cAAcL,KAAAA,GAAW,OAAO,MAAM5C;EAC1C,MAAMkD,cAAcD,aAAaE,KAAKC,IAAI,IAAIJ;EAC9C,MAAMK,qCACJ,IAAIV,MACF,eAAezE,MAAMnB,GAAE,oBAAqBgG,MAAK,SAAUE,UAAS,IACtE;EACF,IAAIC,eAAe,GAAG,MAAMG,aAAa;EAEzC,IAAIC;EACJ,IAAI;GACF,OAAO,MAAMzF,QAAQ4F,KAAK,CACxBzD,SACA,IAAInC,SAAgB6F,GAAGC,WAAW;IAChCL,UAAUE,iBAAiBG,OAAON,aAAa,CAAC,GAAGH,WAAW;GAChE,CAAC,CAAC,CACH;EACH,UAAU;GACR,IAAII,YAAYV,KAAAA,GAAWgB,aAAaN,OAAO;EACjD;CACF,CACF;CAEA,MAAMO,2BACJ,eAAe3F,MAAMnB,GAAE,mFAAoFmB,MAAMhB,IAAG;CAEtH,MAAM4G,gBAAgB/I,eAAe,YAAY;EAC/C,MAAMgJ,QAAQ,MAAM7F,MAAMb,QAAQyG,cAAc5F,MAAMnB,EAAE;EACxD,IAAIb,wBAAwB6H,OAAO7F,MAAMhB,GAAG,GAC1C,OAAO;GAAE6G;GAAOC,SAAS;EAAM;EAEjC,OAAO;GAAED,OAAO;GAAMC,SAAS/H,wBAAwB8H,KAAK;EAAE;CAChE,CAAC;CAED,MAAME,iBAAiBlJ,eACrB,YAAoD;EAClD,IAAImD,MAAMd,KAAKgB,SAAS,SAAS;GAC/B,MAAM8F,eAAerI,oBAAoB;IACvCsI,UAAUjG,MAAMnB;IAChBqH,WAAWlG,MAAMhB;IACjBmH,QAAQnG,MAAMd;IACdC,SAASa,MAAMb;IACfC,aAAaY,MAAMZ;IACnBgH,qBAAqBpH,QAAQqC,oBAAoBrC,IAAIqH,SAAS,CAAC;GACjE,CAAC;GACD,OAAO,IAAIjJ,8BAA8B,IAAIkJ,IAAItG,MAAMhB,GAAG,GAAG,EAC3DgH,aACF,CAAC;EACH;EACA,IAAIhG,MAAMd,KAAKgB,SAAS,UAAU;GAChC,MAAM,EAAE2F,OAAAA,SAAOC,YAAY,MAAMF,cAAc;GAC/C,MAAMW,UAAU1I,aAAamC,MAAMd,MAAM2G,OAAK;GAC9C,IAAI,CAACU,WAAWT,SAAS,MAAM,IAAIrB,MAAMkB,mBAAmB,CAAC;GAC7D,MAAMa,gBAAsD,CAAC;GAC7D,IAAID,SAASC,cAAcC,cAAc,EAAEF,QAAQ;GACnD,OAAO,IAAInJ,8BACT,IAAIkJ,IAAItG,MAAMhB,GAAG,GACjBwH,aACF;EACF;EACA,OAAO,IAAIpJ,8BAA8B,IAAIkJ,IAAItG,MAAMhB,GAAG,CAAC;CAC7D,CACF;CAEA,MAAM0H,iBAAiB7J,gBACpB8J,SAMK;EACJ3F,SACE2F,KAAK5F,MAAMmC,KAAK6D,MAAM;GACpB,MAAMC,OAAoB;IACxBjI,MAAMgI,EAAEhI;IACR+H,aAAaC,EAAED;GACjB;GACA,IAAIC,EAAEF,gBAAgBnC,KAAAA,GAAWsC,KAAKH,cAAcE,EAAEF;GACtD,OAAOG;EACT,CAAC,CACH;CACF,CACF;CAEA,MAAMC,YAAYpK,eAChB,OACEqK,QACA5C,cACA6C,YACqB;EACrB,MAAMC,cAAcF,OAAOG,UAAU;EACrC,MAAMV,SACJQ,SAASrC,cAAcJ,KAAAA,IACnB,MAAM0C,cACN,MAAMzC,sBACJyC,aACA,iBACAD,QAAQrC,SACV;EACN,IAAI,CAACT,oBAAoBC,YAAU,GAAG,OAAO;EAC7CoC,eAAeC,MAAI;EACnB,OAAO;CACT,CACF;CAEA,MAAMW,kBAAkBzK,eACtB,OACE8F,aACA2B,iBACqB;EACrB,MAAMiD,gBAA+B;GACnC,GAAIvH,MAAMP,gBAAgB,QACtB,CAAC,IACD,EAAE+H,cAAc,EAAE/H,aAAa,CAAC,EAAE,EAAE;GACxCgI,aAAa,EACX1G,OAAO;IACL2G,aAAa;IACbC,YAAY;IACZC,YAAYjE,SAAOkE,UAAU;KAC3B,IAAI,CAACxD,oBAAoBC,YAAU,GAAG;KACtC,IAAIX,YAAU,MAAM;MAClBzC,aAAa,EAAEC,SAASwC,QAAMxC,QAAQ,CAAC;MACvC;KACF;KACA,IAAI0G,UAAU,MAAM;KACpB3G,aAAa,IAAI;KACjBwF,eAAe,EAAE3F,OAAO8G,MAAM,CAAC;IACjC;GACF,EACF;EACF;EACA,IAAI7H,MAAMT,OAAOC,iBAAiBkF,KAAAA,GAChC6C,cAAcO,oBAAoB9H,MAAMT,MAAMC;EAEhD,MAAM0H,WAAS,IAAI/J,OACjB;GACE4B,MAAM;GACNgJ,SAAS;EACX,GACAR,aACF;EACA,IAAIvH,MAAMP,gBAAgB,OACxByH,SAAOc,kBACL,uBACCC,SAAwBC,YAAmC;GAC1D,IAAI,CAAC7D,oBAAoBC,YAAU,GACjC,OAAO3E,QAAQoC,QAAQ,EAAEgC,QAAQ,SAAS,CAAC;GAE7C,IAAI,EAAE,qBAAqBkE,QAAQE,SACjC,OAAOxI,QAAQoC,QAAQ,EAAEgC,QAAQ,SAAS,CAAC;GAE7C,MAAM,EAAE5C,SAASmB,oBAAoB2F,QAAQE;GAE7C,MAAMtJ,OAAKH,YAAY;GACvB,MAAMoD,YAAU,IAAInC,SAAuBoC,YAAY;IACrD,MAAMM,gBAAgB;KACpBe,0BAA0BvE,MAAI,EAAEkF,QAAQ,SAAS,CAAC;IACpD;IACA/B,wBAAwBlC,QAAQsI,IAAIvJ,MAAI;KACtCkD;KACAI,QAAQ+F,QAAQG,OAAOlG;KACvBE;KACAC;IACF,CAAC;GACH,CAAC;GACDf,wBAAwBzB,cAAY,CAClC,GAAGA,WACH;IACEjB,IAAAA;IACAsC;IACAmB;GACF,CAAC,CACF;GACD,MAAMe,UAAQrB,wBAAwBlC,QAAQwD,IAAIzE,IAAE;GACpD,IAAIwE,SAAO;IACT,IAAI6E,QAAQG,OAAOlG,OAAOmG,SACxBjF,QAAMhB,QAAQ;SAEd6F,QAAQG,OAAOlG,OAAOoG,iBAAiB,SAASlF,QAAMhB,SAAS,EAC7DmG,MAAM,KACR,CAAC;GAEL;GACA,OAAO1G;EACT,CACF;EAEF,MAAMgD,cAAYG,KAAKC,IAAI;EAC3B,MAAMP,sBACJuC,SAAOuB,QAAQ9F,WAAS,GACxB,cACAmC,WACF;EACA,IAAI,CAACT,oBAAoBC,YAAU,GAAG,OAAO;EAM7C,IAAI,CAACoE,MADgBzB,UAAUC,UAAQ5C,cAAY,EAAEQ,WAAAA,YAAU,CAAC,GACnD,OAAO;EAEpBpD,oBAAoB5B,UAAU;EAC9B0B,UAAU1B,UAAUoH;EACpBzF,aAAa3B,UAAU6C;EACvB7B,mBAAmB,WAAW;EAC9B,OAAO;CACT,CACF;CAEA,MAAM6H,YAAY9L,eAAe,YAAY;EAC3C,MAAMyH,eAAa,EAAE3C,wBAAwB7B;EAE7C,MAAMsE,gBAAgB;EACtB,IAAI,CAACC,oBAAoBC,YAAU,GAAG;EAEtCxD,mBAAmB,YAAY;EAC/BI,aAAa,IAAI;EACjBG,oBAAoB,IAAI;EAGxBL,SAAS,CAAA,CAAE;EACX,IAAI2B,cAAkD;EACtD,IAAI;GACFA,cAAY,MAAMoD,eAAe;GACjC,IAAI,CAAC1B,oBAAoBC,YAAU,GAAG;IACpC,MAAMzB,sBAAsB,CAACF,WAAS,CAAC;IACvC;GACF;GACAjB,oBAAoB5B,UAAU6C;GAI9B,MAAM2E,gBAAgB3E,aAAW2B,YAAU;EAC7C,SAASsE,KAAK;GACZ,IAAI,CAACvE,oBAAoBC,YAAU,GAAG;GAEtC,IAAIsE,eAAevL,mBAAmB;IAIpCqE,oBAAoB5B,UAAU;IAC9B2B,aAAa3B,UAAU6C;IACvB7B,mBAAmB,cAAc;GACnC,OAAO;IACLgD,0BAA0B;IAC1B,IAAInB,aAAW;KACbjB,oBAAoB5B,UAAU;KAC9B,MAAM+C,sBAAsB,CAACF,WAAS,CAAC;IACzC;IACAzB,aAAa,EACXC,SAASyH,eAAenE,QAAQmE,IAAIzH,UAAU0H,OAAOD,GAAG,EAC1D,CAAC;IACD9H,mBAAmB,OAAO;GAC5B;EACF;CACF,CAAC;CAED,MAAMgI,eAAejM,eAAe,YAAY;EAC9C8E,wBAAwB7B,WAAW;EACnCkB,SAAS,CAAA,CAAE;EACXK,oBAAoB,IAAI;EACxBP,mBAAmB,cAAc;EACjC,MAAMsD,gBAAgB;CACxB,CAAC;CAED,MAAM2E,iBAAiBlM,eAAe,OAAOmM,gBAAwB;EACnE,MAAMC,uBAAuBtH,wBAAwB7B;EACrD,MAAMd,QAAM,IAAIsH,IAAI0C,WAAW;EAC/B,MAAMnD,UAAQ7G,MAAIkK,aAAa5F,IAAI,OAAO;EAC1C,IAAI,CAACuC,SAAO,MAAM,IAAIpB,MAAM,6BAA2B;EACvD,IAAI0E,wBAAwBvH,yBAAyB9B;EACrD,IAAI,CAACqJ,uBAAuB;GAC1B,IAAIpH;GAIJoH,wBAAwB;IAAEtH,OAAO;IAAGC,SAAAA,IAHhBnC,SAAeyJ,mBAAmB;KACpDrH,YAAUqH;IACZ,CACoCtH;IAASC,SAAAA;GAAQ;GACrDH,yBAAyB9B,UAAUqJ;EACrC;EACAA,sBAAsBtH,SAAS;EAC/B,IAAI;GACF,MAAM,EAAEgE,OAAOwD,WAAWvD,YAAY,MAAMF,cAAc;GAC1D,IAAI,CAACvB,oBAAoB4E,oBAAoB,GAC3C,MAAM1E,2BAA2B;GAEnC,IAAIuB,SAAS,MAAM,IAAIrB,MAAMkB,mBAAmB,CAAC;GACjD,IAAI,CAAC0D,WAAWxD,OACd,MAAM,IAAIpB,MACR,wDACF;GAEF,IAAI4E,UAAUxD,UAAUA,SACtB,MAAM,IAAIpB,MAAM,sDAAsD;GAExE,IAAI,CAACzF,MAAIkK,aAAa5F,IAAI,MAAM,KAAK,CAACtE,MAAIkK,aAAa5F,IAAI,OAAO,GAChE,MAAM,IAAImB,MAAM,4CAA4C;EAEhE,UAAU;GACR0E,sBAAsBtH,SAAS;GAC/B,IAAIsH,sBAAsBtH,UAAU,GAAG;IACrCD,yBAAyB9B,UAAU;IACnCqJ,sBAAsBpH,QAAQ;GAChC;EACF;EAGA,MAAMuC,eAAa,EAAE3C,wBAAwB7B;EAC7CgE,0BAA0B;EAC1B,MAAMX,sBAAsB;EAC5B,IAAI,CAACkB,oBAAoBC,YAAU,GAAG,MAAMC,2BAA2B;EAEvEzD,mBAAmB,aAAa;EAChCI,aAAa,IAAI;EACjB,IAAI;GACF,IAAIyB,cAAYlB,aAAa3B;GAC7B,IAAI,CAAC6C,aAAW;IACdA,cAAY,MAAMoD,eAAe;IACjC,IAAI,CAAC1B,oBAAoBC,YAAU,GAAG;KACpC,MAAMzB,sBAAsB,CAACF,WAAS,CAAC;KACvC,MAAM4B,2BAA2B;IACnC;GACF;GACA9C,aAAa3B,UAAU;GACvB0B,UAAU1B,UAAU;GACpB4B,oBAAoB5B,UAAU6C;GAC9B,MAAMA,YAAU2G,WAAWtK,MAAIkK,YAAY;GAC3C,IAAI,CAAC7E,oBAAoBC,YAAU,GAAG,MAAMC,2BAA2B;GACvElD,oBAAoB,IAAI;GAExB,IAAI,CAACkI,MADmBjC,gBAAgB3E,aAAW2B,YAAU,GAC7C,MAAMC,2BAA2B;EACnD,SAASqE,OAAK;GACZ,MAAMjF,UAAQiF,iBAAenE,QAAQmE,QAAM,IAAInE,MAAMoE,OAAOD,KAAG,CAAC;GAChE,IAAI,CAACvE,oBAAoBC,YAAU,GACjC,MAAMC,2BAA2BZ,OAAK;GAExC,MAAMS,gBAAgB;GACtBlD,aAAa,EACXC,SAASwC,QAAMxC,QACjB,CAAC;GACDL,mBAAmB,OAAO;GAC1B,MAAM6C;EACR;CACF,CAAC;CAED,MAAM6F,iBAAiB3M,eACrB,OAAOsF,WAAmC;EACxC,IAAI,CAACnC,MAAMX,aAAa;EACxB,IAAIW,MAAMd,KAAKgB,SAAS,QAAQ;GAC9B,UAAe;GACf;EACF;EAEA,IAAIF,MAAMd,KAAKgB,SAAS,YAAYF,MAAMd,KAAKiB,OAAO;GACpD,UAAe;GACf;EACF;EACA,MAAMmE,eAAa3C,wBAAwB7B;EAC3C,IAAI2J;EACJ,IAAI;GACFA,SAAS,MAAM7D,cAAc;EAC/B,SAASjC,SAAO;GACd,IAAIxB,OAAOK,aAAa,CAAC6B,oBAAoBC,YAAU,GAAG;GAC1D,MAAMnD,YAAUwC,mBAAiBc,QAAQd,QAAMxC,UAAU0H,OAAOlF,OAAK;GACrEzC,aAAa,EACXC,SAAS,eAAenB,MAAMnB,GAAE,yCAA0CsC,YAC5E,CAAC;GACDL,mBAAmB,OAAO;GAC1B;EACF;EACA,IAAIqB,OAAOK,aAAa,CAAC6B,oBAAoBC,YAAU,GAAG;EAC1D,IAAImF,OAAO3D,SAAS;GAClB5E,aAAa,EAAEC,SAASwE,mBAAmB,EAAE,CAAC;GAC9C;EACF;EACA,MAAM0D,YAAYI,OAAO5D;EACzB,IAAI7F,MAAMd,KAAKgB,SAAS,SAClB;OAAA,CAACtC,qBAAqByL,WAAWrJ,MAAMd,IAAI,GAAG;EAAA,OAC7C,IAAI,CAACmK,WAAWlJ,OACrB;EAEF,MAAMgJ,0BAAwBvH,yBAAyB9B;EACvD,IAAIqJ,yBAAuB;GACzB,MAAMA,wBAAsBrH;GAC5B,IAAIK,OAAOK,aAAa,CAAC6B,oBAAoBC,YAAU,GAAG;EAC5D;EACA,UAAe;CACjB,CACF;CAGA3H,gBAAgB;EACd,MAAMkD,yBAAyBG,MAAMH;EACrC,MAAM8J,mBAAmBpH,mBAAmBzC;EAC5C,IAAI6J,kBAAkBA,iBAAiBnH,YAAY;EACnD,MAAMoH,kBAAkB,EAAEpH,WAAW,MAAM;EAC3CD,mBAAmBzC,UAAU8J;EAC7BnH,WAAW3C,UAAU;EACrB,MAAMqC,WAAS,EAAEK,WAAW,MAAM;EAIlC,eAAoBL,QAAM;EAC1B,aAAa;GACXM,WAAW3C,UAAU;GACrBqC,SAAOK,YAAY;GACnB,MAAMO,SAAOlD,uBAAuBC,QAAQkD,KAAK,YAAY;IAC3D,MAAM,IAAIrD,SAAeoC,cAAY8H,eAAe9H,SAAO,CAAC;IAC5D,IAAI6H,gBAAgBpH,WAAW;IAC/Bb,wBAAwB7B,WAAW;IACnC,MAAMH,QAAQsD,IAAIe,iBAAiB,CAAC,CAACd,IAAIR,oBAAoB,CAAC;GAChE,CAAC;GACD7C,uBAAuBC,UAAUiD;EACnC;CACF,GAAG,CAAC/C,MAAMH,sBAAsB,CAAC;CAEjC,MAAMgG,UAAQjJ,eACL;EACLiC,IAAImB,MAAMnB;EACVC,MAAMkB,MAAMlB;EACZC,MAAMiB,MAAMjB;EACZC,KAAKgB,MAAMhB;EACXC,MAAMe,MAAMf;EACZ4B;EACAI;EACAF;EACAK;EACAE;CACF,IACA;EACEtB,MAAMnB;EACNmB,MAAMlB;EACNkB,MAAMjB;EACNiB,MAAMhB;EACNgB,MAAMf;EACN4B;EACAI;EACAF;EACAK;EACAE;CAAmB,CAEvB;CAEA,OAAO;EACLwI,gBAAgBjE;EAChB4C,SAASE;EACToB,YAAYjB;EACZkB,QAAQ,YAAY;GAClB,MAAMC,sBAAsBtL,2BAA2BqB,KAAK;GAC5D,IAAI;IACF,MAAM8I,aAAa;IACnB,MAAMpL,4BAA4BsC,MAAMb,SAASa,MAAMnB,EAAE;IACzD,MAAMmB,MAAMN,SAAS;GACvB,SAASkJ,OAAK;IACZqB,sBAAsB;IACtB/I,aAAa,EACXC,SAASyH,iBAAenE,QAAQmE,MAAIzH,UAAU0H,OAAOD,KAAG,EAC1D,CAAC;IACD,MAAMA;GACR;GACAqB,sBAAsB;EACxB;EACAC,UAAU,OAAOnL,MAAMoL,SAAS;GAC9B,MAAMjD,WAAS1F,UAAU1B;GACzB,IAAI,CAACoH,UACH,MAAM,IAAIzC,MAAM,eAAezE,MAAMnB,GAAE,mBAAoB;GAE7D,OAAO,MAAMqI,SAAOgD,SAAS;IAC3BnL;IACAqL,WAAWD;GACb,CAAC;EACH;EACAG,eAAe,OAAOnC,WAAW;GAC/B,MAAMjB,WAAS1F,UAAU1B;GACzB,IAAI,CAACoH,UACH,MAAM,IAAIzC,MAAM,eAAezE,MAAMnB,GAAE,mBAAoB;GAE7D,OAAO,MAAMqI,SAAOoD,cAAcnC,MAAM;EAC1C;EACAoC,cAAc,OAAOC,QAAQ;GAC3B,MAAMtD,WAAS1F,UAAU1B;GACzB,IAAI,CAACoH,UACH,MAAM,IAAIzC,MAAM,eAAezE,MAAMnB,GAAE,mBAAoB;GAE7D,OAAO,MAAMqI,SAAOqD,aAAa,EAAEC,IAAI,CAAC;EAC1C;EACAC,cAAc1B;EACd2B,oBACE7L,MACA8L,aACiE;GACjE,IAAIA,SAAS5G,WAAW,UAAU;IAChC,MAAMV,UAAQrB,wBAAwBlC,QAAQwD,IAAIzE,IAAE;IACpD,IAAI,CAACwE,SAAO,OAAOqB,KAAAA;IAEnB,IACE,OAAOiG,SAASE,YAAY,YAC5BF,SAASE,YAAY,QACrBjE,MAAMkE,QAAQH,SAASE,OAAO,GAC9B;KACA,MAAME,SAAS,CACb;MACEH,UAAU;MACVzJ,SAAS;KACX,CAAC;KAEHuC,2BAA2B7E,MAAI;MAC7BsC,SAAS;MACT6J,YAAY,CAAC,SAAS;KACxB,CAAC;KACD,OAAOD;IACT;IAEA,MAAMA,WAAS9M,2BACboF,QAAMf,iBACNqI,SAASE,OACX;IACA,IAAIE,SAAOzK,SAAS,GAAG;KACrB,MAAM0K,aAAa,CACjB,GAAG,IAAI7G,IAAI4G,SAAO7H,KAAKS,YAAUA,QAAMiH,QAAQ,CAAC,CAAC;KAEnDlH,2BAA2B7E,MAAI;MAC7BsC,SAAS,gCAAgC6J,WAAWC,KAAK,IAAI,EAAC;MAC9DD;KACF,CAAC;KACD,OAAOD;IACT;IAEA,MAAM7I,WAAuB;KAC3B6B,QAAQ;KACR8G,SAASF,SAASE;IACpB;IACAzH,0BAA0BvE,MAAIqD,QAAM;IACpC;GACF;GAEAkB,0BAA0BvE,MAAI,EAAEkF,QAAQ4G,SAAS5G,OAAO,CAAC;EAE3D;CACF;AACF;AAEA,MAAMmH,4BAA4BpO,SAAS8D,4BAA4B;AAEvE,MAAauK,oBAAoBrO,SAAS,SAASsO,qBACjDpL,OAC2B;CAC3B,MAAMH,yBAAyBnD,OAAOiD,QAAQoC,QAAQ,CAAC;CACvD,MAAMsJ,eAAetL,0BAA0BC,KAAK;CACpD,MAAM,CAACsL,YAAYC,iBAAiB9O,SAAS;EAAE4O;EAAc/G,YAAY;CAAE,CAAC;CAC5E,IAAIkH,oBAAoBF;CACxB,IAAI,CAACpO,aAAaoO,WAAWD,cAAcA,YAAY,GAAG;EACxDG,oBAAoB;GAClBH;GACA/G,YAAYgH,WAAWhH,aAAa;EACtC;EACAiH,cAAcC,iBAAiB;CACjC;CAKA,OAAOzO,YACLC,QACEwO,kBAAkBlH,YAClB4G,0BAA0B;EAAE,GAAGlL;EAAOH;CAAuB,CAAC,CAChE,CACF;AACF,CAAC"}

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

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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"McpCustomStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpCustomStorage.ts"],"mappings":";;~~cAOa~~,8CAAgB,SAAA,aAAA,MAAA"}
1	+ {"version":3,"file":"McpCustomStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpCustomStorage.ts"],"mappings":";;qBAOa,8CAAgB,SAAA,aAAA,MAAA"}

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

@@ -2,7 +2,7 @@ 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 = {
+export type McpLocalStorageOptions = {
   /** Namespace prefix for keys. Default "aui-mcp". */
   keyPrefix?: string;
   /** Override the underlying Storage. Defaults to globalThis.localStorage. */
@@ -15,9 +15,8 @@ type McpLocalStorageOptions = {
    */
   scopeId?: string;
 };
-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]>;
+export declare const normalizeCustomServerRecords: (value: unknown) => MCPCustomServerRecord[];
+export declare const normalizePersistedAuthState: (value: unknown) => MCPPersistedAuthState | null;
+export declare const McpLocalStorage: import("@assistant-ui/tap").Resource<MCPStorage, [opts?: McpLocalStorageOptions | undefined]>;
 //#endregion
-export { McpLocalStorage, McpLocalStorageOptions, normalizeCustomServerRecords, normalizePersistedAuthState };
 //# sourceMappingURL=McpLocalStorage.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"McpLocalStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"mappings":";;;;~~KAcY~~;;EAEV;;EAEA,UAAU;;;;;;;EAOV;;~~cAiGW~~,+BACX,mBACC;~~cAiFU~~,8BACX,mBACC;~~cAiGU~~,6CAAe,SAAA,aAAA,OAAA"}
1	+ {"version":3,"file":"McpLocalStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"mappings":";;;;YAcY;;EAEV;;EAEA,UAAU;;;;;;;EAOV;;qBAiGW,+BACX,mBACC;qBAiFU,8BACX,mBACC;qBAiGU,6CAAe,SAAA,aAAA,OAAA"}

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

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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"McpMemoryStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpMemoryStorage.ts"],"mappings":";;~~cA6Ba~~,8CAAgB,SAAA"}
1	+ {"version":3,"file":"McpMemoryStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpMemoryStorage.ts"],"mappings":";;qBA6Ba,8CAAgB,SAAA"}

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

@@ -2,7 +2,7 @@ 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 = {
+export type MCPStorage = {
   /**
    * Stable identity of the backing store. Two storages with the same scopeId
    * must read and write the same persisted data. When present, custom servers,
@@ -23,7 +23,6 @@ type MCPStorage = {
   saveAuthState: (serverId: string, state: MCPPersistedAuthState) => Promise<void>;
   clearAuthState: (serverId: string) => Promise<void>;
 };
-type MCPStorageElement = ResourceElement<MCPStorage>;
+export type MCPStorageElement = ResourceElement<MCPStorage>;
 //#endregion
-export { MCPStorage, MCPStorageElement };
 //# sourceMappingURL=types.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/resources/storage/types.ts"],"mappings":";;;;~~KAIY~~;;;;;;;;;;;;;;EAcV;EACA,yBAAyB,QAAQ;EACjC,oBAAoB,SAAS,4BAA4B;EACzD,gBAAgB,qBAAqB,QAAQ;EAC7C,gBACE,kBACA,OAAO,0BACJ;EACL,iBAAiB,qBAAqB;;~~KAG5B~~,oBAAoB,gBAAgB"}
1	+ {"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/resources/storage/types.ts"],"mappings":";;;;YAIY;;;;;;;;;;;;;;EAcV;EACA,yBAAyB,QAAQ;EACjC,oBAAoB,SAAS,4BAA4B;EACzD,gBAAgB,qBAAqB,QAAQ;EAC7C,gBACE,kBACA,OAAO,0BACJ;EACL,iBAAiB,qBAAqB;;YAG5B,oBAAoB,gBAAgB"}

package/dist/resources/validateElicitationContent.d.ts CHANGED Viewed

@@ -3,7 +3,6 @@ type ValidationError = {
   property: string;
   message: string;
 };
-declare const validateElicitationContent: (requestedSchema: unknown, content: Record<string, unknown>) => readonly ValidationError[];
+export declare const validateElicitationContent: (requestedSchema: unknown, content: Record<string, unknown>) => readonly ValidationError[];
 //#endregion
-export { validateElicitationContent };
 //# sourceMappingURL=validateElicitationContent.d.ts.map

package/dist/resources/validateElicitationContent.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validateElicitationContent.d.ts","names":[],"sources":["../../src/resources/validateElicitationContent.ts"],"mappings":";KAAK;EACH;EACA;;cA+BW,6BACX,0BACA,SAAS,qCACC"}
1	+ {"version":3,"file":"validateElicitationContent.d.ts","names":[],"sources":["../../src/resources/validateElicitationContent.ts"],"mappings":";KAAK;EACH;EACA;;qBA+BW,6BACX,0BACA,SAAS,qCACC"}

package/dist/utils/createMcpId.d.ts CHANGED Viewed

@@ -3,7 +3,6 @@
  * Both forms are alphanumeric or hyphenated, so neither can contain the
  * separators `assertValidServerId` reserves.
  */
-declare const createMcpId: () => string;
+export declare const createMcpId: () => string;
 //#endregion
-export { createMcpId };
 //# sourceMappingURL=createMcpId.d.ts.map

package/dist/utils/createMcpId.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createMcpId.d.ts","names":[],"sources":["../../src/utils/createMcpId.ts"],"mappings":";;;;;~~cAMa~~"}
1	+ {"version":3,"file":"createMcpId.d.ts","names":[],"sources":["../../src/utils/createMcpId.ts"],"mappings":";;;;;qBAMa"}

package/dist/utils/invokeMcpCallback.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 //#region src/utils/invokeMcpCallback.d.ts
-declare const invokeMcpCallback: <TArgs extends unknown[]>(name: string, callback: ((...args: TArgs) => void) | undefined, ...args: TArgs) => void;
+export declare const invokeMcpCallback: <TArgs extends unknown[]>(name: string, callback: ((...args: TArgs) => void) | undefined, ...args: TArgs) => void;
 //#endregion
-export { invokeMcpCallback };
 //# sourceMappingURL=invokeMcpCallback.d.ts.map

package/dist/utils/invokeMcpCallback.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"invokeMcpCallback.d.ts","names":[],"sources":["../../src/utils/invokeMcpCallback.ts"],"mappings":";~~cAEa~~,oBAAqB,yBAChC,cACA,eAAe,MAAM,gCAClB,MAAM"}
1	+ {"version":3,"file":"invokeMcpCallback.d.ts","names":[],"sources":["../../src/utils/invokeMcpCallback.ts"],"mappings":";qBAEa,oBAAqB,yBAChC,cACA,eAAe,MAAM,gCAClB,MAAM"}

package/dist/utils/serverId.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 //#region src/utils/serverId.d.ts
-declare function assertValidServerId(id: string): void;
-declare function assertUniqueServerIds(ids: Iterable<string>): void;
+export declare function assertValidServerId(id: string): void;
+export declare function assertUniqueServerIds(ids: Iterable<string>): void;
 //#endregion
-export { assertUniqueServerIds, assertValidServerId };
 //# sourceMappingURL=serverId.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"serverId.d.ts","names":[],"sources":["../../src/utils/serverId.ts"],"mappings":";~~iBAIgB~~,oBAAoB;~~iBAgBpB~~,sBAAsB,KAAK"}
1	+ {"version":3,"file":"serverId.d.ts","names":[],"sources":["../../src/utils/serverId.ts"],"mappings":";wBAIgB,oBAAoB;wBAgBpB,sBAAsB,KAAK"}

package/dist/utils/serverUrl.d.ts CHANGED Viewed

@@ -1,8 +1,7 @@
 import { MCPPersistedAuthState } from "../auth/types.js";
 //#region src/utils/serverUrl.d.ts
-declare const normalizeMcpServerUrl: (serverUrl: string) => string;
-declare const isAuthStateForServerUrl: (state: MCPPersistedAuthState | null, serverUrl: string) => boolean;
-declare const hasPersistedCredentials: (state: MCPPersistedAuthState | null) => boolean;
+export declare const normalizeMcpServerUrl: (serverUrl: string) => string;
+export declare const isAuthStateForServerUrl: (state: MCPPersistedAuthState | null, serverUrl: string) => boolean;
+export declare const hasPersistedCredentials: (state: MCPPersistedAuthState | null) => boolean;
 //#endregion
-export { hasPersistedCredentials, isAuthStateForServerUrl, normalizeMcpServerUrl };
 //# sourceMappingURL=serverUrl.d.ts.map

package/dist/utils/serverUrl.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serverUrl.d.ts","names":[],"sources":["../../src/utils/serverUrl.ts"],"mappings":";;~~cAEa~~,wBAAyB;~~cAGzB~~,0BACX,OAAO,8BACP;~~cAaW~~,0BACX,OAAO"}
1	+ {"version":3,"file":"serverUrl.d.ts","names":[],"sources":["../../src/utils/serverUrl.ts"],"mappings":";;qBAEa,wBAAyB;qBAGzB,0BACX,OAAO,8BACP;qBAaW,0BACX,OAAO"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-mcp",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "MCP server configuration and connection primitives for @assistant-ui",
   "keywords": [
     "mcp",
@@ -27,13 +27,13 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.19",
-    "@assistant-ui/store": "^0.3.13",
-    "@assistant-ui/tap": "^0.9.17",
+    "@assistant-ui/core": "^0.3.20",
+    "@assistant-ui/store": "^0.3.14",
+    "@assistant-ui/tap": "^0.9.18",
     "@modelcontextprotocol/client": "^2.0.0",
     "@modelcontextprotocol/core": "^2.0.0",
     "@radix-ui/react-primitive": "^2.1.10",
-    "assistant-stream": "^0.3.43"
+    "assistant-stream": "^0.3.44"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -45,13 +45,13 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.27",
-    "@testing-library/dom": "^10.4.1",
+    "@assistant-ui/x-buildutils": "0.0.28",
+    "@testing-library/dom": "^10.4.2",
     "@testing-library/react": "^16.3.3",
-    "@types/react": "^19.2.18",
+    "@types/react": "^19.3.0",
     "jsdom": "^30.0.1",
-    "react": "^19.2.8",
-    "vitest": "^5.0.0"
+    "react": "^19.3.0",
+    "vitest": "^5.0.1"
   },
   "publishConfig": {
     "access": "public",
@@ -69,6 +69,7 @@
   "scripts": {
     "build": "aui-build",
     "test": "vitest run",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
     "test:watch": "vitest"
   }
 }

package/src/hooks/useMcpOAuthCallback.test.ts CHANGED Viewed

@@ -2,6 +2,7 @@
 import {
   createElement,
+  StrictMode,
   Suspense,
   startTransition,
   type PropsWithChildren,
@@ -171,6 +172,58 @@ describe("useMcpOAuthCallback", () => {
     expect(onCompleteB).not.toHaveBeenCalled();
     expect(onCompleteA).toHaveBeenCalledWith("docs");
   });
+  it("keeps the newer callback's result when an older attempt settles late", async () => {
+    const secondUrl =
+      "https://app.example.com/oauth/callback?state=aui-mcp%3AZG9jcw.second";
+    let rejectFirst!: (err: Error) => void;
+    mocks.completeAuth.mockReturnValueOnce(
+      new Promise<void>((_resolve, reject) => {
+        rejectFirst = reject;
+      }),
+    );
+    mocks.completeAuth.mockResolvedValueOnce();
+    const onComplete = vi.fn();
+    const onError = vi.fn();
+    const { result, rerender } = renderHook(
+      ({ url }) => useMcpOAuthCallback({ url, onComplete, onError }),
+      { initialProps: { url: callbackUrl } },
+    );
+    await waitFor(() => expect(mocks.completeAuth).toHaveBeenCalledOnce());
+    rerender({ url: secondUrl });
+    await waitFor(() => expect(result.current.status).toBe("done"));
+    // The first attempt only fails once the second has already succeeded.
+    await act(async () => {
+      rejectFirst(new Error("authorization code expired"));
+      await Promise.resolve();
+    });
+    expect(result.current).toMatchObject({ status: "done", error: null });
+    expect(onError).not.toHaveBeenCalled();
+    expect(onComplete).toHaveBeenCalledExactlyOnceWith("docs");
+  });
+  // Strict Mode tears the effect down and remounts it without starting a new
+  // attempt, so the one already running must still publish its result.
+  it("publishes the result under Strict Mode's remount", async () => {
+    mocks.completeAuth.mockResolvedValueOnce();
+    const onComplete = vi.fn();
+    const { result } = renderHook(
+      () => useMcpOAuthCallback({ url: callbackUrl, onComplete }),
+      {
+        wrapper: ({ children }: PropsWithChildren) =>
+          createElement(StrictMode, null, children),
+      },
+    );
+    await waitFor(() => expect(result.current.status).toBe("done"));
+    expect(mocks.completeAuth).toHaveBeenCalledOnce();
+    expect(onComplete).toHaveBeenCalledExactlyOnceWith("docs");
+  });
 });
 describe("createMcpOAuthCallbackError", () => {

package/src/hooks/useMcpOAuthCallback.tsx CHANGED Viewed

@@ -62,6 +62,15 @@ export function useMcpOAuthCallback(
     if (startedRef.current === url) return;
     startedRef.current = url;
+    // A callback page can be handed a second login URL while the first
+    // completeAuth is still in flight. That attempt keeps running, so it
+    // publishes only while its own URL is still the one being attempted;
+    // otherwise an older failure would overwrite the newer attempt's success.
+    // The check is against `startedRef` rather than a teardown flag so that
+    // Strict Mode's unmount-remount, which starts no new attempt, still
+    // publishes the result of the one already running.
+    const superseded = () => startedRef.current !== url;
     void (async () => {
       let serverId: string | null = null;
       try {
@@ -72,10 +81,13 @@ export function useMcpOAuthCallback(
         if (!serverId) {
           throw new Error("state was not created by assistant-ui MCP");
         }
+        if (superseded()) return;
         setResult({ status: "running", serverId, error: null });
         await aui.mcp.server({ id: serverId }).completeAuth(url);
+        if (superseded()) return;
         setResult({ status: "done", serverId, error: null });
       } catch (err) {
+        if (superseded()) return;
         const error = createMcpOAuthCallbackError(err, serverId);
         setResult({ status: "error", serverId, error });
         invokeMcpCallback("onError", optsRef.current.onError, error);

package/src/index.ts CHANGED Viewed

@@ -2,7 +2,8 @@
 import "./mcp-scope";
 // Resource — the entry point. Mount via:
-//   useAui({ mcp: McpManagerResource({ connectors }) })
+//   const config = AuiConfig({ mcp: McpManagerResource({ connectors }) })
+//   <AssistantRuntimeProvider runtime={runtime} config={config}>…</AssistantRuntimeProvider>
 export {
   McpManagerResource,
   type McpManagerResourceProps,

package/src/primitives/addForm/McpAddFormAccessibility.test.tsx CHANGED Viewed

@@ -22,6 +22,8 @@ import { McpAddFormPrimitiveNameField as NameField } from "./McpAddFormNameField
 import { McpAddFormPrimitiveUrlField as UrlField } from "./McpAddFormUrlField";
 import { McpAddFormPrimitiveAuthSelect as AuthSelect } from "./McpAddFormAuthSelect";
 import { McpAddFormPrimitiveAuthFields as AuthFields } from "./McpAddFormAuthFields";
+import { McpAddFormPrimitiveBearerTokenField as BearerTokenField } from "./McpAddFormBearerTokenField";
+import { McpAddFormPrimitiveScopesField as ScopesField } from "./McpAddFormScopesField";
 import { McpAddFormPrimitiveError as ErrorMessage } from "./McpAddFormError";
 const Form = ({ name = "Add server" }: { name?: string }) => (
@@ -122,6 +124,10 @@ describe("MCP add form accessibility", () => {
           Authentication method
           <AuthSelect />
         </label>
+        <label>
+          Permissions
+          <ScopesField />
+        </label>
       </Root>,
     );
     expect(screen.getByRole("textbox", { name: "Server name" })).toBeTruthy();
@@ -131,6 +137,7 @@ describe("MCP add form accessibility", () => {
     expect(
       screen.getByRole("combobox", { name: "Authentication method" }),
     ).toBeTruthy();
+    expect(screen.getByRole("textbox", { name: "Permissions" })).toBeTruthy();
   });
   it("preserves field labels and only marks the field with an error", () => {
     render(<Form />);
@@ -234,6 +241,48 @@ describe("MCP add form accessibility", () => {
     expect(field.getAttribute("aria-describedby")).toBe("hint");
   });
+  it("associates a missing token error with a custom bearer token field", () => {
+    render(
+      <Root aria-label="Add server">
+        <NameField aria-label="Name" />
+        <AuthSelect aria-label="Auth" />
+        <AuthFields>
+          {({ authType }) =>
+            authType === "bearer" ? (
+              <>
+                <label htmlFor="api-key">API key</label>
+                <BearerTokenField
+                  id="api-key"
+                  aria-describedby="api-key-hint"
+                />
+                <p id="api-key-hint">Paste the key from your dashboard.</p>
+              </>
+            ) : null
+          }
+        </AuthFields>
+        <ErrorMessage />
+      </Root>,
+    );
+    fireEvent.change(screen.getByRole("textbox", { name: "Name" }), {
+      target: { value: "Docs" },
+    });
+    fireEvent.change(screen.getByRole("combobox", { name: "Auth" }), {
+      target: { value: "bearer" },
+    });
+    const field = screen.getByLabelText("API key");
+    fireEvent.submit(screen.getByRole("form"));
+    const error = screen.getByRole("alert");
+    expect(error.textContent).toBe("Bearer token is required");
+    expect(field.getAttribute("aria-invalid")).toBe("true");
+    expect(field.getAttribute("aria-describedby")).toBe(
+      `api-key-hint ${error.id}`,
+    );
+    fireEvent.change(field, { target: { value: "secret" } });
+    expect(screen.queryByRole("alert")).toBeNull();
+    expect(field.hasAttribute("aria-invalid")).toBe(false);
+    expect(field.getAttribute("aria-describedby")).toBe("api-key-hint");
+  });
   it("keeps URL help text associated when validation errors appear and clear", () => {
     render(
       <Root aria-label="Add server">