@atlaskit/editor-plugin-mentions 14.0.0 → 14.1.1

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

@@ -10,14 +10,17 @@ import { MENTION_PROVIDER_REJECTED, MENTION_PROVIDER_UNDEFINED } from '../types'
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
 export const ACTIONS = {
+  COMMIT_PENDING_TYPED_AGENT_MENTION: 'COMMIT_PENDING_TYPED_AGENT_MENTION',
+  SET_PENDING_TYPED_AGENT_MENTION: 'SET_PENDING_TYPED_AGENT_MENTION',
   SET_PROVIDER: 'SET_PROVIDER'
 };
 
 // 'AGENT' is not in the ADF schema UserType enum but is used at runtime.
 const AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
 const AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
+const AGENT_MENTION_INACTIVITY_MS = 3000;
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "13.3.15";
+const PACKAGE_VERSION = "14.1.0";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {
@@ -29,6 +32,89 @@ const setProvider = provider => (state, dispatch) => {
   }
   return true;
 };
+
+/**
+ * Returns true when a transaction represents a local user document edit that
+ * should restart pending agent-mention inactivity tracking.
+ *
+ * Remote/collab updates, replace-document transactions, AI streaming transforms,
+ * selection-only movements, and metadata-only transactions are intentionally ignored.
+ */
+const isQualifyingLocalUserDocChange = tr => {
+  const isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
+  return tr.docChanged && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
+};
+
+/**
+ * Reads agent-mention details from a known document position without traversing
+ * 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) => {
+  var _parentNode$type$name;
+  if (pos < 0 || pos > state.doc.content.size) {
+    return null;
+  }
+  const node = state.doc.nodeAt(pos);
+  const mentionSchema = state.schema.nodes.mention;
+  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
+    return null;
+  }
+  const $mentionPos = state.doc.resolve(pos);
+  const parentNode = $mentionPos.node($mentionPos.depth);
+  return {
+    id: node.attrs.id,
+    context: parentNode.textContent.trim() || null,
+    nodeSize: node.nodeSize,
+    parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
+    pos
+  };
+};
+
+/**
+ * Finds an agent mention that survived a document change when the changed-range
+ * 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 mentionSchema = state.schema.nodes.mention;
+  let result = null;
+  state.doc.descendants((node, pos) => {
+    var _result, _result2;
+    if (((_result = result) === null || _result === void 0 ? void 0 : _result.id) === preferredId) {
+      return false;
+    }
+    if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !node.attrs.id) {
+      return true;
+    }
+    result = getAgentMentionDetailsAtPos(state, pos, attrs => attrs.id === node.attrs.id);
+    return ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.id) !== preferredId;
+  });
+  return result;
+};
+
+/**
+ * Maps a pending typed agent mention through a document-changing transaction and
+ * returns the updated pending state. If the mapped position was deleted or no
+ * longer points at the same local mention, the pending mention is cleared.
+ */
+const getPendingTypedAgentMentionAfterDocChange = (state, tr, pendingTypedAgentMention, {
+  resetTimer
+}) => {
+  const mappedPos = tr.mapping.mapResult(pendingTypedAgentMention.pos, 1);
+  const resetCount = resetTimer ? pendingTypedAgentMention.resetCount + 1 : pendingTypedAgentMention.resetCount;
+  if (mappedPos.deleted) {
+    return null;
+  }
+  const pendingMentionDetails = getAgentMentionDetailsAtPos(state, mappedPos.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+  return pendingMentionDetails ? {
+    id: pendingMentionDetails.id,
+    localId: pendingTypedAgentMention.localId,
+    nodeSize: pendingMentionDetails.nodeSize,
+    pos: pendingMentionDetails.pos,
+    resetCount
+  } : null;
+};
 export function createMentionPlugin({
   pmPluginFactoryParams,
   fireEvent,
@@ -68,32 +154,71 @@ export function createMentionPlugin({
           action: null,
           params: null
         };
-        let hasNewPluginState = false;
+        let hasPublicPluginStateChanged = false;
         let newPluginState = pluginState;
+        const isAgentMentionsExperimentEnabled = editorExperiment('platform_editor_agent_mentions', true);
         const hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
         if (tr.docChanged || tr.selectionSet && hasPositionChanged) {
           newPluginState = {
             ...pluginState,
             canInsertMention: canMentionBeCreatedInRange(newState.selection.from, newState.selection.to)(newState)
           };
-          hasNewPluginState = true;
+          hasPublicPluginStateChanged = true;
         }
         switch (action) {
+          case ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION:
+            {
+              var _newPluginState$lastA;
+              const pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
+              // Ignore stale timer callbacks. The localId and resetCount must still match the
+              // current pending mention so older timers cannot publish after later user edits.
+              if (!isAgentMentionsExperimentEnabled || !pendingTypedAgentMention || pendingTypedAgentMention.localId !== (params === null || params === void 0 ? void 0 : params.localId) || pendingTypedAgentMention.resetCount !== (params === null || params === void 0 ? void 0 : params.resetCount)) {
+                break;
+              }
+              const pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+              if (!pendingMentionDetails) {
+                newPluginState = {
+                  ...newPluginState,
+                  pendingTypedAgentMention: null
+                };
+                break;
+              }
+              newPluginState = {
+                ...newPluginState,
+                pendingTypedAgentMention: null,
+                lastInsertedAgentMentionId: pendingMentionDetails.id,
+                lastInsertedAgentMentionContext: pendingMentionDetails.context,
+                lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
+                lastAgentMentionInsertionCount: ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1
+              };
+              hasPublicPluginStateChanged = true;
+              break;
+            }
           case ACTIONS.SET_PROVIDER:
             newPluginState = {
               ...newPluginState,
               mentionProvider: params.provider
             };
-            hasNewPluginState = true;
+            hasPublicPluginStateChanged = true;
             break;
         }
 
         // When the agent mentions experiment is off, dispatch immediately (original behaviour).
         // When it's on, defer dispatch to after the agent tracking block below so that
         // agent-mention state changes are included in the notification.
-        if (hasNewPluginState && !editorExperiment('platform_editor_agent_mentions', true)) {
+        if (hasPublicPluginStateChanged && !isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
+        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument')) {
+          newPluginState = {
+            ...newPluginState,
+            pendingTypedAgentMention: null,
+            lastInsertedAgentMentionId: null,
+            lastInsertedAgentMentionContext: null,
+            lastInsertedAgentMentionParentNodeType: null
+          };
+          hasPublicPluginStateChanged = true;
+        }
         if (options !== null && options !== void 0 && options.handleMentionsChanged && tr.docChanged) {
           var _insm$session, _insm$session2;
           (_insm$session = insm.session) === null || _insm$session === void 0 ? void 0 : _insm$session.startFeature('mentionDeletionDetection');
@@ -152,7 +277,7 @@ export function createMentionPlugin({
           (_insm$session2 = insm.session) === null || _insm$session2 === void 0 ? void 0 : _insm$session2.endFeature('mentionDeletionDetection');
         }
         const isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
-        if (tr.docChanged && !tr.getMeta('replaceDocument') && !isAIStreaming && editorExperiment('platform_editor_agent_mentions', true)) {
+        if (tr.docChanged && !tr.getMeta('replaceDocument') && !isAIStreaming && isAgentMentionsExperimentEnabled) {
           const mentionSchema = newState.schema.nodes.mention;
           const newDocRanges = [];
           const oldDocRanges = [];
@@ -198,28 +323,36 @@ export function createMentionPlugin({
               oldDocRanges.push(...stepOldRanges);
             }
           });
-          if (stepsTouchMentions || newPluginState.lastInsertedAgentMentionId) {
-            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+          const shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
+          if (shouldResolveAgentMentionState) {
+            var _newPluginState$lastA2, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
             let agentMentionId = null;
             let agentMentionContext = null;
             let agentMentionParentNodeType = null;
             let newCount = 0;
             let oldAgentMentionId = null;
             let oldCount = 0;
+            const pendingTypedAgentMentionDetails = {};
             if (stepsTouchMentions) {
               for (const [from, to] of newDocRanges) {
                 const clampedTo = Math.min(to, newState.doc.content.size);
                 if (from >= clampedTo) continue;
-                newState.doc.nodesBetween(from, clampedTo, (node, _pos, parent) => {
+                newState.doc.nodesBetween(from, clampedTo, (node, pos) => {
                   if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
                     return true;
                   }
                   newCount++;
+                  if (pendingTypedAgentMentionDetails.current === undefined && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
+                    var _getAgentMentionDetai;
+                    pendingTypedAgentMentionDetails.current = (_getAgentMentionDetai = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.localId === params.localId)) !== null && _getAgentMentionDetai !== void 0 ? _getAgentMentionDetai : undefined;
+                  }
                   if (agentMentionId === null && node.attrs.id) {
-                    var _parent$type$name;
-                    agentMentionId = node.attrs.id;
-                    agentMentionParentNodeType = (_parent$type$name = parent === null || parent === void 0 ? void 0 : parent.type.name) !== null && _parent$type$name !== void 0 ? _parent$type$name : null;
-                    agentMentionContext = (parent === null || parent === void 0 ? void 0 : parent.textContent.trim()) || null;
+                    const agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.id === node.attrs.id);
+                    if (agentMentionDetails) {
+                      agentMentionId = agentMentionDetails.id;
+                      agentMentionContext = agentMentionDetails.context;
+                      agentMentionParentNodeType = agentMentionDetails.parentNodeType;
+                    }
                   }
                   return true;
                 });
@@ -243,33 +376,46 @@ export function createMentionPlugin({
             // When a deletion collapses the new-doc range to a zero-width point, or when
             // the doc changed but no step covered the tracked mention, the new-doc scan
             // above finds nothing. Check whether any agent mention survived in the document.
-            let resolvedFromSurvivor = false;
+            let resolvedFromFullDocFallback = false;
             if (agentMentionId === null && newPluginState.lastInsertedAgentMentionId) {
-              const prevId = newPluginState.lastInsertedAgentMentionId;
-              let survivorId = null;
-              let survivorContext = null;
-              let survivorParentNodeType = null;
-              newState.doc.descendants((node, _pos, parent) => {
-                if (survivorId === prevId) return false;
-                if (node.type === mentionSchema && AGENT_USER_TYPES.has(node.attrs.userType)) {
-                  var _parent$type$name2;
-                  // Prefer the previously tracked ID; otherwise keep the first found.
-                  survivorId = node.attrs.id;
-                  survivorParentNodeType = (_parent$type$name2 = parent === null || parent === void 0 ? void 0 : parent.type.name) !== null && _parent$type$name2 !== void 0 ? _parent$type$name2 : null;
-                  survivorContext = (parent === null || parent === void 0 ? void 0 : parent.textContent.trim()) || null;
-                }
-                return survivorId !== prevId;
-              });
-              if (survivorId !== null) {
-                agentMentionId = survivorId;
-                agentMentionContext = survivorContext;
-                agentMentionParentNodeType = survivorParentNodeType;
-                resolvedFromSurvivor = true;
+              const survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId);
+              if (survivorDetails) {
+                agentMentionId = survivorDetails.id;
+                agentMentionContext = survivorDetails.context;
+                agentMentionParentNodeType = survivorDetails.parentNodeType;
+                resolvedFromFullDocFallback = true;
               }
             }
-            const isNewInsertion = agentMentionId !== null && !resolvedFromSurvivor && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
-            const newInsertionCount = isNewInsertion ? ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1 : undefined;
-            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) {
+            const isNewInsertion = agentMentionId !== null && !resolvedFromFullDocFallback && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
+            const isPendingTypedAgentMentionInsertion = isNewInsertion && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && typeof (params === null || params === void 0 ? void 0 : params.localId) === 'string';
+            const newInsertionCount = isNewInsertion ? ((_newPluginState$lastA2 = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA2 !== void 0 ? _newPluginState$lastA2 : 0) + 1 : undefined;
+            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetails.current) {
+              const pendingTypedAgentMentionLocalId = params === null || params === void 0 ? void 0 : params.localId;
+              newPluginState = {
+                ...newPluginState,
+                pendingTypedAgentMention: {
+                  id: pendingTypedAgentMentionDetails.current.id,
+                  localId: pendingTypedAgentMentionLocalId,
+                  nodeSize: pendingTypedAgentMentionDetails.current.nodeSize,
+                  pos: pendingTypedAgentMentionDetails.current.pos,
+                  resetCount: 1
+                }
+              };
+            } else if (isPendingTypedAgentMentionInsertion) {
+              // Fallback: if the localId-specific scan missed the typed mention,
+              // publish immediately so the insertion is not dropped.
+              newPluginState = {
+                ...newPluginState,
+                pendingTypedAgentMention: null,
+                lastInsertedAgentMentionId: agentMentionId,
+                lastInsertedAgentMentionContext: agentMentionContext,
+                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) {
               newPluginState = {
                 ...newPluginState,
                 lastInsertedAgentMentionId: agentMentionId,
@@ -279,11 +425,19 @@ export function createMentionPlugin({
                   lastAgentMentionInsertionCount: newInsertionCount
                 } : {})
               };
-              hasNewPluginState = true;
+              hasPublicPluginStateChanged = true;
             }
           }
         }
-        if (hasNewPluginState && editorExperiment('platform_editor_agent_mentions', true)) {
+        if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && tr.docChanged) {
+          newPluginState = {
+            ...newPluginState,
+            pendingTypedAgentMention: getPendingTypedAgentMentionAfterDocChange(newState, tr, newPluginState.pendingTypedAgentMention, {
+              resetTimer: isQualifyingLocalUserDocChange(tr)
+            })
+          };
+        }
+        if (hasPublicPluginStateChanged && isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
         return newPluginState;
@@ -301,6 +455,47 @@ export function createMentionPlugin({
       }
     },
     view(editorView) {
+      const isAgentMentionsEnabled = editorExperiment('platform_editor_agent_mentions', true);
+      let pendingTypedAgentMentionTimer;
+      let pendingTypedAgentMentionTimerKey = null;
+      const clearPendingTypedAgentMentionTimer = () => {
+        if (pendingTypedAgentMentionTimer) {
+          clearTimeout(pendingTypedAgentMentionTimer);
+          pendingTypedAgentMentionTimer = undefined;
+        }
+        pendingTypedAgentMentionTimerKey = null;
+      };
+      const schedulePendingTypedAgentMentionTimer = mentionPluginState => {
+        if (!isAgentMentionsEnabled) {
+          clearPendingTypedAgentMentionTimer();
+          return;
+        }
+        const pendingTypedAgentMention = mentionPluginState === null || mentionPluginState === void 0 ? void 0 : mentionPluginState.pendingTypedAgentMention;
+        if (!pendingTypedAgentMention) {
+          clearPendingTypedAgentMentionTimer();
+          return;
+        }
+        const timerKey = `${pendingTypedAgentMention.localId}:${pendingTypedAgentMention.resetCount}`;
+        if (timerKey === pendingTypedAgentMentionTimerKey) {
+          return;
+        }
+        clearPendingTypedAgentMentionTimer();
+        pendingTypedAgentMentionTimerKey = timerKey;
+        pendingTypedAgentMentionTimer = setTimeout(() => {
+          var _mentionPluginKey$get;
+          const latestPendingTypedAgentMention = (_mentionPluginKey$get = mentionPluginKey.getState(editorView.state)) === null || _mentionPluginKey$get === void 0 ? void 0 : _mentionPluginKey$get.pendingTypedAgentMention;
+          if (!latestPendingTypedAgentMention || latestPendingTypedAgentMention.localId !== pendingTypedAgentMention.localId || latestPendingTypedAgentMention.resetCount !== pendingTypedAgentMention.resetCount) {
+            return;
+          }
+          editorView.dispatch(editorView.state.tr.setMeta(mentionPluginKey, {
+            action: ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION,
+            params: {
+              localId: pendingTypedAgentMention.localId,
+              resetCount: pendingTypedAgentMention.resetCount
+            }
+          }));
+        }, AGENT_MENTION_INACTIVITY_MS);
+      };
       const providerHandler = (name, providerPromise) => {
         switch (name) {
           case 'mentionProvider':
@@ -346,7 +541,15 @@ export function createMentionPlugin({
         pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
       }
       return {
+        update(view, prevState) {
+          const mentionPluginState = mentionPluginKey.getState(view.state);
+          if (mentionPluginState === mentionPluginKey.getState(prevState)) {
+            return;
+          }
+          schedulePendingTypedAgentMentionTimer(mentionPluginState);
+        },
         destroy() {
+          clearPendingTypedAgentMentionTimer();
           if (pmPluginFactoryParams.providerFactory) {
             pmPluginFactoryParams.providerFactory.unsubscribe('mentionProvider', providerHandler);
           }

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

@@ -12,6 +12,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { createSingleMentionFragment } from '../../editor-commands';
+import { mentionPluginKey } from '../../pm-plugins/key';
+import { ACTIONS } from '../../pm-plugins/main';
 import { mentionPlaceholderPluginKey, MENTION_PLACEHOLDER_ACTIONS } from '../../pm-plugins/mentionPlaceholder';
 import { getMentionPluginState } from '../../pm-plugins/utils';
 import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
@@ -362,10 +364,10 @@ export const createTypeAheadConfig = ({
         sessionId
       };
       const isAgentMentionsExperimentEnabled = expVal('platform_editor_agent_mentions', 'isEnabled', false);
-      const shouldSuppressInviteForAgentMention = isAgentMentionsExperimentEnabled && isAgentMention(item.mention);
+      const isAgentMentionInsertion = isAgentMentionsExperimentEnabled && isAgentMention(item.mention);
       // userType can be missing for provider-only agent mentions. Copy/paste cannot
       // see appType, so persist APP only when there is no explicit userType.
-      const persistedUserType = isAgentMentionsExperimentEnabled && isAgentMention(item.mention) && userType == null ? 'APP' : userType;
+      const persistedUserType = isAgentMentionInsertion && userType == null ? 'APP' : userType;
       if (mentionProvider && !isInviteItem(item.mention)) {
         mentionProvider.recordMentionSelection(item.mention, mentionContext);
       }
@@ -424,7 +426,7 @@ export const createTypeAheadConfig = ({
           localId: mentionLocalId,
           method: 'typed',
           type: 'added',
-          ...(shouldSuppressInviteForAgentMention ? {
+          ...(isAgentMentionInsertion ? {
             shouldSuppressMentionNotification: true
           } : {})
         };
@@ -437,22 +439,22 @@ export const createTypeAheadConfig = ({
           handleMentionsChanged([mentionChange]);
         }
       }
-      fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(x => x.mention), query, contextIdentifierProvider, taskListId, taskItemId, shouldSuppressInviteForAgentMention));
+      fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(x => x.mention), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionInsertion));
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       sessionId = uuid();
       if (mentionProvider && isTeamType(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
-      if (!shouldSuppressInviteForAgentMention && isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+      if (!isAgentMentionInsertion && isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
         mentionProvider.inviteXProductUser(id, name);
       }
-      return insert(createSingleMentionFragment({
+      const tr = insert(createSingleMentionFragment({
         mentionProvider,
         mentionInsertDisplayName,
         tr: state.tr,
         sanitizePrivateContent,
-        suppressInviteXProductUser: shouldSuppressInviteForAgentMention
+        suppressInviteXProductUser: isAgentMentionInsertion
       })({
         name,
         id,
@@ -462,6 +464,15 @@ export const createTypeAheadConfig = ({
         accessLevel,
         isXProductUser
       }));
+      if (isAgentMentionInsertion) {
+        tr.setMeta(mentionPluginKey, {
+          action: ACTIONS.SET_PENDING_TYPED_AGENT_MENTION,
+          params: {
+            localId: mentionLocalId
+          }
+        });
+      }
+      return tr;
     },
     dismiss({
       editorState,