fix(workflows): fingerprint only stored rows so container child order cannot raise a false conflict

Author: waleedlatif1

apps/sim/lib/workflows/application/apply-workflow-operations.test.ts

@@ -514,6 +514,30 @@ describe('applyWorkflowOperations', () => {
 
       expect(result.dryRun).toBe(false)
     })
+
+    /** Container `nodes` are rebuilt from the block rows, so they inherit the read's row order. */
+    it('commits when only container child order differs on the re-read', async () => {
+      const containers = (nodes: string[]) => ({
+        loops: { 'loop-1': { id: 'loop-1', nodes, iterations: 1, loopType: 'for' } },
+        parallels: { 'parallel-1': { id: 'parallel-1', nodes, count: 2, parallelType: 'count' } },
+      })
+      mocks.normalizeState
+        .mockReturnValueOnce({
+          state: { ...graph(), ...containers(['block-1', 'block-2']) },
+          warnings: [],
+        })
+        .mockReturnValueOnce({
+          state: { ...graph(), ...containers(['block-2', 'block-1']) },
+          warnings: [],
+        })
+
+      const result = await applyWorkflowOperations.execute({
+        principal: sessionPrincipal,
+        input: { workflowId: 'workflow-1', operations },
+      })
+
+      expect(result.dryRun).toBe(false)
+    })
   })
 
   /**

apps/sim/lib/workflows/application/apply-workflow-operations.ts

@@ -226,10 +226,14 @@ function applyBlockEnabledChanges(
  * An order-insensitive identity for a stored graph, so two reads of the same
  * rows compare equal even though the loader neither orders its rows nor fixes
  * the key order of the records it builds.
+ *
+ * Only blocks and edges are compared: loops and parallels are rebuilt from the
+ * blocks on every load, with child `nodes` in row order.
  */
 function storedGraphFingerprint(graph: Record<string, unknown>): string {
-  const edges = [...(asGraph(graph).edges ?? [])].sort((a, b) => compareStrings(a.id, b.id))
-  return JSON.stringify(sortObjectKeysDeep({ ...graph, edges }))
+  const { blocks, edges } = asGraph(graph)
+  const sortedEdges = [...(edges ?? [])].sort((a, b) => compareStrings(a.id, b.id))
+  return JSON.stringify(sortObjectKeysDeep({ blocks, edges: sortedEdges }))
 }
 
 interface BaseGraph {

apps/sim/lib/workflows/application/custom-block-authoring.test.ts

@@ -154,6 +154,11 @@ function graph(includeCustom = false) {
   }
 }
 
+/** Resolves the graph the write is given, running its reader the way the row-locked transaction does. */
+async function resolveWrittenState(state: unknown) {
+  return typeof state === 'function' ? state({}) : state
+}
+
 const add: EditWorkflowOperation = {
   operation_type: 'add',
   block_id: 'new-worker',
@@ -171,7 +176,9 @@ describe('custom blocks in authorized workflow authoring', () => {
       workflowRecord: context.workflow,
       normalizedData: graph(true),
     }))
-    mocks.replace.mockImplementation(async ({ state }) => prepareWorkflowStateForPersistence(state))
+    mocks.replace.mockImplementation(async ({ state }) =>
+      prepareWorkflowStateForPersistence(await resolveWrittenState(state))
+    )
   })
 
   it.each([session, copilot])(
@@ -218,7 +225,7 @@ describe('custom blocks in authorized workflow authoring', () => {
       expect(result.lint.fieldIssues).toEqual([])
       expect(mocks.replace).toHaveBeenCalledTimes(dryRun ? 0 : 1)
       if (!dryRun) {
-        const persisted = mocks.replace.mock.calls[0][0].state
+        const { state: persisted } = await mocks.replace.mock.results[0].value
         expect(persisted.blocks.worker.subBlocks['input-text']).toMatchObject({
           value: 'updated',
           type: 'short-input',
@@ -265,7 +272,7 @@ describe('custom blocks in authorized workflow authoring', () => {
     mocks.replace.mockImplementation(async ({ state, workspaceId }) => {
       const foreignType = workspaceId === 'one' ? other.type : customBlock.type
       expect(getBlock(foreignType)).toBeUndefined()
-      return prepareWorkflowStateForPersistence(state)
+      return prepareWorkflowStateForPersistence(await resolveWrittenState(state))
     })
     const results = await Promise.all(
       [customBlock, other].map((row, index) =>
@@ -298,7 +305,7 @@ describe('custom blocks in authorized workflow authoring', () => {
       expect(result.lint.fieldIssues).toEqual([])
       expect(mocks.replace).toHaveBeenCalledTimes(dryRun ? 0 : 1)
       if (!dryRun) {
-        const persisted = mocks.replace.mock.calls[0][0].state
+        const { state: persisted } = await mocks.replace.mock.results[0].value
         expect(persisted.blocks.worker.subBlocks['input-text']).toMatchObject({
           value: 'hello',
           type: 'short-input',