@atlaskit/editor-plugin-collab-edit 20.0.1 → 20.1.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 20.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 20.1.0
+
+### Minor Changes
+
+- [`fcc5d229eacdb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fcc5d229eacdb) -
+  Resolve consistent agent labels and colours for collaborators, filter local acknowledgements under
+  M1, and use shared display defaults instead of legacy streaming settings.
+- [`fcc5d229eacdb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fcc5d229eacdb) -
+  Keep agent highlights associated with their actor and invocation under
+  platform_editor_ai_streaming_ux_experience_m1.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 20.0.1
 
 ### Patch Changes

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

@@ -19,10 +19,11 @@ var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _analytics = require("./analytics");
+var _agentEditRequester = require("./main/agent-edit-requester");
 var _agentReviewSegments = require("./main/agent-review-segments");
 var _agentShimmerDecorations = require("./main/agent-shimmer-decorations");
-var _agentEditRequester = require("./main/agent-edit-requester");
 var _agentShimmerRanges = require("./main/agent-shimmer-ranges");
+var _remoteAgentChromeIdentity = require("./main/remote-agent-chrome-identity");
 var _utils = require("./utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -102,7 +103,7 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
     var agentShimmers = [];
     var visualJson = json;
     var visualSteps = steps;
-    if (options !== null && options !== void 0 && options.useNativePlugin && userIds && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_be_streaming')) {
+    if (options !== null && options !== void 0 && options.useNativePlugin && userIds && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ai_streaming_ux_experience_m1') || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_be_streaming'))) {
       var _sendableSteps;
       // Read the client ID before applying the acknowledgement, while the local steps
       // are still unconfirmed. receiveTransaction removes this same local prefix.
@@ -120,17 +121,19 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
       visualJson = json.slice(acknowledgedSteps);
       visualSteps = steps.slice(acknowledgedSteps);
     }
+    var isM1StreamingEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ai_streaming_ux_experience_m1');
     var isUnifiedPostApplyChromeEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ai_unified_post_apply_chrome');
-    if (isUnifiedPostApplyChromeEnabled && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_be_streaming')) {
+    if (isUnifiedPostApplyChromeEnabled && (isM1StreamingEnabled || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_agent_be_streaming'))) {
       var ranges = (0, _agentShimmerRanges.getAgentEditChromeRanges)(visualJson, visualSteps, tr, view, function (reason, agentType, error) {
         return editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.getAgentEditShimmerNotShownPayload)(reason, agentType, error))(tr);
       });
       var requester = (0, _agentEditRequester.getAgentEditRequester)(visualJson, view);
       if (ranges.length && requester) {
         // Collab supplies a machine agent type, not a display name; preserve the legacy
-        // uppercase telepointer label.
+        // uppercase telepointer label as the fallback for observers that cannot resolve a
+        // redesigned presentation from the forwarded identity.
         var telepointerLabel = requester.agentType.trim().toUpperCase();
-        tr.setMeta(_collabAgentEditChrome.AGENT_EDIT_CHROME_DATA, _objectSpread(_objectSpread(_objectSpread({}, (0, _collabAgentEditChrome.getAgentEditChromeDynamicConfig)()), telepointerLabel ? {
+        tr.setMeta(_collabAgentEditChrome.AGENT_EDIT_CHROME_DATA, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, !isM1StreamingEnabled ? (0, _collabAgentEditChrome.getAgentEditChromeDynamicConfig)() : {}), (0, _remoteAgentChromeIdentity.getRemoteAgentChromeIdentity)(requester)), telepointerLabel ? {
           telepointerLabel: telepointerLabel
         } : {}), {}, {
           ranges: ranges

package/dist/cjs/pm-plugins/main/agent-edit-requester.js

@@ -4,26 +4,40 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAgentEditRequester = void 0;
+exports.isStepFromAgentEdit = exports.getAgentEditRequester = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _pluginKey = require("./plugin-key");
 var isAgentRemoteStep = function isAgentRemoteStep(step) {
   return (0, _typeof2.default)(step) === 'object' && step !== null && typeof step.agentType === 'string';
 };
+var asString = function asString(value) {
+  return typeof value === 'string' ? value : undefined;
+};
+var isStepFromAgentEdit = exports.isStepFromAgentEdit = function isStepFromAgentEdit(step, requester) {
+  if (!isAgentRemoteStep(step)) {
+    return false;
+  }
+  return step.agentType === requester.agentType && asString(step.agentId) === requester.agentId && asString(step.agentSourceId) === requester.agentSourceId && asString(step.agentNamedId) === requester.agentNamedId && asString(step.userId) === requester.actorUserId && asString(step.invocationId) === requester.invocationId;
+};
 var getAgentEditRequester = exports.getAgentEditRequester = function getAgentEditRequester(json, view) {
   var _collabPluginState$ac;
   var agentStep = json.find(isAgentRemoteStep);
   if (!agentStep) {
     return null;
   }
-  var actorUserId = typeof agentStep.userId === 'string' ? agentStep.userId : undefined;
+  var actorUserId = asString(agentStep.userId);
   var collabPluginState = _pluginKey.pluginKey.getState(view.state);
   var localSessionId = collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId;
   var localUserId = localSessionId ? collabPluginState === null || collabPluginState === void 0 || (_collabPluginState$ac = collabPluginState.activeParticipants) === null || _collabPluginState$ac === void 0 || (_collabPluginState$ac = _collabPluginState$ac.get(localSessionId)) === null || _collabPluginState$ac === void 0 ? void 0 : _collabPluginState$ac.userId : undefined;
   return {
-    agentId: typeof agentStep.agentId === 'string' ? agentStep.agentId : undefined,
+    agentId: asString(agentStep.agentId),
+    agentName: asString(agentStep.agentName),
+    agentNamedId: asString(agentStep.agentNamedId),
+    agentSourceId: asString(agentStep.agentSourceId),
     agentType: agentStep.agentType,
     actorUserId: actorUserId,
+    invocationId: asString(agentStep.invocationId),
+    isThirdPartyAgent: typeof agentStep.isThirdPartyAgent === 'boolean' ? agentStep.isThirdPartyAgent : undefined,
     isLocalUserRequester: actorUserId !== undefined && localUserId !== undefined && actorUserId === localUserId
   };
 };

package/dist/cjs/pm-plugins/main/agent-shimmer-ranges.js

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isPositionNeutralStep = exports.getMarkStepRange = exports.getAgentShimmerRanges = exports.getAgentEditChromeRanges = void 0;
-var _collabAgentReviewSliceCompare = require("@atlaskit/editor-common/collab-agent-review-slice-compare");
 var _collabAgentEditChangedRanges = require("@atlaskit/editor-common/collab-agent-edit-changed-ranges");
+var _collabAgentReviewSliceCompare = require("@atlaskit/editor-common/collab-agent-review-slice-compare");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _agentEditRequester = require("./agent-edit-requester");
 // When an agent step lands we cover the top-level block(s) it wrote with a skeleton-loader shimmer
 // (plus a Rovo agent telepointer at the end of the range), then remove it on a timer to reveal the
 // content. Gated behind the `platform_editor_agent_be_streaming` experiment. `shimmerDurationMs` and
@@ -286,9 +288,11 @@ var getAgentEditChromeRanges = exports.getAgentEditChromeRanges = function getAg
     // rolls back unconfirmed local steps before applying these remote steps, and
     // replays the local steps afterwards. Select the actual applied remote indexes;
     // the shared extractor maps them through every later step into tr.doc.
+    var requester = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ai_streaming_ux_experience_m1') ? (0, _agentEditRequester.getAgentEditRequester)(json, view) : null;
     var includedStepIndexes = [];
     json.forEach(function (rawStep, index) {
-      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index]) {
+      var belongsToSelectedAgent = !requester || (0, _agentEditRequester.isStepFromAgentEdit)(rawStep, requester);
+      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index] && belongsToSelectedAgent) {
         includedStepIndexes.push(rebasedSteps + index);
       }
     });

package/dist/cjs/pm-plugins/main/remote-agent-chrome-identity.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getRemoteAgentChromeIdentity = void 0;
+/**
+ * Maps collab step attribution onto the shared agent-edit chrome identity fields.
+ *
+ * Step attribution carries the agent's provisioned Atlassian identity account id under `agentId`
+ * (see `getAgentAttribution`), so it is forwarded as `agentIdentityAccountId` rather than as the
+ * agent's own source-system id.
+ */
+var getRemoteAgentChromeIdentity = exports.getRemoteAgentChromeIdentity = function getRemoteAgentChromeIdentity(requester) {
+  var _requester$agentSourc, _requester$agentId, _requester$agentName, _requester$agentNamed;
+  return {
+    actorUserId: requester.actorUserId,
+    invocationId: requester.invocationId,
+    agentId: ((_requester$agentSourc = requester.agentSourceId) === null || _requester$agentSourc === void 0 ? void 0 : _requester$agentSourc.trim()) || undefined,
+    agentIdentityAccountId: ((_requester$agentId = requester.agentId) === null || _requester$agentId === void 0 ? void 0 : _requester$agentId.trim()) || undefined,
+    agentName: ((_requester$agentName = requester.agentName) === null || _requester$agentName === void 0 ? void 0 : _requester$agentName.trim()) || undefined,
+    agentNamedId: ((_requester$agentNamed = requester.agentNamedId) === null || _requester$agentNamed === void 0 ? void 0 : _requester$agentNamed.trim()) || undefined,
+    agentType: requester.agentType.trim() || undefined,
+    isThirdParty: requester.isThirdPartyAgent
+  };
+};

package/dist/cjs/pm-plugins/track-and-filter-spamming-steps.js

@@ -7,9 +7,9 @@ exports.createPlugin = exports.createFilterTransaction = void 0;
 exports.generateTransactionKey = generateTransactionKey;
 exports.trackSpammingStepsPluginKey = exports.sanitizeFilteredStep = void 0;
 var _analytics = require("@atlaskit/adf-schema/steps/analytics");
-var _typeAhead = require("@atlaskit/adf-schema/steps/type-ahead");
 var _linkMetaStep = require("@atlaskit/adf-schema/steps/link-meta-step");
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
+var _typeAhead = require("@atlaskit/adf-schema/steps/type-ahead");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");

package/dist/cjs/pm-plugins/track-steps.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.track = exports.task = exports.sanitizeStep = exports.groupSteps = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _analytics = require("@atlaskit/adf-schema/steps/analytics");
-var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
 var _batchAttrsStep = require("@atlaskit/adf-schema/steps/batch-attrs-step");
+var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _trackStepMetrics = require("./track-step-metrics");

package/dist/es2019/entry-points/collabEditPlugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { collabEditPlugin } from '../collabEditPlugin';

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

@@ -14,10 +14,11 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { receiveTransaction, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getAgentEditShimmerNotShownPayload } from './analytics';
+import { getAgentEditRequester } from './main/agent-edit-requester';
 import { getAgentEditSegments } from './main/agent-review-segments';
 import { ADD_AGENT_SHIMMER_META, AGENT_EDIT_HIGHLIGHT_DEFAULT_DURATION_MS, AGENT_SHIMMER_DEFAULT_DURATION_MS, HIGHLIGHT_AGENT_SHIMMER_META, REMOVE_AGENT_SHIMMER_META } from './main/agent-shimmer-decorations';
-import { getAgentEditRequester } from './main/agent-edit-requester';
 import { getAgentEditChromeRanges, getAgentShimmerRanges } from './main/agent-shimmer-ranges';
+import { getRemoteAgentChromeIdentity } from './main/remote-agent-chrome-identity';
 import { replaceDocument } from './utils';
 
 /*
@@ -105,7 +106,7 @@ export const applyRemoteSteps = (json, view, userIds, options, editorAnalyticsAp
     let agentShimmers = [];
     let visualJson = json;
     let visualSteps = steps;
-    if (options !== null && options !== void 0 && options.useNativePlugin && userIds && isExperimentEnabled('platform_editor_agent_be_streaming')) {
+    if (options !== null && options !== void 0 && options.useNativePlugin && userIds && (isExperimentEnabled('platform_editor_ai_streaming_ux_experience_m1') || isExperimentEnabled('platform_editor_agent_be_streaming'))) {
       var _sendableSteps;
       // Read the client ID before applying the acknowledgement, while the local steps
       // are still unconfirmed. receiveTransaction removes this same local prefix.
@@ -123,16 +124,19 @@ export const applyRemoteSteps = (json, view, userIds, options, editorAnalyticsAp
       visualJson = json.slice(acknowledgedSteps);
       visualSteps = steps.slice(acknowledgedSteps);
     }
+    const isM1StreamingEnabled = isExperimentEnabled('platform_editor_ai_streaming_ux_experience_m1');
     const isUnifiedPostApplyChromeEnabled = isExperimentEnabled('platform_editor_ai_unified_post_apply_chrome');
-    if (isUnifiedPostApplyChromeEnabled && isExperimentEnabled('platform_editor_agent_be_streaming')) {
+    if (isUnifiedPostApplyChromeEnabled && (isM1StreamingEnabled || isExperimentEnabled('platform_editor_agent_be_streaming'))) {
       const ranges = getAgentEditChromeRanges(visualJson, visualSteps, tr, view, (reason, agentType, error) => editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(getAgentEditShimmerNotShownPayload(reason, agentType, error))(tr));
       const requester = getAgentEditRequester(visualJson, view);
       if (ranges.length && requester) {
         // Collab supplies a machine agent type, not a display name; preserve the legacy
-        // uppercase telepointer label.
+        // uppercase telepointer label as the fallback for observers that cannot resolve a
+        // redesigned presentation from the forwarded identity.
         const telepointerLabel = requester.agentType.trim().toUpperCase();
         tr.setMeta(AGENT_EDIT_CHROME_DATA, {
-          ...getAgentEditChromeDynamicConfig(),
+          ...(!isM1StreamingEnabled ? getAgentEditChromeDynamicConfig() : {}),
+          ...getRemoteAgentChromeIdentity(requester),
           ...(telepointerLabel ? {
             telepointerLabel
           } : {}),

package/dist/es2019/pm-plugins/main/agent-edit-requester.js

@@ -1,19 +1,31 @@
 import { pluginKey } from './plugin-key';
 const isAgentRemoteStep = step => typeof step === 'object' && step !== null && typeof step.agentType === 'string';
+const asString = value => typeof value === 'string' ? value : undefined;
+export const isStepFromAgentEdit = (step, requester) => {
+  if (!isAgentRemoteStep(step)) {
+    return false;
+  }
+  return step.agentType === requester.agentType && asString(step.agentId) === requester.agentId && asString(step.agentSourceId) === requester.agentSourceId && asString(step.agentNamedId) === requester.agentNamedId && asString(step.userId) === requester.actorUserId && asString(step.invocationId) === requester.invocationId;
+};
 export const getAgentEditRequester = (json, view) => {
   var _collabPluginState$ac, _collabPluginState$ac2;
   const agentStep = json.find(isAgentRemoteStep);
   if (!agentStep) {
     return null;
   }
-  const actorUserId = typeof agentStep.userId === 'string' ? agentStep.userId : undefined;
+  const actorUserId = asString(agentStep.userId);
   const collabPluginState = pluginKey.getState(view.state);
   const localSessionId = collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId;
   const localUserId = localSessionId ? collabPluginState === null || collabPluginState === void 0 ? void 0 : (_collabPluginState$ac = collabPluginState.activeParticipants) === null || _collabPluginState$ac === void 0 ? void 0 : (_collabPluginState$ac2 = _collabPluginState$ac.get(localSessionId)) === null || _collabPluginState$ac2 === void 0 ? void 0 : _collabPluginState$ac2.userId : undefined;
   return {
-    agentId: typeof agentStep.agentId === 'string' ? agentStep.agentId : undefined,
+    agentId: asString(agentStep.agentId),
+    agentName: asString(agentStep.agentName),
+    agentNamedId: asString(agentStep.agentNamedId),
+    agentSourceId: asString(agentStep.agentSourceId),
     agentType: agentStep.agentType,
     actorUserId,
+    invocationId: asString(agentStep.invocationId),
+    isThirdPartyAgent: typeof agentStep.isThirdPartyAgent === 'boolean' ? agentStep.isThirdPartyAgent : undefined,
     isLocalUserRequester: actorUserId !== undefined && localUserId !== undefined && actorUserId === localUserId
   };
 };

package/dist/es2019/pm-plugins/main/agent-shimmer-ranges.js

@@ -1,9 +1,11 @@
-import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
 import { getAgentEditChangedRanges } from '@atlaskit/editor-common/collab-agent-edit-changed-ranges';
+import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getCollabState } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getAgentEditRequester, isStepFromAgentEdit } from './agent-edit-requester';
 // When an agent step lands we cover the top-level block(s) it wrote with a skeleton-loader shimmer
 // (plus a Rovo agent telepointer at the end of the range), then remove it on a timer to reveal the
 // content. Gated behind the `platform_editor_agent_be_streaming` experiment. `shimmerDurationMs` and
@@ -264,9 +266,11 @@ export const getAgentEditChromeRanges = (json, steps, tr, view, onNotShown) => {
     // rolls back unconfirmed local steps before applying these remote steps, and
     // replays the local steps afterwards. Select the actual applied remote indexes;
     // the shared extractor maps them through every later step into tr.doc.
+    const requester = isExperimentEnabled('platform_editor_ai_streaming_ux_experience_m1') ? getAgentEditRequester(json, view) : null;
     const includedStepIndexes = [];
     json.forEach((rawStep, index) => {
-      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index]) {
+      const belongsToSelectedAgent = !requester || isStepFromAgentEdit(rawStep, requester);
+      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index] && belongsToSelectedAgent) {
         includedStepIndexes.push(rebasedSteps + index);
       }
     });

package/dist/es2019/pm-plugins/main/remote-agent-chrome-identity.js

@@ -0,0 +1,20 @@
+/**
+ * Maps collab step attribution onto the shared agent-edit chrome identity fields.
+ *
+ * Step attribution carries the agent's provisioned Atlassian identity account id under `agentId`
+ * (see `getAgentAttribution`), so it is forwarded as `agentIdentityAccountId` rather than as the
+ * agent's own source-system id.
+ */
+export const getRemoteAgentChromeIdentity = requester => {
+  var _requester$agentSourc, _requester$agentId, _requester$agentName, _requester$agentNamed;
+  return {
+    actorUserId: requester.actorUserId,
+    invocationId: requester.invocationId,
+    agentId: ((_requester$agentSourc = requester.agentSourceId) === null || _requester$agentSourc === void 0 ? void 0 : _requester$agentSourc.trim()) || undefined,
+    agentIdentityAccountId: ((_requester$agentId = requester.agentId) === null || _requester$agentId === void 0 ? void 0 : _requester$agentId.trim()) || undefined,
+    agentName: ((_requester$agentName = requester.agentName) === null || _requester$agentName === void 0 ? void 0 : _requester$agentName.trim()) || undefined,
+    agentNamedId: ((_requester$agentNamed = requester.agentNamedId) === null || _requester$agentNamed === void 0 ? void 0 : _requester$agentNamed.trim()) || undefined,
+    agentType: requester.agentType.trim() || undefined,
+    isThirdParty: requester.isThirdPartyAgent
+  };
+};

package/dist/es2019/pm-plugins/track-and-filter-spamming-steps.js

@@ -1,7 +1,7 @@
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps/analytics';
-import { InsertTypeAheadStep } from '@atlaskit/adf-schema/steps/type-ahead';
 import { LinkMetaStep } from '@atlaskit/adf-schema/steps/link-meta-step';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
+import { InsertTypeAheadStep } from '@atlaskit/adf-schema/steps/type-ahead';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';

package/dist/es2019/pm-plugins/track-steps.js

@@ -1,7 +1,7 @@
 // delete this file when cleaning up platform_editor_remove_collab_step_metrics
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps/analytics';
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { BatchAttrsStep } from '@atlaskit/adf-schema/steps/batch-attrs-step';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { updateNcsSessionStepMetrics } from './track-step-metrics';

package/dist/esm/entry-points/collabEditPlugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { collabEditPlugin } from '../collabEditPlugin';

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

@@ -17,10 +17,11 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { receiveTransaction, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getAgentEditShimmerNotShownPayload } from './analytics';
+import { getAgentEditRequester } from './main/agent-edit-requester';
 import { getAgentEditSegments } from './main/agent-review-segments';
 import { ADD_AGENT_SHIMMER_META, AGENT_EDIT_HIGHLIGHT_DEFAULT_DURATION_MS, AGENT_SHIMMER_DEFAULT_DURATION_MS, HIGHLIGHT_AGENT_SHIMMER_META, REMOVE_AGENT_SHIMMER_META } from './main/agent-shimmer-decorations';
-import { getAgentEditRequester } from './main/agent-edit-requester';
 import { getAgentEditChromeRanges, getAgentShimmerRanges } from './main/agent-shimmer-ranges';
+import { getRemoteAgentChromeIdentity } from './main/remote-agent-chrome-identity';
 import { replaceDocument } from './utils';
 
 /*
@@ -95,7 +96,7 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
     var agentShimmers = [];
     var visualJson = json;
     var visualSteps = steps;
-    if (options !== null && options !== void 0 && options.useNativePlugin && userIds && isExperimentEnabled('platform_editor_agent_be_streaming')) {
+    if (options !== null && options !== void 0 && options.useNativePlugin && userIds && (isExperimentEnabled('platform_editor_ai_streaming_ux_experience_m1') || isExperimentEnabled('platform_editor_agent_be_streaming'))) {
       var _sendableSteps;
       // Read the client ID before applying the acknowledgement, while the local steps
       // are still unconfirmed. receiveTransaction removes this same local prefix.
@@ -113,17 +114,19 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
       visualJson = json.slice(acknowledgedSteps);
       visualSteps = steps.slice(acknowledgedSteps);
     }
+    var isM1StreamingEnabled = isExperimentEnabled('platform_editor_ai_streaming_ux_experience_m1');
     var isUnifiedPostApplyChromeEnabled = isExperimentEnabled('platform_editor_ai_unified_post_apply_chrome');
-    if (isUnifiedPostApplyChromeEnabled && isExperimentEnabled('platform_editor_agent_be_streaming')) {
+    if (isUnifiedPostApplyChromeEnabled && (isM1StreamingEnabled || isExperimentEnabled('platform_editor_agent_be_streaming'))) {
       var ranges = getAgentEditChromeRanges(visualJson, visualSteps, tr, view, function (reason, agentType, error) {
         return editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(getAgentEditShimmerNotShownPayload(reason, agentType, error))(tr);
       });
       var requester = getAgentEditRequester(visualJson, view);
       if (ranges.length && requester) {
         // Collab supplies a machine agent type, not a display name; preserve the legacy
-        // uppercase telepointer label.
+        // uppercase telepointer label as the fallback for observers that cannot resolve a
+        // redesigned presentation from the forwarded identity.
         var telepointerLabel = requester.agentType.trim().toUpperCase();
-        tr.setMeta(AGENT_EDIT_CHROME_DATA, _objectSpread(_objectSpread(_objectSpread({}, getAgentEditChromeDynamicConfig()), telepointerLabel ? {
+        tr.setMeta(AGENT_EDIT_CHROME_DATA, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, !isM1StreamingEnabled ? getAgentEditChromeDynamicConfig() : {}), getRemoteAgentChromeIdentity(requester)), telepointerLabel ? {
           telepointerLabel: telepointerLabel
         } : {}), {}, {
           ranges: ranges

package/dist/esm/pm-plugins/main/agent-edit-requester.js

@@ -3,20 +3,34 @@ import { pluginKey } from './plugin-key';
 var isAgentRemoteStep = function isAgentRemoteStep(step) {
   return _typeof(step) === 'object' && step !== null && typeof step.agentType === 'string';
 };
+var asString = function asString(value) {
+  return typeof value === 'string' ? value : undefined;
+};
+export var isStepFromAgentEdit = function isStepFromAgentEdit(step, requester) {
+  if (!isAgentRemoteStep(step)) {
+    return false;
+  }
+  return step.agentType === requester.agentType && asString(step.agentId) === requester.agentId && asString(step.agentSourceId) === requester.agentSourceId && asString(step.agentNamedId) === requester.agentNamedId && asString(step.userId) === requester.actorUserId && asString(step.invocationId) === requester.invocationId;
+};
 export var getAgentEditRequester = function getAgentEditRequester(json, view) {
   var _collabPluginState$ac;
   var agentStep = json.find(isAgentRemoteStep);
   if (!agentStep) {
     return null;
   }
-  var actorUserId = typeof agentStep.userId === 'string' ? agentStep.userId : undefined;
+  var actorUserId = asString(agentStep.userId);
   var collabPluginState = pluginKey.getState(view.state);
   var localSessionId = collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId;
   var localUserId = localSessionId ? collabPluginState === null || collabPluginState === void 0 || (_collabPluginState$ac = collabPluginState.activeParticipants) === null || _collabPluginState$ac === void 0 || (_collabPluginState$ac = _collabPluginState$ac.get(localSessionId)) === null || _collabPluginState$ac === void 0 ? void 0 : _collabPluginState$ac.userId : undefined;
   return {
-    agentId: typeof agentStep.agentId === 'string' ? agentStep.agentId : undefined,
+    agentId: asString(agentStep.agentId),
+    agentName: asString(agentStep.agentName),
+    agentNamedId: asString(agentStep.agentNamedId),
+    agentSourceId: asString(agentStep.agentSourceId),
     agentType: agentStep.agentType,
     actorUserId: actorUserId,
+    invocationId: asString(agentStep.invocationId),
+    isThirdPartyAgent: typeof agentStep.isThirdPartyAgent === 'boolean' ? agentStep.isThirdPartyAgent : undefined,
     isLocalUserRequester: actorUserId !== undefined && localUserId !== undefined && actorUserId === localUserId
   };
 };

package/dist/esm/pm-plugins/main/agent-shimmer-ranges.js

@@ -1,9 +1,11 @@
-import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
 import { getAgentEditChangedRanges } from '@atlaskit/editor-common/collab-agent-edit-changed-ranges';
+import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getCollabState } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getAgentEditRequester, isStepFromAgentEdit } from './agent-edit-requester';
 // When an agent step lands we cover the top-level block(s) it wrote with a skeleton-loader shimmer
 // (plus a Rovo agent telepointer at the end of the range), then remove it on a timer to reveal the
 // content. Gated behind the `platform_editor_agent_be_streaming` experiment. `shimmerDurationMs` and
@@ -280,9 +282,11 @@ export var getAgentEditChromeRanges = function getAgentEditChromeRanges(json, st
     // rolls back unconfirmed local steps before applying these remote steps, and
     // replays the local steps afterwards. Select the actual applied remote indexes;
     // the shared extractor maps them through every later step into tr.doc.
+    var requester = isExperimentEnabled('platform_editor_ai_streaming_ux_experience_m1') ? getAgentEditRequester(json, view) : null;
     var includedStepIndexes = [];
     json.forEach(function (rawStep, index) {
-      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index]) {
+      var belongsToSelectedAgent = !requester || isStepFromAgentEdit(rawStep, requester);
+      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index] && belongsToSelectedAgent) {
         includedStepIndexes.push(rebasedSteps + index);
       }
     });

package/dist/esm/pm-plugins/main/remote-agent-chrome-identity.js

@@ -0,0 +1,20 @@
+/**
+ * Maps collab step attribution onto the shared agent-edit chrome identity fields.
+ *
+ * Step attribution carries the agent's provisioned Atlassian identity account id under `agentId`
+ * (see `getAgentAttribution`), so it is forwarded as `agentIdentityAccountId` rather than as the
+ * agent's own source-system id.
+ */
+export var getRemoteAgentChromeIdentity = function getRemoteAgentChromeIdentity(requester) {
+  var _requester$agentSourc, _requester$agentId, _requester$agentName, _requester$agentNamed;
+  return {
+    actorUserId: requester.actorUserId,
+    invocationId: requester.invocationId,
+    agentId: ((_requester$agentSourc = requester.agentSourceId) === null || _requester$agentSourc === void 0 ? void 0 : _requester$agentSourc.trim()) || undefined,
+    agentIdentityAccountId: ((_requester$agentId = requester.agentId) === null || _requester$agentId === void 0 ? void 0 : _requester$agentId.trim()) || undefined,
+    agentName: ((_requester$agentName = requester.agentName) === null || _requester$agentName === void 0 ? void 0 : _requester$agentName.trim()) || undefined,
+    agentNamedId: ((_requester$agentNamed = requester.agentNamedId) === null || _requester$agentNamed === void 0 ? void 0 : _requester$agentNamed.trim()) || undefined,
+    agentType: requester.agentType.trim() || undefined,
+    isThirdParty: requester.isThirdPartyAgent
+  };
+};

package/dist/esm/pm-plugins/track-and-filter-spamming-steps.js

@@ -1,7 +1,7 @@
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps/analytics';
-import { InsertTypeAheadStep } from '@atlaskit/adf-schema/steps/type-ahead';
 import { LinkMetaStep } from '@atlaskit/adf-schema/steps/link-meta-step';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
+import { InsertTypeAheadStep } from '@atlaskit/adf-schema/steps/type-ahead';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';

package/dist/esm/pm-plugins/track-steps.js

@@ -4,8 +4,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 // delete this file when cleaning up platform_editor_remove_collab_step_metrics
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps/analytics';
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { BatchAttrsStep } from '@atlaskit/adf-schema/steps/batch-attrs-step';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { updateNcsSessionStepMetrics } from './track-step-metrics';

package/dist/types/pm-plugins/main/agent-edit-requester.d.ts

@@ -2,7 +2,13 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface AgentEditRequester {
     actorUserId?: string;
     agentId?: string;
+    agentName?: string;
+    agentNamedId?: string;
+    agentSourceId?: string;
     agentType: string;
+    invocationId?: string;
     isLocalUserRequester: boolean;
+    isThirdPartyAgent?: boolean;
 }
+export declare const isStepFromAgentEdit: (step: unknown, requester: AgentEditRequester) => boolean;
 export declare const getAgentEditRequester: (json: unknown[], view: EditorView) => AgentEditRequester | null;

package/dist/types/pm-plugins/main/remote-agent-chrome-identity.d.ts

@@ -0,0 +1,12 @@
+import type { AgentEditChromeData } from '@atlaskit/editor-common/collab-agent-edit-chrome';
+import type { AgentEditRequester } from './agent-edit-requester';
+type RemoteAgentChromeIdentity = Pick<AgentEditChromeData, 'actorUserId' | 'invocationId' | 'agentId' | 'agentIdentityAccountId' | 'agentName' | 'agentNamedId' | 'agentType' | 'isThirdParty'>;
+/**
+ * Maps collab step attribution onto the shared agent-edit chrome identity fields.
+ *
+ * Step attribution carries the agent's provisioned Atlassian identity account id under `agentId`
+ * (see `getAgentAttribution`), so it is forwarded as `agentIdentityAccountId` rather than as the
+ * agent's own source-system id.
+ */
+export declare const getRemoteAgentChromeIdentity: (requester: AgentEditRequester) => RemoteAgentChromeIdentity;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "20.0.1",
+	"version": "20.1.1",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,13 +32,13 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^200.0.0",
+		"@atlaskit/tmp-editor-statsig": "^201.0.0",
 		"@atlaskit/tokens": "^18.2.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.0.0",
+		"@atlaskit/editor-common": "^123.2.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0"
 	},