@flowapt/flowiq-cli 0.1.10 → 0.1.11

package/README.md

@@ -16,12 +16,24 @@ flowiq --version   # should print 0.1.x
 
 ## Authenticate
 
-Get a personal staff API key from a FlowIQ super-admin (an `fiq_staff_…`
-string). Then:
+Default flow — browser login (like `npm login`):
 
 ```bash
 flowiq auth login
-# paste your key when prompted
+```
+
+The CLI shows a short code (e.g. `FQ4X-9KTB`), opens
+`https://app.flowiq.live/cli-auth` when you press ENTER, and waits. A
+logged-in FlowIQ **super admin** confirms the code on the page matches the
+one in your terminal and clicks Approve — the CLI then receives a
+freshly-minted personal key automatically. **Never approve a code you
+didn't just see in your own terminal.**
+
+Fallbacks (CI / no browser):
+
+```bash
+flowiq auth login --token fiq_staff_…   # supply a key directly
+flowiq auth login --paste               # prompt for a key on stdin
 ```
 
 Your key is saved to `~/.config/flowiq/auth.json` with `chmod 600`. To
@@ -31,8 +43,16 @@ verify what you're authenticated as:
 flowiq auth whoami
 ```
 
+To rotate this device's token (mints a fresh key, revokes the old one
+server-side — run whenever you want a new secret):
+
+```bash
+flowiq auth refresh
+```
+
 To log out (deletes the local key file, does NOT revoke the key
-server-side — ask your admin to revoke):
+server-side — use `flowiq auth refresh` first if you want the old key
+dead, or ask another super admin to revoke):
 
 ```bash
 flowiq auth logout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowapt/flowiq-cli",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Command-line tool for FlowIQ staff: round-trip agent prompts, questionnaires, fine-tuning, pin-board tasks, webhooks, templates, agent-updates, chat exports, and live agent testing without ever touching service-role credentials.",
   "type": "module",
   "bin": {

package/src/commands/auth.js

@@ -1,8 +1,23 @@
-// `flowiq auth login` / `flowiq auth logout` / `flowiq auth whoami`.
-// Stores a `fiq_staff_…` bearer token at ~/.config/flowiq/auth.json.
+// `flowiq auth login` / `logout` / `whoami` / `refresh`.
+//
+// Default login = browser device flow (like `npm login` / `gh auth login`):
+//   1. POST /cli/login-start (unauthenticated) → device_code + user_code
+//   2. Show the user code, press ENTER → open https://app.flowiq.live/cli-auth
+//   3. A logged-in SUPER ADMIN confirms the codes match and approves
+//   4. Poll /cli/login-poll until the key is minted server-side (mint-at-claim)
+//
+// Fallbacks: `--token <key>` (direct) or `--paste` (interactive paste) keep
+// the original flow for CI or when no browser is handy.
+//
+// `flowiq auth refresh` rotates the saved key in place via /cli/token-rotate —
+// run it on each device whenever you want a fresh secret; the old key is
+// revoked server-side. If the saved key is already dead it falls back to the
+// full browser login.
 
 import readline from "node:readline";
-import { loadConfig, saveConfig, clearConfig, configFilePath } from "../config.js";
+import os from "node:os";
+import { spawn } from "node:child_process";
+import { loadConfig, saveConfig, clearConfig } from "../config.js";
 import { http } from "../http.js";
 
 function prompt(question, { silent = false } = {}) {
@@ -41,25 +56,42 @@ function prompt(question, { silent = false } = {}) {
   });
 }
 
-export async function login(opts = {}) {
-  const cfg = await loadConfig();
-  if (opts.apiUrl) cfg.api_url = opts.apiUrl;
-
-  let token = opts.token;
-  if (!token) {
-    process.stdout.write(`API URL: ${cfg.api_url}\n`);
-    token = await prompt("Paste your staff API key (fiq_staff_…): ", { silent: true });
-    token = token.trim();
+// Unauthenticated POST — login-start / login-poll run BEFORE a token exists,
+// so they can't go through http.js (which requires the saved token).
+async function unauthedPost(apiUrl, endpoint, body) {
+  const url = `${apiUrl.replace(/\/$/, "")}/cli/${endpoint}`;
+  const resp = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", Accept: "application/json" },
+    body: JSON.stringify(body ?? {}),
+  });
+  const text = await resp.text();
+  let parsed;
+  try { parsed = text ? JSON.parse(text) : {}; } catch { parsed = { _raw: text }; }
+  if (!resp.ok) {
+    throw new Error(parsed.message || parsed.error || `${endpoint} → HTTP ${resp.status}`);
   }
+  return parsed;
+}
 
-  if (!token.startsWith("fiq_staff_")) {
-    console.error(`Error: token must start with "fiq_staff_" (got ${token.slice(0, 12)}…).`);
-    process.exit(1);
+function openBrowser(url) {
+  const platform = process.platform;
+  let cmd, args;
+  if (platform === "darwin") { cmd = "open"; args = [url]; }
+  else if (platform === "win32") { cmd = "cmd"; args = ["/c", "start", "", url]; }
+  else { cmd = "xdg-open"; args = [url]; }
+  try {
+    spawn(cmd, args, { stdio: "ignore", detached: true }).unref();
+    return true;
+  } catch {
+    return false;
   }
+}
 
-  // Save first so http.js can use it, then verify with /cli/whoami.
-  const file = await saveConfig({ api_url: cfg.api_url, token });
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
+async function saveAndVerify(apiUrl, token) {
+  const file = await saveConfig({ api_url: apiUrl, token });
   try {
     const me = await http.get("whoami");
     console.log(`Logged in as ${me.user_email || me.user_id} (super_admin=${me.is_super_admin})`);
@@ -73,6 +105,109 @@ export async function login(opts = {}) {
   }
 }
 
+async function browserLogin(cfg) {
+  const deviceName = `${os.hostname()} (${os.platform()})`;
+  let start;
+  try {
+    start = await unauthedPost(cfg.api_url, "login-start", { device_name: deviceName });
+  } catch (e) {
+    console.error(`Could not start browser login: ${e.message}`);
+    console.error("Fallback: flowiq auth login --paste");
+    process.exit(1);
+  }
+
+  console.log("");
+  console.log("First, confirm this code matches the one shown in your browser:");
+  console.log("");
+  console.log(`    ${start.user_code}`);
+  console.log("");
+  console.log(`Approval page: ${start.verification_url}`);
+  await prompt("Press ENTER to open in the browser... ");
+  if (!openBrowser(start.verification_url)) {
+    console.log("(Could not open a browser — visit the URL above manually.)");
+  }
+
+  const intervalMs = Math.max(2, start.interval || 5) * 1000;
+  const deadline = Date.now() + (start.expires_in || 600) * 1000;
+  process.stdout.write("Waiting for a super admin to approve");
+
+  while (Date.now() < deadline) {
+    await sleep(intervalMs);
+    let poll;
+    try {
+      poll = await unauthedPost(cfg.api_url, "login-poll", { device_code: start.device_code });
+    } catch (e) {
+      console.error(`\nPolling failed: ${e.message}`);
+      process.exit(1);
+    }
+
+    if (poll.status === "pending") { process.stdout.write("."); continue; }
+    if (poll.status === "slow_down") { await sleep(intervalMs); continue; }
+    process.stdout.write("\n");
+
+    if (poll.status === "approved") {
+      console.log(`Approved${poll.user_email ? ` by ${poll.user_email}` : ""}.`);
+      await saveAndVerify(cfg.api_url, poll.token);
+      return;
+    }
+    if (poll.status === "denied") { console.error("Login was DENIED in the browser."); process.exit(1); }
+    if (poll.status === "expired") { console.error("Login request expired. Re-run `flowiq auth login`."); process.exit(1); }
+    if (poll.status === "claimed") { console.error("This login was already claimed. Re-run `flowiq auth login`."); process.exit(1); }
+    console.error(`Unexpected status: ${poll.status}`); process.exit(1);
+  }
+
+  console.error("\nTimed out waiting for approval. Re-run `flowiq auth login`.");
+  process.exit(1);
+}
+
+export async function login(opts = {}) {
+  const cfg = await loadConfig();
+  if (opts.apiUrl) cfg.api_url = opts.apiUrl;
+
+  // Fallback paths: --token (direct) or --paste (interactive paste).
+  let token = opts.token;
+  if (!token && opts.paste) {
+    process.stdout.write(`API URL: ${cfg.api_url}\n`);
+    token = (await prompt("Paste your staff API key (fiq_staff_…): ", { silent: true })).trim();
+  }
+
+  if (token) {
+    if (!token.startsWith("fiq_staff_")) {
+      console.error(`Error: token must start with "fiq_staff_" (got ${token.slice(0, 12)}…).`);
+      process.exit(1);
+    }
+    await saveAndVerify(cfg.api_url, token);
+    return;
+  }
+
+  // Default: browser device flow.
+  await browserLogin(cfg);
+}
+
+export async function refresh() {
+  const cfg = await loadConfig();
+  if (!cfg.token) {
+    console.log("No saved token — starting browser login instead.");
+    await browserLogin(cfg);
+    return;
+  }
+
+  try {
+    const rotated = await http.post("token-rotate", {});
+    await saveConfig({ api_url: cfg.api_url, token: rotated.token });
+    console.log(`Token rotated (${rotated.rotated_from} → ${rotated.key_prefix}).`);
+    console.log(rotated.old_key_revoked ? "Old key revoked." : "WARNING: old key could not be revoked — revoke it manually.");
+  } catch (e) {
+    if (e.status === 401) {
+      console.log("Saved token is no longer valid — starting browser login…");
+      await browserLogin(cfg);
+      return;
+    }
+    console.error(`Refresh failed: ${e.message}`);
+    process.exit(1);
+  }
+}
+
 export async function logout() {
   const removed = await clearConfig();
   console.log(removed ? "Logged out." : "Already logged out.");

package/src/index.js

@@ -40,10 +40,14 @@ export function run(argv) {
   // auth
   const auth = program.command("auth").description("Manage CLI authentication");
   auth.command("login")
-    .description("Save a staff API key (fiq_staff_…)")
-    .option("--token <token>", "supply the token via flag instead of stdin")
+    .description("Log in via the browser (super-admin approval); --token/--paste for the old key-paste flow")
+    .option("--token <token>", "supply a staff API key directly instead of the browser flow")
+    .option("--paste", "prompt for a staff API key on stdin instead of the browser flow")
     .option("--api-url <url>", "override the API host (default https://api.flowiq.live)")
     .action((opts) => authCmd.login(opts));
+  auth.command("refresh")
+    .description("Rotate this device's token in place (old key is revoked server-side)")
+    .action(() => authCmd.refresh());
   auth.command("logout").description("Remove the saved token").action(() => authCmd.logout());
   auth.command("whoami").description("Show the user behind the saved token").action(() => authCmd.whoami());