zerocut-cli 0.3.3 → 0.4.0

package/README.md

@@ -102,6 +102,7 @@ zerocut config --ott <token> --region <cn|us>   # non-interactive
   - Options:
     - `--prompt <prompt>` (required)
     - `--model <model>` (seedream|seedream-pro|seedream-5l|banana|banana2|banana-pro|wan|wan-pro)
+    - `--type <type>` (default|storyboard|subject-turnaround, default: default)
     - `--aspectRatio <ratio>` (1:1|3:4|4:3|16:9|9:16|2:3|3:2|21:9|1:4|4:1|1:8|8:1)
     - `--resolution <resolution>` (1K|2K|4K)
     - `--refs <img1,img2,...>` (comma-separated paths/URLs)
@@ -158,7 +159,7 @@ zerocut config --ott <token> --region <cn|us>   # non-interactive
 
 ```bash
 # Create an image (default action)
-npx zerocut-cli image --prompt "a cat" --model seedream --aspectRatio 1:1 --resolution 1K --refs ref1.png,ref2.jpg --output out.png
+npx zerocut-cli image --prompt "a cat" --model seedream --type default --aspectRatio 1:1 --resolution 1K --refs ref1.png,ref2.jpg --output out.png
 
 # Create video (default action)
 npx zerocut-cli video --prompt "city night drive" --duration 12 --model vidu --refs frame1.png,frame2.png --resolution 720p --output movie.mp4

package/dist/commands/config.js

@@ -17,6 +17,29 @@ async function ask(question, defaults) {
     const trimmed = answer.trim();
     return trimmed.length > 0 ? trimmed : (defaults ?? "");
 }
+async function exchangeOttAndSave(ott, region) {
+    const base = region === "cn" ? "https://api2.zerocut.cn" : "https://api2.zerocut.art";
+    const resp = await fetch(`${base}/api/open/ott/exchange`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ ott }),
+    });
+    if (!resp.ok) {
+        process.stderr.write(`OTT exchange failed: HTTP ${resp.status}\n`);
+        process.exitCode = 1;
+        return;
+    }
+    const json = (await resp.json());
+    const apiKey = json?.data?.apiKey;
+    if (typeof apiKey !== "string" || apiKey.length === 0) {
+        process.stderr.write("OTT exchange failed: missing data.apiKey in response\n");
+        process.exitCode = 1;
+        return;
+    }
+    (0, config_1.setConfigValueSync)("apiKey", apiKey);
+    (0, config_1.setConfigValueSync)("region", region);
+    process.stdout.write("apiKey set via OTT\n");
+}
 function register(program) {
     const parent = program
         .command("config")
@@ -24,37 +47,38 @@ function register(program) {
         .option("--ott <token>", "One-Time Token (OTT) for fetching API key")
         .option("--region <region>", "Region for OTT exchange: cn|us")
         .action(async function (opts) {
-        const ott = typeof opts.ott === "string" ? opts.ott.trim() : "";
-        const region = typeof opts.region === "string" ? opts.region.trim().toLowerCase() : "";
-        if (!ott)
-            return; // no quick params; fall through to subcommands normally
-        if (region !== "cn" && region !== "us") {
-            process.stderr.write("Invalid or missing --region. Allowed: cn|us\n");
+        const cfg = (0, config_1.readConfigSync)();
+        const regionInput = typeof opts.region === "string" ? opts.region.trim().toLowerCase() : "";
+        let region;
+        if (regionInput === "cn" || regionInput === "us") {
+            region = regionInput;
+        }
+        else if (regionInput.length > 0) {
+            process.stderr.write("Invalid --region. Allowed: cn|us\n");
             process.exitCode = 1;
             return;
         }
-        try {
-            const base = region === "cn" ? "https://api2.zerocut.cn" : "https://api2.zerocut.art";
-            const resp = await fetch(`${base}/api/open/ott/exchange`, {
-                method: "POST",
-                headers: { "content-type": "application/json" },
-                body: JSON.stringify({ ott }),
-            });
-            if (!resp.ok) {
-                process.stderr.write(`OTT exchange failed: HTTP ${resp.status}\n`);
+        else {
+            const defaultRegion = cfg.region === "cn" || cfg.region === "us" ? cfg.region : "us";
+            const regionAnswer = (await ask("Choose region (cn/us)", defaultRegion))
+                .trim()
+                .toLowerCase();
+            if (regionAnswer !== "cn" && regionAnswer !== "us") {
+                process.stderr.write("Invalid region. Allowed: cn|us\n");
                 process.exitCode = 1;
                 return;
             }
-            const json = (await resp.json());
-            const apiKey = json?.data?.apiKey;
-            if (typeof apiKey !== "string" || apiKey.length === 0) {
-                process.stderr.write("OTT exchange failed: missing data.apiKey in response\n");
-                process.exitCode = 1;
-                return;
-            }
-            (0, config_1.setConfigValueSync)("apiKey", apiKey);
-            (0, config_1.setConfigValueSync)("region", region);
-            process.stdout.write("apiKey set via OTT\n");
+            region = regionAnswer;
+        }
+        const ott = typeof opts.ott === "string" ? opts.ott.trim() : "";
+        const ottValue = ott.length > 0 ? ott : (await ask("Enter One-Time Token (OTT)")).trim();
+        if (!ottValue) {
+            process.stderr.write("OTT is required\n");
+            process.exitCode = 1;
+            return;
+        }
+        try {
+            await exchangeOttAndSave(ottValue, region);
         }
         catch (err) {
             process.stderr.write(`OTT exchange failed: ${err.message}\n`);
@@ -84,29 +108,7 @@ function register(program) {
             return;
         }
         try {
-            const base = region === "cn" ? "https://api2.zerocut.cn" : "https://api2.zerocut.art";
-            const resp = await fetch(`${base}/api/open/ott/exchange`, {
-                method: "POST",
-                headers: {
-                    "content-type": "application/json",
-                },
-                body: JSON.stringify({ ott }),
-            });
-            if (!resp.ok) {
-                process.stderr.write(`OTT exchange failed: HTTP ${resp.status}\n`);
-                process.exitCode = 1;
-                return;
-            }
-            const json = (await resp.json());
-            const apiKey = json?.data?.apiKey;
-            if (typeof apiKey !== "string" || apiKey.length === 0) {
-                process.stderr.write("OTT exchange failed: missing data.apiKey in response\n");
-                process.exitCode = 1;
-                return;
-            }
-            (0, config_1.setConfigValueSync)("apiKey", apiKey);
-            (0, config_1.setConfigValueSync)("region", region);
-            process.stdout.write("apiKey set via OTT\n");
+            await exchangeOttAndSave(ott, region);
         }
         catch (err) {
             process.stderr.write(`OTT exchange failed: ${err.message}\n`);

package/dist/commands/image.js

@@ -38,11 +38,13 @@ function register(program) {
         "8:1",
     ];
     const allowedResolutions = ["1K", "2K", "4K"];
-    async function performImageGeneration(session, { prompt, model, aspectRatio, resolution, refsList, output, }) {
+    const allowedTypes = ["default", "storyboard", "subject-turnaround"];
+    async function performImageGeneration(session, { prompt, model, type, aspectRatio, resolution, refsList, output, }) {
         const referenceImages = await Promise.all(refsList.map(async (ref) => ({ url: await (0, cerevox_1.getMaterialUri)(session, ref) })));
         const onProgress = (0, progress_1.createProgressSpinner)("inferencing");
         const payload = {
             model: model || "seedream-5l",
+            type,
             prompt,
             aspect_ratio: aspectRatio,
             resolution,
@@ -95,6 +97,13 @@ function register(program) {
             return;
         }
         const modelArg = (model ?? undefined);
+        const type = typeof opts.type === "string" ? opts.type.trim() : "default";
+        if (!allowedTypes.includes(type)) {
+            process.stderr.write(`Invalid value for --type: ${type}. Allowed: ${allowedTypes.join("|")}\n`);
+            process.exitCode = 1;
+            return;
+        }
+        const typeArg = type;
         const aspectRatio = typeof opts.aspectRatio === "string"
             ? opts.aspectRatio.trim()
             : undefined;
@@ -121,6 +130,7 @@ function register(program) {
         await performImageGeneration(session, {
             prompt,
             model: modelArg,
+            type: typeArg,
             aspectRatio,
             resolution,
             refsList,
@@ -131,6 +141,7 @@ function register(program) {
     parent
         .option("--prompt <prompt>", "Text prompt for image generation (required)")
         .option("--model <model>", `Generator model: ${allowedModels.join("|")}`)
+        .option("--type <type>", `Image type: ${allowedTypes.join("|")}`)
         .option("--aspectRatio <ratio>", `Aspect ratio: ${allowedAspectRatios.join("|")}`)
         .option("--resolution <resolution>", `Resolution: ${allowedResolutions.join("|")}`)
         .option("--refs <refs>", "Comma-separated reference image paths/urls")
@@ -142,6 +153,7 @@ function register(program) {
         .description("Create a new image; requires --prompt")
         .option("--prompt <prompt>", "Text prompt for image generation (required)")
         .option("--model <model>", `Generator model: ${allowedModels.join("|")}`)
+        .option("--type <type>", `Image type: ${allowedTypes.join("|")}`)
         .option("--aspectRatio <ratio>", `Aspect ratio: ${allowedAspectRatios.join("|")}`)
         .option("--resolution <resolution>", `Resolution: ${allowedResolutions.join("|")}`)
         .option("--refs <refs>", "Comma-separated reference image paths/urls")

package/dist/commands/skill.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.description = exports.name = void 0;
 exports.register = register;
 const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 exports.name = "skill";
 exports.description = "Print built-in SKILL.md content";
@@ -16,13 +17,12 @@ function printSkill(relativePath) {
     if (!content.endsWith("\n")) {
         process.stdout.write("\n");
     }
-    const outputPath = node_path_1.default.resolve(process.cwd(), "zerocut-cli/SKILL.md");
-    node_fs_1.default.mkdirSync(node_path_1.default.dirname(outputPath), { recursive: true });
-    node_fs_1.default.writeFileSync(outputPath, content, "utf8");
-    process.stderr.write(`Saved skill markdown to ${outputPath}\n`);
 }
 function register(program) {
-    const parent = program.command("skill").description("Print built-in skill markdown");
+    const parent = program
+        .command("skill")
+        .description("Print built-in skill markdown")
+        .option("--claude", "Append Claude skill save hint");
     parent
         .command("one-click-video")
         .description("Print one-click-video skill markdown")
@@ -35,7 +35,11 @@ function register(program) {
         .action(() => {
         printSkill("../skill/edit-video/SKILL.md");
     });
-    parent.action(() => {
+    parent.action((opts) => {
         printSkill("../skill/SKILL.md");
+        if (opts.claude) {
+            const savePath = node_path_1.default.join(node_os_1.default.homedir(), ".claude", "skills", "zerocut", "SKILL.md");
+            process.stdout.write(`\n⚠️ Please save the markdown above to ${savePath} to create the skill.\n`);
+        }
     });
 }

package/dist/services/cerevox.d.ts

@@ -18,6 +18,7 @@ export declare function syncToTOS(url: string): Promise<string>;
 export declare function runFFMpegCommand(session: Session, command: string, resources?: string[]): Promise<{
     exitCode: number;
     outputFilePath: string;
+    tosUrl: string | undefined;
     data: {
         stdout: string;
         stderr: string | undefined;

package/dist/services/cerevox.js

@@ -193,20 +193,23 @@ async function runFFMpegCommand(session, command, resources = []) {
         cwd: workDir,
     });
     const outputFilePath = trimmedCommand.startsWith("ffmpeg")
-        ? finalCommand.split(" ").pop() || ""
+        ? (finalCommand.split(" ").pop() || "").replace(/^["']|["']$/g, "")
         : "";
     const sandboxFilePath = (0, node_path_2.join)(workDir, outputFilePath);
+    let tosUrl;
     // 等待命令完成
     const result = await response.json();
     if (result.exitCode === 0 && outputFilePath) {
         const savePath = (0, node_path_2.join)(process.cwd(), (0, node_path_1.basename)(outputFilePath));
-        console.log(sandboxFilePath, savePath);
         const files = session.files;
         await files.download(sandboxFilePath, savePath);
+        const sandboxUrl = await getMaterialUri(session, savePath);
+        tosUrl = await syncToTOS(sandboxUrl);
     }
     return {
         exitCode: result.exitCode,
         outputFilePath,
+        tosUrl,
         data: {
             stdout: result.stdout || (!result.exitCode && result.stderr) || "",
             stderr: result.exitCode ? result.stderr : undefined,

package/dist/services/commandLoader.js

@@ -49,6 +49,7 @@ const pandoc_1 = require("../commands/pandoc");
 const skill_1 = require("../commands/skill");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const node_url_1 = require("node:url");
 function loadBuiltInCommands(program) {
     (0, help_1.register)(program);
     (0, config_1.register)(program);
@@ -70,7 +71,8 @@ async function loadExternalCommandsAsync(program, dir) {
     for (const f of files) {
         const full = node_path_1.default.join(d, f);
         try {
-            const mod = (await Promise.resolve(`${full}`).then(s => __importStar(require(s))));
+            const moduleSpecifier = (0, node_url_1.pathToFileURL)(full).href;
+            const mod = (await Promise.resolve(`${moduleSpecifier}`).then(s => __importStar(require(s))));
             const fn = mod.register ?? mod.default;
             if (typeof fn === "function")
                 fn(program);

package/dist/skill/SKILL.md

@@ -102,13 +102,14 @@ Default action: `create`
 
 ```bash
 npx zerocut-cli image --prompt "a cat on a bike" --output out.png
-npx zerocut-cli image create --prompt "a cat on a bike" --model seedream-5l --aspectRatio 1:1 --resolution 1K --refs ref1.png,ref2.jpg --output out.png
+npx zerocut-cli image create --prompt "a cat on a bike" --model seedream-5l --type default --aspectRatio 1:1 --resolution 1K --refs ref1.png,ref2.jpg --output out.png
 ```
 
 Options:
 
 - `--prompt <prompt>` required
 - `--model <model>`
+- `--type <type>`
 - `--aspectRatio <ratio>`
 - `--resolution <resolution>`
 - `--refs <refs>` comma-separated local paths or URLs
@@ -118,6 +119,8 @@ Validation rules:
 
 - `--prompt` must be non-empty
 - `--model` allowed: `seedream|seedream-pro|seedream-5l|banana|banana2|banana-pro|wan|wan-pro`
+- `--type` allowed: `default|storyboard|subject-turnaround`
+- unless user specifies type, default to `default`
 - `--aspectRatio` allowed: `1:1|3:4|4:3|16:9|9:16|2:3|3:2|21:9|1:4|4:1|1:8|8:1`
 - unless user specifies aspect ratio, default to `16:9`
 - `--resolution` allowed: `1K|2K|4K`