zerocut-cli 0.3.2 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zerocut-cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "ZeroCut CLI: AI assistant CLI for creating and editing images/audio/video",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/config.ts

@@ -14,6 +14,30 @@ async function ask(question: string, defaults?: string): Promise<string> {
   return trimmed.length > 0 ? trimmed : (defaults ?? "");
 }
 
+async function exchangeOttAndSave(ott: string, region: "cn" | "us"): Promise<void> {
+  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()) as { data?: { apiKey?: string } };
+  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;
+  }
+  setConfigValueSync("apiKey", apiKey);
+  setConfigValueSync("region", region);
+  process.stdout.write("apiKey set via OTT\n");
+}
+
 export function register(program: Command): void {
   const parent = program
     .command("config")
@@ -21,36 +45,36 @@ export function register(program: Command): void {
     .option("--ott <token>", "One-Time Token (OTT) for fetching API key")
     .option("--region <region>", "Region for OTT exchange: cn|us")
     .action(async function (this: Command, opts: { ott?: string; region?: string }) {
-      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 = readConfigSync() as { region?: unknown };
+      const regionInput = typeof opts.region === "string" ? opts.region.trim().toLowerCase() : "";
+      let region: "cn" | "us";
+      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()) as { data?: { apiKey?: string } };
-        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;
-        }
-        setConfigValueSync("apiKey", apiKey);
-        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 as Error).message}\n`);
         process.exitCode = 1;
@@ -82,32 +106,7 @@ export function register(program: Command): void {
         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()) as {
-          data?: { apiKey?: string };
-          [k: string]: unknown;
-        };
-        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;
-        }
-        setConfigValueSync("apiKey", apiKey);
-        setConfigValueSync("region", region);
-        process.stdout.write("apiKey set via OTT\n");
+        await exchangeOttAndSave(ott, region);
       } catch (err) {
         process.stderr.write(`OTT exchange failed: ${(err as Error).message}\n`);
         process.exitCode = 1;

package/src/commands/skill.ts

@@ -1,5 +1,6 @@
 import type { Command } from "commander";
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 
 export const name = "skill";
@@ -15,7 +16,10 @@ function printSkill(relativePath: string): void {
 }
 
 export function register(program: Command): void {
-  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")
@@ -31,10 +35,13 @@ export function register(program: Command): void {
       printSkill("../skill/edit-video/SKILL.md");
     });
 
-  parent.action(() => {
+  parent.action((opts: { claude?: boolean }) => {
     printSkill("../skill/SKILL.md");
-    process.stdout.write(
-      "\nPlease save the markdown above to zerocut/SKILL.md to create the skill.\n"
-    );
+    if (opts.claude) {
+      const savePath = path.join(os.homedir(), ".claude", "skills", "zerocut", "SKILL.md");
+      process.stdout.write(
+        `\n⚠️ Please save the markdown above to ${savePath} to create the skill.\n`
+      );
+    }
   });
 }

package/src/services/commandLoader.ts

@@ -10,6 +10,7 @@ import { register as registerPandoc } from "../commands/pandoc";
 import { register as registerSkill } from "../commands/skill";
 import fs from "node:fs";
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 
 export function loadBuiltInCommands(program: Command): void {
   registerHelp(program);
@@ -31,7 +32,8 @@ export async function loadExternalCommandsAsync(program: Command, dir?: string):
   for (const f of files) {
     const full = path.join(d, f);
     try {
-      const mod = (await import(full)) as {
+      const moduleSpecifier = pathToFileURL(full).href;
+      const mod = (await import(moduleSpecifier)) as {
         register?: (p: Command) => void;
         default?: (p: Command) => void;
       };