From 95bb4abf53c9cb005ef45e3519a049a4f5425390 Mon Sep 17 00:00:00 2001
From: Leifer Mendez <leifer33@gmail.com>
Date: Thu, 27 Nov 2025 17:48:09 +0100
Subject: [PATCH] fix: improve remote JID handling in SherpaProvider to ensure
 correct formatting

---
 packages/provider-sherpa/src/sherpa.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/provider-sherpa/src/sherpa.ts b/packages/provider-sherpa/src/sherpa.ts
index 64c093c86..2c72ee0b8 100644
--- a/packages/provider-sherpa/src/sherpa.ts
+++ b/packages/provider-sherpa/src/sherpa.ts
@@ -534,11 +534,20 @@ class SherpaProvider extends ProviderClass<WASocket> {
                         }
                     }
 
+                    // Buscar siempre el que tenga formato @s.whatsapp.net (puede estar en remoteJid o remoteJidAlt)
+                    const remoteJid = (messageCtx?.key as any)?.remoteJid
+                    const remoteJidAlt = (messageCtx?.key as any)?.remoteJidAlt
+                    const fromParse = remoteJid?.includes('@s.whatsapp.net')
+                        ? remoteJid
+                        : remoteJidAlt?.includes('@s.whatsapp.net')
+                        ? remoteJidAlt
+                        : remoteJid || remoteJidAlt
+
                     let payload = {
                         ...messageCtx,
                         body: textToBody,
                         name: messageCtx?.pushName,
-                        from: messageCtx?.key?.remoteJid,
+                        from: baileyCleanNumber(fromParse),
                     }
 
                     if (messageCtx.message?.locationMessage) {