@argo-video/cli 0.22.1 → 0.24.0

package/dist/preview.js

@@ -7,7 +7,7 @@
  * renders overlay cues on a DOM layer, and lets the user edit voiceover text
  * + overlay props inline with per-scene TTS regen.
  */
-import { execFile } from 'node:child_process';
+import { execFile, spawnSync } from 'node:child_process';
 import { createServer } from 'node:http';
 import { readFileSync, existsSync, readdirSync, writeFileSync, statSync, createReadStream, unlinkSync, mkdirSync } from 'node:fs';
 import { dirname, extname, join, relative, resolve } from 'node:path';
@@ -21,6 +21,8 @@ import { exportVideo, checkFfmpeg } from './export.js';
 import { applySpeedRampToTimeline } from './speed-ramp.js';
 import { shiftCameraMoves, scaleCameraMoves } from './camera-move.js';
 import { resolveFreezes, adjustPlacementsForFreezes, totalFreezeDurationMs } from './freeze.js';
+import { buildOverlayPngsForImport, isImportedVideo } from './overlays/render-to-png.js';
+import { detectVideoTheme, getVideoDurationMs } from './media.js';
 const MIME_TYPES = {
     '.html': 'text/html',
     '.js': 'text/javascript',
@@ -36,6 +38,39 @@ function readJsonFile(filePath, fallback) {
         return fallback;
     return JSON.parse(readFileSync(filePath, 'utf-8'));
 }
+function ensureSeekablePreviewProxy(rawVideoPath, proxyPath) {
+    try {
+        const needsRender = !existsSync(proxyPath) || statSync(proxyPath).mtimeMs < statSync(rawVideoPath).mtimeMs;
+        if (!needsRender)
+            return proxyPath;
+        checkFfmpeg();
+        const result = spawnSync('ffmpeg', [
+            '-i', rawVideoPath,
+            '-map', '0:v:0',
+            '-map', '0:a:0?',
+            '-c:v', 'libx264',
+            '-preset', 'veryfast',
+            '-crf', '23',
+            '-pix_fmt', 'yuv420p',
+            '-movflags', '+faststart',
+            '-c:a', 'aac',
+            '-b:a', '128k',
+            '-y', proxyPath,
+        ], {
+            stdio: 'pipe',
+        });
+        if (result.status !== 0) {
+            const stderr = result.stderr?.toString('utf-8').trim();
+            console.warn(`Warning: failed to create preview MP4 proxy for ${rawVideoPath}${stderr ? `: ${stderr}` : ''}`);
+            return null;
+        }
+        return proxyPath;
+    }
+    catch (err) {
+        console.warn(`Warning: failed to prepare seekable preview video: ${err.message}`);
+        return null;
+    }
+}
 function setManifestField(target, key, value) {
     if (value === undefined || value === null || value === '') {
         if (key in target) {
@@ -98,12 +133,13 @@ function updatePreviewOverlayEntry(target, overlay) {
     }
     return changed;
 }
-function buildRenderedOverlays(overlays) {
+function buildRenderedOverlays(overlays, themeMap) {
     const renderedOverlays = {};
     for (const entry of overlays) {
         const { scene, ...cue } = entry;
         const zone = cue.placement ?? 'bottom-center';
-        const { contentHtml, styles } = renderTemplate(cue, 'dark');
+        const theme = themeMap?.[scene] ?? 'dark';
+        const { contentHtml, styles } = renderTemplate(cue, theme);
         renderedOverlays[scene] = { html: contentHtml, styles, zone };
     }
     return renderedOverlays;
@@ -177,7 +213,32 @@ function loadPreviewData(demoName, argoDir, demosDir, outputDir = 'videos', expo
     const reportPath = join(demoDir, 'scene-report.json');
     const persistedReport = readJsonFile(reportPath, null);
     const sceneReport = buildPreviewSceneReport(timing, sceneDurations, persistedReport);
-    const renderedOverlays = buildRenderedOverlays(overlays);
+    // Detect per-scene overlay theme from the video content.
+    // Uses ffmpeg to sample frames at each overlay's scene timestamp.
+    // Find video file — prefer original extension (imported videos) over .webm
+    const videoExts = ['.mp4', '.mov', '.mkv', '.avi', '.webm'];
+    let videoPath = null;
+    for (const ext of videoExts) {
+        const candidate = join(demoDir, `video${ext}`);
+        if (existsSync(candidate)) {
+            videoPath = candidate;
+            break;
+        }
+    }
+    let overlayThemeMap;
+    if (videoPath && overlays.length > 0) {
+        overlayThemeMap = {};
+        for (const ov of overlays) {
+            const sceneMs = timing[ov.scene] ?? 0;
+            // Use next scene start as end bound, or scene + 5s as fallback
+            const nextSceneMs = Object.values(timing)
+                .filter((ms) => ms > sceneMs)
+                .sort((a, b) => a - b)[0];
+            const endMs = nextSceneMs ?? sceneMs + 5000;
+            overlayThemeMap[ov.scene] = detectVideoTheme(videoPath, sceneMs, endMs);
+        }
+    }
+    const renderedOverlays = buildRenderedOverlays(overlays, overlayThemeMap);
     // Pipeline metadata (reuse meta loaded above for headTrimMs)
     const pipelineMeta = Object.keys(meta).length > 0 ? meta : null;
     const hasGenerated = Boolean(activeMusicPath && existsSync(activeMusicPath));
@@ -188,6 +249,27 @@ function loadPreviewData(demoName, argoDir, demosDir, outputDir = 'videos', expo
         include: hasGenerated || hasConfig,
         volume: exportConfig?.musicVolume ?? 0.15,
     };
+    // Get actual video duration as the timeline floor
+    let videoDurationMs = 0;
+    const videoExtsForDur = ['.mp4', '.mov', '.mkv', '.avi', '.webm'];
+    for (const ext of videoExtsForDur) {
+        const candidate = join(demoDir, `video${ext}`);
+        if (existsSync(candidate)) {
+            try {
+                videoDurationMs = getVideoDurationMs(candidate);
+            }
+            catch { /* ignore */ }
+            break;
+        }
+    }
+    // Also check the exported MP4
+    const exportedMp4 = join(outputDir, `${demoName}.mp4`);
+    if (videoDurationMs === 0 && existsSync(exportedMp4)) {
+        try {
+            videoDurationMs = getVideoDurationMs(exportedMp4);
+        }
+        catch { /* ignore */ }
+    }
     return {
         demoName,
         timing,
@@ -197,6 +279,8 @@ function loadPreviewData(demoName, argoDir, demosDir, outputDir = 'videos', expo
         sceneDurations,
         sceneReport,
         renderedOverlays,
+        overlayThemes: overlayThemeMap ?? {},
+        videoDurationMs,
         pipelineMeta,
         bgm,
     };
@@ -267,8 +351,8 @@ function refreshPreviewAudioArtifacts(demoName, argoDir, demosDir, defaults) {
         };
         const clipPath = cache.getClipPath(demoName, cacheEntry);
         if (!existsSync(clipPath)) {
-            throw new Error(`Expected regenerated clip for scene "${entry.scene}" at ${clipPath}, but it was not found. ` +
-                `Try running: argo tts generate ${scenesPath}`);
+            // Clip not generated yet (e.g., imported video without TTS run) — skip silently
+            continue;
         }
         const clipInfo = readClipInfo(clipPath, entry.scene);
         clips.push(clipInfo);
@@ -319,14 +403,48 @@ export async function startPreviewServer(options) {
     const port = options.port ?? 0; // 0 = auto-assign
     const demoName = options.demoName;
     const demoDir = join(argoDir, demoName);
-    // Prefer exported MP4 (has keyframes for seeking) over raw WebM (no cue points)
-    const webmPath = join(demoDir, 'video.webm');
-    const mp4Path = join(outputDir, `${demoName}.mp4`);
-    let videoPath = existsSync(mp4Path) ? mp4Path : webmPath;
-    if (!existsSync(videoPath)) {
-        throw new Error(`No recording found for '${demoName}'. Run 'argo pipeline ${demoName}' first.`);
+    const importedVideo = isImportedVideo(argoDir, demoName);
+    // Raw video path in .argo/<demo>/ — used for duration probing/theme detection and
+    // as the source for an optional seekable preview proxy.
+    let rawVideoPath = null;
+    for (const rawExt of ['.mp4', '.mov', '.mkv', '.avi', '.webm']) {
+        const candidate = join(demoDir, `video${rawExt}`);
+        if (existsSync(candidate)) {
+            rawVideoPath = candidate;
+            break;
+        }
+    }
+    // Prefer exported MP4 (has keyframes for seeking), then original-extension import, then raw WebM
+    const exportedMp4 = join(outputDir, `${demoName}.mp4`);
+    const previewProxyMp4 = join(demoDir, 'preview.mp4');
+    const mimeMap = {
+        '.mp4': 'video/mp4', '.mov': 'video/quicktime', '.mkv': 'video/x-matroska',
+        '.avi': 'video/x-msvideo', '.webm': 'video/webm',
+    };
+    let videoPath = null;
+    if (existsSync(exportedMp4)) {
+        videoPath = exportedMp4;
     }
-    let videoMime = videoPath.endsWith('.mp4') ? 'video/mp4' : 'video/webm';
+    else if (importedVideo && rawVideoPath) {
+        videoPath = ensureSeekablePreviewProxy(rawVideoPath, previewProxyMp4) ?? rawVideoPath;
+    }
+    else {
+        // Find the original-extension video first (correct MIME), fall back to video.webm
+        for (const ext of ['.mp4', '.mov', '.mkv', '.avi', '.webm']) {
+            const candidate = join(demoDir, `video${ext}`);
+            if (existsSync(candidate)) {
+                videoPath = candidate;
+                break;
+            }
+        }
+    }
+    if (!videoPath || !existsSync(videoPath)) {
+        throw new Error(`No recording found for '${demoName}'. Run 'argo pipeline ${demoName}' or 'argo import' first.`);
+    }
+    const ext = videoPath.slice(videoPath.lastIndexOf('.'));
+    let videoMime = mimeMap[ext] ?? 'video/mp4';
+    if (!rawVideoPath)
+        rawVideoPath = videoPath; // fallback to served video
     // Track BGM saved from the music generator panel
     let activeMusicPath;
     // Check if a previously saved BGM exists
@@ -363,6 +481,22 @@ export async function startPreviewServer(options) {
                     if (existing) {
                         changed = updatePreviewVoiceoverEntry(existing, vo) || changed;
                     }
+                    else {
+                        // New scene — always create a manifest entry (even without text)
+                        const newEntry = { scene: vo.scene };
+                        if (vo.text?.trim())
+                            newEntry.text = vo.text;
+                        if (vo.voice)
+                            newEntry.voice = vo.voice;
+                        if (vo.speed)
+                            newEntry.speed = vo.speed;
+                        if (vo.lang)
+                            newEntry.lang = vo.lang;
+                        if (vo._hint)
+                            newEntry._hint = vo._hint;
+                        scenes.push(newEntry);
+                        changed = true;
+                    }
                 }
                 if (changed) {
                     writeFileSync(scenesPath, JSON.stringify(scenes, null, 2) + '\n', 'utf-8');
@@ -377,7 +511,22 @@ export async function startPreviewServer(options) {
                 for await (const chunk of req)
                     chunks.push(chunk);
                 const body = JSON.parse(Buffer.concat(chunks).toString('utf-8'));
-                const renderedOverlays = buildRenderedOverlays(body);
+                // Detect per-scene theme from the video for adaptive overlays
+                let liveThemeMap;
+                if (rawVideoPath && existsSync(rawVideoPath) && body.length > 0) {
+                    const timingFile = join(demoDir, '.timing.json');
+                    const liveTiming = existsSync(timingFile)
+                        ? readJsonFile(timingFile, {}) : {};
+                    liveThemeMap = {};
+                    for (const ov of body) {
+                        const sceneMs = liveTiming[ov.scene] ?? 0;
+                        const nextMs = Object.values(liveTiming)
+                            .filter((ms) => ms > sceneMs)
+                            .sort((a, b) => a - b)[0];
+                        liveThemeMap[ov.scene] = detectVideoTheme(rawVideoPath, sceneMs, nextMs ?? sceneMs + 5000);
+                    }
+                }
+                const renderedOverlays = buildRenderedOverlays(body, liveThemeMap);
                 res.writeHead(200, { 'Content-Type': 'application/json' });
                 res.end(JSON.stringify({ ok: true, renderedOverlays }));
                 return;
@@ -438,6 +587,29 @@ export async function startPreviewServer(options) {
                 res.end(JSON.stringify({ ok: true, changed }));
                 return;
             }
+            // Save timing marks to .timing.json
+            if (url === '/api/save-timing' && req.method === 'POST') {
+                const chunks = [];
+                for await (const chunk of req)
+                    chunks.push(chunk);
+                const { timing } = JSON.parse(Buffer.concat(chunks).toString('utf-8'));
+                const timingPath = join(demoDir, '.timing.json');
+                // Read existing timing to merge (preserves any extra keys)
+                const existing = readJsonFile(timingPath, {});
+                // If the pipeline applied head-trimming, shift new timing marks back to raw timeline
+                const metaPath = join(outputDir, `${demoName}.meta.json`);
+                const meta = existsSync(metaPath) ? readJsonFile(metaPath, {}) : {};
+                const headTrimMs = meta?.export?.headTrimMs ?? 0;
+                const rawTiming = {};
+                for (const [scene, ms] of Object.entries(timing)) {
+                    rawTiming[scene] = ms + headTrimMs;
+                }
+                const merged = { ...existing, ...rawTiming };
+                writeFileSync(timingPath, JSON.stringify(merged, null, 2) + '\n', 'utf-8');
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ ok: true }));
+                return;
+            }
             // Regenerate a single TTS clip
             if (url === '/api/regen-clip' && req.method === 'POST') {
                 const chunks = [];
@@ -489,13 +661,21 @@ export async function startPreviewServer(options) {
                         chunks.push(chunk);
                     const bodyText = Buffer.concat(chunks).toString('utf-8').trim();
                     const body = bodyText ? JSON.parse(bodyText) : {};
+                    // Generate TTS clips for any scenes with text (auto-regen before export)
+                    const manifestPath = join(demosDir, `${demoName}.scenes.json`);
+                    try {
+                        await runPreviewTtsGenerate(manifestPath);
+                    }
+                    catch (ttsErr) {
+                        console.warn(`Warning: TTS generation failed, exporting without voiceover: ${ttsErr.message}`);
+                    }
                     // Refresh aligned audio from current clips + timing
                     const refreshed = refreshPreviewAudioArtifacts(demoName, argoDir, demosDir, options.ttsDefaults);
                     // Read timing for head-trim + placement computation
                     const timing = readJsonFile(join(demoDir, '.timing.json'), {});
                     const markTimes = Object.values(timing);
                     let headTrimMs = 0;
-                    if (markTimes.length > 0) {
+                    if (!importedVideo && markTimes.length > 0) {
                         const firstMarkMs = Math.min(...markTimes);
                         headTrimMs = Math.max(0, firstMarkMs - 200);
                         if (headTrimMs <= 500)
@@ -508,7 +688,7 @@ export async function startPreviewServer(options) {
                     // Get video duration
                     const { execFileSync } = await import('node:child_process');
                     const rawDur = execFileSync('ffprobe', [
-                        '-v', 'error', '-show_entries', 'format=duration', '-of', 'csv=p=0', webmPath,
+                        '-v', 'error', '-show_entries', 'format=duration', '-of', 'csv=p=0', rawVideoPath,
                     ], { encoding: 'utf-8' }).trim();
                     const totalDurationMs = Math.round(parseFloat(rawDur) * 1000);
                     const shiftedDurationMs = totalDurationMs - headTrimMs;
@@ -533,7 +713,8 @@ export async function startPreviewServer(options) {
                         ? Math.max(0, Math.min(1, body.musicVolume))
                         : (ec?.musicVolume ?? 0.15);
                     const exportMusicPath = includeBgm ? (activeMusicPath ?? ec?.musicPath) : undefined;
-                    const rampResult = applySpeedRampToTimeline(placements, shiftedDurationMs, ec?.speedRamp);
+                    const effectiveSpeedRamp = importedVideo ? undefined : ec?.speedRamp;
+                    const rampResult = applySpeedRampToTimeline(placements, shiftedDurationMs, effectiveSpeedRamp);
                     const finalPlacements = rampResult.placements;
                     const finalDurationMs = rampResult.totalDurationMs;
                     const speedRampSegments = rampResult.segments.length > 0 ? rampResult.segments : undefined;
@@ -583,6 +764,16 @@ export async function startPreviewServer(options) {
                         }
                     }
                     catch { /* optional */ }
+                    // Render overlay PNGs for imported videos (no Playwright recording step).
+                    const overlayPngs = await buildOverlayPngsForImport({
+                        argoDir,
+                        demoName,
+                        manifestPath: scenesPath,
+                        placements: freezeAdjustedPlacements,
+                        videoWidth: ec?.outputWidth ?? 1920,
+                        videoHeight: ec?.outputHeight ?? 1080,
+                        deviceScaleFactor: ec?.deviceScaleFactor,
+                    });
                     // Export — use full config so output matches argo pipeline
                     await exportVideo({
                         demoName,
@@ -608,10 +799,12 @@ export async function startPreviewServer(options) {
                         cameraMoves,
                         watermark: ec?.watermark,
                         freezeSpecs: previewResolvedFreezes.length > 0 ? previewResolvedFreezes : undefined,
+                        overlayPngs,
                     });
                     // Switch to serving the new MP4
-                    if (existsSync(mp4Path)) {
-                        videoPath = mp4Path;
+                    const newMp4 = join(outputDir, `${demoName}.mp4`);
+                    if (existsSync(newMp4)) {
+                        videoPath = newMp4;
                         videoMime = 'video/mp4';
                     }
                     res.end(JSON.stringify({ ok: true }));
@@ -1093,6 +1286,50 @@ const PREVIEW_HTML = `<!DOCTYPE html>
   .overlay-cue[data-zone="bottom-right"] { bottom: 60px; right: 40px; }
   .overlay-cue[data-zone="center"] { top: 50%; left: 50%; transform: translate(-50%, -50%); }
 
+  /* Drag-to-snap overlay positioning */
+  .overlay-cue.overlay-draggable {
+    cursor: grab;
+    user-select: none;
+    /* pointer-events only on visible overlays — invisible ones must not intercept clicks */
+  }
+  .overlay-cue.overlay-draggable.visible {
+    pointer-events: auto;
+  }
+  .overlay-cue.overlay-draggable:active {
+    cursor: grabbing;
+  }
+  .overlay-cue.overlay-dragging {
+    cursor: grabbing;
+    opacity: 0.85;
+    z-index: 20;
+  }
+  .snap-zone {
+    position: absolute;
+    border: 2px dashed rgba(99, 102, 241, 0.4);
+    border-radius: 8px;
+    pointer-events: none;
+    opacity: 0;
+    transition: opacity 0.2s;
+    z-index: 15;
+  }
+  .snap-zone.visible {
+    opacity: 1;
+  }
+  .snap-zone.highlight {
+    background: rgba(99, 102, 241, 0.15);
+    border-color: rgba(99, 102, 241, 0.8);
+  }
+  .snap-zone-label {
+    position: absolute;
+    bottom: 4px;
+    left: 50%;
+    transform: translateX(-50%);
+    font-size: 11px;
+    color: rgba(99, 102, 241, 0.8);
+    font-family: var(--mono);
+    white-space: nowrap;
+  }
+
   /* Timeline bar */
   .timeline {
     background: var(--surface);
@@ -1433,6 +1670,24 @@ const PREVIEW_HTML = `<!DOCTYPE html>
     border-radius: 4px;
   }
 
+  .add-scene-btn {
+    width: 100%;
+    padding: 10px;
+    margin-bottom: 12px;
+    background: var(--bg-card, var(--surface));
+    border: 2px dashed var(--border);
+    border-radius: 10px;
+    color: var(--text-muted);
+    cursor: pointer;
+    font-family: var(--mono);
+    font-size: 0.85rem;
+    transition: all 0.2s;
+  }
+  .add-scene-btn:hover {
+    border-color: var(--accent);
+    color: var(--accent);
+  }
+
   /* Editable fields */
   .field-group { margin-top: 8px; }
   .field-group label {
@@ -1697,6 +1952,12 @@ const PREVIEW_HTML = `<!DOCTYPE html>
   <div class="video-container">
     <video id="video" src="/video" preload="auto" muted playsinline></video>
     <div class="overlay-layer" id="overlay-layer"></div>
+    <div class="snap-zone" data-zone="top-left" style="top:10%;left:5%;width:35%;height:35%"><span class="snap-zone-label">top-left</span></div>
+    <div class="snap-zone" data-zone="top-right" style="top:10%;right:5%;width:35%;height:35%"><span class="snap-zone-label">top-right</span></div>
+    <div class="snap-zone" data-zone="bottom-left" style="bottom:10%;left:5%;width:35%;height:35%"><span class="snap-zone-label">bottom-left</span></div>
+    <div class="snap-zone" data-zone="bottom-right" style="bottom:10%;right:5%;width:35%;height:35%"><span class="snap-zone-label">bottom-right</span></div>
+    <div class="snap-zone" data-zone="bottom-center" style="bottom:5%;left:25%;width:50%;height:20%"><span class="snap-zone-label">bottom-center</span></div>
+    <div class="snap-zone" data-zone="center" style="top:30%;left:25%;width:50%;height:40%"><span class="snap-zone-label">center</span></div>
   </div>
 
   <div class="timeline">
@@ -1737,6 +1998,7 @@ const PREVIEW_HTML = `<!DOCTYPE html>
     <button class="sidebar-tab" data-tab="metadata">Metadata</button>
   </div>
   <div class="sidebar-panel" id="panel-scenes">
+    <button id="add-scene-btn" class="add-scene-btn">+ Add scene at current time</button>
     <div id="scene-list"></div>
     <div class="music-panel" id="music-panel">
       <div class="music-panel-header" id="music-panel-header">
@@ -1839,12 +2101,19 @@ const scenes = Object.entries(DATA.timing)
 
 let activeScene = null;
 
-// ─── Timeline ──────────────────────────────────────────────────────────────
-video.addEventListener('loadedmetadata', () => {
-  const totalMs = video.duration * 1000;
-  document.getElementById('time-total').textContent = formatTime(totalMs);
+function getPreviewDurationMs() {
+  const mediaDurationMs = Number.isFinite(video.duration) && video.duration > 0
+    ? video.duration * 1000
+    : 0;
+  return mediaDurationMs || DATA.videoDurationMs || DATA.sceneReport?.totalDurationMs || 0;
+}
+
+function renderTimelineMarkers() {
+  const totalMs = getPreviewDurationMs();
+  if (!totalMs) return;
+
+  timelineBar.querySelectorAll('.timeline-scene').forEach(node => node.remove());
 
-  // Render scene markers on timeline
   scenes.forEach((s, i) => {
     const pct = (s.startMs / totalMs) * 100;
     const nextStart = i + 1 < scenes.length ? scenes[i + 1].startMs : totalMs;
@@ -1854,23 +2123,38 @@ video.addEventListener('loadedmetadata', () => {
     marker.className = 'timeline-scene';
     marker.style.left = pct + '%';
     marker.style.width = Math.max(widthPct, 2) + '%';
-    const hasOverlay = DATA.overlays.find(o => o.scene === s.name);
-    // s.name is already escaped via esc() — safe for innerHTML
+    const hasOverlay = s.overlay?.type;
     marker.innerHTML = esc(s.name) + (hasOverlay ? '<span class="has-overlay"></span>' : '');
     marker.dataset.scene = s.name;
     marker.addEventListener('click', (e) => {
       e.stopPropagation();
+      // Don't seek to scene start if user just finished scrubbing
+      if (justScrubbed) return;
       seekToScene(s);
     });
     timelineBar.appendChild(marker);
   });
+}
+
+// ─── Timeline ──────────────────────────────────────────────────────────────
+video.addEventListener('loadedmetadata', () => {
+  const totalMs = getPreviewDurationMs();
+  document.getElementById('time-total').textContent = formatTime(totalMs);
+  renderTimelineMarkers();
 
   // Create overlay DOM elements
   renderOverlayElements();
 });
 
+if (getPreviewDurationMs() > 0) {
+  document.getElementById('time-total').textContent = formatTime(getPreviewDurationMs());
+  renderTimelineMarkers();
+}
+
 video.addEventListener('timeupdate', () => {
-  const totalMs = video.duration * 1000;
+  // Don't update UI during scrubbing — scrubToX handles it directly
+  if (isScrubbing) return;
+  const totalMs = getPreviewDurationMs();
   const currentMs = video.currentTime * 1000;
   if (scenePlaybackEndMs !== null && currentMs >= scenePlaybackEndMs) {
     const stopAt = scenePlaybackEndMs;
@@ -1899,13 +2183,47 @@ video.addEventListener('timeupdate', () => {
   }
 });
 
-// Click on timeline bar to seek
-timelineBar.addEventListener('click', (e) => {
+// Click and drag on timeline bar to scrub
+let isScrubbing = false;
+let justScrubbed = false;
+
+function scrubToX(clientX) {
   const rect = timelineBar.getBoundingClientRect();
-  const pct = (e.clientX - rect.left) / rect.width;
-  const seekTime = pct * video.duration;
+  const pct = Math.max(0, Math.min(1, (clientX - rect.left) / rect.width));
+  const dur = video.duration;
+  if (!dur || !Number.isFinite(dur)) return;
+  const targetSec = pct * dur;
   scenePlaybackEndMs = null;
-  void seekAbsoluteMs(seekTime * 1000);
+  // Direct assignment — no async seek during scrubbing
+  video.currentTime = targetSec;
+  // Update UI immediately
+  const ms = targetSec * 1000;
+  document.getElementById('time-current').textContent = formatTime(ms);
+  timelineProgress.style.width = (pct * 100) + '%';
+  document.getElementById('timeline-playhead').style.left = (pct * 100) + '%';
+}
+
+timelineBar.addEventListener('mousedown', (e) => {
+  isScrubbing = true;
+  video.pause();
+  showPlayIcon();
+  scrubToX(e.clientX);
+  e.preventDefault();
+});
+
+document.addEventListener('mousemove', (e) => {
+  if (!isScrubbing) return;
+  scrubToX(e.clientX);
+  e.preventDefault();
+});
+
+document.addEventListener('mouseup', () => {
+  if (isScrubbing) {
+    isScrubbing = false;
+    // Prevent the subsequent click event on scene markers from seeking to scene start
+    justScrubbed = true;
+    setTimeout(() => { justScrubbed = false; }, 50);
+  }
 });
 
 // Play/pause icon toggling
@@ -2005,6 +2323,7 @@ function renderOverlayElements() {
     el.innerHTML = '<span class="preview-badge">PREVIEW</span>' + s.rendered.html;
     Object.assign(el.style, s.rendered.styles);
     overlayLayer.appendChild(el);
+    makeOverlayDraggable(el);
   }
 }
 
@@ -2018,9 +2337,13 @@ function updateOverlayVisibility(currentMs) {
     const el = overlayLayer.querySelector('[data-scene="' + s.name + '"]');
     if (!el) continue;
 
-    // Show overlay only during this scene's own duration (not bleeding into next scene)
+    // Show overlay during this scene's time range.
+    // For scenes without TTS (endMs === startMs), extend to the next scene's start or video end.
     const { startMs, endMs } = getSceneBounds(s);
-    const isActive = currentMs >= startMs && currentMs < endMs;
+    const sceneIdx = scenes.indexOf(s);
+    const nextStart = sceneIdx + 1 < scenes.length ? scenes[sceneIdx + 1].startMs : getPreviewDurationMs();
+    const effectiveEnd = endMs > startMs ? endMs : nextStart;
+    const isActive = currentMs >= startMs && currentMs < effectiveEnd;
     el.classList.toggle('visible', isActive);
   }
 }
@@ -2029,6 +2352,154 @@ document.getElementById('cb-overlays').addEventListener('change', () => {
   updateOverlayVisibility(video.currentTime * 1000);
 });
 
+// ─── Drag-to-snap overlay positioning ──────────────────────────────────────
+const SNAP_ZONES = ['top-left', 'top-right', 'bottom-left', 'bottom-right', 'bottom-center', 'center'];
+const snapZoneEls = document.querySelectorAll('.snap-zone');
+
+// Zone center positions as fractions of the container
+const ZONE_CENTERS = {
+  'top-left':      { x: 0.05 + 0.35 / 2, y: 0.10 + 0.35 / 2 },
+  'top-right':     { x: 1 - 0.05 - 0.35 / 2, y: 0.10 + 0.35 / 2 },
+  'bottom-left':   { x: 0.05 + 0.35 / 2, y: 1 - 0.10 - 0.35 / 2 },
+  'bottom-right':  { x: 1 - 0.05 - 0.35 / 2, y: 1 - 0.10 - 0.35 / 2 },
+  'bottom-center': { x: 0.25 + 0.50 / 2, y: 1 - 0.05 - 0.20 / 2 },
+  'center':        { x: 0.25 + 0.50 / 2, y: 0.30 + 0.40 / 2 },
+};
+
+let dragState = null;
+let isOverlayDragging = false;
+
+function showSnapZones() {
+  snapZoneEls.forEach(el => el.classList.add('visible'));
+}
+
+function hideSnapZones() {
+  snapZoneEls.forEach(el => {
+    el.classList.remove('visible', 'highlight');
+  });
+}
+
+function highlightNearestZone(fracX, fracY) {
+  let nearest = null;
+  let minDist = Infinity;
+  for (const zone of SNAP_ZONES) {
+    const c = ZONE_CENTERS[zone];
+    const d = Math.hypot(fracX - c.x, fracY - c.y);
+    if (d < minDist) {
+      minDist = d;
+      nearest = zone;
+    }
+  }
+  snapZoneEls.forEach(el => {
+    el.classList.toggle('highlight', el.dataset.zone === nearest);
+  });
+  return nearest;
+}
+
+function makeOverlayDraggable(el) {
+  el.classList.add('overlay-draggable');
+
+  el.addEventListener('mousedown', (e) => {
+    // Only primary button
+    if (e.button !== 0) return;
+    e.preventDefault();
+    e.stopPropagation();
+
+    const container = el.closest('.video-container');
+    if (!container) return;
+    const containerRect = container.getBoundingClientRect();
+    const elRect = el.getBoundingClientRect();
+
+    // Store original zone positioning styles so we can restore if needed
+    const sceneName = el.dataset.scene;
+
+    dragState = {
+      el,
+      sceneName,
+      container,
+      containerRect,
+      // Offset from mouse to element top-left
+      offsetX: e.clientX - elRect.left,
+      offsetY: e.clientY - elRect.top,
+      nearestZone: null,
+    };
+
+    // Switch to fixed positioning for free drag
+    isOverlayDragging = true;
+    el.classList.add('overlay-dragging');
+    el.style.position = 'absolute';
+    el.style.left = (elRect.left - containerRect.left) + 'px';
+    el.style.top = (elRect.top - containerRect.top) + 'px';
+    el.style.right = 'auto';
+    el.style.bottom = 'auto';
+    el.style.transform = 'none';
+
+    showSnapZones();
+  });
+}
+
+document.addEventListener('mousemove', (e) => {
+  if (!dragState) return;
+  e.preventDefault();
+
+  const { el, container, containerRect, offsetX, offsetY } = dragState;
+  const rect = containerRect;
+
+  const newLeft = e.clientX - rect.left - offsetX;
+  const newTop = e.clientY - rect.top - offsetY;
+
+  el.style.left = newLeft + 'px';
+  el.style.top = newTop + 'px';
+
+  // Calculate overlay center as fraction of container
+  const elRect = el.getBoundingClientRect();
+  const centerX = (elRect.left + elRect.width / 2 - rect.left) / rect.width;
+  const centerY = (elRect.top + elRect.height / 2 - rect.top) / rect.height;
+
+  dragState.nearestZone = highlightNearestZone(centerX, centerY);
+});
+
+document.addEventListener('mouseup', (e) => {
+  if (!dragState) return;
+
+  const { el, sceneName, nearestZone } = dragState;
+  const zone = nearestZone || 'bottom-center';
+
+  // Remove drag styles — let CSS zone positioning take over
+  el.classList.remove('overlay-dragging');
+  el.style.position = '';
+  el.style.left = '';
+  el.style.top = '';
+  el.style.right = '';
+  el.style.bottom = '';
+  el.style.transform = '';
+
+  // Update the data-zone attribute so CSS positioning applies
+  el.dataset.zone = zone;
+
+  // Update s.overlay (single source of truth)
+  const s = scenes.find(sc => sc.name === sceneName);
+  if (s && s.overlay) {
+    s.overlay.placement = zone;
+  }
+
+  // Update the placement dropdown for visual consistency
+  const placeEl = document.querySelector('select[data-scene="' + sceneName + '"][data-field="overlay-placement"]');
+  if (placeEl) {
+    placeEl.value = zone;
+  }
+
+  // Update rendered data so renderOverlayElements stays in sync
+  if (DATA.renderedOverlays[sceneName]) {
+    DATA.renderedOverlays[sceneName].zone = zone;
+  }
+
+  hideSnapZones();
+  markDirty();
+  isOverlayDragging = false;
+  dragState = null;
+});
+
 // ─── Scene list (sidebar) ──────────────────────────────────────────────────
 function renderSceneList() {
   sceneList.innerHTML = '';
@@ -2122,8 +2593,66 @@ function renderSceneList() {
     wireOverlayListeners(s.name);
     wireEffectListeners(s.name);
   }
+
+  // Trigger overlay preview after rendering so existing overlays appear on the video
+  previewOverlays();
 }
 
+// ─── Add Scene button ────────────────────────────────────────────────────
+document.getElementById('add-scene-btn').addEventListener('click', () => {
+  // Generate a unique scene name
+  let idx = scenes.length + 1;
+  let name = 'scene-' + idx;
+  const existingNames = new Set(scenes.map(s => s.name));
+  while (existingNames.has(name)) {
+    idx++;
+    name = 'scene-' + idx;
+  }
+
+  // Timestamp from current video position
+  const startMs = Math.round(video.currentTime * 1000);
+
+  // Add to timing data
+  DATA.timing[name] = startMs;
+  DATA.sceneDurations[name] = 0;
+  DATA.voiceover.push({ scene: name, text: '' });
+
+  // Insert scene into the sorted array at the right position
+  const newScene = {
+    name,
+    startMs,
+    vo: { scene: name, text: '' },
+    overlay: undefined,
+    effects: [],
+    rendered: undefined,
+    report: undefined,
+  };
+  // Find insertion index to keep sorted by startMs
+  let insertIdx = scenes.length;
+  for (let i = 0; i < scenes.length; i++) {
+    if (scenes[i].startMs > startMs) {
+      insertIdx = i;
+      break;
+    }
+  }
+  scenes.splice(insertIdx, 0, newScene);
+
+  // Capture current form values before re-render wipes the DOM
+  syncFormValuesToScenes();
+
+  // Re-render scene list
+  renderSceneList();
+  snapshotAllScenes();
+  markDirty();
+
+  // Auto-scroll to the new card and expand it
+  const newCard = document.querySelector('.scene-card[data-scene="' + name + '"]');
+  if (newCard) {
+    newCard.classList.add('expanded');
+    newCard.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  }
+});
+
 function renderDynamicOverlayFields(sceneName, type, ov) {
   if (!type) return '';
   let fields = '';
@@ -2192,6 +2721,13 @@ function renderOverlayFields(s) {
             <option value="bottom-right" \${ov?.placement === 'bottom-right' ? 'selected' : ''}>bottom-right</option>
             <option value="center" \${ov?.placement === 'center' ? 'selected' : ''}>center</option>
           </select>
+        </div>
+        <div style="flex:0 0 auto; display:flex; align-items:flex-end; padding-bottom:2px;">
+          <span class="overlay-theme-badge" data-scene="\${esc(s.name)}" title="Auto-detected overlay theme"
+            style="font-size:11px; padding:2px 6px; border-radius:3px;
+              background:\${(DATA.overlayThemes[s.name] ?? 'dark') === 'light' ? '#fff' : '#333'};
+              color:\${(DATA.overlayThemes[s.name] ?? 'dark') === 'light' ? '#333' : '#ccc'};
+              border:1px solid #555;">\${DATA.overlayThemes[s.name] ?? 'dark'}</span>
         </div>\` : ''}
       </div>
       \${type ? \`<div class="field-group">
@@ -2213,6 +2749,10 @@ function updateOverlayFieldsForScene(sceneName) {
   const typeEl = document.querySelector('select[data-scene="' + sceneName + '"][data-field="overlay-type"]');
   const type = typeEl?.value ?? '';
   const s = scenes.find(sc => sc.name === sceneName);
+  if (s) {
+    if (!type) s.overlay = undefined;
+    else s.overlay = { ...(s.overlay ?? {}), type };
+  }
   const ov = s?.overlay;
   const container = document.querySelector('.overlay-fields-dynamic[data-scene="' + sceneName + '"]');
   if (!container) return;
@@ -2227,6 +2767,8 @@ function updateOverlayFieldsForScene(sceneName) {
     section.outerHTML = renderOverlayFields(fakeScene);
     // Re-wire event listeners for the new overlay fields
     wireOverlayListeners(sceneName);
+    // Trigger preview to show the overlay immediately after type change
+    renderSingleSceneOverlay(sceneName);
   }
 }
 
@@ -2234,19 +2776,80 @@ function wireOverlayListeners(sceneName) {
   const card = document.querySelector('.scene-card[data-scene="' + sceneName + '"]');
   if (!card) return;
   let debounceTimer;
-  card.querySelectorAll('[data-field^="overlay"]').forEach(input => {
+
+  // Type change — special: re-renders the dynamic fields
+  const typeSelect = card.querySelector('select[data-field="overlay-type"]');
+  if (typeSelect) {
+    typeSelect.addEventListener('change', () => {
+      const s = scenes.find(sc => sc.name === sceneName);
+      if (!s) return;
+      const type = typeSelect.value;
+      if (!type) {
+        s.overlay = undefined;
+      } else {
+        s.overlay = { ...(s.overlay ?? {}), type };
+      }
+      updateOverlayFieldsForScene(sceneName);
+    });
+  }
+
+  // All other overlay fields — update s.overlay directly
+  card.querySelectorAll('[data-field^="overlay-"]').forEach(input => {
+    const field = input.dataset.field;
+    if (field === 'overlay-type') return; // handled above
+
     const handler = () => {
+      const s = scenes.find(sc => sc.name === sceneName);
+      if (!s || !s.overlay) return;
+
+      // Map field name to overlay property
+      if (field === 'overlay-placement') s.overlay.placement = input.value;
+      else if (field === 'overlay-motion') {
+        if (input.value && input.value !== 'none') s.overlay.motion = input.value;
+        else delete s.overlay.motion;
+      }
+      else if (field === 'overlay-text') {
+        if (s.overlay.type === 'lower-third' || s.overlay.type === 'callout') {
+          s.overlay.text = input.value;
+        } else {
+          s.overlay.title = input.value;
+        }
+      }
+      else if (field === 'overlay-body') s.overlay.body = input.value || undefined;
+      else if (field === 'overlay-kicker') s.overlay.kicker = input.value || undefined;
+      else if (field === 'overlay-src') s.overlay.src = input.value || undefined;
+
       markDirty();
+
+      // Skip render during drag
+      if (isOverlayDragging) return;
+
+      // Debounce per-scene render
       clearTimeout(debounceTimer);
-      debounceTimer = setTimeout(() => previewOverlays(), 300);
+      debounceTimer = setTimeout(() => renderSingleSceneOverlay(sceneName), 300);
     };
+
     input.addEventListener('input', handler);
     input.addEventListener('change', handler);
   });
-  // Re-wire the type change listener
-  const typeSelect = card.querySelector('select[data-field="overlay-type"]');
-  if (typeSelect) {
-    typeSelect.addEventListener('change', () => updateOverlayFieldsForScene(sceneName));
+}
+
+async function renderSingleSceneOverlay(sceneName) {
+  const s = scenes.find(sc => sc.name === sceneName);
+  if (!s?.overlay?.type) return;
+
+  const ov = [{ ...s.overlay, scene: sceneName }];
+  const resp = await fetch('/api/render-overlays', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(ov),
+  });
+  const result = await resp.json();
+  if (result.renderedOverlays?.[sceneName]) {
+    DATA.renderedOverlays[sceneName] = result.renderedOverlays[sceneName];
+    s.rendered = result.renderedOverlays[sceneName];
+    renderOverlayElements();
+    updateOverlayVisibility(video.currentTime * 1000);
   }
 }
 
@@ -2419,6 +3022,18 @@ async function saveEffects() {
   });
 }
 
+async function saveTiming() {
+  const timing = {};
+  for (const s of scenes) {
+    timing[s.name] = s.startMs;
+  }
+  await fetch('/api/save-timing', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ timing }),
+  });
+}
+
 function previewEffect(sceneName, index) {
   const s = scenes.find(sc => sc.name === sceneName);
   if (!s?.effects?.[index]) return;
@@ -2556,7 +3171,7 @@ async function seekAbsoluteMs(absoluteMs) {
     return;
   }
 
-  const totalMs = video.duration * 1000;
+  const totalMs = getPreviewDurationMs();
   if (totalMs > 0) {
     const pct = (targetMs / totalMs) * 100;
     timelineProgress.style.width = pct + '%';
@@ -2652,8 +3267,9 @@ async function regenClip(sceneName, btn) {
   setStatus('Regenerating TTS for ' + sceneName + '...', 'saving');
 
   try {
-    // Save current voiceover state first
+    // Save current voiceover + timing state first (new scenes need timing marks)
     await saveVoiceover();
+    await saveTiming();
 
     const resp = await fetch('/api/regen-clip', {
       method: 'POST',
@@ -2688,6 +3304,23 @@ async function regenClip(sceneName, btn) {
   }
 }
 
+// Sync DOM form values back to in-memory scenes array.
+// Called before renderSceneList() to preserve user edits.
+function syncFormValuesToScenes() {
+  for (const s of scenes) {
+    const textEl = document.querySelector('textarea[data-scene="' + s.name + '"][data-field="text"]');
+    if (textEl && textEl.value) {
+      if (!s.vo) s.vo = { scene: s.name, text: '' };
+      s.vo.text = textEl.value;
+    }
+    const voiceEl = document.querySelector('input[data-scene="' + s.name + '"][data-field="voice"]');
+    if (voiceEl?.value && s.vo) s.vo.voice = voiceEl.value;
+    const speedEl = document.querySelector('input[data-scene="' + s.name + '"][data-field="speed"]');
+    if (speedEl?.value && s.vo) s.vo.speed = parseFloat(speedEl.value);
+  }
+}
+
+
 function collectVoiceover() {
   return scenes.map(s => {
     const textEl = document.querySelector('textarea[data-scene="' + s.name + '"][data-field="text"]');
@@ -2706,43 +3339,10 @@ function collectVoiceover() {
 }
 
 function collectOverlays() {
+  // Serialize from s.overlay (single source of truth) — no DOM reading
   return scenes
-    .map(s => {
-      const typeEl = document.querySelector('select[data-scene="' + s.name + '"][data-field="overlay-type"]');
-      const placeEl = document.querySelector('select[data-scene="' + s.name + '"][data-field="overlay-placement"]');
-      const motionEl = document.querySelector('select[data-scene="' + s.name + '"][data-field="overlay-motion"]');
-      const textEl = document.querySelector('input[data-scene="' + s.name + '"][data-field="overlay-text"]');
-      const bodyEl = document.querySelector('input[data-scene="' + s.name + '"][data-field="overlay-body"]');
-      const kickerEl = document.querySelector('input[data-scene="' + s.name + '"][data-field="overlay-kicker"]');
-      const srcEl = document.querySelector('input[data-scene="' + s.name + '"][data-field="overlay-src"]');
-      const type = typeEl?.value;
-      if (!type) return null;
-      const entry = {
-        ...(s.overlay ?? {}),
-        scene: s.name,
-        type,
-        placement: placeEl?.value ?? 'bottom-center',
-      };
-      if (motionEl?.value && motionEl.value !== 'none') entry.motion = motionEl.value;
-      else delete entry.motion;
-
-      delete entry.text;
-      delete entry.title;
-      delete entry.body;
-      delete entry.kicker;
-      delete entry.src;
-
-      if (type === 'lower-third' || type === 'callout') {
-        entry.text = textEl?.value ?? '';
-      } else {
-        entry.title = textEl?.value ?? '';
-        if (bodyEl?.value) entry.body = bodyEl.value;
-        if (type === 'headline-card' && kickerEl?.value) entry.kicker = kickerEl.value;
-        if (type === 'image-card' && srcEl?.value) entry.src = srcEl.value;
-      }
-      return entry;
-    })
-    .filter(Boolean);
+    .filter(s => s.overlay?.type)
+    .map(s => ({ ...s.overlay, scene: s.name }));
 }
 
 async function saveVoiceover() {
@@ -2754,7 +3354,7 @@ async function saveVoiceover() {
   });
 }
 
-// Render-only preview (no disk write) — called on every overlay field edit
+// Render-only preview (no disk write) — called on overlay field edits
 async function previewOverlays() {
   const ov = collectOverlays();
   const resp = await fetch('/api/render-overlays', {
@@ -2765,9 +3365,7 @@ async function previewOverlays() {
   const result = await resp.json();
   if (result.renderedOverlays) {
     DATA.renderedOverlays = result.renderedOverlays;
-    DATA.overlays = ov;
     for (const s of scenes) {
-      s.overlay = DATA.overlays.find(o => o.scene === s.name);
       s.rendered = DATA.renderedOverlays[s.name];
     }
     renderOverlayElements();
@@ -2786,9 +3384,7 @@ async function saveOverlays() {
   const result = await resp.json();
   if (result.renderedOverlays) {
     DATA.renderedOverlays = result.renderedOverlays;
-    DATA.overlays = ov;
     for (const s of scenes) {
-      s.overlay = DATA.overlays.find(o => o.scene === s.name);
       s.rendered = DATA.renderedOverlays[s.name];
     }
     renderOverlayElements();
@@ -2824,28 +3420,12 @@ function isSceneModified(sceneName) {
   const voice = card.querySelector('[data-field="voice"]')?.value ?? '';
   const speed = card.querySelector('[data-field="speed"]')?.value ?? '';
   if (text !== snap.text || voice !== snap.voice || String(speed) !== String(snap.speed)) return true;
-  // Check overlay fields
-  const type = card.querySelector('[data-field="overlay-type"]')?.value ?? '';
-  const snapType = snap.overlay?.type ?? '';
-  if (type !== snapType) return true;
-  if (type) {
-    const placement = card.querySelector('[data-field="overlay-placement"]')?.value ?? '';
-    const motion = card.querySelector('[data-field="overlay-motion"]')?.value ?? '';
-    const overlayText = card.querySelector('[data-field="overlay-text"]')?.value ?? '';
-    const body = card.querySelector('[data-field="overlay-body"]')?.value ?? '';
-    const kicker = card.querySelector('[data-field="overlay-kicker"]')?.value ?? '';
-    const src = card.querySelector('[data-field="overlay-src"]')?.value ?? '';
-    const so = snap.overlay || {};
-    if (placement !== (so.placement ?? 'bottom-center')) return true;
-    if (motion !== (so.motion ?? 'none')) return true;
-    const snapText = so.type === 'lower-third' || so.type === 'callout' ? (so.text ?? '') : (so.title ?? '');
-    if (overlayText !== snapText) return true;
-    if (body !== (so.body ?? '')) return true;
-    if (kicker !== (so.kicker ?? '')) return true;
-    if (src !== (so.src ?? '')) return true;
-  }
-  // Check effects
+  // Check overlay and effects from s.overlay / s.effects (single source of truth)
   const s = scenes.find(sc => sc.name === sceneName);
+  const currentOverlay = s?.overlay;
+  const snapOverlay = snap.overlay;
+  if (JSON.stringify(currentOverlay ?? null) !== JSON.stringify(snapOverlay ?? null)) return true;
+  // Check effects
   const currentEffects = JSON.stringify(s?.effects ?? []);
   const snapEffects = JSON.stringify(snap.effects ?? []);
   if (currentEffects !== snapEffects) return true;
@@ -2882,13 +3462,17 @@ function undoScene(sceneName) {
     s.effects = snap.effects?.length ? JSON.parse(JSON.stringify(snap.effects)) : [];
     refreshEffectsUI(sceneName);
   }
-  // Restore overlay type (triggers field re-render)
+  // Restore overlay from snapshot into s.overlay (single source of truth)
+  if (s) {
+    s.overlay = snap.overlay ? JSON.parse(JSON.stringify(snap.overlay)) : undefined;
+  }
+  // Restore overlay type (triggers field re-render via updateOverlayFieldsForScene)
   const typeEl = card.querySelector('[data-field="overlay-type"]');
   if (typeEl) {
     typeEl.value = snap.overlay?.type ?? '';
     updateOverlayFieldsForScene(sceneName);
   }
-  // Restore overlay field values after re-render
+  // Restore overlay field values in DOM after re-render
   setTimeout(() => {
     const so = snap.overlay || {};
     const textField = card.querySelector('[data-field="overlay-text"]');
@@ -2905,8 +3489,8 @@ function undoScene(sceneName) {
     if (placementField) placementField.value = so.placement ?? 'bottom-center';
     const motionField = card.querySelector('[data-field="overlay-motion"]');
     if (motionField) motionField.value = so.motion ?? 'none';
-    // Re-render overlay preview
-    previewOverlays();
+    // Re-render overlay preview for this scene only
+    renderSingleSceneOverlay(sceneName);
     updateUndoButton(sceneName);
     // Check if all scenes are back to saved state
     const anyModified = scenes.some(s => isSceneModified(s.name));
@@ -2942,6 +3526,7 @@ document.getElementById('btn-save').addEventListener('click', async () => {
     await saveVoiceover();
     await saveOverlays();
     await saveEffects();
+    await saveTiming();
     clearDirty();
     setStatus('All changes saved', 'saved');
     saveBtn.textContent = '\\u2713 Saved';
@@ -2959,13 +3544,12 @@ document.getElementById('btn-save').addEventListener('click', async () => {
 
 // Export button (re-align audio + export MP4, no re-recording)
 document.getElementById('btn-export').addEventListener('click', async () => {
-  if (isDirty && !confirm('You have unsaved changes. Save before exporting?')) return;
-  if (isDirty) {
-    await saveVoiceover();
-    await saveOverlays();
-    await saveEffects();
-    clearDirty();
-  }
+  // Always save before export to ensure timing marks + voiceover are persisted
+  await saveVoiceover();
+  await saveOverlays();
+  await saveEffects();
+  await saveTiming();
+  clearDirty();
   const overlay = document.getElementById('recording-overlay');
   const title = document.getElementById('recording-title');
   const subtitle = document.getElementById('recording-subtitle');
@@ -3008,6 +3592,7 @@ document.getElementById('btn-rerecord').addEventListener('click', async () => {
     await saveVoiceover();
     await saveOverlays();
     await saveEffects();
+    await saveTiming();
     clearDirty();
   }
   const overlay = document.getElementById('recording-overlay');