Conflicts: - video_generator.py: keep _find_ffmpeg (now reading FASTVIDEO_FFMPEG_BIN through envs) alongside main's _quantize_video_frames_to_uint8. - CreateJobButton.test.tsx: keep this branch's stubbed-dialog tests (job JSON import); main's real-dialog focus tests move to CreateJobButton.dialog.test.tsx, waiting for the dialog's deferred open.