@atlaskit/editor-plugin-mentions 15.0.2 → 15.0.4

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

@@ -14,6 +14,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _insm = require("@atlaskit/insm");
 var _resource = require("@atlaskit/mention/resource");
 var _types = require("@atlaskit/mention/types");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mentionNodeView = require("../nodeviews/mentionNodeView");
@@ -66,7 +67,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "15.0.1";
+var PACKAGE_VERSION = "15.0.3";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -352,10 +353,6 @@ function createMentionPlugin(_ref2) {
     options = _ref2.options,
     api = _ref2.api;
   var mentionProvider;
-
-  // Injected by Rovo-aware consumers only. Non-Rovo consumers omit this field
-  // entirely so this plugin incurs zero bundle cost from rovo-experience-api.
-  var getIsRovoPanelOpen = options === null || options === void 0 ? void 0 : options.getIsRovoPanelOpen;
   var sendAnalytics = function sendAnalytics(event, actionSubject, action, attributes) {
     if (event === _resource.SLI_EVENT_TYPE || event === _resource.SMART_EVENT_TYPE) {
       fireEvent({
@@ -388,7 +385,6 @@ function createMentionPlugin(_ref2) {
           params = _ref3.params;
         var hasPublicPluginStateChanged = false;
         var newPluginState = pluginState;
-        var isAgentMentionsExperimentEnabled = (0, _experiments.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), {}, {
@@ -397,75 +393,79 @@ function createMentionPlugin(_ref2) {
           hasPublicPluginStateChanged = true;
         }
         switch (action) {
-          case ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION:
-            {
-              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 commitResult = commitPendingTypedAgentMention(newState, newPluginState, pendingTypedAgentMention);
-              newPluginState = commitResult.pluginState;
-              hasPublicPluginStateChanged = hasPublicPluginStateChanged || commitResult.hasPublicPluginStateChanged;
-              break;
-            }
-          case ACTIONS.DISCARD_PENDING_TYPED_AGENT_MENTION:
-            {
-              // Silently discard the pending typed agent mention without committing it.
-              var pendingTypedAgentMentionToDiscard = newPluginState.pendingTypedAgentMention;
-              if (!isAgentMentionsExperimentEnabled || !pendingTypedAgentMentionToDiscard || pendingTypedAgentMentionToDiscard.localId !== (params === null || params === void 0 ? void 0 : params.localId) || pendingTypedAgentMentionToDiscard.resetCount !== (params === null || params === void 0 ? void 0 : params.resetCount)) {
-                break;
-              }
-              newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                pendingTypedAgentMention: null
-              });
-              hasPublicPluginStateChanged = true;
-              break;
-            }
           case ACTIONS.SET_PROVIDER:
             newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
               mentionProvider: params.provider
             });
             hasPublicPluginStateChanged = true;
             break;
-          case ACTIONS.RESOLVE_PASTED_AGENT_MENTION_NAME:
-            {
-              var _newPluginState$pendi, _newPluginState$pendi2, _newPluginState$pendi3, _newPluginState$pendi4, _newPluginState$pendi5, _newPluginState$pendi6;
-              // Guard: only apply if there is a matching pending pasted mention (staleness check).
-              if (!isAgentMentionsExperimentEnabled || !(params !== null && params !== void 0 && params.id) || !(params !== null && params !== void 0 && params.name) || ((_newPluginState$pendi = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi === void 0 ? void 0 : _newPluginState$pendi.id) !== params.id || !(0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
+        }
+        if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') && (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true)) {
+          switch (action) {
+            case ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION:
+              {
+                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 (!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 commitResult = commitPendingTypedAgentMention(newState, newPluginState, pendingTypedAgentMention);
+                newPluginState = commitResult.pluginState;
+                hasPublicPluginStateChanged = hasPublicPluginStateChanged || commitResult.hasPublicPluginStateChanged;
                 break;
               }
-              newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                pendingPastedAgentMention: null,
-                lastInsertedAgentMentionId: (_newPluginState$pendi2 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi2 === void 0 ? void 0 : _newPluginState$pendi2.id,
-                lastInsertedAgentMentionLocalId: (_newPluginState$pendi3 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi3 === void 0 ? void 0 : _newPluginState$pendi3.localId,
-                lastInsertedAgentMentionContext: (_newPluginState$pendi4 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi4 === void 0 ? void 0 : _newPluginState$pendi4.context,
-                lastInsertedAgentMentionName: params.name,
-                lastInsertedAgentMentionPrompt: (_newPluginState$pendi5 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi5 === void 0 ? void 0 : _newPluginState$pendi5.prompt,
-                lastInsertedAgentMentionParentNodeType: (_newPluginState$pendi6 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi6 === void 0 ? void 0 : _newPluginState$pendi6.parentNodeType
-              });
-              hasPublicPluginStateChanged = true;
-              break;
-            }
-          case ACTIONS.CLEAR_PENDING_PASTED_AGENT_MENTION:
-            {
-              var _newPluginState$pendi7;
-              if (!isAgentMentionsExperimentEnabled || !(params !== null && params !== void 0 && params.id) || ((_newPluginState$pendi7 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi7 === void 0 ? void 0 : _newPluginState$pendi7.id) !== params.id || !(0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
+            case ACTIONS.DISCARD_PENDING_TYPED_AGENT_MENTION:
+              {
+                // Silently discard the pending typed agent mention without committing it.
+                var pendingTypedAgentMentionToDiscard = newPluginState.pendingTypedAgentMention;
+                if (!pendingTypedAgentMentionToDiscard || pendingTypedAgentMentionToDiscard.localId !== (params === null || params === void 0 ? void 0 : params.localId) || pendingTypedAgentMentionToDiscard.resetCount !== (params === null || params === void 0 ? void 0 : params.resetCount)) {
+                  break;
+                }
+                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                  pendingTypedAgentMention: null
+                });
+                hasPublicPluginStateChanged = true;
                 break;
               }
-              // resolveMentionName() returned a non-OK status — clear the pending state.
-              newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                pendingPastedAgentMention: null
-              });
-              break;
-            }
+            case ACTIONS.RESOLVE_PASTED_AGENT_MENTION_NAME:
+              {
+                var _newPluginState$pendi, _newPluginState$pendi2, _newPluginState$pendi3, _newPluginState$pendi4, _newPluginState$pendi5, _newPluginState$pendi6;
+                // Guard: only apply if there is a matching pending pasted mention (staleness check).
+                if (!(params !== null && params !== void 0 && params.id) || !(params !== null && params !== void 0 && params.name) || ((_newPluginState$pendi = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi === void 0 ? void 0 : _newPluginState$pendi.id) !== params.id || !(0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
+                  break;
+                }
+                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                  pendingPastedAgentMention: null,
+                  lastInsertedAgentMentionId: (_newPluginState$pendi2 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi2 === void 0 ? void 0 : _newPluginState$pendi2.id,
+                  lastInsertedAgentMentionLocalId: (_newPluginState$pendi3 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi3 === void 0 ? void 0 : _newPluginState$pendi3.localId,
+                  lastInsertedAgentMentionContext: (_newPluginState$pendi4 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi4 === void 0 ? void 0 : _newPluginState$pendi4.context,
+                  lastInsertedAgentMentionName: params.name,
+                  lastInsertedAgentMentionPrompt: (_newPluginState$pendi5 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi5 === void 0 ? void 0 : _newPluginState$pendi5.prompt,
+                  lastInsertedAgentMentionParentNodeType: (_newPluginState$pendi6 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi6 === void 0 ? void 0 : _newPluginState$pendi6.parentNodeType
+                });
+                hasPublicPluginStateChanged = true;
+                break;
+              }
+            case ACTIONS.CLEAR_PENDING_PASTED_AGENT_MENTION:
+              {
+                var _newPluginState$pendi7;
+                if (!(params !== null && params !== void 0 && params.id) || ((_newPluginState$pendi7 = newPluginState.pendingPastedAgentMention) === null || _newPluginState$pendi7 === void 0 ? void 0 : _newPluginState$pendi7.id) !== params.id || !(0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
+                  break;
+                }
+                // resolveMentionName() returned a non-OK status — clear the pending state.
+                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                  pendingPastedAgentMention: null
+                });
+                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 (hasPublicPluginStateChanged && !isAgentMentionsExperimentEnabled) {
+        if (hasPublicPluginStateChanged && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') || !(0, _experiments.editorExperiment)('platform_editor_agent_mentions', true))) {
           pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
         }
         if (options !== null && options !== void 0 && options.handleMentionsChanged && tr.docChanged) {
@@ -527,7 +527,7 @@ function createMentionPlugin(_ref2) {
           }
           (_insm$session2 = _insm.insm.session) === null || _insm$session2 === void 0 || _insm$session2.endFeature('mentionDeletionDetection');
         }
-        if (isAgentMentionsExperimentEnabled && isQualifyingLocalUserDocChange(tr)) {
+        if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') && (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true) && isQualifyingLocalUserDocChange(tr)) {
           var _mentionSchema = newState.schema.nodes.mention;
           var newDocRanges = [];
           var oldDocRanges = [];
@@ -721,10 +721,11 @@ function createMentionPlugin(_ref2) {
               } : {});
               hasPublicPluginStateChanged = true;
             } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionName !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionPrompt !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionPrompt) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
+              var _options$getIsRovoPan;
               // Suppress the nudge for pasted/non-typed agent mentions when Rovo is already
               // open.
               var isTaskItemMentionForPaste = agentMentionParentNodeType === 'taskItem';
-              if (!isTaskItemMentionForPaste && isNewInsertion && getIsRovoPanelOpen !== null && getIsRovoPanelOpen !== void 0 && getIsRovoPanelOpen()) {
+              if (!isTaskItemMentionForPaste && isNewInsertion && options !== null && options !== void 0 && (_options$getIsRovoPan = options.getIsRovoPanelOpen) !== null && _options$getIsRovoPan !== void 0 && _options$getIsRovoPan.call(options)) {
                 // Rovo is already open — skip setting lastInsertedAgentMention* so the
                 // downstream nudge listener never fires.
               } else if (agentMentionName === null && agentMentionId !== null && (0, _resource.isResolvingMentionProvider)(newPluginState.mentionProvider) && (0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
@@ -758,51 +759,53 @@ function createMentionPlugin(_ref2) {
             }
           }
         }
-        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument') && hasTrackedAgentMentionState(newPluginState)) {
+        if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') && (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true) && tr.docChanged && tr.getMeta('replaceDocument') && hasTrackedAgentMentionState(newPluginState)) {
           newPluginState = clearTrackedAgentMentionState(newPluginState);
           hasPublicPluginStateChanged = true;
         }
-        if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && tr.docChanged) {
+        if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') && (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true) && 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)
             })
           });
         }
-
-        // Typed agent mentions stay pending while the user is still editing around them,
-        // but leaving the mention's direct parent means they have moved on from that
-        // paragraph/block. Publish immediately in that case instead of waiting for the
-        // inactivity timer.
-        var shouldCheckPendingTypedAgentMentionParent = isLocalSelectionChange(tr, hasPositionChanged);
-        if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && shouldCheckPendingTypedAgentMentionParent) {
-          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
-            });
-          } else if (hasPendingMentionMovedToNewParent(oldState, tr, pluginState.pendingTypedAgentMention, pendingMentionDetails) || isSelectionOutsideDirectParent(newState, pendingMentionDetails)) {
-            // Suppress the nudge when Rovo chat is already open, mirroring the same
-            // guard used in the inactivity-timer path. Task-item mentions are
-            // exempt because they auto-fire the mini modal and never show a nudge.
-            if (pendingMentionDetails.parentNodeType !== 'taskItem' && getIsRovoPanelOpen !== null && getIsRovoPanelOpen !== void 0 && getIsRovoPanelOpen()) {
-              // Discard without committing so lastInsertedAgentMention* fields are
-              // never set and the downstream nudge listener never fires.
+        if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') && (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true)) {
+          // Typed agent mentions stay pending while the user is still editing around them,
+          // but leaving the mention's direct parent means they have moved on from that
+          // paragraph/block. Publish immediately in that case instead of waiting for the
+          // inactivity timer.
+          var shouldCheckPendingTypedAgentMentionParent = isLocalSelectionChange(tr, hasPositionChanged);
+          if (newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && shouldCheckPendingTypedAgentMentionParent) {
+            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
               });
-              hasPublicPluginStateChanged = true;
-            } else {
-              var _commitResult = commitResolvedPendingTypedAgentMention(newPluginState, pendingMentionDetails);
-              newPluginState = _commitResult.pluginState;
-              hasPublicPluginStateChanged = hasPublicPluginStateChanged || _commitResult.hasPublicPluginStateChanged;
+            } else if (hasPendingMentionMovedToNewParent(oldState, tr, pluginState.pendingTypedAgentMention, pendingMentionDetails) || isSelectionOutsideDirectParent(newState, pendingMentionDetails)) {
+              var _options$getIsRovoPan2;
+              // Suppress the nudge when Rovo chat is already open, mirroring the same
+              // guard used in the inactivity-timer path. Task-item mentions are
+              // exempt because they auto-fire the mini modal and never show a nudge.
+              if (pendingMentionDetails.parentNodeType !== 'taskItem' && options !== null && options !== void 0 && (_options$getIsRovoPan2 = options.getIsRovoPanelOpen) !== null && _options$getIsRovoPan2 !== void 0 && _options$getIsRovoPan2.call(options)) {
+                // Discard without committing so lastInsertedAgentMention* fields are
+                // never set and the downstream nudge listener never fires.
+                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                  pendingTypedAgentMention: null
+                });
+                hasPublicPluginStateChanged = true;
+              } else {
+                var _commitResult = commitResolvedPendingTypedAgentMention(newPluginState, pendingMentionDetails);
+                newPluginState = _commitResult.pluginState;
+                hasPublicPluginStateChanged = hasPublicPluginStateChanged || _commitResult.hasPublicPluginStateChanged;
+              }
             }
           }
         }
-        if (hasPublicPluginStateChanged && isAgentMentionsExperimentEnabled) {
+        if (hasPublicPluginStateChanged && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') && (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true)) {
           pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
         }
         return newPluginState;
@@ -821,7 +824,6 @@ function createMentionPlugin(_ref2) {
       }
     },
     view: function view(editorView) {
-      var isAgentMentionsEnabled = (0, _experiments.editorExperiment)('platform_editor_agent_mentions', true);
       var pendingTypedAgentMentionTimer;
       var pendingTypedAgentMentionTimerKey = null;
       var pendingTypedAgentMentionFocusDeferCount = 0;
@@ -868,7 +870,7 @@ function createMentionPlugin(_ref2) {
         var _ref5 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
           _ref5$preserveFocusDe = _ref5.preserveFocusDeferCount,
           preserveFocusDeferCount = _ref5$preserveFocusDe === void 0 ? false : _ref5$preserveFocusDe;
-        if (!isAgentMentionsEnabled) {
+        if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin') || !(0, _experiments.editorExperiment)('platform_editor_agent_mentions', true)) {
           clearPendingTypedAgentMentionTimer();
           return;
         }
@@ -888,10 +890,11 @@ function createMentionPlugin(_ref2) {
         pendingTypedAgentMentionTimer = setTimeout(function () {
           var _mentionPluginKey$get;
           {
+            var _options$getIsRovoPan3;
             // Suppress the agent-mention nudge when the Rovo panel is already open,
             // but only for non-task-item mentions.
             var isTaskItemMention = pendingTypedAgentMention.parentNodeType === 'taskItem';
-            if (!isTaskItemMention && getIsRovoPanelOpen !== null && getIsRovoPanelOpen !== void 0 && getIsRovoPanelOpen()) {
+            if (!isTaskItemMention && options !== null && options !== void 0 && (_options$getIsRovoPan3 = options.getIsRovoPanelOpen) !== null && _options$getIsRovoPan3 !== void 0 && _options$getIsRovoPan3.call(options)) {
               // Dispatch a discard so pendingTypedAgentMention is nulled out of plugin
               // state.
               editorView.dispatch(editorView.state.tr.setMeta(_key.mentionPluginKey, {
@@ -972,18 +975,20 @@ function createMentionPlugin(_ref2) {
       }
       return {
         update: function update(view, prevState) {
-          var _mentionPluginState$p;
           var mentionPluginState = _key.mentionPluginKey.getState(view.state);
           if (mentionPluginState === _key.mentionPluginKey.getState(prevState)) {
             return;
           }
-          _schedulePendingTypedAgentMentionTimer(mentionPluginState);
+          if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_mentions_separate_pm_plugin')) {
+            var _mentionPluginState$p;
+            _schedulePendingTypedAgentMentionTimer(mentionPluginState);
 
-          // If a pasted agent mention has no name (cache miss), resolve it async
-          // via the mention provider and dispatch RESOLVE_PASTED_AGENT_MENTION_NAME
-          // so the nudge displays the correct name.
-          if ((0, _experiments.editorExperiment)('platform_editor_agent_mentions', true) && (mentionPluginState === null || mentionPluginState === void 0 || (_mentionPluginState$p = mentionPluginState.pendingPastedAgentMention) === null || _mentionPluginState$p === void 0 ? void 0 : _mentionPluginState$p.id) != null && mentionPluginState !== null && mentionPluginState !== void 0 && mentionPluginState.mentionProvider && (0, _resource.isResolvingMentionProvider)(mentionPluginState.mentionProvider) && (0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
-            resolveAndDispatchPastedAgentMentionName(mentionPluginState.pendingPastedAgentMention.id, mentionPluginState.mentionProvider, pendingResolveMentionIds, view);
+            // If a pasted agent mention has no name (cache miss), resolve it async
+            // via the mention provider and dispatch RESOLVE_PASTED_AGENT_MENTION_NAME
+            // so the nudge displays the correct name.
+            if ((0, _experiments.editorExperiment)('platform_editor_agent_mentions', true) && (mentionPluginState === null || mentionPluginState === void 0 || (_mentionPluginState$p = mentionPluginState.pendingPastedAgentMention) === null || _mentionPluginState$p === void 0 ? void 0 : _mentionPluginState$p.id) != null && mentionPluginState !== null && mentionPluginState !== void 0 && mentionPluginState.mentionProvider && (0, _resource.isResolvingMentionProvider)(mentionPluginState.mentionProvider) && (0, _platformFeatureFlags.fg)('platform_editor_agent_mentions_drop_one_fixes')) {
+              resolveAndDispatchPastedAgentMentionName(mentionPluginState.pendingPastedAgentMention.id, mentionPluginState.mentionProvider, pendingResolveMentionIds, view);
+            }
           }
         },
         destroy: function destroy() {

package/dist/es2019/mentionsPlugin.js

@@ -8,9 +8,12 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { IconMention } from '@atlaskit/editor-common/quick-insert';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
 import { MentionNameStatus, isPromise } from '@atlaskit/mention/types';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertMention } from './editor-commands';
 import { mentionNodeSpec } from './nodeviews/mentionNodeSpec';
+import { agentMentionPluginKey, createAgentMentionPlugin } from './pm-plugins/agent';
 import { mentionPluginKey } from './pm-plugins/key';
 import { ACTIONS, createMentionPlugin } from './pm-plugins/main';
 import { createMentionPlaceholderPlugin } from './pm-plugins/mentionPlaceholder';
@@ -125,6 +128,15 @@ const mentionsPlugin = ({
           api
         })
       }];
+      if (editorExperiment('platform_editor_agent_mentions', true) && isExperimentEnabled('platform_editor_agent_mentions_separate_pm_plugin')) {
+        plugins.push({
+          name: 'agentMention',
+          plugin: pmPluginFactoryParams => createAgentMentionPlugin({
+            pmPluginFactoryParams,
+            options
+          })
+        });
+      }
       if (fg('jira_invites_auto_tag_new_user_in_mentions_fg')) {
         plugins.push({
           name: 'mentionPlaceholder',
@@ -227,6 +239,7 @@ const mentionsPlugin = ({
         return undefined;
       }
       const mentionPluginState = mentionPluginKey.getState(editorState);
+      const agentMentionPluginState = isExperimentEnabled('platform_editor_agent_mentions_separate_pm_plugin') ? agentMentionPluginKey.getState(editorState) : undefined;
       // Exclude pendingPastedAgentMention — it is an @internal transient field and
       // should not be part of the public shared state API. Exposing it would cause
       // unnecessary re-renders in subscribers and leak implementation details.
@@ -236,6 +249,15 @@ const mentionsPlugin = ({
       } = mentionPluginState !== null && mentionPluginState !== void 0 ? mentionPluginState : {};
       return {
         ...publicPluginState,
+        ...(agentMentionPluginState ? {
+          lastAgentMentionInsertionCount: agentMentionPluginState.lastAgentMentionInsertionCount,
+          lastInsertedAgentMentionContext: agentMentionPluginState.lastInsertedAgentMentionContext,
+          lastInsertedAgentMentionId: agentMentionPluginState.lastInsertedAgentMentionId,
+          lastInsertedAgentMentionLocalId: agentMentionPluginState.lastInsertedAgentMentionLocalId,
+          lastInsertedAgentMentionName: agentMentionPluginState.lastInsertedAgentMentionName,
+          lastInsertedAgentMentionParentNodeType: agentMentionPluginState.lastInsertedAgentMentionParentNodeType,
+          lastInsertedAgentMentionPrompt: agentMentionPluginState.lastInsertedAgentMentionPrompt
+        } : {}),
         typeAheadHandler: typeAhead
       };
     },