@vuer-ai/vuer-rtc 0.7.0 → 0.8.2

package/tests/fixtures/object-ops.jsonl

@@ -1,4 +1,4 @@
-{"name": "object_set", "op": {"key": "node-1", "otype": "object.set", "path": "metadata", "value": {"author": "user-1", "version": 1}}}
-{"name": "object_set_empty", "op": {"key": "node-1", "otype": "object.set", "path": "metadata", "value": {}}}
-{"name": "object_merge", "op": {"key": "node-1", "otype": "object.merge", "path": "metadata", "value": {"tags": ["a", "b"]}}}
-{"name": "object_merge_nested", "op": {"key": "node-1", "otype": "object.merge", "path": "config", "value": {"settings": {"enabled": true}}}}
+{"name": "object_set", "op": {"key": "node-1", "ot": "object.set", "path": "metadata", "value": {"author": "user-1", "version": 1}}}
+{"name": "object_set_empty", "op": {"key": "node-1", "ot": "object.set", "path": "metadata", "value": {}}}
+{"name": "object_merge", "op": {"key": "node-1", "ot": "object.merge", "path": "metadata", "value": {"tags": ["a", "b"]}}}
+{"name": "object_merge_nested", "op": {"key": "node-1", "ot": "object.merge", "path": "config", "value": {"settings": {"enabled": true}}}}

package/tests/fixtures/operations.jsonl

@@ -1,7 +1,7 @@
-{"name": "number.set", "op": {"key": "cube-1", "otype": "number.set", "path": "opacity", "value": 0.5}, "expected": {"opacity": 0.5}}
-{"name": "number.add", "op": {"key": "cube-1", "otype": "number.add", "path": "score", "value": 10}, "expected": {"score": 10}}
-{"name": "vector3.set", "op": {"key": "cube-1", "otype": "vector3.set", "path": "position", "value": [1, 2, 3]}, "expected": {"position": [1, 2, 3]}}
-{"name": "vector3.add", "op": {"key": "cube-1", "otype": "vector3.add", "path": "position", "value": [0.1, 0.2, 0.3]}, "initial": {"position": [1, 2, 3]}, "expected": {"position": [1.1, 2.2, 3.3]}}
-{"name": "boolean.set", "op": {"key": "cube-1", "otype": "boolean.set", "path": "visible", "value": false}, "expected": {"visible": false}}
-{"name": "string.set", "op": {"key": "cube-1", "otype": "string.set", "path": "name", "value": "MyCube"}, "expected": {"name": "MyCube"}}
-{"name": "node.insert", "op": {"key": "sphere-1", "otype": "node.insert", "path": "sphere-1", "value": {"id": "uuid-sphere", "tag": "Mesh", "name": "Sphere"}}, "expected": {"nodes": {"sphere-1": {"id": "uuid-sphere", "tag": "Mesh", "name": "Sphere"}}}}
+{"name": "number.set", "op": {"key": "cube-1", "ot": "number.set", "path": "opacity", "value": 0.5}, "expected": {"opacity": 0.5}}
+{"name": "number.add", "op": {"key": "cube-1", "ot": "number.add", "path": "score", "value": 10}, "expected": {"score": 10}}
+{"name": "vector3.set", "op": {"key": "cube-1", "ot": "vector3.set", "path": "position", "value": [1, 2, 3]}, "expected": {"position": [1, 2, 3]}}
+{"name": "vector3.add", "op": {"key": "cube-1", "ot": "vector3.add", "path": "position", "value": [0.1, 0.2, 0.3]}, "initial": {"position": [1, 2, 3]}, "expected": {"position": [1.1, 2.2, 3.3]}}
+{"name": "boolean.set", "op": {"key": "cube-1", "ot": "boolean.set", "path": "visible", "value": false}, "expected": {"visible": false}}
+{"name": "string.set", "op": {"key": "cube-1", "ot": "string.set", "path": "name", "value": "MyCube"}, "expected": {"name": "MyCube"}}
+{"name": "node.insert", "op": {"key": "sphere-1", "ot": "node.insert", "path": "sphere-1", "value": {"id": "uuid-sphere", "tag": "Mesh", "name": "Sphere"}}, "expected": {"nodes": {"sphere-1": {"id": "uuid-sphere", "tag": "Mesh", "name": "Sphere"}}}}

package/tests/fixtures/string-ops.jsonl

@@ -1,4 +1,4 @@
-{"name": "string_set", "op": {"key": "node-1", "otype": "string.set", "path": "name", "value": "Player"}}
-{"name": "string_set_empty", "op": {"key": "node-1", "otype": "string.set", "path": "name", "value": ""}}
-{"name": "string_concat", "op": {"key": "node-1", "otype": "string.concat", "path": "tags", "value": "active"}}
-{"name": "string_concat_separator", "op": {"key": "node-1", "otype": "string.concat", "path": "tags", "value": "enemy", "separator": ","}}
+{"name": "string_set", "op": {"key": "node-1", "ot": "string.set", "path": "name", "value": "Player"}}
+{"name": "string_set_empty", "op": {"key": "node-1", "ot": "string.set", "path": "name", "value": ""}}
+{"name": "string_concat", "op": {"key": "node-1", "ot": "string.concat", "path": "tags", "value": "active"}}
+{"name": "string_concat_separator", "op": {"key": "node-1", "ot": "string.concat", "path": "tags", "value": "enemy", "separator": ","}}

package/tests/fixtures/undo-redo.jsonl

@@ -1,3 +1,3 @@
-{"name": "undo_single_edit", "steps": [{"action": "edit", "op": {"key": "cube-1", "otype": "vector3.set", "path": "position", "value": [5, 5, 5]}}, {"action": "commit"}, {"action": "undo"}], "expected": {"position": [0, 0, 0]}}
-{"name": "redo_after_undo", "steps": [{"action": "edit", "op": {"key": "cube-1", "otype": "vector3.set", "path": "position", "value": [5, 5, 5]}}, {"action": "commit"}, {"action": "undo"}, {"action": "redo"}], "expected": {"position": [5, 5, 5]}}
-{"name": "undo_uncommitted", "steps": [{"action": "edit", "op": {"key": "cube-1", "otype": "vector3.set", "path": "position", "value": [5, 5, 5]}}, {"action": "undo"}], "expected": {"position": [0, 0, 0]}}
+{"name": "undo_single_edit", "steps": [{"action": "edit", "op": {"key": "cube-1", "ot": "vector3.set", "path": "position", "value": [5, 5, 5]}}, {"action": "commit"}, {"action": "undo"}], "expected": {"position": [0, 0, 0]}}
+{"name": "redo_after_undo", "steps": [{"action": "edit", "op": {"key": "cube-1", "ot": "vector3.set", "path": "position", "value": [5, 5, 5]}}, {"action": "commit"}, {"action": "undo"}, {"action": "redo"}], "expected": {"position": [5, 5, 5]}}
+{"name": "undo_uncommitted", "steps": [{"action": "edit", "op": {"key": "cube-1", "ot": "vector3.set", "path": "position", "value": [5, 5, 5]}}, {"action": "undo"}], "expected": {"position": [0, 0, 0]}}

package/tests/fixtures/vector-ops.jsonl

@@ -1,17 +1,17 @@
-{"name": "vector3_set", "op": {"key": "node-1", "otype": "vector3.set", "path": "position", "value": [1, 2, 3]}}
-{"name": "vector3_set_zero", "op": {"key": "node-1", "otype": "vector3.set", "path": "position", "value": [0, 0, 0]}}
-{"name": "vector3_add", "op": {"key": "node-1", "otype": "vector3.add", "path": "position", "value": [0.5, 0.5, 0.5]}}
-{"name": "vector3_add_negative", "op": {"key": "node-1", "otype": "vector3.add", "path": "position", "value": [-1, -1, -1]}}
-{"name": "vector3_multiply", "op": {"key": "node-1", "otype": "vector3.multiply", "path": "scale", "value": [2, 2, 2]}}
-{"name": "vector3_multiply_non_uniform", "op": {"key": "node-1", "otype": "vector3.multiply", "path": "scale", "value": [1, 2, 3]}}
-{"name": "quaternion_set", "op": {"key": "node-1", "otype": "quaternion.set", "path": "rotation", "value": [0, 0, 0, 1]}}
-{"name": "quaternion_set_rotated", "op": {"key": "node-1", "otype": "quaternion.set", "path": "rotation", "value": [0, 0.7071, 0, 0.7071]}}
-{"name": "quaternion_multiply", "op": {"key": "node-1", "otype": "quaternion.multiply", "path": "rotation", "value": [0, 0.3827, 0, 0.9239]}}
-{"name": "vector3_apply_euler", "op": {"key": "node-1", "otype": "vector3.applyEuler", "path": "direction", "value": [0, 1.5708, 0]}}
-{"name": "vector3_apply_euler_zero", "op": {"key": "node-1", "otype": "vector3.applyEuler", "path": "direction", "value": [0, 0, 0]}}
-{"name": "vector3_apply_quaternion", "op": {"key": "node-1", "otype": "vector3.applyQuaternion", "path": "direction", "value": [0, 0.7071, 0, 0.7071]}}
-{"name": "vector3_apply_quaternion_identity", "op": {"key": "node-1", "otype": "vector3.applyQuaternion", "path": "direction", "value": [0, 0, 0, 1]}}
-{"name": "euler_set", "op": {"key": "node-1", "otype": "euler.set", "path": "eulerRotation", "value": [0, 1.5708, 0]}}
-{"name": "euler_set_zero", "op": {"key": "node-1", "otype": "euler.set", "path": "eulerRotation", "value": [0, 0, 0]}}
-{"name": "euler_add", "op": {"key": "node-1", "otype": "euler.add", "path": "eulerRotation", "value": [0.1, 0.2, 0.3]}}
-{"name": "euler_add_negative", "op": {"key": "node-1", "otype": "euler.add", "path": "eulerRotation", "value": [-0.5, -0.5, -0.5]}}
+{"name": "vector3_set", "op": {"key": "node-1", "ot": "vector3.set", "path": "position", "value": [1, 2, 3]}}
+{"name": "vector3_set_zero", "op": {"key": "node-1", "ot": "vector3.set", "path": "position", "value": [0, 0, 0]}}
+{"name": "vector3_add", "op": {"key": "node-1", "ot": "vector3.add", "path": "position", "value": [0.5, 0.5, 0.5]}}
+{"name": "vector3_add_negative", "op": {"key": "node-1", "ot": "vector3.add", "path": "position", "value": [-1, -1, -1]}}
+{"name": "vector3_multiply", "op": {"key": "node-1", "ot": "vector3.multiply", "path": "scale", "value": [2, 2, 2]}}
+{"name": "vector3_multiply_non_uniform", "op": {"key": "node-1", "ot": "vector3.multiply", "path": "scale", "value": [1, 2, 3]}}
+{"name": "quaternion_set", "op": {"key": "node-1", "ot": "quaternion.set", "path": "rotation", "value": [0, 0, 0, 1]}}
+{"name": "quaternion_set_rotated", "op": {"key": "node-1", "ot": "quaternion.set", "path": "rotation", "value": [0, 0.7071, 0, 0.7071]}}
+{"name": "quaternion_multiply", "op": {"key": "node-1", "ot": "quaternion.multiply", "path": "rotation", "value": [0, 0.3827, 0, 0.9239]}}
+{"name": "vector3_apply_euler", "op": {"key": "node-1", "ot": "vector3.applyEuler", "path": "direction", "value": [0, 1.5708, 0]}}
+{"name": "vector3_apply_euler_zero", "op": {"key": "node-1", "ot": "vector3.applyEuler", "path": "direction", "value": [0, 0, 0]}}
+{"name": "vector3_apply_quaternion", "op": {"key": "node-1", "ot": "vector3.applyQuaternion", "path": "direction", "value": [0, 0.7071, 0, 0.7071]}}
+{"name": "vector3_apply_quaternion_identity", "op": {"key": "node-1", "ot": "vector3.applyQuaternion", "path": "direction", "value": [0, 0, 0, 1]}}
+{"name": "euler_set", "op": {"key": "node-1", "ot": "euler.set", "path": "eulerRotation", "value": [0, 1.5708, 0]}}
+{"name": "euler_set_zero", "op": {"key": "node-1", "ot": "euler.set", "path": "eulerRotation", "value": [0, 0, 0]}}
+{"name": "euler_add", "op": {"key": "node-1", "ot": "euler.add", "path": "eulerRotation", "value": [0.1, 0.2, 0.3]}}
+{"name": "euler_add_negative", "op": {"key": "node-1", "ot": "euler.add", "path": "eulerRotation", "value": [-0.5, -0.5, -0.5]}}

package/tests/operations/collections.test.ts

@@ -28,10 +28,10 @@ function loadOps(filename: string): OpFixture[] {
 function createMsg(op: Operation, lamport = 1): CRDTMessage {
   return {
     id: `msg-${Math.random().toString(36).slice(2)}`,
-    sessionId: 'test-session',
+    client: 'test-session',
     clock: { 'test-session': lamport },
-    lamportTime: lamport,
-    timestamp: Date.now() / 1000,
+    lt: lamport,
+    ts: Date.now() / 1000,
     ops: [op],
   };
 }
@@ -43,7 +43,7 @@ function createNodeWithProps(
 ): SceneGraph {
   const nodeOp: Operation = {
     key: '',
-    otype: 'node.insert',
+    ot: 'node.insert',
     path: 'children',
     value: {
       key,

package/tests/operations/nodes.test.ts

@@ -28,10 +28,10 @@ function loadOps(filename: string): OpFixture[] {
 function createMsg(op: Operation, lamport = 1): CRDTMessage {
   return {
     id: `msg-${Math.random().toString(36).slice(2)}`,
-    sessionId: 'test-session',
+    client: 'test-session',
     clock: { 'test-session': lamport },
-    lamportTime: lamport,
-    timestamp: Date.now() / 1000,
+    lt: lamport,
+    ts: Date.now() / 1000,
     ops: [op],
   };
 }
@@ -119,7 +119,7 @@ describe('Node Operations', () => {
       // Insert same mesh again with different name
       const duplicateOp: Operation = {
         key: 'scene',
-        otype: 'node.insert',
+        ot: 'node.insert',
         path: 'children',
         value: {
           key: 'cube-1',
@@ -193,7 +193,7 @@ describe('Node Operations', () => {
 
       const removeOp: Operation = {
         key: 'scene',
-        otype: 'node.remove',
+        ot: 'node.remove',
         path: 'children',
         value: 'non-existent',
       };

package/tests/operations/operation-ordering.test.ts

@@ -0,0 +1,406 @@
+/**
+ * Test: Operation ordering bug that caused IME divergence
+ *
+ * This test reproduces the exact scenario from message-log-1772398431392.json
+ * where operations arrived with non-monotonic sequence numbers:
+ * seq: 40, 50, 59, 62, 46, 56, 64, 60, 63
+ *
+ * The fix ensures operations are sorted by Lamport timestamp before applying.
+ */
+
+import { describe, it, expect } from '@jest/globals';
+import { applyMessage, createEmptyGraph } from '../../src/operations/dispatcher.js';
+import type { CRDTMessage } from '../../src/operations/OperationTypes.js';
+
+describe('Operation Ordering - IME Divergence Bug', () => {
+  it('should apply operations in Lamport order when array has non-monotonic seq', () => {
+    // Create initial graph with text node
+    let graph = createEmptyGraph();
+
+    // Initialize root and text node
+    const initMsg: CRDTMessage = {
+      id: 'msg-init',
+      client: 'Misaka-08330-hy6',
+      clock: { 'Misaka-08330-hy6': 1 },
+      lt: 1,
+      ts: 1000.0,
+      ops: [
+        {
+          ot: 'node.insert',
+          key: '',
+          path: 'children',
+          value: { key: 'default-scene', tag: 'Scene', name: 'Scene' },
+        },
+        {
+          ot: 'node.insert',
+          key: 'default-scene',
+          path: 'children',
+          value: { key: 'text-doc', tag: 'Text', name: 'Text' },
+        },
+        {
+          ot: 'text.init',
+          key: 'text-doc',
+          path: 'content',
+          value: '',
+        } as any,
+      ],
+    };
+    graph = applyMessage(graph, initMsg);
+
+    // Simulate operations arriving in non-monotonic seq order
+    // This reproduces entry #21 from the divergence log
+    const msg: CRDTMessage = {
+      id: 'msg-ime',
+      client: 'Misaka-08330-hy6',
+      clock: { 'Misaka-08330-hy6': 2 },
+      lt: 64,
+      ts: 1001.0,
+      ops: [
+        // Op #1: seq:40
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:7',
+          value: [null, 'wo z'],
+          seq: 40,
+          ts: 1001.0,
+        } as any,
+        // Op #2: seq:50
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:24',
+          value: ['Misaka-08330-hy6:7', 'ch'],
+          seq: 50,
+          ts: 1001.1,
+        } as any,
+        // Op #3: seq:59 - creates ID that will be deleted
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:37',
+          value: ['Misaka-08330-hy6:24', 's'],
+          seq: 59,
+          ts: 1001.2,
+        } as any,
+        // Op #4: seq:62
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:39',
+          value: ['Misaka-08330-hy6:37', 'u r'],
+          seq: 62,
+          ts: 1001.3,
+        } as any,
+        // Op #5: seq:46 - GOES BACKWARDS!
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:17',
+          value: ['Misaka-08330-hy6:7', ' l'],
+          seq: 46,
+          ts: 1001.05,
+        } as any,
+        // Op #6: seq:56
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:33',
+          value: ['Misaka-08330-hy6:24', 'i'],
+          seq: 56,
+          ts: 1001.15,
+        } as any,
+        // Op #7: seq:64 - replace that deletes id:37 from op #3
+        {
+          ot: 'text.replace',
+          key: 'text-doc',
+          path: 'content',
+          position: 0,
+          length: 6,
+          value: [null, '输入'],
+          rm: [['Misaka-08330-hy6:37', 6]],
+          id: 'Misaka-08330-hy6:43',
+          seq: 64,
+          ts: 1001.4,
+        } as any,
+        // Op #8: seq:60
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:38',
+          value: ['Misaka-08330-hy6:37', 'h'],
+          seq: 60,
+          ts: 1001.25,
+        } as any,
+        // Op #9: delete (no seq shown in log, using 65)
+        {
+          ot: 'text.delete',
+          key: 'text-doc',
+          path: 'content',
+          position: 0,
+          length: 1,
+          rm: [['Misaka-08330-hy6:36', 1]],
+          seq: 65,
+          ts: 1001.45,
+        } as any,
+        // Op #10: seq:63
+        {
+          ot: 'text.insert',
+          key: 'text-doc',
+          path: 'content',
+          id: 'Misaka-08330-hy6:42',
+          value: ['Misaka-08330-hy6:38', 'u'],
+          seq: 63,
+          ts: 1001.35,
+        } as any,
+      ],
+    };
+
+    // Apply the message - operations should be sorted before applying
+    const result = applyMessage(graph, msg);
+
+    // The key test: operations should have been applied in seq order
+    // (40, 46, 50, 56, 59, 60, 62, 63, 64, 65) NOT array order
+    // This should produce consistent text without the CRDT throwing errors
+    expect(result.nodes['text-doc']).toBeDefined();
+    expect(result.nodes['text-doc'].content).toBeDefined();
+
+    // The exact text content depends on the CRDT merge logic,
+    // but it should not throw errors and should be deterministic
+    const text = String(result.nodes['text-doc'].content);
+    expect(text).toBeTruthy();
+
+    // Most importantly: this should NOT throw an error about missing IDs
+    // The replace operation (seq:64) that deletes id:37 should be applied
+    // AFTER the insert operation (seq:59) that creates id:37
+  });
+
+  it('should sort operations with only seq metadata', () => {
+    let graph = createEmptyGraph();
+
+    // Create nodes first
+    const initMsg: CRDTMessage = {
+      id: 'msg-init',
+      client: 'alice',
+      clock: { alice: 0 },
+      lt: 0,
+      ts: 999.0,
+      ops: [
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-1' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-2' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-3' } },
+      ],
+    };
+    graph = applyMessage(graph, initMsg);
+
+    const msg: CRDTMessage = {
+      id: 'msg-1',
+      client: 'alice',
+      clock: { alice: 1 },
+      lt: 50,
+      ts: 1000.0,
+      ops: [
+        {
+          ot: 'number.set',
+          key: 'node-1',
+          path: 'value',
+          value: 40,
+          seq: 40,
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-2',
+          path: 'value',
+          value: 30,
+          seq: 30,
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-3',
+          path: 'value',
+          value: 50,
+          seq: 50,
+        } as any,
+      ],
+    };
+
+    // Operations should be applied in seq order: 30, 40, 50
+    const result = applyMessage(graph, msg);
+    expect(result.nodes['node-1'].value).toBe(40);
+    expect(result.nodes['node-2'].value).toBe(30);
+    expect(result.nodes['node-3'].value).toBe(50);
+  });
+
+  it('should handle operations without seq/ts/id gracefully', () => {
+    let graph = createEmptyGraph();
+
+    // Create nodes first
+    const initMsg: CRDTMessage = {
+      id: 'msg-init',
+      client: 'alice',
+      clock: { alice: 0 },
+      lt: 0,
+      ts: 999.0,
+      ops: [
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-1' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-2' } },
+      ],
+    };
+    graph = applyMessage(graph, initMsg);
+
+    const msg: CRDTMessage = {
+      id: 'msg-1',
+      client: 'alice',
+      clock: { alice: 1 },
+      lt: 10,
+      ts: 1000.0,
+      ops: [
+        {
+          ot: 'number.set',
+          key: 'node-1',
+          path: 'value',
+          value: 1,
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-2',
+          path: 'value',
+          value: 2,
+        } as any,
+      ],
+    };
+
+    // Should not throw even without seq/ts/id
+    const result = applyMessage(graph, msg);
+    expect(result.nodes['node-1'].value).toBe(1);
+    expect(result.nodes['node-2'].value).toBe(2);
+  });
+
+  it('should use ts as tiebreaker when seq is equal', () => {
+    let graph = createEmptyGraph();
+
+    // Create nodes first
+    const initMsg: CRDTMessage = {
+      id: 'msg-init',
+      client: 'alice',
+      clock: { alice: 0 },
+      lt: 0,
+      ts: 999.0,
+      ops: [
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-1' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-2' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-3' } },
+      ],
+    };
+    graph = applyMessage(graph, initMsg);
+
+    const msg: CRDTMessage = {
+      id: 'msg-1',
+      client: 'alice',
+      clock: { alice: 1 },
+      lt: 40,
+      ts: 1000.0,
+      ops: [
+        {
+          ot: 'number.set',
+          key: 'node-1',
+          path: 'value',
+          value: 1,
+          seq: 40,
+          ts: 1000.2,
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-2',
+          path: 'value',
+          value: 2,
+          seq: 40,
+          ts: 1000.1,
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-3',
+          path: 'value',
+          value: 3,
+          seq: 40,
+          ts: 1000.3,
+        } as any,
+      ],
+    };
+
+    // Should sort by ts when seq is equal: 1000.1, 1000.2, 1000.3
+    const result = applyMessage(graph, msg);
+    expect(result.nodes['node-1'].value).toBe(1);
+    expect(result.nodes['node-2'].value).toBe(2);
+    expect(result.nodes['node-3'].value).toBe(3);
+  });
+
+  it('should use id as final tiebreaker', () => {
+    let graph = createEmptyGraph();
+
+    // Create nodes first
+    const initMsg: CRDTMessage = {
+      id: 'msg-init',
+      client: 'alice',
+      clock: { alice: 0 },
+      lt: 0,
+      ts: 999.0,
+      ops: [
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-1' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-2' } },
+        { ot: 'node.insert', key: '', path: 'children', value: { key: 'node-3' } },
+      ],
+    };
+    graph = applyMessage(graph, initMsg);
+
+    const msg: CRDTMessage = {
+      id: 'msg-1',
+      client: 'alice',
+      clock: { alice: 1 },
+      lt: 40,
+      ts: 1000.0,
+      ops: [
+        {
+          ot: 'number.set',
+          key: 'node-1',
+          path: 'value',
+          value: 1,
+          seq: 40,
+          ts: 1000.0,
+          id: 'charlie:1',
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-2',
+          path: 'value',
+          value: 2,
+          seq: 40,
+          ts: 1000.0,
+          id: 'alice:1',
+        } as any,
+        {
+          ot: 'number.set',
+          key: 'node-3',
+          path: 'value',
+          value: 3,
+          seq: 40,
+          ts: 1000.0,
+          id: 'bob:1',
+        } as any,
+      ],
+    };
+
+    // Should sort by id when seq and ts are equal: alice, bob, charlie
+    const result = applyMessage(graph, msg);
+    expect(result.nodes['node-1'].value).toBe(1);
+    expect(result.nodes['node-2'].value).toBe(2);
+    expect(result.nodes['node-3'].value).toBe(3);
+  });
+});

package/tests/operations/primitives.test.ts

@@ -28,10 +28,10 @@ function loadOps(filename: string): OpFixture[] {
 function createMsg(op: Operation, lamport = 1): CRDTMessage {
   return {
     id: `msg-${Math.random().toString(36).slice(2)}`,
-    sessionId: 'test-session',
+    client: 'test-session',
     clock: { 'test-session': lamport },
-    lamportTime: lamport,
-    timestamp: Date.now() / 1000,
+    lt: lamport,
+    ts: Date.now() / 1000,
     ops: [op],
   };
 }
@@ -43,7 +43,7 @@ function createNodeWithProps(
 ): SceneGraph {
   const nodeOp: Operation = {
     key: '',
-    otype: 'node.insert',
+    ot: 'node.insert',
     path: 'children',
     value: {
       key,