@atlaskit/editor-plugin-mentions 14.5.9 → 14.5.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-mentions
 
+## 14.5.10
+
+### Patch Changes
+
+- [`1448830a87645`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1448830a87645) -
+  Preserve ADF-backed editor agent mention prompt context through Rovo chat drafts and sends.
+- Updated dependencies
+
 ## 14.5.9
 
 ### Patch Changes

package/dist/cjs/pm-plugins/agent-mention-context.js

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

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

@@ -17,6 +17,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mentionNodeView = require("../nodeviews/mentionNodeView");
 var _types2 = require("../types");
+var _agentMentionContext = require("./agent-mention-context");
 var _key = require("./key");
 var _utils = require("./utils");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -51,7 +52,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.5.8";
+var PACKAGE_VERSION = "14.5.9";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -103,11 +104,14 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   }
   var $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   var parentNode = $mentionPos.node($mentionPos.depth);
+  var id = node.attrs.id;
+  var name = getAgentMentionName(node.attrs.text, fallbackName);
   return {
-    id: node.attrs.id,
+    id: id,
     localId: node.attrs.localId,
-    context: parentNode.textContent.trim() || null,
-    name: getAgentMentionName(node.attrs.text, fallbackName),
+    context: (0, _agentMentionContext.getAgentMentionParentContext)(parentNode, node.attrs.localId),
+    name: name,
+    prompt: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
     parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
@@ -196,6 +200,7 @@ var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTyped
       lastInsertedAgentMentionLocalId: pendingMentionDetails.localId,
       lastInsertedAgentMentionContext: pendingMentionDetails.context,
       lastInsertedAgentMentionName: pendingMentionDetails.name,
+      lastInsertedAgentMentionPrompt: pendingMentionDetails.prompt,
       lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
       lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
     })
@@ -222,7 +227,7 @@ var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(sta
   return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
 };
 var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
-  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionLocalId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionName != null || pluginState.lastInsertedAgentMentionPrompt != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
 };
 
 /**
@@ -237,6 +242,7 @@ var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(plugi
     lastInsertedAgentMentionLocalId: null,
     lastInsertedAgentMentionContext: null,
     lastInsertedAgentMentionName: null,
+    lastInsertedAgentMentionPrompt: null,
     lastInsertedAgentMentionParentNodeType: null
   });
 };
@@ -426,6 +432,7 @@ function createMentionPlugin(_ref2) {
             var agentMentionLocalId = null;
             var agentMentionContext = null;
             var agentMentionName = null;
+            var agentMentionPrompt = null;
             var agentMentionParentNodeType = null;
             var existingAgentMentionLocalIdsInChangedRanges = new Set();
             var pendingTypedAgentMentionDetails = null;
@@ -457,6 +464,7 @@ function createMentionPlugin(_ref2) {
                         agentMentionLocalId = agentMentionDetails.localId;
                         agentMentionContext = agentMentionDetails.context;
                         agentMentionName = agentMentionDetails.name;
+                        agentMentionPrompt = agentMentionDetails.prompt;
                         agentMentionParentNodeType = agentMentionDetails.parentNodeType;
                       }
                     }
@@ -505,6 +513,7 @@ function createMentionPlugin(_ref2) {
                 agentMentionLocalId = survivorDetails.localId;
                 agentMentionContext = survivorDetails.context;
                 agentMentionName = survivorDetails.name;
+                agentMentionPrompt = survivorDetails.prompt;
                 agentMentionParentNodeType = survivorDetails.parentNodeType;
                 resolvedFromFullDocFallback = true;
               }
@@ -553,17 +562,19 @@ function createMentionPlugin(_ref2) {
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount
               } : {});
               hasPublicPluginStateChanged = true;
-            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionContext !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionContext) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionName !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
+            } else if (agentMentionId !== ((_newPluginState$lastI2 = newPluginState.lastInsertedAgentMentionId) !== null && _newPluginState$lastI2 !== void 0 ? _newPluginState$lastI2 : null) || agentMentionLocalId !== ((_newPluginState$lastI3 = newPluginState.lastInsertedAgentMentionLocalId) !== null && _newPluginState$lastI3 !== void 0 ? _newPluginState$lastI3 : null) || agentMentionName !== ((_newPluginState$lastI4 = newPluginState.lastInsertedAgentMentionName) !== null && _newPluginState$lastI4 !== void 0 ? _newPluginState$lastI4 : null) || agentMentionPrompt !== ((_newPluginState$lastI5 = newPluginState.lastInsertedAgentMentionPrompt) !== null && _newPluginState$lastI5 !== void 0 ? _newPluginState$lastI5 : null) || agentMentionParentNodeType !== ((_newPluginState$lastI6 = newPluginState.lastInsertedAgentMentionParentNodeType) !== null && _newPluginState$lastI6 !== void 0 ? _newPluginState$lastI6 : null) || newInsertionCount !== undefined) {
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 lastInsertedAgentMentionId: agentMentionId,
                 lastInsertedAgentMentionLocalId: agentMentionLocalId,
                 lastInsertedAgentMentionContext: agentMentionContext,
                 lastInsertedAgentMentionName: agentMentionName,
+                lastInsertedAgentMentionPrompt: agentMentionPrompt,
                 lastInsertedAgentMentionParentNodeType: agentMentionParentNodeType
               }, newInsertionCount !== undefined ? {
                 lastAgentMentionInsertionCount: newInsertionCount

package/dist/es2019/pm-plugins/agent-mention-context.js

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

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

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

package/dist/esm/pm-plugins/agent-mention-context.js

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

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.5.9",
+	"version": "14.5.10",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/profilecard": "^26.5.0",
 		"@atlaskit/teams-app-config": "^2.1.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tmp-editor-statsig": "^119.2.0",
+		"@atlaskit/tmp-editor-statsig": "^120.0.0",
 		"@atlaskit/tokens": "^15.3.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@atlaskit/user-picker": "^13.4.0",
@@ -53,7 +53,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.19.0",
+		"@atlaskit/editor-common": "^116.20.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"