@badzz88/baileys 8.4.9 → 8.5.1

package/{src → lib}/Socket/messages-recv.js

@@ -37,6 +37,7 @@ const makeMessagesRecvSocket = config => {
 		signalRepository,
 		query,
 		upsertMessage,
+		getUSyncDevices,
 		resyncAppState,
 		onUnexpectedError,
 		assertSessions,
@@ -46,10 +47,7 @@ const makeMessagesRecvSocket = config => {
 		uploadPreKeys,
 		sendPeerDataOperationMessage,
 		messageRetryManager,
-		issuePrivacyTokens,
-		getUSyncDevices,
-		createParticipantNodes,
-		newsletterServerIdCache
+		issuePrivacyTokens
 	} = sock
 	const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping)
 	// Track when the socket fully opens so pending pre-connect messages are treated as history
@@ -147,14 +145,13 @@ const makeMessagesRecvSocket = config => {
 	 *
 	 * @param {string} [registrationTraceId] - Optional trace ID for this registration attempt.
 	 */
-	const requestCompanionCanonicalNonce = async registrationTraceId => {
+	const requestCompanionCanonicalNonce = async (registrationTraceId) => {
 		if (!authState.creds.me?.id) {
 			throw new boom_1.Boom('Not authenticated')
 		}
 		return sendPeerDataOperationMessage({
 			companionCanonicalUserNonceFetchRequest: registrationTraceId ? { registrationTraceId } : {},
-			peerDataOperationRequestType:
-				index_js_1.proto.Message.PeerDataOperationRequestType.COMPANION_CANONICAL_USER_NONCE_FETCH
+			peerDataOperationRequestType: index_js_1.proto.Message.PeerDataOperationRequestType.COMPANION_CANONICAL_USER_NONCE_FETCH
 		})
 	}
 	/**
@@ -170,135 +167,54 @@ const makeMessagesRecvSocket = config => {
 			peerDataOperationRequestType: index_js_1.proto.Message.PeerDataOperationRequestType.COMPANION_META_NONCE_FETCH
 		})
 	}
-	// Handles mex notifications (newsletter and group XWA2 property updates).
-	// Wire format: notification[type=mex] → <update op_name="..."> → JSON payload in content bytes.
-	const handleMexNotification = async node => {
-		const updateNodes = (0, WABinary_1.getBinaryNodeChildren)(node, 'update')
-		if (!updateNodes.length) {
-			logger.debug({ node }, 'mex notification with no update children')
+	// Handles mex newsletter notifications
+	const handleMexNewsletterNotification = async node => {
+		const mexNode = (0, WABinary_1.getBinaryNodeChild)(node, 'mex')
+		if (!mexNode?.content) {
+			logger.warn({ node }, 'Invalid mex newsletter notification')
 			return
 		}
-		for (const updateNode of updateNodes) {
-			const opName = updateNode.attrs?.op_name
-			if (!opName) continue
-			let payload
-			try {
-				const raw = updateNode.content?.text ?? updateNode.content?.toString?.()
-				payload = raw ? JSON.parse(raw) : null
-			} catch (e) {
-				logger.error({ err: e, opName }, 'failed to parse mex update payload')
-				continue
-			}
-			if (!payload?.data) {
-				logger.debug({ opName }, 'mex update with no data field')
-				continue
-			}
-			const d = payload.data
-			switch (opName) {
-				case 'NotificationNewsletterUpdate': {
-					// d.xwa2_notify_newsletter_on_metadata_update: { id, thread_metadata: { settings } }
-					const upd = d.xwa2_notify_newsletter_on_metadata_update
-					if (upd?.id) {
-						ev.emit('newsletter-settings.update', {
-							id: upd.id,
-							update: upd.thread_metadata?.settings ?? {}
-						})
-					}
-					break
-				}
-				case 'NotificationNewsletterJoin': {
-					// d.xwa2_notify_newsletter_on_join: full newsletter metadata on subscribe
-					const upd = d.xwa2_notify_newsletter_on_join
-					if (upd?.id) {
-						ev.emit('newsletter-participants.update', {
-							id: upd.id,
-							author: node.attrs.from,
-							user: (0, WABinary_1.jidNormalizedUser)(node.attrs.from),
-							new_role: upd.viewer_metadata?.role ?? 'SUBSCRIBER',
-							action: 'join',
-							metadata: upd.thread_metadata
-						})
-					}
-					break
-				}
-				case 'NotificationNewsletterMuteChange': {
-					// d.xwa2_notify_newsletter_on_mute_change: { id, mute: "ON"|"OFF" }
-					const upd = d.xwa2_notify_newsletter_on_mute_change
-					if (upd?.id) {
-						ev.emit('newsletter-settings.update', {
-							id: upd.id,
-							update: { mute: upd.mute }
-						})
-					}
-					break
-				}
-				case 'NotificationNewsletterUserSettingChange': {
-					// d.xwa2_notify_newsletter_on_user_setting_change: { id, setting: { type, value } }
-					const upd = d.xwa2_notify_newsletter_on_user_setting_change
-					if (upd?.id && upd.setting) {
+		let data
+		try {
+			data = JSON.parse(mexNode.content.toString())
+		} catch (error) {
+			logger.error({ err: error, node }, 'Failed to parse mex newsletter notification')
+			return
+		}
+		const operation = data?.operation
+		const updates = data?.updates
+		if (!updates || !operation) {
+			logger.warn({ data }, 'Invalid mex newsletter notification content')
+			return
+		}
+		logger.info({ operation, updates }, 'got mex newsletter notification')
+		switch (operation) {
+			case 'NotificationNewsletterUpdate':
+				for (const update of updates) {
+					if (update.jid && update.settings && Object.keys(update.settings).length > 0) {
 						ev.emit('newsletter-settings.update', {
-							id: upd.id,
-							update: { userSetting: upd.setting }
+							id: update.jid,
+							update: update.settings
 						})
 					}
-					break
 				}
-				case 'NotificationNewsletterAdminPromote': {
-					// legacy format kept for compat
-					const upd = d.xwa2_notify_newsletter_on_admin_promote
-					if (upd?.id) {
+				break
+			case 'NotificationNewsletterAdminPromote':
+				for (const update of updates) {
+					if (update.jid && update.user) {
 						ev.emit('newsletter-participants.update', {
-							id: upd.id,
+							id: update.jid,
 							author: node.attrs.from,
-							user: upd.user,
+							user: update.user,
 							new_role: 'ADMIN',
 							action: 'promote'
 						})
 					}
-					break
-				}
-				case 'NotificationGroupMemberLinkPropertyUpdate': {
-					// d.xwa2_notify_group_on_prop_change: { id, properties: { member_link_mode } }
-					const upd = d.xwa2_notify_group_on_prop_change
-					if (upd?.id && upd.properties?.member_link_mode !== undefined) {
-						ev.emit('groups.update', [
-							{
-								id: upd.id,
-								memberAddMode: upd.properties.member_link_mode
-							}
-						])
-					}
-					break
-				}
-				case 'NotificationGroupLimitSharingPropertyUpdate': {
-					// d.xwa2_notify_group_on_prop_change: { id, properties: { limit_sharing } }
-					const upd = d.xwa2_notify_group_on_prop_change
-					if (upd?.id && upd.properties?.limit_sharing !== undefined) {
-						ev.emit('groups.update', [
-							{
-								id: upd.id,
-								limitSharing: upd.properties.limit_sharing
-							}
-						])
-					}
-					break
 				}
-				case 'NotificationGroupMemberShareGroupHistoryModePropertyUpdate': {
-					// d.xwa2_notify_group_on_prop_change: { id, properties: { member_share_group_history_mode } }
-					const upd = d.xwa2_notify_group_on_prop_change
-					if (upd?.id && upd.properties?.member_share_group_history_mode !== undefined) {
-						ev.emit('groups.update', [
-							{
-								id: upd.id,
-								memberShareHistoryMode: upd.properties.member_share_group_history_mode
-							}
-						])
-					}
-					break
-				}
-				default:
-					logger.debug({ opName, from: node.attrs.from }, 'unhandled mex op')
-			}
+				break
+			default:
+				logger.info({ operation, data }, 'Unhandled mex newsletter notification')
+				break
 		}
 	}
 	// Handles newsletter notifications
@@ -351,9 +267,7 @@ const makeMessagesRecvSocket = config => {
 					})
 				}
 				break
-			case 'message': {
-				const viewCount = child.attrs.view_count !== undefined ? +child.attrs.view_count : undefined
-				const impressionCount = child.attrs.impression_count !== undefined ? +child.attrs.impression_count : undefined
+			case 'message':
 				const plaintextNode = (0, WABinary_1.getBinaryNodeChild)(child, 'plaintext')
 				if (plaintextNode?.content) {
 					try {
@@ -366,16 +280,11 @@ const makeMessagesRecvSocket = config => {
 							key: {
 								remoteJid: from,
 								id: child.attrs.message_id || child.attrs.server_id,
-								// always false: this branch only runs for inbound plaintext newsletter posts,
-								// which always originate from the channel, never from us
-								fromMe: false
+								fromMe: false // TODO: is this really true though
 							},
 							message: messageProto,
 							messageTimestamp: +child.attrs.t
 						}).toJSON()
-						// Attach insight counters when the server includes them
-						if (viewCount !== undefined) fullMessage.views = viewCount
-						if (impressionCount !== undefined) fullMessage.impressions = impressionCount
 						await upsertMessage(fullMessage, 'append')
 						logger.info('Processed plaintext newsletter message')
 					} catch (error) {
@@ -383,44 +292,23 @@ const makeMessagesRecvSocket = config => {
 					}
 				}
 				break
-			}
-			case 'live_updates': {
-				// Live engagement updates: reactions + forwards per message.
-				// Wire: <live_updates> → <messages t="..."> → <message server_id="...">
-				//         → <forwards_count count="N">, <reactions> → <reaction code="X" count="N">
-				const messagesNode = (0, WABinary_1.getBinaryNodeChild)(child, 'messages')
-				const msgTs = messagesNode?.attrs?.t ? +messagesNode.attrs.t : undefined
-				for (const msgNode of (0, WABinary_1.getBinaryNodeChildren)(messagesNode ?? child, 'message')) {
-					const serverId = msgNode.attrs.server_id
-					const fwdNode = (0, WABinary_1.getBinaryNodeChild)(msgNode, 'forwards_count')
-					const forwardsCount = fwdNode?.attrs?.count !== undefined ? +fwdNode.attrs.count : undefined
-					const reactionsNode = (0, WABinary_1.getBinaryNodeChild)(msgNode, 'reactions')
-					const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionsNode ?? msgNode, 'reaction').map(r => ({
-						code: r.attrs.code,
-						count: +r.attrs.count
-					}))
-					ev.emit('newsletter.live-update', {
-						id: from,
-						server_id: serverId,
-						timestamp: msgTs,
-						forwardsCount,
-						reactions
-					})
-				}
+			case 'live_updates':
+				// Live view count / engagement update
+				const liveCount = parseInt(child.attrs.count || child.content?.toString() || '0', 10)
+				ev.emit('newsletter.live-update', {
+					id: from,
+					server_id: child.attrs.message_id || child.attrs.server_id,
+					liveViewers: liveCount,
+					timestamp: child.attrs.t ? +child.attrs.t : undefined
+				})
 				break
-			}
-			case 'pin': {
-				const pinnedServerId = child.attrs.message_id || child.attrs.server_id
-				const isPinned = child.attrs.action !== 'unpin'
+			case 'pin':
 				ev.emit('newsletter.pin', {
 					id: from,
-					server_id: pinnedServerId,
-					pinned: isPinned
+					server_id: child.attrs.message_id || child.attrs.server_id,
+					pinned: child.attrs.action !== 'unpin'
 				})
-				// Sync the pinnedMessage field on the newsletter metadata object
-				ev.emit('newsletters.update', [{ id: from, pinnedMessage: isPinned ? pinnedServerId : null }])
 				break
-			}
 			case 'category':
 				ev.emit('newsletter-settings.update', {
 					id: from,
@@ -440,88 +328,6 @@ const makeMessagesRecvSocket = config => {
 				break
 		}
 	}
-	// Handles incoming <status> stanzas pushed by the server for newsletter posts.
-	// These arrive on the CB:status channel (AB-gated by status_e2ee_recv_over_status_stanza).
-	const handleNewsletterStatus = async node => {
-		const { id, from, server_id, t, is_sender, offline, type, edit } = node.attrs
-		const serverId = server_id ? +server_id : undefined
-		const timestamp = t ? +t : undefined
-		const isSender = is_sender === 'true'
-		const offlineIndex = offline !== undefined ? +offline : undefined
-		// Cache messageId → serverId so the bot can look up server_id when a message is quoted
-		if (id && serverId != null) {
-			newsletterServerIdCache?.set(id, serverId)
-		}
-
-		// Parse optional <meta> child: edit timestamps, interaction type, admin profile
-		const metaNode = (0, WABinary_1.getBinaryNodeChild)(node, 'meta')
-		const meta = metaNode
-			? {
-					...(metaNode.attrs.msg_edit_t ? { editedAt: +metaNode.attrs.msg_edit_t } : {}),
-					...(metaNode.attrs.original_msg_t ? { originalTimestamp: +metaNode.attrs.original_msg_t } : {}),
-					...(metaNode.attrs.interaction_type ? { interactionType: metaNode.attrs.interaction_type } : {}),
-					...(metaNode.attrs.parent_server_id ? { parentServerId: +metaNode.attrs.parent_server_id } : {}),
-					...(metaNode.attrs.response_server_id ? { responseServerId: +metaNode.attrs.response_server_id } : {})
-				}
-			: undefined
-
-		// Parse engagement counters
-		const viewsNode = (0, WABinary_1.getBinaryNodeChild)(node, 'views_count')
-		const viewsCount = viewsNode?.attrs?.count !== undefined ? +viewsNode.attrs.count : undefined
-		const responsesNode = (0, WABinary_1.getBinaryNodeChild)(node, 'responses_count')
-		const responsesCount = responsesNode?.attrs?.count !== undefined ? +responsesNode.attrs.count : undefined
-		const reactionsNode = (0, WABinary_1.getBinaryNodeChild)(node, 'reactions')
-		const reactionCounts = (0, WABinary_1.getBinaryNodeChildren)(reactionsNode ?? { content: [] }, 'reaction').map(
-			r => ({ code: r.attrs.code, count: +r.attrs.count })
-		)
-
-		let content = null
-		let mediaType = undefined
-
-		if (type === 'reaction') {
-			const reactionNode = (0, WABinary_1.getBinaryNodeChild)(node, 'reaction')
-			content = { type: 'reaction', code: reactionNode?.attrs?.code }
-		} else if (type === 'text' || type === 'media') {
-			const plaintextNode = (0, WABinary_1.getBinaryNodeChild)(node, 'plaintext')
-			if (type === 'media') mediaType = plaintextNode?.attrs?.mediatype
-			if (edit === '7' || edit === '8') {
-				content = { type: 'revoke', edit }
-			} else if (plaintextNode?.content) {
-				try {
-					const buf = Buffer.isBuffer(plaintextNode.content)
-						? plaintextNode.content
-						: Buffer.from(plaintextNode.content)
-					const message = index_js_1.proto.Message.decode(buf).toJSON()
-					content = { type, message, ...(mediaType ? { mediaType } : {}) }
-				} catch (err) {
-					logger.error({ err }, 'Failed to decode newsletter status plaintext')
-					content = { type, raw: true, ...(mediaType ? { mediaType } : {}) }
-				}
-			}
-		}
-
-		// Send ACK back to server
-		const ackType = type === 'reaction' ? 'reaction' : edit ? 'revoke' : type
-		await sendNode({
-			tag: 'ack',
-			attrs: { id, to: from, class: 'status', type: ackType || 'text' },
-			content: undefined
-		})
-
-		ev.emit('newsletter.status', {
-			id: from,
-			messageId: id,
-			serverId,
-			timestamp,
-			isSender,
-			...(offlineIndex !== undefined ? { offlineIndex } : {}),
-			...(meta ? { meta } : {}),
-			...(viewsCount !== undefined ? { viewsCount } : {}),
-			...(responsesCount !== undefined ? { responsesCount } : {}),
-			...(reactionCounts.length ? { reactionCounts } : {}),
-			content
-		})
-	}
 	const sendMessageAck = async (node, errorCode) => {
 		const stanza = (0, stanza_ack_1.buildAckStanza)(node, errorCode, authState.creds.me.id)
 		logger.debug({ recv: { tag: node.tag, attrs: node.attrs }, sent: stanza.attrs }, 'sent ack')
@@ -871,9 +677,8 @@ const makeMessagesRecvSocket = config => {
 							id: node.attrs.id,
 							t: node.attrs.t,
 							v: '1',
-							// Confirmed from live capture: real retry receipts carry error="1"
-							// in the overwhelming majority of samples (1270/1273); "0" never observed.
-							error: '1'
+							// ADD ERROR FIELD
+							error: '0'
 						}
 					},
 					{
@@ -921,7 +726,7 @@ const makeMessagesRecvSocket = config => {
 			const tcJid = await (0, tc_token_utils_1.resolveTcTokenJid)(normalizedJid, getLIDForPN)
 			const tcTokenData = await authState.keys.get('tctoken', [tcJid])
 			const senderTs = tcTokenData?.[tcJid]?.senderTimestamp
-			if (senderTs == null || (0, tc_token_utils_1.isTcTokenExpired)(senderTs)) {
+			if (senderTs === null || senderTs === undefined || (0, tc_token_utils_1.isTcTokenExpired)(senderTs)) {
 				return
 			}
 			logger.debug({ jid: normalizedJid, senderTimestamp: senderTs }, 'identity changed, re-issuing tctoken')
@@ -969,21 +774,8 @@ const makeMessagesRecvSocket = config => {
 			}
 		}
 	}
-	// Group participant nodes carry authoritative LID<->PN pairs (jid + phone_number/lid
-	// attrs). Persist them so PN<->LID resolution elsewhere doesn't need a usync round trip.
-	const storeParticipantLidPairs = participants => {
-		const pairs = []
-		for (const p of participants || []) {
-			if (p.phoneNumber) pairs.push({ lid: p.id, pn: p.phoneNumber })
-			else if (p.lid) pairs.push({ lid: p.lid, pn: p.id })
-		}
-		if (!pairs.length) return
-		signalRepository.lidMapping
-			.storeLIDPNMappings(pairs)
-			.catch(error => logger.debug({ error }, 'failed to store LID/PN mappings from group notification'))
-	}
 	const handleGroupNotification = (fullNode, child, msg) => {
-		// PN/LID: acting + affected participant already resolved below via participant_pn/lid attrs
+		// TODO: Support PN/LID (Here is only LID now)
 		const actingParticipantLid = fullNode.attrs.participant
 		const actingParticipantPn = fullNode.attrs.participant_pn
 		const actingParticipantUsername = fullNode.attrs.participant_username
@@ -997,7 +789,6 @@ const makeMessagesRecvSocket = config => {
 				msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE
 				msg.messageStubParameters = [metadata.subject]
 				msg.key = { participant: metadata.owner, participantAlt: metadata.ownerPn }
-				storeParticipantLidPairs(metadata.participants)
 				ev.emit('chats.upsert', [
 					{
 						id: metadata.id,
@@ -1036,6 +827,7 @@ const makeMessagesRecvSocket = config => {
 				const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`
 				msg.messageStubType = Types_1.WAMessageStubType[stubType]
 				const participants = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(({ attrs }) => {
+					// TODO: Store LID MAPPINGS
 					return {
 						id: attrs.jid,
 						phoneNumber:
@@ -1044,8 +836,7 @@ const makeMessagesRecvSocket = config => {
 								: undefined,
 						lid: (0, WABinary_1.isPnUser)(attrs.jid) && (0, WABinary_1.isLidUser)(attrs.lid) ? attrs.lid : undefined,
 						username: attrs.participant_username || attrs.username || undefined,
-						admin: attrs.type || null,
-						uuid: attrs.uuid || attrs.participant_uuid || undefined
+						admin: attrs.type || null
 					}
 				})
 				if (
@@ -1058,7 +849,6 @@ const makeMessagesRecvSocket = config => {
 				) {
 					msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE
 				}
-				storeParticipantLidPairs(participants)
 				msg.messageStubParameters = participants.map(a => JSON.stringify(a))
 				break
 			case 'subject':
@@ -1108,51 +898,13 @@ const makeMessagesRecvSocket = config => {
 				break
 			case 'revoked_membership_requests':
 				const isDenied = (0, WABinary_1.areJidsSameUser)(affectedParticipantLid, actingParticipantLid)
-				if ((0, WABinary_1.isLidUser)(affectedParticipantLid) && (0, WABinary_1.isPnUser)(affectedParticipantPn)) {
-					storeParticipantLidPairs([{ id: affectedParticipantLid, phoneNumber: affectedParticipantPn }])
-				}
+				// TODO: LIDMAPPING SUPPORT
 				msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD
 				msg.messageStubParameters = [
 					JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
 					isDenied ? 'revoked' : 'rejected'
 				]
 				break
-			case 'sibling_link': {
-				const linkedGroupJid = (0, WABinary_1.getBinaryNodeChild)(child, 'group')?.attrs?.jid || child.attrs?.jid
-				ev.emit('groups.update', [
-					{
-						id: fullNode.attrs.from,
-						siblingGroupLinked: linkedGroupJid || true,
-						author: actingParticipantLid,
-						authorPn: actingParticipantPn
-					}
-				])
-				break
-			}
-			case 'sibling_unlink': {
-				const unlinkedGroupJid = (0, WABinary_1.getBinaryNodeChild)(child, 'group')?.attrs?.jid || child.attrs?.jid
-				ev.emit('groups.update', [
-					{
-						id: fullNode.attrs.from,
-						siblingGroupUnlinked: unlinkedGroupJid || true,
-						author: actingParticipantLid,
-						authorPn: actingParticipantPn
-					}
-				])
-				break
-			}
-			case 'clear_history': {
-				const historyClearTimestamp = child.attrs?.t ? +child.attrs.t : (0, Date)()
-				ev.emit('groups.update', [
-					{
-						id: fullNode.attrs.from,
-						historyClearTimestamp,
-						author: actingParticipantLid,
-						authorPn: actingParticipantPn
-					}
-				])
-				break
-			}
 		}
 	}
 	const normalizeNotificationParticipant = async (jid, groupData) => {
@@ -1326,17 +1078,15 @@ const makeMessagesRecvSocket = config => {
 		if (childTag === 'peer_device_presence') {
 			const jid = attrs.jid || (0, WABinary_1.jidNormalizedUser)(node.attrs.from)
 			const presence = attrs.type === 'unavailable' ? 'unavailable' : 'available'
-			const isIosInterop = !!authState.creds.interopIosEnabled
-			logger.debug({ jid, presence, isIosInterop }, '[interop] peer_device_presence')
-			ev.emit('presence.update', { id: jid, presences: { [jid]: { lastKnownPresence: presence } }, isIosInterop })
+			logger.debug({ jid, presence }, '[interop] peer_device_presence')
+			ev.emit('presence.update', { id: jid, presences: { [jid]: { lastKnownPresence: presence } } })
 			return
 		}
 
 		// fbid:thread / fbid:devices — Meta thread or device list association
 		if (childTag === 'fbid_thread' || childTag === 'fbid_devices') {
-			const isIosInterop = !!authState.creds.interopIosEnabled
-			logger.debug({ childTag, attrs, from: node.attrs.from, isIosInterop }, '[interop] fbid association update')
-			ev.emit('interop.fbid-update', { type: childTag, jid: node.attrs.from, attrs, isIosInterop })
+			logger.debug({ childTag, attrs, from: node.attrs.from }, '[interop] fbid association update')
+			ev.emit('interop.fbid-update', { type: childTag, jid: node.attrs.from, attrs })
 			return
 		}
 
@@ -1363,24 +1113,10 @@ const makeMessagesRecvSocket = config => {
 				await handleNewsletterNotification(node)
 				break
 			case 'mex':
-				await handleMexNotification(node)
+				await handleMexNewsletterNotification(node)
 				break
 			case 'w:gp2':
-				if (child?.tag === 'groups_dirty') {
-					// Bulk "these groups are stale, refetch" signal — not a per-group stub message,
-					// so it doesn't go through handleGroupNotification (which assumes a single group).
-					const dirtyGroupJids = (0, WABinary_1.getBinaryNodeChildren)(child, 'group')
-						.map(g => g.attrs.jid)
-						.filter(Boolean)
-					if (dirtyGroupJids.length) {
-						ev.emit(
-							'groups.update',
-							dirtyGroupJids.map(jid => ({ id: jid }))
-						)
-					}
-					break
-				}
-				// PN/LID resolution for participant fields happens below via normalizeNotificationResult
+				// TODO: HANDLE PARTICIPANT_PN
 				const groupData = await getNotificationGroupData(node)
 				handleGroupNotification(node, child, result)
 
@@ -1393,39 +1129,26 @@ const makeMessagesRecvSocket = config => {
 			case 'encrypt':
 				await handleEncryptNotification(node)
 				break
-			case 'devices': {
-				// child = <add> or <remove> — neither carries jid/lid, owner is node.attrs.from.
-				// A third variant, <update hash="..."/>, carries no device list at all (just a
-				// device-list hash refresh) — don't misreport it as "removed nothing".
-				const addNode = (0, WABinary_1.getBinaryNodeChild)(node, 'add')
-				const removeNode = (0, WABinary_1.getBinaryNodeChild)(node, 'remove')
-				const changedNode = addNode || removeNode
-				if (!changedNode) {
-					logger.debug({ node }, 'devices hash refresh, no add/remove list to report')
-					break
-				}
-				const isAdded = !!addNode
-				const devices = (0, WABinary_1.getBinaryNodeChildren)(changedNode, 'device')
-				const deviceOwnerJid = from
+			case 'devices':
+				const devices = (0, WABinary_1.getBinaryNodeChildren)(child, 'device')
+				const deviceOwnerJid = child.attrs.jid || child.attrs.lid
 				const deviceData = devices.map(d => ({
 					id: d.attrs.jid,
 					lid: d.attrs.lid,
-					// wire attr is "key-index" (hyphen), not "key_index"
-					keyIndex: d.attrs['key-index'] ? +d.attrs['key-index'] : undefined,
+					keyIndex: d.attrs.key_index ? +d.attrs.key_index : undefined,
 					platform: d.attrs.platform || undefined,
 					isCompanion: d.attrs.companion === 'true' || undefined
 				}))
-				const isSelf =
-					(0, WABinary_1.areJidsSameUser)(from, authState.creds.me?.id) ||
-					(0, WABinary_1.areJidsSameUser)(from, authState.creds.me?.lid)
-				if (isSelf) {
-					logger.info({ deviceData, isAdded }, 'my own devices changed')
-				}
-				if (deviceOwnerJid) {
-					ev.emit('devices.update', { id: deviceOwnerJid, devices: deviceData, isSelf, added: isAdded })
+				if (
+					(0, WABinary_1.areJidsSameUser)(child.attrs.jid, authState.creds.me.id) ||
+					(0, WABinary_1.areJidsSameUser)(child.attrs.lid, authState.creds.me.lid)
+				) {
+					logger.info({ deviceData }, 'my own devices changed')
+					ev.emit('devices.update', { id: deviceOwnerJid, devices: deviceData, isSelf: true })
+				} else if (deviceOwnerJid) {
+					ev.emit('devices.update', { id: deviceOwnerJid, devices: deviceData, isSelf: false })
 				}
 				break
-			}
 			case 'server_sync':
 				const update = (0, WABinary_1.getBinaryNodeChild)(node, 'collection')
 				if (update) {
@@ -1433,18 +1156,13 @@ const makeMessagesRecvSocket = config => {
 					await resyncAppState([name], false)
 				}
 				break
-			case 'picture': {
+			case 'picture':
 				const setPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'set')
 				const delPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'delete')
-				const pictureOwnerJid = (0, WABinary_1.jidNormalizedUser)(node?.attrs?.from)
-				if (!pictureOwnerJid) {
-					// a picture content hash is not a valid contact id — nothing usable to emit without "from"
-					logger.debug({ node }, 'picture notification missing "from", skipping contacts.update')
-					break
-				}
+				// TODO: WAJIDHASH stuff proper support inhouse
 				ev.emit('contacts.update', [
 					{
-						id: pictureOwnerJid,
+						id: (0, WABinary_1.jidNormalizedUser)(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || '',
 						imgUrl: setPicture ? 'changed' : 'removed'
 					}
 				])
@@ -1461,7 +1179,6 @@ const makeMessagesRecvSocket = config => {
 					}
 				}
 				break
-			}
 			case 'account_sync':
 				if (child.tag === 'disappearing_mode') {
 					const newDuration = +child.attrs.duration
@@ -1477,60 +1194,18 @@ const makeMessagesRecvSocket = config => {
 						}
 					})
 				} else if (child.tag === 'blocklist') {
-					// Real wire shape is <blocklist action="modify" addressing_mode="lid"/> with
-					// no per-entry children — it's a "your blocklist changed, go refetch it" signal,
-					// not an inline diff. Re-fetch and let fetchBlocklist emit the refreshed list.
-					sock.fetchBlocklist().catch(error => logger.warn({ error }, 'failed to refresh blocklist after account_sync'))
-				} else if (child.tag === 'devices') {
-					// Full device-list sync: all linked devices + signed key-index-list.
-					// Sent when a device is added, removed, or key index changes.
-					const dhash = child.attrs.dhash
-					const deviceNodes = (0, WABinary_1.getBinaryNodeChildren)(child, 'device')
-					const keyIndexListNode = (0, WABinary_1.getBinaryNodeChild)(child, 'key-index-list')
-					const devices = deviceNodes.map(d => ({
-						jid: d.attrs.jid ? String(d.attrs.jid) : undefined,
-						keyIndex: d.attrs['key-index'] ? +d.attrs['key-index'] : undefined
-					}))
-					logger.info({ dhash, deviceCount: devices.length }, 'account devices list synced')
-					ev.emit('account.devices-synced', {
-						dhash,
-						devices,
-						keyIndexListTimestamp: keyIndexListNode?.attrs?.ts ? +keyIndexListNode.attrs.ts : undefined,
-						keyIndexList: keyIndexListNode?.content ? Buffer.from(keyIndexListNode.content) : undefined
-					})
-				}
-				break
-			case 'disappearing_mode': {
-				// Same payload as the account_sync-nested variant above, but WhatsApp also
-				// pushes it as its own top-level notification type on some accounts.
-				const newDuration = +child.attrs.duration
-				const timestamp = +child.attrs.t
-				logger.info({ newDuration }, 'updated account disappearing mode')
-				ev.emit('creds.update', {
-					accountSettings: {
-						...authState.creds.accountSettings,
-						defaultDisappearingMode: {
-							ephemeralExpiration: newDuration,
-							ephemeralSettingTimestamp: timestamp
-						}
+					const blocklists = (0, WABinary_1.getBinaryNodeChildren)(child, 'item')
+					for (const { attrs } of blocklists) {
+						const blocklist = [attrs.jid]
+						const type = attrs.action === 'block' ? 'add' : 'remove'
+						ev.emit('blocklist.update', { blocklist, type })
 					}
-				})
-				break
-			}
-			case 'contacts': {
-				// <update jid="..."/> = single contact touched; <update hash="..."/> or a
-				// sibling <sync after="..."/> = list-level signal with no actionable jid.
-				const updateChild = (0, WABinary_1.getBinaryNodeChild)(node, 'update')
-				if (updateChild?.attrs?.jid) {
-					ev.emit('contacts.update', [{ id: (0, WABinary_1.jidNormalizedUser)(updateChild.attrs.jid) }])
-				} else {
-					logger.debug({ node }, 'contacts list changed (hash/sync signal), no per-contact jid to update')
 				}
 				break
-			}
 			case 'business':
+				// SMB privacy / data-sharing settings sync push
+				// (WhatsApp Web: WASmaxInBizSettingsSyncPrivacySettingRequest)
 				if (child?.tag === 'privacy') {
-					// SMB privacy / data-sharing settings sync push
 					ev.emit('business.privacy-settings-sync', {
 						jid: from,
 						categories: (0, WABinary_1.getBinaryNodeChildren)(child, 'category').map(c => ({
@@ -1539,32 +1214,6 @@ const makeMessagesRecvSocket = config => {
 						})),
 						attrs: child.attrs
 					})
-				} else if (child?.tag === 'profile') {
-					// Business profile updated for a contact (tag = profile version hash)
-					ev.emit('contacts.update', [
-						{
-							id: (0, WABinary_1.jidNormalizedUser)(child.attrs.jid || from),
-							businessProfileTag: child.attrs.tag
-						}
-					])
-				} else if (child?.tag === 'verified_name') {
-					// Verified business name changed — content is a proto payload
-					ev.emit('contacts.update', [
-						{
-							id: (0, WABinary_1.jidNormalizedUser)(child.attrs.jid || from),
-							verifiedName: {
-								verifiedLevel: child.attrs.verified_level,
-								serial: child.attrs.serial,
-								version: child.attrs.v
-							}
-						}
-					])
-				} else if (child?.tag === 'remove') {
-					// Business account downgraded/removed. <remove jid="..."/> names the account;
-					// <remove hash="..."/> is a list-level signal with no actionable jid.
-					if (child.attrs.jid) {
-						ev.emit('contacts.update', [{ id: (0, WABinary_1.jidNormalizedUser)(child.attrs.jid), isBusiness: false }])
-					}
 				}
 				break
 			case 'hosted':
@@ -1838,10 +1487,11 @@ const makeMessagesRecvSocket = config => {
 		const newValue = ((await msgRetryCache.get(key)) || 0) + 1
 		await msgRetryCache.set(key, newValue)
 	}
-	const sendMessagesAgain = async (key, ids, retryNode) => {
+	const sendMessagesAgain = async (key, ids, retryNode, receiptNode) => {
 		const remoteJid = key.remoteJid
 		const participant = key.participant || remoteJid
 		const retryCount = +retryNode.attrs.count || 1
+		const msgId = ids[0]
 		// Try to get messages from cache first, then fallback to getMessage
 		const msgs = []
 		for (const id of ids) {
@@ -1873,12 +1523,53 @@ const makeMessagesRecvSocket = config => {
 		// just re-send the message to everyone
 		// prevents the first message decryption failure
 		const sendToAll = !(0, WABinary_1.jidDecode)(participant)?.device
+		const sessionId = signalRepository.jidToSignalProtocolAddress(participant)
+		let injectedFromBundle = false
+		if (typeof signalRepository.injectE2ESession === 'function' && typeof Utils_1.extractE2ESessionFromRetryReceipt === 'function') {
+			const bundle = Utils_1.extractE2ESessionFromRetryReceipt(receiptNode)
+			if (bundle) {
+				try {
+					await signalRepository.injectE2ESession({ jid: participant, session: bundle })
+					injectedFromBundle = true
+					logger.debug({ participant, retryCount }, 'injected session from retry receipt key bundle')
+				} catch (error) {
+					logger.warn({ error, participant }, 'failed to inject session from retry receipt')
+				}
+			}
+		}
+		if (!injectedFromBundle && signalRepository.getSessionInfo) {
+			const receivedRegId = (0, WABinary_1.getBinaryNodeChildUInt)(receiptNode, 'registration', 4)
+			if (typeof receivedRegId === 'number' && Number.isInteger(receivedRegId)) {
+				const info = await signalRepository.getSessionInfo(participant)
+				if (info && info.registrationId !== 0 && info.registrationId !== receivedRegId) {
+					logger.info(
+						{ participant, stored: info.registrationId, received: receivedRegId },
+						'reg id mismatch on retry without bundle, deleting session'
+					)
+					await authState.keys.set({ session: { [sessionId]: null } })
+				}
+			}
+		}
+		const BASE_KEY_CHECK_RETRY = 2
+		if (msgId && messageRetryManager && signalRepository.getSessionInfo) {
+			const info = await signalRepository.getSessionInfo(participant)
+			if (info) {
+				if (retryCount === BASE_KEY_CHECK_RETRY) {
+					messageRetryManager.saveBaseKey(sessionId, msgId, info.baseKey)
+				} else if (retryCount > BASE_KEY_CHECK_RETRY) {
+					if (messageRetryManager.hasSameBaseKey(sessionId, msgId, info.baseKey)) {
+						logger.warn({ participant, retryCount }, 'base key collision on retry, forcing fresh session')
+						await authState.keys.set({ session: { [sessionId]: null } })
+					}
+					messageRetryManager.deleteBaseKey(sessionId, msgId)
+				}
+			}
+		}
 		// Check if we should recreate session for this retry
 		let shouldRecreateSession = false
 		let recreateReason = ''
-		if (enableAutoSessionRecreation && messageRetryManager && retryCount > 1) {
+		if (enableAutoSessionRecreation && messageRetryManager && retryCount > 1 && !injectedFromBundle) {
 			try {
-				const sessionId = signalRepository.jidToSignalProtocolAddress(participant)
 				const hasSession = await signalRepository.validateSession(participant)
 				const result = messageRetryManager.shouldRecreateSession(participant, hasSession.exists)
 				shouldRecreateSession = result.recreate
@@ -1891,7 +1582,9 @@ const makeMessagesRecvSocket = config => {
 				logger.warn({ error, participant }, 'failed to check session recreation for outgoing retry')
 			}
 		}
-		await assertSessions([participant], true)
+		if (!injectedFromBundle) {
+			await assertSessions([participant], true)
+		}
 		if ((0, WABinary_1.isJidGroup)(remoteJid)) {
 			await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } })
 		}
@@ -1940,51 +1633,6 @@ const makeMessagesRecvSocket = config => {
 			const items = (0, WABinary_1.getBinaryNodeChildren)(content[0], 'item')
 			ids.push(...items.map(i => i.attrs.id))
 		}
-		// E. Media Retry Notification Receipt
-		// Server tells us a specific message's media should be re-fetched
-		if (attrs.type === 'media-retry') {
-			const mediaRetryNode =
-				(0, WABinary_1.getBinaryNodeChild)(node, 'media-retry') ||
-				(0, WABinary_1.getBinaryNodeChild)(node, 'media_retry')
-			ev.emit('messages.media-retry', {
-				ids,
-				from: attrs.from,
-				participant: attrs.participant,
-				t: attrs.t,
-				retryAttrs: mediaRetryNode?.attrs
-			})
-			await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack media-retry receipt'))
-			return
-		}
-		// F. Server Error Receipt
-		// Server signals a delivery error for one or more messages
-		if (attrs.type === 'server-error') {
-			const errorNode = (0, WABinary_1.getBinaryNodeChild)(node, 'error')
-			ev.emit('messages.server-error', {
-				ids,
-				from: attrs.from,
-				participant: attrs.participant,
-				t: attrs.t,
-				errorCode: errorNode?.attrs?.code || attrs.error_code,
-				errorText: errorNode?.attrs?.text || errorNode?.content?.toString?.()
-			})
-			await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack server-error receipt'))
-			return
-		}
-		// D. Receipt aggregation
-		// Server sent a batched-receipt (receipt_agg attr) — emit dedicated event AND fall through
-		// to the normal status-update pipeline so all IDs in the batch get their status updated.
-		if (attrs.receipt_agg) {
-			ev.emit('receipt.batched', {
-				ids,
-				from: attrs.from,
-				participant: attrs.participant,
-				type: attrs.type,
-				t: attrs.t,
-				receiptAgg: attrs.receipt_agg
-			})
-			// Do not return — let all IDs be processed by the normal receipt path below.
-		}
 		try {
 			await Promise.all([
 				receiptMutex.mutex(async () => {
@@ -2029,7 +1677,7 @@ const makeMessagesRecvSocket = config => {
 								try {
 									await updateSendMessageAgainCount(ids[0], key.participant)
 									logger.debug({ attrs, key }, 'recv retry request')
-									await sendMessagesAgain(key, ids, retryNode)
+									await sendMessagesAgain(key, ids, retryNode, node)
 								} catch (error) {
 									logger.error(
 										{ key, ids, trace: error instanceof Error ? error.stack : 'Unknown error' },
@@ -2419,19 +2067,6 @@ const makeMessagesRecvSocket = config => {
 			}
 		}
 	}
-	// group_info roster: <group_info><user jid=.. state=.. user_pn=..><device jid=..
-	// platform=..><capability ver=../></device></user>...</group_info>. Baileys previously
-	// only kept the flat group_info-level attrs (call.payload), dropping the roster entirely.
-	const parseGroupCallRoster = groupInfoNode =>
-		(0, WABinary_1.getBinaryNodeChildren)(groupInfoNode, 'user').map(userNode => ({
-			jid: userNode.attrs.jid,
-			state: userNode.attrs.state,
-			userPn: userNode.attrs.user_pn,
-			devices: (0, WABinary_1.getBinaryNodeChildren)(userNode, 'device').map(d => ({
-				jid: d.attrs.jid,
-				platform: d.attrs.platform
-			}))
-		}))
 	const handleCall = async node => {
 		try {
 			const { attrs } = node
@@ -2459,45 +2094,10 @@ const makeMessagesRecvSocket = config => {
 				}
 			}
 			if (status === 'offer') {
-				const videoNode = (0, WABinary_1.getBinaryNodeChild)(infoChild, 'video')
-				const audioNodes = (0, WABinary_1.getBinaryNodeChildren)(infoChild, 'audio')
-				const silenceNode = (0, WABinary_1.getBinaryNodeChild)(infoChild, 'silence')
-				call.isVideo = !!videoNode
+				call.isVideo = !!(0, WABinary_1.getBinaryNodeChild)(infoChild, 'video')
 				call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid']
 				call.groupJid = infoChild.attrs['group-jid']
-				// lightweight=1 marks a silent/wave-style group ring (no full ringing UX expected)
-				call.isLightweight = infoChild.attrs.lightweight === '1'
-				if (silenceNode?.attrs?.reason) {
-					call.silenceReason = silenceNode.attrs.reason
-				}
-				// Wire attrs are "enc"/"rate" (audio) and "dec" (video) — not "codec".
-				// <audio> can repeat once per supported sample rate.
-				if (audioNodes.length) {
-					call.audioCodecs = audioNodes.map(n => ({ enc: n.attrs.enc, rate: n.attrs.rate ? +n.attrs.rate : undefined }))
-					call.audioCodec = audioNodes[0].attrs.enc
-				}
-				if (videoNode?.attrs?.dec) {
-					call.videoCodec = videoNode.attrs.dec
-				}
-				// Decrypt Signal-encrypted callKey from <enc> child
-				const encNode = (0, WABinary_1.getBinaryNodeChild)(infoChild, 'enc')
-				if (encNode?.content) {
-					try {
-						const encType = encNode.attrs.type || 'msg'
-						const ciphertext = Buffer.isBuffer(encNode.content) ? encNode.content : Buffer.from(encNode.content)
-						const decrypted = await signalRepository.decryptMessage({ jid: attrs.from, type: encType, ciphertext })
-						const unpadded = (0, Utils_1.unpadRandomMax16)(decrypted)
-						const callMsg = index_js_1.proto.Message.decode(unpadded)
-						if (callMsg?.call?.callKey?.length) {
-							call.callKey = Buffer.from(callMsg.call.callKey)
-						}
-					} catch (e) {
-						logger.debug({ e }, 'failed to decrypt call enc')
-					}
-				}
 				await callOfferCache.set(call.id, call)
-			} else if (status === 'waiting_room_request') {
-				call.peerJid = infoChild.attrs.from || infoChild.attrs['peer-jid'] || infoChild.attrs['user-jid']
 			}
 			const existingCall = await callOfferCache.get(call.id)
 			// use existing call info to populate this event
@@ -2506,41 +2106,8 @@ const makeMessagesRecvSocket = config => {
 				call.isGroup = existingCall.isGroup
 				call.callerPn = call.callerPn || existingCall.callerPn
 			}
-			// Enrich event payload for signalling-only statuses
-			if (status === 'peer_state') {
-				const stateChild = (0, WABinary_1.getBinaryNodeChild)(infoChild, 'peer_state')
-				call.state = stateChild?.attrs?.state || infoChild.attrs?.state
-			} else if (status === 'group_info') {
-				call.payload = infoChild.attrs
-				call.participants = parseGroupCallRoster(infoChild)
-			} else if (status === 'video_state') {
-				const vsChild = (0, WABinary_1.getBinaryNodeChild)(infoChild, 'video_state')
-				const enabledRaw = vsChild?.attrs?.enabled ?? infoChild.attrs?.enabled
-				call.enabled = enabledRaw === 'true' || enabledRaw === '1'
-			} else if (status === 'enc_rekey') {
-				const rekeyChild =
-					(0, WABinary_1.getBinaryNodeChild)(infoChild, 'enc-rekey') ||
-					(0, WABinary_1.getBinaryNodeChild)(infoChild, 'enc_rekey')
-				if (rekeyChild?.content && Buffer.isBuffer(rekeyChild.content)) {
-					try {
-						call.rekeyPayload = (0, Utils_1.decodeE2eRekeyPayload)(rekeyChild.content)
-					} catch (e) {
-						logger.debug({ e }, 'failed to decode enc-rekey payload in handleCall')
-					}
-				}
-			}
 			// delete data once call has ended
-			if (
-				status === 'reject' ||
-				status === 'accept' ||
-				status === 'timeout' ||
-				status === 'terminate' ||
-				status === 'reject_do_not_disturb' ||
-				status === 'mic_permission_denied' ||
-				status === 'camera_permission_denied' ||
-				status === 'remote_busy' ||
-				status === 'remote_offline'
-			) {
+			if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
 				await callOfferCache.del(call.id)
 			}
 			await normalizeCallEventJids(call, infoChild)
@@ -2555,24 +2122,7 @@ const makeMessagesRecvSocket = config => {
 	// <mute_v2>, <transport>, … each with a call-id) instead of wrapped in <call>.
 	// This additively handles those: emit a 'call' event for state stanzas and ack ALL
 	// of them (otherwise WhatsApp keeps redelivering). The <call> path above is untouched.
-	const CALL_STATE_TAGS = new Set([
-		'offer',
-		'offer_notice',
-		'terminate',
-		'accept',
-		'reject',
-		'preaccept',
-		'accept_ack',
-		'enc-rekey',
-		'enc_rekey',
-		'peer_state',
-		'group_info',
-		'video_state',
-		'video_state_ack',
-		'flow_control',
-		'mute_v2',
-		'waiting_room_request'
-	])
+	const CALL_STATE_TAGS = new Set(['offer', 'offer_notice', 'terminate', 'accept', 'reject', 'preaccept'])
 	const handleStandaloneCallStanza = async node => {
 		try {
 			if (!CALL_STATE_TAGS.has(node.tag)) {
@@ -2592,24 +2142,9 @@ const makeMessagesRecvSocket = config => {
 				status
 			}
 			if (status === 'offer') {
-				const videoNode = (0, WABinary_1.getBinaryNodeChild)(node, 'video')
-				const audioNodes = (0, WABinary_1.getBinaryNodeChildren)(node, 'audio')
-				const silenceNode = (0, WABinary_1.getBinaryNodeChild)(node, 'silence')
-				call.isVideo = !!videoNode
+				call.isVideo = !!(0, WABinary_1.getBinaryNodeChild)(node, 'video')
 				call.isGroup = attrs.type === 'group' || !!attrs['group-jid']
 				call.groupJid = attrs['group-jid']
-				call.isLightweight = attrs.lightweight === '1'
-				if (silenceNode?.attrs?.reason) {
-					call.silenceReason = silenceNode.attrs.reason
-				}
-				// Wire attrs are "enc"/"rate" (audio) and "dec" (video) — not "codec".
-				if (audioNodes.length) {
-					call.audioCodecs = audioNodes.map(n => ({ enc: n.attrs.enc, rate: n.attrs.rate ? +n.attrs.rate : undefined }))
-					call.audioCodec = audioNodes[0].attrs.enc
-				}
-				if (videoNode?.attrs?.dec) {
-					call.videoCodec = videoNode.attrs.dec
-				}
 				if (callId) {
 					await callOfferCache.set(callId, call)
 				}
@@ -2620,45 +2155,7 @@ const makeMessagesRecvSocket = config => {
 				call.isGroup = existingCall.isGroup
 				call.callerPn = call.callerPn || existingCall.callerPn
 			}
-			// Enrich event payload for signalling-only statuses
-			if (status === 'peer_state') {
-				const stateChild = (0, WABinary_1.getBinaryNodeChild)(node, 'peer_state')
-				call.state = stateChild?.attrs?.state || attrs?.state
-			} else if (status === 'group_info') {
-				call.payload = attrs
-				call.participants = parseGroupCallRoster(node)
-			} else if (status === 'video_state') {
-				const vsChild = (0, WABinary_1.getBinaryNodeChild)(node, 'video_state')
-				const enabledRaw = vsChild?.attrs?.enabled ?? attrs?.enabled
-				call.enabled = enabledRaw === 'true' || enabledRaw === '1'
-			} else if (status === 'enc_rekey') {
-				const rekeyChild =
-					(0, WABinary_1.getBinaryNodeChild)(node, 'enc-rekey') || (0, WABinary_1.getBinaryNodeChild)(node, 'enc_rekey')
-				if (rekeyChild?.content && Buffer.isBuffer(rekeyChild.content)) {
-					try {
-						call.rekeyPayload = (0, Utils_1.decodeE2eRekeyPayload)(rekeyChild.content)
-					} catch (e) {
-						logger.debug({ e }, 'failed to decode enc-rekey payload in standalone call stanza')
-					}
-				}
-			} else if (status === 'mute') {
-				// mute_v2 IS the top-level tag on real traffic (no wrapping/nested child) —
-				// attrs are { call-id, call-creator, mute-state: "0"|"1" }, never
-				// muted/audio_muted, and there's no nested <audio> child.
-				call.muted = node.attrs['mute-state'] === '1'
-			}
-			if (
-				callId &&
-				(status === 'reject' ||
-					status === 'accept' ||
-					status === 'timeout' ||
-					status === 'terminate' ||
-					status === 'reject_do_not_disturb' ||
-					status === 'mic_permission_denied' ||
-					status === 'camera_permission_denied' ||
-					status === 'remote_busy' ||
-					status === 'remote_offline')
-			) {
+			if (callId && (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate')) {
 				await callOfferCache.del(callId)
 			}
 			await normalizeCallEventJids(call, node)
@@ -2727,37 +2224,6 @@ const makeMessagesRecvSocket = config => {
 			// }
 		}
 	}
-	const handleChatstate = async node => {
-		const { from, state } = node.attrs
-		if (!from) return
-		const isTyping = state === 'typing'
-		ev.emit('presence.update', [
-			{
-				id: from,
-				presences: {
-					[from]: isTyping ? 'composing' : 'paused'
-				}
-			}
-		])
-	}
-	const handlePresence = async node => {
-		const { from, type } = node.attrs
-		if (!from || !type) return
-		const presenceMap = {
-			available: 'available',
-			unavailable: 'unavailable'
-		}
-		const presence = presenceMap[type] || type
-		ev.emit('presence.update', [
-			{
-				id: from,
-				presences: {
-					[from]: presence
-				},
-				lastSeen: node.attrs.t ? Number(node.attrs.t) * 1000 : undefined
-			}
-		])
-	}
 	/// processes a node with the given function
 	/// and adds the task to the existing buffer if we're buffering events
 	const processNodeWithBuffer = async (node, identifier, exec) => {
@@ -2809,33 +2275,8 @@ const makeMessagesRecvSocket = config => {
 	})
 	// additive: top-level call-signalling stanzas (some accounts send these instead of <call>)
 	for (const callTag of [
-		'offer',
-		'offer_notice',
-		'terminate',
-		'accept',
-		'reject',
-		'preaccept',
-		'accept_ack',
-		'enc-rekey',
-		'enc_rekey',
-		'peer_state',
-		'group_info',
-		'video_state',
-		'video_state_ack',
-		'flow_control',
-		'transport',
-		'video',
-		'duration',
-		'mute_v2',
-		'lobby',
-		'heartbeat',
-		'relaylatency',
-		'link_query',
-		'waiting_room_request',
-		// Present in Utils/stanza-ack.js's CALL_STANZA_TAGS (ack builder already treats it as a
-		// call stanza) but was missing here — meant it was never routed/acked, so real traffic
-		// (confirmed via live capture) would just get redelivered forever.
-		'group_update'
+		'offer', 'offer_notice', 'terminate', 'accept', 'reject', 'preaccept',
+		'transport', 'video', 'duration', 'mute_v2', 'lobby', 'heartbeat', 'relaylatency', 'link_query'
 	]) {
 		ws.on('CB:' + callTag, node => {
 			nodelogger(node)
@@ -2850,18 +2291,6 @@ const makeMessagesRecvSocket = config => {
 		nodelogger(node)
 		await processNode('notification', node, 'handling notification', handleNotification)
 	})
-	ws.on('CB:status', async node => {
-		nodelogger(node)
-		await handleNewsletterStatus(node).catch(error => onUnexpectedError(error, 'handling newsletter status'))
-	})
-	ws.on('CB:chatstate', async node => {
-		nodelogger(node)
-		await handleChatstate(node).catch(error => onUnexpectedError(error, 'handling chatstate'))
-	})
-	ws.on('CB:presence', async node => {
-		nodelogger(node)
-		await handlePresence(node).catch(error => onUnexpectedError(error, 'handling presence'))
-	})
 	ws.on('CB:ack,class:message', node => {
 		nodelogger(node)
 		handleBadAck(node).catch(error => onUnexpectedError(error, 'handling bad ack'))