@assistant-ui/react-mcp 0.1.3 → 0.1.5

package/dist/resources/McpServerResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","ClientOutput","Client","StreamableHTTPClientTransport","UnauthorizedError","ClientOptions","ElicitRequest","ElicitResult","StreamableHTTPClientTransportOptions","createOAuthProvider","buildHeaders","assertValidServerId","validateElicitationContent","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPElicitation","MCPElicitationResponse","MCPServerKind","MCPServerState","MCPToolInfo","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","cache","defaultTtlMs","elicitation","onRemove","Promise","useMcpServerResource","props","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","pendingElicitations","setPendingElicitations","clientRef","transportRef","pendingTransportRef","transportCloseQueueRef","resolve","connectionGenerationRef","elicitationResolversRef","Map","result","signal","AbortSignal","onAbort","requestedSchema","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","current","then","all","map","closePendingTransport","resolvePendingElicitation","entry","get","delete","removeEventListener","filter","setPendingElicitationError","error","NonNullable","has","cancelPendingElicitations","action","closeTransports","pendingTransport","activeTransport","Set","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","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","crypto","randomUUID","Math","random","slice","set","aborted","addEventListener","once","connect","synced","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","code","searchParams","finishAuth","connected","tryAutoConnect","token","tokens","previousDisposal","pendingDisposal","queueMicrotask","state","getState","disconnect","remove","clearAuthState","callTool","args","arguments","Record","listResources","readResource","uri","completeAuth","answerElicitation","response","property","content","isArray","errors","properties","length","join","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 {\n  Client,\n  StreamableHTTPClientTransport,\n  UnauthorizedError,\n  type ClientOptions,\n  type ElicitRequest,\n  type ElicitResult,\n  type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/client\";\nimport { createOAuthProvider } from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\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\";\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\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  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 transportCloseQueueRef = useRef(Promise.resolve());\n  const connectionGenerationRef = useRef(0);\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 = 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 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 closeTransports = async () => {\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    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 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 =\n              typeof crypto !== \"undefined\" && \"randomUUID\" in crypto\n                ? crypto.randomUUID()\n                : `mcp-${Date.now()}-${Math.random().toString(36).slice(2)}`;\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 generation = ++connectionGenerationRef.current;\n    cancelPendingElicitations();\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      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      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    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\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","UnauthorizedError","ClientOptions","ElicitRequest","ElicitResult","StreamableHTTPClientTransportOptions","createOAuthProvider","buildHeaders","assertValidServerId","validateElicitationContent","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPElicitation","MCPElicitationResponse","MCPServerKind","MCPServerState","MCPToolInfo","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","cache","defaultTtlMs","elicitation","onRemove","Promise","useMcpServerResource","props","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","pendingElicitations","setPendingElicitations","clientRef","transportRef","pendingTransportRef","transportCloseQueueRef","resolve","connectionGenerationRef","elicitationResolversRef","Map","result","signal","AbortSignal","onAbort","requestedSchema","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","current","then","all","map","closePendingTransport","resolvePendingElicitation","entry","get","delete","removeEventListener","filter","setPendingElicitationError","error","NonNullable","has","cancelPendingElicitations","action","closeTransports","pendingTransport","activeTransport","Set","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","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","crypto","randomUUID","Math","random","slice","set","aborted","addEventListener","once","connect","synced","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","code","searchParams","finishAuth","connected","tryAutoConnect","token","tokens","previousDisposal","pendingDisposal","queueMicrotask","state","getState","disconnect","remove","clearAuthState","callTool","args","arguments","Record","listResources","readResource","uri","completeAuth","answerElicitation","response","property","content","isArray","errors","properties","length","join","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 {\n  Client,\n  StreamableHTTPClientTransport,\n  UnauthorizedError,\n  type ClientOptions,\n  type ElicitRequest,\n  type ElicitResult,\n  type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/client\";\nimport { createOAuthProvider } from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\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\";\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\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  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 transportCloseQueueRef = useRef(Promise.resolve());\n  const connectionGenerationRef = useRef(0);\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 = 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 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 closeTransports = async () => {\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    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 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 =\n              typeof crypto !== \"undefined\" && \"randomUUID\" in crypto\n                ? crypto.randomUUID()\n                : `mcp-${Date.now()}-${Math.random().toString(36).slice(2)}`;\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 generation = ++connectionGenerationRef.current;\n    cancelPendingElicitations();\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      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      await doDisconnect();\n      try {\n        await props.storage.clearAuthState(props.id);\n        await props.onRemove();\n      } catch (err) {\n        setLastError({\n          message: err instanceof Error ? err.message : String(err),\n        });\n        throw err;\n      }\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\nexport const McpServerResource = resource(useMcpServerResource);\n"],"mappings":";;;;;;;;AA2CA,MAAM0C,wBACJC,UAC8B;CAC9B3B,oBAAoB2B,MAAMhB,EAAE;CAC5B,MAAM,CAACiB,iBAAiBC,sBACtB7C,SAA6B,cAAc;CAC7C,MAAM,CAAC8C,OAAOC,YAAY/C,SAAwB,CAAA,CAAE;CACpD,MAAM,CAACgD,WAAWC,gBAAgBjD,SAAqC,IAAI;CAC3E,MAAM,CAACmD,kBAAkBC,uBAAuBpD,SAAwB,IAAI;CAC5E,MAAM,CAACqD,qBAAqBC,0BAA0BtD,SAEpD,CAAA,CAAE;CAEJ,MAAMuD,YAAYtD,OAAsB,IAAI;CAC5C,MAAMuD,eAAevD,OAA6C,IAAI;CACtE,MAAMwD,sBAAsBxD,OAC1B,IACF;CACA,MAAMyD,yBAAyBzD,OAAOwC,QAAQkB,QAAQ,CAAC;CACvD,MAAMC,0BAA0B3D,OAAO,CAAC;CACxC,MAAM4D,0BAA0B5D,uBAC9B,IAAI6D,IAQF,CACJ;CACA,MAAMM,qBAAqBnE,OAAsC,IAAI;CACrE,MAAMqE,aAAarE,OAAO,IAAI;CAE9B,MAAMsE,uBAAuB,OAC3BC,cACkB;EAClB,IAAI;GACF,MAAMA,UAAUC,MAAM;EACxB,QAAQ,CACN;CAEJ;CAEA,MAAMC,yBACJC,eACkB;EAClB,MAAMC,OAAOlB,uBAAuBmB,QAAQC,KAAK,YAAY;GAC3D,MAAMrC,QAAQsC,IAAIJ,WAAWK,IAAIT,oBAAoB,CAAC;EACxD,CAAC;EACDb,uBAAuBmB,UAAUD;EACjC,OAAOA;CACT;CAEA,MAAMK,wBAAwB,YAAY;EACxC,MAAMT,cAAYf,oBAAoBoB;EACtCpB,oBAAoBoB,UAAU;EAC9B,MAAMH,sBAAsBF,cAAY,CAACA,WAAS,IAAI,CAAA,CAAE;CAC1D;CAEA,MAAMU,6BAA6BvD,IAAYoC,WAAyB;EACtE,MAAMoB,QAAQtB,wBAAwBgB,QAAQO,IAAIzD,EAAE;EACpD,IAAI,CAACwD,OAAO,OAAO;EACnBtB,wBAAwBgB,QAAQQ,OAAO1D,EAAE;EACzCwD,MAAMnB,OAAOsB,oBAAoB,SAASH,MAAMjB,OAAO;EACvDZ,wBAAwBuB,YACtBA,QAAQU,QAAQhD,gBAAgBA,YAAYZ,OAAOA,EAAE,CACvD;EACAwD,MAAMxB,QAAQI,MAAM;EACpB,OAAO;CACT;CAEA,MAAMyB,8BACJ7D,MACA8D,UACG;EACH,IAAI,CAAC5B,wBAAwBgB,QAAQc,IAAIhE,IAAE,GAAG,OAAO;EACrD2B,wBAAwBuB,cACtBA,UAAQG,KAAKzC,kBACXA,cAAYZ,OAAOA,OAAK;GAAE,GAAGY;GAAakD;EAAM,IAAIlD,aACtD,CACF;EACA,OAAO;CACT;CAEA,MAAMqD,kCAAkC;EACtC,KAAK,MAAM,CAACjE,SAAOkC,wBAAwBgB,SACzCK,0BAA0BvD,MAAI,EAAEkE,QAAQ,SAAS,CAAC;CAEtD;CAEA,MAAMC,kBAAkB,YAAY;EAClCF,0BAA0B;EAC1B,MAAMG,mBAAmBtC,oBAAoBoB;EAC7C,MAAMmB,kBAAkBxC,aAAaqB;EACrCpB,oBAAoBoB,UAAU;EAC9BrB,aAAaqB,UAAU;EACvBtB,UAAUsB,UAAU;EAEpB,MAAMF,eAAa,IAAIsB,IACrB,CAACF,kBAAkBC,eAAe,CAAC,CAACT,QACjCf,gBACCA,gBAAc,IAClB,CACF;EACA,MAAME,sBAAsB,CAAC,GAAGC,YAAU,CAAC;CAC7C;CAEA,MAAMuB,uBAAuBC,eAC3B7B,WAAWO,WAAWsB,eAAevC,wBAAwBiB;CAE/D,MAAMuB,8BAA8BC,UAClC,IAAIC,MACF,eAAe3D,MAAMhB,GAAE,qDACvB0E,UAAUE,KAAAA,IAAYA,KAAAA,IAAY,EAAEF,MAAM,CAC5C;CAEF,MAAMG,wBAAwBpG,eAC5B,OACEqG,SACAE,OACAC,cACe;EACf,MAAMC,YAAYlE,MAAMP;EACxB,IAAIyE,cAAcN,KAAAA,GAAW,OAAO,MAAME;EAC1C,MAAMK,cAAcD,aAAaE,KAAKC,IAAI,IAAIJ;EAC9C,MAAMK,qCACJ,IAAIX,MACF,eAAe3D,MAAMhB,GAAE,oBAAqBgF,MAAK,SAAUE,UAAS,IACtE;EACF,IAAIC,eAAe,GAAG,MAAMG,aAAa;EAEzC,IAAIC;EACJ,IAAI;GACF,OAAO,MAAMzE,QAAQ4E,KAAK,CACxBZ,SACA,IAAIhE,SAAgB6E,GAAGC,WAAW;IAChCL,UAAUE,iBAAiBG,OAAON,aAAa,CAAC,GAAGH,WAAW;GAChE,CAAC,CAAC,CACH;EACH,UAAU;GACR,IAAII,YAAYX,KAAAA,GAAWiB,aAAaN,OAAO;EACjD;CACF,CACF;CAEA,MAAMO,iBAAiBrH,eACrB,YAAoD;EAClD,IAAIuC,MAAMX,KAAK0F,SAAS,SAAS;GAC/B,MAAMC,eAAe7G,oBAAoB;IACvC8G,UAAUjF,MAAMhB;IAChBkG,QAAQlF,MAAMX;IACdC,SAASU,MAAMV;IACfC,aAAaS,MAAMT;IACnB4F,qBAAqBhG,QAAQsB,oBAAoBtB,IAAIiG,SAAS,CAAC;GACjE,CAAC;GACD,OAAO,IAAIvH,8BAA8B,IAAIwH,IAAIrF,MAAMb,GAAG,GAAG,EAC3D6F,aACF,CAAC;EACH;EACA,IAAIhF,MAAMX,KAAK0F,SAAS,UAAU;GAChC,MAAMO,YAAY,MAAMtF,MAAMV,QAAQiG,cAAcvF,MAAMhB,EAAE;GAC5D,MAAMwG,UAAUpH,aAAa4B,MAAMX,MAAMiG,SAAS;GAClD,MAAMG,gBAAsD,CAAC;GAC7D,IAAID,SAASC,cAAcC,cAAc,EAAEF,QAAQ;GACnD,OAAO,IAAI3H,8BACT,IAAIwH,IAAIrF,MAAMb,GAAG,GACjBsG,aACF;EACF;EACA,OAAO,IAAI5H,8BAA8B,IAAIwH,IAAIrF,MAAMb,GAAG,CAAC;CAC7D,CACF;CAEA,MAAMwG,iBAAiBlI,gBACpBmI,SAMK;EACJxF,SACEwF,KAAKzF,MAAMkC,KAAK2D,MAAM;GACpB,MAAMC,OAAoB;IACxB/G,MAAM8G,EAAE9G;IACR6G,aAAaC,EAAED;GACjB;GACA,IAAIC,EAAEF,gBAAgBlC,KAAAA,GAAWqC,KAAKH,cAAcE,EAAEF;GACtD,OAAOG;EACT,CAAC,CACH;CACF,CACF;CAEA,MAAMC,YAAYzI,eAChB,OACE0I,QACA3C,cACA4C,YACqB;EACrB,MAAMC,cAAcF,OAAOG,UAAU;EACrC,MAAMV,SACJQ,SAASnC,cAAcL,KAAAA,IACnB,MAAMyC,cACN,MAAMxC,sBACJwC,aACA,iBACAD,QAAQnC,SACV;EACN,IAAI,CAACV,oBAAoBC,YAAU,GAAG,OAAO;EAC7CmC,eAAeC,MAAI;EACnB,OAAO;CACT,CACF;CAEA,MAAMW,kBAAkB9I,eACtB,OACEoE,aACA2B,iBACqB;EACrB,MAAMgD,gBAA+B;GACnC,GAAIxG,MAAMJ,gBAAgB,QACtB,CAAC,IACD,EAAE6G,cAAc,EAAE7G,aAAa,CAAC,EAAE,EAAE;GACxC8G,aAAa,EACXvG,OAAO;IACLwG,aAAa;IACbC,YAAY;IACZC,YAAY/D,SAAOgE,UAAU;KAC3B,IAAI,CAACvD,oBAAoBC,YAAU,GAAG;KACtC,IAAIV,YAAU,MAAM;MAClBxC,aAAa,EAAEC,SAASuC,QAAMvC,QAAQ,CAAC;MACvC;KACF;KACA,IAAIuG,UAAU,MAAM;KACpBxG,aAAa,IAAI;KACjBqF,eAAe,EAAExF,OAAO2G,MAAM,CAAC;IACjC;GACF,EACF;EACF;EACA,IAAI9G,MAAMN,OAAOC,iBAAiBiE,KAAAA,GAChC4C,cAAcO,oBAAoB/G,MAAMN,MAAMC;EAEhD,MAAMwG,WAAS,IAAIvI,OACjB;GACEsB,MAAM;GACN8H,SAAS;EACX,GACAR,aACF;EACA,IAAIxG,MAAMJ,gBAAgB,OACxBuG,SAAOc,kBACL,uBACCC,SAAwBC,YAAmC;GAC1D,IAAI,CAAC5D,oBAAoBC,YAAU,GACjC,OAAO1D,QAAQkB,QAAQ,EAAEkC,QAAQ,SAAS,CAAC;GAE7C,IAAI,EAAE,qBAAqBgE,QAAQE,SACjC,OAAOtH,QAAQkB,QAAQ,EAAEkC,QAAQ,SAAS,CAAC;GAE7C,MAAM,EAAE3C,SAASiB,oBAAoB0F,QAAQE;GAE7C,MAAMpI,OACJ,OAAOqI,WAAW,eAAe,gBAAgBA,SAC7CA,OAAOC,WAAW,IAClB,OAAOlD,KAAKC,IAAI,EAAC,GAAIkD,KAAKC,OAAO,CAAC,CAACpC,SAAS,EAAE,CAAC,CAACqC,MAAM,CAAC;GAC7D,MAAM3D,YAAU,IAAIhE,SAAuBkB,YAAY;IACrD,MAAMO,gBAAgB;KACpBgB,0BAA0BvD,MAAI,EAAEkE,QAAQ,SAAS,CAAC;IACpD;IACAhC,wBAAwBgB,QAAQwF,IAAI1I,MAAI;KACtCgC;KACAK,QAAQ8F,QAAQ9F;KAChBE;KACAC;IACF,CAAC;GACH,CAAC;GACDb,wBAAwBuB,cAAY,CAClC,GAAGA,WACH;IACElD,IAAAA;IACAuB;IACAiB;GACF,CAAC,CACF;GACD,MAAMgB,UAAQtB,wBAAwBgB,QAAQO,IAAIzD,IAAE;GACpD,IAAIwD,SACF,IAAI2E,QAAQ9F,OAAOsG,SACjBnF,QAAMjB,QAAQ;QAEd4F,QAAQ9F,OAAOuG,iBAAiB,SAASpF,QAAMjB,SAAS,EACtDsG,MAAM,KACR,CAAC;GAGL,OAAO/D;EACT,CACF;EAEF,MAAMG,cAAYG,KAAKC,IAAI;EAC3B,MAAMR,sBACJsC,SAAO2B,QAAQjG,WAAS,GACxB,cACAoC,WACF;EACA,IAAI,CAACV,oBAAoBC,YAAU,GAAG,OAAO;EAM7C,IAAI,CAACuE,MADgB7B,UAAUC,UAAQ3C,cAAY,EAAES,WAAAA,YAAU,CAAC,GACnD,OAAO;EAEpBnD,oBAAoBoB,UAAU;EAC9BtB,UAAUsB,UAAUiE;EACpBtF,aAAaqB,UAAUL;EACvB3B,mBAAmB,WAAW;EAC9B,OAAO;CACT,CACF;CAEA,MAAM8H,YAAYvK,eAAe,YAAY;EAC3C,MAAM+F,eAAa,EAAEvC,wBAAwBiB;EAE7C,MAAMiB,gBAAgB;EACtB,IAAI,CAACI,oBAAoBC,YAAU,GAAG;EAEtCtD,mBAAmB,YAAY;EAC/BI,aAAa,IAAI;EACjBG,oBAAoB,IAAI;EAGxBL,SAAS,CAAA,CAAE;EACX,IAAIyB,cAAkD;EACtD,IAAI;GACFA,cAAY,MAAMiD,eAAe;GACjC,IAAI,CAACvB,oBAAoBC,YAAU,GAAG;IACpC,MAAMzB,sBAAsB,CAACF,WAAS,CAAC;IACvC;GACF;GACAf,oBAAoBoB,UAAUL;GAI9B,MAAM0E,gBAAgB1E,aAAW2B,YAAU;EAC7C,SAASyE,KAAK;GACZ,IAAI,CAAC1E,oBAAoBC,YAAU,GAAG;GAEtC,IAAIyE,eAAenK,mBAAmB;IAIpCgD,oBAAoBoB,UAAU;IAC9BrB,aAAaqB,UAAUL;IACvB3B,mBAAmB,cAAc;GACnC,OAAO;IACL+C,0BAA0B;IAC1B,IAAIpB,aAAW;KACbf,oBAAoBoB,UAAU;KAC9B,MAAMH,sBAAsB,CAACF,WAAS,CAAC;IACzC;IACAvB,aAAa,EACXC,SAAS0H,eAAetE,QAAQsE,IAAI1H,UAAU2H,OAAOD,GAAG,EAC1D,CAAC;IACD/H,mBAAmB,OAAO;GAC5B;EACF;CACF,CAAC;CAED,MAAMiI,eAAe1K,eAAe,YAAY;EAC9CwD,wBAAwBiB,WAAW;EACnC9B,SAAS,CAAA,CAAE;EACXK,oBAAoB,IAAI;EACxBP,mBAAmB,cAAc;EACjC,MAAMiD,gBAAgB;CACxB,CAAC;CAED,MAAMiF,iBAAiB3K,eAAe,OAAO4K,gBAAwB;EACnE,MAAM7E,eAAa,EAAEvC,wBAAwBiB;EAC7Ce,0BAA0B;EAC1B,MAAMX,sBAAsB;EAC5B,IAAI,CAACiB,oBAAoBC,YAAU,GAAG,MAAMC,2BAA2B;EAEvEvD,mBAAmB,aAAa;EAChCI,aAAa,IAAI;EACjB,IAAI;GAEF,MAAMgI,OAAOnJ,IADGkG,IAAIgD,WACPlJ,CAAG,CAACoJ,aAAa9F,IAAI,MAAM;GACxC,IAAI,CAAC6F,MAAM,MAAM,IAAI3E,MAAM,4CAA4C;GACvE,IAAI9B,cAAYhB,aAAaqB;GAC7B,IAAI,CAACL,aAAW;IACdA,cAAY,MAAMiD,eAAe;IACjC,IAAI,CAACvB,oBAAoBC,YAAU,GAAG;KACpC,MAAMzB,sBAAsB,CAACF,WAAS,CAAC;KACvC,MAAM4B,2BAA2B;IACnC;GACF;GACA5C,aAAaqB,UAAU;GACvBtB,UAAUsB,UAAU;GACpBpB,oBAAoBoB,UAAUL;GAC9B,MAAMA,YAAU2G,WAAWF,IAAI;GAC/B,IAAI,CAAC/E,oBAAoBC,YAAU,GAAG,MAAMC,2BAA2B;GACvEhD,oBAAoB,IAAI;GAExB,IAAI,CAACgI,MADmBlC,gBAAgB1E,aAAW2B,YAAU,GAC7C,MAAMC,2BAA2B;EACnD,SAASwE,OAAK;GACZ,MAAMnF,UAAQmF,iBAAetE,QAAQsE,QAAM,IAAItE,MAAMuE,OAAOD,KAAG,CAAC;GAChE,IAAI,CAAC1E,oBAAoBC,YAAU,GACjC,MAAMC,2BAA2BX,OAAK;GAExC,MAAMK,gBAAgB;GACtB7C,aAAa,EACXC,SAASuC,QAAMvC,QACjB,CAAC;GACDL,mBAAmB,OAAO;GAC1B,MAAM4C;EACR;CACF,CAAC;CAED,MAAM4F,iBAAiBjL,eACrB,OAAO4D,WAAmC;EACxC,IAAI,CAACrB,MAAMR,aAAa;EACxB,IAAIQ,MAAMX,KAAK0F,SAAS,QAAQ;GAC9B,UAAe;GACf;EACF;EAEA,IAAI/E,MAAMX,KAAK0F,SAAS,YAAY/E,MAAMX,KAAKsJ,OAAO;GACpD,UAAe;GACf;EACF;EACA,MAAMrD,cAAY,MAAMtF,MAAMV,QAAQiG,cAAcvF,MAAMhB,EAAE;EAC5D,IAAIqC,OAAOK,WAAW;EACtB,IAAI1B,MAAMX,KAAK0F,SAAS,SAClB;OAAA,CAACO,aAAWsD,QAAQ;EAAA,OACnB,IAAI,CAACtD,aAAWqD,OACrB;EAEF,UAAe;CACjB,CACF;CAGApL,gBAAgB;EACd,MAAMsL,mBAAmBpH,mBAAmBS;EAC5C,IAAI2G,kBAAkBA,iBAAiBnH,YAAY;EACnD,MAAMoH,kBAAkB,EAAEpH,WAAW,MAAM;EAC3CD,mBAAmBS,UAAU4G;EAC7BnH,WAAWO,UAAU;EACrB,MAAMb,WAAS,EAAEK,WAAW,MAAM;EAClC,eAAoBL,QAAM;EAC1B,aAAa;GACXM,WAAWO,UAAU;GACrBb,SAAOK,YAAY;GAEnBqH,qBAAqB;IACnB,IAAID,gBAAgBpH,WAAW;IAC/BT,wBAAwBiB,WAAW;IACnC,gBAAqB;GACvB,CAAC;EACH;CACF,GAAG,CAAA,CAAE;CAEL,MAAM8G,QAAQxL,eACL;EACLwB,IAAIgB,MAAMhB;EACVC,MAAMe,MAAMf;EACZC,MAAMc,MAAMd;EACZC,KAAKa,MAAMb;EACXC,MAAMY,MAAMZ;EACZa;EACAI;EACAF;EACAK;EACAE;CACF,IACA;EACEV,MAAMhB;EACNgB,MAAMf;EACNe,MAAMd;EACNc,MAAMb;EACNa,MAAMZ;EACNa;EACAI;EACAF;EACAK;EACAE;CAAmB,CAEvB;CAEA,OAAO;EACLuI,gBAAgBD;EAChBlB,SAASE;EACTkB,YAAYf;EACZgB,QAAQ,YAAY;GAClB,MAAMhB,aAAa;GACnB,IAAI;IACF,MAAMnI,MAAMV,QAAQ8J,eAAepJ,MAAMhB,EAAE;IAC3C,MAAMgB,MAAMH,SAAS;GACvB,SAASoI,OAAK;IACZ3H,aAAa,EACXC,SAAS0H,iBAAetE,QAAQsE,MAAI1H,UAAU2H,OAAOD,KAAG,EAC1D,CAAC;IACD,MAAMA;GACR;EACF;EACAoB,UAAU,OAAOnK,MAAMoK,SAAS;GAC9B,MAAMnD,WAASvF,UAAUsB;GACzB,IAAI,CAACiE,UACH,MAAM,IAAIxC,MAAM,eAAe3D,MAAMhB,GAAE,mBAAoB;GAE7D,OAAO,MAAMmH,SAAOkD,SAAS;IAC3BnK;IACAqK,WAAWD;GACb,CAAC;EACH;EACAG,eAAe,OAAOrC,WAAW;GAC/B,MAAMjB,WAASvF,UAAUsB;GACzB,IAAI,CAACiE,UACH,MAAM,IAAIxC,MAAM,eAAe3D,MAAMhB,GAAE,mBAAoB;GAE7D,OAAO,MAAMmH,SAAOsD,cAAcrC,MAAM;EAC1C;EACAsC,cAAc,OAAOC,QAAQ;GAC3B,MAAMxD,WAASvF,UAAUsB;GACzB,IAAI,CAACiE,UACH,MAAM,IAAIxC,MAAM,eAAe3D,MAAMhB,GAAE,mBAAoB;GAE7D,OAAO,MAAMmH,SAAOuD,aAAa,EAAEC,IAAI,CAAC;EAC1C;EACAC,cAAcxB;EACdyB,oBACE7K,MACA8K,aACiE;GACjE,IAAIA,SAAS5G,WAAW,UAAU;IAChC,MAAMV,UAAQtB,wBAAwBgB,QAAQO,IAAIzD,IAAE;IACpD,IAAI,CAACwD,SAAO;IAEZ,IACE,OAAOsH,SAASE,YAAY,YAC5BF,SAASE,YAAY,QACrBnE,MAAMoE,QAAQH,SAASE,OAAO,GAC9B;KACA,MAAME,SAAS,CACb;MACEH,UAAU;MACVxJ,SAAS;KACX,CAAC;KAEHsC,2BAA2B7D,MAAI;MAC7BuB,SAAS;MACT4J,YAAY,CAAC,SAAS;KACxB,CAAC;KACD,OAAOD;IACT;IAEA,MAAMA,WAAS5L,2BACbkE,QAAMhB,iBACNsI,SAASE,OACX;IACA,IAAIE,SAAOE,SAAS,GAAG;KACrB,MAAMD,aAAa,CACjB,GAAG,IAAI7G,IAAI4G,SAAO7H,KAAKS,YAAUA,QAAMiH,QAAQ,CAAC,CAAC;KAEnDlH,2BAA2B7D,MAAI;MAC7BuB,SAAS,gCAAgC4J,WAAWE,KAAK,IAAI,EAAC;MAC9DF;KACF,CAAC;KACD,OAAOD;IACT;IAEA,MAAM9I,WAAuB;KAC3B8B,QAAQ;KACR8G,SAASF,SAASE;IACpB;IACAzH,0BAA0BvD,MAAIoC,QAAM;IACpC;GACF;GAEAmB,0BAA0BvD,MAAI,EAAEkE,QAAQ4G,SAAS5G,OAAO,CAAC;EAC3D;CACF;AACF;AAEA,MAAaoH,oBAAoB5M,SAASqC,oBAAoB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-mcp",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "MCP server configuration and connection primitives for @assistant-ui",
   "keywords": [
     "mcp",
@@ -26,14 +26,19 @@
     "README.md"
   ],
   "sideEffects": false,
+  "scripts": {
+    "build": "aui-build",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
   "dependencies": {
+    "@assistant-ui/core": "workspace:*",
+    "@assistant-ui/store": "workspace:*",
+    "@assistant-ui/tap": "workspace:*",
     "@modelcontextprotocol/client": "^2.0.0",
     "@modelcontextprotocol/core": "^2.0.0",
     "@radix-ui/react-primitive": "^2.1.10",
-    "@assistant-ui/core": "0.3.5",
-    "@assistant-ui/store": "0.3.3",
-    "@assistant-ui/tap": "0.9.9",
-    "assistant-stream": "0.3.33"
+    "assistant-stream": "workspace:*"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -45,10 +50,13 @@
     }
   },
   "devDependencies": {
+    "@assistant-ui/x-buildutils": "workspace:*",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/react": "^19.2.17",
+    "jsdom": "^29.1.1",
     "react": "^19.2.8",
-    "vitest": "^4.1.10",
-    "@assistant-ui/x-buildutils": "0.0.20"
+    "vitest": "^4.1.10"
   },
   "publishConfig": {
     "access": "public",
@@ -62,10 +70,5 @@
   },
   "bugs": {
     "url": "https://github.com/assistant-ui/assistant-ui/issues"
-  },
-  "scripts": {
-    "build": "aui-build",
-    "test": "vitest run",
-    "test:watch": "vitest"
   }
-}
+}

package/src/context/McpConnectorByIndexProvider.tsx

@@ -1,16 +1,20 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const McpConnectorByIndexProvider: FC<
   PropsWithChildren<{ index: number }>
 > = ({ index, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     mcpServer: Derived({
       source: "mcp",
       query: { kind: "connector", index },
       get: (parent) => parent.mcp.connector({ index }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/context/McpCustomServerByIndexProvider.tsx

@@ -1,16 +1,20 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const McpCustomServerByIndexProvider: FC<
   PropsWithChildren<{ index: number }>
 > = ({ index, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     mcpServer: Derived({
       source: "mcp",
       query: { kind: "custom", index },
       get: (parent) => parent.mcp.customServer({ index }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/context/McpServerByIdProvider.tsx

@@ -1,17 +1,21 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const McpServerByIdProvider: FC<PropsWithChildren<{ id: string }>> = ({
   id,
   children,
 }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     mcpServer: Derived({
       source: "mcp",
       query: { id },
       get: (parent) => parent.mcp.server({ id }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/hooks/useMcpOAuthCallback.test.ts

@@ -1,5 +1,104 @@
-import { describe, expect, it } from "vitest";
-import { createMcpOAuthCallbackError } from "./useMcpOAuthCallback";
+// @vitest-environment jsdom
+
+import { renderHook, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => {
+  const completeAuth = vi.fn<(url: string) => Promise<void>>();
+  const server = vi.fn(() => ({ completeAuth }));
+  return {
+    completeAuth,
+    server,
+    aui: { mcp: { server } },
+  };
+});
+
+vi.mock("@assistant-ui/store", async (importOriginal) => ({
+  ...(await importOriginal()),
+  useAui: () => mocks.aui,
+}));
+
+const { createMcpOAuthCallbackError, useMcpOAuthCallback } =
+  await import("./useMcpOAuthCallback");
+
+const callbackUrl =
+  "https://app.example.com/oauth/callback?state=aui-mcp%3AZG9jcw.nonce";
+
+beforeEach(() => {
+  mocks.completeAuth.mockReset();
+  mocks.server.mockClear();
+});
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+describe("useMcpOAuthCallback", () => {
+  it.each(["throws", "rejects"] as const)(
+    "keeps successful authentication done when onComplete %s",
+    async (mode) => {
+      const callbackError = new Error("telemetry failed");
+      const consoleError = vi
+        .spyOn(console, "error")
+        .mockImplementation(() => {});
+      const onComplete = vi.fn(() => {
+        if (mode === "throws") throw callbackError;
+        return Promise.reject(callbackError);
+      });
+      mocks.completeAuth.mockResolvedValueOnce();
+
+      const { result } = renderHook(() =>
+        useMcpOAuthCallback({ url: callbackUrl, onComplete }),
+      );
+
+      await waitFor(() => expect(result.current.status).toBe("done"));
+      expect(result.current).toEqual({
+        status: "done",
+        serverId: "docs",
+        error: null,
+      });
+      await waitFor(() => {
+        expect(consoleError).toHaveBeenCalledWith(
+          "[react-mcp] onComplete callback threw an error",
+          callbackError,
+        );
+      });
+    },
+  );
+
+  it.each(["throws", "rejects"] as const)(
+    "preserves authentication errors when onError %s",
+    async (mode) => {
+      const authError = new Error("invalid_grant");
+      const callbackError = new Error("telemetry failed");
+      const consoleError = vi
+        .spyOn(console, "error")
+        .mockImplementation(() => {});
+      const onError = vi.fn(() => {
+        if (mode === "throws") throw callbackError;
+        return Promise.reject(callbackError);
+      });
+      mocks.completeAuth.mockRejectedValueOnce(authError);
+
+      const { result } = renderHook(() =>
+        useMcpOAuthCallback({ url: callbackUrl, onError }),
+      );
+
+      await waitFor(() => expect(result.current.status).toBe("error"));
+      expect(result.current.serverId).toBe("docs");
+      expect(result.current.error).toMatchObject({
+        message: 'MCP OAuth callback for server "docs" failed: invalid_grant',
+        cause: authError,
+      });
+      await waitFor(() => {
+        expect(consoleError).toHaveBeenCalledWith(
+          "[react-mcp] onError callback threw an error",
+          callbackError,
+        );
+      });
+    },
+  );
+});
 
 describe("createMcpOAuthCallbackError", () => {
   it("adds MCP OAuth callback context without a server id", () => {

package/src/hooks/useMcpOAuthCallback.tsx

@@ -2,6 +2,36 @@ import { type FC, type ReactNode, useEffect, useRef, useState } from "react";
 import { useAui } from "@assistant-ui/store";
 import { decodeServerIdFromState } from "../auth/createOAuthProvider";
 
+type McpOAuthCallbackName = "onComplete" | "onError";
+
+const reportCallbackError = (name: McpOAuthCallbackName, error: unknown) => {
+  console.error(`[react-mcp] ${name} callback threw an error`, error);
+};
+
+const invokeMcpOAuthCallback = <TArgs extends unknown[]>(
+  name: McpOAuthCallbackName,
+  callback: ((...args: TArgs) => void) | undefined,
+  ...args: TArgs
+) => {
+  if (!callback) return;
+
+  try {
+    const result = callback(...args) as unknown;
+    if (
+      result !== null &&
+      (typeof result === "object" || typeof result === "function") &&
+      "then" in result &&
+      typeof result.then === "function"
+    ) {
+      void Promise.resolve(result).catch((error) => {
+        reportCallbackError(name, error);
+      });
+    }
+  } catch (error) {
+    reportCallbackError(name, error);
+  }
+};
+
 export const createMcpOAuthCallbackError = (
   err: unknown,
   serverId: string | null,
@@ -52,7 +82,7 @@ export function useMcpOAuthCallback(
     if (startedRef.current === url) return;
     startedRef.current = url;
 
-    (async () => {
+    void (async () => {
       let serverId: string | null = null;
       try {
         const parsed = new URL(url);
@@ -71,12 +101,18 @@ export function useMcpOAuthCallback(
         setResult({ status: "running", serverId, error: null });
         await aui.mcp.server({ id: serverId }).completeAuth(url);
         setResult({ status: "done", serverId, error: null });
-        optsRef.current.onComplete?.(serverId);
       } catch (err) {
-        const e = createMcpOAuthCallbackError(err, serverId);
-        setResult({ status: "error", serverId, error: e });
-        optsRef.current.onError?.(e);
+        const error = createMcpOAuthCallbackError(err, serverId);
+        setResult({ status: "error", serverId, error });
+        invokeMcpOAuthCallback("onError", optsRef.current.onError, error);
+        return;
       }
+
+      invokeMcpOAuthCallback(
+        "onComplete",
+        optsRef.current.onComplete,
+        serverId,
+      );
     })();
   }, [aui, opts.url]);
 

package/src/primitives/server/McpServerRemoveButton.test.tsx

@@ -0,0 +1,71 @@
+import type { AssistantState } from "@assistant-ui/store";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  remove: vi.fn<() => Promise<void>>(),
+  kind: "custom" as "connector" | "custom",
+}));
+
+vi.mock("@assistant-ui/store", async (importOriginal) => ({
+  ...(await importOriginal()),
+  useAui: () => ({ mcpServer: { remove: mocks.remove } }),
+  useAuiState: function useAuiState<T>(selector: (state: AssistantState) => T) {
+    return selector({
+      mcpServer: { kind: mocks.kind },
+    } as AssistantState);
+  },
+}));
+
+const { McpServerPrimitiveRemoveButton } =
+  await import("./McpServerRemoveButton");
+
+const captureUnhandledRejections = async (callback: () => void) => {
+  const reasons: unknown[] = [];
+  const listener = (reason: unknown) => reasons.push(reason);
+  process.on("unhandledRejection", listener);
+  try {
+    callback();
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    return reasons;
+  } finally {
+    process.off("unhandledRejection", listener);
+  }
+};
+
+const renderButton = () =>
+  (
+    McpServerPrimitiveRemoveButton as unknown as {
+      render: (
+        props: Record<string, unknown>,
+        ref: null,
+      ) => {
+        props: {
+          onClick: (event: { defaultPrevented: boolean }) => void;
+        };
+      };
+    }
+  ).render({}, null);
+
+describe("McpServerPrimitiveRemoveButton", () => {
+  beforeEach(() => {
+    mocks.remove.mockReset();
+    mocks.kind = "custom";
+  });
+
+  it("does not render for connectors", () => {
+    mocks.kind = "connector";
+
+    expect(renderButton()).toBeNull();
+  });
+
+  it("handles rejected custom server remove actions", async () => {
+    mocks.remove.mockRejectedValueOnce(new Error("storage unavailable"));
+
+    const unhandledRejections = await captureUnhandledRejections(() => {
+      renderButton().props.onClick({ defaultPrevented: false });
+    });
+
+    expect(mocks.remove).toHaveBeenCalledOnce();
+    expect(unhandledRejections).toEqual([]);
+  });
+});

package/src/primitives/server/McpServerRemoveButton.tsx

@@ -26,7 +26,7 @@ export const McpServerPrimitiveRemoveButton = forwardRef<
       onClick={(e) => {
         props.onClick?.(e);
         if (e.defaultPrevented) return;
-        void aui.mcpServer.remove();
+        void aui.mcpServer.remove().catch(() => undefined);
       }}
     />
   );