@atlaskit/editor-plugin-show-diff 21.0.0 → 21.0.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 21.0.2
+
+### Patch Changes
+
+- [`1647c1098fca5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1647c1098fca5) -
+  Highlight changed inline nodes and the edited portion of link display text
+
+## 21.0.1
+
+### Patch Changes
+
+- [`df1aa098e75d3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df1aa098e75d3) -
+  Contributor tags now always render Rovo's real avatar URL when available, instead of the hardcoded
+  Rovo glyph. The glyph was removed; the generic agent fallback is used when no URL is supplied or
+  it fails to load, matching Figma/Lovable/Replit.
+- Updated dependencies
+
 ## 21.0.0
 
 ### Patch Changes

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

@@ -464,11 +464,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       };
     }
   }
-  // The attribute-aware encoder is only needed by the smart classifier and is gated with it.
-  var _selectTokenEncoder = (0, _selectTokenEncoder2.selectTokenEncoder)(diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff')),
+  // The attribute-aware encoder is needed by the smart classifier and is gated with it.
+  // The NCS version-history path also uses it so the main diff calculation detects attribute-only
+  // node replacements, e.g. changing an emoji or mention without changing the node type.
+  var _selectTokenEncoder = (0, _selectTokenEncoder2.selectTokenEncoder)(diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') || (0, _fg.fg)('confluence_ncs_step_diffing_version_history')),
     tokenEncoder = _selectTokenEncoder.tokenEncoder,
     shouldHideMarkOnlyDeletions = _selectTokenEncoder.shouldHideMarkOnlyDeletions;
   var changes;
+  var contentChanges;
   var attributedChanges = [];
   var attributionColors;
   if (attributedChangesetEnabled) {
@@ -482,6 +485,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         stepIndex: stepIndex
       });
     }));
+    contentChanges = changeset.changes;
     attributedChanges = diffType === 'step' ? (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions) : (0, _toConsumableArray2.default)(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
@@ -501,6 +505,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }
   } else {
     var _changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    contentChanges = _changeset.changes;
     changes = getChanges({
       changeset: _changeset,
       originalDoc: originalDoc,
@@ -760,20 +765,52 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   changes.forEach(function (change) {
     createDecorationsForChange(change);
   });
-  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
-  // 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 (_ref10) {
+  // Compare the content outside replacement ranges at matching positions in both documents.
+  // This preserves real formatting edits without highlighting an unchanged link mark reapplied
+  // while editing its display text.
+  var hasUnhighlightedMarkChanges = function hasUnhighlightedMarkChanges(_ref10) {
     var fromB = _ref10.fromB,
       toB = _ref10.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref11) {
+    var from = fromB;
+    var offset = 0;
+    var differs = function differs(to) {
+      return from < to && !originalDoc.slice(from + offset, to + offset).content.eq(tr.doc.slice(from, to).content);
+    };
+    var _iterator5 = _createForOfIteratorHelper(contentChanges),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var change = _step5.value;
+        if (change.fromB >= toB) {
+          break;
+        }
+        if (change.toB > from) {
+          if (differs(change.fromB)) {
+            return true;
+          }
+          from = change.toB;
+        }
+        offset = change.toA - change.toB;
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    return differs(toB);
+  };
+
+  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
+  // smart path and the NCS version-history path. For NCS version history, only skip the step-range
+  // highlight if the main diff covers it or the remaining content has unchanged formatting.
+  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (range) {
     return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
-      return change.fromB === fromB && change.toB === toB;
-    });
+      return change.fromB <= range.fromB && change.toB >= range.toB;
+    }) && hasUnhighlightedMarkChanges(range);
   }).forEach(function (change) {
     var _attributionColors$ge, _attributionColors;
     var changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
@@ -797,8 +834,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     return !isHandledByTable(fromB, toB);
   }).filter(function (_ref13) {
     var fromB = _ref13.fromB,
-      toB = _ref13.toB;
-    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      toB = _ref13.toB,
+      isInline = _ref13.isInline;
+    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
   }).forEach(function (change) {

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

@@ -20,7 +20,8 @@ var typeID = function typeID(type) {
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 var markAwareTokenEncoder = exports.markAwareTokenEncoder = {
   encodeCharacter: function encodeCharacter(char, marks) {

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

@@ -11,7 +11,7 @@ var _markAwareTokenEncoder = require("./markAwareTokenEncoder");
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 var selectTokenEncoder = exports.selectTokenEncoder = function selectTokenEncoder(useAttrAwareEncoder) {
   if (useAttrAwareEncoder) {

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isDiffableAttr = exports.getRequiredIncludedDiffableAttrs = exports.getIncludedDiffableAttrs = exports.getDiffableAttrNames = exports.DIFFABLE_ATTRS_BY_NODE_TYPE = void 0;
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -94,10 +95,13 @@ var getRequiredIncludedDiffableAttrs = exports.getRequiredIncludedDiffableAttrs
  * order is not stable across the two diffed documents.
  */
 var getDiffableAttrNames = exports.getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
+  // Adding a column updates existing widths, ignore this attribute change. Move this into
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
+  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && (0, _fg.fg)('confluence_ncs_step_diffing_version_history');
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(function (name) {
-      return !DEFAULT_EXCLUDED_ATTRS.includes(name);
+      return !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width');
     }).sort();
   }
   if ('include' in rule) {

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

@@ -90,6 +90,11 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     var $pos = doc.resolve(finalPos);
     var nodeAtPos = doc.nodeAt(finalPos);
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
+    var hasChangedAttr = function hasChangedAttr(watchedAttrs) {
+      return attrsToCheck.some(function (attr) {
+        return watchedAttrs.includes(attr) && (!(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !(0, _isEqual.default)(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
+      });
+    };
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -97,9 +102,7 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (attrsToCheck.some(function (v) {
-          return watchedAttrs.includes(v);
-        })) {
+        if (hasChangedAttr(watchedAttrs)) {
           return _objectSpread(_objectSpread({}, attributionKey ? {
             attributionKey: attributionKey
           } : {}), {}, {
@@ -131,9 +134,7 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     // (e.g. note -> warning) — highlight the new panel and, when the original node
     // is resolvable, expose its range (fromA/toA) so the caller can render the old
     // panel as a "deleted" widget for a before/after comparison.
-    if (attrsToCheck.some(function (v) {
-      return panelAttrs.includes(v);
-    }) && nodeAtPos && (0, _nodeTypeUtils.getBaseNodeTypeName)(nodeAtPos.type) === 'panel') {
+    if (hasChangedAttr(panelAttrs) && nodeAtPos && (0, _nodeTypeUtils.getBaseNodeTypeName)(nodeAtPos.type) === 'panel') {
       return _objectSpread(_objectSpread({}, attributionKey ? {
         attributionKey: attributionKey
       } : {}), {}, {
@@ -181,7 +182,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
   .filter(function (range, i, arr) {
-    return arr.findIndex(function (r) {
+    return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? !arr.some(function (r, nextIndex) {
+      return nextIndex > i && r.fromB === range.fromB;
+    }) : arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

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

@@ -30,10 +30,10 @@ var SHOW_DIFF_AGENT_BRANDS = {
 
 /**
  * Brands that prefer the account's real avatar over their fixed glyph when the invoking profile
- * has one. Claude/ChatGPT/Rovo intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS`
- * in `contributorAvatarRenderer.ts`).
+ * has one. Claude/ChatGPT intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS` in
+ * `contributorAvatarRenderer.ts`).
  */
-var AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit']);
+var AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit', 'rovo']);
 
 /** Known external agent types emitted by Confluence's agent identification service that carry
  * no `@atlaskit/agent-color` brand — a generic labelled fallback. */

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

@@ -10,25 +10,24 @@ var _default = require("@atlaskit/avatar/constants/default");
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _contributorTagIcons = require("./contributorTagIcons");
 /**
- * Agent kinds with a custom contributor-tag icon. Figma/Lovable/Replit have no entry here — they
- * always render the real avatar `resolveDiffContributors` supplies, falling back to the generic
- * `aiAgent` glyph (see `showContributorIcon`) on load failure. The declared type stays the wider
+ * Agent kinds with a custom contributor-tag icon, used as a fallback glyph when no `avatarUrl` is
+ * available or its image fails to load (see `showContributorIcon`). Rovo/Figma/Lovable/Replit have
+ * no entry here — they fall back to the generic `aiAgent` glyph. The declared type stays the wider
  * `TagContributor['agentKind']` so indexing below (with `'identified' | 'external'` in play too)
  * stays safely partial.
  */
 var AGENT_KIND_ICONS = {
   claude: 'claude',
-  chatgpt: 'chatgpt',
-  rovo: 'rovoHex'
+  chatgpt: 'chatgpt'
 };
 
 /**
  * Brands that always render their fixed glyph, even when the contributor also carries an
- * `avatarUrl`. Figma/Lovable/Replit are excluded here and use the real avatar when
+ * `avatarUrl`. Rovo/Figma/Lovable/Replit are excluded here and use the real avatar when
  * `resolveDiffContributors` supplies one, falling back to the generic `aiAgent` glyph on load
  * failure.
  */
-var FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt', 'rovo']);
+var FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt']);
 
 /** The size `@atlaskit/avatar`'s `xxsmall` rendered at. */
 var AVATAR_SIZE = _avatarSizes.AVATAR_SIZES.xxsmall;
@@ -125,8 +124,8 @@ var contributorAvatarRenderer = exports.contributorAvatarRenderer = function con
   };
   if (contributor.avatarUrl) {
     var _contributor$agentKin2;
-    // Claude/ChatGPT/Rovo always use their fixed glyph, even when the profile also has an
-    // avatar URL. Other agents (e.g. Figma/Lovable/Replit) and users prefer the real avatar.
+    // Claude/ChatGPT always use their fixed glyph, even when the profile also has an avatar
+    // URL. Other agents (e.g. Rovo/Figma/Lovable/Replit) and users prefer the real avatar.
     var usesFixedGlyph = isAgent && FIXED_GLYPH_AGENT_KINDS.has((_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : 'external');
     if (usesFixedGlyph) {
       showContributorIcon();

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

@@ -10,9 +10,6 @@ exports.getContributorTagIcon = void 0;
  * Neither `@atlaskit/icon`, `@atlaskit/icon-lab` nor `@atlaskit/logo` exposes a raw-SVG entry
  * point, so the markup is copied here rather than kept as a React island for these glyphs. Keep in
  * sync with the sources named on each constant.
- *
- * The Rovo hex is the `brand` appearance, whose `--rovo-*-color` variables resolve to `initial` in
- * both themes — the fallbacks below are the rendered colours, so no theme observer is needed.
  */
 
 /** `@atlaskit/icon/core/person`, at the 16px the avatar renders it. */
@@ -28,9 +25,6 @@ var AI_BOT_ICON_SVG = "<svg width=\"12\" height=\"12\" fill=\"none\" viewBox=\"0
  */
 var AI_AGENT_ICON_SVG = "<svg width=\"12\" height=\"12\" fill=\"none\" viewBox=\"0 0 16 16\" role=\"presentation\" style=\"display:block\"><path fill=\"currentcolor\" fill-rule=\"evenodd\" d=\"M6.971.493a2 2 0 0 1 2.058 0l5 3A2 2 0 0 1 15 5.208v5.584a2 2 0 0 1-.971 1.715l-5 3a2 2 0 0 1-2.058 0l-5-3A2 2 0 0 1 1 10.792V5.208a2 2 0 0 1 .971-1.715zm1.286 1.286a.5.5 0 0 0-.514 0l-5 3a.5.5 0 0 0-.243.429v5.584a.5.5 0 0 0 .243.429l1.098.66a4.25 4.25 0 1 1 8.318 0l1.098-.66a.5.5 0 0 0 .243-.429V5.208a.5.5 0 0 0-.243-.429zM8 8.25a2.75 2.75 0 1 0 0 5.5 2.75 2.75 0 0 0 0-5.5\" clip-rule=\"evenodd\"/></svg>";
 
-/** `RovoHexIcon` from `@atlaskit/logo/rovo-hex/icon`, at the 16px `xxsmall` renders. */
-var ROVO_HEX_ICON_SVG = "<svg width=\"16\" height=\"16\" viewBox=\"0 0 24 24\" role=\"presentation\" style=\"display:block\"><path fill=\"#1868db\" fill-rule=\"evenodd\" d=\"m13.227 16.789-7.154 4.169-3.403-1.96a2.72 2.72 0 0 1-1.362-2.355V7.366c0-.973.518-1.87 1.361-2.354l6.044-3.487-.038.114a3.6 3.6 0 0 0-.172 1.088v9.278c0 1.274.68 2.45 1.786 3.085z\" clip-rule=\"evenodd\"/><path fill=\"#6a9a23\" fill-rule=\"evenodd\" d=\"m11.296 15.671-7.193 4.153 6.607 3.812a2.73 2.73 0 0 0 2.676.026l.048-.033a2.73 2.73 0 0 0 1.232-1.525 2.7 2.7 0 0 0 .127-.822v-3.594z\" clip-rule=\"evenodd\"/><path fill=\"#af59e1\" fill-rule=\"evenodd\" d=\"m21.477 5.003-4.404-2.539-5.904 4.89 2.69 1.556a3.56 3.56 0 0 1 1.785 3.086v9.277a3.6 3.6 0 0 1-.21 1.202l6.044-3.486a2.71 2.71 0 0 0 1.362-2.355V7.357c0-.97-.521-1.87-1.363-2.354\" clip-rule=\"evenodd\"/><path fill=\"#fca700\" fill-rule=\"evenodd\" d=\"M12.74 8.266 9.353 6.312V2.718c0-.283.044-.56.127-.821A2.73 2.73 0 0 1 10.71.372V.37a.4.4 0 0 0 .048-.033 2.73 2.73 0 0 1 2.676.026l6.499 3.75z\" clip-rule=\"evenodd\"/></svg>";
-
 /** Claude hexagon lockup from the brand asset: the hexagon and knot glyph both baked in. */
 var CLAUDE_ICON_SVG = "<svg width=\"16\" height=\"18\" viewBox=\"0 0 16 18\" fill=\"none\" role=\"presentation\" style=\"display:block\"><path fill=\"#D97757\" d=\"M14.5007 3.28903L9.50384 0.402344C8.5736 -0.13506 7.42701 -0.134016 6.49774 0.405082L1.49458 3.30759C0.569434 3.8443 0 4.83297 0 5.90253V11.1804C0 12.2519 0.571497 13.2421 1.49931 13.7781L6.49931 16.6666C7.42787 17.203 8.57213 17.203 9.50069 16.6666L14.5007 13.7781C15.4285 13.2421 16 12.2519 16 11.1804V5.88671C16 4.8152 15.4285 3.82504 14.5007 3.28903Z\"/><path fill=\"#FAF9F6\" d=\"M5.19791 10.055L7.0123 9.03681L7.04267 8.94806L7.0123 8.89907H6.92357L6.62 8.88034L5.58321 8.85232L4.68418 8.815L3.81317 8.76826L3.59367 8.72158L3.38818 8.4507L3.4092 8.31526L3.59367 8.1915L3.85754 8.21485L4.44133 8.25455L5.317 8.31526L5.95216 8.35262L6.89321 8.4507H7.04267L7.06368 8.38999L7.0123 8.35262L6.97261 8.31526L6.06658 7.70112L5.08582 7.05196L4.5721 6.67834L4.29422 6.48919L4.15411 6.31172L4.09339 5.92409L4.34559 5.64621L4.68418 5.66956L4.77058 5.69291L5.11384 5.95678L5.84708 6.52422L6.80448 7.22943L6.94459 7.34618L7.00063 7.30649L7.00763 7.27846L6.94459 7.17338L6.42385 6.23233L5.86809 5.27492L5.62057 4.87795L5.55519 4.63977C5.53183 4.54169 5.51549 4.45996 5.51549 4.35956L5.80271 3.96959L5.9615 3.91821L6.34446 3.96959L6.50558 4.10969L6.74377 4.65378L7.12907 5.51077L7.72686 6.676L7.90199 7.0216L7.99539 7.34152L8.0304 7.43959H8.09113V7.38354L8.14018 6.72737L8.23124 5.92175L8.31999 4.88496L8.35032 4.59307L8.49511 4.24279L8.78232 4.05365L9.00649 4.16107L9.19098 4.42494L9.16533 4.5954L9.05555 5.30762L8.84073 6.42381L8.70062 7.17105H8.78232L8.87574 7.07764L9.25401 6.57559L9.88922 5.78165L10.1694 5.4664L10.4963 5.11847L10.7065 4.95267H11.1035L11.3953 5.38701L11.2646 5.83535L10.8559 6.35375L10.5173 6.79276L10.0316 7.4466L9.72807 7.96966L9.7561 8.0117L9.82849 8.00469L10.926 7.77118L11.5191 7.66376L12.2266 7.54233L12.5466 7.69178L12.5816 7.84356L12.4555 8.15414L11.6989 8.34095L10.8116 8.51842L9.48985 8.83136L9.4735 8.84303L9.49223 8.86637L10.0877 8.92241L10.3422 8.93639H10.9657L12.1262 9.02283L12.4298 9.2236L12.612 9.46881L12.5816 9.6556L12.1146 9.89382L11.4841 9.74434L10.013 9.3941L9.50858 9.26797H9.43849V9.31004L9.85882 9.721L10.6294 10.4169L11.5938 11.3136L11.6429 11.5354L11.5191 11.7106L11.3884 11.6918L10.5407 11.0544L10.2137 10.7672L9.4735 10.1436H9.42451V10.209L9.59495 10.4589L10.4963 11.8133L10.543 12.2289L10.4776 12.3644L10.2441 12.4461L9.98726 12.3994L9.45952 11.6592L8.91544 10.8255L8.47645 10.0783L8.42271 10.1086L8.16352 12.8991L8.04207 13.0416L7.76188 13.149L7.52837 12.9715L7.40461 12.6843L7.52837 12.1168L7.67781 11.3766L7.79925 10.7881L7.90899 10.0573L7.97438 9.81443L7.96971 9.79808L7.916 9.80507L7.36491 10.5617L6.5266 11.6942L5.86342 12.4041L5.70463 12.4671L5.42909 12.3247L5.45477 12.0702L5.60889 11.8436L6.5266 10.6761L7.08002 9.95217L7.4373 9.53421L7.43497 9.47349H7.41395L4.97607 11.0567L4.54174 11.1127L4.35493 10.9376L4.37828 10.6504L4.46702 10.557L5.20024 10.0526L5.19791 10.055Z\"/></svg>";
 
@@ -41,8 +35,7 @@ var markup = {
   aiBot: AI_BOT_ICON_SVG,
   chatgpt: CHATGPT_ICON_SVG,
   claude: CLAUDE_ICON_SVG,
-  person: PERSON_ICON_SVG,
-  rovoHex: ROVO_HEX_ICON_SVG
+  person: PERSON_ICON_SVG
 };
 
 /**

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

@@ -418,12 +418,15 @@ const calculateDiffDecorationsInner = ({
       };
     }
   }
-  // The attribute-aware encoder is only needed by the smart classifier and is gated with it.
+  // The attribute-aware encoder is needed by the smart classifier and is gated with it.
+  // The NCS version-history path also uses it so the main diff calculation detects attribute-only
+  // node replacements, e.g. changing an emoji or mention without changing the node type.
   const {
     tokenEncoder,
     shouldHideMarkOnlyDeletions
-  } = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff'));
+  } = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || fg('confluence_ncs_step_diffing_version_history'));
   let changes;
+  let contentChanges;
   let attributedChanges = [];
   let attributionColors;
   if (attributedChangesetEnabled) {
@@ -434,6 +437,7 @@ const calculateDiffDecorationsInner = ({
       ...attribution,
       stepIndex
     })));
+    contentChanges = changeset.changes;
     attributedChanges = diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : [...changeset.changes];
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
@@ -453,6 +457,7 @@ const calculateDiffDecorationsInner = ({
     }
   } else {
     const changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    contentChanges = changeset.changes;
     changes = getChanges({
       changeset,
       originalDoc,
@@ -686,17 +691,38 @@ const calculateDiffDecorationsInner = ({
   changes.forEach(change => {
     createDecorationsForChange(change);
   });
-  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
-  // 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(({
+  // Compare the content outside replacement ranges at matching positions in both documents.
+  // This preserves real formatting edits without highlighting an unchanged link mark reapplied
+  // while editing its display text.
+  const hasUnhighlightedMarkChanges = ({
     fromB,
     toB
-  }) => !isHandledByTable(fromB, toB)).filter(({
+  }) => {
+    let from = fromB;
+    let offset = 0;
+    const differs = to => from < to && !originalDoc.slice(from + offset, to + offset).content.eq(tr.doc.slice(from, to).content);
+    for (const change of contentChanges) {
+      if (change.fromB >= toB) {
+        break;
+      }
+      if (change.toB > from) {
+        if (differs(change.fromB)) {
+          return true;
+        }
+        from = change.toB;
+      }
+      offset = change.toA - change.toB;
+    }
+    return differs(toB);
+  };
+
+  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
+  // smart path and the NCS version-history path. For NCS version history, only skip the step-range
+  // highlight if the main diff covers it or the remaining content has unchanged formatting.
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(({
     fromB,
     toB
-  }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+  }) => !isHandledByTable(fromB, toB)).filter(range => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB <= range.fromB && change.toB >= range.toB) && hasUnhighlightedMarkChanges(range)).forEach(change => {
     var _attributionColors$ge, _attributionColors;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
     const attributionKey = showContributorTags ? change.attributionKey : undefined;
@@ -718,8 +744,9 @@ const calculateDiffDecorationsInner = ({
     toB
   }) => !isHandledByTable(fromB, toB)).filter(({
     fromB,
-    toB
-  }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+    toB,
+    isInline
+  }) => !fg('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
     var _attributionColors$ge2, _attributionColors2;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge2 = (_attributionColors2 = attributionColors) === null || _attributionColors2 === void 0 ? void 0 : _attributionColors2.get(change.attributionKey)) !== null && _attributionColors$ge2 !== void 0 ? _attributionColors$ge2 : colorScheme : colorScheme;
     const attributionKey = showContributorTags ? change.attributionKey : undefined;

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

@@ -15,7 +15,8 @@ const typeID = type => {
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 export const markAwareTokenEncoder = {
   encodeCharacter: (char, marks) => encodeCharacterWithMarks(char, marks),

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

@@ -5,7 +5,7 @@ import { markAwareTokenEncoder } from './markAwareTokenEncoder';
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 export const selectTokenEncoder = useAttrAwareEncoder => {
   if (useAttrAwareEncoder) {

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

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -88,9 +90,12 @@ export const getRequiredIncludedDiffableAttrs = nodeTypeName => {
  * order is not stable across the two diffed documents.
  */
 export const getDiffableAttrNames = (nodeTypeName, attrs) => {
+  // Adding a column updates existing widths, ignore this attribute change. Move this into
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
+  const ignoreColumnWidth = nodeTypeName === 'layoutColumn' && fg('confluence_ncs_step_diffing_version_history');
   const rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return Object.keys(attrs).filter(name => !DEFAULT_EXCLUDED_ATTRS.includes(name)).sort();
+    return Object.keys(attrs).filter(name => !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width')).sort();
   }
   if ('include' in rule) {
     return rule.include;

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

@@ -74,6 +74,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
     const $pos = doc.resolve(finalPos);
     const nodeAtPos = doc.nodeAt(finalPos);
     const originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
+    const hasChangedAttr = watchedAttrs => attrsToCheck.some(attr => watchedAttrs.includes(attr) && (!fg('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr])));
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -81,7 +82,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
       const nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         const watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (attrsToCheck.some(v => watchedAttrs.includes(v))) {
+        if (hasChangedAttr(watchedAttrs)) {
           return {
             ...(attributionKey ? {
               attributionKey
@@ -114,7 +115,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
     // (e.g. note -> warning) — highlight the new panel and, when the original node
     // is resolvable, expose its range (fromA/toA) so the caller can render the old
     // panel as a "deleted" widget for a before/after comparison.
-    if (attrsToCheck.some(v => panelAttrs.includes(v)) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
+    if (hasChangedAttr(panelAttrs) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
       return {
         ...(attributionKey ? {
           attributionKey
@@ -161,7 +162,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
   // Deduplicate by node position: multiple AttrSteps on the same node
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
-  .filter((range, i, arr) => arr.findIndex(r => r.fromB === range.fromB) === i);
+  .filter((range, i, arr) => fg('confluence_ncs_step_diffing_version_history') ? !arr.some((r, nextIndex) => nextIndex > i && r.fromB === range.fromB) : arr.findIndex(r => r.fromB === range.fromB) === i);
 };
 
 /**

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

@@ -18,10 +18,10 @@ const SHOW_DIFF_AGENT_BRANDS = {
 
 /**
  * Brands that prefer the account's real avatar over their fixed glyph when the invoking profile
- * has one. Claude/ChatGPT/Rovo intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS`
- * in `contributorAvatarRenderer.ts`).
+ * has one. Claude/ChatGPT intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS` in
+ * `contributorAvatarRenderer.ts`).
  */
-const AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit']);
+const AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit', 'rovo']);
 
 /** Known external agent types emitted by Confluence's agent identification service that carry
  * no `@atlaskit/agent-color` brand — a generic labelled fallback. */

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

@@ -5,25 +5,24 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getContributorTagIcon } from './contributorTagIcons';
 
 /**
- * Agent kinds with a custom contributor-tag icon. Figma/Lovable/Replit have no entry here — they
- * always render the real avatar `resolveDiffContributors` supplies, falling back to the generic
- * `aiAgent` glyph (see `showContributorIcon`) on load failure. The declared type stays the wider
+ * Agent kinds with a custom contributor-tag icon, used as a fallback glyph when no `avatarUrl` is
+ * available or its image fails to load (see `showContributorIcon`). Rovo/Figma/Lovable/Replit have
+ * no entry here — they fall back to the generic `aiAgent` glyph. The declared type stays the wider
  * `TagContributor['agentKind']` so indexing below (with `'identified' | 'external'` in play too)
  * stays safely partial.
  */
 const AGENT_KIND_ICONS = {
   claude: 'claude',
-  chatgpt: 'chatgpt',
-  rovo: 'rovoHex'
+  chatgpt: 'chatgpt'
 };
 
 /**
  * Brands that always render their fixed glyph, even when the contributor also carries an
- * `avatarUrl`. Figma/Lovable/Replit are excluded here and use the real avatar when
+ * `avatarUrl`. Rovo/Figma/Lovable/Replit are excluded here and use the real avatar when
  * `resolveDiffContributors` supplies one, falling back to the generic `aiAgent` glyph on load
  * failure.
  */
-const FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt', 'rovo']);
+const FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt']);
 
 /** The size `@atlaskit/avatar`'s `xxsmall` rendered at. */
 const AVATAR_SIZE = AVATAR_SIZES.xxsmall;
@@ -121,8 +120,8 @@ export const contributorAvatarRenderer = ({
   };
   if (contributor.avatarUrl) {
     var _contributor$agentKin2;
-    // Claude/ChatGPT/Rovo always use their fixed glyph, even when the profile also has an
-    // avatar URL. Other agents (e.g. Figma/Lovable/Replit) and users prefer the real avatar.
+    // Claude/ChatGPT always use their fixed glyph, even when the profile also has an avatar
+    // URL. Other agents (e.g. Rovo/Figma/Lovable/Replit) and users prefer the real avatar.
     const usesFixedGlyph = isAgent && FIXED_GLYPH_AGENT_KINDS.has((_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : 'external');
     if (usesFixedGlyph) {
       showContributorIcon();

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

@@ -4,9 +4,6 @@
  * Neither `@atlaskit/icon`, `@atlaskit/icon-lab` nor `@atlaskit/logo` exposes a raw-SVG entry
  * point, so the markup is copied here rather than kept as a React island for these glyphs. Keep in
  * sync with the sources named on each constant.
- *
- * The Rovo hex is the `brand` appearance, whose `--rovo-*-color` variables resolve to `initial` in
- * both themes — the fallbacks below are the rendered colours, so no theme observer is needed.
  */
 
 /** `@atlaskit/icon/core/person`, at the 16px the avatar renders it. */
@@ -22,9 +19,6 @@ const AI_BOT_ICON_SVG = `<svg width="12" height="12" fill="none" viewBox="0 0 16
  */
 const AI_AGENT_ICON_SVG = `<svg width="12" height="12" fill="none" viewBox="0 0 16 16" role="presentation" style="display:block"><path fill="currentcolor" fill-rule="evenodd" d="M6.971.493a2 2 0 0 1 2.058 0l5 3A2 2 0 0 1 15 5.208v5.584a2 2 0 0 1-.971 1.715l-5 3a2 2 0 0 1-2.058 0l-5-3A2 2 0 0 1 1 10.792V5.208a2 2 0 0 1 .971-1.715zm1.286 1.286a.5.5 0 0 0-.514 0l-5 3a.5.5 0 0 0-.243.429v5.584a.5.5 0 0 0 .243.429l1.098.66a4.25 4.25 0 1 1 8.318 0l1.098-.66a.5.5 0 0 0 .243-.429V5.208a.5.5 0 0 0-.243-.429zM8 8.25a2.75 2.75 0 1 0 0 5.5 2.75 2.75 0 0 0 0-5.5" clip-rule="evenodd"/></svg>`;
 
-/** `RovoHexIcon` from `@atlaskit/logo/rovo-hex/icon`, at the 16px `xxsmall` renders. */
-const ROVO_HEX_ICON_SVG = `<svg width="16" height="16" viewBox="0 0 24 24" role="presentation" style="display:block"><path fill="#1868db" fill-rule="evenodd" d="m13.227 16.789-7.154 4.169-3.403-1.96a2.72 2.72 0 0 1-1.362-2.355V7.366c0-.973.518-1.87 1.361-2.354l6.044-3.487-.038.114a3.6 3.6 0 0 0-.172 1.088v9.278c0 1.274.68 2.45 1.786 3.085z" clip-rule="evenodd"/><path fill="#6a9a23" fill-rule="evenodd" d="m11.296 15.671-7.193 4.153 6.607 3.812a2.73 2.73 0 0 0 2.676.026l.048-.033a2.73 2.73 0 0 0 1.232-1.525 2.7 2.7 0 0 0 .127-.822v-3.594z" clip-rule="evenodd"/><path fill="#af59e1" fill-rule="evenodd" d="m21.477 5.003-4.404-2.539-5.904 4.89 2.69 1.556a3.56 3.56 0 0 1 1.785 3.086v9.277a3.6 3.6 0 0 1-.21 1.202l6.044-3.486a2.71 2.71 0 0 0 1.362-2.355V7.357c0-.97-.521-1.87-1.363-2.354" clip-rule="evenodd"/><path fill="#fca700" fill-rule="evenodd" d="M12.74 8.266 9.353 6.312V2.718c0-.283.044-.56.127-.821A2.73 2.73 0 0 1 10.71.372V.37a.4.4 0 0 0 .048-.033 2.73 2.73 0 0 1 2.676.026l6.499 3.75z" clip-rule="evenodd"/></svg>`;
-
 /** Claude hexagon lockup from the brand asset: the hexagon and knot glyph both baked in. */
 const CLAUDE_ICON_SVG = `<svg width="16" height="18" viewBox="0 0 16 18" fill="none" role="presentation" style="display:block"><path fill="#D97757" d="M14.5007 3.28903L9.50384 0.402344C8.5736 -0.13506 7.42701 -0.134016 6.49774 0.405082L1.49458 3.30759C0.569434 3.8443 0 4.83297 0 5.90253V11.1804C0 12.2519 0.571497 13.2421 1.49931 13.7781L6.49931 16.6666C7.42787 17.203 8.57213 17.203 9.50069 16.6666L14.5007 13.7781C15.4285 13.2421 16 12.2519 16 11.1804V5.88671C16 4.8152 15.4285 3.82504 14.5007 3.28903Z"/><path fill="#FAF9F6" d="M5.19791 10.055L7.0123 9.03681L7.04267 8.94806L7.0123 8.89907H6.92357L6.62 8.88034L5.58321 8.85232L4.68418 8.815L3.81317 8.76826L3.59367 8.72158L3.38818 8.4507L3.4092 8.31526L3.59367 8.1915L3.85754 8.21485L4.44133 8.25455L5.317 8.31526L5.95216 8.35262L6.89321 8.4507H7.04267L7.06368 8.38999L7.0123 8.35262L6.97261 8.31526L6.06658 7.70112L5.08582 7.05196L4.5721 6.67834L4.29422 6.48919L4.15411 6.31172L4.09339 5.92409L4.34559 5.64621L4.68418 5.66956L4.77058 5.69291L5.11384 5.95678L5.84708 6.52422L6.80448 7.22943L6.94459 7.34618L7.00063 7.30649L7.00763 7.27846L6.94459 7.17338L6.42385 6.23233L5.86809 5.27492L5.62057 4.87795L5.55519 4.63977C5.53183 4.54169 5.51549 4.45996 5.51549 4.35956L5.80271 3.96959L5.9615 3.91821L6.34446 3.96959L6.50558 4.10969L6.74377 4.65378L7.12907 5.51077L7.72686 6.676L7.90199 7.0216L7.99539 7.34152L8.0304 7.43959H8.09113V7.38354L8.14018 6.72737L8.23124 5.92175L8.31999 4.88496L8.35032 4.59307L8.49511 4.24279L8.78232 4.05365L9.00649 4.16107L9.19098 4.42494L9.16533 4.5954L9.05555 5.30762L8.84073 6.42381L8.70062 7.17105H8.78232L8.87574 7.07764L9.25401 6.57559L9.88922 5.78165L10.1694 5.4664L10.4963 5.11847L10.7065 4.95267H11.1035L11.3953 5.38701L11.2646 5.83535L10.8559 6.35375L10.5173 6.79276L10.0316 7.4466L9.72807 7.96966L9.7561 8.0117L9.82849 8.00469L10.926 7.77118L11.5191 7.66376L12.2266 7.54233L12.5466 7.69178L12.5816 7.84356L12.4555 8.15414L11.6989 8.34095L10.8116 8.51842L9.48985 8.83136L9.4735 8.84303L9.49223 8.86637L10.0877 8.92241L10.3422 8.93639H10.9657L12.1262 9.02283L12.4298 9.2236L12.612 9.46881L12.5816 9.6556L12.1146 9.89382L11.4841 9.74434L10.013 9.3941L9.50858 9.26797H9.43849V9.31004L9.85882 9.721L10.6294 10.4169L11.5938 11.3136L11.6429 11.5354L11.5191 11.7106L11.3884 11.6918L10.5407 11.0544L10.2137 10.7672L9.4735 10.1436H9.42451V10.209L9.59495 10.4589L10.4963 11.8133L10.543 12.2289L10.4776 12.3644L10.2441 12.4461L9.98726 12.3994L9.45952 11.6592L8.91544 10.8255L8.47645 10.0783L8.42271 10.1086L8.16352 12.8991L8.04207 13.0416L7.76188 13.149L7.52837 12.9715L7.40461 12.6843L7.52837 12.1168L7.67781 11.3766L7.79925 10.7881L7.90899 10.0573L7.97438 9.81443L7.96971 9.79808L7.916 9.80507L7.36491 10.5617L6.5266 11.6942L5.86342 12.4041L5.70463 12.4671L5.42909 12.3247L5.45477 12.0702L5.60889 11.8436L6.5266 10.6761L7.08002 9.95217L7.4373 9.53421L7.43497 9.47349H7.41395L4.97607 11.0567L4.54174 11.1127L4.35493 10.9376L4.37828 10.6504L4.46702 10.557L5.20024 10.0526L5.19791 10.055Z"/></svg>`;
 
@@ -35,8 +29,7 @@ const markup = {
   aiBot: AI_BOT_ICON_SVG,
   chatgpt: CHATGPT_ICON_SVG,
   claude: CLAUDE_ICON_SVG,
-  person: PERSON_ICON_SVG,
-  rovoHex: ROVO_HEX_ICON_SVG
+  person: PERSON_ICON_SVG
 };
 
 /**

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

@@ -457,11 +457,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       };
     }
   }
-  // The attribute-aware encoder is only needed by the smart classifier and is gated with it.
-  var _selectTokenEncoder = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff')),
+  // The attribute-aware encoder is needed by the smart classifier and is gated with it.
+  // The NCS version-history path also uses it so the main diff calculation detects attribute-only
+  // node replacements, e.g. changing an emoji or mention without changing the node type.
+  var _selectTokenEncoder = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || fg('confluence_ncs_step_diffing_version_history')),
     tokenEncoder = _selectTokenEncoder.tokenEncoder,
     shouldHideMarkOnlyDeletions = _selectTokenEncoder.shouldHideMarkOnlyDeletions;
   var changes;
+  var contentChanges;
   var attributedChanges = [];
   var attributionColors;
   if (attributedChangesetEnabled) {
@@ -475,6 +478,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         stepIndex: stepIndex
       });
     }));
+    contentChanges = changeset.changes;
     attributedChanges = diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : _toConsumableArray(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
@@ -494,6 +498,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }
   } else {
     var _changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    contentChanges = _changeset.changes;
     changes = getChanges({
       changeset: _changeset,
       originalDoc: originalDoc,
@@ -753,20 +758,52 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   changes.forEach(function (change) {
     createDecorationsForChange(change);
   });
-  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
-  // 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 (_ref10) {
+  // Compare the content outside replacement ranges at matching positions in both documents.
+  // This preserves real formatting edits without highlighting an unchanged link mark reapplied
+  // while editing its display text.
+  var hasUnhighlightedMarkChanges = function hasUnhighlightedMarkChanges(_ref10) {
     var fromB = _ref10.fromB,
       toB = _ref10.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref11) {
+    var from = fromB;
+    var offset = 0;
+    var differs = function differs(to) {
+      return from < to && !originalDoc.slice(from + offset, to + offset).content.eq(tr.doc.slice(from, to).content);
+    };
+    var _iterator5 = _createForOfIteratorHelper(contentChanges),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var change = _step5.value;
+        if (change.fromB >= toB) {
+          break;
+        }
+        if (change.toB > from) {
+          if (differs(change.fromB)) {
+            return true;
+          }
+          from = change.toB;
+        }
+        offset = change.toA - change.toB;
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    return differs(toB);
+  };
+
+  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
+  // smart path and the NCS version-history path. For NCS version history, only skip the step-range
+  // highlight if the main diff covers it or the remaining content has unchanged formatting.
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (range) {
     return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
-      return change.fromB === fromB && change.toB === toB;
-    });
+      return change.fromB <= range.fromB && change.toB >= range.toB;
+    }) && hasUnhighlightedMarkChanges(range);
   }).forEach(function (change) {
     var _attributionColors$ge, _attributionColors;
     var changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
@@ -790,8 +827,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     return !isHandledByTable(fromB, toB);
   }).filter(function (_ref13) {
     var fromB = _ref13.fromB,
-      toB = _ref13.toB;
-    return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      toB = _ref13.toB,
+      isInline = _ref13.isInline;
+    return !fg('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
   }).forEach(function (change) {

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

@@ -15,7 +15,8 @@ var typeID = function typeID(type) {
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 export var markAwareTokenEncoder = {
   encodeCharacter: function encodeCharacter(char, marks) {

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

@@ -5,7 +5,7 @@ import { markAwareTokenEncoder } from './markAwareTokenEncoder';
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 export var selectTokenEncoder = function selectTokenEncoder(useAttrAwareEncoder) {
   if (useAttrAwareEncoder) {

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

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -88,10 +90,13 @@ export var getRequiredIncludedDiffableAttrs = function getRequiredIncludedDiffab
  * order is not stable across the two diffed documents.
  */
 export var getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
+  // Adding a column updates existing widths, ignore this attribute change. Move this into
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
+  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && fg('confluence_ncs_step_diffing_version_history');
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(function (name) {
-      return !DEFAULT_EXCLUDED_ATTRS.includes(name);
+      return !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width');
     }).sort();
   }
   if ('include' in rule) {

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

@@ -83,6 +83,11 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     var $pos = doc.resolve(finalPos);
     var nodeAtPos = doc.nodeAt(finalPos);
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
+    var hasChangedAttr = function hasChangedAttr(watchedAttrs) {
+      return attrsToCheck.some(function (attr) {
+        return watchedAttrs.includes(attr) && (!fg('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
+      });
+    };
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -90,9 +95,7 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (attrsToCheck.some(function (v) {
-          return watchedAttrs.includes(v);
-        })) {
+        if (hasChangedAttr(watchedAttrs)) {
           return _objectSpread(_objectSpread({}, attributionKey ? {
             attributionKey: attributionKey
           } : {}), {}, {
@@ -124,9 +127,7 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     // (e.g. note -> warning) — highlight the new panel and, when the original node
     // is resolvable, expose its range (fromA/toA) so the caller can render the old
     // panel as a "deleted" widget for a before/after comparison.
-    if (attrsToCheck.some(function (v) {
-      return panelAttrs.includes(v);
-    }) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
+    if (hasChangedAttr(panelAttrs) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
       return _objectSpread(_objectSpread({}, attributionKey ? {
         attributionKey: attributionKey
       } : {}), {}, {
@@ -174,7 +175,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
   .filter(function (range, i, arr) {
-    return arr.findIndex(function (r) {
+    return fg('confluence_ncs_step_diffing_version_history') ? !arr.some(function (r, nextIndex) {
+      return nextIndex > i && r.fromB === range.fromB;
+    }) : arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

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

@@ -24,10 +24,10 @@ var SHOW_DIFF_AGENT_BRANDS = {
 
 /**
  * Brands that prefer the account's real avatar over their fixed glyph when the invoking profile
- * has one. Claude/ChatGPT/Rovo intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS`
- * in `contributorAvatarRenderer.ts`).
+ * has one. Claude/ChatGPT intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS` in
+ * `contributorAvatarRenderer.ts`).
  */
-var AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit']);
+var AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit', 'rovo']);
 
 /** Known external agent types emitted by Confluence's agent identification service that carry
  * no `@atlaskit/agent-color` brand — a generic labelled fallback. */

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

@@ -5,25 +5,24 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getContributorTagIcon } from './contributorTagIcons';
 
 /**
- * Agent kinds with a custom contributor-tag icon. Figma/Lovable/Replit have no entry here — they
- * always render the real avatar `resolveDiffContributors` supplies, falling back to the generic
- * `aiAgent` glyph (see `showContributorIcon`) on load failure. The declared type stays the wider
+ * Agent kinds with a custom contributor-tag icon, used as a fallback glyph when no `avatarUrl` is
+ * available or its image fails to load (see `showContributorIcon`). Rovo/Figma/Lovable/Replit have
+ * no entry here — they fall back to the generic `aiAgent` glyph. The declared type stays the wider
  * `TagContributor['agentKind']` so indexing below (with `'identified' | 'external'` in play too)
  * stays safely partial.
  */
 var AGENT_KIND_ICONS = {
   claude: 'claude',
-  chatgpt: 'chatgpt',
-  rovo: 'rovoHex'
+  chatgpt: 'chatgpt'
 };
 
 /**
  * Brands that always render their fixed glyph, even when the contributor also carries an
- * `avatarUrl`. Figma/Lovable/Replit are excluded here and use the real avatar when
+ * `avatarUrl`. Rovo/Figma/Lovable/Replit are excluded here and use the real avatar when
  * `resolveDiffContributors` supplies one, falling back to the generic `aiAgent` glyph on load
  * failure.
  */
-var FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt', 'rovo']);
+var FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt']);
 
 /** The size `@atlaskit/avatar`'s `xxsmall` rendered at. */
 var AVATAR_SIZE = AVATAR_SIZES.xxsmall;
@@ -120,8 +119,8 @@ export var contributorAvatarRenderer = function contributorAvatarRenderer(_ref)
   };
   if (contributor.avatarUrl) {
     var _contributor$agentKin2;
-    // Claude/ChatGPT/Rovo always use their fixed glyph, even when the profile also has an
-    // avatar URL. Other agents (e.g. Figma/Lovable/Replit) and users prefer the real avatar.
+    // Claude/ChatGPT always use their fixed glyph, even when the profile also has an avatar
+    // URL. Other agents (e.g. Rovo/Figma/Lovable/Replit) and users prefer the real avatar.
     var usesFixedGlyph = isAgent && FIXED_GLYPH_AGENT_KINDS.has((_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : 'external');
     if (usesFixedGlyph) {
       showContributorIcon();

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

@@ -4,9 +4,6 @@
  * Neither `@atlaskit/icon`, `@atlaskit/icon-lab` nor `@atlaskit/logo` exposes a raw-SVG entry
  * point, so the markup is copied here rather than kept as a React island for these glyphs. Keep in
  * sync with the sources named on each constant.
- *
- * The Rovo hex is the `brand` appearance, whose `--rovo-*-color` variables resolve to `initial` in
- * both themes — the fallbacks below are the rendered colours, so no theme observer is needed.
  */
 
 /** `@atlaskit/icon/core/person`, at the 16px the avatar renders it. */
@@ -22,9 +19,6 @@ var AI_BOT_ICON_SVG = "<svg width=\"12\" height=\"12\" fill=\"none\" viewBox=\"0
  */
 var AI_AGENT_ICON_SVG = "<svg width=\"12\" height=\"12\" fill=\"none\" viewBox=\"0 0 16 16\" role=\"presentation\" style=\"display:block\"><path fill=\"currentcolor\" fill-rule=\"evenodd\" d=\"M6.971.493a2 2 0 0 1 2.058 0l5 3A2 2 0 0 1 15 5.208v5.584a2 2 0 0 1-.971 1.715l-5 3a2 2 0 0 1-2.058 0l-5-3A2 2 0 0 1 1 10.792V5.208a2 2 0 0 1 .971-1.715zm1.286 1.286a.5.5 0 0 0-.514 0l-5 3a.5.5 0 0 0-.243.429v5.584a.5.5 0 0 0 .243.429l1.098.66a4.25 4.25 0 1 1 8.318 0l1.098-.66a.5.5 0 0 0 .243-.429V5.208a.5.5 0 0 0-.243-.429zM8 8.25a2.75 2.75 0 1 0 0 5.5 2.75 2.75 0 0 0 0-5.5\" clip-rule=\"evenodd\"/></svg>";
 
-/** `RovoHexIcon` from `@atlaskit/logo/rovo-hex/icon`, at the 16px `xxsmall` renders. */
-var ROVO_HEX_ICON_SVG = "<svg width=\"16\" height=\"16\" viewBox=\"0 0 24 24\" role=\"presentation\" style=\"display:block\"><path fill=\"#1868db\" fill-rule=\"evenodd\" d=\"m13.227 16.789-7.154 4.169-3.403-1.96a2.72 2.72 0 0 1-1.362-2.355V7.366c0-.973.518-1.87 1.361-2.354l6.044-3.487-.038.114a3.6 3.6 0 0 0-.172 1.088v9.278c0 1.274.68 2.45 1.786 3.085z\" clip-rule=\"evenodd\"/><path fill=\"#6a9a23\" fill-rule=\"evenodd\" d=\"m11.296 15.671-7.193 4.153 6.607 3.812a2.73 2.73 0 0 0 2.676.026l.048-.033a2.73 2.73 0 0 0 1.232-1.525 2.7 2.7 0 0 0 .127-.822v-3.594z\" clip-rule=\"evenodd\"/><path fill=\"#af59e1\" fill-rule=\"evenodd\" d=\"m21.477 5.003-4.404-2.539-5.904 4.89 2.69 1.556a3.56 3.56 0 0 1 1.785 3.086v9.277a3.6 3.6 0 0 1-.21 1.202l6.044-3.486a2.71 2.71 0 0 0 1.362-2.355V7.357c0-.97-.521-1.87-1.363-2.354\" clip-rule=\"evenodd\"/><path fill=\"#fca700\" fill-rule=\"evenodd\" d=\"M12.74 8.266 9.353 6.312V2.718c0-.283.044-.56.127-.821A2.73 2.73 0 0 1 10.71.372V.37a.4.4 0 0 0 .048-.033 2.73 2.73 0 0 1 2.676.026l6.499 3.75z\" clip-rule=\"evenodd\"/></svg>";
-
 /** Claude hexagon lockup from the brand asset: the hexagon and knot glyph both baked in. */
 var CLAUDE_ICON_SVG = "<svg width=\"16\" height=\"18\" viewBox=\"0 0 16 18\" fill=\"none\" role=\"presentation\" style=\"display:block\"><path fill=\"#D97757\" d=\"M14.5007 3.28903L9.50384 0.402344C8.5736 -0.13506 7.42701 -0.134016 6.49774 0.405082L1.49458 3.30759C0.569434 3.8443 0 4.83297 0 5.90253V11.1804C0 12.2519 0.571497 13.2421 1.49931 13.7781L6.49931 16.6666C7.42787 17.203 8.57213 17.203 9.50069 16.6666L14.5007 13.7781C15.4285 13.2421 16 12.2519 16 11.1804V5.88671C16 4.8152 15.4285 3.82504 14.5007 3.28903Z\"/><path fill=\"#FAF9F6\" d=\"M5.19791 10.055L7.0123 9.03681L7.04267 8.94806L7.0123 8.89907H6.92357L6.62 8.88034L5.58321 8.85232L4.68418 8.815L3.81317 8.76826L3.59367 8.72158L3.38818 8.4507L3.4092 8.31526L3.59367 8.1915L3.85754 8.21485L4.44133 8.25455L5.317 8.31526L5.95216 8.35262L6.89321 8.4507H7.04267L7.06368 8.38999L7.0123 8.35262L6.97261 8.31526L6.06658 7.70112L5.08582 7.05196L4.5721 6.67834L4.29422 6.48919L4.15411 6.31172L4.09339 5.92409L4.34559 5.64621L4.68418 5.66956L4.77058 5.69291L5.11384 5.95678L5.84708 6.52422L6.80448 7.22943L6.94459 7.34618L7.00063 7.30649L7.00763 7.27846L6.94459 7.17338L6.42385 6.23233L5.86809 5.27492L5.62057 4.87795L5.55519 4.63977C5.53183 4.54169 5.51549 4.45996 5.51549 4.35956L5.80271 3.96959L5.9615 3.91821L6.34446 3.96959L6.50558 4.10969L6.74377 4.65378L7.12907 5.51077L7.72686 6.676L7.90199 7.0216L7.99539 7.34152L8.0304 7.43959H8.09113V7.38354L8.14018 6.72737L8.23124 5.92175L8.31999 4.88496L8.35032 4.59307L8.49511 4.24279L8.78232 4.05365L9.00649 4.16107L9.19098 4.42494L9.16533 4.5954L9.05555 5.30762L8.84073 6.42381L8.70062 7.17105H8.78232L8.87574 7.07764L9.25401 6.57559L9.88922 5.78165L10.1694 5.4664L10.4963 5.11847L10.7065 4.95267H11.1035L11.3953 5.38701L11.2646 5.83535L10.8559 6.35375L10.5173 6.79276L10.0316 7.4466L9.72807 7.96966L9.7561 8.0117L9.82849 8.00469L10.926 7.77118L11.5191 7.66376L12.2266 7.54233L12.5466 7.69178L12.5816 7.84356L12.4555 8.15414L11.6989 8.34095L10.8116 8.51842L9.48985 8.83136L9.4735 8.84303L9.49223 8.86637L10.0877 8.92241L10.3422 8.93639H10.9657L12.1262 9.02283L12.4298 9.2236L12.612 9.46881L12.5816 9.6556L12.1146 9.89382L11.4841 9.74434L10.013 9.3941L9.50858 9.26797H9.43849V9.31004L9.85882 9.721L10.6294 10.4169L11.5938 11.3136L11.6429 11.5354L11.5191 11.7106L11.3884 11.6918L10.5407 11.0544L10.2137 10.7672L9.4735 10.1436H9.42451V10.209L9.59495 10.4589L10.4963 11.8133L10.543 12.2289L10.4776 12.3644L10.2441 12.4461L9.98726 12.3994L9.45952 11.6592L8.91544 10.8255L8.47645 10.0783L8.42271 10.1086L8.16352 12.8991L8.04207 13.0416L7.76188 13.149L7.52837 12.9715L7.40461 12.6843L7.52837 12.1168L7.67781 11.3766L7.79925 10.7881L7.90899 10.0573L7.97438 9.81443L7.96971 9.79808L7.916 9.80507L7.36491 10.5617L6.5266 11.6942L5.86342 12.4041L5.70463 12.4671L5.42909 12.3247L5.45477 12.0702L5.60889 11.8436L6.5266 10.6761L7.08002 9.95217L7.4373 9.53421L7.43497 9.47349H7.41395L4.97607 11.0567L4.54174 11.1127L4.35493 10.9376L4.37828 10.6504L4.46702 10.557L5.20024 10.0526L5.19791 10.055Z\"/></svg>";
 
@@ -35,8 +29,7 @@ var markup = {
   aiBot: AI_BOT_ICON_SVG,
   chatgpt: CHATGPT_ICON_SVG,
   claude: CLAUDE_ICON_SVG,
-  person: PERSON_ICON_SVG,
-  rovoHex: ROVO_HEX_ICON_SVG
+  person: PERSON_ICON_SVG
 };
 
 /**

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

@@ -4,6 +4,7 @@ import type { TokenEncoder } from 'prosemirror-changeset';
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 export declare const markAwareTokenEncoder: TokenEncoder<string | number>;

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

@@ -10,6 +10,6 @@ export type TokenEncoderSelection = {
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 export declare const selectTokenEncoder: (useAttrAwareEncoder: boolean) => TokenEncoderSelection;

package/dist/types/ui/ContributorTag/contributorTagIcons.d.ts

@@ -4,9 +4,6 @@
  * Neither `@atlaskit/icon`, `@atlaskit/icon-lab` nor `@atlaskit/logo` exposes a raw-SVG entry
  * point, so the markup is copied here rather than kept as a React island for these glyphs. Keep in
  * sync with the sources named on each constant.
- *
- * The Rovo hex is the `brand` appearance, whose `--rovo-*-color` variables resolve to `initial` in
- * both themes — the fallbacks below are the rendered colours, so no theme observer is needed.
  */
-export type ContributorTagIcon = 'aiAgent' | 'aiBot' | 'chatgpt' | 'claude' | 'person' | 'rovoHex';
+export type ContributorTagIcon = 'aiAgent' | 'aiBot' | 'chatgpt' | 'claude' | 'person';
 export declare const getContributorTagIcon: (icon: ContributorTagIcon, doc: Document) => DocumentFragment;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "21.0.0",
+	"version": "21.0.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/adf-utils": "^20.9.0",
 		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
-		"@atlaskit/dropdown-menu": "^20.0.0",
+		"@atlaskit/dropdown-menu": "^21.0.0",
 		"@atlaskit/editor-core": "^233.0.0",
 		"@atlaskit/editor-json-transformer": "^10.0.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
@@ -71,7 +71,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^127.0.0",
+		"@atlaskit/editor-common": "^127.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"