@assistant-ui/react-mcp 0.0.5 → 0.0.7

package/src/resources/McpManagerResource.ts

@@ -1,16 +1,8 @@
+import { useState, useEffect, useMemo, useEffectEvent, useRef } from "react";
+import { useResource, resource, withKey } from "@assistant-ui/tap";
 import {
-  resource,
-  tapState,
-  tapResource,
-  tapEffect,
-  tapMemo,
-  tapEffectEvent,
-  tapRef,
-  withKey,
-} from "@assistant-ui/tap";
-import {
-  tapClientLookup,
-  tapAssistantClientRef,
+  useClientLookup,
+  useAssistantClientRef,
   attachTransformScopes,
   type ClientOutput,
 } from "@assistant-ui/store";
@@ -40,208 +32,209 @@ function defaultRedirectUri(): string {
   return `${window.location.origin}/mcp/callback`;
 }
 
-export const McpManagerResource = resource(
-  (props: McpManagerResourceProps): ClientOutput<"mcp"> => {
-    const connectors = props.connectors ?? [];
-    const autoConnect = props.autoConnect ?? true;
-    const redirectUri = props.oauthRedirectUri ?? defaultRedirectUri();
-
-    const storageElement = props.storage ?? McpLocalStorage();
-    const storage = tapResource(storageElement);
-
-    const [customServers, setCustomServers] = tapState<MCPCustomServerRecord[]>(
-      [],
+// Stable empty fallback so an absent `connectors` prop doesn't produce a fresh
+// array each render (which would invalidate the serverElements memo below).
+const NO_CONNECTORS: MCPConnector[] = [];
+
+export const McpManagerResource = resource(function McpManagerResource(
+  props: McpManagerResourceProps,
+): ClientOutput<"mcp"> {
+  const connectors = props.connectors ?? NO_CONNECTORS;
+  const autoConnect = props.autoConnect ?? true;
+  const redirectUri = props.oauthRedirectUri ?? defaultRedirectUri();
+
+  const storageElement = props.storage ?? McpLocalStorage();
+  const storage = useResource(storageElement);
+
+  const [customServers, setCustomServers] = useState<MCPCustomServerRecord[]>(
+    [],
+  );
+  const [isHydrated, setIsHydrated] = useState(false);
+
+  const hydratedRef = useRef(false);
+
+  const hydrate = useEffectEvent(async (signal: { cancelled: boolean }) => {
+    try {
+      const records = await storage.loadCustomServers();
+      if (signal.cancelled) return;
+      // Merge rather than replace so any addCustomServer calls that
+      // happened before hydration resolved aren't silently overwritten.
+      // Persisted order wins; pre-hydration locals append.
+      setCustomServers((prev) => {
+        if (prev.length === 0) return records;
+        const persistedIds = new Set(records.map((r) => r.id));
+        return [...records, ...prev.filter((r) => !persistedIds.has(r.id))];
+      });
+    } finally {
+      if (!signal.cancelled) {
+        hydratedRef.current = true;
+        setIsHydrated(true);
+      }
+    }
+  });
+
+  useEffect(() => {
+    const signal = { cancelled: false };
+    void hydrate(signal);
+    return () => {
+      signal.cancelled = true;
+    };
+  }, []);
+
+  const persistCustomServers = useEffectEvent(
+    async (records: MCPCustomServerRecord[]) => {
+      if (!hydratedRef.current) return;
+      await storage.saveCustomServers(records);
+    },
+  );
+
+  useEffect(() => {
+    void persistCustomServers(customServers);
+  }, [customServers]);
+
+  const serverElements = useMemo(() => {
+    const connectorElements = connectors.map((c) =>
+      withKey(
+        c.id,
+        McpServerResource({
+          id: c.id,
+          kind: "connector",
+          name: c.name,
+          url: c.url,
+          icon: c.icon,
+          auth: c.auth,
+          storage,
+          redirectUri,
+          autoConnect,
+          onRemove: async () => {
+            // connectors cannot be removed
+          },
+        }),
+      ),
     );
-    const [isHydrated, setIsHydrated] = tapState(false);
+    const customElements = customServers.map((s) =>
+      withKey(
+        s.id,
+        McpServerResource({
+          id: s.id,
+          kind: "custom",
+          name: s.name,
+          url: s.url,
+          auth: s.auth,
+          storage,
+          redirectUri,
+          autoConnect,
+          onRemove: async () => {
+            setCustomServers((prev) => prev.filter((x) => x.id !== s.id));
+          },
+        }),
+      ),
+    );
+    return [...connectorElements, ...customElements];
+  }, [connectors, customServers, storage, redirectUri, autoConnect]);
 
-    const hydratedRef = tapRef(false);
+  const lookup = useClientLookup(() => serverElements, [serverElements]);
 
-    const hydrate = tapEffectEvent(async (signal: { cancelled: boolean }) => {
-      try {
-        const records = await storage.loadCustomServers();
-        if (signal.cancelled) return;
-        // Merge rather than replace so any addCustomServer calls that
-        // happened before hydration resolved aren't silently overwritten.
-        // Persisted order wins; pre-hydration locals append.
-        setCustomServers((prev) => {
-          if (prev.length === 0) return records;
-          const persistedIds = new Set(records.map((r) => r.id));
-          return [...records, ...prev.filter((r) => !persistedIds.has(r.id))];
-        });
-      } finally {
-        if (!signal.cancelled) {
-          hydratedRef.current = true;
-          setIsHydrated(true);
-        }
+  const state = useMemo<MCPManagerState>(() => {
+    const all = lookup.state;
+    return {
+      servers: all,
+      connectors: all.filter((s) => s.kind === "connector"),
+      customServers: all.filter((s) => s.kind === "custom"),
+      isHydrated,
+    };
+  }, [lookup.state, isHydrated]);
+
+  // ─── Auto-register MCP tools as frontend tools in modelContext ─────
+  // Build the toolkit from connected servers; re-register when the visible
+  // tool surface changes. Tool names are prefixed with the server id to
+  // avoid collisions across connected servers — connector ids must not
+  // contain `__` (enforced by `defineConnector`); `addCustomServer`
+  // generates UUIDs that satisfy the constraint by construction.
+  const toolkit = useMemo<Record<string, Tool<any, any>>>(() => {
+    const out: Record<string, Tool<any, any>> = {};
+    for (const server of state.servers) {
+      if (server.connectionState !== "connected") continue;
+      for (const tool of server.tools) {
+        const fullName = `${server.id}__${tool.name}`;
+        out[fullName] = {
+          type: "frontend",
+          ...(tool.description !== undefined
+            ? { description: tool.description }
+            : {}),
+          parameters: tool.inputSchema as never,
+          execute: (args) =>
+            lookup.get({ key: server.id }).callTool(tool.name, args as unknown),
+        };
       }
-    });
+    }
+    return out;
+  }, [state, lookup]);
 
-    tapEffect(() => {
-      const signal = { cancelled: false };
-      void hydrate(signal);
-      return () => {
-        signal.cancelled = true;
-      };
-    }, []);
-
-    const persistCustomServers = tapEffectEvent(
-      async (records: MCPCustomServerRecord[]) => {
-        if (!hydratedRef.current) return;
-        await storage.saveCustomServers(records);
-      },
-    );
+  const clientRef = useAssistantClientRef();
 
-    tapEffect(() => {
-      void persistCustomServers(customServers);
-    }, [customServers]);
-
-    const serverElements = tapMemo(() => {
-      const connectorElements = connectors.map((c) =>
-        withKey(
-          c.id,
-          McpServerResource({
-            id: c.id,
-            kind: "connector",
-            name: c.name,
-            url: c.url,
-            icon: c.icon,
-            auth: c.auth,
-            storage,
-            redirectUri,
-            autoConnect,
-            onRemove: async () => {
-              // connectors cannot be removed
-            },
-          }),
-        ),
-      );
-      const customElements = customServers.map((s) =>
-        withKey(
-          s.id,
-          McpServerResource({
-            id: s.id,
-            kind: "custom",
-            name: s.name,
-            url: s.url,
-            auth: s.auth,
-            storage,
-            redirectUri,
-            autoConnect,
-            onRemove: async () => {
-              setCustomServers((prev) => prev.filter((x) => x.id !== s.id));
-            },
-          }),
-        ),
+  useEffect(() => {
+    const client = clientRef.current;
+    if (!client) return;
+    return client.modelContext().register({
+      getModelContext: () => ({ tools: toolkit }),
+    });
+  }, [toolkit, clientRef]);
+
+  const serverByKind = (kind: "connector" | "custom", index: number) => {
+    const list = kind === "connector" ? state.connectors : state.customServers;
+    const entry = list[index];
+    if (!entry) {
+      throw new Error(
+        `McpManagerResource: no ${kind} at index ${index} (length ${list.length})`,
       );
-      return [...connectorElements, ...customElements];
-    }, [connectors, customServers, storage, redirectUri, autoConnect]);
-
-    const lookup = tapClientLookup(() => serverElements, [serverElements]);
-
-    const state = tapMemo<MCPManagerState>(() => {
-      const all = lookup.state;
-      return {
-        servers: all,
-        connectors: all.filter((s) => s.kind === "connector"),
-        customServers: all.filter((s) => s.kind === "custom"),
-        isHydrated,
+    }
+    return lookup.get({ key: entry.id });
+  };
+
+  return {
+    getState: () => state,
+    server: (query) => {
+      if ("id" in query) return lookup.get({ key: query.id });
+      return serverByKind(query.kind, query.index);
+    },
+    connector: ({ index }) => serverByKind("connector", index),
+    customServer: ({ index }) => serverByKind("custom", index),
+    addCustomServer: async ({ name, url, auth }) => {
+      const record: MCPCustomServerRecord = {
+        id:
+          typeof crypto !== "undefined" && "randomUUID" in crypto
+            ? crypto.randomUUID()
+            : `mcp-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+        name,
+        url,
+        auth: auth as MCPAuthConfig,
+        createdAt: Date.now(),
       };
-    }, [lookup.state, isHydrated]);
-
-    // ─── Auto-register MCP tools as frontend tools in modelContext ─────
-    // Build the toolkit from connected servers; re-register when the visible
-    // tool surface changes. Tool names are prefixed with the server id to
-    // avoid collisions across connected servers — connector ids must not
-    // contain `__` (enforced by `defineConnector`); `addCustomServer`
-    // generates UUIDs that satisfy the constraint by construction.
-    const toolkit = tapMemo<Record<string, Tool<any, any>>>(() => {
-      const out: Record<string, Tool<any, any>> = {};
-      for (const server of state.servers) {
-        if (server.connectionState !== "connected") continue;
-        for (const tool of server.tools) {
-          const fullName = `${server.id}__${tool.name}`;
-          out[fullName] = {
-            type: "frontend",
-            ...(tool.description !== undefined
-              ? { description: tool.description }
-              : {}),
-            parameters: tool.inputSchema as never,
-            execute: (args) =>
-              lookup
-                .get({ key: server.id })
-                .callTool(tool.name, args as unknown),
-          };
-        }
-      }
-      return out;
-    }, [state, lookup]);
-
-    const clientRef = tapAssistantClientRef();
-
-    tapEffect(() => {
-      const client = clientRef.current;
-      if (!client) return;
-      return client.modelContext().register({
-        getModelContext: () => ({ tools: toolkit }),
-      });
-    }, [toolkit, clientRef]);
-
-    const serverByKind = (kind: "connector" | "custom", index: number) => {
-      const list =
-        kind === "connector" ? state.connectors : state.customServers;
-      const entry = list[index];
-      if (!entry) {
+      setCustomServers((prev) => [...prev, record]);
+      return record.id;
+    },
+    removeServer: async (id) => {
+      // removeServer is custom-server only — connectors are app-defined
+      // and not user-removable. Refuse rather than silently no-op.
+      if (state.connectors.some((c) => c.id === id)) {
         throw new Error(
-          `McpManagerResource: no ${kind} at index ${index} (length ${list.length})`,
+          `Cannot remove connector "${id}" — connectors are app-defined and not removable. Use a custom server id instead.`,
         );
       }
-      return lookup.get({ key: entry.id });
-    };
-
-    return {
-      getState: () => state,
-      server: (query) => {
-        if ("id" in query) return lookup.get({ key: query.id });
-        return serverByKind(query.kind, query.index);
-      },
-      connector: ({ index }) => serverByKind("connector", index),
-      customServer: ({ index }) => serverByKind("custom", index),
-      addCustomServer: async ({ name, url, auth }) => {
-        const record: MCPCustomServerRecord = {
-          id:
-            typeof crypto !== "undefined" && "randomUUID" in crypto
-              ? crypto.randomUUID()
-              : `mcp-${Date.now()}-${Math.random().toString(36).slice(2)}`,
-          name,
-          url,
-          auth: auth as MCPAuthConfig,
-          createdAt: Date.now(),
-        };
-        setCustomServers((prev) => [...prev, record]);
-        return record.id;
-      },
-      removeServer: async (id) => {
-        // removeServer is custom-server only — connectors are app-defined
-        // and not user-removable. Refuse rather than silently no-op.
-        if (state.connectors.some((c) => c.id === id)) {
-          throw new Error(
-            `Cannot remove connector "${id}" — connectors are app-defined and not removable. Use a custom server id instead.`,
-          );
-        }
-        // Delegate to McpServerResource.remove() which disconnects,
-        // clears auth state, and unregisters from customServers in one
-        // place. Fallback to manual cleanup if the lookup is empty
-        // (server already gone).
-        try {
-          await lookup.get({ key: id }).remove();
-        } catch {
-          await storage.clearAuthState(id);
-          setCustomServers((prev) => prev.filter((s) => s.id !== id));
-        }
-      },
-    };
-  },
-);
+      // Delegate to McpServerResource.remove() which disconnects,
+      // clears auth state, and unregisters from customServers in one
+      // place. Fallback to manual cleanup if the lookup is empty
+      // (server already gone).
+      try {
+        await lookup.get({ key: id }).remove();
+      } catch {
+        await storage.clearAuthState(id);
+        setCustomServers((prev) => prev.filter((s) => s.id !== id));
+      }
+    },
+  };
+});
 
 // Ensure modelContext exists as a sibling when the manager mounts. If an
 // ancestor (e.g. a chat runtime) already provides modelContext, this is a