Merge remote-tracking branch 'origin/staging' into fix/onedrive

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts

@@ -1288,13 +1288,6 @@ export function useWorkflowExecution() {
           onBlockCompleteCallback: onBlockComplete,
         })
 
-        const clientWorkflowState = executionWorkflowState || {
-          blocks: filteredStates,
-          edges: workflowEdges,
-          loops: latestWorkflowState.loops,
-          parallels: latestWorkflowState.parallels,
-        }
-
         await executionStream.execute({
           workflowId: activeWorkflowId,
           input: finalWorkflowInput,
@@ -1304,12 +1297,14 @@ export function useWorkflowExecution() {
           useDraftState: true,
           isClientSession: true,
           stopAfterBlockId,
-          workflowStateOverride: {
-            blocks: clientWorkflowState.blocks,
-            edges: clientWorkflowState.edges,
-            loops: clientWorkflowState.loops,
-            parallels: clientWorkflowState.parallels,
-          },
+          workflowStateOverride: executionWorkflowState
+            ? {
+                blocks: executionWorkflowState.blocks,
+                edges: executionWorkflowState.edges,
+                loops: executionWorkflowState.loops,
+                parallels: executionWorkflowState.parallels,
+              }
+            : undefined,
           callbacks: {
             onExecutionStarted: (data) => {
               logger.info('Server execution started:', data)