blun-king-cli 2.5.1 → 2.6.0

package/bin/blun.js

@@ -2228,6 +2228,24 @@ async function main() {
     }
   }
 
+  // Restore last workdir if still in home/default dir
+  var lastWdFile = path.join(CONFIG_DIR, "last-workdir.json");
+  if (!dirIdx || dirIdx === -1) {
+    try {
+      if (fs.existsSync(lastWdFile)) {
+        var lastWd = JSON.parse(fs.readFileSync(lastWdFile, "utf8"));
+        if (lastWd.dir && fs.existsSync(lastWd.dir) && config.workdir === process.cwd()) {
+          // Only auto-restore if user didn't explicitly cd somewhere
+          var homeDir = require("os").homedir();
+          if (config.workdir === homeDir || config.workdir === homeDir.replace(/\\/g, "/")) {
+            config.workdir = lastWd.dir;
+            process.chdir(config.workdir);
+          }
+        }
+      }
+    } catch(e) {}
+  }
+
   if (!process.argv.includes("--no-workdir-prompt") && !process.argv.includes("--trust")) {
     var trustedDirs = [];
     var trustFile = path.join(CONFIG_DIR, "trusted.json");
@@ -2240,35 +2258,82 @@ async function main() {
       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.gray + "  [y] Yes, trust  [n] Choose another folder  [a] Always trust" + 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" }
+      ];
+      var trustSel = 0;
+
+      // Arrow key menu for trust selection
+      var trustChoice = await new Promise(function(resolve) {
+        function renderTrustMenu() {
+          // Move up and clear previous menu
+          if (trustSel >= 0) process.stdout.write("\x1b[3A\r");
+          trustOptions.forEach(function(opt, i) {
+            var prefix = i === trustSel ? C.green + C.bold + "  \u276F " : "    ";
+            var color = i === trustSel ? C.brightWhite + C.bold : C.gray;
+            process.stdout.write("\x1b[2K" + prefix + color + (i + 1) + ". " + opt.label + C.reset + "\n");
+          });
+        }
+        // Initial render
+        console.log(""); console.log(""); console.log("");
+        renderTrustMenu();
 
-      var trustAnswer = await new Promise(function(resolve) {
         process.stdin.setRawMode(true);
         process.stdin.resume();
         process.stdin.setEncoding("utf8");
-        process.stdin.once("data", function(key) {
-          process.stdin.setRawMode(false);
-          resolve(key.toLowerCase());
-        });
+        function onKey(key) {
+          if (key === "\x1b[A") { trustSel = Math.max(0, trustSel - 1); renderTrustMenu(); return; }
+          if (key === "\x1b[B") { trustSel = Math.min(2, trustSel + 1); renderTrustMenu(); return; }
+          if (key === "1") { trustSel = 0; process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve(trustOptions[0].action); return; }
+          if (key === "2") { trustSel = 1; process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve(trustOptions[1].action); return; }
+          if (key === "3") { trustSel = 2; process.stdin.removeListener("data", onKey); process.stdin.setRawMode(false); resolve(trustOptions[2].action); return; }
+          if (key === "\r" || key === "\n") {
+            process.stdin.removeListener("data", onKey);
+            process.stdin.setRawMode(false);
+            resolve(trustOptions[trustSel].action);
+            return;
+          }
+        }
+        process.stdin.on("data", onKey);
       });
 
-      if (trustAnswer === "a") {
+      if (trustChoice === "always") {
         trustedDirs.push(process.cwd());
         fs.writeFileSync(trustFile, JSON.stringify(trustedDirs, null, 2));
         printSuccess("Folder trusted permanently.");
-      } else if (trustAnswer === "n") {
-        var rlDir = readline.createInterface({ input: process.stdin, output: process.stdout });
-        var newDir = await new Promise(function(resolve) {
-          rlDir.question(C.brightBlue + "  Enter path: " + C.reset, resolve);
-        });
-        rlDir.close();
-        if (newDir.trim() && fs.existsSync(newDir.trim())) {
-          config.workdir = newDir.trim();
-        } else {
+      } 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.");
         }
       }
-      // y or anything else = trust for this session
+      // trust = trust for this session only
       console.log("");
     }
   }
@@ -2568,6 +2633,8 @@ async function main() {
     if (key === "\x03" || key === "\x04") {
       session.history = chatHistory.slice(-50);
       saveSessionHistory(session);
+      // Save last workdir for next session
+      try { fs.writeFileSync(path.join(CONFIG_DIR, "last-workdir.json"), JSON.stringify({ dir: config.workdir, ts: new Date().toISOString() })); } catch(e) {}
       eraseUI();
       console.log(C.dim + "\nBye." + C.reset);
       process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "BLUN King CLI — Premium KI Console",
   "bin": {
     "blun": "./bin/blun.js"