@flatkey-ai/cli 0.1.23 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatkey-ai/cli",
-  "version": "0.1.23",
+  "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,7 +277,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,
+              account: account ?? saved.auth?.account,
               loginAt: Math.floor(Date.now() / 1000),
             },
             configDir: deps.configDir,
@@ -285,9 +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: accountFromAuthData(pollData) ?? saved.auth?.account,
+              account: stripDisplayOnlyIds(account ?? saved.auth?.account),
               reusedConfig: true,
             }
             : `Flatkey CLI already authorized. Saved config: ${configPath}`;
@@ -300,7 +299,7 @@ async function handleLogin(command, deps) {
           deviceId,
           userId: pollData.user_id,
           tokenId: pollData.token_id,
-          account: accountFromAuthData(pollData),
+          account,
           loginAt: Math.floor(Date.now() / 1000),
         },
         configDir: deps.configDir,
@@ -309,9 +308,7 @@ async function handleLogin(command, deps) {
         ? {
           success: true,
           configPath,
-          tokenId: pollData.token_id,
-          userId: pollData.user_id,
-          account: accountFromAuthData(pollData),
+          account: stripDisplayOnlyIds(account),
         }
         : `Flatkey CLI authorized. Saved config: ${configPath}`;
     }
@@ -761,12 +758,13 @@ async function handleUtility(command, deps) {
   };
   if (command.group === "credits") return getCredits(options);
 
-  const status = await getStatus(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 status;
+    return command.options.json ? status : extractStatusDisplayFields(status);
   }
-  return { ...status, account };
+  const mergedStatus = sanitizeStatusResponse({ ...status, account });
+  return command.options.json ? mergedStatus : extractStatusDisplayFields(mergedStatus);
 }
 
 function effectiveAccountForStatus({ command, saved, apiKey }) {
@@ -778,16 +776,52 @@ function effectiveAccountForStatus({ command, saved, apiKey }) {
 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 && userId === undefined) return null;
+  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) {
   const { resolveApiKey, resolveOrigins } = await import("./config.js");
   const { getModels } = await import("./api.js");