@newrelic/browser-agent 1.313.1-rc.1 → 1.313.1-rc.3

package/dist/cjs/common/constants/env.cdn.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.313.1-rc.1";
+const VERSION = exports.VERSION = "1.313.1-rc.3";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.313.1-rc.1";
+const VERSION = exports.VERSION = "1.313.1-rc.3";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/dom/selector-path.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.analyzeElemPath = void 0;
+var _utils = require("../v2/utils");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -18,12 +19,16 @@ exports.analyzeElemPath = void 0;
  *
  * @param {HTMLElement} elem
  * @param {Array<string>} [targetFields=[]] specifies which fields to gather from the nearest element in the path
- * @returns {{path: (undefined|string), nearestFields: {}, hasButton: boolean, hasLink: boolean}}
+ * @returns {{path: (undefined|string), nearestFields: {}, targets: Array, hasButton: boolean, hasLink: boolean}}
  */
-const analyzeElemPath = (elem, targetFields = []) => {
+const analyzeElemPath = (elem, targetFields = [], agentRef) => {
+  const targets = [];
   const result = {
     path: undefined,
     nearestFields: {},
+    get targets() {
+      return targets.length ? targets : [undefined];
+    },
     hasButton: false,
     hasLink: false
   };
@@ -46,6 +51,10 @@ const analyzeElemPath = (elem, targetFields = []) => {
       targetFields.forEach(field => {
         result.nearestFields[nearestAttrName(field)] ||= elem[field]?.baseVal || elem[field];
       });
+      const dataAttrs = elem?.dataset;
+      if (dataAttrs.nrMfeId) {
+        targets.push(...(0, _utils.getRegisteredTargetsFromId)(dataAttrs.nrMfeId, agentRef));
+      }
       pathSelector = buildPathSelector(elem, pathSelector);
       elem = elem.parentNode;
     }

package/dist/cjs/features/generic_events/aggregate/index.js

@@ -61,7 +61,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       }
       let addUserAction = () => {/** no-op */};
       if (_runtime.isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new _userActionsAggregator.UserActionsAggregator();
+        this.#userActionAggregator = new _userActionsAggregator.UserActionsAggregator(this.agentRef);
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent);
         addUserAction = aggregatedUserAction => {
           try {
@@ -73,56 +73,58 @@ class Aggregate extends _aggregateBase.AggregateBase {
                 timeStamp,
                 type
               } = aggregatedUserAction.event;
-              const userActionEvent = {
-                eventType: 'UserAction',
-                timestamp: this.#toEpoch(timeStamp),
-                action: type,
-                actionCount: aggregatedUserAction.count,
-                actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
-                actionMs: aggregatedUserAction.relativeMs,
-                rageClick: aggregatedUserAction.rageClick,
-                target: aggregatedUserAction.selectorPath,
-                currentUrl: aggregatedUserAction.currentUrl,
-                ...((0, _iframe.isIFrameWindow)(window) && {
-                  iframe: true
-                }),
-                ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
-                  /** prevent us from capturing an obscenely long value */
-                  if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
-                  return acc;
-                }, {}),
-                ...aggregatedUserAction.nearestTargetFields,
-                ...(aggregatedUserAction.deadClick && {
-                  deadClick: true
-                }),
-                ...(aggregatedUserAction.errorClick && {
-                  errorClick: true
-                })
-              };
-              this.addEvent(userActionEvent);
-              this.#trackUserActionSM(userActionEvent);
+              aggregatedUserAction.targets.forEach(mfeTarget => {
+                const userActionEvent = {
+                  eventType: 'UserAction',
+                  timestamp: this.#toEpoch(timeStamp),
+                  action: type,
+                  actionCount: aggregatedUserAction.count,
+                  actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
+                  actionMs: aggregatedUserAction.relativeMs,
+                  rageClick: aggregatedUserAction.rageClick,
+                  target: aggregatedUserAction.selectorPath,
+                  currentUrl: aggregatedUserAction.currentUrl,
+                  ...((0, _iframe.isIFrameWindow)(window) && {
+                    iframe: true
+                  }),
+                  ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
+                    /** prevent us from capturing an obscenely long value */
+                    if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
+                    return acc;
+                  }, {}),
+                  ...aggregatedUserAction.nearestTargetFields,
+                  ...(aggregatedUserAction.deadClick && {
+                    deadClick: true
+                  }),
+                  ...(aggregatedUserAction.errorClick && {
+                    errorClick: true
+                  })
+                };
+                this.addEvent(userActionEvent, mfeTarget);
+                this.#trackUserActionSM(userActionEvent);
 
-              /**
-               * Returns the original target field name with `target` prepended and camelCased
-               * @param {string} originalFieldName
-               * @returns {string} the target field name
-               */
-              function targetAttrName(originalFieldName) {
-                /** preserve original renaming structure for pre-existing field maps */
-                if (originalFieldName === 'tagName') originalFieldName = 'tag';
-                if (originalFieldName === 'className') originalFieldName = 'class';
-                /** return the original field name, cap'd and prepended with target to match formatting */
-                return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
-              }
+                /**
+                * Returns the original target field name with `target` prepended and camelCased
+                * @param {string} originalFieldName
+                * @returns {string} the target field name
+                */
+                function targetAttrName(originalFieldName) {
+                  /** preserve original renaming structure for pre-existing field maps */
+                  if (originalFieldName === 'tagName') originalFieldName = 'tag';
+                  if (originalFieldName === 'className') originalFieldName = 'class';
+                  /** return the original field name, cap'd and prepended with target to match formatting */
+                  return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
+                }
 
-              /**
-               * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
-               * @param {string} attribute The attribute to check for on the target element
-               * @returns {boolean} Whether the target element has the attribute and can be trusted
-               */
-              function canTrustTargetAttribute(attribute) {
-                return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
-              }
+                /**
+                * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
+                * @param {string} attribute The attribute to check for on the target element
+                * @returns {boolean} Whether the target element has the attribute and can be trusted
+                */
+                function canTrustTargetAttribute(attribute) {
+                  return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
+                }
+              });
             }
           } catch (e) {
             // do nothing for now
@@ -322,9 +324,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       timestamp: this.#toEpoch((0, _now.now)()),
       /** all generic events require pageUrl(s) */
       pageUrl: (0, _cleanUrl.cleanURL)('' + _runtime.initialLocation),
-      currentUrl: (0, _cleanUrl.cleanURL)('' + location),
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...(0, _utils.getVersion2Attributes)(target, this)
+      currentUrl: (0, _cleanUrl.cleanURL)('' + location)
     };
     const eventAttributes = {
       /** Agent-level custom attributes */
@@ -334,7 +334,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes);
+    this.events.add({
+      ...eventAttributes,
+      ...(0, _utils.getVersion2Attributes)(target, this)
+    });
+    if ((0, _utils.shouldDuplicate)(target, this.agentRef)) this.addEvent({
+      ...eventAttributes,
+      ...(0, _utils.getVersion2DuplicationAttributes)(target, this)
+    });
   }
   serializer(eventBuffer) {
     return (0, _traverse.applyFnToProps)({

package/dist/cjs/features/generic_events/aggregate/user-actions/aggregated-user-action.js

@@ -7,7 +7,7 @@ exports.AggregatedUserAction = void 0;
 var _constants = require("../../constants");
 var _cleanUrl = require("../../../../common/url/clean-url");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -23,6 +23,7 @@ class AggregatedUserAction {
     this.currentUrl = (0, _cleanUrl.cleanURL)('' + location);
     this.deadClick = false;
     this.errorClick = false;
+    this.targets = selectorInfo.targets;
   }
 
   /**

package/dist/cjs/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -10,7 +10,7 @@ var _aggregatedUserAction = require("./aggregated-user-action");
 var _timer = require("../../../../common/timer/timer");
 var _nreum = require("../../../../common/window/nreum");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -21,7 +21,8 @@ class UserActionsAggregator {
   #deadClickTimer = undefined;
   #domObserver = undefined;
   #errorClickTimer = undefined;
-  constructor() {
+  constructor(agentRef) {
+    this.agentRef = agentRef;
     if ((0, _nreum.gosNREUMOriginals)().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this));
     }
@@ -44,7 +45,7 @@ class UserActionsAggregator {
   process(evt, targetFields) {
     if (!evt) return;
     const targetElem = _constants.OBSERVED_WINDOW_EVENTS.includes(evt.type) ? window : evt.target;
-    const selectorInfo = (0, _selectorPath.analyzeElemPath)(targetElem, targetFields);
+    const selectorInfo = (0, _selectorPath.analyzeElemPath)(targetElem, targetFields, this.agentRef);
 
     // if selectorInfo.path is undefined, aggregation will be skipped for this event
     const aggregationKey = getAggregationKey(evt, selectorInfo.path);

package/dist/cjs/features/session_replay/aggregate/index.js

@@ -21,7 +21,7 @@ var _cleanUrl = require("../../../common/url/clean-url");
 var _featureGates = require("../../utils/feature-gates");
 var _constants3 = require("../../../loaders/api/constants");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); } /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */ /**
  * @file Records, aggregates, and harvests session replay data.
@@ -219,6 +219,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
   }
   makeHarvestPayload() {
+    if (this.isRetrying) return this.recorder.retryPayload;
     if (this.mode !== _constants2.MODE.FULL || this.blocked) return; // harvests should only be made in FULL mode, and not if the feature is blocked
     if (this.shouldCompress && !this.gzipper) return; // if compression is enabled, but the libraries have not loaded, wait for them to load
     if (!this.recorder || !this.timeKeeper?.ready || !(this.recorder.hasSeenSnapshot && this.recorder.hasSeenMeta)) return; // if the recorder or the timekeeper is not ready, or the recorder has not yet seen a snapshot, do not harvest
@@ -246,8 +247,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.abort(_constants.ABORT_REASONS.TOO_BIG, len);
       return;
     }
-
-    // TODO -- Gracefully handle the buffer for retries.
     if (!this.agentRef.runtime.session.state.sessionReplaySentFirstChunk) this.syncWithSessionManager({
       sessionReplaySentFirstChunk: true
     });
@@ -255,6 +254,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!this.agentRef.runtime.session.state.traceHarvestStarted) {
       (0, _console.warn)(59, JSON.stringify(this.agentRef.runtime.session.state));
     }
+    this.recorder.retryPayload = payload;
     return payload;
   }
 
@@ -352,9 +352,18 @@ class Aggregate extends _aggregateBase.AggregateBase {
     };
   }
   postHarvestCleanup(result) {
-    // The mutual decision for now is to stop recording and clear buffers if ingest is experiencing 429 rate limiting
-    if (result.status === 429) {
-      this.abort(_constants.ABORT_REASONS.TOO_MANY);
+    if (result.sent) {
+      if (result.retry) {
+        (0, _console.warn)(70);
+        this.isRetrying = true;
+        this.forceStop();
+      } else {
+        this.recorder.retryPayload = undefined;
+        if (this.isRetrying) {
+          this.isRetrying = false;
+          this.switchToFull();
+        }
+      }
     }
   }
 

package/dist/cjs/features/session_replay/constants.js

@@ -7,7 +7,7 @@ exports.TRIGGERS = exports.RRWEB_EVENT_TYPES = exports.QUERY_PARAM_PADDING = exp
 var _constants = require("../../common/session/constants");
 var _features = require("../../loaders/features/features");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

package/dist/cjs/features/session_replay/shared/recorder.js

@@ -19,7 +19,7 @@ var _console = require("../../../common/util/console");
 var _invoke = require("../../../common/util/invoke");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -47,6 +47,8 @@ class Recorder {
     this.events = new _recorderEvents.RecorderEvents(this.shouldFix);
     /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
     this.backloggedEvents = new _recorderEvents.RecorderEvents(this.shouldFix);
+    /** Used to hold the harvest contents to facilitate retrying */
+    this.retryPayload = undefined;
     /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     this.hasSeenSnapshot = false;
     this.hasSeenMeta = false;

package/dist/esm/common/constants/env.cdn.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.313.1-rc.1";
+export const VERSION = "1.313.1-rc.3";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.313.1-rc.1";
+export const VERSION = "1.313.1-rc.3";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/dom/selector-path.js

@@ -1,8 +1,10 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { getRegisteredTargetsFromId } from '../v2/utils';
+
 /**
  * Generates a CSS selector path for the given element, if possible.
  * Also gather metadata about the element's nearest fields, and whether there are any links or buttons in the path.
@@ -12,12 +14,16 @@
  *
  * @param {HTMLElement} elem
  * @param {Array<string>} [targetFields=[]] specifies which fields to gather from the nearest element in the path
- * @returns {{path: (undefined|string), nearestFields: {}, hasButton: boolean, hasLink: boolean}}
+ * @returns {{path: (undefined|string), nearestFields: {}, targets: Array, hasButton: boolean, hasLink: boolean}}
  */
-export const analyzeElemPath = (elem, targetFields = []) => {
+export const analyzeElemPath = (elem, targetFields = [], agentRef) => {
+  const targets = [];
   const result = {
     path: undefined,
     nearestFields: {},
+    get targets() {
+      return targets.length ? targets : [undefined];
+    },
     hasButton: false,
     hasLink: false
   };
@@ -40,6 +46,10 @@ export const analyzeElemPath = (elem, targetFields = []) => {
       targetFields.forEach(field => {
         result.nearestFields[nearestAttrName(field)] ||= elem[field]?.baseVal || elem[field];
       });
+      const dataAttrs = elem?.dataset;
+      if (dataAttrs.nrMfeId) {
+        targets.push(...getRegisteredTargetsFromId(dataAttrs.nrMfeId, agentRef));
+      }
       pathSelector = buildPathSelector(elem, pathSelector);
       elem = elem.parentNode;
     }

package/dist/esm/features/generic_events/aggregate/index.js

@@ -14,7 +14,7 @@ import { applyFnToProps } from '../../../common/util/traverse';
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator';
 import { isIFrameWindow } from '../../../common/dom/iframe';
 import { isPureObject } from '../../../common/util/type-check';
-import { getVersion2Attributes } from '../../../common/v2/utils';
+import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   #userActionAggregator;
@@ -54,7 +54,7 @@ export class Aggregate extends AggregateBase {
       }
       let addUserAction = () => {/** no-op */};
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new UserActionsAggregator();
+        this.#userActionAggregator = new UserActionsAggregator(this.agentRef);
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent);
         addUserAction = aggregatedUserAction => {
           try {
@@ -66,56 +66,58 @@ export class Aggregate extends AggregateBase {
                 timeStamp,
                 type
               } = aggregatedUserAction.event;
-              const userActionEvent = {
-                eventType: 'UserAction',
-                timestamp: this.#toEpoch(timeStamp),
-                action: type,
-                actionCount: aggregatedUserAction.count,
-                actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
-                actionMs: aggregatedUserAction.relativeMs,
-                rageClick: aggregatedUserAction.rageClick,
-                target: aggregatedUserAction.selectorPath,
-                currentUrl: aggregatedUserAction.currentUrl,
-                ...(isIFrameWindow(window) && {
-                  iframe: true
-                }),
-                ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
-                  /** prevent us from capturing an obscenely long value */
-                  if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
-                  return acc;
-                }, {}),
-                ...aggregatedUserAction.nearestTargetFields,
-                ...(aggregatedUserAction.deadClick && {
-                  deadClick: true
-                }),
-                ...(aggregatedUserAction.errorClick && {
-                  errorClick: true
-                })
-              };
-              this.addEvent(userActionEvent);
-              this.#trackUserActionSM(userActionEvent);
+              aggregatedUserAction.targets.forEach(mfeTarget => {
+                const userActionEvent = {
+                  eventType: 'UserAction',
+                  timestamp: this.#toEpoch(timeStamp),
+                  action: type,
+                  actionCount: aggregatedUserAction.count,
+                  actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
+                  actionMs: aggregatedUserAction.relativeMs,
+                  rageClick: aggregatedUserAction.rageClick,
+                  target: aggregatedUserAction.selectorPath,
+                  currentUrl: aggregatedUserAction.currentUrl,
+                  ...(isIFrameWindow(window) && {
+                    iframe: true
+                  }),
+                  ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
+                    /** prevent us from capturing an obscenely long value */
+                    if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
+                    return acc;
+                  }, {}),
+                  ...aggregatedUserAction.nearestTargetFields,
+                  ...(aggregatedUserAction.deadClick && {
+                    deadClick: true
+                  }),
+                  ...(aggregatedUserAction.errorClick && {
+                    errorClick: true
+                  })
+                };
+                this.addEvent(userActionEvent, mfeTarget);
+                this.#trackUserActionSM(userActionEvent);
 
-              /**
-               * Returns the original target field name with `target` prepended and camelCased
-               * @param {string} originalFieldName
-               * @returns {string} the target field name
-               */
-              function targetAttrName(originalFieldName) {
-                /** preserve original renaming structure for pre-existing field maps */
-                if (originalFieldName === 'tagName') originalFieldName = 'tag';
-                if (originalFieldName === 'className') originalFieldName = 'class';
-                /** return the original field name, cap'd and prepended with target to match formatting */
-                return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
-              }
+                /**
+                * Returns the original target field name with `target` prepended and camelCased
+                * @param {string} originalFieldName
+                * @returns {string} the target field name
+                */
+                function targetAttrName(originalFieldName) {
+                  /** preserve original renaming structure for pre-existing field maps */
+                  if (originalFieldName === 'tagName') originalFieldName = 'tag';
+                  if (originalFieldName === 'className') originalFieldName = 'class';
+                  /** return the original field name, cap'd and prepended with target to match formatting */
+                  return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
+                }
 
-              /**
-               * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
-               * @param {string} attribute The attribute to check for on the target element
-               * @returns {boolean} Whether the target element has the attribute and can be trusted
-               */
-              function canTrustTargetAttribute(attribute) {
-                return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
-              }
+                /**
+                * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
+                * @param {string} attribute The attribute to check for on the target element
+                * @returns {boolean} Whether the target element has the attribute and can be trusted
+                */
+                function canTrustTargetAttribute(attribute) {
+                  return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
+                }
+              });
             }
           } catch (e) {
             // do nothing for now
@@ -315,9 +317,7 @@ export class Aggregate extends AggregateBase {
       timestamp: this.#toEpoch(now()),
       /** all generic events require pageUrl(s) */
       pageUrl: cleanURL('' + initialLocation),
-      currentUrl: cleanURL('' + location),
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...getVersion2Attributes(target, this)
+      currentUrl: cleanURL('' + location)
     };
     const eventAttributes = {
       /** Agent-level custom attributes */
@@ -327,7 +327,14 @@ export class Aggregate extends AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes);
+    this.events.add({
+      ...eventAttributes,
+      ...getVersion2Attributes(target, this)
+    });
+    if (shouldDuplicate(target, this.agentRef)) this.addEvent({
+      ...eventAttributes,
+      ...getVersion2DuplicationAttributes(target, this)
+    });
   }
   serializer(eventBuffer) {
     return applyFnToProps({

package/dist/esm/features/generic_events/aggregate/user-actions/aggregated-user-action.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { RAGE_CLICK_THRESHOLD_EVENTS, RAGE_CLICK_THRESHOLD_MS } from '../../constants';
@@ -16,6 +16,7 @@ export class AggregatedUserAction {
     this.currentUrl = cleanURL('' + location);
     this.deadClick = false;
     this.errorClick = false;
+    this.targets = selectorInfo.targets;
   }
 
   /**

package/dist/esm/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { analyzeElemPath } from '../../../../common/dom/selector-path';
@@ -14,7 +14,8 @@ export class UserActionsAggregator {
   #deadClickTimer = undefined;
   #domObserver = undefined;
   #errorClickTimer = undefined;
-  constructor() {
+  constructor(agentRef) {
+    this.agentRef = agentRef;
     if (gosNREUMOriginals().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this));
     }
@@ -37,7 +38,7 @@ export class UserActionsAggregator {
   process(evt, targetFields) {
     if (!evt) return;
     const targetElem = OBSERVED_WINDOW_EVENTS.includes(evt.type) ? window : evt.target;
-    const selectorInfo = analyzeElemPath(targetElem, targetFields);
+    const selectorInfo = analyzeElemPath(targetElem, targetFields, this.agentRef);
 
     // if selectorInfo.path is undefined, aggregation will be skipped for this event
     const aggregationKey = getAggregationKey(evt, selectorInfo.path);

package/dist/esm/features/session_replay/aggregate/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
@@ -215,6 +215,7 @@ export class Aggregate extends AggregateBase {
     }
   }
   makeHarvestPayload() {
+    if (this.isRetrying) return this.recorder.retryPayload;
     if (this.mode !== MODE.FULL || this.blocked) return; // harvests should only be made in FULL mode, and not if the feature is blocked
     if (this.shouldCompress && !this.gzipper) return; // if compression is enabled, but the libraries have not loaded, wait for them to load
     if (!this.recorder || !this.timeKeeper?.ready || !(this.recorder.hasSeenSnapshot && this.recorder.hasSeenMeta)) return; // if the recorder or the timekeeper is not ready, or the recorder has not yet seen a snapshot, do not harvest
@@ -242,8 +243,6 @@ export class Aggregate extends AggregateBase {
       this.abort(ABORT_REASONS.TOO_BIG, len);
       return;
     }
-
-    // TODO -- Gracefully handle the buffer for retries.
     if (!this.agentRef.runtime.session.state.sessionReplaySentFirstChunk) this.syncWithSessionManager({
       sessionReplaySentFirstChunk: true
     });
@@ -251,6 +250,7 @@ export class Aggregate extends AggregateBase {
     if (!this.agentRef.runtime.session.state.traceHarvestStarted) {
       warn(59, JSON.stringify(this.agentRef.runtime.session.state));
     }
+    this.recorder.retryPayload = payload;
     return payload;
   }
 
@@ -348,9 +348,18 @@ export class Aggregate extends AggregateBase {
     };
   }
   postHarvestCleanup(result) {
-    // The mutual decision for now is to stop recording and clear buffers if ingest is experiencing 429 rate limiting
-    if (result.status === 429) {
-      this.abort(ABORT_REASONS.TOO_MANY);
+    if (result.sent) {
+      if (result.retry) {
+        warn(70);
+        this.isRetrying = true;
+        this.forceStop();
+      } else {
+        this.recorder.retryPayload = undefined;
+        if (this.isRetrying) {
+          this.isRetrying = false;
+          this.switchToFull();
+        }
+      }
     }
   }
 

package/dist/esm/features/session_replay/constants.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { MODE } from '../../common/session/constants';

package/dist/esm/features/session_replay/shared/recorder.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { record as recorder } from '@newrelic/rrweb';
@@ -40,6 +40,8 @@ export class Recorder {
     this.events = new RecorderEvents(this.shouldFix);
     /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
     this.backloggedEvents = new RecorderEvents(this.shouldFix);
+    /** Used to hold the harvest contents to facilitate retrying */
+    this.retryPayload = undefined;
     /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     this.hasSeenSnapshot = false;
     this.hasSeenMeta = false;

package/dist/types/common/dom/selector-path.d.ts

@@ -1,6 +1,7 @@
-export function analyzeElemPath(elem: HTMLElement, targetFields?: Array<string>): {
+export function analyzeElemPath(elem: HTMLElement, targetFields?: Array<string>, agentRef: any): {
     path: (undefined | string);
     nearestFields: {};
+    targets: any[];
     hasButton: boolean;
     hasLink: boolean;
 };

package/dist/types/common/dom/selector-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector-path.d.ts","sourceRoot":"","sources":["../../../../src/common/dom/selector-path.js"],"names":[],"mappings":"AAgBO,sCAJI,WAAW,iBACX,KAAK,CAAC,MAAM,CAAC,GACX;IAAC,IAAI,EAAE,CAAC,SAAS,GAAC,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,EAAE,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CA2B/F"}
+{"version":3,"file":"selector-path.d.ts","sourceRoot":"","sources":["../../../../src/common/dom/selector-path.js"],"names":[],"mappings":"AAkBO,sCAJI,WAAW,iBACX,KAAK,CAAC,MAAM,CAAC,kBACX;IAAC,IAAI,EAAE,CAAC,SAAS,GAAC,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,EAAE,CAAC;IAAC,OAAO,QAAQ;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CAkC/G"}

package/dist/types/features/generic_events/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAGjC,2BAqQC;IAnQC,gCAAkG;IAsQpG;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAmCjB;IAED,qCAEC;IAED;;;MAEC;;CAsBF;8BAjW6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAGjC,2BAyQC;IAvQC,gCAAkG;IA0QpG;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAkCjB;IAED,qCAEC;IAED;;;MAEC;;CAsBF;8BApW6B,4BAA4B"}

package/dist/types/features/generic_events/aggregate/user-actions/aggregated-user-action.d.ts

@@ -10,6 +10,7 @@ export class AggregatedUserAction {
     currentUrl: string;
     deadClick: boolean;
     errorClick: boolean;
+    targets: any;
     /**
      * Aggregates the count and maintains the relative MS array for matching events
      * Will determine if a rage click was observed as part of the aggregation

package/dist/types/features/generic_events/aggregate/user-actions/aggregated-user-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregated-user-action.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/aggregated-user-action.js"],"names":[],"mappings":"AAOA;IACE,yCAWC;IAVC,WAAgB;IAChB,cAAc;IACd,iBAAyC;IACzC,qBAAqB;IACrB,kBAAqC;IACrC,+BAA0B;IAC1B,yBAAqD;IACrD,mBAAyC;IACzC,mBAAsB;IACtB,oBAAuB;IAGzB;;;;;OAKG;IACH,eAHW,KAAK,GACH,IAAI,CAMhB;IAED;;;OAGG;IACH,eAFa,OAAO,CAKnB;CACF"}
+{"version":3,"file":"aggregated-user-action.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/aggregated-user-action.js"],"names":[],"mappings":"AAOA;IACE,yCAYC;IAXC,WAAgB;IAChB,cAAc;IACd,iBAAyC;IACzC,qBAAqB;IACrB,kBAAqC;IACrC,+BAA0B;IAC1B,yBAAqD;IACrD,mBAAyC;IACzC,mBAAsB;IACtB,oBAAuB;IACvB,aAAmC;IAGrC;;;;;OAKG;IACH,eAHW,KAAK,GACH,IAAI,CAMhB;IAED;;;OAGG;IACH,eAFa,OAAO,CAKnB;CACF"}

package/dist/types/features/generic_events/aggregate/user-actions/user-actions-aggregator.d.ts

@@ -1,4 +1,6 @@
 export class UserActionsAggregator {
+    constructor(agentRef: any);
+    agentRef: any;
     get aggregationEvent(): AggregatedUserAction | undefined;
     /**
      * Process the event and determine if a new aggregation set should be made or if it should increment the current aggregation

package/dist/types/features/generic_events/aggregate/user-actions/user-actions-aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-actions-aggregator.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js"],"names":[],"mappings":"AAUA;IAcE,yDAQC;IAED;;;;OAIG;IACH,aAHW,KAAK,sBACH,oBAAoB,GAAC,SAAS,CA2B1C;IAED,yBAKC;IA0CD,oBAEC;;CACF;qCA9GoC,0BAA0B"}
+{"version":3,"file":"user-actions-aggregator.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js"],"names":[],"mappings":"AAUA;IAQE,2BAKC;IAJC,cAAwB;IAM1B,yDAQC;IAED;;;;OAIG;IACH,aAHW,KAAK,sBACH,oBAAoB,GAAC,SAAS,CA2B1C;IAED,yBAKC;IA0CD,oBAEC;;CACF;qCA/GoC,0BAA0B"}

package/dist/types/features/session_replay/aggregate/index.d.ts

@@ -35,17 +35,7 @@ export class Aggregate extends AggregateBase {
         PRELOAD: string;
     }): void;
     prepUtils(): Promise<void>;
-    makeHarvestPayload(): {
-        qs: {
-            browser_monitoring_key: any;
-            type: string;
-            app_id: any;
-            protocol_version: string;
-            timestamp: any;
-            attributes: string;
-        };
-        body: any;
-    } | undefined;
+    makeHarvestPayload(): any;
     /**
      * returns the timestamps for the earliest and latest nodes in the provided array, even if out of order
      * @param {Object[]} [nodes] - the nodes to evaluate

package/dist/types/features/session_replay/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/aggregate/index.js"],"names":[],"mappings":"AAyBA;IACE,2BAAiC;IAIjC,sCAyFC;IA5FD,aAAe;IAKb,iFAAiF;IACjF,qBAAwB;IAGxB,2CAA2C;IAC3C,sDAAwB;IACxB,6CAA6C;IAC7C,gDAAmB;IACnB,+DAA+D;IAC/D,wBAA0B;IAE1B,0BAA0B;IAC1B,kBAAqB;IACrB,6CAA6C;IAC7C,gBAA2B;IAE3B,qBAA2B;IAE3B,cAA8C;IAI9C,kCAAqG;IAmEvG,0BAEC;IAED,0BAMC;IAED,qBAUC;IAED;;;;;;OAMG;IACH,4BALW,OAAO,iBACP,OAAO;;;;;;QAEL,IAAI,CA8ChB;IAED,2BAUC;IAED;;;;;;;;;;kBAwCC;IAED;;;;OAIG;IACH,6BAHW,MAAM,EAAE,GACN;QAAE,UAAU,EAAE,MAAM,GAAC,SAAS,CAAC;QAAC,SAAS,EAAE,MAAM,GAAC,SAAS,CAAA;KAAE,CAUzE;IAED;;;;;;;;;;MAsEC;IAED,sCAKC;IAED;;;;OAIG;IACH,mCAKC;IAED,yDAAyD;IACzD,+CASC;IAED,yCAIC;CACF;8BA7W6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/aggregate/index.js"],"names":[],"mappings":"AAyBA;IACE,2BAAiC;IAIjC,sCAyFC;IA5FD,aAAe;IAKb,iFAAiF;IACjF,qBAAwB;IAGxB,2CAA2C;IAC3C,sDAAwB;IACxB,6CAA6C;IAC7C,gDAAmB;IACnB,+DAA+D;IAC/D,wBAA0B;IAE1B,0BAA0B;IAC1B,kBAAqB;IACrB,6CAA6C;IAC7C,gBAA2B;IAE3B,qBAA2B;IAE3B,cAA8C;IAI9C,kCAAqG;IAmEvG,0BAEC;IAED,0BAMC;IAED,qBAUC;IAED;;;;;;OAMG;IACH,4BALW,OAAO,iBACP,OAAO;;;;;;QAEL,IAAI,CA8ChB;IAED,2BAUC;IAED,0BA0CC;IAED;;;;OAIG;IACH,6BAHW,MAAM,EAAE,GACN;QAAE,UAAU,EAAE,MAAM,GAAC,SAAS,CAAC;QAAC,SAAS,EAAE,MAAM,GAAC,SAAS,CAAA;KAAE,CAUzE;IAED;;;;;;;;;;MAsEC;IAED,sCAcC;IAED;;;;OAIG;IACH,mCAKC;IAED,yDAAyD;IACzD,+CASC;IAED,yCAIC;CACF;8BAxX6B,4BAA4B"}

package/dist/types/features/session_replay/shared/recorder.d.ts

@@ -13,6 +13,8 @@ export class Recorder {
     events: RecorderEvents;
     /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
     backloggedEvents: RecorderEvents;
+    /** Used to hold the harvest contents to facilitate retrying */
+    retryPayload: any;
     /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     hasSeenSnapshot: boolean;
     hasSeenMeta: boolean;

package/dist/types/features/session_replay/shared/recorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/recorder.js"],"names":[],"mappings":"AAqBA;IAUE,+BAkCC;IApCD,sBAAmB;IAGjB,iDAAiD;IACjD,kBAAgC;IAEhC,QAAyB;IACzB,mBAA6C;IAC7C,cAAqC;IAErC,qBAAwB;IACxB,0FAA0F;IAC1F,eAAkE;IAElE,iHAAiH;IACjH,uBAAgD;IAChD,mFAAmF;IACnF,iCAA0D;IAC1D,uIAAuI;IACvI,yBAA4B;IAC5B,qBAAwB;IACxB,kIAAkI;IAClI,kBAAqB;IACrB,uIAAuI;IACvI,0BAAwE;IAc1E,mBAEC;IAED;;;;;;;;;MAWC;IAED,kFAAkF;IAClF,oBAGC;IAED,qDAAqD;IACrD,8CA0CC;IAED;;;;;OAKG;IACH,aAHW,GAAC,cACD,GAAC,QAiCX;IAED,yHAAyH;IACzH,yCAiCC;IAED,0HAA0H;IAC1H,yBAOC;IAED,wBAEC;IAED,gCAAgC;IAChC,uCAGC;IAED;;;SAGK;IACL,oCAGC;;CACF;+BAvO8B,mBAAmB"}
+{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/recorder.js"],"names":[],"mappings":"AAqBA;IAUE,+BAoCC;IAtCD,sBAAmB;IAGjB,iDAAiD;IACjD,kBAAgC;IAEhC,QAAyB;IACzB,mBAA6C;IAC7C,cAAqC;IAErC,qBAAwB;IACxB,0FAA0F;IAC1F,eAAkE;IAElE,iHAAiH;IACjH,uBAAgD;IAChD,mFAAmF;IACnF,iCAA0D;IAC1D,+DAA+D;IAC/D,kBAA6B;IAC7B,uIAAuI;IACvI,yBAA4B;IAC5B,qBAAwB;IACxB,kIAAkI;IAClI,kBAAqB;IACrB,uIAAuI;IACvI,0BAAwE;IAc1E,mBAEC;IAED;;;;;;;;;MAWC;IAED,kFAAkF;IAClF,oBAGC;IAED,qDAAqD;IACrD,8CA0CC;IAED;;;;;OAKG;IACH,aAHW,GAAC,cACD,GAAC,QAiCX;IAED,yHAAyH;IACzH,yCAiCC;IAED,0HAA0H;IAC1H,yBAOC;IAED,wBAEC;IAED,gCAAgC;IAChC,uCAGC;IAED;;;SAGK;IACL,oCAGC;;CACF;+BAzO8B,mBAAmB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.313.1-rc.1",
+  "version": "1.313.1-rc.3",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/dom/selector-path.js

@@ -1,8 +1,10 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { getRegisteredTargetsFromId } from '../v2/utils'
+
 /**
  * Generates a CSS selector path for the given element, if possible.
  * Also gather metadata about the element's nearest fields, and whether there are any links or buttons in the path.
@@ -12,10 +14,11 @@
  *
  * @param {HTMLElement} elem
  * @param {Array<string>} [targetFields=[]] specifies which fields to gather from the nearest element in the path
- * @returns {{path: (undefined|string), nearestFields: {}, hasButton: boolean, hasLink: boolean}}
+ * @returns {{path: (undefined|string), nearestFields: {}, targets: Array, hasButton: boolean, hasLink: boolean}}
  */
-export const analyzeElemPath = (elem, targetFields = []) => {
-  const result = { path: undefined, nearestFields: {}, hasButton: false, hasLink: false }
+export const analyzeElemPath = (elem, targetFields = [], agentRef) => {
+  const targets = []
+  const result = { path: undefined, nearestFields: {}, get targets () { return targets.length ? targets : [undefined] }, hasButton: false, hasLink: false }
   if (!elem) return result
   if (elem === window) { result.path = 'window'; return result }
   if (elem === document) { result.path = 'document'; return result }
@@ -30,6 +33,12 @@ export const analyzeElemPath = (elem, targetFields = []) => {
       result.hasButton ||= tagName === 'button' || (tagName === 'input' && elem.type.toLowerCase() === 'button')
 
       targetFields.forEach(field => { result.nearestFields[nearestAttrName(field)] ||= (elem[field]?.baseVal || elem[field]) })
+
+      const dataAttrs = elem?.dataset
+      if (dataAttrs.nrMfeId) {
+        targets.push(...getRegisteredTargetsFromId(dataAttrs.nrMfeId, agentRef))
+      }
+
       pathSelector = buildPathSelector(elem, pathSelector)
       elem = elem.parentNode
     }

package/src/features/generic_events/aggregate/index.js

@@ -14,7 +14,7 @@ import { applyFnToProps } from '../../../common/util/traverse'
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator'
 import { isIFrameWindow } from '../../../common/dom/iframe'
 import { isPureObject } from '../../../common/util/type-check'
-import { getVersion2Attributes } from '../../../common/v2/utils'
+import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -61,7 +61,7 @@ export class Aggregate extends AggregateBase {
 
       let addUserAction = () => { /** no-op */ }
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new UserActionsAggregator()
+        this.#userActionAggregator = new UserActionsAggregator(this.agentRef)
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent)
 
         addUserAction = (aggregatedUserAction) => {
@@ -70,50 +70,54 @@ export class Aggregate extends AggregateBase {
              * so we still need to validate that an event was given to this method before we try to add */
             if (aggregatedUserAction?.event) {
               const { target, timeStamp, type } = aggregatedUserAction.event
-              const userActionEvent = {
-                eventType: 'UserAction',
-                timestamp: this.#toEpoch(timeStamp),
-                action: type,
-                actionCount: aggregatedUserAction.count,
-                actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
-                actionMs: aggregatedUserAction.relativeMs,
-                rageClick: aggregatedUserAction.rageClick,
-                target: aggregatedUserAction.selectorPath,
-                currentUrl: aggregatedUserAction.currentUrl,
-                ...(isIFrameWindow(window) && { iframe: true }),
-                ...(this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
+
+              aggregatedUserAction.targets.forEach(mfeTarget => {
+                const userActionEvent = {
+                  eventType: 'UserAction',
+                  timestamp: this.#toEpoch(timeStamp),
+                  action: type,
+                  actionCount: aggregatedUserAction.count,
+                  actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
+                  actionMs: aggregatedUserAction.relativeMs,
+                  rageClick: aggregatedUserAction.rageClick,
+                  target: aggregatedUserAction.selectorPath,
+                  currentUrl: aggregatedUserAction.currentUrl,
+                  ...(isIFrameWindow(window) && { iframe: true }),
+                  ...(this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
                   /** prevent us from capturing an obscenely long value */
-                  if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128)
-                  return acc
-                }, {})),
-                ...aggregatedUserAction.nearestTargetFields,
-                ...(aggregatedUserAction.deadClick && { deadClick: true }),
-                ...(aggregatedUserAction.errorClick && { errorClick: true })
-              }
-              this.addEvent(userActionEvent)
-              this.#trackUserActionSM(userActionEvent)
-
-              /**
+                    if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128)
+                    return acc
+                  }, {})),
+                  ...aggregatedUserAction.nearestTargetFields,
+                  ...(aggregatedUserAction.deadClick && { deadClick: true }),
+                  ...(aggregatedUserAction.errorClick && { errorClick: true })
+                }
+                this.addEvent(userActionEvent, mfeTarget)
+
+                this.#trackUserActionSM(userActionEvent)
+
+                /**
                * Returns the original target field name with `target` prepended and camelCased
                * @param {string} originalFieldName
                * @returns {string} the target field name
                */
-              function targetAttrName (originalFieldName) {
+                function targetAttrName (originalFieldName) {
                 /** preserve original renaming structure for pre-existing field maps */
-                if (originalFieldName === 'tagName') originalFieldName = 'tag'
-                if (originalFieldName === 'className') originalFieldName = 'class'
-                /** return the original field name, cap'd and prepended with target to match formatting */
-                return `target${originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1)}`
-              }
+                  if (originalFieldName === 'tagName') originalFieldName = 'tag'
+                  if (originalFieldName === 'className') originalFieldName = 'class'
+                  /** return the original field name, cap'd and prepended with target to match formatting */
+                  return `target${originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1)}`
+                }
 
-              /**
+                /**
                * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
                * @param {string} attribute The attribute to check for on the target element
                * @returns {boolean} Whether the target element has the attribute and can be trusted
                */
-              function canTrustTargetAttribute (attribute) {
-                return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute])
-              }
+                function canTrustTargetAttribute (attribute) {
+                  return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute])
+                }
+              })
             }
           } catch (e) {
             // do nothing for now
@@ -314,9 +318,7 @@ export class Aggregate extends AggregateBase {
       timestamp: this.#toEpoch(now()),
       /** all generic events require pageUrl(s) */
       pageUrl: cleanURL('' + initialLocation),
-      currentUrl: cleanURL('' + location),
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...(getVersion2Attributes(target, this))
+      currentUrl: cleanURL('' + location)
     }
 
     const eventAttributes = {
@@ -328,7 +330,8 @@ export class Aggregate extends AggregateBase {
       ...obj
     }
 
-    this.events.add(eventAttributes)
+    this.events.add({ ...eventAttributes, ...getVersion2Attributes(target, this) })
+    if (shouldDuplicate(target, this.agentRef)) this.addEvent({ ...eventAttributes, ...getVersion2DuplicationAttributes(target, this) })
   }
 
   serializer (eventBuffer) {

package/src/features/generic_events/aggregate/user-actions/aggregated-user-action.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { RAGE_CLICK_THRESHOLD_EVENTS, RAGE_CLICK_THRESHOLD_MS } from '../../constants'
@@ -17,6 +17,7 @@ export class AggregatedUserAction {
     this.currentUrl = cleanURL('' + location)
     this.deadClick = false
     this.errorClick = false
+    this.targets = selectorInfo.targets
   }
 
   /**

package/src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { analyzeElemPath } from '../../../../common/dom/selector-path'
@@ -16,7 +16,8 @@ export class UserActionsAggregator {
   #domObserver = undefined
   #errorClickTimer = undefined
 
-  constructor () {
+  constructor (agentRef) {
+    this.agentRef = agentRef
     if (gosNREUMOriginals().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this))
     }
@@ -40,7 +41,7 @@ export class UserActionsAggregator {
   process (evt, targetFields) {
     if (!evt) return
     const targetElem = OBSERVED_WINDOW_EVENTS.includes(evt.type) ? window : evt.target
-    const selectorInfo = analyzeElemPath(targetElem, targetFields)
+    const selectorInfo = analyzeElemPath(targetElem, targetFields, this.agentRef)
 
     // if selectorInfo.path is undefined, aggregation will be skipped for this event
     const aggregationKey = getAggregationKey(evt, selectorInfo.path)

package/src/features/session_replay/aggregate/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
@@ -209,6 +209,7 @@ export class Aggregate extends AggregateBase {
   }
 
   makeHarvestPayload () {
+    if (this.isRetrying) return this.recorder.retryPayload
     if (this.mode !== MODE.FULL || this.blocked) return // harvests should only be made in FULL mode, and not if the feature is blocked
     if (this.shouldCompress && !this.gzipper) return // if compression is enabled, but the libraries have not loaded, wait for them to load
     if (!this.recorder || !this.timeKeeper?.ready || !(this.recorder.hasSeenSnapshot && this.recorder.hasSeenMeta)) return // if the recorder or the timekeeper is not ready, or the recorder has not yet seen a snapshot, do not harvest
@@ -239,7 +240,6 @@ export class Aggregate extends AggregateBase {
       return
     }
 
-    // TODO -- Gracefully handle the buffer for retries.
     if (!this.agentRef.runtime.session.state.sessionReplaySentFirstChunk) this.syncWithSessionManager({ sessionReplaySentFirstChunk: true })
     this.recorder.clearBuffer()
 
@@ -247,6 +247,8 @@ export class Aggregate extends AggregateBase {
       warn(59, JSON.stringify(this.agentRef.runtime.session.state))
     }
 
+    this.recorder.retryPayload = payload
+
     return payload
   }
 
@@ -338,9 +340,18 @@ export class Aggregate extends AggregateBase {
   }
 
   postHarvestCleanup (result) {
-    // The mutual decision for now is to stop recording and clear buffers if ingest is experiencing 429 rate limiting
-    if (result.status === 429) {
-      this.abort(ABORT_REASONS.TOO_MANY)
+    if (result.sent) {
+      if (result.retry) {
+        warn(70)
+        this.isRetrying = true
+        this.forceStop()
+      } else {
+        this.recorder.retryPayload = undefined
+        if (this.isRetrying) {
+          this.isRetrying = false
+          this.switchToFull()
+        }
+      }
     }
   }
 

package/src/features/session_replay/constants.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { MODE } from '../../common/session/constants'

package/src/features/session_replay/shared/recorder.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { record as recorder } from '@newrelic/rrweb'
@@ -45,6 +45,8 @@ export class Recorder {
     this.events = new RecorderEvents(this.shouldFix)
     /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
     this.backloggedEvents = new RecorderEvents(this.shouldFix)
+    /** Used to hold the harvest contents to facilitate retrying */
+    this.retryPayload = undefined
     /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     this.hasSeenSnapshot = false
     this.hasSeenMeta = false