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

fix(music-video): preserve local song revision recovery during sync

[._.]/ Adam Eivy18e68dd7afb4
diff --git a/server/routes/musicVideoSongRevision.test.js b/server/routes/musicVideoSongRevision.test.js
index 688c9cbb41..49bdecb04c 100644
--- a/server/routes/musicVideoSongRevision.test.js
+++ b/server/routes/musicVideoSongRevision.test.js
@@ -101,7 +101,7 @@ describe('fork song revision through HTTP', () => {
expect((await store.getProject(fork.id)).audioAnalysis).toBeNull();
});
- it('retries downloads without repeating Create and cancels without changing master', async () => {
+ it('retries downloads after a newer peer edit without repeating Create and cancels without changing master', async () => {
const { fork, revisionId } = await fixture();
let fail = true;
let submissions = 0;
@@ -112,9 +112,13 @@ describe('fork song revision through HTTP', () => {
} });
await post(fork.id, 'generate', { revisionId }); await service.__testing.settle();
expect((await store.getProject(fork.id)).songRevision.status).toBe('failed');
+ await store.mergeProjectsFromSync([{ ...stripMusicVideoLocalRenderPins(await store.getProject(fork.id)),
+ name: 'Example peer rename', updatedAt: '2099-01-01T00:00:00Z' }]);
fail = false;
- await post(fork.id, 'generate', { revisionId }); await service.__testing.settle();
+ expect((await post(fork.id, 'generate', { revisionId })).status).toBe(202);
+ await service.__testing.settle();
expect(submissions).toBe(1);
+ expect((await store.getProject(fork.id)).songRevision.candidates).toHaveLength(2);
expect((await post(fork.id, 'cancel', { revisionId })).status).toBe(200);
expect((await store.getProject(fork.id)).uploadedAudioFilename).toBe('original.m4a');
const next = await post(fork.id, '', { ...fields, lyrics: 'Another morning' });
diff --git a/server/services/musicVideo/projectsFile.test.js b/server/services/musicVideo/projectsFile.test.js
index af556e8704..98c27aea67 100644
--- a/server/services/musicVideo/projectsFile.test.js
+++ b/server/services/musicVideo/projectsFile.test.js
@@ -284,6 +284,31 @@ describe('projectsFile federation (#1770)', () => {
expect(writeCounter).toEqual({ project: 0, baseHash: 0 });
});
+ it('keeps paid-song recovery and history across an overlapping peer edit, retry, and tombstone (#12429)', async () => {
+ const p = await file.createProject({ name: 'Example local song' });
+ const songRevision = { id: 'mvsr-local', status: 'generating', submitted: true,
+ songIds: ['example-paid-song-a', 'example-paid-song-b'],
+ candidates: [{ songId: 'example-paid-song-a', filename: 'example-candidate.mp3' }], sequence: 4 };
+ const songRevisionHistory = [{ id: 'mvsr-previous', status: 'selected',
+ selectedSongId: 'example-previous-song', baseline: { audioSource: 'example-original.mp3' } }];
+ const remote = { ...p, name: 'Example peer edit', updatedAt: '2099-01-01T00:00:00Z',
+ songRevision: { id: 'mvsr-foreign', songIds: ['foreign-song'] }, songRevisionHistory: [] };
+ // The checkpoint and sync share the store queue: sync must merge against
+ // the checkpoint that just completed, not the older peer pre-image.
+ const checkpoint = file.mutateProjectRecord(p.id, (current) => ({ project: { ...current, songRevision, songRevisionHistory } }));
+ const sync = file.mergeProjectsFromSync([remote]);
+ await checkpoint;
+ expect(await sync).toEqual({ applied: true, count: 1 });
+ expect(await file.getProject(p.id)).toMatchObject({ name: remote.name, songRevision, songRevisionHistory });
+ writeCounter.project = 0;
+ expect(await file.mergeProjectsFromSync([remote])).toEqual({ applied: false, count: 0 });
+ expect(writeCounter.project).toBe(0);
+ const tombstone = { ...remote, deleted: true, deletedAt: '2099-01-02T00:00:00Z', updatedAt: '2099-01-02T00:00:00Z' };
+ await file.mergeProjectsFromSync([tombstone]);
+ expect(await file.getProject(p.id)).toBeNull();
+ expect(await file.getProject(p.id, { includeDeleted: true })).toMatchObject({ deleted: true, songRevision, songRevisionHistory });
+ });
+
it('mergeProjectsFromSync applies a remote tombstone (delete federates)', async () => {
const p = await file.createProject({ name: 'Doomed' });
const tombstone = { ...p, deleted: true, deletedAt: '2099-01-01T00:00:00Z', updatedAt: '2099-01-01T00:00:00Z' };
diff --git a/server/services/musicVideo/projectsLogic.js b/server/services/musicVideo/projectsLogic.js
index e4f02978f0..6b1584b3bf 100644
--- a/server/services/musicVideo/projectsLogic.js
+++ b/server/services/musicVideo/projectsLogic.js
@@ -1032,6 +1032,10 @@ export function mergeProjectRecord(local, remoteRaw) {
if (Object.hasOwn(local, 'castAndSets')) remote.castAndSets = local.castAndSets;
if (Object.hasOwn(local, 'autonomousRun')) remote.autonomousRun = local.autonomousRun;
if (Object.hasOwn(local, 'renderError')) remote.renderError = local.renderError;
+ // Song revisions hold this install's paid-generation recovery checkpoint,
+ // candidate files and provenance; an unrelated peer edit must not erase them.
+ if (Object.hasOwn(local, 'songRevision')) remote.songRevision = local.songRevision;
+ if (Object.hasOwn(local, 'songRevisionHistory')) remote.songRevisionHistory = local.songRevisionHistory;
// The composition document's files live only on this install as well
// (compositionDocument.js), so its pointer survives a newer remote body.
if (local.composition?.document || local.composition?.documentDraft) {
diff --git a/server/services/musicVideo/projectsLogic.test.js b/server/services/musicVideo/projectsLogic.test.js
index a94bf5d382..7c8d218483 100644
--- a/server/services/musicVideo/projectsLogic.test.js
+++ b/server/services/musicVideo/projectsLogic.test.js
@@ -868,6 +868,21 @@ describe('mergeProjectRecord (#1770 LWW)', () => {
expect(r.next.name).toBe('new');
});
+ it('never imports a peer song revision and preserves explicit local clears (#12429)', async () => {
+ const { sanitizeRecordForWire } = await import('../../lib/syncWire.js');
+ const foreign = { id: 'mv-peer', updatedAt: '2026-01-05T00:00:00Z', name: 'Peer edit',
+ songRevision: { id: 'mvsr-peer', submitted: true, songIds: ['peer-song'] },
+ songRevisionHistory: [{ id: 'mvsr-peer-history' }] };
+ for (const projected of [sanitizeRecordForWire('musicVideoProject', foreign),
+ mergeProjectRecord(null, foreign).next,
+ mergeProjectRecord({ id: foreign.id, updatedAt: '2026-01-01T00:00:00Z' }, foreign).next]) {
+ expect(projected).not.toHaveProperty('songRevision');
+ expect(projected).not.toHaveProperty('songRevisionHistory');
+ }
+ const cleared = { id: foreign.id, updatedAt: '2026-01-01T00:00:00Z', songRevision: null, songRevisionHistory: [] };
+ expect(mergeProjectRecord(cleared, foreign).next).toMatchObject({ name: 'Peer edit', songRevision: null, songRevisionHistory: [] });
+ });
+
it('preserves local render pins when a newer remote edit wins (#3245)', () => {
const local = {
id: 'mv-1',