fix(layout): enforce per-instance geometry ownership

browser_tests/assets/subgraphs/subgraph-link-identity-collision.json

@@ -0,0 +1,156 @@
+{
+  "id": "987de650-fd73-4f2d-a7d6-ef58909d56cb",
+  "revision": 0,
+  "last_node_id": 2,
+  "last_link_id": 0,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "11111111-1111-4111-8111-111111111111",
+      "pos": [300, 300],
+      "size": [220, 80],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [{ "name": "input", "type": "*", "link": null }],
+      "outputs": [{ "name": "output", "type": "*", "links": null }],
+      "properties": {},
+      "widgets_values": []
+    },
+    {
+      "id": 2,
+      "type": "22222222-2222-4222-8222-222222222222",
+      "pos": [650, 300],
+      "size": [220, 80],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [{ "name": "input", "type": "*", "link": null }],
+      "outputs": [{ "name": "output", "type": "*", "links": null }],
+      "properties": {},
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "11111111-1111-4111-8111-111111111111",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 0,
+          "lastLinkId": 1,
+          "lastRerouteId": 101
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Identity collision A",
+        "inputNode": {
+          "id": -10,
+          "bounding": [100, 200, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [500, 200, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa",
+            "name": "input",
+            "type": "*",
+            "linkIds": [1],
+            "pos": { "0": 200, "1": 220 }
+          }
+        ],
+        "outputs": [
+          {
+            "id": "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb",
+            "name": "output",
+            "type": "*",
+            "linkIds": [1],
+            "pos": { "0": 520, "1": 220 }
+          }
+        ],
+        "widgets": [],
+        "nodes": [],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "*",
+            "parentId": 101
+          }
+        ],
+        "reroutes": [{ "id": 101, "pos": [300, 220], "linkIds": [1] }],
+        "extra": {}
+      },
+      {
+        "id": "22222222-2222-4222-8222-222222222222",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 0,
+          "lastLinkId": 1,
+          "lastRerouteId": 201
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Identity collision B",
+        "inputNode": {
+          "id": -10,
+          "bounding": [100, 400, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [500, 400, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "cccccccc-cccc-4ccc-8ccc-cccccccccccc",
+            "name": "input",
+            "type": "*",
+            "linkIds": [1],
+            "pos": { "0": 200, "1": 420 }
+          }
+        ],
+        "outputs": [
+          {
+            "id": "dddddddd-dddd-4ddd-8ddd-dddddddddddd",
+            "name": "output",
+            "type": "*",
+            "linkIds": [1],
+            "pos": { "0": 520, "1": 420 }
+          }
+        ],
+        "widgets": [],
+        "nodes": [],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "*",
+            "parentId": 201
+          }
+        ],
+        "reroutes": [{ "id": 201, "pos": [400, 420], "linkIds": [1] }],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": { "scale": 1, "offset": [0, 0] },
+    "frontendVersion": "1.24.1"
+  },
+  "version": 0.4
+}

browser_tests/tests/graph.spec.ts

@@ -1,6 +1,5 @@
 import { expect } from '@playwright/test'
 
-import { toLinkId } from '@/types/linkId'
 import { toNodeId } from '@/types/nodeId'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
@@ -17,8 +16,18 @@ test.describe('Graph', { tag: ['@smoke', '@canvas'] }, () => {
     await expect
       .poll(() =>
         comfyPage.page.evaluate(
-          (linkId) => window.app!.graph!.links.get(linkId)?.target_slot,
-          toLinkId(1)
+          ({ originId, originSlot, targetId }) =>
+            [...window.app!.graph!.links.values()].find(
+              (link) =>
+                link.origin_id === originId &&
+                link.origin_slot === originSlot &&
+                link.target_id === targetId
+            )?.target_slot,
+          {
+            originId: toNodeId(2),
+            originSlot: 0,
+            targetId: toNodeId(1)
+          }
         )
       )
       .toBe(1)

browser_tests/tests/nodeReplacement.spec.ts

@@ -259,4 +259,43 @@ test.describe('Node replacement', { tag: ['@node', '@ui'] }, () => {
       })
     })
   }
+
+  test(
+    'Replacement keeps its position when enabling Vue Nodes',
+    { tag: ['@vue-nodes'] },
+    async ({ comfyPage }) => {
+      test.slow()
+      await setupNodeReplacement(comfyPage, mockNodeReplacementsSingle)
+      await loadWorkflowAndOpenErrorsTab(
+        comfyPage,
+        'missing/node_replacement_simple'
+      )
+      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', false)
+      await comfyPage.nextFrame()
+
+      await getSwapNodesGroup(comfyPage.page)
+        .getByRole('button', { name: /replace node/i })
+        .click()
+
+      const [ksampler] = await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      await ksampler.dragBy({ x: 120, y: 90 })
+      await comfyPage.nextFrame()
+      const draggedTitlePosition = await ksampler.getTitlePosition()
+
+      await comfyPage.menu.topbar.setVueNodesEnabled(true)
+      await comfyPage.vueNodes.waitForNodes()
+
+      const { header } = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
+      await expect
+        .poll(async () => {
+          const box = await header.boundingBox()
+          if (!box) return Number.POSITIVE_INFINITY
+          return Math.max(
+            Math.abs(box.x + box.width / 2 - draggedTitlePosition.x),
+            Math.abs(box.y + box.height / 2 - draggedTitlePosition.y)
+          )
+        })
+        .toBeLessThanOrEqual(2)
+    }
+  )
 })

browser_tests/tests/subgraph/subgraphLinkIdentity.spec.ts

@@ -0,0 +1,41 @@
+import { expect } from '@playwright/test'
+
+import { toLinkId } from '@/types/linkId'
+
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+
+test.describe('Subgraph link topology identity', { tag: ['@subgraph'] }, () => {
+  test('different definitions keep their own reroute chains when link IDs and endpoints collide', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(
+      'subgraphs/subgraph-link-identity-collision'
+    )
+
+    const collidingLinkId = toLinkId(1)
+    const topology = await comfyPage.page.evaluate((linkId) => {
+      const graph = window.app!.canvas.graph!
+      return graph.nodes
+        .filter((node) => node.isSubgraphNode())
+        .map((node) => ({
+          definitionId: node.subgraph.id,
+          parentId: node.subgraph._links.get(linkId)?.parentId,
+          rerouteIds: [...node.subgraph.reroutes.keys()]
+        }))
+        .sort((a, b) => a.definitionId.localeCompare(b.definitionId))
+    }, collidingLinkId)
+
+    expect(topology).toEqual([
+      {
+        definitionId: '11111111-1111-4111-8111-111111111111',
+        parentId: 101,
+        rerouteIds: [101]
+      },
+      {
+        definitionId: '22222222-2222-4222-8222-222222222222',
+        parentId: 201,
+        rerouteIds: [201]
+      }
+    ])
+  })
+})

browser_tests/tests/vueNodes/rerouteGeometry.spec.ts

@@ -3,11 +3,12 @@ import { toRerouteId } from '@/types/rerouteId'
 
 test.describe('Native reroute geometry', { tag: '@vue-nodes' }, () => {
   test('survives subgraph navigation', async ({ comfyPage }) => {
+    const REROUTE_ID = toRerouteId(1)
     await comfyPage.workflow.loadWorkflow(
       'reroute/single-native-reroute-default-workflow'
     )
     await comfyPage.canvasOps.expectRootReroutePositions({
-      [toRerouteId(1)]: { x: 372.67, y: 415.33 }
+      [REROUTE_ID]: { x: 372.67, y: 415.33 }
     })
 
     const ksampler = await comfyPage.nodeOps.getNodeRefById('3')
@@ -18,7 +19,7 @@ test.describe('Native reroute geometry', { tag: '@vue-nodes' }, () => {
     await comfyPage.subgraph.exitViaBreadcrumb()
 
     await comfyPage.canvasOps.expectRootReroutePositions({
-      [toRerouteId(1)]: { x: 372.67, y: 415.33 }
+      [REROUTE_ID]: { x: 372.67, y: 415.33 }
     })
   })
 })

docs/adr/0003-crdt-based-layout-system.md

@@ -158,7 +158,24 @@ Entity geometry registers and unregisters with the entity that owns it
 (`LGraph.add` / `LGraph.remove`) rather than being seeded per graph on renderer
 entry. All three entity types key by `makeScopedLayoutKey(rootGraphId, id)`, so
 a root graph's teardown is one `clearGraph`; graphs sharing that bucket drop
-their entries individually through `unregisterAllGraphLayout`.
+their entries individually through `detachAllGraphLayout`.
+
+### Amendment (2026-08-09)
+
+Layout commands are purely ID-addressed. The `registrationId` ownership
+tokens formerly carried by `LayoutOperation` variants, stored in Yjs entity
+records, and compared by the store before applying mutations are removed
+entirely: create operations are first-wins (a colliding create is a no-op),
+updates and deletes apply iff the `(rootGraphId, entityId)` key exists and
+the value actually changes, and `rejected` signals only synchronous
+reentrancy. Entity IDs are treated as immutable, root-unique primary keys,
+which makes the key itself sufficient authority. The only lifecycle metadata
+retained is a private, tokenless `{ graphId, id }` attachment descriptor per
+live instance (WeakMaps in `graphLayoutAttachment.ts`), captured at attach
+time; detach clears the descriptor before issuing the store delete and
+restores it only if the delete is rejected. Since tokens never entered
+workflow JSON or any persistence, no data migration applies, and replicated
+state shrinks by one field per entity.
 
 ## Notes
 

src/components/builder/AppModeWidgetList.vue

@@ -21,6 +21,7 @@ import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useLinkStore } from '@/stores/linkStore'
+import { graphScopeOf } from '@/types/graphScopeId'
 import { useWidgetValueStore } from '@/stores/widgetValueStore'
 import { useAppModeStore } from '@/stores/appModeStore'
 import { parseImageWidgetValue } from '@/utils/imageUtil'
@@ -80,10 +81,10 @@ function ensureSelectedWidgetState(
 }
 
 function isWidgetInputLinked(node: LGraphNode, widgetName: string): boolean {
-  const graphId = node.graph?.rootGraph.id
+  const graph = node.graph
   const slot = node.inputs?.findIndex((i) => i.widget?.name === widgetName)
-  if (!graphId || slot === undefined || slot < 0) return false
-  return linkStore.isInputSlotConnected(graphId, node.id, slot)
+  if (!graph || slot === undefined || slot < 0) return false
+  return linkStore.isInputSlotConnected(graphScopeOf(graph), node.id, slot)
 }
 
 const mappedSelections = computed((): WidgetEntry[] => {

src/components/rightSidePanel/parameters/WidgetItem.test.ts

@@ -10,6 +10,7 @@ import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useLinkStore } from '@/stores/linkStore'
+import { toOwningGraphId, toRootGraphId } from '@/types/graphScopeId'
 import { useWidgetValueStore } from '@/stores/widgetValueStore'
 import { widgetId } from '@/types/widgetId'
 import WidgetItem from './WidgetItem.vue'
@@ -77,7 +78,10 @@ function createMockNode(overrides: Partial<LGraphNode> = {}): LGraphNode {
     id: 1,
     type: 'TestNode',
     isSubgraphNode: () => false,
-    graph: { rootGraph: { id: 'test-graph-id' } },
+    graph: {
+      id: 'test-graph-id',
+      rootGraph: { id: 'test-graph-id' }
+    },
     ...overrides
   })
 }
@@ -238,14 +242,20 @@ describe('WidgetItem', () => {
       const { container } = renderWidgetItem(widget, node)
       expect(getStubWidget(container).options.disabled).toBeUndefined()
 
-      useLinkStore().registerLink('test-graph-id', {
-        id: toLinkId(1),
-        originNodeId: toNodeId(2),
-        originSlot: 0,
-        targetNodeId: node.id,
-        targetSlot: 0,
-        type: 'INT'
-      })
+      useLinkStore().registerLink(
+        {
+          rootGraphId: toRootGraphId('test-graph-id'),
+          owningGraphId: toOwningGraphId('test-graph-id')
+        },
+        {
+          id: toLinkId(1),
+          originNodeId: toNodeId(2),
+          originSlot: 0,
+          targetNodeId: node.id,
+          targetSlot: 0,
+          type: 'INT'
+        }
+      )
       await nextTick()
 
       expect(getStubWidget(container).options.disabled).toBe(true)