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: preserve locked storyboard inputs during automation (#11218)

Adam Eivy4eff367b6ad3
diff --git a/server/services/musicVideo/autoReviewService.js b/server/services/musicVideo/autoReviewService.js
index 7e5ab94de5..df00b3e72b 100644
--- a/server/services/musicVideo/autoReviewService.js
+++ b/server/services/musicVideo/autoReviewService.js
@@ -37,7 +37,8 @@ import { execFile } from '../../lib/childProcess.js';
import { safeChildProcessOptions } from '../../lib/processEnv.js';
import { findFfmpeg, findFfprobe, probeVideoStreamInfo, safeUnder } from '../../lib/ffmpeg.js';
import { isVisionCapableCliProvider } from '../../lib/localModelHeuristics.js';
-import { getProject, mutateProjectRecord } from './projects.js';
+import { getProject, mutateProjectRecord as mutateRecord } from './projects.js';
+const mutateProjectRecord = (id, transform) => mutateRecord(id, transform, { source: 'auto-review' });
import { musicVideoEvents } from './events.js';
import { startExcerptRender } from './excerptRender.js';
import { cancelRevision, getDependencyImpact, resumeRevision } from './revisionService.js';
diff --git a/server/services/musicVideo/autonomousService.js b/server/services/musicVideo/autonomousService.js
index af914d3a48..65d7f04466 100644
--- a/server/services/musicVideo/autonomousService.js
+++ b/server/services/musicVideo/autonomousService.js
@@ -92,7 +92,8 @@ import {
sunoSongFields,
} from '../../lib/musicVideoAutonomous.js';
import { withBackupAssetPublication } from '../../lib/backupSnapshotBoundary.js';
-import { getProject, mutateProjectRecord } from './projects.js';
+import { getProject, mutateProjectRecord as mutateRecord } from './projects.js';
+const mutateProjectRecord = (id, transform) => mutateRecord(id, transform, { source: 'orchestrator' });
import { musicVideoEvents } from './events.js';
import { musicVideoDependencyChanges } from '../../lib/musicVideoDependencies.js';
import { isPerformanceScene, performanceCapability } from '../../lib/musicVideoShotTiming.js';
diff --git a/server/services/musicVideo/planner.js b/server/services/musicVideo/planner.js
index 88094f5209..fa26c5813d 100644
--- a/server/services/musicVideo/planner.js
+++ b/server/services/musicVideo/planner.js
@@ -509,7 +509,8 @@ export async function proposeShotRevisions(project, feedback, { providerId, mode
}
async function persistPlan(id, sceneInputs, { hasCards, replace }) {
- if (!hasCards && !replace) return addProjectScenes(id, sceneInputs);
+ if (!hasCards && !replace) return addProjectScenes(id, sceneInputs, { source: 'shot-planner' });
+
const { addScenes, replaceScenes } = await import('./projectsLogic.js');
const { normalizeComposition } = await import('./composition.js');
return mutateProjectRecord(id, (current) => {
@@ -519,5 +520,5 @@ async function persistPlan(id, sceneInputs, { hasCards, replace }) {
outcome.project.composition = normalizeComposition({ ...current.composition, mode: 'composed' });
}
return outcome;
- });
+ }, { source: 'shot-planner' });
}
diff --git a/server/services/musicVideo/productionReview.js b/server/services/musicVideo/productionReview.js
index 072befc0a7..5ed5745458 100644
--- a/server/services/musicVideo/productionReview.js
+++ b/server/services/musicVideo/productionReview.js
@@ -120,9 +120,9 @@ export function seedArtDraft(project, stage = project.castAndSets) {
function shotApprovalBasis(project, scene) {
const row = (project.productionReview?.draft?.storyboard || []).find(shot => shot?.sceneId === scene.sceneId);
const { prompt, framePrompt, visualIntent, camera, direction, startSec, endSec, lyricText, referenceImageId, endImageId,
- shotMode, performanceSpeaker, performanceStyle, visualLayer, loop } = scene;
+ shotMode, performanceSpeaker, performanceStyle, visualLayer, loop, stillFixes, clipFixes } = scene;
return hash({ prompt, framePrompt, visualIntent, camera, direction, startSec, endSec, lyricText, referenceImageId, endImageId,
- shotMode, performanceSpeaker, performanceStyle, visualLayer, loop,
+ shotMode, performanceSpeaker, performanceStyle, visualLayer, loop, stillFixes, clipFixes,
row: row ? { action: row.action, staging: row.staging, camera: row.camera, transition: row.transition, lyricCueIds: row.lyricCueIds } : null });
}
@@ -144,6 +144,36 @@ export function shotLocks(project) {
}));
}
+/** Apply an automation proposal under the store lock; locked render inputs stay intact. */
+export function preserveAutomatedShotLocks(before, after, source) {
+ const locks = shotLocks(before) || {};
+ const locked = (before.scenes || []).filter(scene => locks[scene.sceneId] === 'locked');
+ if (!locked.length) return after;
+ const rejected = locked.filter(scene => {
+ const proposed = after.scenes?.find(next => next.sceneId === scene.sceneId);
+ return !proposed || shotApprovalBasis(before, scene) !== shotApprovalBasis(after, proposed);
+ });
+ // Materialize legacy whole-board locks before an open shot's edit can stale
+ // that approval. No new approval is granted: these shots were already locked.
+ const shotApprovals = { ...after.productionReview?.shotApprovals };
+ for (const scene of locked) shotApprovals[scene.sceneId] = before.productionReview?.shotApprovals?.[scene.sceneId]
+ || { ...before.productionReview?.approvals?.storyboard, basis: shotApprovalBasis(before, scene), fromBoardApproval: true };
+ let next = { ...after, productionReview: { ...after.productionReview, shotApprovals } };
+ if (!rejected.length) return next;
+ // A merge/re-plan may replace IDs or spans. Refuse the whole board mutation
+ // rather than splice an old locked shot into an overlapping new timeline.
+ next = { ...next, scenes: before.scenes, productionReview: { ...next.productionReview,
+ draft: before.productionReview?.draft } };
+ for (const scene of rejected) {
+ const proposed = after.scenes?.find(next => next.sceneId === scene.sceneId);
+ next = recordProductionFeedback(next, { stage: 'storyboard', basis: productionReviewBasis(next).storyboard,
+ target: scene.sceneId, decision: 'comment',
+ text: `${source} proposed changing locked shot ${scene.sceneId}; unlock it before applying this proposal. ${JSON.stringify({ scene: proposed || null,
+ storyboard: after.productionReview?.draft?.storyboard?.find(row => row.sceneId === scene.sceneId) || null }).slice(0, 6000)}` });
+ }
+ return next;
+}
+
/** Lock or unlock Board shots for the director. A lock binds to the shot as it is now. */
export function setShotLocks(project, { sceneIds, locked, reviewer = null, approvedBy = null }) {
if (project.productionReview?.draft?.storyboardSource === 'document') {
diff --git a/server/services/musicVideo/productionReviewService.js b/server/services/musicVideo/productionReviewService.js
index 00bdf87da9..92e3709ab4 100644
--- a/server/services/musicVideo/productionReviewService.js
+++ b/server/services/musicVideo/productionReviewService.js
@@ -344,7 +344,7 @@ export async function reviseProductionFromFeedback(id, { stage, ...route }) {
});
return { project: { ...current, scenes, updatedAt: new Date().toISOString(),
...(storyboard ? { productionReview: { ...current.productionReview, draft: { ...draft, storyboard } } } : {}) } };
- });
+ }, { source: 'storyboard-revision' });
return { ...changed(next), revision: { stage, sceneIds: [...updates.keys()] } };
}
const mode = project.composition?.mode;
diff --git a/server/services/musicVideo/productionService.js b/server/services/musicVideo/productionService.js
index db9edd73ca..a84151a426 100644
--- a/server/services/musicVideo/productionService.js
+++ b/server/services/musicVideo/productionService.js
@@ -28,7 +28,8 @@ import { ensureSceneTakes, selectSceneTake } from './takes.js';
import { randomUUID } from 'crypto';
import { ServerError } from '../../lib/errorHandler.js';
-import { getProject, mutateProjectRecord } from './projects.js';
+import { getProject, mutateProjectRecord as mutateRecord } from './projects.js';
+const mutateProjectRecord = (id, transform) => mutateRecord(id, transform, { source: 'production-run' });
import { musicVideoEvents } from './events.js';
import { isFreeProvider } from '../../lib/modelPricing.js';
import { isAuthoringOneShotProvider } from '../../lib/providerVendors.js';
diff --git a/server/services/musicVideo/projects.js b/server/services/musicVideo/projects.js
index 84c020b054..74e4f66c69 100644
--- a/server/services/musicVideo/projects.js
+++ b/server/services/musicVideo/projects.js
@@ -239,7 +239,11 @@ export async function addProjectScene(id, sceneInput) {
* caller composing a response never has to re-fetch or risk overwriting a
* concurrent edit with stale state.
*/
-export async function addProjectScenes(id, sceneInputs) {
+export async function addProjectScenes(id, sceneInputs, { source = null } = {}) {
+ if (source) {
+ const { addScenes } = await import('./projectsLogic.js');
+ return mutateProjectRecord(id, current => addScenes(current, sceneInputs), { source });
+ }
const { project, scenes } = await (await selectBackend()).addProjectScenes(id, sceneInputs);
emitRecordUpdated('musicVideoProject', id);
return { project, scenes };
@@ -327,9 +331,11 @@ export async function reviewSceneTake(id, sceneId, takeId, review) {
* resolves to that outcome with the persisted project. Used by the treatment
* service (#8980) so its revision checks run against the freshest record.
*/
-export async function mutateProjectRecord(id, transform) {
+export async function mutateProjectRecord(id, transform, { source = null } = {}) {
+ const { preserveAutomatedShotLocks } = source ? await import('./productionReview.js') : {};
const outcome = await (await selectBackend()).mutateProjectRecord(id, (current) => {
const outcome = transform(current);
+ if (source) outcome.project = preserveAutomatedShotLocks(current, outcome.project, source);
return { ...outcome, project: retainMusicVideoDependencies(current, outcome.project) };
});
emitRecordUpdated('musicVideoProject', id);
diff --git a/server/services/musicVideo/projects.test.js b/server/services/musicVideo/projects.test.js
index 20774b2fad..714466847f 100644
--- a/server/services/musicVideo/projects.test.js
+++ b/server/services/musicVideo/projects.test.js
@@ -238,3 +238,55 @@ describe('refreshSongStyleFromSuno', () => {
expect(updateTrack).toHaveBeenCalledWith('track-1', { prompt: 'synth-pop, -metal' });
});
});
+
+
+describe('automation respects persisted shot locks (#11218)', () => {
+ it('records run edits, cuts and merges as proposals, allows open edits and director edits', async () => {
+ const { applySceneUpdate, removeScene, mergeNextScene } = await import('./projectsLogic.js');
+ const { setShotLocks, shotLocks } = await import('./productionReview.js');
+ const p = await projects.createProject({ name: 'Locks' });
+ const a = await projects.addProjectScene(p.id, { startSec: 0, endSec: 2, prompt: 'Keep this' });
+ const b = await projects.addProjectScene(p.id, { startSec: 2, endSec: 4, prompt: 'Open shot' });
+ await projects.mutateProjectRecord(p.id, current => ({ project: setShotLocks(current, { sceneIds: [a.sceneId], locked: true }) }));
+ const attempt = await projects.mutateProjectRecord(p.id, current => applySceneUpdate(current, a.sceneId, { prompt: 'Automation edit' }), { source: 'orchestrator' });
+ expect(attempt.project.scenes[0].prompt).toBe('Keep this');
+ expect(attempt.project.productionReview.feedback.at(-1)).toMatchObject({ target: a.sceneId, decision: 'comment', text: expect.stringContaining('Automation edit') });
+ for (const transform of [current => ({ project: removeScene(current, a.sceneId) }), current => mergeNextScene(current, a.sceneId)]) {
+ const out = await projects.mutateProjectRecord(p.id, transform, { source: 'production-run' });
+ expect(out.project.scenes.map(s => s.sceneId)).toEqual([a.sceneId, b.sceneId]);
+ expect(shotLocks(out.project)[a.sceneId]).toBe('locked');
+ }
+ await projects.mutateProjectRecord(p.id, current => applySceneUpdate(current, b.sceneId, { prompt: 'Allowed run edit' }), { source: 'orchestrator' });
+ expect((await projects.getProject(p.id)).scenes[1].prompt).toBe('Allowed run edit');
+ await projects.updateScene(p.id, a.sceneId, { prompt: 'Director edit' });
+ expect(shotLocks(await projects.getProject(p.id))).toEqual({ [a.sceneId]: 'changed', [b.sceneId]: 'open' });
+ });
+
+ it('keeps locked storyboard rows and the original board when a planner replaces its IDs', async () => {
+ const { setShotLocks, shotLocks } = await import('./productionReview.js');
+ const { replaceScenes } = await import('./projectsLogic.js');
+ const p = await projects.createProject({ name: 'Locked plan' });
+ const scene = await projects.addProjectScene(p.id, { startSec: 0, endSec: 4, prompt: 'Original' });
+ await projects.mutateProjectRecord(p.id, current => ({ project: setShotLocks({ ...current,
+ productionReview: { draft: { storyboard: [{ sceneId: scene.sceneId, action: 'Stay' }] } } }, { sceneIds: [scene.sceneId], locked: true }) }));
+ const revised = await projects.mutateProjectRecord(p.id, current => ({ project: { ...current,
+ productionReview: { ...current.productionReview, draft: { storyboard: [{ sceneId: scene.sceneId, action: 'Move' }] } } } }), { source: 'orchestrator' });
+ expect(revised.project.productionReview.draft.storyboard[0].action).toBe('Stay');
+ const replaced = await projects.mutateProjectRecord(p.id, current => replaceScenes(current, [{ startSec: 0, endSec: 2, prompt: 'New span' }]), { source: 'shot-planner' });
+ expect(replaced.project.scenes.map(s => s.sceneId)).toEqual([scene.sceneId]);
+ expect(shotLocks(await projects.getProject(p.id))[scene.sceneId]).toBe('locked');
+ expect(replaced.project.productionReview.feedback).toHaveLength(2);
+ });
+
+ it('checks fresh locks when an asynchronous repair lands and preserves generated clip output', async () => {
+ const { setShotLocks, shotLocks } = await import('./productionReview.js');
+ const p = await projects.createProject({ name: 'Repair race' });
+ const scene = await projects.addProjectScene(p.id, { startSec: 0, endSec: 2, prompt: 'Approved input' });
+ await projects.mutateProjectRecord(p.id, current => ({ project: setShotLocks(current, { sceneIds: [scene.sceneId], locked: true }) }));
+ const repair = await projects.mutateProjectRecord(p.id, current => ({ project: { ...current, scenes: current.scenes.map(s => ({ ...s, clipFixes: { text: 'New motion' } })) } }), { source: 'orchestrator' });
+ expect(repair.project.scenes[0].clipFixes).toBeUndefined();
+ const clip = await projects.mutateProjectRecord(p.id, current => ({ project: { ...current, scenes: current.scenes.map(s => ({ ...s, videoHistoryId: 'new-clip' })) } }), { source: 'production-run' });
+ expect(clip.project.scenes[0].videoHistoryId).toBe('new-clip');
+ expect(shotLocks(clip.project)[scene.sceneId]).toBe('locked');
+ });
+});