@atlaskit/editor-plugin-show-diff 18.0.0 → 19.0.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 19.0.1
+
+### Patch Changes
+
+- [`27d5e74498554`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/27d5e74498554) -
+  Clean up feature gate `platform_editor_reduce_diff_attr_sensitivity`
+- [`6fc3ffdbe2bf3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6fc3ffdbe2bf3) -
+  Use Rovo's registered brand colour in its fixed participant palette slot.
+- Updated dependencies
+
+## 19.0.0
+
+### Minor Changes
+
+- [`9ea47a518fc7c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9ea47a518fc7c) -
+  Cleanup `feature_gate` `platform_editor_diff_inline_mark_changes`. Non-smart diffs permanently use
+  the mark-aware token encoder, so formatting-only edits produce a change, and deleted-side widgets
+  are permanently rendered with an empty mark set so they do not inherit the marks of the
+  surrounding new document.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 18.0.0
 
 ### Patch Changes

package/dist/cjs/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -419,14 +419,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         steppedDoc = result.doc;
       }
     }
-    // Gate the complete attribution fix: mapped positions and step-time nodes are used together.
-    // The fallback deliberately preserves the legacy raw-position lookups for rollout safety.
+    // Mapped positions and step-time nodes are used together so an attr change is attributed to the
+    // node it actually happened on, even when later steps move it.
   } catch (err) {
     _iterator2.e(err);
   } finally {
     _iterator2.f();
   }
-  var attrStepContexts = (0, _fg.fg)('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(function (_ref1) {
+  var attrStepContexts = pendingAttrSteps.flatMap(function (_ref1) {
     var afterNode = _ref1.afterNode,
       attributionKey = _ref1.attributionKey,
       beforeNode = _ref1.beforeNode,
@@ -447,17 +447,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }), {}, {
       step: step
     })];
-  }) : pendingAttrSteps.map(function (_ref10) {
-    var attributionKey = _ref10.attributionKey,
-      step = _ref10.step;
-    return {
-      attributionKey: attributionKey,
-      afterNode: tr.doc.nodeAt(step.pos),
-      beforeNode: originalDoc.nodeAt(step.pos),
-      finalPos: step.pos,
-      originalPos: step.pos,
-      step: step
-    };
   });
 
   // Rather than using .eq() we use a custom function that only checks for structural
@@ -800,13 +789,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // smart path. Only add the legacy step-range decoration when no equivalent changeset range was
   // produced; otherwise the same content receives two inline decorations (and two navigation
   // changes), usually one attribution colour and one default purple decoration.
-  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
+  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref10) {
+    var fromB = _ref10.fromB,
+      toB = _ref10.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref12) {
-    var fromB = _ref12.fromB,
-      toB = _ref12.toB;
     return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
@@ -828,13 +817,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       tagMountContext: tagMountContext
     })));
   });
-  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrStepContexts, originalDoc).filter(function (_ref13) {
+  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrStepContexts, originalDoc).filter(function (_ref12) {
+    var fromB = _ref12.fromB,
+      toB = _ref12.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (_ref13) {
     var fromB = _ref13.fromB,
       toB = _ref13.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref14) {
-    var fromB = _ref14.fromB,
-      toB = _ref14.toB;
     return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
@@ -944,49 +933,49 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change. `tagMountContext` is deliberately absent: it is
 // built once per plugin instance, so it can never be the reason a diff needs recalculating.
-function (_ref15, _ref16) {
-  var _ref20;
+function (_ref14, _ref15) {
+  var _ref19;
+  var _ref16 = (0, _slicedToArray2.default)(_ref14, 1),
+    _ref16$ = _ref16[0],
+    pluginState = _ref16$.pluginState,
+    state = _ref16$.state,
+    colorScheme = _ref16$.colorScheme,
+    intl = _ref16$.intl,
+    activeIndexPos = _ref16$.activeIndexPos,
+    isInverted = _ref16$.isInverted,
+    diffType = _ref16$.diffType,
+    hideDeletedDiffs = _ref16$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref16$.hideAddedDiffsUnderline,
+    showIndicators = _ref16$.showIndicators,
+    smartThresholds = _ref16$.smartThresholds,
+    deletedDiffPlacement = _ref16$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref16$.inlineDeletedDiffPlacement,
+    reveal = _ref16$.reveal;
   var _ref17 = (0, _slicedToArray2.default)(_ref15, 1),
     _ref17$ = _ref17[0],
-    pluginState = _ref17$.pluginState,
-    state = _ref17$.state,
-    colorScheme = _ref17$.colorScheme,
-    intl = _ref17$.intl,
-    activeIndexPos = _ref17$.activeIndexPos,
-    isInverted = _ref17$.isInverted,
-    diffType = _ref17$.diffType,
-    hideDeletedDiffs = _ref17$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref17$.hideAddedDiffsUnderline,
-    showIndicators = _ref17$.showIndicators,
-    smartThresholds = _ref17$.smartThresholds,
-    deletedDiffPlacement = _ref17$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref17$.inlineDeletedDiffPlacement,
-    reveal = _ref17$.reveal;
-  var _ref18 = (0, _slicedToArray2.default)(_ref16, 1),
-    _ref18$ = _ref18[0],
-    lastPluginState = _ref18$.pluginState,
-    lastState = _ref18$.state,
-    lastColorScheme = _ref18$.colorScheme,
-    lastIntl = _ref18$.intl,
-    lastActiveIndexPos = _ref18$.activeIndexPos,
-    lastIsInverted = _ref18$.isInverted,
-    lastDiffType = _ref18$.diffType,
-    lastHideDeletedDiffs = _ref18$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref18$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref18$.showIndicators,
-    lastSmartThresholds = _ref18$.smartThresholds,
-    lastDeletedDiffPlacement = _ref18$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref18$.inlineDeletedDiffPlacement,
-    lastReveal = _ref18$.reveal;
+    lastPluginState = _ref17$.pluginState,
+    lastState = _ref17$.state,
+    lastColorScheme = _ref17$.colorScheme,
+    lastIntl = _ref17$.intl,
+    lastActiveIndexPos = _ref17$.activeIndexPos,
+    lastIsInverted = _ref17$.isInverted,
+    lastDiffType = _ref17$.diffType,
+    lastHideDeletedDiffs = _ref17$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref17$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref17$.showIndicators,
+    lastSmartThresholds = _ref17$.smartThresholds,
+    lastDeletedDiffPlacement = _ref17$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref17$.inlineDeletedDiffPlacement,
+    lastReveal = _ref17$.reveal;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref19;
-    return (_ref19 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+    var _ref18;
+    return (_ref18 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
     // Contributors can arrive after the first calculation; without this, tags never appear.
     (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
     // Turning the reveal on or off changes the emitted styles, so a cached result from the
     // other setting would leave the diff painted in the wrong resting state.
-    (0, _isEqual.default)(reveal, lastReveal)) !== null && _ref19 !== void 0 ? _ref19 : false;
+    (0, _isEqual.default)(reveal, lastReveal)) !== null && _ref18 !== void 0 ? _ref18 : false;
   }
-  return (_ref20 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref20 !== void 0 ? _ref20 : false;
+  return (_ref19 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref19 !== void 0 ? _ref19 : false;
 });

package/dist/cjs/pm-plugins/calculateDiff/selectTokenEncoder.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.selectTokenEncoder = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _markAwareTokenEncoder = require("./markAwareTokenEncoder");
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.
@@ -23,14 +20,8 @@ var selectTokenEncoder = exports.selectTokenEncoder = function selectTokenEncode
       shouldHideMarkOnlyDeletions: false
     };
   }
-  if ((0, _fg.fg)('platform_editor_diff_inline_mark_changes')) {
-    return {
-      tokenEncoder: _markAwareTokenEncoder.markAwareTokenEncoder,
-      shouldHideMarkOnlyDeletions: true
-    };
-  }
   return {
-    tokenEncoder: undefined,
-    shouldHideMarkOnlyDeletions: false
+    tokenEncoder: _markAwareTokenEncoder.markAwareTokenEncoder,
+    shouldHideMarkOnlyDeletions: true
   };
 };

package/dist/cjs/pm-plugins/decorations/colorSchemes/attributions.js

@@ -106,7 +106,6 @@ var getAgentBrandForColor = function getAgentBrandForColor(attribution, contribu
   var agentBrand = contributors === null || contributors === void 0 || (_contributors = contributors[(_getAttributionKey = getAttributionKey(attribution)) !== null && _getAttributionKey !== void 0 ? _getAttributionKey : '']) === null || _contributors === void 0 ? void 0 : _contributors.agentKind;
   return isDiffAgentBrand(agentBrand) ? agentBrand : attribution === null || attribution === void 0 ? void 0 : attribution.agentType;
 };
-
 /**
  * Public contributor list to internal key-addressed record. A contributor whose attribution carries
  * no identity is dropped, since it could never match a step. Later entries win.

package/dist/cjs/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -555,7 +555,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
+  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
     attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
@@ -568,9 +568,12 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), (0, _fg.fg)('platform_editor_diff_inline_mark_changes') && {
-    marks: []
-  }), {}, {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text in the NEW document. `dom` already carries the original marks, so a
+    // formatting change would render the deleted side wrapped in the very mark the edit
+    // introduced — unbolded text shown struck through but still bold.
+    marks: [],
     destroy: function destroy() {
       var _constrainMediaObserv2;
       (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 || _constrainMediaObserv2.disconnect();

package/dist/cjs/pm-plugins/decorations/utils/createDeletedLineBreakWidget.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.createDeletedLineBreakWidget = exports.createDeletedLineBreakDecoration = exports.RETURN_GLYPH = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _decorationKeys = require("../decorationKeys");
 var _wrapBlockNodeView = require("./wrapBlockNodeView");
@@ -100,7 +99,9 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
     diffType: diffType
   }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && side !== undefined && {
     side: side
-  }))), (0, _fg.fg)('platform_editor_diff_inline_mark_changes') && {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text. The glyph carries its own deleted styling and must not inherit them.
     marks: []
   }));
 };

package/dist/cjs/pm-plugins/decorations/utils/getAttrChangeRanges.js

@@ -11,7 +11,6 @@ var _omit = _interopRequireDefault(require("lodash/omit"));
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
 var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _diffableAttrs = require("./diffableAttrs");
 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; }
@@ -75,10 +74,10 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
       return undefined;
     }
     var stepAttrs = getStepAttrs(step);
-    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed.
-    // Keep the legacy payload-based checks until the rollout gate is enabled, and fall back
-    // to them if either step-time node is unavailable.
-    var attrsToCheck = (0, _fg.fg)('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(function (attrName) {
+    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed,
+    // so narrow it to the attrs whose values actually differ. Fall back to the full step
+    // payload if either step-time node is unavailable.
+    var attrsToCheck = beforeNode && afterNode ? stepAttrs.filter(function (attrName) {
       return !(0, _isEqual.default)(beforeNode.attrs[attrName], afterNode.attrs[attrName]);
     }) : stepAttrs;
     var $pos = doc.resolve(finalPos);
@@ -139,12 +138,12 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
       });
     }
 
-    // Extension nodes: highlight changes to user-visible configuration. When enabled,
-    // transient extension metadata is ignored by the comparison below.
+    // Extension nodes: highlight changes to user-visible configuration. Transient extension
+    // metadata is ignored by the comparison below.
     if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && attrsToCheck.some(function (v) {
       return (0, _diffableAttrs.isDiffableAttr)(nodeAtPos.type.name, v);
     })) {
-      if ((0, _fg.fg)('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
+      if (beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
         return undefined;
       }
       var isInline = nodeAtPos.type.name === 'inlineExtension';

package/dist/cjs/ui/ContributorTag/contributorTagController.js

@@ -38,7 +38,12 @@ var chatgptBrandColor = (0, _getThirdPartyAgentColor.getThirdPartyAgentColor)({
 });
 
 /** Brand accents for agent kinds with no ADS token match. New agents opt in by adding an entry. */
-var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread({}, chatgptBrandColor ? {
+var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread({
+  rovo: {
+    background: "var(--ds-background-neutral-bold, #292A2E)",
+    text: "var(--ds-text-inverse, #FFFFFF)"
+  }
+}, chatgptBrandColor ? {
   chatgpt: {
     background: chatgptBrandColor.bold,
     text: chatgptBrandColor.boldText

package/dist/es2019/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -377,9 +377,9 @@ const calculateDiffDecorationsInner = ({
       steppedDoc = result.doc;
     }
   }
-  // Gate the complete attribution fix: mapped positions and step-time nodes are used together.
-  // The fallback deliberately preserves the legacy raw-position lookups for rollout safety.
-  const attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(({
+  // Mapped positions and step-time nodes are used together so an attr change is attributed to the
+  // node it actually happened on, even when later steps move it.
+  const attrStepContexts = pendingAttrSteps.flatMap(({
     afterNode,
     attributionKey,
     beforeNode,
@@ -401,17 +401,7 @@ const calculateDiffDecorationsInner = ({
       }),
       step
     }];
-  }) : pendingAttrSteps.map(({
-    attributionKey,
-    step
-  }) => ({
-    attributionKey,
-    afterNode: tr.doc.nodeAt(step.pos),
-    beforeNode: originalDoc.nodeAt(step.pos),
-    finalPos: step.pos,
-    originalPos: step.pos,
-    step
-  }));
+  });
 
   // Rather than using .eq() we use a custom function that only checks for structural
   // changes and ignores differences in attributes which don't affect decoration positions

package/dist/es2019/pm-plugins/calculateDiff/selectTokenEncoder.js

@@ -1,11 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { markAwareTokenEncoder } from './markAwareTokenEncoder';
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.
@@ -17,14 +14,8 @@ export const selectTokenEncoder = useAttrAwareEncoder => {
       shouldHideMarkOnlyDeletions: false
     };
   }
-  if (fg('platform_editor_diff_inline_mark_changes')) {
-    return {
-      tokenEncoder: markAwareTokenEncoder,
-      shouldHideMarkOnlyDeletions: true
-    };
-  }
   return {
-    tokenEncoder: undefined,
-    shouldHideMarkOnlyDeletions: false
+    tokenEncoder: markAwareTokenEncoder,
+    shouldHideMarkOnlyDeletions: true
   };
 };

package/dist/es2019/pm-plugins/decorations/colorSchemes/attributions.js

@@ -86,7 +86,6 @@ const getAgentBrandForColor = (attribution, contributors) => {
   const agentBrand = contributors === null || contributors === void 0 ? void 0 : (_contributors = contributors[(_getAttributionKey = getAttributionKey(attribution)) !== null && _getAttributionKey !== void 0 ? _getAttributionKey : '']) === null || _contributors === void 0 ? void 0 : _contributors.agentKind;
   return isDiffAgentBrand(agentBrand) ? agentBrand : attribution === null || attribution === void 0 ? void 0 : attribution.agentType;
 };
-
 /**
  * Public contributor list to internal key-addressed record. A contributor whose attribution carries
  * no identity is dropped, since it could never match a step. Later entries win.

package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -560,9 +560,7 @@ export const createNodeChangedDecorationWidget = ({
     // adjacent text in the NEW document. `dom` already carries the original marks, so a
     // formatting change would render the deleted side wrapped in the very mark the edit
     // introduced — unbolded text shown struck through but still bold.
-    ...(fg('platform_editor_diff_inline_mark_changes') && {
-      marks: []
-    }),
+    marks: [],
     destroy: () => {
       var _constrainMediaObserv2;
       (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 ? void 0 : _constrainMediaObserv2.disconnect();

package/dist/es2019/pm-plugins/decorations/utils/createDeletedLineBreakWidget.js

@@ -1,5 +1,4 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
@@ -94,7 +93,5 @@ export const createDeletedLineBreakDecoration = ({
   }),
   // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
   // adjacent text. The glyph carries its own deleted styling and must not inherit them.
-  ...(fg('platform_editor_diff_inline_mark_changes') && {
-    marks: []
-  })
+  marks: []
 });

package/dist/es2019/pm-plugins/decorations/utils/getAttrChangeRanges.js

@@ -3,7 +3,6 @@ import omit from 'lodash/omit';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getRequiredIncludedDiffableAttrs, isDiffableAttr } from './diffableAttrs';
 const filterUndefined = x => !!x;
 
@@ -59,10 +58,10 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
       return undefined;
     }
     const stepAttrs = getStepAttrs(step);
-    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed.
-    // Keep the legacy payload-based checks until the rollout gate is enabled, and fall back
-    // to them if either step-time node is unavailable.
-    const attrsToCheck = fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(attrName => !isEqual(beforeNode.attrs[attrName], afterNode.attrs[attrName])) : stepAttrs;
+    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed,
+    // so narrow it to the attrs whose values actually differ. Fall back to the full step
+    // payload if either step-time node is unavailable.
+    const attrsToCheck = beforeNode && afterNode ? stepAttrs.filter(attrName => !isEqual(beforeNode.attrs[attrName], afterNode.attrs[attrName])) : stepAttrs;
     const $pos = doc.resolve(finalPos);
     const nodeAtPos = doc.nodeAt(finalPos);
     const originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
@@ -120,10 +119,10 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
       };
     }
 
-    // Extension nodes: highlight changes to user-visible configuration. When enabled,
-    // transient extension metadata is ignored by the comparison below.
+    // Extension nodes: highlight changes to user-visible configuration. Transient extension
+    // metadata is ignored by the comparison below.
     if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && attrsToCheck.some(v => isDiffableAttr(nodeAtPos.type.name, v))) {
-      if (fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
+      if (beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
         return undefined;
       }
       const isInline = nodeAtPos.type.name === 'inlineExtension';

package/dist/es2019/ui/ContributorTag/contributorTagController.js

@@ -28,6 +28,10 @@ const chatgptBrandColor = getThirdPartyAgentColor({
 
 /** Brand accents for agent kinds with no ADS token match. New agents opt in by adding an entry. */
 const AGENT_KIND_ACCENT_OVERRIDES = {
+  rovo: {
+    background: "var(--ds-background-neutral-bold, #292A2E)",
+    text: "var(--ds-text-inverse, #FFFFFF)"
+  },
   ...(chatgptBrandColor ? {
     chatgpt: {
       background: chatgptBrandColor.bold,

package/dist/esm/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -412,14 +412,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         steppedDoc = result.doc;
       }
     }
-    // Gate the complete attribution fix: mapped positions and step-time nodes are used together.
-    // The fallback deliberately preserves the legacy raw-position lookups for rollout safety.
+    // Mapped positions and step-time nodes are used together so an attr change is attributed to the
+    // node it actually happened on, even when later steps move it.
   } catch (err) {
     _iterator2.e(err);
   } finally {
     _iterator2.f();
   }
-  var attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(function (_ref1) {
+  var attrStepContexts = pendingAttrSteps.flatMap(function (_ref1) {
     var afterNode = _ref1.afterNode,
       attributionKey = _ref1.attributionKey,
       beforeNode = _ref1.beforeNode,
@@ -440,17 +440,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }), {}, {
       step: step
     })];
-  }) : pendingAttrSteps.map(function (_ref10) {
-    var attributionKey = _ref10.attributionKey,
-      step = _ref10.step;
-    return {
-      attributionKey: attributionKey,
-      afterNode: tr.doc.nodeAt(step.pos),
-      beforeNode: originalDoc.nodeAt(step.pos),
-      finalPos: step.pos,
-      originalPos: step.pos,
-      step: step
-    };
   });
 
   // Rather than using .eq() we use a custom function that only checks for structural
@@ -793,13 +782,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // smart path. Only add the legacy step-range decoration when no equivalent changeset range was
   // produced; otherwise the same content receives two inline decorations (and two navigation
   // changes), usually one attribution colour and one default purple decoration.
-  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref10) {
+    var fromB = _ref10.fromB,
+      toB = _ref10.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref12) {
-    var fromB = _ref12.fromB,
-      toB = _ref12.toB;
     return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
@@ -821,13 +810,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       tagMountContext: tagMountContext
     })));
   });
-  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).filter(function (_ref13) {
+  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).filter(function (_ref12) {
+    var fromB = _ref12.fromB,
+      toB = _ref12.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (_ref13) {
     var fromB = _ref13.fromB,
       toB = _ref13.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref14) {
-    var fromB = _ref14.fromB,
-      toB = _ref14.toB;
     return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
@@ -937,49 +926,49 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
 export var calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change. `tagMountContext` is deliberately absent: it is
 // built once per plugin instance, so it can never be the reason a diff needs recalculating.
-function (_ref15, _ref16) {
-  var _ref20;
+function (_ref14, _ref15) {
+  var _ref19;
+  var _ref16 = _slicedToArray(_ref14, 1),
+    _ref16$ = _ref16[0],
+    pluginState = _ref16$.pluginState,
+    state = _ref16$.state,
+    colorScheme = _ref16$.colorScheme,
+    intl = _ref16$.intl,
+    activeIndexPos = _ref16$.activeIndexPos,
+    isInverted = _ref16$.isInverted,
+    diffType = _ref16$.diffType,
+    hideDeletedDiffs = _ref16$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref16$.hideAddedDiffsUnderline,
+    showIndicators = _ref16$.showIndicators,
+    smartThresholds = _ref16$.smartThresholds,
+    deletedDiffPlacement = _ref16$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref16$.inlineDeletedDiffPlacement,
+    reveal = _ref16$.reveal;
   var _ref17 = _slicedToArray(_ref15, 1),
     _ref17$ = _ref17[0],
-    pluginState = _ref17$.pluginState,
-    state = _ref17$.state,
-    colorScheme = _ref17$.colorScheme,
-    intl = _ref17$.intl,
-    activeIndexPos = _ref17$.activeIndexPos,
-    isInverted = _ref17$.isInverted,
-    diffType = _ref17$.diffType,
-    hideDeletedDiffs = _ref17$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref17$.hideAddedDiffsUnderline,
-    showIndicators = _ref17$.showIndicators,
-    smartThresholds = _ref17$.smartThresholds,
-    deletedDiffPlacement = _ref17$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref17$.inlineDeletedDiffPlacement,
-    reveal = _ref17$.reveal;
-  var _ref18 = _slicedToArray(_ref16, 1),
-    _ref18$ = _ref18[0],
-    lastPluginState = _ref18$.pluginState,
-    lastState = _ref18$.state,
-    lastColorScheme = _ref18$.colorScheme,
-    lastIntl = _ref18$.intl,
-    lastActiveIndexPos = _ref18$.activeIndexPos,
-    lastIsInverted = _ref18$.isInverted,
-    lastDiffType = _ref18$.diffType,
-    lastHideDeletedDiffs = _ref18$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref18$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref18$.showIndicators,
-    lastSmartThresholds = _ref18$.smartThresholds,
-    lastDeletedDiffPlacement = _ref18$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref18$.inlineDeletedDiffPlacement,
-    lastReveal = _ref18$.reveal;
+    lastPluginState = _ref17$.pluginState,
+    lastState = _ref17$.state,
+    lastColorScheme = _ref17$.colorScheme,
+    lastIntl = _ref17$.intl,
+    lastActiveIndexPos = _ref17$.activeIndexPos,
+    lastIsInverted = _ref17$.isInverted,
+    lastDiffType = _ref17$.diffType,
+    lastHideDeletedDiffs = _ref17$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref17$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref17$.showIndicators,
+    lastSmartThresholds = _ref17$.smartThresholds,
+    lastDeletedDiffPlacement = _ref17$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref17$.inlineDeletedDiffPlacement,
+    lastReveal = _ref17$.reveal;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
-    var _ref19;
-    return (_ref19 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+    var _ref18;
+    return (_ref18 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
     // Contributors can arrive after the first calculation; without this, tags never appear.
     isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
     // Turning the reveal on or off changes the emitted styles, so a cached result from the
     // other setting would leave the diff painted in the wrong resting state.
-    isEqual(reveal, lastReveal)) !== null && _ref19 !== void 0 ? _ref19 : false;
+    isEqual(reveal, lastReveal)) !== null && _ref18 !== void 0 ? _ref18 : false;
   }
-  return (_ref20 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref20 !== void 0 ? _ref20 : false;
+  return (_ref19 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref19 !== void 0 ? _ref19 : false;
 });

package/dist/esm/pm-plugins/calculateDiff/selectTokenEncoder.js

@@ -1,11 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { markAwareTokenEncoder } from './markAwareTokenEncoder';
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.
@@ -17,14 +14,8 @@ export var selectTokenEncoder = function selectTokenEncoder(useAttrAwareEncoder)
       shouldHideMarkOnlyDeletions: false
     };
   }
-  if (fg('platform_editor_diff_inline_mark_changes')) {
-    return {
-      tokenEncoder: markAwareTokenEncoder,
-      shouldHideMarkOnlyDeletions: true
-    };
-  }
   return {
-    tokenEncoder: undefined,
-    shouldHideMarkOnlyDeletions: false
+    tokenEncoder: markAwareTokenEncoder,
+    shouldHideMarkOnlyDeletions: true
   };
 };

package/dist/esm/pm-plugins/decorations/colorSchemes/attributions.js

@@ -100,7 +100,6 @@ var getAgentBrandForColor = function getAgentBrandForColor(attribution, contribu
   var agentBrand = contributors === null || contributors === void 0 || (_contributors = contributors[(_getAttributionKey = getAttributionKey(attribution)) !== null && _getAttributionKey !== void 0 ? _getAttributionKey : '']) === null || _contributors === void 0 ? void 0 : _contributors.agentKind;
   return isDiffAgentBrand(agentBrand) ? agentBrand : attribution === null || attribution === void 0 ? void 0 : attribution.agentType;
 };
-
 /**
  * Public contributor list to internal key-addressed record. A contributor whose attribution carries
  * no identity is dropped, since it could never match a step. Later entries win.

package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -548,7 +548,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
+  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
     attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
@@ -561,9 +561,12 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), fg('platform_editor_diff_inline_mark_changes') && {
-    marks: []
-  }), {}, {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text in the NEW document. `dom` already carries the original marks, so a
+    // formatting change would render the deleted side wrapped in the very mark the edit
+    // introduced — unbolded text shown struck through but still bold.
+    marks: [],
     destroy: function destroy() {
       var _constrainMediaObserv2;
       (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 || _constrainMediaObserv2.disconnect();

package/dist/esm/pm-plugins/decorations/utils/createDeletedLineBreakWidget.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
@@ -94,7 +93,9 @@ export var createDeletedLineBreakDecoration = function createDeletedLineBreakDec
     diffType: diffType
   }, isExtendedEnabled(diffType) && side !== undefined && {
     side: side
-  }))), fg('platform_editor_diff_inline_mark_changes') && {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text. The glyph carries its own deleted styling and must not inherit them.
     marks: []
   }));
 };

package/dist/esm/pm-plugins/decorations/utils/getAttrChangeRanges.js

@@ -6,7 +6,6 @@ import omit from 'lodash/omit';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getRequiredIncludedDiffableAttrs, isDiffableAttr } from './diffableAttrs';
 var filterUndefined = function filterUndefined(x) {
   return !!x;
@@ -68,10 +67,10 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
       return undefined;
     }
     var stepAttrs = getStepAttrs(step);
-    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed.
-    // Keep the legacy payload-based checks until the rollout gate is enabled, and fall back
-    // to them if either step-time node is unavailable.
-    var attrsToCheck = fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(function (attrName) {
+    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed,
+    // so narrow it to the attrs whose values actually differ. Fall back to the full step
+    // payload if either step-time node is unavailable.
+    var attrsToCheck = beforeNode && afterNode ? stepAttrs.filter(function (attrName) {
       return !isEqual(beforeNode.attrs[attrName], afterNode.attrs[attrName]);
     }) : stepAttrs;
     var $pos = doc.resolve(finalPos);
@@ -132,12 +131,12 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
       });
     }
 
-    // Extension nodes: highlight changes to user-visible configuration. When enabled,
-    // transient extension metadata is ignored by the comparison below.
+    // Extension nodes: highlight changes to user-visible configuration. Transient extension
+    // metadata is ignored by the comparison below.
     if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && attrsToCheck.some(function (v) {
       return isDiffableAttr(nodeAtPos.type.name, v);
     })) {
-      if (fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
+      if (beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
         return undefined;
       }
       var isInline = nodeAtPos.type.name === 'inlineExtension';

package/dist/esm/ui/ContributorTag/contributorTagController.js

@@ -31,7 +31,12 @@ var chatgptBrandColor = getThirdPartyAgentColor({
 });
 
 /** Brand accents for agent kinds with no ADS token match. New agents opt in by adding an entry. */
-var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread({}, chatgptBrandColor ? {
+var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread({
+  rovo: {
+    background: "var(--ds-background-neutral-bold, #292A2E)",
+    text: "var(--ds-text-inverse, #FFFFFF)"
+  }
+}, chatgptBrandColor ? {
   chatgpt: {
     background: chatgptBrandColor.bold,
     text: chatgptBrandColor.boldText

package/dist/types/pm-plugins/calculateDiff/selectTokenEncoder.d.ts

@@ -2,14 +2,12 @@ import type { TokenEncoder } from 'prosemirror-changeset';
 export type TokenEncoderSelection = {
     /** Non-smart mark-aware path only; lets callers suppress a duplicate deleted side. */
     shouldHideMarkOnlyDeletions: boolean;
-    /** Encoder to hand to `ChangeSet.create`. `undefined` means the library default. */
-    tokenEncoder: TokenEncoder<string | number> | undefined;
+    /** Encoder to hand to `ChangeSet.create`. */
+    tokenEncoder: TokenEncoder<string | number>;
 };
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.

package/dist/types/pm-plugins/decorations/utils/getAttrChangeRanges.d.ts

@@ -5,8 +5,8 @@ import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/trans
 export type InlineAttrChangeNodeName = 'date' | 'emoji' | 'mention' | 'status';
 type AttrChangeStep = AttrStep | SetAttrsStep;
 export type AttrStepContext = {
-    attributionKey?: string;
     afterNode: PMNode | null;
+    attributionKey?: string;
     beforeNode: PMNode | null;
     finalPos: number;
     originalPos?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "18.0.0",
+	"version": "19.0.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,20 +27,20 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.6.0",
 		"@atlaskit/agent-color": "^1.0.0",
-		"@atlaskit/avatar": "^28.0.0",
+		"@atlaskit/avatar": "^29.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
-		"@atlaskit/editor-plugin-accessibility-utils": "^20.0.0",
-		"@atlaskit/editor-plugin-analytics": "^20.0.0",
-		"@atlaskit/editor-plugin-limited-mode": "^17.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^18.0.0",
+		"@atlaskit/editor-plugin-accessibility-utils": "^21.0.0",
+		"@atlaskit/editor-plugin-analytics": "^21.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^18.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^19.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^205.0.0",
-		"@atlaskit/tokens": "^19.0.0",
+		"@atlaskit/tmp-editor-statsig": "^206.0.0",
+		"@atlaskit/tokens": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"bind-event-listener": "^3.0.0",
@@ -53,25 +53,25 @@
 		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^18.3.0",
-		"@atlaskit/editor-core": "^230.0.0",
-		"@atlaskit/editor-json-transformer": "^9.8.0",
+		"@atlaskit/editor-core": "^231.0.0",
+		"@atlaskit/editor-json-transformer": "^10.0.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
-		"@atlaskit/form": "^17.2.0",
+		"@atlaskit/form": "^18.0.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/textarea": "^10.2.0",
 		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
-		"@atlassian/editor-ai-injected-editors": "^34.0.0",
-		"@atlassian/editor-plugin-ai": "^74.0.0",
+		"@atlassian/editor-ai-injected-editors": "^35.0.0",
+		"@atlassian/editor-plugin-ai": "^75.1.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^124.0.0",
+		"@atlaskit/editor-common": "^125.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -99,9 +99,6 @@
 		"confluence_ncs_step_diffing_version_history": {
 			"type": "boolean"
 		},
-		"platform_editor_reduce_diff_attr_sensitivity": {
-			"type": "boolean"
-		},
 		"platform_editor_diff_inline_mark_changes": {
 			"type": "boolean"
 		}

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"extends": "./tsconfig.dev.json",
+	"extends": "./tsconfig.app.json",
 	"compilerOptions": {
 		"disableReferencedProjectLoad": true,
 		"disableSolutionSearching": true