@tambo-ai/react 0.64.1 → 0.65.1

package/dist/mcp/__tests__/tambo-mcp-provider.test.js

@@ -60,13 +60,34 @@ jest.mock("../mcp-client", () => ({
     },
 }));
 // Mock the registry provider to avoid dependency issues
-jest.mock("../../providers/tambo-registry-provider", () => ({
-    useTamboRegistry: jest.fn(),
-}));
+jest.mock("../../providers/tambo-registry-provider", () => {
+    const actual = jest.requireActual("../../providers/tambo-registry-provider");
+    return {
+        ...actual,
+        useTamboRegistry: jest.fn(),
+    };
+});
 // Mock the client provider to avoid dependency issues
-jest.mock("../../providers/tambo-client-provider", () => ({
-    useTamboClient: jest.fn(),
-}));
+jest.mock("../../providers/tambo-client-provider", () => {
+    return {
+        useTamboClient: jest.fn(),
+        TamboClientContext: react_2.default.createContext(undefined),
+    };
+});
+// Helper to wrap tests with all required providers (used across multiple describe blocks)
+const TestWrapper = ({ mcpServers, handlers, children }) => {
+    const client = (0, tambo_client_provider_1.useTamboClient)();
+    return (react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+            client,
+            queryClient: {},
+            isUpdatingToken: false,
+            mcpAccessToken: null,
+            setMcpAccessToken: () => { },
+        } },
+        react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: mcpServers },
+            react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { handlers: handlers }, children)))));
+};
 describe("extractErrorMessage", () => {
     describe("Array content handling", () => {
         it("should extract text from array content with multiple text items", () => {
@@ -191,17 +212,33 @@ describe("TamboMcpProvider server list changes", () => {
     };
     it("adds a new server when the list grows", async () => {
         let latest = [];
-        const { rerender, getByTestId } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender, getByTestId } = (0, react_1.render)(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         // Wait for initial connection
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
         // Add new server
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example", "https://b.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example", "https://b.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
             const urls = getByTestId("urls").textContent || "";
@@ -211,16 +248,32 @@ describe("TamboMcpProvider server list changes", () => {
     });
     it("removes a server when the list shrinks", async () => {
         let latest = [];
-        const { rerender, getByTestId } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example", "https://b.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender, getByTestId } = (0, react_1.render)(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example", "https://b.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
         });
         // Remove one server
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
             const urls = getByTestId("urls").textContent || "";
@@ -234,9 +287,8 @@ describe("TamboMcpProvider server list changes", () => {
             { url: "https://a.example", transport: mcp_client_1.MCPTransport.SSE },
             { url: "https://b.example", transport: mcp_client_1.MCPTransport.SSE },
         ];
-        const { rerender } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: initial },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender } = (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: initial },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
         });
@@ -245,9 +297,8 @@ describe("TamboMcpProvider server list changes", () => {
             { url: "https://a.example", transport: mcp_client_1.MCPTransport.SSE },
             { url: "https://b.example", transport: mcp_client_1.MCPTransport.SSE },
         ];
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: same },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(TestWrapper, { mcpServers: same },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
             const urls = latest.map((s) => s.url).sort();
@@ -262,9 +313,8 @@ describe("TamboMcpProvider server list changes", () => {
         mcp_client_1.MCPClient.create = createSpy;
         let latest = [];
         const initial = [{ url: "https://a.example", transport: mcp_client_1.MCPTransport.SSE }];
-        const { rerender } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: initial },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender } = (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: initial },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
@@ -273,9 +323,8 @@ describe("TamboMcpProvider server list changes", () => {
         const firstClient = latest[0].client;
         // Pass a new array with same server
         const same = [{ url: "https://a.example", transport: mcp_client_1.MCPTransport.SSE }];
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: same },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(TestWrapper, { mcpServers: same },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
@@ -292,17 +341,33 @@ describe("TamboMcpProvider server list changes", () => {
         });
         mcp_client_1.MCPClient.create = createSpy;
         let latest = [];
-        const { rerender } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example", "https://b.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender } = (0, react_1.render)(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example", "https://b.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
         });
         expect(closeSpy).not.toHaveBeenCalled();
         // Remove one server
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
@@ -317,9 +382,17 @@ describe("TamboMcpProvider server list changes", () => {
         });
         mcp_client_1.MCPClient.create = createSpy;
         let latest = [];
-        const { unmount } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://a.example", "https://b.example"] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { unmount } = (0, react_1.render)(react_2.default.createElement(tambo_client_provider_1.TamboClientContext.Provider, { value: {
+                client: (0, tambo_client_provider_1.useTamboClient)(),
+                queryClient: {},
+                isUpdatingToken: false,
+                mcpAccessToken: null,
+                setMcpAccessToken: () => { },
+            } },
+            react_2.default.createElement(tambo_registry_provider_1.TamboRegistryProvider, { mcpServers: ["https://a.example", "https://b.example"] },
+                react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
+                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, null,
+                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))))));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
         });
@@ -342,15 +415,14 @@ describe("TamboMcpProvider server list changes", () => {
         });
         mcp_client_1.MCPClient.create = createSpy;
         let latest = [];
-        const { rerender } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                    {
-                        url: "https://a.example",
-                        transport: mcp_client_1.MCPTransport.SSE,
-                        customHeaders: { Authorization: "Bearer token1" },
-                    },
-                ] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender } = (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: [
+                {
+                    url: "https://a.example",
+                    transport: mcp_client_1.MCPTransport.SSE,
+                    customHeaders: { Authorization: "Bearer token1" },
+                },
+            ] },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
             expect(createSpy).toHaveBeenCalledTimes(1);
@@ -358,15 +430,14 @@ describe("TamboMcpProvider server list changes", () => {
         const firstClientId = latest[0].client?.id;
         expect(firstClientId).toBe(1);
         // Change the customHeaders
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                    {
-                        url: "https://a.example",
-                        transport: mcp_client_1.MCPTransport.SSE,
-                        customHeaders: { Authorization: "Bearer token2" },
-                    },
-                ] },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(TestWrapper, { mcpServers: [
+                {
+                    url: "https://a.example",
+                    transport: mcp_client_1.MCPTransport.SSE,
+                    customHeaders: { Authorization: "Bearer token2" },
+                },
+            ] },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         // Wait for old client to be closed and new client to be created
         await (0, react_1.waitFor)(() => {
             expect(closeSpy).toHaveBeenCalledTimes(1);
@@ -418,13 +489,12 @@ describe("TamboMcpProvider handler support", () => {
             elicitation: mockElicitationHandler,
         };
         let latest = [];
-        (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://test.example"], handlers: handlers },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: ["https://test.example"], handlers: handlers },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
-        // Verify MCPClient.create was called
+        // Verify MCPClient.create was called with an HTTP transport and wrapped handler
         expect(createSpy).toHaveBeenCalledWith("https://test.example", mcp_client_1.MCPTransport.HTTP, undefined, undefined, undefined, expect.objectContaining({
             elicitation: expect.any(Function),
         }));
@@ -440,7 +510,7 @@ describe("TamboMcpProvider handler support", () => {
         await passedHandlers.elicitation(mockRequest, mockExtra);
         expect(mockElicitationHandler).toHaveBeenCalledWith(mockRequest, mockExtra, expect.objectContaining({
             url: "https://test.example",
-            transport: mcp_client_1.MCPTransport.HTTP,
+            serverKey: "test",
         }));
     });
     it("should pass provider-level sampling handler to MCPClient.create", async () => {
@@ -454,13 +524,12 @@ describe("TamboMcpProvider handler support", () => {
             sampling: mockSamplingHandler,
         };
         let latest = [];
-        (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://test.example"], handlers: handlers },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: ["https://test.example"], handlers: handlers },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
-        // Verify MCPClient.create was called with sampling handler
+        // Verify MCPClient.create was called with HTTP transport and sampling handler
         expect(createSpy).toHaveBeenCalledWith("https://test.example", mcp_client_1.MCPTransport.HTTP, undefined, undefined, undefined, expect.objectContaining({
             sampling: expect.any(Function),
         }));
@@ -477,7 +546,7 @@ describe("TamboMcpProvider handler support", () => {
         await passedHandlers.sampling(mockRequest, mockExtra);
         expect(mockSamplingHandler).toHaveBeenCalledWith(mockRequest, mockExtra, expect.objectContaining({
             url: "https://test.example",
-            transport: mcp_client_1.MCPTransport.HTTP,
+            serverKey: "test",
         }));
     });
     it("should allow per-server handlers to override provider-level handlers", async () => {
@@ -491,16 +560,15 @@ describe("TamboMcpProvider handler support", () => {
             elicitation: providerElicitationHandler,
         };
         let latest = [];
-        (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                    {
-                        url: "https://test.example",
-                        handlers: {
-                            elicitation: serverElicitationHandler,
-                        },
+        (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: [
+                {
+                    url: "https://test.example",
+                    handlers: {
+                        elicitation: serverElicitationHandler,
                     },
-                ], handlers: handlers },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+                },
+            ], handlers: handlers },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
@@ -516,12 +584,11 @@ describe("TamboMcpProvider handler support", () => {
             elicitation: mockElicitationHandler,
         };
         let latest = [];
-        (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                    { url: "https://server-a.example", name: "Server A" },
-                    { url: "https://server-b.example", name: "Server B" },
-                ], handlers: handlers },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: [
+                { url: "https://server-a.example", name: "Server A" },
+                { url: "https://server-b.example", name: "Server B" },
+            ], handlers: handlers },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(2);
         });
@@ -557,16 +624,14 @@ describe("TamboMcpProvider handler support", () => {
             content: [{ type: "text", text: "updated" }],
         });
         let latest = [];
-        const { rerender } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://test.example"], handlers: { elicitation: initialHandler } },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        const { rerender } = (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: ["https://test.example"], handlers: { elicitation: initialHandler } },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(latest.length).toBe(1);
         });
         // Update the handlers
-        rerender(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-            react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://test.example"], handlers: { elicitation: updatedHandler } },
-                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+        rerender(react_2.default.createElement(TestWrapper, { mcpServers: ["https://test.example"], handlers: { elicitation: updatedHandler } },
+            react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
         await (0, react_1.waitFor)(() => {
             expect(mockClient.updateElicitationHandler).toHaveBeenCalled();
         });
@@ -599,9 +664,8 @@ describe("TamboMcpProvider serverKey derivation and tool prefixing", () => {
                 close: jest.fn(),
             });
             let latest = [];
-            (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-                react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://mcp.linear.app/mcp"] },
-                    react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+            (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: ["https://mcp.linear.app/mcp"] },
+                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
             await (0, react_1.waitFor)(() => {
                 expect(latest.length).toBe(1);
                 expect(latest[0].serverKey).toBe("linear");
@@ -613,14 +677,13 @@ describe("TamboMcpProvider serverKey derivation and tool prefixing", () => {
                 close: jest.fn(),
             });
             let latest = [];
-            (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-                react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                        {
-                            url: "https://mcp.linear.app/mcp",
-                            serverKey: "custom-key",
-                        },
-                    ] },
-                    react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+            (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: [
+                    {
+                        url: "https://mcp.linear.app/mcp",
+                        serverKey: "custom-key",
+                    },
+                ] },
+                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
             await (0, react_1.waitFor)(() => {
                 expect(latest.length).toBe(1);
                 expect(latest[0].serverKey).toBe("custom-key");
@@ -640,9 +703,8 @@ describe("TamboMcpProvider serverKey derivation and tool prefixing", () => {
             ];
             for (const { url, expected } of testCases) {
                 let latest = [];
-                const { unmount } = (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-                    react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [url] },
-                        react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+                const { unmount } = (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: [url] },
+                    react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
                 await (0, react_1.waitFor)(() => {
                     expect(latest.length).toBe(1);
                     expect(latest[0].serverKey).toBe(expected);
@@ -662,9 +724,8 @@ describe("TamboMcpProvider serverKey derivation and tool prefixing", () => {
                 close: jest.fn(),
             });
             let latest = [];
-            (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-                react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: ["https://mcp.linear.app/mcp"] },
-                    react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+            (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: ["https://mcp.linear.app/mcp"] },
+                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
             await (0, react_1.waitFor)(() => {
                 expect(latest.length).toBe(1);
                 expect(mockRegisterTool).toHaveBeenCalledWith(expect.objectContaining({
@@ -682,12 +743,8 @@ describe("TamboMcpProvider serverKey derivation and tool prefixing", () => {
                 close: jest.fn(),
             });
             let latest = [];
-            (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-                react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                        "https://mcp.linear.app/mcp",
-                        "https://api.github.com",
-                    ] },
-                    react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+            (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: ["https://mcp.linear.app/mcp", "https://api.github.com"] },
+                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
             await (0, react_1.waitFor)(() => {
                 expect(latest.length).toBe(2);
                 // Check that tools are registered with prefixed names
@@ -711,15 +768,14 @@ describe("TamboMcpProvider serverKey derivation and tool prefixing", () => {
                 close: jest.fn(),
             });
             let latest = [];
-            (0, react_1.render)(react_2.default.createElement(tambo_mcp_token_provider_1.TamboMcpTokenProvider, null,
-                react_2.default.createElement(tambo_mcp_provider_1.TamboMcpProvider, { mcpServers: [
-                        {
-                            url: "https://mcp.linear.app/mcp",
-                            serverKey: "my-server",
-                        },
-                        "https://api.github.com",
-                    ] },
-                    react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) }))));
+            (0, react_1.render)(react_2.default.createElement(TestWrapper, { mcpServers: [
+                    {
+                        url: "https://mcp.linear.app/mcp",
+                        serverKey: "my-server",
+                    },
+                    "https://api.github.com",
+                ] },
+                react_2.default.createElement(Capture, { onUpdate: (s) => (latest = s) })));
             await (0, react_1.waitFor)(() => {
                 expect(latest.length).toBe(2);
                 const calls = mockRegisterTool.mock.calls;