improvement(search): one provider setting for the any-term retry

Replace the parallel requiresEveryTerm and partialMatchesNeedHalfTheTerms flags and their two lookups with a single anyTermRetry setting that carries the fallback's options.

Author: waleedlatif1

apps/sim/lib/sim-search/live/account-session.ts

@@ -23,10 +23,9 @@ import { livePolicyFor, loadLiveSearchPolicies } from '@/lib/sim-search/live/pol
 import { LIVE_SEARCH_PROVIDER_CATALOG } from '@/lib/sim-search/live/provider-catalog'
 import { isSearchProviderEnabled } from '@/lib/sim-search/live/provider-rollout'
 import {
-  partialMatchesNeedHalfTheTerms,
+  anyTermRetry,
   previewNativeText,
   readNativeProvider,
-  requiresEveryTerm,
   searchNativeProvider,
 } from '@/lib/sim-search/live/providers'
 import { searchWithinPolicy } from '@/lib/sim-search/live/scoped-search'
@@ -206,10 +205,9 @@ export async function openLiveAccountSession(
           client ? searchNativeProvider(provider, client, native) : searchMcp(native)
         )
       }
-      return client && requiresEveryTerm(provider)
-        ? searchWithAnyTermFallback(searchOnce, search, signal, {
-            requireHalfTheTerms: partialMatchesNeedHalfTheTerms(provider),
-          })
+      const retry = client ? anyTermRetry(provider) : undefined
+      return retry
+        ? searchWithAnyTermFallback(searchOnce, search, signal, retry)
         : searchOnce(search)
     },
     async verify(document) {

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

@@ -26,7 +26,7 @@ const mocks = vi.hoisted(() => ({
   json: vi.fn(),
   service: vi.fn(),
   destroyPool: vi.fn(),
-  requiresEveryTerm: vi.fn(),
+  anyTermRetry: vi.fn(),
   preview: vi.fn(),
 }))
 vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock)
@@ -67,8 +67,7 @@ vi.mock('@/lib/sim-search/live/providers', () => ({
   liveSearchGuidance: (providers: string[]) => `Live coverage: ${[...new Set(providers)]}`,
   searchNativeProvider: mocks.search,
   readNativeProvider: mocks.read,
-  requiresEveryTerm: mocks.requiresEveryTerm,
-  partialMatchesNeedHalfTheTerms: () => false,
+  anyTermRetry: mocks.anyTermRetry,
   previewNativeText: mocks.preview,
 }))
 vi.mock('@/executor/utils/resolved-secret-content-projection', () => ({
@@ -141,7 +140,7 @@ describe('authorized live retrieval', () => {
       documents: [{ ...document, id: 'src/a.ts', container: '42', kind: 'code' }],
     })
     mocks.adminVerify.mockResolvedValue(true)
-    mocks.requiresEveryTerm.mockReset().mockReturnValue(false)
+    mocks.anyTermRetry.mockReset().mockReturnValue(undefined)
     mocks.preview.mockReset().mockResolvedValue(undefined)
   })
   describe('Zoom continuation integrity', () => {
@@ -699,7 +698,7 @@ describe('authorized live retrieval', () => {
   })
 
   it('retries an underfilled search with any term for providers that require every term', async () => {
-    mocks.requiresEveryTerm.mockReturnValue(true)
+    mocks.anyTermRetry.mockReturnValue({})
     const loose = { ...document, id: 'loose', url: 'https://docs.google.com/document/d/loose/edit' }
     mocks.search.mockImplementation(async (_provider, _client, search) => ({
       documents: search.textMatch === 'any' ? [loose, document] : [document],

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

@@ -20,6 +20,7 @@ import {
   type LiveSearchProviderId,
 } from '@/lib/sim-search/live/provider-catalog'
 import { readSlack, searchSlack } from '@/lib/sim-search/live/slack'
+import type { AnyTermFallbackOptions } from '@/lib/sim-search/live/term-fallback'
 import type {
   NativeClient,
   NativeDocument,
@@ -46,13 +47,12 @@ interface NativeQueryGuide {
 
 interface NativeProvider {
   guide: NativeQueryGuide
-  /** Plain queries must contain every word, so an underfilled search retries with any term. */
-  requiresEveryTerm?: true
   /**
-   * The any-term retry ranks items sharing just a couple of common words alongside close matches,
-   * so its partial matches must contain at least half the query's terms.
+   * Plain queries must contain every word, so an underfilled search retries with any term.
+   * `requireHalfTheTerms` is for a provider whose any-term query ranks items sharing just a couple
+   * of common words alongside close matches.
    */
-  partialMatchesNeedHalfTheTerms?: true
+  anyTermRetry?: AnyTermFallbackOptions
   /**
    * Full text for a search preview, for providers whose search returns only an excerpt or
    * metadata. At most one request; undefined for kinds without a cheap text form.
@@ -181,8 +181,7 @@ export const LIVE_SEARCH_PROVIDERS = {
       avoid:
         'JQL with only an ORDER BY clause (Jira rejects unbounded queries), and identifying users other than currentUser() by display name or email; use their account ID.',
     },
-    requiresEveryTerm: true,
-    partialMatchesNeedHalfTheTerms: true,
+    anyTermRetry: { requireHalfTheTerms: true },
     search: (client, input) => searchAtlassian(client, 'jira', input),
     read: (client, reference) => readAtlassian(client, 'jira', reference.id, reference.container),
   },
@@ -196,7 +195,7 @@ export const LIVE_SEARCH_PROVIDERS = {
       avoid:
         'starting the query with a negative clause (NOT, !=, !~ or NOT IN), which CQL rejects; lead with a positive clause such as type IN (page, blogpost).',
     },
-    requiresEveryTerm: true,
+    anyTermRetry: { requireHalfTheTerms: false },
     previewText: previewConfluence,
     search: (client, input) => searchAtlassian(client, 'confluence', input),
     read: (client, reference) =>
@@ -319,18 +318,13 @@ export function searchNativeProvider(
   return adapter.search(client, input)
 }
 
-/** True when the provider's plain-text search matches only items containing every query word. */
-export function requiresEveryTerm(provider: LiveSearchProviderId): boolean {
-  const adapter = LIVE_SEARCH_PROVIDERS[provider]
-  return 'requiresEveryTerm' in adapter && adapter.requiresEveryTerm === true
-}
-
-/** True when the provider's partial matches must contain at least half the query's terms. */
-export function partialMatchesNeedHalfTheTerms(provider: LiveSearchProviderId): boolean {
+/**
+ * How the provider retries an underfilled plain search with any term; undefined when its
+ * plain-text search does not require every query word.
+ */
+export function anyTermRetry(provider: LiveSearchProviderId): AnyTermFallbackOptions | undefined {
   const adapter = LIVE_SEARCH_PROVIDERS[provider]
-  return (
-    'partialMatchesNeedHalfTheTerms' in adapter && adapter.partialMatchesNeedHalfTheTerms === true
-  )
+  return 'anyTermRetry' in adapter ? adapter.anyTermRetry : undefined
 }
 
 /**

apps/sim/lib/sim-search/live/term-fallback.ts

@@ -50,11 +50,16 @@ const documentKey = ({ container, kind, id }: NativeDocument) =>
  * With `requireHalfTheTerms`, a partial match must contain at least half the query's terms in its
  * title or text, for providers whose OR query matches items sharing only a couple of common words.
  */
+export interface AnyTermFallbackOptions {
+  /** Keep only partial matches holding at least half the query's terms. */
+  requireHalfTheTerms?: boolean
+}
+
 export async function searchWithAnyTermFallback(
   search: (input: NativeSearchInput) => Promise<NativePage>,
   input: NativeSearchInput,
   signal: AbortSignal,
-  options: { requireHalfTheTerms?: boolean } = {}
+  options: AnyTermFallbackOptions = {}
 ): Promise<NativePage> {
   const strict = await search(input)
   const terms = significantTerms(input.query)