klypix-mcp 1.77.0 → 1.78.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/merge-brains.mjs +7 -1
package/package.json
CHANGED
package/src/merge-brains.mjs
CHANGED
|
@@ -83,9 +83,15 @@ function sanitizeDeletionReceipt(raw) {
|
|
|
83
83
|
//
|
|
84
84
|
// VOLATILE = written by the act of saving, not by a human/agent decision:
|
|
85
85
|
// updatedAt — touch timestamp zIndex — display order derived from zKey
|
|
86
|
+
// editedAt — the desktop app's authored-edit stamp (2026-08-22): advances on
|
|
87
|
+
// content-level edits only, but an edit-then-undo cycle leaves the
|
|
88
|
+
// content identical while the stamp differs — exactly the
|
|
89
|
+
// same-meaning-different-bytes shape that spawned the updatedAt
|
|
90
|
+
// twins above. A card whose only difference is WHEN it was last
|
|
91
|
+
// edited has not diverged.
|
|
86
92
|
// Everything else (content, colors, geometry, evidence, author…) stays load-
|
|
87
93
|
// bearing: a real edit to any of them is still a real conflict.
|
|
88
|
-
const VOLATILE_ITEM_FIELDS = ['updatedAt', 'zIndex'];
|
|
94
|
+
const VOLATILE_ITEM_FIELDS = ['updatedAt', 'zIndex', 'editedAt'];
|
|
89
95
|
|
|
90
96
|
const sortedStable = (v) => JSON.stringify(v, (_k, val) =>
|
|
91
97
|
(val && typeof val === 'object' && !Array.isArray(val))
|