tsunami-code 3.11.0 → 3.11.1

package/index.js

@@ -508,6 +508,7 @@ async function run() {
   });
 
   ui.start(historyEntries);
+  ui.setModelLabel(getModel());
 
   // ── Memory commands ───────────────────────────────────────────────────────────
   async function handleMemoryCommand(args) {
@@ -973,6 +974,7 @@ async function run() {
         case 'model':
           if (rest[0]) {
             setModel(rest[0]);
+            ui.setModelLabel(rest[0]);
             console.log(green(`  Model changed to: ${rest[0]}\n`));
           } else {
             console.log(dim(`  Current model: ${getModel()}\n`));

package/lib/ui.js

@@ -1,34 +1,38 @@
 // lib/ui.js — sticky-bottom terminal UI
-// Pins a 3-line input box at the bottom of the terminal.
-// All output (model replies, tool calls, spinner) scrolls above it.
-// Uses ANSI scroll region (\x1b[top;botr) so the bottom box never scrolls.
+// Pins a 4-line area at the bottom of the terminal:
+//   ╭─ tsunami ───────────────────────────────────────────────╮
+//   │ ❯ input                                                 │
+//   ╰─────────────────────────────────────────────────────────╯
+//     model-name                                         (dim)
+// All output (replies, tool calls, spinner) scrolls above.
+// Uses ANSI scroll region so the bottom box never scrolls away.
 
 import chalk from 'chalk';
 
-const cyan  = (s) => chalk.cyan(s);
+const cyan   = (s) => chalk.cyan(s);
 const yellow = (s) => chalk.yellow(s);
-const dim   = (s) => chalk.dim(s);
+const dim    = (s) => chalk.dim(s);
 
-const BOX_LINES = 3; // ╭─ header ─╮ / │ ❯ input │ / ╰──────────╯
+const BOX_LINES = 4; // top border + input + bottom border + model label
 
 export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit }) {
-  let planMode       = initPlanMode;
-  let continuation   = false;   // true → show ··· prompt
-  let inputBuf       = '';
-  let cursorPos      = 0;
-  let history        = [];      // strings, oldest→newest
-  let histIdx        = 0;       // points past end when not navigating
-  let histDraft      = '';      // saved current input while browsing history
-  let processing     = false;
-  let lineHandler    = null;    // set during readLine / readChar
-  let _interrupted   = false;
-
-  const rows = () => process.stdout.rows  || 24;
+  let planMode     = initPlanMode;
+  let continuation = false;
+  let modelLabel   = '';
+  let inputBuf     = '';
+  let cursorPos    = 0;
+  let history      = [];
+  let histIdx      = 0;
+  let histDraft    = '';
+  let processing   = false;
+  let lineHandler  = null;
+  let _interrupted = false;
+
+  const rows = () => process.stdout.rows    || 24;
   const cols = () => process.stdout.columns || 80;
 
   // ── Scroll region ──────────────────────────────────────────────────────────
-  // Confines terminal scroll to rows 1..(rows-BOX_LINES).
-  // The bottom BOX_LINES rows sit outside the scroll region and stay fixed.
+  // Rows 1 .. (rows-BOX_LINES) scroll. The bottom BOX_LINES rows stay fixed.
 
   function setScrollRegion() {
     process.stdout.write(`\x1b[1;${rows() - BOX_LINES}r`);
@@ -39,40 +43,38 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
   }
 
   function goOutputArea() {
-    // Place cursor at the last line of the scroll region so next write lands there.
     process.stdout.write(`\x1b[${rows() - BOX_LINES};1H`);
   }
 
   // ── Box drawing ────────────────────────────────────────────────────────────
+  // Draws using absolute row numbers from the actual terminal bottom.
 
   function drawBox() {
-    const w = cols();
-    const r = rows();
-    const r1 = r - BOX_LINES + 1;   // top border row
-    const r2 = r - BOX_LINES + 2;   // input row
-    const r3 = r - BOX_LINES + 3;   // bottom border row
+    const w  = cols();
+    const r  = rows();       // last row of terminal
+    const rT = r - 3;        // top border    ╭─────╮
+    const rI = r - 2;        // input line    │ ❯   │
+    const rB = r - 1;        // bottom border ╰─────╯
+    const rM = r;            // model label
 
-    // Save cursor so we can restore it after drawing.
-    process.stdout.write('\x1b[s');
+    process.stdout.write('\x1b[s');   // save cursor
 
-    // Top border ─────────────────────────────────────────
+    // Top border ─────────────────────────────────────────────────────
     const label     = ' tsunami ';
     const rightFill = Math.max(0, w - 2 - 1 - label.length);
     const topLine   = `╭─${label}${'─'.repeat(rightFill)}╮`;
-    process.stdout.write(`\x1b[${r1};1H\x1b[2K${topLine.slice(0, w)}`);
+    process.stdout.write(`\x1b[${rT};1H\x1b[2K${topLine.slice(0, w)}`);
 
-    // Input line ──────────────────────────────────────────
+    // Input line ──────────────────────────────────────────────────────
     let prefix;
     if (continuation)  prefix = ` ${dim('···')} `;
     else if (planMode) prefix = ` ${yellow('❯')} ${dim('[plan]')} `;
     else               prefix = ` ${cyan('❯')} `;
 
-    // Strip ANSI codes to measure visible width of prefix.
     const prefixVis = prefix.replace(/\x1b\[[0-9;]*m/g, '');
-    const innerW    = w - 2;                              // space between │ │
-    const maxInput  = Math.max(0, innerW - prefixVis.length - 1); // trailing space
+    const innerW    = w - 2;
+    const maxInput  = Math.max(0, innerW - prefixVis.length - 1);
 
-    // Slide window so cursor stays visible.
     let dispInput  = inputBuf;
     let dispCursor = cursorPos;
     if (dispInput.length > maxInput) {
@@ -82,15 +84,19 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
     }
     const display = dispInput.slice(0, maxInput);
     const pad     = ' '.repeat(Math.max(0, maxInput - display.length));
-    process.stdout.write(`\x1b[${r2};1H\x1b[2K│${prefix}${display}${pad} │`);
+    process.stdout.write(`\x1b[${rI};1H\x1b[2K│${prefix}${display}${pad} │`);
 
-    // Bottom border ───────────────────────────────────────
+    // Bottom border ───────────────────────────────────────────────────
     const botLine = `╰${'─'.repeat(w - 2)}╯`;
-    process.stdout.write(`\x1b[${r3};1H\x1b[2K${botLine.slice(0, w)}`);
+    process.stdout.write(`\x1b[${rB};1H\x1b[2K${botLine.slice(0, w)}`);
+
+    // Model label ─────────────────────────────────────────────────────
+    const ml = modelLabel ? `  ${dim(modelLabel)}` : '';
+    process.stdout.write(`\x1b[${rM};1H\x1b[2K${ml}`);
 
-    // Restore cursor to correct column in the input row.
+    // Position cursor in input line at correct column ─────────────────
     const curCol = 1 + prefixVis.length + 1 + Math.min(dispCursor, display.length);
-    process.stdout.write(`\x1b[${r2};${curCol}H`);
+    process.stdout.write(`\x1b[${rI};${curCol}H`);
   }
 
   // ── Raw key handler ────────────────────────────────────────────────────────
@@ -98,10 +104,9 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
   function handleKey(chunk) {
     const key = chunk.toString('utf8');
 
-    // Delegate to temporary line handler (readLine / readChar in progress).
     if (lineHandler) { lineHandler(key); return; }
 
-    // Ctrl+C ──────────────────────────────────────────────
+    // Ctrl+C
     if (key === '\x03') {
       if (processing) {
         _interrupted = true;
@@ -117,15 +122,15 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       return;
     }
 
-    // Ctrl+D ──────────────────────────────────────────────
+    // Ctrl+D
     if (key === '\x04') {
       if (!processing && inputBuf === '') { exitUI(); onExit(0); }
       return;
     }
 
-    if (processing) return;   // swallow all other keys while model is running
+    if (processing) return;
 
-    // Enter ───────────────────────────────────────────────
+    // Enter
     if (key === '\r' || key === '\n') {
       const line = inputBuf;
       if (line || continuation) {
@@ -144,7 +149,7 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       return;
     }
 
-    // Backspace ───────────────────────────────────────────
+    // Backspace
     if (key === '\x7f' || key === '\x08') {
       if (cursorPos > 0) {
         inputBuf = inputBuf.slice(0, cursorPos - 1) + inputBuf.slice(cursorPos);
@@ -154,7 +159,7 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       return;
     }
 
-    // Tab ─────────────────────────────────────────────────
+    // Tab
     if (key === '\t') {
       if (!onTab) return;
       const [hits] = onTab(inputBuf);
@@ -165,7 +170,6 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
         drawBox();
         return;
       }
-      // Multiple hits — show list and fill common prefix.
       const prefix = hits.reduce((a, b) => {
         let i = 0;
         while (i < a.length && i < b.length && a[i] === b[i]) i++;
@@ -182,8 +186,8 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       return;
     }
 
-    // Arrow / navigation escape sequences ─────────────────
-    if (key === '\x1b[A') {   // up — history back
+    // Arrow keys / navigation
+    if (key === '\x1b[A') {
       if (histIdx > 0) {
         if (histIdx === history.length) histDraft = inputBuf;
         histIdx--;
@@ -193,7 +197,7 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       }
       return;
     }
-    if (key === '\x1b[B') {   // down — history forward
+    if (key === '\x1b[B') {
       if (histIdx < history.length) {
         histIdx++;
         inputBuf  = histIdx === history.length ? histDraft : history[histIdx] || '';
@@ -202,11 +206,11 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       }
       return;
     }
-    if (key === '\x1b[D')   { cursorPos = Math.max(0, cursorPos - 1);             drawBox(); return; } // ←
-    if (key === '\x1b[C')   { cursorPos = Math.min(inputBuf.length, cursorPos+1); drawBox(); return; } // →
-    if (key === '\x1b[H' || key === '\x01') { cursorPos = 0;               drawBox(); return; } // Home / Ctrl+A
-    if (key === '\x1b[F' || key === '\x05') { cursorPos = inputBuf.length; drawBox(); return; } // End  / Ctrl+E
-    if (key === '\x1b[3~') { // Delete
+    if (key === '\x1b[D')   { cursorPos = Math.max(0, cursorPos - 1);             drawBox(); return; }
+    if (key === '\x1b[C')   { cursorPos = Math.min(inputBuf.length, cursorPos+1); drawBox(); return; }
+    if (key === '\x1b[H' || key === '\x01') { cursorPos = 0;               drawBox(); return; }
+    if (key === '\x1b[F' || key === '\x05') { cursorPos = inputBuf.length; drawBox(); return; }
+    if (key === '\x1b[3~') {
       if (cursorPos < inputBuf.length) {
         inputBuf = inputBuf.slice(0, cursorPos) + inputBuf.slice(cursorPos + 1);
         drawBox();
@@ -214,10 +218,10 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       return;
     }
 
-    // Editing shortcuts ────────────────────────────────────
-    if (key === '\x0b') { inputBuf = inputBuf.slice(0, cursorPos); drawBox(); return; }         // Ctrl+K
-    if (key === '\x15') { inputBuf = inputBuf.slice(cursorPos); cursorPos = 0; drawBox(); return; } // Ctrl+U
-    if (key === '\x17') { // Ctrl+W — kill word backwards
+    // Editing shortcuts
+    if (key === '\x0b') { inputBuf = inputBuf.slice(0, cursorPos); drawBox(); return; }
+    if (key === '\x15') { inputBuf = inputBuf.slice(cursorPos); cursorPos = 0; drawBox(); return; }
+    if (key === '\x17') {
       const before    = inputBuf.slice(0, cursorPos).trimEnd();
       const lastSpace = before.lastIndexOf(' ');
       const newBefore = lastSpace < 0 ? '' : before.slice(0, lastSpace + 1);
@@ -226,17 +230,15 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       drawBox();
       return;
     }
-    if (key === '\x0c') { // Ctrl+L — clear screen
+    if (key === '\x0c') {
       process.stdout.write('\x1b[2J\x1b[1;1H');
       setScrollRegion();
       drawBox();
       return;
     }
 
-    // Ignore unhandled escape sequences.
     if (key.startsWith('\x1b')) return;
 
-    // Printable chars (including multi-byte UTF-8).
     if (key >= ' ' || key.charCodeAt(0) > 127) {
       inputBuf   = inputBuf.slice(0, cursorPos) + key + inputBuf.slice(cursorPos);
       cursorPos += key.length;
@@ -244,7 +246,8 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
     }
   }
 
-  // ── readLine — full line read during processing (AskUser tool) ────────────
+  // ── readLine / readChar ────────────────────────────────────────────────────
+
   function readLine(promptText) {
     return new Promise((resolve) => {
       let buf = '';
@@ -268,7 +271,6 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
     });
   }
 
-  // ── readChar — single-key confirm prompt ──────────────────────────────────
   function readChar(promptText) {
     return new Promise((resolve) => {
       process.stdout.write(promptText);
@@ -288,7 +290,7 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
   function start(preloadHistory = []) {
     if (!process.stdin.isTTY) return;
 
-    history = [...preloadHistory];   // oldest→newest
+    history = [...preloadHistory];
     histIdx = history.length;
 
     process.stdin.setRawMode(true);
@@ -301,7 +303,7 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
       drawBox();
     });
 
-    // Push content up to make room for the box at the bottom.
+    // Push existing content up to make room for the box.
     process.stdout.write('\n'.repeat(BOX_LINES));
     setScrollRegion();
     goOutputArea();
@@ -310,12 +312,12 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
 
   function pause() {
     processing = true;
-    goOutputArea();   // cursor into scroll region, ready for output
+    goOutputArea();
   }
 
   function resume() {
     processing = false;
-    drawBox();        // cursor back into input box
+    drawBox();
   }
 
   function setPlanMode(val) {
@@ -328,6 +330,11 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
     if (!processing) drawBox();
   }
 
+  function setModelLabel(label) {
+    modelLabel = label;
+    if (!processing) drawBox();
+  }
+
   function wasInterrupted() {
     const v = _interrupted;
     _interrupted = false;
@@ -336,7 +343,6 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
 
   function exitUI() {
     resetScrollRegion();
-    // Clear the box lines so the terminal is clean on exit.
     const r = rows();
     for (let i = 0; i < BOX_LINES; i++) {
       process.stdout.write(`\x1b[${r - BOX_LINES + 1 + i};1H\x1b[2K`);
@@ -350,5 +356,10 @@ export function createUI({ planMode: initPlanMode = false, onLine, onTab, onExit
     process.exit(code);
   }
 
-  return { start, pause, resume, setPlanMode, setContinuation, readLine, readChar, wasInterrupted, stop, exitUI };
+  return {
+    start, pause, resume,
+    setPlanMode, setContinuation, setModelLabel,
+    readLine, readChar,
+    wasInterrupted, stop, exitUI,
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsunami-code",
-  "version": "3.11.0",
+  "version": "3.11.1",
   "description": "Tsunami Code CLI — AI coding agent by Keystone World Management Navy Seal Unit XI3",
   "type": "module",
   "bin": {