@glance-apps/sync 1.2.1 → 1.3.1

package/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.1] - 2026-06-14
+
+### Fixed
+
+- **`mergeRoutineDefinitions` now applies last-write-wins on chip id collisions.**
+  Previously, when the same chip id existed on both sides, the local chip was
+  kept verbatim and the remote one skipped — `lastModified` was only consulted
+  for tombstone resurrection. As a result, any edit to an existing routine chip
+  (rename, reorder, time change, or stamping `ownerSyncId`) failed to propagate
+  across devices. Colliding chips are now resolved by the newer `lastModified`,
+  matching the behavior of `mergeArrayById` / `mergeHabits`. Ordering and
+  tombstone behavior are preserved.
+
+## [1.3.0] - 2026-06-14
+
+### Added
+
+- **Multi-user roster sync in `mergeSyncData`.** A `users` array is now merged
+  across devices using last-write-wins per user, keyed by `syncId` (falling back
+  to `id`) and resolved by `updatedAt`. A roster signature (id, `updatedAt`,
+  `deleted` flag, and `name`) drives the `localChanged` / `remoteChanged` dirty
+  flags so roster edits propagate. The per-device `multiUserEnabled` toggle is
+  intentionally not merged.
+
 ## [1.2.1] - 2026-06-14
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glance-apps/sync",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "license": "MIT",
   "type": "module",
   "main": "src/index.js",

package/src/merge.js

@@ -115,8 +115,11 @@ export const mergeArrayById = (localItems, remoteItems, deletedIds, syncHorizon
  *
  * Each side's bucket is an array of { id, name } chips.  The merge preserves
  * local ordering and appends any remote-only chips at the end — mirroring the
- * mergeArrayById strategy.  Chips present in the deletedChipIds tombstone map
- * are excluded from the merged result.
+ * mergeArrayById strategy.  When the same chip id exists on both sides, the
+ * version with the newer `lastModified` wins (field-level last-write-wins), so
+ * edits like renames, time changes, or ownership stamps propagate across
+ * devices.  Chips present in the deletedChipIds tombstone map are excluded from
+ * the merged result.
  *
  * @param {Object} localDefs  - Local routine definitions (bucket → chip[])
  * @param {Object} remoteDefs - Remote routine definitions (bucket → chip[])
@@ -141,40 +144,33 @@ export const mergeRoutineDefinitions = (localDefs, remoteDefs, deletedChipIds =
   for (const bucket of allBuckets) {
     const localChips = localDefs[bucket] || [];
     const remoteChips = remoteDefs[bucket] || [];
-    const localIds = new Set(localChips.map(c => String(c.id)));
     const remoteMap = new Map(remoteChips.map(c => [String(c.id), c]));
+    const localMap = new Map(localChips.map(c => [String(c.id), c]));
+    const lm = (c) => c?.lastModified ? new Date(c.lastModified).getTime() : 0;
 
-    // Start with local chips in order, filtering out tombstoned chips
     const bucketMerged = [];
+    // Local chips in order; when a chip also exists remotely, take the newer one.
     for (const chip of localChips) {
-      if (isTombstoned(chip)) {
-        localChanged = true; // chip removed locally
-        continue;
+      if (isTombstoned(chip)) { localChanged = true; continue; }
+      const r = remoteMap.get(String(chip.id));
+      if (r && !isTombstoned(r) && lm(r) > lm(chip)) {
+        bucketMerged.push(r); localChanged = true;          // remote edit wins
+      } else {
+        bucketMerged.push(chip);
+        if (r && lm(chip) > lm(r)) remoteChanged = true;    // local edit is newer
       }
-      bucketMerged.push(chip);
     }
-
     // Append remote-only chips (skip tombstoned)
-    for (const remoteChip of remoteChips) {
-      const id = String(remoteChip.id);
-      if (localIds.has(id)) continue;
-      if (isTombstoned(remoteChip)) {
-        remoteChanged = true; // tell remote this was deleted
-        continue;
-      }
-      bucketMerged.push(remoteChip);
-      localChanged = true;
+    for (const r of remoteChips) {
+      if (localMap.has(String(r.id))) continue;
+      if (isTombstoned(r)) { remoteChanged = true; continue; }
+      bucketMerged.push(r); localChanged = true;
     }
-
-    // Check for local-only chips (remote needs them)
-    for (const localChip of localChips) {
-      const id = String(localChip.id);
-      if (isTombstoned(localChip)) continue; // don't flag deleted chips as needing push
-      if (!remoteMap.has(id)) {
-        remoteChanged = true;
-      }
+    // Local-only chips → remote needs them
+    for (const c of localChips) {
+      if (isTombstoned(c)) continue;
+      if (!remoteMap.has(String(c.id))) remoteChanged = true;
     }
-
     merged[bucket] = bucketMerged;
   }
 
@@ -832,6 +828,25 @@ export const mergeSyncData = (localData, remoteData, retentionDays = 90) => {
   const prunedDeletedGoalIds = pruneTombstones(allDeletedGoalIds, tombstoneCutoff);
   const prunedDeletedProjectIds = pruneTombstones(allDeletedProjectIds, tombstoneCutoff);
 
+  // ── Multi-user roster: last-write-wins per user by updatedAt (keyed by syncId).
+  // NOTE: multiUserEnabled is intentionally NOT merged — it's a per-device toggle.
+  const localUsers  = Array.isArray(localData.users)  ? localData.users  : [];
+  const remoteUsers = Array.isArray(remoteData.users) ? remoteData.users : [];
+  const usersById = new Map(localUsers.map(u => [u.syncId ?? u.id, u]));
+  for (const u of remoteUsers) {
+    const k = u.syncId ?? u.id;
+    const prev = usersById.get(k);
+    if (!prev || (u.updatedAt || '') > (prev.updatedAt || '')) usersById.set(k, u);
+  }
+  const mergedUsers = [...usersById.values()];
+
+  const rosterSig = (arr) => arr
+    .map(u => `${u.syncId ?? u.id}:${u.updatedAt || ''}:${u.deleted ? 1 : 0}:${u.name || ''}`)
+    .sort().join('|');
+  const mergedSig = rosterSig(mergedUsers);
+  if (mergedSig !== rosterSig(localUsers))  localChanged  = true;
+  if (mergedSig !== rosterSig(remoteUsers)) remoteChanged = true;
+
   return {
     data: {
       tasks: finalTasks,
@@ -877,6 +892,7 @@ export const mergeSyncData = (localData, remoteData, retentionDays = 90) => {
       minimizedSections: localData.minimizedSections, // UI pref — keep local
       use24HourClock: localData.use24HourClock, // device pref — keep local
       tombstonePrunedBefore: mergedTombstonePrunedBefore,
+      users: mergedUsers,
     },
     localChanged,
     remoteChanged