From 21a87b580e6b6cf8753737230df02ab96e7a1918 Mon Sep 17 00:00:00 2001 From: bymyself Date: Thu, 27 Aug 2026 07:05:34 +0000 Subject: [PATCH 1/3] test: cover duplicate-create logical convergence --- test/stamp-target-identity.test.ts | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/test/stamp-target-identity.test.ts b/test/stamp-target-identity.test.ts index edb6161a..296aa267 100644 --- a/test/stamp-target-identity.test.ts +++ b/test/stamp-target-identity.test.ts @@ -22,6 +22,7 @@ import { mint, project, writeTarget, + type AddNodeOp, type ConnectOp, type Op, type SetWidgetOp, @@ -197,4 +198,55 @@ describe("stamp targets normalize node ids to strings", () => { expect(forward.links.map((l) => (l as unknown[])[0])).toEqual([502]); expect(reverse.links.map((l) => (l as unknown[])[0])).toEqual([502]); }); + + it("add_node: same-type duplicate ids converge on one higher-stamped payload", () => { + const makeCreate = ( + tag: string, + actor: string, + baseVersion: number, + stepsValue: number, + pos: [number, number], + ): AddNodeOp => ({ + op: "add_node", + op_id: opId(tag), + actor, + base_version: baseVersion, + stamp: [baseVersion, actor], + node_id: 10, + class_type: "KSampler", + pos, + node: { + ...base().nodes[0]!, + id: 10, + pos, + widgets_values: [stepsValue, "fixed", 20, 8.0, "euler", "simple", 1.0], + }, + }); + const lower = makeCreate("a3", AGENT, 5, 111, [10, 10]); + const higher = makeCreate("b3", HUMAN, 9, 999, [20, 20]); + const snapshot = Y.encodeStateAsUpdate(mint(base(), catalog)); + const applyOrder = (ops: AddNodeOp[]): Y.Doc => { + const doc = new Y.Doc(); + Y.applyUpdate(doc, snapshot); + expect(applyOps(doc, ops, catalog).failed).toBeNull(); + return doc; + }; + const sortedEntries = (doc: Y.Doc, name: "__stamps" | "__applied"): [string, unknown][] => + [...doc.getMap(name).entries()].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)); + + const forward = applyOrder([lower, higher]); + const reverse = applyOrder([higher, lower]); + const forwardProjection = canonicalize(project(forward, catalog)); + const reverseProjection = canonicalize(project(reverse, catalog)); + const created = forwardProjection.nodes.filter((node) => node.id === 10); + + expect(forwardProjection).toEqual(reverseProjection); + expect(created).toHaveLength(1); + expect(created[0]!.pos).toEqual([20, 20]); + expect(created[0]!.widgets_values?.[0]).toBe(999); + expect(sortedEntries(forward, "__stamps")).toEqual(sortedEntries(reverse, "__stamps")); + expect(sortedEntries(forward, "__stamps")).toHaveLength(1); + expect(sortedEntries(forward, "__applied")).toEqual(sortedEntries(reverse, "__applied")); + expect(sortedEntries(forward, "__applied")).toHaveLength(2); + }); }); From 742abe17cb678d693c2eff36e1aac8175a22a620 Mon Sep 17 00:00:00 2001 From: christian-byrne Date: Thu, 3 Sep 2026 14:44:00 +0000 Subject: [PATCH 2/3] test: assert duplicate-create reapplication is a no-op in both orders Addresses https://github.com/Comfy-Org/comfy-multi-player/pull/172#discussion_r3924682052 (CodeRabbit): apply each order's first op a second time and assert projection, __stamps, and __applied are unchanged. --- test/stamp-target-identity.test.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/stamp-target-identity.test.ts b/test/stamp-target-identity.test.ts index 296aa267..3259a37e 100644 --- a/test/stamp-target-identity.test.ts +++ b/test/stamp-target-identity.test.ts @@ -248,5 +248,23 @@ describe("stamp targets normalize node ids to strings", () => { expect(sortedEntries(forward, "__stamps")).toHaveLength(1); expect(sortedEntries(forward, "__applied")).toEqual(sortedEntries(reverse, "__applied")); expect(sortedEntries(forward, "__applied")).toHaveLength(2); + + // Reapplying an already-applied operation is a no-op in both orders: take + // each order's first (losing) op and apply it a second time, then assert + // the projection and both ledgers are unchanged. + const snapshotOf = (doc: Y.Doc) => ({ + projection: canonicalize(project(doc, catalog)), + stamps: sortedEntries(doc, "__stamps"), + applied: sortedEntries(doc, "__applied"), + }); + const forwardAgain = applyOrder([lower, higher]); + const forwardBefore = snapshotOf(forwardAgain); + expect(applyOps(forwardAgain, [lower], catalog).failed).toBeNull(); + expect(snapshotOf(forwardAgain)).toEqual(forwardBefore); + + const reverseAgain = applyOrder([higher, lower]); + const reverseBefore = snapshotOf(reverseAgain); + expect(applyOps(reverseAgain, [higher], catalog).failed).toBeNull(); + expect(snapshotOf(reverseAgain)).toEqual(reverseBefore); }); }); From a8d353f59858f934d5870194841f4e8a4a03da04 Mon Sep 17 00:00:00 2001 From: bymyself Date: Mon, 21 Sep 2026 15:57:42 -0700 Subject: [PATCH 3/3] test: update stamp identity assertions for current contracts --- test/stamp-target-identity.test.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/stamp-target-identity.test.ts b/test/stamp-target-identity.test.ts index 16eeeb3f..b8135fa2 100644 --- a/test/stamp-target-identity.test.ts +++ b/test/stamp-target-identity.test.ts @@ -19,6 +19,7 @@ import * as Y from "yjs"; import { describe, expect, it } from "vitest"; import { applyOps, + codePointCompare, mint, project, writeTarget, @@ -29,6 +30,7 @@ import { type SetWidgetOp, type WorkflowJSON, } from "../src/index.js"; +import { rejectedOutcome } from "./apply-result-helpers.js"; import { canonicalize, loadCatalog } from "./helpers.js"; const catalog = loadCatalog(); @@ -229,11 +231,11 @@ describe("stamp targets normalize node ids to strings", () => { const applyOrder = (ops: AddNodeOp[]): Y.Doc => { const doc = new Y.Doc(); Y.applyUpdate(doc, snapshot); - expect(applyOps(doc, ops, catalog).failed).toBeNull(); + expect(rejectedOutcome(applyOps(doc, ops, catalog))).toBeUndefined(); return doc; }; const sortedEntries = (doc: Y.Doc, name: "__stamps" | "__applied"): [string, unknown][] => - [...doc.getMap(name).entries()].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)); + [...doc.getMap(name).entries()].sort(([a], [b]) => codePointCompare(a, b)); const forward = applyOrder([lower, higher]); const reverse = applyOrder([higher, lower]); @@ -244,7 +246,7 @@ describe("stamp targets normalize node ids to strings", () => { expect(forwardProjection).toEqual(reverseProjection); expect(created).toHaveLength(1); expect(created[0]!.pos).toEqual([20, 20]); - expect(created[0]!.widgets_values?.[0]).toBe(999); + expect(Array.isArray(created[0]!.widgets_values) ? created[0]!.widgets_values[0] : undefined).toBe(999); expect(sortedEntries(forward, "__stamps")).toEqual(sortedEntries(reverse, "__stamps")); expect(sortedEntries(forward, "__stamps")).toHaveLength(1); expect(sortedEntries(forward, "__applied")).toEqual(sortedEntries(reverse, "__applied")); @@ -260,12 +262,12 @@ describe("stamp targets normalize node ids to strings", () => { }); const forwardAgain = applyOrder([lower, higher]); const forwardBefore = snapshotOf(forwardAgain); - expect(applyOps(forwardAgain, [lower], catalog).failed).toBeNull(); + expect(rejectedOutcome(applyOps(forwardAgain, [lower], catalog))).toBeUndefined(); expect(snapshotOf(forwardAgain)).toEqual(forwardBefore); const reverseAgain = applyOrder([higher, lower]); const reverseBefore = snapshotOf(reverseAgain); - expect(applyOps(reverseAgain, [higher], catalog).failed).toBeNull(); + expect(rejectedOutcome(applyOps(reverseAgain, [higher], catalog))).toBeUndefined(); expect(snapshotOf(reverseAgain)).toEqual(reverseBefore); }); });