cli-whatsapp 0.1.16 → 0.1.19

package/dist/cli/commands/filepicker.js

@@ -3,7 +3,9 @@ import { readdirSync, statSync } from 'node:fs';
 import { resolve, join, relative } from 'node:path';
 import { homedir } from 'node:os';
 import { c } from "../../utils/format.js";
-const VISIBLE = 12; // rows shown at once
+// Rows shown at once — capped so the whole overlay (list + ~6 lines of chrome)
+// fits the terminal height and never has to scroll.
+const VISIBLE = Math.max(4, Math.min(12, (process.stdout.rows || 24) - 9));
 const WIDTH = 58; // inner box width
 const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, '');
 function pad(s, w) {
@@ -16,13 +18,16 @@ function highlight(s) {
 }
 const border = (l, r) => c.teal(l + '─'.repeat(WIDTH) + r);
 /**
- * Generic raw-mode overlay runner: sets up keypress capture (stealing readline's
- * handlers for the duration), renders below the prompt, and restores everything
- * on exit. `render` draws the overlay; `makeOnKey(done)` returns the keypress
- * handler and calls `done(result)` to close. No-op (null) on a non-TTY.
+ * Generic raw-mode overlay runner. Draws the overlay on the lines *below* the
+ * prompt and repaints using only RELATIVE cursor moves (never absolute
+ * save/restore), so it stays correct even when drawing near the bottom of the
+ * screen scrolls the terminal — no stacking/ghosting. `buildRows()` returns the
+ * overlay's lines; `makeOnKey(done, repaint)` handles keys, calling `repaint()`
+ * after state changes and `done(result)` to close. No-op (null) on a non-TTY.
  */
-function runOverlay(render, makeOnKey) {
+function runOverlay(buildRows, makeOnKey) {
     const input = process.stdin;
+    const out = process.stdout;
     if (!input.isTTY)
         return Promise.resolve(null);
     readline.emitKeypressEvents(input);
@@ -30,20 +35,40 @@ function runOverlay(render, makeOnKey) {
     input.setRawMode(true);
     const saved = input.listeners('keypress');
     input.removeAllListeners('keypress');
-    process.stdout.write('\x1b7'); // save cursor at the prompt
-    render();
+    // Cursor rests at the overlay's top-left between paints. All moves are
+    // relative to it, which survives terminal scrolling.
+    let drawn = 0;
+    const paint = () => {
+        const rows = buildRows();
+        if (drawn === 0) {
+            out.write('\n'); // open the first overlay line just below the prompt
+        }
+        else {
+            readline.cursorTo(out, 0);
+            readline.clearScreenDown(out); // wipe the previous overlay in place
+        }
+        out.write(rows.join('\n'));
+        if (rows.length > 1)
+            readline.moveCursor(out, 0, -(rows.length - 1));
+        readline.cursorTo(out, 0);
+        drawn = rows.length;
+    };
+    paint();
     return new Promise((res) => {
         let onKey;
         const done = (result) => {
             input.removeListener('keypress', onKey);
-            process.stdout.write('\x1b8\x1b[0J'); // restore cursor, wipe overlay
+            readline.cursorTo(out, 0);
+            readline.clearScreenDown(out); // wipe the overlay
+            readline.moveCursor(out, 0, -1); // back up onto the prompt line
+            readline.cursorTo(out, 0);
             if (input.isTTY)
                 input.setRawMode(wasRaw);
             for (const l of saved)
                 input.on('keypress', l);
             res(result);
         };
-        onKey = makeOnKey(done);
+        onKey = makeOnKey(done, paint);
         input.on('keypress', onKey);
     });
 }
@@ -86,7 +111,7 @@ export function pickFile(startDir) {
         return [{ name: '..', dir: true }, ...items];
     };
     let entries = load();
-    const render = () => {
+    const buildRows = () => {
         if (index >= entries.length)
             index = Math.max(0, entries.length - 1);
         scroll = clampScroll(index, scroll, entries.length);
@@ -104,17 +129,17 @@ export function pickFile(startDir) {
         });
         rows.push(border('╰', '╯'));
         rows.push(c.dim(`  @${filter}${c.gray('▏')}   ↑↓ move · ⏎ ${entries[index]?.dir ? 'open' : 'attach'} · ⌫ up · esc cancel`));
-        process.stdout.write('\x1b8\x1b[0J\n' + rows.join('\n'));
+        return rows;
     };
-    return runOverlay(render, (done) => (str, key) => {
+    return runOverlay(buildRows, (done, repaint) => (str, key) => {
         if (!key)
             return;
         if (key.name === 'escape' || (key.ctrl && key.name === 'c'))
             return done(null);
         if (key.name === 'up')
-            return void ((index = Math.max(0, index - 1)), render());
+            return void ((index = Math.max(0, index - 1)), repaint());
         if (key.name === 'down')
-            return void ((index = Math.min(entries.length - 1, index + 1)), render());
+            return void ((index = Math.min(entries.length - 1, index + 1)), repaint());
         if (key.name === 'return') {
             const e = entries[index];
             if (!e)
@@ -125,7 +150,7 @@ export function pickFile(startDir) {
                 index = 0;
                 scroll = 0;
                 entries = load();
-                return render();
+                return repaint();
             }
             const full = join(dir, e.name);
             if (e.dir) {
@@ -134,7 +159,7 @@ export function pickFile(startDir) {
                 index = 0;
                 scroll = 0;
                 entries = load();
-                return render();
+                return repaint();
             }
             const rel = relative(process.cwd(), full);
             return done(rel && !rel.startsWith('..') ? rel : full);
@@ -147,14 +172,14 @@ export function pickFile(startDir) {
             index = 0;
             scroll = 0;
             entries = load();
-            return render();
+            return repaint();
         }
         if (str && str.length === 1 && str >= ' ' && !key.ctrl && !key.meta) {
             filter += str;
             index = 0;
             scroll = 0;
             entries = load();
-            return render();
+            return repaint();
         }
     });
 }
@@ -174,7 +199,7 @@ export function pickFromList(title, allItems, initialFilter = '') {
     };
     let items = match();
     const LEFT = 14; // width of the value column
-    const render = () => {
+    const buildRows = () => {
         if (index >= items.length)
             index = Math.max(0, items.length - 1);
         scroll = clampScroll(index, scroll, items.length);
@@ -197,17 +222,17 @@ export function pickFromList(title, allItems, initialFilter = '') {
         });
         rows.push(border('╰', '╯'));
         rows.push(c.dim(`  ${filter}${c.gray('▏')}   ↑↓ move · ⏎ select · esc cancel`));
-        process.stdout.write('\x1b8\x1b[0J\n' + rows.join('\n'));
+        return rows;
     };
-    return runOverlay(render, (done) => (str, key) => {
+    return runOverlay(buildRows, (done, repaint) => (str, key) => {
         if (!key)
             return;
         if (key.name === 'escape' || (key.ctrl && key.name === 'c'))
             return done(null);
         if (key.name === 'up')
-            return void ((index = Math.max(0, index - 1)), render());
+            return void ((index = Math.max(0, index - 1)), repaint());
         if (key.name === 'down')
-            return void ((index = Math.min(items.length - 1, index + 1)), render());
+            return void ((index = Math.min(items.length - 1, index + 1)), repaint());
         if (key.name === 'return') {
             const it = items[index];
             return done(it ? (it.id ?? it.value) : null);
@@ -219,14 +244,14 @@ export function pickFromList(title, allItems, initialFilter = '') {
             index = 0;
             scroll = 0;
             items = match();
-            return render();
+            return repaint();
         }
         if (str && str.length === 1 && str >= ' ' && !key.ctrl && !key.meta) {
             filter += str;
             index = 0;
             scroll = 0;
             items = match();
-            return render();
+            return repaint();
         }
     });
 }

package/dist/cli/commands/shell.js

@@ -20,6 +20,7 @@ import { notify } from "../../utils/notify.js";
 // ---- tab completion --------------------------------------------------------
 const SLASH_ITEMS = [
     { value: '/open', desc: 'open a chat — then just type to send', args: true },
+    { value: '/switch', desc: 'switch to another chat/contact', args: true },
     { value: '/close', desc: 'leave the current chat' },
     { value: '/chats', desc: 'list conversations' },
     { value: '/recent', desc: 'recently active chats' },
@@ -47,7 +48,7 @@ const SLASH_ITEMS = [
 ];
 const SLASH = SLASH_ITEMS.map((it) => it.value);
 const CHAT_CMDS = new Set([
-    '/open', '/send', '/sendfile', '/pin', '/unpin', '/archive', '/unarchive', '/history',
+    '/open', '/switch', '/send', '/sendfile', '/pin', '/unpin', '/archive', '/unarchive', '/history',
 ]);
 let nameCache = [];
 function refreshNames() {
@@ -439,6 +440,7 @@ function setSetting(key, value) {
 // ---- help ------------------------------------------------------------------
 const HELP = `${c.bold('Commands')} ${c.dim('(slash optional for the first word)')}
   ${c.cyan('/open')} <chat>          open a chat — then just type to send
+  ${c.cyan('/switch')} <chat>        jump to another chat/contact
   ${c.green('@')}                       open a file picker to attach (↑↓ to choose, ⏎ to pick)
   ${c.cyan('/close')}                 leave the current chat
   ${c.cyan('/chats')} · ${c.cyan('/recent')} · ${c.cyan('/contacts')}   list chats / recent / contacts
@@ -511,6 +513,7 @@ async function handle(state, raw) {
             banner();
             return;
         case 'open':
+        case 'switch':
             if (need(args[0], 'chat'))
                 openChat(state, args.join(' '));
             return;
@@ -521,9 +524,9 @@ async function handle(state, raw) {
             print(c.dim('left chat.'));
             return;
         case 'chats':
-            chats({ limit: args[0] });
+            chats({ limit: args[0] ?? '20' });
             refreshNames();
-            return;
+            return; // top 20 recent by default
         case 'recent':
             recent({ limit: args[0] });
             return;
@@ -695,7 +698,7 @@ export async function shell() {
     let pickerOpen = false;
     // Commands whose <chat> argument gets the live chat picker. "final" = chat is
     // the last arg (run on pick); "then" = chat then more input (send/sendfile).
-    const CHAT_FINAL = new Set(['open', 'history', 'pin', 'unpin', 'archive', 'unarchive']);
+    const CHAT_FINAL = new Set(['open', 'switch', 'history', 'pin', 'unpin', 'archive', 'unarchive']);
     const CHAT_THEN = new Set(['send', 'sendfile']);
     const clearLine = () => rl.write(null, { ctrl: true, name: 'u' });
     // Open the chat picker for a command, then insert/run with the chosen chat.
@@ -761,7 +764,7 @@ export async function shell() {
         }
         // Space right after a chat command (typed manually) → open the chat picker.
         if (str === ' ') {
-            const m = rl.line.match(/^\/(open|history|pin|unpin|archive|unarchive|send|sendfile) $/);
+            const m = rl.line.match(/^\/(open|switch|history|pin|unpin|archive|unarchive|send|sendfile) $/);
             if (m) {
                 pickerOpen = true;
                 void (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-whatsapp",
-  "version": "0.1.16",
+  "version": "0.1.19",
   "description": "A lightweight, fast, terminal-first WhatsApp client. Read, search, send, media, groups, and live notifications — from your terminal.",
   "type": "module",
   "bin": {