@atlaskit/editor-plugin-collab-edit 19.0.4 → 19.0.6

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 19.0.6
+
+### Patch Changes
+
+- [`b9d1af39046dc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b9d1af39046dc) -
+  Add a shared applied-step range detector for AI activity. Connect local streaming under
+  platform_editor_ai_streaming_ux_experience_m1 and incoming agent edits under the existing backend
+  streaming rollout to this detector. Refine shared chrome highlights to affected nested textblock
+  content for all existing shared-chrome consumers.
+
+  Preserve node attribute activity through cumulative replacements that retain its markup while
+  changing descendant content. Reuse existing highlight styles and the grouped cursor.
+
+  Expose a transaction-only AI activity action and connect direct orchestrator attribute, move, wrap
+  and remove mutations under platform_editor_ai_streaming_ux_experience_m1. Keep review segments and
+  existing streaming cadence unchanged.
+
+  Reuse lazily built node-identity indexes per transaction snapshot to avoid repeated full-document
+  lookups when changed blocks survive cumulative replacements.
+
+  Let the chrome plugin map and accumulate existing highlights without restamping stale positions
+  from before direct orchestrator mutations.
+
+- Updated dependencies
+
+## 19.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 19.0.4
 
 ### Patch Changes

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

@@ -114,8 +114,9 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
           acknowledgedSteps++;
         }
       }
-      // Slice both visual inputs so remote steps stay aligned with tr.docs. The
-      // full batch still participates in collaboration, presence and attribution.
+      // Keep both remote inputs aligned after removing the acknowledged prefix.
+      // Unified chrome accounts for local rollback steps in the applied transaction;
+      // the full batch still participates in collaboration, presence and attribution.
       visualJson = json.slice(acknowledgedSteps);
       visualSteps = steps.slice(acknowledgedSteps);
     }

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _monitoring = require("@atlaskit/editor-common/monitoring");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
@@ -262,14 +263,42 @@ var getAgentShimmerRanges = exports.getAgentShimmerRanges = function getAgentShi
  * together with these ranges, in `AgentEditChromeData`.
  */
 var getAgentEditChromeRanges = exports.getAgentEditChromeRanges = function getAgentEditChromeRanges(json, steps, tr, view, onNotShown) {
-  // Reuse legacy range derivation with skeleton and telepointer output disabled. A non-zero
-  // highlight duration keeps capture enabled; the returned legacy phase and duration are discarded.
-  return deriveAgentShimmerRanges(json, steps, tr, view, 0, 1, false, onNotShown).map(function (_ref) {
-    var from = _ref.from,
-      to = _ref.to;
-    return {
-      from: from,
-      to: to
-    };
-  });
+  var _json$find2;
+  var agentType = (_json$find2 = json.find(function (step) {
+    return typeof (step === null || step === void 0 ? void 0 : step.agentType) === 'string';
+  })) === null || _json$find2 === void 0 ? void 0 : _json$find2.agentType;
+  if (agentType === undefined) {
+    return [];
+  }
+  var rebasedSteps = Number(tr.getMeta('rebased')) || 0;
+  if (rebasedSteps > 0) {
+    var _getCollabState$uncon2, _getCollabState2;
+    var unconfirmed = (_getCollabState$uncon2 = (_getCollabState2 = (0, _prosemirrorCollab.getCollabState)(view.state)) === null || _getCollabState2 === void 0 ? void 0 : _getCollabState2.unconfirmed) !== null && _getCollabState$uncon2 !== void 0 ? _getCollabState$uncon2 : [];
+    if (unconfirmed.some(function (entry) {
+      return !isPositionNeutralStep(entry.step);
+    })) {
+      onNotShown === null || onNotShown === void 0 || onNotShown('rebasedConcurrentEdit', agentType);
+      return [];
+    }
+  }
+  try {
+    // The caller removes the acknowledged local prefix. receiveTransaction then
+    // 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 includedStepIndexes = [];
+    json.forEach(function (rawStep, index) {
+      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index]) {
+        includedStepIndexes.push(rebasedSteps + index);
+      }
+    });
+    var ranges = (0, _collabAgentEditChangedRanges.getAgentEditChangedRanges)(tr, includedStepIndexes);
+    if (!ranges.length) {
+      onNotShown === null || onNotShown === void 0 || onNotShown('nothingToShow', agentType);
+    }
+    return ranges;
+  } catch (error) {
+    onNotShown === null || onNotShown === void 0 || onNotShown('captureThrew', agentType, error);
+    return [];
+  }
 };

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

@@ -117,8 +117,9 @@ export const applyRemoteSteps = (json, view, userIds, options, editorAnalyticsAp
           acknowledgedSteps++;
         }
       }
-      // Slice both visual inputs so remote steps stay aligned with tr.docs. The
-      // full batch still participates in collaboration, presence and attribution.
+      // Keep both remote inputs aligned after removing the acknowledged prefix.
+      // Unified chrome accounts for local rollback steps in the applied transaction;
+      // the full batch still participates in collaboration, presence and attribution.
       visualJson = json.slice(acknowledgedSteps);
       visualSteps = steps.slice(acknowledgedSteps);
     }

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

@@ -1,4 +1,5 @@
 import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
+import { getAgentEditChangedRanges } from '@atlaskit/editor-common/collab-agent-edit-changed-ranges';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { getCollabState } from '@atlaskit/prosemirror-collab';
@@ -244,13 +245,38 @@ export const getAgentShimmerRanges = (json, steps, tr, view, shimmerDurationMs,
  * together with these ranges, in `AgentEditChromeData`.
  */
 export const getAgentEditChromeRanges = (json, steps, tr, view, onNotShown) => {
-  // Reuse legacy range derivation with skeleton and telepointer output disabled. A non-zero
-  // highlight duration keeps capture enabled; the returned legacy phase and duration are discarded.
-  return deriveAgentShimmerRanges(json, steps, tr, view, 0, 1, false, onNotShown).map(({
-    from,
-    to
-  }) => ({
-    from,
-    to
-  }));
+  var _json$find2;
+  const agentType = (_json$find2 = json.find(step => typeof (step === null || step === void 0 ? void 0 : step.agentType) === 'string')) === null || _json$find2 === void 0 ? void 0 : _json$find2.agentType;
+  if (agentType === undefined) {
+    return [];
+  }
+  const rebasedSteps = Number(tr.getMeta('rebased')) || 0;
+  if (rebasedSteps > 0) {
+    var _getCollabState$uncon2, _getCollabState2;
+    const unconfirmed = (_getCollabState$uncon2 = (_getCollabState2 = getCollabState(view.state)) === null || _getCollabState2 === void 0 ? void 0 : _getCollabState2.unconfirmed) !== null && _getCollabState$uncon2 !== void 0 ? _getCollabState$uncon2 : [];
+    if (unconfirmed.some(entry => !isPositionNeutralStep(entry.step))) {
+      onNotShown === null || onNotShown === void 0 ? void 0 : onNotShown('rebasedConcurrentEdit', agentType);
+      return [];
+    }
+  }
+  try {
+    // The caller removes the acknowledged local prefix. receiveTransaction then
+    // 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 includedStepIndexes = [];
+    json.forEach((rawStep, index) => {
+      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index]) {
+        includedStepIndexes.push(rebasedSteps + index);
+      }
+    });
+    const ranges = getAgentEditChangedRanges(tr, includedStepIndexes);
+    if (!ranges.length) {
+      onNotShown === null || onNotShown === void 0 ? void 0 : onNotShown('nothingToShow', agentType);
+    }
+    return ranges;
+  } catch (error) {
+    onNotShown === null || onNotShown === void 0 ? void 0 : onNotShown('captureThrew', agentType, error);
+    return [];
+  }
 };

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

@@ -107,8 +107,9 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
           acknowledgedSteps++;
         }
       }
-      // Slice both visual inputs so remote steps stay aligned with tr.docs. The
-      // full batch still participates in collaboration, presence and attribution.
+      // Keep both remote inputs aligned after removing the acknowledged prefix.
+      // Unified chrome accounts for local rollback steps in the applied transaction;
+      // the full batch still participates in collaboration, presence and attribution.
       visualJson = json.slice(acknowledgedSteps);
       visualSteps = steps.slice(acknowledgedSteps);
     }

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

@@ -1,4 +1,5 @@
 import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
+import { getAgentEditChangedRanges } from '@atlaskit/editor-common/collab-agent-edit-changed-ranges';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { getCollabState } from '@atlaskit/prosemirror-collab';
@@ -256,14 +257,42 @@ export var getAgentShimmerRanges = function getAgentShimmerRanges(json, steps, t
  * together with these ranges, in `AgentEditChromeData`.
  */
 export var getAgentEditChromeRanges = function getAgentEditChromeRanges(json, steps, tr, view, onNotShown) {
-  // Reuse legacy range derivation with skeleton and telepointer output disabled. A non-zero
-  // highlight duration keeps capture enabled; the returned legacy phase and duration are discarded.
-  return deriveAgentShimmerRanges(json, steps, tr, view, 0, 1, false, onNotShown).map(function (_ref) {
-    var from = _ref.from,
-      to = _ref.to;
-    return {
-      from: from,
-      to: to
-    };
-  });
+  var _json$find2;
+  var agentType = (_json$find2 = json.find(function (step) {
+    return typeof (step === null || step === void 0 ? void 0 : step.agentType) === 'string';
+  })) === null || _json$find2 === void 0 ? void 0 : _json$find2.agentType;
+  if (agentType === undefined) {
+    return [];
+  }
+  var rebasedSteps = Number(tr.getMeta('rebased')) || 0;
+  if (rebasedSteps > 0) {
+    var _getCollabState$uncon2, _getCollabState2;
+    var unconfirmed = (_getCollabState$uncon2 = (_getCollabState2 = getCollabState(view.state)) === null || _getCollabState2 === void 0 ? void 0 : _getCollabState2.unconfirmed) !== null && _getCollabState$uncon2 !== void 0 ? _getCollabState$uncon2 : [];
+    if (unconfirmed.some(function (entry) {
+      return !isPositionNeutralStep(entry.step);
+    })) {
+      onNotShown === null || onNotShown === void 0 || onNotShown('rebasedConcurrentEdit', agentType);
+      return [];
+    }
+  }
+  try {
+    // The caller removes the acknowledged local prefix. receiveTransaction then
+    // 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 includedStepIndexes = [];
+    json.forEach(function (rawStep, index) {
+      if (typeof (rawStep === null || rawStep === void 0 ? void 0 : rawStep.agentType) === 'string' && steps[index]) {
+        includedStepIndexes.push(rebasedSteps + index);
+      }
+    });
+    var ranges = getAgentEditChangedRanges(tr, includedStepIndexes);
+    if (!ranges.length) {
+      onNotShown === null || onNotShown === void 0 || onNotShown('nothingToShow', agentType);
+    }
+    return ranges;
+  } catch (error) {
+    onNotShown === null || onNotShown === void 0 || onNotShown('captureThrew', agentType, error);
+    return [];
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "19.0.4",
+	"version": "19.0.6",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,17 +28,17 @@
 		"@atlaskit/editor-plugin-feature-flags": "^17.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
-		"@atlaskit/frontend-utilities": "^4.4.0",
+		"@atlaskit/frontend-utilities": "^4.5.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^192.0.0",
+		"@atlaskit/tmp-editor-statsig": "^194.0.0",
 		"@atlaskit/tokens": "^16.12.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.3.0",
+		"@atlaskit/editor-common": "^122.6.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0"
 	},