blun-king-cli 7.2.11 → 7.3.0

package/lib/chat.js

@@ -276,61 +276,25 @@ function startChat() {
           printToScrollArea(chalk.yellow("  [SYS] Model: " + parts[1]));
           drawInputPanel();
         } else {
-          // Open inquirer menu
-          enterMenuMode(function (done) {
-            var inquirer = require("inquirer");
-            inquirer.prompt([{
-              type: "list",
-              name: "model",
-              message: chalk.cyan("Select Model"),
-              choices: [
-                { name: "Auto (recommended)", value: "auto" },
-                { name: "Gemma 4", value: "gemma4" },
-                { name: "Claude", value: "claude" },
-                { name: "Llama", value: "llama" },
-              ],
-            }]).then(function (ans) {
-              if (ans.model) {
-                model = ans.model;
-                settings.model = ans.model;
-                auth.saveSettings(settings);
-                printToScrollArea(chalk.yellow("  [SYS] Model: " + ans.model));
-              }
-              done();
-            });
-          });
+          // Cycle model
+          var models = ["auto", "gemma4", "claude", "llama"];
+          var midx = models.indexOf(settings.model || "auto");
+          settings.model = models[(midx + 1) % models.length];
+          model = settings.model;
+          auth.saveSettings(settings);
+          printToScrollArea(chalk.yellow("  [SYS] Model: " + settings.model));
+          drawInputPanel();
         }
         return;
       }
 
       if (input === "/settings") {
-        enterMenuMode(function (done) {
-          openSettingsPanel(done);
-        });
+        openRawSettings();
         return;
       }
 
       if (input === "/") {
-        enterMenuMode(function (done) {
-          var inquirer = require("inquirer");
-          inquirer.prompt([{
-            type: "list",
-            name: "cmd",
-            message: chalk.cyan("Select command"),
-            choices: SLASH_COMMANDS.map(function (c) {
-              return { name: chalk.green(c[0]) + chalk.gray("  " + c[1]), value: c[0] };
-            }).concat([
-              new inquirer.Separator(),
-              { name: chalk.dim("Cancel"), value: "" },
-            ]),
-            pageSize: 12,
-          }]).then(function (ans) {
-            done();
-            if (ans.cmd) {
-              processCommand(ans.cmd);
-            }
-          });
-        });
+        openRawCommandPicker();
         return;
       }
 
@@ -413,6 +377,212 @@ function startChat() {
         });
     }
 
+    // ── Raw-Mode Settings Panel (no inquirer needed) ──────
+    function openRawSettings() {
+      var settingsActive = true;
+      var selectedField = 0;
+      var fields = ui.SETTINGS_FIELDS;
+
+      function drawSettings() {
+        var rows = getRows();
+        var cols = getCols();
+        var t = ui.getTheme();
+        var panelTop = rows - INPUT_PANEL_HEIGHT + 1;
+
+        // Draw settings over the input panel area
+        process.stdout.write(saveCursor());
+
+        // Clear panel area
+        for (var r = panelTop; r <= panelTop + 4; r++) {
+          process.stdout.write(cursorTo(r, 1) + clearLine());
+        }
+
+        // Also use scroll area bottom for more space
+        var settingsTop = panelTop - fields.length - 3;
+        if (settingsTop < 2) settingsTop = 2;
+
+        // Header
+        process.stdout.write(cursorTo(settingsTop, 1) + clearLine());
+        process.stdout.write(t.frame("  ╭─ Settings ") + t.frame("─".repeat(Math.max(1, cols - 16))) + t.frame("╮"));
+
+        // Fields
+        for (var i = 0; i < fields.length; i++) {
+          var row = settingsTop + 1 + i;
+          process.stdout.write(cursorTo(row, 1) + clearLine());
+          var marker = i === selectedField ? chalk.cyan("  ▸ ") : "    ";
+          var label = fields[i].label;
+          var value = ui.formatSettingValue(fields[i], settings[fields[i].key]);
+          var help = i === selectedField ? chalk.dim("  ← →  change") : "";
+          process.stdout.write(t.frame("  │") + marker + chalk.white(label) + " ".repeat(Math.max(1, 16 - label.length)) + value + help);
+          process.stdout.write(cursorTo(row, cols) + t.frame("│"));
+        }
+
+        // Footer
+        var footerRow = settingsTop + 1 + fields.length;
+        process.stdout.write(cursorTo(footerRow, 1) + clearLine());
+        process.stdout.write(t.frame("  │") + chalk.dim("  ↑↓ select  ← → change  Enter/Esc close"));
+        process.stdout.write(cursorTo(footerRow, cols) + t.frame("│"));
+
+        process.stdout.write(cursorTo(footerRow + 1, 1) + clearLine());
+        process.stdout.write(t.frame("  ╰") + t.frame("─".repeat(Math.max(1, cols - 4))) + t.frame("╯"));
+
+        process.stdout.write(restoreCursor());
+      }
+
+      // Replace data listener temporarily
+      process.stdin.removeAllListeners("data");
+
+      function onSettingsKey(key) {
+        if (!settingsActive) return;
+
+        // Escape or Enter — close settings
+        if (key === "\u001b" && key.length === 1 || key === "\r" || key === "\n") {
+          settingsActive = false;
+          process.stdin.removeAllListeners("data");
+          // Redraw normal UI
+          var rows = getRows();
+          var settingsTop = rows - INPUT_PANEL_HEIGHT + 1 - fields.length - 3;
+          if (settingsTop < 2) settingsTop = 2;
+          for (var r = settingsTop; r <= rows; r++) {
+            process.stdout.write(cursorTo(r, 1) + clearLine());
+          }
+          drawInputPanel();
+          startRawInput();
+          return;
+        }
+
+        // Up arrow
+        if (key === "\u001b[A") {
+          selectedField = (selectedField - 1 + fields.length) % fields.length;
+          drawSettings();
+          return;
+        }
+
+        // Down arrow
+        if (key === "\u001b[B") {
+          selectedField = (selectedField + 1) % fields.length;
+          drawSettings();
+          return;
+        }
+
+        // Left/Right arrow — cycle value
+        if (key === "\u001b[D" || key === "\u001b[C") {
+          var field = fields[selectedField];
+          var values = field.values;
+          var curIdx = values.indexOf(settings[field.key]);
+          if (curIdx < 0) curIdx = 0;
+          var dir = key === "\u001b[C" ? 1 : -1;
+          var newIdx = (curIdx + dir + values.length) % values.length;
+          settings[field.key] = values[newIdx];
+          if (field.key === "theme") ui.setTheme(settings.theme);
+          auth.saveSettings(settings);
+          drawSettings();
+          return;
+        }
+
+        // Ctrl+C
+        if (key === "\u0003") {
+          settingsActive = false;
+          process.stdin.removeAllListeners("data");
+          drawInputPanel();
+          startRawInput();
+          return;
+        }
+      }
+
+      process.stdin.on("data", onSettingsKey);
+      drawSettings();
+    }
+
+    // ── Raw Command Picker ─────────────────────────────────
+    function openRawCommandPicker() {
+      var pickerActive = true;
+      var selectedCmd = 0;
+
+      function drawPicker() {
+        var rows = getRows();
+        var cols = getCols();
+        var t = ui.getTheme();
+        var panelTop = rows - INPUT_PANEL_HEIGHT + 1;
+        var pickerTop = panelTop - SLASH_COMMANDS.length - 3;
+        if (pickerTop < 2) pickerTop = 2;
+
+        process.stdout.write(saveCursor());
+
+        // Header
+        process.stdout.write(cursorTo(pickerTop, 1) + clearLine());
+        process.stdout.write(t.frame("  ╭─ Commands ") + t.frame("─".repeat(Math.max(1, cols - 16))) + t.frame("╮"));
+
+        for (var i = 0; i < SLASH_COMMANDS.length; i++) {
+          var row = pickerTop + 1 + i;
+          process.stdout.write(cursorTo(row, 1) + clearLine());
+          var marker = i === selectedCmd ? chalk.cyan("  ▸ ") : "    ";
+          process.stdout.write(t.frame("  │") + marker + chalk.green(SLASH_COMMANDS[i][0]) + " ".repeat(Math.max(1, 14 - SLASH_COMMANDS[i][0].length)) + chalk.gray(SLASH_COMMANDS[i][1]));
+          process.stdout.write(cursorTo(row, cols) + t.frame("│"));
+        }
+
+        var footerRow = pickerTop + 1 + SLASH_COMMANDS.length;
+        process.stdout.write(cursorTo(footerRow, 1) + clearLine());
+        process.stdout.write(t.frame("  │") + chalk.dim("  ↑↓ select  Enter run  Esc close"));
+        process.stdout.write(cursorTo(footerRow, cols) + t.frame("│"));
+        process.stdout.write(cursorTo(footerRow + 1, 1) + clearLine());
+        process.stdout.write(t.frame("  ╰") + t.frame("─".repeat(Math.max(1, cols - 4))) + t.frame("╯"));
+
+        process.stdout.write(restoreCursor());
+      }
+
+      process.stdin.removeAllListeners("data");
+
+      function onPickerKey(key) {
+        if (!pickerActive) return;
+
+        if (key === "\u001b" && key.length === 1 || key === "\u0003") {
+          pickerActive = false;
+          process.stdin.removeAllListeners("data");
+          var rows = getRows();
+          var pickerTop = rows - INPUT_PANEL_HEIGHT + 1 - SLASH_COMMANDS.length - 3;
+          if (pickerTop < 2) pickerTop = 2;
+          for (var r = pickerTop; r <= rows; r++) {
+            process.stdout.write(cursorTo(r, 1) + clearLine());
+          }
+          drawInputPanel();
+          startRawInput();
+          return;
+        }
+
+        if (key === "\u001b[A") {
+          selectedCmd = (selectedCmd - 1 + SLASH_COMMANDS.length) % SLASH_COMMANDS.length;
+          drawPicker();
+          return;
+        }
+
+        if (key === "\u001b[B") {
+          selectedCmd = (selectedCmd + 1) % SLASH_COMMANDS.length;
+          drawPicker();
+          return;
+        }
+
+        if (key === "\r" || key === "\n") {
+          pickerActive = false;
+          process.stdin.removeAllListeners("data");
+          var cmd = SLASH_COMMANDS[selectedCmd][0];
+          var rows = getRows();
+          var pickerTop = rows - INPUT_PANEL_HEIGHT + 1 - SLASH_COMMANDS.length - 3;
+          if (pickerTop < 2) pickerTop = 2;
+          for (var r = pickerTop; r <= rows; r++) {
+            process.stdout.write(cursorTo(r, 1) + clearLine());
+          }
+          drawInputPanel();
+          startRawInput();
+          processCommand(cmd);
+          return;
+        }
+      }
+
+      process.stdin.on("data", onPickerKey);
+      drawPicker();
+    }
+
     // ── Settings Panel (inquirer) ─────────────────────────
     function openSettingsPanel(done) {
       var inquirer = require("inquirer");
@@ -460,23 +630,35 @@ function startChat() {
     // ── Menu Mode (temporarily disable raw input) ────────
     function enterMenuMode(fn) {
       isInMenu = true;
-      // Reset scroll region for inquirer to work properly
+      // Reset everything for inquirer
       var rows = getRows();
+      // Remove scroll region
       process.stdout.write(setScrollRegion(1, rows));
-      process.stdout.write(cursorTo(rows - INPUT_PANEL_HEIGHT, 1));
+      // Move cursor below the panel area
+      process.stdout.write(cursorTo(rows - INPUT_PANEL_HEIGHT - 1, 1));
       process.stdout.write(showCursor());
-      try { process.stdin.setRawMode(false); } catch (e) {}
+      // Exit raw mode and clean up listeners
       process.stdin.removeAllListeners("data");
+      process.stdin.removeAllListeners("keypress");
+      try { process.stdin.setRawMode(false); } catch (e) {}
+      // Fully reset stdin for inquirer
       process.stdin.pause();
-      process.stdin.resume();
-
-      fn(function () {
-        // Re-enter TUI mode
-        isInMenu = false;
-        setupLayout();
-        drawInputPanel();
-        startRawInput();
-      });
+      // Small delay to let stdin settle before inquirer takes over
+      setTimeout(function () {
+        fn(function () {
+          // Re-enter TUI mode
+          isInMenu = false;
+          console.clear();
+          ui.renderBanner();
+          var creds3 = auth.getStoredCredentials();
+          if (creds3) {
+            console.log(chalk.yellow("  [SYS] Connected as " + (creds3.name || creds3.email || "user") + " | Plan: " + (creds3.plan || "free")));
+          }
+          setupLayout();
+          drawInputPanel();
+          startRawInput();
+        });
+      }, 50);
     }
 
     // ── Cleanup ──────────────────────────────────────────
@@ -602,6 +784,12 @@ function startChat() {
       setTimeout(function () {
         // Clear screen, draw banner, then enter TUI mode
         console.clear();
+        // Push banner down a few lines
+        var rows = getRows();
+        var contentHeight = 12; // banner ~6 + info ~3 + padding ~3
+        var scrollArea = rows - INPUT_PANEL_HEIGHT;
+        var topPadding = Math.max(0, Math.floor((scrollArea - contentHeight) / 2));
+        for (var p = 0; p < topPadding; p++) console.log("");
         // Render banner in normal mode first (before scroll region)
         ui.renderBanner();
         var creds2 = auth.getStoredCredentials();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "7.2.11",
+  "version": "7.3.0",
   "description": "BLUN AI Assistant - Command Line Interface",
   "bin": {
     "blun": "./bin/blun.js"