@atlaskit/editor-plugin-mentions 14.5.9 → 14.5.11

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @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
+
+- [`1448830a87645`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1448830a87645) -
+  Preserve ADF-backed editor agent mention prompt context through Rovo chat drafts and sends.
+- Updated dependencies
+
 ## 14.5.9
 
 ### 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/agent-mention-context.js

@@ -0,0 +1,87 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAgentMentionParentContext = void 0;
+var PASS_THROUGH_PROMPT_INLINE_NODE_TYPES = new Set(['hardBreak', 'inlineCard', 'mention', 'text']);
+var isAgentMention = function isAgentMention(node) {
+  var _node$attrs;
+  return node.type === 'mention' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.userType) === 'APP';
+};
+var isAllowedAgentMention = function isAllowedAgentMention(node, agentMentionLocalId) {
+  var _node$attrs2;
+  return !isAgentMention(node) || ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) === agentMentionLocalId;
+};
+var getStatusText = function getStatusText(node) {
+  var _node$attrs3;
+  var text = (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.text;
+  return typeof text === 'string' && text ? text : null;
+};
+var getDateText = function getDateText(node) {
+  var _node$attrs4;
+  var timestamp = (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.timestamp;
+  if (typeof timestamp !== 'string' || !timestamp) {
+    return null;
+  }
+  var date = new Date(Number(timestamp));
+  if (Number.isNaN(date.getTime())) {
+    return null;
+  }
+  return date.toISOString().slice(0, 10);
+};
+var toPromptInlineNode = function toPromptInlineNode(node, agentMentionLocalId) {
+  if (!isAllowedAgentMention(node, agentMentionLocalId)) {
+    return null;
+  }
+  if (PASS_THROUGH_PROMPT_INLINE_NODE_TYPES.has(node.type)) {
+    return node;
+  }
+  if (node.type === 'status') {
+    var text = getStatusText(node);
+    return text ? {
+      type: 'text',
+      text: text
+    } : null;
+  }
+  if (node.type === 'date') {
+    var _text = getDateText(node);
+    return _text ? {
+      type: 'text',
+      text: _text
+    } : null;
+  }
+  return null;
+};
+
+/**
+ * Returns the direct parent content of an inserted agent mention as prompt ADF.
+ *
+ * The chat input supports only a subset of editor inline ADF, so this keeps prompt content
+ * intentionally narrow:
+ * - `text`, `inlineCard`, and `hardBreak` pass through unchanged.
+ * - people mentions pass through unchanged.
+ * - only the invoked agent mention is kept, identified by `localId`; other agent mentions are dropped.
+ * - `status` becomes its label text.
+ * - `date` becomes ISO date text.
+ * - everything else is dropped.
+ *
+ * This only reads direct parent content. It does not recursively pull content out of nested or
+ * unsupported nodes.
+ */
+var getAgentMentionParentContext = exports.getAgentMentionParentContext = function getAgentMentionParentContext(parentNode, agentMentionLocalId) {
+  var _parentAdf$content;
+  var parentAdf = parentNode.toJSON();
+  var supportedInlineContent = ((_parentAdf$content = parentAdf.content) !== null && _parentAdf$content !== void 0 ? _parentAdf$content : []).flatMap(function (node) {
+    var promptNode = toPromptInlineNode(node, agentMentionLocalId);
+    return promptNode ? [promptNode] : [];
+  });
+  return {
+    type: 'doc',
+    version: 1,
+    content: [{
+      type: 'paragraph',
+      content: supportedInlineContent
+    }]
+  };
+};

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

@@ -17,6 +17,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mentionNodeView = require("../nodeviews/mentionNodeView");
 var _types2 = require("../types");
+var _agentMentionContext = require("./agent-mention-context");
 var _key = require("./key");
 var _utils = require("./utils");
 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; } } }; }
@@ -51,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.8";
+var PACKAGE_VERSION = "14.5.10";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -103,11 +104,14 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   }
   var $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   var parentNode = $mentionPos.node($mentionPos.depth);
+  var id = node.attrs.id;
+  var name = getAgentMentionName(node.attrs.text, fallbackName);
   return {
-    id: node.attrs.id,
+    id: id,
     localId: node.attrs.localId,
-    context: parentNode.textContent.trim() || null,
-    name: getAgentMentionName(node.attrs.text, fallbackName),
+    context: (0, _agentMentionContext.getAgentMentionParentContext)(parentNode, node.attrs.localId),
+    name: name,
+    prompt: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
     parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
@@ -196,6 +200,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
       lastInsertedAgentMentionLocalId: pendingMentionDetails.localId,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
       lastInsertedAgentMentionName: pendingMentionDetails.name,
+      lastInsertedAgentMentionPrompt: pendingMentionDetails.prompt,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     })
@@ -222,7 +227,7 @@ var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(sta
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
 var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
-  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionPrompt != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 };
 
 /**
@@ -237,6 +242,7 @@ var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(plugi
     lastInsertedAgentMentionLocalId: null,
     lastInsertedAgentMentionContext: null,
     lastInsertedAgentMentionName: null,
+    lastInsertedAgentMentionPrompt: null,
     lastInsertedAgentMentionParentNodeType: null
   });
 };
@@ -426,6 +432,7 @@ function createMentionPlugin(_ref2) {
             var agentMentionLocalId = null;
             var agentMentionContext = null;
             var agentMentionName = null;
+            var agentMentionPrompt = null;
             var agentMentionParentNodeType = null;
             var existingAgentMentionLocalIdsInChangedRanges = new Set();
             var pendingTypedAgentMentionDetails = null;
@@ -457,6 +464,7 @@ function createMentionPlugin(_ref2) {
                         agentMentionLocalId = agentMentionDetails.localId;
                         agentMentionContext = agentMentionDetails.context;
                         agentMentionName = agentMentionDetails.name;
+                        agentMentionPrompt = agentMentionDetails.prompt;
                         agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                       }
                     }
@@ -505,6 +513,7 @@ function createMentionPlugin(_ref2) {
                 agentMentionLocalId = survivorDetails.localId;
                 agentMentionContext = survivorDetails.context;
                 agentMentionName = survivorDetails.name;
+                agentMentionPrompt = survivorDetails.prompt;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -553,17 +562,19 @@ function createMentionPlugin(_ref2) {
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
               } : {});
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionContext !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionName !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionName !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionPrompt !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionPrompt) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount

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/agent-mention-context.js

@@ -0,0 +1,81 @@
+const PASS_THROUGH_PROMPT_INLINE_NODE_TYPES = new Set(['hardBreak', 'inlineCard', 'mention', 'text']);
+const isAgentMention = node => {
+  var _node$attrs;
+  return node.type === 'mention' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.userType) === 'APP';
+};
+const isAllowedAgentMention = (node, agentMentionLocalId) => {
+  var _node$attrs2;
+  return !isAgentMention(node) || ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) === agentMentionLocalId;
+};
+const getStatusText = node => {
+  var _node$attrs3;
+  const text = (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.text;
+  return typeof text === 'string' && text ? text : null;
+};
+const getDateText = node => {
+  var _node$attrs4;
+  const timestamp = (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.timestamp;
+  if (typeof timestamp !== 'string' || !timestamp) {
+    return null;
+  }
+  const date = new Date(Number(timestamp));
+  if (Number.isNaN(date.getTime())) {
+    return null;
+  }
+  return date.toISOString().slice(0, 10);
+};
+const toPromptInlineNode = (node, agentMentionLocalId) => {
+  if (!isAllowedAgentMention(node, agentMentionLocalId)) {
+    return null;
+  }
+  if (PASS_THROUGH_PROMPT_INLINE_NODE_TYPES.has(node.type)) {
+    return node;
+  }
+  if (node.type === 'status') {
+    const text = getStatusText(node);
+    return text ? {
+      type: 'text',
+      text
+    } : null;
+  }
+  if (node.type === 'date') {
+    const text = getDateText(node);
+    return text ? {
+      type: 'text',
+      text
+    } : null;
+  }
+  return null;
+};
+
+/**
+ * Returns the direct parent content of an inserted agent mention as prompt ADF.
+ *
+ * The chat input supports only a subset of editor inline ADF, so this keeps prompt content
+ * intentionally narrow:
+ * - `text`, `inlineCard`, and `hardBreak` pass through unchanged.
+ * - people mentions pass through unchanged.
+ * - only the invoked agent mention is kept, identified by `localId`; other agent mentions are dropped.
+ * - `status` becomes its label text.
+ * - `date` becomes ISO date text.
+ * - everything else is dropped.
+ *
+ * This only reads direct parent content. It does not recursively pull content out of nested or
+ * unsupported nodes.
+ */
+export const getAgentMentionParentContext = (parentNode, agentMentionLocalId) => {
+  var _parentAdf$content;
+  const parentAdf = parentNode.toJSON();
+  const supportedInlineContent = ((_parentAdf$content = parentAdf.content) !== null && _parentAdf$content !== void 0 ? _parentAdf$content : []).flatMap(node => {
+    const promptNode = toPromptInlineNode(node, agentMentionLocalId);
+    return promptNode ? [promptNode] : [];
+  });
+  return {
+    type: 'doc',
+    version: 1,
+    content: [{
+      type: 'paragraph',
+      content: supportedInlineContent
+    }]
+  };
+};

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

@@ -7,6 +7,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { MentionNodeView } from '../nodeviews/mentionNodeView';
 import { MENTION_PROVIDER_REJECTED, MENTION_PROVIDER_UNDEFINED } from '../types';
+import { getAgentMentionParentContext } from './agent-mention-context';
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
 export const ACTIONS = {
@@ -36,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.8";
+const PACKAGE_VERSION = "14.5.10";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {
@@ -86,11 +87,14 @@ const getAgentMentionDetailsAtPos = (state, pos, matchesMention, fallbackName) =
   }
   const $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   const parentNode = $mentionPos.node($mentionPos.depth);
+  const id = node.attrs.id;
+  const name = getAgentMentionName(node.attrs.text, fallbackName);
   return {
-    id: node.attrs.id,
+    id,
     localId: node.attrs.localId,
-    context: parentNode.textContent.trim() || null,
-    name: getAgentMentionName(node.attrs.text, fallbackName),
+    context: getAgentMentionParentContext(parentNode, node.attrs.localId),
+    name,
+    prompt: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
     parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
@@ -175,6 +179,7 @@ const commitResolvedPendingTypedAgentMention = (pluginState, pendingMentionDetai
       lastInsertedAgentMentionLocalId: pendingMentionDetails.localId,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
       lastInsertedAgentMentionName: pendingMentionDetails.name,
+      lastInsertedAgentMentionPrompt: pendingMentionDetails.prompt,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     }
@@ -199,7 +204,7 @@ const commitPendingTypedAgentMention = (state, pluginState, pendingTypedAgentMen
   }
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
-const hasTrackedAgentMentionState = pluginState => Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+const hasTrackedAgentMentionState = pluginState => Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionPrompt != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 
 /**
  * Clears agent mention state that points at a specific document snapshot.
@@ -214,6 +219,7 @@ const clearTrackedAgentMentionState = pluginState => {
     lastInsertedAgentMentionLocalId: null,
     lastInsertedAgentMentionContext: null,
     lastInsertedAgentMentionName: null,
+    lastInsertedAgentMentionPrompt: null,
     lastInsertedAgentMentionParentNodeType: null
   };
 };
@@ -406,6 +412,7 @@ export function createMentionPlugin({
             let agentMentionLocalId = null;
             let agentMentionContext = null;
             let agentMentionName = null;
+            let agentMentionPrompt = null;
             let agentMentionParentNodeType = null;
             const existingAgentMentionLocalIdsInChangedRanges = new Set();
             let pendingTypedAgentMentionDetails = null;
@@ -427,6 +434,7 @@ export function createMentionPlugin({
                       agentMentionLocalId = agentMentionDetails.localId;
                       agentMentionContext = agentMentionDetails.context;
                       agentMentionName = agentMentionDetails.name;
+                      agentMentionPrompt = agentMentionDetails.prompt;
                       agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                     }
                   }
@@ -459,6 +467,7 @@ export function createMentionPlugin({
                 agentMentionLocalId = survivorDetails.localId;
                 agentMentionContext = survivorDetails.context;
                 agentMentionName = survivorDetails.name;
+                agentMentionPrompt = survivorDetails.prompt;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -509,19 +518,21 @@ export function createMentionPlugin({
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType,
                 ...(newInsertionCount !== undefined ? {
                   lastAgentMentionInsertionCount: newInsertionCount
                 } : {})
               };
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionContext !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionName !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionName !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionPrompt !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionPrompt) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
               newPluginState = {
                 ...newPluginState,
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType,
                 ...(newInsertionCount !== undefined ? {
                   lastAgentMentionInsertionCount: newInsertionCount

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/agent-mention-context.js

@@ -0,0 +1,81 @@
+var PASS_THROUGH_PROMPT_INLINE_NODE_TYPES = new Set(['hardBreak', 'inlineCard', 'mention', 'text']);
+var isAgentMention = function isAgentMention(node) {
+  var _node$attrs;
+  return node.type === 'mention' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.userType) === 'APP';
+};
+var isAllowedAgentMention = function isAllowedAgentMention(node, agentMentionLocalId) {
+  var _node$attrs2;
+  return !isAgentMention(node) || ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) === agentMentionLocalId;
+};
+var getStatusText = function getStatusText(node) {
+  var _node$attrs3;
+  var text = (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.text;
+  return typeof text === 'string' && text ? text : null;
+};
+var getDateText = function getDateText(node) {
+  var _node$attrs4;
+  var timestamp = (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.timestamp;
+  if (typeof timestamp !== 'string' || !timestamp) {
+    return null;
+  }
+  var date = new Date(Number(timestamp));
+  if (Number.isNaN(date.getTime())) {
+    return null;
+  }
+  return date.toISOString().slice(0, 10);
+};
+var toPromptInlineNode = function toPromptInlineNode(node, agentMentionLocalId) {
+  if (!isAllowedAgentMention(node, agentMentionLocalId)) {
+    return null;
+  }
+  if (PASS_THROUGH_PROMPT_INLINE_NODE_TYPES.has(node.type)) {
+    return node;
+  }
+  if (node.type === 'status') {
+    var text = getStatusText(node);
+    return text ? {
+      type: 'text',
+      text: text
+    } : null;
+  }
+  if (node.type === 'date') {
+    var _text = getDateText(node);
+    return _text ? {
+      type: 'text',
+      text: _text
+    } : null;
+  }
+  return null;
+};
+
+/**
+ * Returns the direct parent content of an inserted agent mention as prompt ADF.
+ *
+ * The chat input supports only a subset of editor inline ADF, so this keeps prompt content
+ * intentionally narrow:
+ * - `text`, `inlineCard`, and `hardBreak` pass through unchanged.
+ * - people mentions pass through unchanged.
+ * - only the invoked agent mention is kept, identified by `localId`; other agent mentions are dropped.
+ * - `status` becomes its label text.
+ * - `date` becomes ISO date text.
+ * - everything else is dropped.
+ *
+ * This only reads direct parent content. It does not recursively pull content out of nested or
+ * unsupported nodes.
+ */
+export var getAgentMentionParentContext = function getAgentMentionParentContext(parentNode, agentMentionLocalId) {
+  var _parentAdf$content;
+  var parentAdf = parentNode.toJSON();
+  var supportedInlineContent = ((_parentAdf$content = parentAdf.content) !== null && _parentAdf$content !== void 0 ? _parentAdf$content : []).flatMap(function (node) {
+    var promptNode = toPromptInlineNode(node, agentMentionLocalId);
+    return promptNode ? [promptNode] : [];
+  });
+  return {
+    type: 'doc',
+    version: 1,
+    content: [{
+      type: 'paragraph',
+      content: supportedInlineContent
+    }]
+  };
+};

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

@@ -14,6 +14,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { MentionNodeView } from '../nodeviews/mentionNodeView';
 import { MENTION_PROVIDER_REJECTED, MENTION_PROVIDER_UNDEFINED } from '../types';
+import { getAgentMentionParentContext } from './agent-mention-context';
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
 export var ACTIONS = {
@@ -43,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.8";
+var PACKAGE_VERSION = "14.5.10";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -95,11 +96,14 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   }
   var $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   var parentNode = $mentionPos.node($mentionPos.depth);
+  var id = node.attrs.id;
+  var name = getAgentMentionName(node.attrs.text, fallbackName);
   return {
-    id: node.attrs.id,
+    id: id,
     localId: node.attrs.localId,
-    context: parentNode.textContent.trim() || null,
-    name: getAgentMentionName(node.attrs.text, fallbackName),
+    context: getAgentMentionParentContext(parentNode, node.attrs.localId),
+    name: name,
+    prompt: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
     parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
@@ -188,6 +192,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
       lastInsertedAgentMentionLocalId: pendingMentionDetails.localId,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
       lastInsertedAgentMentionName: pendingMentionDetails.name,
+      lastInsertedAgentMentionPrompt: pendingMentionDetails.prompt,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     })
@@ -214,7 +219,7 @@ var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(sta
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
 var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
-  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionPrompt != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 };
 
 /**
@@ -229,6 +234,7 @@ var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(plugi
     lastInsertedAgentMentionLocalId: null,
     lastInsertedAgentMentionContext: null,
     lastInsertedAgentMentionName: null,
+    lastInsertedAgentMentionPrompt: null,
     lastInsertedAgentMentionParentNodeType: null
   });
 };
@@ -418,6 +424,7 @@ export function createMentionPlugin(_ref2) {
             var agentMentionLocalId = null;
             var agentMentionContext = null;
             var agentMentionName = null;
+            var agentMentionPrompt = null;
             var agentMentionParentNodeType = null;
             var existingAgentMentionLocalIdsInChangedRanges = new Set();
             var pendingTypedAgentMentionDetails = null;
@@ -449,6 +456,7 @@ export function createMentionPlugin(_ref2) {
                         agentMentionLocalId = agentMentionDetails.localId;
                         agentMentionContext = agentMentionDetails.context;
                         agentMentionName = agentMentionDetails.name;
+                        agentMentionPrompt = agentMentionDetails.prompt;
                         agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                       }
                     }
@@ -497,6 +505,7 @@ export function createMentionPlugin(_ref2) {
                 agentMentionLocalId = survivorDetails.localId;
                 agentMentionContext = survivorDetails.context;
                 agentMentionName = survivorDetails.name;
+                agentMentionPrompt = survivorDetails.prompt;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -545,17 +554,19 @@ export function createMentionPlugin(_ref2) {
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
               } : {});
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionContext !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionName !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionName !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionPrompt !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionPrompt) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount

package/dist/types/pm-plugins/agent-mention-context.d.ts

@@ -0,0 +1,18 @@
+import type { DocNode } from '@atlaskit/adf-schema';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Returns the direct parent content of an inserted agent mention as prompt ADF.
+ *
+ * The chat input supports only a subset of editor inline ADF, so this keeps prompt content
+ * intentionally narrow:
+ * - `text`, `inlineCard`, and `hardBreak` pass through unchanged.
+ * - people mentions pass through unchanged.
+ * - only the invoked agent mention is kept, identified by `localId`; other agent mentions are dropped.
+ * - `status` becomes its label text.
+ * - `date` becomes ISO date text.
+ * - everything else is dropped.
+ *
+ * This only reads direct parent content. It does not recursively pull content out of nested or
+ * unsupported nodes.
+ */
+export declare const getAgentMentionParentContext: (parentNode: PMNode, agentMentionLocalId?: string | null) => DocNode;

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

@@ -1,3 +1,4 @@
+import type { DocNode } from '@atlaskit/adf-schema';
 import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import type { Providers, ProfilecardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { TypeAheadHandler } from '@atlaskit/editor-common/types';
@@ -44,7 +45,7 @@ export interface MentionsPluginOptions extends MentionPluginConfig {
  */
 export type MentionPluginOptions = MentionsPluginOptions;
 export type AgentMentionDetails = {
-    context: string | null;
+    context: DocNode;
     id: string;
     localId: string;
     name: string | null;
@@ -59,6 +60,7 @@ export type AgentMentionDetails = {
      */
     parentStart: number;
     pos: number;
+    prompt: string | null;
 };
 export type MentionPluginState = {
     canInsertMention?: boolean;
@@ -68,10 +70,10 @@ export type MentionPluginState = {
      */
     lastAgentMentionInsertionCount?: number;
     /**
-     * Plain-text content of the block node containing the agent mention.
+     * Prompt-safe ADF context from the direct parent of the agent mention.
      * Used as a prompt context for Rovo chat.
      */
-    lastInsertedAgentMentionContext?: string | null;
+    lastInsertedAgentMentionContext?: DocNode | null;
     /**
      * The ID of the most recently inserted agent (APP | AGENT userType) mention.
      * Null when no agent mention is present in the document.
@@ -92,6 +94,11 @@ export type MentionPluginState = {
      * (e.g. 'taskItem', 'paragraph'). Determines auto-send vs. draft behaviour.
      */
     lastInsertedAgentMentionParentNodeType?: string | null;
+    /**
+     * Plain-text prompt from the direct parent of the agent mention.
+     * Preserves the pre-ADF fallback behaviour for chat input drafts.
+     */
+    lastInsertedAgentMentionPrompt?: string | null;
     mentionProvider?: MentionProvider;
     mentions?: Array<MentionDescription>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.5.9",
+	"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": "^119.2.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.19.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"