Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

test: pin tombstone-only sync merges report a change and persist (#11879)

Adam Eivyd560ed9943c9
diff --git a/server/lib/tombstones.test.js b/server/lib/tombstones.test.js
index c0913019ee..e6aff7439c 100644
--- a/server/lib/tombstones.test.js
+++ b/server/lib/tombstones.test.js
@@ -126,12 +126,38 @@ describe('mergeTombstones', () => {
});
it('keeps the newest deletion on a key collision', () => {
- const { merged } = mergeTombstones(
+ const { merged, changed } = mergeTombstones(
[tomb('a.md', '2026-01-01T00:00:00.000Z')],
[tomb('a.md', '2026-05-01T00:00:00.000Z')],
OPTS
);
expect(merged).toEqual([tomb('a.md', '2026-05-01T00:00:00.000Z')]);
+ expect(changed).toBe(true);
+ });
+
+ it('reports a change when the remote brings only a new tombstone for a key local never held', () => {
+ const { merged, changed } = mergeTombstones([], [tomb('gone.md', '2026-04-01T00:00:00.000Z')], OPTS);
+ expect(merged).toEqual([tomb('gone.md', '2026-04-01T00:00:00.000Z')]);
+ expect(changed).toBe(true);
+ });
+
+ it('reports a change when only the deletion stamp advances (same key and count)', () => {
+ const { changed } = mergeTombstones(
+ [tomb('a.md', '2026-01-01T00:00:00.000Z')],
+ [tomb('a.md', '2026-02-01T00:00:00.000Z')],
+ OPTS
+ );
+ expect(changed).toBe(true);
+ });
+
+ it('keeps the local deletion when the remote one is older', () => {
+ const { merged, changed } = mergeTombstones(
+ [tomb('a.md', '2026-05-01T00:00:00.000Z')],
+ [tomb('a.md', '2026-01-01T00:00:00.000Z')],
+ OPTS
+ );
+ expect(merged).toEqual([tomb('a.md', '2026-05-01T00:00:00.000Z')]);
+ expect(changed).toBe(false);
});
it('reports no change when the remote adds nothing (older peer sends no key)', () => {
@@ -167,8 +193,8 @@ describe('pruneTombstones', () => {
it('uses the newest matching record when several share a key', () => {
const records = [
- { filename: 'a.md', createdAt: '2026-01-01T00:00:00.000Z' },
{ filename: 'a.md', createdAt: '2026-06-01T00:00:00.000Z' },
+ { filename: 'a.md', createdAt: '2026-01-01T00:00:00.000Z' },
];
expect(pruneTombstones(list, records, OPTS)).toEqual([]);
});
diff --git a/server/services/digital-twin-sync.test.js b/server/services/digital-twin-sync.test.js
index a2bf583061..cd5c8d7c2a 100644
--- a/server/services/digital-twin-sync.test.js
+++ b/server/services/digital-twin-sync.test.js
@@ -486,6 +486,14 @@ describe('mergeAutobiographyStories', () => {
expect(mergeAutobiographyStories(local, { stories: [{ id: 's1', createdAt: '2026-01-01' }], usedPrompts: ['a'] }).changed).toBe(false);
});
+ it('reports a change when the peer brings only a tombstone for a story we never held', () => {
+ const local = { stories: [{ id: 's1', createdAt: '2026-01-01' }], usedPrompts: [] };
+ const remote = { stories: [{ id: 's1', createdAt: '2026-01-01' }], usedPrompts: [], deletedStories: [{ id: 'gone', deletedAt: '2026-03-01T00:00:00.000Z' }] };
+ const { merged, changed } = mergeAutobiographyStories(local, remote);
+ expect(changed).toBe(true);
+ expect(merged.deletedStories).toEqual([{ id: 'gone', deletedAt: '2026-03-01T00:00:00.000Z' }]);
+ });
+
it('sorts merged stories by id (stable on-disk order for checksum convergence)', () => {
const local = { stories: [{ id: 's3', createdAt: '2026-01-03' }], usedPrompts: ['z'] };
const remote = { stories: [{ id: 's1', createdAt: '2026-01-01' }, { id: 's2', createdAt: '2026-01-02' }], usedPrompts: ['a'] };
@@ -569,6 +577,14 @@ describe('mergeSocialAccounts', () => {
expect(changed).toBe(true);
});
+ it('reports a change when the peer brings only a tombstone for an account we never held', () => {
+ const local = { accounts: { a1: { platform: 'github', updatedAt: '2026-01-01' } } };
+ const remote = { accounts: { a1: { platform: 'github', updatedAt: '2026-01-01' } }, deletedAccounts: [{ id: 'gone', deletedAt: '2026-03-01T00:00:00.000Z' }] };
+ const { merged, changed } = mergeSocialAccounts(local, remote);
+ expect(changed).toBe(true);
+ expect(merged.deletedAccounts).toEqual([{ id: 'gone', deletedAt: '2026-03-01T00:00:00.000Z' }]);
+ });
+
it('LWW on a shared account by updatedAt', () => {
const local = { accounts: { a1: { username: 'old', updatedAt: '2026-01-01' } } };
const remote = { accounts: { a1: { username: 'new', updatedAt: '2026-02-01' } } };
diff --git a/server/services/goalDeletionSync.test.js b/server/services/goalDeletionSync.test.js
index 13e4304540..6b392cee13 100644
--- a/server/services/goalDeletionSync.test.js
+++ b/server/services/goalDeletionSync.test.js
@@ -90,6 +90,18 @@ describe('goal deletion across snapshot-federated peers (#9816)', () => {
expect(await read()).toEqual(backOnA);
});
+ it('persists a tombstone for a goal this peer never held (tombstone-only delta)', async () => {
+ const remote = { ...shared(), goalTombstones: [{ id: 'goal-never-held', deletedAt: DELETED_AT }] };
+ const before = shared();
+
+ const after = await pull(before, remote);
+ expect(after.goalTombstones).toEqual([{ id: 'goal-never-held', deletedAt: DELETED_AT }]);
+ expect(ids(after)).toEqual(ids(before));
+
+ // Replaying the same delta is a no-op: nothing further to write.
+ expect(await dataSync.applyRemote('goals', remote)).toEqual({ applied: false, count: 0 });
+ });
+
it('rejects a stale goal from an older peer that omits tombstones, and keeps the tombstone', async () => {
const peerA = await deleteOnPeer(shared(), 'goal-example');
const legacyPayload = { goals: shared().goals, updatedAt: '2026-01-01T00:00:00.000Z' };
diff --git a/server/services/peerUsage.test.js b/server/services/peerUsage.test.js
index 001d0a291c..3331ceab3e 100644
--- a/server/services/peerUsage.test.js
+++ b/server/services/peerUsage.test.js
@@ -362,6 +362,16 @@ describe('retiring an instance', () => {
expect((await readStoreFile()).instances['inst-peer']).toBeUndefined();
});
+ it('persists a tombstone for an instance this machine never held, and a newer re-delete', async () => {
+ const first = { instanceId: 'inst-gone', deletedAt: '2026-08-30T00:00:00.000Z' };
+ expect(await applyUsageRemote({ instances: {}, tombstones: [first] })).toEqual({ applied: false, count: 0 });
+ expect((await readStoreFile()).tombstones).toEqual([first]);
+
+ const newer = { instanceId: 'inst-gone', deletedAt: '2026-08-31T00:00:00.000Z' };
+ await applyUsageRemote({ instances: {}, tombstones: [newer] });
+ expect((await readStoreFile()).tombstones).toEqual([newer]);
+ });
+
it('lets a machine that comes back supersede its own tombstone', async () => {
await applyUsageRemote({ instances: { 'inst-peer': peerEntry() } });
await forgetInstanceUsage('inst-peer');