blun-king-cli 5.2.5 → 5.3.1

package/blun-cli.js

@@ -147,8 +147,7 @@ function printHeader() {
 // ── Update Checker ──
 function checkForUpdates() {
   try {
-    var currentVersion = "1.4.0";
-    try { currentVersion = require(path.join(__dirname, "..", "package.json")).version; } catch(e) {}
+    var currentVersion = PKG_VERSION;
     var nullDev = process.platform === "win32" ? "2>NUL" : "2>/dev/null";
     var latest = execSync("npm view blun-king-cli version " + nullDev, { encoding: "utf8", timeout: 8000, stdio: ["pipe", "pipe", "pipe"] }).trim();
     if (latest && latest !== currentVersion) {
@@ -534,7 +533,7 @@ async function handleCommand(input) {
       break;
 
     case "/login":
-      cmdLogin(args);
+      await cmdLogin(args);
       break;
 
     case "/logout":
@@ -2224,21 +2223,106 @@ function cmdModel(args) {
 // ══════════════════════════════════════════════════
 // ── 9. /login /logout ──
 // ══════════════════════════════════════════════════
-function cmdLogin(args) {
+async function cmdLogin(args) {
   if (args && args.startsWith("key ")) {
     config.auth.api_key = args.slice(4).trim();
     config.auth.type = "api_key";
+    config.api.key = config.auth.api_key;
     saveConfig(config);
     printSuccess("Logged in with API key.");
-  } else if (args === "oauth") {
-    printInfo("OAuth login not yet implemented. Use API key for now:");
-    printInfo("  /login key <your-api-key>");
-  } else {
+    return;
+  }
+
+  // Device Flow (like Claude Code)
+  console.log("");
+  console.log(C.bold + C.brightWhite + "  BLUN King Login" + C.reset);
+  console.log(C.gray + "  Connecting to " + config.api.base_url + "..." + C.reset);
+
+  try {
+    // Step 1: Start device flow
+    var deviceResp = await apiCall("POST", "/api/king/auth/device", {});
+    if (deviceResp.status !== 200 || !deviceResp.data.user_code) {
+      // Fallback: API key login
+      printInfo("Device flow not available. Use API key:");
+      printInfo("  /login key <your-api-key>");
+      return;
+    }
+
+    var deviceCode = deviceResp.data.device_code;
+    var userCode = deviceResp.data.user_code;
+    var verifyUrl = deviceResp.data.verification_url;
+    var pollInterval = (deviceResp.data.interval || 5) * 1000;
+    var expiresIn = deviceResp.data.expires_in || 900;
+
     console.log("");
-    console.log(C.bold + "  Login:" + C.reset);
-    console.log("  /login key <api-key>  — Login with API key");
-    console.log("  /login oauth          — Login with OAuth (coming soon)");
+    console.log(C.yellow + C.bold + "  Code: " + C.brightWhite + userCode + C.reset);
+    console.log(C.gray + "  Gib diesen Code im Browser ein:" + C.reset);
+    console.log(C.brightCyan + "  " + verifyUrl + C.reset);
     console.log("");
+
+    // Try to open browser
+    try {
+      if (process.platform === "win32") {
+        require("child_process").execSync('start "" "' + verifyUrl + '"', { stdio: "ignore" });
+      } else if (process.platform === "darwin") {
+        require("child_process").execSync('open "' + verifyUrl + '"', { stdio: "ignore" });
+      } else {
+        require("child_process").execSync('xdg-open "' + verifyUrl + '" 2>/dev/null || true', { stdio: "ignore" });
+      }
+      printInfo("Browser geöffnet.");
+    } catch(e) {
+      printInfo("Öffne den Link manuell im Browser.");
+    }
+
+    console.log(C.dim + "  Warte auf Freigabe..." + C.reset);
+
+    // Step 2: Poll for authorization
+    var maxPolls = Math.floor(expiresIn * 1000 / pollInterval);
+    var authorized = false;
+    for (var p = 0; p < maxPolls; p++) {
+      await new Promise(function(r) { setTimeout(r, pollInterval); });
+      try {
+        var tokenResp = await apiCall("POST", "/api/king/auth/token", { device_code: deviceCode });
+        if (tokenResp.status === 200 && tokenResp.data.access_token) {
+          // Success!
+          config.auth.type = "oauth";
+          config.auth.oauth_token = tokenResp.data.access_token;
+          config.auth.oauth_expires = new Date(Date.now() + (tokenResp.data.expires_in || 86400) * 1000).toISOString();
+          config.auth.refresh_token = tokenResp.data.refresh_token || "";
+          config.api.key = tokenResp.data.access_token;
+          if (tokenResp.data.user) {
+            config.auth.user = tokenResp.data.user;
+          }
+          saveConfig(config);
+          console.log("");
+          printSuccess("Eingeloggt!" + (tokenResp.data.user ? " (" + (tokenResp.data.user.email || tokenResp.data.user.name) + ")" : ""));
+          if (tokenResp.data.user && tokenResp.data.user.plan) {
+            printInfo("Plan: " + tokenResp.data.user.plan);
+          }
+          authorized = true;
+          break;
+        }
+        // 428 = authorization_pending → keep polling
+        if (tokenResp.status === 428) {
+          process.stdout.write(".");
+          continue;
+        }
+        // Other error
+        if (tokenResp.data && tokenResp.data.error === "expired_token") {
+          printError("Code abgelaufen. Starte /login erneut.");
+          break;
+        }
+      } catch(pollErr) {
+        // Network error, retry
+        continue;
+      }
+    }
+    if (!authorized) {
+      printError("Login fehlgeschlagen oder abgelaufen.");
+    }
+  } catch(e) {
+    printError("Login error: " + e.message);
+    printInfo("Fallback: /login key <your-api-key>");
   }
 }
 
@@ -2558,50 +2642,86 @@ async function main() {
     }
   }
 
-  // API Key — ALWAYS prompt (like Claude Code login)
-  var existingKey = config.api.key || config.auth.api_key || "";
-  console.log("");
-  console.log(C.yellow + C.bold + "  API Key" + C.reset);
-  if (existingKey.length > 3) {
-    console.log(C.gray + "  Current: " + C.green + existingKey.slice(0, 8) + "..." + C.reset);
-    console.log(C.gray + "  Press Enter to keep, or type a new key:" + C.reset);
-  } else {
-    console.log(C.gray + "  Enter your BLUN King API key:" + C.reset);
-  }
-  process.stdout.write(C.brightBlue + "  API Key: " + C.reset);
-  var apiKeyAnswer = await new Promise(function(resolve) {
-    var buf = "";
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.setEncoding("utf8");
-    function onKeyApi(key) {
-      if (key === "\x03") { process.exit(0); }
-      if (key === "\r" || key === "\n") {
-        process.stdin.removeListener("data", onKeyApi);
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
-        process.stdout.write("\n");
-        resolve(buf.trim());
-        return;
+  // Auth check — if no valid key/token, prompt for login or API key
+  var existingKey = config.api.key || config.auth.api_key || config.auth.oauth_token || "";
+  if (existingKey.length < 3) {
+    console.log("");
+    console.log(C.yellow + C.bold + "  Authentication required" + C.reset);
+    console.log(C.gray + "  Choose how to connect:" + C.reset);
+    console.log("");
+
+    var authOptions = [
+      { label: "Login (opens browser)", action: "login" },
+      { label: "Enter API key", action: "key" }
+    ];
+    var authSel = 0;
+    var authChoice = await new Promise(function(resolve) {
+      function render() {
+        process.stdout.write("\x1b[2A\r");
+        authOptions.forEach(function(opt, i) {
+          var prefix = i === authSel ? "\x1b[32m\x1b[1m  \u276F " : "    ";
+          var color = i === authSel ? "\x1b[97m\x1b[1m" : "\x1b[90m";
+          process.stdout.write("\x1b[2K" + prefix + color + opt.label + "\x1b[0m\n");
+        });
       }
-      if (key === "\x7f" || key === "\b") {
-        if (buf.length > 0) { buf = buf.slice(0, -1); process.stdout.write("\b \b"); }
-        return;
+      console.log(""); console.log("");
+      render();
+      process.stdin.setRawMode(true);
+      process.stdin.resume();
+      process.stdin.setEncoding("utf8");
+      function onKey(key) {
+        if (key === "\x1b[A") { authSel = Math.max(0, authSel - 1); render(); return; }
+        if (key === "\x1b[B") { authSel = Math.min(1, authSel + 1); render(); return; }
+        if (key === "\r" || key === "\n") {
+          process.stdin.removeListener("data", onKey);
+          process.stdin.setRawMode(false);
+          process.stdin.pause();
+          resolve(authOptions[authSel].action);
+          return;
+        }
+        if (key === "\x03") { process.exit(0); }
+      }
+      process.stdin.on("data", onKey);
+    });
+
+    if (authChoice === "login") {
+      await cmdLogin("");
+    } else {
+      console.log("");
+      process.stdout.write(C.brightBlue + "  API Key: " + C.reset);
+      var apiKeyAnswer = await new Promise(function(resolve) {
+        var buf = "";
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdin.setEncoding("utf8");
+        function onKeyApi(key) {
+          if (key === "\x03") { process.exit(0); }
+          if (key === "\r" || key === "\n") {
+            process.stdin.removeListener("data", onKeyApi);
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+            process.stdout.write("\n");
+            resolve(buf.trim());
+            return;
+          }
+          if (key === "\x7f" || key === "\b") {
+            if (buf.length > 0) { buf = buf.slice(0, -1); process.stdout.write("\b \b"); }
+            return;
+          }
+          buf += key;
+          process.stdout.write("*");
+        }
+        process.stdin.on("data", onKeyApi);
+      });
+      if (apiKeyAnswer) {
+        config.api.key = apiKeyAnswer;
+        config.auth.api_key = apiKeyAnswer;
+        saveConfig(config);
+        printSuccess("API key saved.");
+      } else {
+        printError("No API key — some features won't work.");
       }
-      buf += key;
-      process.stdout.write("*");
     }
-    process.stdin.on("data", onKeyApi);
-  });
-  if (apiKeyAnswer) {
-    config.api.key = apiKeyAnswer;
-    config.auth.api_key = apiKeyAnswer;
-    saveConfig(config);
-    printSuccess("API key saved.");
-  } else if (existingKey.length > 3) {
-    printSuccess("Using saved key.");
-  } else {
-    printError("No API key — some features won't work.");
   }
 
   printHeader();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "5.2.5",
+  "version": "5.3.1",
   "description": "BLUN King CLI — Your local AI assistant powered by Gemma4",
   "type": "commonjs",
   "bin": {