From 39d75892a32cf7360531529c4389209700ad6c31 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Tue, 3 Feb 2026 18:43:08 -0800
Subject: [PATCH] make sync path match

---
 .../app/api/workflows/[id]/execute/route.ts   | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/apps/sim/app/api/workflows/[id]/execute/route.ts b/apps/sim/app/api/workflows/[id]/execute/route.ts
index b89611b17..3d103d061 100644
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -403,6 +403,17 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
     if (!enableSSE) {
       logger.info(`[${requestId}] Using non-SSE execution (direct JSON response)`)
       const syncTimeout = preprocessResult.executionTimeout?.sync
+      const abortController = new AbortController()
+      let isTimedOut = false
+      let timeoutId: NodeJS.Timeout | undefined
+
+      if (syncTimeout) {
+        timeoutId = setTimeout(() => {
+          isTimedOut = true
+          abortController.abort()
+        }, syncTimeout)
+      }
+
       try {
         const metadata: ExecutionMetadata = {
           requestId,
@@ -436,9 +447,33 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
           includeFileBase64,
           base64MaxBytes,
           stopAfterBlockId,
-          abortSignal: syncTimeout ? AbortSignal.timeout(syncTimeout) : undefined,
+          abortSignal: abortController.signal,
         })
 
+        if (result.status === 'cancelled' && isTimedOut && syncTimeout) {
+          const timeoutErrorMessage = getTimeoutErrorMessage(null, syncTimeout)
+          logger.info(`[${requestId}] Non-SSE execution timed out`, { timeoutMs: syncTimeout })
+          await loggingSession.markAsFailed(timeoutErrorMessage)
+
+          await cleanupExecutionBase64Cache(executionId)
+
+          return NextResponse.json(
+            {
+              success: false,
+              output: result.output,
+              error: timeoutErrorMessage,
+              metadata: result.metadata
+                ? {
+                    duration: result.metadata.duration,
+                    startTime: result.metadata.startTime,
+                    endTime: result.metadata.endTime,
+                  }
+                : undefined,
+            },
+            { status: 408 }
+          )
+        }
+
         const outputWithBase64 = includeFileBase64
           ? ((await hydrateUserFilesWithBase64(result.output, {
               requestId,
@@ -472,14 +507,9 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
 
         return NextResponse.json(filteredResult)
       } catch (error: unknown) {
-        const isTimeout = isTimeoutError(error)
-        const errorMessage = isTimeout
-          ? getTimeoutErrorMessage(error, syncTimeout)
-          : error instanceof Error
-            ? error.message
-            : 'Unknown error'
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error'
 
-        logger.error(`[${requestId}] Non-SSE execution failed: ${errorMessage}`, { isTimeout })
+        logger.error(`[${requestId}] Non-SSE execution failed: ${errorMessage}`)
 
         const executionResult = hasExecutionResult(error) ? error.executionResult : undefined
 
@@ -502,8 +532,10 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
                 }
               : undefined,
           },
-          { status: isTimeout ? 408 : 500 }
+          { status: 500 }
         )
+      } finally {
+        if (timeoutId) clearTimeout(timeoutId)
       }
     }