@atlaskit/collab-provider 24.1.9 → 24.2.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/collab-provider
 
+## 24.2.0
+
+### Minor Changes
+
+- [`d96f86ff344b8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d96f86ff344b8) -
+  Use @atlaskit/platform-feature-experiments directly for
+  platform_editor_vc90_transition_expand_icon, platform_editor_add_image_editing,
+  platform_editor_ai_multi_format_streaming, platform_editor_default_toolbar_state,
+  platform_editor_early_exit_return_draft, platform_editor_fix_focus_MediaInsertPicker,
+  platform_editor_fix_table_move_shortcut, platform_editor_menu_radius_update,
+  platform_editor_react19_migration, and show_mentions_in_suggest_reply.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 24.1.10
+
+### Patch Changes
+
+- [`80b19d6c0649f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/80b19d6c0649f) -
+  Preserve agent type metadata in collaboration presence participants behind
+  `platform_move_presence_agents`.
+- Updated dependencies
+
 ## 24.1.9
 
 ### Patch Changes

package/dist/cjs/document/document-service.js

@@ -16,6 +16,7 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _const = require("../helpers/const");
@@ -968,7 +969,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       }
       try {
         var _this$analyticsHelper34;
-        var providerIds = new Set();
+        var agentTypeByProviderId = new Map();
         var agentIds = new Set();
         var agentTypes = new Set();
         var agentStepCount = 0;
@@ -981,12 +982,12 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             if (!providerId) {
               continue;
             }
-            providerIds.add(providerId);
             agentStepCount++;
             var _ref10 = step,
               agentId = _ref10.agentId,
               agentType = _ref10.agentType;
             if (agentType) {
+              agentTypeByProviderId.set(providerId, agentType);
               agentTypes.add(agentType);
             }
             if (agentId) {
@@ -999,7 +1000,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         } finally {
           _iterator.f();
         }
-        if (providerIds.size === 0) {
+        if (agentTypeByProviderId.size === 0) {
           return;
         }
         // Anchor signal that the agent-presence logic kicked off for a received transaction. Fires
@@ -1007,13 +1008,13 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         // non-PII: agent kinds, actor ids, and counts — never document content.
         (_this$analyticsHelper34 = this.analyticsHelper) === null || _this$analyticsHelper34 === void 0 || _this$analyticsHelper34.sendActionEvent(_const.EVENT_ACTION.AGENT_EDIT_RECEIVED, _const.EVENT_STATUS.SUCCESS, {
           agentIds: (0, _toConsumableArray2.default)(agentIds),
-          agentCount: providerIds.size,
+          agentCount: agentTypeByProviderId.size,
           agentTypes: (0, _toConsumableArray2.default)(agentTypes),
           agentStepCount: agentStepCount,
           totalStepCount: steps.length
         });
-        providerIds.forEach(function (providerId) {
-          return _this3.participantsService.upsertAIProviderParticipantLocally(providerId);
+        agentTypeByProviderId.forEach(function (agentType, providerId) {
+          return _this3.participantsService.upsertAIProviderParticipantLocally(providerId, (0, _fg.fg)('platform_move_presence_agents') ? agentType : undefined);
         });
       } catch (error) {
         var _this$analyticsHelper35;

package/dist/cjs/participants/participants-helper.js

@@ -15,11 +15,11 @@ var PARTICIPANT_UPDATE_INTERVAL = exports.PARTICIPANT_UPDATE_INTERVAL = 300 * 10
 var DEFAULT_BATCH_FETCH_SIZE = 25;
 var createParticipantFromPayload = exports.createParticipantFromPayload = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(payload, getUser) {
-    var actingUserId, sessionId, timestamp, clientId, userId, permit, presenceId, presenceActivity, user, participant;
+    var actingUserId, agentType, sessionId, timestamp, clientId, userId, permit, presenceId, presenceActivity, user, participant;
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          actingUserId = payload.actingUserId, sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit, presenceId = payload.presenceId, presenceActivity = payload.presenceActivity;
+          actingUserId = payload.actingUserId, agentType = payload.agentType, sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit, presenceId = payload.presenceId, presenceActivity = payload.presenceActivity;
           _context.next = 1;
           return getUser === null || getUser === void 0 ? void 0 : getUser(userId);
         case 1:
@@ -34,6 +34,7 @@ var createParticipantFromPayload = exports.createParticipantFromPayload = /*#__P
             clientId: clientId,
             permit: permit,
             actingUserId: actingUserId,
+            agentType: agentType,
             isGuest: user === null || user === void 0 ? void 0 : user.isGuest,
             presenceId: presenceId,
             presenceActivity: presenceActivity,
@@ -106,6 +107,7 @@ var fetchParticipants = exports.fetchParticipants = /*#__PURE__*/function () {
                 clientId: participant.clientId,
                 permit: participant.permit,
                 actingUserId: participant.actingUserId,
+                agentType: participant.agentType,
                 presenceId: participant.presenceId,
                 presenceActivity: participant.presenceActivity,
                 isHydrated: true

package/dist/cjs/participants/participants-service.js

@@ -88,12 +88,13 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         }
       }
     });
-    (0, _defineProperty2.default)(this, "buildAIProviderPresencePayload", function (providerId) {
+    (0, _defineProperty2.default)(this, "buildAIProviderPresencePayload", function (providerId, agentType) {
       var defaultPresenceData = _this.getPresenceData();
       var presencePayload = {
         sessionId: "".concat(providerId, "::").concat(defaultPresenceData.sessionId),
         userId: providerId,
         clientId: "".concat(providerId, "::").concat(defaultPresenceData.clientId),
+        agentType: agentType,
         permit: {
           isPermittedToComment: false,
           isPermittedToEdit: false,
@@ -136,11 +137,13 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
      * presence consumer on each streamed step.
      *
      * @param providerId `agent:<aaid|type>` id of the agent
+     * @param agentType kind of the agent that authored the step
      */
-    (0, _defineProperty2.default)(this, "upsertAIProviderParticipantLocally", function (providerId) {
-      var payload = _this.buildAIProviderPresencePayload(providerId);
+    (0, _defineProperty2.default)(this, "upsertAIProviderParticipantLocally", function (providerId, agentType) {
+      var payload = _this.buildAIProviderPresencePayload(providerId, agentType);
       var sessionId = payload.sessionId;
       var existing = _this.participantsState.getBySessionId(sessionId);
+      var hasAgentTypeChanged = (existing === null || existing === void 0 ? void 0 : existing.agentType) !== agentType;
       var wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       var participant = _objectSpread(_objectSpread(_objectSpread({}, payload), (0, _fg.fg)('platform_move_presence_agents') ? {
         presenceActivity: 'editor'
@@ -160,7 +163,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
 
       // Active refreshes stay silent. Re-emit when an inactive agent becomes active so consumers
       // can update its presentation immediately.
-      if (!existing || (0, _fg.fg)('platform_move_presence_agents') && wasInactive) {
+      if (!existing || hasAgentTypeChanged || (0, _fg.fg)('platform_move_presence_agents') && wasInactive) {
         _this.emitPresence({
           joined: [participant]
         }, 'adding agent participant from remote step');
@@ -230,6 +233,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
     (0, _defineProperty2.default)(this, "hasActingUserChanged", function (previous, current) {
       return previous.actingUserId !== current.actingUserId;
     });
+    (0, _defineProperty2.default)(this, "hasAgentTypeChanged", function (previous, current) {
+      return previous.agentType !== current.agentType;
+    });
     (0, _defineProperty2.default)(this, "handleAnonymousUser", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(payload) {
         var _previousParticipant$, _ref2, _previousParticipant$2, _asset2;
@@ -330,7 +336,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
                 _context2.next = 7;
                 break;
               }
-              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentTypeChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -428,12 +434,13 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
               // would handle activity and lastActive changes
               participant = _objectSpread(_objectSpread({}, previousParticipant), {}, {
                 actingUserId: payload.actingUserId,
+                agentType: payload.agentType,
                 presenceActivity: payload.presenceActivity,
                 lastActive: payload.timestamp
               });
               _this.participantsState.setBySessionId(sessionId, participant);
               _this.scheduleRemoteAgentExpiry(participant);
-              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentTypeChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -457,19 +464,23 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
     }());
     (0, _defineProperty2.default)(this, "onParticipantUpdated", /*#__PURE__*/function () {
       var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(payload) {
+        var gatedPayload;
         return _regenerator.default.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              gatedPayload = _objectSpread(_objectSpread({}, payload), {}, {
+                agentType: (0, _fg.fg)('platform_move_presence_agents') ? payload.agentType : undefined
+              });
               if (!_this.batchProps) {
                 _context4.next = 1;
                 break;
               }
-              _this.updateParticipantLazy(payload);
+              _this.updateParticipantLazy(gatedPayload);
               _context4.next = 2;
               break;
             case 1:
               _context4.next = 2;
-              return _this.updateParticipantEager(payload);
+              return _this.updateParticipantEager(gatedPayload);
             case 2:
             case "end":
               return _context4.stop();

package/dist/cjs/provider/index.js

@@ -19,7 +19,6 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _emitter = require("../emitter");
 var _channel = require("../channel");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils = require("../helpers/utils");
 var _analyticsHelper = _interopRequireDefault(require("../analytics/analytics-helper"));
@@ -163,7 +162,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
             offlineReplaceStepsLength: (0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true) ? (0, _getOfflineStepsLength.getOfflineReplaceStepsLength)(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()) : undefined,
             unconfirmedStepsLength: unconfirmedStepsLength
           }, _this.sessionId);
-        } else if ((0, _expValEquals.expValEquals)('platform_editor_early_exit_return_draft', 'isEnabled', true)) {
+        } else if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_early_exit_return_draft')) {
           var _this$initialDraft2;
           // Conditionally run catchup based on CollabDraftMetadata.relevance
           // Only catch up when relevance is 'STALE' or absent

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "24.1.8";
+var version = exports.version = "24.1.10";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/document/document-service.js

@@ -4,6 +4,7 @@ import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform'
 import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
@@ -843,7 +844,7 @@ export class DocumentService {
     }
     try {
       var _this$analyticsHelper34;
-      const providerIds = new Set();
+      const agentTypeByProviderId = new Map();
       const agentIds = new Set();
       const agentTypes = new Set();
       let agentStepCount = 0;
@@ -852,13 +853,13 @@ export class DocumentService {
         if (!providerId) {
           continue;
         }
-        providerIds.add(providerId);
         agentStepCount++;
         const {
           agentId,
           agentType
         } = step;
         if (agentType) {
+          agentTypeByProviderId.set(providerId, agentType);
           agentTypes.add(agentType);
         }
         if (agentId) {
@@ -866,7 +867,7 @@ export class DocumentService {
         }
       }
       // No agent-authored steps in this batch — nothing to register or report.
-      if (providerIds.size === 0) {
+      if (agentTypeByProviderId.size === 0) {
         return;
       }
       // Anchor signal that the agent-presence logic kicked off for a received transaction. Fires
@@ -874,12 +875,12 @@ export class DocumentService {
       // non-PII: agent kinds, actor ids, and counts — never document content.
       (_this$analyticsHelper34 = this.analyticsHelper) === null || _this$analyticsHelper34 === void 0 ? void 0 : _this$analyticsHelper34.sendActionEvent(EVENT_ACTION.AGENT_EDIT_RECEIVED, EVENT_STATUS.SUCCESS, {
         agentIds: [...agentIds],
-        agentCount: providerIds.size,
+        agentCount: agentTypeByProviderId.size,
         agentTypes: [...agentTypes],
         agentStepCount,
         totalStepCount: steps.length
       });
-      providerIds.forEach(providerId => this.participantsService.upsertAIProviderParticipantLocally(providerId));
+      agentTypeByProviderId.forEach((agentType, providerId) => this.participantsService.upsertAIProviderParticipantLocally(providerId, fg('platform_move_presence_agents') ? agentType : undefined));
     } catch (error) {
       var _this$analyticsHelper35;
       (_this$analyticsHelper35 = this.analyticsHelper) === null || _this$analyticsHelper35 === void 0 ? void 0 : _this$analyticsHelper35.sendErrorEvent(error, 'Error while adding agent presence from steps');

package/dist/es2019/participants/participants-helper.js

@@ -6,6 +6,7 @@ const DEFAULT_BATCH_FETCH_SIZE = 25;
 export const createParticipantFromPayload = async (payload, getUser) => {
   const {
     actingUserId,
+    agentType,
     sessionId,
     timestamp,
     clientId,
@@ -25,6 +26,7 @@ export const createParticipantFromPayload = async (payload, getUser) => {
     clientId,
     permit,
     actingUserId,
+    agentType,
     isGuest: user === null || user === void 0 ? void 0 : user.isGuest,
     presenceId: presenceId,
     presenceActivity: presenceActivity,
@@ -80,6 +82,7 @@ export const fetchParticipants = async (participantsState, batchProps) => {
         clientId: participant.clientId,
         permit: participant.permit,
         actingUserId: participant.actingUserId,
+        agentType: participant.agentType,
         presenceId: participant.presenceId,
         presenceActivity: participant.presenceActivity,
         isHydrated: true

package/dist/es2019/participants/participants-service.js

@@ -72,12 +72,13 @@ export class ParticipantsService {
         }
       }
     });
-    _defineProperty(this, "buildAIProviderPresencePayload", providerId => {
+    _defineProperty(this, "buildAIProviderPresencePayload", (providerId, agentType) => {
       const defaultPresenceData = this.getPresenceData();
       const presencePayload = {
         sessionId: `${providerId}::${defaultPresenceData.sessionId}`,
         userId: providerId,
         clientId: `${providerId}::${defaultPresenceData.clientId}`,
+        agentType,
         permit: {
           isPermittedToComment: false,
           isPermittedToEdit: false,
@@ -120,13 +121,15 @@ export class ParticipantsService {
      * presence consumer on each streamed step.
      *
      * @param providerId `agent:<aaid|type>` id of the agent
+     * @param agentType kind of the agent that authored the step
      */
-    _defineProperty(this, "upsertAIProviderParticipantLocally", providerId => {
-      const payload = this.buildAIProviderPresencePayload(providerId);
+    _defineProperty(this, "upsertAIProviderParticipantLocally", (providerId, agentType) => {
+      const payload = this.buildAIProviderPresencePayload(providerId, agentType);
       const {
         sessionId
       } = payload;
       const existing = this.participantsState.getBySessionId(sessionId);
+      const hasAgentTypeChanged = (existing === null || existing === void 0 ? void 0 : existing.agentType) !== agentType;
       const wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       const participant = {
         ...payload,
@@ -148,7 +151,7 @@ export class ParticipantsService {
 
       // Active refreshes stay silent. Re-emit when an inactive agent becomes active so consumers
       // can update its presentation immediately.
-      if (!existing || fg('platform_move_presence_agents') && wasInactive) {
+      if (!existing || hasAgentTypeChanged || fg('platform_move_presence_agents') && wasInactive) {
         this.emitPresence({
           joined: [participant]
         }, 'adding agent participant from remote step');
@@ -214,6 +217,9 @@ export class ParticipantsService {
     _defineProperty(this, "hasActingUserChanged", (previous, current) => {
       return previous.actingUserId !== current.actingUserId;
     });
+    _defineProperty(this, "hasAgentTypeChanged", (previous, current) => {
+      return previous.agentType !== current.agentType;
+    });
     _defineProperty(this, "handleAnonymousUser", async payload => {
       var _previousParticipant$, _ref, _previousParticipant$2, _asset2;
       const {
@@ -280,7 +286,7 @@ export class ParticipantsService {
       this.participantsState.setBySessionId(participant.sessionId, participant);
       this.scheduleRemoteAgentExpiry(participant);
       if (previousParticipant) {
-        if (this.hasActingUserChanged(previousParticipant, participant) || this.hasAgentBecomeActive(previousParticipant, participant)) {
+        if (this.hasActingUserChanged(previousParticipant, participant) || this.hasAgentTypeChanged(previousParticipant, participant) || this.hasAgentBecomeActive(previousParticipant, participant)) {
           this.emitPresence({
             joined: [participant]
           }, 'handling participant acting user changed event');
@@ -364,12 +370,13 @@ export class ParticipantsService {
       const participant = {
         ...previousParticipant,
         actingUserId: payload.actingUserId,
+        agentType: payload.agentType,
         presenceActivity: payload.presenceActivity,
         lastActive: payload.timestamp
       };
       this.participantsState.setBySessionId(sessionId, participant);
       this.scheduleRemoteAgentExpiry(participant);
-      if (this.hasActingUserChanged(previousParticipant, participant) || this.hasAgentBecomeActive(previousParticipant, participant)) {
+      if (this.hasActingUserChanged(previousParticipant, participant) || this.hasAgentTypeChanged(previousParticipant, participant) || this.hasAgentBecomeActive(previousParticipant, participant)) {
         this.emitPresence({
           joined: [participant]
         }, 'handling participant acting user changed event');
@@ -383,10 +390,14 @@ export class ParticipantsService {
       return;
     });
     _defineProperty(this, "onParticipantUpdated", async payload => {
+      const gatedPayload = {
+        ...payload,
+        agentType: fg('platform_move_presence_agents') ? payload.agentType : undefined
+      };
       if (this.batchProps) {
-        this.updateParticipantLazy(payload);
+        this.updateParticipantLazy(gatedPayload);
       } else {
-        await this.updateParticipantEager(payload);
+        await this.updateParticipantEager(gatedPayload);
       }
     });
     /**

package/dist/es2019/provider/index.js

@@ -5,7 +5,6 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createLogger, logObfuscatedSteps } from '../helpers/utils';
 import AnalyticsHelper from '../analytics/analytics-helper';
@@ -143,7 +142,7 @@ export class Provider extends Emitter {
             offlineReplaceStepsLength: editorExperiment('platform_editor_offline_editing_web', true) ? getOfflineReplaceStepsLength(this.documentService.getUnconfirmedSteps(), this.documentService.getUnconfirmedStepsOrigins()) : undefined,
             unconfirmedStepsLength: unconfirmedStepsLength
           }, this.sessionId);
-        } else if (expValEquals('platform_editor_early_exit_return_draft', 'isEnabled', true)) {
+        } else if (isExperimentEnabled('platform_editor_early_exit_return_draft')) {
           var _this$initialDraft, _this$initialDraft$me;
           // Conditionally run catchup based on CollabDraftMetadata.relevance
           // Only catch up when relevance is 'STALE' or absent

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "24.1.8";
+export const version = "24.1.10";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/document/document-service.js

@@ -14,6 +14,7 @@ import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform'
 import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
@@ -962,7 +963,7 @@ export var DocumentService = /*#__PURE__*/function () {
       }
       try {
         var _this$analyticsHelper34;
-        var providerIds = new Set();
+        var agentTypeByProviderId = new Map();
         var agentIds = new Set();
         var agentTypes = new Set();
         var agentStepCount = 0;
@@ -975,12 +976,12 @@ export var DocumentService = /*#__PURE__*/function () {
             if (!providerId) {
               continue;
             }
-            providerIds.add(providerId);
             agentStepCount++;
             var _ref10 = step,
               agentId = _ref10.agentId,
               agentType = _ref10.agentType;
             if (agentType) {
+              agentTypeByProviderId.set(providerId, agentType);
               agentTypes.add(agentType);
             }
             if (agentId) {
@@ -993,7 +994,7 @@ export var DocumentService = /*#__PURE__*/function () {
         } finally {
           _iterator.f();
         }
-        if (providerIds.size === 0) {
+        if (agentTypeByProviderId.size === 0) {
           return;
         }
         // Anchor signal that the agent-presence logic kicked off for a received transaction. Fires
@@ -1001,13 +1002,13 @@ export var DocumentService = /*#__PURE__*/function () {
         // non-PII: agent kinds, actor ids, and counts — never document content.
         (_this$analyticsHelper34 = this.analyticsHelper) === null || _this$analyticsHelper34 === void 0 || _this$analyticsHelper34.sendActionEvent(EVENT_ACTION.AGENT_EDIT_RECEIVED, EVENT_STATUS.SUCCESS, {
           agentIds: _toConsumableArray(agentIds),
-          agentCount: providerIds.size,
+          agentCount: agentTypeByProviderId.size,
           agentTypes: _toConsumableArray(agentTypes),
           agentStepCount: agentStepCount,
           totalStepCount: steps.length
         });
-        providerIds.forEach(function (providerId) {
-          return _this3.participantsService.upsertAIProviderParticipantLocally(providerId);
+        agentTypeByProviderId.forEach(function (agentType, providerId) {
+          return _this3.participantsService.upsertAIProviderParticipantLocally(providerId, fg('platform_move_presence_agents') ? agentType : undefined);
         });
       } catch (error) {
         var _this$analyticsHelper35;

package/dist/esm/participants/participants-helper.js

@@ -8,11 +8,11 @@ export var PARTICIPANT_UPDATE_INTERVAL = 300 * 1000; // 300 seconds
 var DEFAULT_BATCH_FETCH_SIZE = 25;
 export var createParticipantFromPayload = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(payload, getUser) {
-    var actingUserId, sessionId, timestamp, clientId, userId, permit, presenceId, presenceActivity, user, participant;
+    var actingUserId, agentType, sessionId, timestamp, clientId, userId, permit, presenceId, presenceActivity, user, participant;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          actingUserId = payload.actingUserId, sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit, presenceId = payload.presenceId, presenceActivity = payload.presenceActivity;
+          actingUserId = payload.actingUserId, agentType = payload.agentType, sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit, presenceId = payload.presenceId, presenceActivity = payload.presenceActivity;
           _context.next = 1;
           return getUser === null || getUser === void 0 ? void 0 : getUser(userId);
         case 1:
@@ -27,6 +27,7 @@ export var createParticipantFromPayload = /*#__PURE__*/function () {
             clientId: clientId,
             permit: permit,
             actingUserId: actingUserId,
+            agentType: agentType,
             isGuest: user === null || user === void 0 ? void 0 : user.isGuest,
             presenceId: presenceId,
             presenceActivity: presenceActivity,
@@ -99,6 +100,7 @@ export var fetchParticipants = /*#__PURE__*/function () {
                 clientId: participant.clientId,
                 permit: participant.permit,
                 actingUserId: participant.actingUserId,
+                agentType: participant.agentType,
                 presenceId: participant.presenceId,
                 presenceActivity: participant.presenceActivity,
                 isHydrated: true

package/dist/esm/participants/participants-service.js

@@ -81,12 +81,13 @@ export var ParticipantsService = /*#__PURE__*/function () {
         }
       }
     });
-    _defineProperty(this, "buildAIProviderPresencePayload", function (providerId) {
+    _defineProperty(this, "buildAIProviderPresencePayload", function (providerId, agentType) {
       var defaultPresenceData = _this.getPresenceData();
       var presencePayload = {
         sessionId: "".concat(providerId, "::").concat(defaultPresenceData.sessionId),
         userId: providerId,
         clientId: "".concat(providerId, "::").concat(defaultPresenceData.clientId),
+        agentType: agentType,
         permit: {
           isPermittedToComment: false,
           isPermittedToEdit: false,
@@ -129,11 +130,13 @@ export var ParticipantsService = /*#__PURE__*/function () {
      * presence consumer on each streamed step.
      *
      * @param providerId `agent:<aaid|type>` id of the agent
+     * @param agentType kind of the agent that authored the step
      */
-    _defineProperty(this, "upsertAIProviderParticipantLocally", function (providerId) {
-      var payload = _this.buildAIProviderPresencePayload(providerId);
+    _defineProperty(this, "upsertAIProviderParticipantLocally", function (providerId, agentType) {
+      var payload = _this.buildAIProviderPresencePayload(providerId, agentType);
       var sessionId = payload.sessionId;
       var existing = _this.participantsState.getBySessionId(sessionId);
+      var hasAgentTypeChanged = (existing === null || existing === void 0 ? void 0 : existing.agentType) !== agentType;
       var wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       var participant = _objectSpread(_objectSpread(_objectSpread({}, payload), fg('platform_move_presence_agents') ? {
         presenceActivity: 'editor'
@@ -153,7 +156,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
 
       // Active refreshes stay silent. Re-emit when an inactive agent becomes active so consumers
       // can update its presentation immediately.
-      if (!existing || fg('platform_move_presence_agents') && wasInactive) {
+      if (!existing || hasAgentTypeChanged || fg('platform_move_presence_agents') && wasInactive) {
         _this.emitPresence({
           joined: [participant]
         }, 'adding agent participant from remote step');
@@ -223,6 +226,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
     _defineProperty(this, "hasActingUserChanged", function (previous, current) {
       return previous.actingUserId !== current.actingUserId;
     });
+    _defineProperty(this, "hasAgentTypeChanged", function (previous, current) {
+      return previous.agentType !== current.agentType;
+    });
     _defineProperty(this, "handleAnonymousUser", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(payload) {
         var _previousParticipant$, _ref2, _previousParticipant$2, _asset2;
@@ -323,7 +329,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
                 _context2.next = 7;
                 break;
               }
-              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentTypeChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -421,12 +427,13 @@ export var ParticipantsService = /*#__PURE__*/function () {
               // would handle activity and lastActive changes
               participant = _objectSpread(_objectSpread({}, previousParticipant), {}, {
                 actingUserId: payload.actingUserId,
+                agentType: payload.agentType,
                 presenceActivity: payload.presenceActivity,
                 lastActive: payload.timestamp
               });
               _this.participantsState.setBySessionId(sessionId, participant);
               _this.scheduleRemoteAgentExpiry(participant);
-              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentTypeChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -450,19 +457,23 @@ export var ParticipantsService = /*#__PURE__*/function () {
     }());
     _defineProperty(this, "onParticipantUpdated", /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(payload) {
+        var gatedPayload;
         return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              gatedPayload = _objectSpread(_objectSpread({}, payload), {}, {
+                agentType: fg('platform_move_presence_agents') ? payload.agentType : undefined
+              });
               if (!_this.batchProps) {
                 _context4.next = 1;
                 break;
               }
-              _this.updateParticipantLazy(payload);
+              _this.updateParticipantLazy(gatedPayload);
               _context4.next = 2;
               break;
             case 1:
               _context4.next = 2;
-              return _this.updateParticipantEager(payload);
+              return _this.updateParticipantEager(gatedPayload);
             case 2:
             case "end":
               return _context4.stop();

package/dist/esm/provider/index.js

@@ -18,7 +18,6 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createLogger, logObfuscatedSteps } from '../helpers/utils';
 import AnalyticsHelper from '../analytics/analytics-helper';
@@ -157,7 +156,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
             offlineReplaceStepsLength: editorExperiment('platform_editor_offline_editing_web', true) ? getOfflineReplaceStepsLength(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()) : undefined,
             unconfirmedStepsLength: unconfirmedStepsLength
           }, _this.sessionId);
-        } else if (expValEquals('platform_editor_early_exit_return_draft', 'isEnabled', true)) {
+        } else if (isExperimentEnabled('platform_editor_early_exit_return_draft')) {
           var _this$initialDraft2;
           // Conditionally run catchup based on CollabDraftMetadata.relevance
           // Only catch up when relevance is 'STALE' or absent

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "24.1.8";
+export var version = "24.1.10";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/participants/participants-service.d.ts

@@ -83,8 +83,9 @@ export declare class ParticipantsService {
      * presence consumer on each streamed step.
      *
      * @param providerId `agent:<aaid|type>` id of the agent
+     * @param agentType kind of the agent that authored the step
      */
-    upsertAIProviderParticipantLocally: (providerId: string) => void;
+    upsertAIProviderParticipantLocally: (providerId: string, agentType?: string) => void;
     /**
      * (Re)starts the sliding expiry timer for an agent participant. The enriched lifecycle retains
      * agents for five minutes, while the legacy lifecycle keeps its 30-second removal behavior.
@@ -105,6 +106,7 @@ export declare class ParticipantsService {
     private clearAgentPresenceTimers;
     private hasPresenceActivityChanged;
     private hasActingUserChanged;
+    private hasAgentTypeChanged;
     private handleAnonymousUser;
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event

package/dist/types/types.d.ts

@@ -155,6 +155,8 @@ export type BroadcastIncomingPayload = {
 export type PresenceData = {
     /** User identity an agent participant is acting on behalf of, when delegated by a user. */
     actingUserId?: string;
+    /** Agent kind supplied by NCS, such as `convo-ai`, `mcp`, or `twg`. */
+    agentType?: string;
     clientId: number | string;
     /** Permission level the participant holds on the document (view / comment / edit). */
     permit?: UserPermitType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "24.1.9",
+	"version": "24.2.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -23,14 +23,14 @@
 		"@atlaskit/analytics-listeners": "^11.1.0",
 		"@atlaskit/anonymous-assets": "^2.8.0",
 		"@atlaskit/atlassian-context": "^1.1.0",
-		"@atlaskit/editor-json-transformer": "^9.4.0",
+		"@atlaskit/editor-json-transformer": "^9.6.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/prosemirror-collab": "^1.0.0",
-		"@atlaskit/react-ufo": "^7.6.0",
-		"@atlaskit/tmp-editor-statsig": "^155.0.0",
+		"@atlaskit/react-ufo": "^7.7.0",
+		"@atlaskit/tmp-editor-statsig": "^157.0.0",
 		"@atlaskit/ufo": "^1.0.0",
 		"@atlaskit/util-service-support": "^7.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -77,6 +77,6 @@
 		}
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.10.0"
+		"@atlaskit/editor-common": "^119.13.0"
 	}
 }