fix: move clearTimeout to finally block in fetchLatestBaileysVersion

Ensures timer cleanup on both success and fetch rejection paths, preventing dangling timers when DNS/network fails before abort fires. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
fix: add timeout to fetchLatestBaileysVersion to prevent hanging connections
2026-03-01 09:37:48 -03:00 · 2026-03-01 09:27:16 -03:00
29 changed files with 1265 additions and 4991 deletions
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package proto;
-/// WhatsApp Version: 2.3000.1035216863
+/// WhatsApp Version: 2.3000.1034238531
 message ADVDeviceIdentity {
    optional uint32 rawId = 1;
@@ -74,7 +74,6 @@ message AIMediaCollectionMessage {
 message AIMediaCollectionMetadata {
    optional string collectionId = 1;
    optional uint32 uploadOrderIndex = 2;
 }
 message AIQueryFanout {
@@ -252,12 +251,10 @@ message AIThreadInfo {
    optional AIThreadClientInfo clientInfo = 2;
    message AIThreadClientInfo {
        optional AIThreadType type = 1;
        optional string sourceChatJid = 2;
        enum AIThreadType {
            UNKNOWN = 0;
            DEFAULT = 1;
            INCOGNITO = 2;
            SIDE_CHAT = 3;
        }
    }
@@ -345,14 +342,6 @@ message BotAgeCollectionMetadata {
    }
 }
 message BotAgentDeepLinkMetadata {
    optional string token = 1;
 }
 message BotAgentMetadata {
    optional BotAgentDeepLinkMetadata deepLinkMetadata = 1;
 }
 message BotCapabilityMetadata {
    repeated BotCapabilityType capabilities = 1;
    enum BotCapabilityType {
@@ -414,9 +403,6 @@ message BotCapabilityMetadata {
        RICH_RESPONSE_UR_BLOKS_ENABLED = 55;
        RICH_RESPONSE_INLINE_LINKS_ENABLED = 56;
        RICH_RESPONSE_UR_IMAGINE_VIDEO = 57;
        JSON_PATCH_STREAMING = 58;
        AI_TAB_FORCE_CLIPPY = 59;
        UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60;
    }
 }
@@ -701,7 +687,6 @@ enum BotMetricsEntryPoint {
    WEB_INTRO_PANEL = 46;
    WEB_NAVIGATION_BAR = 47;
    GROUP_MEMBER = 54;
    CHATLIST_SEARCH = 55;
 }
 message BotMetricsMetadata {
    optional string destinationId = 1;
@@ -1084,7 +1069,6 @@ message ClientPairingProps {
    optional bool isSyncdPureLidSession = 2;
    optional bool isSyncdSnapshotRecoveryEnabled = 3;
    optional bool isHsThumbnailSyncEnabled = 4;
    optional bytes subscriptionSyncPayload = 5;
 }
 message ClientPayload {
@@ -1122,7 +1106,6 @@ message ClientPayload {
    optional bool paaLink = 44;
    optional int32 preacksCount = 45;
    optional int32 processingQueueSize = 46;
    repeated string pairedPeripherals = 47;
    enum AccountType {
        DEFAULT = 0;
        GUEST = 1;
@@ -1465,7 +1448,6 @@ message ContextInfo {
        optional AdType adType = 25;
        optional string wtwaWebsiteUrl = 26;
        optional string adPreviewUrl = 27;
        optional bool containsCtwaFlowsAutoReply = 28;
        enum AdType {
            CTWA = 0;
            CAWC = 1;
@@ -1620,8 +1602,6 @@ message Conversation {
    optional bool limitSharingInitiatedByMe = 53;
    optional bool maibaAiThreadEnabled = 54;
    optional bool isMarketingMessageThread = 55;
    optional bool isSenderNewAccount = 56;
    optional uint32 afterReadDuration = 57;
    enum EndOfHistoryTransferType {
        COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0;
        COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1;
@@ -1648,9 +1628,6 @@ message DeviceCapabilities {
    message BusinessBroadcast {
        optional bool importListEnabled = 1;
        optional bool companionSupportEnabled = 2;
        optional bool campaignSyncEnabled = 3;
        optional bool insightsSyncEnabled = 4;
    }
    enum ChatLockSupportLevel {
@@ -1725,7 +1702,6 @@ message DeviceProps {
        optional uint32 thumbnailSyncDaysLimit = 19;
        optional uint32 initialSyncMaxMessagesPerChat = 20;
        optional bool supportManusHistory = 21;
        optional bool supportHatchHistory = 22;
    }
    enum PlatformType {
@@ -1920,8 +1896,6 @@ message HandshakeMessage {
        optional bytes static = 1;
        optional bytes payload = 2;
        optional bytes extendedCiphertext = 3;
        optional bytes paddedBytes = 4;
        optional bool simulateXxkemFs = 5;
    }
    message ClientHello {
@@ -1930,9 +1904,6 @@ message HandshakeMessage {
        optional bytes payload = 3;
        optional bool useExtended = 4;
        optional bytes extendedCiphertext = 5;
        optional bytes paddedBytes = 6;
        optional bool sendServerHelloPaddedBytes = 7;
        optional bool simulateXxkemFs = 8;
    }
    message ServerHello {
@@ -1940,7 +1911,6 @@ message HandshakeMessage {
        optional bytes static = 2;
        optional bytes payload = 3;
        optional bytes extendedStatic = 4;
        optional bytes paddingBytes = 5;
    }
 }
@@ -2297,7 +2267,6 @@ message Message {
    optional PollCreationMessage pollCreationMessageV6 = 119;
    optional ConditionalRevealMessage conditionalRevealMessage = 120;
    optional PollAddOptionMessage pollAddOptionMessage = 121;
    optional EventInviteMessage eventInviteMessage = 122;
    message AlbumMessage {
        optional uint32 expectedImageCount = 2;
        optional uint32 expectedVideoCount = 3;
@@ -2578,16 +2547,6 @@ message Message {
        optional bytes encIv = 3;
    }
    message EventInviteMessage {
        optional ContextInfo contextInfo = 1;
        optional string eventId = 2;
        optional string eventTitle = 3;
        optional bytes jpegThumbnail = 4;
        optional int64 startTime = 5;
        optional string caption = 6;
        optional bool isCanceled = 7;
    }
    message EventMessage {
        optional ContextInfo contextInfo = 1;
        optional bool isCanceled = 2;
@@ -2839,13 +2798,6 @@ message Message {
        optional bool securityNotificationEnabled = 1;
    }
    enum InsightDeliveryState {
        SENT = 0;
        DELIVERED = 1;
        READ = 2;
        REPLIED = 3;
        QUICK_REPLIED = 4;
    }
    message InteractiveMessage {
        optional Header header = 1;
        optional Body body = 2;
@@ -3114,10 +3066,9 @@ message Message {
    message MessageHistoryMetadata {
        repeated string historyReceivers = 1;
-        optional int64 oldestMessageTimestampInWindow = 2;
+        optional int64 oldestMessageTimestamp = 2;
        optional int64 messageCount = 3;
        repeated string nonHistoryReceivers = 4;
        optional int64 oldestMessageTimestampInBundle = 5;
    }
    message MessageHistoryNotice {
@@ -3178,11 +3129,6 @@ message Message {
        optional int64 expiryTimestamp = 2;
        optional bool incentiveEligible = 3;
        optional string referralId = 4;
        optional InviteType inviteType = 5;
        enum InviteType {
            DEFAULT = 0;
            MAPPER = 1;
        }
        enum ServiceType {
            UNKNOWN = 0;
            FBPAY = 1;
@@ -3224,16 +3170,6 @@ message Message {
        optional HistorySyncChunkRetryRequest historySyncChunkRetryRequest = 8;
        optional GalaxyFlowAction galaxyFlowAction = 9;
        optional CompanionCanonicalUserNonceFetchRequest companionCanonicalUserNonceFetchRequest = 10;
        optional BizBroadcastInsightsContactListRequest bizBroadcastInsightsContactListRequest = 11;
        optional BizBroadcastInsightsRefreshRequest bizBroadcastInsightsRefreshRequest = 12;
        message BizBroadcastInsightsContactListRequest {
            optional string campaignId = 1;
        }
        message BizBroadcastInsightsRefreshRequest {
            optional string campaignId = 1;
        }
        message CompanionCanonicalUserNonceFetchRequest {
            optional string registrationTraceId = 1;
        }
@@ -3308,18 +3244,6 @@ message Message {
            optional CompanionCanonicalUserNonceFetchResponse companionCanonicalUserNonceFetchRequestResponse = 9;
            optional HistorySyncChunkRetryResponse historySyncChunkRetryResponse = 10;
            optional FlowResponsesCsvBundle flowResponsesCsvBundle = 11;
            optional BizBroadcastInsightsContactListResponse bizBroadcastInsightsContactListResponse = 12;
            message BizBroadcastInsightsContactListResponse {
                optional string campaignId = 1;
                optional int64 timestampMs = 2;
                repeated Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactState contacts = 3;
            }
            message BizBroadcastInsightsContactState {
                optional string contactJid = 1;
                optional Message.InsightDeliveryState state = 2;
            }
            message CompanionCanonicalUserNonceFetchResponse {
                optional string nonce = 1;
                optional string waFbid = 2;
@@ -3433,8 +3357,6 @@ message Message {
        COMPANION_CANONICAL_USER_NONCE_FETCH = 9;
        HISTORY_SYNC_CHUNK_RETRY = 10;
        GALAXY_FLOW_ACTION = 11;
        BUSINESS_BROADCAST_INSIGHTS_DELIVERED_TO = 12;
        BUSINESS_BROADCAST_INSIGHTS_REFRESH = 13;
    }
    message PinInChatMessage {
        optional MessageKey key = 1;
@@ -3604,7 +3526,6 @@ message Message {
            GROUP_MEMBER_LABEL_CHANGE = 30;
            AI_MEDIA_COLLECTION_MESSAGE = 31;
            MESSAGE_UNSCHEDULE = 32;
            BOT_UNLINK_MESSAGE = 33;
        }
    }
@@ -3637,7 +3558,6 @@ message Message {
    message RequestWelcomeMessageMetadata {
        optional LocalChatState localChatState = 1;
        optional WelcomeTrigger welcomeTrigger = 2;
        optional BotAgentMetadata botAgentMetadata = 3;
        enum LocalChatState {
            EMPTY = 0;
            NON_EMPTY = 1;
@@ -4047,7 +3967,6 @@ message MsgOpaqueData {
    optional string quarantineExtractedText = 48;
    optional int64 pollEndTime = 49;
    optional bool pollHideVoterNames = 50;
    optional bool pollAllowAddOption = 52;
    message EventLocation {
        optional double degreesLatitude = 1;
        optional double degreesLongitude = 2;
@@ -4164,9 +4083,6 @@ enum MutationProps {
    NCT_SALT_SYNC_ACTION = 80;
    BUSINESS_BROADCAST_CAMPAIGN_ACTION = 81;
    BUSINESS_BROADCAST_INSIGHTS_ACTION = 82;
    CUSTOMER_DATA_ACTION = 83;
    SUBSCRIPTIONS_SYNC_V2_ACTION = 84;
    THREAD_PIN_ACTION = 85;
    SHARE_OWN_PN = 10001;
    BUSINESS_BROADCAST_ACTION = 10002;
    AI_THREAD_DELETE_ACTION = 10003;
@@ -4635,7 +4551,6 @@ message StatusAttribution {
            APPLE_MUSIC = 8;
            SHARECHAT = 9;
            GOOGLE_PHOTOS = 10;
            SOUNDCLOUD = 11;
        }
    }
@@ -4803,9 +4718,6 @@ message SyncActionValue {
    optional NctSaltSyncAction nctSaltSyncAction = 80;
    optional BusinessBroadcastCampaignAction businessBroadcastCampaignAction = 81;
    optional BusinessBroadcastInsightsAction businessBroadcastInsightsAction = 82;
    optional CustomerDataAction customerDataAction = 83;
    optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84;
    optional ThreadPinAction threadPinAction = 85;
    message AgentAction {
        optional string name = 1;
        optional int32 deviceID = 2;
@@ -4927,20 +4839,6 @@ message SyncActionValue {
        repeated SyncActionValue.CustomPaymentMethod customPaymentMethods = 1;
    }
    message CustomerDataAction {
        optional string chatJid = 1;
        optional int32 contactType = 2;
        optional string email = 3;
        optional string altPhoneNumbers = 4;
        optional int64 birthday = 5;
        optional string address = 6;
        optional int32 acquisitionSource = 7;
        optional int32 leadStage = 8;
        optional int64 lastOrder = 9;
        optional int64 createdAt = 10;
        optional int64 modifiedAt = 11;
    }
    message DeleteChatAction {
        optional SyncActionValue.SyncActionMessageRange messageRange = 1;
    }
@@ -5321,29 +5219,6 @@ message SyncActionValue {
        optional int64 expirationDate = 3;
    }
    message SubscriptionsSyncV2Action {
        repeated SubscriptionInfo subscriptions = 1;
        repeated PaidFeature paidFeature = 2;
        message PaidFeature {
            optional string name = 1;
            optional bool enabled = 2;
            optional int32 limit = 3;
            optional int64 expirationTime = 4;
        }
        message SubscriptionInfo {
            optional string id = 1;
            optional int32 tier = 2;
            optional string status = 3;
            optional int64 startTime = 4;
            optional int64 endTime = 5;
            optional bool isPlatformChanged = 6;
            optional string source = 7;
            optional int64 creationTime = 8;
        }
    }
    message SyncActionMessage {
        optional MessageKey key = 1;
        optional int64 timestamp = 2;
@@ -5355,10 +5230,6 @@ message SyncActionValue {
        repeated SyncActionValue.SyncActionMessage messages = 3;
    }
    message ThreadPinAction {
        optional bool pinned = 1;
    }
    message TimeFormatAction {
        optional bool isTwentyFourHourFormatEnabled = 1;
    }
@@ -5480,6 +5351,7 @@ message TemplateButton {
 message ThreadID {
    optional ThreadType threadType = 1;
    optional MessageKey threadKey = 2;
    optional string sourceChatJid = 3;
    enum ThreadType {
        UNKNOWN = 0;
        VIEW_REPLIES = 1;
@@ -203,13 +203,11 @@ export namespace proto {
    interface IAIMediaCollectionMetadata {
        collectionId?: (string|null);
        uploadOrderIndex?: (number|null);
    }
    class AIMediaCollectionMetadata implements IAIMediaCollectionMetadata {
        constructor(p?: proto.IAIMediaCollectionMetadata);
        public collectionId?: (string|null);
        public uploadOrderIndex?: (number|null);
        public static create(properties?: proto.IAIMediaCollectionMetadata): proto.AIMediaCollectionMetadata;
        public static encode(m: proto.IAIMediaCollectionMetadata, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.AIMediaCollectionMetadata;
@@ -727,13 +725,11 @@ export namespace proto {
        interface IAIThreadClientInfo {
            type?: (proto.AIThreadInfo.AIThreadClientInfo.AIThreadType|null);
            sourceChatJid?: (string|null);
        }
        class AIThreadClientInfo implements IAIThreadClientInfo {
            constructor(p?: proto.AIThreadInfo.IAIThreadClientInfo);
            public type?: (proto.AIThreadInfo.AIThreadClientInfo.AIThreadType|null);
            public sourceChatJid?: (string|null);
            public static create(properties?: proto.AIThreadInfo.IAIThreadClientInfo): proto.AIThreadInfo.AIThreadClientInfo;
            public static encode(m: proto.AIThreadInfo.IAIThreadClientInfo, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.AIThreadInfo.AIThreadClientInfo;
@@ -748,8 +744,7 @@ export namespace proto {
            enum AIThreadType {
                UNKNOWN = 0,
                DEFAULT = 1,
-                INCOGNITO = 2,
+                INCOGNITO = 2
                SIDE_CHAT = 3
            }
        }
@@ -981,38 +976,6 @@ export namespace proto {
        }
    }
    interface IBotAgentDeepLinkMetadata {
        token?: (string|null);
    }
    class BotAgentDeepLinkMetadata implements IBotAgentDeepLinkMetadata {
        constructor(p?: proto.IBotAgentDeepLinkMetadata);
        public token?: (string|null);
        public static create(properties?: proto.IBotAgentDeepLinkMetadata): proto.BotAgentDeepLinkMetadata;
        public static encode(m: proto.IBotAgentDeepLinkMetadata, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.BotAgentDeepLinkMetadata;
        public static fromObject(d: { [k: string]: any }): proto.BotAgentDeepLinkMetadata;
        public static toObject(m: proto.BotAgentDeepLinkMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
        public toJSON(): { [k: string]: any };
        public static getTypeUrl(typeUrlPrefix?: string): string;
    }
    interface IBotAgentMetadata {
        deepLinkMetadata?: (proto.IBotAgentDeepLinkMetadata|null);
    }
    class BotAgentMetadata implements IBotAgentMetadata {
        constructor(p?: proto.IBotAgentMetadata);
        public deepLinkMetadata?: (proto.IBotAgentDeepLinkMetadata|null);
        public static create(properties?: proto.IBotAgentMetadata): proto.BotAgentMetadata;
        public static encode(m: proto.IBotAgentMetadata, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.BotAgentMetadata;
        public static fromObject(d: { [k: string]: any }): proto.BotAgentMetadata;
        public static toObject(m: proto.BotAgentMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
        public toJSON(): { [k: string]: any };
        public static getTypeUrl(typeUrlPrefix?: string): string;
    }
    interface IBotCapabilityMetadata {
        capabilities?: (proto.BotCapabilityMetadata.BotCapabilityType[]|null);
    }
@@ -1089,10 +1052,7 @@ export namespace proto {
            AI_IMAGINE_UR_TO_NATIVE_LOADING_INDICATOR = 54,
            RICH_RESPONSE_UR_BLOKS_ENABLED = 55,
            RICH_RESPONSE_INLINE_LINKS_ENABLED = 56,
-            RICH_RESPONSE_UR_IMAGINE_VIDEO = 57,
+            RICH_RESPONSE_UR_IMAGINE_VIDEO = 57
            JSON_PATCH_STREAMING = 58,
            AI_TAB_FORCE_CLIPPY = 59,
            UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60
        }
    }
@@ -1778,8 +1738,7 @@ export namespace proto {
        META_AI_SETTINGS = 45,
        WEB_INTRO_PANEL = 46,
        WEB_NAVIGATION_BAR = 47,
-        GROUP_MEMBER = 54,
+        GROUP_MEMBER = 54
        CHATLIST_SEARCH = 55
    }
    interface IBotMetricsMetadata {
@@ -2803,7 +2762,6 @@ export namespace proto {
        isSyncdPureLidSession?: (boolean|null);
        isSyncdSnapshotRecoveryEnabled?: (boolean|null);
        isHsThumbnailSyncEnabled?: (boolean|null);
        subscriptionSyncPayload?: (Uint8Array|null);
    }
    class ClientPairingProps implements IClientPairingProps {
@@ -2812,7 +2770,6 @@ export namespace proto {
        public isSyncdPureLidSession?: (boolean|null);
        public isSyncdSnapshotRecoveryEnabled?: (boolean|null);
        public isHsThumbnailSyncEnabled?: (boolean|null);
        public subscriptionSyncPayload?: (Uint8Array|null);
        public static create(properties?: proto.IClientPairingProps): proto.ClientPairingProps;
        public static encode(m: proto.IClientPairingProps, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ClientPairingProps;
@@ -2857,7 +2814,6 @@ export namespace proto {
        paaLink?: (boolean|null);
        preacksCount?: (number|null);
        processingQueueSize?: (number|null);
        pairedPeripherals?: (string[]|null);
    }
    class ClientPayload implements IClientPayload {
@@ -2896,7 +2852,6 @@ export namespace proto {
        public paaLink?: (boolean|null);
        public preacksCount?: (number|null);
        public processingQueueSize?: (number|null);
        public pairedPeripherals: string[];
        public static create(properties?: proto.IClientPayload): proto.ClientPayload;
        public static encode(m: proto.IClientPayload, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ClientPayload;
@@ -3590,7 +3545,6 @@ export namespace proto {
            adType?: (proto.ContextInfo.ExternalAdReplyInfo.AdType|null);
            wtwaWebsiteUrl?: (string|null);
            adPreviewUrl?: (string|null);
            containsCtwaFlowsAutoReply?: (boolean|null);
        }
        class ExternalAdReplyInfo implements IExternalAdReplyInfo {
@@ -3622,7 +3576,6 @@ export namespace proto {
            public adType?: (proto.ContextInfo.ExternalAdReplyInfo.AdType|null);
            public wtwaWebsiteUrl?: (string|null);
            public adPreviewUrl?: (string|null);
            public containsCtwaFlowsAutoReply?: (boolean|null);
            public static create(properties?: proto.ContextInfo.IExternalAdReplyInfo): proto.ContextInfo.ExternalAdReplyInfo;
            public static encode(m: proto.ContextInfo.IExternalAdReplyInfo, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ContextInfo.ExternalAdReplyInfo;
@@ -3887,8 +3840,6 @@ export namespace proto {
        limitSharingInitiatedByMe?: (boolean|null);
        maibaAiThreadEnabled?: (boolean|null);
        isMarketingMessageThread?: (boolean|null);
        isSenderNewAccount?: (boolean|null);
        afterReadDuration?: (number|null);
    }
    class Conversation implements IConversation {
@@ -3948,8 +3899,6 @@ export namespace proto {
        public limitSharingInitiatedByMe?: (boolean|null);
        public maibaAiThreadEnabled?: (boolean|null);
        public isMarketingMessageThread?: (boolean|null);
        public isSenderNewAccount?: (boolean|null);
        public afterReadDuration?: (number|null);
        public static create(properties?: proto.IConversation): proto.Conversation;
        public static encode(m: proto.IConversation, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Conversation;
@@ -4024,17 +3973,11 @@ export namespace proto {
        interface IBusinessBroadcast {
            importListEnabled?: (boolean|null);
            companionSupportEnabled?: (boolean|null);
            campaignSyncEnabled?: (boolean|null);
            insightsSyncEnabled?: (boolean|null);
        }
        class BusinessBroadcast implements IBusinessBroadcast {
            constructor(p?: proto.DeviceCapabilities.IBusinessBroadcast);
            public importListEnabled?: (boolean|null);
            public companionSupportEnabled?: (boolean|null);
            public campaignSyncEnabled?: (boolean|null);
            public insightsSyncEnabled?: (boolean|null);
            public static create(properties?: proto.DeviceCapabilities.IBusinessBroadcast): proto.DeviceCapabilities.BusinessBroadcast;
            public static encode(m: proto.DeviceCapabilities.IBusinessBroadcast, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.DeviceCapabilities.BusinessBroadcast;
@@ -4209,7 +4152,6 @@ export namespace proto {
            thumbnailSyncDaysLimit?: (number|null);
            initialSyncMaxMessagesPerChat?: (number|null);
            supportManusHistory?: (boolean|null);
            supportHatchHistory?: (boolean|null);
        }
        class HistorySyncConfig implements IHistorySyncConfig {
@@ -4235,7 +4177,6 @@ export namespace proto {
            public thumbnailSyncDaysLimit?: (number|null);
            public initialSyncMaxMessagesPerChat?: (number|null);
            public supportManusHistory?: (boolean|null);
            public supportHatchHistory?: (boolean|null);
            public static create(properties?: proto.DeviceProps.IHistorySyncConfig): proto.DeviceProps.HistorySyncConfig;
            public static encode(m: proto.DeviceProps.IHistorySyncConfig, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.DeviceProps.HistorySyncConfig;
@@ -4730,8 +4671,6 @@ export namespace proto {
            "static"?: (Uint8Array|null);
            payload?: (Uint8Array|null);
            extendedCiphertext?: (Uint8Array|null);
            paddedBytes?: (Uint8Array|null);
            simulateXxkemFs?: (boolean|null);
        }
        class ClientFinish implements IClientFinish {
@@ -4739,8 +4678,6 @@ export namespace proto {
            public static?: (Uint8Array|null);
            public payload?: (Uint8Array|null);
            public extendedCiphertext?: (Uint8Array|null);
            public paddedBytes?: (Uint8Array|null);
            public simulateXxkemFs?: (boolean|null);
            public static create(properties?: proto.HandshakeMessage.IClientFinish): proto.HandshakeMessage.ClientFinish;
            public static encode(m: proto.HandshakeMessage.IClientFinish, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ClientFinish;
@@ -4756,9 +4693,6 @@ export namespace proto {
            payload?: (Uint8Array|null);
            useExtended?: (boolean|null);
            extendedCiphertext?: (Uint8Array|null);
            paddedBytes?: (Uint8Array|null);
            sendServerHelloPaddedBytes?: (boolean|null);
            simulateXxkemFs?: (boolean|null);
        }
        class ClientHello implements IClientHello {
@@ -4768,9 +4702,6 @@ export namespace proto {
            public payload?: (Uint8Array|null);
            public useExtended?: (boolean|null);
            public extendedCiphertext?: (Uint8Array|null);
            public paddedBytes?: (Uint8Array|null);
            public sendServerHelloPaddedBytes?: (boolean|null);
            public simulateXxkemFs?: (boolean|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;
@@ -4785,7 +4716,6 @@ export namespace proto {
            "static"?: (Uint8Array|null);
            payload?: (Uint8Array|null);
            extendedStatic?: (Uint8Array|null);
            paddingBytes?: (Uint8Array|null);
        }
        class ServerHello implements IServerHello {
@@ -4794,7 +4724,6 @@ export namespace proto {
            public static?: (Uint8Array|null);
            public payload?: (Uint8Array|null);
            public extendedStatic?: (Uint8Array|null);
            public paddingBytes?: (Uint8Array|null);
            public static create(properties?: proto.HandshakeMessage.IServerHello): proto.HandshakeMessage.ServerHello;
            public static encode(m: proto.HandshakeMessage.IServerHello, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ServerHello;
@@ -5604,7 +5533,6 @@ export namespace proto {
        pollCreationMessageV6?: (proto.Message.IPollCreationMessage|null);
        conditionalRevealMessage?: (proto.Message.IConditionalRevealMessage|null);
        pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
        eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
    }
    class Message implements IMessage {
@@ -5710,7 +5638,6 @@ export namespace proto {
        public pollCreationMessageV6?: (proto.Message.IPollCreationMessage|null);
        public conditionalRevealMessage?: (proto.Message.IConditionalRevealMessage|null);
        public pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
        public eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
        public static create(properties?: proto.IMessage): proto.Message;
        public static encode(m: proto.IMessage, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message;
@@ -6514,34 +6441,6 @@ export namespace proto {
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface IEventInviteMessage {
            contextInfo?: (proto.IContextInfo|null);
            eventId?: (string|null);
            eventTitle?: (string|null);
            jpegThumbnail?: (Uint8Array|null);
            startTime?: (number|Long|null);
            caption?: (string|null);
            isCanceled?: (boolean|null);
        }
        class EventInviteMessage implements IEventInviteMessage {
            constructor(p?: proto.Message.IEventInviteMessage);
            public contextInfo?: (proto.IContextInfo|null);
            public eventId?: (string|null);
            public eventTitle?: (string|null);
            public jpegThumbnail?: (Uint8Array|null);
            public startTime?: (number|Long|null);
            public caption?: (string|null);
            public isCanceled?: (boolean|null);
            public static create(properties?: proto.Message.IEventInviteMessage): proto.Message.EventInviteMessage;
            public static encode(m: proto.Message.IEventInviteMessage, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.EventInviteMessage;
            public static fromObject(d: { [k: string]: any }): proto.Message.EventInviteMessage;
            public static toObject(m: proto.Message.EventInviteMessage, o?: $protobuf.IConversionOptions): { [k: string]: any };
            public toJSON(): { [k: string]: any };
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface IEventMessage {
            contextInfo?: (proto.IContextInfo|null);
            isCanceled?: (boolean|null);
@@ -7143,14 +7042,6 @@ export namespace proto {
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        enum InsightDeliveryState {
            SENT = 0,
            DELIVERED = 1,
            READ = 2,
            REPLIED = 3,
            QUICK_REPLIED = 4
        }
        interface IInteractiveMessage {
            header?: (proto.Message.InteractiveMessage.IHeader|null);
            body?: (proto.Message.InteractiveMessage.IBody|null);
@@ -7906,19 +7797,17 @@ export namespace proto {
        interface IMessageHistoryMetadata {
            historyReceivers?: (string[]|null);
-            oldestMessageTimestampInWindow?: (number|Long|null);
+            oldestMessageTimestamp?: (number|Long|null);
            messageCount?: (number|Long|null);
            nonHistoryReceivers?: (string[]|null);
            oldestMessageTimestampInBundle?: (number|Long|null);
        }
        class MessageHistoryMetadata implements IMessageHistoryMetadata {
            constructor(p?: proto.Message.IMessageHistoryMetadata);
            public historyReceivers: string[];
-            public oldestMessageTimestampInWindow?: (number|Long|null);
+            public oldestMessageTimestamp?: (number|Long|null);
            public messageCount?: (number|Long|null);
            public nonHistoryReceivers: string[];
            public oldestMessageTimestampInBundle?: (number|Long|null);
            public static create(properties?: proto.Message.IMessageHistoryMetadata): proto.Message.MessageHistoryMetadata;
            public static encode(m: proto.Message.IMessageHistoryMetadata, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.MessageHistoryMetadata;
@@ -8076,7 +7965,6 @@ export namespace proto {
            expiryTimestamp?: (number|Long|null);
            incentiveEligible?: (boolean|null);
            referralId?: (string|null);
            inviteType?: (proto.Message.PaymentInviteMessage.InviteType|null);
        }
        class PaymentInviteMessage implements IPaymentInviteMessage {
@@ -8085,7 +7973,6 @@ export namespace proto {
            public expiryTimestamp?: (number|Long|null);
            public incentiveEligible?: (boolean|null);
            public referralId?: (string|null);
            public inviteType?: (proto.Message.PaymentInviteMessage.InviteType|null);
            public static create(properties?: proto.Message.IPaymentInviteMessage): proto.Message.PaymentInviteMessage;
            public static encode(m: proto.Message.IPaymentInviteMessage, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PaymentInviteMessage;
@@ -8097,11 +7984,6 @@ export namespace proto {
        namespace PaymentInviteMessage {
            enum InviteType {
                DEFAULT = 0,
                MAPPER = 1
            }
            enum ServiceType {
                UNKNOWN = 0,
                FBPAY = 1,
@@ -8200,8 +8082,6 @@ export namespace proto {
            historySyncChunkRetryRequest?: (proto.Message.PeerDataOperationRequestMessage.IHistorySyncChunkRetryRequest|null);
            galaxyFlowAction?: (proto.Message.PeerDataOperationRequestMessage.IGalaxyFlowAction|null);
            companionCanonicalUserNonceFetchRequest?: (proto.Message.PeerDataOperationRequestMessage.ICompanionCanonicalUserNonceFetchRequest|null);
            bizBroadcastInsightsContactListRequest?: (proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsContactListRequest|null);
            bizBroadcastInsightsRefreshRequest?: (proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsRefreshRequest|null);
        }
        class PeerDataOperationRequestMessage implements IPeerDataOperationRequestMessage {
@@ -8216,8 +8096,6 @@ export namespace proto {
            public historySyncChunkRetryRequest?: (proto.Message.PeerDataOperationRequestMessage.IHistorySyncChunkRetryRequest|null);
            public galaxyFlowAction?: (proto.Message.PeerDataOperationRequestMessage.IGalaxyFlowAction|null);
            public companionCanonicalUserNonceFetchRequest?: (proto.Message.PeerDataOperationRequestMessage.ICompanionCanonicalUserNonceFetchRequest|null);
            public bizBroadcastInsightsContactListRequest?: (proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsContactListRequest|null);
            public bizBroadcastInsightsRefreshRequest?: (proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsRefreshRequest|null);
            public static create(properties?: proto.Message.IPeerDataOperationRequestMessage): proto.Message.PeerDataOperationRequestMessage;
            public static encode(m: proto.Message.IPeerDataOperationRequestMessage, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestMessage;
@@ -8229,38 +8107,6 @@ export namespace proto {
        namespace PeerDataOperationRequestMessage {
            interface IBizBroadcastInsightsContactListRequest {
                campaignId?: (string|null);
            }
            class BizBroadcastInsightsContactListRequest implements IBizBroadcastInsightsContactListRequest {
                constructor(p?: proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsContactListRequest);
                public campaignId?: (string|null);
                public static create(properties?: proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsContactListRequest): proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsContactListRequest;
                public static encode(m: proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsContactListRequest, w?: $protobuf.Writer): $protobuf.Writer;
                public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsContactListRequest;
                public static fromObject(d: { [k: string]: any }): proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsContactListRequest;
                public static toObject(m: proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsContactListRequest, o?: $protobuf.IConversionOptions): { [k: string]: any };
                public toJSON(): { [k: string]: any };
                public static getTypeUrl(typeUrlPrefix?: string): string;
            }
            interface IBizBroadcastInsightsRefreshRequest {
                campaignId?: (string|null);
            }
            class BizBroadcastInsightsRefreshRequest implements IBizBroadcastInsightsRefreshRequest {
                constructor(p?: proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsRefreshRequest);
                public campaignId?: (string|null);
                public static create(properties?: proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsRefreshRequest): proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsRefreshRequest;
                public static encode(m: proto.Message.PeerDataOperationRequestMessage.IBizBroadcastInsightsRefreshRequest, w?: $protobuf.Writer): $protobuf.Writer;
                public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsRefreshRequest;
                public static fromObject(d: { [k: string]: any }): proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsRefreshRequest;
                public static toObject(m: proto.Message.PeerDataOperationRequestMessage.BizBroadcastInsightsRefreshRequest, o?: $protobuf.IConversionOptions): { [k: string]: any };
                public toJSON(): { [k: string]: any };
                public static getTypeUrl(typeUrlPrefix?: string): string;
            }
            interface ICompanionCanonicalUserNonceFetchRequest {
                registrationTraceId?: (string|null);
            }
@@ -8480,7 +8326,6 @@ export namespace proto {
                companionCanonicalUserNonceFetchRequestResponse?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.ICompanionCanonicalUserNonceFetchResponse|null);
                historySyncChunkRetryResponse?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IHistorySyncChunkRetryResponse|null);
                flowResponsesCsvBundle?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IFlowResponsesCsvBundle|null);
                bizBroadcastInsightsContactListResponse?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactListResponse|null);
            }
            class PeerDataOperationResult implements IPeerDataOperationResult {
@@ -8496,7 +8341,6 @@ export namespace proto {
                public companionCanonicalUserNonceFetchRequestResponse?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.ICompanionCanonicalUserNonceFetchResponse|null);
                public historySyncChunkRetryResponse?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IHistorySyncChunkRetryResponse|null);
                public flowResponsesCsvBundle?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IFlowResponsesCsvBundle|null);
                public bizBroadcastInsightsContactListResponse?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactListResponse|null);
                public static create(properties?: proto.Message.PeerDataOperationRequestResponseMessage.IPeerDataOperationResult): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult;
                public static encode(m: proto.Message.PeerDataOperationRequestResponseMessage.IPeerDataOperationResult, w?: $protobuf.Writer): $protobuf.Writer;
                public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult;
@@ -8508,44 +8352,6 @@ export namespace proto {
            namespace PeerDataOperationResult {
                interface IBizBroadcastInsightsContactListResponse {
                    campaignId?: (string|null);
                    timestampMs?: (number|Long|null);
                    contacts?: (proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactState[]|null);
                }
                class BizBroadcastInsightsContactListResponse implements IBizBroadcastInsightsContactListResponse {
                    constructor(p?: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactListResponse);
                    public campaignId?: (string|null);
                    public timestampMs?: (number|Long|null);
                    public contacts: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactState[];
                    public static create(properties?: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactListResponse): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactListResponse;
                    public static encode(m: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactListResponse, w?: $protobuf.Writer): $protobuf.Writer;
                    public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactListResponse;
                    public static fromObject(d: { [k: string]: any }): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactListResponse;
                    public static toObject(m: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactListResponse, o?: $protobuf.IConversionOptions): { [k: string]: any };
                    public toJSON(): { [k: string]: any };
                    public static getTypeUrl(typeUrlPrefix?: string): string;
                }
                interface IBizBroadcastInsightsContactState {
                    contactJid?: (string|null);
                    state?: (proto.Message.InsightDeliveryState|null);
                }
                class BizBroadcastInsightsContactState implements IBizBroadcastInsightsContactState {
                    constructor(p?: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactState);
                    public contactJid?: (string|null);
                    public state?: (proto.Message.InsightDeliveryState|null);
                    public static create(properties?: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactState): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactState;
                    public static encode(m: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.IBizBroadcastInsightsContactState, w?: $protobuf.Writer): $protobuf.Writer;
                    public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactState;
                    public static fromObject(d: { [k: string]: any }): proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactState;
                    public static toObject(m: proto.Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.BizBroadcastInsightsContactState, o?: $protobuf.IConversionOptions): { [k: string]: any };
                    public toJSON(): { [k: string]: any };
                    public static getTypeUrl(typeUrlPrefix?: string): string;
                }
                interface ICompanionCanonicalUserNonceFetchResponse {
                    nonce?: (string|null);
                    waFbid?: (string|null);
@@ -8828,9 +8634,7 @@ export namespace proto {
            COMPANION_SYNCD_SNAPSHOT_FATAL_RECOVERY = 8,
            COMPANION_CANONICAL_USER_NONCE_FETCH = 9,
            HISTORY_SYNC_CHUNK_RETRY = 10,
-            GALAXY_FLOW_ACTION = 11,
+            GALAXY_FLOW_ACTION = 11
            BUSINESS_BROADCAST_INSIGHTS_DELIVERED_TO = 12,
            BUSINESS_BROADCAST_INSIGHTS_REFRESH = 13
        }
        interface IPinInChatMessage {
@@ -9267,8 +9071,7 @@ export namespace proto {
                AI_QUERY_FANOUT = 29,
                GROUP_MEMBER_LABEL_CHANGE = 30,
                AI_MEDIA_COLLECTION_MESSAGE = 31,
-                MESSAGE_UNSCHEDULE = 32,
+                MESSAGE_UNSCHEDULE = 32
                BOT_UNLINK_MESSAGE = 33
            }
        }
@@ -9359,14 +9162,12 @@ export namespace proto {
        interface IRequestWelcomeMessageMetadata {
            localChatState?: (proto.Message.RequestWelcomeMessageMetadata.LocalChatState|null);
            welcomeTrigger?: (proto.Message.RequestWelcomeMessageMetadata.WelcomeTrigger|null);
            botAgentMetadata?: (proto.IBotAgentMetadata|null);
        }
        class RequestWelcomeMessageMetadata implements IRequestWelcomeMessageMetadata {
            constructor(p?: proto.Message.IRequestWelcomeMessageMetadata);
            public localChatState?: (proto.Message.RequestWelcomeMessageMetadata.LocalChatState|null);
            public welcomeTrigger?: (proto.Message.RequestWelcomeMessageMetadata.WelcomeTrigger|null);
            public botAgentMetadata?: (proto.IBotAgentMetadata|null);
            public static create(properties?: proto.Message.IRequestWelcomeMessageMetadata): proto.Message.RequestWelcomeMessageMetadata;
            public static encode(m: proto.Message.IRequestWelcomeMessageMetadata, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.RequestWelcomeMessageMetadata;
@@ -10313,7 +10114,6 @@ export namespace proto {
        quarantineExtractedText?: (string|null);
        pollEndTime?: (number|Long|null);
        pollHideVoterNames?: (boolean|null);
        pollAllowAddOption?: (boolean|null);
    }
    class MsgOpaqueData implements IMsgOpaqueData {
@@ -10364,7 +10164,6 @@ export namespace proto {
        public quarantineExtractedText?: (string|null);
        public pollEndTime?: (number|Long|null);
        public pollHideVoterNames?: (boolean|null);
        public pollAllowAddOption?: (boolean|null);
        public static create(properties?: proto.IMsgOpaqueData): proto.MsgOpaqueData;
        public static encode(m: proto.IMsgOpaqueData, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.MsgOpaqueData;
@@ -10561,9 +10360,6 @@ export namespace proto {
        NCT_SALT_SYNC_ACTION = 80,
        BUSINESS_BROADCAST_CAMPAIGN_ACTION = 81,
        BUSINESS_BROADCAST_INSIGHTS_ACTION = 82,
        CUSTOMER_DATA_ACTION = 83,
        SUBSCRIPTIONS_SYNC_V2_ACTION = 84,
        THREAD_PIN_ACTION = 85,
        SHARE_OWN_PN = 10001,
        BUSINESS_BROADCAST_ACTION = 10002,
        AI_THREAD_DELETE_ACTION = 10003
@@ -11847,8 +11643,7 @@ export namespace proto {
                THREADS = 7,
                APPLE_MUSIC = 8,
                SHARECHAT = 9,
-                GOOGLE_PHOTOS = 10,
+                GOOGLE_PHOTOS = 10
                SOUNDCLOUD = 11
            }
        }
@@ -12158,9 +11953,6 @@ export namespace proto {
        nctSaltSyncAction?: (proto.SyncActionValue.INctSaltSyncAction|null);
        businessBroadcastCampaignAction?: (proto.SyncActionValue.IBusinessBroadcastCampaignAction|null);
        businessBroadcastInsightsAction?: (proto.SyncActionValue.IBusinessBroadcastInsightsAction|null);
        customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
        subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
        threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
    }
    class SyncActionValue implements ISyncActionValue {
@@ -12238,9 +12030,6 @@ export namespace proto {
        public nctSaltSyncAction?: (proto.SyncActionValue.INctSaltSyncAction|null);
        public businessBroadcastCampaignAction?: (proto.SyncActionValue.IBusinessBroadcastCampaignAction|null);
        public businessBroadcastInsightsAction?: (proto.SyncActionValue.IBusinessBroadcastInsightsAction|null);
        public customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
        public subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
        public threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
        public static create(properties?: proto.ISyncActionValue): proto.SyncActionValue;
        public static encode(m: proto.ISyncActionValue, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue;
@@ -12647,42 +12436,6 @@ export namespace proto {
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface ICustomerDataAction {
            chatJid?: (string|null);
            contactType?: (number|null);
            email?: (string|null);
            altPhoneNumbers?: (string|null);
            birthday?: (number|Long|null);
            address?: (string|null);
            acquisitionSource?: (number|null);
            leadStage?: (number|null);
            lastOrder?: (number|Long|null);
            createdAt?: (number|Long|null);
            modifiedAt?: (number|Long|null);
        }
        class CustomerDataAction implements ICustomerDataAction {
            constructor(p?: proto.SyncActionValue.ICustomerDataAction);
            public chatJid?: (string|null);
            public contactType?: (number|null);
            public email?: (string|null);
            public altPhoneNumbers?: (string|null);
            public birthday?: (number|Long|null);
            public address?: (string|null);
            public acquisitionSource?: (number|null);
            public leadStage?: (number|null);
            public lastOrder?: (number|Long|null);
            public createdAt?: (number|Long|null);
            public modifiedAt?: (number|Long|null);
            public static create(properties?: proto.SyncActionValue.ICustomerDataAction): proto.SyncActionValue.CustomerDataAction;
            public static encode(m: proto.SyncActionValue.ICustomerDataAction, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.CustomerDataAction;
            public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.CustomerDataAction;
            public static toObject(m: proto.SyncActionValue.CustomerDataAction, o?: $protobuf.IConversionOptions): { [k: string]: any };
            public toJSON(): { [k: string]: any };
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface IDeleteChatAction {
            messageRange?: (proto.SyncActionValue.ISyncActionMessageRange|null);
        }
@@ -13773,79 +13526,6 @@ export namespace proto {
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface ISubscriptionsSyncV2Action {
            subscriptions?: (proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo[]|null);
            paidFeature?: (proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature[]|null);
        }
        class SubscriptionsSyncV2Action implements ISubscriptionsSyncV2Action {
            constructor(p?: proto.SyncActionValue.ISubscriptionsSyncV2Action);
            public subscriptions: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo[];
            public paidFeature: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature[];
            public static create(properties?: proto.SyncActionValue.ISubscriptionsSyncV2Action): proto.SyncActionValue.SubscriptionsSyncV2Action;
            public static encode(m: proto.SyncActionValue.ISubscriptionsSyncV2Action, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SubscriptionsSyncV2Action;
            public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.SubscriptionsSyncV2Action;
            public static toObject(m: proto.SyncActionValue.SubscriptionsSyncV2Action, o?: $protobuf.IConversionOptions): { [k: string]: any };
            public toJSON(): { [k: string]: any };
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        namespace SubscriptionsSyncV2Action {
            interface IPaidFeature {
                name?: (string|null);
                enabled?: (boolean|null);
                limit?: (number|null);
                expirationTime?: (number|Long|null);
            }
            class PaidFeature implements IPaidFeature {
                constructor(p?: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature);
                public name?: (string|null);
                public enabled?: (boolean|null);
                public limit?: (number|null);
                public expirationTime?: (number|Long|null);
                public static create(properties?: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature): proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature;
                public static encode(m: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature, w?: $protobuf.Writer): $protobuf.Writer;
                public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature;
                public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature;
                public static toObject(m: proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature, o?: $protobuf.IConversionOptions): { [k: string]: any };
                public toJSON(): { [k: string]: any };
                public static getTypeUrl(typeUrlPrefix?: string): string;
            }
            interface ISubscriptionInfo {
                id?: (string|null);
                tier?: (number|null);
                status?: (string|null);
                startTime?: (number|Long|null);
                endTime?: (number|Long|null);
                isPlatformChanged?: (boolean|null);
                source?: (string|null);
                creationTime?: (number|Long|null);
            }
            class SubscriptionInfo implements ISubscriptionInfo {
                constructor(p?: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo);
                public id?: (string|null);
                public tier?: (number|null);
                public status?: (string|null);
                public startTime?: (number|Long|null);
                public endTime?: (number|Long|null);
                public isPlatformChanged?: (boolean|null);
                public source?: (string|null);
                public creationTime?: (number|Long|null);
                public static create(properties?: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo): proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo;
                public static encode(m: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo, w?: $protobuf.Writer): $protobuf.Writer;
                public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo;
                public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo;
                public static toObject(m: proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo, o?: $protobuf.IConversionOptions): { [k: string]: any };
                public toJSON(): { [k: string]: any };
                public static getTypeUrl(typeUrlPrefix?: string): string;
            }
        }
        interface ISyncActionMessage {
            key?: (proto.IMessageKey|null);
            timestamp?: (number|Long|null);
@@ -13884,22 +13564,6 @@ export namespace proto {
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface IThreadPinAction {
            pinned?: (boolean|null);
        }
        class ThreadPinAction implements IThreadPinAction {
            constructor(p?: proto.SyncActionValue.IThreadPinAction);
            public pinned?: (boolean|null);
            public static create(properties?: proto.SyncActionValue.IThreadPinAction): proto.SyncActionValue.ThreadPinAction;
            public static encode(m: proto.SyncActionValue.IThreadPinAction, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.ThreadPinAction;
            public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.ThreadPinAction;
            public static toObject(m: proto.SyncActionValue.ThreadPinAction, o?: $protobuf.IConversionOptions): { [k: string]: any };
            public toJSON(): { [k: string]: any };
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }
        interface ITimeFormatAction {
            isTwentyFourHourFormatEnabled?: (boolean|null);
        }
@@ -14295,12 +13959,14 @@ export namespace proto {
    interface IThreadID {
        threadType?: (proto.ThreadID.ThreadType|null);
        threadKey?: (proto.IMessageKey|null);
        sourceChatJid?: (string|null);
    }
    class ThreadID implements IThreadID {
        constructor(p?: proto.IThreadID);
        public threadType?: (proto.ThreadID.ThreadType|null);
        public threadKey?: (proto.IMessageKey|null);
        public sourceChatJid?: (string|null);
        public static create(properties?: proto.IThreadID): proto.ThreadID;
        public static encode(m: proto.IThreadID, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ThreadID;
@@ -47,7 +47,7 @@
    "fflate": "^0.8.2",
    "libsignal": "github:whiskeysockets/libsignal-node",
    "lru-cache": "^11.2.6",
-    "music-metadata": "^11.12.3",
+    "music-metadata": "^11.12.0",
    "p-queue": "^9.0.0",
    "pino": "^10.3.1",
    "prom-client": "^15.1.3",
@@ -1 +1 @@
-{"version":[2,3000,1035223526]}
+{"version":[2,3000,1034258243]}
@@ -56,33 +56,10 @@ export const PROCESSABLE_HISTORY_TYPES = [
 // 6 hours in milliseconds
 const SIX_HOURS_MS = 6 * 60 * 60 * 1000
 /**
 * Resolves the default browser tuple from the BAILEYS_BROWSER env var.
 * Default: Android companion (SMB_ANDROID) — matches upstream PR #2201.
 * Pair code auto-detects Android and falls back to Chrome in socket.ts.
 *
 *   unset / 'android'    → Browsers.android('14')
 *   'android:15'         → Browsers.android('15')
 *   'chrome' / 'macos'   → Browsers.macOS('Chrome')
 */
 const resolveDefaultBrowser = (): [string, string, string] => {
 	const env = process.env.BAILEYS_BROWSER?.trim().toLowerCase()
 	if (env === 'chrome' || env === 'macos') {
 		return Browsers.macOS('Chrome')
 	}
 	if (env?.startsWith('android:')) {
 		const apiLevel = env.split(':')[1] || '14'
 		return Browsers.android(apiLevel)
 	}
 	return Browsers.android('14')
 }
 export const DEFAULT_CONNECTION_CONFIG: SocketConfig = {
 	version: version as WAVersion,
 	versionCheckIntervalMs: SIX_HOURS_MS,
-	browser: resolveDefaultBrowser(),
+	browser: Browsers.macOS('Chrome'),
 	waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
 	connectTimeoutMs: 20_000,
 	keepAliveIntervalMs: 15_000,
@@ -90,7 +67,7 @@ export const DEFAULT_CONNECTION_CONFIG: SocketConfig = {
 	emitOwnEvents: true,
 	defaultQueryTimeoutMs: 30_000,
 	customUploadHosts: [],
-	retryRequestDelayMs: 150,
+	retryRequestDelayMs: 250,
 	maxMsgRetryCount: 5,
 	fireInitQueries: true,
 	auth: undefined as unknown as AuthenticationState,
@@ -101,7 +78,7 @@ export const DEFAULT_CONNECTION_CONFIG: SocketConfig = {
 	shouldSyncHistoryMessage: () => true,
 	shouldIgnoreJid: () => false,
 	linkPreviewImageThumbnailWidth: 192,
-	transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 1000 },
+	transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
 	generateHighQualityLinkPreview: false,
 	enableAutoSessionRecreation: true,
 	enableRecentMessageCache: true,
@@ -302,25 +302,6 @@ export function makeLibSignalRepository(
 	// Promise instead of each spawning their own DB transactions.
 	const migrationInFlight = new Map<string, Promise<{ migrated: number; skipped: number; total: number }>>()
 	// Resolve PN JID to its canonical LID JID for transaction locking.
 	// This prevents PN/LID race conditions where concurrent operations for the
 	// same logical contact acquire different mutex locks because one uses PN
 	// and the other uses LID. (Aligned with WABA behavior — all operations use LID internally.)
 	const resolveCanonicalJid = async(jid: string): Promise<string> => {
 		if (isAnyLidUser(jid)) {
 			return jid
 		}
 		if (isAnyPnUser(jid)) {
 			const lid = await lidMapping.getLIDForPN(jid)
 			if (lid) {
 				return lid
 			}
 		}
 		return jid
 	}
 	const repository: SignalRepositoryWithLIDStore = {
 		decryptGroupMessage({ group, authorJid, msg }) {
 			const senderName = jidToSignalSenderKeyName(group, authorJid)
@@ -415,24 +396,23 @@ export function makeLibSignalRepository(
 				return result
 			}
-			// Use canonical JID (PN→LID resolved) as transaction key to prevent
+			// If it's not a sync message, we need to ensure atomicity
-			// PN/LID race conditions on the same logical session.
+			// For regular messages, we use a transaction to ensure atomicity
 			const canonicalJid = await resolveCanonicalJid(jid)
 			return parsedKeys.transaction(async () => {
 				return await doDecrypt()
-			}, canonicalJid)
+			}, jid)
 		},
 		async encryptMessage({ jid, data }) {
 			const addr = jidToSignalProtocolAddress(jid)
 			const cipher = new libsignal.SessionCipher(storage, addr)
-			const canonicalJid = await resolveCanonicalJid(jid)
+			// Use transaction to ensure atomicity
 			return parsedKeys.transaction(async () => {
 				const { type: sigType, body } = await cipher.encrypt(data)
 				const type = sigType === 3 ? 'pkmsg' : 'msg'
 				return { type, ciphertext: Buffer.from(body, 'binary') }
-			}, canonicalJid)
+			}, jid)
 		},
 		async encryptGroupMessage({ group, meId, data }) {
@@ -674,10 +654,9 @@ export function makeLibSignalRepository(
 								// Session exists (guaranteed from device discovery)
 								const fromSession = libsignal.SessionRecord.deserialize(pnSession)
 								if (fromSession.haveOpenSession()) {
-									// Queue for bulk update: copy to LID, retain PN session.
+									// Queue for bulk update: copy to LID, delete from PN
 									// WABA retains both PN and LID sessions during migration to avoid
 									// No Session errors if messages arrive via PN before migration completes.
 									sessionUpdates[lidAddrStr] = fromSession.serialize()
 									sessionUpdates[pnAddrStr] = null
 									migratedCount++
 								}
@@ -797,13 +776,6 @@ function signalStorage(
 		return id
 	}
 	// Delayed PreKey deletion: grace period to handle race conditions
 	// where two pkmsg with the same preKeyId arrive nearly simultaneously.
 	// WABA deletes immediately (33ms), but we add a 5-min grace period
 	// because we can't handle "Invalid PreKey ID" errors at the native level.
 	const PREKEY_GRACE_PERIOD_MS = 5 * 60 * 1000 // 5 minutes
 	const pendingPreKeyDeletions = new Map<string, ReturnType<typeof setTimeout>>()
 	return {
 		loadSession: async (id: string) => {
 			try {
@@ -836,26 +808,7 @@ function signalStorage(
 				}
 			}
 		},
-		removePreKey: (id: number) => {
+		removePreKey: (id: number) => keys.set({ 'pre-key': { [id]: null } }),
 			const keyId = id.toString()
 			// Clear any existing timer for this key
 			const existing = pendingPreKeyDeletions.get(keyId)
 			if (existing) {
 				clearTimeout(existing)
 			}
 			// Schedule deletion after grace period
 			const timer = setTimeout(async () => {
 				pendingPreKeyDeletions.delete(keyId)
 				try {
 					await keys.set({ 'pre-key': { [id]: null } })
 				} catch {
 					// Keystore may be destroyed if connection closed — safe to ignore
 				}
 			}, PREKEY_GRACE_PERIOD_MS)
 			pendingPreKeyDeletions.set(keyId, timer)
 		},
 		loadSignedPreKey: () => {
 			const key = creds.signedPreKey
 			return {
@@ -945,24 +898,14 @@ function signalStorage(
 					// IDENTITY KEY CHANGED - contact reinstalled WhatsApp or switched devices
 					const previousFingerprint = generateKeyFingerprint(existingKey)
-					// Delete old session and save new identity key atomically.
+					// Delete old session and save new identity key atomically
 					// Store identity in BOTH LID and PN addresses (WABA stores in both
 					// recipient_account_type=0 and type=1 with CONFLICT_REPLACE).
 					const identityUpdates: Record<string, Uint8Array> = { [wireJid]: identityKey }
 					if (wireJid !== id) {
 						identityUpdates[id] = identityKey
 					}
 					await keys.set({
 						session: { [wireJid]: null },
-						'identity-key': identityUpdates
+						'identity-key': { [wireJid]: identityKey }
 					})
-					// Update cache for both addresses
+					// Update cache
 					identityKeyCache.set(wireJid, identityKey)
 					if (wireJid !== id) {
 						identityKeyCache.set(id, identityKey)
 					}
 					// Record metrics
 					metrics.signalIdentityChanges?.inc({ type: 'changed' })
@@ -998,19 +941,10 @@ function signalStorage(
 				if (!existingKey) {
 					// NEW CONTACT - Trust On First Use (TOFU)
-					// Store in both LID and PN addresses (aligned with WABA dual identity storage)
+					await keys.set({ 'identity-key': { [wireJid]: identityKey } })
 					const identityUpdates: Record<string, Uint8Array> = { [wireJid]: identityKey }
 					if (wireJid !== id) {
 						identityUpdates[id] = identityKey
 					}
-					await keys.set({ 'identity-key': identityUpdates })
+					// Update cache
 					// Update cache for both addresses
 					identityKeyCache.set(wireJid, identityKey)
 					if (wireJid !== id) {
 						identityKeyCache.set(id, identityKey)
 					}
 					// Record metrics
 					metrics.signalIdentityChanges?.inc({ type: 'new' })
@@ -50,8 +50,7 @@ import {
 	isMissingKeyError,
 	MAX_SYNC_ATTEMPTS,
 	newLTHashState,
-	processSyncAction,
+	processSyncAction
 	resolveLidToPn
 } from '../Utils'
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex'
 import processMessage from '../Utils/process-message'
@@ -103,14 +102,14 @@ export const makeChatsSocket = (config: SocketConfig) => {
 	/** this mutex ensures that messages from the same chat are processed in order, while allowing parallel processing of messages from different chats */
 	const messageMutex = makeKeyedMutex()
-	/** this mutex ensures that receipts from the same chat are processed in order, while allowing parallel processing across chats */
+	/** this mutex ensures that receipts are processed in order */
-	const receiptMutex = makeKeyedMutex()
+	const receiptMutex = makeMutex()
 	/** this mutex ensures that app state patches are processed in order */
 	const appStatePatchMutex = makeMutex()
-	/** this mutex ensures that notifications from the same chat are processed in order, while allowing parallel processing across chats */
+	/** this mutex ensures that notifications are processed in order */
-	const notificationMutex = makeKeyedMutex()
+	const notificationMutex = makeMutex()
 	// Timeout for AwaitingInitialSync state
 	let awaitingSyncTimeout: NodeJS.Timeout | undefined
@@ -758,16 +757,9 @@ export const makeChatsSocket = (config: SocketConfig) => {
 			}, authState?.creds?.me?.id || 'resync-app-state')
 			const { onMutation } = newAppStateChunkHandler(isInitialSync)
 			const lidMapping = signalRepository.lidMapping
 			for (const key in globalMutationMap) {
 				const mutation = globalMutationMap[key]
 				if (!mutation) continue
 				// Normalize LID→PN in sync action index[1] (chat/contact ID)
 				if (mutation.index[1] && isAnyLidUser(mutation.index[1])) {
 					const resolved = await resolveLidToPn(mutation.index[1], lidMapping, logger)
 					if (resolved) mutation.index[1] = resolved
 				}
 				onMutation(mutation)
 			}
 		}
@@ -920,16 +912,16 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		})
 	}
-	const handlePresenceUpdate = async ({ tag, attrs, content }: BinaryNode) => {
+	const handlePresenceUpdate = ({ tag, attrs, content }: BinaryNode) => {
 		let presence: PresenceData | undefined
-		const rawJid = attrs.from
+		const jid = attrs.from
-		const rawParticipant = attrs.participant || attrs.from
+		const participant = attrs.participant || attrs.from
-		if (!rawJid) {
+		if (!jid) {
 			logger.warn({ attrs }, 'handlePresenceUpdate: jid (attrs.from) is missing, skipping')
 			return
 		}
-		if (shouldIgnoreJid(rawJid) && rawJid !== S_WHATSAPP_NET) {
+		if (shouldIgnoreJid(jid) && jid !== S_WHATSAPP_NET) {
 			return
 		}
@@ -941,7 +933,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		} else if (Array.isArray(content)) {
 			const [firstChild] = content
 			if (!firstChild) {
-				logger.warn({ jid: rawJid }, 'handlePresenceUpdate: firstChild content is empty, skipping')
+				logger.warn({ jid }, 'handlePresenceUpdate: firstChild content is empty, skipping')
 				return
 			}
@@ -960,19 +952,12 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		}
 		if (presence) {
-			if (!rawParticipant) {
+			if (!participant) {
-				logger.warn({ jid: rawJid }, 'handlePresenceUpdate: participant is missing, skipping')
+				logger.warn({ jid }, 'handlePresenceUpdate: participant is missing, skipping')
 				return
 			}
-			// Resolve LID→PN so consumers always see phone-number JIDs
+			ev.emit('presence.update', { id: jid, presences: { [participant]: presence } })
 			const lidMapping = signalRepository.lidMapping
 			const [jid, participant] = await Promise.all([
 				resolveLidToPn(rawJid, lidMapping, logger),
 				resolveLidToPn(rawParticipant, lidMapping, logger)
 			])
 			ev.emit('presence.update', { id: jid!, presences: { [participant!]: presence } })
 		}
 	}
@@ -1046,16 +1031,8 @@ export const makeChatsSocket = (config: SocketConfig) => {
 				undefined,
 				logger
 			)
 			const lidMapping = signalRepository.lidMapping
 			for (const key in mutationMap) {
-				const mutation = mutationMap[key]!
+				onMutation(mutationMap[key]!)
 				// Normalize LID→PN in sync action index[1] (chat/contact ID)
 				if (mutation.index[1] && isAnyLidUser(mutation.index[1])) {
 					const resolved = await resolveLidToPn(mutation.index[1], lidMapping, logger)
 					if (resolved) mutation.index[1] = resolved
 				}
 				onMutation(mutation)
 			}
 		}
 	}
@@ -1399,12 +1376,8 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		}
 	})
-	ws.on('CB:presence', (node: BinaryNode) => {
+	ws.on('CB:presence', handlePresenceUpdate)
-		handlePresenceUpdate(node).catch(err => onUnexpectedError(err, 'handling presence update'))
+	ws.on('CB:chatstate', handlePresenceUpdate)
 	})
 	ws.on('CB:chatstate', (node: BinaryNode) => {
 		handlePresenceUpdate(node).catch(err => onUnexpectedError(err, 'handling chatstate update'))
 	})
 	ws.on('CB:ib,,dirty', async (node: BinaryNode) => {
 		const { attrs } = getBinaryNodeChild(node, 'dirty')!
@@ -1522,7 +1495,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		awaitingSyncTimeout = setTimeout(() => {
 			if (syncState === SyncState.AwaitingInitialSync) {
-				logger.warn('Timeout in AwaitingInitialSync (2s), forcing state to Online and flushing buffer')
+				logger.warn('Timeout in AwaitingInitialSync (4s), forcing state to Online and flushing buffer')
 				syncState = SyncState.Online
 				ev.flush()
@@ -1532,7 +1505,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
 				const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1
 				ev.emit('creds.update', { accountSyncCounter })
 			}
-		}, 2_000)
+		}, 4_000)
 	})
 	// When an app state sync key arrives (myAppStateKeyId is set) and there are
@@ -1,7 +1,7 @@
 import { proto } from '../../WAProto/index.js'
 import type { GroupMetadata, GroupParticipant, ParticipantAction, SocketConfig, WAMessageKey } from '../Types'
 import { WAMessageAddressingMode, WAMessageStubType } from '../Types'
-import { generateMessageIDV2, resolveLidToPn, unixTimestampSeconds } from '../Utils'
+import { generateMessageIDV2, unixTimestampSeconds } from '../Utils'
 import {
 	type BinaryNode,
 	getBinaryNodeChild,
@@ -17,43 +17,6 @@ import { makeChatsSocket } from './chats'
 export const makeGroupsSocket = (config: SocketConfig) => {
 	const sock = makeChatsSocket(config)
 	const { authState, ev, query, upsertMessage } = sock
 	const { signalRepository } = sock
 	const { logger } = config
 	/** Normalize group metadata participant IDs from LID to PN */
 	const normalizeGroupMetadata = async (metadata: GroupMetadata): Promise<GroupMetadata> => {
 		const lidMapping = signalRepository.lidMapping
 		// Resolve all participant LIDs in parallel for better performance on large groups
 		await Promise.all(metadata.participants.map(async (p) => {
 			if (isLidUser(p.id)) {
 				if (p.phoneNumber) {
 					p.lid = p.id
 					p.id = p.phoneNumber
 				} else {
 					const resolved = await resolveLidToPn(p.id, lidMapping, logger)
 					if (resolved && resolved !== p.id) {
 						p.lid = p.id
 						p.id = resolved
 					}
 				}
 			}
 		}))
 		// Normalize owner/subjectOwner if LID (parallel)
 		const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([
 			metadata.owner && isLidUser(metadata.owner)
 				? (metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger))
 				: null,
 			metadata.subjectOwner && isLidUser(metadata.subjectOwner)
 				? (metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger))
 				: null
 		])
 		if (resolvedOwner) metadata.owner = resolvedOwner
 		if (resolvedSubjectOwner) metadata.subjectOwner = resolvedSubjectOwner
 		return metadata
 	}
 	const groupQuery = async (jid: string, type: 'get' | 'set', content: BinaryNode[]) =>
 		query({
@@ -68,7 +31,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
 	const groupMetadata = async (jid: string) => {
 		const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }])
-		return normalizeGroupMetadata(extractGroupMetadata(result))
+		return extractGroupMetadata(result)
 	}
 	const groupFetchAllParticipating = async () => {
@@ -95,15 +58,16 @@ export const makeGroupsSocket = (config: SocketConfig) => {
 		if (groupsChild) {
 			const groups = getBinaryNodeChildren(groupsChild, 'group')
 			for (const groupNode of groups) {
-				const meta = await normalizeGroupMetadata(extractGroupMetadata({
+				const meta = extractGroupMetadata({
 					tag: 'result',
 					attrs: {},
 					content: [groupNode]
-				}))
+				})
 				data[meta.id] = meta
 			}
 		}
 		// TODO: properly parse LID / PN DATA
 		sock.ev.emit('groups.update', Object.values(data))
 		return data
@@ -137,7 +101,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
 					}))
 				}
 			])
-			return normalizeGroupMetadata(extractGroupMetadata(result))
+			return extractGroupMetadata(result)
 		},
 		groupLeave: async (id: string) => {
 			await groupQuery('@g.us', 'set', [
@@ -313,7 +277,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
 		),
 		groupGetInviteInfo: async (code: string) => {
 			const results = await groupQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }])
-			return normalizeGroupMetadata(extractGroupMetadata(results))
+			return extractGroupMetadata(results)
 		},
 		groupToggleEphemeral: async (jid: string, ephemeralExpiration: number) => {
 			const content: BinaryNode = ephemeralExpiration
@@ -38,7 +38,7 @@ import {
 	signedKeyPair,
 	xmppSignedPreKey
 } from '../Utils'
-import { getPlatformId, isAndroidBrowser } from '../Utils/browser-utils'
+import { getPlatformId } from '../Utils/browser-utils'
 import {
 	CircuitBreaker,
 	CircuitOpenError,
@@ -634,6 +634,8 @@ export const makeSocket = (config: SocketConfig) => {
 		}
 		helloMsg = proto.HandshakeMessage.fromObject(helloMsg)
 		logger.info({ browser, helloMsg }, 'connected to WA')
 		const init = proto.HandshakeMessage.encode(helloMsg).finish()
 		const result = await awaitNextMessage<Uint8Array>(init)
@@ -1350,25 +1352,6 @@ export const makeSocket = (config: SocketConfig) => {
 			id: jidEncode(phoneNumber, 's.whatsapp.net'),
 			name: '~'
 		}
 		// Pair code companion_platform_id must be Chrome (1) when using Android
 		// browser preset. ANDROID_PHONE (16) causes silent timeout (server ignores),
 		// UWP (21) causes "cannot connect device" rejection. Only Chrome (1) works
 		// for pair code via web protocol (WA\x06\x03). The device still appears as
 		// "Android" in linked devices because DeviceProps.platformType=ANDROID_PHONE
 		// is set separately in the registration node.
 		const isAndroid = isAndroidBrowser(browser)
 		const pairPlatformId = isAndroid ? getPlatformId('Chrome') : getPlatformId(browser[1])
 		const pairPlatformDisplay = isAndroid ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})`
 		logger.info({
 			pairCode: pairingCode,
 			jid: authState.creds.me.id,
 			companionPlatformId: pairPlatformId,
 			companionPlatformDisplay: pairPlatformDisplay,
 			isAndroid,
 		}, `pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`)
 		ev.emit('creds.update', authState.creds)
 		await sendNode({
 			tag: 'iq',
@@ -1401,12 +1384,12 @@ export const makeSocket = (config: SocketConfig) => {
 						{
 							tag: 'companion_platform_id',
 							attrs: {},
-							content: pairPlatformId
+							content: getPlatformId(browser[1])
 						},
 						{
 							tag: 'companion_platform_display',
 							attrs: {},
-							content: pairPlatformDisplay
+							content: `${browser[1]} (${browser[0]})`
 						},
 						{
 							tag: 'link_code_pairing_nonce',
@@ -1536,9 +1519,7 @@ export const makeSocket = (config: SocketConfig) => {
 	})
 	// login complete
 	ws.on('CB:success', async (node: BinaryNode) => {
-		const isAndroid = isAndroidBrowser(browser)
+		logger.info('opened connection to WA')
 		const phoneId = authState.creds.me?.id?.split(':')[0]?.split('@')[0] || 'new session'
 		logger.info(`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`)
 		clearTimeout(qrTimer) // will never happen in all likelyhood -- but just in case WA sends success on first try
 		ev.emit('creds.update', { me: { ...authState.creds.me!, lid: node.attrs.lid } })
@@ -1686,8 +1667,8 @@ export const makeSocket = (config: SocketConfig) => {
 	// already-authenticated session (no QR re-scan needed). In this case we skip
 	// the offline buffer entirely so live messages are not held hostage waiting for the
 	// server to finish flushing the pending-message backlog (CB:ib,,offline).
-	// For normal restarts (no stale routingInfo) the standard 2 s safety cap applies.
+	// For normal restarts (no stale routingInfo) the standard 5 s safety cap applies.
-	const OFFLINE_BUFFER_TIMEOUT_MS = 2_000
+	const OFFLINE_BUFFER_TIMEOUT_MS = 5_000
 	let offlineBufferTimeout: NodeJS.Timeout | undefined
 	process.nextTick(() => {
@@ -80,7 +80,7 @@ export type SignalDataTypeMap = {
 	'app-state-sync-version': LTHashState
 	'lid-mapping': string
 	'device-list': string[]
-	tctoken: { token: Buffer; timestamp?: string; senderTimestamp?: number; realIssueTimestamp?: number | null }
+	tctoken: { token: Buffer; timestamp?: string; senderTimestamp?: number }
 	/** Identity key for Signal Protocol - used for detecting contact reinstalls */
 	'identity-key': Uint8Array
 }
@@ -1,30 +1,4 @@
-export type WACallUpdateType =
+export type WACallUpdateType = 'offer' | 'ringing' | 'timeout' | 'reject' | 'accept' | 'terminate'
 	| 'offer'
 	| 'ringing'
 	| 'timeout'
 	| 'reject'
 	| 'accept'
 	| 'terminate'
 	| 'preaccept'
 	| 'transport'
 	| 'relaylatency'
 	| 'group_update'
 	| 'reminder'
 	| 'heartbeat'
 	| 'mute_v2'
 	| 'enc_rekey'
 	| 'video'
 	| 'relay'
 export type WACallParticipant = {
 	jid?: string
 	/** 'connected' | 'invited' | 'left' etc. */
 	state?: string
 	/** Phone number in s.whatsapp.net format */
 	userPn?: string
 	/** 'admin' for group call link creator */
 	type?: string
 }
 export type WACallEvent = {
 	chatId: string
@@ -39,20 +13,4 @@ export type WACallEvent = {
 	latencyMs?: number
 	/** Phone number of the caller (sanitized to fix Brazilian landline bug) */
 	callerPn?: string
 	/** Call link token (forms URL: https://call.whatsapp.com/video/<token>) */
 	linkToken?: string
 	/** JID of who created the call link */
 	linkCreator?: string
 	/** Phone number of link creator */
 	linkCreatorPn?: string
 	/** Media type: 'video' or 'audio' */
 	media?: string
 	/** Max participants for group/link calls */
 	connectedLimit?: number
 	/** Participants in a group/link call */
 	participants?: WACallParticipant[]
 	/** Call duration in ms (from terminate/call_summary) */
 	duration?: number
 	/** Terminate reason (e.g. 'group_call_ended', 'accepted_elsewhere', 'timeout') */
 	terminateReason?: string
 }
@@ -54,14 +54,12 @@ export type WAMediaUpload = Buffer | WAMediaPayloadStream | WAMediaPayloadURL
 * Individual sticker in a sticker pack
 */
 export type Sticker = {
-	/** Buffer, Stream or URL of the sticker image (WebP or Lottie/WAS format) */
+	/** Buffer, Stream or URL of the sticker image (will be converted to WebP if needed) */
 	data: WAMediaUpload
 	/** Array of emojis associated with this sticker (max 3 recommended per WhatsApp standards) */
 	emojis?: string[]
 	/** Accessibility label for screen readers (max 125 chars for static, 255 for animated) */
 	accessibilityLabel?: string
 	/** Force Lottie format detection (auto-detected if omitted) */
 	isLottie?: boolean
 }
 /**
@@ -23,7 +23,6 @@ export type BrowsersMap = {
 	baileys(browser: string): [string, string, string]
 	windows(browser: string): [string, string, string]
 	appropriate(browser: string): [string, string, string]
 	android(apiLevel: string): [string, string, string]
 }
 export enum DisconnectReason {
@@ -94,13 +94,7 @@ const BROWSER_TO_PLATFORM_ID: ReadonlyMap<string, string> = (() => {
 		}
 	}
-	const map = new Map(entries)
+	return new Map(entries)
 	// ANDROID → ANDROID_PHONE alias (DeviceProps.PlatformType has ANDROID_PHONE but not ANDROID)
 	if (!map.has('ANDROID') && map.has('ANDROID_PHONE')) {
 		map.set('ANDROID', map.get('ANDROID_PHONE')!)
 	}
 	return map
 })()
 // ============================================================
@@ -337,8 +331,7 @@ export const Browsers: BrowsersMap = {
 	macOS: (browser: string): [string, string, string] => ['Mac OS', browser, OS_VERSIONS.macOS],
 	windows: (browser: string): [string, string, string] => ['Windows', browser, OS_VERSIONS.windows],
 	baileys: (browser: string): [string, string, string] => ['Baileys', browser, OS_VERSIONS.baileys],
-	appropriate: (browser: string): [string, string, string] => [getPlatformName(), browser, getAppropriateVersion()],
+	appropriate: (browser: string): [string, string, string] => [getPlatformName(), browser, getAppropriateVersion()]
 	android: (apiLevel: string): [string, string, string] => [apiLevel, 'Android', '']
 } as const
 /**
@@ -385,7 +378,7 @@ export const getPlatformId = (browser: unknown): string => {
 * properties like 'toString' or 'constructor'.
 *
 * @param value - Value to check
- * @returns True if value is a valid browser preset key ('ubuntu', 'macOS', 'windows', 'baileys', 'appropriate', 'android')
+ * @returns True if value is a valid browser preset key ('ubuntu', 'macOS', 'windows', 'baileys', 'appropriate')
 *
 * @example
 * isValidBrowserPreset('ubuntu')      // true
@@ -398,16 +391,6 @@ export const getPlatformId = (browser: unknown): string => {
 *   const config = Browsers[userInput]('MyApp')
 * }
 */
 /**
 * Checks if the browser tuple represents an Android companion device.
 *
 * @param browser - Browser tuple [os, platform, version]
 * @returns True if platform is 'Android' (case-insensitive)
 */
 export const isAndroidBrowser = (browser: [string, string, string]): boolean => {
 	return browser[1]?.toUpperCase() === 'ANDROID'
 }
 export const isValidBrowserPreset = (value: unknown): value is keyof BrowsersMap => {
 	return typeof value === 'string' && Object.prototype.hasOwnProperty.call(Browsers, value)
 }
@@ -14,6 +14,7 @@ import {
 	isJidStatusBroadcast,
 	isLidUser,
 	isPnUser,
 	jidDecode
 	//	transferDevice
 } from '../WABinary'
 import { unpadRandomMax16 } from './generics'
@@ -275,6 +276,7 @@ export const decryptMessageNode = (
 	meLid: string,
 	repository: SignalRepositoryWithLIDStore,
 	logger: ILogger,
 	autoCleanCorrupted = true
 ) => {
 	const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid)
 	return {
@@ -420,19 +422,34 @@ export const decryptMessageNode = (
 							if (isRetryExhausted) {
 								logger.error(
 									errorContext,
-									`⚠️ Session corrupted after ${err.attempts} attempts. Retry+pkmsg flow will recover.`
+									`⚠️ Session corrupted and recovery failed after ${err.attempts} attempts. Auto-cleanup will attempt to recover.`
 								)
 							} else {
 								// First occurrence - log as warning since auto-recovery will attempt
 								logger.warn(errorContext, '⚠️ Corrupted session detected - attempting auto-recovery')
 							}
-							// Session cleanup is deferred to retry exhaustion (safety net).
+							// Automatic cleanup of corrupted session (if enabled)
-							// The Signal Protocol handles recovery naturally via retry+pkmsg:
+							// eslint-disable-next-line max-depth
-							// Bad MAC -> retry receipt -> sender re-sends as pkmsg -> new session.
+							if (autoCleanCorrupted) {
-							// Deleting sessions here (hot path) causes cascading failures when
+								// eslint-disable-next-line max-depth
-							// multiple messages from the same contact arrive simultaneously.
+								try {
-							// See: messages-recv.ts sendRetryRequest() for deferred cleanup.
+									const deletedCount = await cleanupCorruptedSession(decryptionJid, repository, logger)
 									// Mask only user portion of JID for privacy (preserve domain info)
 									const { user, server } = jidDecode(decryptionJid) || {}
 									const maskedUser =
 										user && user.length > 8 ? `${user.substring(0, 4)}****${user.substring(user.length - 4)}` : user
 									const maskedJid = maskedUser && server ? `${maskedUser}@${server}` : decryptionJid
 									logger.info(
 										{ jid: decryptionJid, maskedJid, targetedDevices: deletedCount },
 										`🔄 Session Reset | JID: ${maskedJid} | Targeted: ${deletedCount} devices | Will recreate on next message`
 									)
 								} catch (cleanupErr) {
 									logger.error({ decryptionJid, err: cleanupErr }, '❌ Failed to cleanup corrupted session')
 								}
 							}
 						} else if (isSessionRecord) {
 							// Session record errors are transient - retry should handle them
 							// eslint-disable-next-line max-depth
@@ -487,20 +504,53 @@ export function isCorruptedSessionError(error: any): boolean {
 }
 /**
- * Clean up corrupted session for a specific device JID.
+ * Clean up corrupted session by deleting all device sessions for a JID
- * WABA behavior: DELETE sessions WHERE recipient_id=? AND device_id=?
+ * Signal Protocol will automatically recreate the session on next message
 * Only deletes the exact device that was corrupted, not all devices.
 *
 * NOTE: This should NOT be called on every Bad MAC error (hot path).
 * Instead, let the retry+pkmsg flow handle recovery naturally (like WhatsApp does).
 * Only call this as a safety net when retries are exhausted.
 */
-export async function cleanupCorruptedSession(
+async function cleanupCorruptedSession(
 	jid: string,
 	repository: SignalRepositoryWithLIDStore,
 	logger: ILogger
 ): Promise<number> {
-	await repository.deleteSession([jid])
+	const { user, device } = jidDecode(jid) || {}
-	logger.info({ jid }, 'Cleaned up corrupted session for specific device')
+	if (!user) {
-	return 1
+		logger.warn({ jid }, 'Cannot cleanup session - invalid JID')
 		return 0
 	}
 	// Build list of JIDs to delete (primary + secondary devices)
 	const jidsToDelete: string[] = []
 	// Determine domain type correctly (handle hosted JIDs)
 	// JID formats:
 	//   - PN: user@s.whatsapp.net
 	//   - LID: user@lid
 	//   - Hosted PN: user@hosted
 	//   - Hosted LID: user@hosted.lid
 	const isLID = jid.endsWith('@lid') || jid.endsWith('@hosted.lid')
 	const isHosted = jid.includes('@hosted')
 	let domain: string
 	if (isLID) {
 		domain = isHosted ? 'hosted.lid' : 'lid'
 	} else {
 		domain = isHosted ? 'hosted' : 's.whatsapp.net'
 	}
 	// Primary device (0)
 	jidsToDelete.push(`${user}@${domain}`)
 	// Secondary devices (1-5 common range for Web/Desktop/etc)
 	for (let i = 1; i <= 5; i++) {
 		jidsToDelete.push(`${user}:${i}@${domain}`)
 	}
 	// If specific device was identified and > 5, ensure it's included
 	if (device !== undefined && device > 5) {
 		jidsToDelete.push(`${user}:${device}@${domain}`)
 	}
 	await repository.deleteSession(jidsToDelete)
 	return jidsToDelete.length
 }
@@ -54,15 +54,15 @@ export interface BufferConfig {
 */
 export function loadBufferConfig(): BufferConfig {
 	return {
-		// perf(inbound-latency): reduced from 15s → 3s so the safety auto-flush fires sooner.
+		// perf(inbound-latency): reduced from 15s → 5s so the safety auto-flush fires sooner.
 		// processNodeWithBuffer always calls ev.flush() explicitly (no-op for this timer),
 		// but socket.ts's offline-phase buffer and any stalled buffer benefit from the lower cap.
-		bufferTimeoutMs: parseInt(process.env.BAILEYS_BUFFER_TIMEOUT_MS || '3000', 10),
+		bufferTimeoutMs: parseInt(process.env.BAILEYS_BUFFER_TIMEOUT_MS || '5000', 10),
 		minBufferTimeoutMs: parseInt(process.env.BAILEYS_BUFFER_MIN_TIMEOUT_MS || '1000', 10),
-		maxBufferTimeoutMs: parseInt(process.env.BAILEYS_BUFFER_MAX_TIMEOUT_MS || '3000', 10),
+		maxBufferTimeoutMs: parseInt(process.env.BAILEYS_BUFFER_MAX_TIMEOUT_MS || '8000', 10),
 		maxHistoryCacheSize: parseInt(process.env.BAILEYS_BUFFER_MAX_HISTORY_CACHE || '10000', 10),
 		maxBufferSize: parseInt(process.env.BAILEYS_BUFFER_MAX_SIZE || '5000', 10),
-		flushDebounceMs: parseInt(process.env.BAILEYS_BUFFER_FLUSH_DEBOUNCE_MS || '10', 10),
+		flushDebounceMs: parseInt(process.env.BAILEYS_BUFFER_FLUSH_DEBOUNCE_MS || '100', 10),
 		enableAdaptiveTimeout: process.env.BAILEYS_BUFFER_ADAPTIVE_TIMEOUT !== 'false',
 		enableMetrics: process.env.BAILEYS_BUFFER_METRICS === 'true' || process.env.BAILEYS_PROMETHEUS_ENABLED === 'true',
 		lruCleanupRatio: parseFloat(process.env.BAILEYS_BUFFER_LRU_CLEANUP_RATIO || '0.2'),
@@ -429,36 +429,6 @@ export const getCallStatusFromNode = ({ tag, attrs }: BinaryNode) => {
 		case 'accept':
 			status = 'accept'
 			break
 		case 'preaccept':
 			status = 'preaccept'
 			break
 		case 'transport':
 			status = 'transport'
 			break
 		case 'relaylatency':
 			status = 'relaylatency'
 			break
 		case 'group_update':
 			status = 'group_update'
 			break
 		case 'reminder':
 			status = 'reminder'
 			break
 		case 'heartbeat':
 			status = 'heartbeat'
 			break
 		case 'mute_v2':
 			status = 'mute_v2'
 			break
 		case 'enc_rekey':
 			status = 'enc_rekey'
 			break
 		case 'video':
 			status = 'video'
 			break
 		case 'relay':
 			status = 'relay'
 			break
 		default:
 			status = 'ringing'
 			break
@@ -211,33 +211,15 @@ export class MessageRetryManager {
 			}
 		}
-		// MAC errors require session recreation, but rate-limited to prevent loops.
+		// MAC errors require IMMEDIATE session recreation regardless of history
-		// When multiple messages fail with Bad MAC simultaneously, only the first
+		// This handles the case where contact reinstalled WhatsApp (identity key changed)
 		// should trigger recreation; subsequent ones within the cooldown window
 		// piggyback on the same new session established by the retry+pkmsg flow.
 		if (errorCode !== undefined && MAC_ERROR_CODES.has(errorCode)) {
-			const now = Date.now()
+			this.sessionRecreateHistory.set(jid, Date.now())
 			const prevTime = this.sessionRecreateHistory.get(jid)
 			const MAC_ERROR_COOLDOWN_MS = 1_000 // 1 second — WABA recovers faster
 			if (prevTime && now - prevTime < MAC_ERROR_COOLDOWN_MS) {
 				const reasonName = RetryReason[errorCode] || `code_${errorCode}`
 				this.logger.debug(
 					{ jid, errorCode: reasonName, msSinceLast: now - prevTime },
 					'MAC error session recreation skipped — cooldown active'
 				)
 				return {
 					reason: '',
 					recreate: false
 				}
 			}
 			this.sessionRecreateHistory.set(jid, now)
 			this.statistics.sessionRecreations++
 			const reasonName = RetryReason[errorCode] || `code_${errorCode}`
 			metrics.signalMacErrors?.inc({ action: 'session_recreation' })
 			metrics.signalSessionRecreations?.inc({ reason: 'mac_error' })
-			this.logger.warn({ jid, errorCode: reasonName }, 'MAC error detected, recreating session')
+			this.logger.warn({ jid, errorCode: reasonName }, 'MAC error detected, forcing immediate session recreation')
 			return {
 				reason: `MAC error (${reasonName}) - contact may have reinstalled WhatsApp`,
 				recreate: true
@@ -160,7 +160,7 @@ export const extractImageThumb = async (bufferOrFilePath: Readable | Buffer | st
 				height: dimensions.height
 			}
 		}
-	} else if ('jimp' in lib && (typeof lib.jimp?.Jimp === 'object' || typeof lib.jimp?.Jimp === 'function')) {
+	} else if ('jimp' in lib && typeof lib.jimp?.Jimp === 'object') {
 		const jimp = await (lib.jimp.Jimp as any).read(bufferOrFilePath)
 		const dimensions = {
 			width: jimp.width,
@@ -1228,57 +1228,19 @@ export const generateWAMessageContent = async (
 			options.logger?.info('Sending CTA buttons as nativeFlowMessage with viewOnceMessage wrapper')
 		}
 	}
-	// Check for nativeCarousel — inline handler (validated on Android, iOS, Web)
+	// Check for nativeCarousel
 	// 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 cards = carouselMsg.nativeCarousel.cards || []
+		const carouselOptions: CarouselMessageOptions = {
-		const title = carouselMsg.nativeCarousel.title || carouselMsg.title
+			cards: carouselMsg.nativeCarousel.cards,
-		const text = carouselMsg.text
+			title: carouselMsg.nativeCarousel.title || carouselMsg.title,
-		const footer = carouselMsg.footer
+			text: carouselMsg.text,
-
+			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)
 		// Direct interactiveMessage — no viewOnceMessage wrapper, no root header/body/footer
 		m.interactiveMessage = generated.interactiveMessage
 		return m
 	}
 	// Check for nativeList
@@ -19,13 +19,10 @@ import type {
 	WAMessage,
 	WAMessageKey
 } from '../Types'
 import type { LIDMappingStore } from '../Signal/lid-mapping'
 import { WAMessageStubType } from '../Types'
 import { getContentType, normalizeMessageContent } from '../Utils/messages'
 import {
 	areJidsSameUser,
 	isAnyLidUser,
 	isAnyPnUser,
 	isHostedLidUser,
 	isHostedPnUser,
 	isJidBroadcast,
@@ -116,106 +113,46 @@ export const cleanMessage = (message: WAMessage, meId: string, meLid: string) =>
 			msgKey.remoteJid = message.key.remoteJid
 			// set participant of the message
 			msgKey.participant = msgKey.participant || message.key.participant
 		} else {
 			// fromMe reactions/polls: normalise remoteJid to match the chat JID
 			// ensures DM reaction keys are consistent with group behavior
 			msgKey.remoteJid = message.key.remoteJid
 			// in groups, normalise participant for own messages too
 			if (message.key.participant) {
 				msgKey.participant = msgKey.participant || message.key.participant
 			}
 		}
 	}
 }
 /**
 * Resolves a LID JID to its PN equivalent using the LID mapping store.
 * Returns the original JID if it's not a LID or if no mapping is found.
 * Safe to call with any JID type (group, newsletter, PN, etc.).
 */
 export const resolveLidToPn = async (
 	jid: string | undefined | null,
 	lidMapping: LIDMappingStore,
 	logger?: ILogger
 ): Promise<string | undefined> => {
 	if (!jid) {
 		return undefined
 	}
 	if (isAnyLidUser(jid)) {
 		const pn = await lidMapping.getPNForLID(jid)
 		if (pn) {
 			logger?.debug({ lid: jid, pn }, 'Resolved LID to PN')
 		}
 		return pn || jid
 	}
 	return jid
 }
 /**
 * Normalizes a WAMessageKey by resolving LID→PN for remoteJid and participant.
 */
 export const normalizeKeyLidToPn = async (
 	key: WAMessageKey,
 	lidMapping: LIDMappingStore,
 	logger?: ILogger
 ): Promise<void> => {
 	const [resolvedRemoteJid, resolvedParticipant] = await Promise.all([
 		resolveLidToPn(key.remoteJid, lidMapping, logger),
 		resolveLidToPn(key.participant, lidMapping, logger)
 	])
 	if (resolvedRemoteJid) {
 		key.remoteJid = resolvedRemoteJid
 	}
 	if (resolvedParticipant) {
 		key.participant = resolvedParticipant
 	}
 }
 export const normalizeMessageJids = async (
 	message: WAMessage,
 	signalRepository: SignalRepositoryWithLIDStore,
 	logger?: ILogger
 ): Promise<void> => {
-	const lidMapping = signalRepository.lidMapping
+	const resolveLidToPn = async (jid: string | undefined | null): Promise<string | undefined> => {
-	const key = message.key
+		if (!jid) {
-
+			return undefined
 	// FAST PATH: Use alt JIDs directly when available (avoids LIDMappingStore race condition).
 	// The stanza always carries both formats (LID + PN) in the attributes.
 	// When addressing_mode=lid, remoteJid is LID and remoteJidAlt is PN.
 	// When addressing_mode=pn, remoteJid is already PN (no conversion needed).
 	if (key.remoteJid && isAnyLidUser(key.remoteJid) && key.remoteJidAlt && isAnyPnUser(key.remoteJidAlt)) {
 		logger?.debug({ lid: key.remoteJid, pn: key.remoteJidAlt }, 'Resolved remoteJid LID→PN via alt (fast path)')
 		key.remoteJid = key.remoteJidAlt
 	}
 	if (key.participant && isAnyLidUser(key.participant) && key.participantAlt && isAnyPnUser(key.participantAlt)) {
 		logger?.debug({ lid: key.participant, pn: key.participantAlt }, 'Resolved participant LID→PN via alt (fast path)')
 		key.participant = key.participantAlt
 	}
 	// SLOW PATH: Resolve any remaining LIDs via LIDMappingStore lookup
 	await normalizeKeyLidToPn(key, lidMapping, logger)
 	// Also normalize participantAlt (the alternative JID format — can be LID when addressing_mode=pn)
 	if (key.participantAlt && isAnyLidUser(key.participantAlt)) {
 		const resolved = await resolveLidToPn(key.participantAlt, lidMapping, logger)
 		if (resolved) {
 			key.participantAlt = resolved
 		}
 		if (isLidUser(jid) || isHostedLidUser(jid)) {
 			const pn = await signalRepository.lidMapping.getPNForLID(jid)
 			if (pn) {
 				logger?.debug({ lid: jid, pn }, 'Resolved LID to PN for inbound message')
 			} else {
 				logger?.debug({ lid: jid }, 'PN not found for inbound LID, keeping LID')
 			}
 			return pn || jid
 		}
 		return jid
 	}
-	// Normalize nested message keys (reaction, poll) that may contain LID JIDs
+	// Execute both lookups in parallel instead of sequentially to reduce latency
-	const content = normalizeMessageContent(message.message)
+	const [resolvedRemoteJid, resolvedParticipant] = await Promise.all([
-	if (content?.reactionMessage?.key) {
+		resolveLidToPn(message.key.remoteJid),
-		await normalizeKeyLidToPn(content.reactionMessage.key, lidMapping, logger)
+		resolveLidToPn(message.key.participant)
 	])
 	if (resolvedRemoteJid) {
 		message.key.remoteJid = resolvedRemoteJid
 	}
-	if (content?.pollUpdateMessage?.pollCreationMessageKey) {
+	if (resolvedParticipant) {
-		await normalizeKeyLidToPn(content.pollUpdateMessage.pollCreationMessageKey, lidMapping, logger)
+		message.key.participant = resolvedParticipant
 	}
 }
@@ -589,12 +526,6 @@ const processMessage = async (
 								'CTWA: Successfully recovered message via placeholder resend'
 							)
 							// Normalize LID→PN in PDO-recovered message key before emitting
 							// eslint-disable-next-line max-depth
 							if (webMessageInfo.key && signalRepository) {
 								await normalizeKeyLidToPn(webMessageInfo.key as WAMessageKey, signalRepository.lidMapping, logger)
 							}
 							// wait till another upsert event is available, don't want it to be part of the PDO response message
 							// TODO: parse through proper message handling utilities (to add relevant key fields)
 							ev.emit('messages.upsert', {
@@ -735,13 +666,9 @@ const processMessage = async (
 						response: responseMsg
 					}
 					// Normalize creationMsgKey JIDs for the emitted event
 					const normalizedCreationKey = { ...creationMsgKey }
 					await normalizeKeyLidToPn(normalizedCreationKey, signalRepository.lidMapping, logger)
 					ev.emit('messages.update', [
 						{
-							key: normalizedCreationKey,
+							key: creationMsgKey,
 							update: {
 								eventResponses: [eventResponse]
 							}
@@ -784,7 +711,7 @@ const processMessage = async (
 			})
 		}
-		const participantsIncludesMe = () => participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
+		const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid.phoneNumber)) // ADD SUPPORT FOR LID
 		switch (message.messageStubType) {
 			case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
@@ -2,7 +2,6 @@ import { Boom } from '@hapi/boom'
 import { createHash } from 'crypto'
 import { zipSync } from 'fflate'
 import { promises as fs } from 'fs'
 import { gzipSync, gunzipSync } from 'zlib'
 import { proto } from '../../WAProto/index.js'
 import type { MediaType } from '../Defaults/index.js'
 import type { StickerPack, WAMediaUpload, WAMediaUploadFunction } from '../Types/Message.js'
@@ -102,49 +101,6 @@ export const isAnimatedWebP = (buffer: Buffer): boolean => {
 	return false
 }
 /**
 * Detecta se um buffer é Lottie JSON (raw ou gzip-compressed/WAS)
 *
 * WABA usa mimetype `application/was` para stickers Lottie.
 * WAS (WhatsApp Animated Sticker) = gzip-compressed Lottie JSON.
 *
 * Detecção:
 * - Gzip (0x1f 0x8b): descomprime e verifica se é Lottie JSON
 * - JSON bruto: verifica campos Lottie obrigatórios (v, ip, op, layers)
 *
 * @param buffer - Buffer to check
 * @returns true if buffer is Lottie/WAS format
 */
 export const isLottieBuffer = (buffer: Buffer): boolean => {
 	if (buffer.length < 2) return false
 	let jsonBuffer: Buffer
 	// Check if gzip-compressed (WAS format)
 	if (buffer[0] === 0x1f && buffer[1] === 0x8b) {
 		try {
 			// SECURITY: Limit decompressed output to 50MB to prevent decompression bombs
 			jsonBuffer = gunzipSync(buffer, { maxOutputLength: 50 * 1024 * 1024 }) as Buffer
 		} catch {
 			return false
 		}
 	} else if (buffer[0] === 0x7b) {
 		// Starts with '{' - could be raw Lottie JSON
 		jsonBuffer = buffer
 	} else {
 		return false
 	}
 	// Validate Lottie JSON structure: must have v, ip, op, AND layers
 	try {
 		const str = jsonBuffer.toString('utf8', 0, Math.min(jsonBuffer.length, 4096))
 		// Quick check for ALL required Lottie fields
 		return str.includes('"v"') && str.includes('"layers"') && str.includes('"ip"') && str.includes('"op"')
 	} catch {
 		return false
 	}
 }
 /**
 * Converte uma imagem para WebP usando Sharp
 * Preserva o buffer original se já for WebP para manter EXIF e animações
@@ -158,25 +114,12 @@ export const isLottieBuffer = (buffer: Buffer): boolean => {
 const convertToWebP = async (
 	buffer: Buffer,
 	logger?: ILogger
-): Promise<{ webpBuffer: Buffer; isAnimated: boolean; isLottie: boolean }> => {
+): Promise<{ webpBuffer: Buffer; isAnimated: boolean }> => {
 	// Lottie/WAS: ensure gzip-compressed format (WAS = gzip Lottie JSON)
 	if (isLottieBuffer(buffer)) {
 		let wasBuffer = buffer
 		// Raw Lottie JSON (starts with '{') must be gzipped to produce valid WAS
 		if (buffer[0] === 0x7b) {
 			logger?.trace('Raw Lottie JSON detected, gzip-compressing to WAS format')
 			wasBuffer = gzipSync(buffer) as Buffer
 		}
 		logger?.trace('Input is Lottie/WAS format')
 		return { webpBuffer: wasBuffer, isAnimated: true, isLottie: true }
 	}
 	// Se já é WebP, preserva o buffer original (mantém EXIF e animações)
 	if (isWebPBuffer(buffer)) {
 		const isAnimated = isAnimatedWebP(buffer)
 		logger?.trace({ isAnimated }, 'Input is already WebP, preserving original buffer')
-		return { webpBuffer: buffer, isAnimated, isLottie: false }
+		return { webpBuffer: buffer, isAnimated }
 	}
 	// Tenta usar Sharp para converter
@@ -192,7 +135,7 @@ const convertToWebP = async (
 	logger?.trace('Converting image to WebP using Sharp')
 	const webpBuffer = await lib.sharp.default(buffer).webp().toBuffer()
-	return { webpBuffer, isAnimated: false, isLottie: false }
+	return { webpBuffer, isAnimated: false }
 }
 /**
@@ -395,11 +338,9 @@ export type PrepareStickerPackMessageOptions = {
 *
 * **Especificações WhatsApp:**
 * - 3-30 stickers por pack (oficial)
- * - WebP ou Lottie/WAS (application/was)
+ * - WebP obrigatório
 * - Stickers: 512x512 pixels (auto-resize)
 * - Recomendado: 100KB por sticker estático, 500KB animado
- * - Tray icon: 96x96 pixels (PNG no ZIP)
+ * - Tray icon: 252x252 pixels
 * - Thumbnail: 252x252 pixels (JPEG, upload separado)
 *
 * @param stickerPack - Sticker pack data with stickers, cover, name, publisher
 * @param options - Upload function and optional logger
@@ -523,36 +464,9 @@ export const prepareStickerPackMessage = async (
 				// Obtém buffer do sticker
 				const buffer = await mediaToBuffer(sticker.data, `sticker ${i + 1}`)
-				// Detecta formato e converte se necessário
+				// Converte para WebP
 				// eslint-disable-next-line prefer-const
-				let { webpBuffer, isAnimated, isLottie } = await convertToWebP(buffer, logger)
+				let { webpBuffer, isAnimated } = await convertToWebP(buffer, logger)
 				// Validate explicit isLottie flag — must match detected format
 				if (sticker.isLottie !== undefined && sticker.isLottie !== isLottie) {
 					throw new Boom(
 						`Sticker ${i + 1}: explicit isLottie=${sticker.isLottie} does not match detected format (detected=${isLottie})`,
 						{ statusCode: 400 }
 					)
 				}
 				// WABA: Enforce 512x512 dimensions for WebP stickers (Lottie is vector, skip)
 				if (!isLottie && isWebPBuffer(webpBuffer)) {
 					const lib = await getImageProcessingLibrary()
 					if (lib?.sharp) {
 						const metadata = await lib.sharp.default(webpBuffer).metadata()
 						if (metadata.width !== 512 || metadata.height !== 512) {
 							logger?.trace(
 								{ index: i, width: metadata.width, height: metadata.height },
 								'Resizing sticker to 512x512 (WABA standard)'
 							)
 							webpBuffer = await lib.sharp
 								.default(webpBuffer)
 								.resize(512, 512, { fit: 'contain', background: { r: 0, g: 0, b: 0, alpha: 0 } })
 								.webp()
 								.toBuffer()
 						}
 					}
 				}
 				// ENHANCEMENT: Auto-compression if exceeds 1MB (try quality 70, then 50)
 				const MAX_STICKER_SIZE = 1024 * 1024 // 1MB
@@ -569,7 +483,7 @@ export const prepareStickerPackMessage = async (
 					if (lib?.sharp) {
 						// Try quality 70
 						try {
-							const compressed70 = await lib.sharp.default(webpBuffer).webp({ quality: 70 }).toBuffer()
+							const compressed70 = await lib.sharp.default(buffer).webp({ quality: 70 }).toBuffer()
 							// eslint-disable-next-line max-depth
 							if (compressed70.length <= MAX_STICKER_SIZE) {
@@ -584,7 +498,7 @@ export const prepareStickerPackMessage = async (
 								)
 							} else {
 								// Try quality 50
-								const compressed50 = await lib.sharp.default(webpBuffer).webp({ quality: 50 }).toBuffer()
+								const compressed50 = await lib.sharp.default(buffer).webp({ quality: 50 }).toBuffer()
 								// eslint-disable-next-line max-depth
 								if (compressed50.length <= MAX_STICKER_SIZE) {
@@ -633,13 +547,12 @@ export const prepareStickerPackMessage = async (
 					)
 				}
-				// Gera nome do arquivo: hash.webp ou hash.was (WABA: plain_file_hash.ext)
+				// Gera nome do arquivo: hash.webp (deduplicação automática)
 				const sha256Hash = generateSha256Hash(webpBuffer)
-				const extension = isLottie ? 'was' : 'webp'
+				const fileName = `${sha256Hash}.webp`
 				const fileName = `${sha256Hash}.${extension}`
 				logger?.trace(
-					{ index: i, fileName, sizeKB: finalSizeKB.toFixed(2), isAnimated, isLottie },
+					{ index: i, fileName, sizeKB: finalSizeKB.toFixed(2), isAnimated },
 					'Sticker processed successfully'
 				)
@@ -647,7 +560,6 @@ export const prepareStickerPackMessage = async (
 					fileName,
 					webpBuffer,
 					isAnimated,
 					isLottie,
 					emojis: sticker.emojis || [],
 					accessibilityLabel: sticker.accessibilityLabel
 				}
@@ -666,7 +578,7 @@ export const prepareStickerPackMessage = async (
 	for (const result of processedStickers) {
 		if (!result) continue
-		const { fileName, webpBuffer, isAnimated, isLottie, emojis, accessibilityLabel } = result
+		const { fileName, webpBuffer, isAnimated, emojis, accessibilityLabel } = result
 		// SECURITY FIX #7: Check if this hash already exists (duplicate sticker)
 		const existingMetadata = metadataByHash.get(fileName)
@@ -693,14 +605,13 @@ export const prepareStickerPackMessage = async (
 			// New sticker - add to ZIP and create metadata
 			stickerData[fileName] = [new Uint8Array(webpBuffer), { level: 0 as 0 }]
 			// WABA: mimetype é 'application/was' para Lottie, 'image/webp' para WebP
 			const metadata: proto.Message.StickerPackMessage.ISticker = {
 				fileName,
 				isAnimated,
 				emojis,
 				accessibilityLabel,
-				isLottie,
+				isLottie: false,
-				mimetype: isLottie ? 'application/was' : 'image/webp'
+				mimetype: 'image/webp'
 			}
 			metadataByHash.set(fileName, metadata)
@@ -725,22 +636,10 @@ export const prepareStickerPackMessage = async (
 		logger?.trace('Processing cover image')
 		coverBuffer = await mediaToBuffer(cover, 'cover image')
-		// Tray icon uses PNG format, 96x96 pixels (official client standard)
+		// Converte cover para WebP e adiciona ao ZIP
-		const lib = await getImageProcessingLibrary()
+		const result = await convertToWebP(coverBuffer, logger)
-		if (!lib?.sharp) {
+		coverWebP = result.webpBuffer
-			throw new Boom(
+		coverFileName = `${stickerPackId}.webp`
 				'Sharp library is required for cover/tray icon processing. Install with: yarn add sharp',
 				{ statusCode: 400 }
 			)
 		}
 		coverWebP = await lib.sharp
 			.default(coverBuffer)
 			.resize(96, 96, { fit: 'contain', background: { r: 0, g: 0, b: 0, alpha: 0 } })
 			.png()
 			.toBuffer()
 		coverFileName = `${stickerPackId}.png`
 		stickerData[coverFileName] = [new Uint8Array(coverWebP), { level: 0 as 0 }]
 	} catch (error) {
 		throw new Boom(`Failed to process cover image: ${(error as Error).message}`, {
@@ -154,24 +154,15 @@ export async function storeTcTokensFromIqResult({
 			continue
 		}
-		const tokenEntry = {
+		await keys.set({
-			...existingEntry,
+			tctoken: {
-			token: Buffer.from(tokenNode.content),
+				[storageJid]: {
-			timestamp: tokenNode.attrs.t,
+					...existingEntry,
-			// Resets real_issue_timestamp to null when storing a new token
+					token: Buffer.from(tokenNode.content),
-			realIssueTimestamp: null
+					timestamp: tokenNode.attrs.t
-		}
+				}
-
+			}
-		// Store under resolved storageJid AND under fallbackJid (PN) for reliable lookup
+		})
 		const normalizedFallback = jidNormalizedUser(fallbackJid)
 		const keysToStore: Record<string, typeof tokenEntry | null> = {
 			[storageJid]: tokenEntry
 		}
 		if (normalizedFallback !== storageJid) {
 			keysToStore[normalizedFallback] = tokenEntry
 		}
 		await keys.set({ tctoken: keysToStore })
 		onNewJidStored?.(storageJid)
 	}
 }
@@ -64,7 +64,12 @@ const getClientPayload = (config: SocketConfig) => {
 }
 export const generateLoginNode = (userJid: string, config: SocketConfig): proto.IClientPayload => {
-	const { user, device } = jidDecode(userJid)!
+	const decoded = jidDecode(userJid)
 	if (!decoded) {
 		throw new Boom('Invalid user JID', { statusCode: 400 })
 	}
 	const { user, device } = decoded
 	const payload: proto.IClientPayload = {
 		...getClientPayload(config),
 		passive: true,
@@ -153,6 +158,9 @@ export const configureSuccessfulPairing = (
 	}: Pick<AuthenticationCreds, 'advSecretKey' | 'signedIdentityKey' | 'signalIdentities'>
 ) => {
 	const msgId = stanza.attrs.id
 	if (!msgId) {
 		throw new Boom('Missing message ID', { statusCode: 400 })
 	}
 	const pairSuccessNode = getBinaryNodeChild(stanza, 'pair-success')
@@ -168,42 +176,51 @@ export const configureSuccessfulPairing = (
 	const bizName = businessNode?.attrs.name
 	const jid = deviceNode.attrs.jid
 	const lid = deviceNode.attrs.lid
 	if (!jid || !lid) {
 		throw new Boom('Missing JID or LID in device node', { statusCode: 400 })
 	}
 	const { details, hmac, accountType } = proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content as Buffer)
 	if (!details || !hmac) {
 		throw new Boom('Missing ADV signature fields', { statusCode: 400 })
 	}
 	let hmacPrefix = Buffer.from([])
 	if (accountType !== undefined && accountType === proto.ADVEncryptionType.HOSTED) {
 		hmacPrefix = WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
 	}
-	const advSign = hmacSign(Buffer.concat([hmacPrefix, details!]), Buffer.from(advSecretKey, 'base64'))
+	const advSign = hmacSign(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'))
-	if (Buffer.compare(hmac!, advSign) !== 0) {
+	if (Buffer.compare(hmac, advSign) !== 0) {
 		throw new Boom('Invalid account signature')
 	}
-	const account = proto.ADVSignedDeviceIdentity.decode(details!)
+	const account = proto.ADVSignedDeviceIdentity.decode(details)
 	const { accountSignatureKey, accountSignature, details: deviceDetails } = account
 	if (!accountSignatureKey || !accountSignature || !deviceDetails) {
 		throw new Boom('Missing ADV account fields', { statusCode: 400 })
 	}
-	const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails!)
+	const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails)
 	const accountSignaturePrefix =
 		deviceIdentity.deviceType === proto.ADVEncryptionType.HOSTED
 			? WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
 			: WA_ADV_ACCOUNT_SIG_PREFIX
-	const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails!, signedIdentityKey.public])
+	const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public])
-	if (!Curve.verify(accountSignatureKey!, accountMsg, accountSignature!)) {
+	if (!Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
 		throw new Boom('Failed to verify account signature')
 	}
 	const deviceMsg = Buffer.concat([
 		WA_ADV_DEVICE_SIG_PREFIX,
-		deviceDetails!,
+		deviceDetails,
 		signedIdentityKey.public,
-		accountSignatureKey!
+		accountSignatureKey
 	])
 	account.deviceSignature = Curve.sign(signedIdentityKey.private, deviceMsg)
-	const identity = createSignalIdentity(lid!, accountSignatureKey!)
+	const identity = createSignalIdentity(lid, accountSignatureKey)
 	const accountEnc = encodeSignedDeviceIdentity(account, false)
 	const reply: BinaryNode = {
@@ -211,7 +228,7 @@ export const configureSuccessfulPairing = (
 		attrs: {
 			to: S_WHATSAPP_NET,
 			type: 'result',
-			id: msgId!
+			id: msgId
 		},
 		content: [
 			{
@@ -230,7 +247,7 @@ export const configureSuccessfulPairing = (
 	const authUpdate: Partial<AuthenticationCreds> = {
 		account,
-		me: { id: jid!, name: bizName, lid },
+		me: { id: jid, name: bizName, lid },
 		signalIdentities: [...(signalIdentities || []), identity],
 		platform: platformNode?.attrs.name
 	}
@@ -20,7 +20,7 @@ import { jest } from '@jest/globals'
 * bad-ack-handling.test.ts.
 */
-const OFFLINE_BUFFER_TIMEOUT_MS = 2_000
+const OFFLINE_BUFFER_TIMEOUT_MS = 5_000
 /** Mirrors the state variables declared at the top of makeSocket */
 interface OfflineBufferState {
@@ -101,10 +101,10 @@ describe('offline-buffer safety timer (socket.ts)', () => {
 	})
 	// -------------------------------------------------------------------------
-	// 1. Timeout path — CB:ib,,offline never arrives within 2 s
+	// 1. Timeout path — CB:ib,,offline never arrives within 5 s
 	// -------------------------------------------------------------------------
-	it('fires after 2 s and flushes when CB:ib,,offline is delayed', () => {
+	it('fires after 5 s and flushes when CB:ib,,offline is delayed', () => {
 		startBuffer(state, mockFlush, mockWarn)
 		expect(mockFlush).not.toHaveBeenCalled()
@@ -144,17 +144,17 @@ describe('offline-buffer safety timer (socket.ts)', () => {
 	})
 	// -------------------------------------------------------------------------
-	// 2. Happy path — CB:ib,,offline arrives before the 2 s timer fires
+	// 2. Happy path — CB:ib,,offline arrives before the 5 s timer fires
 	// -------------------------------------------------------------------------
 	it('CB:ib,,offline cancels the timer and flushes exactly once', () => {
 		startBuffer(state, mockFlush, mockWarn)
-		// Server responds before the 2 s timeout
+		// Server responds before the 5 s timeout
 		jest.advanceTimersByTime(1_000)
 		onOffline(state, mockFlush)
-		// Timer should be cancelled — advancing past 2 s must not cause a second flush
+		// Timer should be cancelled — advancing past 5 s must not cause a second flush
 		jest.advanceTimersByTime(OFFLINE_BUFFER_TIMEOUT_MS)
 		expect(mockFlush).toHaveBeenCalledTimes(1)
@@ -192,7 +192,7 @@ describe('offline-buffer safety timer (socket.ts)', () => {
 		onClose(state)
-		// Timer must be gone — advancing past 2 s must not trigger any flush
+		// Timer must be gone — advancing past 5 s must not trigger any flush
 		jest.advanceTimersByTime(OFFLINE_BUFFER_TIMEOUT_MS)
 		expect(mockFlush).not.toHaveBeenCalled()
@@ -236,7 +236,7 @@ describe('offline-buffer safety timer (socket.ts)', () => {
 	// 4. Boundary / timing edge cases
 	// -------------------------------------------------------------------------
-	it('does not flush before exactly 2 s have elapsed', () => {
+	it('does not flush before exactly 5 s have elapsed', () => {
 		startBuffer(state, mockFlush, mockWarn)
 		jest.advanceTimersByTime(OFFLINE_BUFFER_TIMEOUT_MS - 1)
@@ -244,7 +244,7 @@ describe('offline-buffer safety timer (socket.ts)', () => {
 		expect(mockFlush).not.toHaveBeenCalled()
 	})
-	it('flushes at exactly the 2 s boundary', () => {
+	it('flushes at exactly the 5 s boundary', () => {
 		startBuffer(state, mockFlush, mockWarn)
 		jest.advanceTimersByTime(OFFLINE_BUFFER_TIMEOUT_MS)
@@ -388,13 +388,6 @@ __metadata:
  languageName: node
  linkType: hard
 "@borewit/text-codec@npm:^0.2.2":
  version: 0.2.2
  resolution: "@borewit/text-codec@npm:0.2.2"
  checksum: 10c0/2d3fb132bc6a132914a8fbf8e9ff2fa1ead210ecc395b28bb7355bd7719548a5e351ffe39f21c3bee8048f6cabd99eabd404bb5cc809cad9cba25abed19d271f
  languageName: node
  linkType: hard
 "@cacheable/node-cache@npm:^2.0.1":
  version: 2.0.1
  resolution: "@cacheable/node-cache@npm:2.0.1"
@@ -3112,7 +3105,7 @@ __metadata:
    libsignal: "github:whiskeysockets/libsignal-node"
    link-preview-js: "npm:^4.0.0"
    lru-cache: "npm:^11.2.6"
-    music-metadata: "npm:^11.12.3"
+    music-metadata: "npm:^11.12.0"
    open: "npm:^11.0.0"
    p-queue: "npm:^9.0.0"
    pino: "npm:^10.3.1"
@@ -4563,15 +4556,15 @@ __metadata:
  languageName: node
  linkType: hard
-"file-type@npm:^21.3.1":
+"file-type@npm:^21.3.0":
-  version: 21.3.1
+  version: 21.3.0
-  resolution: "file-type@npm:21.3.1"
+  resolution: "file-type@npm:21.3.0"
  dependencies:
    "@tokenizer/inflate": "npm:^0.4.1"
    strtok3: "npm:^10.3.4"
    token-types: "npm:^6.1.1"
    uint8array-extras: "npm:^1.4.0"
-  checksum: 10c0/66a8eda781c803c6fc372464abba88cee564cfe30f029716f06909da1564bc51d0a4e8d34654b881dc751cdb0513338b3c0747e06a608cee0dd5c5499b018d47
+  checksum: 10c0/1b1fa909e6063044a6da1d2ea348ee4d747ed9286382d3f0d4d6532c11fb2ea9f2e7e67b2bc7d745d1bc937e05dee1aa8cb912c64250933bcb393a3744f4e284
  languageName: node
  linkType: hard
@@ -6511,21 +6504,21 @@ __metadata:
  languageName: node
  linkType: hard
-"music-metadata@npm:^11.12.3":
+"music-metadata@npm:^11.12.0":
-  version: 11.12.3
+  version: 11.12.0
-  resolution: "music-metadata@npm:11.12.3"
+  resolution: "music-metadata@npm:11.12.0"
  dependencies:
-    "@borewit/text-codec": "npm:^0.2.2"
+    "@borewit/text-codec": "npm:^0.2.1"
    "@tokenizer/token": "npm:^0.3.0"
    content-type: "npm:^1.0.5"
    debug: "npm:^4.4.3"
-    file-type: "npm:^21.3.1"
+    file-type: "npm:^21.3.0"
    media-typer: "npm:^1.1.0"
    strtok3: "npm:^10.3.4"
    token-types: "npm:^6.1.2"
    uint8array-extras: "npm:^1.5.0"
    win-guid: "npm:^0.2.1"
-  checksum: 10c0/57df905f51ec792e5b4c994645eab64d47d5608b9de11151f54b26fbd5f563598ec04d8aed7f244ef1479030d78ddab8af1ee84dfcee40a93b3241941b50999d
+  checksum: 10c0/014a120b8941ab80452171def0ec3cba013041ba4b94f8061ad493a037d3423e6d316131a13fb0433404685ebd3c8e3ae2255c1bafaeb20673fcd73af2df0148
  languageName: node
  linkType: hard
`@@ -1 +1 @@`
	`{"version":[2,3000,1035223526]}`	`{"version":[2,3000,1034258243]}`