@mevdragon/vidfarm-devcli 0.7.0 → 0.7.1

package/dist/src/app.js

@@ -21,6 +21,7 @@ import { writeForkManifest } from "./services/fork-manifest.js";
 import { renderHelpPage } from "./help-page.js";
 import { renderHomepage } from "./homepage.js";
 import { COMPOSITION_RUNTIME_SCRIPT_BODY } from "./composition-runtime.js";
+import { KEN_BURNS_CSS, KEN_BURNS_STYLE_MARKER } from "./hyperframes/composition.js";
 import { normalizeCompositionZIndexHtml, sanitizeCompositionHtml } from "./services/composition-sanitize.js";
 import { applyMarkupUsd } from "./services/billing-pricing.js";
 import { primitiveRegistry } from "./primitive-registry.js";
@@ -4140,6 +4141,8 @@ function createEditorActionTool() {
             background_style: z.enum(["plain", "outline", "highlight-solid", "highlight-translucent"]).optional().describe("Text background treatment."),
             object_fit: z.string().optional().describe("CSS object-fit for image/video (cover, contain, fill, none, scale-down)."),
             object_position: z.string().optional().describe("CSS object-position for image/video (e.g., center, top, bottom left)."),
+            ken_burns: z.enum(["zoom-in", "zoom-out", "pan-left", "pan-right", "pan-up", "pan-down", "zoom-in-left", "zoom-in-right", "none"]).optional().describe("Ken Burns motion for still-image layers: a slow pan/zoom spanning the clip's full duration. Apply with set_layer_media on an existing image, or seed it on add_layer/generate_layer when kind/media_type is image. 'none' removes the effect. When the user says 'animate the images' / 'ken burns', apply it to every still image, varying presets across adjacent clips (zoom-in, pan-left, zoom-out, ...) for a documentary feel."),
+            ken_burns_intensity: z.number().optional().describe("Ken Burns strength: extra zoom / pan travel as a fraction of the frame, 0.04-0.5 (default 0.18; ~0.1 subtle, ~0.3 dramatic). Only meaningful alongside ken_burns."),
             volume: z.number().optional().describe("Volume 0..1 for audio/video."),
             muted: z.boolean().optional().describe("Toggle mute on audio/video."),
             group_label: z.string().optional().describe("Optional label for group_layers."),
@@ -4514,6 +4517,21 @@ function rewriteHyperframesDraftCompositionHtml(html, draftPath) {
             rewritten = `${rewritten}\n${runtimeTag}`;
         }
     }
+    // Ken Burns keyframes: always available in the editor iframe so toggling
+    // data-kenburns on a layer animates immediately, even for compositions
+    // stored before the builder embedded the stylesheet.
+    if (!rewritten.includes(KEN_BURNS_STYLE_MARKER)) {
+        const kenBurnsTag = `<style data-vf-kenburns="true">${KEN_BURNS_CSS}</style>`;
+        if (/<\/head>/i.test(rewritten)) {
+            rewritten = rewritten.replace(/<\/head>/i, `${kenBurnsTag}\n</head>`);
+        }
+        else if (/<\/body>/i.test(rewritten)) {
+            rewritten = rewritten.replace(/<\/body>/i, `${kenBurnsTag}\n</body>`);
+        }
+        else {
+            rewritten = `${rewritten}\n${kenBurnsTag}`;
+        }
+    }
     return rewritten;
 }
 async function renderHyperframesStudioEditorPage(input) {
@@ -4806,7 +4824,10 @@ function buildTemplateHomepageEntry(template) {
     if (!template.videoUrl)
         return null;
     const isPrivate = template.visibility === "private";
-    const title = isPrivate ? (template.title || template.id) : template.id;
+    // Older records stored the source host ("youtube.com") as a title fallback —
+    // never show that as a card title; the template id is the canonical default.
+    const storedTitle = template.title && template.title !== template.sourceHost ? template.title : null;
+    const title = isPrivate ? (storedTitle || template.id) : template.id;
     const previewUrl = template.thumbnailUrl || template.videoUrl || null;
     return {
         title,
@@ -4842,26 +4863,213 @@ const DISCOVER_SUBMISSION_HOSTS = [
 function isSupportedDiscoverSubmissionHost(host) {
     return DISCOVER_SUBMISSION_HOSTS.some((allowed) => host === allowed || host.endsWith(`.${allowed}`));
 }
-// Discover "Add Template": ingest a social video URL as a PRIVATE inspiration
-// owned by the caller. The download job runs async; /discover/feed finalizes
-// it and mints the private template once the video lands.
-app.post("/discover/templates", async (c) => {
+// Upload cap for "Add Template → upload a video". Generous relative to the
+// 50 MB My Files cap because template sources are full short-form videos; the
+// bytes go straight to S3 via presigned PUT, never through a Lambda body.
+const INSPIRATION_UPLOAD_MAX_BYTES = 200 * 1024 * 1024;
+function isUploadableInspirationVideo(fileName, contentType) {
+    if (contentType.startsWith("video/"))
+        return true;
+    return [".mp4", ".m4v", ".mov", ".webm"].includes(path.extname(fileName).toLowerCase());
+}
+function isOwnInspirationUploadKey(storageKey, customerId) {
+    return storageKey.startsWith(`users/${customerId}/inspiration-uploads/`);
+}
+// Discover "Add Template" (upload, step 1 of 3): mint a write target for a
+// local video file. Contract shared by web + devcli: presign here (JSON), PUT
+// (or multipart-fallback POST) the bytes, then POST /discover/templates with
+// { upload: { storage_key, file_name } } to queue the ingest. In `vidfarm
+// serve` cloud-passthrough mode this proxies upstream so the client PUTs
+// straight to cloud S3 and the ingest lands in the cloud account — multipart
+// bodies can't proxy (text-only proxy), so proxying the presign avoids ever
+// needing to.
+app.post("/discover/templates/upload/presign", async (c) => {
     const customer = await requireBrowserCustomer(c);
     if (!customer)
         return c.json({ ok: false, error: "Log in to add templates." }, 401);
-    // Cloud passthrough (vidfarm serve): Add Template ingests into the CLOUD
-    // account — the download job, billing, and catalog entry all live upstream,
-    // and the proxied /discover/feed finalizes it. Local ingest only happens
-    // when no upstream key is configured.
     if (hasUpstreamKey()) {
         const proxied = await proxyRequestToUpstream(c);
         if (proxied)
             return proxied;
     }
     const body = asRecord(await c.req.json().catch(() => ({}))) ?? {};
+    const fileName = sanitizeFileName(readNonEmptyString(body.file_name) ?? "upload.mp4");
+    const contentType = readNonEmptyString(body.content_type) ?? inferAttachmentContentType(fileName);
+    if (!isUploadableInspirationVideo(fileName, contentType)) {
+        return c.json({ ok: false, error: "Upload a video file (MP4, MOV, or WebM)." }, 400);
+    }
+    const sizeBytes = Number(body.size_bytes);
+    if (Number.isFinite(sizeBytes) && sizeBytes > INSPIRATION_UPLOAD_MAX_BYTES) {
+        return c.json({ ok: false, error: "Video uploads can be at most 200 MB." }, 400);
+    }
+    const uploadId = randomUUID();
+    const storageKey = storage.inspirationUploadKey(customer.id, uploadId, fileName);
+    if (config.STORAGE_DRIVER !== "s3") {
+        return c.json({
+            transport: "server",
+            upload_id: uploadId,
+            file_name: fileName,
+            content_type: contentType,
+            storage_key: storageKey,
+            upload: {
+                method: "POST",
+                url: "/discover/templates/upload",
+                form_field: "file"
+            }
+        });
+    }
+    const upload = await storage.createWriteUrl(storageKey, { contentType, expiresIn: 3600 });
+    return c.json({
+        transport: "presigned",
+        upload_id: uploadId,
+        file_name: fileName,
+        content_type: contentType,
+        storage_key: storageKey,
+        upload: {
+            method: upload.method,
+            url: upload.url,
+            headers: upload.headers,
+            expires_in_seconds: upload.expiresIn
+        }
+    });
+});
+// Upload step 2 (multipart fallback): only used when presign returned
+// transport "server" — i.e. the local storage driver (vidfarm serve without
+// S3). Deliberately not proxied upstream: the upstream proxy is text-only,
+// and in passthrough mode the presign already handed the client a direct
+// cloud target.
+app.post("/discover/templates/upload", async (c) => {
+    const customer = await requireBrowserCustomer(c);
+    if (!customer)
+        return c.json({ ok: false, error: "Log in to add templates." }, 401);
+    const formData = await c.req.formData().catch(() => null);
+    const file = formData?.get("file");
+    if (!isFormFile(file))
+        return c.json({ ok: false, error: "Select a video file to upload." }, 400);
+    const fileName = sanitizeFileName(file.name || "upload.mp4");
+    const contentType = file.type || inferAttachmentContentType(fileName);
+    if (!isUploadableInspirationVideo(fileName, contentType)) {
+        return c.json({ ok: false, error: "Upload a video file (MP4, MOV, or WebM)." }, 400);
+    }
+    const buffer = Buffer.from(await file.arrayBuffer());
+    if (buffer.byteLength > INSPIRATION_UPLOAD_MAX_BYTES) {
+        return c.json({ ok: false, error: "Video uploads can be at most 200 MB." }, 400);
+    }
+    const uploadId = randomUUID();
+    const storageKey = storage.inspirationUploadKey(customer.id, uploadId, fileName);
+    const stored = await storage.putBuffer(storageKey, buffer, contentType);
+    return c.json({
+        ok: true,
+        storage_key: storageKey,
+        file_name: fileName,
+        content_type: contentType,
+        size_bytes: buffer.byteLength,
+        url: stored.url
+    }, 201);
+});
+// Discover "Add Template": ingest a social video URL — or a video the caller
+// just uploaded via the presign/upload pair above — as a PRIVATE inspiration
+// owned by the caller. The download/ingest job runs async; /discover/feed
+// finalizes it and mints the private template once the video lands.
+app.post("/discover/templates", async (c) => {
+    const customer = await requireBrowserCustomer(c);
+    if (!customer)
+        return c.json({ ok: false, error: "Log in to add templates." }, 401);
+    const body = asRecord(await c.req.json().catch(() => ({}))) ?? {};
+    const uploadRef = asRecord(body.upload);
+    const uploadStorageKey = readNonEmptyString(uploadRef?.storage_key);
+    // Cloud passthrough (vidfarm serve): Add Template ingests into the CLOUD
+    // account — the download/ingest job, billing, and catalog entry all live
+    // upstream, and the proxied /discover/feed finalizes it. The one exception:
+    // an upload key minted by THIS box (local presign fallback while upstream
+    // was unreachable) — its bytes only exist locally, so ingest locally.
+    if (hasUpstreamKey() && !(uploadStorageKey && isOwnInspirationUploadKey(uploadStorageKey, customer.id))) {
+        const proxied = await proxyRequestToUpstream(c);
+        if (proxied)
+            return proxied;
+    }
+    if (uploadStorageKey) {
+        if (!isOwnInspirationUploadKey(uploadStorageKey, customer.id)) {
+            return c.json({ ok: false, error: "That upload doesn't belong to this account." }, 403);
+        }
+        const uploadUrl = storage.getPublicUrl(uploadStorageKey);
+        if (!uploadUrl)
+            return c.json({ ok: false, error: "Uploaded video could not be resolved." }, 400);
+        const explicitTitle = readNonEmptyString(body.title) ?? null;
+        const tagline = readNonEmptyString(body.tagline) ?? readNonEmptyString(body.trend_tagline) ?? null;
+        const notes = readNonEmptyString(body.notes) ?? null;
+        const uploadFileName = readNonEmptyString(uploadRef?.file_name) ?? null;
+        const primitive = primitiveRegistry.get("primitive:video_ingest");
+        if (!primitive)
+            return c.json({ ok: false, error: "Video ingest primitive not available" }, 500);
+        const operation = primitive.operations["run"];
+        if (!operation)
+            return c.json({ ok: false, error: "Video ingest operation not available" }, 500);
+        // Only a caller-chosen title flows into the manifest — never the file
+        // name. An untitled upload finalizes with title null so its /discover
+        // card displays the minted template id.
+        const payload = operation.inputSchema.parse({
+            source_video_url: uploadUrl,
+            title: explicitTitle ?? tagline ?? undefined,
+            file_name: uploadFileName ?? undefined,
+            save_manifest: true
+        });
+        let job;
+        try {
+            await assertWalletCanQueueJobs(customer.id);
+            job = await jobs.createRootJob({
+                templateId: primitive.id,
+                operationName: "run",
+                workflowName: operation.workflow,
+                tracer: `discover_template_upload:${customer.id}`,
+                payload,
+                webhookUrl: null,
+                customer,
+                providerHint: undefined
+            });
+        }
+        catch (error) {
+            if (error instanceof InsufficientWalletFundsError)
+                return insufficientFundsResponse(c, error);
+            if (error instanceof ActiveJobLimitExceededError)
+                return activeJobLimitExceededResponse(c, error);
+            throw error;
+        }
+        // No Step Functions worker on a local (vidfarm serve) box — run the ingest
+        // in-process, detached, exactly like local renders. /discover/feed polls
+        // finalize the inspiration when the job lands.
+        if (!config.VIDFARM_JOB_STATE_MACHINE_ARN) {
+            void runPrimitiveJobInProcess(job.id).catch((error) => {
+                console.error("local video ingest failed", job.id, error instanceof Error ? error.message : error);
+            });
+        }
+        // Every upload key is unique (uuid segment), so no dedupe pass: two
+        // uploads of the same file are two intentional inspirations.
+        let inspiration = await serverlessRecords.createInspiration({
+            customerId: customer.id,
+            sourceUrl: uploadUrl,
+            originalUrl: uploadUrl,
+            sourceHost: "upload",
+            downloadJobId: job.id,
+            trendTagline: tagline,
+            visibility: "private",
+            notes
+        });
+        // Pending-card label while the ingest runs: explicit title, else the file
+        // name. Finalize overwrites this from the manifest, so an untitled upload
+        // ends at title null → the card shows the minted template id.
+        const pendingTitle = explicitTitle ?? uploadFileName;
+        if (pendingTitle) {
+            inspiration = (await serverlessRecords.updateInspiration({
+                inspirationId: inspiration.id,
+                patch: { title: pendingTitle }
+            })) ?? inspiration;
+        }
+        return c.json(serializeInspiration(inspiration), 202);
+    }
     const sourceUrl = readNonEmptyString(body.source_url);
     if (!sourceUrl)
-        return c.json({ ok: false, error: "Enter a video URL." }, 400);
+        return c.json({ ok: false, error: "Enter a video URL or upload a video file." }, 400);
     const originalUrl = stripTrackingParams(sourceUrl);
     const sourceHost = safeUrlHostname(originalUrl);
     if (!sourceHost)
@@ -4908,6 +5116,13 @@ app.post("/discover/templates", async (c) => {
             return activeJobLimitExceededResponse(c, error);
         throw error;
     }
+    // Same local-box treatment as the upload branch: no Step Functions worker
+    // means the download job must run in-process or it queues forever.
+    if (!config.VIDFARM_JOB_STATE_MACHINE_ARN) {
+        void runPrimitiveJobInProcess(job.id).catch((error) => {
+            console.error("local video download failed", job.id, error instanceof Error ? error.message : error);
+        });
+    }
     const inspiration = await serverlessRecords.createInspiration({
         customerId: customer.id,
         sourceUrl,
@@ -4975,13 +5190,21 @@ app.delete("/discover/templates/:entryId", async (c) => {
 // client-side via status.
 function buildPendingInspirationHomepageEntry(inspiration) {
     return {
-        title: inspiration.trendTagline || inspiration.title || inspiration.sourceHost || "New template",
+        // Uploads: explicit title (or file name, stored at submit time) outranks
+        // the tagline; URL ingests keep tagline-first.
+        title: (inspiration.sourceHost === "upload"
+            ? (inspiration.title || inspiration.trendTagline)
+            : (inspiration.trendTagline || inspiration.title)) || inspiration.sourceHost || "New template",
         templateId: inspiration.id,
         slugId: inspiration.id,
         difficulty: "easy",
         viralDna: inspiration.status === "failed"
-            ? (inspiration.errorMessage || "Video download failed. Check the URL and try adding it again.")
-            : (inspiration.notes || "Downloading the source video. This card unlocks automatically once it's ready."),
+            ? (inspiration.errorMessage || (inspiration.sourceHost === "upload"
+                ? "Video ingest failed. Try uploading the file again."
+                : "Video download failed. Check the URL and try adding it again."))
+            : (inspiration.notes || (inspiration.sourceHost === "upload"
+                ? "Processing your uploaded video. This card unlocks automatically once it's ready."
+                : "Downloading the source video. This card unlocks automatically once it's ready.")),
         previewUrl: inspiration.thumbnailUrl || "",
         approvedAt: inspiration.createdAt,
         sourceType: inspiration.sourceHost || "social",
@@ -7781,8 +8004,15 @@ app.get(`${COMPOSITIONS_PREFIX}/:forkId/versions`, async (c) => {
         const limit = Number.parseInt(c.req.query("limit") ?? "25", 10);
         const cursor = c.req.query("cursor") ?? null;
         const page = await serverlessRecords.listForkVersions({ forkId: access.fork.id, limit, cursor });
+        // Fork content is world-viewable, but the snapshot trail is personal.
+        // /editor parks users without their own fork on the template's shared
+        // default fork, so without this scoping the History modal would list the
+        // fork owner's (i.e. another user's) publish/decompose history.
+        const visible = access.capabilities.isOwner
+            ? page.items
+            : page.items.filter((version) => Boolean(customer && version.createdBy === customer.id));
         return c.json({
-            versions: page.items.map(serializeVersion),
+            versions: visible.map(serializeVersion),
             next_cursor: page.nextCursor
         });
     }
@@ -7945,7 +8175,14 @@ async function finalizeInspirationIfReady(inspiration) {
                 customerId: ready.customerId,
                 originalUrl: ready.originalUrl,
                 sourceHost: ready.sourceHost,
-                title: ready.trendTagline || ready.title || ready.sourceHost || "Untitled",
+                // No host/"Untitled" fallback: a template without an explicit title or
+                // tagline displays as its template id on /discover. For uploads the
+                // manifest title IS the caller's explicit title, so it outranks the
+                // tagline; URL ingests keep tagline-first (manifest title is just the
+                // social post's own caption).
+                title: (ready.sourceHost === "upload"
+                    ? (ready.title || ready.trendTagline)
+                    : (ready.trendTagline || ready.title)) || null,
                 thumbnailUrl: ready.thumbnailUrl,
                 videoUrl: ready.videoUrl,
                 durationSeconds: ready.durationSeconds,