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: refuse a scene merge whose next scene ends before the first (#10810)

Adam Eivy5b27c2f2a16d
diff --git a/server/services/musicVideo/projectsLogic.js b/server/services/musicVideo/projectsLogic.js
index bd5629b7e3..b9b446d7bb 100644
--- a/server/services/musicVideo/projectsLogic.js
+++ b/server/services/musicVideo/projectsLogic.js
@@ -785,6 +785,9 @@ export function mergeNextScene(project, sceneId, { backend = null } = {}) {
const lane = backend || project.videoSettings?.backend || null;
const startSec = scene.startSec;
const endSec = timedSec(following.endSec) ? following.endSec : scene.endSec;
+ if (timedSec(startSec) && timedSec(endSec) && (endSec <= startSec || (timedSec(scene.endSec) && endSec < scene.endSec))) {
+ throw new ServerError('The next scene ends before this one does — put the scenes in song order before merging them.', { status: 400, code: 'MUSIC_VIDEO_MERGE_OUT_OF_ORDER' });
+ }
const maxSec = shotSplitLimit(scene, lane);
if (maxSec != null) {
if (!timedSec(startSec) || !timedSec(endSec)) {
diff --git a/server/services/musicVideo/projectsLogic.test.js b/server/services/musicVideo/projectsLogic.test.js
index 3a8523f3c3..314178e483 100644
--- a/server/services/musicVideo/projectsLogic.test.js
+++ b/server/services/musicVideo/projectsLogic.test.js
@@ -644,6 +644,8 @@ describe('mergeNextScene', () => {
const long = applySceneUpdate(project, ids[2], { endSec: 20 }).project; // 4–20s > 10s
expect(() => mergeNextScene(long, ids[1], { backend: 'grok' })).toThrow(/longer than this backend/);
expect(() => mergeNextScene(project, ids[2])).toThrow(/no next scene/);
+ const swapped = applySceneUpdate(project, ids[1], { startSec: 0, endSec: 2 }).project;
+ expect(() => mergeNextScene(swapped, ids[0])).toThrow(/song order/);
expect(() => mergeNextScene({ ...project, composition: { mode: 'document' } }, ids[0])).toThrow(/shot manifest/);
});
});