fix: add biz node injection and quality_control for carousel WhatsApp Web rendering

- Add interactive message detection helpers (getButtonType, isCarouselMessage, etc.)
- Inject biz node with interactive/native_flow for non-carousel interactive messages
- Inject biz + quality_control with decision_id for carousel messages
- Skip bot node for native_flow/carousel/catalog (breaks Web rendering)
- Force device-identity inclusion for carousel messages
- Append deferred biz/bot/quality_control nodes after device-identity and tctoken
- Store tctoken under both LID and PN for reliable lookup

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

WAProto/WAProto.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package proto;
 
-/// WhatsApp Version: 2.3000.1035484955
+/// WhatsApp Version: 2.3000.1035216863
 
 message ADVDeviceIdentity {
     optional uint32 rawId = 1;
@@ -417,7 +417,6 @@ message BotCapabilityMetadata {
         JSON_PATCH_STREAMING = 58;
         AI_TAB_FORCE_CLIPPY = 59;
         UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60;
-        AI_SUBSCRIPTION_ENABLED = 61;
     }
 }
 
@@ -1934,20 +1933,8 @@ message HandshakeMessage {
         optional bytes paddedBytes = 6;
         optional bool sendServerHelloPaddedBytes = 7;
         optional bool simulateXxkemFs = 8;
-        optional HandshakeMessage.HandshakePqMode pqMode = 9;
     }
     
-    enum HandshakePqMode {
-        HANDSHAKE_PQ_MODE_UNKNOWN = 0;
-        XXKEM = 1;
-        XXKEM_FS = 2;
-        WA_CLASSICAL = 3;
-        WA_PQ = 4;
-        IKKEM = 5;
-        IKKEM_FS = 6;
-        XXKEM_2 = 7;
-        IKKEM_2 = 8;
-    }
     message ServerHello {
         optional bytes ephemeral = 1;
         optional bytes static = 2;

WAProto/index.d.ts

@@ -1092,8 +1092,7 @@ export namespace proto {
             RICH_RESPONSE_UR_IMAGINE_VIDEO = 57,
             JSON_PATCH_STREAMING = 58,
             AI_TAB_FORCE_CLIPPY = 59,
-            UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60,
-            AI_SUBSCRIPTION_ENABLED = 61
+            UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60
         }
     }
 
@@ -4760,7 +4759,6 @@ export namespace proto {
             paddedBytes?: (Uint8Array|null);
             sendServerHelloPaddedBytes?: (boolean|null);
             simulateXxkemFs?: (boolean|null);
-            pqMode?: (proto.HandshakeMessage.HandshakePqMode|null);
         }
 
         class ClientHello implements IClientHello {
@@ -4773,7 +4771,6 @@ export namespace proto {
             public paddedBytes?: (Uint8Array|null);
             public sendServerHelloPaddedBytes?: (boolean|null);
             public simulateXxkemFs?: (boolean|null);
-            public pqMode?: (proto.HandshakeMessage.HandshakePqMode|null);
             public static create(properties?: proto.HandshakeMessage.IClientHello): proto.HandshakeMessage.ClientHello;
             public static encode(m: proto.HandshakeMessage.IClientHello, w?: $protobuf.Writer): $protobuf.Writer;
             public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ClientHello;
@@ -4783,18 +4780,6 @@ export namespace proto {
             public static getTypeUrl(typeUrlPrefix?: string): string;
         }
 
-        enum HandshakePqMode {
-            HANDSHAKE_PQ_MODE_UNKNOWN = 0,
-            XXKEM = 1,
-            XXKEM_FS = 2,
-            WA_CLASSICAL = 3,
-            WA_PQ = 4,
-            IKKEM = 5,
-            IKKEM_FS = 6,
-            XXKEM_2 = 7,
-            IKKEM_2 = 8
-        }
-
         interface IServerHello {
             ephemeral?: (Uint8Array|null);
             "static"?: (Uint8Array|null);

WAProto/index.js

@@ -6897,10 +6897,6 @@ export const proto = $root.proto = (() => {
                     case 60:
                         m.capabilities[i] = 60;
                         break;
-                    case "AI_SUBSCRIPTION_ENABLED":
-                    case 61:
-                        m.capabilities[i] = 61;
-                        break;
                     }
                 }
             }
@@ -6997,7 +6993,6 @@ export const proto = $root.proto = (() => {
             values[valuesById[58] = "JSON_PATCH_STREAMING"] = 58;
             values[valuesById[59] = "AI_TAB_FORCE_CLIPPY"] = 59;
             values[valuesById[60] = "UNIFIED_RESPONSE_EMBEDDED_SCREENS"] = 60;
-            values[valuesById[61] = "AI_SUBSCRIPTION_ENABLED"] = 61;
             return values;
         })();
 
@@ -32590,7 +32585,6 @@ export const proto = $root.proto = (() => {
             ClientHello.prototype.paddedBytes = null;
             ClientHello.prototype.sendServerHelloPaddedBytes = null;
             ClientHello.prototype.simulateXxkemFs = null;
-            ClientHello.prototype.pqMode = null;
 
             let $oneOfFields;
 
@@ -32642,12 +32636,6 @@ export const proto = $root.proto = (() => {
                 set: $util.oneOfSetter($oneOfFields)
             });
 
-            // Virtual OneOf for proto3 optional field
-            Object.defineProperty(ClientHello.prototype, "_pqMode", {
-                get: $util.oneOfGetter($oneOfFields = ["pqMode"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
-
             ClientHello.create = function create(properties) {
                 return new ClientHello(properties);
             };
@@ -32671,8 +32659,6 @@ export const proto = $root.proto = (() => {
                     w.uint32(56).bool(m.sendServerHelloPaddedBytes);
                 if (m.simulateXxkemFs != null && Object.hasOwnProperty.call(m, "simulateXxkemFs"))
                     w.uint32(64).bool(m.simulateXxkemFs);
-                if (m.pqMode != null && Object.hasOwnProperty.call(m, "pqMode"))
-                    w.uint32(72).int32(m.pqMode);
                 return w;
             };
 
@@ -32717,10 +32703,6 @@ export const proto = $root.proto = (() => {
                             m.simulateXxkemFs = r.bool();
                             break;
                         }
-                    case 9: {
-                            m.pqMode = r.int32();
-                            break;
-                        }
                     default:
                         r.skipType(t & 7);
                         break;
@@ -32772,50 +32754,6 @@ export const proto = $root.proto = (() => {
                 if (d.simulateXxkemFs != null) {
                     m.simulateXxkemFs = Boolean(d.simulateXxkemFs);
                 }
-                switch (d.pqMode) {
-                default:
-                    if (typeof d.pqMode === "number") {
-                        m.pqMode = d.pqMode;
-                        break;
-                    }
-                    break;
-                case "HANDSHAKE_PQ_MODE_UNKNOWN":
-                case 0:
-                    m.pqMode = 0;
-                    break;
-                case "XXKEM":
-                case 1:
-                    m.pqMode = 1;
-                    break;
-                case "XXKEM_FS":
-                case 2:
-                    m.pqMode = 2;
-                    break;
-                case "WA_CLASSICAL":
-                case 3:
-                    m.pqMode = 3;
-                    break;
-                case "WA_PQ":
-                case 4:
-                    m.pqMode = 4;
-                    break;
-                case "IKKEM":
-                case 5:
-                    m.pqMode = 5;
-                    break;
-                case "IKKEM_FS":
-                case 6:
-                    m.pqMode = 6;
-                    break;
-                case "XXKEM_2":
-                case 7:
-                    m.pqMode = 7;
-                    break;
-                case "IKKEM_2":
-                case 8:
-                    m.pqMode = 8;
-                    break;
-                }
                 return m;
             };
 
@@ -32863,11 +32801,6 @@ export const proto = $root.proto = (() => {
                     if (o.oneofs)
                         d._simulateXxkemFs = "simulateXxkemFs";
                 }
-                if (m.pqMode != null && m.hasOwnProperty("pqMode")) {
-                    d.pqMode = o.enums === String ? $root.proto.HandshakeMessage.HandshakePqMode[m.pqMode] === undefined ? m.pqMode : $root.proto.HandshakeMessage.HandshakePqMode[m.pqMode] : m.pqMode;
-                    if (o.oneofs)
-                        d._pqMode = "pqMode";
-                }
                 return d;
             };
 
@@ -32885,20 +32818,6 @@ export const proto = $root.proto = (() => {
             return ClientHello;
         })();
 
-        HandshakeMessage.HandshakePqMode = (function() {
-            const valuesById = {}, values = Object.create(valuesById);
-            values[valuesById[0] = "HANDSHAKE_PQ_MODE_UNKNOWN"] = 0;
-            values[valuesById[1] = "XXKEM"] = 1;
-            values[valuesById[2] = "XXKEM_FS"] = 2;
-            values[valuesById[3] = "WA_CLASSICAL"] = 3;
-            values[valuesById[4] = "WA_PQ"] = 4;
-            values[valuesById[5] = "IKKEM"] = 5;
-            values[valuesById[6] = "IKKEM_FS"] = 6;
-            values[valuesById[7] = "XXKEM_2"] = 7;
-            values[valuesById[8] = "IKKEM_2"] = 8;
-            return values;
-        })();
-
         HandshakeMessage.ServerHello = (function() {
 
             function ServerHello(p) {

src/Defaults/baileys-version.json

@@ -1 +1 @@
-{"version":[2,3000,1035504971]}
+{"version":[2,3000,1035223526]}

src/Defaults/index.ts

@@ -188,12 +188,10 @@ export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP) as MediaType[]
 /** 120s timeout for history sync stall detection, same as WA Web's handleChunkProgress / restartPausedTimer (g = 120) */
 export const HISTORY_SYNC_PAUSED_TIMEOUT_MS = 120_000
 
-// Replenishment threshold: when server count drops below this, top-up back to INITIAL_PREKEY_COUNT
-export const MIN_PREKEY_COUNT = 200
+export const MIN_PREKEY_COUNT = 5
 
-// Initial pool size matching WA Business (CDP IDB capture: prekey-store = 812 on registration)
-// Rounded to 800 for cleanliness; replenishment always tops up to this value
-export const INITIAL_PREKEY_COUNT = 800
+// Moderate prekey count (upstream uses 812, reduced to balance rate limiting and availability)
+export const INITIAL_PREKEY_COUNT = 200
 
 export const UPLOAD_TIMEOUT = 30000 // 30 seconds
 // Moderate upload interval to balance rate limiting and responsiveness (was 5000)

src/Socket/messages-recv.ts

@@ -7,7 +7,6 @@ import { proto } from '../../WAProto/index.js'
 import {
 	DEFAULT_CACHE_TTLS,
 	DEFAULT_SESSION_CLEANUP_CONFIG,
-	INITIAL_PREKEY_COUNT,
 	KEY_BUNDLE_TYPE,
 	MIN_PREKEY_COUNT,
 	PLACEHOLDER_MAX_AGE_SECONDS,
@@ -1441,8 +1440,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 
 			logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count')
 			if (shouldUploadMorePreKeys) {
-				// Top-up back to INITIAL_PREKEY_COUNT so the pool is always restored to full size
-				await uploadPreKeys(Math.max(1, INITIAL_PREKEY_COUNT - count))
+				await uploadPreKeys()
 			}
 		} else {
 			const result = await handleIdentityChange(node, {

src/Socket/newsletter.ts

@@ -123,11 +123,11 @@ export const makeNewsletterSocket = (config: SocketConfig) => {
 		},
 
 		newsletterMute: (jid: string) => {
-			return executeWMexQuery({ input: { newsletter_id: jid, type: 'MUTE_ADMIN_ACTIVITY', value: 'OFF' } }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2)
+			return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2)
 		},
 
 		newsletterUnmute: (jid: string) => {
-			return executeWMexQuery({ input: { newsletter_id: jid, type: 'MUTE_ADMIN_ACTIVITY', value: 'ON' } }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2)
+			return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2)
 		},
 
 		newsletterUpdateName: async (jid: string, name: string) => {

src/Socket/socket.ts

@@ -785,7 +785,7 @@ export const makeSocket = (config: SocketConfig) => {
 			let count = 0
 			const preKeyCount = await getAvailablePreKeysOnServer()
 			if (preKeyCount === 0) count = INITIAL_PREKEY_COUNT
-			else count = Math.max(0, INITIAL_PREKEY_COUNT - preKeyCount)
+			else count = MIN_PREKEY_COUNT
 			const { exists: currentPreKeyExists, currentPreKeyId } = await verifyCurrentPreKeyExists()
 
 			logger.info(`${preKeyCount} pre-keys found on server`)
@@ -1151,7 +1151,7 @@ export const makeSocket = (config: SocketConfig) => {
 		// Decrement active connections
 		decrementActiveConnections()
 
-		clearTimeout(keepAliveReq)
+		clearInterval(keepAliveReq)
 		clearTimeout(qrTimer)
 
 		// Clear offline-buffer safety timer so its callback cannot call ev.flush()
@@ -1262,16 +1262,8 @@ export const makeSocket = (config: SocketConfig) => {
 		})
 	}
 
-	const startKeepAliveRequest = () => {
-		// Use recursive setTimeout with ±15% jitter to match WA Desktop behaviour
-		// (WA Business Desktop: ~25-30s intervals with natural variance)
-		const scheduleNextKeepAlive = () => {
-			const jitter = keepAliveIntervalMs * 0.15
-			const delay = keepAliveIntervalMs + Math.floor((Math.random() * 2 - 1) * jitter)
-			keepAliveReq = setTimeout(onKeepAliveTick, delay)
-		}
-
-		const onKeepAliveTick = () => {
+	const startKeepAliveRequest = () =>
+		(keepAliveReq = setInterval(() => {
 			if (!lastDateRecv) {
 				lastDateRecv = new Date()
 			}
@@ -1283,7 +1275,6 @@ export const makeSocket = (config: SocketConfig) => {
 			*/
 			if (diff > keepAliveIntervalMs + 5000) {
 				void end(new Boom('Connection was lost', { statusCode: DisconnectReason.connectionLost }))
-				return // connection closing — do not reschedule
 			} else if (ws.isOpen) {
 				// Send keep-alive ping via sendNode() (fire-and-forget) instead of query().
 				// query() wraps the ping in the query circuit breaker — when that breaker is
@@ -1306,12 +1297,7 @@ export const makeSocket = (config: SocketConfig) => {
 			} else {
 				logger.warn('keep alive called when WS not open')
 			}
-
-			scheduleNextKeepAlive()
-		}
-
-		scheduleNextKeepAlive()
-	}
+		}, keepAliveIntervalMs))
 	/** i have no idea why this exists. pls enlighten me */
 	const sendPassiveIq = (tag: 'passive' | 'active') =>
 		query({

src/Types/Events.ts

@@ -27,8 +27,6 @@ export type BaileysEventMap = {
 		chats: Chat[]
 		contacts: Contact[]
 		messages: WAMessage[]
-		/** Past participants for group chats (people who left/were removed). userJid is always a phone number (PN), never a LID. */
-		pastParticipants?: proto.IPastParticipants[] | null
 		isLatest?: boolean
 		progress?: number | null
 		syncType?: proto.HistorySync.HistorySyncType | null
@@ -187,8 +185,6 @@ export type BufferedEventData = {
 		chats: { [jid: string]: Chat }
 		contacts: { [jid: string]: Contact }
 		messages: { [uqId: string]: WAMessage }
-		/** Keyed by groupJid for O(1) deduplication across chunks */
-		pastParticipants: { [groupJid: string]: proto.IPastParticipant[] }
 		empty: boolean
 		isLatest: boolean
 		progress?: number | null

src/Types/Newsletter.ts

@@ -4,10 +4,10 @@ export enum XWAPaths {
 	xwa2_newsletter_view = 'xwa2_newsletter_view',
 	xwa2_newsletter_metadata = 'xwa2_newsletter',
 	xwa2_newsletter_admin_count = 'xwa2_newsletter_admin',
-	xwa2_newsletter_mute_v2 = 'xwa2_newsletter_update_user_setting',
-	xwa2_newsletter_unmute_v2 = 'xwa2_newsletter_update_user_setting',
-	xwa2_newsletter_follow = 'xwa2_newsletter_join_v2',
-	xwa2_newsletter_unfollow = 'xwa2_newsletter_leave_v2',
+	xwa2_newsletter_mute_v2 = 'xwa2_newsletter_mute_v2',
+	xwa2_newsletter_unmute_v2 = 'xwa2_newsletter_unmute_v2',
+	xwa2_newsletter_follow = 'xwa2_newsletter_follow',
+	xwa2_newsletter_unfollow = 'xwa2_newsletter_unfollow',
 	xwa2_newsletter_change_owner = 'xwa2_newsletter_change_owner',
 	xwa2_newsletter_demote = 'xwa2_newsletter_demote',
 	xwa2_newsletter_delete_v2 = 'xwa2_newsletter_delete_v2'
@@ -17,10 +17,10 @@ export enum QueryIds {
 	UPDATE_METADATA = '24250201037901610',
 	METADATA = '6563316087068696',
 	SUBSCRIBERS = '9783111038412085',
-	FOLLOW = '24404358912487870',
-	UNFOLLOW = '9767147403369991',
-	MUTE = '31938993655691868',
-	UNMUTE = '31938993655691868',
+	FOLLOW = '7871414976211147',
+	UNFOLLOW = '7238632346214362',
+	MUTE = '29766401636284406',
+	UNMUTE = '9864994326891137',
 	ADMIN_COUNT = '7130823597031706',
 	CHANGE_OWNER = '7341777602580933',
 	DEMOTE = '6551828931592903',

src/Utils/event-buffer.ts

@@ -1,5 +1,4 @@
 import EventEmitter from 'events'
-import { proto } from '../../WAProto/index.js'
 import type {
 	BaileysEvent,
 	BaileysEventEmitter,
@@ -891,7 +890,6 @@ const makeBufferData = (): BufferedEventData => {
 			chats: {},
 			messages: {},
 			contacts: {},
-			pastParticipants: {},
 			isLatest: false,
 			empty: true
 		},
@@ -969,28 +967,6 @@ function append<E extends BufferableEvent>(
 				}
 			}
 
-			// Merge pastParticipants with deduplication by groupJid and by userJid within each group.
-			// Multiple HistorySync chunks can carry the same group -- we merge rather than concatenate
-			// to avoid duplicate entries in the final event delivered to the consumer.
-			for (const group of (eventData.pastParticipants ?? []) as proto.IPastParticipants[]) {
-				const groupJid = group.groupJid
-				if (!groupJid) continue
-
-				if (!data.historySets.pastParticipants[groupJid]) {
-					data.historySets.pastParticipants[groupJid] = []
-				}
-
-				const existing = data.historySets.pastParticipants[groupJid]
-				const seenJids = new Set(existing.map(p => p.userJid).filter(Boolean))
-
-				for (const participant of (group.pastParticipants ?? []) as proto.IPastParticipant[]) {
-					if (participant.userJid && !seenJids.has(participant.userJid)) {
-						existing.push(participant)
-						seenJids.add(participant.userJid)
-					}
-				}
-			}
-
 			data.historySets.empty = false
 			data.historySets.syncType = eventData.syncType
 			data.historySets.progress = eventData.progress
@@ -1316,10 +1292,6 @@ function consolidateEvents(data: BufferedEventData) {
 			chats: Object.values(data.historySets.chats),
 			messages: Object.values(data.historySets.messages),
 			contacts: Object.values(data.historySets.contacts),
-			// Convert dedup map back to array. Each entry has groupJid + participants (all unique userJids).
-			pastParticipants: Object.entries(data.historySets.pastParticipants).map(
-				([groupJid, participants]) => ({ groupJid, pastParticipants: participants })
-			),
 			syncType: data.historySets.syncType,
 			progress: data.historySets.progress,
 			isLatest: data.historySets.isLatest,

src/Utils/history.ts

@@ -15,7 +15,7 @@ import {
 import { toNumber } from './generics'
 import type { ILogger } from './logger.js'
 import { normalizeMessageContent } from './messages'
-import { downloadContentFromMessage, getUrlFromDirectPath } from './messages-media'
+import { downloadContentFromMessage } from './messages-media'
 
 const inflatePromise = promisify(inflate)
 
@@ -374,25 +374,10 @@ export const processHistoryMessage = (item: proto.IHistorySync, logger?: ILogger
 	// Convert Map back to array for return
 	const lidPnMappings = Array.from(lidPnMap.values())
 
-	// Normalize pastParticipants: resolve LID userJids → PN so the consumer always
-	// receives a phone number, never an opaque LID identifier.
-	// Uses the lidPnMap built above (populated from phoneNumberToLidMappings + conversations).
-	// If a LID cannot be resolved, the original value is kept rather than dropping the participant.
-	const pastParticipants: proto.IPastParticipants[] = (item.pastParticipants ?? []).map(group => ({
-		groupJid: group.groupJid,
-		pastParticipants: (group.pastParticipants ?? []).map(participant => {
-			const userJid = participant.userJid
-			if (!userJid || !isAnyLidUser(userJid)) return participant
-			const mapping = lidPnMap.get(jidNormalizedUser(userJid))
-			return mapping?.pn ? { ...participant, userJid: mapping.pn } : participant
-		})
-	}))
-
 	return {
 		chats,
 		contacts,
 		messages,
-		pastParticipants,
 		lidPnMappings,
 		syncType: item.syncType,
 		progress: item.progress
@@ -423,19 +408,7 @@ export const downloadAndProcessHistorySyncNotification = async (
 		historyMsg = await downloadHistory(msg, options)
 	}
 
-	const result = processHistoryMessage(historyMsg, logger)
-
-	// Mirror WA Desktop behaviour: DELETE the CDN blob only after processing succeeds.
-	// Doing this earlier (e.g. inside downloadHistory) risks permanent history loss if
-	// processing throws — the server copy would be gone and retry after reconnect would fail.
-	if (msg.directPath) {
-		const cdnUrl = getUrlFromDirectPath(msg.directPath)
-		fetch(cdnUrl, { ...options, method: 'DELETE' }).catch(() => {
-			// non-fatal — server will expire it anyway
-		})
-	}
-
-	return result
+	return processHistoryMessage(historyMsg, logger)
 }
 
 /**

src/Utils/messages-media.ts

@@ -160,7 +160,7 @@ export const extractImageThumb = async (bufferOrFilePath: Readable | Buffer | st
 				height: dimensions.height
 			}
 		}
-	} else if ('jimp' in lib && typeof lib.jimp?.Jimp === 'function') {
+	} else if ('jimp' in lib && (typeof lib.jimp?.Jimp === 'object' || typeof lib.jimp?.Jimp === 'function')) {
 		const jimp = await (lib.jimp.Jimp as any).read(bufferOrFilePath)
 		const dimensions = {
 			width: jimp.width,

src/Utils/messages.ts

@@ -41,11 +41,9 @@ import type { ILogger } from './logger'
 import {
 	downloadContentFromMessage,
 	encryptedStream,
-	extractImageThumb,
 	generateThumbnail,
 	getAudioDuration,
 	getAudioWaveform,
-	getStream,
 	getRawMediaUploadData,
 	type MediaDownloadOptions
 } from './messages-media'
@@ -635,59 +633,6 @@ export const generateCarouselMessage = async (
 		)
 	}
 
-	const recoverCarouselImageMetadata = async (
-		imageMessage: proto.Message.IImageMessage | null | undefined,
-		cardImage: WAMediaUpload,
-		cardTitle: string | undefined,
-		uploadOptions: MessageContentGenerationOptions
-	) => {
-		if (!imageMessage) {
-			return
-		}
-
-		const missingThumbnail = !imageMessage.jpegThumbnail
-		const missingWidth = !imageMessage.width
-		const missingHeight = !imageMessage.height
-		if (!missingThumbnail && !missingWidth && !missingHeight) {
-			return
-		}
-
-		try {
-			const { stream } = await getStream(cardImage, uploadOptions.options)
-			const { buffer, original } = await extractImageThumb(stream)
-
-			if (missingThumbnail) {
-				imageMessage.jpegThumbnail = buffer.toString('base64')
-			}
-
-			if (missingWidth && original.width) {
-				imageMessage.width = original.width
-			}
-
-			if (missingHeight && original.height) {
-				imageMessage.height = original.height
-			}
-
-			uploadOptions.logger?.info(
-				{
-					cardTitle,
-					recoveredThumbnail: !!imageMessage.jpegThumbnail,
-					width: imageMessage.width,
-					height: imageMessage.height
-				},
-				'[CAROUSEL] Recovered image metadata from source media'
-			)
-		} catch (error) {
-			uploadOptions.logger?.warn(
-				{
-					cardTitle,
-					trace: error instanceof Error ? error.stack : String(error)
-				},
-				'[CAROUSEL] Failed source-media thumbnail fallback'
-			)
-		}
-	}
-
 	// Map cards to the carousel format (processing media)
 	const carouselCards = await Promise.all(
 		cards.map(async card => {
@@ -703,11 +648,6 @@ export const generateCarouselMessage = async (
 			if (hasMedia && mediaOptions) {
 				if (card.image) {
 					const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, mediaOptions)
-
-					// Mirror the working Pastorini-style result: every carousel image card should
-					// carry a jpegThumbnail and dimensions before it reaches the Web live renderer.
-					await recoverCarouselImageMetadata(imageMessage, card.image, card.title, mediaOptions)
-
 					// Validate image fields needed for WhatsApp rendering
 					if (imageMessage && !imageMessage.jpegThumbnail) {
 						mediaOptions.logger?.warn(
@@ -1288,20 +1228,57 @@ export const generateWAMessageContent = async (
 			options.logger?.info('Sending CTA buttons as nativeFlowMessage with viewOnceMessage wrapper')
 		}
 	}
-	// Check for nativeCarousel
+	// Check for nativeCarousel — inline handler (validated on Android, iOS, Web)
+	// Direct interactiveMessage at root (field 45), NO viewOnceMessage wrapper,
+	// NO messageContextInfo, NO biz/bot stanza nodes needed
 	else if (hasNonNullishProperty(message, 'nativeCarousel')) {
 		const carouselMsg = message as any
-		const carouselOptions: CarouselMessageOptions = {
-			cards: carouselMsg.nativeCarousel.cards,
-			title: carouselMsg.nativeCarousel.title || carouselMsg.title,
-			text: carouselMsg.text,
-			footer: carouselMsg.footer
+		const cards = carouselMsg.nativeCarousel.cards || []
+		const title = carouselMsg.nativeCarousel.title || carouselMsg.title
+		const text = carouselMsg.text
+		const footer = carouselMsg.footer
+
+		const carouselCards = await Promise.all(
+			cards.map(async (card: any) => {
+				const hasMedia = !!(card.image || card.video)
+				const header: any = {
+					title: card.title || '',
+					subtitle: card.footer || '',
+					hasMediaAttachment: hasMedia
+				}
+				if (hasMedia && card.image) {
+					const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, options)
+					if (imageMessage && !imageMessage.height) imageMessage.height = 500
+					if (imageMessage && !imageMessage.width) imageMessage.width = 500
+					header.imageMessage = imageMessage
+				}
+				return {
+					header,
+					body: { text: card.body || '' },
+					footer: card.footer ? { text: card.footer } : undefined,
+					nativeFlowMessage: {
+						buttons: (card.buttons || []).map((btn: any) => {
+							switch (btn.type) {
+								case 'url': return { name: 'cta_url', buttonParamsJson: JSON.stringify({ display_text: btn.text, url: btn.url, merchant_url: btn.url }) }
+								case 'copy': return { name: 'cta_copy', buttonParamsJson: JSON.stringify({ display_text: btn.text, copy_code: btn.copyText }) }
+								case 'call': return { name: 'cta_call', buttonParamsJson: JSON.stringify({ display_text: btn.text, phone_number: btn.phoneNumber }) }
+								default: return { name: 'quick_reply', buttonParamsJson: JSON.stringify({ display_text: btn.text, id: btn.id }) }
+							}
+						})
+					}
+				}
+			})
+		)
+
+		m.interactiveMessage = {
+			header: { title: title || ' ', hasMediaAttachment: false },
+			body: { text: text || '' },
+			footer: footer ? { text: footer } : undefined,
+			carouselMessage: {
+				cards: carouselCards,
+				messageVersion: 1
+			}
 		}
-		// Pass options for media processing if cards have images/videos
-		const generated = await generateCarouselMessage(carouselOptions, options)
-		// Frida capture shows interactiveMessage DIRECT (field 45) in DSM — no viewOnceMessage wrapper
-		// Testing without wrapper: biz node + quality_control already match Pastorini CDP stanza
-		m.interactiveMessage = generated.interactiveMessage
 		return m
 	}
 	// Check for nativeList

src/Utils/tc-token-utils.ts

@@ -158,13 +158,11 @@ export async function storeTcTokensFromIqResult({
 			...existingEntry,
 			token: Buffer.from(tokenNode.content),
 			timestamp: tokenNode.attrs.t,
-			// WABA Android: resets real_issue_timestamp to null when storing a new token
-			// (UPDATE wa_trusted_contacts_send SET real_issue_timestamp=null)
+			// Resets real_issue_timestamp to null when storing a new token
 			realIssueTimestamp: null
 		}
 
 		// Store under resolved storageJid AND under fallbackJid (PN) for reliable lookup
-		// The read path may resolve to a different LID than the store path
 		const normalizedFallback = jidNormalizedUser(fallbackJid)
 		const keysToStore: Record<string, typeof tokenEntry | null> = {
 			[storageJid]: tokenEntry

src/WAUSync/USyncQuery.ts

@@ -10,7 +10,7 @@ import {
 } from './Protocols'
 import { USyncUser } from './USyncUser'
 
-export type USyncQueryResultList = { [protocol: string]: unknown; id: string; rawId?: number }
+export type USyncQueryResultList = { [protocol: string]: unknown; id: string }
 
 export type USyncQueryResult = {
 	list: USyncQueryResultList[]
@@ -68,8 +68,10 @@ export class USyncQuery {
 		//TODO: see if there are any errors in the result node
 		//const resultNode = getBinaryNodeChild(usyncNode, 'result')
 
-		const parseNodeList = (content: BinaryNode[]): USyncQueryResultList[] =>
-			content.reduce((acc: USyncQueryResultList[], node) => {
+		const listNode = usyncNode ? getBinaryNodeChild(usyncNode, 'list') : undefined
+
+		if (listNode?.content && Array.isArray(listNode.content)) {
+			queryResult.list = listNode.content.reduce((acc: USyncQueryResultList[], node) => {
 				const id = node?.attrs.jid
 				if (id) {
 					const data = Array.isArray(node?.content)
@@ -87,24 +89,15 @@ export class USyncQuery {
 									.filter(([, b]) => b !== null) as [string, unknown][]
 							)
 						: {}
-					const rawIdAttr = node?.attrs?.['raw_id']
-					const rawId = rawIdAttr !== undefined ? Number(rawIdAttr) : undefined
-					acc.push({ ...data, id, ...(rawId !== undefined && !isNaN(rawId) ? { rawId } : {}) })
+					acc.push({ ...data, id })
 				}
 
 				return acc
 			}, [])
-
-		const listNode = usyncNode ? getBinaryNodeChild(usyncNode, 'list') : undefined
-		if (listNode?.content && Array.isArray(listNode.content)) {
-			queryResult.list = parseNodeList(listNode.content)
-		}
-
-		const sideListNode = usyncNode ? getBinaryNodeChild(usyncNode, 'side_list') : undefined
-		if (sideListNode?.content && Array.isArray(sideListNode.content)) {
-			queryResult.sideList = parseNodeList(sideListNode.content)
 		}
 
+		//TODO: implement side list
+		//const sideListNode = getBinaryNodeChild(usyncNode, 'side_list')
 		return queryResult
 	}