reelforge 0.7.0 → 0.8.0

package/dist/commands/create.js

@@ -15,27 +15,8 @@ const IMAGE_UNITS = 3;
 const CHARS_PER_SEC_ZH = 5;
 const TARGET_SEC_PER_SCENE = 8;
 function estimateUnits(body) {
-    let tplType;
-    if (body.frame_template_inline) {
-        if (body.frame_template_type) {
-            tplType = body.frame_template_type;
-        }
-        else {
-            const m = body.frame_template_inline.match(/<meta[^>]+name=["']template:type["'][^>]+content=["']([a-z]+)["']/i);
-            const v = m?.[1].toLowerCase();
-            tplType = v === "static" || v === "asset" || v === "image" ? v : "image";
-        }
-    }
-    else {
-        const tplKey = body.frame_template || "1080x1920/image_default.html";
-        const tplBase = (tplKey.split("/").pop() || "").toLowerCase();
-        tplType = tplBase.startsWith("static_")
-            ? "static"
-            : tplBase.startsWith("asset_")
-                ? "asset"
-                : "image";
-    }
-    // Estimated scene count: from script length (fixed) or from duration (generate).
+    // The standard pipeline now always generates one AI image per scene (the
+    // old static_/asset_ template-type carveouts are gone).
     let estimatedScenes;
     if (body.script) {
         const estSec = body.script.length / CHARS_PER_SEC_ZH;
@@ -45,19 +26,9 @@ function estimateUnits(body) {
         const dur = body.duration ?? 45;
         estimatedScenes = Math.max(2, Math.round(dur / TARGET_SEC_PER_SCENE));
     }
-    const imageUnits = tplType === "image" ? estimatedScenes * IMAGE_UNITS : 0;
-    return PLAN_UNITS + TTS_UNITS + ASR_UNITS + imageUnits;
+    return PLAN_UNITS + TTS_UNITS + ASR_UNITS + estimatedScenes * IMAGE_UNITS;
 }
 // ── Helpers ─────────────────────────────────────────────────────
-function looksLikeLocalHtmlPath(value) {
-    if (/^[.~]|^\//.test(value))
-        return true;
-    if (value.includes("\\"))
-        return true;
-    if (value.endsWith(".html") && fsSync.existsSync(value))
-        return true;
-    return false;
-}
 /** `@file` prefix → load file contents; raw text → return as-is. */
 async function resolveTextOrFile(input) {
     if (input.startsWith("@")) {
@@ -184,32 +155,16 @@ function optsToBody(opts) {
         out.prompt_prefix = opts.promptPrefix;
     if (opts.characterRef !== undefined)
         out.character_ref = opts.characterRef;
-    if (opts.styleRef !== undefined)
-        out.style_ref = opts.styleRef;
     if (opts.voiceId !== undefined)
         out.voice_id = opts.voiceId;
     if (opts.ttsSpeed !== undefined)
         out.tts_speed = opts.ttsSpeed;
     if (opts.videoFps !== undefined)
         out.video_fps = opts.videoFps;
-    if (opts.frameTemplate !== undefined) {
-        if (looksLikeLocalHtmlPath(opts.frameTemplate)) {
-            const abs = path.resolve(opts.frameTemplate);
-            if (!fsSync.existsSync(abs)) {
-                throw new Error(`--frame-template: local file not found: ${abs}`);
-            }
-            out.frame_template_inline = fsSync.readFileSync(abs, "utf-8");
-        }
-        else {
-            out.frame_template = opts.frameTemplate;
-        }
-    }
-    if (opts.frameTemplateSize !== undefined)
-        out.frame_template_size = opts.frameTemplateSize;
-    if (opts.frameTemplateType !== undefined)
-        out.frame_template_type = opts.frameTemplateType;
-    if (opts.templateParams !== undefined)
-        out.template_params = opts.templateParams;
+    if (opts.motion !== undefined)
+        out.motion = opts.motion;
+    if (opts.subtitleStyle !== undefined)
+        out.subtitle_style = opts.subtitleStyle;
     if (opts.subtitleMinChars !== undefined)
         out.subtitle_min_chars = opts.subtitleMinChars;
     if (opts.subtitleHardMax !== undefined)
@@ -336,14 +291,12 @@ export function registerCreate(program) {
         .option("-d, --duration <sec>", "target video duration in seconds (generate mode only; default 45). LLM aims for ~duration × 5 chars of narration.", (v) => parseInt(v, 10))
         .option("-p, --pace <pace>", "visual rhythm hint passed to the LLM: slow | normal | fast (default normal). LLM still decides the actual scene count from semantic structure.")
         // --- Visual ---
-        .option("--frame-template <keyOrPath>", "HTML frame template: preset key (e.g. 1080x1920/image_default.html) OR path to a local .html (auto-sent inline)")
-        .option("--frame-template-size <wxh>", "size for inline HTML when the file lacks <meta template:width|height>, e.g. 1080x1920")
-        .option("--frame-template-type <type>", "inline template type: image (default) | static | asset. Controls whether AI image generation runs per scene.")
-        .option("--image-model <id>", "RelayX image model (rx-image-z | rx-image-flux | rx-image-qwen | rx-image-qwen-edit). Auto-switches to rx-image-qwen-edit when --character-ref or --style-ref is set.")
+        .option("--image-model <id>", "RelayX image model (rx-image-z | rx-image-flux | rx-image-qwen | rx-image-qwen-edit). Auto-switches to rx-image-qwen-edit when --character-ref is set.")
         .option("--prompt-prefix <text>", "raw style prefix prepended to every image prompt (overrides --style)")
         .option("--style <preset>", "image style preset — shortcut for --prompt-prefix; see 'Style presets' below")
         .option("--character-ref <urlOrPath>", "reference image of the main character — locks identity across scenes. URL, data: URI, or local png/jpg/webp path (auto-encoded). Auto-enables rx-image-qwen-edit.")
-        .option("--style-ref <urlOrPath>", "reference image of the overall visual style — locks palette/composition/mood across scenes. Same input formats as --character-ref.")
+        .option("--motion <preset>", "per-scene image animation intensity. See 'Motion presets' below. Default: lite.")
+        .option("--subtitle-style <preset>", "subtitle visual style. See 'Subtitle styles' below. Default: plate.")
         // --- Audio (TTS) ---
         .option("--voice-id <id>", "RelayX TTS voice id (default 专业解说); see `rf tts voices`")
         .option("--tts-speed <n>", "speech speed 0.5..2 (default 1.0)", parseFloat)
@@ -356,14 +309,6 @@ export function registerCreate(program) {
         .option("--subtitle-hard-max <N>", "subtitle line absolute max chars (default 24)", (v) => parseInt(v, 10))
         // --- Output / extra ---
         .option("--video-fps <n>", "output video fps (default 30)", (v) => parseInt(v, 10))
-        .option("--template-params <json>", "extra template placeholders as JSON string", (v) => {
-        try {
-            return JSON.parse(v);
-        }
-        catch {
-            throw new Error(`--template-params: invalid JSON: ${v}`);
-        }
-    })
         // --- Runtime / workflow ---
         .option("--recipe <file>", "load defaults from a JSON recipe file (CLI flags still override)")
         .option("--redo", "replay last successful create from ~/.reelforge/last-create.json")
@@ -385,9 +330,21 @@ export function registerCreate(program) {
         "  fast    split long semantic chunks into multiple shots for variety",
         "",
         "Defaults:",
-        "  duration=45s · pace=normal · frame-template=1080x1920/image_default.html · tts-speed=1.0",
+        "  duration=45s · pace=normal · motion=lite · subtitle-style=plate · tts-speed=1.0",
+        "",
+        "Motion presets (--motion <preset>) — per-scene image animation intensity:",
+        "  off     no motion, hard cuts between scenes — PPT / slideshow mode",
+        "  lite    6% zoom + 0.3s crossfade, 4 sub-anims (default; safe + tasteful)",
+        "  max     20% zoom/pan + 0.5s crossfade, 10 sub-anims (cinematic, more dramatic)",
+        "  · sub-animations are Fisher-Yates shuffled per task_id, so every video",
+        "    cycles a different order — no two videos feel identical.",
         "",
-        "Style presets (--style <preset>) — quick shortcut for --prompt-prefix:",
+        "Subtitle styles (--subtitle-style <preset>):",
+        "  plate    semi-transparent black plate + white text (CapCut default; safest readability)",
+        "  stroke   bold white text with black stroke + shadow, no plate (抖音网红风)",
+        "  cinema   bottom black gradient backdrop + lighter text (film / documentary look)",
+        "",
+        "Image style presets (--style <preset>) — quick shortcut for --prompt-prefix:",
         formatStylePresetsList(),
         "  · Pass --prompt-prefix to override (raw string always wins).",
         "  · Omit both to use the server's configured default style (if any).",
@@ -409,16 +366,17 @@ export function registerCreate(program) {
         "  rf create --script @./script.txt",
         '  rf create --script "整段文案文本..."',
         "",
-        "  # Custom HTML template (auto-detected when --frame-template is a local path)",
-        "  rf create '...' --frame-template ./my-brand.html",
-        "",
-        "  # Pick a built-in style preset",
+        "  # Pick a built-in image style preset",
         '  rf create "..." --style cinematic',
         "",
         "  # Cross-scene character consistency (auto-switches image model)",
         '  rf create "主角小女孩的一天" --character-ref ./hero.png',
-        "  rf create '...' --character-ref ./hero.png --style-ref ./mood.jpg",
-        '  rf create "..." --style-ref https://example.com/style.png',
+        '  rf create "..." --character-ref https://example.com/hero.png',
+        "",
+        "  # Motion + subtitle style combos",
+        '  rf create "..." --motion max --subtitle-style stroke    # 抖音网红风',
+        '  rf create "..." --motion lite --subtitle-style cinema   # 文艺纪录片',
+        '  rf create "..." --motion off                            # PPT 模式（旧行为）',
         "",
         "  # Recipe + replay last",
         "  rf create --recipe ./space.recipe.json",
@@ -448,6 +406,12 @@ export function registerCreate(program) {
         if (opts.pace && !["slow", "normal", "fast"].includes(opts.pace)) {
             throw new Error(`--pace must be one of slow|normal|fast (got: ${opts.pace})`);
         }
+        if (opts.motion && !["off", "lite", "max"].includes(opts.motion)) {
+            throw new Error(`--motion must be one of off|lite|max (got: ${opts.motion})`);
+        }
+        if (opts.subtitleStyle && !["plate", "stroke", "cinema"].includes(opts.subtitleStyle)) {
+            throw new Error(`--subtitle-style must be one of plate|stroke|cinema (got: ${opts.subtitleStyle})`);
+        }
         // 1. Layer defaults: --redo → --recipe → CLI opts → positional topic
         let body = {};
         if (opts.redo) {
@@ -480,19 +444,14 @@ export function registerCreate(program) {
         if (typeof body.script === "string") {
             body.script = await resolveTextOrFile(body.script);
         }
-        // Resolve refs: local file paths → data: URIs (RelayX accepts both
-        // https:// and data: in image_urls). Done after layering so a recipe
-        // can carry refs by path too.
+        // Resolve character ref: local file path → data: URI (RelayX accepts
+        // both https:// and data: in image_urls). Done after layering so a
+        // recipe can carry the ref by path too.
         const resolvedChar = await resolveRefImage(body.character_ref, "--character-ref");
-        const resolvedStyle = await resolveRefImage(body.style_ref, "--style-ref");
         if (resolvedChar !== undefined)
             body.character_ref = resolvedChar;
         else
             delete body.character_ref;
-        if (resolvedStyle !== undefined)
-            body.style_ref = resolvedStyle;
-        else
-            delete body.style_ref;
         // Validate content mode
         const hasTopic = typeof body.topic === "string" && body.topic.trim().length > 0;
         const hasScript = typeof body.script === "string" && body.script.trim().length > 0;
@@ -502,11 +461,8 @@ export function registerCreate(program) {
         if (hasTopic && hasScript) {
             throw new Error("--topic and --script are mutually exclusive (pick one mode).");
         }
-        // 3. Final body — drop empty / null fields
+        // 3. Final body
         const finalBody = { ...body };
-        if (finalBody.frame_template_inline && finalBody.frame_template) {
-            delete finalBody.frame_template;
-        }
         // 4. Estimate cost
         const estimate = estimateUnits(finalBody);
         if (opts.dryRun) {

package/dist/commands/images.js

@@ -1,6 +1,35 @@
+import fs from "node:fs/promises";
+import fsSync from "node:fs";
+import path from "node:path";
 import { post } from "../client.js";
 import { downloadTo } from "../utils/download.js";
 import { print, success } from "../utils/output.js";
+/**
+ * Reference image resolver. Accepts an https:// URL, a data: URI, or a local
+ * file path. Local files are read + base64-encoded into a data: URI so the
+ * server can forward them inside the JSON body — no file-hosting step needed.
+ */
+async function resolveImageRef(input) {
+    const t = input.trim();
+    if (!t)
+        throw new Error("--image: empty value");
+    if (/^https?:\/\//i.test(t) || t.startsWith("data:"))
+        return t;
+    const abs = path.resolve(t);
+    if (!fsSync.existsSync(abs)) {
+        throw new Error(`--image: local file not found: ${abs}`);
+    }
+    const ext = path.extname(abs).toLowerCase();
+    const mime = ext === ".jpg" || ext === ".jpeg" ? "image/jpeg" :
+        ext === ".webp" ? "image/webp" :
+            ext === ".png" ? "image/png" :
+                null;
+    if (!mime) {
+        throw new Error(`--image: unsupported extension ${ext} (use png/jpg/jpeg/webp)`);
+    }
+    const buf = await fs.readFile(abs);
+    return `data:${mime};base64,${buf.toString("base64")}`;
+}
 export function registerImages(program) {
     const images = program
         .command("images")
@@ -8,19 +37,30 @@ export function registerImages(program) {
         .helpOption("-h, --help", "show help");
     images
         .command("generate")
-        .description("Generate an image via RelayX")
+        .description("Generate an image via RelayX (text-to-image or ref-image, depending on model + --image)")
         .helpOption("-h, --help", "show help")
-        .requiredOption("-p, --prompt <text>", "text prompt")
-        .option("-m, --model <id>", "RelayX image model id (rx-image-z | rx-image-flux | rx-image-qwen)")
+        .requiredOption("-p, --prompt <text>", "text prompt. With --image, reference each ref via 「图 N」/「Image N」.")
+        .option("-m, --model <id>", "RelayX image model id (rx-image-z | rx-image-flux | rx-image-qwen | rx-image-qwen-edit)")
         .option("--width <n>", "image width", parseInt)
         .option("--height <n>", "image height", parseInt)
+        .option("-i, --image <urlOrPath>", "reference image, repeatable up to 3 times. URL / data: URI / local png/jpg/webp path (auto-base64'd). Index N-1 maps to 「图 N」in the prompt. Only honored by edit-capable SKUs (rx-image-qwen-edit).", (val, prev) => [...prev, val], [])
         .option("-o, --output <file>", "download first image to this local path")
         .option("--all-output <dir>", "download ALL generated images into this directory")
         .addHelpText("after", [
         "",
         "Examples:",
+        "  # plain text-to-image",
         "  reelforge images generate -p 'a cat' -m rx-image-flux --width 1024 --height 1024 -o cat.png",
-        "  reelforge images generate -p 'cyberpunk city, neon, 9:16' --width 1080 --height 1920 -o city.png",
+        "",
+        "  # ref-image edit (Qwen-Image-Edit), 1 ref local file",
+        "  reelforge images generate -m rx-image-qwen-edit \\",
+        "    -p '保持图1人物，把背景改成雪山黄昏' \\",
+        "    -i ./hero.png -o out.png",
+        "",
+        "  # ref-image edit, 2 refs (URL + local), 「图1」+「图2」",
+        "  reelforge images generate -m rx-image-qwen-edit \\",
+        "    -p '让图1的人物穿上图2的衣服' \\",
+        "    -i https://example.com/person.jpg -i ./outfit.png -o composite.png",
     ].join("\n"))
         .action(async (opts) => {
         const body = { prompt: opts.prompt };
@@ -30,6 +70,12 @@ export function registerImages(program) {
             body.width = opts.width;
         if (opts.height !== undefined)
             body.height = opts.height;
+        if (opts.image && Array.isArray(opts.image) && opts.image.length > 0) {
+            if (opts.image.length > 3) {
+                throw new Error(`--image accepts at most 3 refs (got ${opts.image.length})`);
+            }
+            body.image_urls = await Promise.all(opts.image.map(resolveImageRef));
+        }
         const r = await post("/api/v1/images/generate", body);
         if (opts.output && r.images?.[0]) {
             await downloadTo(r.images[0], opts.output);

package/dist/commands/pipelines.js

@@ -1,6 +1,4 @@
 import fs from "node:fs/promises";
-import fsSync from "node:fs";
-import path from "node:path";
 import { post } from "../client.js";
 import { waitForTask } from "../utils/task-waiter.js";
 import { downloadTo } from "../utils/download.js";
@@ -47,11 +45,11 @@ export function registerPipelines(program) {
         .option("--script <text>", "your own master script text (mode=fixed). Use @file to read from disk.")
         .option("-d, --duration <sec>", "target video duration in seconds (generate mode; default 45)", (v) => parseInt(v, 10))
         .option("-p, --pace <pace>", "visual rhythm hint: slow | normal | fast (default normal)")
-        .option("--frame-template <keyOrPath>", "preset key (e.g. 1080x1920/image_default.html) OR path to a local .html file")
-        .option("--frame-template-size <wxh>", "size for inline HTML when the file lacks <meta template:width|height>")
-        .option("--frame-template-type <type>", "inline type: image (default) | static | asset")
-        .option("--image-model <id>", "RelayX image model (rx-image-z | rx-image-flux | rx-image-qwen)")
+        .option("--motion <preset>", "per-scene image animation: off | lite (default) | max")
+        .option("--subtitle-style <preset>", "subtitle visual style: plate (default) | stroke | cinema")
+        .option("--image-model <id>", "RelayX image model (rx-image-z | rx-image-flux | rx-image-qwen | rx-image-qwen-edit)")
         .option("--prompt-prefix <text>", "style prefix prepended to every image prompt")
+        .option("--character-ref <urlOrPath>", "main character ref for cross-scene identity lock")
         .option("--voice-id <id>", "RelayX TTS voice id (default 专业解说); see `rf tts voices`")
         .option("--tts-speed <n>", "speech speed (0.5..2; default 1.0)", parseFloat)
         .option("--video-fps <n>", "output video fps (default 30)", (v) => parseInt(v, 10))
@@ -64,11 +62,15 @@ export function registerPipelines(program) {
         "  fixed       You supply the script.  --script <text-or-@file>",
         "",
         "Pace (LLM visual rhythm hint):  slow | normal | fast",
+        "Motion (per-scene animation):    off | lite | max",
+        "Subtitle style:                  plate | stroke | cinema",
         "",
         "Examples:",
         "  rf pipelines standard -t 'why we explore space' -d 60 -o space.mp4",
-        "  rf pipelines standard --script @script.txt -p slow -o out.mp4",
-        "  rf pipelines standard -t '宠物' --frame-template ./my-brand.html -o final.mp4",
+        "  rf pipelines standard --script @script.txt -p slow --motion max -o out.mp4",
+        "  rf pipelines standard -t '宠物' --motion lite --subtitle-style cinema -o final.mp4",
+        "",
+        "Tip: `rf create` is a more ergonomic wrapper around the same endpoint.",
     ].join("\n"))).action(async (opts) => {
         const hasTopic = typeof opts.topic === "string" && opts.topic.length > 0;
         const hasScript = typeof opts.script === "string" && opts.script.length > 0;
@@ -81,24 +83,28 @@ export function registerPipelines(program) {
         if (opts.pace && !["slow", "normal", "fast"].includes(opts.pace)) {
             throw new Error(`--pace must be one of slow|normal|fast (got: ${opts.pace})`);
         }
+        if (opts.motion && !["off", "lite", "max"].includes(opts.motion)) {
+            throw new Error(`--motion must be one of off|lite|max (got: ${opts.motion})`);
+        }
+        if (opts.subtitleStyle && !["plate", "stroke", "cinema"].includes(opts.subtitleStyle)) {
+            throw new Error(`--subtitle-style must be one of plate|stroke|cinema (got: ${opts.subtitleStyle})`);
+        }
         let topic = opts.topic;
         let script = opts.script;
         if (topic?.startsWith("@"))
             topic = await fs.readFile(topic.slice(1), "utf-8");
         if (script?.startsWith("@"))
             script = await fs.readFile(script.slice(1), "utf-8");
-        const tpl = opts.frameTemplate
-            ? resolveTemplateArg(opts.frameTemplate, opts.frameTemplateSize)
-            : {};
         await submitAndMaybeWait("/api/v1/pipelines/standard", {
             topic,
             script,
             duration: opts.duration,
             pace: opts.pace,
-            ...tpl,
-            frame_template_type: opts.frameTemplateType,
+            motion: opts.motion,
+            subtitle_style: opts.subtitleStyle,
             image_model: opts.imageModel,
             prompt_prefix: opts.promptPrefix,
+            character_ref: opts.characterRef,
             voice_id: opts.voiceId,
             tts_speed: opts.ttsSpeed,
             video_fps: opts.videoFps,
@@ -107,14 +113,3 @@ export function registerPipelines(program) {
         }, { wait: opts.wait, output: opts.output, pollMs: opts.pollMs, timeoutMs: opts.timeoutMs });
     });
 }
-function resolveTemplateArg(value, size) {
-    if (/^[.~]|^\//.test(value) || value.includes("\\") || (value.endsWith(".html") && fsSync.existsSync(value))) {
-        const abs = path.resolve(value);
-        if (!fsSync.existsSync(abs)) {
-            throw new Error(`Local template not found: ${abs}`);
-        }
-        const html = fsSync.readFileSync(abs, "utf-8");
-        return size ? { frame_template_inline: html, frame_template_size: size } : { frame_template_inline: html };
-    }
-    return { frame_template: value };
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reelforge",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "CLI for ReelForge Studio — AI video engine. Installs as both `reelforge` and the short alias `rf`. Every REST API exposed as a command, with --help on every level.",
   "license": "Apache-2.0",
   "type": "module",