hydrate block state on server side output

Author: abhinavDhulipala

apps/sim/executor/execution/block-executor.ts

@@ -110,7 +110,6 @@ export class BlockExecutor {
       }
 
       resolvedInputs = this.resolver.resolveInputs(ctx, node.id, block.config.params, block)
-      resolvedInputs = await hydrateCacheReferences(resolvedInputs)
 
       if (blockLog) {
         blockLog.input = this.sanitizeInputsForLog(resolvedInputs)
@@ -169,6 +168,10 @@ export class BlockExecutor {
         })) as NormalizedBlockOutput
       }
 
+      normalizedOutput = (await hydrateCacheReferences(
+        normalizedOutput as Record<string, unknown>
+      )) as NormalizedBlockOutput
+
       const duration = performance.now() - startTime
 
       if (blockLog) {

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

@@ -25,7 +25,11 @@ vi.mock('@/lib/paginated-cache/redis-cache', () => ({
   })),
 }))
 
-import { autoPaginate, hydrateCacheReferences } from '@/lib/paginated-cache/paginate'
+import {
+  autoPaginate,
+  cleanupPaginatedCache,
+  hydrateCacheReferences,
+} from '@/lib/paginated-cache/paginate'
 import type { ToolResponse } from '@/tools/types'
 
 function makePageResponse(items: unknown[], hasMore: boolean, cursor: string | null): ToolResponse {
@@ -256,7 +260,6 @@ describe('cleanupPaginatedCache', () => {
       .mockResolvedValueOnce(['0', ['pagcache:page:exec-1:tool:field:uuid:0']])
       .mockResolvedValueOnce(['0', ['pagcache:meta:exec-1:tool:field:uuid']])
 
-    const { cleanupPaginatedCache } = await import('@/lib/paginated-cache/paginate')
     await cleanupPaginatedCache('exec-1')
 
     expect(mockScan).toHaveBeenCalledWith('0', 'MATCH', 'pagcache:page:exec-1:*', 'COUNT', 100)
@@ -267,7 +270,6 @@ describe('cleanupPaginatedCache', () => {
   it('no-ops when Redis is unavailable', async () => {
     mockGetRedisClient.mockReturnValue(null)
 
-    const { cleanupPaginatedCache } = await import('@/lib/paginated-cache/paginate')
     await cleanupPaginatedCache('exec-1')
 
     expect(mockScan).not.toHaveBeenCalled()

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

@@ -330,9 +330,17 @@ export async function executeQueuedWorkflowJob(
       await eventWriter.close()
     }
 
-    await Promise.allSettled([
-      cleanupExecutionBase64Cache(executionId),
-      cleanupPaginatedCache(executionId),
-    ])
+    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 paginated cache', {
+        executionId,
+        error: error instanceof Error ? error.message : String(error),
+      })
+    })
   }
 }

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

@@ -348,10 +348,10 @@ export async function createStreamingResponse(
         controller.enqueue(encodeSSE('[DONE]'))
 
         if (executionId) {
-          await Promise.allSettled([
-            cleanupExecutionBase64Cache(executionId),
-            cleanupPaginatedCache(executionId),
-          ])
+          await cleanupExecutionBase64Cache(executionId)
+          void cleanupPaginatedCache(executionId).catch((error) => {
+            logger.error('Failed to cleanup paginated cache', { executionId, error })
+          })
         }
 
         controller.close()
@@ -362,10 +362,10 @@ export async function createStreamingResponse(
         )
 
         if (executionId) {
-          await Promise.allSettled([
-            cleanupExecutionBase64Cache(executionId),
-            cleanupPaginatedCache(executionId),
-          ])
+          await cleanupExecutionBase64Cache(executionId)
+          void cleanupPaginatedCache(executionId).catch((error) => {
+            logger.error('Failed to cleanup paginated cache', { executionId, error })
+          })
         }
 
         controller.close()
@@ -378,10 +378,14 @@ export async function createStreamingResponse(
       timeoutController.abort()
       timeoutController.cleanup()
       if (executionId) {
-        await Promise.allSettled([
-          cleanupExecutionBase64Cache(executionId),
-          cleanupPaginatedCache(executionId),
-        ])
+        try {
+          await cleanupExecutionBase64Cache(executionId)
+        } catch (error) {
+          logger.error(`[${requestId}] Failed to cleanup base64 cache`, { error })
+        }
+        void cleanupPaginatedCache(executionId).catch((error) => {
+          logger.error('Failed to cleanup paginated cache', { executionId, error })
+        })
       }
     },
   })

apps/sim/tools/index.ts

@@ -852,6 +852,8 @@ export async function executeTool(
       // Process file outputs if execution context is available
       finalResult = await processFileOutputs(finalResult, tool, executionContext)
 
+      // Auto-paginate if configured (duplicated in both directExecution and HTTP branches
+      // because each returns independently with timing data)
       finalResult = await maybeAutoPaginate(
         tool,
         finalResult,

apps/sim/tools/zendesk/get_tickets_v2.ts

@@ -24,7 +24,7 @@ export interface ZendeskGetTicketsV2Params {
 export interface ZendeskGetTicketsV2Response {
   success: boolean
   output: {
-    tickets: any[]
+    tickets: Record<string, unknown>[]
     paging?: {
       after_cursor: string | null
       has_more: boolean
@@ -107,7 +107,8 @@ export const zendeskGetTicketsV2Tool: ToolConfig<
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Results per page as a number string (default: "100", max: "100")',
+      description:
+        'Batch size per API request during auto-pagination as a number string (default: "100", max: "100")',
     },
   },