@atlaskit/editor-common 126.0.0 → 126.1.1

package/CHANGELOG.md

@@ -1,5 +1,63 @@
 # @atlaskit/editor-common
 
+## 126.1.1
+
+### Patch Changes
+
+- [`534c9253b7fab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/534c9253b7fab) -
+  Add operational mention avatar failure events and reasons behind
+  `platform_editor_mention_avatar_observability`, covering image failures, provider failures,
+  missing avatar URLs, and missing providers. Events identify the editor or renderer surface without
+  adding mention user data. Successful image loads emit no events.
+- Updated dependencies
+
+## 126.1.0
+
+### Minor Changes
+
+- [`5b30c74e8080f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5b30c74e8080f) -
+  Compose the intermediate steps of an AI streaming response into a single collab step, so a
+  streamed edit costs the collab service roughly one step per block instead of one per chunk.
+
+  Each streaming frame replaces the whole AI region with the cumulative content so far, so the
+  frames are individually large and grow as the response does. They are also thrown away at the end
+  — `buildCommitTransaction` rebuilds the final document from the response rather than from what was
+  streamed — which is what makes composing them safe.
+
+  `mergeOverlappingSteps` merges two consecutive overlapping steps into the single step they are
+  collectively equivalent to, and `collapseStreamingSteps` folds it across the steps in the collab
+  unconfirmed queue. Composition is exact in both directions: the forward step is verified against
+  the document, and the inverse is composed alongside it because `rebaseSteps` applies inverses to
+  the live document whenever a remote step arrives.
+
+  Composing only helps while the steps are still unsent, because `lockStepOrigins` marks everything
+  a flush sends and a locked step can never be merged. `createCollabSendHold` therefore holds the
+  send back across transactions — not per transaction, since acks, remote steps and the user's own
+  typing all trigger sends that would otherwise lock the queue. Producers drive it with the
+  `DEFER_COLLAB_SEND` meta: `true` starts the hold, `false` releases it, anything else leaves it
+  untouched. `true` does not extend a hold already in progress, so a continuous stream of held
+  frames still reaches the bound.
+
+  `editor-common` gains two new entrypoints for the metadata keys shared between the producer and
+  the collab layer: `./collab-streaming-step-collapse` and `./collab-defer-collab-send`. The changes
+  in `editor-plugin-collab-edit` and `editor-plugin-ai` are internal — neither package's exports map
+  changes.
+
+  While the send is held nothing is sent, including the user's own edits, up to the hold's time
+  bound. `sendableSteps` returns the queue in version order, so a later step cannot be sent ahead of
+  held ones. Peers also do not see in-progress content until a flush, and content in a held queue
+  exists only on the client until then.
+
+  All of this is behind the `platform_editor_ai_collapse_streaming_steps` feature gate. With the
+  gate off, streaming frames are not stamped, the send is never held, and the unconfirmed queue is
+  left exactly as it is today.
+
+### Patch Changes
+
+- [`5f61320693517`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5f61320693517) -
+  Clean up experiment `platform_editor_remove_collab_step_metrics`
+- Updated dependencies
+
 ## 126.0.0
 
 ### Major Changes

package/collab-defer-collab-send/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/editor-common/collab-defer-collab-send",
+  "main": "../dist/cjs/collab/defer-collab-send.js",
+  "module": "../dist/esm/collab/defer-collab-send.js",
+  "module:es2019": "../dist/es2019/collab/defer-collab-send.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../dist/types/collab/defer-collab-send.d.ts"
+}

package/collab-streaming-step-collapse/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/editor-common/collab-streaming-step-collapse",
+  "main": "../dist/cjs/collab/streaming-step-collapse.js",
+  "module": "../dist/esm/collab/streaming-step-collapse.js",
+  "module:es2019": "../dist/es2019/collab/streaming-step-collapse.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../dist/types/collab/streaming-step-collapse.d.ts"
+}

package/dist/cjs/analytics/types/enums.js

@@ -197,9 +197,6 @@ var ACTION = exports.ACTION = /*#__PURE__*/function (ACTION) {
   ACTION["SELECT_ALL_ESCAPED"] = "selectAllEscaped";
   ACTION["SORT_COLUMN"] = "sortedColumn";
   ACTION["SORT_COLUMN_NOT_ALLOWED"] = "sortColumnNotAllowed";
-  // remove this enum when cleaning up platform_editor_remove_collab_step_metrics
-  ACTION["NCS_SESSION_STEP_METRICS"] = "ncsSessionStepMetrics";
-  ACTION["STEPS_TRACKED"] = "stepsTracked";
   ACTION["ORGANIC_CHANGES_TRACKED"] = "organicChangesTracked";
   ACTION["STEPS_FILTERED"] = "stepsFiltered";
   ACTION["AGENT_EDIT_SHIMMER_NOT_SHOWN"] = "agentEditShimmerNotShown";

package/dist/cjs/collab/defer-collab-send.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFER_COLLAB_SEND = void 0;
+/**
+ * Neutral transaction metadata used by streaming producers to tell the collab layer not to flush
+ * the unconfirmed queue for this transaction.
+ *
+ * The transaction is still applied to the local document immediately; only the network send is
+ * held back. The steps stay in the collab plugin's unconfirmed queue, which is where sending is
+ * deferred from — `sendableSteps` returns the whole queue, so the next unheld transaction sends
+ * everything that accumulated.
+ *
+ * Holding the send is what gives `collapseStreamingSteps` a window to work in: `send()` stamps
+ * `mergeIsLocked` on every origin it flushes, and locked steps can no longer be composed.
+ *
+ * Producers must bound how long they hold. Held steps are content the collab service has not seen,
+ * so they are lost if the tab closes, and a peer editing the same region while steps are held will
+ * rebase against a document that is missing them.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(DEFER_COLLAB_SEND, true);
+ * ```
+ */
+var DEFER_COLLAB_SEND = exports.DEFER_COLLAB_SEND = 'deferCollabSend';

package/dist/cjs/collab/streaming-step-collapse.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.STREAMING_COLLAPSIBLE_STEPS = void 0;
+/**
+ * Neutral transaction metadata used by streaming producers (for example editor-plugin-ai's
+ * in-editor direct streaming) to tell the collab layer that this transaction's steps are an
+ * intermediate frame of a single logical edit.
+ *
+ * Streaming producers re-render the whole in-progress region on every chunk, which means each
+ * frame is a full replace of the region the previous frame inserted. Every frame is applied to the
+ * local document immediately (so the user sees the content stream in), but only the *composition*
+ * of the frames needs to reach the collab service.
+ *
+ * Stamping a transaction with this meta does NOT stop its steps from being sent — it only makes
+ * them eligible to be composed with adjacent frames while they are still unconfirmed. See
+ * `collapseStreamingSteps` in `@atlaskit/editor-plugin-collab-edit`.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(STREAMING_COLLAPSIBLE_STEPS, true);
+ * ```
+ */
+var STREAMING_COLLAPSIBLE_STEPS = exports.STREAMING_COLLAPSIBLE_STEPS = 'streamingCollapsibleSteps';

package/dist/cjs/monitoring/error.js

@@ -27,7 +27,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "125.4.0";
+var packageVersion = "126.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "125.4.0";
+var packageVersion = "126.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/ui/Mention/index.js

@@ -14,6 +14,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _providerFactory = require("../../provider-factory");
 var _mentionWithProviders = require("./mention-with-providers");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(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 (var _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); }
@@ -39,7 +40,9 @@ var Mention = exports.default = /*#__PURE__*/function (_PureComponent) {
         mentionNodeDataProvider = _this$props.mentionNodeDataProvider;
       var mentionProvider = providers.mentionProvider,
         profilecardProvider = providers.profilecardProvider;
-      var isAvatarEnabled = Boolean(mentionNodeDataProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_node_avatar') || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_node_graphql_provider'));
+      var hasProvider = Boolean(mentionNodeDataProvider);
+      var canReportMissingProvider = !hasProvider && (0, _fg.fg)('platform_editor_mention_avatar_observability');
+      var isAvatarEnabled = (hasProvider || canReportMissingProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_node_avatar') || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_node_graphql_provider'));
       if (isAvatarEnabled && mentionNodeDataProvider) {
         return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithAvatarProviders, {
           id: id,
@@ -55,7 +58,9 @@ var Mention = exports.default = /*#__PURE__*/function (_PureComponent) {
           profilecardProvider: profilecardProvider
         });
       }
-      return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, canReportMissingProvider && isAvatarEnabled && /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MissingMentionAvatarProvider, {
+        mentionKey: "".concat(userType !== null && userType !== void 0 ? userType : 'DEFAULT', ":").concat(id)
+      }), /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithProviders, {
         id: id,
         text: text,
         accessLevel: accessLevel,
@@ -66,7 +71,7 @@ var Mention = exports.default = /*#__PURE__*/function (_PureComponent) {
         eventHandlers: eventHandlers,
         mentionProvider: mentionProvider,
         profilecardProvider: profilecardProvider
-      });
+      }));
     });
     _this.providerFactory = props.providers || new _providerFactory.ProviderFactory();
     return _this;

package/dist/cjs/ui/Mention/mention-with-providers.js

@@ -5,24 +5,61 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MentionWithProviders = exports.MentionWithAvatarProviders = void 0;
+exports.MissingMentionAvatarProvider = exports.MentionWithProviders = exports.MentionWithAvatarProviders = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
+var _constants = require("@atlaskit/mention/constants");
 var _resourcedMention = _interopRequireDefault(require("@atlaskit/mention/resourced-mention"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _mentionWithProfilecard = _interopRequireDefault(require("./mention-with-profilecard"));
 var _excluded = ["id", "mentionNodeDataProvider", "userType"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(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 (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var GENERIC_USER_IDS = ['HipChat', 'all', 'here'];
-var useMentionNodeData = function useMentionNodeData(_ref) {
+var useAvatarFailureReporter = function useAvatarFailureReporter() {
+  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  var createEventRef = (0, _react.useRef)(createAnalyticsEvent);
+  createEventRef.current = createAnalyticsEvent;
+  return (0, _react.useCallback)(function (reason) {
+    if ((0, _fg.fg)('platform_editor_mention_avatar_observability')) {
+      createEventRef.current({
+        action: 'failed',
+        actionSubject: 'mentionAvatar',
+        eventType: 'operational',
+        attributes: {
+          componentName: 'mention',
+          reason: reason,
+          surface: 'renderer'
+        }
+      }).fire(_constants.ELEMENTS_CHANNEL);
+    }
+  }, []);
+};
+var MissingMentionAvatarProvider = exports.MissingMentionAvatarProvider = function MissingMentionAvatarProvider(_ref) {
+  var mentionKey = _ref.mentionKey;
+  var reportFailure = useAvatarFailureReporter();
+  var reportedKey = (0, _react.useRef)();
+  (0, _react.useEffect)(function () {
+    if (reportedKey.current !== mentionKey) {
+      reportedKey.current = mentionKey;
+      reportFailure('missing_provider');
+    }
+  }, [mentionKey, reportFailure]);
+  return null;
+};
+var useMentionNodeData = function useMentionNodeData(_ref2) {
   var _state$data;
-  var id = _ref.id,
-    mentionNodeDataProvider = _ref.mentionNodeDataProvider,
-    userType = _ref.userType;
+  var id = _ref2.id,
+    mentionNodeDataProvider = _ref2.mentionNodeDataProvider,
+    userType = _ref2.userType;
+  var reportFailure = useAvatarFailureReporter();
+  var reportedResolution = (0, _react.useRef)();
   var mention = (0, _react.useMemo)(function () {
     return {
       id: id,
@@ -44,38 +81,60 @@ var useMentionNodeData = function useMentionNodeData(_ref) {
     setState = _useState2[1];
   var data = state.key === mentionKey ? (_state$data = state.data) !== null && _state$data !== void 0 ? _state$data : synchronousData : synchronousData;
   (0, _react.useEffect)(function () {
+    var reportResolution = function reportResolution(data, error) {
+      var _reportedResolution$c;
+      if (!error && (!data || data.avatarUrl)) {
+        return;
+      }
+      if (((_reportedResolution$c = reportedResolution.current) === null || _reportedResolution$c === void 0 ? void 0 : _reportedResolution$c.mention) === mention && reportedResolution.current.provider === mentionNodeDataProvider) {
+        return;
+      }
+      reportedResolution.current = {
+        mention: mention,
+        provider: mentionNodeDataProvider
+      };
+      if (error) {
+        reportFailure('provider_failed');
+      } else if (data && !data.avatarUrl) {
+        reportFailure('missing_avatar_url');
+      }
+    };
     if (synchronousData) {
+      reportResolution(synchronousData);
       return;
     }
     var isActive = true;
     mentionNodeDataProvider.getMentionData(mention, function (payload) {
-      if (isActive && payload.data) {
-        setState({
-          data: payload.data,
-          key: mentionKey
-        });
+      if (isActive) {
+        reportResolution(payload.data, payload.error);
+        if (payload.data) {
+          setState({
+            data: payload.data,
+            key: mentionKey
+          });
+        }
       }
     });
     return function () {
       isActive = false;
     };
-  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData]);
+  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData, reportFailure]);
   return data;
 };
-var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.default.memo(function (_ref2) {
-  var accessLevel = _ref2.accessLevel,
-    disabledTooltip = _ref2.disabledTooltip,
-    eventHandlers = _ref2.eventHandlers,
-    id = _ref2.id,
-    isDisabled = _ref2.isDisabled,
-    mentionNodeData = _ref2.mentionNodeData,
-    mentionProvider = _ref2.mentionProvider,
-    profilecardProviderResolver = _ref2.profilecardProvider,
-    _ref2$renderAvatarSlo = _ref2.renderAvatarSlot,
-    renderAvatarSlot = _ref2$renderAvatarSlo === void 0 ? false : _ref2$renderAvatarSlo,
-    text = _ref2.text,
-    localId = _ref2.localId,
-    userType = _ref2.userType;
+var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.default.memo(function (_ref3) {
+  var accessLevel = _ref3.accessLevel,
+    disabledTooltip = _ref3.disabledTooltip,
+    eventHandlers = _ref3.eventHandlers,
+    id = _ref3.id,
+    isDisabled = _ref3.isDisabled,
+    mentionNodeData = _ref3.mentionNodeData,
+    mentionProvider = _ref3.mentionProvider,
+    profilecardProviderResolver = _ref3.profilecardProvider,
+    _ref3$renderAvatarSlo = _ref3.renderAvatarSlot,
+    renderAvatarSlot = _ref3$renderAvatarSlo === void 0 ? false : _ref3$renderAvatarSlo,
+    text = _ref3.text,
+    localId = _ref3.localId,
+    userType = _ref3.userType;
   var _useState3 = (0, _react.useState)(null),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     profilecardProvider = _useState4[0],
@@ -117,7 +176,7 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
     }
     var isActive = true;
     var resolveRovoChatIdentity = /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _provider$getRovoChat, provider, identityAccountId, _t;
         return _regenerator.default.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -149,7 +208,7 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
         }, _callee, null, [[0, 3]]);
       }));
       return function resolveRovoChatIdentity() {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     void resolveRovoChatIdentity();
@@ -204,11 +263,11 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
     isRovoChat: isRovoChat
   });
 });
-var MentionWithAvatarProviders = exports.MentionWithAvatarProviders = /*#__PURE__*/_react.default.memo(function (_ref4) {
-  var id = _ref4.id,
-    mentionNodeDataProvider = _ref4.mentionNodeDataProvider,
-    userType = _ref4.userType,
-    props = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+var MentionWithAvatarProviders = exports.MentionWithAvatarProviders = /*#__PURE__*/_react.default.memo(function (_ref5) {
+  var id = _ref5.id,
+    mentionNodeDataProvider = _ref5.mentionNodeDataProvider,
+    userType = _ref5.userType,
+    props = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
   var mentionNodeData = useMentionNodeData({
     id: id,
     mentionNodeDataProvider: mentionNodeDataProvider,

package/dist/es2019/analytics/types/enums.js

@@ -193,9 +193,6 @@ export let ACTION = /*#__PURE__*/function (ACTION) {
   ACTION["SELECT_ALL_ESCAPED"] = "selectAllEscaped";
   ACTION["SORT_COLUMN"] = "sortedColumn";
   ACTION["SORT_COLUMN_NOT_ALLOWED"] = "sortColumnNotAllowed";
-  // remove this enum when cleaning up platform_editor_remove_collab_step_metrics
-  ACTION["NCS_SESSION_STEP_METRICS"] = "ncsSessionStepMetrics";
-  ACTION["STEPS_TRACKED"] = "stepsTracked";
   ACTION["ORGANIC_CHANGES_TRACKED"] = "organicChangesTracked";
   ACTION["STEPS_FILTERED"] = "stepsFiltered";
   ACTION["AGENT_EDIT_SHIMMER_NOT_SHOWN"] = "agentEditShimmerNotShown";

package/dist/es2019/collab/defer-collab-send.js

@@ -0,0 +1,22 @@
+/**
+ * Neutral transaction metadata used by streaming producers to tell the collab layer not to flush
+ * the unconfirmed queue for this transaction.
+ *
+ * The transaction is still applied to the local document immediately; only the network send is
+ * held back. The steps stay in the collab plugin's unconfirmed queue, which is where sending is
+ * deferred from — `sendableSteps` returns the whole queue, so the next unheld transaction sends
+ * everything that accumulated.
+ *
+ * Holding the send is what gives `collapseStreamingSteps` a window to work in: `send()` stamps
+ * `mergeIsLocked` on every origin it flushes, and locked steps can no longer be composed.
+ *
+ * Producers must bound how long they hold. Held steps are content the collab service has not seen,
+ * so they are lost if the tab closes, and a peer editing the same region while steps are held will
+ * rebase against a document that is missing them.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(DEFER_COLLAB_SEND, true);
+ * ```
+ */
+export const DEFER_COLLAB_SEND = 'deferCollabSend';

package/dist/es2019/collab/streaming-step-collapse.js

@@ -0,0 +1,20 @@
+/**
+ * Neutral transaction metadata used by streaming producers (for example editor-plugin-ai's
+ * in-editor direct streaming) to tell the collab layer that this transaction's steps are an
+ * intermediate frame of a single logical edit.
+ *
+ * Streaming producers re-render the whole in-progress region on every chunk, which means each
+ * frame is a full replace of the region the previous frame inserted. Every frame is applied to the
+ * local document immediately (so the user sees the content stream in), but only the *composition*
+ * of the frames needs to reach the collab service.
+ *
+ * Stamping a transaction with this meta does NOT stop its steps from being sent — it only makes
+ * them eligible to be composed with adjacent frames while they are still unconfirmed. See
+ * `collapseStreamingSteps` in `@atlaskit/editor-plugin-collab-edit`.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(STREAMING_COLLAPSIBLE_STEPS, true);
+ * ```
+ */
+export const STREAMING_COLLAPSIBLE_STEPS = 'streamingCollapsibleSteps';

package/dist/es2019/monitoring/error.js

@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "125.4.0";
+const packageVersion = "126.1.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "125.4.0";
+const packageVersion = "126.1.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/ui/Mention/index.js

@@ -3,8 +3,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 import React, { PureComponent } from 'react';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ProviderFactory, WithProviders } from '../../provider-factory';
-import { MentionWithAvatarProviders, MentionWithProviders } from './mention-with-providers';
+import { MissingMentionAvatarProvider, MentionWithAvatarProviders, MentionWithProviders } from './mention-with-providers';
 const MENTION_PROVIDERS = ['mentionProvider', 'profilecardProvider'];
 const GENERIC_MENTION_IDS = ['HipChat', 'all', 'here'];
 export default class Mention extends PureComponent {
@@ -26,7 +27,9 @@ export default class Mention extends PureComponent {
         mentionProvider,
         profilecardProvider
       } = providers;
-      const isAvatarEnabled = Boolean(mentionNodeDataProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && (isExperimentEnabled('platform_editor_mention_node_avatar') || isExperimentEnabled('platform_editor_mention_node_graphql_provider'));
+      const hasProvider = Boolean(mentionNodeDataProvider);
+      const canReportMissingProvider = !hasProvider && fg('platform_editor_mention_avatar_observability');
+      const isAvatarEnabled = (hasProvider || canReportMissingProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && (isExperimentEnabled('platform_editor_mention_node_avatar') || isExperimentEnabled('platform_editor_mention_node_graphql_provider'));
       if (isAvatarEnabled && mentionNodeDataProvider) {
         return /*#__PURE__*/React.createElement(MentionWithAvatarProviders, {
           id: id,
@@ -42,7 +45,9 @@ export default class Mention extends PureComponent {
           profilecardProvider: profilecardProvider
         });
       }
-      return /*#__PURE__*/React.createElement(MentionWithProviders, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, canReportMissingProvider && isAvatarEnabled && /*#__PURE__*/React.createElement(MissingMentionAvatarProvider, {
+        mentionKey: `${userType !== null && userType !== void 0 ? userType : 'DEFAULT'}:${id}`
+      }), /*#__PURE__*/React.createElement(MentionWithProviders, {
         id: id,
         text: text,
         accessLevel: accessLevel,
@@ -53,7 +58,7 @@ export default class Mention extends PureComponent {
         eventHandlers: eventHandlers,
         mentionProvider: mentionProvider,
         profilecardProvider: profilecardProvider
-      });
+      }));
     });
     this.providerFactory = props.providers || new ProviderFactory();
   }

package/dist/es2019/ui/Mention/mention-with-providers.js

@@ -1,15 +1,54 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
+import { ELEMENTS_CHANNEL } from '@atlaskit/mention/constants';
 import ResourcedMention from '@atlaskit/mention/resourced-mention';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import ResourcedMentionWithProfilecard from './mention-with-profilecard';
 const GENERIC_USER_IDS = ['HipChat', 'all', 'here'];
+const useAvatarFailureReporter = () => {
+  const {
+    createAnalyticsEvent
+  } = useAnalyticsEvents();
+  const createEventRef = useRef(createAnalyticsEvent);
+  createEventRef.current = createAnalyticsEvent;
+  return useCallback(reason => {
+    if (fg('platform_editor_mention_avatar_observability')) {
+      createEventRef.current({
+        action: 'failed',
+        actionSubject: 'mentionAvatar',
+        eventType: 'operational',
+        attributes: {
+          componentName: 'mention',
+          reason,
+          surface: 'renderer'
+        }
+      }).fire(ELEMENTS_CHANNEL);
+    }
+  }, []);
+};
+export const MissingMentionAvatarProvider = ({
+  mentionKey
+}) => {
+  const reportFailure = useAvatarFailureReporter();
+  const reportedKey = useRef();
+  useEffect(() => {
+    if (reportedKey.current !== mentionKey) {
+      reportedKey.current = mentionKey;
+      reportFailure('missing_provider');
+    }
+  }, [mentionKey, reportFailure]);
+  return null;
+};
 const useMentionNodeData = ({
   id,
   mentionNodeDataProvider,
   userType
 }) => {
   var _state$data;
+  const reportFailure = useAvatarFailureReporter();
+  const reportedResolution = useRef();
   const mention = useMemo(() => ({
     id,
     userType
@@ -22,22 +61,44 @@ const useMentionNodeData = ({
   }));
   const data = state.key === mentionKey ? (_state$data = state.data) !== null && _state$data !== void 0 ? _state$data : synchronousData : synchronousData;
   useEffect(() => {
+    const reportResolution = (data, error) => {
+      var _reportedResolution$c;
+      if (!error && (!data || data.avatarUrl)) {
+        return;
+      }
+      if (((_reportedResolution$c = reportedResolution.current) === null || _reportedResolution$c === void 0 ? void 0 : _reportedResolution$c.mention) === mention && reportedResolution.current.provider === mentionNodeDataProvider) {
+        return;
+      }
+      reportedResolution.current = {
+        mention,
+        provider: mentionNodeDataProvider
+      };
+      if (error) {
+        reportFailure('provider_failed');
+      } else if (data && !data.avatarUrl) {
+        reportFailure('missing_avatar_url');
+      }
+    };
     if (synchronousData) {
+      reportResolution(synchronousData);
       return;
     }
     let isActive = true;
     mentionNodeDataProvider.getMentionData(mention, payload => {
-      if (isActive && payload.data) {
-        setState({
-          data: payload.data,
-          key: mentionKey
-        });
+      if (isActive) {
+        reportResolution(payload.data, payload.error);
+        if (payload.data) {
+          setState({
+            data: payload.data,
+            key: mentionKey
+          });
+        }
       }
     });
     return () => {
       isActive = false;
     };
-  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData]);
+  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData, reportFailure]);
   return data;
 };
 export const MentionWithProviders = /*#__PURE__*/React.memo(({

package/dist/esm/analytics/types/enums.js

@@ -193,9 +193,6 @@ export var ACTION = /*#__PURE__*/function (ACTION) {
   ACTION["SELECT_ALL_ESCAPED"] = "selectAllEscaped";
   ACTION["SORT_COLUMN"] = "sortedColumn";
   ACTION["SORT_COLUMN_NOT_ALLOWED"] = "sortColumnNotAllowed";
-  // remove this enum when cleaning up platform_editor_remove_collab_step_metrics
-  ACTION["NCS_SESSION_STEP_METRICS"] = "ncsSessionStepMetrics";
-  ACTION["STEPS_TRACKED"] = "stepsTracked";
   ACTION["ORGANIC_CHANGES_TRACKED"] = "organicChangesTracked";
   ACTION["STEPS_FILTERED"] = "stepsFiltered";
   ACTION["AGENT_EDIT_SHIMMER_NOT_SHOWN"] = "agentEditShimmerNotShown";

package/dist/esm/collab/defer-collab-send.js

@@ -0,0 +1,22 @@
+/**
+ * Neutral transaction metadata used by streaming producers to tell the collab layer not to flush
+ * the unconfirmed queue for this transaction.
+ *
+ * The transaction is still applied to the local document immediately; only the network send is
+ * held back. The steps stay in the collab plugin's unconfirmed queue, which is where sending is
+ * deferred from — `sendableSteps` returns the whole queue, so the next unheld transaction sends
+ * everything that accumulated.
+ *
+ * Holding the send is what gives `collapseStreamingSteps` a window to work in: `send()` stamps
+ * `mergeIsLocked` on every origin it flushes, and locked steps can no longer be composed.
+ *
+ * Producers must bound how long they hold. Held steps are content the collab service has not seen,
+ * so they are lost if the tab closes, and a peer editing the same region while steps are held will
+ * rebase against a document that is missing them.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(DEFER_COLLAB_SEND, true);
+ * ```
+ */
+export var DEFER_COLLAB_SEND = 'deferCollabSend';

package/dist/esm/collab/streaming-step-collapse.js

@@ -0,0 +1,20 @@
+/**
+ * Neutral transaction metadata used by streaming producers (for example editor-plugin-ai's
+ * in-editor direct streaming) to tell the collab layer that this transaction's steps are an
+ * intermediate frame of a single logical edit.
+ *
+ * Streaming producers re-render the whole in-progress region on every chunk, which means each
+ * frame is a full replace of the region the previous frame inserted. Every frame is applied to the
+ * local document immediately (so the user sees the content stream in), but only the *composition*
+ * of the frames needs to reach the collab service.
+ *
+ * Stamping a transaction with this meta does NOT stop its steps from being sent — it only makes
+ * them eligible to be composed with adjacent frames while they are still unconfirmed. See
+ * `collapseStreamingSteps` in `@atlaskit/editor-plugin-collab-edit`.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(STREAMING_COLLAPSIBLE_STEPS, true);
+ * ```
+ */
+export var STREAMING_COLLAPSIBLE_STEPS = 'streamingCollapsibleSteps';

package/dist/esm/monitoring/error.js

@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "125.4.0";
+var packageVersion = "126.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "125.4.0";
+var packageVersion = "126.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/ui/Mention/index.js

@@ -10,8 +10,9 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 
 import React, { PureComponent } from 'react';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ProviderFactory, WithProviders } from '../../provider-factory';
-import { MentionWithAvatarProviders, MentionWithProviders } from './mention-with-providers';
+import { MissingMentionAvatarProvider, MentionWithAvatarProviders, MentionWithProviders } from './mention-with-providers';
 var MENTION_PROVIDERS = ['mentionProvider', 'profilecardProvider'];
 var GENERIC_MENTION_IDS = ['HipChat', 'all', 'here'];
 var Mention = /*#__PURE__*/function (_PureComponent) {
@@ -32,7 +33,9 @@ var Mention = /*#__PURE__*/function (_PureComponent) {
         mentionNodeDataProvider = _this$props.mentionNodeDataProvider;
       var mentionProvider = providers.mentionProvider,
         profilecardProvider = providers.profilecardProvider;
-      var isAvatarEnabled = Boolean(mentionNodeDataProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && (isExperimentEnabled('platform_editor_mention_node_avatar') || isExperimentEnabled('platform_editor_mention_node_graphql_provider'));
+      var hasProvider = Boolean(mentionNodeDataProvider);
+      var canReportMissingProvider = !hasProvider && fg('platform_editor_mention_avatar_observability');
+      var isAvatarEnabled = (hasProvider || canReportMissingProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && (isExperimentEnabled('platform_editor_mention_node_avatar') || isExperimentEnabled('platform_editor_mention_node_graphql_provider'));
       if (isAvatarEnabled && mentionNodeDataProvider) {
         return /*#__PURE__*/React.createElement(MentionWithAvatarProviders, {
           id: id,
@@ -48,7 +51,9 @@ var Mention = /*#__PURE__*/function (_PureComponent) {
           profilecardProvider: profilecardProvider
         });
       }
-      return /*#__PURE__*/React.createElement(MentionWithProviders, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, canReportMissingProvider && isAvatarEnabled && /*#__PURE__*/React.createElement(MissingMentionAvatarProvider, {
+        mentionKey: "".concat(userType !== null && userType !== void 0 ? userType : 'DEFAULT', ":").concat(id)
+      }), /*#__PURE__*/React.createElement(MentionWithProviders, {
         id: id,
         text: text,
         accessLevel: accessLevel,
@@ -59,7 +64,7 @@ var Mention = /*#__PURE__*/function (_PureComponent) {
         eventHandlers: eventHandlers,
         mentionProvider: mentionProvider,
         profilecardProvider: profilecardProvider
-      });
+      }));
     });
     _this.providerFactory = props.providers || new ProviderFactory();
     return _this;

package/dist/esm/ui/Mention/mention-with-providers.js

@@ -4,16 +4,53 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["id", "mentionNodeDataProvider", "userType"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
+import { ELEMENTS_CHANNEL } from '@atlaskit/mention/constants';
 import ResourcedMention from '@atlaskit/mention/resourced-mention';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import ResourcedMentionWithProfilecard from './mention-with-profilecard';
 var GENERIC_USER_IDS = ['HipChat', 'all', 'here'];
-var useMentionNodeData = function useMentionNodeData(_ref) {
+var useAvatarFailureReporter = function useAvatarFailureReporter() {
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  var createEventRef = useRef(createAnalyticsEvent);
+  createEventRef.current = createAnalyticsEvent;
+  return useCallback(function (reason) {
+    if (fg('platform_editor_mention_avatar_observability')) {
+      createEventRef.current({
+        action: 'failed',
+        actionSubject: 'mentionAvatar',
+        eventType: 'operational',
+        attributes: {
+          componentName: 'mention',
+          reason: reason,
+          surface: 'renderer'
+        }
+      }).fire(ELEMENTS_CHANNEL);
+    }
+  }, []);
+};
+export var MissingMentionAvatarProvider = function MissingMentionAvatarProvider(_ref) {
+  var mentionKey = _ref.mentionKey;
+  var reportFailure = useAvatarFailureReporter();
+  var reportedKey = useRef();
+  useEffect(function () {
+    if (reportedKey.current !== mentionKey) {
+      reportedKey.current = mentionKey;
+      reportFailure('missing_provider');
+    }
+  }, [mentionKey, reportFailure]);
+  return null;
+};
+var useMentionNodeData = function useMentionNodeData(_ref2) {
   var _state$data;
-  var id = _ref.id,
-    mentionNodeDataProvider = _ref.mentionNodeDataProvider,
-    userType = _ref.userType;
+  var id = _ref2.id,
+    mentionNodeDataProvider = _ref2.mentionNodeDataProvider,
+    userType = _ref2.userType;
+  var reportFailure = useAvatarFailureReporter();
+  var reportedResolution = useRef();
   var mention = useMemo(function () {
     return {
       id: id,
@@ -35,38 +72,60 @@ var useMentionNodeData = function useMentionNodeData(_ref) {
     setState = _useState2[1];
   var data = state.key === mentionKey ? (_state$data = state.data) !== null && _state$data !== void 0 ? _state$data : synchronousData : synchronousData;
   useEffect(function () {
+    var reportResolution = function reportResolution(data, error) {
+      var _reportedResolution$c;
+      if (!error && (!data || data.avatarUrl)) {
+        return;
+      }
+      if (((_reportedResolution$c = reportedResolution.current) === null || _reportedResolution$c === void 0 ? void 0 : _reportedResolution$c.mention) === mention && reportedResolution.current.provider === mentionNodeDataProvider) {
+        return;
+      }
+      reportedResolution.current = {
+        mention: mention,
+        provider: mentionNodeDataProvider
+      };
+      if (error) {
+        reportFailure('provider_failed');
+      } else if (data && !data.avatarUrl) {
+        reportFailure('missing_avatar_url');
+      }
+    };
     if (synchronousData) {
+      reportResolution(synchronousData);
       return;
     }
     var isActive = true;
     mentionNodeDataProvider.getMentionData(mention, function (payload) {
-      if (isActive && payload.data) {
-        setState({
-          data: payload.data,
-          key: mentionKey
-        });
+      if (isActive) {
+        reportResolution(payload.data, payload.error);
+        if (payload.data) {
+          setState({
+            data: payload.data,
+            key: mentionKey
+          });
+        }
       }
     });
     return function () {
       isActive = false;
     };
-  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData]);
+  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData, reportFailure]);
   return data;
 };
-export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref2) {
-  var accessLevel = _ref2.accessLevel,
-    disabledTooltip = _ref2.disabledTooltip,
-    eventHandlers = _ref2.eventHandlers,
-    id = _ref2.id,
-    isDisabled = _ref2.isDisabled,
-    mentionNodeData = _ref2.mentionNodeData,
-    mentionProvider = _ref2.mentionProvider,
-    profilecardProviderResolver = _ref2.profilecardProvider,
-    _ref2$renderAvatarSlo = _ref2.renderAvatarSlot,
-    renderAvatarSlot = _ref2$renderAvatarSlo === void 0 ? false : _ref2$renderAvatarSlo,
-    text = _ref2.text,
-    localId = _ref2.localId,
-    userType = _ref2.userType;
+export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref3) {
+  var accessLevel = _ref3.accessLevel,
+    disabledTooltip = _ref3.disabledTooltip,
+    eventHandlers = _ref3.eventHandlers,
+    id = _ref3.id,
+    isDisabled = _ref3.isDisabled,
+    mentionNodeData = _ref3.mentionNodeData,
+    mentionProvider = _ref3.mentionProvider,
+    profilecardProviderResolver = _ref3.profilecardProvider,
+    _ref3$renderAvatarSlo = _ref3.renderAvatarSlot,
+    renderAvatarSlot = _ref3$renderAvatarSlo === void 0 ? false : _ref3$renderAvatarSlo,
+    text = _ref3.text,
+    localId = _ref3.localId,
+    userType = _ref3.userType;
   var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     profilecardProvider = _useState4[0],
@@ -108,7 +167,7 @@ export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref2) {
     }
     var isActive = true;
     var resolveRovoChatIdentity = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _provider$getRovoChat, provider, identityAccountId, _t;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -140,7 +199,7 @@ export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref2) {
         }, _callee, null, [[0, 3]]);
       }));
       return function resolveRovoChatIdentity() {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     void resolveRovoChatIdentity();
@@ -195,11 +254,11 @@ export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref2) {
     isRovoChat: isRovoChat
   });
 });
-export var MentionWithAvatarProviders = /*#__PURE__*/React.memo(function (_ref4) {
-  var id = _ref4.id,
-    mentionNodeDataProvider = _ref4.mentionNodeDataProvider,
-    userType = _ref4.userType,
-    props = _objectWithoutProperties(_ref4, _excluded);
+export var MentionWithAvatarProviders = /*#__PURE__*/React.memo(function (_ref5) {
+  var id = _ref5.id,
+    mentionNodeDataProvider = _ref5.mentionNodeDataProvider,
+    userType = _ref5.userType,
+    props = _objectWithoutProperties(_ref5, _excluded);
   var mentionNodeData = useMentionNodeData({
     id: id,
     mentionNodeDataProvider: mentionNodeDataProvider,

package/dist/types/analytics/index.d.ts

@@ -55,7 +55,6 @@ export type { AIUnifiedEventPayload, AIUnifiedCommonAttributes } from './types/a
 export type { ActiveSessionEventPayload, ActiveSessionEventAttributes, } from './types/activity-session-events';
 export { type AIInlineSuggestionPayload, AI_SUGGESTION_TRIGGERED_FROM, } from './types/ai-inline-suggestion-events';
 export { type TelepointerClickPayload } from './types/telepointer-events';
-export { type NcsSessionStepEventAEP, type NcsSessionStepMetrics, } from './types/ncs-session-step-events';
 export type { BlockMenuEventPayload } from './types/block-menu-events';
 export type { BreakoutEventPayload, BreakoutSupportedNodes } from './types/breakout-events';
 export type { RendererSyncBlockEventPayload, SyncBlockEventPayload, SyncedBlockSSRErrorAEP, } from './types/sync-block-events';

package/dist/types/analytics/types/enums.d.ts

@@ -190,8 +190,6 @@ export declare enum ACTION {
     SELECT_ALL_ESCAPED = "selectAllEscaped",
     SORT_COLUMN = "sortedColumn",
     SORT_COLUMN_NOT_ALLOWED = "sortColumnNotAllowed",
-    NCS_SESSION_STEP_METRICS = "ncsSessionStepMetrics",
-    STEPS_TRACKED = "stepsTracked",
     ORGANIC_CHANGES_TRACKED = "organicChangesTracked",
     STEPS_FILTERED = "stepsFiltered",
     AGENT_EDIT_SHIMMER_NOT_SHOWN = "agentEditShimmerNotShown",

package/dist/types/analytics/types/events.d.ts

@@ -48,7 +48,6 @@ import type { MediaEventPayload } from './media-events';
 import type { MentionEventPayload } from './mention-events';
 import type { MoveContentEventPayload } from './move-content-events';
 import type { NativeEmbedResizeErroredAEP } from './native-embed-events';
-import type { NcsSessionStepEventAEP } from './ncs-session-step-events';
 import type { NestedTableActionsEventPayload } from './nested-table-events';
 import type { NodeEventPayload } from './node-events';
 import type { OfflineEditingEventPayload } from './offline-editing-event';
@@ -74,7 +73,7 @@ export type SimplifiedNode = {
     pos: number;
     type: string;
 };
-export type AnalyticsEventPayload<T = void> = AvatarEventPayload | GeneralEventPayload<T> | FormatEventPayload | SubstituteEventPayload | InsertEventPayload | NodeEventPayload | MoveContentEventPayload | MediaEventPayload | TableEventPayload | PasteEventPayload | PasteActionsMenuEventPayload | QuickInsertInformationEventPayload | CutCopyEventPayload | ErrorEventPayload | TextColorEventPayload | FindReplaceEventPayload | DateEventPayload | SelectionEventPayload | ListEventPayload | ConfigPanelEventPayload | ElementBrowserEventPayload | CreateLinkInlineDialogEventPayload | HighlightActionsEventPayload | UnsupportedContentPayload | ExtensionEventPayload | TransactionEventPayload | TypeAheadPayload | UnlinkToolbarAEP | EditLinkToolbarAEP | PreviewItemClickedAEP | OpenLinkToolbarAEP | OpenSettingsToolbarAEP | CustomPanelEventPayload | FeatureExposureAEP | NewCollabSyncUpErrorAEP | UnsupportedContentTooltipPayload | ReferentialityEventPayload | LoomEventPayload | MBEEventPayload | HighlightEventPayload | DatasourceClickedPayload | ElementEventPayload | VisitedLinkAEP | ViewEventPayload | MediaUploadEventPayload | MentionEventPayload | EngagementPlatformEventPayload | NestedTableActionsEventPayload | ContainerNodeActionsEventPayload | AICommandPaletteEventPayload | AIDefinitionsEventPayload | AIEventPayload | AIStreamingEventPayload | AIProactiveEventPayload | AiAutocompleteEventPayload | AiSuggestionsEventPayload | ContextualTypeaheadEventPayload | AIQuickPromptEventPayload | AIUnifiedEventPayload | BreakoutEventPayload | BlockMenuEventPayload | ActiveSessionEventPayload | AIInlineSuggestionPayload | SelectionExtensionEventPayload | TelepointerClickPayload | SelectionToolbarEventPayload | ExperienceEventPayload | AlignmentEventPayload | UndoRedoAEP | OfflineEditingEventPayload | NcsSessionStepEventAEP | AgentEditShimmerNotShownAEP | FloatingToolbarOverflowEventPayload | SyncBlockEventPayload | FloatingToolbarEventPayload;
+export type AnalyticsEventPayload<T = void> = AvatarEventPayload | GeneralEventPayload<T> | FormatEventPayload | SubstituteEventPayload | InsertEventPayload | NodeEventPayload | MoveContentEventPayload | MediaEventPayload | TableEventPayload | PasteEventPayload | PasteActionsMenuEventPayload | QuickInsertInformationEventPayload | CutCopyEventPayload | ErrorEventPayload | TextColorEventPayload | FindReplaceEventPayload | DateEventPayload | SelectionEventPayload | ListEventPayload | ConfigPanelEventPayload | ElementBrowserEventPayload | CreateLinkInlineDialogEventPayload | HighlightActionsEventPayload | UnsupportedContentPayload | ExtensionEventPayload | TransactionEventPayload | TypeAheadPayload | UnlinkToolbarAEP | EditLinkToolbarAEP | PreviewItemClickedAEP | OpenLinkToolbarAEP | OpenSettingsToolbarAEP | CustomPanelEventPayload | FeatureExposureAEP | NewCollabSyncUpErrorAEP | UnsupportedContentTooltipPayload | ReferentialityEventPayload | LoomEventPayload | MBEEventPayload | HighlightEventPayload | DatasourceClickedPayload | ElementEventPayload | VisitedLinkAEP | ViewEventPayload | MediaUploadEventPayload | MentionEventPayload | EngagementPlatformEventPayload | NestedTableActionsEventPayload | ContainerNodeActionsEventPayload | AICommandPaletteEventPayload | AIDefinitionsEventPayload | AIEventPayload | AIStreamingEventPayload | AIProactiveEventPayload | AiAutocompleteEventPayload | AiSuggestionsEventPayload | ContextualTypeaheadEventPayload | AIQuickPromptEventPayload | AIUnifiedEventPayload | BreakoutEventPayload | BlockMenuEventPayload | ActiveSessionEventPayload | AIInlineSuggestionPayload | SelectionExtensionEventPayload | TelepointerClickPayload | SelectionToolbarEventPayload | ExperienceEventPayload | AlignmentEventPayload | UndoRedoAEP | OfflineEditingEventPayload | AgentEditShimmerNotShownAEP | FloatingToolbarOverflowEventPayload | SyncBlockEventPayload | FloatingToolbarEventPayload;
 type CustomPanelEventPayload = TrackAEP<ACTION.CHANGED_BACKGROUND_COLOR | ACTION.CHANGED_ICON | ACTION.REMOVE_ICON, ACTION_SUBJECT.PANEL, ACTION_SUBJECT_ID.PANEL, {
     newColor: string;
     previousColor: string;

package/dist/types/analytics/types/general-events.d.ts

@@ -249,7 +249,7 @@ type IndentationMarksTransformedAEP = OperationalAEP<ACTION.INDENTATION_MARKS_TR
 type NodesMissingContentTransformedAEP = OperationalAEP<ACTION.NODES_MISSING_CONTENT_TRANSFORMED, ACTION_SUBJECT.EDITOR, undefined, undefined>;
 type SingleColumLayoutDetectedAEP = OperationalAEP<ACTION.SINGLE_COL_LAYOUT_DETECTED, ACTION_SUBJECT.EDITOR, undefined, undefined>;
 type InvalidMediaContentTransformedAEP = OperationalAEP<ACTION.INVALID_MEDIA_CONTENT_TRANSFORMED, ACTION_SUBJECT.EDITOR, undefined, undefined>;
-type CollabStepsTrackerPayloadAEP = OperationalAEP<ACTION.STEPS_TRACKED | ACTION.STEPS_FILTERED, ACTION_SUBJECT.COLLAB, undefined, {
+type CollabStepsTrackerPayloadAEP = OperationalAEP<ACTION.STEPS_FILTERED, ACTION_SUBJECT.COLLAB, undefined, {
     steps: unknown[];
 }>;
 type CollabOrganicChangesTrackerPayloadAEP = OperationalAEP<ACTION.ORGANIC_CHANGES_TRACKED, ACTION_SUBJECT.COLLAB, undefined, {

package/dist/types/collab/defer-collab-send.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Neutral transaction metadata used by streaming producers to tell the collab layer not to flush
+ * the unconfirmed queue for this transaction.
+ *
+ * The transaction is still applied to the local document immediately; only the network send is
+ * held back. The steps stay in the collab plugin's unconfirmed queue, which is where sending is
+ * deferred from — `sendableSteps` returns the whole queue, so the next unheld transaction sends
+ * everything that accumulated.
+ *
+ * Holding the send is what gives `collapseStreamingSteps` a window to work in: `send()` stamps
+ * `mergeIsLocked` on every origin it flushes, and locked steps can no longer be composed.
+ *
+ * Producers must bound how long they hold. Held steps are content the collab service has not seen,
+ * so they are lost if the tab closes, and a peer editing the same region while steps are held will
+ * rebase against a document that is missing them.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(DEFER_COLLAB_SEND, true);
+ * ```
+ */
+export declare const DEFER_COLLAB_SEND = "deferCollabSend";

package/dist/types/collab/streaming-step-collapse.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Neutral transaction metadata used by streaming producers (for example editor-plugin-ai's
+ * in-editor direct streaming) to tell the collab layer that this transaction's steps are an
+ * intermediate frame of a single logical edit.
+ *
+ * Streaming producers re-render the whole in-progress region on every chunk, which means each
+ * frame is a full replace of the region the previous frame inserted. Every frame is applied to the
+ * local document immediately (so the user sees the content stream in), but only the *composition*
+ * of the frames needs to reach the collab service.
+ *
+ * Stamping a transaction with this meta does NOT stop its steps from being sent — it only makes
+ * them eligible to be composed with adjacent frames while they are still unconfirmed. See
+ * `collapseStreamingSteps` in `@atlaskit/editor-plugin-collab-edit`.
+ *
+ * @example
+ * ```ts
+ * tr.setMeta(STREAMING_COLLAPSIBLE_STEPS, true);
+ * ```
+ */
+export declare const STREAMING_COLLAPSIBLE_STEPS = "streamingCollapsibleSteps";

package/dist/types/ui/Mention/index.d.ts

@@ -19,7 +19,7 @@ export interface MentionProps {
 export interface MentionState {
     profilecardProvider: ProfilecardProvider | null;
 }
-export default class Mention extends PureComponent<MentionProps, Object> {
+export default class Mention extends PureComponent<MentionProps, object> {
     private providerFactory;
     constructor(props: MentionProps);
     componentWillUnmount(): void;

package/dist/types/ui/Mention/mention-with-providers.d.ts

@@ -24,6 +24,9 @@ export interface MentionWithProvidersProps extends Props {
 export interface State {
     profilecardProvider: ProfilecardProvider | null;
 }
+export declare const MissingMentionAvatarProvider: ({ mentionKey }: {
+    mentionKey: string;
+}) => null;
 export declare const MentionWithProviders: React.MemoExoticComponent<(props: MentionWithProvidersProps) => React.JSX.Element>;
 export declare const MentionWithAvatarProviders: React.MemoExoticComponent<(props: Props & {
     mentionNodeDataProvider: MentionNodeDataProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "126.0.0",
+	"version": "126.1.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -75,7 +75,7 @@
 		"@atlaskit/popper": "^9.4.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/profilecard": "^27.0.0",
-		"@atlaskit/prosemirror-history": "^1.2.0",
+		"@atlaskit/prosemirror-history": "^1.3.0",
 		"@atlaskit/react-compiler-gating": "^0.2.0",
 		"@atlaskit/react-ufo": "^8.0.0",
 		"@atlaskit/section-message": "^10.2.0",
@@ -85,8 +85,8 @@
 		"@atlaskit/task-decision": "^21.11.0",
 		"@atlaskit/teams-app-config": "^3.1.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^209.0.0",
-		"@atlaskit/tokens": "^20.0.0",
+		"@atlaskit/tmp-editor-statsig": "^211.0.0",
+		"@atlaskit/tokens": "^20.1.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/width-detector": "^7.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -146,6 +146,10 @@
 		"sinon": "^2.2.0"
 	},
 	"platform-feature-flags": {
+		"platform_editor_mention_avatar_observability": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"confluence_ncs_step_diffing_version_history": {
 			"type": "boolean",
 			"referenceOnly": true

package/analytics/types/ncs-session-step-events/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "@atlaskit/editor-common/analytics/types/ncs-session-step-events",
-  "main": "../../../dist/cjs/analytics/types/ncs-session-step-events.js",
-  "module": "../../../dist/esm/analytics/types/ncs-session-step-events.js",
-  "module:es2019": "../../../dist/es2019/analytics/types/ncs-session-step-events.js",
-  "sideEffects": [
-    "**/*.compiled.css"
-  ],
-  "types": "../../../dist/types/analytics/types/ncs-session-step-events.d.ts"
-}

package/dist/cjs/analytics/types/ncs-session-step-events.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

package/dist/cjs/ncs-step-metrics/index.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.NCS_STORAGE = void 0;
-// Disable no-re-export rule for entry point files
-/* eslint-disable @atlaskit/editor/no-re-export */
-var NCS_STORAGE = exports.NCS_STORAGE = /*#__PURE__*/function (NCS_STORAGE) {
-  // remove step metrics keys when cleaning up platform_editor_remove_collab_step_metrics
-  NCS_STORAGE["NCS_STORAGE_CLIENT_KEY"] = "ncs-session-step-metrics-storage";
-  NCS_STORAGE["NCS_SESSION_STEP_METRICS"] = "ncsSessionStepMetrics";
-  NCS_STORAGE["NCS_ACTIVE_SESSIONS"] = "ncsActiveSessions";
-  return NCS_STORAGE;
-}({});

package/dist/es2019/analytics/types/ncs-session-step-events.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/ncs-step-metrics/index.js

@@ -1,10 +0,0 @@
-// Disable no-re-export rule for entry point files
-/* eslint-disable @atlaskit/editor/no-re-export */
-
-export let NCS_STORAGE = /*#__PURE__*/function (NCS_STORAGE) {
-  // remove step metrics keys when cleaning up platform_editor_remove_collab_step_metrics
-  NCS_STORAGE["NCS_STORAGE_CLIENT_KEY"] = "ncs-session-step-metrics-storage";
-  NCS_STORAGE["NCS_SESSION_STEP_METRICS"] = "ncsSessionStepMetrics";
-  NCS_STORAGE["NCS_ACTIVE_SESSIONS"] = "ncsActiveSessions";
-  return NCS_STORAGE;
-}({});

package/dist/esm/analytics/types/ncs-session-step-events.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/ncs-step-metrics/index.js

@@ -1,10 +0,0 @@
-// Disable no-re-export rule for entry point files
-/* eslint-disable @atlaskit/editor/no-re-export */
-
-export var NCS_STORAGE = /*#__PURE__*/function (NCS_STORAGE) {
-  // remove step metrics keys when cleaning up platform_editor_remove_collab_step_metrics
-  NCS_STORAGE["NCS_STORAGE_CLIENT_KEY"] = "ncs-session-step-metrics-storage";
-  NCS_STORAGE["NCS_SESSION_STEP_METRICS"] = "ncsSessionStepMetrics";
-  NCS_STORAGE["NCS_ACTIVE_SESSIONS"] = "ncsActiveSessions";
-  return NCS_STORAGE;
-}({});

package/dist/types/analytics/types/ncs-session-step-events.d.ts

@@ -1,11 +0,0 @@
-import type { ACTION, ACTION_SUBJECT } from './enums';
-import type { OperationalAEP } from './utils';
-export type NcsSessionStepMetrics = {
-    maxStepSize: number;
-    ncsSessionId?: string;
-    numberOfSteps: number;
-    p90StepSize?: number;
-    stepSizeSumForP90?: number[];
-    totalStepSize: number;
-};
-export type NcsSessionStepEventAEP = OperationalAEP<ACTION.NCS_SESSION_STEP_METRICS, ACTION_SUBJECT.COLLAB, undefined, NcsSessionStepMetrics>;

package/dist/types/ncs-step-metrics/index.d.ts

@@ -1,5 +0,0 @@
-export declare enum NCS_STORAGE {
-    NCS_STORAGE_CLIENT_KEY = "ncs-session-step-metrics-storage",
-    NCS_SESSION_STEP_METRICS = "ncsSessionStepMetrics",
-    NCS_ACTIVE_SESSIONS = "ncsActiveSessions"
-}

package/ncs-step-metrics/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "@atlaskit/editor-common/ncs-step-metrics",
-  "main": "../dist/cjs/ncs-step-metrics/index.js",
-  "module": "../dist/esm/ncs-step-metrics/index.js",
-  "module:es2019": "../dist/es2019/ncs-step-metrics/index.js",
-  "sideEffects": [
-    "**/*.compiled.css"
-  ],
-  "types": "../dist/types/ncs-step-metrics/index.d.ts"
-}