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
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix: preserve composition and legacy lock hashes on rejected plans (#11218)
Adam Eivy01bfdd9e37ad
diff --git a/server/services/musicVideo/productionReview.js b/server/services/musicVideo/productionReview.jsindex e4ab89f659..6da65b5724 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, stillFixes, clipFixes } = scene;+ shotMode, performanceSpeaker, performanceStyle, visualLayer, loop } = scene;return hash({ prompt, framePrompt, visualIntent, camera, direction, startSec, endSec, lyricText, referenceImageId, endImageId,- shotMode, performanceSpeaker, performanceStyle, visualLayer, loop, stillFixes, clipFixes,+ shotMode, performanceSpeaker, performanceStyle, visualLayer, loop,row: row ? { action: row.action, staging: row.staging, camera: row.camera, transition: row.transition, lyricCueIds: row.lyricCueIds } : null });}@@ -151,7 +151,11 @@ export function preserveAutomatedShotLocks(before, after, source) {if (!locked.length) return { project: after, rejected: false };const rejected = locked.filter(scene => {const proposed = after.scenes?.find(next => next.sceneId === scene.sceneId);- return !proposed || shotApprovalBasis(before, scene) !== shotApprovalBasis(after, proposed);+ // Repair notes feed generation too, but stay outside the persisted approval+ // hash so existing shot locks keep their cross-version meaning.+ const repairBasis = shot => hash({ stillFixes: shot.stillFixes, clipFixes: shot.clipFixes });+ return !proposed || shotApprovalBasis(before, scene) !== shotApprovalBasis(after, proposed)+ || repairBasis(scene) !== repairBasis(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.@@ -162,7 +166,7 @@ export function preserveAutomatedShotLocks(before, after, source) {if (!rejected.length) return { project: next, rejected: false };// 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.map(scene => {+ next = { ...next, composition: before.composition, scenes: before.scenes.map(scene => {const output = after.scenes?.find(candidate => candidate.sceneId === scene.sceneId);return output ? { ...scene, takes: output.takes, videoHistoryId: output.videoHistoryId } : scene;}), productionReview: { ...next.productionReview,diff --git a/server/services/musicVideo/projects.test.js b/server/services/musicVideo/projects.test.jsindex b2ac385457..fac800199f 100644--- a/server/services/musicVideo/projects.test.js+++ b/server/services/musicVideo/projects.test.js@@ -272,9 +272,14 @@ describe('automation respects persisted shot locks (#11218)', () => {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' });+ const replaced = await projects.mutateProjectRecord(p.id, current => {+ const outcome = replaceScenes(current, [{ startSec: 0, endSec: 2, prompt: 'New span' }]);+ outcome.project.composition = { ...current.composition, mode: 'composed' };+ return outcome;+ }, { source: 'shot-planner' });expect(replaced.project.scenes.map(s => s.sceneId)).toEqual([scene.sceneId]);expect(replaced).toMatchObject({ rejected: true, replaced: 0 });+ expect(replaced.project.composition?.mode).toBe(p.composition?.mode);expect(replaced.scenes).toEqual((await projects.getProject(p.id)).scenes);expect(shotLocks(await projects.getProject(p.id))[scene.sceneId]).toBe('locked');expect(replaced.project.productionReview.feedback).toHaveLength(2);