fix: merge subblock values in auto-layout to prevent losing router context

Auto-layout was reading from getWorkflowState() without merging subblock
store values, then persisting stale subblock data to the database. This
caused runtime-edited values (e.g. router_v2 context) to be overwritten
with their initial/empty values whenever auto-layout was triggered.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts

@@ -4,6 +4,8 @@ import {
   DEFAULT_LAYOUT_PADDING,
   DEFAULT_VERTICAL_SPACING,
 } from '@/lib/workflows/autolayout/constants'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import { mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 const logger = createLogger('AutoLayoutUtils')
@@ -109,10 +111,13 @@ export async function applyAutoLayoutAndUpdateStore(
       return { success: false, error: errorMessage }
     }
 
-    // Update workflow store immediately with new positions
+    const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
+    const layoutedBlocks = result.data?.layoutedBlocks || blocks
+    const mergedBlocks = mergeSubblockState(layoutedBlocks, activeWorkflowId ?? undefined)
+
     const newWorkflowState = {
       ...workflowStore.getWorkflowState(),
-      blocks: result.data?.layoutedBlocks || blocks,
+      blocks: mergedBlocks,
       lastSaved: Date.now(),
     }
 
@@ -167,9 +172,10 @@ export async function applyAutoLayoutAndUpdateStore(
       })
 
       // Revert the store changes since database save failed
+      const revertBlocks = mergeSubblockState(blocks, activeWorkflowId ?? undefined)
       useWorkflowStore.getState().replaceWorkflowState({
         ...workflowStore.getWorkflowState(),
-        blocks,
+        blocks: revertBlocks,
         lastSaved: workflowStore.lastSaved,
       })