@chozzz/vargos 2.0.14 → 2.2.0

package/dist/services/channels/providers/whatsapp/adapter.js

@@ -3,29 +3,24 @@
  */
 import { readFileSync, existsSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
-import { BaseChannelAdapter } from '../../base-adapter.js';
+import { jidDecode, jidNormalizedUser, areJidsSameUser } from '@whiskeysockets/baileys';
+import { BaseChannelAdapter, MEDIA_TYPE_LABELS } from '../../base-adapter.js';
 import { createWhatsAppSocket } from './session.js';
 import { normalizeWhatsAppMessage } from './normalizer.js';
 import { getDataPaths } from '../../../../lib/paths.js';
 import { toMessage } from '../../../../lib/error.js';
 import { Reconnector } from '../../reconnect.js';
-import { MEDIA_TYPE_MIME_DEFAULTS } from '../../../../lib/media-transcribe.js';
-const MEDIA_TYPE_LABELS = {
-    audio: 'Voice message',
-    video: 'Video message',
-    document: 'Document',
-    sticker: 'Sticker',
-};
+import { MEDIA_TYPE_MIME_DEFAULTS } from '../../../../lib/mime.js';
 export class WhatsAppAdapter extends BaseChannelAdapter {
     type = 'whatsapp';
     sock = null;
     botJid = '';
+    botLid = null; // learned from proper mentions
     reconnector = new Reconnector();
     reconnectTimer = null;
     authDir = '';
-    lidCache = new Map();
-    constructor(instanceId, deps) {
-        super(instanceId, 'whatsapp', deps);
+    constructor(instanceId, deps, allowFrom) {
+        super(instanceId, 'whatsapp', deps, allowFrom);
     }
     async start() {
         if (this.sock) {
@@ -103,15 +98,16 @@ export class WhatsAppAdapter extends BaseChannelAdapter {
     async send(sessionKey, text) {
         if (!this.sock)
             throw new Error('WhatsApp not connected');
-        const userId = this.extractUserId(sessionKey);
-        await this.sock.sendMessage(this.toJid(userId), { text });
+        const targetJid = this.toJid(this.extractUserId(sessionKey));
+        this.log.info(`send: sessionKey=${sessionKey} targetJid=${targetJid} text=${text.slice(0, 80)}`);
+        await this.sock.sendMessage(targetJid, { text });
+        this.log.info(`send: delivered to ${targetJid}`);
     }
     async sendMedia(sessionKey, filePath, mimeType, caption) {
         if (!this.sock)
             throw new Error('WhatsApp not connected');
-        const userId = this.extractUserId(sessionKey);
+        const jid = this.toJid(this.extractUserId(sessionKey));
         const buffer = readFileSync(filePath);
-        const jid = this.toJid(userId);
         const fileName = path.basename(filePath);
         const [mediaType] = mimeType.split('/');
         if (mediaType === 'image') {
@@ -129,52 +125,46 @@ export class WhatsAppAdapter extends BaseChannelAdapter {
         this.log.info(`sendMedia: ${sessionKey} ${mimeType} ${fileName}`);
     }
     async sendTypingIndicator(sessionKey) {
-        const userId = this.extractUserId(sessionKey);
-        await this.sock?.sendPresenceUpdate('composing', this.toJid(userId));
+        await this.sock?.sendPresenceUpdate('composing', this.toJid(this.extractUserId(sessionKey)));
     }
     async react(sessionKey, messageId, emoji) {
-        const userId = this.extractUserId(sessionKey);
-        const jid = this.toJid(userId);
+        const jid = this.toJid(this.extractUserId(sessionKey));
+        this.log.info(`react: sessionKey=${sessionKey} jid=${jid} messageId=${messageId} emoji=${emoji}`);
         await this.sock?.sendMessage(jid, {
             react: { text: emoji, key: { remoteJid: jid, id: messageId } },
         });
     }
     toJid(id) {
-        if (id.includes('@'))
-            return id;
-        return `${id.replace(/^\+/, '')}@s.whatsapp.net`;
-    }
-    resolvePhone(jid) {
-        if (jid.endsWith('@s.whatsapp.net'))
-            return jid.replace('@s.whatsapp.net', '');
-        if (jid.endsWith('@lid')) {
-            const lid = jid.replace('@lid', '');
-            return this.lidToPhone(lid);
-        }
-        return jid;
-    }
-    lidToPhone(lid) {
-        const cached = this.lidCache.get(lid);
-        if (cached)
-            return cached;
-        try {
-            const file = path.join(this.authDir, `lid-mapping-${lid}_reverse.json`);
-            const phone = JSON.parse(readFileSync(file, 'utf-8'));
-            this.lidCache.set(lid, phone);
-            return phone;
-        }
-        catch {
-            return lid;
+        // If already a full JID with domain, normalize and return
+        if (id.includes('@')) {
+            const decoded = jidDecode(id);
+            if (decoded)
+                return jidNormalizedUser(id);
         }
+        // Plain phone number — append canonical domain
+        return `${id.replace(/^\+/, '')}@s.whatsapp.net`;
     }
     handleInbound(msg) {
         if (msg.fromMe)
             return;
         if (!this.dedupe.add(msg.messageId))
             return;
-        const chatId = msg.isGroup ? msg.jid : msg.jid;
+        // Learn bot's LID from proper mentions (mentionedJids populated by WhatsApp).
+        // When user mentions bot via the menu, WhatsApp includes the bot's LID in mentionedJids.
+        // We cache it so text fallback (@number typing) can match it later.
+        if (msg.mentionedJids) {
+            for (const jid of msg.mentionedJids) {
+                if (areJidsSameUser(jid, this.botJid) && jid !== this.botJid) {
+                    this.botLid = jid;
+                    this.log.debug(`learned bot LID: ${jid} (from ${this.botJid})`);
+                    break;
+                }
+            }
+        }
+        const chatId = msg.sessionJid; // group JID for groups, user JID for private
         const normalizedMsg = normalizeWhatsAppMessage(msg, {
             botJid: this.botJid,
+            botLid: this.botLid,
             botName: this.sock?.user?.name,
         });
         if (!normalizedMsg) {
@@ -193,22 +183,16 @@ export class WhatsAppAdapter extends BaseChannelAdapter {
         this.latestMessageId.set(chatId, msg.messageId);
         this.debouncer.push(chatId, msg.text, normalizedMsg);
     }
-    isMentioned(msg) {
-        if (!msg.isGroup || !this.botJid)
-            return false;
-        return msg.mentionedJids?.includes(this.botJid) || msg.quotedSenderJid === this.botJid;
-    }
     async resolveMedia(msg) {
-        const m = msg;
-        if (!m.mediaBuffer)
+        if (!msg.mediaBuffer)
             return null;
-        const rawMime = m.mimeType?.split(';')[0].trim();
-        const mimeType = rawMime || MEDIA_TYPE_MIME_DEFAULTS[m.mediaType] || 'application/octet-stream';
+        const rawMime = msg.mimeType?.split(';')[0].trim();
+        const mimeType = rawMime || MEDIA_TYPE_MIME_DEFAULTS[msg.mediaType] || 'application/octet-stream';
         return {
-            buffer: m.mediaBuffer,
+            buffer: msg.mediaBuffer,
             mimeType,
-            mediaType: m.mediaType ?? 'document',
-            caption: m.caption,
+            mediaType: msg.mediaType === 'sticker' ? 'image' : (msg.mediaType ?? 'document'),
+            caption: msg.caption,
         };
     }
     async handleMedia(msg, normalizedMsg) {
@@ -216,7 +200,7 @@ export class WhatsAppAdapter extends BaseChannelAdapter {
             this.log.error('No inbound message handler');
             return;
         }
-        const userId = msg.jid.replace(/@[^@]+$/, '');
+        const userId = msg.jid;
         const sessionKey = this.buildSessionKey(userId);
         if (!msg.mediaBuffer) {
             const label = MEDIA_TYPE_LABELS[msg.mediaType] || 'Media';
@@ -225,7 +209,7 @@ export class WhatsAppAdapter extends BaseChannelAdapter {
             await this.onInboundMessage(sessionKey, messageWithText);
             return;
         }
-        const { caption, savedPath, mimeType } = await this.processInboundMedia(msg, sessionKey, normalizedMsg, (text) => this.onInboundMessage(sessionKey, { ...normalizedMsg, text }));
+        const { caption, savedPath, mimeType } = await this.processInboundMedia(msg, (text) => this.onInboundMessage(sessionKey, { ...normalizedMsg, text }), sessionKey, normalizedMsg.chatType !== 'group');
         this.log.debug(`received ${msg.mediaType} from ${userId}: ${caption} (${mimeType}) - ${savedPath}`);
     }
     /**

package/dist/services/channels/providers/whatsapp/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAGxF,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,MAAM,OAAO,eAAgB,SAAQ,kBAA0C;IACpE,IAAI,GAAG,UAAmB,CAAC;IAE5B,IAAI,GAAoB,IAAI,CAAC;IAC7B,MAAM,GAAG,EAAE,CAAC;IACZ,MAAM,GAAkB,IAAI,CAAC,CAAC,+BAA+B;IAC7D,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IAChC,cAAc,GAAyC,IAAI,CAAC;IAC5D,OAAO,GAAG,EAAE,CAAC;IAErB,YACE,UAAkB,EAClB,IAAiB,EACjB,SAAoB;QAEpB,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC;gBAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;YAChE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,0BAA0B,IAAI,CAAC,OAAO,6CAA6C,IAAI,CAAC,UAAU,WAAW,CAC9G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE;gBACnD,IAAI,EAAE,GAAG,EAAE;oBACT,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;gBACzE,CAAC;gBACD,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;oBACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC;oBACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;oBACvC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;oBAC1B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;gBAC3B,CAAC;gBACD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE;oBACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,MAAM,EAAE,CAAC,CAAC;oBACzC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;oBAEjB,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;wBAC5B,oEAAoE;wBACpE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;wBACjF,IAAI,CAAC;4BACH,IAAI,CAAC,4BAA4B,EAAE,CAAC;wBACtC,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;4BACzE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;4BACtB,OAAO;wBACT,CAAC;wBACD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;wBAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;wBACzB,OAAO;oBACT,CAAC;oBAED,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;wBAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;wBACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;wBAC1F,OAAO;oBACT,CAAC;oBAED,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;oBAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,CAAC;gBACD,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,UAAkB,EAAE,IAAY;QACzC,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,UAAU,cAAc,SAAS,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;QACjG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,SAAS,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,QAAgB,EAAE,QAAgB,EAAE,OAAgB;QACtF,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAExC,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC;aAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC;aAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,UAAU,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC;IACpE,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,UAAkB;QACpD,MAAM,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,UAAkB,EAAE,SAAiB,EAAE,KAAa;QAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,UAAU,QAAQ,GAAG,cAAc,SAAS,UAAU,KAAK,EAAE,CAAC,CAAC;QAClG,MAAM,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,EAAE;YAChC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;SAC/D,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,EAAU;QACtB,0DAA0D;QAC1D,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,OAAO;gBAAE,OAAO,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,+CAA+C;QAC/C,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC;IACnD,CAAC;IAEO,aAAa,CAAC,GAA2B;QAC/C,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO;QAEvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO;QAE5C,8EAA8E;QAC9E,yFAAyF;QACzF,oEAAoE;QACpE,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YACtB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACpC,IAAI,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;oBAC7D,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;oBAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,UAAU,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;oBAChE,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,6CAA6C;QAC5E,MAAM,aAAa,GAAG,wBAAwB,CAAC,GAAG,EAAE;YAClD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAC;YACvE,OAAO;QACT,CAAC;QAED,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,SAAS,SAAS,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;YAC7E,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChG,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,aAAa,CAAC,UAAU,KAAK,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACvD,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,GAA2B;QACtD,IAAI,CAAC,GAAG,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC;QAElC,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,IAAI,wBAAwB,CAAC,GAAG,CAAC,SAAU,CAAC,IAAI,0BAA0B,CAAC;QACnG,OAAO;YACL,MAAM,EAAE,GAAG,CAAC,WAAW;YACvB,QAAQ;YACR,SAAS,EAAE,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,IAAI,UAAU,CAAC;YAChF,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,GAA2B,EAAE,aAAuC;QAC5F,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAEhD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAU,CAAC,IAAI,OAAO,CAAC;YAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC;YAElF,MAAM,eAAe,GAA6B,EAAE,GAAG,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;YACtF,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACrE,GAAG,EACH,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAiB,CAAC,UAAU,EAAE,EAAE,GAAG,aAAa,EAAE,IAAI,EAAE,CAAC,EACxE,UAAU,EACV,aAAa,CAAC,QAAQ,KAAK,OAAO,CACnC,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,SAAS,SAAS,MAAM,KAAK,OAAO,KAAK,QAAQ,OAAO,SAAS,EAAE,CAAC,CAAC;IACtG,CAAC;IAED;;;OAGG;IACK,4BAA4B;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAA4B,CAAC;QAEtF,6DAA6D;QAC7D,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC;QACzB,uDAAuD;QACvD,KAAK,CAAC,EAAE,GAAG,SAAS,CAAC;QAErB,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC7E,CAAC;IAEO,iBAAiB;QACvB,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;YACtB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,KAAK,eAAe,IAAI,CAAC,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC;QACpF,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YAC1C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;CACF"}

package/dist/services/channels/providers/whatsapp/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * WhatsApp provider — loads and manages WhatsApp channel adapters.
  */
-import type { ChannelAdapter, AdapterDeps } from '../../contracts.js';
+import type { ChannelAdapter, AdapterDeps } from '../../types.js';
 import type { WhatsAppChannel } from '../../../config/schemas/channels.js';
 declare const _default: {
     type: "whatsapp";

package/dist/services/channels/providers/whatsapp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAmB,cAAc,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;;;8BAKzC,MAAM,UAAU,eAAe,QAAQ,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;;AAF9G,wBAK6C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAmB,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;;;8BAKzC,MAAM,UAAU,eAAe,QAAQ,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;;AAF9G,wBAK6C"}

package/dist/services/channels/providers/whatsapp/index.js

@@ -5,7 +5,7 @@ import { WhatsAppAdapter } from './adapter.js';
 export default {
     type: 'whatsapp',
     async createAdapter(instanceId, config, deps) {
-        return new WhatsAppAdapter(instanceId, deps);
+        return new WhatsAppAdapter(instanceId, deps, config.allowFrom);
     },
 };
 //# sourceMappingURL=index.js.map

package/dist/services/channels/providers/whatsapp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAe;IACb,IAAI,EAAE,UAAU;IAChB,KAAK,CAAC,aAAa,CAAC,UAAkB,EAAE,MAAuB,EAAE,IAAiB;QAChF,OAAO,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;CACyC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAe;IACb,IAAI,EAAE,UAAU;IAChB,KAAK,CAAC,aAAa,CAAC,UAAkB,EAAE,MAAuB,EAAE,IAAiB;QAChF,OAAO,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;CACyC,CAAC"}

package/dist/services/channels/providers/whatsapp/normalizer.d.ts

@@ -1,10 +1,11 @@
 /**
  * WhatsApp message normalizer — converts WhatsApp adapter output to canonical form.
  */
-import type { NormalizedInboundMessage } from '../../contracts.js';
+import type { NormalizedInboundMessage } from '../../types.js';
 import type { WhatsAppInboundMessage } from './types.js';
 export interface WhatsAppNormalizerContext {
     botJid: string;
+    botLid?: string | null;
     botName?: string;
 }
 export declare function normalizeWhatsAppMessage(msg: WhatsAppInboundMessage, context: WhatsAppNormalizerContext): NormalizedInboundMessage | null;

package/dist/services/channels/providers/whatsapp/normalizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizer.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/normalizer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,yBAAyB,GACjC,wBAAwB,GAAG,IAAI,CA0BjC"}
+{"version":3,"file":"normalizer.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/normalizer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,yBAAyB,GACjC,wBAAwB,GAAG,IAAI,CAyBjC"}

package/dist/services/channels/providers/whatsapp/normalizer.js

@@ -1,6 +1,7 @@
 /**
  * WhatsApp message normalizer — converts WhatsApp adapter output to canonical form.
  */
+import { jidDecode, areJidsSameUser } from '@whiskeysockets/baileys';
 export function normalizeWhatsAppMessage(msg, context) {
     // Ignore bot's own messages
     if (msg.fromMe) {
@@ -10,7 +11,7 @@ export function normalizeWhatsAppMessage(msg, context) {
         return null;
     }
     const chatType = msg.isGroup ? 'group' : 'private';
-    const isMentioned = msg.isGroup ? isMentionedInGroup(msg, context.botJid) : true;
+    const isMentioned = msg.isGroup ? isMentionedInGroup(msg, context.botJid, context.botLid) : true;
     return {
         messageId: msg.messageId,
         fromUserId: msg.jid, // Store JID for whitelist checking
@@ -20,28 +21,32 @@ export function normalizeWhatsAppMessage(msg, context) {
         channelType: 'whatsapp',
         botUserId: context.botJid || undefined,
         botName: context.botName,
-        skipAgent: msg.isGroup && !isMentioned ? true : false,
         text: msg.text,
         media: undefined, // Media handling done separately
     };
 }
-function isMentionedInGroup(msg, botJid) {
-    // Check if bot was explicitly mentioned
-    if (msg.mentionedJids?.includes(botJid)) {
+function isMentionedInGroup(msg, botJid, _botLid) {
+    // Check if bot was explicitly mentioned via areJidsSameUser
+    // (handles @lid vs @s.whatsapp.net format differences)
+    if (msg.mentionedJids?.some(jid => areJidsSameUser(jid, botJid))) {
         return true;
     }
     // Check if it's a reply to bot's message
-    if (msg.quotedSenderJid === botJid) {
+    if (msg.quotedSenderJid && areJidsSameUser(msg.quotedSenderJid, botJid)) {
+        return true;
+    }
+    // Fallback: check for @number patterns in text.
+    // When user types @Name in WhatsApp, the raw text contains @<number> (PN or LID).
+    // mentionedJids is only populated when using the proper mention menu.
+    // So we detect @number in text and treat it as a mention for whitelisted users.
+    if (msg.text && /@\d{5,}/.test(msg.text)) {
         return true;
     }
     return false;
 }
 function resolvePhoneFromJid(jid) {
-    // Extract phone number from JID
-    // Format: "614123456789@s.whatsapp.net" or "123456789@lid"
-    if (jid.includes('@')) {
-        return jid.split('@')[0];
-    }
-    return jid;
+    // Use Baileys' jidDecode to extract user portion (handles @s.whatsapp.net, @lid, device suffixes, etc.)
+    const decoded = jidDecode(jid);
+    return decoded?.user || jid;
 }
 //# sourceMappingURL=normalizer.js.map

package/dist/services/channels/providers/whatsapp/normalizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalizer.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/normalizer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,MAAM,UAAU,wBAAwB,CACtC,GAA2B,EAC3B,OAAkC;IAElC,4BAA4B;IAC5B,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACnD,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEjF,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,UAAU,EAAE,GAAG,CAAC,GAAG,EAAE,mCAAmC;QACxD,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC;QACtD,QAAQ;QACR,WAAW;QACX,WAAW,EAAE,UAAU;QACvB,SAAS,EAAE,OAAO,CAAC,MAAM,IAAI,SAAS;QACtC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,GAAG,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACrD,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,KAAK,EAAE,SAAS,EAAE,iCAAiC;KACpD,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,GAA2B,EAAE,MAAc;IACrE,wCAAwC;IACxC,IAAI,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yCAAyC;IACzC,IAAI,GAAG,CAAC,eAAe,KAAK,MAAM,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,gCAAgC;IAChC,2DAA2D;IAC3D,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"normalizer.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/normalizer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAUrE,MAAM,UAAU,wBAAwB,CACtC,GAA2B,EAC3B,OAAkC;IAElC,4BAA4B;IAC5B,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACnD,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEjG,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,UAAU,EAAE,GAAG,CAAC,GAAG,EAAE,mCAAmC;QACxD,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC;QACtD,QAAQ;QACR,WAAW;QACX,WAAW,EAAE,UAAU;QACvB,SAAS,EAAE,OAAO,CAAC,MAAM,IAAI,SAAS;QACtC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,KAAK,EAAE,SAAS,EAAE,iCAAiC;KACpD,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,GAA2B,EAAE,MAAc,EAAE,OAAuB;IAC9F,4DAA4D;IAC5D,uDAAuD;IACvD,IAAI,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yCAAyC;IACzC,IAAI,GAAG,CAAC,eAAe,IAAI,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gDAAgD;IAChD,kFAAkF;IAClF,sEAAsE;IACtE,gFAAgF;IAChF,IAAI,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,wGAAwG;IACxG,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;AAC9B,CAAC"}

package/dist/services/channels/providers/whatsapp/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/session.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAqB,EAMnB,KAAK,QAAQ,EAEb,KAAK,SAAS,EACf,MAAM,yBAAyB,CAAC;AAKjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAOxD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,QAAQ,CAAC,CA6DnB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAqDf"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/session.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAqB,EAOnB,KAAK,QAAQ,EAEb,KAAK,SAAS,EACf,MAAM,yBAAyB,CAAC;AAKjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAOxD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,QAAQ,CAAC,CA6DnB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA+Df"}

package/dist/services/channels/providers/whatsapp/session.js

@@ -2,7 +2,7 @@
  * WhatsApp socket creation via Baileys
  * Handles QR code auth and multi-file auth state persistence
  */
-import makeWASocket, { useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, makeCacheableSignalKeyStore, downloadMediaMessage, } from '@whiskeysockets/baileys';
+import makeWASocket, { useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, makeCacheableSignalKeyStore, downloadMediaMessage, jidNormalizedUser, } from '@whiskeysockets/baileys';
 import qrcode from 'qrcode-terminal';
 import pino from 'pino';
 import { promises as fs } from 'node:fs';
@@ -68,16 +68,24 @@ export async function createWhatsAppSocket(authDir, events) {
 }
 export async function processInboundMessage(msg, events) {
     const m = msg.message;
-    const remoteJid = msg.key.remoteJid || '';
+    // Baileys normalizes JID structure in cleanMessage() (strips device/agent suffixes,
+    // converts @c.us→@s.whatsapp.net) but does NOT resolve LID→PN. We apply
+    // jidNormalizedUser here as a defense-in-depth to ensure consistent JID format.
+    const remoteJid = jidNormalizedUser(msg.key.remoteJid || '');
     const isGroup = remoteJid.endsWith('@g.us');
-    // For groups, use sender's JID; for private, use remote JID
-    // This ensures whitelist checks work per-user and sessions stay per-user
-    const jid = isGroup ? (msg.key.participant || remoteJid) : remoteJid;
-    const mentionedJids = (m.extendedTextMessage?.contextInfo?.mentionedJid ?? []);
-    const quotedSenderJid = m.extendedTextMessage?.contextInfo?.participant;
+    // Session key uses remoteJid (group JID for groups, user JID for private).
+    // This ensures replies and reactions route to the correct destination.
+    // Whitelist checks use participant (sender) separately.
+    const jid = jidNormalizedUser(isGroup ? (msg.key.participant || remoteJid) : remoteJid);
+    const sessionJid = remoteJid; // always the chat/group for session key routing
+    const mentionedJids = (m.extendedTextMessage?.contextInfo?.mentionedJid ?? []).map((j) => jidNormalizedUser(j));
+    const quotedSenderJid = m.extendedTextMessage?.contextInfo?.participant
+        ? jidNormalizedUser(m.extendedTextMessage.contextInfo.participant)
+        : undefined;
     const base = {
         messageId: msg.key.id || '',
         jid,
+        sessionJid, // group JID for groups, user JID for private — used for session key + routing
         fromMe: msg.key.fromMe || false,
         isGroup,
         timestamp: typeof msg.messageTimestamp === 'number'

package/dist/services/channels/providers/whatsapp/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/session.ts"],"names":[],"mappings":"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"}

package/dist/services/channels/providers/whatsapp/types.d.ts

@@ -2,6 +2,7 @@
 export interface WhatsAppInboundMessage {
     messageId: string;
     jid: string;
+    sessionJid: string;
     text: string;
     fromMe: boolean;
     isGroup: boolean;

package/dist/services/channels/providers/whatsapp/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/types.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3B,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,SAAS,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,CAAC;CAClD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../services/channels/providers/whatsapp/types.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3B,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,SAAS,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,CAAC;CAClD"}

package/dist/services/channels/types.d.ts

@@ -1,5 +1,9 @@
-import type { OnInboundMessageFn, NormalizedInboundMessage } from './contracts.js';
-/** Channel adapter interface and types */
+/**
+ * Channel types and adapter contracts — the boundary between core policy and
+ * provider implementations. Core calls ChannelAdapter; adapters call onInbound.
+ */
+import type { ChannelStatus } from '../../gateway/events.js';
+import type { ChannelEntry } from '../config/schemas/channels.js';
 export type ChannelType = 'whatsapp' | 'telegram' | (string & {});
 export interface InboundMediaSource {
     buffer: Buffer;
@@ -12,5 +16,66 @@ export interface ExtractedMedia {
     filePath: string;
     mimeType: string;
 }
-export type { OnInboundMessageFn, NormalizedInboundMessage };
+/**
+ * Required interface all channel adapters must implement.
+ * Core calls these methods; adapters call onInboundMessage callback.
+ */
+export interface ChannelAdapter {
+    readonly instanceId: string;
+    readonly type: ChannelType;
+    readonly status: ChannelStatus;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    send(sessionKey: string, text: string): Promise<void>;
+    startTyping(sessionKey: string, withToolFlag: boolean): void;
+    stopTyping(sessionKey: string, final?: boolean): void;
+    resumeTyping(sessionKey: string): void;
+    extractLatestMessageId(userId: string): string | null | undefined;
+    shouldExecute(userId: string, chatType: string, isMentioned: boolean): boolean;
+    sendMedia?: (sessionKey: string, filePath: string, mimeType: string, caption?: string) => Promise<void>;
+    react?: (sessionKey: string, messageId: string, emoji: string) => Promise<void>;
+}
+/**
+ * Adapter dependencies — passed during construction.
+ * Unifies callback injection into a single parameter.
+ */
+export interface AdapterDeps {
+    onInbound: OnInboundMessageFn;
+    transcribe?: (filePath: string) => Promise<string>;
+    describe?: (filePath: string) => Promise<string>;
+    extract?: (filePath: string, mimeType: string) => Promise<{
+        text: string;
+    }>;
+}
+/**
+ * Provider pattern: factory for creating channel adapters.
+ * Generic over the channel entry type for type-safe config passing.
+ */
+export interface ChannelProvider<TEntry extends ChannelEntry = ChannelEntry> {
+    readonly type: TEntry['type'];
+    createAdapter(instanceId: string, config: TEntry, deps: AdapterDeps): Promise<ChannelAdapter>;
+}
+/**
+ * Canonical inbound message shape after normalization.
+ * All adapters emit this (via normalizers), core policy handles this.
+ */
+export interface NormalizedInboundMessage {
+    messageId: string;
+    fromUserId: string;
+    fromUser: string;
+    fromUserHandle?: string;
+    chatType: 'private' | 'group';
+    isMentioned: boolean;
+    channelType: string;
+    botUserId?: string;
+    botName?: string;
+    botHandle?: string;
+    text?: string;
+    media?: InboundMediaSource;
+}
+/**
+ * Callback signature for inbound messages.
+ * Adapters call this when a message arrives.
+ */
+export type OnInboundMessageFn = (sessionKey: string, normalizedMessage: NormalizedInboundMessage) => Promise<void>;
 //# sourceMappingURL=types.d.ts.map

package/dist/services/channels/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../services/channels/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,0CAA0C;AAE1C,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElE,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,CAAC;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAGD,YAAY,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../services/channels/types.ts"],"names":[],"mappings":"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"}

package/dist/services/channels/types.js

@@ -1,2 +1,6 @@
+/**
+ * Channel types and adapter contracts — the boundary between core policy and
+ * provider implementations. Core calls ChannelAdapter; adapters call onInbound.
+ */
 export {};
 //# sourceMappingURL=types.js.map

package/dist/services/channels/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../services/channels/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../services/channels/types.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/services/config/index.d.ts

@@ -552,8 +552,8 @@ export declare const AppConfigSchema: z.ZodObject<{
         type: z.ZodDefault<z.ZodEnum<["api_key"]>>;
         key: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        key: string;
         type: "api_key";
+        key: string;
     }, {
         key: string;
         type?: "api_key" | undefined;
@@ -1352,8 +1352,8 @@ export declare const AppConfigSchema: z.ZodObject<{
         type: z.ZodDefault<z.ZodEnum<["api_key"]>>;
         key: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        key: string;
         type: "api_key";
+        key: string;
     }, {
         key: string;
         type?: "api_key" | undefined;
@@ -2152,8 +2152,8 @@ export declare const AppConfigSchema: z.ZodObject<{
         type: z.ZodDefault<z.ZodEnum<["api_key"]>>;
         key: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        key: string;
         type: "api_key";
+        key: string;
     }, {
         key: string;
         type?: "api_key" | undefined;

package/dist/services/config/schemas/auth.d.ts

@@ -8,8 +8,8 @@ export declare const AuthEntrySchema: z.ZodObject<{
     type: z.ZodDefault<z.ZodEnum<["api_key"]>>;
     key: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    key: string;
     type: "api_key";
+    key: string;
 }, {
     key: string;
     type?: "api_key" | undefined;
@@ -34,8 +34,8 @@ export declare const AuthSchema: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUni
     type: z.ZodDefault<z.ZodEnum<["api_key"]>>;
     key: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    key: string;
     type: "api_key";
+    key: string;
 }, {
     key: string;
     type?: "api_key" | undefined;

package/dist/services/config/schemas/channels.d.ts

@@ -114,4 +114,6 @@ export declare const ChannelEntrySchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
 export type ChannelEntry = z.infer<typeof ChannelEntrySchema>;
 export type TelegramChannel = z.infer<typeof TelegramChannelSchema>;
 export type WhatsAppChannel = z.infer<typeof WhatsAppChannelSchema>;
+/** Built-in channel type names — single source of truth, derived from the union above. */
+export declare const CHANNEL_TYPES: [ChannelEntry["type"], ...ChannelEntry["type"][]];
 //# sourceMappingURL=channels.d.ts.map

package/dist/services/config/schemas/channels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../../../../services/config/schemas/channels.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGhC,CAAC;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;EAA6D,CAAC;AAEhG,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAK,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAChE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../../../../services/config/schemas/channels.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGhC,CAAC;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;EAA6D,CAAC;AAEhG,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAK,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAChE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,0FAA0F;AAC1F,eAAO,MAAM,aAAa,EAA8D,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC"}

package/dist/services/config/schemas/channels.js

@@ -19,4 +19,6 @@ export const ChannelEntrySchema = z.discriminatedUnion('type', [
     TelegramChannelSchema,
     WhatsAppChannelSchema,
 ]);
+/** Built-in channel type names — single source of truth, derived from the union above. */
+export const CHANNEL_TYPES = ChannelEntrySchema.options.map(o => o.shape.type.value);
 //# sourceMappingURL=channels.js.map