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

[waleedlatif1]

Summary

• Auto-layout was reading from getWorkflowState() without merging subblock store values, then persisting stale data to the database via PUT /api/workflows/[id]/state
• This caused runtime-edited values (e.g. router_v2 context) to be silently overwritten with their initial/empty values whenever auto-layout was triggered
• Added mergeSubblockState() call (the same pattern used by every other persistence path) to preserve current subblock values during auto-layout

Test plan

• Set a router_v2 block's context field to a non-empty value
• Trigger auto-layout
• Verify the context value is preserved after layout completes
• Reload the page and verify the context value persists from the database

[cursor]

PR Summary

Medium Risk
Touches workflow state update/persistence for auto-layout; while the change is small, it affects what gets written to the store and database and could impact runtime-edited block data if incorrect.

Overview
Auto-layout now merges live subblock values into the blocks returned from the layout API via mergeSubblockState() before updating the workflow store and persisting state.

On save failure rollback, it also merges subblock state when restoring the previous blocks, preventing runtime-edited subblock fields (e.g. router context) from being overwritten by stale/empty values during auto-layout.

^{Reviewed by Cursor Bugbot for commit aac05b6. Configure here.}

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Skipped		Apr 8, 2026 8:02pm

[greptile-apps]

Greptile Summary

This PR fixes a data-loss bug where auto-layout was persisting stale subblock values to the database. The fix adds mergeSubblockState(layoutedBlocks, workflowId) before writing to the store and the database, matching the pattern used on every other persistence path. The revert path on save failure also correctly applies the same merge. The previous concern about using activeWorkflowId from the registry instead of the workflowId parameter has been addressed — both call sites now use the function argument.

Confidence Score: 5/5

Safe to merge — the fix is minimal, correct, and follows the established persistence pattern used everywhere else in the codebase.

The prior P1 concern (using activeWorkflowId from the registry instead of the scoped workflowId parameter) has been resolved. Both the happy path and the revert path now call mergeSubblockState with workflowId. No new issues were found.

No files require special attention.

Vulnerabilities

No security concerns identified.

Important Files Changed

Filename	Overview
apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts	Adds mergeSubblockState on both the happy path (lines 113–114) and the revert path (line 173), using the scoped workflowId parameter throughout — correctly prevents auto-layout from overwriting runtime-edited subblock values.

Sequence Diagram

sequenceDiagram
    participant U as User
    participant ALU as applyAutoLayoutAndUpdateStore
    participant API as /api/workflows/[id]/autolayout
    participant SBS as SubBlockStore
    participant WFS as WorkflowStore
    participant DB as /api/workflows/[id]/state

    U->>ALU: trigger auto-layout
    ALU->>WFS: getState() → blocks, edges, loops, parallels
    ALU->>API: POST (blocks + layout options)
    API-->>ALU: layoutedBlocks (positions updated)
    ALU->>SBS: mergeSubblockState(layoutedBlocks, workflowId)
    SBS-->>ALU: mergedBlocks (positions + current subblock values)
    ALU->>WFS: replaceWorkflowState(mergedBlocks)
    ALU->>DB: PUT (mergedBlocks with subblock values preserved)
    alt Save succeeds
        DB-->>ALU: 200 OK
        ALU-->>U: { success: true }
    else Save fails
        DB-->>ALU: error
        ALU->>SBS: mergeSubblockState(originalBlocks, workflowId)
        SBS-->>ALU: revertBlocks
        ALU->>WFS: replaceWorkflowState(revertBlocks)
        ALU-->>U: { success: false, error }
    end

Loading

_{Reviews (2): Last reviewed commit: "fix: merge subblock values in auto-layou..." | Re-trigger Greptile}

[waleedlatif1]

@greptile

[waleedlatif1]

@cursor review

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit aac05b6. Configure here.}