@atlaskit/editor-plugin-mentions 14.5.10 → 14.5.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-mentions
 
+## 14.5.11
+
+### Patch Changes
+
+- [`48dd7ce8c1cb2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/48dd7ce8c1cb2) -
+  EDITOR-7322 - fix mention pill getting overwritten with aaid
+- Updated dependencies
+
 ## 14.5.10
 
 ### Patch Changes

package/dist/cjs/nodeviews/mentionNodeView.js

@@ -23,11 +23,36 @@ var _profileCardRenderer2 = require("./profileCardRenderer");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var primitiveClassName = 'editor-mention-primitive';
-// @ts-ignore - TS1501 TypeScript 5.9.2 upgrade
+// eslint-disable-next-line require-unicode-regexp
 var AT_PREFIX_REGEX = /^@/;
 var getAccessibilityLabelFromName = function getAccessibilityLabelFromName(name) {
   return name.replace(AT_PREFIX_REGEX, '');
 };
+
+// Workaround: AI-rewritten pages may store the raw AAID (e.g. '@712020:uuid') in attrs.text for
+// APP/AGENT mentions instead of the display name. Detect this so we can fall through to provider
+// resolution. Pattern: '@digits:uuid' — distinct from plain-UUID human AAIDs (no numeric prefix).
+var AAID_MENTION_TEXT_PATTERN =
+// eslint-disable-next-line require-unicode-regexp
+/^@\d+:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/** Returns true if `text` looks like a raw AAID rather than a display name. */
+var isMentionTextAnAaid = function isMentionTextAnAaid(text) {
+  return AAID_MENTION_TEXT_PATTERN.test(text);
+};
+var isAgentMentionsExperimentEnabled = function isAgentMentionsExperimentEnabled() {
+  return (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false);
+};
+
+/**
+ * Returns true if the node is an APP/AGENT mention whose stored text is a raw
+ * AAID (e.g. '@712020:uuid') rather than a resolved display name.
+ * All AAID-workaround guards should go through this helper so the checks stay
+ * consistent and can't drift apart.
+ */
+var isAgentAaidText = function isAgentAaidText(node, isAgentMentionsEnabled) {
+  return isAgentMentionsEnabled && (node.attrs.userType === 'APP' || node.attrs.userType === 'AGENT') && !!node.attrs.text && isMentionTextAnAaid(node.attrs.text);
+};
 var toDOM = function toDOM(node) {
   // packages/elements/mention/src/components/Mention/index.tsx
   var mentionAttrs = {
@@ -45,12 +70,14 @@ var toDOM = function toDOM(node) {
       'data-local-id': node.attrs.localId
     });
   }
-  if ((0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) && node.attrs.userType) {
+  var isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
+  if (isAgentMentionsEnabled && node.attrs.userType) {
     mentionAttrs = _objectSpread(_objectSpread({}, mentionAttrs), {}, {
       'data-user-type': node.attrs.userType
     });
   }
   var browser = (0, _browser.getBrowserInfo)();
+  var hasAgentAaidText = isAgentAaidText(node, isAgentMentionsEnabled);
   return ['span', mentionAttrs, ['span', {
     class: 'zeroWidthSpaceContainer'
   }, ['span', {
@@ -58,7 +85,7 @@ var toDOM = function toDOM(node) {
   }, _whitespace.ZERO_WIDTH_SPACE]], ['span', {
     spellcheck: 'false',
     class: primitiveClassName
-  }, node.attrs.text || '@…'], browser.android ? ['span', {
+  }, node.attrs.text && !hasAgentAaidText ? node.attrs.text : '@…'], browser.android ? ['span', {
     class: 'zeroWidthSpaceContainer',
     contenteditable: 'false'
   }, ['span', {
@@ -71,12 +98,14 @@ var processName = function processName(name) {
   return name.status === _resource.MentionNameStatus.OK ? "@".concat(name.name || '') : "@_|unknown|_";
 };
 var handleProviderName = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(mentionProvider, node) {
-    var nameDetail, resolvedNameDetail;
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(mentionProvider, node, isAgentMentionsEnabled) {
+    var textIsAaid, nameDetail, resolvedNameDetail;
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!((0, _resource.isResolvingMentionProvider)(mentionProvider) && node.attrs.id && !node.attrs.text)) {
+          // Also resolve when text is a raw AAID — provider will return the real display name.
+          textIsAaid = isAgentAaidText(node, isAgentMentionsEnabled);
+          if (!((0, _resource.isResolvingMentionProvider)(mentionProvider) && node.attrs.id && (!node.attrs.text || textIsAaid))) {
             _context.next = 2;
             break;
           }
@@ -92,7 +121,7 @@ var handleProviderName = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function handleProviderName(_x, _x2) {
+  return function handleProviderName(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -147,7 +176,8 @@ var MentionNodeView = exports.MentionNodeView = /*#__PURE__*/function () {
       updateNode = _profileCardRenderer.updateNode;
     // Accessibility attributes - based on `packages/people-and-teams/profilecard/src/components/User/ProfileCardTrigger.tsx`
     if (this.domElement && options !== null && options !== void 0 && options.profilecardProvider) {
-      if (node.attrs.text) {
+      var isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
+      if (node.attrs.text && !isAgentAaidText(node, isAgentMentionsEnabled)) {
         this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(node.attrs.text));
       }
       this.domElement.setAttribute('aria-expanded', 'false');
@@ -252,8 +282,10 @@ var MentionNodeView = exports.MentionNodeView = /*#__PURE__*/function () {
     }
   }, {
     key: "setTextContent",
-    value: function setTextContent(name) {
-      if (name && !this.node.attrs.text && this.mentionPrimitiveElement) {
+    value: function setTextContent(name, isAgentMentionsEnabled) {
+      // Also overwrite when text is a raw AAID so the resolved name takes precedence.
+      var textIsAaid = isAgentAaidText(this.node, isAgentMentionsEnabled);
+      if (name && (!this.node.attrs.text || textIsAaid) && this.mentionPrimitiveElement) {
         this.mentionPrimitiveElement.textContent = name;
       }
     }
@@ -278,10 +310,11 @@ var MentionNodeView = exports.MentionNodeView = /*#__PURE__*/function () {
     value: function () {
       var _updateState = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(mentionProvider) {
         var _mentionProvider$shou2, _this$config$options2;
-        var isHighlighted, disabledState, isDisabled, newState, disabledTooltip, name;
+        var isAgentMentionsEnabled, isHighlighted, disabledState, isDisabled, newState, disabledTooltip, name, text;
         return _regenerator.default.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
               isHighlighted = (0, _expValEquals.expValEquals)('platform_editor_vc90_transition_mentions', 'isEnabled', true) ? this.shouldHighlightMention(mentionProvider) : (_mentionProvider$shou2 = mentionProvider === null || mentionProvider === void 0 ? void 0 : mentionProvider.shouldHighlightMention({
                 id: this.node.attrs.id
               })) !== null && _mentionProvider$shou2 !== void 0 ? _mentionProvider$shou2 : false;
@@ -298,15 +331,18 @@ var MentionNodeView = exports.MentionNodeView = /*#__PURE__*/function () {
               // the chip is already disabled.
               this.syncDisabledTooltip(disabledState);
               _context2.next = 1;
-              return handleProviderName(mentionProvider, this.node);
+              return handleProviderName(mentionProvider, this.node, isAgentMentionsEnabled);
             case 1:
               name = _context2.sent;
-              this.setTextContent(name);
+              this.setTextContent(name, isAgentMentionsEnabled);
               // Only overwrite the disabled-state aria-label with the name-based one
               // when the chip is NOT disabled; otherwise the disabled reason set in
               // `setClassList` would be silently clobbered, regressing a11y.
-              if (name && this.domElement && (_this$config$options2 = this.config.options) !== null && _this$config$options2 !== void 0 && _this$config$options2.profilecardProvider && newState !== 'disabled') {
-                this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(name));
+              if (this.domElement && (_this$config$options2 = this.config.options) !== null && _this$config$options2 !== void 0 && _this$config$options2.profilecardProvider && newState !== 'disabled') {
+                text = name !== null && name !== void 0 ? name : this.node.attrs.text;
+                if (text && !isAgentAaidText(this.node, isAgentMentionsEnabled)) {
+                  this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(text));
+                }
               }
             case 2:
             case "end":
@@ -314,7 +350,7 @@ var MentionNodeView = exports.MentionNodeView = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function updateState(_x3) {
+      function updateState(_x4) {
         return _updateState.apply(this, arguments);
       }
       return updateState;

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

@@ -52,7 +52,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.5.9";
+var PACKAGE_VERSION = "14.5.10";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/es2019/nodeviews/mentionNodeView.js

@@ -9,9 +9,28 @@ import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { disabledTooltipRenderer } from './disabledTooltipRenderer';
 import { profileCardRenderer } from './profileCardRenderer';
 const primitiveClassName = 'editor-mention-primitive';
-// @ts-ignore - TS1501 TypeScript 5.9.2 upgrade
-const AT_PREFIX_REGEX = /^@/u;
+// eslint-disable-next-line require-unicode-regexp
+const AT_PREFIX_REGEX = /^@/;
 const getAccessibilityLabelFromName = name => name.replace(AT_PREFIX_REGEX, '');
+
+// Workaround: AI-rewritten pages may store the raw AAID (e.g. '@712020:uuid') in attrs.text for
+// APP/AGENT mentions instead of the display name. Detect this so we can fall through to provider
+// resolution. Pattern: '@digits:uuid' — distinct from plain-UUID human AAIDs (no numeric prefix).
+const AAID_MENTION_TEXT_PATTERN =
+// eslint-disable-next-line require-unicode-regexp
+/^@\d+:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/** Returns true if `text` looks like a raw AAID rather than a display name. */
+const isMentionTextAnAaid = text => AAID_MENTION_TEXT_PATTERN.test(text);
+const isAgentMentionsExperimentEnabled = () => expVal('platform_editor_agent_mentions', 'isEnabled', false);
+
+/**
+ * Returns true if the node is an APP/AGENT mention whose stored text is a raw
+ * AAID (e.g. '@712020:uuid') rather than a resolved display name.
+ * All AAID-workaround guards should go through this helper so the checks stay
+ * consistent and can't drift apart.
+ */
+const isAgentAaidText = (node, isAgentMentionsEnabled) => isAgentMentionsEnabled && (node.attrs.userType === 'APP' || node.attrs.userType === 'AGENT') && !!node.attrs.text && isMentionTextAnAaid(node.attrs.text);
 const toDOM = node => {
   // packages/elements/mention/src/components/Mention/index.tsx
   let mentionAttrs = {
@@ -30,13 +49,15 @@ const toDOM = node => {
       'data-local-id': node.attrs.localId
     };
   }
-  if (expVal('platform_editor_agent_mentions', 'isEnabled', false) && node.attrs.userType) {
+  const isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
+  if (isAgentMentionsEnabled && node.attrs.userType) {
     mentionAttrs = {
       ...mentionAttrs,
       'data-user-type': node.attrs.userType
     };
   }
   const browser = getBrowserInfo();
+  const hasAgentAaidText = isAgentAaidText(node, isAgentMentionsEnabled);
   return ['span', mentionAttrs, ['span', {
     class: 'zeroWidthSpaceContainer'
   }, ['span', {
@@ -44,7 +65,7 @@ const toDOM = node => {
   }, ZERO_WIDTH_SPACE]], ['span', {
     spellcheck: 'false',
     class: primitiveClassName
-  }, node.attrs.text || '@…'], browser.android ? ['span', {
+  }, node.attrs.text && !hasAgentAaidText ? node.attrs.text : '@…'], browser.android ? ['span', {
     class: 'zeroWidthSpaceContainer',
     contenteditable: 'false'
   }, ['span', {
@@ -56,8 +77,10 @@ const toDOM = node => {
 const processName = name => {
   return name.status === MentionNameStatus.OK ? `@${name.name || ''}` : `@_|unknown|_`;
 };
-const handleProviderName = async (mentionProvider, node) => {
-  if (isResolvingMentionProvider(mentionProvider) && node.attrs.id && !node.attrs.text) {
+const handleProviderName = async (mentionProvider, node, isAgentMentionsEnabled) => {
+  // Also resolve when text is a raw AAID — provider will return the real display name.
+  const textIsAaid = isAgentAaidText(node, isAgentMentionsEnabled);
+  if (isResolvingMentionProvider(mentionProvider) && node.attrs.id && (!node.attrs.text || textIsAaid)) {
     const nameDetail = mentionProvider === null || mentionProvider === void 0 ? void 0 : mentionProvider.resolveMentionName(node.attrs.id);
     const resolvedNameDetail = await nameDetail;
     return processName(resolvedNameDetail);
@@ -117,7 +140,8 @@ export class MentionNodeView {
     });
     // Accessibility attributes - based on `packages/people-and-teams/profilecard/src/components/User/ProfileCardTrigger.tsx`
     if (this.domElement && options !== null && options !== void 0 && options.profilecardProvider) {
-      if (node.attrs.text) {
+      const isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
+      if (node.attrs.text && !isAgentAaidText(node, isAgentMentionsEnabled)) {
         this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(node.attrs.text));
       }
       this.domElement.setAttribute('aria-expanded', 'false');
@@ -213,8 +237,10 @@ export class MentionNodeView {
       this.disabledTooltip = undefined;
     }
   }
-  setTextContent(name) {
-    if (name && !this.node.attrs.text && this.mentionPrimitiveElement) {
+  setTextContent(name, isAgentMentionsEnabled) {
+    // Also overwrite when text is a raw AAID so the resolved name takes precedence.
+    const textIsAaid = isAgentAaidText(this.node, isAgentMentionsEnabled);
+    if (name && (!this.node.attrs.text || textIsAaid) && this.mentionPrimitiveElement) {
       this.mentionPrimitiveElement.textContent = name;
     }
   }
@@ -235,6 +261,7 @@ export class MentionNodeView {
   }
   async updateState(mentionProvider) {
     var _mentionProvider$shou2, _this$config$options2;
+    const isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
     const isHighlighted = expValEquals('platform_editor_vc90_transition_mentions', 'isEnabled', true) ? this.shouldHighlightMention(mentionProvider) : (_mentionProvider$shou2 = mentionProvider === null || mentionProvider === void 0 ? void 0 : mentionProvider.shouldHighlightMention({
       id: this.node.attrs.id
     })) !== null && _mentionProvider$shou2 !== void 0 ? _mentionProvider$shou2 : false;
@@ -251,13 +278,16 @@ export class MentionNodeView {
     // the tooltip text stays in sync if the disabled reason changes while
     // the chip is already disabled.
     this.syncDisabledTooltip(disabledState);
-    const name = await handleProviderName(mentionProvider, this.node);
-    this.setTextContent(name);
+    const name = await handleProviderName(mentionProvider, this.node, isAgentMentionsEnabled);
+    this.setTextContent(name, isAgentMentionsEnabled);
     // Only overwrite the disabled-state aria-label with the name-based one
     // when the chip is NOT disabled; otherwise the disabled reason set in
     // `setClassList` would be silently clobbered, regressing a11y.
-    if (name && this.domElement && (_this$config$options2 = this.config.options) !== null && _this$config$options2 !== void 0 && _this$config$options2.profilecardProvider && newState !== 'disabled') {
-      this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(name));
+    if (this.domElement && (_this$config$options2 = this.config.options) !== null && _this$config$options2 !== void 0 && _this$config$options2.profilecardProvider && newState !== 'disabled') {
+      const text = name !== null && name !== void 0 ? name : this.node.attrs.text;
+      if (text && !isAgentAaidText(this.node, isAgentMentionsEnabled)) {
+        this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(text));
+      }
     }
   }
   nodeIsEqual(nextNode) {

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

@@ -37,7 +37,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.5.9";
+const PACKAGE_VERSION = "14.5.10";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/esm/nodeviews/mentionNodeView.js

@@ -16,11 +16,36 @@ import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { disabledTooltipRenderer } from './disabledTooltipRenderer';
 import { profileCardRenderer } from './profileCardRenderer';
 var primitiveClassName = 'editor-mention-primitive';
-// @ts-ignore - TS1501 TypeScript 5.9.2 upgrade
+// eslint-disable-next-line require-unicode-regexp
 var AT_PREFIX_REGEX = /^@/;
 var getAccessibilityLabelFromName = function getAccessibilityLabelFromName(name) {
   return name.replace(AT_PREFIX_REGEX, '');
 };
+
+// Workaround: AI-rewritten pages may store the raw AAID (e.g. '@712020:uuid') in attrs.text for
+// APP/AGENT mentions instead of the display name. Detect this so we can fall through to provider
+// resolution. Pattern: '@digits:uuid' — distinct from plain-UUID human AAIDs (no numeric prefix).
+var AAID_MENTION_TEXT_PATTERN =
+// eslint-disable-next-line require-unicode-regexp
+/^@\d+:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/** Returns true if `text` looks like a raw AAID rather than a display name. */
+var isMentionTextAnAaid = function isMentionTextAnAaid(text) {
+  return AAID_MENTION_TEXT_PATTERN.test(text);
+};
+var isAgentMentionsExperimentEnabled = function isAgentMentionsExperimentEnabled() {
+  return expVal('platform_editor_agent_mentions', 'isEnabled', false);
+};
+
+/**
+ * Returns true if the node is an APP/AGENT mention whose stored text is a raw
+ * AAID (e.g. '@712020:uuid') rather than a resolved display name.
+ * All AAID-workaround guards should go through this helper so the checks stay
+ * consistent and can't drift apart.
+ */
+var isAgentAaidText = function isAgentAaidText(node, isAgentMentionsEnabled) {
+  return isAgentMentionsEnabled && (node.attrs.userType === 'APP' || node.attrs.userType === 'AGENT') && !!node.attrs.text && isMentionTextAnAaid(node.attrs.text);
+};
 var toDOM = function toDOM(node) {
   // packages/elements/mention/src/components/Mention/index.tsx
   var mentionAttrs = {
@@ -38,12 +63,14 @@ var toDOM = function toDOM(node) {
       'data-local-id': node.attrs.localId
     });
   }
-  if (expVal('platform_editor_agent_mentions', 'isEnabled', false) && node.attrs.userType) {
+  var isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
+  if (isAgentMentionsEnabled && node.attrs.userType) {
     mentionAttrs = _objectSpread(_objectSpread({}, mentionAttrs), {}, {
       'data-user-type': node.attrs.userType
     });
   }
   var browser = getBrowserInfo();
+  var hasAgentAaidText = isAgentAaidText(node, isAgentMentionsEnabled);
   return ['span', mentionAttrs, ['span', {
     class: 'zeroWidthSpaceContainer'
   }, ['span', {
@@ -51,7 +78,7 @@ var toDOM = function toDOM(node) {
   }, ZERO_WIDTH_SPACE]], ['span', {
     spellcheck: 'false',
     class: primitiveClassName
-  }, node.attrs.text || '@…'], browser.android ? ['span', {
+  }, node.attrs.text && !hasAgentAaidText ? node.attrs.text : '@…'], browser.android ? ['span', {
     class: 'zeroWidthSpaceContainer',
     contenteditable: 'false'
   }, ['span', {
@@ -64,12 +91,14 @@ var processName = function processName(name) {
   return name.status === MentionNameStatus.OK ? "@".concat(name.name || '') : "@_|unknown|_";
 };
 var handleProviderName = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(mentionProvider, node) {
-    var nameDetail, resolvedNameDetail;
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(mentionProvider, node, isAgentMentionsEnabled) {
+    var textIsAaid, nameDetail, resolvedNameDetail;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(isResolvingMentionProvider(mentionProvider) && node.attrs.id && !node.attrs.text)) {
+          // Also resolve when text is a raw AAID — provider will return the real display name.
+          textIsAaid = isAgentAaidText(node, isAgentMentionsEnabled);
+          if (!(isResolvingMentionProvider(mentionProvider) && node.attrs.id && (!node.attrs.text || textIsAaid))) {
             _context.next = 2;
             break;
           }
@@ -85,7 +114,7 @@ var handleProviderName = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function handleProviderName(_x, _x2) {
+  return function handleProviderName(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -140,7 +169,8 @@ export var MentionNodeView = /*#__PURE__*/function () {
       updateNode = _profileCardRenderer.updateNode;
     // Accessibility attributes - based on `packages/people-and-teams/profilecard/src/components/User/ProfileCardTrigger.tsx`
     if (this.domElement && options !== null && options !== void 0 && options.profilecardProvider) {
-      if (node.attrs.text) {
+      var isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
+      if (node.attrs.text && !isAgentAaidText(node, isAgentMentionsEnabled)) {
         this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(node.attrs.text));
       }
       this.domElement.setAttribute('aria-expanded', 'false');
@@ -245,8 +275,10 @@ export var MentionNodeView = /*#__PURE__*/function () {
     }
   }, {
     key: "setTextContent",
-    value: function setTextContent(name) {
-      if (name && !this.node.attrs.text && this.mentionPrimitiveElement) {
+    value: function setTextContent(name, isAgentMentionsEnabled) {
+      // Also overwrite when text is a raw AAID so the resolved name takes precedence.
+      var textIsAaid = isAgentAaidText(this.node, isAgentMentionsEnabled);
+      if (name && (!this.node.attrs.text || textIsAaid) && this.mentionPrimitiveElement) {
         this.mentionPrimitiveElement.textContent = name;
       }
     }
@@ -271,10 +303,11 @@ export var MentionNodeView = /*#__PURE__*/function () {
     value: function () {
       var _updateState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(mentionProvider) {
         var _mentionProvider$shou2, _this$config$options2;
-        var isHighlighted, disabledState, isDisabled, newState, disabledTooltip, name;
+        var isAgentMentionsEnabled, isHighlighted, disabledState, isDisabled, newState, disabledTooltip, name, text;
         return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              isAgentMentionsEnabled = isAgentMentionsExperimentEnabled();
               isHighlighted = expValEquals('platform_editor_vc90_transition_mentions', 'isEnabled', true) ? this.shouldHighlightMention(mentionProvider) : (_mentionProvider$shou2 = mentionProvider === null || mentionProvider === void 0 ? void 0 : mentionProvider.shouldHighlightMention({
                 id: this.node.attrs.id
               })) !== null && _mentionProvider$shou2 !== void 0 ? _mentionProvider$shou2 : false;
@@ -291,15 +324,18 @@ export var MentionNodeView = /*#__PURE__*/function () {
               // the chip is already disabled.
               this.syncDisabledTooltip(disabledState);
               _context2.next = 1;
-              return handleProviderName(mentionProvider, this.node);
+              return handleProviderName(mentionProvider, this.node, isAgentMentionsEnabled);
             case 1:
               name = _context2.sent;
-              this.setTextContent(name);
+              this.setTextContent(name, isAgentMentionsEnabled);
               // Only overwrite the disabled-state aria-label with the name-based one
               // when the chip is NOT disabled; otherwise the disabled reason set in
               // `setClassList` would be silently clobbered, regressing a11y.
-              if (name && this.domElement && (_this$config$options2 = this.config.options) !== null && _this$config$options2 !== void 0 && _this$config$options2.profilecardProvider && newState !== 'disabled') {
-                this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(name));
+              if (this.domElement && (_this$config$options2 = this.config.options) !== null && _this$config$options2 !== void 0 && _this$config$options2.profilecardProvider && newState !== 'disabled') {
+                text = name !== null && name !== void 0 ? name : this.node.attrs.text;
+                if (text && !isAgentAaidText(this.node, isAgentMentionsEnabled)) {
+                  this.domElement.setAttribute('aria-label', getAccessibilityLabelFromName(text));
+                }
               }
             case 2:
             case "end":
@@ -307,7 +343,7 @@ export var MentionNodeView = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function updateState(_x3) {
+      function updateState(_x4) {
         return _updateState.apply(this, arguments);
       }
       return updateState;

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

@@ -44,7 +44,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.5.9";
+var PACKAGE_VERSION = "14.5.10";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.5.10",
+	"version": "14.5.11",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,10 +38,10 @@
 		"@atlaskit/popper": "^8.2.0",
 		"@atlaskit/portal": "^6.1.0",
 		"@atlaskit/primitives": "^20.3.0",
-		"@atlaskit/profilecard": "^26.5.0",
+		"@atlaskit/profilecard": "^26.8.0",
 		"@atlaskit/teams-app-config": "^2.1.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tmp-editor-statsig": "^120.0.0",
+		"@atlaskit/tmp-editor-statsig": "^120.1.0",
 		"@atlaskit/tokens": "^15.3.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.20.0",
+		"@atlaskit/editor-common": "^116.21.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"