@webex/contact-center 3.12.0-next.9 → 3.12.0-task-refactor.1

package/src/services/task/TaskManager.ts

@@ -3,25 +3,32 @@ import {ICall, LINE_EVENTS} from '@webex/calling';
 import {WebSocketManager} from '../core/websocket/WebSocketManager';
 import routingContact from './contact';
 import WebCallingService from '../WebCallingService';
-import {ITask, MEDIA_CHANNEL, TASK_EVENTS, TaskData, TaskId} from './types';
+import {
+  MEDIA_CHANNEL,
+  TASK_EVENTS,
+  TaskData,
+  TaskId,
+  ITask,
+  WebSocketPayload,
+  WebSocketMessage,
+  TaskEventActions,
+  EventContext,
+} from './types';
 import {TASK_MANAGER_FILE} from '../../constants';
 import {METHODS, TRANSCRIPT_EVENT_MAP} from './constants';
-import {CC_EVENTS, CC_TASK_EVENTS, WrapupData} from '../config/types';
-import {AIAssistantEventName, AIAssistantEventType, LoginOption} from '../../types';
+import {CC_EVENTS, WrapupData} from '../config/types';
+import {ConfigFlags, LoginOption, AIAssistantEventType, AIAssistantEventName} from '../../types';
 import LoggerProxy from '../../logger-proxy';
-import Task from '.';
-import MetricsManager from '../../metrics/MetricsManager';
-import {METRIC_EVENT_NAMES} from '../../metrics/constants';
-import {
-  checkParticipantNotInInteraction,
-  getIsConferenceInProgress,
-  isCampaignPreviewReservation,
-  isParticipantInMainInteraction,
-  isPrimary,
-  isSecondaryEpDnAgent,
-  shouldAutoAnswerTask,
-} from './TaskUtils';
-import ApiAIAssistant from '../ApiAiAssistant';
+import {getIsConferenceInProgress, isSecondaryEpDnAgent, shouldAutoAnswerTask} from './TaskUtils';
+import TaskFactory from './TaskFactory';
+import WebRTC from './voice/WebRTC';
+import {TaskEvent, type TaskEventPayload} from './state-machine';
+import {normalizeTaskData} from './taskDataNormalizer';
+import {ApiAIAssistant} from '../ApiAiAssistant';
+
+const CC_EVENT_SET = new Set<CC_EVENTS>(Object.values(CC_EVENTS) as CC_EVENTS[]);
+
+const isCcEvent = (value: string): value is CC_EVENTS => CC_EVENT_SET.has(value as CC_EVENTS);
 
 /** @internal */
 export default class TaskManager extends EventEmitter {
@@ -35,8 +42,10 @@ export default class TaskManager extends EventEmitter {
   private taskCollection: Record<TaskId, ITask>;
   private webCallingService: WebCallingService;
   private webSocketManager: WebSocketManager;
-  private metricsManager: MetricsManager;
-  private static taskManager;
+  private rtdWebSocketManager: WebSocketManager;
+  // eslint-disable-next-line no-use-before-define
+  private static taskManager: TaskManager;
+  private configFlags?: ConfigFlags;
   private wrapupData: WrapupData;
   private agentId: string;
   private webRtcEnabled: boolean;
@@ -50,47 +59,28 @@ export default class TaskManager extends EventEmitter {
     apiAIAssistant: ApiAIAssistant,
     contact: ReturnType<typeof routingContact>,
     webCallingService: WebCallingService,
-    webSocketManager: WebSocketManager
+    webSocketManager: WebSocketManager,
+    rtdWebSocketManager: WebSocketManager
   ) {
     super();
     this.apiAIAssistant = apiAIAssistant;
     this.contact = contact;
-    this.taskCollection = {};
     this.webCallingService = webCallingService;
     this.webSocketManager = webSocketManager;
-    this.metricsManager = MetricsManager.getInstance();
+    this.rtdWebSocketManager = rtdWebSocketManager;
+    this.taskCollection = {};
+    this.webRtcEnabled = false;
+
     this.registerTaskListeners();
     this.registerIncomingCallEvent();
   }
 
-  public setWrapupData(wrapupData: WrapupData) {
-    this.wrapupData = wrapupData;
-  }
-
-  public setAgentId(agentId: string) {
-    this.agentId = agentId;
-  }
-
-  /**
-   * Gets the current agent ID
-   * @returns {string} The agent ID set for this task manager instance
-   * @public
-   */
-  public getAgentId(): string {
-    return this.agentId;
-  }
-
-  public setWebRtcEnabled(webRtcEnabled: boolean) {
-    this.webRtcEnabled = webRtcEnabled;
-  }
-
   public handleRealtimeWebsocketEvent(event: string) {
     try {
       const payload = JSON.parse(event);
 
-      const eventType = payload?.type || payload?.data?.notifType;
       const interactionId = payload?.data?.data?.conversationId;
-      if (!eventType || !interactionId) return;
+      if (!interactionId) return;
 
       const task = this.taskCollection[interactionId];
       if (!task) {
@@ -103,7 +93,7 @@ export default class TaskManager extends EventEmitter {
         return;
       }
 
-      task.emit(eventType, payload.data);
+      task.emit(payload.type, payload.data);
     } catch (error) {
       LoggerProxy.error('Failed to parse RTD WebSocket message', {
         module: TASK_MANAGER_FILE,
@@ -113,10 +103,43 @@ export default class TaskManager extends EventEmitter {
     }
   }
 
+  /**
+   * Set config flags for task creation
+   */
+  public setConfigFlags(configFlags: ConfigFlags) {
+    this.configFlags = configFlags;
+  }
+
+  /**
+   * Set wrapup configuration data
+   */
+  public setWrapupData(wrapupData: WrapupData) {
+    this.wrapupData = wrapupData;
+  }
+
+  /**
+   * Set agent ID for task operations
+   */
+  public setAgentId(agentId: string) {
+    this.agentId = agentId;
+  }
+
+  /**
+   * Gets the current agent ID
+   * @returns {string} The agent ID set for this task manager instance
+   * @public
+   */
+  public getAgentId(): string {
+    return this.agentId;
+  }
+
+  public setWebRtcEnabled(webRtcEnabled: boolean) {
+    this.webRtcEnabled = webRtcEnabled;
+  }
+
   private handleIncomingWebCall = (call: ICall) => {
     const currentTask = Object.values(this.taskCollection).find(
-      (task) =>
-        task.data.interaction.mediaType === 'telephony' && !isCampaignPreviewReservation(task)
+      (t) => t.data.interaction.mediaType === MEDIA_CHANNEL.TELEPHONY
     );
 
     if (currentTask) {
@@ -126,7 +149,15 @@ export default class TaskManager extends EventEmitter {
         method: METHODS.HANDLE_INCOMING_WEB_CALL,
         interactionId: currentTask.data.interactionId,
       });
-      this.emit(TASK_EVENTS.TASK_INCOMING, currentTask);
+
+      // Send TASK_INCOMING to state machine - it will emit on the task object
+      const eventPayload = TaskManager.mapEventToTaskStateMachineEvent(
+        CC_EVENTS.AGENT_CONTACT_RESERVED,
+        currentTask.data
+      );
+      if (eventPayload && currentTask) {
+        currentTask.sendStateMachineEvent(eventPayload);
+      }
     }
     this.call = call;
   };
@@ -139,551 +170,470 @@ export default class TaskManager extends EventEmitter {
     this.webCallingService.off(LINE_EVENTS.INCOMING_CALL, this.handleIncomingWebCall);
   }
 
+  /**
+   * Map WebSocket CC_EVENTS to state machine TaskEvent
+   * @param ccEvent - The CC_EVENT type from WebSocket
+   * @param payload - The event payload
+   * @param agentId - Optional agent ID for state detection (needed for HYDRATE)
+   * @returns TaskEventPayload for state machine or null if no mapping
+   */
+  private static mapEventToTaskStateMachineEvent(
+    ccEvent: CC_EVENTS,
+    payload: WebSocketPayload,
+    agentId?: string
+  ): TaskEventPayload | null {
+    const mediaResourceId =
+      payload.mediaResourceId ||
+      payload.interaction?.media?.[payload.interactionId]?.mediaResourceId;
+
+    switch (ccEvent) {
+      // CC -> TaskEvent mappings (see TaskStateMachine comment for quick reference)
+      case CC_EVENTS.AGENT_CONTACT_RESERVED: // AgentContactReserved -> TASK_INCOMING
+        return {type: TaskEvent.TASK_INCOMING, taskData: payload};
+
+      case CC_EVENTS.AGENT_OFFER_CONTACT: // AgentOfferContact -> TASK_OFFERED
+        return {type: TaskEvent.TASK_OFFERED, taskData: payload};
+
+      case CC_EVENTS.AGENT_CONTACT: // AgentContact -> HYDRATE
+        // Include agentId for state detection (e.g., checking isWrapUp in participant data)
+        return {type: TaskEvent.HYDRATE, taskData: payload, agentId};
+
+      case CC_EVENTS.CONTACT_UPDATED:
+        return {type: TaskEvent.CONTACT_UPDATED, taskData: payload};
+      case CC_EVENTS.CONTACT_OWNER_CHANGED:
+        return {type: TaskEvent.CONTACT_OWNER_CHANGED, taskData: payload};
+
+      case CC_EVENTS.AGENT_OFFER_CONSULT: // AgentOfferConsult -> OFFER_CONSULT
+        return {
+          type: TaskEvent.OFFER_CONSULT,
+          taskData: {...payload, isConsulted: true},
+        };
+
+      case CC_EVENTS.AGENT_CONTACT_ASSIGNED: // AgentContactAssigned -> ASSIGN
+        return {type: TaskEvent.ASSIGN, taskData: payload};
+
+      case CC_EVENTS.AGENT_CONTACT_HELD:
+        return {
+          type: TaskEvent.HOLD_SUCCESS,
+          mediaResourceId: mediaResourceId || '',
+          taskData: payload,
+        };
+
+      case CC_EVENTS.AGENT_CONTACT_UNHELD:
+        return {
+          type: TaskEvent.UNHOLD_SUCCESS,
+          mediaResourceId: mediaResourceId || '',
+          taskData: payload,
+        };
+
+      case CC_EVENTS.AGENT_CONSULT_CREATED:
+        return {
+          type: TaskEvent.CONSULT_CREATED,
+          taskData: {...payload, isConsulted: false},
+        };
+
+      case CC_EVENTS.AGENT_CONSULTING: // AgentConsulting -> CONSULTING_ACTIVE
+        // use context to figure out if it's the initiator or receiver using consultInitiator from context
+        return {
+          type: TaskEvent.CONSULTING_ACTIVE,
+          consultDestinationAgentJoined: true,
+          taskData: payload,
+        };
+
+      case CC_EVENTS.AGENT_CONSULT_ENDED: // AgentConsultEnded -> CONSULT_END
+        return {type: TaskEvent.CONSULT_END, taskData: payload};
+
+      case CC_EVENTS.AGENT_CONSULT_FAILED:
+      case CC_EVENTS.AGENT_CTQ_FAILED:
+        return {type: TaskEvent.CONSULT_FAILED, reason: payload.reason, taskData: payload};
+
+      case CC_EVENTS.AGENT_CTQ_CANCELLED:
+        return {type: TaskEvent.CTQ_CANCEL, taskData: payload};
+
+      case CC_EVENTS.AGENT_CTQ_CANCEL_FAILED:
+        return {type: TaskEvent.CTQ_CANCEL_FAILED, taskData: payload};
+
+      case CC_EVENTS.AGENT_BLIND_TRANSFERRED: // AgentBlindTransferred -> TRANSFER_SUCCESS
+      case CC_EVENTS.AGENT_CONSULT_TRANSFERRED: // AgentConsultTransferred -> TRANSFER_SUCCESS
+      case CC_EVENTS.AGENT_VTEAM_TRANSFERRED: // AgentVTeamTransferred -> TRANSFER_SUCCESS
+        return {
+          type: TaskEvent.TRANSFER_SUCCESS,
+          taskData: payload,
+        };
+
+      case CC_EVENTS.AGENT_WRAPUP:
+        return {type: TaskEvent.TASK_WRAPUP, taskData: {...payload, wrapUpRequired: true}};
+      case CC_EVENTS.AGENT_CONTACT_UNASSIGNED:
+        return null; // Add WRAPUP if needed
+
+      case CC_EVENTS.AGENT_BLIND_TRANSFER_FAILED:
+      case CC_EVENTS.AGENT_VTEAM_TRANSFER_FAILED:
+      case CC_EVENTS.AGENT_CONSULT_TRANSFER_FAILED:
+      case CC_EVENTS.AGENT_CONFERENCE_TRANSFER_FAILED:
+        return {type: TaskEvent.TRANSFER_FAILED, taskData: payload};
+
+      case CC_EVENTS.CONTACT_ENDED:
+        return {
+          type: TaskEvent.CONTACT_ENDED,
+          taskData: {
+            ...payload,
+            wrapUpRequired: payload.interaction?.state !== 'new',
+          },
+        };
+
+      case CC_EVENTS.AGENT_INVITE_FAILED:
+        return {type: TaskEvent.INVITE_FAILED, reason: payload.reason};
+
+      case CC_EVENTS.AGENT_CONTACT_ASSIGN_FAILED:
+        return {type: TaskEvent.ASSIGN_FAILED, reason: payload.reason};
+
+      case CC_EVENTS.AGENT_CONTACT_OFFER_RONA:
+        return {type: TaskEvent.RONA, taskData: payload, reason: payload.reason};
+
+      case CC_EVENTS.AGENT_OUTBOUND_FAILED:
+        return {type: TaskEvent.OUTBOUND_FAILED, reason: payload.reason};
+
+      case CC_EVENTS.CONTACT_RECORDING_STARTED:
+        return {type: TaskEvent.RECORDING_STARTED, taskData: payload};
+
+      case CC_EVENTS.CONTACT_RECORDING_PAUSED:
+        return {type: TaskEvent.PAUSE_RECORDING, taskData: payload};
+
+      case CC_EVENTS.CONTACT_RECORDING_RESUMED:
+        return {type: TaskEvent.RESUME_RECORDING, taskData: payload};
+
+      case CC_EVENTS.AGENT_WRAPPEDUP:
+        return {type: TaskEvent.WRAPUP_COMPLETE, taskData: payload};
+
+      // Conference events - these trigger state machine transition to CONFERENCING
+      case CC_EVENTS.AGENT_CONSULT_CONFERENCED:
+      case CC_EVENTS.PARTICIPANT_JOINED_CONFERENCE:
+        return {type: TaskEvent.CONFERENCE_START, taskData: payload};
+
+      case CC_EVENTS.AGENT_CONSULT_CONFERENCE_FAILED:
+        return {type: TaskEvent.CONFERENCE_FAILED, reason: payload.reason, taskData: payload};
+
+      case CC_EVENTS.AGENT_CONSULT_CONFERENCE_ENDED:
+        return {type: TaskEvent.CONFERENCE_END, taskData: payload};
+
+      case CC_EVENTS.PARTICIPANT_LEFT_CONFERENCE:
+        return {
+          type: TaskEvent.PARTICIPANT_LEAVE,
+          taskData: payload,
+          participantId: payload?.participantId,
+        };
+
+      case CC_EVENTS.AGENT_CONFERENCE_TRANSFERRED:
+        return {type: TaskEvent.TRANSFER_CONFERENCE_SUCCESS, taskData: payload};
+
+      default:
+        // Not all events need state machine mapping
+        return null;
+    }
+  }
+
+  /**
+   * Register WebSocket message listeners for task events
+   *
+   * Main entry point that orchestrates event processing through a clear pipeline:
+   * 1. Parse and validate incoming WebSocket messages
+   * 2. Prepare event context with task and state machine mappings
+   * 3. Handle task lifecycle (creation, updates, collection management)
+   * 4. Send events to state machine (task-level transitions/emissions)
+   * 5. Cleanup is triggered via task events emitted by the state machine
+   *
+   * This architecture separates concerns:
+   * - TaskManager: Manages task collection lifecycle and operational concerns
+   * - State Machine: Manages individual task state and event emissions
+   */
   private registerTaskListeners() {
     this.webSocketManager.on('message', (event) => {
-      const payload = JSON.parse(event);
-      // Re-emit the task events to the task object
-      let task: ITask;
-      if (payload.data?.type || payload.type) {
-        if (Object.values(CC_TASK_EVENTS).includes(payload.data.type || payload.type)) {
-          task =
-            this.taskCollection[payload.data?.interactionId] ||
-            this.taskCollection[payload.data?.data?.conversationId];
-        }
-        LoggerProxy.info(`Handling task event ${payload.data?.type}`, {
-          module: TASK_MANAGER_FILE,
-          method: METHODS.REGISTER_TASK_LISTENERS,
-          interactionId: payload.data?.interactionId,
-        });
-        switch (payload.data.type) {
-          case CC_EVENTS.AGENT_CONTACT:
-            // Case1 : Task is already present in taskCollection
-            if (this.taskCollection[payload.data.interactionId]) {
-              LoggerProxy.log(`Got AGENT_CONTACT: Task already exists in collection`, {
-                module: TASK_MANAGER_FILE,
-                method: METHODS.REGISTER_TASK_LISTENERS,
-                interactionId: payload.data.interactionId,
-              });
-              break;
-            } else if (!this.taskCollection[payload.data.interactionId]) {
-              // Case2 : Task is not present in taskCollection
-              LoggerProxy.log(`Got AGENT_CONTACT : Creating new task in taskManager`, {
-                module: TASK_MANAGER_FILE,
-                method: METHODS.REGISTER_TASK_LISTENERS,
-                interactionId: payload.data.interactionId,
-              });
-
-              // Check if auto-answer should happen for this task
-              const shouldAutoAnswer = shouldAutoAnswerTask(
-                payload.data,
-                this.agentId,
-                this.webCallingService.loginOption,
-                this.webRtcEnabled
-              );
-
-              task = new Task(
-                this.contact,
-                this.webCallingService,
-                {
-                  ...payload.data,
-                  wrapUpRequired:
-                    payload.data.interaction?.participants?.[this.agentId]?.isWrapUp || false,
-                  isConferenceInProgress: getIsConferenceInProgress(payload.data),
-                  isAutoAnswering: shouldAutoAnswer, // Set flag before emitting
-                },
-                this.wrapupData,
-                this.agentId
-              );
-              this.taskCollection[payload.data.interactionId] = task;
-              // Condition 1: The state is=new i.e it is a incoming task
-              if (payload.data.interaction.state === 'new') {
-                LoggerProxy.log(
-                  `Got AGENT_CONTACT for a task with state=new, sending TASK_INCOMING event`,
-                  {
-                    module: TASK_MANAGER_FILE,
-                    method: METHODS.REGISTER_TASK_LISTENERS,
-                    interactionId: payload.data.interactionId,
-                  }
-                );
-                this.emit(TASK_EVENTS.TASK_INCOMING, task);
-              } else {
-                // Condition 2: The state is anything else i.e the task was connected
-                LoggerProxy.log(
-                  `Got AGENT_CONTACT for a task with state=${payload.data.interaction.state}, sending TASK_HYDRATE event`,
-                  {
-                    module: TASK_MANAGER_FILE,
-                    method: METHODS.REGISTER_TASK_LISTENERS,
-                    interactionId: payload.data.interactionId,
-                  }
-                );
-                this.emit(TASK_EVENTS.TASK_HYDRATE, task);
-              }
-            }
-            break;
-
-          case CC_EVENTS.AGENT_CONTACT_RESERVED: {
-            // Check if auto-answer should happen for this task
-            const shouldAutoAnswerReserved = shouldAutoAnswerTask(
-              payload.data,
-              this.agentId,
-              this.webCallingService.loginOption,
-              this.webRtcEnabled
-            );
-
-            task = new Task(
-              this.contact,
-              this.webCallingService,
-              {
-                ...payload.data,
-                isConsulted: false,
-                isAutoAnswering: shouldAutoAnswerReserved, // Set flag before emitting
-              },
-              this.wrapupData,
-              this.agentId
-            );
-            this.taskCollection[payload.data.interactionId] = task;
-            if (
-              this.webCallingService.loginOption !== LoginOption.BROWSER ||
-              task.data.interaction.mediaType !== MEDIA_CHANNEL.TELEPHONY // for digital channels
-            ) {
-              this.emit(TASK_EVENTS.TASK_INCOMING, task);
-            } else if (this.call) {
-              this.emit(TASK_EVENTS.TASK_INCOMING, task);
-            }
-            break;
-          }
-          case CC_EVENTS.AGENT_OFFER_CONTACT:
-            // We don't have to emit any event here since this will be result of promise.
-            task = this.updateTaskData(task, payload.data);
-            LoggerProxy.log(`Agent offer contact received for task`, {
-              module: TASK_MANAGER_FILE,
-              method: METHODS.REGISTER_TASK_LISTENERS,
-              interactionId: payload.data?.interactionId,
-            });
-            this.emit(TASK_EVENTS.TASK_OFFER_CONTACT, task);
-
-            // Handle auto-answer for offer contact
-            this.handleAutoAnswer(task);
-            break;
-          case CC_EVENTS.AGENT_OUTBOUND_FAILED:
-            if (task) {
-              task = this.updateTaskData(task, payload.data);
-              this.metricsManager.trackEvent(
-                METRIC_EVENT_NAMES.TASK_OUTDIAL_FAILED,
-                {
-                  ...MetricsManager.getCommonTrackingFieldForAQMResponse(payload.data),
-                  taskId: payload.data.interactionId,
-                  reason: payload.data.reasonCode || payload.data.reason,
-                },
-                ['behavioral', 'operational']
-              );
-              LoggerProxy.log(`Agent outbound failed for task`, {
-                module: TASK_MANAGER_FILE,
-                method: METHODS.REGISTER_TASK_LISTENERS,
-                interactionId: payload.data.interactionId,
-              });
-              task.emit(TASK_EVENTS.TASK_OUTDIAL_FAILED, payload.data.reason ?? 'UNKNOWN_REASON');
-            }
-            break;
-          case CC_EVENTS.AGENT_CONTACT_ASSIGNED:
-            // When a campaign preview contact is accepted, the assigned event may arrive
-            // with a new interactionId while the task is stored under the original
-            // reservationInteractionId. Fall back to that key so the task is found.
-            if (!task && payload.data.reservationInteractionId) {
-              task = this.taskCollection[payload.data.reservationInteractionId];
-              if (task) {
-                // Re-key the task under the new interaction ID and remove the old entry
-                delete this.taskCollection[payload.data.reservationInteractionId];
-                this.taskCollection[payload.data.interactionId] = task;
-              }
-            }
-            if (task) {
-              task = this.updateTaskData(task, payload.data);
-              task.emit(TASK_EVENTS.TASK_ASSIGNED, task);
-            }
-            break;
-          case CC_EVENTS.AGENT_CONTACT_UNASSIGNED:
-            task = this.updateTaskData(task, {
-              ...payload.data,
-              wrapUpRequired: true,
-            });
-            task.emit(TASK_EVENTS.TASK_END, task);
-            break;
-          case CC_EVENTS.AGENT_CONTACT_OFFER_RONA:
-          case CC_EVENTS.AGENT_CONTACT_ASSIGN_FAILED:
-          case CC_EVENTS.AGENT_INVITE_FAILED: {
-            LoggerProxy.warn(
-              `[DEBUG-CAMPAIGN-CLEAR] Task removal triggered by ${payload.data.type}, interactionId=${payload.data.interactionId}, taskType=${task?.data?.type}`,
-              {
-                module: TASK_MANAGER_FILE,
-                method: METHODS.REGISTER_TASK_LISTENERS,
-                interactionId: payload.data.interactionId,
-              }
-            );
-            task = this.updateTaskData(task, payload.data);
-
-            const eventTypeToMetricMap: Record<string, keyof typeof METRIC_EVENT_NAMES> = {
-              [CC_EVENTS.AGENT_CONTACT_ASSIGN_FAILED]: 'AGENT_CONTACT_ASSIGN_FAILED',
-              [CC_EVENTS.AGENT_INVITE_FAILED]: 'AGENT_INVITE_FAILED',
-            };
-            const metricEventName: keyof typeof METRIC_EVENT_NAMES =
-              eventTypeToMetricMap[payload.data.type] || 'AGENT_RONA';
-
-            this.metricsManager.trackEvent(
-              METRIC_EVENT_NAMES[metricEventName],
-              {
-                ...MetricsManager.getCommonTrackingFieldForAQMResponse(payload.data),
-                taskId: payload.data.interactionId,
-                reason: payload.data.reason,
-              },
-              ['behavioral', 'operational']
-            );
-            this.handleTaskCleanup(task);
-            task.emit(TASK_EVENTS.TASK_REJECT, payload.data.reason);
-            break;
-          }
-          case CC_EVENTS.CONTACT_ENDED:
-            // Update task data
-            if (task) {
-              LoggerProxy.warn(
-                `[DEBUG-CAMPAIGN-CLEAR] CONTACT_ENDED, interactionId=${payload.data.interactionId}, taskType=${task?.data?.type}, state=${task?.data?.interaction?.state}`,
-                {
-                  module: TASK_MANAGER_FILE,
-                  method: METHODS.REGISTER_TASK_LISTENERS,
-                  interactionId: payload.data.interactionId,
-                }
-              );
-              task = this.updateTaskData(task, {
-                ...payload.data,
-                wrapUpRequired: payload.data.agentsPendingWrapUp?.includes(this.agentId) || false,
-              });
-
-              // Handle cleanup based on whether task should be deleted
-              this.handleTaskCleanup(task);
-
-              task?.emit(TASK_EVENTS.TASK_END, task);
-            }
-            break;
-          case CC_EVENTS.CAMPAIGN_CONTACT_UPDATED:
-            // CampaignContactUpdated is a non-terminal event (intermediate update during accept).
-            // Only update the task data — do NOT remove the task or emit TASK_END.
-            // Task cleanup is handled by CONTACT_ENDED or other terminal events.
-            if (task) {
-              task = this.updateTaskData(task, payload.data);
-            }
-            break;
-          case CC_EVENTS.CONTACT_MERGED:
-            task = this.handleContactMerged(task, payload.data);
-            break;
-          case CC_EVENTS.AGENT_CONTACT_HELD:
-            // As soon as the main interaction is held, we need to emit TASK_HOLD
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_HOLD, task);
-            break;
-          case CC_EVENTS.AGENT_CONTACT_UNHELD:
-            // As soon as the main interaction is unheld, we need to emit TASK_RESUME
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_RESUME, task);
-            break;
-          case CC_EVENTS.AGENT_VTEAM_TRANSFERRED:
-            task = this.updateTaskData(task, {
-              ...payload.data,
-              wrapUpRequired: true,
-            });
-            task.emit(TASK_EVENTS.TASK_END, task);
-            break;
-          case CC_EVENTS.AGENT_CTQ_CANCEL_FAILED:
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONSULT_QUEUE_FAILED, task);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_CREATED:
-            // Received when self agent initiates a consult
-            task = this.updateTaskData(task, {
-              ...payload.data,
-              isConsulted: false, // This ensures that the task consult status is always reset
-            });
-            task.emit(TASK_EVENTS.TASK_CONSULT_CREATED, task);
-            break;
-          case CC_EVENTS.AGENT_OFFER_CONSULT:
-            // Received when other agent sends us a consult offer
-            task = this.updateTaskData(task, {
-              ...payload.data,
-              isConsulted: true, // This ensures that the task is marked as us being requested for a consult
-            });
-            task.emit(TASK_EVENTS.TASK_OFFER_CONSULT, task);
-
-            // Handle auto-answer for consult offer
-            this.handleAutoAnswer(task);
-            break;
-          case CC_EVENTS.AGENT_CONSULTING:
-            // Received when agent is in an active consult state
-            // TODO: Check if we can use backend consult state instead of isConsulted
-            task = this.updateTaskData(task, payload.data);
-            if (task.data.isConsulted) {
-              // Fire only if you are the agent who received the consult request
-              task.emit(TASK_EVENTS.TASK_CONSULT_ACCEPTED, task);
-            } else {
-              // Fire only if you are the agent who initiated the consult
-              task.emit(TASK_EVENTS.TASK_CONSULTING, task);
-            }
-            break;
-          case CC_EVENTS.AGENT_CONSULT_FAILED:
-            // This can only be received by the agent who initiated the consult.
-            // We need not emit any event here since this will be result of promise
-            task = this.updateTaskData(task, payload.data);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_ENDED:
-            task = this.updateTaskData(task, payload.data);
-            if (task.data.isConsulted) {
-              // This will be the end state of the task as soon as we end the consult in case of
-              // us being offered a consult
-              this.removeTaskFromCollection(task);
-            }
-            task.emit(TASK_EVENTS.TASK_CONSULT_END, task);
-            break;
-          case CC_EVENTS.AGENT_CTQ_CANCELLED:
-            // This event is received when the consult using queue is cancelled using API
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONSULT_QUEUE_CANCELLED, task);
-            break;
-          case CC_EVENTS.AGENT_WRAPUP:
-            task = this.updateTaskData(task, {...payload.data, wrapUpRequired: true});
-            task.emit(TASK_EVENTS.TASK_END, task);
-            break;
-          case CC_EVENTS.AGENT_WRAPPEDUP:
-            task.cancelAutoWrapupTimer();
-            this.removeTaskFromCollection(task);
-            task.emit(TASK_EVENTS.TASK_WRAPPEDUP, task);
-            break;
-          case CC_EVENTS.CONTACT_RECORDING_PAUSED:
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_RECORDING_PAUSED, task);
-            break;
-          case CC_EVENTS.CONTACT_RECORDING_PAUSE_FAILED:
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_RECORDING_PAUSE_FAILED, task);
-            break;
-          case CC_EVENTS.CONTACT_RECORDING_RESUMED:
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_RECORDING_RESUMED, task);
-            break;
-          case CC_EVENTS.CONTACT_RECORDING_RESUME_FAILED:
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_RECORDING_RESUME_FAILED, task);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_CONFERENCING:
-            // Conference is being established - update task state and emit establishing event
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_ESTABLISHING, task);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_CONFERENCED:
-            // Conference started successfully - update task state and emit event
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_STARTED, task);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_CONFERENCE_FAILED:
-            // Conference failed - update task state and emit failure event
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_FAILED, task);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_CONFERENCE_ENDED:
-            // Conference ended - update task state and emit event
-            task = this.updateTaskData(task, payload.data);
-            if (
-              !task ||
-              isPrimary(task, this.agentId) ||
-              isParticipantInMainInteraction(task, this.agentId)
-            ) {
-              LoggerProxy.log('Primary or main interaction participant leaving conference');
-            } else {
-              this.removeTaskFromCollection(task);
-            }
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_ENDED, task);
-            break;
-          case CC_EVENTS.PARTICIPANT_JOINED_CONFERENCE: {
-            task = this.updateTaskData(task, {
-              ...payload.data,
-              isConferenceInProgress: getIsConferenceInProgress(payload.data),
-            });
-            task.emit(TASK_EVENTS.TASK_PARTICIPANT_JOINED, task);
-            break;
-          }
-          case CC_EVENTS.PARTICIPANT_LEFT_CONFERENCE: {
-            // Conference ended - update task state and emit event
-
-            task = this.updateTaskData(task, {
-              ...payload.data,
-              isConferenceInProgress: getIsConferenceInProgress(payload.data),
-            });
-            if (checkParticipantNotInInteraction(task, this.agentId)) {
-              if (
-                isParticipantInMainInteraction(task, this.agentId) ||
-                isPrimary(task, this.agentId)
-              ) {
-                LoggerProxy.log('Primary or main interaction participant leaving conference');
-              } else {
-                this.removeTaskFromCollection(task);
-              }
-            }
-            task.emit(TASK_EVENTS.TASK_PARTICIPANT_LEFT, task);
-            break;
-          }
-          case CC_EVENTS.PARTICIPANT_LEFT_CONFERENCE_FAILED:
-            // Conference exit failed - update task state and emit failure event
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_PARTICIPANT_LEFT_FAILED, task);
-            break;
-          case CC_EVENTS.AGENT_CONSULT_CONFERENCE_END_FAILED:
-            // Conference end failed - update task state with error details and emit failure event
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_END_FAILED, task);
-            break;
-          case CC_EVENTS.AGENT_CONFERENCE_TRANSFERRED:
-            // Conference was transferred - update task state and emit transfer success event
-            // Note: Backend should provide hasLeft and wrapUpRequired status
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_TRANSFERRED, task);
-            break;
-          case CC_EVENTS.AGENT_CONFERENCE_TRANSFER_FAILED:
-            // Conference transfer failed - update task state with error details and emit failure event
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_CONFERENCE_TRANSFER_FAILED, task);
-            break;
-          case CC_EVENTS.PARTICIPANT_POST_CALL_ACTIVITY:
-            // Post-call activity for participant - update task state with activity details
-            task = this.updateTaskData(task, payload.data);
-            task.emit(TASK_EVENTS.TASK_POST_CALL_ACTIVITY, task);
-            break;
-          case CC_EVENTS.AGENT_OFFER_CAMPAIGN_RESERVATION: {
-            // Campaign preview contact offered to agent
-            // Create a task in the collection so subsequent events (e.g. AGENT_CONTACT_ASSIGNED
-            // after acceptPreviewContact) can find and update it.
-            // Emit TASK_CAMPAIGN_PREVIEW_RESERVATION instead of TASK_INCOMING so the call
-            // does not ring out to the customer before the agent explicitly accepts the preview contact.
-            LoggerProxy.log('Campaign preview reservation received', {
-              module: TASK_MANAGER_FILE,
-              method: METHODS.REGISTER_TASK_LISTENERS,
-              interactionId: payload.data.interactionId,
-            });
-
-            if (!this.taskCollection[payload.data.interactionId]) {
-              task = new Task(
-                this.contact,
-                this.webCallingService,
-                {
-                  ...payload.data,
-                  wrapUpRequired: false,
-                  isConferenceInProgress: false,
-                  isAutoAnswering: false,
-                },
-                this.wrapupData,
-                this.agentId
-              );
-              this.taskCollection[payload.data.interactionId] = task;
-            } else {
-              task = this.updateTaskData(task, payload.data);
-            }
-
-            this.emit(TASK_EVENTS.TASK_CAMPAIGN_PREVIEW_RESERVATION, task);
-            break;
-          }
+      // Step 1: Parse and validate the message
+      const message = TaskManager.parseWebSocketMessage(event);
+      if (!message) return;
 
-          default:
-            break;
-        }
-        if (task) {
-          task.emit(payload.data.type, payload.data);
-        }
+      // Step 2: Prepare event context
+      const eventContext = this.prepareEventContext(message);
+      if (!eventContext) return;
 
-        const transcriptInteractionId =
-          payload.data?.interactionId ||
-          payload.data?.data?.conversationId ||
-          task?.data?.interactionId;
+      const actions = this.handleTaskLifecycleEvent(eventContext);
 
-        if (TRANSCRIPT_EVENT_MAP[payload.data.type] && transcriptInteractionId) {
-          this.requestRealTimeTranscripts(payload.data.type, transcriptInteractionId);
-        }
+      const {task} = actions;
+      if (!task) return;
+
+      const {payload, stateMachineEvent} = eventContext;
+
+      // Always keep task.data updated (even for mapped events) so consumers relying
+      // on TaskManager-managed task instances see the latest payload.
+      if (payload) {
+        this.updateTaskData(task, payload);
       }
+
+      // Send event to state machine - this will trigger all TASK_EVENTS emissions
+      // including TASK_INCOMING which is now handled via the state machine callbacks
+      if (stateMachineEvent) {
+        task.sendStateMachineEvent(stateMachineEvent);
+      }
+
+      // Send transcript start/stop events for relevant CC events
+      this.requestRealTimeTranscripts(eventContext.eventType, payload.interactionId);
     });
   }
 
-  private updateTaskData(task: ITask, taskData: TaskData): ITask {
-    if (!task) {
-      return undefined;
-    }
+  /**
+   * Parse and validate WebSocket message
+   * @returns Parsed message or null if invalid/keepalive
+   */
+  private static parseWebSocketMessage(event: string): WebSocketMessage | null {
+    try {
+      const payload = JSON.parse(event) as WebSocketMessage;
 
-    if (!taskData?.interactionId) {
-      LoggerProxy.warn('Received task update with missing interactionId', {
-        module: TASK_MANAGER_FILE,
-        method: METHODS.UPDATE_TASK_DATA,
-      });
-    }
+      // Filter out keepalive messages
+      if (payload?.keepalive === 'true' || payload?.keepalive === true) {
+        return null;
+      }
 
-    try {
-      const currentTask = task.updateTaskData(taskData);
-      this.taskCollection[taskData.interactionId] = currentTask;
+      // Normalize task data if present
+      if (payload?.data?.interaction) {
+        payload.data = normalizeTaskData(payload.data);
+      }
 
-      return currentTask;
+      return payload;
     } catch (error) {
-      LoggerProxy.error(`Failed to update task`, {
+      LoggerProxy.error('Failed to parse WebSocket message', {
         module: TASK_MANAGER_FILE,
-        method: METHODS.UPDATE_TASK_DATA,
-        interactionId: taskData.interactionId,
+        method: 'parseWebSocketMessage',
+        error,
       });
 
-      return task;
+      return null;
     }
   }
 
   /**
-   * Handles CONTACT_MERGED event logic
-   * @param task - The task to process
-   * @param taskData - The task data from the event payload
-   * @returns Updated or newly created task
-   * @private
+   * Prepare context for event processing
+   * @returns Event context or null if event type is invalid
    */
-  private handleContactMerged(task: ITask, taskData: TaskData): ITask {
-    if (taskData.childInteractionId) {
-      // remove the child task from collection
-      this.removeTaskFromCollection(this.taskCollection[taskData.childInteractionId]);
+  private prepareEventContext(message: WebSocketMessage): EventContext | null {
+    const eventType = message.data?.type || message.type;
+
+    if (!eventType || !isCcEvent(eventType)) {
+      return null;
     }
 
-    if (this.taskCollection[taskData.interactionId]) {
-      LoggerProxy.log(`Got CONTACT_MERGED: Task already exists in collection`, {
-        module: TASK_MANAGER_FILE,
-        method: METHODS.REGISTER_TASK_LISTENERS,
-        interactionId: taskData.interactionId,
-      });
-      // update the task data
-      task = this.updateTaskData(task, taskData);
-    } else {
-      // Case2 : Task is not present in taskCollection
-      LoggerProxy.log(`Got CONTACT_MERGED : Creating new task in taskManager`, {
-        module: TASK_MANAGER_FILE,
-        method: METHODS.REGISTER_TASK_LISTENERS,
-        interactionId: taskData.interactionId,
-      });
+    const interactionId = message.data.interactionId;
+    const task = this.taskCollection[interactionId];
+
+    const wasConsultedTask = Boolean(task?.data?.isConsulted);
+    const computeWrapUpRequired = () => {
+      if (message.data.wrapUpRequired !== undefined) {
+        return message.data.wrapUpRequired;
+      }
+      if (message.data.isConsulted !== undefined) {
+        return !message.data.isConsulted;
+      }
+
+      return !wasConsultedTask;
+    };
+
+    const adjustedPayload =
+      eventType === CC_EVENTS.AGENT_CONSULT_TRANSFERRED ||
+      eventType === CC_EVENTS.AGENT_BLIND_TRANSFERRED ||
+      eventType === CC_EVENTS.AGENT_VTEAM_TRANSFERRED
+        ? {
+            ...message.data,
+            wrapUpRequired: computeWrapUpRequired(),
+          }
+        : message.data;
+
+    const stateMachineEvent = TaskManager.mapEventToTaskStateMachineEvent(
+      eventType,
+      adjustedPayload,
+      this.agentId
+    );
+
+    LoggerProxy.info(`Handling task event ${eventType}`, {
+      module: TASK_MANAGER_FILE,
+      method: 'prepareEventContext',
+      interactionId,
+    });
+
+    return {
+      eventType,
+      payload: adjustedPayload,
+      task,
+      stateMachineEvent,
+    };
+  }
+
+  /**
+   * Handle task lifecycle events and determine required actions
+   *
+   * Delegates to specific event handlers based on event type. Each handler
+   * is responsible for TaskManager-level concerns:
+   * - Task creation and collection management
+   * - Metrics tracking
+   * - Resource cleanup decisions
+   *
+   * Note: Task-level state transitions and event emissions are handled by
+   * the task state machine via sendStateMachineEvent()
+   */
+  private handleTaskLifecycleEvent(context: EventContext): TaskEventActions {
+    const {eventType} = context;
+
+    switch (eventType) {
+      case CC_EVENTS.AGENT_CONTACT_RESERVED:
+        return this.handleContactReserved(context);
+
+      case CC_EVENTS.AGENT_CONTACT:
+        return this.handleAgentContact(context);
+
+      case CC_EVENTS.CONTACT_MERGED:
+        return this.handleContactMergedEvent(context);
+
+      default:
+        return {task: context.task};
+    }
+  }
+
+  /**
+   * Handle AGENT_CONTACT_RESERVED event
+   * Creates a new task; state machine event is sent during processing
+   */
+  private handleContactReserved(context: EventContext): TaskEventActions {
+    const {payload} = context;
+    const isConsultedTask =
+      payload.isConsulted === true || isSecondaryEpDnAgent(payload.interaction);
+    const shouldAutoAnswer = shouldAutoAnswerTask(
+      payload,
+      this.agentId,
+      this.webCallingService.loginOption,
+      this.webRtcEnabled
+    );
+
+    const taskData: TaskData = {
+      ...payload,
+      isConsulted: isConsultedTask,
+      isAutoAnswering: shouldAutoAnswer,
+    };
+
+    const task = TaskFactory.createTask(
+      this.contact,
+      this.webCallingService,
+      taskData,
+      this.configFlags,
+      this.wrapupData,
+      this.agentId
+    );
+
+    this.setupTaskListeners(task);
+    this.taskCollection[payload.interactionId] = task;
+
+    return {task};
+  }
+
+  /**
+   * Handle AGENT_CONTACT event
+   * Re-creates task if missing (multi-session scenario)
+   */
+  private handleAgentContact(context: EventContext): TaskEventActions {
+    let {task} = context;
+    const {payload} = context;
 
-      task = new Task(
+    if (!task) {
+      const isConsultedTask =
+        payload.isConsulted === true || isSecondaryEpDnAgent(payload.interaction);
+      const shouldAutoAnswer = shouldAutoAnswerTask(
+        payload,
+        this.agentId,
+        this.webCallingService.loginOption,
+        this.webRtcEnabled
+      );
+      const taskData: TaskData = {
+        ...payload,
+        isConsulted: isConsultedTask,
+        wrapUpRequired: payload.interaction?.participants?.[this.agentId]?.isWrapUp || false,
+        isConferenceInProgress: getIsConferenceInProgress(payload),
+        isAutoAnswering: shouldAutoAnswer,
+      };
+
+      task = TaskFactory.createTask(
         this.contact,
         this.webCallingService,
-        {
-          ...taskData,
-          wrapUpRequired: taskData.interaction?.participants?.[this.agentId]?.isWrapUp || false,
-          isConferenceInProgress: getIsConferenceInProgress(taskData),
-        },
+        taskData,
+        this.configFlags,
         this.wrapupData,
         this.agentId
       );
-      this.taskCollection[taskData.interactionId] = task;
+      this.setupTaskListeners(task);
+      this.taskCollection[payload.interactionId] = task;
+    }
+
+    return {task};
+  }
+
+  private updateTaskData(task: ITask, taskData: TaskData): ITask {
+    if (!task) {
+      throw new Error('Task not found for update');
     }
 
-    this.emit(TASK_EVENTS.TASK_MERGED, task);
+    const snapshot = task.stateMachineService?.getSnapshot?.();
+    const isConsultingFlow =
+      snapshot?.value === 'CONSULTING' || taskData.interaction?.state === 'consulting';
+
+    const updateTaskData = isConsultingFlow
+      ? {
+          ...taskData,
+          destAgentId: taskData.destAgentId ?? snapshot?.context?.consultDestinationAgentId ?? null,
+          destinationType:
+            taskData.destinationType ?? snapshot?.context?.consultDestinationType ?? null,
+        }
+      : taskData;
+
+    task.updateTaskData(updateTaskData);
+    this.taskCollection[taskData.interactionId] = task;
 
     return task;
   }
 
+  /**
+   * Setup listeners for task events that need to be bubbled up to TaskManager
+   * This replaces the previous callback injection pattern
+   */
+  private setupTaskListeners(task: ITask): void {
+    // Listen for TASK_INCOMING and re-emit so webex.cc can notify consumers
+    task.on(TASK_EVENTS.TASK_INCOMING, (t: ITask) => {
+      LoggerProxy.log(`Task incoming event received`, {
+        module: TASK_MANAGER_FILE,
+        method: METHODS.REGISTER_TASK_LISTENERS,
+        interactionId: t.data?.interactionId,
+      });
+
+      this.emit(TASK_EVENTS.TASK_INCOMING, t);
+    });
+
+    // Listen for TASK_HYDRATE on the task and re-emit on TaskManager
+    task.on(TASK_EVENTS.TASK_HYDRATE, (t: ITask) => {
+      // Task data is already updated by the task itself before emitting
+      this.emit(TASK_EVENTS.TASK_HYDRATE, t);
+    });
+
+    // Listen for internal cleanup signal emitted by the state machine
+    task.on(TASK_EVENTS.TASK_CLEANUP, (t: ITask, options?: {removeFromCollection?: boolean}) => {
+      this.handleTaskCleanup(t);
+      if (options?.removeFromCollection) {
+        const interactionId = t?.data?.interactionId;
+        if (interactionId && this.taskCollection[interactionId]) {
+          this.removeTaskFromCollection(t);
+        }
+      }
+    });
+  }
+
   private removeTaskFromCollection(task: ITask) {
+    if (typeof task.cancelAutoWrapupTimer === 'function') {
+      task.cancelAutoWrapupTimer();
+    }
     if (task?.data?.interactionId) {
       delete this.taskCollection[task.data.interactionId];
       LoggerProxy.info(`Task removed from collection`, {
@@ -695,69 +645,61 @@ export default class TaskManager extends EventEmitter {
   }
 
   /**
-   * Handles auto-answer logic for incoming tasks
-   * Automatically accepts tasks when isAutoAnswering flag is set
-   * The flag is set during task creation based on:
-   * 1. WebRTC calls with auto-answer enabled in agent profile
-   * 2. Agent-initiated WebRTC outdial calls
-   * 3. Agent-initiated digital outbound (Email/SMS) without previous transfers
-   *
-   * @param task - The task to auto-answer
+   * Handles CONTACT_MERGED event logic
+   * @param task - The task to process
+   * @param taskData - The task data from the event payload
+   * @returns Updated or newly created task
    * @private
    */
-  private async handleAutoAnswer(task: ITask): Promise<void> {
-    if (!task || !task.data || !task.data.isAutoAnswering) {
-      return;
-    }
+  private handleContactMergedEvent(context: EventContext): TaskEventActions {
+    const {payload} = context;
+    let task = context.task;
 
-    LoggerProxy.info(`Auto-answering task`, {
-      module: TASK_MANAGER_FILE,
-      method: 'handleAutoAnswer',
-      interactionId: task.data.interactionId,
-    });
+    if (payload.childInteractionId) {
+      // remove the child task from collection
+      this.removeTaskFromCollection(this.taskCollection[payload.childInteractionId]);
+    }
 
-    try {
-      await task.accept();
-      LoggerProxy.info(`Task auto-answered successfully`, {
+    if (task) {
+      LoggerProxy.log(`Got CONTACT_MERGED: Task already exists in collection`, {
         module: TASK_MANAGER_FILE,
-        method: 'handleAutoAnswer',
-        interactionId: task.data.interactionId,
+        method: METHODS.REGISTER_TASK_LISTENERS,
+        interactionId: payload.interactionId,
       });
-
-      // Track successful auto-answer
-      this.metricsManager.trackEvent(
-        METRIC_EVENT_NAMES.TASK_AUTO_ANSWER_SUCCESS,
-        {
-          taskId: task.data.interactionId,
-          mediaType: task.data.interaction.mediaType,
-          isAutoAnswered: true,
-        },
-        ['behavioral', 'operational']
-      );
-      // Emit task:autoAnswered event for widgets/UI to react
-      task.emit(TASK_EVENTS.TASK_AUTO_ANSWERED, task);
-    } catch (error) {
-      // Reset isAutoAnswering flag on failure
-      task.updateTaskData({...task.data, isAutoAnswering: false});
-      LoggerProxy.error(`Failed to auto-answer task`, {
+      // update the task data
+      this.updateTaskData(task, payload);
+    } else {
+      // Case2 : Task is not present in taskCollection
+      LoggerProxy.log(`Got CONTACT_MERGED : Creating new task in taskManager`, {
         module: TASK_MANAGER_FILE,
-        method: 'handleAutoAnswer',
-        interactionId: task.data.interactionId,
-        error,
+        method: METHODS.REGISTER_TASK_LISTENERS,
+        interactionId: payload.interactionId,
       });
 
-      // Track auto-answer failure
-      this.metricsManager.trackEvent(
-        METRIC_EVENT_NAMES.TASK_AUTO_ANSWER_FAILED,
-        {
-          taskId: task.data.interactionId,
-          mediaType: task.data.interaction.mediaType,
-          error: error?.message || 'Unknown error',
-          isAutoAnswered: false,
-        },
-        ['behavioral', 'operational']
+      const taskData: TaskData = {
+        ...payload,
+        wrapUpRequired: payload.interaction?.participants?.[this.agentId]?.isWrapUp || false,
+        isConferenceInProgress: getIsConferenceInProgress(payload),
+        isConsulted: false,
+      };
+
+      task = TaskFactory.createTask(
+        this.contact,
+        this.webCallingService,
+        taskData,
+        this.configFlags,
+        this.wrapupData,
+        this.agentId
       );
+      this.setupTaskListeners(task);
+      this.taskCollection[payload.interactionId] = task;
     }
+
+    if (task) {
+      this.emit(TASK_EVENTS.TASK_MERGED, task);
+    }
+
+    return {task};
   }
 
   /**
@@ -766,10 +708,10 @@ export default class TaskManager extends EventEmitter {
    * @private
    */
   private handleTaskCleanup(task: ITask) {
-    // Clean up Desktop/WebRTC calling resources for browser-based telephony tasks
     if (
       this.webCallingService.loginOption === LoginOption.BROWSER &&
-      task.data.interaction.mediaType === 'telephony'
+      task.data.interaction.mediaType === MEDIA_CHANNEL.TELEPHONY &&
+      task instanceof WebRTC
     ) {
       task.unregisterWebCallListeners();
       this.webCallingService.cleanUpCall();
@@ -777,16 +719,13 @@ export default class TaskManager extends EventEmitter {
 
     const isOutdial = task.data.interaction.outboundType === 'OUTDIAL';
     const isNew = task.data.interaction.state === 'new';
-    const needsWrapUp = task.data.agentsPendingWrapUp?.includes(this.agentId) ?? false;
+    const needsWrapUp = task.data.agentsPendingWrapUp?.length > 0;
 
     // For OUTDIAL: only remove if NOT terminated (user-declined, no wrap-up follows)
+    // If terminated, keep task for wrap-up flow (CONTACT_ENDED → AGENT_WRAPUP)
     // For non-OUTDIAL: remove if state is 'new'
     // Always remove if secondary EpDn agent
-    if (
-      (isNew && !(isOutdial && needsWrapUp)) ||
-      isSecondaryEpDnAgent(task.data.interaction) ||
-      (!needsWrapUp && isOutdial) // For outdial tasks, needs wrap-up is false and state is "WRAPUP". We need to just remove the task.
-    ) {
+    if ((isNew && !(isOutdial && needsWrapUp)) || isSecondaryEpDnAgent(task.data.interaction)) {
       this.removeTaskFromCollection(task);
     }
   }
@@ -797,12 +736,8 @@ export default class TaskManager extends EventEmitter {
    */
   private requestRealTimeTranscripts(eventType: string, interactionId: string): void {
     const action = TRANSCRIPT_EVENT_MAP[eventType];
-    if (
-      !action ||
-      !this.apiAIAssistant ||
-      this.apiAIAssistant.aiFeature?.realtimeTranscripts?.enable === false
-    )
-      return;
+    if (!action || !this.apiAIAssistant) return;
+    if (this.configFlags?.aiFeature?.realtimeTranscripts?.enable === false) return;
 
     this.apiAIAssistant
       .sendEvent(
@@ -815,7 +750,7 @@ export default class TaskManager extends EventEmitter {
       .catch((error) => {
         LoggerProxy.error(`Failed to send transcript ${action} event`, {
           module: TASK_MANAGER_FILE,
-          method: 'requestRealTimeTranscripts',
+          method: METHODS.REQUEST_REAL_TIME_TRANSCRIPTS,
           interactionId,
           error,
         });
@@ -826,28 +761,27 @@ export default class TaskManager extends EventEmitter {
     return this.taskCollection[taskId];
   }
 
-  /**
-   * @param taskId - Unique identifier for each task
-   */
-  public getAllTasks = (): Record<TaskId, ITask> => {
-    return this.taskCollection;
-  };
+  public getAllTasks(): Record<TaskId, ITask> {
+    return {...this.taskCollection};
+  }
 
   public static getTaskManager(
     apiAIAssistant: ApiAIAssistant,
     contact: ReturnType<typeof routingContact>,
     webCallingService: WebCallingService,
-    webSocketManager: WebSocketManager
+    webSocketManager: WebSocketManager,
+    rtdWebSocketManager?: WebSocketManager
   ): TaskManager {
     if (!TaskManager.taskManager) {
       TaskManager.taskManager = new TaskManager(
         apiAIAssistant,
         contact,
         webCallingService,
-        webSocketManager
+        webSocketManager,
+        rtdWebSocketManager
       );
     }
 
-    return this.taskManager;
+    return TaskManager.taskManager;
   }
 }