@atlaskit/editor-plugin-mentions 14.6.6 → 14.8.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-mentions
 
+## 14.8.0
+
+### Minor Changes
+
+- [`d6596dc895420`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d6596dc895420) -
+  Show a loading shimmer in the mention typeahead Agents section while the (slower) agent source
+  resolves. The Rovo chat mention provider now emits a non-selectable loading placeholder in the
+  agents slot until agents arrive (gated by rovo_chat_agent_selection); @atlaskit/mention renders it
+  as a skeleton row, and the editor mention plugin guards it from selection/analytics.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.7.0
+
+### Minor Changes
+
+- [`f4cf0276c2938`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f4cf0276c2938) -
+  Add metric attributes for tracking agent inclusion and selection from the mention picker
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.6.6
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -66,7 +66,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.6.5";
+var PACKAGE_VERSION = "14.7.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/cjs/ui/type-ahead/analytics.js

@@ -105,7 +105,7 @@ var buildTypeAheadInviteItemClickedPayload = exports.buildTypeAheadInviteItemCli
     }, additionalAttributes)
   };
 };
-var buildTypeAheadInsertedPayload = exports.buildTypeAheadInsertedPayload = function buildTypeAheadInsertedPayload(duration, upKeyCount, downKeyCount, sessionId, insertType, mention, mentionLocalId, mentionList, query, contextIdentifierProvider, taskListId, taskItemId, isAgent) {
+var buildTypeAheadInsertedPayload = exports.buildTypeAheadInsertedPayload = function buildTypeAheadInsertedPayload(duration, upKeyCount, downKeyCount, sessionId, insertType, mention, mentionLocalId, mentionList, query, contextIdentifierProvider, taskListId, taskItemId, isAgent, agentSectioningEnabled) {
   var _extractAttributesFro3 = extractAttributesFromQuery(query),
     queryLength = _extractAttributesFro3.queryLength,
     spaceInQuery = _extractAttributesFro3.spaceInQuery;
@@ -141,7 +141,8 @@ var buildTypeAheadInsertedPayload = exports.buildTypeAheadInsertedPayload = func
       memberCount: (0, _utils.isTeamType)(mention.userType) && mention.context ? mention.context.memberCount : null,
       includesYou: (0, _utils.isTeamType)(mention.userType) && mention.context ? mention.context.includesYou : null
     }, isAgent ? {
-      isAgent: isAgent
+      isAgent: isAgent,
+      agentSectioningEnabled: agentSectioningEnabled
     } : {}), {}, {
       taskListId: taskListId,
       taskItemId: taskItemId,
@@ -152,16 +153,21 @@ var buildTypeAheadInsertedPayload = exports.buildTypeAheadInsertedPayload = func
     })
   };
 };
-var buildTypeAheadRenderedPayload = exports.buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayload(duration, userIds, query, teams, xProductMentionsLength) {
+var buildTypeAheadRenderedPayload = exports.buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayload(duration, userIds, query, teams, xProductMentionsLength, agentAnalytics) {
   var _extractAttributesFro4 = extractAttributesFromQuery(query),
     queryLength = _extractAttributesFro4.queryLength,
     spaceInQuery = _extractAttributesFro4.spaceInQuery;
   var actionSubject = userIds ? _analytics.ACTION_SUBJECT.MENTION_TYPEAHEAD : _analytics.ACTION_SUBJECT.TEAM_MENTION_TYPEAHEAD;
+  var agentAnalyticsAttributes = agentAnalytics ? {
+    agentCount: agentAnalytics.agentCount,
+    agentsShown: agentAnalytics.agentCount > 0,
+    agentSectioningEnabled: agentAnalytics.agentSectioningEnabled
+  } : {};
   return {
     action: _analytics.ACTION.RENDERED,
     actionSubject: actionSubject,
     eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-    attributes: {
+    attributes: _objectSpread({
       componentName: componentName,
       duration: duration,
       userIds: userIds,
@@ -169,6 +175,6 @@ var buildTypeAheadRenderedPayload = exports.buildTypeAheadRenderedPayload = func
       queryLength: queryLength,
       spaceInQuery: spaceInQuery,
       xProductMentionsLength: xProductMentionsLength
-    }
+    }, agentAnalyticsAttributes)
   };
 };

package/dist/cjs/ui/type-ahead/index.js

@@ -46,6 +46,14 @@ var isAgentMention = function isAgentMention(mention) {
 var isAgentTypeAheadItem = function isAgentTypeAheadItem(item) {
   return item.mention ? isAgentMention(item.mention) : false;
 };
+
+// A non-selectable loading placeholder injected by the provider (e.g.
+// `RovoChatMentionResource`) while the slower agent source resolves. It
+// renders as a skeleton row via `@atlaskit/mention`'s `MentionItem` and
+// must never be inserted or counted in rendered-mention analytics.
+var isLoadingPlaceholder = function isLoadingPlaceholder(mention) {
+  return !!(mention !== null && mention !== void 0 && mention.isPlaceholder);
+};
 var createInviteItem = function createInviteItem(_ref) {
   var mentionProvider = _ref.mentionProvider,
     onInviteItemMount = _ref.onInviteItemMount,
@@ -158,7 +166,8 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
   return function (_ref5) {
     var query = _ref5.query,
       mentions = _ref5.mentions,
-      stats = _ref5.stats;
+      stats = _ref5.stats,
+      agentAnalytics = _ref5.agentAnalytics;
     var duration = 0;
     var userOrTeamIds = null;
     var teams = null;
@@ -191,7 +200,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
         return !!m;
       });
     }
-    var payload = (0, _analytics.buildTypeAheadRenderedPayload)(duration, userOrTeamIds, query, teams, xProductMentionsLength);
+    var payload = (0, _analytics.buildTypeAheadRenderedPayload)(duration, userOrTeamIds, query, teams, xProductMentionsLength, agentAnalytics);
     fireEvent(payload, 'fabric-elements');
   };
 };
@@ -264,7 +273,8 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
   var fireEvent = _ref6.fireEvent,
     getFirstQueryWithoutResults = _ref6.getFirstQueryWithoutResults,
     setFirstQueryWithoutResults = _ref6.setFirstQueryWithoutResults,
-    toItem = _ref6.toItem;
+    toItem = _ref6.toItem,
+    enableAgentSectioning = _ref6.enableAgentSectioning;
   return function (_ref7) {
     var mentions = _ref7.mentions,
       query = _ref7.query,
@@ -275,12 +285,29 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
     var mentionItems = mentions.map(function (mention) {
       return toItem(mention);
     });
+    var agentCount = mentions.filter(isAgentMention).length;
+    var agentAnalytics = {
+      agentCount: agentCount,
+      agentSectioningEnabled: enableAgentSectioning
+    };
+
+    // The loading placeholder is a rendered-only row — keep it in
+    // `mentionItems` so the shimmer shows, but exclude it from analytics
+    // and no-results bookkeeping so it isn't counted as a real result.
+    var realMentions = mentions.filter(function (mention) {
+      return !isLoadingPlaceholder(mention);
+    });
     buildAndSendElementsTypeAheadAnalytics(fireEvent)({
       query: query,
-      mentions: mentions,
-      stats: stats
+      mentions: realMentions,
+      stats: stats,
+      agentAnalytics: agentAnalytics
     });
-    if (mentions.length === 0 && getFirstQueryWithoutResults() === null) {
+
+    // While a loading placeholder is present the result set isn't settled yet
+    // (e.g. agents still resolving) — don't record this query as "no results",
+    // or a later emission that arrives with results would be ignored.
+    if (realMentions.length === 0 && !mentions.some(isLoadingPlaceholder) && getFirstQueryWithoutResults() === null) {
       setFirstQueryWithoutResults(query);
     }
     if (!mentionProvider.shouldEnableInvite || mentionItems.length > 2) {
@@ -315,6 +342,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
   var firstQueryWithoutResults = null;
   var subscriptionKeys = new Set();
   var transformMentionsToTypeAheadItems = makeTransformMentionsToTypeAheadItems({
+    enableAgentSectioning: enableAgentSectioning,
     fireEvent: fireEvent,
     getFirstQueryWithoutResults: function getFirstQueryWithoutResults() {
       return firstQueryWithoutResults;
@@ -424,6 +452,12 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         query = _ref10.query,
         sourceListItem = _ref10.sourceListItem;
       var schema = state.schema;
+
+      // Placeholder isn't selectable. Return `false` (not a transaction) so
+      // the runtime keeps the dropdown open; a transaction would close it.
+      if (isLoadingPlaceholder(item.mention)) {
+        return false;
+      }
       var pluginState = (0, _utils2.getMentionPluginState)(state);
       var mentionProvider = pluginState.mentionProvider;
       var _item$mention = item.mention,
@@ -438,8 +472,8 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
-      var isAgentMentionsExperimentEnabled = (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false);
-      var isAgentMentionInsertion = isAgentMentionsExperimentEnabled && isAgentMention(item.mention);
+      var isAgentMentionSelection = isAgentMention(item.mention);
+      var isAgentMentionInsertion = isAgentMentionSelection && (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false);
       // userType can be missing for provider-only agent mentions. Copy/paste cannot
       // see appType, so persist APP only when there is no explicit userType.
       var persistedUserType = isAgentMentionInsertion && userType == null ? 'APP' : userType;
@@ -512,7 +546,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }
       fireEvent((0, _analytics.buildTypeAheadInsertedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(function (x) {
         return x.mention;
-      }), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionInsertion));
+      }), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionSelection, enableAgentSectioning));
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       sessionId = (0, _uuid.default)();

package/dist/es2019/pm-plugins/main.js

@@ -50,7 +50,7 @@ const AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 const AGENT_MENTION_INACTIVITY_MS = 3000;
 const MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "14.6.5";
+const PACKAGE_VERSION = "14.7.0";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/es2019/ui/type-ahead/analytics.js

@@ -97,7 +97,7 @@ export const buildTypeAheadInviteItemClickedPayload = (duration, upKeyCount, dow
     }
   };
 };
-export const buildTypeAheadInsertedPayload = (duration, upKeyCount, downKeyCount, sessionId, insertType, mention, mentionLocalId, mentionList, query, contextIdentifierProvider, taskListId, taskItemId, isAgent) => {
+export const buildTypeAheadInsertedPayload = (duration, upKeyCount, downKeyCount, sessionId, insertType, mention, mentionLocalId, mentionList, query, contextIdentifierProvider, taskListId, taskItemId, isAgent, agentSectioningEnabled) => {
   const {
     queryLength,
     spaceInQuery
@@ -134,7 +134,8 @@ export const buildTypeAheadInsertedPayload = (duration, upKeyCount, downKeyCount
       memberCount: isTeamType(mention.userType) && mention.context ? mention.context.memberCount : null,
       includesYou: isTeamType(mention.userType) && mention.context ? mention.context.includesYou : null,
       ...(isAgent ? {
-        isAgent
+        isAgent,
+        agentSectioningEnabled
       } : {}),
       taskListId,
       taskItemId,
@@ -145,12 +146,17 @@ export const buildTypeAheadInsertedPayload = (duration, upKeyCount, downKeyCount
     }
   };
 };
-export const buildTypeAheadRenderedPayload = (duration, userIds, query, teams, xProductMentionsLength) => {
+export const buildTypeAheadRenderedPayload = (duration, userIds, query, teams, xProductMentionsLength, agentAnalytics) => {
   const {
     queryLength,
     spaceInQuery
   } = extractAttributesFromQuery(query);
   const actionSubject = userIds ? ACTION_SUBJECT.MENTION_TYPEAHEAD : ACTION_SUBJECT.TEAM_MENTION_TYPEAHEAD;
+  const agentAnalyticsAttributes = agentAnalytics ? {
+    agentCount: agentAnalytics.agentCount,
+    agentsShown: agentAnalytics.agentCount > 0,
+    agentSectioningEnabled: agentAnalytics.agentSectioningEnabled
+  } : {};
   return {
     action: ACTION.RENDERED,
     actionSubject,
@@ -162,7 +168,8 @@ export const buildTypeAheadRenderedPayload = (duration, userIds, query, teams, x
       teams,
       queryLength,
       spaceInQuery,
-      xProductMentionsLength
+      xProductMentionsLength,
+      ...agentAnalyticsAttributes
     }
   };
 };

package/dist/es2019/ui/type-ahead/index.js

@@ -24,6 +24,12 @@ import { isInviteItem, isTeamStats, isTeamType, shouldKeepInviteItem } from './u
 const isAgentUserType = userType => userType === 'APP' || userType === 'AGENT';
 const isAgentMention = mention => isAgentUserType(mention.userType) || mention.appType === 'agent';
 const isAgentTypeAheadItem = item => item.mention ? isAgentMention(item.mention) : false;
+
+// A non-selectable loading placeholder injected by the provider (e.g.
+// `RovoChatMentionResource`) while the slower agent source resolves. It
+// renders as a skeleton row via `@atlaskit/mention`'s `MentionItem` and
+// must never be inserted or counted in rendered-mention analytics.
+const isLoadingPlaceholder = mention => !!(mention !== null && mention !== void 0 && mention.isPlaceholder);
 const createInviteItem = ({
   mentionProvider,
   onInviteItemMount,
@@ -129,7 +135,8 @@ export function memoize(fn
 const buildAndSendElementsTypeAheadAnalytics = fireEvent => ({
   query,
   mentions,
-  stats
+  stats,
+  agentAnalytics
 }) => {
   let duration = 0;
   let userOrTeamIds = null;
@@ -155,7 +162,7 @@ const buildAndSendElementsTypeAheadAnalytics = fireEvent => ({
       memberCount: mention.context.memberCount
     } : null).filter(m => !!m);
   }
-  const payload = buildTypeAheadRenderedPayload(duration, userOrTeamIds, query, teams, xProductMentionsLength);
+  const payload = buildTypeAheadRenderedPayload(duration, userOrTeamIds, query, teams, xProductMentionsLength, agentAnalytics);
   fireEvent(payload, 'fabric-elements');
 };
 
@@ -233,7 +240,8 @@ const makeTransformMentionsToTypeAheadItems = ({
   fireEvent,
   getFirstQueryWithoutResults,
   setFirstQueryWithoutResults,
-  toItem
+  toItem,
+  enableAgentSectioning
 }) => {
   return ({
     mentions,
@@ -244,12 +252,27 @@ const makeTransformMentionsToTypeAheadItems = ({
     sessionId
   }) => {
     const mentionItems = mentions.map(mention => toItem(mention));
+    const agentCount = mentions.filter(isAgentMention).length;
+    const agentAnalytics = {
+      agentCount,
+      agentSectioningEnabled: enableAgentSectioning
+    };
+
+    // The loading placeholder is a rendered-only row — keep it in
+    // `mentionItems` so the shimmer shows, but exclude it from analytics
+    // and no-results bookkeeping so it isn't counted as a real result.
+    const realMentions = mentions.filter(mention => !isLoadingPlaceholder(mention));
     buildAndSendElementsTypeAheadAnalytics(fireEvent)({
       query,
-      mentions,
-      stats
+      mentions: realMentions,
+      stats,
+      agentAnalytics
     });
-    if (mentions.length === 0 && getFirstQueryWithoutResults() === null) {
+
+    // While a loading placeholder is present the result set isn't settled yet
+    // (e.g. agents still resolving) — don't record this query as "no results",
+    // or a later emission that arrives with results would be ignored.
+    if (realMentions.length === 0 && !mentions.some(isLoadingPlaceholder) && getFirstQueryWithoutResults() === null) {
       setFirstQueryWithoutResults(query);
     }
     if (!mentionProvider.shouldEnableInvite || mentionItems.length > 2) {
@@ -284,6 +307,7 @@ export const createTypeAheadConfig = ({
   let firstQueryWithoutResults = null;
   const subscriptionKeys = new Set();
   const transformMentionsToTypeAheadItems = makeTransformMentionsToTypeAheadItems({
+    enableAgentSectioning,
     fireEvent,
     getFirstQueryWithoutResults: () => firstQueryWithoutResults,
     setFirstQueryWithoutResults: query => {
@@ -394,6 +418,12 @@ export const createTypeAheadConfig = ({
       const {
         schema
       } = state;
+
+      // Placeholder isn't selectable. Return `false` (not a transaction) so
+      // the runtime keeps the dropdown open; a transaction would close it.
+      if (isLoadingPlaceholder(item.mention)) {
+        return false;
+      }
       const pluginState = getMentionPluginState(state);
       const {
         mentionProvider
@@ -413,8 +443,8 @@ export const createTypeAheadConfig = ({
         ...contextIdentifierProvider,
         sessionId
       };
-      const isAgentMentionsExperimentEnabled = expVal('platform_editor_agent_mentions', 'isEnabled', false);
-      const isAgentMentionInsertion = isAgentMentionsExperimentEnabled && isAgentMention(item.mention);
+      const isAgentMentionSelection = isAgentMention(item.mention);
+      const isAgentMentionInsertion = isAgentMentionSelection && expVal('platform_editor_agent_mentions', 'isEnabled', false);
       // userType can be missing for provider-only agent mentions. Copy/paste cannot
       // see appType, so persist APP only when there is no explicit userType.
       const persistedUserType = isAgentMentionInsertion && userType == null ? 'APP' : userType;
@@ -489,7 +519,7 @@ export const createTypeAheadConfig = ({
           handleMentionsChanged([mentionChange]);
         }
       }
-      fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(x => x.mention), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionInsertion));
+      fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(x => x.mention), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionSelection, enableAgentSectioning));
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       sessionId = uuid();

package/dist/esm/pm-plugins/main.js

@@ -57,7 +57,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.6.5";
+var PACKAGE_VERSION = "14.7.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/esm/ui/type-ahead/analytics.js

@@ -98,7 +98,7 @@ export var buildTypeAheadInviteItemClickedPayload = function buildTypeAheadInvit
     }, additionalAttributes)
   };
 };
-export var buildTypeAheadInsertedPayload = function buildTypeAheadInsertedPayload(duration, upKeyCount, downKeyCount, sessionId, insertType, mention, mentionLocalId, mentionList, query, contextIdentifierProvider, taskListId, taskItemId, isAgent) {
+export var buildTypeAheadInsertedPayload = function buildTypeAheadInsertedPayload(duration, upKeyCount, downKeyCount, sessionId, insertType, mention, mentionLocalId, mentionList, query, contextIdentifierProvider, taskListId, taskItemId, isAgent, agentSectioningEnabled) {
   var _extractAttributesFro3 = extractAttributesFromQuery(query),
     queryLength = _extractAttributesFro3.queryLength,
     spaceInQuery = _extractAttributesFro3.spaceInQuery;
@@ -134,7 +134,8 @@ export var buildTypeAheadInsertedPayload = function buildTypeAheadInsertedPayloa
       memberCount: isTeamType(mention.userType) && mention.context ? mention.context.memberCount : null,
       includesYou: isTeamType(mention.userType) && mention.context ? mention.context.includesYou : null
     }, isAgent ? {
-      isAgent: isAgent
+      isAgent: isAgent,
+      agentSectioningEnabled: agentSectioningEnabled
     } : {}), {}, {
       taskListId: taskListId,
       taskItemId: taskItemId,
@@ -145,16 +146,21 @@ export var buildTypeAheadInsertedPayload = function buildTypeAheadInsertedPayloa
     })
   };
 };
-export var buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayload(duration, userIds, query, teams, xProductMentionsLength) {
+export var buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayload(duration, userIds, query, teams, xProductMentionsLength, agentAnalytics) {
   var _extractAttributesFro4 = extractAttributesFromQuery(query),
     queryLength = _extractAttributesFro4.queryLength,
     spaceInQuery = _extractAttributesFro4.spaceInQuery;
   var actionSubject = userIds ? ACTION_SUBJECT.MENTION_TYPEAHEAD : ACTION_SUBJECT.TEAM_MENTION_TYPEAHEAD;
+  var agentAnalyticsAttributes = agentAnalytics ? {
+    agentCount: agentAnalytics.agentCount,
+    agentsShown: agentAnalytics.agentCount > 0,
+    agentSectioningEnabled: agentAnalytics.agentSectioningEnabled
+  } : {};
   return {
     action: ACTION.RENDERED,
     actionSubject: actionSubject,
     eventType: EVENT_TYPE.OPERATIONAL,
-    attributes: {
+    attributes: _objectSpread({
       componentName: componentName,
       duration: duration,
       userIds: userIds,
@@ -162,6 +168,6 @@ export var buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayloa
       queryLength: queryLength,
       spaceInQuery: spaceInQuery,
       xProductMentionsLength: xProductMentionsLength
-    }
+    }, agentAnalyticsAttributes)
   };
 };

package/dist/esm/ui/type-ahead/index.js

@@ -37,6 +37,14 @@ var isAgentMention = function isAgentMention(mention) {
 var isAgentTypeAheadItem = function isAgentTypeAheadItem(item) {
   return item.mention ? isAgentMention(item.mention) : false;
 };
+
+// A non-selectable loading placeholder injected by the provider (e.g.
+// `RovoChatMentionResource`) while the slower agent source resolves. It
+// renders as a skeleton row via `@atlaskit/mention`'s `MentionItem` and
+// must never be inserted or counted in rendered-mention analytics.
+var isLoadingPlaceholder = function isLoadingPlaceholder(mention) {
+  return !!(mention !== null && mention !== void 0 && mention.isPlaceholder);
+};
 var createInviteItem = function createInviteItem(_ref) {
   var mentionProvider = _ref.mentionProvider,
     onInviteItemMount = _ref.onInviteItemMount,
@@ -149,7 +157,8 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
   return function (_ref5) {
     var query = _ref5.query,
       mentions = _ref5.mentions,
-      stats = _ref5.stats;
+      stats = _ref5.stats,
+      agentAnalytics = _ref5.agentAnalytics;
     var duration = 0;
     var userOrTeamIds = null;
     var teams = null;
@@ -182,7 +191,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
         return !!m;
       });
     }
-    var payload = buildTypeAheadRenderedPayload(duration, userOrTeamIds, query, teams, xProductMentionsLength);
+    var payload = buildTypeAheadRenderedPayload(duration, userOrTeamIds, query, teams, xProductMentionsLength, agentAnalytics);
     fireEvent(payload, 'fabric-elements');
   };
 };
@@ -255,7 +264,8 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
   var fireEvent = _ref6.fireEvent,
     getFirstQueryWithoutResults = _ref6.getFirstQueryWithoutResults,
     setFirstQueryWithoutResults = _ref6.setFirstQueryWithoutResults,
-    toItem = _ref6.toItem;
+    toItem = _ref6.toItem,
+    enableAgentSectioning = _ref6.enableAgentSectioning;
   return function (_ref7) {
     var mentions = _ref7.mentions,
       query = _ref7.query,
@@ -266,12 +276,29 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
     var mentionItems = mentions.map(function (mention) {
       return toItem(mention);
     });
+    var agentCount = mentions.filter(isAgentMention).length;
+    var agentAnalytics = {
+      agentCount: agentCount,
+      agentSectioningEnabled: enableAgentSectioning
+    };
+
+    // The loading placeholder is a rendered-only row — keep it in
+    // `mentionItems` so the shimmer shows, but exclude it from analytics
+    // and no-results bookkeeping so it isn't counted as a real result.
+    var realMentions = mentions.filter(function (mention) {
+      return !isLoadingPlaceholder(mention);
+    });
     buildAndSendElementsTypeAheadAnalytics(fireEvent)({
       query: query,
-      mentions: mentions,
-      stats: stats
+      mentions: realMentions,
+      stats: stats,
+      agentAnalytics: agentAnalytics
     });
-    if (mentions.length === 0 && getFirstQueryWithoutResults() === null) {
+
+    // While a loading placeholder is present the result set isn't settled yet
+    // (e.g. agents still resolving) — don't record this query as "no results",
+    // or a later emission that arrives with results would be ignored.
+    if (realMentions.length === 0 && !mentions.some(isLoadingPlaceholder) && getFirstQueryWithoutResults() === null) {
       setFirstQueryWithoutResults(query);
     }
     if (!mentionProvider.shouldEnableInvite || mentionItems.length > 2) {
@@ -306,6 +333,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref8) {
   var firstQueryWithoutResults = null;
   var subscriptionKeys = new Set();
   var transformMentionsToTypeAheadItems = makeTransformMentionsToTypeAheadItems({
+    enableAgentSectioning: enableAgentSectioning,
     fireEvent: fireEvent,
     getFirstQueryWithoutResults: function getFirstQueryWithoutResults() {
       return firstQueryWithoutResults;
@@ -415,6 +443,12 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref8) {
         query = _ref10.query,
         sourceListItem = _ref10.sourceListItem;
       var schema = state.schema;
+
+      // Placeholder isn't selectable. Return `false` (not a transaction) so
+      // the runtime keeps the dropdown open; a transaction would close it.
+      if (isLoadingPlaceholder(item.mention)) {
+        return false;
+      }
       var pluginState = getMentionPluginState(state);
       var mentionProvider = pluginState.mentionProvider;
       var _item$mention = item.mention,
@@ -429,8 +463,8 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref8) {
       var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
-      var isAgentMentionsExperimentEnabled = expVal('platform_editor_agent_mentions', 'isEnabled', false);
-      var isAgentMentionInsertion = isAgentMentionsExperimentEnabled && isAgentMention(item.mention);
+      var isAgentMentionSelection = isAgentMention(item.mention);
+      var isAgentMentionInsertion = isAgentMentionSelection && expVal('platform_editor_agent_mentions', 'isEnabled', false);
       // userType can be missing for provider-only agent mentions. Copy/paste cannot
       // see appType, so persist APP only when there is no explicit userType.
       var persistedUserType = isAgentMentionInsertion && userType == null ? 'APP' : userType;
@@ -503,7 +537,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref8) {
       }
       fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(function (x) {
         return x.mention;
-      }), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionInsertion));
+      }), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionSelection, enableAgentSectioning));
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       sessionId = uuid();

package/dist/types/ui/type-ahead/analytics.d.ts

@@ -8,5 +8,8 @@ export declare const MENTION_SOURCE = "mentionInEditor";
 export declare const buildTypeAheadCancelPayload: (duration: number, upKeyCount: number, downKeyCount: number, sessionId: string, query?: string) => AnalyticsEventPayload;
 export declare const buildTypeAheadInviteItemViewedPayload: (sessionId: string, contextIdentifierProvider?: ContextIdentifierProvider, userRole?: UserRole, additionalAttributes?: Record<string, unknown>) => AnalyticsEventPayload;
 export declare const buildTypeAheadInviteItemClickedPayload: (duration: number, upKeyCount: number, downKeyCount: number, sessionId: string, insertType: SelectItemMode, query?: string, contextIdentifierProvider?: ContextIdentifierProvider, userRole?: UserRole, additionalAttributes?: Record<string, unknown>) => AnalyticsEventPayload;
-export declare const buildTypeAheadInsertedPayload: (duration: number, upKeyCount: number, downKeyCount: number, sessionId: string, insertType: SelectItemMode, mention: MentionDescription, mentionLocalId: string, mentionList?: MentionDescription[], query?: string, contextIdentifierProvider?: ContextIdentifierProvider, taskListId?: string, taskItemId?: string, isAgent?: boolean) => AnalyticsEventPayload;
-export declare const buildTypeAheadRenderedPayload: (duration: number, userIds: Array<string> | null, query: string, teams: TeamInfoAttrAnalytics[] | null, xProductMentionsLength: number) => AnalyticsEventPayload;
+export declare const buildTypeAheadInsertedPayload: (duration: number, upKeyCount: number, downKeyCount: number, sessionId: string, insertType: SelectItemMode, mention: MentionDescription, mentionLocalId: string, mentionList?: MentionDescription[], query?: string, contextIdentifierProvider?: ContextIdentifierProvider, taskListId?: string, taskItemId?: string, isAgent?: boolean, agentSectioningEnabled?: boolean) => AnalyticsEventPayload;
+export declare const buildTypeAheadRenderedPayload: (duration: number, userIds: Array<string> | null, query: string, teams: TeamInfoAttrAnalytics[] | null, xProductMentionsLength: number, agentAnalytics?: {
+    agentCount: number;
+    agentSectioningEnabled: boolean;
+}) => AnalyticsEventPayload;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.6.6",
+	"version": "14.8.0",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 		"@atlaskit/insm": "^1.0.0",
 		"@atlaskit/link": "^4.3.0",
 		"@atlaskit/lozenge": "^14.1.0",
-		"@atlaskit/mention": "^27.5.0",
+		"@atlaskit/mention": "^27.7.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/popper": "^8.3.0",
 		"@atlaskit/portal": "^6.1.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/profilecard": "^26.9.0",
 		"@atlaskit/teams-app-config": "^2.1.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tmp-editor-statsig": "^126.0.0",
+		"@atlaskit/tmp-editor-statsig": "^126.1.0",
 		"@atlaskit/tokens": "^15.8.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@atlaskit/user-picker": "^13.4.0",
@@ -53,7 +53,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.30.0",
+		"@atlaskit/editor-common": "^116.32.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"