fix: server-side auto-connection now respects client's autoConnect preference

Author: PlaneInABottle

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx

@@ -645,10 +645,11 @@ const WorkflowContent = React.memo(
             newParentId: u.parentId || null,
             newPosition: u.position,
             affectedEdges: [],
-          }))
+          })),
+          { autoConnect: isAutoConnectEnabled }
         )
       },
-      [collaborativeBatchUpdateParent]
+      [collaborativeBatchUpdateParent, isAutoConnectEnabled]
     )
 
     /**
@@ -804,7 +805,8 @@ const WorkflowContent = React.memo(
           autoConnectEdge ? [autoConnectEdge] : [],
           {},
           {},
-          subBlockValues
+          subBlockValues,
+          { autoConnect: isAutoConnectEnabled }
         )
         usePanelEditorStore.getState().setCurrentBlockId(id)
       },
@@ -1106,7 +1108,8 @@ const WorkflowContent = React.memo(
           pasteData.edges,
           pasteData.loops,
           pasteData.parallels,
-          pasteData.subBlockValues
+          pasteData.subBlockValues,
+          { autoConnect: isAutoConnectEnabled }
         )
 
         // Resize container if we pasted into a subflow
@@ -2498,12 +2501,33 @@ const WorkflowContent = React.memo(
       // Preserve existing selection state
       setDisplayNodes((currentNodes) => {
         const selectedIds = new Set(currentNodes.filter((n) => n.selected).map((n) => n.id))
-        return derivedNodes.map((node) => ({
-          ...node,
-          selected: selectedIds.has(node.id),
-        }))
+        const dragStart = getDragStartPosition()
+        const multiDrag = multiNodeDragStartRef.current
+
+        return derivedNodes.map((node) => {
+          const isSelected = selectedIds.has(node.id)
+          const isBeingDragged = dragStart?.id === node.id || multiDrag.has(node.id)
+
+          if (isBeingDragged) {
+            // Find the current display node to preserve its position
+            const currentNode = currentNodes.find((n) => n.id === node.id)
+            if (currentNode) {
+              return {
+                ...node,
+                position: currentNode.position,
+                parentId: currentNode.parentId,
+                selected: isSelected,
+              }
+            }
+          }
+
+          return {
+            ...node,
+            selected: isSelected,
+          }
+        })
       })
-    }, [derivedNodes, blocks, pendingSelection, clearPendingSelection])
+    }, [derivedNodes, blocks, pendingSelection, clearPendingSelection, getDragStartPosition])
 
     /** Pans viewport to pending blocks once they have valid dimensions. */
     useEffect(() => {
@@ -2608,7 +2632,7 @@ const WorkflowContent = React.memo(
           })
 
           // Single atomic batch update (handles edge removal + parent update + undo/redo)
-          collaborativeBatchUpdateParent(updates)
+          collaborativeBatchUpdateParent(updates, { autoConnect: isAutoConnectEnabled })
 
           // Update displayNodes once to prevent React Flow from using stale parent data
           setDisplayNodes((nodes) =>

apps/sim/hooks/use-collaborative-workflow.ts

@@ -477,6 +477,7 @@ export function useCollaborativeWorkflow() {
                 )
                 if (activeWorkflowId) {
                   useSubBlockStore.getState().setWorkflowValues(activeWorkflowId, subBlockValues)
+                  pruneUndoRedoStacksForWorkflow(activeWorkflowId)
                 }
 
                 logger.info('Successfully applied remote workflow state replacement')
@@ -726,9 +727,9 @@ export function useCollaborativeWorkflow() {
     }
 
     const handleOperationConfirmed = (data: any) => {
-      const { operationId } = data
+      const { operationId, appliedPayload } = data
       logger.debug('Operation confirmed', { operationId })
-      confirmOperation(operationId)
+      confirmOperation(operationId, appliedPayload)
     }
 
     const handleOperationFailed = (data: any) => {
@@ -1017,7 +1018,8 @@ export function useCollaborativeWorkflow() {
         newParentId: string | null
         newPosition: { x: number; y: number }
         affectedEdges: Edge[]
-      }>
+      }>,
+      options?: { autoConnect?: boolean }
     ) => {
       if (isBaselineDiffView) {
         return
@@ -1085,6 +1087,7 @@ export function useCollaborativeWorkflow() {
               parentId: u.newParentId || '',
               position: u.newPosition,
             })),
+            autoConnect: options?.autoConnect,
           },
         },
         workflowId: activeWorkflowId || '',
@@ -1705,7 +1708,7 @@ export function useCollaborativeWorkflow() {
       loops: Record<string, Loop> = {},
       parallels: Record<string, Parallel> = {},
       subBlockValues: Record<string, Record<string, unknown>> = {},
-      options?: { skipUndoRedo?: boolean }
+      options?: { skipUndoRedo?: boolean; autoConnect?: boolean }
     ) => {
       if (!activeWorkflowId) {
         logger.debug('Skipping batch add blocks - no active workflow')
@@ -1745,7 +1748,14 @@ export function useCollaborativeWorkflow() {
         operation: {
           operation: BLOCKS_OPERATIONS.BATCH_ADD_BLOCKS,
           target: OPERATION_TARGETS.BLOCKS,
-          payload: { blocks, edges: validEdges, loops, parallels, subBlockValues },
+          payload: {
+            blocks,
+            edges: validEdges,
+            loops,
+            parallels,
+            subBlockValues,
+            autoConnect: options?.autoConnect,
+          },
         },
         workflowId: activeWorkflowId || '',
         userId: session?.user?.id || 'unknown',

apps/sim/socket/database/operations.ts

@@ -808,7 +808,7 @@ async function handleBlockOperationTx(
       // Auto-connect: if block is entering a container and has no incoming edges,
       // connect it from the container's start handle (mirrors UI tryCreateAutoConnectEdge)
       let addedEdges: OperationResult['addedEdges'] = []
-      if (payload.parentId) {
+      if (payload.parentId && payload.autoConnect !== false) {
         const autoConnect = await autoConnectToContainerStart(
           tx,
           workflowId,
@@ -1815,8 +1815,9 @@ async function handleBlocksOperationTx(
           )
         )
         allRemovedEdgeIds.push(...removedEdgeIds)
+        const canAutoConnect = payload.autoConnect !== false
 
-        if (parentId) {
+        if (parentId && canAutoConnect) {
           const autoConnect = await autoConnectToContainerStart(tx, workflowId, id, parentId)
           allAddedEdges.push(...autoConnect.edges)
         }