@flatkey-ai/cli 0.1.11 → 0.1.13

package/package.json

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

package/src/cli.js

@@ -215,14 +215,17 @@ export async function runCommand(command, deps = {}) {
 }
 
 async function handleLogin(command, deps) {
-  const { ensureDeviceId, writeAuthConfig } = await import("./config.js");
+  const { ensureDeviceId, resolveOrigins, writeAuthConfig } = await import("./config.js");
   const { createDeviceAuthorization, pollDeviceAuthorization } = await import("./api.js");
   const deviceId = await ensureDeviceId({ configDir: deps.configDir });
   const version = await readPackageVersion();
-  const env = deps.env ?? process.env;
-  const consoleUrl = firstNonEmpty(command.options.console_url, env.CONSOLE_ORIGIN);
+  const { consoleOrigin } = await resolveOrigins({
+    consoleUrl: command.options.console_url,
+    env: deps.env ?? process.env,
+    configDir: deps.configDir,
+  });
   const authorization = await createDeviceAuthorization({
-    consoleUrl,
+    consoleUrl: consoleOrigin,
     deviceId,
     clientName: "flatkey-cli",
     clientVersion: version,
@@ -246,7 +249,7 @@ async function handleLogin(command, deps) {
   while (Date.now() < deadline) {
     await delay(nextLoginPollDelay(startedAt, initialIntervalMs), deps);
     const poll = await pollDeviceAuthorization({
-      consoleUrl,
+      consoleUrl: consoleOrigin,
       deviceCode: data.device_code,
       fetch: deps.fetch,
     });
@@ -352,10 +355,10 @@ async function handleAuthStatus(command, deps) {
     authenticated: Boolean(apiKey),
     source: command.options.api_key
       ? "option"
-      : (deps.env ?? process.env).FLATKEY_API_KEY
-        ? "env"
-        : saved?.apiKey
-          ? "config"
+      : saved?.apiKey
+        ? "config"
+        : (deps.env ?? process.env).FLATKEY_API_KEY
+          ? "env"
           : "none",
     key: maskKey(apiKey),
     auth: saved?.auth ?? null,
@@ -364,7 +367,7 @@ async function handleAuthStatus(command, deps) {
 }
 
 async function handleGenerate(command, deps) {
-  const { resolveApiKey } = await import("./config.js");
+  const { resolveApiKey, resolveOrigins } = await import("./config.js");
   const {
     generateAudio,
     generateAudioMusic,
@@ -386,11 +389,17 @@ async function handleGenerate(command, deps) {
     : await resolveApiKey({
         apiKey: command.options.api_key,
         env: deps.env ?? process.env,
+        configDir: deps.configDir,
       });
+  const { routerOrigin } = await resolveOrigins({
+    baseUrl: command.options.base_url,
+    env: deps.env ?? process.env,
+    configDir: deps.configDir,
+  });
   const options = {
     ...command.options,
     apiKey,
-    baseUrl: firstNonEmpty(command.options.base_url, (deps.env ?? process.env).ROUTER_ORIGIN),
+    baseUrl: routerOrigin,
     fetch: deps.fetch,
   };
   if (command.options.dry_run) {
@@ -464,15 +473,21 @@ function scrubArtifactResponse(value) {
 }
 
 async function handleVoices(command, deps) {
-  const { resolveApiKey } = await import("./config.js");
+  const { resolveApiKey, resolveOrigins } = await import("./config.js");
   const { getVoices } = await import("./api.js");
   const apiKey = await resolveApiKey({
     apiKey: command.options.api_key,
     env: deps.env ?? process.env,
+    configDir: deps.configDir,
+  });
+  const { routerOrigin } = await resolveOrigins({
+    baseUrl: command.options.base_url,
+    env: deps.env ?? process.env,
+    configDir: deps.configDir,
   });
   return getVoices({
     apiKey,
-    baseUrl: firstNonEmpty(command.options.base_url, (deps.env ?? process.env).ROUTER_ORIGIN),
+    baseUrl: routerOrigin,
     fetch: deps.fetch,
   });
 }
@@ -516,32 +531,44 @@ function redactRequest(request) {
 }
 
 async function handleUtility(command, deps) {
-  const { resolveApiKey } = await import("./config.js");
+  const { resolveApiKey, resolveOrigins } = await import("./config.js");
   const { getCredits, getStatus } = await import("./api.js");
   const apiKey = await resolveApiKey({
     apiKey: command.options.api_key,
     env: deps.env ?? process.env,
+    configDir: deps.configDir,
+  });
+  const { consoleOrigin } = await resolveOrigins({
+    baseUrl: command.options.base_url,
+    env: deps.env ?? process.env,
+    configDir: deps.configDir,
   });
   const options = {
     apiKey,
-    baseUrl: firstNonEmpty(command.options.base_url, (deps.env ?? process.env).CONSOLE_ORIGIN),
+    baseUrl: consoleOrigin,
     fetch: deps.fetch,
   };
   return command.group === "credits" ? getCredits(options) : getStatus(options);
 }
 
 async function handleModels(command, deps) {
-  const { resolveApiKey } = await import("./config.js");
+  const { resolveApiKey, resolveOrigins } = await import("./config.js");
   const { getModels } = await import("./api.js");
   const { normalizeModels } = await import("./models.js");
 
   const apiKey = await resolveApiKey({
     apiKey: command.options.api_key,
     env: deps.env ?? process.env,
+    configDir: deps.configDir,
+  });
+  const { consoleOrigin } = await resolveOrigins({
+    baseUrl: command.options.base_url,
+    env: deps.env ?? process.env,
+    configDir: deps.configDir,
   });
   const response = await getModels({
     apiKey,
-    baseUrl: firstNonEmpty(command.options.base_url, (deps.env ?? process.env).CONSOLE_ORIGIN),
+    baseUrl: consoleOrigin,
     fetch: deps.fetch,
   });
   return { models: normalizeModels(response, command.options.type) };
@@ -549,7 +576,109 @@ async function handleModels(command, deps) {
 
 function formatHuman(result) {
   if (typeof result === "string") return result;
-  return JSON.stringify(result, null, 2);
+  if (!result || typeof result !== "object") return String(result);
+  if (result.dryRun && result.request) return formatDryRun(result);
+  if (result.kind) return formatGenerationResult(result);
+  if (Array.isArray(result.models)) return formatModels(result.models);
+  if (Array.isArray(result.voices)) return formatVoices(result.voices);
+  if (typeof result.authenticated === "boolean") return formatAuthStatus(result);
+  return formatKeyValues(result);
+}
+
+function formatDryRun(result) {
+  const lines = [
+    `Dry run: ${result.kind}`,
+    `${result.request.method ?? "GET"} ${result.request.url}`,
+  ];
+  if (result.request.body !== undefined) {
+    lines.push("Body:");
+    lines.push(JSON.stringify(result.request.body, null, 2));
+  }
+  return lines.join("\n");
+}
+
+function formatGenerationResult(result) {
+  if (result.kind === "text") {
+    const lines = [result.text || "(empty text)"];
+    if (result.output) lines.push(`Saved: ${result.output}`);
+    return lines.join("\n");
+  }
+  const artifacts = Array.isArray(result.artifacts) ? result.artifacts : [];
+  if (artifacts.length === 0) return `${titleCase(result.kind)} generated. No artifacts returned.`;
+  const lines = [`${titleCase(result.kind)} generated:`];
+  for (const artifact of artifacts) {
+    if (artifact.path) lines.push(`- Saved: ${artifact.path}`);
+    else if (artifact.url) lines.push(`- URL: ${artifact.url}`);
+    else lines.push(`- ${JSON.stringify(artifact)}`);
+  }
+  return lines.join("\n");
+}
+
+function formatModels(models) {
+  if (models.length === 0) return "No models available.";
+  return [
+    `Available models (${models.length}):`,
+    formatTable(
+      ["Model", "Type", "Source"],
+      models.map((model) => [
+        model.id,
+        model.type ?? "",
+        model.source ?? "",
+      ]),
+    ),
+  ].join("\n");
+}
+
+function formatVoices(voices) {
+  if (voices.length === 0) return "No voices available.";
+  const lines = [`Available voices (${voices.length}):`];
+  for (const voice of voices) {
+    const id = voice.voice_id ?? voice.id;
+    const name = voice.name ? `${voice.name} ` : "";
+    lines.push(`- ${name}${id ? `(${id})` : ""}`.trim());
+  }
+  return lines.join("\n");
+}
+
+function formatKeyValues(result) {
+  const entries = Object.entries(result);
+  if (entries.length === 0) return "OK";
+  return entries
+    .map(([key, value]) => `${humanLabel(key)}: ${formatScalar(value)}`)
+    .join("\n");
+}
+
+function formatScalar(value) {
+  if (value === null || value === undefined) return "";
+  if (typeof value === "object") return JSON.stringify(value);
+  return String(value);
+}
+
+function humanLabel(key) {
+  return key
+    .replaceAll("_", " ")
+    .replace(/([a-z])([A-Z])/g, "$1 $2")
+    .replace(/^./, (char) => char.toUpperCase());
+}
+
+function titleCase(value) {
+  return String(value).replace(/^./, (char) => char.toUpperCase());
+}
+
+function formatTable(headers, rows) {
+  const widths = headers.map((header, index) => Math.max(
+    header.length,
+    ...rows.map((row) => String(row[index] ?? "").length),
+  ));
+  const line = (cells) => cells
+    .map((cell, index) => String(cell ?? "").padEnd(widths[index]))
+    .join("  ")
+    .trimEnd();
+  return [
+    line(headers),
+    line(widths.map((width) => "-".repeat(width))),
+    ...rows.map(line),
+  ].join("\n");
 }
 
 async function readPackageVersion() {

package/src/config.js

@@ -3,6 +3,9 @@ import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
+export const ROUTER_ORIGIN_KEY = "routerOrigin";
+export const CONSOLE_ORIGIN_KEY = "consoleOrigin";
+
 export function getDefaultConfigDir() {
   return join(homedir(), ".config", "flatkey");
 }
@@ -17,16 +20,40 @@ export async function resolveApiKey({
   configDir = getDefaultConfigDir(),
 } = {}) {
   if (apiKey) return apiKey;
-  if (env.FLATKEY_API_KEY) return env.FLATKEY_API_KEY;
 
   const saved = await readSavedConfig(configDir);
   if (saved?.apiKey) return saved.apiKey;
+  if (env.FLATKEY_API_KEY) return env.FLATKEY_API_KEY;
 
   throw new Error(
     "Missing Flatkey API key. Create one at https://console.flatkey.ai/keys, then run `flatkey onboard --api-key <key>` or set FLATKEY_API_KEY.",
   );
 }
 
+export async function resolveOrigins({
+  baseUrl,
+  consoleUrl,
+  env = process.env,
+  configDir = getDefaultConfigDir(),
+} = {}) {
+  const saved = await readSavedConfig(configDir);
+  return {
+    routerOrigin: firstNonEmpty(
+      baseUrl,
+      saved?.[ROUTER_ORIGIN_KEY],
+      saved?.ROUTER_ORIGIN,
+      env.ROUTER_ORIGIN,
+    ),
+    consoleOrigin: firstNonEmpty(
+      consoleUrl,
+      baseUrl,
+      saved?.[CONSOLE_ORIGIN_KEY],
+      saved?.CONSOLE_ORIGIN,
+      env.CONSOLE_ORIGIN,
+    ),
+  };
+}
+
 export async function writeConfig({ apiKey, configDir = getDefaultConfigDir() }) {
   if (typeof apiKey !== "string" || apiKey.trim() === "") {
     throw new Error("Missing --api-key value. Create a key at https://console.flatkey.ai/keys, then run `flatkey onboard --api-key <key>`.");
@@ -34,7 +61,8 @@ export async function writeConfig({ apiKey, configDir = getDefaultConfigDir() })
 
   await mkdir(configDir, { recursive: true });
   const configPath = getConfigPath(configDir);
-  await writeFile(configPath, `${JSON.stringify({ apiKey }, null, 2)}\n`, {
+  const saved = await readSavedConfig(configDir) ?? {};
+  await writeFile(configPath, `${JSON.stringify({ ...saved, apiKey }, null, 2)}\n`, {
     mode: 0o600,
   });
   try {
@@ -109,3 +137,7 @@ async function readSavedConfig(configDir) {
     throw error;
   }
 }
+
+function firstNonEmpty(...values) {
+  return values.find((value) => typeof value === "string" && value.trim() !== "");
+}