fix: address socket sync review follow-ups

Author: PlaneInABottle

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

@@ -32,6 +32,19 @@ import { findAllDescendantNodes, isBlockProtected } from '@/stores/workflows/wor
 
 const logger = createLogger('CollaborativeWorkflow')
 
+function parseUndoRedoStackKey(key: string): { workflowId: string; userId: string } | null {
+  const separatorIndex = key.indexOf(':')
+
+  if (separatorIndex <= 0 || separatorIndex === key.length - 1) {
+    return null
+  }
+
+  return {
+    workflowId: key.slice(0, separatorIndex),
+    userId: key.slice(separatorIndex + 1),
+  }
+}
+
 export function useCollaborativeWorkflow() {
   const undoRedo = useUndoRedo()
   const isUndoRedoInProgress = useRef(false)
@@ -239,9 +252,9 @@ export function useCollaborativeWorkflow() {
                 const undoRedoStore = useUndoRedoStore.getState()
                 const stackKeys = Object.keys(undoRedoStore.stacks)
                 stackKeys.forEach((key) => {
-                  const [wfId, uId] = key.split(':')
-                  if (wfId === activeWorkflowId) {
-                    undoRedoStore.pruneInvalidEntries(wfId, uId, graph)
+                  const parsedKey = parseUndoRedoStackKey(key)
+                  if (parsedKey?.workflowId === activeWorkflowId) {
+                    undoRedoStore.pruneInvalidEntries(parsedKey.workflowId, parsedKey.userId, graph)
                   }
                 })
               }
@@ -281,9 +294,9 @@ export function useCollaborativeWorkflow() {
                 const undoRedoStore = useUndoRedoStore.getState()
                 const stackKeys = Object.keys(undoRedoStore.stacks)
                 stackKeys.forEach((key) => {
-                  const [wfId, uId] = key.split(':')
-                  if (wfId === activeWorkflowId) {
-                    undoRedoStore.pruneInvalidEntries(wfId, uId, graph)
+                  const parsedKey = parseUndoRedoStackKey(key)
+                  if (parsedKey?.workflowId === activeWorkflowId) {
+                    undoRedoStore.pruneInvalidEntries(parsedKey.workflowId, parsedKey.userId, graph)
                   }
                 })
 
@@ -646,10 +659,12 @@ export function useCollaborativeWorkflow() {
                 const undoRedoStore = useUndoRedoStore.getState()
                 const stackKeys = Object.keys(undoRedoStore.stacks)
                 stackKeys.forEach((key) => {
-                  const [wfId, userId] = key.split(':')
-                  if (wfId === workflowId) {
-                    undoRedoStore.pruneInvalidEntries(wfId, userId, graph)
+                  const parsedKey = parseUndoRedoStackKey(key)
+                  if (!parsedKey || parsedKey.workflowId !== workflowId) {
+                    return
                   }
+
+                  undoRedoStore.pruneInvalidEntries(parsedKey.workflowId, parsedKey.userId, graph)
                 })
               } finally {
                 isApplyingRemoteChange.current = false

apps/sim/socket/database/operations.ts

@@ -1630,7 +1630,6 @@ async function handleBlocksOperationTx(
       )
 
       const allRemovedEdgeIds: string[] = []
-      const allAddedEdges: NonNullable<OperationResult['addedEdges']> = []
       const applicableUpdates: Array<(typeof updates)[number]> = []
 
       for (const update of updates) {
@@ -1649,11 +1648,8 @@ async function handleBlocksOperationTx(
           continue
         }
 
-        // Fetch current parent to update subflow node lists
+        // Confirm the block exists before applying the batch parent update
         const existing = blocksById[id]
-        const existingParentId = (existing?.data as Record<string, unknown> | null)?.parentId as
-          | string
-          | undefined
 
         if (!existing) {
           logger.warn(`Block ${id} not found for batch-update-parent`)
@@ -1672,6 +1668,10 @@ async function handleBlocksOperationTx(
         if (!id) continue
 
         const isRemovingFromParent = !parentId
+        const existing = blocksById[id]
+        const existingParentId = (existing?.data as Record<string, unknown> | null)?.parentId as
+          | string
+          | undefined
 
         // Get current data and position
         const [currentBlock] = await tx
@@ -1715,13 +1715,6 @@ async function handleBlocksOperationTx(
         )
         allRemovedEdgeIds.push(...removedEdgeIds)
 
-        // Auto-connect: if block is entering a container and has no incoming edges,
-        // connect it from the container's start handle
-        if (parentId) {
-          const autoConnect = await autoConnectToContainerStart(tx, workflowId, id, parentId)
-          allAddedEdges.push(...autoConnect.edges)
-        }
-
         // If the block now has a parent, update the new parent's subflow node list
         if (parentId) {
           await updateSubflowNodeList(tx, workflowId, parentId)
@@ -1733,7 +1726,7 @@ async function handleBlocksOperationTx(
       }
 
       logger.debug(`Batch updated parent for ${updates.length} blocks`)
-      return { removedEdgeIds: allRemovedEdgeIds, addedEdges: allAddedEdges }
+      return { removedEdgeIds: allRemovedEdgeIds }
     }
 
     default: