cli-whatsapp 0.1.2 → 0.1.4

package/dist/cli/commands/read.js

@@ -1,6 +1,6 @@
 import { listChats, listContacts, getMessages, searchMessages, findChat, } from "../../db/sqlite.js";
 import { loadConfig } from "../../config/index.js";
-import { renderChatList, renderMessages, displayName, formatTime, truncate, c, } from "../../utils/format.js";
+import { renderChatList, renderMessages, displayName, chatNumber, cleanSender, formatTime, truncate, c, } from "../../utils/format.js";
 import { print, info, fail } from "../../utils/ui.js";
 /** wa chats [--all] [--limit N] */
 export function chats(opts) {
@@ -34,7 +34,7 @@ export function open(target, opts) {
     }
     const cfg = loadConfig();
     const limit = clampLimit(opts.limit, cfg.preferences.openLimit);
-    print(c.bold(displayName(chat)) + c.dim(`  ${chat.jid}`));
+    print(c.bold(displayName(chat)) + (chatNumber(chat) ? c.dim(`  ${chatNumber(chat)}`) : ''));
     print(c.dim('─'.repeat(40)));
     print(renderMessages(getMessages(chat.jid, limit), cfg.preferences.time24h));
 }
@@ -57,7 +57,7 @@ export function search(term, opts) {
         const chat = findChat(m.chatJid);
         const where = c.magenta(chat ? displayName(chat) : m.chatJid.split('@')[0]);
         const time = c.gray(formatTime(m.timestamp, cfg.preferences.time24h));
-        const who = m.fromMe ? c.green('me') : c.cyan(m.sender ?? '');
+        const who = m.fromMe ? c.green('me') : c.cyan(cleanSender(m.sender));
         const body = highlight(truncate(m.text ?? '', 80), term);
         print(`${where} ${time} ${who}: ${body} ${c.dim(`#${m.id}`)}`);
     }

package/dist/cli/commands/shell.js

@@ -10,10 +10,10 @@ import { recent, pin, unpin, archive, unarchive } from "./manage.js";
 import { status } from "./auth.js";
 import { connect, hasSession } from "../../whatsapp/client.js";
 import { registerPersistence, extractText, isGroupJid } from "../../whatsapp/events.js";
-import { listChats, findChat, getMessages, countMessages, } from "../../db/sqlite.js";
+import { listChats, listContacts, findChat, upsertChat, getMessages, countMessages, } from "../../db/sqlite.js";
 import { resolveTarget } from "../../utils/jid.js";
 import { loadConfig, saveConfig } from "../../config/index.js";
-import { c, displayName, formatTime, truncate, renderMessages } from "../../utils/format.js";
+import { c, displayName, chatNumber, formatTime, truncate, renderMessages } from "../../utils/format.js";
 import { print, warn, printError } from "../../utils/ui.js";
 import { notify } from "../../utils/notify.js";
 // ---- tab completion --------------------------------------------------------
@@ -249,16 +249,31 @@ async function sendTo(state, jid, name, content, meta) {
 }
 // ---- chat context ----------------------------------------------------------
 function openChat(state, target) {
-    const chat = findChat(target);
+    // Resolve against chats, contacts, or a raw number/jid.
+    const resolved = resolveTarget(target);
+    let chat = resolved ? findChat(resolved.jid) : findChat(target);
+    if (!chat && resolved) {
+        // Known contact / number with no conversation yet — start one.
+        upsertChat({
+            jid: resolved.jid,
+            name: resolved.name,
+            isGroup: resolved.jid.endsWith('@g.us') ? 1 : 0,
+        });
+        chat = findChat(resolved.jid);
+    }
     if (!chat) {
-        warn(`No chat matching "${target}". Try /chats or /search.`);
+        warn(`No chat or contact matching "${target}". Try /chats or /search.`);
         return;
     }
     state.active = chat;
     setPrompt(state);
     print(c.dim('─'.repeat(40)));
-    print(c.bold(displayName(chat)) + c.dim(`  ${chat.jid}`));
-    print(renderMessages(getMessages(chat.jid, 15), loadConfig().preferences.time24h));
+    const sub = chatNumber(chat);
+    print(c.bold(displayName(chat)) + (sub ? c.dim(`  ${sub}`) : ''));
+    const msgs = getMessages(chat.jid, 15);
+    print(msgs.length
+        ? renderMessages(msgs, loadConfig().preferences.time24h)
+        : c.dim('No messages yet — say hi 👋'));
     print(c.dim(`─── in this chat: type to send · @ opens a file picker to attach · /close ───`));
 }
 // ---- settings --------------------------------------------------------------
@@ -544,6 +559,39 @@ export async function shell() {
     // listener, so rl.line already includes the just-typed character.
     readline.emitKeypressEvents(process.stdin);
     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_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.
+    const chatPickInto = async (cmd) => {
+        // Existing chats first (names resolved via contacts + the LID map)…
+        const items = listChats(5000, true).map((ch) => ({
+            value: displayName(ch),
+            desc: truncate((ch.lastMessage ?? '').replace(/\s+/g, ' '), 30),
+        }));
+        // …then every other contact, so nobody is missing. Dedupe by name so a
+        // contact already shown as a chat doesn't appear twice.
+        const seen = new Set(items.map((it) => it.value.toLowerCase()));
+        for (const ct of listContacts(50000)) {
+            if (ct.name && !seen.has(ct.name.toLowerCase())) {
+                items.push({ value: ct.name, desc: 'contact' });
+                seen.add(ct.name.toLowerCase());
+            }
+        }
+        const chat = await pickFromList('Select a chat or contact', items, '');
+        clearLine();
+        if (!chat)
+            return; // cancelled → empty line
+        const q = /\s/.test(chat) ? `"${chat}"` : chat; // quote names with spaces
+        if (CHAT_THEN.has(cmd))
+            rl.write(`/${cmd} ${q} `); // wait for message/file
+        else {
+            queue.push(`/${cmd} ${q}`); // run right away
+            void pump();
+        }
+    };
     process.stdin.on('keypress', (str, _key) => {
         void _key;
         if (!process.stdin.isTTY || pickerOpen || busy)
@@ -551,26 +599,48 @@ export async function shell() {
         // `/` menu — only when it's the first character on the line.
         if (str === '/' && rl.line === '/') {
             pickerOpen = true;
-            pickFromList('Slash Commands', SLASH_ITEMS, '')
-                .then((picked) => {
-                rl.write(null, { ctrl: true, name: 'u' }); // clear the '/'
-                if (!picked)
-                    return; // cancelled (esc / backspace) — leave the line empty
-                const item = SLASH_ITEMS.find((i) => i.value === picked);
-                if (item && !item.args) {
-                    // No arguments needed → run it right away (no second Enter).
-                    queue.push(picked);
-                    void pump();
+            void (async () => {
+                try {
+                    const picked = await pickFromList('Slash Commands', SLASH_ITEMS, '');
+                    clearLine();
+                    if (!picked)
+                        return; // cancelled — leave the line empty
+                    const cmd = picked.slice(1);
+                    if (CHAT_FINAL.has(cmd) || CHAT_THEN.has(cmd)) {
+                        await chatPickInto(cmd); // chain straight into the chat picker
+                        return;
+                    }
+                    const item = SLASH_ITEMS.find((i) => i.value === picked);
+                    if (item && !item.args) {
+                        queue.push(picked); // no args → run now
+                        void pump();
+                    }
+                    else {
+                        rl.write(picked + ' '); // needs (non-chat) args → wait
+                    }
                 }
-                else {
-                    rl.write(picked + ' '); // needs args → wait for input
+                finally {
+                    pickerOpen = false;
                 }
-            })
-                .finally(() => {
-                pickerOpen = false;
-            });
+            })();
             return;
         }
+        // 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) $/);
+            if (m) {
+                pickerOpen = true;
+                void (async () => {
+                    try {
+                        await chatPickInto(m[1]);
+                    }
+                    finally {
+                        pickerOpen = false;
+                    }
+                })();
+                return;
+            }
+        }
         // `@` file picker — only with a chat open and at a fresh token boundary.
         if (str === '@' && state.active) {
             const before = rl.line.slice(0, Math.max(0, rl.cursor - 1)).replace(/@$/, '');
@@ -579,7 +649,6 @@ export async function shell() {
             pickerOpen = true;
             pickFile(process.cwd())
                 .then((picked) => {
-                // Quote paths with spaces so the whole path is treated as one token.
                 if (picked)
                     rl.write(picked.includes(' ') ? `"${picked}"` : picked);
                 else

package/dist/cli/commands/sync.js

@@ -1,6 +1,6 @@
 import { connect, runWithConnection } from "../../whatsapp/client.js";
 import { registerPersistence, extractText, isGroupJid } from "../../whatsapp/events.js";
-import { countMessages, listChats, findChat } from "../../db/sqlite.js";
+import { countMessages, listChats, findChat, importLidMappings } from "../../db/sqlite.js";
 import { loadConfig, saveConfig } from "../../config/index.js";
 import { ok, info, print } from "../../utils/ui.js";
 import { c, formatTime, displayName } from "../../utils/format.js";
@@ -22,10 +22,14 @@ export async function sync(opts) {
         clearInterval(timer);
         process.stdout.write('\r' + ' '.repeat(50) + '\r');
     }, { requireSession: true, syncFullHistory: true });
+    // Bridge WhatsApp's @lid ids to phone numbers so contact names resolve.
+    const mapped = importLidMappings();
     const after = { chats: listChats(5000).length, msgs: countMessages() };
     const cfg = loadConfig();
     cfg.session.lastSyncAt = Date.now();
     saveConfig(cfg);
+    if (mapped)
+        info(`Resolved ${mapped} contact name mappings.`);
     ok(`Sync complete. +${after.chats - before.chats} chats, +${after.msgs - before.msgs} messages ` +
         `(${after.chats} chats, ${after.msgs} messages total).`);
 }

package/dist/db/schema.js

@@ -4,7 +4,7 @@
  *
  * `schema_version` in the `settings` table lets us evolve this safely later.
  */
-export const SCHEMA_VERSION = 2;
+export const SCHEMA_VERSION = 3;
 export const SCHEMA_SQL = /* sql */ `
 PRAGMA journal_mode = WAL;      -- concurrent read while writing (watch + reads)
 PRAGMA synchronous = NORMAL;    -- fast, safe enough for a local cache
@@ -54,4 +54,14 @@ CREATE TABLE IF NOT EXISTS settings (
   key    TEXT PRIMARY KEY,
   value  TEXT
 );
+
+-- WhatsApp's "LID" identifiers ↔ phone-number jids. Individual chats are often
+-- stored under a @lid jid while the contact is saved under the phone jid; this
+-- table bridges them so names resolve. Populated from the session's mapping
+-- files (and kept fresh on sync).
+CREATE TABLE IF NOT EXISTS lid_map (
+  lid  TEXT PRIMARY KEY,   -- e.g. 112735023038675@lid
+  pn   TEXT                -- e.g. 918179514637@s.whatsapp.net
+);
+CREATE INDEX IF NOT EXISTS idx_lid_pn ON lid_map (pn);
 `;

package/dist/db/sqlite.js

@@ -1,4 +1,6 @@
 import { DatabaseSync } from 'node:sqlite';
+import { readdirSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { ensureDirs, PATHS } from "../config/index.js";
 import { SCHEMA_SQL, SCHEMA_VERSION } from "./schema.js";
 let db = null;
@@ -108,16 +110,30 @@ export function setMediaPath(id, path) {
     getDb().prepare('UPDATE messages SET mediaPath = ? WHERE id = ?').run(path, id);
 }
 // ---- queries ---------------------------------------------------------------
-// Chat rows with the display name resolved: prefer the chat's own name, then
-// fall back to a known contact name for the same jid (direct chats often have
-// no name of their own). Column order/shape matches ChatRow.
+// Chat rows with the display name resolved. Preference order:
+//   1. the chat's own name
+//   2. a saved contact for the same jid (direct phone-number chats)
+//   3. a saved contact reached via the LID→phone map (chats stored under @lid)
+// Column order/shape matches ChatRow. `NAME_EXPR` is reused wherever we need the
+// same resolution (e.g. searching by name).
+// Prefer, in order: the chat's own name, the contact reached via the LID map
+// (the real saved name for @lid chats), then the direct contact — but never a
+// WhatsApp privacy-masked placeholder like "+91∙∙∙∙∙∙∙∙37" (those contain the
+// U+2219 bullet), which we treat as "no name".
+const UNMASK = (col) => `CASE WHEN ${col} LIKE '%∙%' THEN NULL ELSE ${col} END`;
+const NAME_EXPR = `COALESCE(${UNMASK('c.name')}, ${UNMASK('ctl.name')}, ${UNMASK('ct.name')})`;
+const CHAT_JOINS = `
+  FROM chats c
+  LEFT JOIN contacts ct  ON ct.jid = c.jid
+  LEFT JOIN lid_map  lm  ON lm.lid = c.jid
+  LEFT JOIN contacts ctl ON ctl.jid = lm.pn`;
 const CHAT_SELECT = `
   SELECT c.jid,
-         COALESCE(c.name, ct.name) AS name,
+         ${NAME_EXPR} AS name,
          c.lastMessage, c.lastTimestamp, c.unreadCount,
-         c.archived, c.pinned, c.isGroup
-  FROM chats c
-  LEFT JOIN contacts ct ON ct.jid = c.jid`;
+         c.archived, c.pinned, c.isGroup,
+         lm.pn AS pn
+  ${CHAT_JOINS}`;
 export function listChats(limit = 50, includeArchived = false) {
     return getDb()
         .prepare(`${CHAT_SELECT}
@@ -127,8 +143,11 @@ export function listChats(limit = 50, includeArchived = false) {
         .all(limit);
 }
 export function listContacts(limit = 500) {
+    // Exclude WhatsApp privacy-masked placeholder names (e.g. "+91∙∙∙∙∙∙∙∙37").
     return getDb()
-        .prepare(`SELECT * FROM contacts WHERE name IS NOT NULL ORDER BY name COLLATE NOCASE LIMIT ?`)
+        .prepare(`SELECT * FROM contacts
+       WHERE name IS NOT NULL AND name NOT LIKE '%∙%'
+       ORDER BY name COLLATE NOCASE LIMIT ?`)
         .all(limit);
 }
 export function getMessages(chatJid, limit = 30) {
@@ -165,26 +184,70 @@ export function findChat(query) {
         .get(query);
     if (exact)
         return exact;
-    // Bare phone number → match the number portion of a direct-chat jid.
+    // Bare phone number → match the number portion of a direct-chat jid, or the
+    // phone of a @lid chat via the LID map.
     const digits = query.replace(/[^\d]/g, '');
     if (digits.length >= 5 && digits === query.replace(/[+\s()\-]/g, '')) {
         const byNum = dbc
-            .prepare(`${CHAT_SELECT} WHERE c.jid LIKE ? ORDER BY c.lastTimestamp DESC LIMIT 1`)
-            .get(`${digits}@%`);
+            .prepare(`${CHAT_SELECT}
+         WHERE c.jid LIKE ? OR lm.pn LIKE ?
+         ORDER BY c.lastTimestamp DESC LIMIT 1`)
+            .get(`${digits}@%`, `${digits}@%`);
         if (byNum)
             return byNum;
     }
-    // Case-insensitive name match (chat's own name OR the linked contact name),
-    // preferring the most recently active.
+    // Case-insensitive name match (chat name, direct contact, or LID-mapped
+    // contact), preferring an exact match then the most recently active.
     const byName = dbc
         .prepare(`${CHAT_SELECT}
-       WHERE COALESCE(c.name, ct.name) LIKE ? ESCAPE '\\'
-       ORDER BY (COALESCE(c.name, ct.name) = ? COLLATE NOCASE) DESC,
+       WHERE ${NAME_EXPR} LIKE ? ESCAPE '\\'
+       ORDER BY (${NAME_EXPR} = ? COLLATE NOCASE) DESC,
                 c.lastTimestamp DESC
        LIMIT 1`)
         .get(likePattern(query), query);
     return byName ?? null;
 }
+/**
+ * Import the session's LID↔phone mappings into `lid_map`. Reads the
+ * `lid-mapping-<LID>_reverse.json` files (LID → phone number) that Baileys
+ * writes. Idempotent and fast (single transaction); safe to run on every sync.
+ * Returns the number of mappings imported.
+ */
+export function importLidMappings() {
+    let files;
+    try {
+        files = readdirSync(PATHS.sessions).filter((f) => f.startsWith('lid-mapping-') && f.endsWith('_reverse.json'));
+    }
+    catch {
+        return 0;
+    }
+    const dbc = getDb();
+    const stmt = dbc.prepare(`INSERT INTO lid_map (lid, pn) VALUES (?, ?)
+     ON CONFLICT(lid) DO UPDATE SET pn = excluded.pn`);
+    dbc.exec('BEGIN');
+    let n = 0;
+    try {
+        for (const f of files) {
+            const lid = f.slice('lid-mapping-'.length, -'_reverse.json'.length);
+            let pn;
+            try {
+                pn = JSON.parse(readFileSync(join(PATHS.sessions, f), 'utf8'));
+            }
+            catch {
+                continue;
+            }
+            if (!lid || !pn)
+                continue;
+            stmt.run(`${lid}@lid`, `${pn}@s.whatsapp.net`);
+            n++;
+        }
+        dbc.exec('COMMIT');
+    }
+    catch {
+        dbc.exec('ROLLBACK');
+    }
+    return n;
+}
 /** Media messages, optionally filtered by type (image/video/audio/document/sticker). */
 export function listMedia(types, limit = 50) {
     const dbc = getDb();

package/dist/utils/format.js

@@ -45,11 +45,17 @@ export function formatTime(ms, time24h = true) {
     return `${date} ${time}`;
 }
 export function displayName(chat) {
-    if (chat.name)
+    // Real saved/known name (never a privacy-masked placeholder).
+    if (chat.name && !chat.name.includes('∙'))
         return chat.name;
-    // Fall back to the phone number portion of a direct jid.
-    const num = chat.jid.split('@')[0];
-    return chat.isGroup ? `Group ${num}` : `+${num}`;
+    if (chat.isGroup)
+        return 'Group';
+    // Individual with no name: show a real phone number — never a @lid id.
+    // Prefer the LID→phone mapping, else the number of a phone jid.
+    const pnNum = chat.pn ? chat.pn.split('@')[0] : null;
+    const jidNum = chat.jid.endsWith('@s.whatsapp.net') ? chat.jid.split('@')[0] : null;
+    const num = pnNum ?? jidNum;
+    return num ? `+${num}` : 'Unknown contact';
 }
 /** Render the numbered chat list shown by `wa chats`. */
 export function renderChatList(chats, time24h = true) {
@@ -76,13 +82,33 @@ export function renderMessages(messages, time24h = true) {
     return messages
         .map((m) => {
         const time = c.gray(formatTime(m.timestamp, time24h));
-        const who = m.fromMe ? c.green('me') : c.cyan(m.sender ?? 'unknown');
+        const who = m.fromMe ? c.green('me') : c.cyan(cleanSender(m.sender));
         const body = m.text ?? (m.type ? c.dim(`[${m.type}]`) : c.dim('[no text]'));
         const id = c.dim(`#${m.id}`);
         return `${time} ${who}: ${body} ${id}`;
     })
         .join('\n');
 }
+/** A human sender label that never exposes a @lid id or a masked placeholder. */
+export function cleanSender(sender) {
+    if (!sender)
+        return 'unknown';
+    if (sender.includes('∙'))
+        return 'unknown'; // masked placeholder
+    if (sender.includes('@')) {
+        if (sender.endsWith('@lid'))
+            return 'unknown'; // never show a lid
+        return `+${sender.split('@')[0]}`; // phone jid → number
+    }
+    return sender; // a real push name
+}
+/** Phone number to show under a chat header — never a @lid id. */
+export function chatNumber(chat) {
+    const pnNum = chat.pn ? chat.pn.split('@')[0] : null;
+    const jidNum = chat.jid.endsWith('@s.whatsapp.net') ? chat.jid.split('@')[0] : null;
+    const num = pnNum ?? jidNum;
+    return num ? `+${num}` : '';
+}
 export function truncate(s, n) {
     const oneLine = s.replace(/\s+/g, ' ').trim();
     return oneLine.length > n ? oneLine.slice(0, n - 1) + '…' : oneLine;

package/package.json

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