From 8128b9bd45f3a8a4e5da8d92f2c933a9f065a0c5 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Sat, 18 Jul 2026 13:14:00 -0700
Subject: [PATCH] fix(chat): run block execution state loader

---
 apps/sim/lib/workflows/executor/execution-state.test.ts | 6 ++++--
 apps/sim/lib/workflows/executor/execution-state.ts      | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/sim/lib/workflows/executor/execution-state.test.ts b/apps/sim/lib/workflows/executor/execution-state.test.ts
index c2a6c967e70..689371c0ffd 100644
--- a/apps/sim/lib/workflows/executor/execution-state.test.ts
+++ b/apps/sim/lib/workflows/executor/execution-state.test.ts
@@ -148,7 +148,10 @@ describe('execution state lookup', () => {
     )
     mockMaterializeExecutionData
       .mockResolvedValueOnce({})
-      .mockResolvedValueOnce({ executionState: EXECUTION_STATE })
+      .mockImplementationOnce(async (executionData: Record<string, unknown>) => {
+        const { traceStoreRef: _traceStoreRef, ...inlineValues } = executionData
+        return { executionState: EXECUTION_STATE, ...inlineValues }
+      })
 
     const result = await getLatestExecutionStateWithExecutionId('workflow-1')
 
@@ -160,7 +163,6 @@ describe('execution state lookup', () => {
     expect(mockMaterializeExecutionData).toHaveBeenNthCalledWith(
       1,
       {
-        executionState: null,
         traceStoreRef: { id: 'value-2' },
       },
       {
diff --git a/apps/sim/lib/workflows/executor/execution-state.ts b/apps/sim/lib/workflows/executor/execution-state.ts
index 3c8cb8f9fd9..f482f8e9e75 100644
--- a/apps/sim/lib/workflows/executor/execution-state.ts
+++ b/apps/sim/lib/workflows/executor/execution-state.ts
@@ -142,8 +142,12 @@ export async function getLatestExecutionStateWithExecutionId(
       workflowId: row.workflowId,
       workspaceId: row.workspaceId,
       executionData: {
-        executionState: row.executionState,
-        [TRACE_STORE_REF_KEY]: row.traceStoreRef,
+        ...(row.executionState !== null && row.executionState !== undefined
+          ? { executionState: row.executionState }
+          : {}),
+        ...(row.traceStoreRef !== null && row.traceStoreRef !== undefined
+          ? { [TRACE_STORE_REF_KEY]: row.traceStoreRef }
+          : {}),
       },
     })
     if (state) return { executionId: row.executionId, state }