fix(sailpoint): require aggregations for aggregate, expose searchAfter, fix review-item filters

- Require aggregationsDsl on search_aggregate (contract + tool) and send aggregationType: DSL so
  /search/aggregate always receives a valid aggregations definition.
- Coerce searchAfter cursor elements to strings instead of dropping non-string values, and expose
  a searchAfter input on the block so deep pagination past 10k is reachable from the UI.
- Correct the certification review-item filter fields (entitlements / access profiles / roles) to
  comma-separated ID filters instead of true/false placeholders.

Author: mzxchandra

apps/docs/content/docs/en/integrations/sailpoint.mdx

@@ -725,7 +725,7 @@ Return the aggregation result (buckets under `aggregations`, plus `hits`) for a
 | --------- | ---- | -------- | ----------- |
 | `indices` | json | No | Indices to aggregate over \(defaults to \["identities"\]\) |
 | `query` | string | No | Elasticsearch query string to scope the documents before aggregating |
-| `aggregationsDsl` | json | No | Elasticsearch aggregations DSL object defining the buckets/metrics to compute, e.g. \{ "department": \{ "terms": \{ "field": "attributes.department" \} \} \} |
+| `aggregationsDsl` | json | Yes | Elasticsearch aggregations DSL object defining the buckets/metrics to compute, e.g. \{ "department": \{ "terms": \{ "field": "attributes.department" \} \} \} |
 | `limit` | number | No | Maximum number of aggregation results \(max 250\) |
 | `offset` | number | No | Pagination offset \(0-based\) |
 

apps/sim/app/api/tools/sailpoint/query/route.test.ts

@@ -139,6 +139,7 @@ describe('SailPoint query route', () => {
       operation: 'sailpoint_search_aggregate',
       indices: 'identities',
       query: 'attributes.department:*',
+      aggregationsDsl: { department: { terms: { field: 'attributes.department' } } },
     })
 
     const response = await POST(request)
@@ -148,10 +149,31 @@ describe('SailPoint query route', () => {
     expect(fetchMock.mock.calls[1]?.[0]).toBe(
       'https://acme-aggregate.api.identitynow.com/v2025/search/aggregate'
     )
+    const aggInit = fetchMock.mock.calls[1]?.[1] as RequestInit
+    expect(JSON.parse(aggInit.body as string)).toEqual({
+      indices: ['identities'],
+      query: { query: 'attributes.department:*' },
+      aggregationType: 'DSL',
+      aggregationsDsl: { department: { terms: { field: 'attributes.department' } } },
+    })
     // The full AggregationResult object is preserved under `item`, not dropped as an empty list.
     expect(data.output).toEqual({ item: aggregationResult })
   })
 
+  it('rejects a search aggregate without an aggregations definition', async () => {
+    const request = createMockRequest('POST', {
+      ...baseCreds,
+      tenant: 'acme-agg-missing',
+      operation: 'sailpoint_search_aggregate',
+      indices: 'identities',
+    })
+
+    const response = await POST(request)
+
+    expect(response.status).toBe(400)
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+
   it('caches the token across calls with the same credentials', async () => {
     fetchMock
       .mockResolvedValueOnce(tokenResponse())

apps/sim/app/api/tools/sailpoint/query/route.ts

@@ -57,11 +57,22 @@ function qs(params: Record<string, unknown>): string {
   return serialized ? `?${serialized}` : ''
 }
 
-/** Normalizes an array/JSON-string/comma-list into a string[] (or undefined when empty). */
+/** Coerces a primitive (string/number/boolean) to a non-empty string token, else null. */
+function coerceToken(value: unknown): string | null {
+  if (typeof value === 'string') return value.length ? value : null
+  if (typeof value === 'number' || typeof value === 'boolean') return String(value)
+  return null
+}
+
+/**
+ * Normalizes an array/JSON-string/comma-list into a string[] (or undefined when empty). Numeric or
+ * boolean array elements are coerced to strings rather than dropped - SailPoint's `searchAfter`
+ * cursor mirrors sort values, which may include numbers, and must be sent as strings.
+ */
 function toStringList(value: unknown): string[] | undefined {
   if (value == null) return undefined
   if (Array.isArray(value)) {
-    const arr = value.filter((v): v is string => typeof v === 'string' && v.length > 0)
+    const arr = value.map(coerceToken).filter((v): v is string => v !== null)
     return arr.length ? arr : undefined
   }
   if (typeof value === 'string') {
@@ -71,7 +82,7 @@ function toStringList(value: unknown): string[] | undefined {
       try {
         const parsed: unknown = JSON.parse(trimmed)
         if (Array.isArray(parsed)) {
-          const arr = parsed.filter((v): v is string => typeof v === 'string')
+          const arr = parsed.map(coerceToken).filter((v): v is string => v !== null)
           return arr.length ? arr : undefined
         }
       } catch {
@@ -196,6 +207,9 @@ function dispatch(
       const searchBody = filterUndefined({
         indices: toStringList(body.indices) ?? ['identities'],
         query: body.query ? { query: body.query } : undefined,
+        // Interpret aggregationsDsl as Elasticsearch DSL (also SailPoint's default) rather than
+        // the typed SAILPOINT aggregation mode.
+        aggregationType: 'DSL',
         aggregationsDsl: body.aggregationsDsl,
       })
       return execute(

apps/sim/blocks/blocks/sailpoint.ts

@@ -199,6 +199,14 @@ export const SailPointBlock: BlockConfig<SailPointListResponse> = {
       condition: { field: 'operation', value: 'sailpoint_search' },
       mode: 'advanced',
     },
+    {
+      id: 'searchAfter',
+      title: 'Search After',
+      type: 'short-input',
+      placeholder: '["John Doe","2c9180...id"] (cursor from the last result to page past 10k)',
+      condition: { field: 'operation', value: 'sailpoint_search' },
+      mode: 'advanced',
+    },
     {
       id: 'aggregationsDsl',
       title: 'Aggregations',
@@ -393,25 +401,25 @@ export const SailPointBlock: BlockConfig<SailPointListResponse> = {
     },
     {
       id: 'entitlements',
-      title: 'Entitlements Filter',
+      title: 'Entitlement IDs',
       type: 'short-input',
-      placeholder: 'true / false',
+      placeholder: 'Comma-separated entitlement IDs to filter by',
       condition: { field: 'operation', value: 'sailpoint_list_certification_review_items' },
       mode: 'advanced',
     },
     {
       id: 'accessProfiles',
-      title: 'Access Profiles Filter',
+      title: 'Access Profile IDs',
       type: 'short-input',
-      placeholder: 'true / false',
+      placeholder: 'Comma-separated access profile IDs to filter by',
       condition: { field: 'operation', value: 'sailpoint_list_certification_review_items' },
       mode: 'advanced',
     },
     {
       id: 'roles',
-      title: 'Roles Filter',
+      title: 'Role IDs',
       type: 'short-input',
-      placeholder: 'true / false',
+      placeholder: 'Comma-separated role IDs to filter by',
       condition: { field: 'operation', value: 'sailpoint_list_certification_review_items' },
       mode: 'advanced',
     },
@@ -617,6 +625,7 @@ export const SailPointBlock: BlockConfig<SailPointListResponse> = {
             setStr('indices', params.indices)
             setStr('query', params.query)
             setStr('sort', params.sort)
+            setStr('searchAfter', params.searchAfter)
             if (params.includeNested === 'false' || params.includeNested === false) {
               mapped.includeNested = false
             }
@@ -765,6 +774,7 @@ export const SailPointBlock: BlockConfig<SailPointListResponse> = {
     query: { type: 'string', description: 'Elasticsearch query string' },
     includeNested: { type: 'string', description: 'Include nested objects in search results' },
     sort: { type: 'string', description: 'Search sort fields' },
+    searchAfter: { type: 'string', description: 'searchAfter cursor for deep search pagination' },
     aggregationsDsl: {
       type: 'json',
       description: 'Elasticsearch aggregations DSL for search aggregate',

apps/sim/lib/api/contracts/tools/sailpoint.ts

@@ -95,7 +95,12 @@ const searchAggregateSchema = z.object({
   operation: z.literal('sailpoint_search_aggregate'),
   indices: stringListField,
   query: z.string().optional(),
-  aggregationsDsl: z.preprocess(parseJson, z.record(z.string(), z.unknown())).optional(),
+  aggregationsDsl: z.preprocess(
+    parseJson,
+    z.record(z.string(), z.unknown()).refine((value) => Object.keys(value).length > 0, {
+      message: 'aggregationsDsl is required and must define at least one aggregation',
+    })
+  ),
   limit: limitField(LIMIT_STANDARD),
   offset: offsetField,
 })

apps/sim/tools/sailpoint/search_aggregate.ts

@@ -33,7 +33,7 @@ export const sailpointSearchAggregateTool: ToolConfig<
     },
     aggregationsDsl: {
       type: 'json',
-      required: false,
+      required: true,
       visibility: 'user-or-llm',
       description:
         'Elasticsearch aggregations DSL object defining the buckets/metrics to compute, e.g. { "department": { "terms": { "field": "attributes.department" } } }',