@flatkey-ai/cli 0.1.13 → 0.1.15

package/README.md

@@ -244,10 +244,6 @@ npm test
 node bin/flatkey.js --version
 ```
 
-## Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=flatkey-ai/flatkey-cli&type=Date)](https://www.star-history.com/#flatkey-ai/flatkey-cli&Date)
-
 ## Links
 
 - Website: [flatkey.ai](https://flatkey.ai/?utm_source=github&utm_medium=readme&utm_campaign=flatkey_cli_links)

package/package.json

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

package/src/api.js

@@ -295,11 +295,15 @@ function extractErrorMessage(body, status) {
     : typeof body?.message === "string"
       ? body.message
       : undefined;
-  if (message === "Token not provided") return missingApiKeyMessage();
+  if (isAuthTokenError(message)) return missingApiKeyMessage();
   if (message) return message;
   return `Flatkey API request failed with HTTP ${status}`;
 }
 
+function isAuthTokenError(message) {
+  return message === "Token not provided" || /^Invalid token\b/i.test(message ?? "");
+}
+
 function missingApiKeyMessage() {
-  return "Missing Flatkey API key. Create one at https://console.flatkey.ai/keys, then run `flatkey onboard --api-key <key>` or set FLATKEY_API_KEY.";
+  return "Missing or invalid Flatkey API key. Run `flatkey login`, or create a key at https://console.flatkey.ai/keys and run `flatkey onboard --api-key <key>`.";
 }

package/src/cli.js

@@ -215,7 +215,7 @@ export async function runCommand(command, deps = {}) {
 }
 
 async function handleLogin(command, deps) {
-  const { ensureDeviceId, resolveOrigins, writeAuthConfig } = await import("./config.js");
+  const { ensureDeviceId, readConfig, resolveOrigins, writeAuthConfig } = await import("./config.js");
   const { createDeviceAuthorization, pollDeviceAuthorization } = await import("./api.js");
   const deviceId = await ensureDeviceId({ configDir: deps.configDir });
   const version = await readPackageVersion();
@@ -256,7 +256,29 @@ async function handleLogin(command, deps) {
     const pollData = poll?.data ?? poll;
     if (pollData?.status === "approved") {
       if (!pollData.api_key) {
-        throw new Error("Flatkey login approved but no API key was returned.");
+        const saved = await readConfig(deps.configDir);
+        if (typeof saved?.apiKey === "string" && saved.apiKey.trim() !== "") {
+          const configPath = await writeAuthConfig({
+            apiKey: saved.apiKey,
+            auth: {
+              deviceId,
+              userId: pollData.user_id ?? saved.auth?.userId,
+              tokenId: pollData.token_id ?? saved.auth?.tokenId,
+              loginAt: Math.floor(Date.now() / 1000),
+            },
+            configDir: deps.configDir,
+          });
+          return command.options.json
+            ? {
+              success: true,
+              configPath,
+              tokenId: pollData.token_id ?? saved.auth?.tokenId,
+              userId: pollData.user_id ?? saved.auth?.userId,
+              reusedConfig: true,
+            }
+            : `Flatkey CLI already authorized. Saved config: ${configPath}`;
+        }
+        throw new Error("Flatkey login was approved, but no API key was returned. The authorization may have already been consumed. Run `flatkey login` again.");
       }
       const configPath = await writeAuthConfig({
         apiKey: pollData.api_key,

package/src/config.js

@@ -26,7 +26,7 @@ export async function resolveApiKey({
   if (env.FLATKEY_API_KEY) return env.FLATKEY_API_KEY;
 
   throw new Error(
-    "Missing Flatkey API key. Create one at https://console.flatkey.ai/keys, then run `flatkey onboard --api-key <key>` or set FLATKEY_API_KEY.",
+    "Missing or invalid Flatkey API key. Run `flatkey login`, or create a key at https://console.flatkey.ai/keys and run `flatkey onboard --api-key <key>`.",
   );
 }