@flatkey-ai/cli 0.1.22 → 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.22",
+  "version": "0.1.23",
   "description": "Flatkey media generation CLI for image, video, audio, credits, status, and models.",
   "type": "module",
   "bin": {

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") {
@@ -732,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,
@@ -749,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) {