fix(search): recheck Zoom approval and bound MCP serialization

Author: waleedlatif1

apps/sim/.env.example

@@ -269,5 +269,6 @@ CRON_SECRET=your_cron_secret # Use `openssl rand -hex 32` to generate. Authentic
 
 # Zoom member search: separate General OAuth app to preserve workflow grants.
 # Register ${NEXT_PUBLIC_APP_URL}/api/mcp/oauth/callback with the two meeting read scopes.
+# ZOOM_SEARCH=false           # Off-AppConfig fallback; set true to enable for eligible organization-owned scopes
 # ZOOM_MCP_CLIENT_ID=
 # ZOOM_MCP_CLIENT_SECRET=

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

@@ -10,6 +10,7 @@ import {
 } from '@sim/db/schema'
 import * as dns from '@sim/security/dns'
 import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
+import { createDeferred } from '@sim/testing/helpers/deferred'
 import { getPostgresErrorCode } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { toRecord } from '@sim/utils/object'
@@ -18,7 +19,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi }
 import { listSearchIntegrationsContract } from '@/lib/api/contracts/knowledge/search-integrations'
 import { env } from '@/lib/core/config/env'
 import { createOrganizationAccountsGroup } from '@/lib/credential-groups/workspace-accounts'
-import { tryAcquireAdvisoryXactLock } from '@/lib/db/advisory-locks'
+import { acquireAdvisoryXactLock, tryAcquireAdvisoryXactLock } from '@/lib/db/advisory-locks'
 import {
   approveSearchIntegration,
   listSearchIntegrations,
@@ -195,6 +196,63 @@ describe('atomic organization live Search MCP setup', () => {
     }
   )
 
+  it('rejects Zoom approval when rollout is disabled while waiting for the accounts lock', async () => {
+    const group = await db.transaction((tx) =>
+      createOrganizationAccountsGroup(tx, ids.organization, ids.owner)
+    )
+    await db.insert(mcpServers).values({
+      id: generateId(),
+      organizationId: ids.organization,
+      credentialGroupId: group.id,
+      managedConnectorId: 'zoom',
+      name: 'Zoom',
+      transport: 'streamable-http',
+      url: 'https://mcp.zoom.us/mcp/meeting/streamable',
+      authType: 'oauth',
+      enabled: true,
+      createdBy: ids.owner,
+    })
+    Object.assign(env, { ZOOM_SEARCH: true })
+    const before = await snapshot()
+    const locked = createDeferred<number>()
+    const release = createDeferred<void>()
+    const blocker = db.transaction(async (tx) => {
+      await acquireAdvisoryXactLock(
+        tx,
+        'search_accounts',
+        `search-accounts:organization:${ids.organization}`
+      )
+      const [connection] = await tx.execute<{ pid: number }>(sql`SELECT pg_backend_pid() AS pid`)
+      locked.resolve(connection.pid)
+      await release.promise
+    })
+    const blockerPid = await locked.promise
+    const attempt = approve('zoom').catch((error: unknown) => error)
+    try {
+      await vi.waitFor(
+        async () => {
+          const [state] = await db.execute<{ waiting: boolean }>(sql`
+            SELECT EXISTS (
+              SELECT 1 FROM pg_stat_activity
+              WHERE ${blockerPid} = ANY(pg_blocking_pids(pid))
+            ) AS waiting
+          `)
+          expect(state.waiting).toBe(true)
+        },
+        { timeout: 5_000 }
+      )
+      Object.assign(env, { ZOOM_SEARCH: false })
+    } finally {
+      release.resolve()
+      await blocker
+      await attempt
+    }
+    expect(await attempt).toMatchObject({ code: 'forbidden' })
+    expect(await snapshot()).toEqual(before)
+    Object.assign(env, { ZOOM_SEARCH: true })
+    await expect(approve('zoom')).resolves.toMatchObject({ approved: true })
+  })
+
   it('resolves the sign-in server before the approval takes the accounts lock', async () => {
     const lockHeldDuringLookup: boolean[] = []
     vi.mocked(dns.resolveHostAddresses).mockImplementationOnce(async () => {

apps/sim/lib/sim-search/live/README.md

@@ -159,7 +159,7 @@ Zoom Search defaults off for organization-scoped rollout. Enable selected organi
 }
 ```
 
-Only the canonical organization ID participates in this rollout check. For local or self-hosted deployments, `ZOOM_SEARCH=true` enables Zoom Search globally; leave that boolean fallback off for an organization-targeted rollout. Setup, enrollment and retrieval enforce the flag. The dedicated Zoom MCP Search connector is gated wherever it is invoked, including generic MCP tools; the standard workflow Zoom OAuth/tools remain available. Disabling the flag preserves saved grants and conversations while denying subsequent Search use; existing approvals can still be removed and connected accounts disconnected. Other providers retain the shared Search and credential-group availability policies without a separate provider rollout gate.
+Only the canonical organization ID participates in this rollout check. For local or self-hosted deployments, `ZOOM_SEARCH=true` enables Zoom Search for all otherwise eligible organization-owned scopes; personal workspaces without an organization cannot use managed connected accounts. Leave that boolean fallback off for an organization-targeted rollout. Setup, enrollment and retrieval enforce the flag. The dedicated Zoom MCP Search connector is gated wherever it is invoked, including generic MCP tools; the standard workflow Zoom OAuth/tools remain available. Disabling the flag preserves saved grants and conversations while denying subsequent Search use; existing approvals can still be removed and connected accounts disconnected. Other providers retain the shared Search and credential-group availability policies without a separate provider rollout gate.
 
 ### Shared invariants
 

apps/sim/lib/sim-search/live/managed-mcp-payload.ts

@@ -1,12 +1,13 @@
 import { isRecordLike } from '@sim/utils/object'
+import { stringifyBoundedJson } from '@/lib/core/utils/bounded-json'
 import type { McpToolResult } from '@/lib/mcp/types'
 import { NativeSearchError } from '@/lib/sim-search/live/http'
 
 const MAX_SEARCH_MCP_PAYLOAD_BYTES = 4 * 1024 * 1024
 
 /** MCP text is untrusted provider data; malformed structured search output is never an empty success. */
 export function managedMcpPayload(result: McpToolResult, label: string): unknown {
-  if (Buffer.byteLength(JSON.stringify(result), 'utf8') > MAX_SEARCH_MCP_PAYLOAD_BYTES)
+  if (stringifyBoundedJson(result, MAX_SEARCH_MCP_PAYLOAD_BYTES) === undefined)
     throw new NativeSearchError(
       'unavailable',
       `${label} response exceeded the search size limit. Narrow the query.`

apps/sim/lib/sim-search/live/managed-mcp.test.ts

@@ -127,4 +127,17 @@ describe('managed search MCP read boundary', () => {
     expect((failure as NativeSearchError).message).toContain('existing Granola account')
     expect((failure as NativeSearchError).message).not.toContain('private-provider-detail')
   })
+
+  it('rejects escaped MCP payload overflow before allocating its JSON representation', () => {
+    const result = { structuredContent: { ['\u0000'.repeat(800_000)]: 'value' } }
+    const serialize = vi.spyOn(JSON, 'stringify').mockImplementation(() => {
+      throw new Error('Oversized payload reached serialization')
+    })
+    try {
+      expect(() => managedMcpPayload(result, 'Fireflies')).toThrow('size limit')
+      expect(serialize).not.toHaveBeenCalled()
+    } finally {
+      serialize.mockRestore()
+    }
+  })
 })

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

@@ -109,6 +109,11 @@ export async function addOrganizationSearchMcpProvider(
     )
     .limit(1)
   if (existing) {
+    if (!(await isSearchProviderEnabled(provider, { kind: 'organization', organizationId })))
+      throw new OrchestrationError(
+        'forbidden',
+        'Zoom Search is not available for this organization'
+      )
     if (!existing.enabled)
       throw new OrchestrationError(
         'validation',