@flatkey-ai/cli 0.1.2 → 0.1.4

package/package.json

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

package/src/api.js

@@ -1,4 +1,5 @@
 export const DEFAULT_BASE_URL = "https://router.flatkey.ai";
+export const DEFAULT_MODELS_BASE_URL = "https://console.flatkey.ai";
 
 export class FlatkeyError extends Error {
   constructor(message, { status } = {}) {
@@ -27,7 +28,10 @@ export function planImageRequest(options) {
   const path = `/v1beta/models/${encodeURIComponent(model)}:generateContent?key=${encodeURIComponent(options.apiKey)}`;
   return planRequest(options, path, {
     method: "POST",
-    headers: { "content-type": "application/json" },
+    headers: {
+      ...jsonHeaders(options.apiKey),
+      "x-goog-api-key": options.apiKey,
+    },
     body: {
       contents: [{ parts: [{ text: options.prompt }] }],
     },
@@ -39,7 +43,7 @@ export function generateVideo(options) {
 }
 
 export function planVideoRequest(options) {
-  return planJsonPost(options, "/v1/videos/generations", cleanObject({
+  return planJsonPost(options, "/v1/video/generations", cleanObject({
     model: options.model ?? "veo-3",
     prompt: options.prompt,
     duration: parseOptionalInteger(options.duration),
@@ -81,7 +85,10 @@ export function getStatus(options) {
 }
 
 export function getModels(options) {
-  return requestJson(options, "/v1/models");
+  return requestJson({
+    ...options,
+    baseUrl: options.baseUrl ?? DEFAULT_MODELS_BASE_URL,
+  }, "/v1/available_models");
 }
 
 async function postJson(options, path, payload) {

package/src/cli.js

@@ -18,6 +18,9 @@ export function parseArgv(argv) {
   if (!group) {
     return { group: "help", action: undefined, options: {} };
   }
+  if (group === "--version" || group === "-v") {
+    return { group: "version", action: undefined, options: {} };
+  }
   if (!COMMANDS.has(group)) {
     throw new Error(`Unknown command: ${group}`);
   }
@@ -87,7 +90,8 @@ export async function runCommand(command, deps = {}) {
     return command.options.ai ? getAiHelp() : getHumanHelp();
   }
   if (command.group === "version") {
-    return { version: await readPackageVersion() };
+    const version = await readPackageVersion();
+    return command.options.json ? { version } : version;
   }
 
   if (command.group === "models") {

package/test/api.test.js

@@ -45,6 +45,8 @@ test("builds nano image request using gemini-style route", async () => {
     "https://router.test/v1beta/models/nano-banana-pro-preview:generateContent?key=key",
   );
   assert.equal(calls[0].init.method, "POST");
+  assert.equal(calls[0].init.headers.Authorization, "Bearer key");
+  assert.equal(calls[0].init.headers["x-goog-api-key"], "key");
   assert.deepEqual(JSON.parse(calls[0].init.body), {
     contents: [{ parts: [{ text: "poster" }] }],
   });
@@ -87,7 +89,7 @@ test("builds video generation request", async () => {
     fetch,
   });
 
-  assert.equal(calls[0].url, "https://router.test/v1/videos/generations");
+  assert.equal(calls[0].url, "https://router.test/v1/video/generations");
   assert.deepEqual(JSON.parse(calls[0].init.body), {
     model: "veo-3",
     prompt: "walkthrough",
@@ -108,7 +110,7 @@ test("builds seedance2 video generation request", async () => {
     fetch,
   });
 
-  assert.equal(calls[0].url, "https://router.test/v1/videos/generations");
+  assert.equal(calls[0].url, "https://router.test/v1/video/generations");
   assert.equal(JSON.parse(calls[0].init.body).model, "seedance2");
 });
 
@@ -161,21 +163,33 @@ test("builds credits, status, and models requests", async () => {
 
   assert.equal(calls[0].url, "https://router.test/v1/credits");
   assert.equal(calls[1].url, "https://router.test/v1/status");
-  assert.equal(calls[2].url, "https://router.test/v1/models");
+  assert.equal(calls[2].url, "https://router.test/v1/available_models");
   assert.equal(calls[0].init.headers.Authorization, "Bearer key");
   assert.equal(calls[2].init.headers.Authorization, "Bearer key");
 });
 
-test("plans model list request from new-api relay route", async () => {
-  const { fetch, calls } = fetchRecorder({ object: "list", data: [{ id: "gpt-5.5" }] });
+test("plans available model list request from new-api relay route", async () => {
+  const { fetch, calls } = fetchRecorder({
+    success: true,
+    object: "list",
+    data: [{ id: "gpt-5.5", object: "model", owned_by: "flatkey" }],
+  });
 
-  await getModels({ apiKey: "env-key", baseUrl: "https://router.flatkey.ai", fetch });
+  await getModels({ apiKey: "env-key", fetch });
 
-  assert.equal(calls[0].url, "https://router.flatkey.ai/v1/models");
+  assert.equal(calls[0].url, "https://console.flatkey.ai/v1/available_models");
   assert.equal(calls[0].init.method, "GET");
   assert.equal(calls[0].init.headers.Authorization, "Bearer env-key");
 });
 
+test("honors explicit base url for available model list request", async () => {
+  const { fetch, calls } = fetchRecorder({ success: true, object: "list", data: [] });
+
+  await getModels({ apiKey: "env-key", baseUrl: "https://router.test", fetch });
+
+  assert.equal(calls[0].url, "https://router.test/v1/available_models");
+});
+
 test("plans dry-run requests for target media models", () => {
   assert.equal(planImageRequest({
     apiKey: "key",

package/test/cli.test.js

@@ -75,6 +75,19 @@ test("parses ai help", () => {
   });
 });
 
+test("parses global version aliases", () => {
+  assert.deepEqual(parseArgv(["--version"]), {
+    group: "version",
+    action: undefined,
+    options: {},
+  });
+  assert.deepEqual(parseArgv(["-v"]), {
+    group: "version",
+    action: undefined,
+    options: {},
+  });
+});
+
 test("rejects unknown commands", () => {
   assert.throws(
     () => parseArgv(["wat"]),
@@ -85,7 +98,8 @@ test("rejects unknown commands", () => {
 test("version command matches package version", async () => {
   const pkg = JSON.parse(await (await import("node:fs/promises")).readFile("package.json", "utf8"));
 
-  assert.deepEqual(await runCommand({ group: "version", options: {} }), {
+  assert.equal(await runCommand({ group: "version", options: {} }), pkg.version);
+  assert.deepEqual(await runCommand({ group: "version", options: { json: true } }), {
     version: pkg.version,
   });
 });

package/test/integration.test.js

@@ -20,7 +20,7 @@ test("runs generation and utility commands in json mode", async (t) => {
       response.setHeader("content-type", "application/json");
       if (request.url.startsWith("/v1beta/models/")) {
         response.end(JSON.stringify({ data: [{ url: "https://cdn.test/image.png" }] }));
-      } else if (request.url === "/v1/videos/generations") {
+      } else if (request.url === "/v1/video/generations") {
         response.end(JSON.stringify({ data: [{ url: "https://cdn.test/video.mp4" }] }));
       } else if (request.url === "/v1/audio/generations") {
         response.end(JSON.stringify({ data: [{ url: "https://cdn.test/audio.mp3" }] }));
@@ -30,8 +30,12 @@ test("runs generation and utility commands in json mode", async (t) => {
         response.end(JSON.stringify({ remaining: 42, used: 8 }));
       } else if (request.url === "/v1/status") {
         response.end(JSON.stringify({ status: "ok" }));
-      } else if (request.url === "/v1/models") {
-        response.end(JSON.stringify({ data: [{ id: "remote-image", type: "image" }] }));
+      } else if (request.url === "/v1/available_models") {
+        response.end(JSON.stringify({
+          success: true,
+          object: "list",
+          data: [{ id: "remote-image", object: "model", owned_by: "flatkey" }],
+        }));
       } else {
         response.statusCode = 404;
         response.end(JSON.stringify({ error: { message: "not found" } }));
@@ -62,7 +66,7 @@ test("runs generation and utility commands in json mode", async (t) => {
   ]);
   assert.equal(image.stderr, "");
   assert.ok(requests.some((request) => request.url.startsWith("/v1beta/models/")));
-  assert.ok(requests.some((request) => request.url === "/v1/videos/generations"));
+  assert.ok(requests.some((request) => request.url === "/v1/video/generations"));
   assert.ok(requests.some((request) => request.url === "/v1/audio/generations"));
   assert.ok(requests.some((request) => request.url === "/v1/chat/completions"));
 });