vidspotai-shared 1.0.92 → 1.0.94

package/lib/services/editor/planToProject.helpers.js

@@ -6,6 +6,7 @@ exports.sizeForAspect = sizeForAspect;
 exports.provenanceForScene = provenanceForScene;
 exports.buildOverlayClipsForScene = buildOverlayClipsForScene;
 exports.makeTrack = makeTrack;
+const textStylePacks_1 = require("../agent/textStylePacks");
 /**
  * Pure building blocks for planToProject: track ids, strategy/transition/size
  * lookups, provenance + overlay styling, the per-scene overlay clip builder,
@@ -126,13 +127,21 @@ function fontWeightForOverlay(o) {
  * of prior scene durations). `sceneDurationMs` clamps any overlay.endMs
  * that overshoots the scene.
  */
-function buildOverlayClipsForScene(sceneIndex, offsetMs, sceneDurationMs, overlays, frameHeight) {
+function buildOverlayClipsForScene(sceneIndex, offsetMs, sceneDurationMs, overlays, frameHeight, 
+/**
+ * Per-video animation look. Resolves the preset for each overlay's role when
+ * the overlay didn't specify its own `preset`. Optional so regen callers that
+ * don't carry the plan still work (they fall through to "clean").
+ */
+stylePack) {
     const clips = [];
     for (const [oi, overlay] of overlays.entries()) {
         const overlayFrom = offsetMs + Math.max(0, overlay.startMs ?? 0);
         const overlayTo = offsetMs + Math.min(sceneDurationMs, overlay.endMs ?? sceneDurationMs);
         if (overlayTo <= overlayFrom)
             continue;
+        // Per-overlay preset wins; else resolve from the video's style pack + role.
+        const preset = overlay.preset ?? (0, textStylePacks_1.resolveTextPreset)(stylePack, overlay.role);
         clips.push({
             id: `scene-${sceneIndex}-overlay-${oi}`,
             trackId: exports.TRACK_ID.text,
@@ -146,6 +155,8 @@ function buildOverlayClipsForScene(sceneIndex, offsetMs, sceneDurationMs, overla
             color: overlay.color ?? "#ffffff",
             align: "center",
             backgroundColor: overlay.bgColor,
+            // First-class preset so the editor + round-trip carry it explicitly.
+            preset,
             effects: [],
             transform: { x: 0, y: 0, scaleX: 1, scaleY: 1, rotation: 0, opacity: 1 },
             locked: false,
@@ -155,6 +166,9 @@ function buildOverlayClipsForScene(sceneIndex, offsetMs, sceneDurationMs, overla
                 position: overlay.position,
                 emphasis: overlay.emphasis,
                 animation: overlay.animation,
+                // Mirror preset into metadata too — readTextMetadata exposes it and
+                // some regen/diff paths only diff on metadata.
+                preset,
                 bgStyle: overlay.bgStyle,
                 sizePct: overlay.sizePct,
                 persistAcrossScenes: overlay.persistAcrossScenes ?? false,
@@ -163,7 +177,7 @@ function buildOverlayClipsForScene(sceneIndex, offsetMs, sceneDurationMs, overla
     }
     return clips;
 }
-function makeTrack(id, kind, index, name) {
+function makeTrack(id, kind, index, name, sourceTrackId) {
     return {
         id,
         kind,
@@ -173,5 +187,6 @@ function makeTrack(id, kind, index, name) {
         hidden: false,
         locked: false,
         gainDb: 0,
+        ...(sourceTrackId ? { sourceTrackId } : {}),
     };
 }

package/lib/services/editor/planToProject.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOverlayClipsForScene = exports.TRACK_ID = void 0;
 exports.planToProject = planToProject;
 const project_schema_1 = require("../../schemas/project.schema");
+const textStylePacks_1 = require("../agent/textStylePacks");
 const planToProject_helpers_1 = require("./planToProject.helpers");
 // Re-export the public surface so `export * from "./editor/planToProject"`
 // (services/index.ts) keeps surfacing these for existing importers.
@@ -221,7 +222,7 @@ function planToProject(input) {
             clips.push(voClip);
         }
         // Overlay text clips.
-        const overlayClips = (0, planToProject_helpers_1.buildOverlayClipsForScene)(scene.sceneIndex, offsetMs, sceneDurationMs, scene.overlays ?? [], size.height);
+        const overlayClips = (0, planToProject_helpers_1.buildOverlayClipsForScene)(scene.sceneIndex, offsetMs, sceneDurationMs, scene.overlays ?? [], size.height, plan.textStylePack);
         if (overlayClips.length > 0)
             hasOverlays = true;
         for (const clip of overlayClips)
@@ -234,6 +235,10 @@ function planToProject(input) {
             // change_caption_style tool): per-scene override wins over the
             // plan-level style, which wins over the renderer defaults, per field.
             const cs = { ...plan.captionStyle, ...scene.captionStyle };
+            // Caption preset: explicit captionStyle.preset wins, else resolve from
+            // the video's style pack. Carried first-class so the editor + round-trip
+            // preserve it.
+            const captionPreset = cs?.preset ?? (0, textStylePacks_1.resolveCaptionPreset)(plan.textStylePack);
             const captionClip = {
                 id: `scene-${scene.sceneIndex}-caption`,
                 trackId: planToProject_helpers_1.TRACK_ID.caption,
@@ -249,11 +254,19 @@ function planToProject(input) {
                 ...(cs?.fontWeight !== undefined ? { fontWeight: cs.fontWeight } : {}),
                 color: cs?.color ?? "#ffffff",
                 ...(cs?.highlightColor ? { highlightColor: cs.highlightColor } : {}),
+                ...(captionPreset ? { preset: captionPreset } : {}),
                 language: "en",
                 effects: [],
                 transform: { x: 0, y: 0, scaleX: 1, scaleY: 1, rotation: 0, opacity: 1 },
                 locked: false,
-                metadata: { sceneIndex: scene.sceneIndex },
+                // parentId / sourceUrl link the caption to its source VO clip — the same
+                // convention editor-made captions use, so the editor groups, regenerates
+                // (replace-in-place by parentId), and links them identically (1:1).
+                metadata: {
+                    sceneIndex: scene.sceneIndex,
+                    parentId: `scene-${scene.sceneIndex}-vo`,
+                    ...(outcome?.voiceoverUrl ? { sourceUrl: outcome.voiceoverUrl } : {}),
+                },
             };
             clips.push(captionClip);
         }
@@ -382,8 +395,11 @@ function planToProject(input) {
         tracks.push((0, planToProject_helpers_1.makeTrack)(planToProject_helpers_1.TRACK_ID.music, "audio", trackIndex++, "Music"));
     if (hasOverlays)
         tracks.push((0, planToProject_helpers_1.makeTrack)(planToProject_helpers_1.TRACK_ID.text, "text", trackIndex++, "Text"));
+    // Caption track is tagged with its SOURCE GROUP (the voiceover track) so the
+    // editor treats agent-made captions exactly like editor-made ones: one caption
+    // row per source group, and regen/new captions route back onto it.
     if (hasCaptions)
-        tracks.push((0, planToProject_helpers_1.makeTrack)(planToProject_helpers_1.TRACK_ID.caption, "caption", trackIndex++, "Captions"));
+        tracks.push((0, planToProject_helpers_1.makeTrack)(planToProject_helpers_1.TRACK_ID.caption, "caption", trackIndex++, "Voiceover · Captions", planToProject_helpers_1.TRACK_ID.voiceover));
     const durationMs = Math.max(1, offsetMs);
     return {
         schemaVersion: project_schema_1.PROJECT_SCHEMA_VERSION,
@@ -393,6 +409,8 @@ function planToProject(input) {
         fps: 30,
         size,
         aspect: plan.aspect,
+        // Agent plans have no master-volume concept yet; 1 = unchanged.
+        masterVolume: 1,
         background: { type: "color", value: "#000000" },
         tracks,
         clips,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vidspotai-shared",
-  "version": "1.0.92",
+  "version": "1.0.94",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {