From 65768bc70c488987efec7a7188fc09a7fb1cb171 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 23 Jan 2026 13:17:32 +0000
Subject: [PATCH] refactor(ctwa): use messageRetryManager for placeholder
 resend scheduling

Aligns CTWA recovery with upstream philosophy by using messageRetryManager
instead of direct requestPlaceholderResend calls.

Benefits:
- Uses 3-second delay from manager (avoids request spam)
- Enables automatic cancellation if message arrives before request
- Centralizes phone request logic in messageRetryManager
- Adds fallback for when manager is not available

Changes:
- Wrap requestPlaceholderResend in messageRetryManager.schedulePhoneRequest()
- Add new metric status 'scheduled' for tracking scheduled requests
- Add metric status 'sent' when request is actually sent after delay
- Keep direct call as fallback when messageRetryManager is null

https://claude.ai/code/session_011WM4Nb6tE1S5nLjHen8Xsi
---
 src/Socket/messages-recv.ts | 95 ++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 32 deletions(-)

diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index 3ba56f0e..e343adf6 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -1261,44 +1261,75 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 
 						if (enableCTWARecovery && msg.key) {
 							const startTime = Date.now()
+							const msgId = msg.key.id!
+							const msgKey = msg.key
+
 							logger.info(
-								{ msgId: msg.key.id, remoteJid: msg.key.remoteJid, messageAge },
-								'CTWA: Message absent from node detected, requesting placeholder resend from phone'
+								{ msgId, remoteJid: msgKey.remoteJid, messageAge },
+								'CTWA: Message absent from node detected, scheduling placeholder resend from phone'
 							)
 
-							try {
+							// Use messageRetryManager to schedule the phone request with delay
+							// This aligns with the upstream philosophy: centralize phone requests in the manager
+							// Benefits: 3s delay (avoids spam), auto-cancellation if message arrives
+							if (messageRetryManager) {
+								metrics.ctwaRecoveryRequests.inc({ status: 'scheduled' })
+
+								messageRetryManager.schedulePhoneRequest(msgId, async () => {
+									try {
+										const requestId = await requestPlaceholderResend(msgKey)
+										if (requestId && requestId !== 'RESOLVED') {
+											logger.debug(
+												{ msgId, requestId },
+												'CTWA: Placeholder resend request sent successfully'
+											)
+											metrics.ctwaRecoveryRequests.inc({ status: 'sent' })
+											// Note: The actual message will be emitted via 'messages.upsert'
+											// when the PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE is processed
+											// in process-message.ts:399-421
+										} else if (requestId === 'RESOLVED') {
+											// Message was received while we were waiting
+											logger.debug(
+												{ msgId },
+												'CTWA: Message received during resend delay'
+											)
+											metrics.ctwaMessagesRecovered.inc()
+											metrics.ctwaRecoveryLatency.observe(Date.now() - startTime)
+										} else {
+											// Already requested (duplicate request prevented by cache)
+											logger.debug(
+												{ msgId },
+												'CTWA: Resend already requested, skipping duplicate'
+											)
+										}
+									} catch (error) {
+										logger.warn(
+											{ error, msgId },
+											'CTWA: Failed to request placeholder resend'
+										)
+										metrics.ctwaRecoveryFailures.inc({ reason: 'request_failed' })
+									}
+								})
+							} else {
+								// Fallback: direct call if messageRetryManager is not available
 								metrics.ctwaRecoveryRequests.inc({ status: 'requested' })
 
-								const requestId = await requestPlaceholderResend(msg.key)
-								if (requestId) {
-									logger.debug(
-										{ msgId: msg.key.id, requestId },
-										'CTWA: Placeholder resend request sent successfully'
-									)
-									// Note: The actual message will be emitted via 'messages.upsert'
-									// when the PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE is processed
-									// in process-message.ts:399-421
-								} else if (requestId === 'RESOLVED') {
-									// Message was received while we were waiting
-									logger.debug(
-										{ msgId: msg.key.id },
-										'CTWA: Message received during resend delay'
-									)
-									metrics.ctwaMessagesRecovered.inc()
-									metrics.ctwaRecoveryLatency.observe(Date.now() - startTime)
-								} else {
-									// Already requested (duplicate request prevented by cache)
-									logger.debug(
-										{ msgId: msg.key.id },
-										'CTWA: Resend already requested, skipping duplicate'
-									)
+								try {
+									const requestId = await requestPlaceholderResend(msgKey)
+									if (requestId && requestId !== 'RESOLVED') {
+										logger.debug(
+											{ msgId, requestId },
+											'CTWA: Placeholder resend request sent successfully (direct)'
+										)
+									} else if (requestId === 'RESOLVED') {
+										logger.debug({ msgId }, 'CTWA: Message received during resend delay')
+										metrics.ctwaMessagesRecovered.inc()
+										metrics.ctwaRecoveryLatency.observe(Date.now() - startTime)
+									}
+								} catch (error) {
+									logger.warn({ error, msgId }, 'CTWA: Failed to request placeholder resend')
+									metrics.ctwaRecoveryFailures.inc({ reason: 'request_failed' })
 								}
-							} catch (error) {
-								logger.warn(
-									{ error, msgId: msg.key.id },
-									'CTWA: Failed to request placeholder resend'
-								)
-								metrics.ctwaRecoveryFailures.inc({ reason: 'request_failed' })
 							}
 						} else {
 							logger.debug(