@atlaskit/editor-plugin-mentions 14.0.0 → 14.1.1

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

@@ -17,14 +17,17 @@ import { MENTION_PROVIDER_REJECTED, MENTION_PROVIDER_UNDEFINED } from '../types'
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
 export var 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.
 var AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
 var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
+var AGENT_MENTION_INACTIVITY_MS = 3000;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "13.3.15";
+var PACKAGE_VERSION = "14.1.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -38,11 +41,97 @@ var setProvider = function setProvider(provider) {
     return true;
   };
 };
-export function createMentionPlugin(_ref) {
-  var pmPluginFactoryParams = _ref.pmPluginFactoryParams,
-    fireEvent = _ref.fireEvent,
-    options = _ref.options,
-    api = _ref.api;
+
+/**
+ * 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.
+ */
+var isQualifyingLocalUserDocChange = function isQualifyingLocalUserDocChange(tr) {
+  var 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.
+ */
+var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, pos, matchesMention) {
+  var _parentNode$type$name;
+  if (pos < 0 || pos > state.doc.content.size) {
+    return null;
+  }
+  var node = state.doc.nodeAt(pos);
+  var 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;
+  }
+  var $mentionPos = state.doc.resolve(pos);
+  var 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: 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.
+ */
+var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(state, preferredId) {
+  var mentionSchema = state.schema.nodes.mention;
+  var result = null;
+  state.doc.descendants(function (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, function (attrs) {
+      return 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.
+ */
+var getPendingTypedAgentMentionAfterDocChange = function getPendingTypedAgentMentionAfterDocChange(state, tr, pendingTypedAgentMention, _ref) {
+  var resetTimer = _ref.resetTimer;
+  var mappedPos = tr.mapping.mapResult(pendingTypedAgentMention.pos, 1);
+  var resetCount = resetTimer ? pendingTypedAgentMention.resetCount + 1 : pendingTypedAgentMention.resetCount;
+  if (mappedPos.deleted) {
+    return null;
+  }
+  var pendingMentionDetails = getAgentMentionDetailsAtPos(state, mappedPos.pos, function (attrs) {
+    return attrs.localId === pendingTypedAgentMention.localId;
+  });
+  return pendingMentionDetails ? {
+    id: pendingMentionDetails.id,
+    localId: pendingTypedAgentMention.localId,
+    nodeSize: pendingMentionDetails.nodeSize,
+    pos: pendingMentionDetails.pos,
+    resetCount: resetCount
+  } : null;
+};
+export function createMentionPlugin(_ref2) {
+  var pmPluginFactoryParams = _ref2.pmPluginFactoryParams,
+    fireEvent = _ref2.fireEvent,
+    options = _ref2.options,
+    api = _ref2.api;
   var mentionProvider;
   var sendAnalytics = function sendAnalytics(event, actionSubject, action, attributes) {
     if (event === SLI_EVENT_TYPE || event === SMART_EVENT_TYPE) {
@@ -68,36 +157,74 @@ export function createMentionPlugin(_ref) {
         };
       },
       apply: function apply(tr, pluginState, oldState, newState) {
-        var _ref2 = tr.getMeta(mentionPluginKey) || {
+        var _ref3 = tr.getMeta(mentionPluginKey) || {
             action: null,
             params: null
           },
-          action = _ref2.action,
-          params = _ref2.params;
-        var hasNewPluginState = false;
+          action = _ref3.action,
+          params = _ref3.params;
+        var hasPublicPluginStateChanged = false;
         var newPluginState = pluginState;
+        var isAgentMentionsExperimentEnabled = editorExperiment('platform_editor_agent_mentions', true);
         var hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
         if (tr.docChanged || tr.selectionSet && hasPositionChanged) {
           newPluginState = _objectSpread(_objectSpread({}, 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;
+              var 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;
+              }
+              var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, function (attrs) {
+                return attrs.localId === pendingTypedAgentMention.localId;
+              });
+              if (!pendingMentionDetails) {
+                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                  pendingTypedAgentMention: null
+                });
+                break;
+              }
+              newPluginState = _objectSpread(_objectSpread({}, 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 = _objectSpread(_objectSpread({}, 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 = _objectSpread(_objectSpread({}, 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 || _insm$session.startFeature('mentionDeletionDetection');
@@ -158,7 +285,7 @@ export function createMentionPlugin(_ref) {
           (_insm$session2 = insm.session) === null || _insm$session2 === void 0 || _insm$session2.endFeature('mentionDeletionDetection');
         }
         var 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) {
           var _mentionSchema = newState.schema.nodes.mention;
           var newDocRanges = [];
           var oldDocRanges = [];
@@ -204,14 +331,16 @@ export function createMentionPlugin(_ref) {
               oldDocRanges.push.apply(oldDocRanges, stepOldRanges);
             }
           });
-          if (stepsTouchMentions || newPluginState.lastInsertedAgentMentionId) {
-            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+          var shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
+          if (shouldResolveAgentMentionState) {
+            var _newPluginState$lastA2, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
             var agentMentionId = null;
             var agentMentionContext = null;
             var agentMentionParentNodeType = null;
             var newCount = 0;
             var oldAgentMentionId = null;
             var oldCount = 0;
+            var pendingTypedAgentMentionDetails = {};
             if (stepsTouchMentions) {
               var _iterator = _createForOfIteratorHelper(newDocRanges),
                 _step;
@@ -222,16 +351,26 @@ export function createMentionPlugin(_ref) {
                     to = _step$value[1];
                   var clampedTo = Math.min(to, newState.doc.content.size);
                   if (from >= clampedTo) continue;
-                  newState.doc.nodesBetween(from, clampedTo, function (node, _pos, parent) {
+                  newState.doc.nodesBetween(from, clampedTo, function (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, function (attrs) {
+                        return 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;
+                      var agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
+                        return attrs.id === node.attrs.id;
+                      });
+                      if (agentMentionDetails) {
+                        agentMentionId = agentMentionDetails.id;
+                        agentMentionContext = agentMentionDetails.context;
+                        agentMentionParentNodeType = agentMentionDetails.parentNodeType;
+                      }
                     }
                     return true;
                   });
@@ -271,33 +410,43 @@ export function createMentionPlugin(_ref) {
             // 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.
-            var resolvedFromSurvivor = false;
+            var resolvedFromFullDocFallback = false;
             if (agentMentionId === null && newPluginState.lastInsertedAgentMentionId) {
-              var prevId = newPluginState.lastInsertedAgentMentionId;
-              var survivorId = null;
-              var survivorContext = null;
-              var survivorParentNodeType = null;
-              newState.doc.descendants(function (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;
+              var survivorDetails = getSurvivingAgentMentionDetails(newState, newPluginState.lastInsertedAgentMentionId);
+              if (survivorDetails) {
+                agentMentionId = survivorDetails.id;
+                agentMentionContext = survivorDetails.context;
+                agentMentionParentNodeType = survivorDetails.parentNodeType;
+                resolvedFromFullDocFallback = true;
               }
             }
-            var isNewInsertion = agentMentionId !== null && !resolvedFromSurvivor && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
-            var 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) {
+            var isNewInsertion = agentMentionId !== null && !resolvedFromFullDocFallback && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
+            var isPendingTypedAgentMentionInsertion = isNewInsertion && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && typeof (params === null || params === void 0 ? void 0 : params.localId) === 'string';
+            var newInsertionCount = isNewInsertion ? ((_newPluginState$lastA2 = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA2 !== void 0 ? _newPluginState$lastA2 : 0) + 1 : undefined;
+            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetails.current) {
+              var pendingTypedAgentMentionLocalId = params === null || params === void 0 ? void 0 : params.localId;
+              newPluginState = _objectSpread(_objectSpread({}, 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 = _objectSpread(_objectSpread({}, 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 = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionContext: agentMentionContext,
@@ -305,11 +454,18 @@ export function createMentionPlugin(_ref) {
               }, newInsertionCount !== undefined ? {
                 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 = _objectSpread(_objectSpread({}, newPluginState), {}, {
+            pendingTypedAgentMention: getPendingTypedAgentMentionAfterDocChange(newState, tr, newPluginState.pendingTypedAgentMention, {
+              resetTimer: isQualifyingLocalUserDocChange(tr)
+            })
+          });
+        }
+        if (hasPublicPluginStateChanged && isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
         return newPluginState;
@@ -327,6 +483,47 @@ export function createMentionPlugin(_ref) {
       }
     },
     view: function view(editorView) {
+      var isAgentMentionsEnabled = editorExperiment('platform_editor_agent_mentions', true);
+      var pendingTypedAgentMentionTimer;
+      var pendingTypedAgentMentionTimerKey = null;
+      var clearPendingTypedAgentMentionTimer = function clearPendingTypedAgentMentionTimer() {
+        if (pendingTypedAgentMentionTimer) {
+          clearTimeout(pendingTypedAgentMentionTimer);
+          pendingTypedAgentMentionTimer = undefined;
+        }
+        pendingTypedAgentMentionTimerKey = null;
+      };
+      var schedulePendingTypedAgentMentionTimer = function schedulePendingTypedAgentMentionTimer(mentionPluginState) {
+        if (!isAgentMentionsEnabled) {
+          clearPendingTypedAgentMentionTimer();
+          return;
+        }
+        var pendingTypedAgentMention = mentionPluginState === null || mentionPluginState === void 0 ? void 0 : mentionPluginState.pendingTypedAgentMention;
+        if (!pendingTypedAgentMention) {
+          clearPendingTypedAgentMentionTimer();
+          return;
+        }
+        var timerKey = "".concat(pendingTypedAgentMention.localId, ":").concat(pendingTypedAgentMention.resetCount);
+        if (timerKey === pendingTypedAgentMentionTimerKey) {
+          return;
+        }
+        clearPendingTypedAgentMentionTimer();
+        pendingTypedAgentMentionTimerKey = timerKey;
+        pendingTypedAgentMentionTimer = setTimeout(function () {
+          var _mentionPluginKey$get;
+          var 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);
+      };
       var providerHandler = function providerHandler(name, providerPromise) {
         switch (name) {
           case 'mentionProvider':
@@ -372,7 +569,15 @@ export function createMentionPlugin(_ref) {
         pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
       }
       return {
+        update: function update(view, prevState) {
+          var mentionPluginState = mentionPluginKey.getState(view.state);
+          if (mentionPluginState === mentionPluginKey.getState(prevState)) {
+            return;
+          }
+          schedulePendingTypedAgentMentionTimer(mentionPluginState);
+        },
         destroy: function destroy() {
+          clearPendingTypedAgentMentionTimer();
           if (pmPluginFactoryParams.providerFactory) {
             pmPluginFactoryParams.providerFactory.unsubscribe('mentionProvider', providerHandler);
           }

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

@@ -19,6 +19,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';
@@ -371,10 +373,10 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         sessionId: sessionId
       });
       var isAgentMentionsExperimentEnabled = expVal('platform_editor_agent_mentions', 'isEnabled', false);
-      var shouldSuppressInviteForAgentMention = isAgentMentionsExperimentEnabled && isAgentMention(item.mention);
+      var 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.
-      var persistedUserType = isAgentMentionsExperimentEnabled && isAgentMention(item.mention) && userType == null ? 'APP' : userType;
+      var persistedUserType = isAgentMentionInsertion && userType == null ? 'APP' : userType;
       if (mentionProvider && !isInviteItem(item.mention)) {
         mentionProvider.recordMentionSelection(item.mention, mentionContext);
       }
@@ -399,12 +401,12 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
             // If query already includes @, use it as is
             if (email && mentionProvider.showInlineInviteRecaptcha) {
               mentionProvider.showInlineInviteRecaptcha(email);
-              var tr = state.tr;
-              tr.setMeta(mentionPlaceholderPluginKey, {
+              var _tr = state.tr;
+              _tr.setMeta(mentionPlaceholderPluginKey, {
                 action: MENTION_PLACEHOLDER_ACTIONS.SHOW_PLACEHOLDER,
                 placeholder: "@".concat(query)
               });
-              return tr;
+              return _tr;
             }
           } else if (mentionProvider.onInviteItemClick) {
             // Fallback to old behavior for backward compatibility
@@ -431,7 +433,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
           localId: mentionLocalId,
           method: 'typed',
           type: 'added'
-        }, shouldSuppressInviteForAgentMention ? {
+        }, isAgentMentionInsertion ? {
           shouldSuppressMentionNotification: true
         } : {});
         if (taskItemId) {
@@ -444,22 +446,22 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       }
       fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(function (x) {
         return x.mention;
-      }), query, contextIdentifierProvider, taskListId, taskItemId, shouldSuppressInviteForAgentMention));
+      }), 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({
+      var tr = insert(createSingleMentionFragment({
         mentionProvider: mentionProvider,
         mentionInsertDisplayName: mentionInsertDisplayName,
         tr: state.tr,
         sanitizePrivateContent: sanitizePrivateContent,
-        suppressInviteXProductUser: shouldSuppressInviteForAgentMention
+        suppressInviteXProductUser: isAgentMentionInsertion
       })({
         name: name,
         id: id,
@@ -469,6 +471,15 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         accessLevel: accessLevel,
         isXProductUser: isXProductUser
       }));
+      if (isAgentMentionInsertion) {
+        tr.setMeta(mentionPluginKey, {
+          action: ACTIONS.SET_PENDING_TYPED_AGENT_MENTION,
+          params: {
+            localId: mentionLocalId
+          }
+        });
+      }
+      return tr;
     },
     dismiss: function dismiss(_ref10) {
       var editorState = _ref10.editorState,

package/dist/types/pm-plugins/main.d.ts

@@ -3,6 +3,8 @@ import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/edito
 import type { MentionsPlugin } from '../mentionsPluginType';
 import type { FireElementsChannelEvent, MentionPluginOptions, MentionPluginState } from '../types';
 export declare const ACTIONS: {
+    COMMIT_PENDING_TYPED_AGENT_MENTION: string;
+    SET_PENDING_TYPED_AGENT_MENTION: string;
     SET_PROVIDER: string;
 };
 interface CreateMentionPlugin {

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

@@ -43,8 +43,32 @@ export interface MentionsPluginOptions extends MentionPluginConfig {
  * @see https://product-fabric.atlassian.net/browse/ED-27496
  */
 export type MentionPluginOptions = MentionsPluginOptions;
+export type AgentMentionDetails = {
+    id: string;
+    context: string | null;
+    nodeSize: number;
+    parentNodeType: string | null;
+    pos: number;
+};
 export type MentionPluginState = {
     canInsertMention?: boolean;
+    /**
+     * @internal Tracks a typed agent mention while waiting for the platform-side
+     * ready-to-fire trigger. Consumers should continue to react only to
+     * lastInsertedAgentMention* fields.
+     */
+    pendingTypedAgentMention?: {
+        id: string;
+        localId: string;
+        nodeSize: number;
+        pos: number;
+        /**
+         * Generation value for the inactivity timer. This changes when local edits
+         * reset the pending mention window, so stale timer callbacks for the same
+         * localId cannot publish before the latest inactivity period has elapsed.
+         */
+        resetCount: number;
+    } | null;
     /**
      * Increments on each new agent mention insertion (including re-mentions of the same agent).
      * Used to trigger re-renders when the same agent is mentioned again.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.0.0",
+	"version": "14.1.1",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/profilecard": "^26.0.0",
 		"@atlaskit/teams-app-config": "^2.0.0",
 		"@atlaskit/theme": "^26.0.0",
-		"@atlaskit/tmp-editor-statsig": "^104.0.0",
+		"@atlaskit/tmp-editor-statsig": "^106.0.0",
 		"@atlaskit/tokens": "^14.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@atlaskit/user-picker": "^13.0.0",
@@ -52,7 +52,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.0.0",
+		"@atlaskit/editor-common": "^116.2.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"