vidspotai-shared 1.0.91 → 1.0.93

package/lib/services/aiGen/providers/google/googleKeyPool.js

@@ -7,6 +7,40 @@ const logger_1 = require("../../../../utils/logger");
 const redis_service_1 = require("../../../redis.service");
 const googleApiKeys_1 = require("./googleApiKeys");
 Object.defineProperty(exports, "googleApiKeyCount", { enumerable: true, get: function () { return googleApiKeys_1.googleApiKeyCount; } });
+/**
+ * Atomic per-key check-and-consume for the routing counters (RPM + RPD).
+ *
+ * Replaces the old GET-then-INCR in pickForSubmit, which was NON-atomic: under
+ * concurrent submits every caller read "this key has room" before any of them
+ * incremented, so they all piled onto the SAME key (usually the tiny Tier-1
+ * key0) past its ceiling while the other key sat idle — then Google 429'd and,
+ * with the failover bug, the job just failed. Checking and consuming in one
+ * Lua round-trip makes the per-key cap a hard, race-free gate.
+ *
+ * Returns { 1, newMin, dayUsed } when a slot was consumed, or
+ *         { 0, minUsed, dayUsed } when this key is already at its min/day cap.
+ * A limit of 0 means "no cap" (skip that gate). The minute counter is a fixed
+ * 60s window (matches the legacy per-key behavior); the day counter expires at
+ * UTC midnight.
+ */
+const CONSUME_KEY_SCRIPT = `
+local minKey = KEYS[1]
+local dayKey = KEYS[2]
+local minLimit = tonumber(ARGV[1])
+local dayLimit = tonumber(ARGV[2])
+local secsTilMidnight = tonumber(ARGV[3])
+local minUsed = tonumber(redis.call('GET', minKey) or '0')
+local dayUsed = tonumber(redis.call('GET', dayKey) or '0')
+if minLimit > 0 and minUsed >= minLimit then return { 0, minUsed, dayUsed } end
+if dayLimit > 0 and dayUsed >= dayLimit then return { 0, minUsed, dayUsed } end
+local newMin = redis.call('INCR', minKey)
+if newMin == 1 then redis.call('EXPIRE', minKey, 60) end
+if dayLimit > 0 then
+  local newDay = redis.call('INCR', dayKey)
+  if newDay == 1 then redis.call('EXPIRE', dayKey, secsTilMidnight) end
+end
+return { 1, newMin, dayUsed }
+`;
 function utcDateKey() {
     return new Date().toISOString().slice(0, 10);
 }
@@ -134,27 +168,21 @@ class GoogleKeyPool {
         if (candidates.length === 1)
             return candidates[0];
         const date = utcDateKey();
+        const secsTilMidnight = secsUntilMidnight();
         for (const entry of candidates) {
             try {
                 const perKeyMinLimit = (0, googleApiKeys_1.scaleLimitForTier)(baselineMin, entry.tier, "rpm");
                 const perKeyDayLimit = (0, googleApiKeys_1.scaleLimitForTier)(baselineDay, entry.tier, "rpd");
                 const dayKey = `gkpool:${entry.id}:${modelId}:day:${date}`;
                 const minKey = `gkpool:${entry.id}:${modelId}:min`;
-                const [dayRaw, minRaw] = await Promise.all([
-                    client.get(dayKey),
-                    client.get(minKey),
-                ]);
-                const dayUsed = dayRaw ? Number(dayRaw) : 0;
-                const minUsed = minRaw ? Number(minRaw) : 0;
-                const dayOk = perKeyDayLimit <= 0 || dayUsed < perKeyDayLimit;
-                const minOk = perKeyMinLimit <= 0 || minUsed < perKeyMinLimit;
-                if (dayOk && minOk) {
-                    await this.consume(entry, modelId, date);
+                // Atomic check-and-consume: no GET-then-INCR race, so two concurrent
+                // submits can't both think key0 has room and oversubscribe it.
+                const res = (await client.eval(CONSUME_KEY_SCRIPT, 2, minKey, dayKey, String(perKeyMinLimit), String(perKeyDayLimit), String(secsTilMidnight)));
+                if (res[0] === 1)
                     return entry;
-                }
             }
             catch (err) {
-                logger_1.logger.warn("googleKeyPool: routing read failed, trying next key", {
+                logger_1.logger.warn("googleKeyPool: routing eval failed, trying next key", {
                     keyId: entry.id,
                     err: err instanceof Error ? err.message : String(err),
                 });

package/lib/services/asr/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./assemblyai.service";
 export * from "./whisper.service";
+export * from "./transcribeWithFallback";
 //# sourceMappingURL=index.d.ts.map

package/lib/services/asr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/asr/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/asr/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}

package/lib/services/asr/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./assemblyai.service"), exports);
 __exportStar(require("./whisper.service"), exports);
+__exportStar(require("./transcribeWithFallback"), exports);

package/lib/services/asr/transcribeWithFallback.d.ts

@@ -0,0 +1,54 @@
+import { TranscribeParams, TranscribeResult } from "./assemblyai.service";
+/**
+ * Provider-agnostic ASR entry point with automatic AssemblyAI → Whisper
+ * fallback. Mirrors the `provider: "auto"` strategy already used by the agent's
+ * generate_captions tool, but reusable from the REST controller, the MCP tool,
+ * and the picker worker.
+ *
+ * Selection rule:
+ *   - AssemblyAI is the PRIMARY (cheaper $0.15/hr, native diarization, URL
+ *     submission for long audio) — used whenever ASSEMBLYAI_API_KEY is set.
+ *   - Whisper is the FALLBACK (reuses OPENAI_API_KEY already provisioned;
+ *     ~2.4× cost, 25 MB / short-audio only, no diarization) — used when the
+ *     AssemblyAI key is absent OR the AssemblyAI call hard-fails at runtime.
+ *
+ * Historically the AssemblyAI key was never provisioned (a commented-out
+ * placeholder in every env), so the REST transcribe path always threw. Routing
+ * through here makes it work today on the existing OpenAI key and auto-upgrades
+ * to AssemblyAI the moment its key lands in Doppler — no code change needed.
+ */
+export type AsrProviderUsed = "assemblyai" | "whisper";
+export interface AsrTranscribeOutcome {
+    result: TranscribeResult;
+    providerUsed: AsrProviderUsed;
+}
+/** True when at least one ASR provider has a usable key. */
+export declare const isAsrConfigured: () => boolean;
+/** The provider that a sync transcribe would START with, given current keys. */
+export declare const primaryAsrProvider: () => AsrProviderUsed;
+/**
+ * Credits for a given provider + audio duration. `getCreditUsed` is pure
+ * pricing math, but the service constructors key-guard, so we only instantiate
+ * the provider whose key is present — which for `providerUsed` it always is,
+ * since that provider just ran.
+ */
+export declare const asrCreditUsed: (provider: AsrProviderUsed, audioDurationSec: number, speakerLabels?: boolean) => number;
+/** Whether async (submit + poll) is available — AssemblyAI only. */
+export declare const supportsAsyncAsr: () => boolean;
+/**
+ * Submit an async AssemblyAI job. Only valid when {@link supportsAsyncAsr} is
+ * true; Whisper has no submission endpoint.
+ */
+export declare const submitAsyncAsr: (params: TranscribeParams) => Promise<{
+    id: string;
+}>;
+/**
+ * Transcribe synchronously (poll-to-completion for AssemblyAI; single call for
+ * Whisper) with automatic fallback. Returns the result plus which provider
+ * actually produced it so callers can reconcile credits against the right rate.
+ */
+export declare const transcribeWithFallback: (params: TranscribeParams, opts?: {
+    timeoutMs?: number;
+    intervalMs?: number;
+}) => Promise<AsrTranscribeOutcome>;
+//# sourceMappingURL=transcribeWithFallback.d.ts.map

package/lib/services/asr/transcribeWithFallback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transcribeWithFallback.d.ts","sourceRoot":"","sources":["../../../src/services/asr/transcribeWithFallback.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAG9B;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,eAAe,CAAC;CAC/B;AAKD,4DAA4D;AAC5D,eAAO,MAAM,eAAe,QAAO,OAA0C,CAAC;AAE9E,gFAAgF;AAChF,eAAO,MAAM,kBAAkB,QAAO,eAMrC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GACxB,UAAU,eAAe,EACzB,kBAAkB,MAAM,EACxB,uBAAqB,KACpB,MAKF,CAAC;AAEF,oEAAoE;AACpE,eAAO,MAAM,gBAAgB,QAAO,OAA0B,CAAC;AAE/D;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,QAAQ,gBAAgB,KACvB,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAKxB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GACjC,QAAQ,gBAAgB,EACxB,OAAM;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,KACrD,OAAO,CAAC,oBAAoB,CAmC9B,CAAC"}

package/lib/services/asr/transcribeWithFallback.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transcribeWithFallback = exports.submitAsyncAsr = exports.supportsAsyncAsr = exports.asrCreditUsed = exports.primaryAsrProvider = exports.isAsrConfigured = void 0;
+const logger_1 = require("../../utils/logger");
+const assemblyai_service_1 = require("./assemblyai.service");
+const whisper_service_1 = require("./whisper.service");
+const hasAssemblyAI = () => !!process.env.ASSEMBLYAI_API_KEY;
+const hasWhisper = () => !!process.env.OPENAI_API_KEY;
+/** True when at least one ASR provider has a usable key. */
+const isAsrConfigured = () => hasAssemblyAI() || hasWhisper();
+exports.isAsrConfigured = isAsrConfigured;
+/** The provider that a sync transcribe would START with, given current keys. */
+const primaryAsrProvider = () => {
+    if (hasAssemblyAI())
+        return "assemblyai";
+    if (hasWhisper())
+        return "whisper";
+    throw new Error("No ASR provider configured — set ASSEMBLYAI_API_KEY (preferred) or OPENAI_API_KEY");
+};
+exports.primaryAsrProvider = primaryAsrProvider;
+/**
+ * Credits for a given provider + audio duration. `getCreditUsed` is pure
+ * pricing math, but the service constructors key-guard, so we only instantiate
+ * the provider whose key is present — which for `providerUsed` it always is,
+ * since that provider just ran.
+ */
+const asrCreditUsed = (provider, audioDurationSec, speakerLabels = false) => {
+    if (provider === "assemblyai") {
+        return new assemblyai_service_1.AssemblyAIService().getCreditUsed(audioDurationSec, speakerLabels);
+    }
+    return new whisper_service_1.WhisperAsrService().getCreditUsed(audioDurationSec);
+};
+exports.asrCreditUsed = asrCreditUsed;
+/** Whether async (submit + poll) is available — AssemblyAI only. */
+const supportsAsyncAsr = () => hasAssemblyAI();
+exports.supportsAsyncAsr = supportsAsyncAsr;
+/**
+ * Submit an async AssemblyAI job. Only valid when {@link supportsAsyncAsr} is
+ * true; Whisper has no submission endpoint.
+ */
+const submitAsyncAsr = async (params) => {
+    if (!hasAssemblyAI()) {
+        throw new Error("Async ASR requires AssemblyAI (ASSEMBLYAI_API_KEY not set)");
+    }
+    return new assemblyai_service_1.AssemblyAIService().submit(params);
+};
+exports.submitAsyncAsr = submitAsyncAsr;
+/**
+ * Transcribe synchronously (poll-to-completion for AssemblyAI; single call for
+ * Whisper) with automatic fallback. Returns the result plus which provider
+ * actually produced it so callers can reconcile credits against the right rate.
+ */
+const transcribeWithFallback = async (params, opts = {}) => {
+    const runWhisper = async () => ({
+        result: await new whisper_service_1.WhisperAsrService().transcribe(params),
+        providerUsed: "whisper",
+    });
+    if (hasAssemblyAI()) {
+        try {
+            const result = await new assemblyai_service_1.AssemblyAIService().transcribe(params, opts);
+            // A hard provider error → try the fallback. A "processing" status is a
+            // legitimate long-audio timeout (caller polls later), not a failure, so
+            // we keep it on the AssemblyAI track.
+            if (result.status === "error" && hasWhisper()) {
+                logger_1.logger.warn("ASR: AssemblyAI returned error — falling back to Whisper", {
+                    audioUrl: params.audioUrl,
+                    err: result.errorMessage,
+                });
+                return await runWhisper();
+            }
+            return { result, providerUsed: "assemblyai" };
+        }
+        catch (err) {
+            if (!hasWhisper())
+                throw err;
+            logger_1.logger.warn("ASR: AssemblyAI threw — falling back to Whisper", {
+                audioUrl: params.audioUrl,
+                err: err instanceof Error ? err.message : String(err),
+            });
+            return await runWhisper();
+        }
+    }
+    if (hasWhisper())
+        return await runWhisper();
+    throw new Error("No ASR provider configured — set ASSEMBLYAI_API_KEY (preferred) or OPENAI_API_KEY");
+};
+exports.transcribeWithFallback = transcribeWithFallback;

package/lib/services/editor/designToProject.d.ts

@@ -62,6 +62,8 @@ export interface EditorDesignInput {
     trackItemDetailsMap?: Record<string, DesignItemDetails>;
     transitionIds?: string[];
     transitionsMap?: Record<string, DesignTransition>;
+    /** Project-level master volume as the editor stores it: 0–100 (100 = unchanged). */
+    masterVolume?: number;
     /** Server-write-zone field: editor passes it back as-is on autosave. */
     agentRunId?: string;
 }

package/lib/services/editor/designToProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"designToProject.d.ts","sourceRoot":"","sources":["../../../src/services/editor/designToProject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,OAAO,EAIR,MAAM,8BAA8B,CAAC;AAGtC;;;;;;;;;;;;;;;;;GAiBG;AAEH,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,UAAU,iBAAkB,SAAQ,cAAc;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,UAAU,gBAAgB;IACxB,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,aAAa,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC/C,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAClD,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA+BD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACzE,OAAO,CA4FT"}
+{"version":3,"file":"designToProject.d.ts","sourceRoot":"","sources":["../../../src/services/editor/designToProject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,OAAO,EAIR,MAAM,8BAA8B,CAAC;AAGtC;;;;;;;;;;;;;;;;;GAiBG;AAEH,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,UAAU,iBAAkB,SAAQ,cAAc;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,UAAU,gBAAgB;IACxB,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,aAAa,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC/C,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAClD,oFAAoF;IACpF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA+BD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACzE,OAAO,CAiGT"}

package/lib/services/editor/designToProject.js

@@ -110,6 +110,10 @@ function designToProject(design, meta) {
         size: { width, height },
         aspect,
         background: editorBackgroundToProject(d.background),
+        // Editor stores master volume as 0–100; canonical project uses 0–1.
+        masterVolume: typeof d.masterVolume === "number"
+            ? Math.max(0, Math.min(100, d.masterVolume)) / 100
+            : 1,
         tracks,
         clips,
         transitions,
@@ -210,8 +214,14 @@ function buildClip(id, trackId, type, base, detail, display, size) {
             if (!text)
                 return null;
             const align = details.align === "left" || details.align === "right" ? details.align : "center";
+            // Mirror of storeToProject (frontend): carry the text-box width into
+            // metadata.boxWidth so the renderer wraps long text within the canvas
+            // instead of overflowing at "max-content" width. Keeps the exported MP4
+            // in sync with the editor preview.
+            const boxWidth = numOr(details.width, 0);
             return {
                 ...common,
+                ...(boxWidth > 0 ? { metadata: { ...cleanMetadata, boxWidth } } : {}),
                 type: "text",
                 text,
                 fontFamily: strOr(details.fontFamily, "Poppins"),

package/lib/services/editor/planToProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planToProject.d.ts","sourceRoot":"","sources":["../../../src/services/editor/planToProject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,OAAO,EAIR,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAchE,OAAO,EAAE,QAAQ,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEpF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAmYhE"}
+{"version":3,"file":"planToProject.d.ts","sourceRoot":"","sources":["../../../src/services/editor/planToProject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,OAAO,EAIR,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAehE,OAAO,EAAE,QAAQ,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEpF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAwZhE"}

package/lib/services/editor/planToProject.helpers.d.ts

@@ -1,5 +1,5 @@
 import type { Provenance, TextClip, Track, Transition } from "../../schemas/project.schema";
-import type { PlannedScene, SceneAssetStrategy, TextOverlay, TransitionKind, VideoPlan } from "../../schemas/videoPlan.schema";
+import type { PlannedScene, SceneAssetStrategy, TextOverlay, TextStylePack, TransitionKind, VideoPlan } from "../../schemas/videoPlan.schema";
 import type { SceneRenderOutcome } from "./planToProject.types";
 /**
  * Pure building blocks for planToProject: track ids, strategy/transition/size
@@ -35,6 +35,12 @@ export declare function provenanceForScene(scene: PlannedScene, outcome: SceneRe
  * of prior scene durations). `sceneDurationMs` clamps any overlay.endMs
  * that overshoots the scene.
  */
-export declare function buildOverlayClipsForScene(sceneIndex: number, offsetMs: number, sceneDurationMs: number, overlays: readonly TextOverlay[], frameHeight: number): TextClip[];
-export declare function makeTrack(id: string, kind: Track["kind"], index: number, name: string): Track;
+export declare function buildOverlayClipsForScene(sceneIndex: number, offsetMs: number, sceneDurationMs: number, overlays: readonly TextOverlay[], frameHeight: number, 
+/**
+ * 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?: TextStylePack): TextClip[];
+export declare function makeTrack(id: string, kind: Track["kind"], index: number, name: string, sourceTrackId?: string): Track;
 //# sourceMappingURL=planToProject.helpers.d.ts.map

package/lib/services/editor/planToProject.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planToProject.helpers.d.ts","sourceRoot":"","sources":["../../../src/services/editor/planToProject.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,SAAS,EACV,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;;;;;GAMG;AAIH,eAAO,MAAM,QAAQ;;;;;;;CASX,CAAC;AASX,wBAAgB,eAAe,CAAC,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAE9D;AAED,iFAAiF;AACjF,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAInD,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAW5F;AAID,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CASjF,CAAC;AAIF,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,kBAAkB,GAAG,SAAS,GACtC,UAAU,CAiBZ;AA4CD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,WAAW,EAAE,MAAM,GAClB,QAAQ,EAAE,CAoCZ;AAED,wBAAgB,SAAS,CACvB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EACnB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,GACX,KAAK,CAWP"}
+{"version":3,"file":"planToProject.helpers.d.ts","sourceRoot":"","sources":["../../../src/services/editor/planToProject.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,cAAc,EACd,SAAS,EACV,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;;;;;GAMG;AAIH,eAAO,MAAM,QAAQ;;;;;;;CASX,CAAC;AASX,wBAAgB,eAAe,CAAC,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAE9D;AAED,iFAAiF;AACjF,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAInD,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAW5F;AAID,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CASjF,CAAC;AAIF,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,kBAAkB,GAAG,SAAS,GACtC,UAAU,CAiBZ;AA4CD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,WAAW,EAAE,MAAM;AACnB;;;;GAIG;AACH,SAAS,CAAC,EAAE,aAAa,GACxB,QAAQ,EAAE,CA2CZ;AAED,wBAAgB,SAAS,CACvB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EACnB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,GACrB,KAAK,CAYP"}

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.91",
+  "version": "1.0.93",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {