@flatkey-ai/cli 0.1.22 → 0.1.25

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.25",
   "description": "Flatkey media generation CLI for image, video, audio, credits, status, and models.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -267,6 +267,7 @@ async function handleLogin(command, deps) {
     });
     const pollData = poll?.data ?? poll;
     if (pollData?.status === "approved") {
+      const account = accountFromAuthData(pollData);
       if (!pollData.api_key) {
         const saved = await readConfig(deps.configDir);
         if (typeof saved?.apiKey === "string" && saved.apiKey.trim() !== "") {
@@ -276,6 +277,7 @@ async function handleLogin(command, deps) {
               deviceId,
               userId: pollData.user_id ?? saved.auth?.userId,
               tokenId: pollData.token_id ?? saved.auth?.tokenId,
+              account: account ?? saved.auth?.account,
               loginAt: Math.floor(Date.now() / 1000),
             },
             configDir: deps.configDir,
@@ -284,8 +286,7 @@ async function handleLogin(command, deps) {
             ? {
               success: true,
               configPath,
-              tokenId: pollData.token_id ?? saved.auth?.tokenId,
-              userId: pollData.user_id ?? saved.auth?.userId,
+              account: stripDisplayOnlyIds(account ?? saved.auth?.account),
               reusedConfig: true,
             }
             : `Flatkey CLI already authorized. Saved config: ${configPath}`;
@@ -298,12 +299,17 @@ async function handleLogin(command, deps) {
           deviceId,
           userId: pollData.user_id,
           tokenId: pollData.token_id,
+          account,
           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,
+          account: stripDisplayOnlyIds(account),
+        }
         : `Flatkey CLI authorized. Saved config: ${configPath}`;
     }
     if (pollData?.status === "denied") {
@@ -732,7 +738,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 +756,70 @@ 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 = sanitizeStatusResponse(await getStatus(options));
+  const account = effectiveAccountForStatus({ command, saved, apiKey });
+  if (!account || !status || typeof status !== "object" || Array.isArray(status) || status.account !== undefined) {
+    return command.options.json ? status : extractStatusDisplayFields(status);
+  }
+  const mergedStatus = sanitizeStatusResponse({ ...status, account });
+  return command.options.json ? mergedStatus : extractStatusDisplayFields(mergedStatus);
+}
+
+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 name = data.account?.name ?? data.name;
+  const userId = data.account?.userId ?? data.account?.user_id ?? data.userId ?? data.user_id;
+  if (email === undefined && name === undefined && userId === undefined) return null;
+  return Object.fromEntries(
+    Object.entries({
+      email,
+      name,
+      userId,
+    }).filter(([, value]) => value !== undefined && value !== null),
+  );
+}
+
+function sanitizeStatusResponse(status) {
+  if (!status || typeof status !== "object") return status;
+  if (Array.isArray(status)) {
+    return status.map((entry) => sanitizeStatusResponse(entry));
+  }
+  return Object.fromEntries(
+    Object.entries(status)
+      .filter(([key]) => !["userId", "user_id"].includes(key))
+      .map(([key, value]) => [key, sanitizeStatusResponse(value)]),
+  );
+}
+
+function stripDisplayOnlyIds(value) {
+  if (!value || typeof value !== "object") return value;
+  if (Array.isArray(value)) {
+    return value.map((entry) => stripDisplayOnlyIds(entry));
+  }
+  return Object.fromEntries(
+    Object.entries(value)
+      .filter(([key]) => !["userId", "user_id", "tokenId", "token_id"].includes(key))
+      .map(([key, nested]) => [key, stripDisplayOnlyIds(nested)]),
+  );
+}
+
+function extractStatusDisplayFields(status) {
+  if (!status || typeof status !== "object") return status;
+  const email = status.email ?? status.account?.email ?? status.user?.email;
+  const name = status.name ?? status.account?.name ?? status.user?.name;
+  const result = {};
+  if (email !== undefined) result.email = email;
+  if (name !== undefined) result.name = name;
+  return result;
 }
 
 async function handleModels(command, deps) {