@microsoft/omnichannel-chat-widget 1.8.3 → 1.8.4-main.424a580

package/lib/esm/common/telemetry/TelemetryConstants.js

@@ -68,9 +68,11 @@ export let BroadcastEvent;
   BroadcastEvent["OnWidgetError"] = "OnWidgetError";
   BroadcastEvent["FMLTrackingCompletedAck"] = "FMLTrackingCompletedAck";
   BroadcastEvent["FMLTrackingCompleted"] = "FMLTrackingCompleted";
+  BroadcastEvent["PersistentConversationReset"] = "PersistentConversationReset";
 })(BroadcastEvent || (BroadcastEvent = {}));
 export let TelemetryEvent;
 (function (TelemetryEvent) {
+  TelemetryEvent["FetchPersistentChatHistoryFailed"] = "FetchPersistentChatHistoryFailed";
   TelemetryEvent["CallAdded"] = "CallAdded";
   TelemetryEvent["LocalVideoStreamAdded"] = "LocalVideoStreamAdded";
   TelemetryEvent["LocalVideoStreamRemoved"] = "LocalVideoStreamRemoved";
@@ -116,6 +118,7 @@ export let TelemetryEvent;
   TelemetryEvent["EndChatFailed"] = "EndChatFailed";
   TelemetryEvent["SettingCustomContext"] = "SettingCustomContext";
   TelemetryEvent["WebChatLoaded"] = "WebChatLoaded";
+  TelemetryEvent["PersistentChatHistoryEnabled"] = "PersistentChatHistoryEnabled";
   TelemetryEvent["LCWChatButtonActionCompleted"] = "LCWChatButtonActionCompleted";
   TelemetryEvent["LCWChatButtonClicked"] = "LCWChatButtonClicked";
   TelemetryEvent["LCWChatButtonShow"] = "LCWChatButtonShow";
@@ -280,8 +283,37 @@ export let TelemetryEvent;
   TelemetryEvent["UXCitationPaneCompleted"] = "UXCitationPaneCompleted";
   TelemetryEvent["UXLiveChatWidgetStart"] = "UXLiveChatWidgetStart";
   TelemetryEvent["UXLiveChatWidgetCompleted"] = "UXLiveChatWidgetCompleted";
+  TelemetryEvent["UXPostChatPaneStarted"] = "UXPostChatPaneStarted";
+  TelemetryEvent["UXPostChatPaneCompleted"] = "UXPostChatPaneCompleted";
   TelemetryEvent["AppInsightsInitialized"] = "AppInsightsInitialized";
   TelemetryEvent["AppInsightsInitFailed"] = "AppInsightsInitFailed";
+  TelemetryEvent["ConvertPersistentChatHistoryMessageToActivityFailed"] = "ConvertPersistentChatHistoryMessageToActivityFailed";
+  TelemetryEvent["UXLCWPersistentChatHistoryInitialized"] = "UXLCWPersistentChatHistoryInitialized";
+  TelemetryEvent["LCWPersistentChatHistoryFetchStarted"] = "LCWPersistentChatHistoryFetchStarted";
+  TelemetryEvent["LCWPersistentChatHistoryFetchCompleted"] = "LCWPersistentChatHistoryFetchCompleted";
+  TelemetryEvent["LCWPersistentChatHistoryFetchFailed"] = "LCWPersistentChatHistoryFetchFailed";
+  TelemetryEvent["LCWWebChatStorePollingStarted"] = "LCWWebChatStorePollingStarted";
+  TelemetryEvent["LCWWebChatStoreReady"] = "LCWWebChatStoreReady";
+  TelemetryEvent["LCWWebChatConnected"] = "LCWWebChatConnected";
+  TelemetryEvent["LCWWebChatDisconnected"] = "LCWWebChatDisconnected";
+  TelemetryEvent["LCWWebChatConnectionCheckFailed"] = "LCWWebChatConnectionCheckFailed";
+  TelemetryEvent["LCWPersistentConversationHandlerInitialized"] = "LCWPersistentConversationHandlerInitialized";
+  TelemetryEvent["LCWPersistentHistoryPullBlocked"] = "LCWPersistentHistoryPullBlocked";
+  TelemetryEvent["LCWPersistentHistoryPullCompleted"] = "LCWPersistentHistoryPullCompleted";
+  TelemetryEvent["LCWLazyLoadInitializationStarted"] = "LCWLazyLoadInitializationStarted";
+  TelemetryEvent["LCWLazyLoadContainerNotFound"] = "LCWLazyLoadContainerNotFound";
+  TelemetryEvent["LCWLazyLoadInitializationCompleted"] = "LCWLazyLoadInitializationCompleted";
+  TelemetryEvent["LCWLazyLoadSessionMetrics"] = "LCWLazyLoadSessionMetrics";
+  TelemetryEvent["LCWLazyLoadTargetElementNotFound"] = "LCWLazyLoadTargetElementNotFound";
+  TelemetryEvent["LCWLazyLoadScrollFailed"] = "LCWLazyLoadScrollFailed";
+  TelemetryEvent["LCWLazyLoadActivityMounted"] = "LCWLazyLoadActivityMounted";
+  TelemetryEvent["LCWLazyLoadReset"] = "LCWLazyLoadReset";
+  TelemetryEvent["LCWLazyLoadNoMoreHistory"] = "LCWLazyLoadNoMoreHistory";
+  TelemetryEvent["LCWLazyLoadDestroyed"] = "LCWLazyLoadDestroyed";
+  TelemetryEvent["SecureEventBusUnauthorizedDispatch"] = "SecureEventBusUnauthorizedDispatch";
+  TelemetryEvent["SecureEventBusListenerError"] = "SecureEventBusListenerError";
+  TelemetryEvent["SecureEventBusDispatchError"] = "SecureEventBusDispatchError";
+  TelemetryEvent["StartChatComplete"] = "StartChatComplete";
 })(TelemetryEvent || (TelemetryEvent = {}));
 export let TelemetryConstants = /*#__PURE__*/function () {
   function TelemetryConstants() {
@@ -349,6 +381,9 @@ export let TelemetryConstants = /*#__PURE__*/function () {
         case TelemetryEvent.PostChatWorkflowFromAgent:
         case TelemetryEvent.PostChatWorkflowFromBot:
         case TelemetryEvent.AppStatesException:
+        case TelemetryEvent.SecureEventBusUnauthorizedDispatch:
+        case TelemetryEvent.SecureEventBusListenerError:
+        case TelemetryEvent.SecureEventBusDispatchError:
           return ScenarioType.ACTIONS;
         case TelemetryEvent.StartChatSDKCall:
         case TelemetryEvent.StartChatEventReceived:
@@ -408,4 +443,10 @@ export let TelemetryConstants = /*#__PURE__*/function () {
     }
   }]);
   return TelemetryConstants;
-}();
+}();
+export let ConversationStage;
+(function (ConversationStage) {
+  ConversationStage["Initialization"] = "Initialization";
+  ConversationStage["CSREngagement"] = "CSR Engagement";
+  ConversationStage["ConversationEnd"] = "Conversation End";
+})(ConversationStage || (ConversationStage = {}));

package/lib/esm/common/telemetry/loggers/appInsightsLogger.js

@@ -1,19 +1,16 @@
-import { LogLevel, TelemetryEvent } from "../TelemetryConstants";
+import { ConversationStage, LogLevel, TelemetryEvent } from "../TelemetryConstants";
 import ScenarioMarker from "../ScenarioMarker";
 import { TelemetryHelper } from "../TelemetryHelper";
 import { AppInsightsTelemetryMessage } from "../../Constants";
 import { AppInsightsEventMapping } from "../AppInsightsEvents";
 var AllowedKeys;
 (function (AllowedKeys) {
-  AllowedKeys["LogLevel"] = "LogLevel";
+  AllowedKeys["OrganizationId"] = "OrganizationId";
+  AllowedKeys["ConversationId"] = "LiveWorkItemId";
+  AllowedKeys["ElapsedTimeInMilliseconds"] = "Duration";
   AllowedKeys["Description"] = "Description";
-  AllowedKeys["ExceptionDetails"] = "ExceptionDetails";
-  AllowedKeys["ChannelId"] = "ChannelId";
+  AllowedKeys["ChannelId"] = "ChannelType";
   AllowedKeys["LCWRuntimeId"] = "ClientSessionId";
-  AllowedKeys["ConversationId"] = "LiveWorkItemId";
-  AllowedKeys["ChatId"] = "ChatThreadId";
-  AllowedKeys["OrganizationId"] = "OrganizationId";
-  AllowedKeys["ElapsedTimeInMilliseconds"] = "DurationInMilliseconds";
 })(AllowedKeys || (AllowedKeys = {}));
 let initializationPromise = null;
 export const appInsightsLogger = appInsightsKey => {
@@ -86,9 +83,9 @@ export const appInsightsLogger = appInsightsKey => {
         if (!_logger) return;
         const eventName = telemetryInput === null || telemetryInput === void 0 ? void 0 : (_telemetryInput$paylo = telemetryInput.payload) === null || _telemetryInput$paylo === void 0 ? void 0 : _telemetryInput$paylo.Event;
         const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : (_telemetryInput$telem = telemetryInput.telemetryInfo) === null || _telemetryInput$telem === void 0 ? void 0 : _telemetryInput$telem.telemetryInfo;
-        const eventProperties = setEventProperties(telemetryInfo);
         if (eventName) {
           const trackingEventName = getTrackingEventName(logLevel, eventName);
+          const eventProperties = setEventProperties(trackingEventName, telemetryInfo);
           _logger.trackEvent({
             name: trackingEventName,
             properties: eventProperties
@@ -107,17 +104,36 @@ export const appInsightsLogger = appInsightsKey => {
   };
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function setEventProperties(telemetryInfo) {
+  function setEventProperties(eventName, telemetryInfo) {
     const eventProperties = {};
     if (telemetryInfo) {
       for (const key in AllowedKeys) {
-        const finalKey = AllowedKeys[key]; // get renamed keys for LCWRuntimeId, ConversationId, ChatId
+        const finalKey = AllowedKeys[key]; // get renamed keys for LCWRuntimeId, ConversationId
         const value = telemetryInfo[key];
         if (value !== undefined && value !== null && value !== "") {
           eventProperties[finalKey] = value;
         }
       }
     }
+    // Include exception details in description for error events
+    if (telemetryInfo !== null && telemetryInfo !== void 0 && telemetryInfo.ExceptionDetails) {
+      eventProperties[AllowedKeys.Description] = JSON.stringify(telemetryInfo.ExceptionDetails);
+    }
+    const customProperties = (() => {
+      if (!(telemetryInfo !== null && telemetryInfo !== void 0 && telemetryInfo.CustomProperties)) {
+        return {};
+      }
+      try {
+        return typeof telemetryInfo.CustomProperties === "string" ? JSON.parse(telemetryInfo.CustomProperties) : telemetryInfo.CustomProperties;
+      } catch (error) {
+        console.warn("Failed to parse CustomProperties:", error);
+        return {};
+      }
+    })();
+    // Additional properties
+    eventProperties["ConversationStage"] = customProperties.ConversationStage ?? ConversationStage.CSREngagement;
+    eventProperties["Scenario"] = "Conversation Diagnostics";
+    eventProperties["OperationName"] = eventName.includes(": ") ? eventName.split(": ")[1] : eventName;
     return eventProperties;
   }
   function getTrackingEventName(logLevel, eventName) {

package/lib/esm/common/utils/SecureEventBus.js

@@ -0,0 +1,328 @@
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { TelemetryHelper } from "../telemetry/TelemetryHelper";
+import { LogLevel, TelemetryEvent } from "../telemetry/TelemetryConstants";
+
+/**
+ * SecureEventBus - A private, authenticated event system for internal chat widget communication
+ * 
+ * This replaces the vulnerable global window event system to prevent external scripts
+ * from injecting malicious events into the chat widget.
+ * 
+ * @example
+ * ```typescript
+ * const eventBus = SecureEventBus.getInstance();
+ * const token = eventBus.getAuthToken();
+ * 
+ * // Subscribe to an event
+ * const unsubscribe = eventBus.subscribe('userMessage', (payload) => {
+ *   console.log('Message received:', payload);
+ * });
+ * 
+ * // Dispatch an event
+ * eventBus.dispatch('userMessage', { text: 'Hello' }, token);
+ * 
+ * // Unsubscribe
+ * unsubscribe();
+ * ```
+ */
+
+/**
+ * Interface representing an event listener with callback and unique identifier
+ */
+/**
+ * SecureEventBus class implementing the singleton pattern for secure event communication.
+ * Provides authentication-based event dispatching to prevent unauthorized external access.
+ */
+let SecureEventBus = /*#__PURE__*/function () {
+  /**
+   * Private constructor to enforce singleton pattern.
+   * Generates a unique authentication token for this session.
+   */
+  function SecureEventBus() {
+    _classCallCheck(this, SecureEventBus);
+    _defineProperty(this, "listeners", new Map());
+    _defineProperty(this, "authToken", void 0);
+    _defineProperty(this, "eventCounter", 0);
+    // Generate a secure, unique token for this session
+    this.authToken = this.generateAuthToken();
+  }
+
+  /**
+   * Get the singleton instance of SecureEventBus.
+   * Creates a new instance if one doesn't exist.
+   * 
+   * @returns The singleton instance of SecureEventBus
+   * 
+   * @example
+   * ```typescript
+   * const eventBus = SecureEventBus.getInstance();
+   * ```
+   */
+  _createClass(SecureEventBus, [{
+    key: "generateAuthToken",
+    value:
+    /**
+     * Generate a cryptographically secure authentication token.
+     * Uses crypto.getRandomValues when available, falls back to Math.random.
+     * 
+     * @private
+     * @returns A 64-character hexadecimal string representing the authentication token
+     */
+    function generateAuthToken() {
+      const array = new Uint8Array(32);
+      if (typeof crypto !== "undefined" && crypto.getRandomValues) {
+        crypto.getRandomValues(array);
+      } else {
+        // Fallback for environments without crypto.getRandomValues
+        for (let i = 0; i < array.length; i++) {
+          array[i] = Math.floor(Math.random() * 256);
+        }
+      }
+      return Array.from(array, byte => byte.toString(16).padStart(2, "0")).join("");
+    }
+
+    /**
+     * Get the authentication token for this SecureEventBus instance.
+     * This token is required for dispatching events and should only be used internally.
+     * 
+     * @returns The authentication token string
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * const token = eventBus.getAuthToken();
+     * eventBus.dispatch('myEvent', { data: 'value' }, token);
+     * ```
+     */
+  }, {
+    key: "getAuthToken",
+    value: function getAuthToken() {
+      return this.authToken;
+    }
+
+    /**
+     * Dispatch an event with authentication to all registered listeners.
+     * Verifies the authentication token before dispatching to prevent unauthorized access.
+     * 
+     * @param eventName - The name of the event to dispatch
+     * @param payload - The data to send with the event (optional)
+     * @param token - Authentication token (must match the internal token)
+     * @returns true if event was successfully dispatched, false if unauthorized or error occurred
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * const token = eventBus.getAuthToken();
+     * 
+     * // Dispatch with payload
+     * const success = eventBus.dispatch('userAction', { action: 'click', target: 'button' }, token);
+     * 
+     * // Dispatch without payload
+     * eventBus.dispatch('windowClosed', undefined, token);
+     * ```
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }, {
+    key: "dispatch",
+    value: function dispatch(eventName, payload, token) {
+      // Verify authentication token
+      if (token !== this.authToken) {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.SecureEventBusUnauthorizedDispatch,
+          Description: `Unauthorized event dispatch attempt blocked: ${eventName}`,
+          ExceptionDetails: {
+            eventName,
+            providedToken: token ? "provided" : "missing",
+            expectedToken: "secured"
+          }
+        });
+        return false;
+      }
+      const listeners = this.listeners.get(eventName);
+      if (!listeners || listeners.length === 0) {
+        return true; // No listeners, but not an error
+      }
+
+      // Dispatch to all registered listeners
+      try {
+        listeners.forEach(listener => {
+          try {
+            listener.callback(payload);
+          } catch (error) {
+            TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+              Event: TelemetryEvent.SecureEventBusListenerError,
+              Description: `Error in event listener for event: ${eventName}`,
+              ExceptionDetails: error
+            });
+          }
+        });
+        return true;
+      } catch (error) {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.SecureEventBusDispatchError,
+          Description: `Error dispatching event: ${eventName}`,
+          ExceptionDetails: error
+        });
+        return false;
+      }
+    }
+
+    /**
+     * Subscribe to an event with a callback function.
+     * The callback will be executed whenever the specified event is dispatched.
+     * 
+     * @param eventName - The name of the event to listen for
+     * @param callback - The function to execute when the event is fired
+     * @returns A function that can be called to unsubscribe from the event
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * 
+     * // Subscribe to an event
+     * const unsubscribe = eventBus.subscribe('chatMessage', (message) => {
+     *   console.log('New message:', message.text);
+     *   console.log('From user:', message.userId);
+     * });
+     * 
+     * // Later, unsubscribe
+     * unsubscribe();
+     * ```
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }, {
+    key: "subscribe",
+    value: function subscribe(eventName, callback) {
+      const listenerId = `listener_${++this.eventCounter}`;
+      if (!this.listeners.has(eventName)) {
+        this.listeners.set(eventName, []);
+      }
+      const listeners = this.listeners.get(eventName);
+      if (!listeners) {
+        throw new Error(`Listeners for event "${eventName}" not found.`);
+      }
+      const listener = {
+        callback,
+        id: listenerId
+      };
+      listeners.push(listener);
+
+      // Return unsubscribe function
+      return () => {
+        const currentListeners = this.listeners.get(eventName);
+        if (currentListeners) {
+          const index = currentListeners.findIndex(l => l.id === listenerId);
+          if (index !== -1) {
+            currentListeners.splice(index, 1);
+          }
+
+          // Clean up empty listener arrays
+          if (currentListeners.length === 0) {
+            this.listeners.delete(eventName);
+          }
+        }
+      };
+    }
+
+    /**
+     * Remove all listeners for a specific event.
+     * This completely removes the event from the internal listeners map.
+     * 
+     * @param eventName - The name of the event to remove all listeners for
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * 
+     * // Remove all listeners for 'chatClosed' event
+     * eventBus.removeAllListeners('chatClosed');
+     * ```
+     */
+  }, {
+    key: "removeAllListeners",
+    value: function removeAllListeners(eventName) {
+      this.listeners.delete(eventName);
+    }
+
+    /**
+     * Clear all listeners for all events.
+     * This resets the entire event bus to its initial state.
+     * Useful for cleanup during application shutdown or testing.
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * 
+     * // Clear all event listeners
+     * eventBus.clear();
+     * ```
+     */
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.listeners.clear();
+    }
+
+    /**
+     * Get the number of listeners for a specific event.
+     * Useful for debugging and monitoring purposes.
+     * 
+     * @param eventName - The name of the event to count listeners for
+     * @returns The number of listeners registered for the event
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * 
+     * // Check how many listeners are registered for 'userAction'
+     * const count = eventBus.getListenerCount('userAction');
+     * console.log(`${count} listeners registered for userAction`);
+     * ```
+     */
+  }, {
+    key: "getListenerCount",
+    value: function getListenerCount(eventName) {
+      var _this$listeners$get;
+      return ((_this$listeners$get = this.listeners.get(eventName)) === null || _this$listeners$get === void 0 ? void 0 : _this$listeners$get.length) || 0;
+    }
+
+    /**
+     * Get all registered event names.
+     * Returns an array of event names that currently have listeners.
+     * Useful for debugging and monitoring purposes.
+     * 
+     * @returns An array of event names that have registered listeners
+     * 
+     * @example
+     * ```typescript
+     * const eventBus = SecureEventBus.getInstance();
+     * 
+     * // Get all registered events
+     * const events = eventBus.getRegisteredEvents();
+     * console.log('Active events:', events);
+     * // Output: ['userAction', 'chatMessage', 'windowResize']
+     * ```
+     */
+  }, {
+    key: "getRegisteredEvents",
+    value: function getRegisteredEvents() {
+      return Array.from(this.listeners.keys());
+    }
+  }], [{
+    key: "getInstance",
+    value: function getInstance() {
+      if (!SecureEventBus.instance) {
+        SecureEventBus.instance = new SecureEventBus();
+      }
+      return SecureEventBus.instance;
+    }
+  }]);
+  return SecureEventBus;
+}();
+_defineProperty(SecureEventBus, "instance", null);
+export default SecureEventBus;

package/lib/esm/common/utils/dispatchCustomEvent.js

@@ -0,0 +1,18 @@
+import SecureEventBus from "./SecureEventBus";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const dispatchCustomEvent = (name, payload) => {
+  try {
+    const eventBus = SecureEventBus.getInstance();
+    const authToken = eventBus.getAuthToken();
+
+    // Dispatch through the secure event bus instead of global window
+    const success = eventBus.dispatch(name, payload, authToken);
+    if (!success) {
+      console.error("Failed to dispatch secure event:", name);
+    }
+  } catch (error) {
+    console.error("Error dispatching secure custom event:", name, payload, error);
+  }
+};
+export default dispatchCustomEvent;

package/lib/esm/components/chatbuttonstateful/ChatButtonStateful.js

@@ -1,4 +1,4 @@
-import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
+import { ConversationStage, LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect, useRef, useState } from "react";
 import { createTimer, setFocusOnElement } from "../../common/utils";
 import { ChatButton } from "@microsoft/omnichannel-chat-components";
@@ -17,7 +17,10 @@ export const ChatButtonStateful = props => {
     uiTimer = createTimer();
     TelemetryHelper.logLoadingEventToAllTelemetry(LogLevel.INFO, {
       Event: TelemetryEvent.UXLCWChatButtonLoadingStart,
-      Description: "Chat button loading started"
+      Description: "Chat button loading started",
+      CustomProperties: {
+        ConversationStage: ConversationStage.Initialization
+      }
     });
   }, []);
 
@@ -40,7 +43,10 @@ export const ChatButtonStateful = props => {
   ref.current = async () => {
     TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
       Event: TelemetryEvent.LCWChatButtonClicked,
-      Description: "Chat button click action started"
+      Description: "Chat button click action started",
+      CustomProperties: {
+        ConversationStage: ConversationStage.Initialization
+      }
     });
     if (state.appStates.isMinimized) {
       dispatch({
@@ -60,7 +66,10 @@ export const ChatButtonStateful = props => {
     }
     TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
       Event: TelemetryEvent.LCWChatButtonActionCompleted,
-      Description: "Chat button action completed"
+      Description: "Chat button action completed",
+      CustomProperties: {
+        ConversationStage: ConversationStage.Initialization
+      }
     });
   };
   const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
@@ -114,7 +123,10 @@ export const ChatButtonStateful = props => {
     TelemetryHelper.logLoadingEventToAllTelemetry(LogLevel.INFO, {
       Event: TelemetryEvent.UXLCWChatButtonLoadingCompleted,
       Description: "Chat button loading completed",
-      ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
+      ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed,
+      CustomProperties: {
+        ConversationStage: ConversationStage.Initialization
+      }
     });
   }, []);
   useEffect(() => {

package/lib/esm/components/citationpanestateful/CitationPaneStateful.js

@@ -33,7 +33,7 @@ export const CitationPaneStateful = props => {
   const [paneStyle, setPaneStyle] = useState(null);
   const [isReady, setIsReady] = useState(false);
 
-  // Move focus to the container
+  // Initial focus pattern (mirrors ConfirmationPaneStateful): focus first focusable element (will re-attempt after visibility becomes true)
   useEffect(() => {
     preventFocusToMoveOutOfElement(controlId);
     const focusableElements = findAllFocusableElement(`#${controlId}`);
@@ -55,6 +55,25 @@ export const CitationPaneStateful = props => {
     });
   }, []);
 
+  // Retry focus once pane is actually visible (isReady) in case initial attempt occurred while wrapper was visibility:hidden
+  useEffect(() => {
+    if (!isReady) return;
+    const focusableElements = findAllFocusableElement(`#${controlId}`);
+    if (focusableElements && focusableElements.length > 0) {
+      const first = focusableElements[0];
+      // If focused element is not already inside the pane, move focus
+      if (!first.contains(document.activeElement) && !(document.activeElement && document.activeElement.id.startsWith(controlId))) {
+        requestAnimationFrame(() => {
+          if (first.isConnected) {
+            first.focus({
+              preventScroll: true
+            });
+          }
+        });
+      }
+    }
+  }, [isReady, controlId]);
+
   // Compute the widget bounds and set pane style accordingly (95% of widget size
   // and centered inside the widget). If the widget container can't be found,
   // fall back to the default pane styles from defaultCitationPaneProps.

package/lib/esm/components/headerstateful/HeaderStateful.js

@@ -1,4 +1,4 @@
-import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
+import { ConversationStage, LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect, useRef, useState } from "react";
 import { ConfirmationState } from "../../common/Constants";
 import { ConversationState } from "../../contexts/common/ConversationState";
@@ -61,7 +61,10 @@ export const HeaderStateful = props => {
       var _props$headerProps, _props$headerProps$co, _props$headerProps$co2;
       TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
         Event: TelemetryEvent.HeaderCloseButtonClicked,
-        Description: "Header Close action started."
+        Description: "Header Close action started.",
+        CustomProperties: {
+          ConversationStage: ConversationStage.ConversationEnd
+        }
       });
       if (localConfirmationPaneState.current !== ConfirmationState.Ok) {
         dispatch({
@@ -76,7 +79,10 @@ export const HeaderStateful = props => {
       }
       TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
         Event: TelemetryEvent.CloseChatActionCompleted,
-        Description: "Header Close action completed."
+        Description: "Header Close action completed.",
+        CustomProperties: {
+          ConversationStage: ConversationStage.ConversationEnd
+        }
       });
       const closeButtonId = ((_props$headerProps = props.headerProps) === null || _props$headerProps === void 0 ? void 0 : (_props$headerProps$co = _props$headerProps.controlProps) === null || _props$headerProps$co === void 0 ? void 0 : (_props$headerProps$co2 = _props$headerProps$co.closeButtonProps) === null || _props$headerProps$co2 === void 0 ? void 0 : _props$headerProps$co2.id) ?? `${controlProps.id}-close-button`;
       if (closeButtonId) {