integrate-sdk 0.9.56 → 0.9.61

package/dist/server.js

@@ -3449,6 +3449,169 @@ class HttpSessionTransport {
 // src/client.ts
 init_integration_summary();
 init_library_metadata();
+
+// src/database/token-store.ts
+var USABLE_ACCESS_TOKEN_BUFFER_MS = 30 * 1000;
+var MIN_MEANINGFUL_EXPIRY_MS = Date.UTC(2000, 0, 1);
+function getRowUpdatedAtMs(row) {
+  return row.updatedAt instanceof Date ? row.updatedAt.getTime() : 0;
+}
+function normalizeAccountEmail(value) {
+  if (!value)
+    return null;
+  const normalized = value.trim().toLowerCase();
+  return normalized.length > 0 ? normalized : null;
+}
+function normalizeAccountEmailHint(value) {
+  const normalized = normalizeAccountEmail(value);
+  if (!normalized)
+    return null;
+  return normalized.includes("@") ? normalized : null;
+}
+function normalizeAccountIdentifier(value) {
+  return normalizeAccountEmail(value);
+}
+function normalizeAccountIdHint(value) {
+  if (!value)
+    return null;
+  const normalized = value.trim().toLowerCase();
+  return normalized.length > 0 ? normalized : null;
+}
+function normalizeProviderTokenType(value) {
+  const normalized = value?.trim();
+  return normalized && normalized.length > 0 ? normalized : "Bearer";
+}
+function hasMeaningfulExpiresAt(value) {
+  if (!value)
+    return false;
+  const ms = value.getTime();
+  return Number.isFinite(ms) && ms >= MIN_MEANINGFUL_EXPIRY_MS;
+}
+function hasUsableAccessToken(row, now = Date.now(), bufferMs = USABLE_ACCESS_TOKEN_BUFFER_MS) {
+  if (!row.accessToken)
+    return false;
+  const expiresAt = row.expiresAt;
+  if (!hasMeaningfulExpiresAt(expiresAt))
+    return true;
+  return expiresAt.getTime() > now + bufferMs;
+}
+function isLikelyUsableToken(row, now = Date.now()) {
+  return hasUsableAccessToken(row, now) || Boolean(row.refreshToken);
+}
+function parseScopes(scope) {
+  if (!scope)
+    return;
+  const scopes = scope.split(" ").map((item) => item.trim()).filter((item) => item.length > 0);
+  return scopes.length > 0 ? scopes : undefined;
+}
+function choosePreferredTokenRow(rows) {
+  if (rows.length === 0)
+    return;
+  const sorted = [...rows].sort((left, right) => getRowUpdatedAtMs(right) - getRowUpdatedAtMs(left));
+  return sorted.find((row) => hasUsableAccessToken(row)) ?? sorted.find((row) => Boolean(row.refreshToken)) ?? sorted[0];
+}
+function selectProviderTokenRow(rows, email, accountId) {
+  if (rows.length === 0) {
+    return;
+  }
+  const normalizedEmail = normalizeAccountEmailHint(email);
+  const normalizedAccountId = normalizeAccountIdHint(accountId);
+  if (normalizedAccountId && normalizedEmail) {
+    const exactBoth = rows.filter((row) => normalizeAccountIdHint(row.accountId) === normalizedAccountId && normalizeAccountEmail(row.accountEmail) === normalizedEmail);
+    if (exactBoth.length > 0) {
+      return choosePreferredTokenRow(exactBoth);
+    }
+  }
+  if (normalizedAccountId) {
+    const exactAccountId = rows.filter((row) => normalizeAccountIdHint(row.accountId) === normalizedAccountId);
+    if (exactAccountId.length > 0) {
+      return choosePreferredTokenRow(exactAccountId);
+    }
+  }
+  if (normalizedEmail) {
+    const exactEmail = rows.filter((row) => normalizeAccountEmail(row.accountEmail) === normalizedEmail);
+    if (exactEmail.length > 0) {
+      return choosePreferredTokenRow(exactEmail);
+    }
+  } else if (email) {
+    const normalizedIdentifier = normalizeAccountIdentifier(email);
+    if (normalizedIdentifier) {
+      const identifierMatches = rows.filter((row) => normalizeAccountIdHint(row.accountId) === normalizedIdentifier);
+      if (identifierMatches.length > 0) {
+        return choosePreferredTokenRow(identifierMatches);
+      }
+    }
+  }
+  if (normalizedAccountId || normalizedEmail) {
+    const legacyRows = rows.filter((row) => !normalizeAccountIdHint(row.accountId) && !normalizeAccountEmail(row.accountEmail));
+    if (legacyRows.length === 1) {
+      return choosePreferredTokenRow(legacyRows);
+    }
+    return;
+  }
+  return choosePreferredTokenRow(rows);
+}
+function providerTokenRecordToData(row) {
+  const expiresAt = hasMeaningfulExpiresAt(row.expiresAt) ? row.expiresAt : null;
+  const expiresIn = expiresAt ? Math.max(0, Math.floor((expiresAt.getTime() - Date.now()) / 1000)) : 3600;
+  return {
+    accessToken: row.accessToken,
+    refreshToken: row.refreshToken ?? undefined,
+    tokenType: normalizeProviderTokenType(row.tokenType),
+    expiresIn,
+    expiresAt: expiresAt?.toISOString(),
+    scopes: parseScopes(row.scope),
+    email: row.accountEmail ?? undefined,
+    accountId: row.accountId ?? undefined
+  };
+}
+function listConnectedProvidersFromRows(rows, configuredIntegrationIds) {
+  const allowed = configuredIntegrationIds ? new Set(configuredIntegrationIds) : undefined;
+  const rowsByProvider = new Map;
+  for (const row of rows) {
+    if (allowed && !allowed.has(row.provider))
+      continue;
+    const existing = rowsByProvider.get(row.provider);
+    if (existing) {
+      existing.push(row);
+    } else {
+      rowsByProvider.set(row.provider, [row]);
+    }
+  }
+  const connected = [];
+  for (const [provider, providerRows] of rowsByProvider.entries()) {
+    const selected = selectProviderTokenRow(providerRows);
+    if (selected && isLikelyUsableToken(selected)) {
+      connected.push(provider);
+    }
+  }
+  return connected.sort();
+}
+async function listConnectedProviders(configuredIntegrationIds, getProviderToken, context) {
+  if (!context.userId || configuredIntegrationIds.length === 0) {
+    return [];
+  }
+  const connected = [];
+  await Promise.all(configuredIntegrationIds.map(async (provider) => {
+    try {
+      const token = await getProviderToken(provider, undefined, context);
+      if (token?.accessToken || typeof token?.refreshToken === "string" && token.refreshToken.length > 0) {
+        connected.push(provider);
+      }
+    } catch {}
+  }));
+  return connected.sort();
+}
+function defaultResolveAccountIdentity(provider, tokenData, emailHint) {
+  const accountEmail = normalizeAccountEmail(emailHint ?? tokenData.email ?? null);
+  let accountId = normalizeAccountIdHint(tokenData.accountId ?? null);
+  if (!accountId && accountEmail) {
+    accountId = `${provider}:${accountEmail}`;
+  }
+  return { accountEmail, accountId };
+}
+
+// src/client.ts
 init_errors();
 init_logger();
 
@@ -5135,7 +5298,7 @@ class MCPClientBase {
     logger5.debug(`Discovered ${totalDiscovered} tools, ${enabledCount} enabled by integrations`);
   }
   async _callToolByName(name, args, options) {
-    return await this.callToolWithRetry(name, args, 0, options);
+    return await this.callTool(name, args, options);
   }
   async callTool(name, args, options) {
     return await this.callToolWithRetry(name, args, 0, options);
@@ -5314,20 +5477,32 @@ class MCPClientBase {
   getEnabledTools() {
     return Array.from(this.availableTools.values()).filter((tool) => this.enabledToolNames.has(tool.name));
   }
-  async getEnabledToolsAsync() {
-    if (this.isConnected() && this.availableTools.size > 0) {
-      return this.getEnabledTools();
+  async getEnabledToolsAsync(options) {
+    const targetIntegrationIds = await this.resolveTargetIntegrationIds(options);
+    if (targetIntegrationIds.size === 0) {
+      return [];
     }
-    if (this.availableTools.size > 0) {
-      return this.getEnabledTools();
+    const filterToTargets = (tools2) => this.filterToolsToIntegrations(tools2, targetIntegrationIds);
+    const hasCompleteCache = () => {
+      for (const integration of this.integrations) {
+        if (!targetIntegrationIds.has(integration.id))
+          continue;
+        for (const toolName of integration.tools) {
+          if (!this.enabledToolNames.has(toolName))
+            continue;
+          if (!this.availableTools.has(toolName))
+            return false;
+        }
+      }
+      return this.availableTools.size > 0;
+    };
+    if (this.availableTools.size > 0 && hasCompleteCache()) {
+      return filterToTargets(this.getEnabledTools());
     }
     const tools = [];
-    const integrationIds = new Set;
-    for (const integration of this.integrations) {
-      integrationIds.add(integration.id);
-    }
     const { parallelWithLimit: parallelWithLimit2 } = await Promise.resolve().then(() => exports_concurrency);
-    const integrationToolsResults = await parallelWithLimit2(Array.from(integrationIds), async (integrationId) => {
+    const concurrency = options?.fetchConcurrency ?? 8;
+    const integrationToolsResults = await parallelWithLimit2(Array.from(targetIntegrationIds), async (integrationId) => {
       try {
         const response = await this.callServerToolInternal("list_tools_by_integration", {
           integration: integrationId
@@ -5338,25 +5513,14 @@ class MCPClientBase {
             if (item.type === "text" && item.text) {
               try {
                 const parsed = JSON.parse(item.text);
-                if (Array.isArray(parsed)) {
-                  for (const tool of parsed) {
-                    if (tool.name && tool.inputSchema) {
-                      integrationTools.push({
-                        name: tool.name,
-                        description: tool.description,
-                        inputSchema: tool.inputSchema
-                      });
-                    }
-                  }
-                } else if (parsed.tools && Array.isArray(parsed.tools)) {
-                  for (const tool of parsed.tools) {
-                    if (tool.name && tool.inputSchema) {
-                      integrationTools.push({
-                        name: tool.name,
-                        description: tool.description,
-                        inputSchema: tool.inputSchema
-                      });
-                    }
+                const parsedTools = Array.isArray(parsed) ? parsed : parsed.tools && Array.isArray(parsed.tools) ? parsed.tools : [];
+                for (const tool of parsedTools) {
+                  if (tool.name && tool.inputSchema) {
+                    integrationTools.push({
+                      name: tool.name,
+                      description: tool.description,
+                      inputSchema: tool.inputSchema
+                    });
                   }
                 }
               } catch {}
@@ -5368,14 +5532,40 @@ class MCPClientBase {
         logger5.error(`Failed to fetch tools for integration ${integrationId}:`, error);
         return [];
       }
-    }, 3);
+    }, concurrency);
     for (const integrationTools of integrationToolsResults) {
       tools.push(...integrationTools);
     }
     for (const tool of tools) {
       this.availableTools.set(tool.name, tool);
     }
-    return tools.filter((tool) => this.enabledToolNames.has(tool.name));
+    return filterToTargets(tools.filter((tool) => this.enabledToolNames.has(tool.name)));
+  }
+  async resolveTargetIntegrationIds(options) {
+    const configuredIds = this.integrations.map((integration) => integration.id);
+    const configuredSet = new Set(configuredIds);
+    if (options?.integrationIds && options.integrationIds.length > 0) {
+      return new Set(options.integrationIds.filter((id) => configuredSet.has(id)));
+    }
+    if (options?.connectedOnly && options.context?.userId) {
+      const connected = await listConnectedProviders(configuredIds, (provider, email, context) => this.oauthManager.getProviderToken(provider, email, context), options.context);
+      return new Set(connected);
+    }
+    return configuredSet;
+  }
+  filterToolsToIntegrations(tools, integrationIds) {
+    if (integrationIds.size === 0) {
+      return [];
+    }
+    const allowedNames = new Set;
+    for (const integration of this.integrations) {
+      if (!integrationIds.has(integration.id))
+        continue;
+      for (const toolName of integration.tools) {
+        allowedNames.add(toolName);
+      }
+    }
+    return tools.filter((tool) => this.enabledToolNames.has(tool.name) && allowedNames.has(tool.name));
   }
   getOAuthConfig(integrationId) {
     const integration = this.integrations.find((p) => p.id === integrationId);
@@ -5958,6 +6148,51 @@ async function sendWebResponse(webRes, nodeRes) {
 // src/server.ts
 init_logger();
 
+// src/utils/normalize-tool-name.ts
+var TOOL_ALIASES = {
+  github_list_repo_contents: "github_get_file_contents",
+  gdrive_list: "gdrive_list_files",
+  gdrive_get: "gdrive_get_file",
+  gdrive_delete: "gdrive_delete_file",
+  gdrive_trash: "gdrive_trash_file",
+  gdrive_upload: "gdrive_upload_text_file",
+  gdrive_download: "gdrive_download_file",
+  slack_send: "slack_send_message",
+  gmail_send: "gmail_send_email",
+  notion_create_page: "notion_create_page"
+};
+function normalizeToolName(toolName, integrationCandidates = []) {
+  if (TOOL_ALIASES[toolName]) {
+    return TOOL_ALIASES[toolName];
+  }
+  const tripleIdx = toolName.indexOf("___");
+  if (tripleIdx > 0) {
+    const prefix = toolName.slice(0, tripleIdx);
+    const suffix = toolName.slice(tripleIdx + 3);
+    if (integrationCandidates.some((c) => c === prefix)) {
+      if (suffix.startsWith("_")) {
+        return `___${suffix.slice(1)}`;
+      }
+      return `${prefix}_${suffix}`;
+    }
+  }
+  for (const candidate of integrationCandidates) {
+    const doublePrefix = `${candidate}_${candidate}_`;
+    if (toolName.startsWith(doublePrefix)) {
+      return `${candidate}_${toolName.slice(doublePrefix.length)}`;
+    }
+  }
+  const firstUnderscore = toolName.indexOf("_");
+  if (firstUnderscore > 0) {
+    const prefix = toolName.slice(0, firstUnderscore);
+    const rest = toolName.slice(firstUnderscore + 1);
+    if (integrationCandidates.includes(prefix) && rest.startsWith(`${prefix}_`)) {
+      return `${prefix}_${rest.slice(prefix.length + 1)}`;
+    }
+  }
+  return toolName;
+}
+
 // src/integrations/github.ts
 init_logger();
 var logger8 = createLogger("GitHub");
@@ -18330,6 +18565,15 @@ var coerce = {
 };
 var NEVER = INVALID;
 // src/ai/utils.ts
+function toEnabledToolsAsyncOptions(options) {
+  if (!options)
+    return;
+  const { integrationIds, connectedOnly, context, fetchConcurrency } = options;
+  if (integrationIds === undefined && connectedOnly === undefined && context === undefined && fetchConcurrency === undefined) {
+    return;
+  }
+  return { integrationIds, connectedOnly, context, fetchConcurrency };
+}
 function getProviderForTool(client, toolName) {
   return client.getProviderForTool?.(toolName);
 }
@@ -18635,6 +18879,82 @@ function createTriggerTools(config, context) {
 
 // src/ai/vercel-ai.ts
 init_tool_builder();
+
+// src/ai/tool-cache.ts
+function buildToolDiscoveryCacheKey(userId, connectedIntegrationIds) {
+  const sorted = [...connectedIntegrationIds].sort().join(",");
+  return `${userId}:${sorted}`;
+}
+function createMemoryToolDiscoveryCache() {
+  const store = new Map;
+  return {
+    async get(key) {
+      const entry = store.get(key);
+      if (!entry)
+        return null;
+      if (entry.expiresAt <= Date.now()) {
+        store.delete(key);
+        return null;
+      }
+      return entry.stubs;
+    },
+    async set(key, stubs, ttlMs = 5 * 60 * 1000) {
+      store.set(key, { stubs, expiresAt: Date.now() + ttlMs });
+    },
+    async invalidate(userIdOrKey) {
+      for (const key of [...store.keys()]) {
+        if (key === userIdOrKey || key.startsWith(`${userIdOrKey}:`)) {
+          store.delete(key);
+        }
+      }
+    }
+  };
+}
+function createToolDiscoveryCacheInvalidator(cache) {
+  return ({ userId }) => {
+    cache.invalidate(userId);
+  };
+}
+async function resolveToolDiscoveryCacheKey(client, context, options) {
+  const userId = context.userId;
+  if (!userId)
+    return;
+  const configuredIds = (client.integrations ?? []).map((i) => i.id);
+  let targetIds;
+  if (options?.integrationIds?.length) {
+    targetIds = options.integrationIds;
+  } else if (options?.connectedOnly) {
+    targetIds = await listConnectedProviders(configuredIds, (provider, email, ctx) => client.getProviderToken(provider, email, ctx), context);
+  } else {
+    targetIds = configuredIds;
+  }
+  return buildToolDiscoveryCacheKey(userId, targetIds);
+}
+function stubsFromTools(tools) {
+  return tools.map((t) => ({
+    name: t.name,
+    description: t.description,
+    inputSchema: t.inputSchema
+  }));
+}
+function applyToolDiscoveryCache(client, stubs) {
+  client.hydrateToolCache(stubs);
+}
+async function persistToolDiscoveryCache(client, cache, cacheKey, ttlMs) {
+  const tools = client.getAvailableTools();
+  if (tools.length === 0)
+    return;
+  await cache.set(cacheKey, stubsFromTools(tools), ttlMs);
+}
+async function warmToolDiscoveryFromCache(client, cache, cacheKey) {
+  const stubs = await cache.get(cacheKey);
+  if (!stubs || stubs.length === 0)
+    return false;
+  applyToolDiscoveryCache(client, stubs);
+  return true;
+}
+
+// src/ai/vercel-ai.ts
 function convertMCPToolToVercelAI(mcpTool, client, options) {
   return {
     description: mcpTool.description || `Execute ${mcpTool.name}`,
@@ -18656,7 +18976,21 @@ async function getVercelAITools(client, options) {
   }
   const finalOptions = providerTokens ? { ...options, providerTokens } : options;
   await ensureClientConnected(client);
-  const mcpTools = await client.getEnabledToolsAsync();
+  const cacheConfig = options?.cache;
+  let cacheKey;
+  if (cacheConfig?.cache && options?.context) {
+    cacheKey = await resolveToolDiscoveryCacheKey(client, options.context, {
+      integrationIds: options.integrationIds,
+      connectedOnly: options.connectedOnly
+    });
+    if (cacheKey) {
+      await warmToolDiscoveryFromCache(client, cacheConfig.cache, cacheKey);
+    }
+  }
+  const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
+  if (cacheConfig?.cache && cacheKey) {
+    await persistToolDiscoveryCache(client, cacheConfig.cache, cacheKey, cacheConfig.ttlMs);
+  }
   const vercelTools = {};
   let effectiveMode;
   if (options?.mode !== undefined) {
@@ -19962,7 +20296,7 @@ async function getOpenAITools(client, options) {
   }
   const finalOptions = providerTokens ? { ...options, providerTokens } : options;
   await ensureClientConnected(client);
-  const mcpTools = await client.getEnabledToolsAsync();
+  const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
   let effectiveMode;
   if (options?.mode !== undefined) {
     effectiveMode = options.mode;
@@ -20024,7 +20358,7 @@ async function handleOpenAIToolCalls(client, toolCalls, options) {
   const getCodeModeTool = async () => {
     if (cachedCodeModeTool)
       return cachedCodeModeTool;
-    const mcpTools = await client.getEnabledToolsAsync();
+    const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
     cachedCodeModeTool = buildCodeModeTool(client, {
       tools: mcpTools,
       providerTokens: options?.providerTokens,
@@ -20108,7 +20442,7 @@ async function handleAnthropicToolCalls(client, messageContent, options) {
   const getCodeModeTool = async () => {
     if (cachedCodeModeTool)
       return cachedCodeModeTool;
-    const mcpTools = await client.getEnabledToolsAsync();
+    const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
     cachedCodeModeTool = buildCodeModeTool(client, {
       tools: mcpTools,
       providerTokens: options?.providerTokens,
@@ -20159,7 +20493,7 @@ async function getAnthropicTools(client, options) {
   }
   const finalOptions = providerTokens ? { ...options, providerTokens } : options;
   await ensureClientConnected(client);
-  const mcpTools = await client.getEnabledToolsAsync();
+  const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
   let effectiveMode;
   if (options?.mode !== undefined) {
     effectiveMode = options.mode;
@@ -20325,7 +20659,7 @@ async function executeGoogleFunctionCalls(client, functionCalls, options) {
   const getCodeModeTool = async () => {
     if (cachedCodeModeTool)
       return cachedCodeModeTool;
-    const mcpTools = await client.getEnabledToolsAsync();
+    const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
     cachedCodeModeTool = buildCodeModeTool(client, {
       tools: mcpTools,
       providerTokens: finalOptions?.providerTokens,
@@ -20364,7 +20698,7 @@ async function getGoogleTools(client, options) {
   }
   const finalOptions = providerTokens ? { ...options, providerTokens } : options;
   await ensureClientConnected(client);
-  const mcpTools = await client.getEnabledToolsAsync();
+  const mcpTools = await client.getEnabledToolsAsync(toEnabledToolsAsyncOptions(options));
   let effectiveMode;
   if (options?.mode !== undefined) {
     effectiveMode = options.mode;
@@ -21233,130 +21567,126 @@ function zohoSprintsIntegration(config = {}) {
     }
   };
 }
-// src/database/token-store.ts
-var USABLE_ACCESS_TOKEN_BUFFER_MS = 30 * 1000;
-var MIN_MEANINGFUL_EXPIRY_MS = Date.UTC(2000, 0, 1);
-function getRowUpdatedAtMs(row) {
-  return row.updatedAt instanceof Date ? row.updatedAt.getTime() : 0;
-}
-function normalizeAccountEmail(value) {
-  if (!value)
-    return null;
-  const normalized = value.trim().toLowerCase();
-  return normalized.length > 0 ? normalized : null;
-}
-function normalizeAccountEmailHint(value) {
-  const normalized = normalizeAccountEmail(value);
-  if (!normalized)
-    return null;
-  return normalized.includes("@") ? normalized : null;
-}
-function normalizeAccountIdentifier(value) {
-  return normalizeAccountEmail(value);
-}
-function normalizeAccountIdHint(value) {
-  if (!value)
-    return null;
-  const normalized = value.trim().toLowerCase();
-  return normalized.length > 0 ? normalized : null;
-}
-function normalizeProviderTokenType(value) {
-  const normalized = value?.trim();
-  return normalized && normalized.length > 0 ? normalized : "Bearer";
-}
-function hasMeaningfulExpiresAt(value) {
-  if (!value)
-    return false;
-  const ms = value.getTime();
-  return Number.isFinite(ms) && ms >= MIN_MEANINGFUL_EXPIRY_MS;
-}
-function hasUsableAccessToken(row, now = Date.now(), bufferMs = USABLE_ACCESS_TOKEN_BUFFER_MS) {
-  if (!row.accessToken)
-    return false;
-  const expiresAt = row.expiresAt;
-  if (!hasMeaningfulExpiresAt(expiresAt))
-    return true;
-  return expiresAt.getTime() > now + bufferMs;
-}
-function isLikelyUsableToken(row, now = Date.now()) {
-  return hasUsableAccessToken(row, now) || Boolean(row.refreshToken);
-}
-function parseScopes(scope) {
-  if (!scope)
-    return;
-  const scopes = scope.split(" ").map((item) => item.trim()).filter((item) => item.length > 0);
-  return scopes.length > 0 ? scopes : undefined;
-}
-function choosePreferredTokenRow(rows) {
-  if (rows.length === 0)
-    return;
-  const sorted = [...rows].sort((left, right) => getRowUpdatedAtMs(right) - getRowUpdatedAtMs(left));
-  return sorted.find((row) => hasUsableAccessToken(row)) ?? sorted.find((row) => Boolean(row.refreshToken)) ?? sorted[0];
-}
-function selectProviderTokenRow(rows, email, accountId) {
-  if (rows.length === 0) {
-    return;
-  }
-  const normalizedEmail = normalizeAccountEmailHint(email);
-  const normalizedAccountId = normalizeAccountIdHint(accountId);
-  if (normalizedAccountId && normalizedEmail) {
-    const exactBoth = rows.filter((row) => normalizeAccountIdHint(row.accountId) === normalizedAccountId && normalizeAccountEmail(row.accountEmail) === normalizedEmail);
-    if (exactBoth.length > 0) {
-      return choosePreferredTokenRow(exactBoth);
-    }
-  }
-  if (normalizedAccountId) {
-    const exactAccountId = rows.filter((row) => normalizeAccountIdHint(row.accountId) === normalizedAccountId);
-    if (exactAccountId.length > 0) {
-      return choosePreferredTokenRow(exactAccountId);
-    }
-  }
-  if (normalizedEmail) {
-    const exactEmail = rows.filter((row) => normalizeAccountEmail(row.accountEmail) === normalizedEmail);
-    if (exactEmail.length > 0) {
-      return choosePreferredTokenRow(exactEmail);
-    }
-  } else if (email) {
-    const normalizedIdentifier = normalizeAccountIdentifier(email);
-    if (normalizedIdentifier) {
-      const identifierMatches = rows.filter((row) => normalizeAccountIdHint(row.accountId) === normalizedIdentifier);
-      if (identifierMatches.length > 0) {
-        return choosePreferredTokenRow(identifierMatches);
-      }
-    }
-  }
-  if (normalizedAccountId || normalizedEmail) {
-    const legacyRows = rows.filter((row) => !normalizeAccountIdHint(row.accountId) && !normalizeAccountEmail(row.accountEmail));
-    if (legacyRows.length === 1) {
-      return choosePreferredTokenRow(legacyRows);
-    }
-    return;
-  }
-  return choosePreferredTokenRow(rows);
-}
-function providerTokenRecordToData(row) {
-  const expiresAt = hasMeaningfulExpiresAt(row.expiresAt) ? row.expiresAt : null;
-  const expiresIn = expiresAt ? Math.max(0, Math.floor((expiresAt.getTime() - Date.now()) / 1000)) : 3600;
-  return {
-    accessToken: row.accessToken,
-    refreshToken: row.refreshToken ?? undefined,
-    tokenType: normalizeProviderTokenType(row.tokenType),
-    expiresIn,
-    expiresAt: expiresAt?.toISOString(),
-    scopes: parseScopes(row.scope),
-    email: row.accountEmail ?? undefined,
-    accountId: row.accountId ?? undefined
-  };
+// src/integrations/bundle.ts
+function allIntegrations() {
+  return [
+    githubIntegration(),
+    gmailIntegration(),
+    notionIntegration(),
+    slackIntegration(),
+    discordIntegration(),
+    boxIntegration(),
+    paypalIntegration(),
+    squareIntegration(),
+    spotifyIntegration(),
+    stravaIntegration(),
+    asanaIntegration(),
+    confluenceIntegration(),
+    oktaIntegration(),
+    quickbooksIntegration(),
+    bitbucketIntegration(),
+    smartthingsIntegration(),
+    googleAdsIntegration(),
+    pinterestIntegration(),
+    twitchIntegration(),
+    xIntegration(),
+    ebayIntegration(),
+    miroIntegration(),
+    smartsheetIntegration(),
+    docusignIntegration(),
+    pipedriveIntegration(),
+    freshserviceIntegration(),
+    zohoCrmIntegration(),
+    zohoMailIntegration(),
+    zohoDeskIntegration(),
+    zohoBooksIntegration(),
+    zohoProjectsIntegration(),
+    zohoCampaignsIntegration(),
+    zohoAnalyticsIntegration(),
+    zohoInvoiceIntegration(),
+    linearIntegration(),
+    vercelIntegration(),
+    zendeskIntegration(),
+    stripeIntegration(),
+    gcalIntegration(),
+    gmeetIntegration(),
+    gtasksIntegration(),
+    gkeepIntegration(),
+    gcontactsIntegration(),
+    outlookIntegration(),
+    teamsIntegration(),
+    airtableIntegration(),
+    attioIntegration(),
+    todoistIntegration(),
+    whatsappIntegration(),
+    calcomIntegration(),
+    canvaIntegration(),
+    cloudflareIntegration(),
+    rampIntegration(),
+    onedriveIntegration(),
+    plannerIntegration(),
+    sharepointIntegration(),
+    wordIntegration(),
+    excelIntegration(),
+    powerpointIntegration(),
+    gdocsIntegration(),
+    gdriveIntegration(),
+    gsheetsIntegration(),
+    gslidesIntegration(),
+    polarIntegration(),
+    facebookIntegration(),
+    figmaIntegration(),
+    intercomIntegration(),
+    hubspotIntegration(),
+    instagramIntegration(),
+    linkedinIntegration(),
+    threadsIntegration(),
+    tiktokIntegration(),
+    typeformIntegration(),
+    xeroIntegration(),
+    gchatIntegration(),
+    shopifyIntegration(),
+    youtubeIntegration(),
+    zoomIntegration(),
+    redditIntegration(),
+    cursorIntegration(),
+    posthogIntegration(),
+    sentryIntegration(),
+    datadogIntegration(),
+    netlifyIntegration(),
+    mondayIntegration(),
+    webflowIntegration(),
+    jiraIntegration(),
+    salesforceIntegration(),
+    workdayIntegration(),
+    calendlyIntegration(),
+    klaviyoIntegration(),
+    googleFormsIntegration(),
+    firebaseIntegration(),
+    microsoftToDoIntegration(),
+    onenoteIntegration(),
+    microsoftBookingsIntegration(),
+    azureDevopsIntegration(),
+    googlePlayConsoleIntegration(),
+    squarespaceIntegration(),
+    zohoPeopleIntegration(),
+    zohoRecruitIntegration(),
+    zohoSignIntegration(),
+    zohoWorkdriveIntegration(),
+    zohoCreatorIntegration(),
+    zohoInventoryIntegration(),
+    zohoBillingIntegration(),
+    zohoWriterIntegration(),
+    zohoSprintsIntegration()
+  ];
 }
-function defaultResolveAccountIdentity(provider, tokenData, emailHint) {
-  const accountEmail = normalizeAccountEmail(emailHint ?? tokenData.email ?? null);
-  let accountId = normalizeAccountIdHint(tokenData.accountId ?? null);
-  if (!accountId && accountEmail) {
-    accountId = `${provider}:${accountEmail}`;
-  }
-  return { accountEmail, accountId };
+function createIntegrationBundle(options) {
+  const all = allIntegrations();
+  if (!options?.include?.length)
+    return all;
+  const allowed = new Set(options.include);
+  return all.filter((i) => allowed.has(i.id));
 }
-
 // src/database/trigger-store.ts
 function toIsoString(value) {
   if (!value)
@@ -24693,6 +25023,69 @@ var integrateTrigger = pgTable("trigger", {
   index("trigger_status_idx").on(table.status),
   index("trigger_next_run_at_idx").on(table.nextRunAt)
 ]);
+// src/utils/parse-tool-result.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getBooleanProperty(value, key) {
+  const property = value[key];
+  return typeof property === "boolean" ? property : undefined;
+}
+function getStringProperty(value, key) {
+  const property = value[key];
+  if (typeof property !== "string") {
+    return;
+  }
+  const trimmed = property.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function getStructuredContent(result) {
+  const structuredContent = result.structuredContent;
+  return isRecord(structuredContent) ? structuredContent : undefined;
+}
+function getContentText(result) {
+  const content = result.content;
+  if (!Array.isArray(content)) {
+    return;
+  }
+  for (const item of content) {
+    if (!isRecord(item)) {
+      continue;
+    }
+    const text2 = getStringProperty(item, "text");
+    if (text2) {
+      return text2;
+    }
+  }
+  return;
+}
+function isMCPToolError(result) {
+  return parseMCPToolResult(result).ok === false;
+}
+function parseMCPToolResult(result) {
+  if (!isRecord(result)) {
+    return {
+      ok: true,
+      data: result,
+      raw: result
+    };
+  }
+  const structuredContent = getStructuredContent(result);
+  const failed = getBooleanProperty(result, "isError") === true || getBooleanProperty(result, "success") === false || getBooleanProperty(structuredContent ?? {}, "isError") === true || getBooleanProperty(structuredContent ?? {}, "success") === false;
+  if (!failed) {
+    return {
+      ok: true,
+      data: structuredContent ?? result,
+      raw: result
+    };
+  }
+  return {
+    ok: false,
+    error: getStringProperty(result, "error") ?? getStringProperty(structuredContent ?? {}, "error") ?? getContentText(result) ?? "Tool returned an error result",
+    raw: result
+  };
+}
+
 // src/server.ts
 var SERVER_LOG_CONTEXT3 = "server";
 var logger203 = createLogger("MCPServer", SERVER_LOG_CONTEXT3);
@@ -24766,33 +25159,6 @@ function resolveProviderFromToolName(toolName, candidates) {
   }
   return best;
 }
-var TOOL_ALIASES = {
-  github_list_repo_contents: "github_get_file_contents",
-  gdrive_list: "gdrive_list_files",
-  gdrive_get: "gdrive_get_file",
-  gdrive_delete: "gdrive_delete_file",
-  gdrive_trash: "gdrive_trash_file",
-  gdrive_upload: "gdrive_upload_text_file",
-  gdrive_download: "gdrive_download_file"
-};
-function normalizeToolName(toolName, candidates) {
-  if (TOOL_ALIASES[toolName])
-    return TOOL_ALIASES[toolName];
-  const tripleIdx = toolName.indexOf("___");
-  if (tripleIdx > 0) {
-    const prefix = toolName.slice(0, tripleIdx);
-    if (candidates.some((c) => c === prefix)) {
-      return toolName.slice(tripleIdx);
-    }
-  }
-  for (const candidate of candidates) {
-    const doublePrefix = `${candidate}_${candidate}_`;
-    if (toolName.startsWith(doublePrefix)) {
-      return `${candidate}_${toolName.slice(doublePrefix.length)}`;
-    }
-  }
-  return toolName;
-}
 var unauthenticatedCodeModeWarnings = new Set;
 function warnUnauthenticatedCodeModeCallback(details) {
   if (unauthenticatedCodeModeWarnings.has(details.toolName))
@@ -24847,7 +25213,14 @@ function getDefaultRedirectUri() {
   return "http://localhost:3000/api/integrate/oauth/callback";
 }
 function createMCPServer(inputConfig) {
-  const config = mergeDatabaseConfig(inputConfig);
+  let config = mergeDatabaseConfig(inputConfig);
+  if (config.enabledProviders?.length) {
+    const allowed = new Set(config.enabledProviders);
+    config = {
+      ...config,
+      integrations: config.integrations.filter((i) => allowed.has(i.id))
+    };
+  }
   setLogLevel(config.debug ? "debug" : "error", SERVER_LOG_CONTEXT3);
   if (typeof window !== "undefined") {
     throw new Error("createMCPServer() should only be called on the server-side. " + "Use createMCPClient() for client-side code.");
@@ -25784,6 +26157,7 @@ export {
   whoopIntegration,
   whatsappIntegration,
   webflowIntegration,
+  warmToolDiscoveryFromCache,
   vercelIntegration,
   upstashIntegration,
   upsIntegration,
@@ -25816,6 +26190,7 @@ export {
   tableauIntegration,
   svelteKitHandler,
   supabaseIntegration,
+  stubsFromTools,
   stripeIntegration,
   stravaIntegration,
   storeCodeVerifier,
@@ -25835,6 +26210,7 @@ export {
   salesforceIntegration,
   sageIntegration,
   ringIntegration,
+  resolveToolDiscoveryCacheKey,
   resendIntegration,
   redisIntegration,
   redditIntegration,
@@ -25855,8 +26231,10 @@ export {
   pinterestIntegration,
   philipsHueIntegration,
   phantomIntegration,
+  persistToolDiscoveryCache,
   paypalIntegration,
   parseScopes,
+  parseMCPToolResult,
   paperIntegration,
   pandadocIntegration,
   outlookIntegration,
@@ -25866,6 +26244,7 @@ export {
   onedriveIntegration,
   oktaIntegration,
   notionIntegration,
+  normalizeToolName,
   normalizeProviderTokenType,
   normalizeAccountIdentifier,
   normalizeAccountIdHint,
@@ -25891,12 +26270,15 @@ export {
   mapmyfitnessIntegration,
   mailchimpIntegration,
   lookerIntegration,
+  listConnectedProvidersFromRows,
+  listConnectedProviders,
   linkedinIntegration,
   linearIntegration,
   leverIntegration,
   klaviyoIntegration,
   kickIntegration,
   jiraIntegration,
+  isMCPToolError,
   isLikelyUsableToken,
   intercomIntegration,
   integrateTrigger,
@@ -25971,10 +26353,13 @@ export {
   databricksIntegration,
   cursorIntegration,
   createTriggerTools,
+  createToolDiscoveryCacheInvalidator,
   createTanStackOAuthHandler,
   createSimpleIntegration,
   createNextOAuthHandler,
+  createMemoryToolDiscoveryCache,
   createMCPServer,
+  createIntegrationBundle,
   createDatabaseAdapterFactory,
   createDatabaseAdapterCallbacks,
   convexIntegration,
@@ -25987,6 +26372,7 @@ export {
   canvaIntegration,
   calendlyIntegration,
   calcomIntegration,
+  buildToolDiscoveryCacheKey,
   buildPhantomBrowseDeeplink,
   buildCodeModeTool,
   boxIntegration,
@@ -26002,13 +26388,16 @@ export {
   attioIntegration,
   astronomerIntegration,
   asanaIntegration,
+  applyToolDiscoveryCache,
   amazonIntegration,
   amazonAdsIntegration,
   amadeusIntegration,
   alpacaIntegration,
+  allIntegrations,
   airtableIntegration,
   adobeAcrobatSignIntegration,
   __resetUnauthenticatedCodeModeWarnings,
+  TOOL_ALIASES,
   RUNTIME_STUB_SOURCE,
   POST,
   OAuthHandler,