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

Put the camera move beside the clip's motion prompt and show what it adds (#11352)

[._.]/47888d6c152b
diff --git a/client/src/components/musicVideo/SceneCameraControls.jsx b/client/src/components/musicVideo/SceneCameraControls.jsx
index ac10856ce7..4d46187e07 100644
--- a/client/src/components/musicVideo/SceneCameraControls.jsx
+++ b/client/src/components/musicVideo/SceneCameraControls.jsx
@@ -8,9 +8,10 @@ const BY_FAMILY = CAMERA_FAMILIES.map((family) => [family, CAMERA_MOVEMENTS.filt
* A shot's planned camera move (#10589): one of the shared catalog moves, its
* speed, whether it lands on the downbeat, and why a still camera holds. The
* i2v prompt carries it as the four-part camera block and a composed still
- * plays it through the layered camera rig.
+ * plays it through the layered camera rig. `adds` is the exact text the move
+ * adds to the clip's prompt, shown under the picker so nothing joins it unseen.
*/
-export default function SceneCameraControls({ scene, fieldId, onEditLocal, onSave }) {
+export default function SceneCameraControls({ scene, fieldId, onEditLocal, onSave, adds = null }) {
const camera = scene.camera && getCameraMovement(scene.camera.move) ? scene.camera : null;
const move = camera ? getCameraMovement(camera.move) : null;
const save = (next) => {
@@ -19,42 +20,45 @@ export default function SceneCameraControls({ scene, fieldId, onEditLocal, onSav
onSave(scene.sceneId, { camera: value });
};
return (
- <div className="flex flex-wrap gap-2 items-center text-xs">
- <label htmlFor={fieldId('camera')}>Camera</label>
- <select id={fieldId('camera')} value={camera?.move || ''} className={FIELD}
- title="The planned camera move. Video prompts describe it as movement, speed, framing and end; composed stills play it."
- onChange={(e) => save(e.target.value ? { ...camera, move: e.target.value, ...(getCameraMovement(e.target.value).still ? {} : { reason: undefined }) } : null)}>
- <option value="">None</option>
- {BY_FAMILY.map(([family, moves]) => (
- <optgroup key={family} label={family}>
- {moves.map((m) => <option key={m.value} value={m.value}>{m.label}</option>)}
- </optgroup>
- ))}
- </select>
- {move && (
- <>
- <label htmlFor={fieldId('camera-speed')}>Speed</label>
- <select id={fieldId('camera-speed')} value={camera.speed || ''} className={FIELD}
- onChange={(e) => save({ ...camera, speed: e.target.value || undefined })}>
- <option value="">Default ({move.speed})</option>
- {CAMERA_SPEEDS.map((speed) => <option key={speed} value={speed}>{speed}</option>)}
- </select>
- <label className="flex items-center gap-1">
- <input type="checkbox" checked={camera.onBeat === true} onChange={(e) => save({ ...camera, onBeat: e.target.checked })} />
- On beat
- </label>
- {move.still && (
- <>
- <label htmlFor={fieldId('camera-reason')}>Why it holds</label>
- <input id={fieldId('camera-reason')} type="text" maxLength={300} value={camera.reason || ''}
- placeholder="The reason for a static camera"
- onChange={(e) => onEditLocal(scene.sceneId, { camera: { ...camera, reason: e.target.value } })}
- onBlur={(e) => save({ ...camera, reason: e.target.value.trim() || undefined })}
- className={`min-w-0 flex-1 basis-40 ${FIELD}`} />
- </>
- )}
- </>
- )}
+ <div className="space-y-1">
+ <div className="flex flex-wrap gap-2 items-center text-xs">
+ <label htmlFor={fieldId('camera')}>Camera</label>
+ <select id={fieldId('camera')} value={camera?.move || ''} className={FIELD}
+ title="The planned camera move. Video prompts describe it as movement, speed, framing and end; composed stills play it."
+ onChange={(e) => save(e.target.value ? { ...camera, move: e.target.value, ...(getCameraMovement(e.target.value).still ? {} : { reason: undefined }) } : null)}>
+ <option value="">None</option>
+ {BY_FAMILY.map(([family, moves]) => (
+ <optgroup key={family} label={family}>
+ {moves.map((m) => <option key={m.value} value={m.value}>{m.label}</option>)}
+ </optgroup>
+ ))}
+ </select>
+ {move && (
+ <>
+ <label htmlFor={fieldId('camera-speed')}>Speed</label>
+ <select id={fieldId('camera-speed')} value={camera.speed || ''} className={FIELD}
+ onChange={(e) => save({ ...camera, speed: e.target.value || undefined })}>
+ <option value="">Default ({move.speed})</option>
+ {CAMERA_SPEEDS.map((speed) => <option key={speed} value={speed}>{speed}</option>)}
+ </select>
+ <label className="flex items-center gap-1">
+ <input type="checkbox" checked={camera.onBeat === true} onChange={(e) => save({ ...camera, onBeat: e.target.checked })} />
+ On beat
+ </label>
+ {move.still && (
+ <>
+ <label htmlFor={fieldId('camera-reason')}>Why it holds</label>
+ <input id={fieldId('camera-reason')} type="text" maxLength={300} value={camera.reason || ''}
+ placeholder="The reason for a static camera"
+ onChange={(e) => onEditLocal(scene.sceneId, { camera: { ...camera, reason: e.target.value } })}
+ onBlur={(e) => save({ ...camera, reason: e.target.value.trim() || undefined })}
+ className={`min-w-0 flex-1 basis-40 ${FIELD}`} />
+ </>
+ )}
+ </>
+ )}
+ </div>
+ {adds && <p className="whitespace-pre-wrap break-words text-[11px] text-port-text-muted" data-testid="camera-adds">Adds to the prompt: {adds}</p>}
</div>
);
}
diff --git a/client/src/components/musicVideo/SceneCard.jsx b/client/src/components/musicVideo/SceneCard.jsx
index 803b7ecdc9..7cbbc553fe 100644
--- a/client/src/components/musicVideo/SceneCard.jsx
+++ b/client/src/components/musicVideo/SceneCard.jsx
@@ -222,7 +222,7 @@ export default function SceneCard({
typeof scene.startSec === 'number' && typeof scene.endSec === 'number' ? `${scene.startSec.toFixed(2)}–${scene.endSec.toFixed(2)}s` : null,
scene.beatAligned ? 'beat-aligned' : null,
layer === 'footage' && loops && !performance ? 'loops' : null,
- scene.camera?.move ? `camera ${scene.camera.move}` : null,
+ layer !== 'footage' && scene.camera?.move ? `camera ${scene.camera.move}` : null,
].filter(Boolean).join(' · ');
const promptField = (
<textarea
@@ -241,7 +241,7 @@ export default function SceneCard({
span={sceneHasAuthoredSpan(scene) ? { startSec: scene.startSec, endSec: scene.endSec } : null} />
{/* A VHS glitch riding on the cut into or out of this shot; never moves the cut. */}
<SceneTransitions fieldId={fieldId} scene={scene} onChange={applyPatch} />
- {/* Everything set once and rarely revisited: timing, shot mode, layer, camera. */}
+ {/* Everything set once and rarely revisited: timing, shot mode, layer, and a non-footage shot's camera. */}
<details className="group/settings rounded border border-port-border">
<summary className="flex min-h-[44px] cursor-pointer items-center gap-2 px-2 text-xs marker:content-none sm:min-h-[32px] [&::-webkit-details-marker]:hidden">
<ChevronRight size={12} aria-hidden="true" className="shrink-0 transition-transform group-open/settings:rotate-90" />
@@ -340,7 +340,7 @@ export default function SceneCard({
{LAYER_LABELS[layer]} sections render in composed or document mode — a plain render plays this scene&apos;s footage.
</p>
)}
- {layer !== 'card' && <SceneCameraControls scene={scene} fieldId={fieldId} onEditLocal={onEditLocal} onSave={onSave} />}
+ {layer !== 'card' && layer !== 'footage' && <SceneCameraControls scene={scene} fieldId={fieldId} onEditLocal={onEditLocal} onSave={onSave} />}
</div>
</details>
{/* A music-driven shot follows the whole mix, not one voice; a lip-sync needs its singer before it renders. */}
@@ -531,6 +531,11 @@ export default function SceneCard({
<div className="flex aspect-video w-full items-center justify-center rounded border border-dashed border-port-border text-xs text-port-text-muted">No clip yet</div>
)}
{layer === 'footage' && promptField}
+ {/* The camera move sits with the motion prompt and shows the text it adds to it. */}
+ {layer === 'footage' && (
+ <SceneCameraControls scene={scene} fieldId={fieldId} onEditLocal={onEditLocal} onSave={onSave}
+ adds={cardRequest.promptAdditions.find((item) => item.id === 'camera-move')?.text || null} />
+ )}
<div className="flex flex-wrap items-center gap-2">
<SceneRenderTarget id={fieldId('render-on')} value={renderPick} onChange={setRenderPick} performance={performance}
options={renderOptions} onOptionsChange={setRenderOptions} scene={scene} models={videoModels} defaultModel={defaultVideoModel}
@@ -591,7 +596,7 @@ export default function SceneCard({
onOpenPreview={onOpenPreview} />
</>
)}
- {/* The render's settings sit with the render: what it covers and costs, then timing, shot mode, layer and camera. */}
+ {/* The render's settings sit with the render: what it covers and costs, then timing, shot mode and layer. */}
{shotSettings}
</section>
</div>
diff --git a/client/src/components/musicVideo/SceneCard.test.jsx b/client/src/components/musicVideo/SceneCard.test.jsx
index 82a8b8c83d..a3c2b76b4e 100644
--- a/client/src/components/musicVideo/SceneCard.test.jsx
+++ b/client/src/components/musicVideo/SceneCard.test.jsx
@@ -174,6 +174,19 @@ describe('planned camera move (#10589)', () => {
expect(onSave).toHaveBeenLastCalledWith('s1', { camera: null });
});
+ it('puts a footage shot\'s camera beside its motion prompt and shows the text it adds', () => {
+ render(<Harness initial={{ sceneId: 's1', visualLayer: 'footage', prompt: 'a hand turns the dial', startSec: 0, endSec: 5, takes: [] }} onSave={vi.fn()} />);
+ const camera = screen.getByLabelText('Camera');
+ expect(camera.closest('details').querySelector('summary').textContent).not.toMatch(/Shot settings/);
+ expect(screen.queryByTestId('camera-adds')).toBeNull();
+ fireEvent.change(camera, { target: { value: 'slow-dolly-in' } });
+ const adds = screen.getByTestId('camera-adds').textContent.replace(/^Adds to the prompt: /, '');
+ expect(adds.length).toBeGreaterThan(0);
+ // The same text is what Sent to the model lists as its Camera move addition.
+ fireEvent.click(within(screen.getByTestId('render-inputs')).getByRole('button', { name: '+ Camera move' }));
+ expect(screen.getByTestId('render-inputs').textContent).toContain(adds);
+ });
+
it('asks why a static camera holds, and offers no camera on a title card', () => {
const onSave = vi.fn();
const { unmount } = render(<Harness initial={{ sceneId: 's1', startSec: 0, endSec: 5, takes: [], camera: { move: 'slow-dolly-in' } }} onSave={onSave} />);