@atlaskit/editor-plugin-mentions 18.3.4 → 18.3.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-mentions
 
+## 18.3.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 18.3.5
+
+### Patch Changes
+
+- [`c263d4de33054`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c263d4de33054) -
+  Render retryable agent mention load errors in the typeahead menu behind
+  `platform_editor_agent_mentions_rovo_query_timeout`.
+- Updated dependencies
+
 ## 18.3.4
 
 ### Patch Changes

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

@@ -43,7 +43,7 @@ var ACTIONS = exports.ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "18.3.3";
+var PACKAGE_VERSION = "18.3.5";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/cjs/ui/type-ahead/AgentMentionLoadErrorItem.compiled.css

@@ -0,0 +1,14 @@
+._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
+._189eidpf{border-width:0}
+._18zrutpp{padding-inline:var(--ds-space-150,9pt)}
+._1rjcu2gc{padding-block:var(--ds-space-100,8px)}
+._1bsb1osq{width:100%}
+._1e0c1txw{display:flex}
+._1tke1ylp{min-height:40px}
+._4cvr1h6o{align-items:center}
+._80omtlke{cursor:pointer}
+._bfhk1j28{background-color:transparent}
+._syaz13af{color:var(--ds-link,#1868db)}
+._syazazsu{color:var(--ds-text-subtle,#505258)}
+._vchhusvi{box-sizing:border-box}
+._y3gn1e5h{text-align:left}

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

@@ -0,0 +1,52 @@
+/* AgentMentionLoadErrorItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AgentMentionLoadErrorItem = void 0;
+require("./AgentMentionLoadErrorItem.compiled.css");
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
+var _runtime = require("@compiled/react/runtime");
+var _reactIntl = require("react-intl");
+var _messages = require("@atlaskit/editor-common/messages");
+var _statusError = _interopRequireDefault(require("@atlaskit/icon/core/status-error"));
+var _compiled = require("@atlaskit/primitives/compiled");
+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); }
+var styles = {
+  retryRow: "_11c8fhey _189eidpf _1rjcu2gc _18zrutpp _4cvr1h6o _bfhk1j28 _vchhusvi _syazazsu _80omtlke _1e0c1txw _1tke1ylp _y3gn1e5h _1bsb1osq",
+  retryText: "_11c8fhey _syaz13af"
+};
+var AgentMentionLoadErrorItem = exports.AgentMentionLoadErrorItem = function AgentMentionLoadErrorItem(_ref) {
+  var onRetry = _ref.onRetry;
+  var intl = (0, _reactIntl.useIntl)();
+  var handleMouseDown = (0, _react.useCallback)(function (event) {
+    event.preventDefault();
+  }, []);
+  var handleClick = (0, _react.useCallback)(function (event) {
+    event.preventDefault();
+    onRetry();
+  }, [onRetry]);
+  return /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    tabIndex: -1,
+    onMouseDown: handleMouseDown,
+    onClick: handleClick,
+    "data-testid": "agent-mention-load-error-item",
+    className: (0, _runtime.ax)([styles.retryRow])
+  }, /*#__PURE__*/React.createElement(_compiled.Inline, {
+    alignBlock: "center",
+    space: "space.100"
+  }, /*#__PURE__*/React.createElement(_statusError.default, {
+    label: "",
+    color: "var(--ds-icon-danger, #C9372C)"
+  }), /*#__PURE__*/React.createElement(_compiled.Text, {
+    as: "span",
+    color: "color.text.subtle"
+  }, intl.formatMessage(_messages.mentionMessages.typeAheadSectionAgentsLoadError)), /*#__PURE__*/React.createElement("span", {
+    className: (0, _runtime.ax)([styles.retryText])
+  }, intl.formatMessage(_messages.mentionMessages.typeAheadSectionAgentsRetry))));
+};

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

@@ -30,6 +30,7 @@ var _utils2 = require("../../pm-plugins/utils");
 var _InviteItem = _interopRequireWildcard(require("../InviteItem"));
 var _InviteItemWithEmailDomain = _interopRequireDefault(require("../InviteItem/InviteItemWithEmailDomain"));
 var _analytics = require("./analytics");
+var _AgentMentionLoadErrorItem = require("./AgentMentionLoadErrorItem");
 var _MentionItemWithProfileCard = require("./MentionItemWithProfileCard");
 var _utils3 = require("./utils");
 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); }
@@ -41,6 +42,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var isAgentTypeAheadItem = function isAgentTypeAheadItem(item) {
   return item.mention ? (0, _utils3.isAgentMention)(item.mention) : false;
 };
+var isAgentMentionLoadErrorEnabled = function isAgentMentionLoadErrorEnabled(mention) {
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_rovo_query_timeout') && (0, _utils3.isAgentMentionLoadError)(mention);
+};
 var isSearchOrderedAgentTypeAheadItem = function isSearchOrderedAgentTypeAheadItem(item) {
   return !!item.mention && (0, _utils3.isExplicitAgentMention)(item.mention);
 };
@@ -55,9 +59,12 @@ var shouldApplyMentionSearchOrder = function shouldApplyMentionSearchOrder(query
 // `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) {
+var isMentionPlaceholder = function isMentionPlaceholder(mention) {
   return !!(mention !== null && mention !== void 0 && mention.isPlaceholder);
 };
+var isLoadingPlaceholder = function isLoadingPlaceholder(mention) {
+  return isMentionPlaceholder(mention) && !isAgentMentionLoadErrorEnabled(mention);
+};
 var createInviteItem = function createInviteItem(_ref) {
   var mentionProvider = _ref.mentionProvider,
     onInviteItemMount = _ref.onInviteItemMount,
@@ -118,13 +125,28 @@ var makeMentionToTypeaheadItem = function makeMentionToTypeaheadItem(_ref4) {
     profilecardProvider = _ref4.profilecardProvider;
   return function (mention) {
     var itemHeight = useRefreshedItemHeight ? _item.MENTION_ITEM_HEIGHT_REFRESHED : _item.MENTION_ITEM_HEIGHT;
+    if (isAgentMentionLoadErrorEnabled(mention)) {
+      return {
+        title: mention.id,
+        render: function render(_ref5) {
+          var onClick = _ref5.onClick;
+          return /*#__PURE__*/_react.default.createElement(_AgentMentionLoadErrorItem.AgentMentionLoadErrorItem, {
+            onRetry: onClick
+          });
+        },
+        getCustomComponentHeight: function getCustomComponentHeight() {
+          return itemHeight;
+        },
+        mention: mention
+      };
+    }
     if (isLoadingPlaceholder(mention) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_search_order')) {
       return {
         title: mention.id,
         isNonInteractive: true,
-        render: function render(_ref5) {
-          var isSelected = _ref5.isSelected,
-            onClick = _ref5.onClick;
+        render: function render(_ref6) {
+          var isSelected = _ref6.isSelected,
+            onClick = _ref6.onClick;
           return /*#__PURE__*/_react.default.createElement(_MentionItemWithProfileCard.MentionItemWithProfileCard, {
             mention: mention,
             selected: isSelected,
@@ -141,10 +163,10 @@ var makeMentionToTypeaheadItem = function makeMentionToTypeaheadItem(_ref4) {
     }
     return {
       title: mention.id,
-      render: function render(_ref6) {
-        var isSelected = _ref6.isSelected,
-          onClick = _ref6.onClick,
-          onHover = _ref6.onHover;
+      render: function render(_ref7) {
+        var isSelected = _ref7.isSelected,
+          onClick = _ref7.onClick,
+          onHover = _ref7.onHover;
         return (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) && (0, _fg.fg)('platform_editor_mention_typeahead_profilecard') ? /*#__PURE__*/_react.default.createElement(_MentionItemWithProfileCard.MentionItemWithProfileCard, {
           mention: mention,
           selected: isSelected,
@@ -198,12 +220,12 @@ function memoize(fn
   };
 }
 var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAheadAnalytics(fireEvent) {
-  return function (_ref7) {
-    var query = _ref7.query,
-      mentions = _ref7.mentions,
-      stats = _ref7.stats,
-      mentionTypeaheadSessionId = _ref7.mentionTypeaheadSessionId,
-      agentAnalytics = _ref7.agentAnalytics;
+  return function (_ref8) {
+    var query = _ref8.query,
+      mentions = _ref8.mentions,
+      stats = _ref8.stats,
+      mentionTypeaheadSessionId = _ref8.mentionTypeaheadSessionId,
+      agentAnalytics = _ref8.agentAnalytics;
     var duration = 0;
     var userOrTeamIds = null;
     var teams = null;
@@ -305,30 +327,29 @@ var buildNodesForTeamMention = function buildNodesForTeamMention(schema, selecte
  * `createTypeAheadConfig` and intentionally mutated here as a
  * side-effect — preserves the existing single-shot semantics.
  */
-var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToTypeAheadItems(_ref8) {
-  var fireEvent = _ref8.fireEvent,
-    getFirstQueryWithoutResults = _ref8.getFirstQueryWithoutResults,
-    setFirstQueryWithoutResults = _ref8.setFirstQueryWithoutResults,
-    hasFiredInviteItemViewed = _ref8.hasFiredInviteItemViewed,
-    markInviteItemViewed = _ref8.markInviteItemViewed,
-    toItem = _ref8.toItem,
-    enableAgentSectioning = _ref8.enableAgentSectioning;
-  return function (_ref9) {
-    var mentions = _ref9.mentions,
-      query = _ref9.query,
-      stats = _ref9.stats,
-      mentionProvider = _ref9.mentionProvider,
-      contextIdentifierProvider = _ref9.contextIdentifierProvider,
-      sessionId = _ref9.sessionId;
+var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToTypeAheadItems(_ref9) {
+  var fireEvent = _ref9.fireEvent,
+    getFirstQueryWithoutResults = _ref9.getFirstQueryWithoutResults,
+    setFirstQueryWithoutResults = _ref9.setFirstQueryWithoutResults,
+    hasFiredInviteItemViewed = _ref9.hasFiredInviteItemViewed,
+    markInviteItemViewed = _ref9.markInviteItemViewed,
+    toItem = _ref9.toItem,
+    enableAgentSectioning = _ref9.enableAgentSectioning;
+  return function (_ref0) {
+    var mentions = _ref0.mentions,
+      query = _ref0.query,
+      stats = _ref0.stats,
+      mentionProvider = _ref0.mentionProvider,
+      contextIdentifierProvider = _ref0.contextIdentifierProvider,
+      sessionId = _ref0.sessionId;
     var displayMentions = shouldApplyMentionSearchOrder(query) ? (0, _utils3.orderMentionsForDisplay)(mentions) : mentions;
     var mentionItems = displayMentions.map(function (mention) {
       return toItem(mention);
     });
-    // 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.
+    // Provider placeholders stay in `mentionItems` so loading/error rows render,
+    // but they are not real mention results for analytics or agent counts.
     var realMentions = displayMentions.filter(function (mention) {
-      return !isLoadingPlaceholder(mention);
+      return !isMentionPlaceholder(mention);
     });
     var agentCount = realMentions.filter(_utils3.isAgentMention).length;
     var agentAnalytics = {
@@ -373,18 +394,18 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
     })(mentionItems);
   };
 };
-var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
-  var sanitizePrivateContent = _ref0.sanitizePrivateContent,
-    mentionInsertDisplayName = _ref0.mentionInsertDisplayName,
-    fireEvent = _ref0.fireEvent,
-    HighlightComponent = _ref0.HighlightComponent,
-    api = _ref0.api,
-    handleMentionsChanged = _ref0.handleMentionsChanged,
-    _ref0$enableAgentSect = _ref0.enableAgentSectioning,
-    enableAgentSectioning = _ref0$enableAgentSect === void 0 ? false : _ref0$enableAgentSect,
-    _ref0$showAgentMentio = _ref0.showAgentMentionsLabsLozenge,
-    showAgentMentionsLabsLozenge = _ref0$showAgentMentio === void 0 ? false : _ref0$showAgentMentio,
-    profilecardProvider = _ref0.profilecardProvider;
+var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeAheadConfig(_ref1) {
+  var sanitizePrivateContent = _ref1.sanitizePrivateContent,
+    mentionInsertDisplayName = _ref1.mentionInsertDisplayName,
+    fireEvent = _ref1.fireEvent,
+    HighlightComponent = _ref1.HighlightComponent,
+    api = _ref1.api,
+    handleMentionsChanged = _ref1.handleMentionsChanged,
+    _ref1$enableAgentSect = _ref1.enableAgentSectioning,
+    enableAgentSectioning = _ref1$enableAgentSect === void 0 ? false : _ref1$enableAgentSect,
+    _ref1$showAgentMentio = _ref1.showAgentMentionsLabsLozenge,
+    showAgentMentionsLabsLozenge = _ref1$showAgentMentio === void 0 ? false : _ref1$showAgentMentio,
+    profilecardProvider = _ref1.profilecardProvider;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var sessionId = (0, _uuid.v4)();
   var firstQueryWithoutResults = null;
@@ -424,18 +445,18 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }
       return null;
     },
-    getItems: function getItems(_ref1) {
+    getItems: function getItems(_ref10) {
       var _api$contextIdentifie, _api$contextIdentifie2;
-      var query = _ref1.query,
-        editorState = _ref1.editorState;
+      var query = _ref10.query,
+        editorState = _ref10.editorState;
       lastTypeAheadQuery = query || '';
       var pluginState = (0, _utils2.getMentionPluginState)(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
       var mentionProvider = pluginState.mentionProvider;
-      var _ref10 = (_api$contextIdentifie = api === null || api === void 0 || (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {},
-        contextIdentifierProvider = _ref10.contextIdentifierProvider;
+      var _ref11 = (_api$contextIdentifie = api === null || api === void 0 || (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {},
+        contextIdentifierProvider = _ref11.contextIdentifierProvider;
       return new Promise(function (resolve, reject) {
         // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
         var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.v4)());
@@ -470,8 +491,8 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         }));
       });
     },
-    getSections: function getSections(_ref11) {
-      var intl = _ref11.intl;
+    getSections: function getSections(_ref12) {
+      var intl = _ref12.intl;
       if (!enableAgentSectioning) {
         return [];
       }
@@ -516,12 +537,12 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       lastTypeAheadQuery = '';
       _hasFiredInviteItemViewed = false;
     },
-    selectItem: function selectItem(state, item, insert, _ref12) {
+    selectItem: function selectItem(state, item, insert, _ref13) {
       var _api$contextIdentifie3, _api$contextIdentifie4;
-      var mode = _ref12.mode,
-        stats = _ref12.stats,
-        query = _ref12.query,
-        sourceListItem = _ref12.sourceListItem;
+      var mode = _ref13.mode,
+        stats = _ref13.stats,
+        query = _ref13.query,
+        sourceListItem = _ref13.sourceListItem;
       var schema = state.schema;
 
       // Placeholder isn't selectable. Return `false` (not a transaction) so
@@ -531,6 +552,15 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }
       var pluginState = (0, _utils2.getMentionPluginState)(state);
       var mentionProvider = pluginState.mentionProvider;
+      var _ref14 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
+        contextIdentifierProvider = _ref14.contextIdentifierProvider;
+      var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
+        sessionId: sessionId
+      });
+      if (isAgentMentionLoadErrorEnabled(item.mention)) {
+        mentionProvider === null || mentionProvider === void 0 || mentionProvider.filter(query || '', mentionContext);
+        return false;
+      }
       var _item$mention = item.mention,
         id = _item$mention.id,
         name = _item$mention.name,
@@ -538,11 +568,6 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         accessLevel = _item$mention.accessLevel,
         userType = _item$mention.userType,
         isXProductUser = _item$mention.isXProductUser;
-      var _ref13 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
-        contextIdentifierProvider = _ref13.contextIdentifierProvider;
-      var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
-        sessionId: sessionId
-      });
       var isAgentMentionSelection = (0, _utils3.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
@@ -666,11 +691,11 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }
       return tr;
     },
-    dismiss: function dismiss(_ref14) {
-      var editorState = _ref14.editorState,
-        query = _ref14.query,
-        stats = _ref14.stats,
-        wasItemInserted = _ref14.wasItemInserted;
+    dismiss: function dismiss(_ref15) {
+      var editorState = _ref15.editorState,
+        query = _ref15.query,
+        stats = _ref15.stats,
+        wasItemInserted = _ref15.wasItemInserted;
       firstQueryWithoutResults = null;
       _hasFiredInviteItemViewed = false;
       var pickerElapsedTime = stats.startedAt ? performance.now() - stats.startedAt : 0;
@@ -715,10 +740,10 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
    * so we only attach it when the gate is on — otherwise the proven
    * single-shot `getItems` path continues to drive every consumer.
    */
-  var subscribeToItemsUpdates = function subscribeToItemsUpdates(_ref15) {
+  var subscribeToItemsUpdates = function subscribeToItemsUpdates(_ref16) {
     var _api$contextIdentifie5, _api$contextIdentifie6;
-    var query = _ref15.query,
-      editorState = _ref15.editorState;
+    var query = _ref16.query,
+      editorState = _ref16.editorState;
     lastTypeAheadQuery = query || '';
     var pluginState = (0, _utils2.getMentionPluginState)(editorState);
     if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
@@ -730,8 +755,8 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       };
     }
     var mentionProvider = pluginState.mentionProvider;
-    var _ref16 = (_api$contextIdentifie5 = api === null || api === void 0 || (_api$contextIdentifie6 = api.contextIdentifier) === null || _api$contextIdentifie6 === void 0 ? void 0 : _api$contextIdentifie6.sharedState.currentState()) !== null && _api$contextIdentifie5 !== void 0 ? _api$contextIdentifie5 : {},
-      contextIdentifierProvider = _ref16.contextIdentifierProvider;
+    var _ref17 = (_api$contextIdentifie5 = api === null || api === void 0 || (_api$contextIdentifie6 = api.contextIdentifier) === null || _api$contextIdentifie6 === void 0 ? void 0 : _api$contextIdentifie6.sharedState.currentState()) !== null && _api$contextIdentifie5 !== void 0 ? _api$contextIdentifie5 : {},
+      contextIdentifierProvider = _ref17.contextIdentifierProvider;
 
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.v4)());

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

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldKeepInviteItem = exports.orderMentionsForDisplay = exports.isTeamType = exports.isTeamStats = exports.isInviteItem = exports.isExplicitAgentMention = exports.isBotOrTeamMention = exports.isAgentUserType = exports.isAgentMention = exports.getMentionDisplayGroup = void 0;
+exports.shouldKeepInviteItem = exports.orderMentionsForDisplay = exports.isTeamType = exports.isTeamStats = exports.isInviteItem = exports.isExplicitAgentMention = exports.isBotOrTeamMention = exports.isAgentUserType = exports.isAgentMentionLoadError = exports.isAgentMention = exports.getMentionDisplayGroup = void 0;
+var _types = require("@atlaskit/mention/types");
 var _InviteItem = require("../InviteItem");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -35,13 +36,16 @@ var isAgentMention = exports.isAgentMention = function isAgentMention(mention) {
 
 /**
  * True when the mention is explicitly an agent, not a generic APP/bot.
- * Prefer this over {@link isAgentMention} when ordering the search display
+ * Prefer this over `isAgentMention` when ordering the search display
  * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
  * is a bot unless `appType === 'agent'`.
  */
 var isExplicitAgentMention = exports.isExplicitAgentMention = function isExplicitAgentMention(mention) {
   return mention.appType === 'agent' || mention.userType === 'AGENT';
 };
+var isAgentMentionLoadError = exports.isAgentMentionLoadError = function isAgentMentionLoadError(mention) {
+  return (mention === null || mention === void 0 ? void 0 : mention.id) === _types.AGENT_MENTION_LOAD_ERROR_ID && mention.isPlaceholder === true && mention.placeholderType === 'error' && mention.appType === 'agent';
+};
 
 /**
  * Connect/app bots and teams. Explicit agents are excluded so they can be

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

@@ -32,7 +32,7 @@ export const ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "18.3.3";
+const PACKAGE_VERSION = "18.3.5";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/es2019/ui/type-ahead/AgentMentionLoadErrorItem.compiled.css

@@ -0,0 +1,14 @@
+._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
+._189eidpf{border-width:0}
+._18zrutpp{padding-inline:var(--ds-space-150,9pt)}
+._1rjcu2gc{padding-block:var(--ds-space-100,8px)}
+._1bsb1osq{width:100%}
+._1e0c1txw{display:flex}
+._1tke1ylp{min-height:40px}
+._4cvr1h6o{align-items:center}
+._80omtlke{cursor:pointer}
+._bfhk1j28{background-color:transparent}
+._syaz13af{color:var(--ds-link,#1868db)}
+._syazazsu{color:var(--ds-text-subtle,#505258)}
+._vchhusvi{box-sizing:border-box}
+._y3gn1e5h{text-align:left}

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

@@ -0,0 +1,44 @@
+/* AgentMentionLoadErrorItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+import "./AgentMentionLoadErrorItem.compiled.css";
+import * as React from 'react';
+import { ax, ix } from "@compiled/react/runtime";
+import { useCallback } from 'react';
+import { useIntl } from 'react-intl';
+import { mentionMessages } from '@atlaskit/editor-common/messages';
+import StatusErrorIcon from '@atlaskit/icon/core/status-error';
+import { Inline, Text } from '@atlaskit/primitives/compiled';
+const styles = {
+  retryRow: "_11c8fhey _189eidpf _1rjcu2gc _18zrutpp _4cvr1h6o _bfhk1j28 _vchhusvi _syazazsu _80omtlke _1e0c1txw _1tke1ylp _y3gn1e5h _1bsb1osq",
+  retryText: "_11c8fhey _syaz13af"
+};
+export const AgentMentionLoadErrorItem = ({
+  onRetry
+}) => {
+  const intl = useIntl();
+  const handleMouseDown = useCallback(event => {
+    event.preventDefault();
+  }, []);
+  const handleClick = useCallback(event => {
+    event.preventDefault();
+    onRetry();
+  }, [onRetry]);
+  return /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    tabIndex: -1,
+    onMouseDown: handleMouseDown,
+    onClick: handleClick,
+    "data-testid": "agent-mention-load-error-item",
+    className: ax([styles.retryRow])
+  }, /*#__PURE__*/React.createElement(Inline, {
+    alignBlock: "center",
+    space: "space.100"
+  }, /*#__PURE__*/React.createElement(StatusErrorIcon, {
+    label: "",
+    color: "var(--ds-icon-danger, #C9372C)"
+  }), /*#__PURE__*/React.createElement(Text, {
+    as: "span",
+    color: "color.text.subtle"
+  }, intl.formatMessage(mentionMessages.typeAheadSectionAgentsLoadError)), /*#__PURE__*/React.createElement("span", {
+    className: ax([styles.retryText])
+  }, intl.formatMessage(mentionMessages.typeAheadSectionAgentsRetry))));
+};

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

@@ -20,9 +20,11 @@ import { getMentionPluginState } from '../../pm-plugins/utils';
 import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 import InviteItemWithEmailDomain from '../InviteItem/InviteItemWithEmailDomain';
 import { buildTypeAheadCancelPayload, buildTypeAheadInsertedPayload, buildTypeAheadInviteItemClickedPayload, buildTypeAheadInviteItemViewedPayload, buildTypeAheadRenderedPayload } from './analytics';
+import { AgentMentionLoadErrorItem } from './AgentMentionLoadErrorItem';
 import { MentionItemWithProfileCard } from './MentionItemWithProfileCard';
-import { isAgentMention, isBotOrTeamMention, isExplicitAgentMention, isInviteItem, isTeamStats, isTeamType, orderMentionsForDisplay, shouldKeepInviteItem } from './utils';
+import { isAgentMention, isAgentMentionLoadError, isBotOrTeamMention, isExplicitAgentMention, isInviteItem, isTeamStats, isTeamType, orderMentionsForDisplay, shouldKeepInviteItem } from './utils';
 const isAgentTypeAheadItem = item => item.mention ? isAgentMention(item.mention) : false;
+const isAgentMentionLoadErrorEnabled = mention => isExperimentEnabled('platform_editor_agent_mentions_rovo_query_timeout') && isAgentMentionLoadError(mention);
 const isSearchOrderedAgentTypeAheadItem = item => !!item.mention && isExplicitAgentMention(item.mention);
 const isSearchOrderedPersonTypeAheadItem = item => !!item.mention && !isInviteItem(item.mention) && !isExplicitAgentMention(item.mention) && !isBotOrTeamMention(item.mention);
 const shouldApplyMentionSearchOrder = query => isExperimentEnabled('platform_editor_mention_search_order') && query.trim().length > 0;
@@ -31,7 +33,8 @@ const shouldApplyMentionSearchOrder = query => isExperimentEnabled('platform_edi
 // `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 isMentionPlaceholder = mention => !!(mention !== null && mention !== void 0 && mention.isPlaceholder);
+const isLoadingPlaceholder = mention => isMentionPlaceholder(mention) && !isAgentMentionLoadErrorEnabled(mention);
 const createInviteItem = ({
   mentionProvider,
   onInviteItemMount,
@@ -91,6 +94,20 @@ const makeMentionToTypeaheadItem = ({
   profilecardProvider
 }) => mention => {
   const itemHeight = useRefreshedItemHeight ? MENTION_ITEM_HEIGHT_REFRESHED : MENTION_ITEM_HEIGHT;
+  if (isAgentMentionLoadErrorEnabled(mention)) {
+    return {
+      title: mention.id,
+      render: ({
+        onClick
+      }) => /*#__PURE__*/React.createElement(AgentMentionLoadErrorItem, {
+        onRetry: onClick
+      }),
+      getCustomComponentHeight: () => {
+        return itemHeight;
+      },
+      mention
+    };
+  }
   if (isLoadingPlaceholder(mention) && isExperimentEnabled('platform_editor_mention_search_order')) {
     return {
       title: mention.id,
@@ -289,10 +306,9 @@ const makeTransformMentionsToTypeAheadItems = ({
   }) => {
     const displayMentions = shouldApplyMentionSearchOrder(query) ? orderMentionsForDisplay(mentions) : mentions;
     const mentionItems = displayMentions.map(mention => toItem(mention));
-    // 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 = displayMentions.filter(mention => !isLoadingPlaceholder(mention));
+    // Provider placeholders stay in `mentionItems` so loading/error rows render,
+    // but they are not real mention results for analytics or agent counts.
+    const realMentions = displayMentions.filter(mention => !isMentionPlaceholder(mention));
     const agentCount = realMentions.filter(isAgentMention).length;
     const agentAnalytics = {
       agentCount,
@@ -498,6 +514,17 @@ export const createTypeAheadConfig = ({
       const {
         mentionProvider
       } = pluginState;
+      const {
+        contextIdentifierProvider
+      } = (_api$contextIdentifie3 = api === null || api === void 0 ? void 0 : (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {};
+      const mentionContext = {
+        ...contextIdentifierProvider,
+        sessionId
+      };
+      if (isAgentMentionLoadErrorEnabled(item.mention)) {
+        mentionProvider === null || mentionProvider === void 0 ? void 0 : mentionProvider.filter(query || '', mentionContext);
+        return false;
+      }
       const {
         id,
         name,
@@ -506,13 +533,6 @@ export const createTypeAheadConfig = ({
         userType,
         isXProductUser
       } = item.mention;
-      const {
-        contextIdentifierProvider
-      } = (_api$contextIdentifie3 = api === null || api === void 0 ? void 0 : (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {};
-      const mentionContext = {
-        ...contextIdentifierProvider,
-        sessionId
-      };
       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

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

@@ -1,3 +1,4 @@
+import { AGENT_MENTION_LOAD_ERROR_ID } from '@atlaskit/mention/types';
 import { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 
 // Ignored via go/ees005
@@ -17,11 +18,12 @@ export const isAgentMention = mention => isAgentUserType(mention.userType) || me
 
 /**
  * True when the mention is explicitly an agent, not a generic APP/bot.
- * Prefer this over {@link isAgentMention} when ordering the search display
+ * Prefer this over `isAgentMention` when ordering the search display
  * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
  * is a bot unless `appType === 'agent'`.
  */
 export const isExplicitAgentMention = mention => mention.appType === 'agent' || mention.userType === 'AGENT';
+export const isAgentMentionLoadError = mention => (mention === null || mention === void 0 ? void 0 : mention.id) === AGENT_MENTION_LOAD_ERROR_ID && mention.isPlaceholder === true && mention.placeholderType === 'error' && mention.appType === 'agent';
 
 /**
  * Connect/app bots and teams. Explicit agents are excluded so they can be

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

@@ -35,7 +35,7 @@ export var ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "18.3.3";
+var PACKAGE_VERSION = "18.3.5";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/esm/ui/type-ahead/AgentMentionLoadErrorItem.compiled.css

@@ -0,0 +1,14 @@
+._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
+._189eidpf{border-width:0}
+._18zrutpp{padding-inline:var(--ds-space-150,9pt)}
+._1rjcu2gc{padding-block:var(--ds-space-100,8px)}
+._1bsb1osq{width:100%}
+._1e0c1txw{display:flex}
+._1tke1ylp{min-height:40px}
+._4cvr1h6o{align-items:center}
+._80omtlke{cursor:pointer}
+._bfhk1j28{background-color:transparent}
+._syaz13af{color:var(--ds-link,#1868db)}
+._syazazsu{color:var(--ds-text-subtle,#505258)}
+._vchhusvi{box-sizing:border-box}
+._y3gn1e5h{text-align:left}

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

@@ -0,0 +1,43 @@
+/* AgentMentionLoadErrorItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+import "./AgentMentionLoadErrorItem.compiled.css";
+import * as React from 'react';
+import { ax, ix } from "@compiled/react/runtime";
+import { useCallback } from 'react';
+import { useIntl } from 'react-intl';
+import { mentionMessages } from '@atlaskit/editor-common/messages';
+import StatusErrorIcon from '@atlaskit/icon/core/status-error';
+import { Inline, Text } from '@atlaskit/primitives/compiled';
+var styles = {
+  retryRow: "_11c8fhey _189eidpf _1rjcu2gc _18zrutpp _4cvr1h6o _bfhk1j28 _vchhusvi _syazazsu _80omtlke _1e0c1txw _1tke1ylp _y3gn1e5h _1bsb1osq",
+  retryText: "_11c8fhey _syaz13af"
+};
+export var AgentMentionLoadErrorItem = function AgentMentionLoadErrorItem(_ref) {
+  var onRetry = _ref.onRetry;
+  var intl = useIntl();
+  var handleMouseDown = useCallback(function (event) {
+    event.preventDefault();
+  }, []);
+  var handleClick = useCallback(function (event) {
+    event.preventDefault();
+    onRetry();
+  }, [onRetry]);
+  return /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    tabIndex: -1,
+    onMouseDown: handleMouseDown,
+    onClick: handleClick,
+    "data-testid": "agent-mention-load-error-item",
+    className: ax([styles.retryRow])
+  }, /*#__PURE__*/React.createElement(Inline, {
+    alignBlock: "center",
+    space: "space.100"
+  }, /*#__PURE__*/React.createElement(StatusErrorIcon, {
+    label: "",
+    color: "var(--ds-icon-danger, #C9372C)"
+  }), /*#__PURE__*/React.createElement(Text, {
+    as: "span",
+    color: "color.text.subtle"
+  }, intl.formatMessage(mentionMessages.typeAheadSectionAgentsLoadError)), /*#__PURE__*/React.createElement("span", {
+    className: ax([styles.retryText])
+  }, intl.formatMessage(mentionMessages.typeAheadSectionAgentsRetry))));
+};

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

@@ -27,11 +27,15 @@ import { getMentionPluginState } from '../../pm-plugins/utils';
 import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 import InviteItemWithEmailDomain from '../InviteItem/InviteItemWithEmailDomain';
 import { buildTypeAheadCancelPayload, buildTypeAheadInsertedPayload, buildTypeAheadInviteItemClickedPayload, buildTypeAheadInviteItemViewedPayload, buildTypeAheadRenderedPayload } from './analytics';
+import { AgentMentionLoadErrorItem } from './AgentMentionLoadErrorItem';
 import { MentionItemWithProfileCard } from './MentionItemWithProfileCard';
-import { isAgentMention, isBotOrTeamMention, isExplicitAgentMention, isInviteItem, isTeamStats, isTeamType, orderMentionsForDisplay, shouldKeepInviteItem } from './utils';
+import { isAgentMention, isAgentMentionLoadError, isBotOrTeamMention, isExplicitAgentMention, isInviteItem, isTeamStats, isTeamType, orderMentionsForDisplay, shouldKeepInviteItem } from './utils';
 var isAgentTypeAheadItem = function isAgentTypeAheadItem(item) {
   return item.mention ? isAgentMention(item.mention) : false;
 };
+var isAgentMentionLoadErrorEnabled = function isAgentMentionLoadErrorEnabled(mention) {
+  return isExperimentEnabled('platform_editor_agent_mentions_rovo_query_timeout') && isAgentMentionLoadError(mention);
+};
 var isSearchOrderedAgentTypeAheadItem = function isSearchOrderedAgentTypeAheadItem(item) {
   return !!item.mention && isExplicitAgentMention(item.mention);
 };
@@ -46,9 +50,12 @@ var shouldApplyMentionSearchOrder = function shouldApplyMentionSearchOrder(query
 // `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) {
+var isMentionPlaceholder = function isMentionPlaceholder(mention) {
   return !!(mention !== null && mention !== void 0 && mention.isPlaceholder);
 };
+var isLoadingPlaceholder = function isLoadingPlaceholder(mention) {
+  return isMentionPlaceholder(mention) && !isAgentMentionLoadErrorEnabled(mention);
+};
 var createInviteItem = function createInviteItem(_ref) {
   var mentionProvider = _ref.mentionProvider,
     onInviteItemMount = _ref.onInviteItemMount,
@@ -109,13 +116,28 @@ var makeMentionToTypeaheadItem = function makeMentionToTypeaheadItem(_ref4) {
     profilecardProvider = _ref4.profilecardProvider;
   return function (mention) {
     var itemHeight = useRefreshedItemHeight ? MENTION_ITEM_HEIGHT_REFRESHED : MENTION_ITEM_HEIGHT;
+    if (isAgentMentionLoadErrorEnabled(mention)) {
+      return {
+        title: mention.id,
+        render: function render(_ref5) {
+          var onClick = _ref5.onClick;
+          return /*#__PURE__*/React.createElement(AgentMentionLoadErrorItem, {
+            onRetry: onClick
+          });
+        },
+        getCustomComponentHeight: function getCustomComponentHeight() {
+          return itemHeight;
+        },
+        mention: mention
+      };
+    }
     if (isLoadingPlaceholder(mention) && isExperimentEnabled('platform_editor_mention_search_order')) {
       return {
         title: mention.id,
         isNonInteractive: true,
-        render: function render(_ref5) {
-          var isSelected = _ref5.isSelected,
-            onClick = _ref5.onClick;
+        render: function render(_ref6) {
+          var isSelected = _ref6.isSelected,
+            onClick = _ref6.onClick;
           return /*#__PURE__*/React.createElement(MentionItemWithProfileCard, {
             mention: mention,
             selected: isSelected,
@@ -132,10 +154,10 @@ var makeMentionToTypeaheadItem = function makeMentionToTypeaheadItem(_ref4) {
     }
     return {
       title: mention.id,
-      render: function render(_ref6) {
-        var isSelected = _ref6.isSelected,
-          onClick = _ref6.onClick,
-          onHover = _ref6.onHover;
+      render: function render(_ref7) {
+        var isSelected = _ref7.isSelected,
+          onClick = _ref7.onClick,
+          onHover = _ref7.onHover;
         return expVal('platform_editor_agent_mentions', 'isEnabled', false) && fg('platform_editor_mention_typeahead_profilecard') ? /*#__PURE__*/React.createElement(MentionItemWithProfileCard, {
           mention: mention,
           selected: isSelected,
@@ -189,12 +211,12 @@ export function memoize(fn
   };
 }
 var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAheadAnalytics(fireEvent) {
-  return function (_ref7) {
-    var query = _ref7.query,
-      mentions = _ref7.mentions,
-      stats = _ref7.stats,
-      mentionTypeaheadSessionId = _ref7.mentionTypeaheadSessionId,
-      agentAnalytics = _ref7.agentAnalytics;
+  return function (_ref8) {
+    var query = _ref8.query,
+      mentions = _ref8.mentions,
+      stats = _ref8.stats,
+      mentionTypeaheadSessionId = _ref8.mentionTypeaheadSessionId,
+      agentAnalytics = _ref8.agentAnalytics;
     var duration = 0;
     var userOrTeamIds = null;
     var teams = null;
@@ -296,30 +318,29 @@ var buildNodesForTeamMention = function buildNodesForTeamMention(schema, selecte
  * `createTypeAheadConfig` and intentionally mutated here as a
  * side-effect — preserves the existing single-shot semantics.
  */
-var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToTypeAheadItems(_ref8) {
-  var fireEvent = _ref8.fireEvent,
-    getFirstQueryWithoutResults = _ref8.getFirstQueryWithoutResults,
-    setFirstQueryWithoutResults = _ref8.setFirstQueryWithoutResults,
-    hasFiredInviteItemViewed = _ref8.hasFiredInviteItemViewed,
-    markInviteItemViewed = _ref8.markInviteItemViewed,
-    toItem = _ref8.toItem,
-    enableAgentSectioning = _ref8.enableAgentSectioning;
-  return function (_ref9) {
-    var mentions = _ref9.mentions,
-      query = _ref9.query,
-      stats = _ref9.stats,
-      mentionProvider = _ref9.mentionProvider,
-      contextIdentifierProvider = _ref9.contextIdentifierProvider,
-      sessionId = _ref9.sessionId;
+var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToTypeAheadItems(_ref9) {
+  var fireEvent = _ref9.fireEvent,
+    getFirstQueryWithoutResults = _ref9.getFirstQueryWithoutResults,
+    setFirstQueryWithoutResults = _ref9.setFirstQueryWithoutResults,
+    hasFiredInviteItemViewed = _ref9.hasFiredInviteItemViewed,
+    markInviteItemViewed = _ref9.markInviteItemViewed,
+    toItem = _ref9.toItem,
+    enableAgentSectioning = _ref9.enableAgentSectioning;
+  return function (_ref0) {
+    var mentions = _ref0.mentions,
+      query = _ref0.query,
+      stats = _ref0.stats,
+      mentionProvider = _ref0.mentionProvider,
+      contextIdentifierProvider = _ref0.contextIdentifierProvider,
+      sessionId = _ref0.sessionId;
     var displayMentions = shouldApplyMentionSearchOrder(query) ? orderMentionsForDisplay(mentions) : mentions;
     var mentionItems = displayMentions.map(function (mention) {
       return toItem(mention);
     });
-    // 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.
+    // Provider placeholders stay in `mentionItems` so loading/error rows render,
+    // but they are not real mention results for analytics or agent counts.
     var realMentions = displayMentions.filter(function (mention) {
-      return !isLoadingPlaceholder(mention);
+      return !isMentionPlaceholder(mention);
     });
     var agentCount = realMentions.filter(isAgentMention).length;
     var agentAnalytics = {
@@ -364,18 +385,18 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
     })(mentionItems);
   };
 };
-export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
-  var sanitizePrivateContent = _ref0.sanitizePrivateContent,
-    mentionInsertDisplayName = _ref0.mentionInsertDisplayName,
-    fireEvent = _ref0.fireEvent,
-    HighlightComponent = _ref0.HighlightComponent,
-    api = _ref0.api,
-    handleMentionsChanged = _ref0.handleMentionsChanged,
-    _ref0$enableAgentSect = _ref0.enableAgentSectioning,
-    enableAgentSectioning = _ref0$enableAgentSect === void 0 ? false : _ref0$enableAgentSect,
-    _ref0$showAgentMentio = _ref0.showAgentMentionsLabsLozenge,
-    showAgentMentionsLabsLozenge = _ref0$showAgentMentio === void 0 ? false : _ref0$showAgentMentio,
-    profilecardProvider = _ref0.profilecardProvider;
+export var createTypeAheadConfig = function createTypeAheadConfig(_ref1) {
+  var sanitizePrivateContent = _ref1.sanitizePrivateContent,
+    mentionInsertDisplayName = _ref1.mentionInsertDisplayName,
+    fireEvent = _ref1.fireEvent,
+    HighlightComponent = _ref1.HighlightComponent,
+    api = _ref1.api,
+    handleMentionsChanged = _ref1.handleMentionsChanged,
+    _ref1$enableAgentSect = _ref1.enableAgentSectioning,
+    enableAgentSectioning = _ref1$enableAgentSect === void 0 ? false : _ref1$enableAgentSect,
+    _ref1$showAgentMentio = _ref1.showAgentMentionsLabsLozenge,
+    showAgentMentionsLabsLozenge = _ref1$showAgentMentio === void 0 ? false : _ref1$showAgentMentio,
+    profilecardProvider = _ref1.profilecardProvider;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var sessionId = uuid();
   var firstQueryWithoutResults = null;
@@ -415,18 +436,18 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
       }
       return null;
     },
-    getItems: function getItems(_ref1) {
+    getItems: function getItems(_ref10) {
       var _api$contextIdentifie, _api$contextIdentifie2;
-      var query = _ref1.query,
-        editorState = _ref1.editorState;
+      var query = _ref10.query,
+        editorState = _ref10.editorState;
       lastTypeAheadQuery = query || '';
       var pluginState = getMentionPluginState(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
       var mentionProvider = pluginState.mentionProvider;
-      var _ref10 = (_api$contextIdentifie = api === null || api === void 0 || (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {},
-        contextIdentifierProvider = _ref10.contextIdentifierProvider;
+      var _ref11 = (_api$contextIdentifie = api === null || api === void 0 || (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {},
+        contextIdentifierProvider = _ref11.contextIdentifierProvider;
       return new Promise(function (resolve, reject) {
         // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
         var key = "loadingMentionsForTypeAhead_".concat(uuid());
@@ -461,8 +482,8 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
         }));
       });
     },
-    getSections: function getSections(_ref11) {
-      var intl = _ref11.intl;
+    getSections: function getSections(_ref12) {
+      var intl = _ref12.intl;
       if (!enableAgentSectioning) {
         return [];
       }
@@ -507,12 +528,12 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
       lastTypeAheadQuery = '';
       _hasFiredInviteItemViewed = false;
     },
-    selectItem: function selectItem(state, item, insert, _ref12) {
+    selectItem: function selectItem(state, item, insert, _ref13) {
       var _api$contextIdentifie3, _api$contextIdentifie4;
-      var mode = _ref12.mode,
-        stats = _ref12.stats,
-        query = _ref12.query,
-        sourceListItem = _ref12.sourceListItem;
+      var mode = _ref13.mode,
+        stats = _ref13.stats,
+        query = _ref13.query,
+        sourceListItem = _ref13.sourceListItem;
       var schema = state.schema;
 
       // Placeholder isn't selectable. Return `false` (not a transaction) so
@@ -522,6 +543,15 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
       }
       var pluginState = getMentionPluginState(state);
       var mentionProvider = pluginState.mentionProvider;
+      var _ref14 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
+        contextIdentifierProvider = _ref14.contextIdentifierProvider;
+      var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
+        sessionId: sessionId
+      });
+      if (isAgentMentionLoadErrorEnabled(item.mention)) {
+        mentionProvider === null || mentionProvider === void 0 || mentionProvider.filter(query || '', mentionContext);
+        return false;
+      }
       var _item$mention = item.mention,
         id = _item$mention.id,
         name = _item$mention.name,
@@ -529,11 +559,6 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
         accessLevel = _item$mention.accessLevel,
         userType = _item$mention.userType,
         isXProductUser = _item$mention.isXProductUser;
-      var _ref13 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
-        contextIdentifierProvider = _ref13.contextIdentifierProvider;
-      var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
-        sessionId: sessionId
-      });
       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
@@ -657,11 +682,11 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
       }
       return tr;
     },
-    dismiss: function dismiss(_ref14) {
-      var editorState = _ref14.editorState,
-        query = _ref14.query,
-        stats = _ref14.stats,
-        wasItemInserted = _ref14.wasItemInserted;
+    dismiss: function dismiss(_ref15) {
+      var editorState = _ref15.editorState,
+        query = _ref15.query,
+        stats = _ref15.stats,
+        wasItemInserted = _ref15.wasItemInserted;
       firstQueryWithoutResults = null;
       _hasFiredInviteItemViewed = false;
       var pickerElapsedTime = stats.startedAt ? performance.now() - stats.startedAt : 0;
@@ -706,10 +731,10 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
    * so we only attach it when the gate is on — otherwise the proven
    * single-shot `getItems` path continues to drive every consumer.
    */
-  var subscribeToItemsUpdates = function subscribeToItemsUpdates(_ref15) {
+  var subscribeToItemsUpdates = function subscribeToItemsUpdates(_ref16) {
     var _api$contextIdentifie5, _api$contextIdentifie6;
-    var query = _ref15.query,
-      editorState = _ref15.editorState;
+    var query = _ref16.query,
+      editorState = _ref16.editorState;
     lastTypeAheadQuery = query || '';
     var pluginState = getMentionPluginState(editorState);
     if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
@@ -721,8 +746,8 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref0) {
       };
     }
     var mentionProvider = pluginState.mentionProvider;
-    var _ref16 = (_api$contextIdentifie5 = api === null || api === void 0 || (_api$contextIdentifie6 = api.contextIdentifier) === null || _api$contextIdentifie6 === void 0 ? void 0 : _api$contextIdentifie6.sharedState.currentState()) !== null && _api$contextIdentifie5 !== void 0 ? _api$contextIdentifie5 : {},
-      contextIdentifierProvider = _ref16.contextIdentifierProvider;
+    var _ref17 = (_api$contextIdentifie5 = api === null || api === void 0 || (_api$contextIdentifie6 = api.contextIdentifier) === null || _api$contextIdentifie6 === void 0 ? void 0 : _api$contextIdentifie6.sharedState.currentState()) !== null && _api$contextIdentifie5 !== void 0 ? _api$contextIdentifie5 : {},
+      contextIdentifierProvider = _ref17.contextIdentifierProvider;
 
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     var key = "loadingMentionsForTypeAhead_".concat(uuid());

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

@@ -1,6 +1,7 @@
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { AGENT_MENTION_LOAD_ERROR_ID } from '@atlaskit/mention/types';
 import { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 
 // Ignored via go/ees005
@@ -30,13 +31,16 @@ export var isAgentMention = function isAgentMention(mention) {
 
 /**
  * True when the mention is explicitly an agent, not a generic APP/bot.
- * Prefer this over {@link isAgentMention} when ordering the search display
+ * Prefer this over `isAgentMention` when ordering the search display
  * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
  * is a bot unless `appType === 'agent'`.
  */
 export var isExplicitAgentMention = function isExplicitAgentMention(mention) {
   return mention.appType === 'agent' || mention.userType === 'AGENT';
 };
+export var isAgentMentionLoadError = function isAgentMentionLoadError(mention) {
+  return (mention === null || mention === void 0 ? void 0 : mention.id) === AGENT_MENTION_LOAD_ERROR_ID && mention.isPlaceholder === true && mention.placeholderType === 'error' && mention.appType === 'agent';
+};
 
 /**
  * Connect/app bots and teams. Explicit agents are excluded so they can be

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

@@ -0,0 +1,5 @@
+type AgentMentionLoadErrorItemProps = {
+    onRetry: () => void;
+};
+export declare const AgentMentionLoadErrorItem: ({ onRetry, }: AgentMentionLoadErrorItemProps) => JSX.Element;
+export {};

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

@@ -1,4 +1,4 @@
-import type { MentionDescription } from '@atlaskit/mention';
+import { type MentionDescription } from '@atlaskit/mention/types';
 export declare const isTeamType: (userType: any) => boolean;
 export declare const isTeamStats: (stat: any) => boolean;
 export declare const isInviteItem: (mention: MentionDescription) => boolean;
@@ -6,11 +6,14 @@ export declare const isAgentUserType: (userType: string | undefined) => boolean;
 export declare const isAgentMention: (mention: Pick<MentionDescription, 'appType' | 'userType'>) => boolean;
 /**
  * True when the mention is explicitly an agent, not a generic APP/bot.
- * Prefer this over {@link isAgentMention} when ordering the search display
+ * Prefer this over `isAgentMention` when ordering the search display
  * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
  * is a bot unless `appType === 'agent'`.
  */
 export declare const isExplicitAgentMention: (mention: Pick<MentionDescription, 'appType' | 'userType'>) => boolean;
+export declare const isAgentMentionLoadError: (mention: (Partial<Pick<MentionDescription, 'appType' | 'id' | 'isPlaceholder' | 'userType'>> & {
+    placeholderType?: string;
+}) | undefined) => boolean;
 /**
  * Connect/app bots and teams. Explicit agents are excluded so they can be
  * lifted above this group in the hardcoded display order.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "18.3.4",
+	"version": "18.3.6",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,14 +28,14 @@
 		"@atlaskit/editor-plugin-base": "^17.1.0",
 		"@atlaskit/editor-plugin-context-identifier": "^16.0.0",
 		"@atlaskit/editor-plugin-selection": "^16.1.0",
-		"@atlaskit/editor-plugin-type-ahead": "^17.1.0",
+		"@atlaskit/editor-plugin-type-ahead": "^17.2.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
 		"@atlaskit/icon": "^37.6.0",
 		"@atlaskit/insm": "^3.0.0",
 		"@atlaskit/link": "^5.1.0",
 		"@atlaskit/lozenge": "^15.4.0",
-		"@atlaskit/mention": "^27.19.0",
+		"@atlaskit/mention": "^28.0.0",
 		"@atlaskit/node-data-provider": "^17.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
@@ -47,7 +47,7 @@
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/teams-app-config": "^3.1.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^177.0.0",
+		"@atlaskit/tmp-editor-statsig": "^178.0.0",
 		"@atlaskit/tokens": "^16.11.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/user-picker": "^13.12.0",