feat(slack): switch custom bots to the Sim Search app

Author: TheodoreSpeaks

apps/sim/app/api/knowledge/slack/setup/route.test.ts

@@ -17,7 +17,7 @@ vi.mock('@/lib/knowledge/application/slack-search/setup', async () => {
   }
 })
 
-import { createSlackSearchManifest } from '@/lib/slack-search/manifest'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { POST as start } from '@/app/api/knowledge/slack/oauth/route'
 import { POST as prepare } from '@/app/api/knowledge/slack/setup/route'
 
@@ -35,13 +35,13 @@ describe.each([
   ['prepare', prepare, mocks.prepare],
   ['OAuth', start, mocks.start],
 ] as const)('Slack %s route errors', (_name, route, execute) => {
-  it('returns an actionable 400 for a non-HTTPS app URL', async () => {
-    execute.mockImplementation(() =>
-      createSlackSearchManifest(input.name, input.description, 'http://localhost:3000')
+  it('returns application validation errors', async () => {
+    execute.mockRejectedValue(
+      new OrchestrationError('validation', 'Slack app credentials are required')
     )
     const response = await route(createMockRequest('POST', input))
     expect(response.status).toBe(400)
-    expect(await response.json()).toMatchObject({ error: expect.stringContaining('public HTTPS') })
+    expect(await response.json()).toMatchObject({ error: 'Slack app credentials are required' })
     expect(execute).toHaveBeenCalledOnce()
   })
 

apps/sim/app/o/[organizationId]/settings/components/organization-search-slack.test.tsx

@@ -106,8 +106,8 @@ function button(label: string) {
 async function click(label: string) {
   await act(async () => button(label).click())
 }
-async function action(label: string) {
-  const trigger = container.querySelector<HTMLButtonElement>('[aria-label="Sim Search actions"]')!
+async function action(label: string, name = 'Sim Search (custom bot)') {
+  const trigger = container.querySelector<HTMLButtonElement>(`[aria-label="${name} actions"]`)!
   await act(async () => {
     trigger.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }))
   })
@@ -137,27 +137,33 @@ describe('Slack Search settings and shared wizard', () => {
         },
       })
       await render()
-      await click('Install Sim Search')
-      expect(document.querySelector('[role="dialog"]')).toHaveTextContent('Install Sim Search')
+      if (installations.length) {
+        expect(container).toHaveTextContent('Reconnect required')
+        expect(container).toHaveTextContent('Sim Search (custom bot)')
+        await action('Install Sim Search')
+      } else {
+        await click('Install Sim Search')
+      }
+      expect(document.querySelector('[role="dialog"]')).toHaveTextContent(
+        'Install the Sim Search app'
+      )
       expect(document.querySelectorAll('input')).toHaveLength(0)
       expect(mocks.install).not.toHaveBeenCalled()
-      await click('Install Sim Search')
+      await click('Continue with Slack')
       expect(mocks.install).toHaveBeenCalledExactlyOnceWith(
         {
           organizationId: 'org-1',
-          installationId: undefined,
+          installationId: installations[0]?.id,
           name: 'Sim Search',
           description: expect.any(String),
           mode: 'shared',
         },
         expect.any(Object)
       )
-      mocks.installError = new Error(
-        'Remove the previous Slack source configuration before switching apps; members must reconnect'
-      )
+      mocks.installError = new Error('Slack authorization failed. Try again.')
       await render()
       expect(document.querySelector('[role="dialog"] [role="alert"]')).toHaveTextContent(
-        'Remove the previous Slack source configuration'
+        'Slack authorization failed'
       )
       expect(mocks.configure).not.toHaveBeenCalled()
       expect(mocks.remove).not.toHaveBeenCalled()
@@ -175,8 +181,8 @@ describe('Slack Search settings and shared wizard', () => {
     mocks.manifest.mockReturnValue({ data: { sharedAppId: 'A_SHARED', existingApp: null } })
     await render()
     expect(container).not.toHaveTextContent('Install Sim Search')
-    await action('Reconnect')
-    await click('Install Sim Search')
+    await action('Reconnect', 'Sim Search')
+    await click('Continue with Slack')
     expect(mocks.install).toHaveBeenCalledWith(
       expect.objectContaining({ mode: 'shared', installationId: installation.id }),
       expect.any(Object)
@@ -192,12 +198,12 @@ describe('Slack Search settings and shared wizard', () => {
       refetch: mocks.refetch,
     })
     await render()
-    await click('Install Sim Search')
+    await action('Install Sim Search')
     expect(document.querySelector('[role="dialog"] [role="alert"]')).toHaveTextContent(
       'Sim Search installation is unavailable'
     )
     expect(document.querySelector('[role="dialog"]')).not.toHaveTextContent('Create Slack app')
-    expect(button('Install Sim Search')).toBeDisabled()
+    expect(button('Continue with Slack')).toBeDisabled()
     expect(mocks.install).not.toHaveBeenCalled()
     await click('Retry')
     expect(mocks.refetch).toHaveBeenCalledOnce()
@@ -213,11 +219,11 @@ describe('Slack Search settings and shared wizard', () => {
       refetch: mocks.refetch,
     })
     await render()
-    await click('Install Sim Search')
+    await action('Install Sim Search')
     expect(document.querySelector('[role="dialog"] [role="alert"]')).toHaveTextContent(
       'Could not load Slack setup'
     )
-    expect(button('Install Sim Search')).toBeDisabled()
+    expect(button('Continue with Slack')).toBeDisabled()
     await click('Retry')
     expect(mocks.refetch).toHaveBeenCalledOnce()
     expect(mocks.install).not.toHaveBeenCalled()
@@ -229,6 +235,58 @@ describe('Slack Search settings and shared wizard', () => {
     expect(container).toHaveTextContent('Open in Slack')
   })
 
+  it('prompts the existing custom bot to reconnect when the feature becomes available', async () => {
+    await render(true)
+    expect(container).toHaveTextContent('Sim Search (custom bot)')
+    expect(container).toHaveTextContent('Enabled')
+    expect(container).not.toHaveTextContent('Reconnect required')
+    mocks.list.mockReturnValue({
+      data: { sharedAppAvailable: true, installations: [installation], bots: [] },
+    })
+    mocks.manifest.mockReturnValue({ data: { sharedAppId: 'A_SHARED', existingApp: null } })
+    await render()
+    expect(container).toHaveTextContent('Reconnect required')
+    expect(container).not.toHaveTextContent('Install Sim Search')
+    expect(mocks.install).not.toHaveBeenCalled()
+    expect(mocks.configure).not.toHaveBeenCalled()
+    await action('Install Sim Search')
+    expect(document.querySelector('[role="dialog"]')).toHaveTextContent(
+      'Install the Sim Search app'
+    )
+    expect(button('Continue with Slack')).not.toBeDisabled()
+    await click('Cancel')
+    expect(mocks.install).not.toHaveBeenCalled()
+    expect(mocks.remove).not.toHaveBeenCalled()
+  })
+
+  it('shows the native app alongside the retained custom bot after installing', async () => {
+    mocks.list.mockReturnValue({
+      data: {
+        sharedAppAvailable: true,
+        installations: [
+          { ...installation, enabled: false },
+          {
+            ...installation,
+            id: 'native-installation',
+            credentialId: 'native-credential',
+            appId: 'A_SHARED',
+            appKind: 'shared',
+          },
+        ],
+        bots: [],
+      },
+    })
+    await render()
+    expect(container.querySelector('[aria-label="Sim Search (custom bot) actions"]')).not.toBeNull()
+    expect(container.querySelector('[aria-label="Sim Search actions"]')).not.toBeNull()
+    expect(container).toHaveTextContent('Disabled')
+    expect(container).toHaveTextContent('Enabled')
+    expect(container).not.toHaveTextContent('Reconnect required')
+    expect(container).not.toHaveTextContent('Install Sim Search')
+    expect(container.querySelectorAll('a[href*="slack.com/app_redirect"]')).toHaveLength(2)
+    expect(mocks.install).not.toHaveBeenCalled()
+  })
+
   it('starts with one setup action and a Slack app link, with no manifest preview or form', async () => {
     await render()
     expect(container.querySelectorAll('button')).toHaveLength(1)
@@ -246,13 +304,15 @@ describe('Slack Search settings and shared wizard', () => {
 
   it('shows setup errors and blocks progression until the manifest loads', async () => {
     mocks.manifest.mockReturnValue({
-      error: new Error('Slack needs a public HTTPS URL to send messages to Sim.'),
+      error: new Error('Slack app configuration is unavailable.'),
       refetch: mocks.refetch,
       isPending: false,
     })
     await render()
     await click('Set up')
-    expect(document.querySelector('[role="alert"]')).toHaveTextContent('public HTTPS')
+    expect(document.querySelector('[role="alert"]')).toHaveTextContent(
+      'Slack app configuration is unavailable.'
+    )
     expect(document.querySelector('[role="dialog"]')).not.toHaveTextContent('Step 1')
     expect(document.querySelector('[role="dialog"]')).not.toHaveTextContent('Continue')
     await click('Retry')
@@ -294,7 +354,7 @@ describe('Slack Search settings and shared wizard', () => {
       expect(document.querySelector('[role="dialog"]')).not.toHaveTextContent('Loading Slack setup')
       if (mode === 'shared') {
         expect(document.querySelector('[role="dialog"]')).not.toHaveTextContent('Step 1')
-        await click('Install Sim Search')
+        await click('Continue with Slack')
         expect(mocks.install).toHaveBeenCalledWith(
           expect.objectContaining({ organizationId: 'org-1', mode: 'shared' }),
           expect.any(Object)

apps/sim/app/o/[organizationId]/settings/components/organization-search-slack.tsx

@@ -44,10 +44,12 @@ export function OrganizationSearchSlack() {
   if (!viewer.isAdmin) return null
   const busy = configure.isPending || remove.isPending
   const bots = installations.data?.bots ?? []
-  const canInstallSharedApp =
-    !installations.error &&
-    installations.data?.sharedAppAvailable &&
-    !installations.data.installations.some((installation) => installation.appKind === 'shared')
+  const canInstallSharedApp = !installations.error && installations.data?.sharedAppAvailable
+  const sharedTeams = new Set(
+    installations.data?.installations
+      .filter((installation) => installation.appKind === 'shared')
+      .map((installation) => installation.teamId)
+  )
 
   return (
     <SettingsPanel>
@@ -58,16 +60,7 @@ export function OrganizationSearchSlack() {
             <Chip onClick={() => void setSetupResult(null)}>Dismiss</Chip>
           </div>
         )}
-        <SettingsSection
-          label='Connection'
-          action={
-            canInstallSharedApp && Boolean(installations.data?.installations.length) ? (
-              <Chip variant='primary' disabled={busy} onClick={() => setWizard({ mode: 'shared' })}>
-                Install Sim Search
-              </Chip>
-            ) : undefined
-          }
-        >
+        <SettingsSection label='Connection'>
           {installations.error ? (
             <SettingsQueryErrorState
               error={installations.error}
@@ -96,16 +89,19 @@ export function OrganizationSearchSlack() {
                 />
               ) : (
                 installations.data.installations.map((installation) => {
-                  const name =
-                    bots.find((bot) => bot.id === installation.credentialId)?.displayName ??
-                    installation.teamName
-                  const connectionError = installation.needsValidation
-                    ? 'Reconnect to verify the app’s credentials and permissions.'
-                    : ['delivery_failed', 'assistant_or_delivery_failed'].includes(
-                          installation.lastOutcome ?? ''
-                        )
-                      ? 'The last reply failed. Check the Slack connection.'
-                      : null
+                  const custom = installation.appKind === 'custom'
+                  const name = custom ? 'Sim Search (custom bot)' : 'Sim Search'
+                  const needsInstall =
+                    canInstallSharedApp && custom && !sharedTeams.has(installation.teamId)
+                  const connectionError = needsInstall
+                    ? null
+                    : installation.needsValidation
+                      ? 'Reconnect to verify the app’s credentials and permissions.'
+                      : ['delivery_failed', 'assistant_or_delivery_failed'].includes(
+                            installation.lastOutcome ?? ''
+                          )
+                        ? 'The last reply failed. Check the Slack connection.'
+                        : null
                   return (
                     <SettingsResourceRow
                       key={installation.id}
@@ -120,7 +116,7 @@ export function OrganizationSearchSlack() {
                       }
                       badge={
                         <ChipTag>
-                          {installation.needsValidation
+                          {needsInstall || installation.needsValidation
                             ? 'Reconnect required'
                             : installation.enabled
                               ? 'Enabled'
@@ -140,14 +136,18 @@ export function OrganizationSearchSlack() {
                             label={`${name} actions`}
                             actions={[
                               {
-                                label: 'Reconnect',
+                                label: needsInstall ? 'Install Sim Search' : 'Reconnect',
                                 disabled: busy,
                                 onSelect: () =>
                                   setWizard({
-                                    mode: installation.appKind,
+                                    mode: needsInstall ? 'shared' : installation.appKind,
                                     installationId: installation.id,
                                     appId: installation.appId,
-                                    initialName: name,
+                                    initialName:
+                                      custom && !needsInstall
+                                        ? bots.find((bot) => bot.id === installation.credentialId)
+                                            ?.displayName
+                                        : undefined,
                                   }),
                               },
                               {

apps/sim/components/integrations/slack-search-setup-wizard.tsx

@@ -149,14 +149,16 @@ export function SlackSearchSetupWizard({
         onOpenChange={(open) => {
           if (!open) onClose()
         }}
-        srTitle='Install Sim Search'
+        srTitle='Install the Sim Search app'
+        size='sm'
       >
         <ChipModalHeader icon={SlackIcon} onClose={onClose}>
-          Install Sim Search
+          Install the Sim Search app
         </ChipModalHeader>
         <ChipModalBody>
           <p className='px-2 text-[var(--text-secondary)] text-sm'>
-            Choose your Slack workspace and approve Sim Search.
+            Add Sim Search to your Slack workspace to ask questions and get answers from your
+            connected sources.
           </p>
           <ChipModalError>
             {error?.message ??
@@ -179,7 +181,7 @@ export function SlackSearchSetupWizard({
               : undefined
           }
           primaryAction={{
-            label: busy ? 'Connecting…' : 'Install Sim Search',
+            label: busy ? 'Connecting…' : 'Continue with Slack',
             disabled: busy || !prepare.data.sharedAppId || Boolean(prepare.error),
             onClick: installShared,
           }}

apps/sim/lib/credential-groups/provider-configuration.test.ts

@@ -12,6 +12,7 @@ const shared = vi.hoisted(() => ({
   flag: vi.fn(),
 }))
 vi.mock('@/lib/core/config/env', () => ({ env: shared.env }))
+vi.mock('@/lib/core/config/env-flags', () => ({ isHosted: true }))
 vi.mock('@/lib/core/config/feature-flags', () => ({ isFeatureEnabled: shared.flag }))
 
 vi.mock('@/lib/core/security/encryption', () => ({
@@ -39,7 +40,7 @@ const configuration = {
 beforeEach(() => {
   resetDbChainMock()
   shared.env.SLACK_SEARCH_APP_ID = ''
-  shared.flag.mockResolvedValue(true)
+  shared.flag.mockReset().mockResolvedValue(true)
 })
 
 describe('organization Slack app references', () => {
@@ -105,6 +106,39 @@ describe('organization Slack app references', () => {
       else await expect(result).rejects.toThrow('disabled or removed')
     }
   )
+  it('keeps using the custom app for personal sources after a different native app is installed', async () => {
+    shared.env.SLACK_SEARCH_APP_ID = 'ANATIVE'
+    dbChainMockFns.limit
+      .mockResolvedValueOnce([
+        {
+          encryptedProviderConfiguration:
+            await encryptCredentialGroupProviderConfiguration(configuration),
+        },
+      ])
+      .mockResolvedValueOnce([
+        {
+          id: 'A1',
+          kind: 'custom',
+          organizationId: 'org-1',
+          clientId: 'custom-client',
+          encryptedClientSecret: 'encrypted:custom-secret',
+          encryptedSigningSecret: 'encrypted:custom-signing',
+        },
+      ])
+    await expect(
+      getSlackCredentialGroupConfiguration({
+        organizationId: 'org-1',
+        credentialGroupId: 'group-1',
+      })
+    ).resolves.toMatchObject({
+      appId: 'A1',
+      teamId: 'T1',
+      clientId: 'custom-client',
+      clientSecret: 'custom-secret',
+    })
+    expect(dbChainMockFns.limit).toHaveBeenCalledTimes(2)
+    expect(shared.flag).not.toHaveBeenCalled()
+  })
   it('fails when the referenced app is absent from the owning organization', async () => {
     dbChainMockFns.limit
       .mockResolvedValueOnce([