fix(search): recheck for the provider server after a failed pre-approval lookup

Author: waleedlatif1

apps/sim/lib/knowledge/__integration__/search-mcp-setup.integration.ts

@@ -188,6 +188,15 @@ describe('atomic organization live Search MCP setup', () => {
     expect((await snapshot()).servers).toEqual(before)
   })
 
+  it('approves a provider a concurrent approval configured while this lookup failed', async () => {
+    vi.mocked(dns.resolveHostAddresses).mockImplementationOnce(async () => {
+      await approve('fireflies')
+      throw new Error('DNS unavailable')
+    })
+    await approve('fireflies')
+    expect((await snapshot()).servers).toHaveLength(1)
+  })
+
   it('serializes concurrent approvals into one group and one server per provider', async () => {
     const providers = ['fireflies', 'granola', 'notion']
     const results = await Promise.all(

apps/sim/lib/sim-search/live/member-setup.ts

@@ -32,15 +32,10 @@ function toSetupError(error: unknown): never {
   throw error
 }
 
-/**
- * Runs before source approval opens its transaction. A provider whose server does not exist yet
- * has that server checked here, because the check resolves DNS and must not run while the
- * transaction holds the accounts lock; an already-configured provider needs no check.
- */
-export async function prepareSearchMcpProvider(
+async function hasProviderServer(
   organizationId: string,
   provider: ManagedSearchMcpProvider
-): Promise<SearchMcpProviderSetup> {
+): Promise<boolean> {
   const [existing] = await db
     .select({ id: mcpServers.id })
     .from(mcpServers)
@@ -54,13 +49,27 @@ export async function prepareSearchMcpProvider(
       )
     )
     .limit(1)
-  if (existing) return { provider, validated: null }
+  return existing !== undefined
+}
+
+/**
+ * Runs before source approval opens its transaction. A provider whose server does not exist yet
+ * has that server checked here, because the check resolves DNS and must not run while the
+ * transaction holds the accounts lock; an already-configured provider needs no check. A failed
+ * check looks again first, since a concurrent approval may have created the server meanwhile.
+ */
+export async function prepareSearchMcpProvider(
+  organizationId: string,
+  provider: ManagedSearchMcpProvider
+): Promise<SearchMcpProviderSetup> {
+  if (await hasProviderServer(organizationId, provider)) return { provider, validated: null }
   try {
     return {
       provider,
       validated: await validateManagedMcpConnectorInput({ connectorId: provider }),
     }
   } catch (error) {
+    if (await hasProviderServer(organizationId, provider)) return { provider, validated: null }
     toSetupError(error)
   }
 }