fix(search): keep the Jira half-terms summary tier within the all-terms match

Author: waleedlatif1

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

@@ -334,7 +334,8 @@ describe('Confluence plain search ranking', () => {
 
 describe('Jira plain search ranking', () => {
   const search = '/ex/jira/cloud/rest/api/3/search/jql'
-  type Issue = string | { key: string; summary: string }
+  /** `outsideMatch` marks an issue whose text lacks a query term, so an all-terms clause excludes it. */
+  type Issue = string | { key: string; summary: string; outsideMatch?: boolean }
   /**
    * Answers the all-terms query with `exact`, the all-terms summary query with `titled`, and the
    * half-the-terms summary query with `half`, or their failures.
@@ -354,7 +355,9 @@ describe('Jira plain search ranking', () => {
         const jql = options?.body?.jql ?? ''
         if (jql.includes('summary ~')) {
           const rows = jql.includes(' OR ') ? half : titled
-          const picked = typeof rows === 'function' ? rows() : rows
+          const picked = (typeof rows === 'function' ? rows() : rows).filter(
+            (row) => !jql.includes('text ~') || typeof row === 'string' || !row.outsideMatch
+          )
           return { issues: issues(picked).slice(0, options?.body?.maxResults) }
         }
         return { issues: issues(exact.ids), ...(exact.more ? { nextPageToken: 'page-2' } : {}) }
@@ -502,4 +505,17 @@ describe('Jira plain search ranking', () => {
     const page = await searchAtlassian(api, 'jira', query)
     expect(page.documents.map((document) => document.id)).toEqual(['ALL-1', 'HALF-1', 'NEW-3'])
   })
+
+  it('keeps half-the-terms summaries to issues that match every term somewhere', async () => {
+    const api = jira(
+      overflowing,
+      [],
+      [
+        { key: 'OUTSIDE-1', summary: 'Merged results dashboard', outsideMatch: true },
+        { key: 'INSIDE-1', summary: 'Merged results broke the dashboard' },
+      ]
+    )
+    const page = await searchAtlassian(api, 'jira', query)
+    expect(page.documents.map((document) => document.id)).toEqual(['INSIDE-1', 'NEW-3', 'NEW-2'])
+  })
 })

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

@@ -118,9 +118,10 @@ async function sites(client: NativeClient) {
 }
 
 /**
- * Pair matches fetched for the half-the-terms summary fallback. Jira returns them newest first,
- * not by relevance, and the page is then filtered to summaries holding enough terms, so it starts
- * from a wider pool than the caller's limit or the any-term fallback's.
+ * Issues fetched for the half-the-terms summary tier: summary pair matches within the all-terms
+ * match. Jira returns them newest first, not by relevance, and the page is then filtered to
+ * summaries holding enough terms, so it starts from a wider pool than the caller's limit or the
+ * any-term fallback's.
  */
 const HALF_TERM_CANDIDATES = 50
 
@@ -226,17 +227,19 @@ export async function searchAtlassian(
           next: exact.next,
         }
         // JQL has no relevance order, so an all-terms match larger than a page comes back newest
-        // first; issues whose summary holds every term lead it instead, then those holding at
-        // least half of three or more terms (most terms first).
+        // first. Within that match, issues whose summary holds every term lead it instead, then
+        // those whose summary holds at least half of three or more terms (most terms first); a
+        // summary match never brings in an issue lacking one of the terms.
         if (!text || input.native || order || input.textMatch === 'any' || !exact.next)
           return exactPage
         const terms = stemmedTerms(text)
         const [every, half] = await Promise.allSettled([
           searchIssues(jiraTextClause(text, 'all', 'summary')),
           terms.count >= 3
-            ? searchIssues(jiraTextClause(text, 'any', 'summary'), {
-                maxResults: HALF_TERM_CANDIDATES,
-              })
+            ? searchIssues(
+                `${jiraTextClause(text, 'any', 'summary')} AND ${jiraTextClause(text)}`,
+                { maxResults: HALF_TERM_CANDIDATES }
+              )
             : undefined,
         ])
         // A cancelled search stops here; any other failure keeps the all-terms page.