@atlaskit/collab-provider 24.0.0 → 24.0.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/collab-provider
 
+## 24.0.2
+
+### Patch Changes
+
+- [`d7528657a607f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d7528657a607f) -
+  Feature-gate and serialize agent attribution from matching transaction origins onto native-collab
+  steps.
+- Updated dependencies
+
+## 24.0.1
+
+### Patch Changes
+
+- [`e3cd2bd6f960a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3cd2bd6f960a) -
+  Fix agent presence lifecycle behind platform_move_presence_agents.
+- Updated dependencies
+
 ## 24.0.0
 
 ### Patch Changes

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

@@ -4,12 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SINGLE_COLLAB_MODE = exports.ParticipantsService = exports.MULTI_COLLAB_MODE = exports.AGENT_PRESENCE_TTL_MS = void 0;
+exports.SINGLE_COLLAB_MODE = exports.ParticipantsService = exports.MULTI_COLLAB_MODE = exports.AGENT_PRESENCE_TTL_MS = exports.AGENT_PRESENCE_INACTIVE_MS = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _disconnectedReasonMapper = require("../disconnected-reason-mapper");
 var _const = require("../helpers/const");
 var _telepointersHelper = require("./telepointers-helper");
@@ -28,7 +30,8 @@ var MULTI_COLLAB_MODE = exports.MULTI_COLLAB_MODE = 'collab';
 // Sliding inactivity window for agent (AI provider) participants that are added locally from
 // remote agent-authored steps. Reset on each new step for that agent.
 // NOTE: temporary/demonstration lifecycle — long-term expiry may move to NCS.
-var AGENT_PRESENCE_TTL_MS = exports.AGENT_PRESENCE_TTL_MS = 30 * 1000; // 30 seconds
+var AGENT_PRESENCE_INACTIVE_MS = exports.AGENT_PRESENCE_INACTIVE_MS = 30 * 1000; // 30 seconds
+var AGENT_PRESENCE_TTL_MS = exports.AGENT_PRESENCE_TTL_MS = 5 * 60 * 1000; // 5 minutes
 
 /**
  * This service is responsible for handling presence and participant events, as well as sending them on to the editor or NCS.
@@ -138,6 +141,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
       var payload = _this.buildAIProviderPresencePayload(providerId);
       var sessionId = payload.sessionId;
       var existing = _this.participantsState.getBySessionId(sessionId);
+      var wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       var participant = _objectSpread(_objectSpread({}, payload), {}, {
         // `payload.userId` is typed `string | undefined`; here it is always the (string)
         // providerId, so pin it to satisfy ProviderParticipant.userId (string).
@@ -152,26 +156,46 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
       });
       _this.participantsState.setBySessionId(sessionId, participant);
 
-      // Emit only on the first add; a refresh of an already-present agent shouldn't re-emit.
-      if (!existing) {
+      // 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) {
         _this.emitPresence({
           joined: [participant]
         }, 'adding agent participant from remote step');
       }
-      _this.resetAgentPresenceTimer(sessionId);
+      _this.resetAgentPresenceTimer(sessionId, participant.lastActive);
     });
     /**
-     * (Re)starts the sliding 30s inactivity timer for an agent participant. Called on every agent
-     * step so the window slides forward from the agent's most recent activity.
+     * (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.
      */
-    (0, _defineProperty2.default)(this, "resetAgentPresenceTimer", function (sessionId) {
+    (0, _defineProperty2.default)(this, "resetAgentPresenceTimer", function (sessionId, lastActive) {
       var existingTimer = _this.agentPresenceTimers.get(sessionId);
       if (existingTimer !== undefined) {
         clearTimeout(existingTimer);
       }
+      var ttl = (0, _fg.fg)('platform_move_presence_agents') ? AGENT_PRESENCE_TTL_MS : AGENT_PRESENCE_INACTIVE_MS;
+      var delay = Math.max(0, lastActive + ttl - Date.now());
       _this.agentPresenceTimers.set(sessionId, window.setTimeout(function () {
         return _this.removeAgentParticipant(sessionId);
-      }, AGENT_PRESENCE_TTL_MS));
+      }, delay));
+    });
+    (0, _defineProperty2.default)(this, "scheduleRemoteAgentExpiry", function (participant) {
+      if (!(0, _fg.fg)('platform_move_presence_agents') || !(0, _utils.isAIProviderID)(participant.userId) || !Number.isFinite(participant.lastActive)) {
+        return;
+      }
+      _this.resetAgentPresenceTimer(participant.sessionId, participant.lastActive);
+    });
+    (0, _defineProperty2.default)(this, "clearAgentPresenceTimer", function (sessionId) {
+      var timer = _this.agentPresenceTimers.get(sessionId);
+      if (timer !== undefined) {
+        clearTimeout(timer);
+        _this.agentPresenceTimers.delete(sessionId);
+      }
+    });
+    (0, _defineProperty2.default)(this, "hasAgentBecomeActive", function (previous, current) {
+      var now = Date.now();
+      return (0, _fg.fg)('platform_move_presence_agents') && (0, _utils.isAIProviderID)(current.userId) && now - previous.lastActive >= AGENT_PRESENCE_INACTIVE_MS && now - current.lastActive < AGENT_PRESENCE_INACTIVE_MS;
     });
     /**
      * Removes an inactive agent participant once its sliding window elapses and emits the `presence`
@@ -299,11 +323,12 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
             case 6:
               previousParticipant = _this.participantsState.getBySessionId(participant.sessionId);
               _this.participantsState.setBySessionId(participant.sessionId, participant);
+              _this.scheduleRemoteAgentExpiry(participant);
               if (!previousParticipant) {
                 _context2.next = 7;
                 break;
               }
-              if (_this.hasActingUserChanged(previousParticipant, participant)) {
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -376,6 +401,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
                 _context3.next = 3;
                 break;
               }
+              _this.scheduleRemoteAgentExpiry(_participant);
               _this.emitPresence({
                 joined: [_participant]
               }, 'handling updated new agent lazy');
@@ -404,7 +430,8 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
                 lastActive: payload.timestamp
               });
               _this.participantsState.setBySessionId(sessionId, participant);
-              if (_this.hasActingUserChanged(previousParticipant, participant)) {
+              _this.scheduleRemoteAgentExpiry(participant);
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -480,6 +507,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
           });
         });
       }
+      _this.clearAgentPresenceTimer(sessionId);
       _this.participantsState.removeBySessionId(sessionId);
       _this.emitPresence({
         left: [{
@@ -488,7 +516,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
       }, 'participant leaving');
     });
     (0, _defineProperty2.default)(this, "disconnect", function (reason, sessionId) {
-      var left = _this.participantsState.getParticipants();
+      var left = (0, _fg.fg)('platform_move_presence_agents') ? [].concat((0, _toConsumableArray2.default)(_this.participantsState.getParticipants()), (0, _toConsumableArray2.default)(_this.participantsState.getAIProviderParticipants())) : _this.participantsState.getParticipants();
       _this.participantsState.clear();
       // Stop any pending agent presence timers so they don't fire against cleared state.
       _this.clearAgentPresenceTimers();

package/dist/cjs/provider/commit-step.js

@@ -13,6 +13,8 @@ var _const = require("../helpers/const");
 var _types = require("../types");
 var _ncsErrors = require("../errors/ncs-errors");
 var _utils = require("../helpers/utils");
+var _transactionAgentAttribution = require("@atlaskit/editor-common/transaction-agent-attribution");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -36,6 +38,7 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
+    this.shouldSerializeAgentAttribution = (0, _fg.fg)('platform_editor_agentic_step_attribution');
   }
   return (0, _createClass2.default)(CommitStepService, [{
     key: "commitStepQueue",
@@ -75,11 +78,17 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
         _this.lastBroadcastRequestAcked = true;
         logger('reset readyToCommit by timer');
       }, RESET_READYTOCOMMIT_INTERVAL_MS);
-      var stepsWithClientAndUserId = steps.map(function (step) {
+      var stepsWithClientAndUserId = steps.map(function (step, index) {
+        var _stepOrigins$index;
+        var agentAttribution = _this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(_transactionAgentAttribution.AGENT_ATTRIBUTION_META) : undefined;
         return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
           clientId: clientId,
           userId: userId
-        });
+        }, agentAttribution ? _objectSpread({
+          agentType: agentAttribution.agentType
+        }, agentAttribution.agentId !== undefined ? {
+          agentId: agentAttribution.agentId
+        } : {}) : {});
       });
 
       // Mutate steps to ignore expand expand/collapse changes in live pages

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 = "23.1.0";
+var version = exports.version = "24.0.2";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { disconnectedReasonMapper } from '../disconnected-reason-mapper';
 import { EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { telepointerFromStep } from './telepointers-helper';
@@ -15,7 +16,8 @@ export const MULTI_COLLAB_MODE = 'collab';
 // Sliding inactivity window for agent (AI provider) participants that are added locally from
 // remote agent-authored steps. Reset on each new step for that agent.
 // NOTE: temporary/demonstration lifecycle — long-term expiry may move to NCS.
-export const AGENT_PRESENCE_TTL_MS = 30 * 1000; // 30 seconds
+export const AGENT_PRESENCE_INACTIVE_MS = 30 * 1000; // 30 seconds
+export const AGENT_PRESENCE_TTL_MS = 5 * 60 * 1000; // 5 minutes
 
 /**
  * This service is responsible for handling presence and participant events, as well as sending them on to the editor or NCS.
@@ -125,6 +127,7 @@ export class ParticipantsService {
         sessionId
       } = payload;
       const existing = this.participantsState.getBySessionId(sessionId);
+      const wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       const participant = {
         ...payload,
         // `payload.userId` is typed `string | undefined`; here it is always the (string)
@@ -140,24 +143,44 @@ export class ParticipantsService {
       };
       this.participantsState.setBySessionId(sessionId, participant);
 
-      // Emit only on the first add; a refresh of an already-present agent shouldn't re-emit.
-      if (!existing) {
+      // 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) {
         this.emitPresence({
           joined: [participant]
         }, 'adding agent participant from remote step');
       }
-      this.resetAgentPresenceTimer(sessionId);
+      this.resetAgentPresenceTimer(sessionId, participant.lastActive);
     });
     /**
-     * (Re)starts the sliding 30s inactivity timer for an agent participant. Called on every agent
-     * step so the window slides forward from the agent's most recent activity.
+     * (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.
      */
-    _defineProperty(this, "resetAgentPresenceTimer", sessionId => {
+    _defineProperty(this, "resetAgentPresenceTimer", (sessionId, lastActive) => {
       const existingTimer = this.agentPresenceTimers.get(sessionId);
       if (existingTimer !== undefined) {
         clearTimeout(existingTimer);
       }
-      this.agentPresenceTimers.set(sessionId, window.setTimeout(() => this.removeAgentParticipant(sessionId), AGENT_PRESENCE_TTL_MS));
+      const ttl = fg('platform_move_presence_agents') ? AGENT_PRESENCE_TTL_MS : AGENT_PRESENCE_INACTIVE_MS;
+      const delay = Math.max(0, lastActive + ttl - Date.now());
+      this.agentPresenceTimers.set(sessionId, window.setTimeout(() => this.removeAgentParticipant(sessionId), delay));
+    });
+    _defineProperty(this, "scheduleRemoteAgentExpiry", participant => {
+      if (!fg('platform_move_presence_agents') || !isAIProviderID(participant.userId) || !Number.isFinite(participant.lastActive)) {
+        return;
+      }
+      this.resetAgentPresenceTimer(participant.sessionId, participant.lastActive);
+    });
+    _defineProperty(this, "clearAgentPresenceTimer", sessionId => {
+      const timer = this.agentPresenceTimers.get(sessionId);
+      if (timer !== undefined) {
+        clearTimeout(timer);
+        this.agentPresenceTimers.delete(sessionId);
+      }
+    });
+    _defineProperty(this, "hasAgentBecomeActive", (previous, current) => {
+      const now = Date.now();
+      return fg('platform_move_presence_agents') && isAIProviderID(current.userId) && now - previous.lastActive >= AGENT_PRESENCE_INACTIVE_MS && now - current.lastActive < AGENT_PRESENCE_INACTIVE_MS;
     });
     /**
      * Removes an inactive agent participant once its sliding window elapses and emits the `presence`
@@ -252,8 +275,9 @@ export class ParticipantsService {
       }
       const previousParticipant = this.participantsState.getBySessionId(participant.sessionId);
       this.participantsState.setBySessionId(participant.sessionId, participant);
+      this.scheduleRemoteAgentExpiry(participant);
       if (previousParticipant) {
-        if (this.hasActingUserChanged(previousParticipant, participant)) {
+        if (this.hasActingUserChanged(previousParticipant, participant) || this.hasAgentBecomeActive(previousParticipant, participant)) {
           this.emitPresence({
             joined: [participant]
           }, 'handling participant acting user changed event');
@@ -309,6 +333,7 @@ export class ParticipantsService {
         };
         this.participantsState.setBySessionId(sessionId, participant);
         if (isAIProviderID(userId)) {
+          this.scheduleRemoteAgentExpiry(participant);
           this.emitPresence({
             joined: [participant]
           }, 'handling updated new agent lazy');
@@ -340,7 +365,8 @@ export class ParticipantsService {
         lastActive: payload.timestamp
       };
       this.participantsState.setBySessionId(sessionId, participant);
-      if (this.hasActingUserChanged(previousParticipant, participant)) {
+      this.scheduleRemoteAgentExpiry(participant);
+      if (this.hasActingUserChanged(previousParticipant, participant) || this.hasAgentBecomeActive(previousParticipant, participant)) {
         this.emitPresence({
           joined: [participant]
         }, 'handling participant acting user changed event');
@@ -387,6 +413,7 @@ export class ParticipantsService {
           });
         });
       }
+      this.clearAgentPresenceTimer(sessionId);
       this.participantsState.removeBySessionId(sessionId);
       this.emitPresence({
         left: [{
@@ -395,7 +422,7 @@ export class ParticipantsService {
       }, 'participant leaving');
     });
     _defineProperty(this, "disconnect", (reason, sessionId) => {
-      const left = this.participantsState.getParticipants();
+      const left = fg('platform_move_presence_agents') ? [...this.participantsState.getParticipants(), ...this.participantsState.getAIProviderParticipants()] : this.participantsState.getParticipants();
       this.participantsState.clear();
       // Stop any pending agent presence timers so they don't fire against cleared state.
       this.clearAgentPresenceTimers();

package/dist/es2019/provider/commit-step.js

@@ -3,6 +3,8 @@ import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
+import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const logger = createLogger('commit-step', 'black');
 export const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
@@ -23,6 +25,7 @@ export class CommitStepService {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
+    this.shouldSerializeAgentAttribution = fg('platform_editor_agentic_step_attribution');
   }
   commitStepQueue({
     steps,
@@ -60,11 +63,21 @@ export class CommitStepService {
       this.lastBroadcastRequestAcked = true;
       logger('reset readyToCommit by timer');
     }, RESET_READYTOCOMMIT_INTERVAL_MS);
-    let stepsWithClientAndUserId = steps.map(step => ({
-      ...step.toJSON(),
-      clientId,
-      userId
-    }));
+    let stepsWithClientAndUserId = steps.map((step, index) => {
+      var _stepOrigins$index;
+      const agentAttribution = this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 ? void 0 : (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META) : undefined;
+      return {
+        ...step.toJSON(),
+        clientId,
+        userId,
+        ...(agentAttribution ? {
+          agentType: agentAttribution.agentType,
+          ...(agentAttribution.agentId !== undefined ? {
+            agentId: agentAttribution.agentId
+          } : {})
+        } : {})
+      };
+    });
 
     // Mutate steps to ignore expand expand/collapse changes in live pages
     // This is expected to be a temporary divergence from standard editor behaviour

package/dist/es2019/version-wrapper.js

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

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -5,6 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { disconnectedReasonMapper } from '../disconnected-reason-mapper';
 import { EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { telepointerFromStep } from './telepointers-helper';
@@ -21,7 +23,8 @@ export var MULTI_COLLAB_MODE = 'collab';
 // Sliding inactivity window for agent (AI provider) participants that are added locally from
 // remote agent-authored steps. Reset on each new step for that agent.
 // NOTE: temporary/demonstration lifecycle — long-term expiry may move to NCS.
-export var AGENT_PRESENCE_TTL_MS = 30 * 1000; // 30 seconds
+export var AGENT_PRESENCE_INACTIVE_MS = 30 * 1000; // 30 seconds
+export var AGENT_PRESENCE_TTL_MS = 5 * 60 * 1000; // 5 minutes
 
 /**
  * This service is responsible for handling presence and participant events, as well as sending them on to the editor or NCS.
@@ -131,6 +134,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
       var payload = _this.buildAIProviderPresencePayload(providerId);
       var sessionId = payload.sessionId;
       var existing = _this.participantsState.getBySessionId(sessionId);
+      var wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       var participant = _objectSpread(_objectSpread({}, payload), {}, {
         // `payload.userId` is typed `string | undefined`; here it is always the (string)
         // providerId, so pin it to satisfy ProviderParticipant.userId (string).
@@ -145,26 +149,46 @@ export var ParticipantsService = /*#__PURE__*/function () {
       });
       _this.participantsState.setBySessionId(sessionId, participant);
 
-      // Emit only on the first add; a refresh of an already-present agent shouldn't re-emit.
-      if (!existing) {
+      // 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) {
         _this.emitPresence({
           joined: [participant]
         }, 'adding agent participant from remote step');
       }
-      _this.resetAgentPresenceTimer(sessionId);
+      _this.resetAgentPresenceTimer(sessionId, participant.lastActive);
     });
     /**
-     * (Re)starts the sliding 30s inactivity timer for an agent participant. Called on every agent
-     * step so the window slides forward from the agent's most recent activity.
+     * (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.
      */
-    _defineProperty(this, "resetAgentPresenceTimer", function (sessionId) {
+    _defineProperty(this, "resetAgentPresenceTimer", function (sessionId, lastActive) {
       var existingTimer = _this.agentPresenceTimers.get(sessionId);
       if (existingTimer !== undefined) {
         clearTimeout(existingTimer);
       }
+      var ttl = fg('platform_move_presence_agents') ? AGENT_PRESENCE_TTL_MS : AGENT_PRESENCE_INACTIVE_MS;
+      var delay = Math.max(0, lastActive + ttl - Date.now());
       _this.agentPresenceTimers.set(sessionId, window.setTimeout(function () {
         return _this.removeAgentParticipant(sessionId);
-      }, AGENT_PRESENCE_TTL_MS));
+      }, delay));
+    });
+    _defineProperty(this, "scheduleRemoteAgentExpiry", function (participant) {
+      if (!fg('platform_move_presence_agents') || !isAIProviderID(participant.userId) || !Number.isFinite(participant.lastActive)) {
+        return;
+      }
+      _this.resetAgentPresenceTimer(participant.sessionId, participant.lastActive);
+    });
+    _defineProperty(this, "clearAgentPresenceTimer", function (sessionId) {
+      var timer = _this.agentPresenceTimers.get(sessionId);
+      if (timer !== undefined) {
+        clearTimeout(timer);
+        _this.agentPresenceTimers.delete(sessionId);
+      }
+    });
+    _defineProperty(this, "hasAgentBecomeActive", function (previous, current) {
+      var now = Date.now();
+      return fg('platform_move_presence_agents') && isAIProviderID(current.userId) && now - previous.lastActive >= AGENT_PRESENCE_INACTIVE_MS && now - current.lastActive < AGENT_PRESENCE_INACTIVE_MS;
     });
     /**
      * Removes an inactive agent participant once its sliding window elapses and emits the `presence`
@@ -292,11 +316,12 @@ export var ParticipantsService = /*#__PURE__*/function () {
             case 6:
               previousParticipant = _this.participantsState.getBySessionId(participant.sessionId);
               _this.participantsState.setBySessionId(participant.sessionId, participant);
+              _this.scheduleRemoteAgentExpiry(participant);
               if (!previousParticipant) {
                 _context2.next = 7;
                 break;
               }
-              if (_this.hasActingUserChanged(previousParticipant, participant)) {
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -369,6 +394,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
                 _context3.next = 3;
                 break;
               }
+              _this.scheduleRemoteAgentExpiry(_participant);
               _this.emitPresence({
                 joined: [_participant]
               }, 'handling updated new agent lazy');
@@ -397,7 +423,8 @@ export var ParticipantsService = /*#__PURE__*/function () {
                 lastActive: payload.timestamp
               });
               _this.participantsState.setBySessionId(sessionId, participant);
-              if (_this.hasActingUserChanged(previousParticipant, participant)) {
+              _this.scheduleRemoteAgentExpiry(participant);
+              if (_this.hasActingUserChanged(previousParticipant, participant) || _this.hasAgentBecomeActive(previousParticipant, participant)) {
                 _this.emitPresence({
                   joined: [participant]
                 }, 'handling participant acting user changed event');
@@ -473,6 +500,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
           });
         });
       }
+      _this.clearAgentPresenceTimer(sessionId);
       _this.participantsState.removeBySessionId(sessionId);
       _this.emitPresence({
         left: [{
@@ -481,7 +509,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
       }, 'participant leaving');
     });
     _defineProperty(this, "disconnect", function (reason, sessionId) {
-      var left = _this.participantsState.getParticipants();
+      var left = fg('platform_move_presence_agents') ? [].concat(_toConsumableArray(_this.participantsState.getParticipants()), _toConsumableArray(_this.participantsState.getAIProviderParticipants())) : _this.participantsState.getParticipants();
       _this.participantsState.clear();
       // Stop any pending agent presence timers so they don't fire against cleared state.
       _this.clearAgentPresenceTimers();

package/dist/esm/provider/commit-step.js

@@ -8,6 +8,8 @@ import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
+import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var logger = createLogger('commit-step', 'black');
 export var RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
@@ -29,6 +31,7 @@ export var CommitStepService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
+    this.shouldSerializeAgentAttribution = fg('platform_editor_agentic_step_attribution');
   }
   return _createClass(CommitStepService, [{
     key: "commitStepQueue",
@@ -68,11 +71,17 @@ export var CommitStepService = /*#__PURE__*/function () {
         _this.lastBroadcastRequestAcked = true;
         logger('reset readyToCommit by timer');
       }, RESET_READYTOCOMMIT_INTERVAL_MS);
-      var stepsWithClientAndUserId = steps.map(function (step) {
+      var stepsWithClientAndUserId = steps.map(function (step, index) {
+        var _stepOrigins$index;
+        var agentAttribution = _this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META) : undefined;
         return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
           clientId: clientId,
           userId: userId
-        });
+        }, agentAttribution ? _objectSpread({
+          agentType: agentAttribution.agentType
+        }, agentAttribution.agentId !== undefined ? {
+          agentId: agentAttribution.agentId
+        } : {}) : {});
       });
 
       // Mutate steps to ignore expand expand/collapse changes in live pages

package/dist/esm/version-wrapper.js

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

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

@@ -6,6 +6,7 @@ import { ParticipantsState } from './participants-state';
 import type { ParticipantFilter } from './participants-state';
 export declare const SINGLE_COLLAB_MODE = "single";
 export declare const MULTI_COLLAB_MODE = "collab";
+export declare const AGENT_PRESENCE_INACTIVE_MS: number;
 export declare const AGENT_PRESENCE_TTL_MS: number;
 /**
  * This service is responsible for handling presence and participant events, as well as sending them on to the editor or NCS.
@@ -85,10 +86,13 @@ export declare class ParticipantsService {
      */
     upsertAIProviderParticipantLocally: (providerId: string) => void;
     /**
-     * (Re)starts the sliding 30s inactivity timer for an agent participant. Called on every agent
-     * step so the window slides forward from the agent's most recent activity.
+     * (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.
      */
     private resetAgentPresenceTimer;
+    private scheduleRemoteAgentExpiry;
+    private clearAgentPresenceTimer;
+    private hasAgentBecomeActive;
     /**
      * Removes an inactive agent participant once its sliding window elapses and emits the `presence`
      * leave so the facepile drops it.

package/dist/types/provider/commit-step.d.ts

@@ -13,6 +13,7 @@ export declare class CommitStepService {
     private onErrorHandled;
     private readyToCommit;
     private lastBroadcastRequestAcked;
+    private readonly shouldSerializeAgentAttribution;
     /**
      * @param broadcast - Callback for broadcasting events to other clients
      * @param analyticsHelper - Helper for analytics events

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "24.0.0",
+	"version": "24.0.2",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -18,18 +18,18 @@
 		"team": "Editor: Collaboration"
 	},
 	"dependencies": {
-		"@atlaskit/adf-utils": "^20.5.0",
+		"@atlaskit/adf-utils": "^20.6.0",
 		"@atlaskit/analytics-gas-types": "^6.0.0",
 		"@atlaskit/analytics-listeners": "^11.1.0",
 		"@atlaskit/anonymous-assets": "^2.8.0",
 		"@atlaskit/atlassian-context": "^1.1.0",
-		"@atlaskit/editor-json-transformer": "^9.2.0",
+		"@atlaskit/editor-json-transformer": "^9.4.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.5.0",
+		"@atlaskit/react-ufo": "^7.6.0",
 		"@atlaskit/tmp-editor-statsig": "^147.1.0",
 		"@atlaskit/ufo": "^1.0.0",
 		"@atlaskit/util-service-support": "^7.2.0",
@@ -56,12 +56,19 @@
 		}
 	},
 	"devDependencies": {
-		"@atlaskit/adf-schema": "^56.7.0",
+		"@atlaskit/adf-schema": "^57.0.0",
 		"@atlassian/a11y-jest-testing": "^0.15.0",
 		"@atlassian/experiment-test-utils": "^0.2.0",
 		"@atlassian/feature-flags-test-utils": "^1.2.0"
 	},
 	"platform-feature-flags": {
+		"platform_move_presence_agents": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
+		"platform_editor_agentic_step_attribution": {
+			"type": "boolean"
+		},
 		"platform-editor-presence-websocket-only": {
 			"type": "boolean"
 		},
@@ -70,6 +77,6 @@
 		}
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.0.0"
+		"@atlaskit/editor-common": "^119.4.0"
 	}
 }