fix(integrations): keep per-operation pagination values from leaking across operations and keep blank canvas custom field values

Author: waleedlatif1

apps/sim/blocks/blocks/airtable.test.ts

@@ -105,3 +105,21 @@ describe('AirtableBlock typecast', () => {
     ).toMatchObject({ recordIds: ['rec123'] })
   })
 })
+
+describe('Airtable pagination offsets', () => {
+  const mapParams = AirtableBlock.tools.config?.params
+  if (!mapParams) throw new Error('Airtable block is missing its params mapper')
+
+  it('does not send a List Bases offset to List Records on the canvas', () => {
+    const mapped = mapParams({ ...baseParams, operation: 'list', basesOffset: 'itrBases' })
+    expect(mapped.offset).toBeUndefined()
+  })
+
+  it('keeps the model offset on a List Records tool call', () => {
+    const mapped = mapParams(
+      { ...baseParams, operation: 'list', offset: 'itrModel' },
+      { operation: 'list' }
+    )
+    expect(mapped.offset).toBe('itrModel')
+  })
+})

apps/sim/blocks/blocks/airtable.ts

@@ -3,6 +3,7 @@ import { AirtableIcon } from '@/components/icons'
 import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
+import { toolCallArg } from '@/blocks/utils'
 import { getTrigger } from '@/triggers'
 
 /** Canonical account pair — an advanced-mode card only fills `manualCredential`. */
@@ -187,11 +188,19 @@ export const AirtableBlock: BlockConfig = {
       mode: 'advanced',
     },
     {
-      id: 'offset',
+      id: 'recordsOffset',
       title: 'Offset',
       type: 'short-input',
       placeholder: 'Pagination offset from a previous response',
-      condition: { field: 'operation', value: ['listBases', 'list'] },
+      condition: { field: 'operation', value: 'list' },
+      mode: 'advanced',
+    },
+    {
+      id: 'basesOffset',
+      title: 'Offset',
+      type: 'short-input',
+      placeholder: 'Pagination offset from a previous response',
+      condition: { field: 'operation', value: 'listBases' },
       mode: 'advanced',
     },
     {
@@ -407,9 +416,18 @@ Return ONLY the valid JSON array of record ID strings - no explanations, no mark
             throw new Error(`Invalid Airtable operation: ${params.operation}`)
         }
       },
-      params: (params) => {
-        const { oauthCredential, records, fields, fieldsToMergeOn, recordIds, typecast, ...rest } =
-          params
+      params: (params, context) => {
+        const {
+          oauthCredential,
+          records,
+          fields,
+          fieldsToMergeOn,
+          recordIds,
+          typecast,
+          recordsOffset,
+          basesOffset,
+          ...rest
+        } = params
         let parsedRecords: unknown
         let parsedFields: unknown
         let parsedFieldsToMergeOn: unknown
@@ -452,6 +470,16 @@ Return ONLY the valid JSON array of record ID strings - no explanations, no mark
           typecast != null ? { typecast: typecast === true || typecast === 'true' } : {}
 
         switch (params.operation) {
+          case 'list':
+            return {
+              ...baseParams,
+              offset: recordsOffset || toolCallArg(context, rest.offset) || undefined,
+            }
+          case 'listBases':
+            return {
+              ...baseParams,
+              offset: basesOffset || toolCallArg(context, rest.offset) || undefined,
+            }
           case 'create':
           case 'updateMultiple':
             return { ...baseParams, records: parsedRecords, ...typecastParams }
@@ -483,7 +511,14 @@ Return ONLY the valid JSON array of record ID strings - no explanations, no mark
     filterFormula: { type: 'string', description: 'Filter formula expression' }, // Optional for list
     view: { type: 'string', description: 'View name or ID to list records from' },
     pageSize: { type: 'number', description: 'Records per page (max 100)' },
-    offset: { type: 'string', description: 'Pagination offset from a previous response' },
+    recordsOffset: {
+      type: 'string',
+      description: 'Pagination offset from a previous List Records response',
+    },
+    basesOffset: {
+      type: 'string',
+      description: 'Pagination offset from a previous List Bases response',
+    },
     records: { type: 'json', description: 'Record data array' }, // Required for create/updateMultiple/upsert
     fields: { type: 'json', description: 'Field data object' }, // Required for update single
     fieldsToMergeOn: { type: 'json', description: 'Field names to match records on' }, // Required for upsert

apps/sim/blocks/blocks/clickup.ts

@@ -2,7 +2,12 @@ import { ClickUpIcon } from '@/components/icons'
 import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
-import { normalizeFileInput, parseOptionalBooleanInput, toolCallArg } from '@/blocks/utils'
+import {
+  isToolCall,
+  normalizeFileInput,
+  parseOptionalBooleanInput,
+  toolCallArg,
+} from '@/blocks/utils'
 import { getTrigger } from '@/triggers'
 
 const TIMESTAMP_WAND_PROMPT = `Generate a Unix timestamp in milliseconds based on the user's description.
@@ -1730,9 +1735,9 @@ Return ONLY the value (plain string, number, or JSON) - no explanations, no extr
               taskId: params.taskId,
               fieldId: params.fieldId,
               value:
-                params.fieldValue !== undefined && params.fieldValue !== ''
-                  ? parseCustomFieldValue(params.fieldValue)
-                  : toolCallArg(context, params.value),
+                isToolCall(context) && (params.fieldValue === undefined || params.fieldValue === '')
+                  ? params.value
+                  : parseCustomFieldValue(params.fieldValue),
             }
           case 'remove_custom_field_value':
             return {

apps/sim/blocks/blocks/monday.ts

@@ -2,6 +2,7 @@ import { MondayIcon } from '@/components/icons'
 import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
+import { toolCallArg } from '@/blocks/utils'
 import { getTrigger } from '@/triggers'
 
 const BOARD_OPS = [
@@ -468,13 +469,21 @@ export const MondayBlock: BlockConfig = {
       mode: 'advanced',
       condition: { field: 'operation', value: 'list_boards' },
     },
+    {
+      id: 'getItemsCursor',
+      title: 'Cursor',
+      type: 'short-input',
+      placeholder: 'Pagination cursor from previous response',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'get_items' },
+    },
     {
       id: 'cursor',
       title: 'Cursor',
       type: 'short-input',
       placeholder: 'Pagination cursor from previous response',
       mode: 'advanced',
-      condition: { field: 'operation', value: ['get_items', 'search_items'] },
+      condition: { field: 'operation', value: 'search_items' },
     },
     ...getTrigger('monday_item_created').subBlocks,
     ...getTrigger('monday_column_changed').subBlocks,
@@ -512,7 +521,7 @@ export const MondayBlock: BlockConfig = {
         const op = typeof params.operation === 'string' ? params.operation.trim() : 'list_boards'
         return `monday_${op}`
       },
-      params: (params) => {
+      params: (params, context) => {
         const baseParams: Record<string, unknown> = {
           oauthCredential: params.oauthCredential,
         }
@@ -535,7 +544,7 @@ export const MondayBlock: BlockConfig = {
               boardId: params.boardId,
               groupId: params.groupId || undefined,
               limit: params.limit ? Number(params.limit) : undefined,
-              cursor: params.cursor || undefined,
+              cursor: params.getItemsCursor || toolCallArg(context, params.cursor) || undefined,
             }
           case 'search_items':
             return {
@@ -663,7 +672,8 @@ export const MondayBlock: BlockConfig = {
     groupColor: { type: 'string', description: 'Group color hex code' },
     limit: { type: 'number', description: 'Maximum number of results' },
     page: { type: 'number', description: 'Page number for pagination' },
-    cursor: { type: 'string', description: 'Pagination cursor for get items or search' },
+    getItemsCursor: { type: 'string', description: 'Pagination cursor for get items' },
+    cursor: { type: 'string', description: 'Pagination cursor for search items' },
   },
   outputs: {
     boards: {

apps/sim/tools/notion/utils.ts

@@ -76,8 +76,14 @@ const NOTION_MAX_ARRAY_ELEMENTS = 100
  * surrogate pair is never split across two objects.
  */
 export function toNotionRichText(
-  content: string
+  value: unknown
 ): Array<{ type: 'text'; text: { content: string } }> {
+  const content =
+    typeof value === 'string'
+      ? value
+      : value !== null && typeof value === 'object'
+        ? JSON.stringify(value)
+        : String(value ?? '')
   const chunks: string[] = []
   let index = 0
   while (index < content.length) {