fix(search): keep earlier Slack pages on any later-page failure and page past short pages

Author: waleedlatif1

apps/sim/lib/sim-search/live/providers.test.ts

@@ -321,6 +321,56 @@ describe('Slack RTS pages', () => {
     expect(result.message).toContain('nextCursor')
   })
 
+  it('keeps earlier pages when a later page fails outside the Slack API', async () => {
+    const api = client()
+    api.json
+      .mockResolvedValueOnce(slackPage(1, 20, 'page-2'))
+      .mockRejectedValueOnce(new Error('socket hang up'))
+    const result = await searchSlack(api, {
+      ...input,
+      limit: 50,
+      scopes,
+      native: { provider: 'slack', query: 'launch' },
+    })
+    expect(result.documents).toHaveLength(20)
+    expect(result.nextCursor).toBe('page-2')
+    expect(result.partial).toBe(true)
+  })
+
+  it('stops paging once the caller cancels the search', async () => {
+    const api = client()
+    const cancelled = new AbortController()
+    api.json.mockResolvedValueOnce(slackPage(1, 20, 'page-2')).mockImplementationOnce(async () => {
+      cancelled.abort()
+      throw new Error('aborted')
+    })
+    await expect(
+      searchSlack(api, {
+        ...input,
+        limit: 50,
+        scopes,
+        signal: cancelled.signal,
+        native: { provider: 'slack', query: 'launch' },
+      })
+    ).rejects.toThrow('aborted')
+  })
+
+  it('keeps paging past short pages that still carry a cursor', async () => {
+    const api = client()
+    api.json
+      .mockResolvedValueOnce(slackPage(1, 10, 'page-2'))
+      .mockResolvedValueOnce(slackPage(11, 10, 'page-3'))
+      .mockResolvedValueOnce(slackPage(21, 10))
+    const result = await searchSlack(api, {
+      ...input,
+      limit: 30,
+      scopes,
+      native: { provider: 'slack', query: 'launch' },
+    })
+    expect(api.json).toHaveBeenCalledTimes(3)
+    expect(result.documents).toHaveLength(30)
+  })
+
   it('still fails when the first page fails', async () => {
     const api = client()
     api.json.mockResolvedValue({ ok: false, error: 'ratelimited' })

apps/sim/lib/sim-search/live/slack.ts

@@ -39,15 +39,16 @@ function slackResult(value: unknown) {
 /** Results one Real-time Search call returns at most. */
 const SLACK_PAGE_SIZE = 20
 /**
- * Real-time Search pages a search aimed at Slack reads to fill a limit above one page. Each page
- * counts against the member's RTS rate limit of about 10 calls a minute.
+ * Real-time Search pages a search aimed at Slack reads to fill its limit. Each page counts
+ * against the member's RTS rate limit of about 10 calls a minute.
  */
 const MAX_SLACK_SEARCH_PAGES = 3
 
 /**
  * A search across every source reads one page, so Slack shares the result list with the other
  * sources. A Slack-scoped or native Slack search follows the cursor until it fills its limit.
- * A later page that fails keeps the earlier pages and returns the cursor it could not read.
+ * A later page that fails keeps the earlier pages and returns the cursor it could not read,
+ * unless the caller cancelled the search.
  */
 export async function searchSlack(
   client: NativeClient,
@@ -58,10 +59,7 @@ export async function searchSlack(
       'reconnect',
       'Reconnect your Slack account to grant permission to search.'
     )
-  const pages =
-    input.native || input.filters?.source === 'slack'
-      ? Math.min(Math.ceil(input.limit / SLACK_PAGE_SIZE), MAX_SLACK_SEARCH_PAGES)
-      : 1
+  const pages = input.native || input.filters?.source === 'slack' ? MAX_SLACK_SEARCH_PAGES : 1
   const first = await searchSlackPage(client, input, input.native?.cursor, input.limit)
   const documents = [...first.documents]
   let nextCursor = first.nextCursor
@@ -71,12 +69,18 @@ export async function searchSlack(
       documents.push(...more.documents)
       nextCursor = more.nextCursor
     } catch (error) {
-      if (!(error instanceof NativeSearchError)) throw error
+      if (input.signal?.aborted) throw error
       return {
         documents,
         nextCursor,
         partial: true,
-        message: joinMessages([first.message, error.message, 'Continue with nextCursor for more.']),
+        message: joinMessages([
+          first.message,
+          error instanceof NativeSearchError
+            ? error.message
+            : 'Slack could not return more results.',
+          'Continue with nextCursor for more.',
+        ]),
       }
     }
   }