@atlaskit/editor-plugin-mentions 14.4.1 → 14.4.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-mentions
 
+## 14.4.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.4.2
+
+### Patch Changes
+
+- [`484e372703a0e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/484e372703a0e) -
+  [ux] EDITOR-7822: add agent name to nudge
+- Updated dependencies
+
 ## 14.4.1
 
 ### Patch Changes

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

@@ -36,10 +36,21 @@ var AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
 var isAgentUserType = function isAgentUserType(userType) {
   return typeof userType === 'string' && AGENT_USER_TYPES.has(userType);
 };
+var getAgentMentionName = function getAgentMentionName(text, fallbackName) {
+  var trimmedFallbackName = typeof fallbackName === 'string' ? fallbackName.trim() : '';
+  var normalizedFallbackName = (trimmedFallbackName.startsWith('@') ? trimmedFallbackName.slice(1).trim() : trimmedFallbackName) || null;
+  if (typeof text !== 'string') {
+    return normalizedFallbackName;
+  }
+  var trimmedText = text.trim();
+  var displayName = trimmedText.startsWith('@') ? trimmedText.slice(1).trim() : trimmedText;
+  var normalizedName = displayName || normalizedFallbackName;
+  return normalizedName;
+};
 var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.4.0";
+var PACKAGE_VERSION = "14.4.2";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -79,7 +90,7 @@ var isLocalSelectionChange = function isLocalSelectionChange(tr, hasPositionChan
  * the document. Callers pass a matcher so mapped positions are only accepted
  * when they still point at the same pending/tracked mention.
  */
-var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, pos, matchesMention) {
+var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, pos, matchesMention, fallbackName) {
   var _parentNode$type$name;
   if (pos < 0 || pos > state.doc.content.size) {
     return null;
@@ -94,6 +105,7 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   return {
     id: node.attrs.id,
     context: parentNode.textContent.trim() || null,
+    name: getAgentMentionName(node.attrs.text, fallbackName),
     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,
@@ -107,7 +119,7 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
  * scan did not find one. Prefers the previously tracked mention ID when present;
  * otherwise returns a surviving agent mention using the existing traversal order.
  */
-var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(state, preferredId) {
+var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(state, preferredId, preferredName) {
   var mentionSchema = state.schema.nodes.mention;
   var result = null;
   state.doc.descendants(function (node, pos) {
@@ -120,7 +132,7 @@ var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(s
     }
     result = getAgentMentionDetailsAtPos(state, pos, function (attrs) {
       return attrs.id === node.attrs.id;
-    });
+    }, node.attrs.id === preferredId ? preferredName : undefined);
     return ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.id) !== preferredId;
   });
   return result;
@@ -140,10 +152,11 @@ var getPendingTypedAgentMentionAfterDocChange = function getPendingTypedAgentMen
   }
   var pendingMentionDetails = getAgentMentionDetailsAtPos(state, mappedPos.pos, function (attrs) {
     return attrs.localId === pendingTypedAgentMention.localId;
-  });
+  }, pendingTypedAgentMention.name);
   return pendingMentionDetails ? {
     id: pendingMentionDetails.id,
     localId: pendingTypedAgentMention.localId,
+    name: pendingMentionDetails.name,
     nodeSize: pendingMentionDetails.nodeSize,
     pos: pendingMentionDetails.pos,
     resetCount: resetCount
@@ -180,6 +193,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
       pendingTypedAgentMention: null,
       lastInsertedAgentMentionId: pendingMentionDetails.id,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
+      lastInsertedAgentMentionName: pendingMentionDetails.name,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     })
@@ -194,7 +208,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
 var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(state, pluginState, pendingTypedAgentMention) {
   var pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, function (attrs) {
     return attrs.localId === pendingTypedAgentMention.localId;
-  });
+  }, pendingTypedAgentMention.name);
   if (!pendingMentionDetails) {
     return {
       hasPublicPluginStateChanged: false,
@@ -206,7 +220,7 @@ var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(sta
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
 var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
-  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 };
 
 /**
@@ -219,6 +233,7 @@ var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(plugi
     pendingTypedAgentMention: null,
     lastInsertedAgentMentionId: null,
     lastInsertedAgentMentionContext: null,
+    lastInsertedAgentMentionName: null,
     lastInsertedAgentMentionParentNodeType: null
   });
 };
@@ -403,9 +418,10 @@ function createMentionPlugin(_ref2) {
           });
           var shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
           if (shouldResolveAgentMentionState) {
-            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3, _newPluginState$lastI4;
             var agentMentionId = null;
             var agentMentionContext = null;
+            var agentMentionName = null;
             var agentMentionParentNodeType = null;
             var newCount = 0;
             var oldAgentMentionId = null;
@@ -429,15 +445,16 @@ function createMentionPlugin(_ref2) {
                     if (pendingTypedAgentMentionDetails === null && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
                       pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
                         return attrs.localId === params.localId;
-                      });
+                      }, params.name);
                     }
                     if (agentMentionId === null && node.attrs.id) {
                       var agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
                         return attrs.id === node.attrs.id;
-                      });
+                      }, params === null || params === void 0 ? void 0 : params.name);
                       if (agentMentionDetails) {
                         agentMentionId = agentMentionDetails.id;
                         agentMentionContext = agentMentionDetails.context;
+                        agentMentionName = agentMentionDetails.name;
                         agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                       }
                     }
@@ -481,10 +498,11 @@ function createMentionPlugin(_ref2) {
             // above finds nothing. Check whether any agent mention survived in the document.
             var resolvedFromFullDocFallback = false;
             if (agentMentionId === null && newPluginState.lastInsertedAgentMentionId) {
-              var survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId);
+              var survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId, newPluginState.lastInsertedAgentMentionName);
               if (survivorDetails) {
                 agentMentionId = survivorDetails.id;
                 agentMentionContext = survivorDetails.context;
+                agentMentionName = survivorDetails.name;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -499,6 +517,7 @@ function createMentionPlugin(_ref2) {
                 pendingTypedAgentMention: {
                   id: pendingTypedAgentMentionDetailsForState.id,
                   localId: pendingTypedAgentMentionLocalId,
+                  name: pendingTypedAgentMentionDetailsForState.name,
                   nodeSize: pendingTypedAgentMentionDetailsForState.nodeSize,
                   pos: pendingTypedAgentMentionDetailsForState.pos,
                   resetCount: 1
@@ -511,15 +530,17 @@ function createMentionPlugin(_ref2) {
                 pendingTypedAgentMention: null,
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
+                lastInsertedAgentMentionName: agentMentionName,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
               } : {});
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI !== void 0 ? _newPluginState$lastI : null) || agentMentionContext !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI !== void 0 ? _newPluginState$lastI : null) || agentMentionContext !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionName !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || newInsertionCount !== undefined) {
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
+                lastInsertedAgentMentionName: agentMentionName,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
@@ -549,7 +570,7 @@ function createMentionPlugin(_ref2) {
           var _pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
           var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, _pendingTypedAgentMention.pos, function (attrs) {
             return attrs.localId === _pendingTypedAgentMention.localId;
-          });
+          }, _pendingTypedAgentMention.name);
           if (!pendingMentionDetails) {
             newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
               pendingTypedAgentMention: null

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

@@ -529,7 +529,8 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         tr.setMeta(_key.mentionPluginKey, {
           action: _main.ACTIONS.SET_PENDING_TYPED_AGENT_MENTION,
           params: {
-            localId: mentionLocalId
+            localId: mentionLocalId,
+            name: name
           }
         });
       }

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

@@ -21,10 +21,21 @@ const AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
 const isAgentUserType = userType => {
   return typeof userType === 'string' && AGENT_USER_TYPES.has(userType);
 };
+const getAgentMentionName = (text, fallbackName) => {
+  const trimmedFallbackName = typeof fallbackName === 'string' ? fallbackName.trim() : '';
+  const normalizedFallbackName = (trimmedFallbackName.startsWith('@') ? trimmedFallbackName.slice(1).trim() : trimmedFallbackName) || null;
+  if (typeof text !== 'string') {
+    return normalizedFallbackName;
+  }
+  const trimmedText = text.trim();
+  const displayName = trimmedText.startsWith('@') ? trimmedText.slice(1).trim() : trimmedText;
+  const normalizedName = displayName || normalizedFallbackName;
+  return normalizedName;
+};
 const AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 const AGENT_MENTION_INACTIVITY_MS = 3000;
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "14.4.0";
+const PACKAGE_VERSION = "14.4.2";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {
@@ -62,7 +73,7 @@ const isLocalSelectionChange = (tr, hasPositionChanged) => {
  * the document. Callers pass a matcher so mapped positions are only accepted
  * when they still point at the same pending/tracked mention.
  */
-const getAgentMentionDetailsAtPos = (state, pos, matchesMention) => {
+const getAgentMentionDetailsAtPos = (state, pos, matchesMention, fallbackName) => {
   var _parentNode$type$name;
   if (pos < 0 || pos > state.doc.content.size) {
     return null;
@@ -77,6 +88,7 @@ const getAgentMentionDetailsAtPos = (state, pos, matchesMention) => {
   return {
     id: node.attrs.id,
     context: parentNode.textContent.trim() || null,
+    name: getAgentMentionName(node.attrs.text, fallbackName),
     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,
@@ -90,7 +102,7 @@ const getAgentMentionDetailsAtPos = (state, pos, matchesMention) => {
  * scan did not find one. Prefers the previously tracked mention ID when present;
  * otherwise returns a surviving agent mention using the existing traversal order.
  */
-const getSurvivingAgentMentionDetails = (state, preferredId) => {
+const getSurvivingAgentMentionDetails = (state, preferredId, preferredName) => {
   const mentionSchema = state.schema.nodes.mention;
   let result = null;
   state.doc.descendants((node, pos) => {
@@ -101,7 +113,7 @@ const getSurvivingAgentMentionDetails = (state, preferredId) => {
     if (node.type !== mentionSchema || !isAgentUserType(node.attrs.userType) || !node.attrs.id) {
       return true;
     }
-    result = getAgentMentionDetailsAtPos(state, pos, attrs => attrs.id === node.attrs.id);
+    result = getAgentMentionDetailsAtPos(state, pos, attrs => attrs.id === node.attrs.id, node.attrs.id === preferredId ? preferredName : undefined);
     return ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.id) !== preferredId;
   });
   return result;
@@ -120,10 +132,11 @@ const getPendingTypedAgentMentionAfterDocChange = (state, tr, pendingTypedAgentM
   if (mappedPos.deleted) {
     return null;
   }
-  const pendingMentionDetails = getAgentMentionDetailsAtPos(state, mappedPos.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+  const pendingMentionDetails = getAgentMentionDetailsAtPos(state, mappedPos.pos, attrs => attrs.localId === pendingTypedAgentMention.localId, pendingTypedAgentMention.name);
   return pendingMentionDetails ? {
     id: pendingMentionDetails.id,
     localId: pendingTypedAgentMention.localId,
+    name: pendingMentionDetails.name,
     nodeSize: pendingMentionDetails.nodeSize,
     pos: pendingMentionDetails.pos,
     resetCount
@@ -159,6 +172,7 @@ const commitResolvedPendingTypedAgentMention = (pluginState, pendingMentionDetai
       pendingTypedAgentMention: null,
       lastInsertedAgentMentionId: pendingMentionDetails.id,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
+      lastInsertedAgentMentionName: pendingMentionDetails.name,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     }
@@ -171,7 +185,7 @@ const commitResolvedPendingTypedAgentMention = (pluginState, pendingMentionDetai
  * public update.
  */
 const commitPendingTypedAgentMention = (state, pluginState, pendingTypedAgentMention) => {
-  const pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+  const pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId, pendingTypedAgentMention.name);
   if (!pendingMentionDetails) {
     return {
       hasPublicPluginStateChanged: false,
@@ -183,20 +197,23 @@ const commitPendingTypedAgentMention = (state, pluginState, pendingTypedAgentMen
   }
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
-const hasTrackedAgentMentionState = pluginState => Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+const hasTrackedAgentMentionState = pluginState => Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 
 /**
  * Clears agent mention state that points at a specific document snapshot.
  * replaceDocument swaps content wholesale, so pending typed mentions and
  * lastInserted* details from the previous document must be cleared together.
  */
-const clearTrackedAgentMentionState = pluginState => ({
-  ...pluginState,
-  pendingTypedAgentMention: null,
-  lastInsertedAgentMentionId: null,
-  lastInsertedAgentMentionContext: null,
-  lastInsertedAgentMentionParentNodeType: null
-});
+const clearTrackedAgentMentionState = pluginState => {
+  return {
+    ...pluginState,
+    pendingTypedAgentMention: null,
+    lastInsertedAgentMentionId: null,
+    lastInsertedAgentMentionContext: null,
+    lastInsertedAgentMentionName: null,
+    lastInsertedAgentMentionParentNodeType: null
+  };
+};
 export function createMentionPlugin({
   pmPluginFactoryParams,
   fireEvent,
@@ -381,9 +398,10 @@ export function createMentionPlugin({
           });
           const shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
           if (shouldResolveAgentMentionState) {
-            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3, _newPluginState$lastI4;
             let agentMentionId = null;
             let agentMentionContext = null;
+            let agentMentionName = null;
             let agentMentionParentNodeType = null;
             let newCount = 0;
             let oldAgentMentionId = null;
@@ -399,13 +417,14 @@ export function createMentionPlugin({
                   }
                   newCount++;
                   if (pendingTypedAgentMentionDetails === null && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
-                    pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.localId === params.localId);
+                    pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.localId === params.localId, params.name);
                   }
                   if (agentMentionId === null && node.attrs.id) {
-                    const agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.id === node.attrs.id);
+                    const agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.id === node.attrs.id, params === null || params === void 0 ? void 0 : params.name);
                     if (agentMentionDetails) {
                       agentMentionId = agentMentionDetails.id;
                       agentMentionContext = agentMentionDetails.context;
+                      agentMentionName = agentMentionDetails.name;
                       agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                     }
                   }
@@ -433,10 +452,11 @@ export function createMentionPlugin({
             // above finds nothing. Check whether any agent mention survived in the document.
             let resolvedFromFullDocFallback = false;
             if (agentMentionId === null && newPluginState.lastInsertedAgentMentionId) {
-              const survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId);
+              const survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId, newPluginState.lastInsertedAgentMentionName);
               if (survivorDetails) {
                 agentMentionId = survivorDetails.id;
                 agentMentionContext = survivorDetails.context;
+                agentMentionName = survivorDetails.name;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -452,6 +472,7 @@ export function createMentionPlugin({
                 pendingTypedAgentMention: {
                   id: pendingTypedAgentMentionDetailsForState.id,
                   localId: pendingTypedAgentMentionLocalId,
+                  name: pendingTypedAgentMentionDetailsForState.name,
                   nodeSize: pendingTypedAgentMentionDetailsForState.nodeSize,
                   pos: pendingTypedAgentMentionDetailsForState.pos,
                   resetCount: 1
@@ -465,17 +486,19 @@ export function createMentionPlugin({
                 pendingTypedAgentMention: null,
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
+                lastInsertedAgentMentionName: agentMentionName,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType,
                 ...(newInsertionCount !== undefined ? {
                   lastAgentMentionInsertionCount: newInsertionCount
                 } : {})
               };
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI !== void 0 ? _newPluginState$lastI : null) || agentMentionContext !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI !== void 0 ? _newPluginState$lastI : null) || agentMentionContext !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionName !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || newInsertionCount !== undefined) {
               newPluginState = {
                 ...newPluginState,
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
+                lastInsertedAgentMentionName: agentMentionName,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType,
                 ...(newInsertionCount !== undefined ? {
                   lastAgentMentionInsertionCount: newInsertionCount
@@ -505,7 +528,7 @@ export function createMentionPlugin({
         const shouldCheckPendingTypedAgentMentionParent = isLocalSelectionChange(tr, hasPositionChanged);
         if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && shouldCheckPendingTypedAgentMentionParent) {
           const pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
-          const pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+          const pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId, pendingTypedAgentMention.name);
           if (!pendingMentionDetails) {
             newPluginState = {
               ...newPluginState,

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

@@ -514,7 +514,8 @@ export const createTypeAheadConfig = ({
         tr.setMeta(mentionPluginKey, {
           action: ACTIONS.SET_PENDING_TYPED_AGENT_MENTION,
           params: {
-            localId: mentionLocalId
+            localId: mentionLocalId,
+            name
           }
         });
       }

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

@@ -28,10 +28,21 @@ var AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
 var isAgentUserType = function isAgentUserType(userType) {
   return typeof userType === 'string' && AGENT_USER_TYPES.has(userType);
 };
+var getAgentMentionName = function getAgentMentionName(text, fallbackName) {
+  var trimmedFallbackName = typeof fallbackName === 'string' ? fallbackName.trim() : '';
+  var normalizedFallbackName = (trimmedFallbackName.startsWith('@') ? trimmedFallbackName.slice(1).trim() : trimmedFallbackName) || null;
+  if (typeof text !== 'string') {
+    return normalizedFallbackName;
+  }
+  var trimmedText = text.trim();
+  var displayName = trimmedText.startsWith('@') ? trimmedText.slice(1).trim() : trimmedText;
+  var normalizedName = displayName || normalizedFallbackName;
+  return normalizedName;
+};
 var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.4.0";
+var PACKAGE_VERSION = "14.4.2";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -71,7 +82,7 @@ var isLocalSelectionChange = function isLocalSelectionChange(tr, hasPositionChan
  * the document. Callers pass a matcher so mapped positions are only accepted
  * when they still point at the same pending/tracked mention.
  */
-var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, pos, matchesMention) {
+var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, pos, matchesMention, fallbackName) {
   var _parentNode$type$name;
   if (pos < 0 || pos > state.doc.content.size) {
     return null;
@@ -86,6 +97,7 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   return {
     id: node.attrs.id,
     context: parentNode.textContent.trim() || null,
+    name: getAgentMentionName(node.attrs.text, fallbackName),
     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,
@@ -99,7 +111,7 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
  * scan did not find one. Prefers the previously tracked mention ID when present;
  * otherwise returns a surviving agent mention using the existing traversal order.
  */
-var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(state, preferredId) {
+var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(state, preferredId, preferredName) {
   var mentionSchema = state.schema.nodes.mention;
   var result = null;
   state.doc.descendants(function (node, pos) {
@@ -112,7 +124,7 @@ var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(s
     }
     result = getAgentMentionDetailsAtPos(state, pos, function (attrs) {
       return attrs.id === node.attrs.id;
-    });
+    }, node.attrs.id === preferredId ? preferredName : undefined);
     return ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.id) !== preferredId;
   });
   return result;
@@ -132,10 +144,11 @@ var getPendingTypedAgentMentionAfterDocChange = function getPendingTypedAgentMen
   }
   var pendingMentionDetails = getAgentMentionDetailsAtPos(state, mappedPos.pos, function (attrs) {
     return attrs.localId === pendingTypedAgentMention.localId;
-  });
+  }, pendingTypedAgentMention.name);
   return pendingMentionDetails ? {
     id: pendingMentionDetails.id,
     localId: pendingTypedAgentMention.localId,
+    name: pendingMentionDetails.name,
     nodeSize: pendingMentionDetails.nodeSize,
     pos: pendingMentionDetails.pos,
     resetCount: resetCount
@@ -172,6 +185,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
       pendingTypedAgentMention: null,
       lastInsertedAgentMentionId: pendingMentionDetails.id,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
+      lastInsertedAgentMentionName: pendingMentionDetails.name,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     })
@@ -186,7 +200,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
 var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(state, pluginState, pendingTypedAgentMention) {
   var pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, function (attrs) {
     return attrs.localId === pendingTypedAgentMention.localId;
-  });
+  }, pendingTypedAgentMention.name);
   if (!pendingMentionDetails) {
     return {
       hasPublicPluginStateChanged: false,
@@ -198,7 +212,7 @@ var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(sta
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
 var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
-  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 };
 
 /**
@@ -211,6 +225,7 @@ var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(plugi
     pendingTypedAgentMention: null,
     lastInsertedAgentMentionId: null,
     lastInsertedAgentMentionContext: null,
+    lastInsertedAgentMentionName: null,
     lastInsertedAgentMentionParentNodeType: null
   });
 };
@@ -395,9 +410,10 @@ export function createMentionPlugin(_ref2) {
           });
           var shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
           if (shouldResolveAgentMentionState) {
-            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3, _newPluginState$lastI4;
             var agentMentionId = null;
             var agentMentionContext = null;
+            var agentMentionName = null;
             var agentMentionParentNodeType = null;
             var newCount = 0;
             var oldAgentMentionId = null;
@@ -421,15 +437,16 @@ export function createMentionPlugin(_ref2) {
                     if (pendingTypedAgentMentionDetails === null && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
                       pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
                         return attrs.localId === params.localId;
-                      });
+                      }, params.name);
                     }
                     if (agentMentionId === null && node.attrs.id) {
                       var agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
                         return attrs.id === node.attrs.id;
-                      });
+                      }, params === null || params === void 0 ? void 0 : params.name);
                       if (agentMentionDetails) {
                         agentMentionId = agentMentionDetails.id;
                         agentMentionContext = agentMentionDetails.context;
+                        agentMentionName = agentMentionDetails.name;
                         agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                       }
                     }
@@ -473,10 +490,11 @@ export function createMentionPlugin(_ref2) {
             // above finds nothing. Check whether any agent mention survived in the document.
             var resolvedFromFullDocFallback = false;
             if (agentMentionId === null && newPluginState.lastInsertedAgentMentionId) {
-              var survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId);
+              var survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId, newPluginState.lastInsertedAgentMentionName);
               if (survivorDetails) {
                 agentMentionId = survivorDetails.id;
                 agentMentionContext = survivorDetails.context;
+                agentMentionName = survivorDetails.name;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -491,6 +509,7 @@ export function createMentionPlugin(_ref2) {
                 pendingTypedAgentMention: {
                   id: pendingTypedAgentMentionDetailsForState.id,
                   localId: pendingTypedAgentMentionLocalId,
+                  name: pendingTypedAgentMentionDetailsForState.name,
                   nodeSize: pendingTypedAgentMentionDetailsForState.nodeSize,
                   pos: pendingTypedAgentMentionDetailsForState.pos,
                   resetCount: 1
@@ -503,15 +522,17 @@ export function createMentionPlugin(_ref2) {
                 pendingTypedAgentMention: null,
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
+                lastInsertedAgentMentionName: agentMentionName,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
               } : {});
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI !== void 0 ? _newPluginState$lastI : null) || agentMentionContext !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI !== void 0 ? _newPluginState$lastI : null) || agentMentionContext !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionName !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || newInsertionCount !== undefined) {
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
+                lastInsertedAgentMentionName: agentMentionName,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
@@ -541,7 +562,7 @@ export function createMentionPlugin(_ref2) {
           var _pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
           var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, _pendingTypedAgentMention.pos, function (attrs) {
             return attrs.localId === _pendingTypedAgentMention.localId;
-          });
+          }, _pendingTypedAgentMention.name);
           if (!pendingMentionDetails) {
             newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
               pendingTypedAgentMention: null

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

@@ -520,7 +520,8 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref8) {
         tr.setMeta(mentionPluginKey, {
           action: ACTIONS.SET_PENDING_TYPED_AGENT_MENTION,
           params: {
-            localId: mentionLocalId
+            localId: mentionLocalId,
+            name: name
           }
         });
       }

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

@@ -46,6 +46,7 @@ export type MentionPluginOptions = MentionsPluginOptions;
 export type AgentMentionDetails = {
     context: string | null;
     id: string;
+    name: string | null;
     nodeSize: number;
     /**
      * @internal ProseMirror position used for parent-boundary checks.
@@ -75,6 +76,11 @@ export type MentionPluginState = {
      * Null when no agent mention is present in the document.
      */
     lastInsertedAgentMentionId?: string | null;
+    /**
+     * Display name of the most recently inserted agent mention.
+     * Derived from the mention node text and used for Rovo nudge copy.
+     */
+    lastInsertedAgentMentionName?: string | null;
     /**
      * ProseMirror node type of the direct parent of the agent mention
      * (e.g. 'taskItem', 'paragraph'). Determines auto-send vs. draft behaviour.
@@ -90,6 +96,7 @@ export type MentionPluginState = {
     pendingTypedAgentMention?: {
         id: string;
         localId: string;
+        name: string | null;
         nodeSize: number;
         pos: number;
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.4.1",
+	"version": "14.4.3",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,13 +35,13 @@
 		"@atlaskit/lozenge": "^14.0.0",
 		"@atlaskit/mention": "^27.2.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/popper": "^8.0.0",
+		"@atlaskit/popper": "^8.1.0",
 		"@atlaskit/portal": "^6.0.0",
 		"@atlaskit/primitives": "^20.0.0",
-		"@atlaskit/profilecard": "^26.1.0",
+		"@atlaskit/profilecard": "^26.2.0",
 		"@atlaskit/teams-app-config": "^2.0.0",
 		"@atlaskit/theme": "^26.0.0",
-		"@atlaskit/tmp-editor-statsig": "^111.0.0",
+		"@atlaskit/tmp-editor-statsig": "^112.0.0",
 		"@atlaskit/tokens": "^15.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@atlaskit/user-picker": "^13.2.0",
@@ -53,7 +53,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.11.0",
+		"@atlaskit/editor-common": "^116.12.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"