fix(mcp): isolate shared query keys from discovery hooks

Author: TheodoreSpeaks

apps/sim/hooks/mcp/use-mcp-oauth-popup.test.tsx

@@ -15,17 +15,6 @@ vi.mock('@sim/emcn', () => ({
 
 vi.mock('@/hooks/queries/mcp', () => ({
   useStartMcpOauth: () => ({ mutateAsync: mockStartOauth }),
-  mcpKeys: {
-    serversList: (workspaceId: string) => ['mcp', 'servers', workspaceId],
-    managedCatalogList: (workspaceId: string) => ['mcp', 'managed-catalog', workspaceId],
-    serverToolsList: (workspaceId: string, serverId: string) => [
-      'mcp',
-      'server-tools',
-      workspaceId,
-      serverId,
-    ],
-    storedToolsList: (workspaceId: string) => ['mcp', 'stored-tools', workspaceId],
-  },
 }))
 
 import { useMcpOauthPopup } from '@/hooks/mcp/use-mcp-oauth-popup'

apps/sim/hooks/mcp/use-mcp-oauth-popup.ts

@@ -6,7 +6,8 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { useQueryClient } from '@tanstack/react-query'
 import type { McpOauthCallbackMessage, McpOauthCallbackReason } from '@/lib/mcp/oauth'
-import { mcpKeys, useStartMcpOauth } from '@/hooks/queries/mcp'
+import { useStartMcpOauth } from '@/hooks/queries/mcp'
+import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 
 const logger = createLogger('useMcpOauthPopup')
 

apps/sim/hooks/mcp/use-mcp-tools.ts

@@ -13,7 +13,8 @@ import { McpIcon } from '@/components/icons'
 import { getManagedMcpConnectorIcon } from '@/lib/credential-groups/managed-mcp-connector-icons'
 import { createMcpToolId } from '@/lib/mcp/shared'
 import type { McpToolSchema } from '@/lib/mcp/types'
-import { mcpKeys, useMcpToolsQuery } from '@/hooks/queries/mcp'
+import { useMcpToolsQuery } from '@/hooks/queries/mcp'
+import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 
 const logger = createLogger('useMcpTools')
 

apps/sim/hooks/queries/credential-groups.ts

@@ -22,14 +22,14 @@ import {
 import { startOrganizationSlackConfigurationContract } from '@/lib/api/contracts/organization-accounts'
 import type { ContractJsonResponse } from '@/lib/api/contracts/types'
 import { resourceScopeFromOwner } from '@/lib/core/resource-scope'
-import { mcpKeys } from '@/hooks/queries/mcp'
 import {
   CREDENTIAL_GROUP_ACCESS_STALE_TIME,
   CREDENTIAL_GROUP_DETAIL_STALE_TIME,
   credentialGroupKeys,
   fetchWorkspaceAccounts,
   WORKSPACE_ACCOUNTS_STALE_TIME,
 } from '@/hooks/queries/utils/credential-group-queries'
+import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 import { invalidateSelectorQueries } from '@/hooks/queries/utils/selector-keys'
 
 export function useWorkspaceAccounts(workspaceId?: string) {

apps/sim/hooks/queries/mcp.test.tsx

@@ -24,13 +24,13 @@ import {
   type McpServer,
 } from '@/lib/api/contracts/mcp'
 import {
-  mcpKeys,
   useAllowedMcpDomains,
   useForceRefreshMcpTools,
   useMcpServers,
   useMcpToolsQuery,
   useStoredMcpTools,
 } from '@/hooks/queries/mcp'
+import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 
 const WORKSPACE_ID = 'workspace-1'
 

apps/sim/hooks/queries/mcp.ts

@@ -41,6 +41,7 @@ import type {
   McpTransport,
   StoredMcpTool,
 } from '@/lib/mcp/types'
+import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 import { workflowMcpServerKeys } from '@/hooks/queries/workflow-mcp-servers'
 
 const logger = createLogger('McpQueries')
@@ -50,23 +51,6 @@ export type { McpServer }
 
 export const MCP_SERVER_LIST_STALE_TIME = 60 * 1000
 
-export const mcpKeys = {
-  all: ['mcp'] as const,
-  servers: () => [...mcpKeys.all, 'servers'] as const,
-  serversList: (workspaceId?: string) => [...mcpKeys.servers(), workspaceId ?? ''] as const,
-  managedCatalog: () => [...mcpKeys.all, 'managedCatalog'] as const,
-  managedCatalogList: (workspaceId?: string) =>
-    [...mcpKeys.managedCatalog(), workspaceId ?? ''] as const,
-  serverTools: () => [...mcpKeys.all, 'serverTools'] as const,
-  serverToolsWorkspace: (workspaceId?: string) =>
-    [...mcpKeys.serverTools(), workspaceId ?? ''] as const,
-  serverToolsList: (workspaceId?: string, serverId?: string) =>
-    [...mcpKeys.serverToolsWorkspace(workspaceId), serverId ?? ''] as const,
-  storedTools: () => [...mcpKeys.all, 'storedTools'] as const,
-  storedToolsList: (workspaceId?: string) => [...mcpKeys.storedTools(), workspaceId ?? ''] as const,
-  allowedDomains: () => [...mcpKeys.all, 'allowedDomains'] as const,
-}
-
 async function fetchMcpServers(workspaceId: string, signal?: AbortSignal): Promise<McpServer[]> {
   try {
     const data = await requestJson(listMcpServersContract, {

apps/sim/hooks/queries/utils/mcp-keys.ts

@@ -0,0 +1,16 @@
+export const mcpKeys = {
+  all: ['mcp'] as const,
+  servers: () => [...mcpKeys.all, 'servers'] as const,
+  serversList: (workspaceId?: string) => [...mcpKeys.servers(), workspaceId ?? ''] as const,
+  managedCatalog: () => [...mcpKeys.all, 'managedCatalog'] as const,
+  managedCatalogList: (workspaceId?: string) =>
+    [...mcpKeys.managedCatalog(), workspaceId ?? ''] as const,
+  serverTools: () => [...mcpKeys.all, 'serverTools'] as const,
+  serverToolsWorkspace: (workspaceId?: string) =>
+    [...mcpKeys.serverTools(), workspaceId ?? ''] as const,
+  serverToolsList: (workspaceId?: string, serverId?: string) =>
+    [...mcpKeys.serverToolsWorkspace(workspaceId), serverId ?? ''] as const,
+  storedTools: () => [...mcpKeys.all, 'storedTools'] as const,
+  storedToolsList: (workspaceId?: string) => [...mcpKeys.storedTools(), workspaceId ?? ''] as const,
+  allowedDomains: () => [...mcpKeys.all, 'allowedDomains'] as const,
+}