Revert "improvement(executor): correctness-by-construction for workflow logs (#4382)"

This reverts commit add55b4.

Author: waleedlatif1

apps/sim/app/api/workflows/[id]/execute/route.ts

@@ -919,8 +919,7 @@ async function handleExecutePost(
             blockType: string,
             executionOrder: number,
             iterationContext?: IterationContext,
-            childWorkflowContext?: ChildWorkflowContext,
-            blockExecutionId?: string
+            childWorkflowContext?: ChildWorkflowContext
           ) => {
             reqLogger.info('onBlockStart called', { blockId, blockName, blockType })
             sendEvent({
@@ -946,7 +945,6 @@ async function handleExecutePost(
                   childWorkflowBlockId: childWorkflowContext.parentBlockId,
                   childWorkflowName: childWorkflowContext.workflowName,
                 }),
-                ...(blockExecutionId && { blockExecutionId }),
               },
             })
           }
@@ -957,8 +955,7 @@ async function handleExecutePost(
             blockType: string,
             callbackData: any,
             iterationContext?: IterationContext,
-            childWorkflowContext?: ChildWorkflowContext,
-            blockExecutionId?: string
+            childWorkflowContext?: ChildWorkflowContext
           ) => {
             const hasError = callbackData.output?.error
             const childWorkflowData = childWorkflowContext
@@ -972,11 +969,6 @@ async function handleExecutePost(
               ? { childWorkflowInstanceId: callbackData.childWorkflowInstanceId }
               : {}
 
-            const resolvedBlockExecutionId = blockExecutionId ?? callbackData.blockExecutionId
-            const blockExecData = resolvedBlockExecutionId
-              ? { blockExecutionId: resolvedBlockExecutionId }
-              : {}
-
             if (hasError) {
               reqLogger.info('onBlockComplete (error) called', {
                 blockId,
@@ -1010,7 +1002,6 @@ async function handleExecutePost(
                   }),
                   ...childWorkflowData,
                   ...instanceData,
-                  ...blockExecData,
                 },
               })
             } else {
@@ -1045,7 +1036,6 @@ async function handleExecutePost(
                   }),
                   ...childWorkflowData,
                   ...instanceData,
-                  ...blockExecData,
                 },
               })
             }
@@ -1175,6 +1165,7 @@ async function handleExecutePost(
                 data: {
                   error: timeoutErrorMessage,
                   duration: result.metadata?.duration || 0,
+                  finalBlockLogs: result.logs,
                 },
               })
               finalMetaStatus = 'error'
@@ -1188,6 +1179,7 @@ async function handleExecutePost(
                 workflowId,
                 data: {
                   duration: result.metadata?.duration || 0,
+                  finalBlockLogs: result.logs,
                 },
               })
               finalMetaStatus = 'cancelled'
@@ -1252,6 +1244,7 @@ async function handleExecutePost(
             data: {
               error: executionResult?.error || errorMessage,
               duration: executionResult?.metadata?.duration || 0,
+              finalBlockLogs: executionResult?.logs,
             },
           })
           finalMetaStatus = 'error'

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

@@ -230,25 +230,31 @@ export function useWorkflowExecution() {
       durationMs?: number
       blockLogs: BlockLog[]
       isPreExecutionError?: boolean
+      finalBlockLogs?: BlockLog[]
     }) => {
       if (!params.workflowId) return
       sharedHandleExecutionErrorConsole(
-        { addConsole, updateConsole },
+        { addConsole, updateConsole, cancelRunningEntries },
         { ...params, workflowId: params.workflowId }
       )
     },
-    [addConsole, updateConsole]
+    [addConsole, cancelRunningEntries, updateConsole]
   )
 
   const handleExecutionCancelledConsole = useCallback(
-    (params: { workflowId?: string; executionId?: string; durationMs?: number }) => {
+    (params: {
+      workflowId?: string
+      executionId?: string
+      durationMs?: number
+      finalBlockLogs?: BlockLog[]
+    }) => {
       if (!params.workflowId) return
       sharedHandleExecutionCancelledConsole(
-        { addConsole, updateConsole },
+        { addConsole, updateConsole, cancelRunningEntries },
         { ...params, workflowId: params.workflowId }
       )
     },
-    [addConsole, updateConsole]
+    [addConsole, cancelRunningEntries, updateConsole]
   )
 
   const buildBlockEventHandlers = useCallback(
@@ -1030,6 +1036,8 @@ export function useWorkflowExecution() {
           accumulatedBlockLogs,
           accumulatedBlockStates,
           executedBlockIds,
+          consoleMode: 'update',
+          includeStartConsoleEntry: true,
           onBlockCompleteCallback: onBlockComplete,
         })
 
@@ -1232,6 +1240,7 @@ export function useWorkflowExecution() {
                 durationMs: data.duration,
                 blockLogs: accumulatedBlockLogs,
                 isPreExecutionError,
+                finalBlockLogs: data.finalBlockLogs,
               })
 
               if (activeWorkflowId && !isExecutingFromChat) {
@@ -1258,6 +1267,7 @@ export function useWorkflowExecution() {
                 workflowId: activeWorkflowId,
                 executionId: executionIdRef.current,
                 durationMs: data?.duration,
+                finalBlockLogs: data?.finalBlockLogs,
               })
 
               if (activeWorkflowId && !isExecutingFromChat) {
@@ -1674,6 +1684,8 @@ export function useWorkflowExecution() {
           accumulatedBlockLogs,
           accumulatedBlockStates,
           executedBlockIds,
+          consoleMode: 'update',
+          includeStartConsoleEntry: true,
         })
 
         await executionStream.executeFromBlock({
@@ -1743,6 +1755,7 @@ export function useWorkflowExecution() {
                 error: data.error,
                 durationMs: data.duration,
                 blockLogs: accumulatedBlockLogs,
+                finalBlockLogs: data.finalBlockLogs,
               })
 
               setCurrentExecutionId(workflowId, null)
@@ -1755,6 +1768,7 @@ export function useWorkflowExecution() {
                 workflowId,
                 executionId: executionIdRef.current,
                 durationMs: data?.duration,
+                finalBlockLogs: data?.finalBlockLogs,
               })
 
               setCurrentExecutionId(workflowId, null)
@@ -1901,6 +1915,8 @@ export function useWorkflowExecution() {
         accumulatedBlockLogs,
         accumulatedBlockStates,
         executedBlockIds,
+        consoleMode: 'update',
+        includeStartConsoleEntry: true,
       })
 
       const capturedExecutionId = executionId
@@ -2001,6 +2017,7 @@ export function useWorkflowExecution() {
                   executionId: capturedExecutionId,
                   error: data.error,
                   blockLogs: accumulatedBlockLogs,
+                  finalBlockLogs: data.finalBlockLogs,
                 })
               },
               onExecutionCancelled: (data) => {
@@ -2021,6 +2038,7 @@ export function useWorkflowExecution() {
                   workflowId: reconnectWorkflowId,
                   executionId: capturedExecutionId,
                   durationMs: data?.duration,
+                  finalBlockLogs: data?.finalBlockLogs,
                 })
               },
             },