pass execution context through & other minor bug fixes

Author: abhinavDhulipala

apps/sim/lib/paginated-cache/paginate.test.ts

@@ -169,9 +169,10 @@ describe('autoPaginate', () => {
     ).rejects.toThrow('Auto-pagination failed on page 1: rate limited')
   })
 
-  it('passes skipPostProcess=true for subsequent pages', async () => {
+  it('passes executionContext and skipAutoPaginate for subsequent pages', async () => {
     const initialResult = makePageResponse([{ id: 1 }], true, 'cursor-1')
     mockExecuteTool.mockResolvedValueOnce(makePageResponse([{ id: 2 }], false, null))
+    const mockContext = { workflowId: 'wf-1', executionId: 'exec-1' }
 
     await autoPaginate({
       initialResult,
@@ -180,11 +181,14 @@ describe('autoPaginate', () => {
       executeTool: mockExecuteTool,
       toolId: 'zendesk_get_tickets',
       executionId: 'exec-1',
+      executionContext: mockContext as never,
     })
 
     expect(mockExecuteTool).toHaveBeenCalledWith(
       'zendesk_get_tickets',
       expect.objectContaining({ pageAfter: 'cursor-1' }),
+      false,
+      mockContext,
       true
     )
   })

apps/sim/lib/paginated-cache/paginate.ts

@@ -5,6 +5,7 @@ import type { PaginatedCacheStorageAdapter } from '@/lib/paginated-cache/adapter
 import { RedisPaginatedCache } from '@/lib/paginated-cache/redis-cache'
 import type { PaginatedCacheReference, ToolPaginationConfig } from '@/lib/paginated-cache/types'
 import { isPaginatedCacheReference } from '@/lib/paginated-cache/types'
+import type { ExecutionContext } from '@/executor/types'
 import type { ToolResponse } from '@/tools/types'
 
 const logger = createLogger('Paginator')
@@ -18,10 +19,13 @@ interface AutoPaginateOptions {
   executeTool: (
     toolId: string,
     params: Record<string, unknown>,
-    skipPostProcess?: boolean
+    skipPostProcess?: boolean,
+    executionContext?: ExecutionContext,
+    skipAutoPaginate?: boolean
   ) => Promise<ToolResponse>
   toolId: string
   executionId: string
+  executionContext?: ExecutionContext
 }
 
 export async function autoPaginate(options: AutoPaginateOptions): Promise<ToolResponse> {
@@ -32,6 +36,7 @@ export async function autoPaginate(options: AutoPaginateOptions): Promise<ToolRe
     executeTool,
     toolId,
     executionId,
+    executionContext,
   } = options
   const maxPages = config.maxPages ?? DEFAULT_MAX_PAGES
 
@@ -55,7 +60,7 @@ export async function autoPaginate(options: AutoPaginateOptions): Promise<ToolRe
   let nextToken = config.getNextPageToken(initialResult.output)
   while (nextToken !== null && pageIndex < maxPages) {
     const nextParams = config.buildNextPageParams(params, nextToken)
-    const pageResult = await executeTool(toolId, nextParams, true)
+    const pageResult = await executeTool(toolId, nextParams, false, executionContext, true)
 
     if (!pageResult.success) {
       throw new Error(

apps/sim/lib/workflows/executor/queued-workflow-execution.ts

@@ -330,18 +330,9 @@ export async function executeQueuedWorkflowJob(
       await eventWriter.close()
     }
 
-    await cleanupExecutionBase64Cache(executionId).catch((error) => {
-      logger.error('Failed to cleanup queued workflow base64 cache', {
-        executionId,
-        error: error instanceof Error ? error.message : String(error),
-      })
-    })
-
-    await cleanupPaginatedCache(executionId).catch((error) => {
-      logger.error('Failed to cleanup queued workflow paginated cache', {
-        executionId,
-        error: error instanceof Error ? error.message : String(error),
-      })
-    })
+    await Promise.allSettled([
+      cleanupExecutionBase64Cache(executionId),
+      cleanupPaginatedCache(executionId),
+    ])
   }
 }

apps/sim/lib/workflows/streaming/streaming.ts

@@ -7,8 +7,8 @@ import {
 } from '@/lib/core/utils/response-format'
 import { encodeSSE } from '@/lib/core/utils/sse'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
-import { processStreamingBlockLogs } from '@/lib/tokenization'
 import { cleanupPaginatedCache } from '@/lib/paginated-cache/paginate'
+import { processStreamingBlockLogs } from '@/lib/tokenization'
 import {
   cleanupExecutionBase64Cache,
   hydrateUserFilesWithBase64,
@@ -348,8 +348,10 @@ export async function createStreamingResponse(
         controller.enqueue(encodeSSE('[DONE]'))
 
         if (executionId) {
-          await cleanupExecutionBase64Cache(executionId)
-          await cleanupPaginatedCache(executionId)
+          await Promise.allSettled([
+            cleanupExecutionBase64Cache(executionId),
+            cleanupPaginatedCache(executionId),
+          ])
         }
 
         controller.close()
@@ -360,8 +362,10 @@ export async function createStreamingResponse(
         )
 
         if (executionId) {
-          await cleanupExecutionBase64Cache(executionId)
-          await cleanupPaginatedCache(executionId)
+          await Promise.allSettled([
+            cleanupExecutionBase64Cache(executionId),
+            cleanupPaginatedCache(executionId),
+          ])
         }
 
         controller.close()
@@ -374,12 +378,10 @@ export async function createStreamingResponse(
       timeoutController.abort()
       timeoutController.cleanup()
       if (executionId) {
-        try {
-          await cleanupExecutionBase64Cache(executionId)
-          await cleanupPaginatedCache(executionId)
-        } catch (error) {
-          logger.error(`[${requestId}] Failed to cleanup cache`, { error })
-        }
+        await Promise.allSettled([
+          cleanupExecutionBase64Cache(executionId),
+          cleanupPaginatedCache(executionId),
+        ])
       }
     },
   })

apps/sim/tools/index.ts

@@ -609,13 +609,13 @@ async function maybeAutoPaginate(
   finalResult: ToolResponse,
   contextParams: Record<string, unknown>,
   normalizedToolId: string,
-  skipPostProcess: boolean,
+  skipAutoPaginate: boolean,
   executionContext?: ExecutionContext
 ): Promise<ToolResponse> {
   if (
     !tool.pagination ||
     !finalResult.success ||
-    skipPostProcess ||
+    skipAutoPaginate ||
     !executionContext?.executionId
   ) {
     return finalResult
@@ -631,6 +631,7 @@ async function maybeAutoPaginate(
     executeTool,
     toolId: normalizedToolId,
     executionId: executionContext.executionId,
+    executionContext,
   })
 }
 
@@ -642,7 +643,8 @@ export async function executeTool(
   toolId: string,
   params: Record<string, any>,
   skipPostProcess = false,
-  executionContext?: ExecutionContext
+  executionContext?: ExecutionContext,
+  skipAutoPaginate = false
 ): Promise<ToolResponse> {
   // Capture start time for precise timing
   const startTime = new Date()
@@ -859,7 +861,7 @@ export async function executeTool(
         finalResult,
         contextParams,
         normalizedToolId,
-        skipPostProcess,
+        skipAutoPaginate,
         executionContext
       )