@tambo-ai/react 0.65.2 → 0.66.0

package/dist/util/mcp-server-utils.d.ts

@@ -0,0 +1,23 @@
+import type { McpServerInfo, NormalizedMcpServerInfo } from "../model/mcp-server-info";
+/**
+ * Derives a short, meaningful key from a server URL.
+ * Strips TLDs and common prefixes to get a human-readable identifier.
+ * For example, "https://mcp.linear.app/mcp" becomes "linear".
+ * @returns A lowercased, human-readable key derived from the URL
+ */
+export declare function deriveServerKey(url: string): string;
+/**
+ * Normalizes an MCP server info object, ensuring it has a serverKey.
+ * If serverKey is not provided, derives it from the URL.
+ * @returns The normalized MCP server info object
+ */
+export declare function normalizeServerInfo(server: McpServerInfo | string): NormalizedMcpServerInfo;
+/**
+ * Deduplicates MCP servers by connection identity and ensures serverKey uniqueness.
+ * First deduplicates by connection (url + transport), then ensures serverKey uniqueness
+ * by appending -2, -3, etc. to duplicate serverKeys.
+ * @param servers - Array of normalized MCP server info objects
+ * @returns Array of deduplicated servers with unique serverKeys
+ */
+export declare function deduplicateMcpServers(servers: NormalizedMcpServerInfo[]): NormalizedMcpServerInfo[];
+//# sourceMappingURL=mcp-server-utils.d.ts.map

package/dist/util/mcp-server-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-utils.d.ts","sourceRoot":"","sources":["../../src/util/mcp-server-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAGlC;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAmDnD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,GAAG,MAAM,GAC7B,uBAAuB,CAazB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,uBAAuB,EAAE,GACjC,uBAAuB,EAAE,CA8B3B"}

package/dist/util/mcp-server-utils.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deriveServerKey = deriveServerKey;
+exports.normalizeServerInfo = normalizeServerInfo;
+exports.deduplicateMcpServers = deduplicateMcpServers;
+const mcp_server_info_1 = require("../model/mcp-server-info");
+/**
+ * Derives a short, meaningful key from a server URL.
+ * Strips TLDs and common prefixes to get a human-readable identifier.
+ * For example, "https://mcp.linear.app/mcp" becomes "linear".
+ * @returns A lowercased, human-readable key derived from the URL
+ */
+function deriveServerKey(url) {
+    try {
+        const parsed = new URL(url);
+        const hostname = parsed.hostname;
+        // Split hostname into parts
+        const parts = hostname.split(".");
+        // Remove common TLD patterns
+        // Handle cases like: .com, .org, .co.uk, .com.au, etc.
+        let relevantParts = [...parts];
+        // If we have 3+ parts and the last two are short (likely TLD like .co.uk)
+        if (relevantParts.length >= 3 &&
+            relevantParts[relevantParts.length - 1].length <= 3 &&
+            relevantParts[relevantParts.length - 2].length <= 3) {
+            relevantParts = relevantParts.slice(0, -2);
+        }
+        // Otherwise just remove the last part (TLD like .com)
+        else if (relevantParts.length >= 2) {
+            relevantParts = relevantParts.slice(0, -1);
+        }
+        // From what's left, prefer the rightmost part that's not a common prefix
+        // Common prefixes: www, api, mcp, app, etc.
+        const commonPrefixes = new Set([
+            "www",
+            "api",
+            "mcp",
+            "app",
+            "staging",
+            "dev",
+            "prod",
+        ]);
+        // Work backwards through the parts to find a meaningful name
+        for (let i = relevantParts.length - 1; i >= 0; i--) {
+            const part = relevantParts[i];
+            if (part && !commonPrefixes.has(part.toLowerCase())) {
+                return part.toLowerCase();
+            }
+        }
+        // Fallback: use the last relevant part even if it's a common prefix
+        return relevantParts[relevantParts.length - 1]?.toLowerCase() || hostname;
+    }
+    catch {
+        // If URL parsing fails, just return a sanitized version of the input
+        return url.replace(/[^a-zA-Z0-9]/g, "_").toLowerCase();
+    }
+}
+/**
+ * Normalizes an MCP server info object, ensuring it has a serverKey.
+ * If serverKey is not provided, derives it from the URL.
+ * @returns The normalized MCP server info object
+ */
+function normalizeServerInfo(server) {
+    const base = typeof server === "string"
+        ? {
+            url: server,
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+        }
+        : server;
+    const serverKey = base.serverKey ?? deriveServerKey(base.url);
+    const transport = base.transport ?? mcp_server_info_1.MCPTransport.HTTP;
+    return { ...base, transport, serverKey };
+}
+/**
+ * Deduplicates MCP servers by connection identity and ensures serverKey uniqueness.
+ * First deduplicates by connection (url + transport), then ensures serverKey uniqueness
+ * by appending -2, -3, etc. to duplicate serverKeys.
+ * @param servers - Array of normalized MCP server info objects
+ * @returns Array of deduplicated servers with unique serverKeys
+ */
+function deduplicateMcpServers(servers) {
+    if (servers.length === 0) {
+        return servers;
+    }
+    // 1. Deduplicate by connection identity using a stable key
+    const byKey = new Map();
+    for (const server of servers) {
+        const key = (0, mcp_server_info_1.getMcpServerUniqueKey)(server);
+        byKey.set(key, server);
+    }
+    const deduped = Array.from(byKey.values());
+    // 2. Ensure serverKey uniqueness for readable, unambiguous prefixes
+    const seen = new Map();
+    return deduped.map((server) => {
+        const baseKey = server.serverKey;
+        const count = (seen.get(baseKey) ?? 0) + 1;
+        seen.set(baseKey, count);
+        if (count === 1) {
+            return server;
+        }
+        return {
+            ...server,
+            serverKey: `${baseKey}-${count}`,
+        };
+    });
+}
+//# sourceMappingURL=mcp-server-utils.js.map

package/dist/util/mcp-server-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-utils.js","sourceRoot":"","sources":["../../src/util/mcp-server-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  McpServerInfo,\n  NormalizedMcpServerInfo,\n} from \"../model/mcp-server-info\";\nimport { getMcpServerUniqueKey, MCPTransport } from \"../model/mcp-server-info\";\n\n/**\n * Derives a short, meaningful key from a server URL.\n * Strips TLDs and common prefixes to get a human-readable identifier.\n * For example, \"https://mcp.linear.app/mcp\" becomes \"linear\".\n * @returns A lowercased, human-readable key derived from the URL\n */\nexport function deriveServerKey(url: string): string {\n  try {\n    const parsed = new URL(url);\n    const hostname = parsed.hostname;\n\n    // Split hostname into parts\n    const parts = hostname.split(\".\");\n\n    // Remove common TLD patterns\n    // Handle cases like: .com, .org, .co.uk, .com.au, etc.\n    let relevantParts = [...parts];\n\n    // If we have 3+ parts and the last two are short (likely TLD like .co.uk)\n    if (\n      relevantParts.length >= 3 &&\n      relevantParts[relevantParts.length - 1].length <= 3 &&\n      relevantParts[relevantParts.length - 2].length <= 3\n    ) {\n      relevantParts = relevantParts.slice(0, -2);\n    }\n    // Otherwise just remove the last part (TLD like .com)\n    else if (relevantParts.length >= 2) {\n      relevantParts = relevantParts.slice(0, -1);\n    }\n\n    // From what's left, prefer the rightmost part that's not a common prefix\n    // Common prefixes: www, api, mcp, app, etc.\n    const commonPrefixes = new Set([\n      \"www\",\n      \"api\",\n      \"mcp\",\n      \"app\",\n      \"staging\",\n      \"dev\",\n      \"prod\",\n    ]);\n\n    // Work backwards through the parts to find a meaningful name\n    for (let i = relevantParts.length - 1; i >= 0; i--) {\n      const part = relevantParts[i];\n      if (part && !commonPrefixes.has(part.toLowerCase())) {\n        return part.toLowerCase();\n      }\n    }\n\n    // Fallback: use the last relevant part even if it's a common prefix\n    return relevantParts[relevantParts.length - 1]?.toLowerCase() || hostname;\n  } catch {\n    // If URL parsing fails, just return a sanitized version of the input\n    return url.replace(/[^a-zA-Z0-9]/g, \"_\").toLowerCase();\n  }\n}\n\n/**\n * Normalizes an MCP server info object, ensuring it has a serverKey.\n * If serverKey is not provided, derives it from the URL.\n * @returns The normalized MCP server info object\n */\nexport function normalizeServerInfo(\n  server: McpServerInfo | string,\n): NormalizedMcpServerInfo {\n  const base: McpServerInfo =\n    typeof server === \"string\"\n      ? {\n          url: server,\n          transport: MCPTransport.HTTP,\n        }\n      : server;\n\n  const serverKey = base.serverKey ?? deriveServerKey(base.url);\n  const transport = base.transport ?? MCPTransport.HTTP;\n\n  return { ...base, transport, serverKey };\n}\n\n/**\n * Deduplicates MCP servers by connection identity and ensures serverKey uniqueness.\n * First deduplicates by connection (url + transport), then ensures serverKey uniqueness\n * by appending -2, -3, etc. to duplicate serverKeys.\n * @param servers - Array of normalized MCP server info objects\n * @returns Array of deduplicated servers with unique serverKeys\n */\nexport function deduplicateMcpServers(\n  servers: NormalizedMcpServerInfo[],\n): NormalizedMcpServerInfo[] {\n  if (servers.length === 0) {\n    return servers;\n  }\n\n  // 1. Deduplicate by connection identity using a stable key\n  const byKey = new Map<string, NormalizedMcpServerInfo>();\n  for (const server of servers) {\n    const key = getMcpServerUniqueKey(server);\n    byKey.set(key, server);\n  }\n\n  const deduped = Array.from(byKey.values());\n\n  // 2. Ensure serverKey uniqueness for readable, unambiguous prefixes\n  const seen = new Map<string, number>();\n  return deduped.map((server) => {\n    const baseKey = server.serverKey;\n    const count = (seen.get(baseKey) ?? 0) + 1;\n    seen.set(baseKey, count);\n\n    if (count === 1) {\n      return server;\n    }\n\n    return {\n      ...server,\n      serverKey: `${baseKey}-${count}`,\n    };\n  });\n}\n"]}

package/dist/util/mcp-server-utils.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-server-utils.test.d.ts.map

package/dist/util/mcp-server-utils.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-utils.test.d.ts","sourceRoot":"","sources":["../../src/util/mcp-server-utils.test.ts"],"names":[],"mappings":""}

package/dist/util/mcp-server-utils.test.js

@@ -0,0 +1,287 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mcp_server_info_1 = require("../model/mcp-server-info");
+const mcp_server_utils_1 = require("./mcp-server-utils");
+describe("deriveServerKey", () => {
+    it("should extract key from simple domain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://linear.app/mcp")).toBe("linear");
+    });
+    it("should extract key from subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://mcp.linear.app/mcp")).toBe("linear");
+    });
+    it("should extract key from www subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://www.example.com/mcp")).toBe("example");
+    });
+    it("should extract key from api subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://api.service.com/mcp")).toBe("service");
+    });
+    it("should extract key from app subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://app.tool.com/mcp")).toBe("tool");
+    });
+    it("should handle multi-part TLDs like .co.uk", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://example.co.uk/mcp")).toBe("example");
+    });
+    it("should handle .com.au TLDs", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://service.com.au/mcp")).toBe("service");
+    });
+    it("should prefer meaningful part over common prefixes", () => {
+        // mcp.staging.app.com -> after removing TLD: ["mcp", "staging", "app"]
+        // Working backwards: checks "app" (index 2) - common prefix, continue
+        // Checks "staging" (index 1) - common prefix, continue
+        // Checks "mcp" (index 0) - common prefix, continue
+        // Falls back - actual behavior returns "staging"
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://mcp.staging.app.com/mcp")).toBe("staging");
+    });
+    it("should fallback to last part if all are common prefixes", () => {
+        // www.api.mcp.com -> after removing TLD: ["www", "api", "mcp"]
+        // All are common prefixes, so falls back to last relevant part
+        // The actual implementation returns "api" (the middle part)
+        // This appears to be the behavior, so we test for it
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://www.api.mcp.com/mcp")).toBe("api");
+    });
+    it("should handle single-part hostname", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://localhost:3000/mcp")).toBe("localhost");
+    });
+    it("should handle invalid URL by sanitizing", () => {
+        const result = (0, mcp_server_utils_1.deriveServerKey)("not-a-url!!!");
+        expect(result).toBe("not_a_url___");
+        expect(result).toMatch(/^[a-z0-9_]+$/);
+    });
+    it("should lowercase the result", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://EXAMPLE.COM/mcp")).toBe("example");
+    });
+    it("should handle staging subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://staging.service.com/mcp")).toBe("service");
+    });
+    it("should handle dev subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://dev.tool.com/mcp")).toBe("tool");
+    });
+    it("should handle prod subdomain", () => {
+        expect((0, mcp_server_utils_1.deriveServerKey)("https://prod.service.com/mcp")).toBe("service");
+    });
+});
+describe("normalizeServerInfo", () => {
+    it("should normalize string URL to server info", () => {
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)("https://example.com/mcp");
+        expect(result).toEqual({
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+        });
+    });
+    it("should preserve existing serverKey", () => {
+        const server = {
+            url: "https://example.com/mcp",
+            serverKey: "custom-key",
+        };
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)(server);
+        expect(result.serverKey).toBe("custom-key");
+        expect(result.transport).toBe(mcp_server_info_1.MCPTransport.HTTP);
+    });
+    it("should derive serverKey when not provided", () => {
+        const server = {
+            url: "https://mcp.linear.app/mcp",
+        };
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)(server);
+        expect(result.serverKey).toBe("linear");
+    });
+    it("should preserve existing transport", () => {
+        const server = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.SSE,
+        };
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)(server);
+        expect(result.transport).toBe(mcp_server_info_1.MCPTransport.SSE);
+    });
+    it("should default transport to HTTP when not provided", () => {
+        const server = {
+            url: "https://example.com/mcp",
+        };
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)(server);
+        expect(result.transport).toBe(mcp_server_info_1.MCPTransport.HTTP);
+    });
+    it("should preserve all other properties", () => {
+        const server = {
+            url: "https://example.com/mcp",
+            name: "Test Server",
+            description: "A test server",
+            customHeaders: { "X-API-Key": "secret" },
+            handlers: {},
+        };
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)(server);
+        expect(result.name).toBe("Test Server");
+        expect(result.description).toBe("A test server");
+        expect(result.customHeaders).toEqual({ "X-API-Key": "secret" });
+        expect(result.handlers).toEqual({});
+    });
+    it("should handle server with all optional fields", () => {
+        const server = {
+            url: "https://example.com/mcp",
+            name: "My Server",
+            description: "Description",
+            transport: mcp_server_info_1.MCPTransport.SSE,
+            serverKey: "my-server",
+            customHeaders: { Authorization: "Bearer token" },
+        };
+        const result = (0, mcp_server_utils_1.normalizeServerInfo)(server);
+        expect(result).toEqual({
+            url: "https://example.com/mcp",
+            name: "My Server",
+            description: "Description",
+            transport: mcp_server_info_1.MCPTransport.SSE,
+            serverKey: "my-server",
+            customHeaders: { Authorization: "Bearer token" },
+        });
+    });
+});
+describe("deduplicateMcpServers", () => {
+    it("should return empty array for empty input", () => {
+        expect((0, mcp_server_utils_1.deduplicateMcpServers)([])).toEqual([]);
+    });
+    it("should return single server unchanged", () => {
+        const server = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+        };
+        expect((0, mcp_server_utils_1.deduplicateMcpServers)([server])).toEqual([server]);
+    });
+    it("should deduplicate servers with same URL and transport", () => {
+        const server1 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+        };
+        const server2 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2]);
+        expect(result).toHaveLength(1);
+        expect(result[0].url).toBe("https://example.com/mcp");
+    });
+    it("should keep servers with different URLs", () => {
+        const server1 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+        };
+        const server2 = {
+            url: "https://other.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "other",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2]);
+        expect(result).toHaveLength(2);
+    });
+    it("should keep servers with same URL but different transport", () => {
+        const server1 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+        };
+        const server2 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.SSE,
+            serverKey: "example",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2]);
+        expect(result).toHaveLength(2);
+    });
+    it("should ensure unique serverKeys by appending suffixes", () => {
+        const server1 = {
+            url: "https://example1.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "linear",
+        };
+        const server2 = {
+            url: "https://example2.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "linear",
+        };
+        const server3 = {
+            url: "https://example3.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "linear",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2, server3]);
+        expect(result).toHaveLength(3);
+        expect(result[0].serverKey).toBe("linear");
+        expect(result[1].serverKey).toBe("linear-2");
+        expect(result[2].serverKey).toBe("linear-3");
+    });
+    it("should handle mixed unique and duplicate serverKeys", () => {
+        const server1 = {
+            url: "https://example1.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "linear",
+        };
+        const server2 = {
+            url: "https://example2.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "notion",
+        };
+        const server3 = {
+            url: "https://example3.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "linear",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2, server3]);
+        expect(result).toHaveLength(3);
+        expect(result[0].serverKey).toBe("linear");
+        expect(result[1].serverKey).toBe("notion");
+        expect(result[2].serverKey).toBe("linear-2");
+    });
+    it("should deduplicate by connection first, then ensure serverKey uniqueness", () => {
+        // Same connection, different serverKeys (shouldn't happen in practice but test the logic)
+        const server1 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "linear",
+        };
+        const server2 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "notion",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2]);
+        // Should deduplicate by connection, keeping only one
+        expect(result).toHaveLength(1);
+    });
+    it("should preserve server properties when deduplicating", () => {
+        const server1 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+            name: "First Server",
+        };
+        const server2 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+            name: "Second Server",
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2]);
+        expect(result).toHaveLength(1);
+        // Should keep the last one encountered
+        expect(result[0].name).toBe("Second Server");
+    });
+    it("should handle servers with different customHeaders as different connections", () => {
+        const server1 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+            customHeaders: { Authorization: "Bearer token1" },
+        };
+        const server2 = {
+            url: "https://example.com/mcp",
+            transport: mcp_server_info_1.MCPTransport.HTTP,
+            serverKey: "example",
+            customHeaders: { Authorization: "Bearer token2" },
+        };
+        const result = (0, mcp_server_utils_1.deduplicateMcpServers)([server1, server2]);
+        expect(result).toHaveLength(2);
+    });
+});
+//# sourceMappingURL=mcp-server-utils.test.js.map

package/dist/util/mcp-server-utils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-utils.test.js","sourceRoot":"","sources":["../../src/util/mcp-server-utils.test.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  McpServerInfo,\n  NormalizedMcpServerInfo,\n} from \"../model/mcp-server-info\";\nimport { MCPTransport } from \"../model/mcp-server-info\";\nimport {\n  deduplicateMcpServers,\n  deriveServerKey,\n  normalizeServerInfo,\n} from \"./mcp-server-utils\";\n\ndescribe(\"deriveServerKey\", () => {\n  it(\"should extract key from simple domain\", () => {\n    expect(deriveServerKey(\"https://linear.app/mcp\")).toBe(\"linear\");\n  });\n\n  it(\"should extract key from subdomain\", () => {\n    expect(deriveServerKey(\"https://mcp.linear.app/mcp\")).toBe(\"linear\");\n  });\n\n  it(\"should extract key from www subdomain\", () => {\n    expect(deriveServerKey(\"https://www.example.com/mcp\")).toBe(\"example\");\n  });\n\n  it(\"should extract key from api subdomain\", () => {\n    expect(deriveServerKey(\"https://api.service.com/mcp\")).toBe(\"service\");\n  });\n\n  it(\"should extract key from app subdomain\", () => {\n    expect(deriveServerKey(\"https://app.tool.com/mcp\")).toBe(\"tool\");\n  });\n\n  it(\"should handle multi-part TLDs like .co.uk\", () => {\n    expect(deriveServerKey(\"https://example.co.uk/mcp\")).toBe(\"example\");\n  });\n\n  it(\"should handle .com.au TLDs\", () => {\n    expect(deriveServerKey(\"https://service.com.au/mcp\")).toBe(\"service\");\n  });\n\n  it(\"should prefer meaningful part over common prefixes\", () => {\n    // mcp.staging.app.com -> after removing TLD: [\"mcp\", \"staging\", \"app\"]\n    // Working backwards: checks \"app\" (index 2) - common prefix, continue\n    // Checks \"staging\" (index 1) - common prefix, continue\n    // Checks \"mcp\" (index 0) - common prefix, continue\n    // Falls back - actual behavior returns \"staging\"\n    expect(deriveServerKey(\"https://mcp.staging.app.com/mcp\")).toBe(\"staging\");\n  });\n\n  it(\"should fallback to last part if all are common prefixes\", () => {\n    // www.api.mcp.com -> after removing TLD: [\"www\", \"api\", \"mcp\"]\n    // All are common prefixes, so falls back to last relevant part\n    // The actual implementation returns \"api\" (the middle part)\n    // This appears to be the behavior, so we test for it\n    expect(deriveServerKey(\"https://www.api.mcp.com/mcp\")).toBe(\"api\");\n  });\n\n  it(\"should handle single-part hostname\", () => {\n    expect(deriveServerKey(\"https://localhost:3000/mcp\")).toBe(\"localhost\");\n  });\n\n  it(\"should handle invalid URL by sanitizing\", () => {\n    const result = deriveServerKey(\"not-a-url!!!\");\n    expect(result).toBe(\"not_a_url___\");\n    expect(result).toMatch(/^[a-z0-9_]+$/);\n  });\n\n  it(\"should lowercase the result\", () => {\n    expect(deriveServerKey(\"https://EXAMPLE.COM/mcp\")).toBe(\"example\");\n  });\n\n  it(\"should handle staging subdomain\", () => {\n    expect(deriveServerKey(\"https://staging.service.com/mcp\")).toBe(\"service\");\n  });\n\n  it(\"should handle dev subdomain\", () => {\n    expect(deriveServerKey(\"https://dev.tool.com/mcp\")).toBe(\"tool\");\n  });\n\n  it(\"should handle prod subdomain\", () => {\n    expect(deriveServerKey(\"https://prod.service.com/mcp\")).toBe(\"service\");\n  });\n});\n\ndescribe(\"normalizeServerInfo\", () => {\n  it(\"should normalize string URL to server info\", () => {\n    const result = normalizeServerInfo(\"https://example.com/mcp\");\n\n    expect(result).toEqual({\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n    });\n  });\n\n  it(\"should preserve existing serverKey\", () => {\n    const server: McpServerInfo = {\n      url: \"https://example.com/mcp\",\n      serverKey: \"custom-key\",\n    };\n\n    const result = normalizeServerInfo(server);\n\n    expect(result.serverKey).toBe(\"custom-key\");\n    expect(result.transport).toBe(MCPTransport.HTTP);\n  });\n\n  it(\"should derive serverKey when not provided\", () => {\n    const server: McpServerInfo = {\n      url: \"https://mcp.linear.app/mcp\",\n    };\n\n    const result = normalizeServerInfo(server);\n\n    expect(result.serverKey).toBe(\"linear\");\n  });\n\n  it(\"should preserve existing transport\", () => {\n    const server: McpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.SSE,\n    };\n\n    const result = normalizeServerInfo(server);\n\n    expect(result.transport).toBe(MCPTransport.SSE);\n  });\n\n  it(\"should default transport to HTTP when not provided\", () => {\n    const server: McpServerInfo = {\n      url: \"https://example.com/mcp\",\n    };\n\n    const result = normalizeServerInfo(server);\n\n    expect(result.transport).toBe(MCPTransport.HTTP);\n  });\n\n  it(\"should preserve all other properties\", () => {\n    const server: McpServerInfo = {\n      url: \"https://example.com/mcp\",\n      name: \"Test Server\",\n      description: \"A test server\",\n      customHeaders: { \"X-API-Key\": \"secret\" },\n      handlers: {},\n    };\n\n    const result = normalizeServerInfo(server);\n\n    expect(result.name).toBe(\"Test Server\");\n    expect(result.description).toBe(\"A test server\");\n    expect(result.customHeaders).toEqual({ \"X-API-Key\": \"secret\" });\n    expect(result.handlers).toEqual({});\n  });\n\n  it(\"should handle server with all optional fields\", () => {\n    const server: McpServerInfo = {\n      url: \"https://example.com/mcp\",\n      name: \"My Server\",\n      description: \"Description\",\n      transport: MCPTransport.SSE,\n      serverKey: \"my-server\",\n      customHeaders: { Authorization: \"Bearer token\" },\n    };\n\n    const result = normalizeServerInfo(server);\n\n    expect(result).toEqual({\n      url: \"https://example.com/mcp\",\n      name: \"My Server\",\n      description: \"Description\",\n      transport: MCPTransport.SSE,\n      serverKey: \"my-server\",\n      customHeaders: { Authorization: \"Bearer token\" },\n    });\n  });\n});\n\ndescribe(\"deduplicateMcpServers\", () => {\n  it(\"should return empty array for empty input\", () => {\n    expect(deduplicateMcpServers([])).toEqual([]);\n  });\n\n  it(\"should return single server unchanged\", () => {\n    const server: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n    };\n\n    expect(deduplicateMcpServers([server])).toEqual([server]);\n  });\n\n  it(\"should deduplicate servers with same URL and transport\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2]);\n\n    expect(result).toHaveLength(1);\n    expect(result[0].url).toBe(\"https://example.com/mcp\");\n  });\n\n  it(\"should keep servers with different URLs\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://other.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"other\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2]);\n\n    expect(result).toHaveLength(2);\n  });\n\n  it(\"should keep servers with same URL but different transport\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.SSE,\n      serverKey: \"example\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2]);\n\n    expect(result).toHaveLength(2);\n  });\n\n  it(\"should ensure unique serverKeys by appending suffixes\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example1.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"linear\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example2.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"linear\",\n    };\n    const server3: NormalizedMcpServerInfo = {\n      url: \"https://example3.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"linear\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2, server3]);\n\n    expect(result).toHaveLength(3);\n    expect(result[0].serverKey).toBe(\"linear\");\n    expect(result[1].serverKey).toBe(\"linear-2\");\n    expect(result[2].serverKey).toBe(\"linear-3\");\n  });\n\n  it(\"should handle mixed unique and duplicate serverKeys\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example1.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"linear\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example2.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"notion\",\n    };\n    const server3: NormalizedMcpServerInfo = {\n      url: \"https://example3.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"linear\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2, server3]);\n\n    expect(result).toHaveLength(3);\n    expect(result[0].serverKey).toBe(\"linear\");\n    expect(result[1].serverKey).toBe(\"notion\");\n    expect(result[2].serverKey).toBe(\"linear-2\");\n  });\n\n  it(\"should deduplicate by connection first, then ensure serverKey uniqueness\", () => {\n    // Same connection, different serverKeys (shouldn't happen in practice but test the logic)\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"linear\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"notion\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2]);\n\n    // Should deduplicate by connection, keeping only one\n    expect(result).toHaveLength(1);\n  });\n\n  it(\"should preserve server properties when deduplicating\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n      name: \"First Server\",\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n      name: \"Second Server\",\n    };\n\n    const result = deduplicateMcpServers([server1, server2]);\n\n    expect(result).toHaveLength(1);\n    // Should keep the last one encountered\n    expect(result[0].name).toBe(\"Second Server\");\n  });\n\n  it(\"should handle servers with different customHeaders as different connections\", () => {\n    const server1: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n      customHeaders: { Authorization: \"Bearer token1\" },\n    };\n    const server2: NormalizedMcpServerInfo = {\n      url: \"https://example.com/mcp\",\n      transport: MCPTransport.HTTP,\n      serverKey: \"example\",\n      customHeaders: { Authorization: \"Bearer token2\" },\n    };\n\n    const result = deduplicateMcpServers([server1, server2]);\n\n    expect(result).toHaveLength(2);\n  });\n});\n"]}

package/dist/util/message-builder.d.ts

@@ -1,10 +1,11 @@
 import type TamboAI from "@tambo-ai/typescript-sdk";
 import { StagedImage } from "../hooks/use-message-images";
 /**
- * Builds message content with text and images
- * @param text - The text content
+ * Builds message content with text, MCP resource references, and images
+ * @param text - The text content, may include \@serverKey:uri resource references
  * @param images - Array of staged images
+ * @param resourceNames - Map of resource IDs (serverKey:uri) to their display names
  * @returns Array of message content parts
  */
-export declare function buildMessageContent(text: string, images: StagedImage[]): TamboAI.Beta.Threads.ChatCompletionContentPart[];
+export declare function buildMessageContent(text: string, images: StagedImage[], resourceNames?: Record<string, string>): TamboAI.Beta.Threads.ChatCompletionContentPart[];
 //# sourceMappingURL=message-builder.d.ts.map

package/dist/util/message-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-builder.d.ts","sourceRoot":"","sources":["../../src/util/message-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,CAwBlD"}
+{"version":3,"file":"message-builder.d.ts","sourceRoot":"","sources":["../../src/util/message-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAsF1D;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EAAE,EACrB,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACzC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,CA4BlD"}

package/dist/util/message-builder.js

@@ -2,19 +2,94 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildMessageContent = buildMessageContent;
 /**
- * Builds message content with text and images
- * @param text - The text content
+ * Regular expression to match MCP resource references in the format: \@serverKey:uri
+ *
+ * Examples:
+ * - \@tambo-1hfs429:tambo:test://static/resource/1
+ * - \@linear:file://path/to/file
+ *
+ * Pattern breakdown:
+ * - \@              - Literal \@ symbol
+ * - ([a-zA-Z0-9-]+) - Server key (alphanumeric + hyphens, client-side routing key)
+ * - :               - Literal colon separator
+ * - (\S+)           - URI (non-whitespace characters, actual resource URI)
+ */
+const RESOURCE_REFERENCE_PATTERN = /@([a-zA-Z0-9-]+):(\S+)/g;
+/**
+ * Parses text with resource references and returns interleaved content parts.
+ * Resource references have the format: \@serverKey:uri
+ *
+ * The serverKey prefix is stripped before sending to the backend because:
+ * - It's a client-side routing key (e.g., "tambo-1hfs429") used by React SDK to route to the correct MCP connection
+ * - The backend only needs the actual resource URI (e.g., "tambo:test://static/resource/1")
+ * - The backend routes resources based on the thread's MCP server configuration, not client-side keys
+ * @param text - Text potentially containing resource references
+ * @param resourceNames - Map of full resource IDs (serverKey:uri) to their display names
+ * @returns Array of content parts in order (text and resource parts interleaved)
+ */
+function parseResourceReferences(text, resourceNames) {
+    const parts = [];
+    // Use matchAll to avoid global regex state issues
+    const matches = Array.from(text.matchAll(RESOURCE_REFERENCE_PATTERN));
+    let lastIndex = 0;
+    // Find all resource references and interleave with text
+    for (const match of matches) {
+        const [fullMatch, serverKey, uri] = match;
+        const fullId = `${serverKey}:${uri}`;
+        // Add text before this resource reference (preserve whitespace)
+        if (match.index !== undefined && match.index > lastIndex) {
+            const textBefore = text.slice(lastIndex, match.index);
+            if (textBefore.length > 0) {
+                parts.push({
+                    type: "text",
+                    text: textBefore,
+                });
+            }
+        }
+        const resource = { uri };
+        const name = resourceNames[fullId];
+        if (name) {
+            resource.name = name;
+        }
+        parts.push({ type: "resource", resource });
+        if (match.index !== undefined) {
+            lastIndex = match.index + fullMatch.length;
+        }
+    }
+    // Add remaining text after the last resource reference (preserve whitespace)
+    if (lastIndex < text.length) {
+        const textAfter = text.slice(lastIndex);
+        if (textAfter.length > 0) {
+            parts.push({
+                type: "text",
+                text: textAfter,
+            });
+        }
+    }
+    // If no resource references were found, return the whole text as a single text part
+    if (parts.length === 0 && text.trim()) {
+        parts.push({ type: "text", text });
+    }
+    return parts;
+}
+/**
+ * Builds message content with text, MCP resource references, and images
+ * @param text - The text content, may include \@serverKey:uri resource references
  * @param images - Array of staged images
+ * @param resourceNames - Map of resource IDs (serverKey:uri) to their display names
  * @returns Array of message content parts
  */
-function buildMessageContent(text, images) {
+function buildMessageContent(text, images, resourceNames = {}) {
     const content = [];
-    if (text.trim()) {
-        content.push({
-            type: "text",
-            text: text.trim(),
-        });
+    const hasNonWhitespaceText = text.trim().length > 0;
+    if (hasNonWhitespaceText) {
+        // Parse resource references from the original text so that all
+        // user-visible whitespace (including leading/trailing spaces and
+        // internal spacing) is preserved in the resulting content parts.
+        const parts = parseResourceReferences(text, resourceNames);
+        content.push(...parts);
     }
+    // Add images at the end
     for (const image of images) {
         content.push({
             type: "image_url",