@flatkey-ai/cli 0.1.20 → 0.1.22

package/package.json

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

package/src/api.js

@@ -16,7 +16,9 @@ export async function generateImage(options) {
 
 export async function uploadTempMediaImage(options) {
   const form = new FormData();
-  form.append("file", new Blob([options.file]), options.filename ?? "image");
+  form.append("file", new Blob([options.file], cleanObject({
+    type: options.contentType,
+  })), options.filename ?? "image");
   return requestJsonFromPlan(options, planRequest(options, "/v1/temp-media/images", {
     method: "POST",
     headers: authHeaders(options.apiKey),
@@ -240,7 +242,7 @@ async function requestJsonFromPlan(options, plan) {
         : JSON.stringify(plan.body),
   });
   const body = await readJson(response);
-  if (!response.ok) {
+  if (!response.ok || body?.success === false) {
     throw new FlatkeyError(extractErrorMessage(body, response.status), {
       status: response.status,
     });

package/src/cli.js

@@ -15,7 +15,7 @@ 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 GLOBAL_OPTIONS = new Set(["api_key", "base_url", "console_url", "dry_run", "help", "json", "output", "out"]);
 const REPEATABLE_OPTIONS = new Set(["image", "image_url", "video_url"]);
 const COMMAND_OPTIONS = {
   "audio generate": new Set(["model", "prompt", "similarity_boost", "stability", "style", "voice_id"]),
@@ -404,7 +404,7 @@ async function handleImageUpload(command, deps) {
   const { basename } = await import("node:path");
   const { readFile } = await import("node:fs/promises");
   const { resolveApiKey, resolveOrigins } = await import("./config.js");
-  const { uploadTempMediaImage } = await import("./api.js");
+  const { DEFAULT_CONSOLE_URL, uploadTempMediaImage } = await import("./api.js");
   const file = command.options.file;
   if (typeof file !== "string" || file.trim() === "") {
     throw new Error("Missing --file value. Run `flatkey image upload --help` to see supported options.");
@@ -414,25 +414,27 @@ async function handleImageUpload(command, deps) {
     env: deps.env ?? process.env,
     configDir: deps.configDir,
   });
-  const { routerOrigin } = await resolveOrigins({
-    baseUrl: command.options.base_url,
+  const { consoleOrigin } = await resolveOrigins({
+    consoleUrl: command.options.console_url,
     env: deps.env ?? process.env,
     configDir: deps.configDir,
   });
   const response = await uploadTempMediaImage({
     apiKey,
-    baseUrl: routerOrigin,
+    baseUrl: consoleOrigin ?? DEFAULT_CONSOLE_URL,
     file: await readFile(await expandHomePath(file)),
     filename: basename(file),
+    contentType: imageContentTypeFromPath(file),
     fetch: deps.fetch,
   });
   const data = response?.data ?? response;
-  if (!data?.signed_url) {
+  const signedUrl = extractUploadedImageUrl(response);
+  if (!signedUrl) {
     throw new Error("Image upload failed: missing signed_url.");
   }
   return {
     kind: "upload",
-    url: data?.signed_url,
+    url: signedUrl,
     objectKey: data?.object_key,
     expiresAt: data?.expires_at,
     expiresIn: data?.expires_in,
@@ -449,6 +451,7 @@ async function handleGenerate(command, deps) {
     generateImage,
     generateText,
     generateVideo,
+    DEFAULT_CONSOLE_URL,
     getVideo,
     planAudioMusicRequest,
     planAudioRequest,
@@ -469,6 +472,12 @@ async function handleGenerate(command, deps) {
       });
   const { routerOrigin } = await resolveOrigins({
     baseUrl: command.options.base_url,
+    consoleUrl: command.options.console_url,
+    env: deps.env ?? process.env,
+    configDir: deps.configDir,
+  });
+  const { consoleOrigin: tempMediaBaseUrl } = await resolveOrigins({
+    consoleUrl: command.options.console_url,
     env: deps.env ?? process.env,
     configDir: deps.configDir,
   });
@@ -476,6 +485,7 @@ async function handleGenerate(command, deps) {
     ...command.options,
     apiKey,
     baseUrl: routerOrigin,
+    tempMediaBaseUrl: tempMediaBaseUrl ?? DEFAULT_CONSOLE_URL,
     env: deps.env ?? process.env,
     fetch: deps.fetch,
   };
@@ -560,16 +570,30 @@ async function uploadLocalImage(file, options, deps) {
   const { readFile } = await import("node:fs/promises");
   const response = await deps.uploadTempMediaImage({
     apiKey: options.apiKey,
-    baseUrl: options.baseUrl,
+    baseUrl: options.tempMediaBaseUrl ?? options.baseUrl,
     file: await readFile(await expandHomePath(file)),
     filename: basename(file),
+    contentType: imageContentTypeFromPath(file),
     fetch: options.fetch,
   });
-  const url = response?.data?.signed_url ?? response?.signed_url;
+  const url = extractUploadedImageUrl(response);
   if (!url) throw new Error(`Image upload failed: missing signed_url for ${file}`);
   return url;
 }
 
+function extractUploadedImageUrl(response) {
+  const data = response?.data ?? response;
+  return data?.signed_url ?? data?.signedUrl ?? data?.url ?? response?.signed_url ?? response?.signedUrl ?? response?.url;
+}
+
+function imageContentTypeFromPath(file) {
+  const lower = String(file).toLowerCase();
+  if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
+  if (lower.endsWith(".png")) return "image/png";
+  if (lower.endsWith(".webp")) return "image/webp";
+  return undefined;
+}
+
 async function waitForVideoResult(response, options) {
   if (hasArtifact(response)) return response;
   const taskId = videoTaskId(response);
@@ -828,9 +852,45 @@ function formatVoices(voices) {
 function formatKeyValues(result) {
   const entries = Object.entries(result);
   if (entries.length === 0) return "OK";
-  return entries
+  const lines = entries
     .map(([key, value]) => `${humanLabel(key)}: ${formatScalar(value)}`)
-    .join("\n");
+  const warning = lowCreditWarning(result);
+  if (warning) lines.push(warning);
+  return lines.join("\n");
+}
+
+function lowCreditWarning(result) {
+  const credits = extractCreditAmount(result);
+  if (credits === undefined || credits >= 10) return "";
+  return `Low credit warning: remaining credits are ${credits}. Top up soon.`;
+}
+
+function extractCreditAmount(result) {
+  const creditKeys = new Set([
+    "credit",
+    "credits",
+    "remaining",
+    "balance",
+    "total_available",
+    "totalAvailable",
+    "available_balance",
+    "availableBalance",
+  ]);
+  const stack = [result];
+  const seen = new Set();
+  while (stack.length > 0) {
+    const value = stack.shift();
+    if (!value || typeof value !== "object" || seen.has(value)) continue;
+    seen.add(value);
+    for (const [key, entry] of Object.entries(value)) {
+      if (creditKeys.has(key)) {
+        const number = Number(entry);
+        if (Number.isFinite(number)) return number;
+      }
+      if (entry && typeof entry === "object") stack.push(entry);
+    }
+  }
+  return undefined;
 }
 
 function formatScalar(value) {