@flatkey-ai/cli 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatkey-ai/cli",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Flatkey media generation CLI for image, video, audio, credits, status, and models.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -15,6 +15,28 @@ const COMMANDS = new Set([
 ]);
 
 const GROUP_ACTIONS = new Set(["audio", "auth", "image", "text", "video"]);
+const GLOBAL_OPTIONS = new Set(["api_key", "base_url", "dry_run", "help", "json", "output", "out"]);
+const COMMAND_OPTIONS = {
+  "audio generate": new Set(["model", "prompt", "similarity_boost", "stability", "style", "voice_id"]),
+  "audio music": new Set(["music_length_ms", "prompt"]),
+  "audio sfx": new Set(["duration", "prompt"]),
+  "audio voices": new Set([]),
+  "auth status": new Set([]),
+  credits: new Set([]),
+  help: new Set(["ai", "command"]),
+  image: new Set([]),
+  "image generate": new Set(["model", "n", "prompt", "quality", "size"]),
+  login: new Set(["console_url", "no_open", "open"]),
+  logout: new Set([]),
+  models: new Set(["type"]),
+  onboard: new Set(["api_key"]),
+  status: new Set([]),
+  text: new Set([]),
+  "text generate": new Set(["model", "prompt"]),
+  version: new Set([]),
+  video: new Set([]),
+  "video generate": new Set(["aspect", "duration", "fps", "model", "prompt", "ratio", "resolution"]),
+};
 
 export function parseArgv(argv) {
   const [group, maybeAction, ...rest] = argv;
@@ -31,11 +53,11 @@ export function parseArgv(argv) {
     throw new Error(`Unknown command: ${group}`);
   }
   if (group === "help" && maybeAction && !maybeAction.startsWith("--")) {
-    return {
+    return validateCommandOptions({
       group: "help",
       action: undefined,
       options: { command: maybeAction, ...parseOptions(rest) },
-    };
+    });
   }
 
   const hasAction = GROUP_ACTIONS.has(group);
@@ -50,21 +72,21 @@ export function parseArgv(argv) {
   const hasHelpOption = optionTokens.some((token) => token === "--help" || token === "-h")
     || (optionTokens.length === 1 && optionTokens[0] === "help");
   if (hasHelpOption) {
-    return {
+    return validateCommandOptions({
       group,
       action,
       options: {
         ...parseOptions(optionTokens.filter((token) => token !== "help" && token !== "--help" && token !== "-h")),
         help: true,
       },
-    };
+    });
   }
 
-  return {
+  return validateCommandOptions({
     group,
     action,
     options: parseOptions(optionTokens),
-  };
+  });
 }
 
 function isHelpToken(token) {
@@ -99,6 +121,20 @@ function parseOptions(tokens) {
   return options;
 }
 
+function validateCommandOptions(command) {
+  const key = command.action ? `${command.group} ${command.action}` : command.group;
+  const allowed = COMMAND_OPTIONS[key] ?? new Set();
+  for (const option of Object.keys(command.options)) {
+    if (GLOBAL_OPTIONS.has(option) || allowed.has(option)) continue;
+    const flag = `--${option.replaceAll("_", "-")}`;
+    const helpCommand = command.action
+      ? `flatkey ${command.group} ${command.action} --help`
+      : `flatkey ${command.group} --help`;
+    throw new Error(`Unknown option ${flag} for flatkey ${key}. Run \`${helpCommand}\` to see supported options.`);
+  }
+  return command;
+}
+
 export async function main(argv) {
   const command = parseArgv(argv);
   if (command.options.help) {
@@ -183,7 +219,8 @@ async function handleLogin(command, deps) {
   const { createDeviceAuthorization, pollDeviceAuthorization } = await import("./api.js");
   const deviceId = await ensureDeviceId({ configDir: deps.configDir });
   const version = await readPackageVersion();
-  const consoleUrl = command.options.console_url;
+  const env = deps.env ?? process.env;
+  const consoleUrl = command.options.console_url ?? env.CONSOLE_ORIGIN;
   const authorization = await createDeviceAuthorization({
     consoleUrl,
     deviceId,
@@ -349,7 +386,7 @@ async function handleGenerate(command, deps) {
   const options = {
     ...command.options,
     apiKey,
-    baseUrl: command.options.base_url,
+    baseUrl: command.options.base_url ?? (deps.env ?? process.env).ROUTER_ORIGIN,
     fetch: deps.fetch,
   };
   if (command.options.dry_run) {
@@ -431,7 +468,7 @@ async function handleVoices(command, deps) {
   });
   return getVoices({
     apiKey,
-    baseUrl: command.options.base_url,
+    baseUrl: command.options.base_url ?? (deps.env ?? process.env).ROUTER_ORIGIN,
     fetch: deps.fetch,
   });
 }
@@ -483,7 +520,7 @@ async function handleUtility(command, deps) {
   });
   const options = {
     apiKey,
-    baseUrl: command.options.base_url,
+    baseUrl: command.options.base_url ?? (deps.env ?? process.env).CONSOLE_ORIGIN,
     fetch: deps.fetch,
   };
   return command.group === "credits" ? getCredits(options) : getStatus(options);
@@ -501,7 +538,7 @@ async function handleModels(command, deps) {
     });
     const response = await getModels({
       apiKey,
-      baseUrl: command.options.base_url,
+      baseUrl: command.options.base_url ?? (deps.env ?? process.env).CONSOLE_ORIGIN,
       fetch: deps.fetch,
     });
     const models = normalizeModels(response, command.options.type);

package/src/help.js

@@ -31,6 +31,8 @@ Commands:
 
 Environment:
 - FLATKEY_API_KEY: Flatkey API key.
+- ROUTER_ORIGIN: Override generation router origin, e.g. staging router.
+- CONSOLE_ORIGIN: Override console API origin, e.g. staging console.
 - Default router: https://router.flatkey.ai
 
 Recovery:
@@ -65,6 +67,10 @@ Global options:
   --json                         Print machine-readable JSON
   --output, -o <file>             Write generated output to a local file
   --base-url <url>               Override Flatkey router URL
+
+Environment:
+  ROUTER_ORIGIN                  Override generation router origin
+  CONSOLE_ORIGIN                 Override console API origin
   --console-url <url>            Override Flatkey console URL for login
 
 Video options: