fix(atlassian): address review findings

Keep trailing AQL and CQL order by clauses after scoped filters, honor escaped
quotes, reject JSM approvalStatus/organizationId outside their ownership modes,
move Trello card outputs into types.ts so the docs render them, and drop the
now-unused Confluence COMMENTS_OUTPUT.

Author: waleedlatif1

apps/docs/content/docs/integrations/trello.mdx

@@ -815,7 +815,7 @@ export const BitbucketBlock: BlockConfig = {
     },
     {
       id: 'targetRef',
-      title: 'Branch or Tag',
+      title: 'Branch',
       type: 'short-input',
       required: true,
       condition: { field: 'operation', value: 'bitbucket_trigger_pipeline' },

apps/sim/blocks/blocks/bitbucket.ts

@@ -178,6 +178,26 @@ describe('Confluence operations', () => {
     })
   })
 
+  it('keeps a trailing CQL order by after the parenthesized filter', async () => {
+    const fetchMock = vi.fn(async () => Response.json({ results: [], totalSize: 0, _links: {} }))
+    vi.stubGlobal('fetch', fetchMock)
+
+    await executeConfluenceSearch(
+      {
+        ...CONNECTION,
+        query: 'release',
+        limit: 25,
+        cql: 'title ~ "sort order by x" ORDER BY lastmodified desc',
+      },
+      { headers: new Headers(), requestId: 'request-1' }
+    )
+
+    const sentCql = new URL(String(fetchMock.mock.calls[0]?.[0])).searchParams.get('cql')
+    expect(sentCql).toBe(
+      'text ~ "release" AND (title ~ "sort order by x") ORDER BY lastmodified desc'
+    )
+  })
+
   it('fails closed when stored-file authorization denies access', async () => {
     mockAssertToolFileAccess.mockResolvedValueOnce(Response.json({ error: 'Forbidden' }))
 

apps/sim/lib/internal/confluence/operations.test.ts

@@ -905,6 +905,35 @@ export async function executeConfluenceGetPagesByLabel(
   }
 }
 
+const CQL_ORDER_BY = /\s*\border\s+by\s/iy
+
+/**
+ * Splits a trailing `order by` clause off a CQL fragment so the condition can be
+ * parenthesized while the ordering stays at the end, ignoring quoted values.
+ */
+function splitCqlOrderBy(cql: string): { condition: string; orderBy: string } {
+  let quote: string | null = null
+  let orderByStart = -1
+  for (let index = 0; index < cql.length; index++) {
+    const char = cql[index]
+    if (char === '"' || char === "'") {
+      let backslashes = 0
+      for (let cursor = index - 1; cursor >= 0 && cql[cursor] === '\\'; cursor--) backslashes++
+      if (backslashes % 2 === 0) {
+        if (quote === null) quote = char
+        else if (quote === char) quote = null
+      }
+      continue
+    }
+    if (quote !== null) continue
+    if (index > 0 && !/\s/.test(cql[index - 1])) continue
+    CQL_ORDER_BY.lastIndex = index
+    if (CQL_ORDER_BY.test(cql)) orderByStart = index
+  }
+  if (orderByStart === -1) return { condition: cql, orderBy: '' }
+  return { condition: cql.slice(0, orderByStart), orderBy: ` ${cql.slice(orderByStart).trim()}` }
+}
+
 function escapeCql(value: string): string {
   return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
 }
@@ -916,7 +945,11 @@ export async function executeConfluenceSearch(
   assertCursor(input.cursor)
   const client = await createConfluenceClient(input, context.signal)
   let cql = `text ~ "${escapeCql(input.query)}"`
-  if (input.cql?.trim()) cql += ` AND (${input.cql.trim()})`
+  const extraCql = input.cql?.trim()
+  if (extraCql) {
+    const { condition, orderBy } = splitCqlOrderBy(extraCql)
+    cql += condition.trim() ? ` AND (${condition.trim()})${orderBy}` : orderBy
+  }
   const query = new URLSearchParams({
     cql,
     limit: input.limit.toString(),

apps/sim/lib/internal/confluence/operations.ts

@@ -147,14 +147,17 @@ const AQL_ORDER_BY = /\s+order\s+by\s/iy
 
 /**
  * Splits a trailing `order by` clause off an AQL query, ignoring matches inside
- * double-quoted values, since AQL requires the ordering to stay at the end.
+ * double-quoted values (including escaped `\\"`), since AQL requires the ordering to
+ * stay at the end.
  */
 function splitAqlOrderBy(qlQuery: string): { condition: string; orderBy: string } {
   let inQuotes = false
   let orderByStart = -1
   for (let index = 0; index < qlQuery.length; index++) {
     if (qlQuery[index] === '"') {
-      inQuotes = !inQuotes
+      let backslashes = 0
+      for (let cursor = index - 1; cursor >= 0 && qlQuery[cursor] === '\\'; cursor--) backslashes++
+      if (backslashes % 2 === 0) inQuotes = !inQuotes
       continue
     }
     if (inQuotes) continue

apps/sim/lib/internal/jsm/assets.ts

@@ -167,4 +167,26 @@ describe('JSM operations', () => {
       }),
     })
   })
+
+  it.each([
+    [{ approvalStatus: 'MY_PENDING_APPROVAL', requestOwnership: 'OWNED_REQUESTS' }, 'APPROVER'],
+    [{ organizationId: '3', requestOwnership: 'APPROVER' }, 'ORGANIZATION'],
+  ])(
+    'rejects %o, which Atlassian only accepts with requestOwnership %s',
+    async (filters, owner) => {
+      await expect(executeJsmGetRequests({ ...BASE, ...filters })).rejects.toThrow(owner)
+    }
+  )
+
+  it('does not split an order by inside an escaped quote', async () => {
+    mocks.client.json.mockResolvedValueOnce({ values: [], total: 0, isLast: 'true' })
+    await executeJsmSearchObjectsAql({
+      ...BASE,
+      qlQuery: 'Name = "say \\" order by \\" x" order by Name',
+      objectTypeId: '7',
+    })
+    expect(JSON.parse(String(mocks.client.json.mock.calls.at(-1)?.[1]?.body))).toEqual({
+      qlQuery: '(Name = "say \\" order by \\" x") AND objectTypeId = 7 order by Name',
+    })
+  })
 })

apps/sim/lib/internal/jsm/operations.test.ts

@@ -200,7 +200,13 @@ export async function executeJsmGetRequests(input: JsmRequestsBody, signal?: Abo
     const result = validateEnum(input.approvalStatus, APPROVAL_STATUS, 'approvalStatus')
     if (!result.isValid) throw new JsmOperationError(result.error || 'Invalid approvalStatus', 400)
   }
+  if (input.approvalStatus && input.requestOwnership !== 'APPROVER') {
+    throw new JsmOperationError('approvalStatus requires requestOwnership APPROVER', 400)
+  }
   if (input.organizationId) validateId(input.organizationId, 'organizationId')
+  if (input.organizationId && input.requestOwnership !== 'ORGANIZATION') {
+    throw new JsmOperationError('organizationId requires requestOwnership ORGANIZATION', 400)
+  }
   const client = await createJsmClient(input, signal)
   const query = new URLSearchParams()
   append(query, 'serviceDeskId', input.serviceDeskId)

apps/sim/lib/internal/jsm/service-desk.ts

@@ -245,18 +245,6 @@ export const COMMENT_OUTPUT: OutputProperty = {
   properties: COMMENT_ITEM_PROPERTIES,
 }
 
-/**
- * Comments array output definition for list endpoints.
- */
-export const COMMENTS_OUTPUT: OutputProperty = {
-  type: 'array',
-  description: 'Array of Confluence comments',
-  items: {
-    type: 'object',
-    properties: COMMENT_ITEM_PROPERTIES,
-  },
-}
-
 /**
  * Attachment item properties from Confluence API v2.
  * Based on GET /wiki/api/v2/attachments response structure.

apps/sim/tools/confluence/types.ts

@@ -4,10 +4,9 @@ import {
   extractTrelloErrorMessage,
   mapTrelloCard,
   TRELLO_API_BASE_URL,
-  TRELLO_CARD_OUTPUT_DESCRIPTION,
-  TRELLO_CARD_OUTPUT_PROPERTIES,
 } from '@/tools/trello/shared'
 import type { TrelloCreateCardParams, TrelloCreateCardResponse } from '@/tools/trello/types'
+import { TRELLO_CARD_OUTPUT_PROPERTIES } from '@/tools/trello/types'
 import type { ToolConfig } from '@/tools/types'
 
 export const trelloCreateCardTool: ToolConfig<TrelloCreateCardParams, TrelloCreateCardResponse> = {
@@ -176,7 +175,8 @@ export const trelloCreateCardTool: ToolConfig<TrelloCreateCardParams, TrelloCrea
   outputs: {
     card: {
       type: 'json',
-      description: `Created card (${TRELLO_CARD_OUTPUT_DESCRIPTION})`,
+      description:
+        'Created card (id, name, desc, url, shortUrl, shortLink, idShort, idBoard, idList, closed, pos, labelIds, labels, idMembers, idChecklists, due, start, dueComplete, dateLastActivity, badges, checklists, attachments, members)',
       optional: true,
       properties: TRELLO_CARD_OUTPUT_PROPERTIES,
     },