blun-king-cli 5.1.7 → 5.2.1

package/blun-cli.js

@@ -2595,93 +2595,74 @@ async function main() {
   }
 
   if (!process.argv.includes("--no-workdir-prompt") && !process.argv.includes("--trust")) {
-    var trustedDirs = [];
-    var trustFile = path.join(CONFIG_DIR, "trusted.json");
-    if (fs.existsSync(trustFile)) {
-      try { trustedDirs = JSON.parse(fs.readFileSync(trustFile, "utf8")); } catch(e) {}
-    }
-    var isTrusted = trustedDirs.includes(process.cwd());
-
-    if (!isTrusted) {
+    // Always ask — like Claude Code (every session)
+    {
       console.log("");
-      console.log(C.yellow + "  " + BOX.bot + " Working in: " + C.brightWhite + process.cwd() + C.reset);
-      console.log(C.gray + "  Do you trust this folder? BLUN King will read/write files here." + C.reset);
+      console.log(C.yellow + C.bold + "  Quick safety check:" + C.reset);
+      console.log(C.gray + "  Is " + C.brightWhite + process.cwd() + C.gray + " a project you trust?" + C.reset);
+      console.log(C.dim + "  BLUN King will read and write files in this folder." + C.reset);
       console.log("");
 
       var trustOptions = [
-        { label: "Yes, trust this folder", action: "trust" },
-        { label: "Always trust this folder", action: "always" },
-        { label: "Choose another folder", action: "choose" }
+        { label: "Yes, I trust this folder", action: "trust" },
+        { label: "No, exit", action: "exit" }
       ];
       var trustSel = 0;
       var trustResult = await new Promise(function(resolve) {
         function render() {
-          process.stdout.write("\x1b[3A\r");
+          process.stdout.write("\x1b[2A\r");
           trustOptions.forEach(function(opt, i) {
             var prefix = i === trustSel ? "\x1b[32m\x1b[1m  \u276F " : "    ";
             var color = i === trustSel ? "\x1b[97m\x1b[1m" : "\x1b[90m";
-            process.stdout.write("\x1b[2K" + prefix + color + (i + 1) + ". " + opt.label + "\x1b[0m\n");
+            process.stdout.write("\x1b[2K" + prefix + color + opt.label + "\x1b[0m\n");
           });
         }
-        console.log(""); console.log(""); console.log("");
+        console.log(""); console.log("");
         render();
         process.stdin.setRawMode(true);
         process.stdin.resume();
         process.stdin.setEncoding("utf8");
         function onKey(key) {
           if (key === "\x1b[A") { trustSel = Math.max(0, trustSel - 1); render(); return; }
-          if (key === "\x1b[B") { trustSel = Math.min(2, trustSel + 1); render(); return; }
-          if (key === "1" || key === "2" || key === "3") { trustSel = parseInt(key) - 1; process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve(trustOptions[trustSel]); return; }
-          if (key === "\r" || key === "\n") { process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve(trustOptions[trustSel]); return; }
+          if (key === "\x1b[B") { trustSel = Math.min(1, trustSel + 1); render(); return; }
+          if (key === "\r" || key === "\n") {
+            process.stdin.removeListener("data", onKey);
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+            resolve(trustOptions[trustSel]);
+            return;
+          }
           if (key === "\x03") { process.exit(0); }
         }
         process.stdin.on("data", onKey);
       });
-      var trustChoice = trustResult.action;
-
-      if (trustChoice === "always") {
-        trustedDirs.push(process.cwd());
-        fs.writeFileSync(trustFile, JSON.stringify(trustedDirs, null, 2));
-        printSuccess("Folder trusted permanently.");
-      } else if (trustChoice === "choose") {
-        // Open Windows folder picker if available
-        var newDir = null;
-        if (process.platform === "win32") {
-          try {
-            printInfo("Opening folder picker...");
-            var psCmd = 'powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; $f = New-Object System.Windows.Forms.FolderBrowserDialog; $f.Description = \'Choose BLUN King workspace\'; $f.ShowNewFolderButton = $true; if($f.ShowDialog() -eq \'OK\'){ Write-Output $f.SelectedPath } else { Write-Output \'CANCELLED\' }"';
-            newDir = require("child_process").execSync(psCmd, { encoding: "utf8", timeout: 60000 }).trim();
-            if (newDir === "CANCELLED") newDir = null;
-          } catch(e) { newDir = null; }
-        }
-        // Fallback to text input
-        if (!newDir) {
-          var rlDir = readline.createInterface({ input: process.stdin, output: process.stdout });
-          newDir = await new Promise(function(resolve) {
-            rlDir.question(C.brightBlue + "  Enter path: " + C.reset, resolve);
-          });
-          rlDir.close();
-          newDir = newDir ? newDir.trim() : null;
-        }
-        if (newDir && fs.existsSync(newDir)) {
-          config.workdir = newDir;
-          try { fs.writeFileSync(path.join(CONFIG_DIR, "last-workdir.json"), JSON.stringify({ dir: config.workdir, ts: new Date().toISOString() })); } catch(e) {}
-          printSuccess("Workspace: " + config.workdir);
-        } else if (newDir) {
-          printError("Invalid path, using current directory.");
-        }
+
+      if (trustResult.action === "exit") {
+        console.log("");
+        printInfo("Bye!");
+        process.exit(0);
       }
-      // trust = trust for this session only
       console.log("");
     }
   }
 
   // API Key check — prompt if missing (BEFORE header, so user sees it immediately)
-  var hasKey = (config.api.key && config.api.key.length > 3) || (config.auth.api_key && config.auth.api_key.length > 3);
-  if (!hasKey && !process.argv.includes("--api-key")) {
+  // Test if key actually works by hitting /health
+  var hasKey = false;
+  var existingKey = config.api.key || config.auth.api_key || "";
+  if (existingKey.length > 3) {
+    try {
+      var testH = await apiCall("GET", "/health");
+      hasKey = (testH.status === 200);
+    } catch(e) { hasKey = false; }
+  }
+  if (!hasKey) {
     console.log("");
-    console.log(C.yellow + "  " + BOX.bot + " No API key configured." + C.reset);
-    console.log(C.gray + "  Enter your BLUN King API key (or press Enter to skip):" + C.reset);
+    console.log(C.yellow + C.bold + "  API Key required" + C.reset);
+    if (existingKey.length > 3) {
+      console.log(C.red + "  Saved key didn't work — please re-enter." + C.reset);
+    }
+    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 = "";
@@ -2693,6 +2674,7 @@ async function main() {
         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;
@@ -2709,15 +2691,10 @@ async function main() {
     if (apiKeyAnswer) {
       config.api.key = apiKeyAnswer;
       config.auth.api_key = apiKeyAnswer;
-      var cfgFile = path.join(CONFIG_DIR, "config.json");
-      var cfgData = {};
-      if (fs.existsSync(cfgFile)) { try { cfgData = JSON.parse(fs.readFileSync(cfgFile, "utf8")); } catch(e) {} }
-      if (!cfgData.api) cfgData.api = {};
-      if (!cfgData.auth) cfgData.auth = {};
-      cfgData.api.key = apiKeyAnswer;
-      cfgData.auth.api_key = apiKeyAnswer;
-      fs.writeFileSync(cfgFile, JSON.stringify(cfgData, null, 2));
+      saveConfig(config);
       printSuccess("API key saved.");
+    } else {
+      printError("No API key — some features won't work.");
     }
   }
 
@@ -2738,47 +2715,8 @@ async function main() {
     printInfo("Run: blun setup — to configure");
   }
 
-  // Mode selection at startup
-  var sessionMode = "chat"; // chat or agent
-  if (!process.argv.includes("--agent") && !process.argv.includes("--chat")) {
-    console.log("");
-    console.log(C.brightWhite + C.bold + "  How do you want to work?" + C.reset);
-    console.log("");
-    var modeOptions = [
-      { label: "Chat \u2014 talk back and forth", mode: "chat" },
-      { label: "Agent \u2014 give a goal, I do the rest autonomously", mode: "agent" }
-    ];
-    var modeSel = 0;
-    var modeChoice = await new Promise(function(resolve) {
-      function render() {
-        process.stdout.write("\x1b[2A\r");
-        modeOptions.forEach(function(opt, i) {
-          var prefix = i === modeSel ? "\x1b[32m\x1b[1m  \u276F " : "    ";
-          var color = i === modeSel ? "\x1b[97m\x1b[1m" : "\x1b[90m";
-          process.stdout.write("\x1b[2K" + prefix + color + (i + 1) + ". " + opt.label + "\x1b[0m\n");
-        });
-      }
-      console.log(""); console.log("");
-      render();
-      process.stdin.setRawMode(true);
-      process.stdin.resume();
-      process.stdin.setEncoding("utf8");
-      function onKey(key) {
-        if (key === "\x1b[A") { modeSel = 0; render(); return; }
-        if (key === "\x1b[B") { modeSel = 1; render(); return; }
-        if (key === "1") { process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve("chat"); return; }
-        if (key === "2") { process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve("agent"); return; }
-        if (key === "\r" || key === "\n") { process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve(modeOptions[modeSel].mode); return; }
-        if (key === "\x03") { process.exit(0); }
-      }
-      process.stdin.on("data", onKey);
-    });
-    sessionMode = modeChoice;
-    printSuccess("Mode: " + (sessionMode === "agent" ? "Agent (autonomous)" : "Chat (interactive)"));
-    console.log("");
-  } else {
-    sessionMode = process.argv.includes("--agent") ? "agent" : "chat";
-  }
+  // Auto-detect mode from input (no startup selection — like Claude Code)
+  var sessionMode = process.argv.includes("--agent") ? "agent" : "chat";
 
   var ALL_COMMANDS = [
     "/help", "/clear", "/skills", "/skill", "/search", "/learn", "/learn-url",

package/package.json

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