novaprime 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "novaprime",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "NovaPrime — an AI coding assistant in your terminal, powered by GLM.",
   "bin": {
     "novaprime": "bin/novaprime.js"

package/src/prompt.js

@@ -3,8 +3,8 @@ const readline = require('readline');
 const { c } = require('./ui');
 const mode = require('./mode');
 
-// Use Node's readline for single-line prompts (login key, y/N) — it handles
-// editing and history. The multi-line chat box uses a paste-aware reader below.
+// Use Node's readline for single-line prompts (login key, y/N). The multi-line
+// chat box below is a custom raw-mode reader (paste-aware + Shift+Tab + full box).
 let rl = null;
 function getRl() {
   if (!rl) {
@@ -28,16 +28,13 @@ function confirm(message) {
 function close() { if (rl) { rl.close(); rl = null; } }
 
 // ---- bracketed-paste-aware chat input ----------------------------------
-// Terminals that support bracketed paste wrap pasted text in these markers.
-// We capture everything between them (newlines included) WITHOUT submitting,
-// so pasting a big multi-line prompt no longer auto-sends on the first line.
 const PASTE_START = '\x1b[200~';
 const PASTE_END = '\x1b[201~';
 
 function normalize(t) { return t.replace(/\r\n?/g, '\n'); }
+function visLen(s) { return String(s).replace(/\x1b\[[0-9;]*m/g, '').length; } // visible width, minus ANSI
 
-// length of the longest suffix of s that is a prefix of marker (handles a
-// marker that got split across two stdin chunks)
+// longest suffix of s that is a prefix of marker (marker split across chunks)
 function partialTail(s, marker) {
   const max = Math.min(s.length, marker.length - 1);
   for (let n = max; n > 0; n--) {
@@ -46,37 +43,30 @@ function partialTail(s, marker) {
   return 0;
 }
 
-// Handle a run of plain (non-paste) bytes: typing, Enter, backspace, Ctrl+C/D,
-// and swallow escape sequences (arrow keys, etc.) so they don't corrupt input.
+// Plain (non-paste) bytes: typing, Enter, backspace, Ctrl+C/D, Shift+Tab, skip arrows.
+// Only mutates state; the caller redraws the whole box afterward.
 function handlePlain(state, s, sink) {
   for (let i = 0; i < s.length && !state.finished; i++) {
     const ch = s[i];
-    if (ch === '\x03') { sink.cancel(); return; }                         // Ctrl+C
+    if (ch === '\x03') { sink.cancel(); return; }                          // Ctrl+C
     if (ch === '\x04') { if (!state.buf) { sink.cancel(); return; } continue; } // Ctrl+D on empty
-    if (ch === '\r' || ch === '\n') { sink.submit(state.buf); return; }   // Enter -> send
-    if (ch === '\x7f' || ch === '\b') {                                   // backspace
-      if (state.buf.length) {
-        const last = state.buf[state.buf.length - 1];
-        state.buf = state.buf.slice(0, -1);
-        if (last !== '\n') sink.out('\b \b');
-      }
-      continue;
-    }
+    if (ch === '\r' || ch === '\n') { sink.submit(state.buf); return; }    // Enter -> send
+    if (ch === '\x7f' || ch === '\b') { state.buf = state.buf.slice(0, -1); continue; } // backspace
     if (ch === '\x1b') {
       if (s.slice(i, i + 3) === '\x1b[Z') { if (sink.toggleMode) sink.toggleMode(); i += 2; continue; } // Shift+Tab
-      if (s[i + 1] === '[' || s[i + 1] === 'O') {                         // skip other CSI/SS3 escapes (arrows, fn keys)
+      if (s[i + 1] === '[' || s[i + 1] === 'O') {                          // skip arrows / fn keys
         i += 2;
         while (i < s.length && !/[A-Za-z~]/.test(s[i])) i++;
       }
       continue;
     }
-    if (ch === '\t') { state.buf += '  '; sink.out('  '); continue; }     // tab -> 2 spaces
-    if (ch >= ' ') { state.buf += ch; sink.out(ch); }                     // printable
+    if (ch === '\t') { state.buf += '  '; continue; }                      // tab -> 2 spaces
+    if (ch >= ' ') { state.buf += ch; }                                    // printable
   }
 }
 
 // Pure state machine — testable. state = { buf, pasting, pending, finished }.
-// sink = { out(str), submit(value), cancel() }.
+// sink = { submit(value), cancel(), toggleMode() }.
 function processChunk(state, chunk, sink) {
   let s = state.pending + chunk;
   state.pending = '';
@@ -85,13 +75,11 @@ function processChunk(state, chunk, sink) {
       const end = s.indexOf(PASTE_END);
       if (end === -1) {
         const hold = partialTail(s, PASTE_END);
-        const seg = normalize(s.slice(0, s.length - hold));
-        if (seg) { state.buf += seg; sink.out(seg); }
+        state.buf += normalize(s.slice(0, s.length - hold));
         state.pending = s.slice(s.length - hold);
         return;
       }
-      const seg = normalize(s.slice(0, end));
-      if (seg) { state.buf += seg; sink.out(seg); }
+      state.buf += normalize(s.slice(0, end));
       state.pasting = false;
       s = s.slice(end + PASTE_END.length);
       continue;
@@ -99,8 +87,7 @@ function processChunk(state, chunk, sink) {
     const start = s.indexOf(PASTE_START);
     if (start === -1) {
       const hold = partialTail(s, PASTE_START);
-      const plain = s.slice(0, s.length - hold);
-      handlePlain(state, plain, sink);
+      handlePlain(state, s.slice(0, s.length - hold), sink);
       if (!state.finished) state.pending = s.slice(s.length - hold);
       return;
     }
@@ -111,52 +98,70 @@ function processChunk(state, chunk, sink) {
   }
 }
 
-function ttyRaw() { return process.stdin.isTTY && typeof process.stdin.setRawMode === 'function'; }
+function ttyRaw() { return process.stdout.isTTY && process.stdin.isTTY && typeof process.stdin.setRawMode === 'function'; }
 
-// Chat input box. Top border above; readline-free raw reader captures multi-line
-// pastes; bottom border drawn after submit so the message shows as a complete box.
+// Chat input box: a COMPLETE bordered box (top + input lines + bottom) that
+// redraws on every change so the bottom stroke is always visible, multi-line
+// pastes grow the box, and auto-accept status shows inside.
 function boxInput(top, bottom, prompt) {
-  // Fallback for piped / non-TTY input (e.g. `echo ... | novaprime`): plain readline.
-  if (!ttyRaw()) {
+  if (!ttyRaw()) { // piped / non-TTY: fall back to readline
     return new Promise((resolve) => {
       process.stdout.write(top + '\n');
       const r = getRl();
       r.question(prompt, (answer) => { process.stdout.write(bottom + '\n'); resolve(answer); });
     });
   }
-  if (rl) { rl.close(); rl = null; } // release stdin from readline
+  if (rl) { rl.close(); rl = null; }
 
   return new Promise((resolve) => {
     const stdin = process.stdin;
     const state = { buf: '', pasting: false, pending: '', finished: false };
+    const contPrefix = c.dim('│ ');
+    let firstRender = true;
+    let prevUp = 0; // lines from the input line up to the first dynamic line (for clearing)
+
+    function render() {
+      const statusLines = mode.isAuto()
+        ? [c.green('  ⚡ auto-accept ON') + c.dim('  ·  Shift+Tab to turn off')]
+        : [];
+      const inputLines = state.buf.split('\n');
+      const dyn = statusLines
+        .concat(inputLines.map((ln, i) => (i === 0 ? prompt : contPrefix) + ln))
+        .concat([bottom]);
 
-    const onData = (chunk) => processChunk(state, chunk, sink);
-    const cleanup = () => {
+      let out = '';
+      if (!firstRender) { if (prevUp > 0) out += '\x1b[' + prevUp + 'A'; out += '\r\x1b[0J'; }
+      out += dyn.join('\n');
+      out += '\x1b[1A\r'; // from end of bottom up to the last input line, col 0
+      const prefVis = inputLines.length === 1 ? visLen(prompt) : visLen(contPrefix);
+      const col = prefVis + inputLines[inputLines.length - 1].length;
+      if (col > 0) out += '\x1b[' + col + 'C';
+      process.stdout.write(out);
+      prevUp = statusLines.length + (inputLines.length - 1);
+      firstRender = false;
+    }
+
+    function cleanup() {
       try { process.stdout.write('\x1b[?2004l'); } catch (_) {}
       try { stdin.setRawMode(false); } catch (_) {}
       stdin.pause();
       stdin.removeListener('data', onData);
-    };
-    const sink = {
-      out: (str) => process.stdout.write(str),
-      submit: (val) => { state.finished = true; cleanup(); process.stdout.write('\n' + bottom + '\n'); resolve(val); },
-      cancel: () => { state.finished = true; cleanup(); process.stdout.write('\n' + bottom + '\n'); resolve(null); },
-      toggleMode: () => {
-        const on = mode.toggle();
-        process.stdout.write('\r\x1b[2K'); // clear current input line
-        process.stdout.write((on
-          ? c.green('  ⚡ auto-accept: ON') + c.dim('  — running everything without asking (Shift+Tab to undo)')
-          : c.dim('  ⚡ auto-accept: OFF — will ask before changes')) + '\n');
-        process.stdout.write(prompt + state.buf); // redraw input line with whatever was typed
-      },
-    };
+    }
+    function finish(val) {
+      state.finished = true;
+      process.stdout.write('\x1b[1B\r\n'); // move below the bottom border
+      cleanup();
+      resolve(val);
+    }
+    const sink = { submit: (v) => finish(v), cancel: () => finish(null), toggleMode: () => mode.toggle() };
+    const onData = (chunk) => { processChunk(state, chunk, sink); if (!state.finished) render(); };
 
     process.stdout.write(top + '\n');
-    process.stdout.write(prompt);
+    render();
     stdin.setRawMode(true);
     stdin.resume();
     stdin.setEncoding('utf8');
-    process.stdout.write('\x1b[?2004h'); // enable bracketed paste
+    process.stdout.write('\x1b[?2004h'); // bracketed paste on
     stdin.on('data', onData);
   });
 }