@flatkey-ai/cli 0.1.21 → 0.1.23

package/README.md

@@ -13,7 +13,7 @@ Website: [flatkey.ai](https://flatkey.ai/?utm_source=github&utm_medium=readme&ut
 
 ```bash
 npm install -g @flatkey-ai/cli
-export FLATKEY_API_KEY=<your-flatkey-api-key>
+flatkey login
 
 flatkey image generate --prompt "editorial cover, neon city at dawn" -o cover.png
 flatkey video generate --prompt "cinematic product launch clip" --model seedance2 -o launch.mp4
@@ -67,13 +67,44 @@ flatkey -v
 
 ## Auth
 
-Use an environment variable:
+Recommended: sign in through the Flatkey console:
+
+```bash
+flatkey login
+```
+
+`flatkey login` opens a browser authorization page, waits for approval, then saves the CLI API key and account metadata in your local Flatkey config. After login, check the active auth state:
+
+```bash
+flatkey auth status
+flatkey status --json
+```
+
+If your terminal cannot open a browser automatically, print the approval URL and open it yourself:
+
+```bash
+flatkey login --no-open
+```
+
+For staging or self-hosted console testing:
+
+```bash
+flatkey login --console-url https://console.flatkey.ai
+```
+
+To remove the saved API key:
+
+```bash
+flatkey logout
+```
+
+Alternative: use an environment variable:
 
 ```bash
 export FLATKEY_API_KEY=<key>
 ```
 
-Or save it locally:
+Or save a manually created key locally:
 
 ```bash
 flatkey onboard --api-key <key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatkey-ai/cli",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "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

@@ -276,6 +276,7 @@ async function handleLogin(command, deps) {
               deviceId,
               userId: pollData.user_id ?? saved.auth?.userId,
               tokenId: pollData.token_id ?? saved.auth?.tokenId,
+              account: accountFromAuthData(pollData) ?? saved.auth?.account,
               loginAt: Math.floor(Date.now() / 1000),
             },
             configDir: deps.configDir,
@@ -286,6 +287,7 @@ async function handleLogin(command, deps) {
               configPath,
               tokenId: pollData.token_id ?? saved.auth?.tokenId,
               userId: pollData.user_id ?? saved.auth?.userId,
+              account: accountFromAuthData(pollData) ?? saved.auth?.account,
               reusedConfig: true,
             }
             : `Flatkey CLI already authorized. Saved config: ${configPath}`;
@@ -298,12 +300,19 @@ async function handleLogin(command, deps) {
           deviceId,
           userId: pollData.user_id,
           tokenId: pollData.token_id,
+          account: accountFromAuthData(pollData),
           loginAt: Math.floor(Date.now() / 1000),
         },
         configDir: deps.configDir,
       });
       return command.options.json
-        ? { success: true, configPath, tokenId: pollData.token_id, userId: pollData.user_id }
+        ? {
+          success: true,
+          configPath,
+          tokenId: pollData.token_id,
+          userId: pollData.user_id,
+          account: accountFromAuthData(pollData),
+        }
         : `Flatkey CLI authorized. Saved config: ${configPath}`;
     }
     if (pollData?.status === "denied") {
@@ -404,7 +413,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.");
@@ -421,18 +430,20 @@ async function handleImageUpload(command, deps) {
   });
   const response = await uploadTempMediaImage({
     apiKey,
-    baseUrl: consoleOrigin,
+    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 +460,7 @@ async function handleGenerate(command, deps) {
     generateImage,
     generateText,
     generateVideo,
+    DEFAULT_CONSOLE_URL,
     getVideo,
     planAudioMusicRequest,
     planAudioRequest,
@@ -467,7 +479,7 @@ async function handleGenerate(command, deps) {
         env: deps.env ?? process.env,
         configDir: deps.configDir,
       });
-  const { routerOrigin, consoleOrigin } = await resolveOrigins({
+  const { routerOrigin } = await resolveOrigins({
     baseUrl: command.options.base_url,
     consoleUrl: command.options.console_url,
     env: deps.env ?? process.env,
@@ -482,7 +494,7 @@ async function handleGenerate(command, deps) {
     ...command.options,
     apiKey,
     baseUrl: routerOrigin,
-    tempMediaBaseUrl: tempMediaBaseUrl ?? consoleOrigin,
+    tempMediaBaseUrl: tempMediaBaseUrl ?? DEFAULT_CONSOLE_URL,
     env: deps.env ?? process.env,
     fetch: deps.fetch,
   };
@@ -570,13 +582,27 @@ async function uploadLocalImage(file, options, deps) {
     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);
@@ -715,7 +741,8 @@ function redactRequest(request) {
 }
 
 async function handleUtility(command, deps) {
-  const { resolveApiKey, resolveOrigins } = await import("./config.js");
+  const { readConfig, resolveApiKey, resolveOrigins } = await import("./config.js");
+  const saved = await readConfig(deps.configDir);
   const { getCredits, getStatus } = await import("./api.js");
   const apiKey = await resolveApiKey({
     apiKey: command.options.api_key,
@@ -732,7 +759,33 @@ async function handleUtility(command, deps) {
     baseUrl: consoleOrigin,
     fetch: deps.fetch,
   };
-  return command.group === "credits" ? getCredits(options) : getStatus(options);
+  if (command.group === "credits") return getCredits(options);
+
+  const status = await getStatus(options);
+  const account = effectiveAccountForStatus({ command, saved, apiKey });
+  if (!account || !status || typeof status !== "object" || Array.isArray(status) || status.account !== undefined) {
+    return status;
+  }
+  return { ...status, account };
+}
+
+function effectiveAccountForStatus({ command, saved, apiKey }) {
+  if (command.options.api_key || !saved?.apiKey || saved.apiKey !== apiKey) return null;
+  if (saved.auth?.account !== undefined) return saved.auth.account;
+  return accountFromAuthData(saved.auth);
+}
+
+function accountFromAuthData(data) {
+  if (!data || typeof data !== "object") return null;
+  const email = data.account?.email ?? data.email ?? data.userEmail ?? data.user_email;
+  const userId = data.account?.userId ?? data.account?.user_id ?? data.userId ?? data.user_id;
+  if (email === undefined && userId === undefined) return null;
+  return Object.fromEntries(
+    Object.entries({
+      email,
+      userId,
+    }).filter(([, value]) => value !== undefined && value !== null),
+  );
 }
 
 async function handleModels(command, deps) {
@@ -835,9 +888,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) {