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/workflows/executor/queued-workflow-execution.ts

@@ -330,9 +330,11 @@ export async function executeQueuedWorkflowJob(
       await eventWriter.close()
     }
 
-    await Promise.allSettled([
-      cleanupExecutionBase64Cache(executionId),
-      cleanupPaginatedCache(executionId),
-    ])
+    void cleanupExecutionBase64Cache(executionId).catch((error) => {
+      logger.error('Failed to cleanup base64 cache', { executionId, error })
+    })
+    void cleanupPaginatedCache(executionId).catch((error) => {
+      logger.error('Failed to cleanup paginated cache', { executionId, error })
+    })
   }
 }

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

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