fix(search): restore live integration connection chips

Author: Sg312

apps/sim/app/o/[organizationId]/integrations/integrations.tsx

@@ -43,7 +43,7 @@ export function OrganizationIntegrations({
         )
       }
     >
-      {!features.liveEnterpriseSearch && connectionRequest && (
+      {connectionRequest && (
         <SearchIntegrationConnection
           organizationId={organization.id}
           {...connectionRequest}

apps/sim/app/o/[organizationId]/integrations/page.test.tsx

@@ -98,3 +98,25 @@ describe('integrations page Slack context', () => {
     expect(mocks.context).not.toHaveBeenCalled()
   })
 })
+
+it('preserves a live Slack reconnect chip through navigation and login without an indexed source', async () => {
+  const query = {
+    connectorType: 'slack',
+    connectionMode: 'live',
+    optionId: 'slack-option',
+    provider: 'slack',
+    credentialId: 'own-account',
+  }
+  const selected = { ...props, searchParams: Promise.resolve(query) }
+  const page = await OrganizationIntegrationsPage(selected)
+  expect(page.props.connectionRequest).toEqual({
+    userId: 'viewer',
+    target: { type: 'link', ...query },
+  })
+  authMockFns.mockGetSession.mockResolvedValue(null)
+  await expect(OrganizationIntegrationsPage(selected)).rejects.toThrow('Redirect')
+  const redirect = new URL(mocks.redirect.mock.calls[0][0], 'https://sim.test')
+  const callback = new URL(redirect.searchParams.get('callbackUrl')!, 'https://sim.test')
+  for (const [key, value] of Object.entries(query))
+    expect(callback.searchParams.get(key)).toBe(value)
+})

apps/sim/app/o/[organizationId]/integrations/page.tsx

@@ -23,6 +23,9 @@ interface OrganizationIntegrationsPageProps {
   params: Promise<{ organizationId: string }>
   searchParams: Promise<{
     slack?: string | string[]
+    connectionMode?: string | string[]
+    optionId?: string | string[]
+    provider?: string | string[]
     connectorType?: string | string[]
     connectorId?: string | string[]
     credentialId?: string | string[]
@@ -39,10 +42,17 @@ export default async function OrganizationIntegrationsPage({
   const selection = loadIntegrationConnectionParams(query)
   const connector = SEARCH_CONNECTORS.find((entry) => entry.type === selection.connectorType)
   const requested =
-    selection.connectorType || selection.connectorId || selection.credentialId
+    selection.connectorType ||
+    selection.connectorId ||
+    selection.credentialId ||
+    selection.connectionMode ||
+    selection.optionId ||
+    selection.provider
       ? searchConnectionTargetSchema.safeParse({
           type: 'link',
-          provider: connector?.providerId,
+          ...(selection.connectionMode ? { connectionMode: selection.connectionMode } : {}),
+          ...(selection.optionId ? { optionId: selection.optionId } : {}),
+          provider: selection.provider || connector?.providerId,
           connectorType: selection.connectorType,
           ...(selection.connectorId ? { connectorId: selection.connectorId } : {}),
           ...(selection.credentialId ? { credentialId: selection.credentialId } : {}),

apps/sim/app/o/[organizationId]/integrations/search-params.ts

@@ -2,6 +2,9 @@ import { createLoader, parseAsString } from 'nuqs/server'
 
 export const integrationConnectionParams = {
   connectorType: parseAsString.withDefault(''),
+  connectionMode: parseAsString.withDefault(''),
+  optionId: parseAsString.withDefault(''),
+  provider: parseAsString.withDefault(''),
   connectorId: parseAsString.withDefault(''),
   credentialId: parseAsString.withDefault(''),
 }

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/search-integration-connection.tsx

@@ -64,7 +64,13 @@ function SearchIntegrationConnectionControl({
           ? `${name} connection is no longer available`
           : `${action} ${name}`
   const handleConnect = () => {
-    if (connector && !connection.connectorId && connector.setupFields.length && !connection.pending)
+    if (
+      target.connectionMode !== 'live' &&
+      connector &&
+      !connection.connectorId &&
+      connector.setupFields.length &&
+      !connection.pending
+    )
       setSetupOpen(true)
     else void connection.connect()
   }

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.ts

@@ -1476,3 +1476,17 @@ describe('source tag', () => {
     expect(hasPendingTag).toBe(true)
   })
 })
+
+it('renders a live Slack credential target as a visible Search connection card', () => {
+  const item = {
+    type: 'link',
+    provider: 'slack',
+    connectorType: 'slack',
+    connectionMode: 'live',
+    optionId: 'slack-option',
+  } as const
+  const text = `Connect your Slack account below.\n<credential>${JSON.stringify(item)}</credential>`
+  const parsed = parseLastCredentialTag(text)
+  expect(parsed).toEqual([item])
+  expect(credentialTagHasVisibleCard(parsed!, false, 'assistant')).toBe(true)
+})

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx

@@ -184,6 +184,8 @@ export interface CredentialItemData {
   /** Canonical Search source requested by an organization connection control. */
   connectorType?: string
   connectorId?: string
+  connectionMode?: 'live'
+  optionId?: string
 }
 
 /**

apps/sim/hooks/use-search-integration-connection.test.tsx

@@ -17,7 +17,14 @@ const m = vi.hoisted(() => ({
   }>,
   queryError: null as Error | null,
   requestedTarget: undefined as
-    | { type: 'link'; provider: string; connectorType: string; connectorId?: string }
+    | {
+        type: 'link'
+        provider: string
+        connectorType: string
+        connectorId?: string
+        connectionMode?: 'live'
+        optionId?: string
+      }
     | undefined,
 }))
 const target = {
@@ -34,7 +41,9 @@ vi.mock('@/hooks/queries/personal-search-integrations', () => ({
   usePersonalSearchIntegrations: (query: { completionId?: string }) => ({
     data: {
       connections: [{ accounts: m.accounts }],
-      available: [{ target }],
+      available: [
+        { target: m.requestedTarget?.connectionMode === 'live' ? m.requestedTarget : target },
+      ],
       completedCredentialId: m.receipts.get(query.completionId ?? '') ?? null,
     },
     isSuccess: !m.queryError,
@@ -282,3 +291,29 @@ describe('Search connection card lifecycle', () => {
     expect(connection().error).toContain('timed out')
   })
 })
+
+it('completes a live connection using its receipt without an indexed source', async () => {
+  m.requestedTarget = {
+    type: 'link',
+    provider: 'slack',
+    connectorType: 'slack',
+    connectionMode: 'live',
+    optionId: 'slack-option',
+  }
+  m.mutate.mockResolvedValue({ url: 'https://provider.test/authorize' })
+  render()
+  expect(connection().available).toBe(true)
+  await act(async () => {
+    await connection().connect()
+  })
+  const request = m.mutate.mock.calls[0][0]
+  expect(request.target).toEqual(m.requestedTarget)
+  expect(connection().connected).toBe(false)
+  m.accounts = [{ credentialId: 'new-account', status: 'connected' }]
+  render()
+  expect(connection().connected).toBe(false)
+  m.receipts.set(request.oauthCompletionId, 'new-account')
+  render()
+  expect(connection().connected).toBe(true)
+  expect(m.connected).toHaveBeenCalled()
+})

apps/sim/lib/api/contracts/knowledge/personal-integrations.ts

@@ -8,8 +8,8 @@ export const personalSearchIntegrationSchema = z.object({
   name: z.string().max(200),
   providerId: z.string().min(1).max(100),
   connectorType: z.string().min(1).max(100),
-  connectorId: z.string().min(1).max(200),
-  knowledgeBaseId: z.string().min(1).max(200),
+  connectorId: z.string().min(1).max(200).optional(),
+  knowledgeBaseId: z.string().min(1).max(200).optional(),
   description: z.string().max(240),
   accounts: z
     .array(
@@ -22,7 +22,9 @@ export const personalSearchIntegrationSchema = z.object({
     )
     .max(100),
   connectionStatus: z.enum(['connected', 'reconnect_needed', 'not_connected', 'unavailable']),
-  indexingStatus: z.enum(['indexing', 'indexed', 'not_indexed', 'sync_failed', 'paused']),
+  indexingStatus: z
+    .enum(['indexing', 'indexed', 'not_indexed', 'sync_failed', 'paused'])
+    .optional(),
   action: searchConnectionTargetSchema.nullable(),
 })
 
@@ -80,8 +82,8 @@ export const connectPersonalSearchIntegrationContract = defineRouteContract({
     schema: successResponseSchema(
       z.object({
         url: z.string().url(),
-        connectorId: z.string().min(1).max(200),
-        knowledgeBaseId: z.string().min(1).max(200),
+        connectorId: z.string().min(1).max(200).optional(),
+        knowledgeBaseId: z.string().min(1).max(200).optional(),
       })
     ),
   },

apps/sim/lib/credential-groups/application/organization-accounts.ts

@@ -21,10 +21,12 @@ import {
 } from '@/lib/credential-groups/enrollment-links'
 import { CredentialGroupEnrollmentError } from '@/lib/credential-groups/enrollments'
 import { ManagedMcpConnectorError } from '@/lib/credential-groups/managed-mcp-service'
+import type { CredentialGroupConnectionIntent } from '@/lib/credential-groups/oauth-intent'
 import { requireOrganizationAccountsSetup } from '@/lib/credential-groups/organization-setup'
 import { listConfiguredCredentialGroupProviders } from '@/lib/credential-groups/provider-availability'
 import { isScopedCredentialGroupsAvailable } from '@/lib/credential-groups/scoped-availability'
 import { createViewerCredentialGroupEnrollment } from '@/lib/credential-groups/self-enrollment'
+import { startViewerCredentialGroupOAuth } from '@/lib/credential-groups/self-enrollment-oauth'
 import {
   ensureWorkspaceAccountsGroup,
   getOrganizationAccountsGroup,
@@ -239,7 +241,11 @@ export const startOrganizationAccountConnection = defineOrganizationAccountsUseC
     input,
     context,
   }: {
-    input: OrganizationAccountsInput & StartOrganizationAccountConnectionBody
+    input: OrganizationAccountsInput &
+      StartOrganizationAccountConnectionBody & {
+        oauthCompletionId?: string
+        connectionIntent?: CredentialGroupConnectionIntent
+      }
     context: OrganizationMembershipContext
   }) {
     const group = await getOrganizationAccountsGroup(context.organizationId)
@@ -263,6 +269,16 @@ export const startOrganizationAccountConnection = defineOrganizationAccountsUseC
     ) {
       throw new OrchestrationError('not_found', 'This account option is no longer available')
     }
+    if (input.oauthCompletionId) {
+      return startViewerCredentialGroupOAuth({
+        organizationId: context.organizationId,
+        userId: context.userId,
+        credentialGroupId: group.id,
+        optionId: input.optionId,
+        completionId: input.oauthCompletionId,
+        connectionIntent: input.connectionIntent,
+      })
+    }
     const { invitationLink } = await createViewerCredentialGroupEnrollment({
       organizationId: context.organizationId,
       userId: context.userId,