natureco-cli 1.0.43 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "NatureCo AI Bot Terminal Interface",
   "main": "bin/natureco.js",
   "bin": {

package/src/commands/gateway-server.js

@@ -194,6 +194,9 @@ async function startWhatsAppProvider(sessionDir, config) {
     const { state, saveCreds } = await useMultiFileAuthState(sessionDir);
     const { version } = await fetchLatestBaileysVersion();
     
+    // Track last bot reply to prevent infinite loop
+    let lastBotReply = '';
+    
     const sock = makeWASocket({
       version,
       auth: state,
@@ -237,18 +240,10 @@ async function startWhatsAppProvider(sessionDir, config) {
         // Log raw message info
         log('whatsapp', `Raw message - fromMe: ${msg.key.fromMe}, remoteJid: ${msg.key.remoteJid}`, 'gray');
         
-        const sender = msg.key.remoteJid?.split('@')[0].split(':')[0];
-        const allowedNumbers = config.whatsappAllowedNumbers || [];
-        
-        // Log incoming number before access control
-        log('whatsapp', `Incoming from: +${sender}, allowed: ${JSON.stringify(allowedNumbers)}`, 'gray');
-        
-        // Access control - compare last 10 digits
-        if (allowedNumbers.length > 0 && !allowedNumbers.some(n => numberMatches(n, sender))) {
-          log('whatsapp', `blocked message from +${sender} (not in allowed list)`, 'yellow');
-          continue;
-        }
+        const remoteJid = msg.key.remoteJid || '';
+        const isLID = remoteJid.includes('@lid');
         
+        // Skip bot's own replies (fromMe=true and not LID, or matches last bot reply)
         const messageText = msg.message?.conversation || 
                            msg.message?.extendedTextMessage?.text || 
                            msg.message?.imageMessage?.caption ||
@@ -259,6 +254,36 @@ async function startWhatsAppProvider(sessionDir, config) {
                            msg.message?.viewOnceMessage?.message?.conversation ||
                            '';
         
+        // Skip if this is the bot's own reply
+        if (msg.key.fromMe && !isLID) {
+          log('whatsapp', 'Skipping bot own reply (fromMe=true, not LID)', 'gray');
+          continue;
+        }
+        
+        // Skip if message matches last bot reply (prevent loop)
+        if (messageText === lastBotReply && lastBotReply !== '') {
+          log('whatsapp', 'Skipping duplicate bot reply (matches last sent)', 'gray');
+          continue;
+        }
+        
+        // Handle LID format (new WhatsApp format)
+        if (isLID && !msg.key.fromMe) {
+          log('whatsapp', 'LID format detected, fromMe=false, blocked', 'yellow');
+          continue;
+        }
+        
+        const sender = remoteJid.split('@')[0].split(':')[0];
+        const allowedNumbers = config.whatsappAllowedNumbers || [];
+        
+        // Log incoming number
+        log('whatsapp', `Incoming from: +${sender}, allowed: ${JSON.stringify(allowedNumbers)}`, 'gray');
+        
+        // Access control - skip if fromMe + LID (own conversation)
+        if (!(msg.key.fromMe && isLID) && allowedNumbers.length > 0 && !allowedNumbers.some(n => numberMatches(n, sender))) {
+          log('whatsapp', `blocked message from +${sender} (not in allowed list)`, 'yellow');
+          continue;
+        }
+        
         if (!messageText) {
           log('whatsapp', `Message without text content. Keys: ${Object.keys(msg.message || {}).join(', ')}`, 'gray');
           continue;
@@ -266,7 +291,6 @@ async function startWhatsAppProvider(sessionDir, config) {
         
         const ownNumber = sock.user?.id?.split(':')[0].replace('@s.whatsapp.net', '') || 'unknown';
         log('whatsapp', `Inbound message +${sender} -> +${ownNumber} (${messageText.length} chars)`, 'cyan');
-        log('whatsapp', `Message: "${messageText.substring(0, 100)}${messageText.length > 100 ? '...' : ''}"`, 'gray');
         
         try {
           const { sendMessage } = require('../utils/api');
@@ -276,10 +300,13 @@ async function startWhatsAppProvider(sessionDir, config) {
           const reply = response?.reply || response?.message || '';
           
           if (reply) {
-            log('whatsapp', `API response: "${reply.substring(0, 100)}${reply.length > 100 ? '...' : ''}"`, 'gray');
             log('whatsapp', 'Sending reply...', 'cyan');
             
             await sock.sendMessage(msg.key.remoteJid, { text: reply });
+            
+            // Store last bot reply to prevent loop
+            lastBotReply = reply;
+            
             log('whatsapp', `Reply sent (${reply.length} chars)`, 'green');
           } else {
             log('whatsapp', 'No reply from API', 'yellow');