whatsapp-pi 1.0.54 → 1.0.56

package/README.md

@@ -169,3 +169,4 @@ npm test
 - **Session Handling**: Saved state, allow list, and startup reconnects are restored automatically when available.
 - **Intelligent Message Filtering**: Messages ending with `π` are ignored to prevent bot loops.
 - **Storage Management**: Persistent data lives under `.pi-data/` plus the recents store in the user home directory.
+- **Improved Test Coverage (v1.0.56)**: Added unit tests for the `message_end` auto-reply handler, covering the happy path, disconnected guard, role guard, send failure, thrown exceptions, and the `send_wa_message` dedup flag. Fixed a Windows path separator bug in the recents service test suite.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-pi",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "type": "module",
   "description": "WhatsApp integration extension for Pi",
   "main": "whatsapp-pi.ts",

package/src/i18n.ts

@@ -80,6 +80,11 @@ const fallback = {
     "menu.allowed.contact.addAlias": "Add Alias",
     "menu.allowed.contact.removeNumber": "Remove Contact",
     "menu.allowed.contact.back": "Back",
+    "menu.allowed.contact.addNumber": "Add Number",
+    "menu.allowed.contact.removeSendNumber": "Remove Number",
+    "menu.allowed.contact.enterNumber": "Enter send number for {displayName}:",
+    "menu.allowed.contact.numberAdded": "Send number added for {displayName}",
+    "menu.allowed.contact.numberRemoved": "Send number removed for {displayName}",
     "menu.allowed.enterAlias": "Enter alias for {number}:",
     "menu.allowed.pleaseEnterAlias": "Please enter an alias.",
     "menu.allowed.aliasAdded": "Alias added for {number}",
@@ -138,6 +143,8 @@ const fallback = {
     "menu.recents.history.received": "Received",
     "menu.recents.history.noText": "[No text]",
     "menu.recents.history.messageTitle": "Message • {displayName}",
+    "menu.recents.grouped.contacts": "({count} contacts)",
+    "menu.recents.grouped.title": "Recents • ({count} contacts)",
     "message.detail.defaultTitle": "Message Details",
     "message.detail.noReadableText": "[No readable text available]",
     "message.detail.messageId": "Message ID",
@@ -289,6 +296,11 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.allowed.contact.addAlias": "Adicionar apelido",
         "menu.allowed.contact.removeNumber": "Remover contato",
         "menu.allowed.contact.back": "Voltar",
+        "menu.allowed.contact.addNumber": "Adicionar número",
+        "menu.allowed.contact.removeSendNumber": "Remover número",
+        "menu.allowed.contact.enterNumber": "Digite o número de envio para {displayName}:",
+        "menu.allowed.contact.numberAdded": "Número de envio adicionado para {displayName}",
+        "menu.allowed.contact.numberRemoved": "Número de envio removido para {displayName}",
         "menu.allowed.enterAlias": "Digite apelido para {number}:",
         "menu.allowed.pleaseEnterAlias": "Digite um apelido.",
         "menu.allowed.aliasAdded": "Apelido adicionado para {number}",
@@ -347,6 +359,8 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.recents.history.received": "Recebida",
         "menu.recents.history.noText": "[Sem texto]",
         "menu.recents.history.messageTitle": "Mensagem • {displayName}",
+        "menu.recents.grouped.contacts": "({count} contactos)",
+        "menu.recents.grouped.title": "Recentes • ({count} contactos)",
         "message.detail.defaultTitle": "Detalhes da mensagem",
         "message.detail.noReadableText": "[No readable text available]",
         "message.detail.messageId": "ID da mensagem",
@@ -461,6 +475,11 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.allowed.contact.addAlias": "Agregar alias",
         "menu.allowed.contact.removeNumber": "Quitar contacto",
         "menu.allowed.contact.back": "Volver",
+        "menu.allowed.contact.addNumber": "Agregar número",
+        "menu.allowed.contact.removeSendNumber": "Quitar número",
+        "menu.allowed.contact.enterNumber": "Ingresa el número de envío para {displayName}:",
+        "menu.allowed.contact.numberAdded": "Número de envío agregado para {displayName}",
+        "menu.allowed.contact.numberRemoved": "Número de envío eliminado para {displayName}",
         "menu.allowed.enterAlias": "Ingresa alias para {number}:",
         "menu.allowed.pleaseEnterAlias": "Ingresa un alias.",
         "menu.allowed.aliasAdded": "Alias agregado para {number}",
@@ -491,6 +510,8 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.recents.history.received": "Recibido",
         "menu.recents.history.noText": "[Sin texto]",
         "menu.recents.history.messageTitle": "Mensaje • {displayName}",
+        "menu.recents.grouped.contacts": "({count} contactos)",
+        "menu.recents.grouped.title": "Recientes • ({count} contactos)",
         "message.detail.defaultTitle": "Detalles del mensaje",
         "message.detail.noReadableText": "[No readable text available]",
         "message.detail.messageId": "ID del mensaje",
@@ -588,6 +609,11 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.allowed.contact.addAlias": "Ajouter un alias",
         "menu.allowed.contact.removeNumber": "Supprimer le contact",
         "menu.allowed.contact.back": "Retour",
+        "menu.allowed.contact.addNumber": "Ajouter un numéro",
+        "menu.allowed.contact.removeSendNumber": "Supprimer le numéro",
+        "menu.allowed.contact.enterNumber": "Entrez le numéro d'envoi pour {displayName} :",
+        "menu.allowed.contact.numberAdded": "Numéro d'envoi ajouté pour {displayName}",
+        "menu.allowed.contact.numberRemoved": "Numéro d'envoi supprimé pour {displayName}",
         "menu.allowed.enterAlias": "Entrez un alias pour {number} :",
         "menu.allowed.pleaseEnterAlias": "Veuillez saisir un alias.",
         "menu.allowed.aliasAdded": "Alias ajouté pour {number}",
@@ -618,6 +644,8 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.recents.history.received": "Reçu",
         "menu.recents.history.noText": "[Sans texte]",
         "menu.recents.history.messageTitle": "Message • {displayName}",
+        "menu.recents.grouped.contacts": "({count} contacts)",
+        "menu.recents.grouped.title": "Récents • ({count} contacts)",
         "message.detail.defaultTitle": "Détails du message",
         "message.detail.noReadableText": "[No readable text available]",
         "message.detail.messageId": "ID du message",

package/src/services/recents.service.ts

@@ -125,8 +125,15 @@ export class RecentsService {
         });
     }
 
+    private stripSpecialCharacters(text: string): string {
+        return text
+            .replace(/[\p{Extended_Pictographic}\p{Emoji_Modifier}\p{Regional_Indicator}\u200D\uFE0F]/gu, '')
+            .replace(/\s+/g, ' ')
+            .trim();
+    }
+
     private buildPreview(text: string): string {
-        const normalized = text.trim().replace(/\s+/g, ' ');
+        const normalized = this.stripSpecialCharacters(text);
         if (normalized.length <= 80) return normalized;
         return `${normalized.slice(0, 77)}...`;
     }
@@ -158,7 +165,7 @@ export class RecentsService {
         if (!senderNumber) return;
 
         const normalizedTimestamp = this.normalizeTimestamp(input.timestamp);
-        const normalizedText = input.text.trim().replace(/\s+/g, ' ');
+        const normalizedText = this.stripSpecialCharacters(input.text);
         if (!normalizedText) return;
 
         const existing = this.store.messagesBySender[senderNumber] ?? [];
@@ -181,7 +188,7 @@ export class RecentsService {
         const summary: RecentConversationSummary = {
             senderNumber,
             senderName: input.senderName ?? existingConversation?.senderName,
-            lastMessagePreview: this.buildPreview(input.text),
+            lastMessagePreview: this.buildPreview(normalizedText),
             lastMessageTime: normalizedTimestamp,
             lastMessageDirection: input.direction,
             messageCount: this.store.messagesBySender[senderNumber].length,

package/src/services/session.manager.ts

@@ -8,6 +8,7 @@ import { t } from '../i18n.js';
 export interface Contact {
     number: string;
     name?: string;
+    sendNumber?: string;
     reactionMode?: ReactionMode;
 }
 
@@ -76,7 +77,8 @@ export class SessionManager {
                         const reactionMode = item.reactionMode === 'active' || item.reactionMode === 'passive'
                             ? item.reactionMode
                             : undefined;
-                        return { number: num, name: item.name, reactionMode };
+                        const sendNumber = typeof item.sendNumber === 'string' ? item.sendNumber : undefined;
+                        return { number: num, name: item.name, sendNumber, reactionMode };
                     }
                 }
                 return null;
@@ -293,6 +295,20 @@ export class SessionManager {
         await this.saveConfig();
     }
 
+    async setContactSendNumber(number: string, sendNumber: string) {
+        const contact = this.getAllowedContact(number);
+        if (!contact) return;
+        contact.sendNumber = sendNumber.trim();
+        await this.saveConfig();
+    }
+
+    async removeContactSendNumber(number: string) {
+        const contact = this.getAllowedContact(number);
+        if (!contact) return;
+        delete contact.sendNumber;
+        await this.saveConfig();
+    }
+
     async setAllowedGroupAlias(groupJid: string, alias: string) {
         const trimmedAlias = alias.trim();
         if (!trimmedAlias) {

package/src/services/whatsapp.service.ts

@@ -107,6 +107,7 @@ export class WhatsAppService {
     private saveCreds?: () => Promise<void>;
     private restoreBaileysConsoleFilter?: () => void;
     private reconnectTimeout?: ReturnType<typeof setTimeout>;
+    private intentionalStop = false;
     private onQRCode?: (qr: string) => void;
     private onMessage?: (m: MessagesUpsertEvent) => void;
     private onStatusUpdate?: (status: string) => void;
@@ -254,6 +255,26 @@ export class WhatsAppService {
         return Math.min(delay, WhatsAppService.MAX_RECONNECT_DELAY_MS);
     }
 
+    private scheduleReconnect(options: WhatsAppStartOptions) {
+        if (this.intentionalStop) return;
+        this.isReconnecting = true;
+        this.reconnectAttempts++;
+        const delay = this.getReconnectDelayMs();
+        this.onStatusUpdate?.(t('service.whatsapp.reconnecting'));
+        this.clearReconnectTimeout();
+        this.reconnectTimeout = setTimeout(async () => {
+            this.isReconnecting = false;
+            if (this.intentionalStop) return;
+            try {
+                await this.start(options);
+            } catch {
+                if (!this.intentionalStop) {
+                    this.scheduleReconnect(options);
+                }
+            }
+        }, delay);
+    }
+
     private cleanupSocket() {
         this.clearReconnectTimeout();
 
@@ -322,6 +343,7 @@ export class WhatsAppService {
     }
 
     async start(options: WhatsAppStartOptions = {}) {
+        this.intentionalStop = false;
         if (this.isReconnecting) return;
         this.onStatusUpdate?.(t('service.whatsapp.connecting'));
 
@@ -424,6 +446,10 @@ export class WhatsAppService {
         const isAuthRejected = this.isAuthRejected(statusCode, errorMessage);
         const shouldTreatAsLoggedOut = isBadMac || isAuthRejected;
 
+        if (this.intentionalStop) {
+            return;
+        }
+
         if (this.verboseMode) {
             console.error(t('service.whatsapp.connectionClosed', { statusCode: statusCode ?? 'unknown', shouldReconnect: String(shouldReconnect) }));
         }
@@ -464,17 +490,9 @@ export class WhatsAppService {
         }
 
         if (shouldReconnect && !this.isReconnecting) {
-            this.isReconnecting = true;
-            this.reconnectAttempts++;
-            const reconnectDelayMs = this.getReconnectDelayMs();
-            this.onStatusUpdate?.(t('service.whatsapp.reconnecting'));
-            this.clearReconnectTimeout();
             await this.saveCreds?.();
             this.cleanupSocket();
-            this.reconnectTimeout = setTimeout(() => {
-                this.isReconnecting = false;
-                void this.start(options);
-            }, reconnectDelayMs);
+            this.scheduleReconnect(options);
         } else if (!shouldReconnect) {
             this.reconnectAttempts = 0;
             this.sessionManager.setStatus('logged-out');
@@ -706,11 +724,13 @@ export class WhatsAppService {
     }
 
     async logout() {
+        this.intentionalStop = true;
         await this.socket?.logout();
         await this.sessionManager.deleteAuthState();
     }
 
     async stop() {
+        this.intentionalStop = true;
         try {
             await this.saveCreds?.();
         } catch (error) {

package/src/ui/menu.handler.ts

@@ -13,6 +13,12 @@ interface HistoryOptionEntry {
     message: RecentConversationMessage;
 }
 
+interface GroupedRecentEntry {
+    conversations: RecentConversationSummary[];
+    sharedPreview: string;
+    sharedTime: number;
+}
+
 export class MenuHandler {
     private readonly printedAllowedContacts: string[] = [];
     private readonly printedAllowedGroups: string[] = [];
@@ -137,8 +143,17 @@ export class MenuHandler {
         const removeAliasLabel = t('menu.allowed.contact.removeAlias');
         const addAliasLabel = t('menu.allowed.contact.addAlias');
         const removeNumberLabel = t('menu.allowed.contact.removeNumber');
+        const addSendNumberLabel = t('menu.allowed.contact.addNumber');
+        const removeSendNumberLabel = t('menu.allowed.contact.removeSendNumber');
         const backLabel = t('menu.allowed.contact.back');
-        const options = [historyLabel, sendMessageLabel, printNumberLabel];
+        const options = [historyLabel];
+        if (contact.sendNumber) {
+            options.push(sendMessageLabel);
+            options.push(removeSendNumberLabel);
+        } else {
+            options.push(addSendNumberLabel);
+        }
+        options.push(printNumberLabel);
         if (contact.name) {
             options.push(removeAliasLabel);
         } else {
@@ -148,6 +163,27 @@ export class MenuHandler {
 
         const choice = await ctx.ui.select(title, options);
 
+        if (choice === addSendNumberLabel) {
+            const input = await ctx.ui.input(t('menu.allowed.contact.enterNumber', { displayName }));
+            const trimmed = input?.trim() || '';
+            if (!validatePhoneNumber(trimmed)) {
+                ctx.ui.notify(t('menu.allowed.invalidNumber'), 'error');
+                await this.manageAllowedContact(ctx, contact);
+                return;
+            }
+            await this.sessionManager.setContactSendNumber(contact.number, trimmed);
+            ctx.ui.notify(t('menu.allowed.contact.numberAdded', { displayName }), 'info');
+            await this.manageAllowedContact(ctx, { ...contact, sendNumber: trimmed });
+            return;
+        }
+
+        if (choice === removeSendNumberLabel) {
+            await this.sessionManager.removeContactSendNumber(contact.number);
+            ctx.ui.notify(t('menu.allowed.contact.numberRemoved', { displayName }), 'info');
+            await this.manageAllowedContact(ctx, { ...contact, sendNumber: undefined });
+            return;
+        }
+
         if (choice === sendMessageLabel) {
             await this.sendMessageToAllowedContact(ctx, contact);
             await this.manageAllowedContact(ctx, contact);
@@ -344,36 +380,56 @@ export class MenuHandler {
 
     private async manageRecents(ctx: ExtensionCommandContext) {
         const recentConversations = await this.recentsService.getRecentConversations();
+        const groupedEntries = this.groupRecentConversations(recentConversations);
         const title = t('menu.recents.title');
         const backLabel = t('menu.root.back');
+        const nextLabel = 'Next';
+        const previousLabel = 'Previous';
+        const pageSize = 10;
 
-        if (recentConversations.length === 0) {
+        if (groupedEntries.length === 0) {
             ctx.ui.notify(t('menu.recents.empty'), 'info');
             await this.handleCommand(ctx);
             return;
         }
 
-        const options = [
-            ...recentConversations.map(conversation => this.formatRecentConversationOption(conversation)),
-            backLabel
-        ];
+        for (let page = 0; page * pageSize < groupedEntries.length;) {
+            const start = page * pageSize;
+            const pageEntries = groupedEntries.slice(start, start + pageSize);
+            const options = [
+                ...pageEntries.map(entry => this.formatGroupedRecentOption(entry)),
+                ...(page > 0 ? [previousLabel] : []),
+                ...(start + pageSize < groupedEntries.length ? [nextLabel] : []),
+                backLabel
+            ];
 
-        const choice = await ctx.ui.select(title, options);
-        if (!choice || choice === backLabel) {
-            await this.handleCommand(ctx);
-            return;
-        }
+            const choice = await ctx.ui.select(title, options);
+            if (!choice || choice === backLabel) {
+                await this.handleCommand(ctx);
+                return;
+            }
 
-        const selectedConversation = recentConversations.find(conversation =>
-            this.formatRecentConversationOption(conversation) === choice
-        );
+            if (choice === nextLabel) {
+                page += 1;
+                continue;
+            }
+
+            if (choice === previousLabel) {
+                page = Math.max(0, page - 1);
+                continue;
+            }
+
+            const selectedEntry = pageEntries.find(entry =>
+                this.formatGroupedRecentOption(entry) === choice
+            );
 
-        if (!selectedConversation) {
-            await this.manageRecents(ctx);
+            if (!selectedEntry) {
+                return;
+            }
+
+            await this.manageRecentConversation(ctx, selectedEntry.conversations[0]);
             return;
         }
-
-        await this.manageRecentConversation(ctx, selectedConversation);
     }
 
     private async manageRecentConversation(ctx: ExtensionCommandContext, conversation: RecentConversationSummary) {
@@ -387,7 +443,6 @@ export class MenuHandler {
         const allowContactLabel = isGroup
             ? t('menu.recents.contact.allowGroup')
             : t('menu.recents.contact.allowNumber');
-        const sendMessageLabel = t('menu.recents.contact.sendMessage');
         const removeAliasLabel = t('menu.recents.contact.removeAlias');
         const backLabel = t('menu.recents.contact.back');
         const options: string[] = [historyLabel];
@@ -396,8 +451,6 @@ export class MenuHandler {
             options.push(allowContactLabel);
         }
 
-        options.push(sendMessageLabel);
-
         if (allowedContact?.name) {
             options.push(removeAliasLabel);
         }
@@ -434,12 +487,6 @@ export class MenuHandler {
             return;
         }
 
-        if (choice === sendMessageLabel) {
-            await this.sendMessageFromRecents(ctx, conversation);
-            await this.manageRecentConversation(ctx, conversation);
-            return;
-        }
-
         if (choice === historyLabel) {
             await this.showConversationHistory(ctx, conversation);
             await this.manageRecentConversation(ctx, conversation);
@@ -449,19 +496,10 @@ export class MenuHandler {
         await this.manageRecents(ctx);
     }
 
-    private async sendMessageFromRecents(ctx: ExtensionCommandContext, conversation: RecentConversationSummary) {
-        await this.sendPromptedMenuMessage(ctx, {
-            displayName: this.getConversationDisplayName(conversation),
-            senderNumber: conversation.senderNumber,
-            senderName: conversation.senderName,
-            appendPiSuffix: false
-        });
-    }
-
     private async sendMessageToAllowedContact(ctx: ExtensionCommandContext, contact: Contact) {
         await this.sendPromptedMenuMessage(ctx, {
             displayName: this.formatAllowedContactOption(contact),
-            senderNumber: contact.number,
+            senderNumber: contact.sendNumber!,
             senderName: contact.name,
             appendPiSuffix: true
         });
@@ -559,44 +597,66 @@ export class MenuHandler {
             return;
         }
 
-        const historyOptions = this.buildHistoryOptions(this.sortHistoryByMostRecent(history));
-        const choice = await ctx.ui.select(t('menu.recents.history.title', { displayName }), [
-            ...historyOptions.map(option => option.label),
-            t('menu.root.back')
-        ]);
+        const sortedHistory = this.sortHistoryByMostRecent(history);
+        const pageSize = 10;
+        const backLabel = t('menu.root.back');
+        const nextLabel = 'Next';
+        const previousLabel = 'Previous';
+
+        for (let page = 0; page * pageSize < sortedHistory.length;) {
+            const start = page * pageSize;
+            const pageHistory = sortedHistory.slice(start, start + pageSize);
+            const historyOptions = this.buildHistoryOptions(pageHistory);
+            const choice = await ctx.ui.select(t('menu.recents.history.title', { displayName }), [
+                ...historyOptions.map(option => option.label),
+                ...(page > 0 ? [previousLabel] : []),
+                ...(start + pageSize < sortedHistory.length ? [nextLabel] : []),
+                backLabel
+            ]);
+
+            if (!choice || choice === backLabel) {
+                return;
+            }
 
-        if (!choice || choice === t('menu.root.back')) {
-            return;
-        }
+            if (choice === nextLabel) {
+                page += 1;
+                continue;
+            }
 
-        const selectedMessage = this.resolveHistorySelection(choice, historyOptions);
-        if (!selectedMessage) {
-            return;
-        }
+            if (choice === previousLabel) {
+                page = Math.max(0, page - 1);
+                continue;
+            }
 
-        const detailAction = await showMessageDetailView(ctx, {
-            title: t('menu.recents.history.messageTitle', { displayName }),
-            messageId: selectedMessage.messageId,
-            senderNumber: selectedMessage.senderNumber,
-            senderName,
-            text: selectedMessage.text,
-            direction: selectedMessage.direction,
-            timestamp: selectedMessage.timestamp
-        });
+            const selectedMessage = this.resolveHistorySelection(choice, historyOptions);
+            if (!selectedMessage) {
+                return;
+            }
 
-        if (detailAction === 'reply') {
-            await showMessageReplyView(ctx, {
-                selectedMessage: {
-                    messageId: selectedMessage.messageId,
-                    senderNumber: selectedMessage.senderNumber,
-                    senderName,
-                    text: selectedMessage.text,
-                    direction: selectedMessage.direction,
-                    timestamp: selectedMessage.timestamp
-                },
-                whatsappService: this.whatsappService,
-                recentsService: this.recentsService
+            const detailAction = await showMessageDetailView(ctx, {
+                title: t('menu.recents.history.messageTitle', { displayName }),
+                messageId: selectedMessage.messageId,
+                senderNumber: selectedMessage.senderNumber,
+                senderName,
+                text: selectedMessage.text,
+                direction: selectedMessage.direction,
+                timestamp: selectedMessage.timestamp
             });
+
+            if (detailAction === 'reply') {
+                await showMessageReplyView(ctx, {
+                    selectedMessage: {
+                        messageId: selectedMessage.messageId,
+                        senderNumber: selectedMessage.senderNumber,
+                        senderName,
+                        text: selectedMessage.text,
+                        direction: selectedMessage.direction,
+                        timestamp: selectedMessage.timestamp
+                    },
+                    whatsappService: this.whatsappService,
+                    recentsService: this.recentsService
+                });
+            }
         }
     }
 
@@ -611,6 +671,41 @@ export class MenuHandler {
         return options.find(option => option.label === choice)?.message;
     }
 
+    private getRecentsGroupKey(conversation: RecentConversationSummary): string {
+        if (conversation.lastMessageDirection === 'outgoing') {
+            return `outgoing::${conversation.senderNumber}`;
+        }
+        const d = new Date(conversation.lastMessageTime);
+        const minuteKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}-${d.getHours()}-${d.getMinutes()}`;
+        return `${conversation.lastMessagePreview}::${minuteKey}`;
+    }
+
+    private groupRecentConversations(conversations: RecentConversationSummary[]): GroupedRecentEntry[] {
+        const groups = new Map<string, RecentConversationSummary[]>();
+        for (const conversation of conversations) {
+            const key = this.getRecentsGroupKey(conversation);
+            const existing = groups.get(key) ?? [];
+            existing.push(conversation);
+            groups.set(key, existing);
+        }
+        return Array.from(groups.values()).map(members => ({
+            conversations: members,
+            sharedPreview: members[0].lastMessagePreview,
+            sharedTime: members[0].lastMessageTime
+        }));
+    }
+
+    private formatGroupedRecentOption(entry: GroupedRecentEntry): string {
+        if (entry.conversations.length === 1) {
+            return this.formatRecentConversationOption(entry.conversations[0]);
+        }
+        const time = this.formatDateTime(entry.sharedTime);
+        const identifiers = entry.conversations
+            .map(c => c.senderName ? `[${c.senderNumber}] ${c.senderName}` : `(${c.senderNumber})`)
+            .join(' ');
+        return `${identifiers} • ${time} • ${entry.sharedPreview}`;
+    }
+
     private formatRecentConversationOption(conversation: RecentConversationSummary): string {
         const displayName = this.getConversationDisplayName(conversation);
         const time = this.formatDateTime(conversation.lastMessageTime);
@@ -618,7 +713,8 @@ export class MenuHandler {
     }
 
     private formatAllowedContactOption(contact: Contact): string {
-        return contact.name ? `${contact.name} (${contact.number})` : contact.number;
+        const base = contact.name ? `${contact.name} [${contact.number}]` : contact.number;
+        return contact.sendNumber ? `${base} (${contact.sendNumber})` : base;
     }
 
     private formatAllowedGroupOption(group: Contact): string {