Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Sync: the server's write ids are never stamped as a setting an older app changed

Duarte Santosd91ba062cf97
diff --git a/api/sync-stamps.js b/api/sync-stamps.js
index d441d7441..e9b421fd1 100644
--- a/api/sync-stamps.js
+++ b/api/sync-stamps.js
@@ -59,7 +59,7 @@ const capStamps = m => {
return m;
};
const OWN_MERGE = new Set([
- '_ts', '_rev', 'active', 'unit', 'unitSet', 'resetAt', 'resetIds', 'deleted', 'edited', 'undone', 'routineOrder',
+ '_ts', '_rev', '_wid', '_wids', 'active', 'unit', 'unitSet', 'resetAt', 'resetIds', 'deleted', 'edited', 'undone', 'routineOrder',
'workouts', 'routines', 'customEx', 'equipProfiles', 'gymCards', 'bodyweight', 'favEx',
'exWeights', 'balanceOverrides', 'loadKind', 'plates',
]);
@@ -356,7 +356,10 @@ export function stampPut(cur, next, { overRead = false, stamped = false, now = D
const d = mergeDeletions(cur.deleted, next.deleted);
if (d) next.deleted = d; else delete next.deleted;
const e = mergeEdits(cur.edited, next.edited);
- if (e) next.edited = e; else delete next.edited;
+ // The write ids are the server's bookkeeping, never a setting: an older app's push used to get
+ // them stamped as one it changed (QA 2026-10-07), and such a stamp is dropped here.
+ if (e) { delete e._wid; delete e._wids; }
+ if (e && Object.keys(e).length) next.edited = e; else delete next.edited;
if (!stamped) keepUnknown(cur, next);
if (!stamped && overRead) stampUnstamped(cur, next, sent, t);
}
diff --git a/api/test/sync-stamps.test.js b/api/test/sync-stamps.test.js
index 9b59159c4..f78c0e377 100644
--- a/api/test/sync-stamps.test.js
+++ b/api/test/sync-stamps.test.js
@@ -223,3 +223,18 @@ test('an older app that read the latest change still changes it, and one that se
stampPut(cur, replace, { overRead: false, stamped: false, now: NOW });
assert.equal(replace.restSec, 120);
});
+
+// RC review 2026-10-07: an older app sends back the write ids it read, and the server took the
+// difference to the stored ones for a setting it changed: `edited._wid`, `edited._wids`.
+test('an older app\'s push never gets the write ids stamped as settings, and an old such stamp goes', () => {
+ const cur = stored();
+ cur._wid = 'new'; cur._wids = ['a', 'b'];
+ cur.edited = { ...cur.edited, _wid: NOW - 7000 };
+ const old = clone(cur);
+ old._wid = 'older'; old._wids = ['a'];
+ delete old.edited;
+ old.edited = { restSec: NOW - 4000 };
+ stampPut(cur, old, { overRead: true, stamped: false, now: NOW });
+ assert.equal('_wid' in old.edited, false);
+ assert.equal('_wids' in old.edited, false);
+});
diff --git a/frontend/src/lib/sync-merge.js b/frontend/src/lib/sync-merge.js
index f601f8be3..75720ac24 100644
--- a/frontend/src/lib/sync-merge.js
+++ b/frontend/src/lib/sync-merge.js
@@ -600,7 +600,7 @@ function applyDeletions(S, deleted) {
// a rotation pass refilled on the phone survives a setting flipped on the desktop. Fields with a
// merge of their own are not stamped here; a field nobody stamped follows the newer copy, as before.
const OWN_MERGE = new Set([
- '_ts', '_rev', 'active', 'unit', 'unitSet', 'resetAt', 'resetIds', 'deleted', 'edited', 'undone', 'routineOrder',
+ '_ts', '_rev', '_wid', '_wids', 'active', 'unit', 'unitSet', 'resetAt', 'resetIds', 'deleted', 'edited', 'undone', 'routineOrder',
'workouts', 'routines', 'customEx', 'equipProfiles', 'gymCards', 'bodyweight', 'favEx',
'exWeights', 'balanceOverrides', 'loadKind', 'plates',
])
diff --git a/frontend/src/lib/sync-stamps-parity.test.js b/frontend/src/lib/sync-stamps-parity.test.js
index d9aa7e8e6..0df0e4ca8 100644
--- a/frontend/src/lib/sync-stamps-parity.test.js
+++ b/frontend/src/lib/sync-stamps-parity.test.js
@@ -3,7 +3,7 @@
its own changes (an older app, an API planner) must hold in this side's merge. */
import { describe, expect, it } from 'vitest'
import * as S from '../../../api/sync-stamps.js'
-import { highestStamp, mergeDeletions, mergeEdits, mergeStates, stampChange, stampEntry } from './sync-merge.js'
+import { highestStamp, mergeDeletions, mergeEdits, mergeStates, stampChange, stampEntry, stampEdits, stampRestore } from './sync-merge.js'
const clone = v => JSON.parse(JSON.stringify(v))
function rng(seed) { let s = seed >>> 0 || 1; return () => { s ^= s << 13; s >>>= 0; s ^= s >> 17; s ^= s << 5; s >>>= 0; return s / 4294967296 } }
@@ -125,3 +125,13 @@ describe('what the server stamps holds in the merge', () => {
}
})
})
+
+describe('the write ids are no setting', () => {
+ it('neither a change nor a restored backup stamps them', () => {
+ const prev = { _ts: 1, _wid: 'a', _wids: ['x'], restSec: 90 }
+ const next = { ...clone(prev), _wid: 'b', _wids: ['x', 'a'] }
+ expect(stampEdits(prev, next, 5).edited).toBeUndefined()
+ expect(Object.keys(stampRestore({ _wid: 'b', _wids: ['a'], restSec: 60 }, [], 9).edited)).not.toContain('_wid')
+ })
+})
+