whatsapp-pi 1.0.48 → 1.0.49

package/README.md

@@ -8,15 +8,15 @@ A WhatsApp integration extension for the **[Pi Coding Agent](https://github.com/
 
 [![GitHub](https://img.shields.io/badge/github-repo-black.svg?style=flat-square&logo=github)](https://github.com/RaphaCastelloes/whatsapp-pi)
 
-Pi is a powerful agentic AI coding assistant that operates in your terminal. This extension allows you to chat and pair-program with your Pi agent directly through WhatsApp, featuring message filtering, allow-listing, recents/history browsing, message detail/reply, group-only binding, and reliable message delivery.
+Pi is a powerful agentic AI coding assistant that operates in your terminal. This extension lets you chat and pair-program with your Pi agent through WhatsApp, with message filtering, allowed contacts/groups, recents/history browsing, message detail/reply, group-only binding, and reliable message delivery.
 
 ## Features
 
 - **Manual WhatsApp Connection**: QR code-based authentication with session persistence
-- **Allow List**: Control which numbers can interact with Pi
+- **Allowed Contacts**: Control which phone numbers can interact with Pi
   - Add contacts with optional names for easy identification
-  - View ignored numbers (not in allow list) and add them when needed
-  - Manage aliases and print allowed numbers from the menu
+  - View ignored numbers (not yet allowed) and add them when needed
+  - Manage aliases and print allowed contacts from the menu
 - **Allowed Groups**: Control which WhatsApp groups can interact with Pi
   - Add group JIDs with optional aliases
   - Only groups in Allowed Groups are processed by the agent
@@ -48,18 +48,25 @@ To enable PDF reading capabilities (required for the agent to process documents)
 pi install npm:whatsapp-pi
 ```
 
-2. Start Pi (the extension will load automatically once installed):
+2. Start Pi:
 ```bash
 pi
 ```
 
-After connecting WhatsApp once from the menu and scanning the QR code, you can start Pi with auto-connect enabled:
+3. Open `/whatsapp` and choose **Connect / Reconnect WhatsApp**.
+   - QR appears only on first pair or after logoff.
+
+4. Add the chat you will use with Pi to **Allowed Contacts** or **Allowed Groups**.
+
+5. Send a message from that allowed chat to Pi.
+   - Pi replies in same thread.
+   - Use **Recents** only to browse history or reply manually.
+
+After first pairing, you can start Pi with auto-connect enabled:
 ```bash
 pi --whatsapp-pi-online
 ```
 
-3. Use the menu to connect WhatsApp and manage allowed numbers and groups
-
 ## Development / Testing
 
 If you are developing or testing the extension locally, you can clone the repository from [GitHub](https://github.com/RaphaCastelloes/whatsapp-pi):
@@ -86,6 +93,20 @@ To test startup auto-connect locally after you have already paired WhatsApp:
 pi -e whatsapp-pi.ts --whatsapp-pi-online
 ```
 
+## How It Works
+
+- Pi processes **incoming** messages only from allowed contacts or allowed groups.
+- **Recents** is history browser, not trigger.
+- **Send Message** and `send_wa_message` are outbound only.
+- If you message yourself, WhatsApp may show sent/read ticks, but that does not guarantee Pi will treat it as a trigger.
+
+## WhatsApp Numbers and JIDs
+
+- Contacts use phone format in UI: `+5511999999999`
+- Internally, contacts map to JIDs like `5511999999999@s.whatsapp.net`
+- Groups use JIDs like `120363012345@g.us`
+- Recents may show normalized values from WhatsApp, so use **Print Contact** / **Print Group JID** and aliases to avoid confusion.
+
 ## Commands
 
 - `/whatsapp` - Open the WhatsApp management menu
@@ -95,12 +116,12 @@ pi -e whatsapp-pi.ts --whatsapp-pi-online
 - **Disconnect WhatsApp** - Stop WhatsApp connection
 - **Logoff (Delete Session)** - Remove all credentials and session data
 - **Recents** - Open recent conversations, view history, and reply
-- **Allowed Numbers** - Manage contacts that can interact with Pi
+- **Allowed Contacts** - Manage contacts that can interact with Pi
 - **Allowed Groups** - Manage WhatsApp groups that can interact with Pi
 
-### Allowed Numbers Management
-- **Add Number** - Add a new contact to the allow list (format: +5511999999999)
-- **Select a contact** - Open a submenu with **History**, **Send Message**, **Print Number**, alias actions, **Remove Number**, and **Back**
+### Allowed Contacts Management
+- **Add Contact** - Add a new contact to the allowed contacts list (format: +5511999999999)
+- **Select a contact** - Open a submenu with **History**, **Send Message**, **Print Contact**, alias actions, **Remove Contact**, and **Back**
 - **Back** - Return to main menu
 
 ### Allowed Groups Management
@@ -112,7 +133,7 @@ pi -e whatsapp-pi.ts --whatsapp-pi-online
 - **History** - Open full message history for that conversation
 - **Send Message** - Send a new message without Pi suffix
 - **Reply** - Open message detail, then press `R` to reply
-- **Allow Number / Allow Group** - Move a recent sender into the appropriate allow list
+- **Allow Contact / Allow Group** - Move a recent sender into the appropriate allowed list
 - **Remove Alias** - Clear saved alias for that sender
 - **Back** - Return to main menu
 

package/package.json

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

package/src/i18n.ts

@@ -53,7 +53,7 @@ const fallback = {
     "service.whatsapp.failedMarkRead": "Failed to mark message as read:",
     "menu.whatsapp.title": "WhatsApp (Status: {status})",
     "menu.root.recents": "Recents",
-    "menu.root.allowedNumbers": "Allowed Numbers",
+    "menu.root.allowedNumbers": "Allowed Contacts",
     "menu.root.allowedGroups": "Allowed Groups",
     "menu.root.disconnectWhatsApp": "Disconnect WhatsApp",
     "menu.root.connectWhatsApp": "Connect WhatsApp",
@@ -67,25 +67,25 @@ const fallback = {
     "menu.root.logoffTitle": "Logoff",
     "menu.root.logoffConfirmMessage": "Delete all credentials?",
     "menu.root.loggedOffAndDeleted": "Logged off and credentials deleted",
-    "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Allowed numbers",
-    "menu.allowed.title": "Allowed Numbers",
-    "menu.allowed.addNumber": "Add Number",
-    "menu.allowed.enterNumber": "Enter number (e.g. +5511999999999):",
-    "menu.allowed.invalidNumber": "Invalid number format",
-    "menu.allowed.contact.title": "Allowed Number • {displayName}",
+    "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Allowed contacts",
+    "menu.allowed.title": "Allowed Contacts",
+    "menu.allowed.addNumber": "Add Contact",
+    "menu.allowed.enterNumber": "Enter contact (e.g. +5511999999999):",
+    "menu.allowed.invalidNumber": "Invalid contact format",
+    "menu.allowed.contact.title": "Allowed Contact • {displayName}",
     "menu.allowed.contact.history": "History",
     "menu.allowed.contact.sendMessage": "Send Message",
-    "menu.allowed.contact.printNumber": "Print Number",
+    "menu.allowed.contact.printNumber": "Print Contact",
     "menu.allowed.contact.removeAlias": "Remove Alias",
     "menu.allowed.contact.addAlias": "Add Alias",
-    "menu.allowed.contact.removeNumber": "Remove Number",
+    "menu.allowed.contact.removeNumber": "Remove Contact",
     "menu.allowed.contact.back": "Back",
     "menu.allowed.enterAlias": "Enter alias for {number}:",
     "menu.allowed.pleaseEnterAlias": "Please enter an alias.",
     "menu.allowed.aliasAdded": "Alias added for {number}",
     "menu.allowed.aliasRemoved": "Alias removed for {number}",
-    "menu.allowed.removeConfirmTitle": "Remove Number",
-    "menu.allowed.removeConfirmMessage": "Remove {displayName} from Allowed Numbers?",
+    "menu.allowed.removeConfirmTitle": "Remove Contact",
+    "menu.allowed.removeConfirmMessage": "Remove {displayName} from Allowed Contacts?",
     "menu.allowed.removed": "Removed {displayName}",
     "menu.allowed.alreadyAllowed": "{number} is already in the allow list",
     "menu.allowed.addedToAllowList": "Added {number} to the allow list",
@@ -118,7 +118,7 @@ const fallback = {
     "menu.recents.empty": "No recent individual conversations yet.",
     "menu.recents.contact.title": "Recents • {displayName}",
     "menu.recents.contact.history": "History",
-    "menu.recents.contact.allowNumber": "Allow Number",
+    "menu.recents.contact.allowNumber": "Allow Contact",
     "menu.recents.contact.allowGroup": "Allow Group",
     "menu.recents.contact.sendMessage": "Send Message",
     "menu.recents.contact.removeAlias": "Remove Alias",
@@ -255,7 +255,7 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "service.whatsapp.failedMarkRead": "Falha ao marcar mensagem como lida:",
         "menu.whatsapp.title": "WhatsApp (Status: {status})",
         "menu.root.recents": "Recentes",
-        "menu.root.allowedNumbers": "Números permitidos",
+        "menu.root.allowedNumbers": "Contactos permitidos",
         "menu.root.allowedGroups": "Grupos permitidos",
         "menu.root.disconnectWhatsApp": "Desconectar WhatsApp",
         "menu.root.connectWhatsApp": "Conectar WhatsApp",
@@ -269,25 +269,25 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.root.logoffTitle": "Fazer logoff",
         "menu.root.logoffConfirmMessage": "Excluir todas as credenciais?",
         "menu.root.loggedOffAndDeleted": "Logout feito e credenciais excluídas",
-        "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Números permitidos",
-        "menu.allowed.title": "Números permitidos",
-        "menu.allowed.addNumber": "Adicionar número",
-        "menu.allowed.enterNumber": "Digite o número (ex.: +5511999999999):",
-        "menu.allowed.invalidNumber": "Formato de número inválido",
-        "menu.allowed.contact.title": "Número permitido • {displayName}",
+        "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Contactos permitidos",
+        "menu.allowed.title": "Contactos permitidos",
+        "menu.allowed.addNumber": "Adicionar contato",
+        "menu.allowed.enterNumber": "Digite o contato (ex.: +5511999999999):",
+        "menu.allowed.invalidNumber": "Formato de contacto inválido",
+        "menu.allowed.contact.title": "Contacto permitido • {displayName}",
         "menu.allowed.contact.history": "Histórico",
         "menu.allowed.contact.sendMessage": "Enviar mensagem",
-        "menu.allowed.contact.printNumber": "Mostrar número",
+        "menu.allowed.contact.printNumber": "Mostrar contacto",
         "menu.allowed.contact.removeAlias": "Remover apelido",
         "menu.allowed.contact.addAlias": "Adicionar apelido",
-        "menu.allowed.contact.removeNumber": "Remover número",
+        "menu.allowed.contact.removeNumber": "Remover contato",
         "menu.allowed.contact.back": "Voltar",
         "menu.allowed.enterAlias": "Digite apelido para {number}:",
         "menu.allowed.pleaseEnterAlias": "Digite um apelido.",
         "menu.allowed.aliasAdded": "Apelido adicionado para {number}",
         "menu.allowed.aliasRemoved": "Apelido removido para {number}",
-        "menu.allowed.removeConfirmTitle": "Remover número",
-        "menu.allowed.removeConfirmMessage": "Remover {displayName} dos Números permitidos?",
+        "menu.allowed.removeConfirmTitle": "Remover contato",
+        "menu.allowed.removeConfirmMessage": "Remover {displayName} dos Contactos permitidos?",
         "menu.allowed.removed": "Removido {displayName}",
         "menu.allowed.alreadyAllowed": "{number} já está na lista permitida",
         "menu.allowed.addedToAllowList": "Adicionado {number} à lista permitida",
@@ -320,7 +320,7 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.recents.empty": "Ainda não há conversas individuais recentes.",
         "menu.recents.contact.title": "Recentes • {displayName}",
         "menu.recents.contact.history": "Histórico",
-        "menu.recents.contact.allowNumber": "Permitir número",
+        "menu.recents.contact.allowNumber": "Permitir contacto",
         "menu.recents.contact.allowGroup": "Permitir grupo",
         "menu.recents.contact.sendMessage": "Enviar mensagem",
         "menu.recents.contact.removeAlias": "Remover apelido",
@@ -420,7 +420,7 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "service.whatsapp.failedMarkRead": "Error al marcar mensaje como leído:",
         "menu.whatsapp.title": "WhatsApp (Estado: {status})",
         "menu.root.recents": "Recientes",
-        "menu.root.allowedNumbers": "Números permitidos",
+        "menu.root.allowedNumbers": "Contactos permitidos",
         "menu.root.allowedGroups": "Grupos permitidos",
         "menu.root.disconnectWhatsApp": "Desconectar WhatsApp",
         "menu.root.connectWhatsApp": "Conectar WhatsApp",
@@ -434,25 +434,25 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.root.logoffTitle": "Cerrar sesión",
         "menu.root.logoffConfirmMessage": "¿Eliminar todas las credenciales?",
         "menu.root.loggedOffAndDeleted": "Sesión cerrada y credenciales eliminadas",
-        "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Números permitidos",
-        "menu.allowed.title": "Números permitidos",
-        "menu.allowed.addNumber": "Agregar número",
-        "menu.allowed.enterNumber": "Ingresa el número (p. ej. +5511999999999):",
-        "menu.allowed.invalidNumber": "Formato de número inválido",
-        "menu.allowed.contact.title": "Número permitido • {displayName}",
+        "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Contactos permitidos",
+        "menu.allowed.title": "Contactos permitidos",
+        "menu.allowed.addNumber": "Agregar contacto",
+        "menu.allowed.enterNumber": "Ingresa el contacto (p. ej. +5511999999999):",
+        "menu.allowed.invalidNumber": "Formato de contacto inválido",
+        "menu.allowed.contact.title": "Contacto permitido • {displayName}",
         "menu.allowed.contact.history": "Historial",
         "menu.allowed.contact.sendMessage": "Enviar mensaje",
-        "menu.allowed.contact.printNumber": "Mostrar número",
+        "menu.allowed.contact.printNumber": "Mostrar contacto",
         "menu.allowed.contact.removeAlias": "Quitar alias",
         "menu.allowed.contact.addAlias": "Agregar alias",
-        "menu.allowed.contact.removeNumber": "Quitar número",
+        "menu.allowed.contact.removeNumber": "Quitar contacto",
         "menu.allowed.contact.back": "Volver",
         "menu.allowed.enterAlias": "Ingresa alias para {number}:",
         "menu.allowed.pleaseEnterAlias": "Ingresa un alias.",
         "menu.allowed.aliasAdded": "Alias agregado para {number}",
         "menu.allowed.aliasRemoved": "Alias quitado para {number}",
-        "menu.allowed.removeConfirmTitle": "Quitar número",
-        "menu.allowed.removeConfirmMessage": "¿Quitar {displayName} de Números permitidos?",
+        "menu.allowed.removeConfirmTitle": "Quitar contacto",
+        "menu.allowed.removeConfirmMessage": "¿Quitar {displayName} de Contactos permitidos?",
         "menu.allowed.removed": "Quitado {displayName}",
         "menu.allowed.alreadyAllowed": "{number} ya está en la lista permitida",
         "menu.allowed.addedToAllowList": "Agregado {number} a la lista permitida",
@@ -464,7 +464,7 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.recents.empty": "Todavía no hay conversaciones individuales recientes.",
         "menu.recents.contact.title": "Recientes • {displayName}",
         "menu.recents.contact.history": "Historial",
-        "menu.recents.contact.allowNumber": "Permitir número",
+        "menu.recents.contact.allowNumber": "Permitir contacto",
         "menu.recents.contact.sendMessage": "Enviar mensaje",
         "menu.recents.contact.removeAlias": "Quitar alias",
         "menu.recents.contact.back": "Volver",
@@ -547,7 +547,7 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "service.whatsapp.failedMarkRead": "Échec du marquage du message comme lu :",
         "menu.whatsapp.title": "WhatsApp (Statut: {status})",
         "menu.root.recents": "Récents",
-        "menu.root.allowedNumbers": "Numéros autorisés",
+        "menu.root.allowedNumbers": "Contacts autorisés",
         "menu.root.allowedGroups": "Groupes autorisés",
         "menu.root.disconnectWhatsApp": "Déconnecter WhatsApp",
         "menu.root.connectWhatsApp": "Connecter WhatsApp",
@@ -561,25 +561,25 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.root.logoffTitle": "Déconnexion",
         "menu.root.logoffConfirmMessage": "Supprimer toutes les informations d’identification ?",
         "menu.root.loggedOffAndDeleted": "Déconnexion effectuée et identifiants supprimés",
-        "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Numéros autorisés",
-        "menu.allowed.title": "Numéros autorisés",
-        "menu.allowed.addNumber": "Ajouter un numéro",
-        "menu.allowed.enterNumber": "Entrez le numéro (ex. +5511999999999) :",
-        "menu.allowed.invalidNumber": "Format de numéro invalide",
-        "menu.allowed.contact.title": "Numéro autorisé • {displayName}",
+        "menu.allowed.printAllowedNumbersTitle": "[WhatsApp-Pi] Contacts autorisés",
+        "menu.allowed.title": "Contacts autorisés",
+        "menu.allowed.addNumber": "Ajouter un contact",
+        "menu.allowed.enterNumber": "Entrez le contact (ex. +5511999999999) :",
+        "menu.allowed.invalidNumber": "Format de contact invalide",
+        "menu.allowed.contact.title": "Contact autorisé • {displayName}",
         "menu.allowed.contact.history": "Historique",
         "menu.allowed.contact.sendMessage": "Envoyer un message",
-        "menu.allowed.contact.printNumber": "Afficher le numéro",
+        "menu.allowed.contact.printNumber": "Afficher le contact",
         "menu.allowed.contact.removeAlias": "Supprimer l’alias",
         "menu.allowed.contact.addAlias": "Ajouter un alias",
-        "menu.allowed.contact.removeNumber": "Supprimer le numéro",
+        "menu.allowed.contact.removeNumber": "Supprimer le contact",
         "menu.allowed.contact.back": "Retour",
         "menu.allowed.enterAlias": "Entrez un alias pour {number} :",
         "menu.allowed.pleaseEnterAlias": "Veuillez saisir un alias.",
         "menu.allowed.aliasAdded": "Alias ajouté pour {number}",
         "menu.allowed.aliasRemoved": "Alias supprimé pour {number}",
-        "menu.allowed.removeConfirmTitle": "Supprimer le numéro",
-        "menu.allowed.removeConfirmMessage": "Supprimer {displayName} des Numéros autorisés ?",
+        "menu.allowed.removeConfirmTitle": "Supprimer le contact",
+        "menu.allowed.removeConfirmMessage": "Supprimer {displayName} des Contacts autorisés ?",
         "menu.allowed.removed": "Supprimé {displayName}",
         "menu.allowed.alreadyAllowed": "{number} est déjà dans la liste autorisée",
         "menu.allowed.addedToAllowList": "Ajouté {number} à la liste autorisée",
@@ -591,7 +591,7 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.recents.empty": "Aucune conversation individuelle récente.",
         "menu.recents.contact.title": "Récents • {displayName}",
         "menu.recents.contact.history": "Historique",
-        "menu.recents.contact.allowNumber": "Autoriser le numéro",
+        "menu.recents.contact.allowNumber": "Autoriser le contact",
         "menu.recents.contact.sendMessage": "Envoyer un message",
         "menu.recents.contact.removeAlias": "Supprimer l’alias",
         "menu.recents.contact.back": "Retour",

package/src/services/incoming-message.resolver.ts

@@ -1,150 +1,150 @@
-import { t } from '../i18n.js';
-import { extractMessageContent } from 'baileys';
-
-export type IncomingResolution =
-    | { kind: 'text'; text: string }
-    | { kind: 'audio'; text: string; audioMessage: any }
-    | { kind: 'image'; text: string; imageMessage: any }
-    | { kind: 'document'; text: string; documentMessage: any }
-    | { kind: 'contact'; text: string }
-    | { kind: 'location'; text: string }
-    | { kind: 'system'; text: string }
-    | { kind: 'unsupported'; text: string };
-
-const protocolTypes: Record<number, keyof typeof protocolLabels> = {
-    0: 'messageDeleted',
-    3: 'disappearingMessagesUpdated',
-    4: 'disappearingMessageSyncResponse',
-    5: 'historySyncNotification',
-    6: 'appStateSyncKeyShare',
-    7: 'appStateSyncKeyRequest',
-    8: 'messageBackfillRequest',
-    9: 'securityNotificationSync',
-    10: 'fatalAppStateSyncNotification',
-    11: 'phoneNumberShared',
-    14: 'messageEdited',
-    16: 'peerDataRequest',
-    17: 'peerDataResponse',
-    18: 'welcomeMessageRequest',
-    19: 'botFeedback',
-    20: 'mediaNotification'
-};
-
-const protocolLabels = {
-    messageDeleted: t('incoming.protocol.messageDeleted'),
-    disappearingMessagesUpdated: t('incoming.protocol.disappearingMessagesUpdated'),
-    disappearingMessageSyncResponse: t('incoming.protocol.disappearingMessageSyncResponse'),
-    historySyncNotification: t('incoming.protocol.historySyncNotification'),
-    appStateSyncKeyShare: t('incoming.protocol.appStateSyncKeyShare'),
-    appStateSyncKeyRequest: t('incoming.protocol.appStateSyncKeyRequest'),
-    messageBackfillRequest: t('incoming.protocol.messageBackfillRequest'),
-    securityNotificationSync: t('incoming.protocol.securityNotificationSync'),
-    fatalAppStateSyncNotification: t('incoming.protocol.fatalAppStateSyncNotification'),
-    phoneNumberShared: t('incoming.protocol.phoneNumberShared'),
-    messageEdited: t('incoming.protocol.messageEdited'),
-    peerDataRequest: t('incoming.protocol.peerDataRequest'),
-    peerDataResponse: t('incoming.protocol.peerDataResponse'),
-    welcomeMessageRequest: t('incoming.protocol.welcomeMessageRequest'),
-    botFeedback: t('incoming.protocol.botFeedback'),
-    mediaNotification: t('incoming.protocol.mediaNotification')
-} as const;
-
-const unwrapMessageContent = (content: any): any => extractMessageContent(content) ?? content;
-
-const getTypeName = (payload: any): string => {
-    if (!payload || typeof payload !== 'object') return 'unknown';
-    return Object.keys(payload)[0] || 'unknown';
-};
-
-const formatProtocolMessage = (protocolMessage: any): string => {
-    const typeLabelKey = protocolTypes[Number(protocolMessage?.type)];
-    const typeLabel = typeLabelKey ? protocolLabels[typeLabelKey] : t('incoming.protocol.systemUpdate');
-    const editedText = protocolMessage?.editedMessage?.conversation
-        || protocolMessage?.editedMessage?.extendedTextMessage?.text;
-
-    if (editedText) {
-        return `[${typeLabel}: ${editedText}]`;
-    }
-
-    return `[${typeLabel}]`;
-};
-
-export const extractIncomingText = (message: any): IncomingResolution => {
-    const content = unwrapMessageContent(message);
-    const inner = content?.ephemeralMessage?.message
-        || content?.viewOnceMessage?.message
-        || content?.viewOnceMessageV2?.message
-        || content?.viewOnceMessageV2Extension?.message
-        || content?.message;
-
-    const resolved = inner ? unwrapMessageContent(inner) : content;
-    const typeName = getTypeName(resolved);
-    const protocolMessage = resolved?.protocolMessage
-        || (typeName === 'protocolMessage' ? resolved : undefined)
-        || content?.protocolMessage;
-
-    if (protocolMessage) {
-        return { kind: 'system', text: formatProtocolMessage(protocolMessage) };
-    }
-
-    if (resolved?.conversation) {
-        return { kind: 'text', text: resolved.conversation };
-    }
-
-    if (resolved?.extendedTextMessage?.text) {
-        return { kind: 'text', text: resolved.extendedTextMessage.text };
-    }
-
-    if (resolved?.imageMessage) {
-        return {
-            kind: 'image',
-            text: resolved.imageMessage.caption || t('incoming.media.image'),
-            imageMessage: resolved.imageMessage
-        };
-    }
-
-    if (resolved?.videoMessage) {
-        return {
-            kind: 'text',
-            text: resolved.videoMessage.caption || t('incoming.media.video')
-        };
-    }
-
-    if (resolved?.audioMessage) {
-        return {
-            kind: 'audio',
-            text: t('incoming.media.audio'),
-            audioMessage: resolved.audioMessage
-        };
-    }
-
-    if (resolved?.documentMessage) {
-        return {
-            kind: 'document',
-            text: resolved.documentMessage.caption || t('incoming.media.document'),
-            documentMessage: resolved.documentMessage
-        };
-    }
-
-    if (resolved?.contactMessage || resolved?.contactsArrayMessage) {
-        return { kind: 'contact', text: t('incoming.media.contact') };
-    }
-
-    if (resolved?.locationMessage) {
-        return { kind: 'location', text: t('incoming.media.location') };
-    }
-
-    if (resolved?.buttonsResponseMessage?.selectedDisplayText) {
-        return { kind: 'text', text: resolved.buttonsResponseMessage.selectedDisplayText };
-    }
-
-    if (resolved?.listResponseMessage?.title) {
-        return { kind: 'text', text: resolved.listResponseMessage.title };
-    }
-
-    if (resolved?.templateButtonReplyMessage?.selectedDisplayText) {
-        return { kind: 'text', text: resolved.templateButtonReplyMessage.selectedDisplayText };
-    }
-
-    return { kind: 'unsupported', text: t('incoming.media.unsupported', { typeName }) };
-};
+import { t } from '../i18n.js';
+import { extractMessageContent } from 'baileys';
+
+export type IncomingResolution =
+    | { kind: 'text'; text: string }
+    | { kind: 'audio'; text: string; audioMessage: any }
+    | { kind: 'image'; text: string; imageMessage: any }
+    | { kind: 'document'; text: string; documentMessage: any }
+    | { kind: 'contact'; text: string }
+    | { kind: 'location'; text: string }
+    | { kind: 'system'; text: string }
+    | { kind: 'unsupported'; text: string };
+
+const protocolTypes: Record<number, keyof typeof protocolLabels> = {
+    0: 'messageDeleted',
+    3: 'disappearingMessagesUpdated',
+    4: 'disappearingMessageSyncResponse',
+    5: 'historySyncNotification',
+    6: 'appStateSyncKeyShare',
+    7: 'appStateSyncKeyRequest',
+    8: 'messageBackfillRequest',
+    9: 'securityNotificationSync',
+    10: 'fatalAppStateSyncNotification',
+    11: 'phoneNumberShared',
+    14: 'messageEdited',
+    16: 'peerDataRequest',
+    17: 'peerDataResponse',
+    18: 'welcomeMessageRequest',
+    19: 'botFeedback',
+    20: 'mediaNotification'
+};
+
+const protocolLabels = {
+    messageDeleted: t('incoming.protocol.messageDeleted'),
+    disappearingMessagesUpdated: t('incoming.protocol.disappearingMessagesUpdated'),
+    disappearingMessageSyncResponse: t('incoming.protocol.disappearingMessageSyncResponse'),
+    historySyncNotification: t('incoming.protocol.historySyncNotification'),
+    appStateSyncKeyShare: t('incoming.protocol.appStateSyncKeyShare'),
+    appStateSyncKeyRequest: t('incoming.protocol.appStateSyncKeyRequest'),
+    messageBackfillRequest: t('incoming.protocol.messageBackfillRequest'),
+    securityNotificationSync: t('incoming.protocol.securityNotificationSync'),
+    fatalAppStateSyncNotification: t('incoming.protocol.fatalAppStateSyncNotification'),
+    phoneNumberShared: t('incoming.protocol.phoneNumberShared'),
+    messageEdited: t('incoming.protocol.messageEdited'),
+    peerDataRequest: t('incoming.protocol.peerDataRequest'),
+    peerDataResponse: t('incoming.protocol.peerDataResponse'),
+    welcomeMessageRequest: t('incoming.protocol.welcomeMessageRequest'),
+    botFeedback: t('incoming.protocol.botFeedback'),
+    mediaNotification: t('incoming.protocol.mediaNotification')
+} as const;
+
+const unwrapMessageContent = (content: any): any => extractMessageContent(content) ?? content;
+
+const getTypeName = (payload: any): string => {
+    if (!payload || typeof payload !== 'object') return 'unknown';
+    return Object.keys(payload)[0] || 'unknown';
+};
+
+const formatProtocolMessage = (protocolMessage: any): string => {
+    const typeLabelKey = protocolTypes[Number(protocolMessage?.type)];
+    const typeLabel = typeLabelKey ? protocolLabels[typeLabelKey] : t('incoming.protocol.systemUpdate');
+    const editedText = protocolMessage?.editedMessage?.conversation
+        || protocolMessage?.editedMessage?.extendedTextMessage?.text;
+
+    if (editedText) {
+        return `[${typeLabel}: ${editedText}]`;
+    }
+
+    return `[${typeLabel}]`;
+};
+
+export const extractIncomingText = (message: any): IncomingResolution => {
+    const content = unwrapMessageContent(message);
+    const inner = content?.ephemeralMessage?.message
+        || content?.viewOnceMessage?.message
+        || content?.viewOnceMessageV2?.message
+        || content?.viewOnceMessageV2Extension?.message
+        || content?.message;
+
+    const resolved = inner ? unwrapMessageContent(inner) : content;
+    const typeName = getTypeName(resolved);
+    const protocolMessage = resolved?.protocolMessage
+        || (typeName === 'protocolMessage' ? resolved : undefined)
+        || content?.protocolMessage;
+
+    if (protocolMessage) {
+        return { kind: 'system', text: formatProtocolMessage(protocolMessage) };
+    }
+
+    if (resolved?.conversation) {
+        return { kind: 'text', text: resolved.conversation };
+    }
+
+    if (resolved?.extendedTextMessage?.text) {
+        return { kind: 'text', text: resolved.extendedTextMessage.text };
+    }
+
+    if (resolved?.imageMessage) {
+        return {
+            kind: 'image',
+            text: resolved.imageMessage.caption || t('incoming.media.image'),
+            imageMessage: resolved.imageMessage
+        };
+    }
+
+    if (resolved?.videoMessage) {
+        return {
+            kind: 'text',
+            text: resolved.videoMessage.caption || t('incoming.media.video')
+        };
+    }
+
+    if (resolved?.audioMessage) {
+        return {
+            kind: 'audio',
+            text: t('incoming.media.audio'),
+            audioMessage: resolved.audioMessage
+        };
+    }
+
+    if (resolved?.documentMessage) {
+        return {
+            kind: 'document',
+            text: resolved.documentMessage.caption || t('incoming.media.document'),
+            documentMessage: resolved.documentMessage
+        };
+    }
+
+    if (resolved?.contactMessage || resolved?.contactsArrayMessage) {
+        return { kind: 'contact', text: t('incoming.media.contact') };
+    }
+
+    if (resolved?.locationMessage) {
+        return { kind: 'location', text: t('incoming.media.location') };
+    }
+
+    if (resolved?.buttonsResponseMessage?.selectedDisplayText) {
+        return { kind: 'text', text: resolved.buttonsResponseMessage.selectedDisplayText };
+    }
+
+    if (resolved?.listResponseMessage?.title) {
+        return { kind: 'text', text: resolved.listResponseMessage.title };
+    }
+
+    if (resolved?.templateButtonReplyMessage?.selectedDisplayText) {
+        return { kind: 'text', text: resolved.templateButtonReplyMessage.selectedDisplayText };
+    }
+
+    return { kind: 'unsupported', text: t('incoming.media.unsupported', { typeName }) };
+};