blun-king-cli 6.3.4 → 6.4.0

package/lib/chat.js

@@ -6,6 +6,11 @@ const client = require('./client');
 
 let localMode = false;
 
+function showPrompt(rl, username, model) {
+  ui.renderInputBox(username, model);
+  rl.prompt();
+}
+
 async function startChat() {
   ui.renderBanner();
 
@@ -34,38 +39,43 @@ async function startChat() {
   }
 
   const settings = auth.getSettings();
+  const username = (creds ? creds.name : null) || 'local';
+  const model = settings.model || 'auto';
+
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
-    prompt: ui.renderPrompt((creds ? creds.name : null) || 'local', settings.model || 'auto'),
+    prompt: ui.renderPrompt(username, model),
     terminal: true
   });
 
-  console.log('  Type /help for commands, /exit to quit.\n');
-  rl.prompt();
+  showPrompt(rl, username, model);
 
+  return new Promise((resolveChat) => {
   rl.on('line', async (line) => {
     const input = line.trim();
-    if (!input) { rl.prompt(); return; }
+    ui.renderInputBoxClose();
+    if (!input) { showPrompt(rl, username, model); return; }
 
     if (input === '/exit' || input === '/quit') {
       ui.renderResponse('Goodbye!', 'system'); process.exit(0);
     }
-    if (input === '/clear') { console.clear(); ui.renderBanner(); rl.prompt(); return; }
-    if (input === '/status') { ui.renderStatusBar(ui.getStats()); rl.prompt(); return; }
+    if (input === '/clear') { console.clear(); ui.renderBanner(); showPrompt(rl, username, model); return; }
+    if (input === '/status') { ui.renderStatusBar(ui.getStats()); showPrompt(rl, username, model); return; }
     if (input === '/login') {
       try { await auth.login(); localMode = false; ui.renderResponse('Logged in!', 'system'); }
       catch(e) { ui.renderResponse(e.message, 'error'); }
-      rl.prompt(); return;
+      showPrompt(rl, username, model); return;
     }
     if (input === '/whoami') {
       try { await auth.whoami(); } catch(e) { ui.renderResponse(e.message, 'error'); }
-      rl.prompt(); return;
+      showPrompt(rl, username, model); return;
     }
     if (input === '/keys') {
       try { await auth.listApiKeys(); } catch(e) { ui.renderResponse(e.message, 'error'); }
-      rl.prompt(); return;
-    }    if (input === '/model') {
+      showPrompt(rl, username, model); return;
+    }
+    if (input === '/model') {
       const s = auth.getSettings();
       const choice = await auth.promptMenu('Select Model', [
         { label: 'Auto (recommended)', value: 'auto' },
@@ -74,15 +84,15 @@ async function startChat() {
         { label: 'Llama', value: 'llama' }
       ]);
       if (choice) { s.model = choice; auth.saveSettings(s); ui.renderResponse('Model set to: ' + choice, 'system'); }
-      rl.prompt(); return;
+      showPrompt(rl, username, model); return;
     }
     if (input === '/settings') {
       const s = auth.getSettings();
-      console.log(chalk.bold.cyan('\n  Current Settings:'));
-      console.log(chalk.white('  Model:    ') + (s.model || 'auto'));
-      console.log(chalk.white('  Language: ') + (s.language || 'de'));
-      console.log(chalk.white('  Voice:    ') + (s.voice ? 'on' : 'off'));
-      console.log('');
+      ui.renderBox('Settings', [
+        'Model:    ' + (s.model || 'auto'),
+        'Language: ' + (s.language || 'de'),
+        'Voice:    ' + (s.voice ? 'on' : 'off')
+      ].join('\n'), 'cyan');
       const action = await auth.promptMenu('Change Setting', [
         { label: 'Model', value: 'model' },
         { label: 'Language (de/en)', value: 'language' },
@@ -101,7 +111,7 @@ async function startChat() {
       } else if (action === 'voice') {
         s.voice = !s.voice; auth.saveSettings(s); ui.renderResponse('Voice: ' + (s.voice ? 'on' : 'off'), 'system');
       }
-      rl.prompt(); return;
+      showPrompt(rl, username, model); return;
     }
     if (input === '/help') {
       ui.renderBox('Chat Commands', [
@@ -115,12 +125,12 @@ async function startChat() {
         '/settings  Show/change settings',
         '/help      Show this help'
       ].join('\n'), 'cyan');
-      rl.prompt(); return;
+      showPrompt(rl, username, model); return;
     }
 
     if (localMode) {
       ui.renderResponse('Local mode - cannot send messages. Use /login to authenticate.', 'error');
-      rl.prompt(); return;
+      showPrompt(rl, username, model); return;
     }
 
     const spinner = ui.renderSpinner('Thinking...');
@@ -131,7 +141,11 @@ async function startChat() {
       if (res.status === 200 && res.data) {
         const text = res.data.answer || res.data.response || res.data.text || res.data.message || JSON.stringify(res.data);
         ui.renderResponse(text, 'agent');
-        if (res.data.usage) ui.addTokens(res.data.usage.total_tokens || 0, 0.000003);
+        const tok = res.data.tokens || res.data.usage || {};
+        const tokTotal = tok.total || tok.total_tokens || 0;
+        if (tokTotal) ui.addTokens(tokTotal, 0.000003);
+        const usedModel = res.data.routing && res.data.routing.task && res.data.routing.task.type || settings.model || 'auto';
+        ui.renderMiniStatus(usedModel, tokTotal);
       } else if (res.status === 401 || res.status === 403) {
         ui.renderResponse('Auth error. Use /login to re-authenticate.', 'error');
       } else {
@@ -141,10 +155,11 @@ async function startChat() {
       ui.stopSpinner(false, e.message);
       ui.renderResponse('Request failed: ' + e.message + '\n  Try /login if auth expired.', 'error');
     }
-    rl.prompt();
+    showPrompt(rl, username, model);
   });
 
-  rl.on('close', () => { console.log(''); process.exit(0); });
+  rl.on('close', () => { console.log(''); resolveChat(); });
+  });
 }
 
-module.exports = { startChat };
+module.exports = { startChat };

package/lib/ui.js

@@ -1,6 +1,6 @@
 /**
  * BLUN King CLI - Rich Terminal UI Module
- * Task 11: Claude Code-style terminal experience
+ * Claude Code-style terminal experience
  * CommonJS - chalk@4, ora@5, boxen@5
  */
 
@@ -47,27 +47,74 @@ function renderBanner() {
   console.log(chalk.dim("  " + "\u2500".repeat(53) + "\n"));
 }
 
+function getInputBoxWidth() {
+  return Math.min((process.stdout.columns || 80) - 2, 76);
+}
+
+function renderInputBox(username, model) {
+  var w = getInputBoxWidth();
+  var u = username || "user";
+  var m = model || "auto";
+  var hints = "/help \u2502 /settings \u2502 /model \u2502 /exit";
+  var labelText = " " + u + " [" + m + "] ";
+  var hintsText = " " + hints + " ";
+  var topFill = w - labelText.length - hintsText.length;
+  if (topFill < 2) topFill = 2;
+  var topLine = chalk.dim("\u256d") + chalk.cyan(labelText) + chalk.dim("\u2500".repeat(topFill)) + chalk.dim(hintsText) + chalk.dim("\u256e");
+  console.log(topLine);
+}
+
+function renderInputBoxClose() {
+  var w = getInputBoxWidth();
+  console.log(chalk.dim("\u2570" + "\u2500".repeat(w) + "\u256f"));
+}
+
 function renderPrompt(username, model) {
-  var u = chalk.cyan.bold(username || "user");
-  var m = chalk.dim("[" + (model || "auto") + "]");
-  return chalk.dim("\u250c") + " " + u + " " + m + "\n" + chalk.dim("\u2514") + " " + chalk.green.bold("\u276f") + " ";
+  // Called by readline as the prompt string - keep it simple
+  return chalk.dim("\u2502") + " " + chalk.green.bold("\u276f") + " ";
 }
 
 function renderResponse(text, type) {
   var colorFn = colors[type] || colors.agent;
   var labels = { user: "YOU", agent: "BLUN", system: "SYS", error: "ERR" };
   var label = labels[type] || "BLUN";
-  var prefix = colorFn.bold("  [" + label + "] ");
   var rendered = renderMarkdown(text);
-  var lines = rendered.split("\n");
-  lines.forEach(function (line, i) {
-    if (i === 0) {
-      console.log(prefix + colorFn(line));
-    } else {
-      console.log("        " + colorFn(line));
-    }
-  });
-  console.log();
+
+  if (type === "agent") {
+    // Agent responses in a box
+    console.log(
+      boxen(rendered, {
+        title: chalk.green.bold(" \u2728 BLUN "),
+        titleAlignment: "left",
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 0, left: 1, right: 1 },
+        borderStyle: "round",
+        borderColor: "green",
+      })
+    );
+  } else if (type === "error") {
+    console.log(
+      boxen(chalk.red(rendered), {
+        title: chalk.red.bold(" \u2718 Error "),
+        titleAlignment: "left",
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 0, left: 1, right: 1 },
+        borderStyle: "round",
+        borderColor: "red",
+      })
+    );
+  } else {
+    var prefix = colorFn.bold("  [" + label + "] ");
+    var lines = rendered.split("\n");
+    lines.forEach(function (line, i) {
+      if (i === 0) {
+        console.log(prefix + colorFn(line));
+      } else {
+        console.log("        " + colorFn(line));
+      }
+    });
+    console.log();
+  }
 }
 
 function renderMarkdown(text) {
@@ -154,6 +201,19 @@ function renderCodeBlock(code, language) {
   console.log();
 }
 
+function renderMiniStatus(model, tokens) {
+  var elapsed = Math.floor((Date.now() - startTime) / 1000);
+  var mins = Math.floor(elapsed / 60);
+  var secs = elapsed % 60;
+  var parts = [];
+  parts.push(chalk.bgCyan.black(" " + (model || "auto") + " "));
+  if (tokens) parts.push(chalk.dim("Tokens: " + tokens.toLocaleString()));
+  parts.push(chalk.dim("Total: " + totalTokens.toLocaleString()));
+  parts.push(chalk.dim(mins + "m " + secs + "s"));
+  console.log("  " + parts.join(chalk.dim(" \u2502 ")));
+  console.log();
+}
+
 function renderStatusBar(stats) {
   var s = stats || {};
   var model = s.model || "auto";
@@ -200,6 +260,9 @@ function getStats() {
 module.exports = {
   renderBanner: renderBanner,
   renderPrompt: renderPrompt,
+  renderInputBox: renderInputBox,
+  renderInputBoxClose: renderInputBoxClose,
+  renderMiniStatus: renderMiniStatus,
   renderResponse: renderResponse,
   renderSpinner: renderSpinner,
   stopSpinner: stopSpinner,

package/package.json

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