@vuer-ai/vuer-rtc 0.7.0 → 0.8.2

package/src/client/textTypes.ts

@@ -11,7 +11,7 @@ import type { TextRope, InsertOp, DeleteOp, ReplaceOp } from '../crdt/Rope.js';
 import type { VectorClock } from '../state/VectorClock.js';
 
 /**
- * Text operation types - no wrapper needed since ops have otype discriminator
+ * Text operation types - no wrapper needed since ops have ot discriminator
  */
 export type TextOperation = InsertOp | DeleteOp | ReplaceOp;
 
@@ -20,11 +20,11 @@ export type TextOperation = InsertOp | DeleteOp | ReplaceOp;
  */
 export interface TextMessage {
   msgId: string;
-  sessionId: string;
+  client: string;
   operations: TextOperation[];
   vectorClock: VectorClock;
-  lamportTime: number;
-  timestamp: number;
+  lt: number;
+  ts: number;
   description?: string;
 }
 
@@ -51,7 +51,7 @@ export interface TextEditBuffer {
 export interface TextSnapshot {
   rope: TextRope;
   vectorClock: VectorClock;
-  lamportTime: number;    // Max lamport time baked in
+  lt: number;    // Max lamport time baked in
   journalIndex: number;   // How many entries are baked in
 }
 
@@ -72,16 +72,16 @@ export interface TextDocumentState {
   snapshot: TextSnapshot;
 
   // Clocks
-  lamportTime: number;
+  lt: number;
   vectorClock: VectorClock;
-  sessionId: string;
+  client: string;
 }
 
 /**
  * Options for creating a text document store
  */
 export interface CreateTextDocumentOptions {
-  sessionId: string;
+  client: string;
   initialSnapshot?: TextSnapshot;
   onSend?: (msg: TextMessage) => void;
   onStateChange?: (state: TextDocumentState) => void;

package/src/client/types.ts

@@ -34,7 +34,7 @@ export interface EditBuffer {
 export interface Snapshot {
   graph: SceneGraph;
   vectorClock: VectorClock;
-  lamportTime: number;    // Max lamport time baked in
+  lt: number;    // Max lamport time baked in
   journalIndex: number;   // How many entries are baked in
 }
 
@@ -55,16 +55,16 @@ export interface ClientState {
   snapshot: Snapshot;
 
   // Clocks
-  lamportTime: number;
+  lt: number;
   vectorClock: VectorClock;
-  sessionId: string;
+  client: string;
 }
 
 /**
  * Options for creating a graph store
  */
 export interface CreateGraphOptions {
-  sessionId: string;
+  client: string;  // Client/session ID (renamed from sessionId for consistency with wire format)
   initialSnapshot?: Snapshot;
   onSend?: (msg: CRDTMessage) => void;
   onStateChange?: (state: ClientState) => void;

package/src/crdt/GraphTextCRDT.ts

@@ -44,11 +44,11 @@ import {
  */
 export class GraphTextCRDT {
   private _state: Map<string, Map<string, TextRope>>;
-  private _sessionId: string;
+  private _client: string;
 
-  constructor(sessionId: string) {
+  constructor(client: string) {
     this._state = new Map();
-    this._sessionId = sessionId;
+    this._client = client;
   }
 
   /**
@@ -63,7 +63,7 @@ export class GraphTextCRDT {
 
     let rope = nodeState.get(path);
     if (!rope) {
-      rope = create(this._sessionId);
+      rope = create(this._client);
       nodeState.set(path, rope);
     }
 
@@ -99,7 +99,7 @@ export class GraphTextCRDT {
     text: string
   ): InsertOp {
     const rope = this.getOrCreate(nodeKey, path);
-    return insertWithSplit(rope, position, text, this._sessionId);
+    return insertWithSplit(rope, position, text, this._client);
   }
 
   /**
@@ -143,7 +143,7 @@ export class GraphTextCRDT {
     text: string
   ): ReplaceOp {
     const rope = this.getOrCreate(nodeKey, path);
-    return replace(rope, position, length, text, this._sessionId);
+    return replace(rope, position, length, text, this._client);
   }
 
   /**

package/src/crdt/Rope.ts

@@ -27,7 +27,7 @@ export interface Item {
   id: ItemId;
   content: string;
   isDeleted: boolean;
-  parentId: ItemId | null;
+  anchor?: ItemId;      // Changed from 'parentId: ItemId | null' - omit when null
   seq: number;  // Lamport timestamp for total ordering
   ts: number;  // Wall-clock time (seconds) for tie-breaking
 }
@@ -90,29 +90,31 @@ export class TextRope {
 }
 
 export interface InsertOp {
-  otype: 'insert';
+  ot: 'insert';
   id: ItemId;
-  content: string;
-  parentId: ItemId | null;
+  value: [ItemId | null, string];  // [anchor, content]
   seq: number;
   ts: number;  // Wall-clock time (seconds) for tie-breaking
 }
 
 export interface DeleteOp {
-  otype: 'delete';
-  deletions: Array<{ id: ItemId; length: number }>;
+  ot: 'delete';
+  rm: Array<[ItemId, number]>;  // [[itemId, length], ...]
 }
 
 export interface MoveOp {
-  otype: 'move';
+  ot: 'move';
   delete: DeleteOp;
   insert: InsertOp;
 }
 
 export interface ReplaceOp {
-  otype: 'replace';
-  delete: DeleteOp;
-  insert: InsertOp;
+  ot: 'replace';
+  rm: Array<[ItemId, number]>;
+  id: ItemId;
+  value: [ItemId | null, string];  // [anchor, content]
+  seq: number;
+  ts: number;
 }
 
 // ============================================
@@ -280,7 +282,7 @@ function splitItem(rope: TextRope, ordinal: number, offset: number): Item {
     id: createItemId(itemParsed.agent, itemParsed.seq),
     content: item.content.slice(0, offset),
     isDeleted: item.isDeleted,
-    parentId: item.parentId,
+    ...(item.anchor !== undefined && { anchor: item.anchor }),
     seq: item.seq,
     ts: item.ts,
   };
@@ -289,7 +291,7 @@ function splitItem(rope: TextRope, ordinal: number, offset: number): Item {
     id: createItemId(itemParsed.agent, itemParsed.seq + offset),
     content: item.content.slice(offset),
     isDeleted: item.isDeleted,
-    parentId: createItemId(itemParsed.agent, itemParsed.seq + offset - 1),
+    anchor: createItemId(itemParsed.agent, itemParsed.seq + offset - 1),
     seq: item.seq,
     ts: item.ts,
   };
@@ -314,9 +316,9 @@ function containsItemId(rope: TextRope, id: ItemId): boolean {
   return aiFind(entries, parsed.seq) !== -1;
 }
 
-function findParentOrdinal(rope: TextRope, parentId: ItemId | null): number {
-  if (parentId === null) return -1;
-  const parsed = parseItemId(parentId);
+function findParentOrdinal(rope: TextRope, anchor: ItemId | undefined): number {
+  if (anchor === undefined) return -1;
+  const parsed = parseItemId(anchor);
   const entries = rope._agentIndex.get(parsed.agent);
   if (!entries) return -1;
   const ei = aiFind(entries, parsed.seq);
@@ -324,9 +326,9 @@ function findParentOrdinal(rope: TextRope, parentId: ItemId | null): number {
   return computeOrdinal(rope._tree, entries[ei].item);
 }
 
-function splitForParent(rope: TextRope, parentId: ItemId | null): number {
-  if (parentId === null) return -1;
-  const parsedParent = parseItemId(parentId);
+function splitForParent(rope: TextRope, anchor: ItemId | undefined): number {
+  if (anchor === undefined) return -1;
+  const parsedParent = parseItemId(anchor);
   const entries = rope._agentIndex.get(parsedParent.agent);
   if (!entries) return -1;
   const ei = aiFind(entries, parsedParent.seq);
@@ -399,7 +401,7 @@ function integrate(rope: TextRope, newItem: Item, parentOrdinal: number): void {
       // First, compare by Lamport timestamp (seq) - higher seq means happened later
       if (newItem.seq > existingItem.seq) break;
 
-      const existingParentOrdinal = findParentOrdinal(rope, existingItem.parentId);
+      const existingParentOrdinal = findParentOrdinal(rope, existingItem.anchor);
 
       // If existing item's parent is before our parent in the document, insert here
       if (existingParentOrdinal < parentOrdinal) {
@@ -433,11 +435,14 @@ function integrate(rope: TextRope, newItem: Item, parentOrdinal: number): void {
 function _applyLocal(rope: TextRope, op: InsertOp, parentOrdinal: number): void {
   if (op.seq > rope.maxSeq) rope.maxSeq = op.seq;
 
+  const anchor = op.value[0];
+  const content = op.value[1];
+
   const newItem: Item = {
     id: op.id,
-    content: op.content,
+    content,
     isDeleted: false,
-    parentId: op.parentId,
+    ...(anchor !== null && { anchor }),
     seq: op.seq,
     ts: op.ts,
   };
@@ -446,7 +451,7 @@ function _applyLocal(rope: TextRope, op: InsertOp, parentOrdinal: number): void
 
   const idParsed = parseItemId(op.id);
   if (idParsed.agent === rope.agentId) {
-    const maxSeqInItem = idParsed.seq + op.content.length - 1;
+    const maxSeqInItem = idParsed.seq + content.length - 1;
     if (maxSeqInItem >= rope.clock) rope.clock = maxSeqInItem + 1;
   }
 }
@@ -480,15 +485,14 @@ export function insert(rope: TextRope, position: number, content: string, agentI
   const parentId = findInsertPosition(rope, position);
 
   const op: InsertOp = {
-    otype: 'insert',
+    ot: 'insert',
     id: createItemId(rope.agentId, rope.clock),
-    content,
-    parentId,
+    value: [parentId, content],
     seq: rope.maxSeq + 1,
     ts: Date.now() / 1000,
   };
 
-  const parentOrdinal = splitForParent(rope, op.parentId);
+  const parentOrdinal = splitForParent(rope, op.value[0] ?? undefined);
   _applyLocal(rope, op, parentOrdinal);
   return op;
 }
@@ -516,10 +520,9 @@ export function insertWithSplit(rope: TextRope, position: number, content: strin
   }
 
   const op: InsertOp = {
-    otype: 'insert',
+    ot: 'insert',
     id: createItemId(rope.agentId, rope.clock),
-    content,
-    parentId,
+    value: [parentId, content],
     seq: rope.maxSeq + 1,
     ts: Date.now() / 1000,
   };
@@ -539,13 +542,16 @@ export function apply(rope: TextRope, op: InsertOp): void {
   if (op.seq > rope.maxSeq) rope.maxSeq = op.seq;
   if (containsItemId(rope, op.id)) return;
 
-  const parentOrdinal = splitForParent(rope, op.parentId);
+  const anchor = op.value[0];
+  const content = op.value[1];
+
+  const parentOrdinal = splitForParent(rope, anchor ?? undefined);
 
   const newItem: Item = {
     id: op.id,
-    content: op.content,
+    content,
     isDeleted: false,
-    parentId: op.parentId,
+    ...(anchor !== null && { anchor }),
     seq: op.seq,
     ts: op.ts,
   };
@@ -554,7 +560,7 @@ export function apply(rope: TextRope, op: InsertOp): void {
 
   const idParsed = parseItemId(op.id);
   if (idParsed.agent === rope.agentId) {
-    const maxSeqInItem = idParsed.seq + op.content.length - 1;
+    const maxSeqInItem = idParsed.seq + content.length - 1;
     if (maxSeqInItem >= rope.clock) rope.clock = maxSeqInItem + 1;
   }
 }
@@ -578,13 +584,13 @@ function canMergeDeletions(lastId: ItemId, lastLength: number, currentId: ItemId
 }
 
 export function remove(rope: TextRope, position: number, length: number): DeleteOp {
-  if (length === 0) return { otype: 'delete', deletions: [] };
+  if (length === 0) return { ot: 'delete', rm: [] };
 
   // Invalidate insert tracking when deleting
   rope.lastInsertId = null;
   rope.lastInsertPos = 0;
 
-  const deletions: Array<{ id: ItemId; length: number }> = [];
+  const rm: Array<[ItemId, number]> = [];
   let remaining = length;
 
   while (remaining > 0) {
@@ -615,31 +621,33 @@ export function remove(rope: TextRope, position: number, length: number): Delete
     recalcCountsFor(rope._tree, item);
 
     // Try to merge with previous deletion if consecutive
-    const lastDeletion = deletions[deletions.length - 1];
-    if (lastDeletion && canMergeDeletions(lastDeletion.id, lastDeletion.length, item.id)) {
+    const lastDeletion = rm[rm.length - 1];
+    if (lastDeletion && canMergeDeletions(lastDeletion[0], lastDeletion[1], item.id)) {
       // Merge: extend the previous deletion
-      lastDeletion.length += item.content.length;
+      lastDeletion[1] += item.content.length;
     } else {
       // Cannot merge: add new deletion entry
-      deletions.push({ id: item.id, length: item.content.length });
+      rm.push([item.id, item.content.length]);
     }
 
     remaining -= toDelete;
   }
 
-  return { otype: 'delete', deletions };
+  return { ot: 'delete', rm };
 }
 
 export function applyDelete(rope: TextRope, op: DeleteOp): void {
-  if (op.deletions.length === 0) return;
+  if (op.rm.length === 0) return;
 
   // Group and merge deletion ranges by agent
   const byAgent = new Map<string, { start: number; end: number }[]>();
-  for (const del of op.deletions) {
-    const parsed = parseItemId(del.id);
+  for (const del of op.rm) {
+    const itemId = del[0];
+    const len = del[1];
+    const parsed = parseItemId(itemId);
     let ranges = byAgent.get(parsed.agent);
     if (!ranges) { ranges = []; byAgent.set(parsed.agent, ranges); }
-    ranges.push({ start: parsed.seq, end: parsed.seq + del.length });
+    ranges.push({ start: parsed.seq, end: parsed.seq + len });
   }
 
   for (const [, ranges] of byAgent) {
@@ -728,17 +736,87 @@ export function replace(
   agentId?: string
 ): ReplaceOp {
   if (agentId !== undefined) switchAgent(rope, agentId);
-  const deleteOp: DeleteOp = deleteLength > 0 ? remove(rope, position, deleteLength) : { otype: 'delete', deletions: [] };
-  const insertOp: InsertOp = insertText.length > 0
-    ? insertWithSplit(rope, position, insertText)
-    : { otype: 'insert', id: createItemId(rope.agentId, rope.clock), content: '', parentId: null, seq: rope.maxSeq, ts: Date.now() / 1000 };
-  return { otype: 'replace', delete: deleteOp, insert: insertOp };
+
+  // Capture parent ID for insert BEFORE delete (delete mutates rope and loses parent info)
+  let insertParentId: ItemId | null = null;
+  let insertParentOrdinal: number = -1;
+  let needsSplit = false;
+  let splitOffset = 0;
+
+  if (insertText.length > 0) {
+    // Check if we're continuing from the last insert position (continuous typing)
+    if (position === rope.lastInsertPos && rope.lastInsertId !== null) {
+      insertParentId = rope.lastInsertId;
+      insertParentOrdinal = splitForParent(rope, insertParentId);
+    } else {
+      // Cursor moved or first insert - capture parent info before delete
+      const result = findInsertPositionWithSplit(rope, position);
+      insertParentId = result.parentId;
+      insertParentOrdinal = result.parentOrdinal;
+      needsSplit = result.needsSplit;
+      splitOffset = result.splitOffset;
+    }
+  }
+
+  // Delete operation invalidates insert tracking
+  const deleteOp: DeleteOp = deleteLength > 0 ? remove(rope, position, deleteLength) : { ot: 'delete', rm: [] };
+
+  // Create flattened replace operation
+  const replaceOp: ReplaceOp = {
+    ot: 'replace',
+    rm: deleteOp.rm,
+    id: createItemId(rope.agentId, rope.clock),
+    value: [insertParentId, insertText],
+    seq: rope.maxSeq + 1,
+    ts: Date.now() / 1000,
+  };
+
+  // Apply insert if there's text to insert
+  if (insertText.length > 0) {
+    // Split item if needed (parent ordinal may have changed after delete)
+    if (needsSplit && insertParentOrdinal >= 0) {
+      splitItem(rope, insertParentOrdinal, splitOffset);
+    }
+
+    const insertOp: InsertOp = {
+      ot: 'insert',
+      id: replaceOp.id,
+      value: replaceOp.value,
+      seq: replaceOp.seq,
+      ts: replaceOp.ts,
+    };
+
+    _applyLocal(rope, insertOp, insertParentOrdinal);
+
+    // Update last insert tracking
+    const opIdParsed = parseItemId(insertOp.id);
+    const lastCharSeq = opIdParsed.seq + insertText.length - 1;
+    rope.lastInsertId = createItemId(rope.agentId, lastCharSeq);
+    rope.lastInsertPos = position + insertText.length;
+  } else {
+    rope.lastInsertId = null;
+    rope.lastInsertPos = 0;
+  }
+
+  return replaceOp;
 }
 
 export function applyReplace(rope: TextRope, op: ReplaceOp): void {
-  applyDelete(rope, op.delete);
-  if (op.insert.content.length > 0) {
-    apply(rope, op.insert);
+  // Apply delete side
+  const deleteOp: DeleteOp = { ot: 'delete', rm: op.rm };
+  applyDelete(rope, deleteOp);
+
+  // Apply insert side
+  const content = op.value[1];
+  if (content.length > 0) {
+    const insertOp: InsertOp = {
+      ot: 'insert',
+      id: op.id,
+      value: op.value,
+      seq: op.seq,
+      ts: op.ts,
+    };
+    apply(rope, insertOp);
   }
 }
 
@@ -771,7 +849,7 @@ export function move(rope: TextRope, fromPosition: number, length: number, toPos
   if (toPosition > fromPosition) adjustedTo = toPosition - length;
   const insertOp = insertWithSplit(rope, adjustedTo, content);
 
-  return { otype: 'move', delete: deleteOp, insert: insertOp };
+  return { ot: 'move', delete: deleteOp, insert: insertOp };
 }
 
 export function applyMove(rope: TextRope, op: MoveOp): void {
@@ -787,15 +865,14 @@ export function merge(rope: TextRope, other: TextRope): void {
   for (const treeItem of iterateAll(other._tree)) {
     const item = treeItem as Item;
     apply(rope, {
-      otype: 'insert',
+      ot: 'insert',
       id: item.id,
-      content: item.content,
-      parentId: item.parentId,
+      value: [item.anchor ?? null, item.content],
       seq: item.seq,
       ts: item.ts,
     });
     if (item.isDeleted) {
-      applyDelete(rope, { otype: 'delete', deletions: [{ id: item.id, length: item.content.length }] });
+      applyDelete(rope, { ot: 'delete', rm: [[item.id, item.content.length]] });
     }
   }
 }
@@ -836,15 +913,15 @@ export function compact(rope: TextRope): TextRope {
 // Serialization
 // ============================================
 
-export type RawTextRope = [string, number, number, Array<[string, string, string | null, number, number]>];
+export type RawTextRope = [string, number, number, Array<[string, string, string | undefined, number, number]>];
 
 export function toRaw(rope: TextRope): RawTextRope {
   const compacted = compact(rope);
   const items = flattenItems(compacted._tree) as Item[];
-  const rawItems: Array<[string, string, string | null, number, number]> = items.map(item => [
+  const rawItems: Array<[string, string, string | undefined, number, number]> = items.map(item => [
     item.id,
     item.content,
-    item.parentId,
+    item.anchor,
     item.seq,
     item.ts,
   ]);
@@ -853,11 +930,11 @@ export function toRaw(rope: TextRope): RawTextRope {
 
 export function fromRaw(raw: RawTextRope, newAgentId?: string): TextRope {
   const [agentId, clock, maxSeq, rawItems] = raw;
-  const items: Item[] = rawItems.map(([id, content, parentId, seq, ts]) => ({
+  const items: Item[] = rawItems.map(([id, content, anchor, seq, ts]) => ({
     id,
     content,
     isDeleted: false,
-    parentId,
+    ...(anchor !== undefined && { anchor }),
     seq,
     ts,
   }));
@@ -912,15 +989,23 @@ function extractItemsFromSerializedTree(node: unknown): Item[] {
     // Leaf node: extract items array
     const items = n.items as unknown[];
     if (!Array.isArray(items)) return [];
-    return items.map((item: any) => ({
-      id: typeof item.id === 'string' ? item.id : createItemId(item.id.agent, item.id.seq),
-      content: item.content,
-      isDeleted: item.isDeleted ?? false,
-      parentId: item.parentId === null ? null :
-        (typeof item.parentId === 'string' ? item.parentId : createItemId(item.parentId.agent, item.parentId.seq)),
-      seq: item.seq,
-      ts: item.ts ?? Date.now() / 1000,
-    }));
+    return items.map((item: any) => {
+      const result: Item = {
+        id: typeof item.id === 'string' ? item.id : createItemId(item.id.agent, item.id.seq),
+        content: item.content,
+        isDeleted: item.isDeleted ?? false,
+        seq: item.seq,
+        ts: item.ts ?? Date.now() / 1000,
+      };
+
+      // Handle both old 'parentId' and new 'anchor' field names
+      const anchorValue = item.anchor ?? item.parentId;
+      if (anchorValue !== undefined && anchorValue !== null) {
+        result.anchor = typeof anchorValue === 'string' ? anchorValue : createItemId(anchorValue.agent, anchorValue.seq);
+      }
+
+      return result;
+    });
   } else if (n.type === 'internal') {
     // Internal node: recursively collect from children
     const children = n.children as unknown[];

package/src/crdt/index.ts

@@ -28,6 +28,8 @@ export {
   findItemById,
   itemIdEquals,
   itemIdCompare,
+  parseItemId,
+  createItemId,
 } from './Rope.js';
 
 export type {

package/src/index.ts

@@ -39,6 +39,8 @@ export {
   findItemById,
   itemIdEquals,
   itemIdCompare,
+  parseItemId,
+  createItemId,
 } from './crdt/index.js';
 
 export type {