@atlaskit/editor-plugin-show-diff 17.1.8 → 17.1.9

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 17.1.9
+
+### Patch Changes
+
+- [`b378d1dd86483`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b378d1dd86483) -
+  Brand ChatGPT contributor tags with the ChatGPT icon and a fixed colour.
+
+  Centralised agent brand metadata in `@atlaskit/agent-color`: added `agent-brand-claude`,
+  `agent-brand-chatgpt` and `agent-brand-rovo` colour schemes, and extended
+  `getThirdPartyAgentColor` (`./get-third-party-agent-color`) to also resolve the
+  `claude`/`chatgpt`/`rovo`/`rovo_chat` aliases and return a canonical display `name`. Removed the
+  now-redundant `./chatgpt-brand-color` export (`CHATGPT_BRAND_COLOR`) — its value is now the
+  `agent-brand-chatgpt` scheme's `bold`/`boldText` fields, reachable through
+  `getThirdPartyAgentColor`.
+
+  `editor-shared-styles` and `editor-plugin-show-diff` now resolve their brand colours and
+  contributor-tag names through this shared lookup instead of maintaining their own per-package
+  brand tables, with no behaviour change.
+
+- [`6bbecbd2ad0eb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6bbecbd2ad0eb) -
+  EDITOR-9120 Fix numbered table columns in `platform_editor_ai_show_diff_patch_2` so replacement
+  widgets share an existing row number, added and removed rows remain independently numbered, and
+  anchor widgets do not create phantom entries.
+- Updated dependencies
+
 ## 17.1.8
 
 ### Patch Changes

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

@@ -84,6 +84,10 @@ var extractChangedRows = function extractChangedRows(_ref) {
     // Check if this row overlaps with the deletion range
     var rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) || !isEmptyRow(rowNode))) {
+      var rowLocalId = rowNode.attrs.localId;
+      var isTableRowReplacement = rowLocalId && tableNew.node.children.some(function (candidateRow) {
+        return candidateRow.type.name === 'tableRow' && candidateRow.attrs.localId === rowLocalId;
+      });
       var cellEdgeAttrs = edgeAttrsByOffset ? (0, _tableCellEdgeAttrs.getRowCellEdgeAttrs)({
         edgeAttrsByOffset: edgeAttrsByOffset,
         rowNode: rowNode,
@@ -95,6 +99,7 @@ var extractChangedRows = function extractChangedRows(_ref) {
       changedRows.push({
         rowIndex: rowIndex,
         rowNode: rowNode,
+        isTableRowReplacement: isTableRowReplacement,
         cellEdgeAttrs: cellEdgeAttrs,
         fromA: tableOld.pos + 1 + rowStart,
         toA: tableOld.pos + 1 + rowEnd,
@@ -176,6 +181,7 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
   var rowNode = _ref3.rowNode,
     cellEdgeAttrs = _ref3.cellEdgeAttrs,
     nodeViewSerializer = _ref3.nodeViewSerializer,
+    isTableRowReplacement = _ref3.isTableRowReplacement,
     colorScheme = _ref3.colorScheme,
     isInserted = _ref3.isInserted,
     diffType = _ref3.diffType,
@@ -183,6 +189,9 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
     intl = _ref3.intl,
     isActive = _ref3.isActive;
   var tr = document.createElement('tr');
+  if (isTableRowReplacement && (0, _fg.fg)('platform_editor_ai_show_diff_patch_2')) {
+    tr.dataset.showDiffTableRowReplacement = 'true';
+  }
   var colors = _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
   var deletedTreatment = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? (0, _factory.buildDeletedRowStyle)(colors) : (0, _createChangedRowDecorationWidgetsStyles.resolveDeletedRowStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme));
   var hostsRemovedLozenge = Boolean(intl) && (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInserted && !hasAnchoredRemovedLozenge;
@@ -335,6 +344,7 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     var hasAnchoredRemovedLozenge = Boolean(intl) && (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInserted && supportsAnchorPositioning();
     var rowDOM = createChangedRowDOM({
       rowNode: changedRow.rowNode,
+      isTableRowReplacement: changedRow.isTableRowReplacement,
       cellEdgeAttrs: changedRow.cellEdgeAttrs,
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveDiffContributors = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _getThirdPartyAgentColor = require("@atlaskit/agent-color/get-third-party-agent-color");
 var _attributions = require("./decorations/colorSchemes/attributions");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -17,48 +18,24 @@ var ROVO_AGENT_NAME = 'Rovo';
 
 /** `agentType` values that render as "Rovo" rather than as a generic external agent. */
 var ROVO_AGENT_TYPES = new Set(['convo-ai', 'rovo_chat']);
-/** Known external agent types emitted by Confluence's agent identification service. */
-var EXTERNAL_AGENT_PRESENTATIONS = {
-  claude: {
-    agentKind: 'claude',
-    name: 'Claude'
-  },
-  codex: {
-    agentKind: 'external',
-    name: 'Codex'
-  },
-  vscode: {
-    agentKind: 'external',
-    name: 'VS Code'
-  },
-  hermes: {
-    agentKind: 'external',
-    name: 'Hermes'
-  },
-  runlayer: {
-    agentKind: 'external',
-    name: 'Runlayer'
-  },
-  zed: {
-    agentKind: 'external',
-    name: 'Zed'
-  },
-  ampcode: {
-    agentKind: 'external',
-    name: 'Ampcode'
-  },
-  antigravity: {
-    agentKind: 'external',
-    name: 'Antigravity'
-  },
-  devin_cli: {
-    agentKind: 'external',
-    name: 'Devin CLI'
-  },
-  pi_agent: {
-    agentKind: 'external',
-    name: 'Pi Agent'
-  }
+/** `@atlaskit/agent-color` brands show-diff renders with a dedicated presentation. */
+var SHOW_DIFF_AGENT_BRANDS = {
+  'agent-brand-claude': 'claude',
+  'agent-brand-chatgpt': 'chatgpt',
+  'agent-brand-rovo': 'rovo'
+};
+
+/** Known external agent types emitted by Confluence's agent identification service that carry
+ * no `@atlaskit/agent-color` brand — a generic labelled fallback. */
+var EXTERNAL_AGENT_NAMES = {
+  vscode: 'VS Code',
+  hermes: 'Hermes',
+  runlayer: 'Runlayer',
+  zed: 'Zed',
+  ampcode: 'Ampcode',
+  antigravity: 'Antigravity',
+  devin_cli: 'Devin CLI',
+  pi_agent: 'Pi Agent'
 };
 var hasAgentIdentity = function hasAgentIdentity(attribution) {
   var _attribution$agentId, _attribution$agentTyp;
@@ -88,11 +65,16 @@ var resolveUser = function resolveUser(userId, profilesByAccountId) {
 var resolveAgent = function resolveAgent(attribution, profilesByAccountId) {
   var _attribution$agentTyp2, _attribution$agentId2;
   var agentType = (_attribution$agentTyp2 = attribution.agentType) === null || _attribution$agentTyp2 === void 0 ? void 0 : _attribution$agentTyp2.trim().toLowerCase();
-  var agentPresentation = agentType ? EXTERNAL_AGENT_PRESENTATIONS[agentType] : undefined;
-  if (agentPresentation && agentPresentation.agentKind !== 'external') {
-    return _objectSpread(_objectSpread({}, agentPresentation), {}, {
-      kind: 'agent'
-    });
+  var brand = agentType ? (0, _getThirdPartyAgentColor.getThirdPartyAgentColor)({
+    agentName: agentType
+  }) : undefined;
+  var diffBrand = brand ? SHOW_DIFF_AGENT_BRANDS[brand.scheme] : undefined;
+  if (diffBrand && brand) {
+    return {
+      agentKind: diffBrand,
+      kind: 'agent',
+      name: brand.name
+    };
   }
   var agentId = (_attribution$agentId2 = attribution.agentId) === null || _attribution$agentId2 === void 0 ? void 0 : _attribution$agentId2.trim();
   var agentProfile = agentId ? profilesByAccountId.get(agentId) : undefined;
@@ -107,16 +89,18 @@ var resolveAgent = function resolveAgent(attribution, profilesByAccountId) {
   }
 
   // Unknown types keep an empty name for the tag's localised "External agent" label.
-  return agentType && ROVO_AGENT_TYPES.has(agentType) ? {
-    agentKind: 'rovo',
-    kind: 'agent',
-    name: ROVO_AGENT_NAME
-  } : agentPresentation ? _objectSpread(_objectSpread({}, agentPresentation), {}, {
-    kind: 'agent'
-  }) : {
+  if (agentType && ROVO_AGENT_TYPES.has(agentType)) {
+    return {
+      agentKind: 'rovo',
+      kind: 'agent',
+      name: ROVO_AGENT_NAME
+    };
+  }
+  var externalName = agentType ? EXTERNAL_AGENT_NAMES[agentType] : undefined;
+  return {
     agentKind: 'external',
     kind: 'agent',
-    name: ''
+    name: externalName !== null && externalName !== void 0 ? externalName : ''
   };
 };
 

package/dist/cjs/showDiffPluginType.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DIFF_AGENT_BRANDS = void 0;
+exports.DIFF_AGENT_BRANDS = exports.ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED = void 0;
 /**
  * `'standard'` (purple insertions, default) and `'traditional'` (green/red) are the two
  * plugin-configured schemes. The remaining accent names are the attribution palette used for
@@ -27,9 +27,19 @@ exports.DIFF_AGENT_BRANDS = void 0;
 
 var DIFF_AGENT_BRANDS = exports.DIFF_AGENT_BRANDS = new Set(['rovo', 'claude', 'chatgpt']);
 
+/** The brand id `@atlaskit/agent-color` registers each `AgentBrandColorScheme` under. */
+
+/**
+ * Compile-time-only: fails to build if `DiffAgentBrand` names a brand `@atlaskit/agent-color`
+ * hasn't registered a colour scheme for. Catches "added a brand here but forgot the colour"
+ * without needing a runtime check. Exported only so the unused check on this module-scope
+ * assertion doesn't fire; no consumer needs its value.
+ */
+var ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED = exports.ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED = true;
+
 /** A complete identity for one of the accounts named by a step attribution. */
 
-/** Agent presentation: branded, identified by profile, or a generic external agent. */
+/** Agent presentation: branded (dedicated icon and reserved participant colour), identified by profile, or a generic external agent. */
 
 /**
  * A contributor the plugin has resolved from a step attribution and a supplied profile. Internal:

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

@@ -9,7 +9,13 @@ var _avatarSizes = require("@atlaskit/avatar/avatar-sizes");
 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. */
+/**
+ * Agent kinds with a custom contributor-tag icon. The `satisfies` clause fails the build if a
+ * `DiffAgentBrand` is missing an icon here; `ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED` in
+ * `showDiffPluginType.ts` similarly fails the build if a brand has no `@atlaskit/agent-color`
+ * colour scheme. 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',
@@ -34,12 +40,13 @@ var boxStyle = (0, _lazyNodeView.convertToInlineCss)({
   height: "".concat(AVATAR_BOX_SIZE, "px")
 });
 var shapeStyle = (0, _lazyNodeView.convertToInlineCss)({
-  display: 'inline-flex',
+  display: 'flex',
   alignItems: 'center',
   justifyContent: 'center',
   boxSizing: 'border-box',
   width: "".concat(AVATAR_SIZE, "px"),
   height: "".concat(AVATAR_SIZE, "px"),
+  aspectRatio: '1/1',
   overflow: 'hidden'
 });
 var imageStyle = (0, _lazyNodeView.convertToInlineCss)({

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

@@ -10,12 +10,15 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _bindEventListener = require("bind-event-listener");
+var _getThirdPartyAgentColor = require("@atlaskit/agent-color/get-third-party-agent-color");
 var _vanillaTooltip = require("@atlaskit/editor-common/vanilla-tooltip");
 var _factory = require("../../pm-plugins/decorations/colorSchemes/factory");
 var _schemes = require("../../pm-plugins/decorations/colorSchemes/schemes");
 var _buildContributorTagDom = require("./buildContributorTagDom");
 var _contributorAvatarRenderer = require("./contributorAvatarRenderer");
 var _contributorLabel = require("./contributorLabel");
+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; }
 /**
  * Resolves the tag's accent from the same scheme value the highlight was drawn from, so the colour
  * the two carry can never drift — only the tone does, which is `getAccentTokens`'s to pick.
@@ -29,6 +32,19 @@ var getTagAccent = function getTagAccent(_ref) {
   return (0, _factory.getAccentTokens)(accent);
 };
 
+/** ChatGPT's own brand colour, resolved from the shared `@atlaskit/agent-color` registry. */
+var chatgptBrandColor = (0, _getThirdPartyAgentColor.getThirdPartyAgentColor)({
+  agentName: 'chatgpt'
+});
+
+/** 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 ? {
+  chatgpt: {
+    background: chatgptBrandColor.bold,
+    text: chatgptBrandColor.boldText
+  }
+} : {});
+
 /**
  * Keyboard focus, as a member of `revealSources` alongside the elements the pointer can be over. It
  * has no element of its own to key on — the tag is already in the set under its own hover.
@@ -374,12 +390,15 @@ var ContributorTagController = exports.ContributorTagController = /*#__PURE__*/f
   }, {
     key: "accentOf",
     value: function accentOf(model) {
-      var _model$isInserted;
-      return getTagAccent({
+      var _model$isInserted, _model$contributor$ag, _model$connectedContr;
+      var accent = getTagAccent({
         colorScheme: model.colorScheme,
         isActive: Boolean(model.isActive),
         isInserted: (_model$isInserted = model.isInserted) !== null && _model$isInserted !== void 0 ? _model$isInserted : true
       });
+      var agentKind = (_model$contributor$ag = model.contributor.agentKind) !== null && _model$contributor$ag !== void 0 ? _model$contributor$ag : (_model$connectedContr = model.connectedContributor) === null || _model$connectedContr === void 0 ? void 0 : _model$connectedContr.agentKind;
+      var override = agentKind && AGENT_KIND_ACCENT_OVERRIDES[agentKind];
+      return override ? _objectSpread(_objectSpread({}, accent), override) : accent;
     }
   }, {
     key: "applyAccent",

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

@@ -34,8 +34,8 @@ var ROVO_HEX_ICON_SVG = "<svg width=\"16\" height=\"16\" viewBox=\"0 0 24 24\" r
 /** ClaudeLogo from ai-mate/studio-browse-kit, inset to fit the agent hexagon. */
 var CLAUDE_ICON_SVG = "<svg width=\"12\" height=\"12\" viewBox=\"8 8 32 32\" role=\"presentation\" style=\"display:block\"><path fill=\"#FFFFFF\" d=\"M14.2785 29.274L20.5732 25.7445L20.6785 25.4369L20.5732 25.2669H20.2653L19.2122 25.2021L15.6152 25.105L12.4962 24.9755L9.47443 24.8136L8.71291 24.6517L8 23.7126L8.07291 23.2431L8.71291 22.8141L9.62835 22.895L11.6537 23.0326L14.6916 23.2431L16.8952 23.3726L20.16 23.7126H20.6785L20.7514 23.5022L20.5732 23.3726L20.4354 23.2431L17.2922 21.1141L13.8896 18.8636L12.1073 17.5684L11.1433 16.9127L10.6572 16.2975L10.4466 14.9537L11.3215 13.9904L12.4962 14.0713L12.7959 14.1523L13.9868 15.067L16.5306 17.0342L19.8522 19.4789L20.3382 19.8836L20.5327 19.746L20.557 19.6489L20.3382 19.2846L18.5316 16.0223L16.6035 12.7033L15.7448 11.3271L15.518 10.5014C15.437 10.1614 15.3803 9.87807 15.3803 9.52998L16.3767 8.17809L16.9276 8L18.2562 8.17809L18.8152 8.6638L19.6415 10.55L20.9782 13.5209L23.0522 17.5603L23.6597 18.7584L23.9838 19.8674L24.1053 20.2074H24.3159V20.0132L24.4861 17.7384L24.802 14.9456L25.1099 11.3514L25.2152 10.3395L25.7175 9.12522L26.7139 8.46952L27.4916 8.84189L28.1316 9.75664L28.0425 10.3476L27.6618 12.8166L26.9165 16.6861L26.4304 19.2765H26.7139L27.038 18.9527L28.3504 17.2122L30.5539 14.4599L31.5261 13.3671L32.6603 12.1609L33.3894 11.5861H34.7666L35.7792 13.0918L35.3256 14.6461L33.9079 16.4432L32.7332 17.9651L31.0481 20.2317L29.9949 22.045L30.0922 22.1907L30.3433 22.1665L34.1509 21.3569L36.2086 20.9846L38.6633 20.5636L39.7732 21.0817L39.8947 21.6079L39.4572 22.6845L36.8324 23.3322L33.7539 23.9474L29.1686 25.0321L29.1119 25.0726L29.1767 25.1536L31.2425 25.3478L32.1256 25.3964H34.2886L38.3149 25.6959L39.3681 26.3921L40 27.2421L39.8947 27.8897L38.2744 28.7154L36.0871 28.1973L30.9833 26.9831L29.2334 26.5459H28.9904V26.6916L30.4486 28.1164L33.122 30.5287L36.4678 33.6372L36.638 34.4063L36.2086 35.0134L35.7549 34.9486L32.8142 32.7387L31.68 31.743L29.1119 29.5816H28.9418V29.8082L29.5332 30.6744L32.6603 35.3696L32.8223 36.8105L32.5954 37.28L31.7853 37.5634L30.8942 37.4015L29.0633 34.8353L27.1757 31.9454L25.6527 29.3549L25.4663 29.4602L24.5671 39.1338L24.1458 39.6276L23.1737 40L22.3635 39.3848L21.9342 38.3891L22.3635 36.422L22.882 33.8558L23.3033 31.8158L23.6841 29.2821L23.9109 28.4402L23.8947 28.3835L23.7084 28.4078L21.7965 31.0306L18.8881 34.9567L16.5873 37.4177L16.0365 37.6362L15.0805 37.1424L15.1696 36.2601L15.7043 35.4748L18.8881 31.4273L20.8081 28.9178L22.0476 27.4688L22.0395 27.2583H21.9666L13.5089 32.7468L12.002 32.9411L11.3539 32.3339L11.4349 31.3382L11.7428 31.0144L14.2866 29.2659L14.2785 29.274Z\"/></svg>";
 
-/** ChatGPT Presence avatar from Confluence's `ChatGptPresenceIcon`, at 16px. */
-var CHATGPT_ICON_SVG = '<svg width="16" height="16" viewBox="1 1.5328 16 16" overflow="visible" fill="none" role="presentation" style="display:block"><path d="M7.24707 0.973022C8.33116 0.344106 9.66865 0.342238 10.7539 0.969116L15.751 3.85583C16.8334 4.48117 17.5 5.63699 17.5 6.88708V12.1801C17.5 13.4301 16.8334 14.586 15.751 15.2113L10.751 18.1C9.66769 18.7258 8.33231 18.7258 7.24902 18.1L2.24902 15.2113C1.16658 14.586 0.5 13.4301 0.5 12.1801V6.90271C0.5 5.65489 1.1648 4.50153 2.24414 3.87537L7.24707 0.973022Z" fill="#14120B" stroke="#FFFFFF" stroke-width="1"/><svg x="4" y="4.53355" width="10" height="10" viewBox="10 12.0281 24 24" overflow="visible"><path d="M32.2119 21.2917C32.7552 19.256 32.2283 16.9938 30.6312 15.3967C29.0342 13.7997 26.7722 13.2728 24.7362 13.8161C23.2447 12.3277 21.0224 11.6529 18.8407 12.2376C16.6589 12.8221 15.0717 14.5177 14.5243 16.5524C12.4896 17.0999 10.794 18.6873 10.2094 20.8688C9.62493 23.0506 10.2996 25.2728 11.7881 26.7644C11.2448 28.8002 11.7718 31.0623 13.3688 32.6594C14.9658 34.2564 17.2278 34.7834 19.2638 34.2401C20.7553 35.7284 22.9778 36.4032 25.1593 35.8187C27.3411 35.2342 28.9283 33.5386 29.4757 31.5039C31.5105 30.9564 33.206 29.3691 33.7905 27.1874C34.3751 25.0058 33.7005 22.7834 32.2119 21.2919V21.2917ZM29.6507 16.3775C30.7329 17.4598 31.1792 18.937 30.9897 20.3453L25.9072 17.4108C25.6929 17.2871 25.4289 17.2871 25.2148 17.4108L19.2638 20.8466V18.5936C19.2638 18.4356 19.3485 18.2877 19.4854 18.2087L24.017 15.5924C25.8125 14.5895 28.1246 14.8514 29.6508 16.3775H29.6507ZM22 20.8685L24.7364 22.4483V25.608L22 27.1878L19.2636 25.608V22.4483L22 20.8685ZM15.7028 18.0636C15.732 16.0073 17.1149 14.1359 19.1997 13.5772C20.678 13.1811 22.1806 13.5333 23.3053 14.4014L18.2226 17.3357C18.0084 17.4594 17.8764 17.6881 17.8764 17.9353V24.8069L15.9253 23.6804C15.7885 23.6014 15.7028 23.454 15.7028 23.2959V18.0634V18.0636ZM11.549 21.2278C11.9451 19.7495 13.0014 18.6242 14.3156 18.0843V23.9532C14.3156 24.2004 14.4476 24.4291 14.6618 24.5528L20.6128 27.9886L18.6617 29.1151C18.5249 29.1941 18.3544 29.1946 18.2175 29.1156L13.6859 26.4993C11.9196 25.4459 10.9905 23.3124 11.549 21.2278ZM14.3494 31.6788C13.2671 30.5965 12.8208 29.1193 13.0103 27.7111L18.0928 30.6455C18.3071 30.7692 18.5711 30.7692 18.7852 30.6455L24.7362 27.2098V29.4626C24.7362 29.6207 24.6516 29.7682 24.5146 29.8477L19.983 32.4639C18.1875 33.4667 15.8754 33.2049 14.3492 31.6788H14.3494ZM28.2972 29.9927C28.268 32.049 26.8851 33.9205 24.8003 34.4791C23.322 34.8752 21.8194 34.523 20.6947 33.6549L25.7774 30.7205C25.9917 30.5969 26.1236 30.3682 26.1236 30.1209V23.2494L28.0747 24.3759C28.2115 24.4549 28.2972 24.6023 28.2972 24.7604V29.9929V29.9927ZM32.451 26.8285C32.0549 28.3068 30.9986 29.4321 29.6844 29.972V24.1031C29.6844 23.8559 29.5525 23.6272 29.3382 23.5035L23.3872 20.0678L25.3383 18.9412C25.4751 18.8622 25.6456 18.8617 25.7825 18.9407L30.314 21.5569C32.0804 22.6105 33.0095 24.7439 32.451 26.8285Z" fill="#FFFFFF"/></svg></svg>';
+/** ChatGPT hexagon lockup from the brand asset: the hexagon and knot glyph both baked in. */
+var CHATGPT_ICON_SVG = "<svg width=\"16\" height=\"18\" viewBox=\"0 0 16 18\" fill=\"none\" role=\"presentation\" style=\"display:block\"><path fill=\"#14120B\" d=\"M14.5007 3.289L9.50384 0.402314C8.5736 -0.13509 7.42701 -0.134047 6.49774 0.405051L1.49458 3.30756C0.569434 3.84427 0 4.83294 0 5.9025V11.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.88668C16 4.81517 15.4285 3.82501 14.5007 3.289Z\"/><path fill=\"white\" d=\"M12.255 7.39338C12.4813 6.54514 12.2618 5.60258 11.5963 4.93713C10.9309 4.2717 9.9884 4.05217 9.1401 4.27852C8.51863 3.65837 7.59268 3.37721 6.68362 3.62082C5.77456 3.86436 5.11322 4.57087 4.88512 5.41867C4.03733 5.64676 3.33082 6.30819 3.08727 7.21717C2.84372 8.12623 3.12482 9.05218 3.74503 9.67365C3.51868 10.5219 3.73823 11.4645 4.40366 12.1299C5.06909 12.7953 6.01159 13.0149 6.85992 12.7885C7.48137 13.4087 8.4074 13.6898 9.31638 13.4463C10.2254 13.2027 10.8868 12.4962 11.1149 11.6485C11.9627 11.4203 12.6692 10.7589 12.9127 9.84993C13.1563 8.94089 12.8752 8.01491 12.255 7.39347V7.39338ZM11.1878 5.34578C11.6387 5.79673 11.8247 6.41226 11.7457 6.99902L9.62799 5.77632C9.53872 5.72478 9.42871 5.72478 9.3395 5.77632L6.85992 7.20789V6.26917C6.85992 6.20333 6.89519 6.1417 6.95226 6.10877L8.84042 5.01867C9.58854 4.60079 10.5519 4.7099 11.1878 5.34578H11.1878ZM8.00001 7.21703L9.14016 7.87529V9.19183L8.00001 9.85009L6.85984 9.19183V7.87529L8.00001 7.21703ZM5.37616 6.04832C5.38831 5.19153 5.96453 4.41177 6.83319 4.17899C7.44917 4.01397 8.07524 4.16069 8.54389 4.52241L6.42609 5.74505C6.33682 5.79656 6.28184 5.89186 6.28184 5.99489V8.85803L5.4689 8.38867C5.41189 8.35573 5.37616 8.29433 5.37616 8.22846V6.04826V6.04832ZM3.64542 7.36674C3.81044 6.75079 4.25056 6.28191 4.79817 6.05694V8.50232C4.79817 8.60534 4.85315 8.70061 4.94241 8.75216L7.42202 10.1837L6.60904 10.6531C6.55203 10.686 6.48098 10.6862 6.42397 10.6533L4.53581 9.56321C3.79984 9.12427 3.41272 8.23534 3.64542 7.36674ZM4.81224 11.7213C4.36129 11.2704 4.17534 10.6549 4.25429 10.0681L6.37201 11.2908C6.4613 11.3423 6.57129 11.3423 6.6605 11.2908L9.1401 9.85923V10.7979C9.1401 10.8638 9.10483 10.9254 9.04774 10.9584L7.15958 12.0485C6.41145 12.4663 5.44809 12.3572 4.81215 11.7213H4.81224ZM10.6238 11.0188C10.6117 11.8756 10.0355 12.6554 9.1668 12.8881C8.55083 13.0532 7.92476 12.9064 7.45613 12.5447L9.57391 11.322C9.6632 11.2705 9.71816 11.1753 9.71816 11.0722V8.20906L10.5311 8.67845C10.5881 8.71139 10.6238 8.77279 10.6238 8.83866V11.0189V11.0188ZM12.3546 9.70035C12.1896 10.3163 11.7494 10.7852 11.2018 11.0101V8.5648C11.2018 8.46178 11.1469 8.36648 11.0576 8.31496L8.57798 6.88339L9.39095 6.41401C9.44796 6.38107 9.51902 6.38085 9.57603 6.41378L11.4642 7.50388C12.2002 7.94285 12.5873 8.83178 12.3546 9.70035Z\"/></svg>";
 var markup = {
   aiAgent: AI_AGENT_ICON_SVG,
   aiBot: AI_BOT_ICON_SVG,

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

@@ -67,6 +67,8 @@ const extractChangedRows = ({
     // Check if this row overlaps with the deletion range
     const rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && (isExtendedEnabled(diffType) || !isEmptyRow(rowNode))) {
+      const rowLocalId = rowNode.attrs.localId;
+      const isTableRowReplacement = rowLocalId && tableNew.node.children.some(candidateRow => candidateRow.type.name === 'tableRow' && candidateRow.attrs.localId === rowLocalId);
       const cellEdgeAttrs = edgeAttrsByOffset ? getRowCellEdgeAttrs({
         edgeAttrsByOffset,
         rowNode,
@@ -76,6 +78,7 @@ const extractChangedRows = ({
       changedRows.push({
         rowIndex,
         rowNode,
+        isTableRowReplacement,
         cellEdgeAttrs,
         fromA: tableOld.pos + 1 + rowStart,
         toA: tableOld.pos + 1 + rowEnd,
@@ -152,6 +155,7 @@ const createChangedRowDOM = ({
   rowNode,
   cellEdgeAttrs,
   nodeViewSerializer,
+  isTableRowReplacement,
   colorScheme,
   isInserted,
   diffType,
@@ -160,6 +164,9 @@ const createChangedRowDOM = ({
   isActive
 }) => {
   const tr = document.createElement('tr');
+  if (isTableRowReplacement && fg('platform_editor_ai_show_diff_patch_2')) {
+    tr.dataset.showDiffTableRowReplacement = 'true';
+  }
   const colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
   const deletedTreatment = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme));
   const hostsRemovedLozenge = Boolean(intl) && isExtendedEnabled(diffType) && !isInserted && !hasAnchoredRemovedLozenge;
@@ -299,6 +306,7 @@ export const createChangedRowDecorationWidgets = ({
     const hasAnchoredRemovedLozenge = Boolean(intl) && isExtendedEnabled(diffType) && !isInserted && supportsAnchorPositioning();
     const rowDOM = createChangedRowDOM({
       rowNode: changedRow.rowNode,
+      isTableRowReplacement: changedRow.isTableRowReplacement,
       cellEdgeAttrs: changedRow.cellEdgeAttrs,
       nodeViewSerializer,
       colorScheme,

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

@@ -1,3 +1,4 @@
+import { getThirdPartyAgentColor } from '@atlaskit/agent-color/get-third-party-agent-color';
 import { getAttributionKey } from './decorations/colorSchemes/attributions';
 
 /** A brand name, so a literal rather than a translated message. */
@@ -5,48 +6,24 @@ const ROVO_AGENT_NAME = 'Rovo';
 
 /** `agentType` values that render as "Rovo" rather than as a generic external agent. */
 const ROVO_AGENT_TYPES = new Set(['convo-ai', 'rovo_chat']);
-/** Known external agent types emitted by Confluence's agent identification service. */
-const EXTERNAL_AGENT_PRESENTATIONS = {
-  claude: {
-    agentKind: 'claude',
-    name: 'Claude'
-  },
-  codex: {
-    agentKind: 'external',
-    name: 'Codex'
-  },
-  vscode: {
-    agentKind: 'external',
-    name: 'VS Code'
-  },
-  hermes: {
-    agentKind: 'external',
-    name: 'Hermes'
-  },
-  runlayer: {
-    agentKind: 'external',
-    name: 'Runlayer'
-  },
-  zed: {
-    agentKind: 'external',
-    name: 'Zed'
-  },
-  ampcode: {
-    agentKind: 'external',
-    name: 'Ampcode'
-  },
-  antigravity: {
-    agentKind: 'external',
-    name: 'Antigravity'
-  },
-  devin_cli: {
-    agentKind: 'external',
-    name: 'Devin CLI'
-  },
-  pi_agent: {
-    agentKind: 'external',
-    name: 'Pi Agent'
-  }
+/** `@atlaskit/agent-color` brands show-diff renders with a dedicated presentation. */
+const SHOW_DIFF_AGENT_BRANDS = {
+  'agent-brand-claude': 'claude',
+  'agent-brand-chatgpt': 'chatgpt',
+  'agent-brand-rovo': 'rovo'
+};
+
+/** Known external agent types emitted by Confluence's agent identification service that carry
+ * no `@atlaskit/agent-color` brand — a generic labelled fallback. */
+const EXTERNAL_AGENT_NAMES = {
+  vscode: 'VS Code',
+  hermes: 'Hermes',
+  runlayer: 'Runlayer',
+  zed: 'Zed',
+  ampcode: 'Ampcode',
+  antigravity: 'Antigravity',
+  devin_cli: 'Devin CLI',
+  pi_agent: 'Pi Agent'
 };
 const hasAgentIdentity = attribution => {
   var _attribution$agentId, _attribution$agentTyp;
@@ -76,11 +53,15 @@ const resolveUser = (userId, profilesByAccountId) => {
 const resolveAgent = (attribution, profilesByAccountId) => {
   var _attribution$agentTyp2, _attribution$agentId2;
   const agentType = (_attribution$agentTyp2 = attribution.agentType) === null || _attribution$agentTyp2 === void 0 ? void 0 : _attribution$agentTyp2.trim().toLowerCase();
-  const agentPresentation = agentType ? EXTERNAL_AGENT_PRESENTATIONS[agentType] : undefined;
-  if (agentPresentation && agentPresentation.agentKind !== 'external') {
+  const brand = agentType ? getThirdPartyAgentColor({
+    agentName: agentType
+  }) : undefined;
+  const diffBrand = brand ? SHOW_DIFF_AGENT_BRANDS[brand.scheme] : undefined;
+  if (diffBrand && brand) {
     return {
-      ...agentPresentation,
-      kind: 'agent'
+      agentKind: diffBrand,
+      kind: 'agent',
+      name: brand.name
     };
   }
   const agentId = (_attribution$agentId2 = attribution.agentId) === null || _attribution$agentId2 === void 0 ? void 0 : _attribution$agentId2.trim();
@@ -97,17 +78,18 @@ const resolveAgent = (attribution, profilesByAccountId) => {
   }
 
   // Unknown types keep an empty name for the tag's localised "External agent" label.
-  return agentType && ROVO_AGENT_TYPES.has(agentType) ? {
-    agentKind: 'rovo',
-    kind: 'agent',
-    name: ROVO_AGENT_NAME
-  } : agentPresentation ? {
-    ...agentPresentation,
-    kind: 'agent'
-  } : {
+  if (agentType && ROVO_AGENT_TYPES.has(agentType)) {
+    return {
+      agentKind: 'rovo',
+      kind: 'agent',
+      name: ROVO_AGENT_NAME
+    };
+  }
+  const externalName = agentType ? EXTERNAL_AGENT_NAMES[agentType] : undefined;
+  return {
     agentKind: 'external',
     kind: 'agent',
-    name: ''
+    name: externalName !== null && externalName !== void 0 ? externalName : ''
   };
 };
 

package/dist/es2019/showDiffPluginType.js

@@ -21,9 +21,19 @@
 
 export const DIFF_AGENT_BRANDS = new Set(['rovo', 'claude', 'chatgpt']);
 
+/** The brand id `@atlaskit/agent-color` registers each `AgentBrandColorScheme` under. */
+
+/**
+ * Compile-time-only: fails to build if `DiffAgentBrand` names a brand `@atlaskit/agent-color`
+ * hasn't registered a colour scheme for. Catches "added a brand here but forgot the colour"
+ * without needing a runtime check. Exported only so the unused check on this module-scope
+ * assertion doesn't fire; no consumer needs its value.
+ */
+export const ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED = true;
+
 /** A complete identity for one of the accounts named by a step attribution. */
 
-/** Agent presentation: branded, identified by profile, or a generic external agent. */
+/** Agent presentation: branded (dedicated icon and reserved participant colour), identified by profile, or a generic external agent. */
 
 /**
  * A contributor the plugin has resolved from a step attribution and a supplied profile. Internal:

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

@@ -4,7 +4,13 @@ import { BORDER_WIDTH } from '@atlaskit/avatar/constants/default';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getContributorTagIcon } from './contributorTagIcons';
 
-/** Agent kinds with a custom contributor-tag icon. */
+/**
+ * Agent kinds with a custom contributor-tag icon. The `satisfies` clause fails the build if a
+ * `DiffAgentBrand` is missing an icon here; `ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED` in
+ * `showDiffPluginType.ts` similarly fails the build if a brand has no `@atlaskit/agent-color`
+ * colour scheme. 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',
@@ -29,12 +35,13 @@ const boxStyle = convertToInlineCss({
   height: `${AVATAR_BOX_SIZE}px`
 });
 const shapeStyle = convertToInlineCss({
-  display: 'inline-flex',
+  display: 'flex',
   alignItems: 'center',
   justifyContent: 'center',
   boxSizing: 'border-box',
   width: `${AVATAR_SIZE}px`,
   height: `${AVATAR_SIZE}px`,
+  aspectRatio: '1/1',
   overflow: 'hidden'
 });
 const imageStyle = convertToInlineCss({

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

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { bind, bindAll } from 'bind-event-listener';
+import { getThirdPartyAgentColor } from '@atlaskit/agent-color/get-third-party-agent-color';
 import { VanillaTooltip } from '@atlaskit/editor-common/vanilla-tooltip';
 import { DELETED_HIGHLIGHT_BG_VAR, DELETED_HIGHLIGHT_BORDER_VAR, getAccentTokens, getDeletedHighlightHoverBorderColor, getDeletedHighlightHoverColor } from '../../pm-plugins/decorations/colorSchemes/factory';
 import { colorSchemeRegistry } from '../../pm-plugins/decorations/colorSchemes/schemes';
@@ -20,6 +21,21 @@ const getTagAccent = ({
   return getAccentTokens(accent);
 };
 
+/** ChatGPT's own brand colour, resolved from the shared `@atlaskit/agent-color` registry. */
+const chatgptBrandColor = getThirdPartyAgentColor({
+  agentName: 'chatgpt'
+});
+
+/** Brand accents for agent kinds with no ADS token match. New agents opt in by adding an entry. */
+const AGENT_KIND_ACCENT_OVERRIDES = {
+  ...(chatgptBrandColor ? {
+    chatgpt: {
+      background: chatgptBrandColor.bold,
+      text: chatgptBrandColor.boldText
+    }
+  } : {})
+};
+
 /**
  * Keyboard focus, as a member of `revealSources` alongside the elements the pointer can be over. It
  * has no element of its own to key on — the tag is already in the set under its own hover.
@@ -330,12 +346,18 @@ export class ContributorTagController {
     this.dom.srLabel.textContent = fullLabel;
   }
   accentOf(model) {
-    var _model$isInserted;
-    return getTagAccent({
+    var _model$isInserted, _model$contributor$ag, _model$connectedContr;
+    const accent = getTagAccent({
       colorScheme: model.colorScheme,
       isActive: Boolean(model.isActive),
       isInserted: (_model$isInserted = model.isInserted) !== null && _model$isInserted !== void 0 ? _model$isInserted : true
     });
+    const agentKind = (_model$contributor$ag = model.contributor.agentKind) !== null && _model$contributor$ag !== void 0 ? _model$contributor$ag : (_model$connectedContr = model.connectedContributor) === null || _model$connectedContr === void 0 ? void 0 : _model$connectedContr.agentKind;
+    const override = agentKind && AGENT_KIND_ACCENT_OVERRIDES[agentKind];
+    return override ? {
+      ...accent,
+      ...override
+    } : accent;
   }
   applyAccent(model) {
     if (!this.dom) {

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

@@ -28,8 +28,8 @@ const ROVO_HEX_ICON_SVG = `<svg width="16" height="16" viewBox="0 0 24 24" role=
 /** ClaudeLogo from ai-mate/studio-browse-kit, inset to fit the agent hexagon. */
 const CLAUDE_ICON_SVG = `<svg width="12" height="12" viewBox="8 8 32 32" role="presentation" style="display:block"><path fill="#FFFFFF" d="M14.2785 29.274L20.5732 25.7445L20.6785 25.4369L20.5732 25.2669H20.2653L19.2122 25.2021L15.6152 25.105L12.4962 24.9755L9.47443 24.8136L8.71291 24.6517L8 23.7126L8.07291 23.2431L8.71291 22.8141L9.62835 22.895L11.6537 23.0326L14.6916 23.2431L16.8952 23.3726L20.16 23.7126H20.6785L20.7514 23.5022L20.5732 23.3726L20.4354 23.2431L17.2922 21.1141L13.8896 18.8636L12.1073 17.5684L11.1433 16.9127L10.6572 16.2975L10.4466 14.9537L11.3215 13.9904L12.4962 14.0713L12.7959 14.1523L13.9868 15.067L16.5306 17.0342L19.8522 19.4789L20.3382 19.8836L20.5327 19.746L20.557 19.6489L20.3382 19.2846L18.5316 16.0223L16.6035 12.7033L15.7448 11.3271L15.518 10.5014C15.437 10.1614 15.3803 9.87807 15.3803 9.52998L16.3767 8.17809L16.9276 8L18.2562 8.17809L18.8152 8.6638L19.6415 10.55L20.9782 13.5209L23.0522 17.5603L23.6597 18.7584L23.9838 19.8674L24.1053 20.2074H24.3159V20.0132L24.4861 17.7384L24.802 14.9456L25.1099 11.3514L25.2152 10.3395L25.7175 9.12522L26.7139 8.46952L27.4916 8.84189L28.1316 9.75664L28.0425 10.3476L27.6618 12.8166L26.9165 16.6861L26.4304 19.2765H26.7139L27.038 18.9527L28.3504 17.2122L30.5539 14.4599L31.5261 13.3671L32.6603 12.1609L33.3894 11.5861H34.7666L35.7792 13.0918L35.3256 14.6461L33.9079 16.4432L32.7332 17.9651L31.0481 20.2317L29.9949 22.045L30.0922 22.1907L30.3433 22.1665L34.1509 21.3569L36.2086 20.9846L38.6633 20.5636L39.7732 21.0817L39.8947 21.6079L39.4572 22.6845L36.8324 23.3322L33.7539 23.9474L29.1686 25.0321L29.1119 25.0726L29.1767 25.1536L31.2425 25.3478L32.1256 25.3964H34.2886L38.3149 25.6959L39.3681 26.3921L40 27.2421L39.8947 27.8897L38.2744 28.7154L36.0871 28.1973L30.9833 26.9831L29.2334 26.5459H28.9904V26.6916L30.4486 28.1164L33.122 30.5287L36.4678 33.6372L36.638 34.4063L36.2086 35.0134L35.7549 34.9486L32.8142 32.7387L31.68 31.743L29.1119 29.5816H28.9418V29.8082L29.5332 30.6744L32.6603 35.3696L32.8223 36.8105L32.5954 37.28L31.7853 37.5634L30.8942 37.4015L29.0633 34.8353L27.1757 31.9454L25.6527 29.3549L25.4663 29.4602L24.5671 39.1338L24.1458 39.6276L23.1737 40L22.3635 39.3848L21.9342 38.3891L22.3635 36.422L22.882 33.8558L23.3033 31.8158L23.6841 29.2821L23.9109 28.4402L23.8947 28.3835L23.7084 28.4078L21.7965 31.0306L18.8881 34.9567L16.5873 37.4177L16.0365 37.6362L15.0805 37.1424L15.1696 36.2601L15.7043 35.4748L18.8881 31.4273L20.8081 28.9178L22.0476 27.4688L22.0395 27.2583H21.9666L13.5089 32.7468L12.002 32.9411L11.3539 32.3339L11.4349 31.3382L11.7428 31.0144L14.2866 29.2659L14.2785 29.274Z"/></svg>`;
 
-/** ChatGPT Presence avatar from Confluence's `ChatGptPresenceIcon`, at 16px. */
-const CHATGPT_ICON_SVG = '<svg width="16" height="16" viewBox="1 1.5328 16 16" overflow="visible" fill="none" role="presentation" style="display:block"><path d="M7.24707 0.973022C8.33116 0.344106 9.66865 0.342238 10.7539 0.969116L15.751 3.85583C16.8334 4.48117 17.5 5.63699 17.5 6.88708V12.1801C17.5 13.4301 16.8334 14.586 15.751 15.2113L10.751 18.1C9.66769 18.7258 8.33231 18.7258 7.24902 18.1L2.24902 15.2113C1.16658 14.586 0.5 13.4301 0.5 12.1801V6.90271C0.5 5.65489 1.1648 4.50153 2.24414 3.87537L7.24707 0.973022Z" fill="#14120B" stroke="#FFFFFF" stroke-width="1"/><svg x="4" y="4.53355" width="10" height="10" viewBox="10 12.0281 24 24" overflow="visible"><path d="M32.2119 21.2917C32.7552 19.256 32.2283 16.9938 30.6312 15.3967C29.0342 13.7997 26.7722 13.2728 24.7362 13.8161C23.2447 12.3277 21.0224 11.6529 18.8407 12.2376C16.6589 12.8221 15.0717 14.5177 14.5243 16.5524C12.4896 17.0999 10.794 18.6873 10.2094 20.8688C9.62493 23.0506 10.2996 25.2728 11.7881 26.7644C11.2448 28.8002 11.7718 31.0623 13.3688 32.6594C14.9658 34.2564 17.2278 34.7834 19.2638 34.2401C20.7553 35.7284 22.9778 36.4032 25.1593 35.8187C27.3411 35.2342 28.9283 33.5386 29.4757 31.5039C31.5105 30.9564 33.206 29.3691 33.7905 27.1874C34.3751 25.0058 33.7005 22.7834 32.2119 21.2919V21.2917ZM29.6507 16.3775C30.7329 17.4598 31.1792 18.937 30.9897 20.3453L25.9072 17.4108C25.6929 17.2871 25.4289 17.2871 25.2148 17.4108L19.2638 20.8466V18.5936C19.2638 18.4356 19.3485 18.2877 19.4854 18.2087L24.017 15.5924C25.8125 14.5895 28.1246 14.8514 29.6508 16.3775H29.6507ZM22 20.8685L24.7364 22.4483V25.608L22 27.1878L19.2636 25.608V22.4483L22 20.8685ZM15.7028 18.0636C15.732 16.0073 17.1149 14.1359 19.1997 13.5772C20.678 13.1811 22.1806 13.5333 23.3053 14.4014L18.2226 17.3357C18.0084 17.4594 17.8764 17.6881 17.8764 17.9353V24.8069L15.9253 23.6804C15.7885 23.6014 15.7028 23.454 15.7028 23.2959V18.0634V18.0636ZM11.549 21.2278C11.9451 19.7495 13.0014 18.6242 14.3156 18.0843V23.9532C14.3156 24.2004 14.4476 24.4291 14.6618 24.5528L20.6128 27.9886L18.6617 29.1151C18.5249 29.1941 18.3544 29.1946 18.2175 29.1156L13.6859 26.4993C11.9196 25.4459 10.9905 23.3124 11.549 21.2278ZM14.3494 31.6788C13.2671 30.5965 12.8208 29.1193 13.0103 27.7111L18.0928 30.6455C18.3071 30.7692 18.5711 30.7692 18.7852 30.6455L24.7362 27.2098V29.4626C24.7362 29.6207 24.6516 29.7682 24.5146 29.8477L19.983 32.4639C18.1875 33.4667 15.8754 33.2049 14.3492 31.6788H14.3494ZM28.2972 29.9927C28.268 32.049 26.8851 33.9205 24.8003 34.4791C23.322 34.8752 21.8194 34.523 20.6947 33.6549L25.7774 30.7205C25.9917 30.5969 26.1236 30.3682 26.1236 30.1209V23.2494L28.0747 24.3759C28.2115 24.4549 28.2972 24.6023 28.2972 24.7604V29.9929V29.9927ZM32.451 26.8285C32.0549 28.3068 30.9986 29.4321 29.6844 29.972V24.1031C29.6844 23.8559 29.5525 23.6272 29.3382 23.5035L23.3872 20.0678L25.3383 18.9412C25.4751 18.8622 25.6456 18.8617 25.7825 18.9407L30.314 21.5569C32.0804 22.6105 33.0095 24.7439 32.451 26.8285Z" fill="#FFFFFF"/></svg></svg>';
+/** ChatGPT hexagon lockup from the brand asset: the hexagon and knot glyph both baked in. */
+const CHATGPT_ICON_SVG = `<svg width="16" height="18" viewBox="0 0 16 18" fill="none" role="presentation" style="display:block"><path fill="#14120B" d="M14.5007 3.289L9.50384 0.402314C8.5736 -0.13509 7.42701 -0.134047 6.49774 0.405051L1.49458 3.30756C0.569434 3.84427 0 4.83294 0 5.9025V11.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.88668C16 4.81517 15.4285 3.82501 14.5007 3.289Z"/><path fill="white" d="M12.255 7.39338C12.4813 6.54514 12.2618 5.60258 11.5963 4.93713C10.9309 4.2717 9.9884 4.05217 9.1401 4.27852C8.51863 3.65837 7.59268 3.37721 6.68362 3.62082C5.77456 3.86436 5.11322 4.57087 4.88512 5.41867C4.03733 5.64676 3.33082 6.30819 3.08727 7.21717C2.84372 8.12623 3.12482 9.05218 3.74503 9.67365C3.51868 10.5219 3.73823 11.4645 4.40366 12.1299C5.06909 12.7953 6.01159 13.0149 6.85992 12.7885C7.48137 13.4087 8.4074 13.6898 9.31638 13.4463C10.2254 13.2027 10.8868 12.4962 11.1149 11.6485C11.9627 11.4203 12.6692 10.7589 12.9127 9.84993C13.1563 8.94089 12.8752 8.01491 12.255 7.39347V7.39338ZM11.1878 5.34578C11.6387 5.79673 11.8247 6.41226 11.7457 6.99902L9.62799 5.77632C9.53872 5.72478 9.42871 5.72478 9.3395 5.77632L6.85992 7.20789V6.26917C6.85992 6.20333 6.89519 6.1417 6.95226 6.10877L8.84042 5.01867C9.58854 4.60079 10.5519 4.7099 11.1878 5.34578H11.1878ZM8.00001 7.21703L9.14016 7.87529V9.19183L8.00001 9.85009L6.85984 9.19183V7.87529L8.00001 7.21703ZM5.37616 6.04832C5.38831 5.19153 5.96453 4.41177 6.83319 4.17899C7.44917 4.01397 8.07524 4.16069 8.54389 4.52241L6.42609 5.74505C6.33682 5.79656 6.28184 5.89186 6.28184 5.99489V8.85803L5.4689 8.38867C5.41189 8.35573 5.37616 8.29433 5.37616 8.22846V6.04826V6.04832ZM3.64542 7.36674C3.81044 6.75079 4.25056 6.28191 4.79817 6.05694V8.50232C4.79817 8.60534 4.85315 8.70061 4.94241 8.75216L7.42202 10.1837L6.60904 10.6531C6.55203 10.686 6.48098 10.6862 6.42397 10.6533L4.53581 9.56321C3.79984 9.12427 3.41272 8.23534 3.64542 7.36674ZM4.81224 11.7213C4.36129 11.2704 4.17534 10.6549 4.25429 10.0681L6.37201 11.2908C6.4613 11.3423 6.57129 11.3423 6.6605 11.2908L9.1401 9.85923V10.7979C9.1401 10.8638 9.10483 10.9254 9.04774 10.9584L7.15958 12.0485C6.41145 12.4663 5.44809 12.3572 4.81215 11.7213H4.81224ZM10.6238 11.0188C10.6117 11.8756 10.0355 12.6554 9.1668 12.8881C8.55083 13.0532 7.92476 12.9064 7.45613 12.5447L9.57391 11.322C9.6632 11.2705 9.71816 11.1753 9.71816 11.0722V8.20906L10.5311 8.67845C10.5881 8.71139 10.6238 8.77279 10.6238 8.83866V11.0189V11.0188ZM12.3546 9.70035C12.1896 10.3163 11.7494 10.7852 11.2018 11.0101V8.5648C11.2018 8.46178 11.1469 8.36648 11.0576 8.31496L8.57798 6.88339L9.39095 6.41401C9.44796 6.38107 9.51902 6.38085 9.57603 6.41378L11.4642 7.50388C12.2002 7.94285 12.5873 8.83178 12.3546 9.70035Z"/></svg>`;
 const markup = {
   aiAgent: AI_AGENT_ICON_SVG,
   aiBot: AI_BOT_ICON_SVG,

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

@@ -77,6 +77,10 @@ var extractChangedRows = function extractChangedRows(_ref) {
     // Check if this row overlaps with the deletion range
     var rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && (isExtendedEnabled(diffType) || !isEmptyRow(rowNode))) {
+      var rowLocalId = rowNode.attrs.localId;
+      var isTableRowReplacement = rowLocalId && tableNew.node.children.some(function (candidateRow) {
+        return candidateRow.type.name === 'tableRow' && candidateRow.attrs.localId === rowLocalId;
+      });
       var cellEdgeAttrs = edgeAttrsByOffset ? getRowCellEdgeAttrs({
         edgeAttrsByOffset: edgeAttrsByOffset,
         rowNode: rowNode,
@@ -88,6 +92,7 @@ var extractChangedRows = function extractChangedRows(_ref) {
       changedRows.push({
         rowIndex: rowIndex,
         rowNode: rowNode,
+        isTableRowReplacement: isTableRowReplacement,
         cellEdgeAttrs: cellEdgeAttrs,
         fromA: tableOld.pos + 1 + rowStart,
         toA: tableOld.pos + 1 + rowEnd,
@@ -169,6 +174,7 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
   var rowNode = _ref3.rowNode,
     cellEdgeAttrs = _ref3.cellEdgeAttrs,
     nodeViewSerializer = _ref3.nodeViewSerializer,
+    isTableRowReplacement = _ref3.isTableRowReplacement,
     colorScheme = _ref3.colorScheme,
     isInserted = _ref3.isInserted,
     diffType = _ref3.diffType,
@@ -176,6 +182,9 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
     intl = _ref3.intl,
     isActive = _ref3.isActive;
   var tr = document.createElement('tr');
+  if (isTableRowReplacement && fg('platform_editor_ai_show_diff_patch_2')) {
+    tr.dataset.showDiffTableRowReplacement = 'true';
+  }
   var colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
   var deletedTreatment = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme));
   var hostsRemovedLozenge = Boolean(intl) && isExtendedEnabled(diffType) && !isInserted && !hasAnchoredRemovedLozenge;
@@ -328,6 +337,7 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     var hasAnchoredRemovedLozenge = Boolean(intl) && isExtendedEnabled(diffType) && !isInserted && supportsAnchorPositioning();
     var rowDOM = createChangedRowDOM({
       rowNode: changedRow.rowNode,
+      isTableRowReplacement: changedRow.isTableRowReplacement,
       cellEdgeAttrs: changedRow.cellEdgeAttrs,
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,

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

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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 { getThirdPartyAgentColor } from '@atlaskit/agent-color/get-third-party-agent-color';
 import { getAttributionKey } from './decorations/colorSchemes/attributions';
 
 /** A brand name, so a literal rather than a translated message. */
@@ -11,48 +12,24 @@ var ROVO_AGENT_NAME = 'Rovo';
 
 /** `agentType` values that render as "Rovo" rather than as a generic external agent. */
 var ROVO_AGENT_TYPES = new Set(['convo-ai', 'rovo_chat']);
-/** Known external agent types emitted by Confluence's agent identification service. */
-var EXTERNAL_AGENT_PRESENTATIONS = {
-  claude: {
-    agentKind: 'claude',
-    name: 'Claude'
-  },
-  codex: {
-    agentKind: 'external',
-    name: 'Codex'
-  },
-  vscode: {
-    agentKind: 'external',
-    name: 'VS Code'
-  },
-  hermes: {
-    agentKind: 'external',
-    name: 'Hermes'
-  },
-  runlayer: {
-    agentKind: 'external',
-    name: 'Runlayer'
-  },
-  zed: {
-    agentKind: 'external',
-    name: 'Zed'
-  },
-  ampcode: {
-    agentKind: 'external',
-    name: 'Ampcode'
-  },
-  antigravity: {
-    agentKind: 'external',
-    name: 'Antigravity'
-  },
-  devin_cli: {
-    agentKind: 'external',
-    name: 'Devin CLI'
-  },
-  pi_agent: {
-    agentKind: 'external',
-    name: 'Pi Agent'
-  }
+/** `@atlaskit/agent-color` brands show-diff renders with a dedicated presentation. */
+var SHOW_DIFF_AGENT_BRANDS = {
+  'agent-brand-claude': 'claude',
+  'agent-brand-chatgpt': 'chatgpt',
+  'agent-brand-rovo': 'rovo'
+};
+
+/** Known external agent types emitted by Confluence's agent identification service that carry
+ * no `@atlaskit/agent-color` brand — a generic labelled fallback. */
+var EXTERNAL_AGENT_NAMES = {
+  vscode: 'VS Code',
+  hermes: 'Hermes',
+  runlayer: 'Runlayer',
+  zed: 'Zed',
+  ampcode: 'Ampcode',
+  antigravity: 'Antigravity',
+  devin_cli: 'Devin CLI',
+  pi_agent: 'Pi Agent'
 };
 var hasAgentIdentity = function hasAgentIdentity(attribution) {
   var _attribution$agentId, _attribution$agentTyp;
@@ -82,11 +59,16 @@ var resolveUser = function resolveUser(userId, profilesByAccountId) {
 var resolveAgent = function resolveAgent(attribution, profilesByAccountId) {
   var _attribution$agentTyp2, _attribution$agentId2;
   var agentType = (_attribution$agentTyp2 = attribution.agentType) === null || _attribution$agentTyp2 === void 0 ? void 0 : _attribution$agentTyp2.trim().toLowerCase();
-  var agentPresentation = agentType ? EXTERNAL_AGENT_PRESENTATIONS[agentType] : undefined;
-  if (agentPresentation && agentPresentation.agentKind !== 'external') {
-    return _objectSpread(_objectSpread({}, agentPresentation), {}, {
-      kind: 'agent'
-    });
+  var brand = agentType ? getThirdPartyAgentColor({
+    agentName: agentType
+  }) : undefined;
+  var diffBrand = brand ? SHOW_DIFF_AGENT_BRANDS[brand.scheme] : undefined;
+  if (diffBrand && brand) {
+    return {
+      agentKind: diffBrand,
+      kind: 'agent',
+      name: brand.name
+    };
   }
   var agentId = (_attribution$agentId2 = attribution.agentId) === null || _attribution$agentId2 === void 0 ? void 0 : _attribution$agentId2.trim();
   var agentProfile = agentId ? profilesByAccountId.get(agentId) : undefined;
@@ -101,16 +83,18 @@ var resolveAgent = function resolveAgent(attribution, profilesByAccountId) {
   }
 
   // Unknown types keep an empty name for the tag's localised "External agent" label.
-  return agentType && ROVO_AGENT_TYPES.has(agentType) ? {
-    agentKind: 'rovo',
-    kind: 'agent',
-    name: ROVO_AGENT_NAME
-  } : agentPresentation ? _objectSpread(_objectSpread({}, agentPresentation), {}, {
-    kind: 'agent'
-  }) : {
+  if (agentType && ROVO_AGENT_TYPES.has(agentType)) {
+    return {
+      agentKind: 'rovo',
+      kind: 'agent',
+      name: ROVO_AGENT_NAME
+    };
+  }
+  var externalName = agentType ? EXTERNAL_AGENT_NAMES[agentType] : undefined;
+  return {
     agentKind: 'external',
     kind: 'agent',
-    name: ''
+    name: externalName !== null && externalName !== void 0 ? externalName : ''
   };
 };
 

package/dist/esm/showDiffPluginType.js

@@ -21,9 +21,19 @@
 
 export var DIFF_AGENT_BRANDS = new Set(['rovo', 'claude', 'chatgpt']);
 
+/** The brand id `@atlaskit/agent-color` registers each `AgentBrandColorScheme` under. */
+
+/**
+ * Compile-time-only: fails to build if `DiffAgentBrand` names a brand `@atlaskit/agent-color`
+ * hasn't registered a colour scheme for. Catches "added a brand here but forgot the colour"
+ * without needing a runtime check. Exported only so the unused check on this module-scope
+ * assertion doesn't fire; no consumer needs its value.
+ */
+export var ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED = true;
+
 /** A complete identity for one of the accounts named by a step attribution. */
 
-/** Agent presentation: branded, identified by profile, or a generic external agent. */
+/** Agent presentation: branded (dedicated icon and reserved participant colour), identified by profile, or a generic external agent. */
 
 /**
  * A contributor the plugin has resolved from a step attribution and a supplied profile. Internal:

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

@@ -4,7 +4,13 @@ import { BORDER_WIDTH } from '@atlaskit/avatar/constants/default';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getContributorTagIcon } from './contributorTagIcons';
 
-/** Agent kinds with a custom contributor-tag icon. */
+/**
+ * Agent kinds with a custom contributor-tag icon. The `satisfies` clause fails the build if a
+ * `DiffAgentBrand` is missing an icon here; `ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED` in
+ * `showDiffPluginType.ts` similarly fails the build if a brand has no `@atlaskit/agent-color`
+ * colour scheme. 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',
@@ -29,12 +35,13 @@ var boxStyle = convertToInlineCss({
   height: "".concat(AVATAR_BOX_SIZE, "px")
 });
 var shapeStyle = convertToInlineCss({
-  display: 'inline-flex',
+  display: 'flex',
   alignItems: 'center',
   justifyContent: 'center',
   boxSizing: 'border-box',
   width: "".concat(AVATAR_SIZE, "px"),
   height: "".concat(AVATAR_SIZE, "px"),
+  aspectRatio: '1/1',
   overflow: 'hidden'
 });
 var imageStyle = convertToInlineCss({

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

@@ -2,7 +2,10 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 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 { bind, bindAll } from 'bind-event-listener';
+import { getThirdPartyAgentColor } from '@atlaskit/agent-color/get-third-party-agent-color';
 import { VanillaTooltip } from '@atlaskit/editor-common/vanilla-tooltip';
 import { DELETED_HIGHLIGHT_BG_VAR, DELETED_HIGHLIGHT_BORDER_VAR, getAccentTokens, getDeletedHighlightHoverBorderColor, getDeletedHighlightHoverColor } from '../../pm-plugins/decorations/colorSchemes/factory';
 import { colorSchemeRegistry } from '../../pm-plugins/decorations/colorSchemes/schemes';
@@ -22,6 +25,19 @@ var getTagAccent = function getTagAccent(_ref) {
   return getAccentTokens(accent);
 };
 
+/** ChatGPT's own brand colour, resolved from the shared `@atlaskit/agent-color` registry. */
+var chatgptBrandColor = getThirdPartyAgentColor({
+  agentName: 'chatgpt'
+});
+
+/** 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 ? {
+  chatgpt: {
+    background: chatgptBrandColor.bold,
+    text: chatgptBrandColor.boldText
+  }
+} : {});
+
 /**
  * Keyboard focus, as a member of `revealSources` alongside the elements the pointer can be over. It
  * has no element of its own to key on — the tag is already in the set under its own hover.
@@ -367,12 +383,15 @@ export var ContributorTagController = /*#__PURE__*/function () {
   }, {
     key: "accentOf",
     value: function accentOf(model) {
-      var _model$isInserted;
-      return getTagAccent({
+      var _model$isInserted, _model$contributor$ag, _model$connectedContr;
+      var accent = getTagAccent({
         colorScheme: model.colorScheme,
         isActive: Boolean(model.isActive),
         isInserted: (_model$isInserted = model.isInserted) !== null && _model$isInserted !== void 0 ? _model$isInserted : true
       });
+      var agentKind = (_model$contributor$ag = model.contributor.agentKind) !== null && _model$contributor$ag !== void 0 ? _model$contributor$ag : (_model$connectedContr = model.connectedContributor) === null || _model$connectedContr === void 0 ? void 0 : _model$connectedContr.agentKind;
+      var override = agentKind && AGENT_KIND_ACCENT_OVERRIDES[agentKind];
+      return override ? _objectSpread(_objectSpread({}, accent), override) : accent;
     }
   }, {
     key: "applyAccent",

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

@@ -28,8 +28,8 @@ var ROVO_HEX_ICON_SVG = "<svg width=\"16\" height=\"16\" viewBox=\"0 0 24 24\" r
 /** ClaudeLogo from ai-mate/studio-browse-kit, inset to fit the agent hexagon. */
 var CLAUDE_ICON_SVG = "<svg width=\"12\" height=\"12\" viewBox=\"8 8 32 32\" role=\"presentation\" style=\"display:block\"><path fill=\"#FFFFFF\" d=\"M14.2785 29.274L20.5732 25.7445L20.6785 25.4369L20.5732 25.2669H20.2653L19.2122 25.2021L15.6152 25.105L12.4962 24.9755L9.47443 24.8136L8.71291 24.6517L8 23.7126L8.07291 23.2431L8.71291 22.8141L9.62835 22.895L11.6537 23.0326L14.6916 23.2431L16.8952 23.3726L20.16 23.7126H20.6785L20.7514 23.5022L20.5732 23.3726L20.4354 23.2431L17.2922 21.1141L13.8896 18.8636L12.1073 17.5684L11.1433 16.9127L10.6572 16.2975L10.4466 14.9537L11.3215 13.9904L12.4962 14.0713L12.7959 14.1523L13.9868 15.067L16.5306 17.0342L19.8522 19.4789L20.3382 19.8836L20.5327 19.746L20.557 19.6489L20.3382 19.2846L18.5316 16.0223L16.6035 12.7033L15.7448 11.3271L15.518 10.5014C15.437 10.1614 15.3803 9.87807 15.3803 9.52998L16.3767 8.17809L16.9276 8L18.2562 8.17809L18.8152 8.6638L19.6415 10.55L20.9782 13.5209L23.0522 17.5603L23.6597 18.7584L23.9838 19.8674L24.1053 20.2074H24.3159V20.0132L24.4861 17.7384L24.802 14.9456L25.1099 11.3514L25.2152 10.3395L25.7175 9.12522L26.7139 8.46952L27.4916 8.84189L28.1316 9.75664L28.0425 10.3476L27.6618 12.8166L26.9165 16.6861L26.4304 19.2765H26.7139L27.038 18.9527L28.3504 17.2122L30.5539 14.4599L31.5261 13.3671L32.6603 12.1609L33.3894 11.5861H34.7666L35.7792 13.0918L35.3256 14.6461L33.9079 16.4432L32.7332 17.9651L31.0481 20.2317L29.9949 22.045L30.0922 22.1907L30.3433 22.1665L34.1509 21.3569L36.2086 20.9846L38.6633 20.5636L39.7732 21.0817L39.8947 21.6079L39.4572 22.6845L36.8324 23.3322L33.7539 23.9474L29.1686 25.0321L29.1119 25.0726L29.1767 25.1536L31.2425 25.3478L32.1256 25.3964H34.2886L38.3149 25.6959L39.3681 26.3921L40 27.2421L39.8947 27.8897L38.2744 28.7154L36.0871 28.1973L30.9833 26.9831L29.2334 26.5459H28.9904V26.6916L30.4486 28.1164L33.122 30.5287L36.4678 33.6372L36.638 34.4063L36.2086 35.0134L35.7549 34.9486L32.8142 32.7387L31.68 31.743L29.1119 29.5816H28.9418V29.8082L29.5332 30.6744L32.6603 35.3696L32.8223 36.8105L32.5954 37.28L31.7853 37.5634L30.8942 37.4015L29.0633 34.8353L27.1757 31.9454L25.6527 29.3549L25.4663 29.4602L24.5671 39.1338L24.1458 39.6276L23.1737 40L22.3635 39.3848L21.9342 38.3891L22.3635 36.422L22.882 33.8558L23.3033 31.8158L23.6841 29.2821L23.9109 28.4402L23.8947 28.3835L23.7084 28.4078L21.7965 31.0306L18.8881 34.9567L16.5873 37.4177L16.0365 37.6362L15.0805 37.1424L15.1696 36.2601L15.7043 35.4748L18.8881 31.4273L20.8081 28.9178L22.0476 27.4688L22.0395 27.2583H21.9666L13.5089 32.7468L12.002 32.9411L11.3539 32.3339L11.4349 31.3382L11.7428 31.0144L14.2866 29.2659L14.2785 29.274Z\"/></svg>";
 
-/** ChatGPT Presence avatar from Confluence's `ChatGptPresenceIcon`, at 16px. */
-var CHATGPT_ICON_SVG = '<svg width="16" height="16" viewBox="1 1.5328 16 16" overflow="visible" fill="none" role="presentation" style="display:block"><path d="M7.24707 0.973022C8.33116 0.344106 9.66865 0.342238 10.7539 0.969116L15.751 3.85583C16.8334 4.48117 17.5 5.63699 17.5 6.88708V12.1801C17.5 13.4301 16.8334 14.586 15.751 15.2113L10.751 18.1C9.66769 18.7258 8.33231 18.7258 7.24902 18.1L2.24902 15.2113C1.16658 14.586 0.5 13.4301 0.5 12.1801V6.90271C0.5 5.65489 1.1648 4.50153 2.24414 3.87537L7.24707 0.973022Z" fill="#14120B" stroke="#FFFFFF" stroke-width="1"/><svg x="4" y="4.53355" width="10" height="10" viewBox="10 12.0281 24 24" overflow="visible"><path d="M32.2119 21.2917C32.7552 19.256 32.2283 16.9938 30.6312 15.3967C29.0342 13.7997 26.7722 13.2728 24.7362 13.8161C23.2447 12.3277 21.0224 11.6529 18.8407 12.2376C16.6589 12.8221 15.0717 14.5177 14.5243 16.5524C12.4896 17.0999 10.794 18.6873 10.2094 20.8688C9.62493 23.0506 10.2996 25.2728 11.7881 26.7644C11.2448 28.8002 11.7718 31.0623 13.3688 32.6594C14.9658 34.2564 17.2278 34.7834 19.2638 34.2401C20.7553 35.7284 22.9778 36.4032 25.1593 35.8187C27.3411 35.2342 28.9283 33.5386 29.4757 31.5039C31.5105 30.9564 33.206 29.3691 33.7905 27.1874C34.3751 25.0058 33.7005 22.7834 32.2119 21.2919V21.2917ZM29.6507 16.3775C30.7329 17.4598 31.1792 18.937 30.9897 20.3453L25.9072 17.4108C25.6929 17.2871 25.4289 17.2871 25.2148 17.4108L19.2638 20.8466V18.5936C19.2638 18.4356 19.3485 18.2877 19.4854 18.2087L24.017 15.5924C25.8125 14.5895 28.1246 14.8514 29.6508 16.3775H29.6507ZM22 20.8685L24.7364 22.4483V25.608L22 27.1878L19.2636 25.608V22.4483L22 20.8685ZM15.7028 18.0636C15.732 16.0073 17.1149 14.1359 19.1997 13.5772C20.678 13.1811 22.1806 13.5333 23.3053 14.4014L18.2226 17.3357C18.0084 17.4594 17.8764 17.6881 17.8764 17.9353V24.8069L15.9253 23.6804C15.7885 23.6014 15.7028 23.454 15.7028 23.2959V18.0634V18.0636ZM11.549 21.2278C11.9451 19.7495 13.0014 18.6242 14.3156 18.0843V23.9532C14.3156 24.2004 14.4476 24.4291 14.6618 24.5528L20.6128 27.9886L18.6617 29.1151C18.5249 29.1941 18.3544 29.1946 18.2175 29.1156L13.6859 26.4993C11.9196 25.4459 10.9905 23.3124 11.549 21.2278ZM14.3494 31.6788C13.2671 30.5965 12.8208 29.1193 13.0103 27.7111L18.0928 30.6455C18.3071 30.7692 18.5711 30.7692 18.7852 30.6455L24.7362 27.2098V29.4626C24.7362 29.6207 24.6516 29.7682 24.5146 29.8477L19.983 32.4639C18.1875 33.4667 15.8754 33.2049 14.3492 31.6788H14.3494ZM28.2972 29.9927C28.268 32.049 26.8851 33.9205 24.8003 34.4791C23.322 34.8752 21.8194 34.523 20.6947 33.6549L25.7774 30.7205C25.9917 30.5969 26.1236 30.3682 26.1236 30.1209V23.2494L28.0747 24.3759C28.2115 24.4549 28.2972 24.6023 28.2972 24.7604V29.9929V29.9927ZM32.451 26.8285C32.0549 28.3068 30.9986 29.4321 29.6844 29.972V24.1031C29.6844 23.8559 29.5525 23.6272 29.3382 23.5035L23.3872 20.0678L25.3383 18.9412C25.4751 18.8622 25.6456 18.8617 25.7825 18.9407L30.314 21.5569C32.0804 22.6105 33.0095 24.7439 32.451 26.8285Z" fill="#FFFFFF"/></svg></svg>';
+/** ChatGPT hexagon lockup from the brand asset: the hexagon and knot glyph both baked in. */
+var CHATGPT_ICON_SVG = "<svg width=\"16\" height=\"18\" viewBox=\"0 0 16 18\" fill=\"none\" role=\"presentation\" style=\"display:block\"><path fill=\"#14120B\" d=\"M14.5007 3.289L9.50384 0.402314C8.5736 -0.13509 7.42701 -0.134047 6.49774 0.405051L1.49458 3.30756C0.569434 3.84427 0 4.83294 0 5.9025V11.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.88668C16 4.81517 15.4285 3.82501 14.5007 3.289Z\"/><path fill=\"white\" d=\"M12.255 7.39338C12.4813 6.54514 12.2618 5.60258 11.5963 4.93713C10.9309 4.2717 9.9884 4.05217 9.1401 4.27852C8.51863 3.65837 7.59268 3.37721 6.68362 3.62082C5.77456 3.86436 5.11322 4.57087 4.88512 5.41867C4.03733 5.64676 3.33082 6.30819 3.08727 7.21717C2.84372 8.12623 3.12482 9.05218 3.74503 9.67365C3.51868 10.5219 3.73823 11.4645 4.40366 12.1299C5.06909 12.7953 6.01159 13.0149 6.85992 12.7885C7.48137 13.4087 8.4074 13.6898 9.31638 13.4463C10.2254 13.2027 10.8868 12.4962 11.1149 11.6485C11.9627 11.4203 12.6692 10.7589 12.9127 9.84993C13.1563 8.94089 12.8752 8.01491 12.255 7.39347V7.39338ZM11.1878 5.34578C11.6387 5.79673 11.8247 6.41226 11.7457 6.99902L9.62799 5.77632C9.53872 5.72478 9.42871 5.72478 9.3395 5.77632L6.85992 7.20789V6.26917C6.85992 6.20333 6.89519 6.1417 6.95226 6.10877L8.84042 5.01867C9.58854 4.60079 10.5519 4.7099 11.1878 5.34578H11.1878ZM8.00001 7.21703L9.14016 7.87529V9.19183L8.00001 9.85009L6.85984 9.19183V7.87529L8.00001 7.21703ZM5.37616 6.04832C5.38831 5.19153 5.96453 4.41177 6.83319 4.17899C7.44917 4.01397 8.07524 4.16069 8.54389 4.52241L6.42609 5.74505C6.33682 5.79656 6.28184 5.89186 6.28184 5.99489V8.85803L5.4689 8.38867C5.41189 8.35573 5.37616 8.29433 5.37616 8.22846V6.04826V6.04832ZM3.64542 7.36674C3.81044 6.75079 4.25056 6.28191 4.79817 6.05694V8.50232C4.79817 8.60534 4.85315 8.70061 4.94241 8.75216L7.42202 10.1837L6.60904 10.6531C6.55203 10.686 6.48098 10.6862 6.42397 10.6533L4.53581 9.56321C3.79984 9.12427 3.41272 8.23534 3.64542 7.36674ZM4.81224 11.7213C4.36129 11.2704 4.17534 10.6549 4.25429 10.0681L6.37201 11.2908C6.4613 11.3423 6.57129 11.3423 6.6605 11.2908L9.1401 9.85923V10.7979C9.1401 10.8638 9.10483 10.9254 9.04774 10.9584L7.15958 12.0485C6.41145 12.4663 5.44809 12.3572 4.81215 11.7213H4.81224ZM10.6238 11.0188C10.6117 11.8756 10.0355 12.6554 9.1668 12.8881C8.55083 13.0532 7.92476 12.9064 7.45613 12.5447L9.57391 11.322C9.6632 11.2705 9.71816 11.1753 9.71816 11.0722V8.20906L10.5311 8.67845C10.5881 8.71139 10.6238 8.77279 10.6238 8.83866V11.0189V11.0188ZM12.3546 9.70035C12.1896 10.3163 11.7494 10.7852 11.2018 11.0101V8.5648C11.2018 8.46178 11.1469 8.36648 11.0576 8.31496L8.57798 6.88339L9.39095 6.41401C9.44796 6.38107 9.51902 6.38085 9.57603 6.41378L11.4642 7.50388C12.2002 7.94285 12.5873 8.83178 12.3546 9.70035Z\"/></svg>";
 var markup = {
   aiAgent: AI_AGENT_ICON_SVG,
   aiBot: AI_BOT_ICON_SVG,

package/dist/types/showDiffPluginType.d.ts

@@ -1,3 +1,4 @@
+import type { AgentBrandColorScheme } from '@atlaskit/agent-color/agent-presence-color-types';
 import type { StepJson } from '@atlaskit/editor-common/collab';
 import type { NextEditorPlugin, EditorCommand, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer/types';
@@ -40,6 +41,15 @@ export type StepWithAttribution<TStep> = {
 /** Branded agent presentations supported by contributor tags. */
 export type DiffAgentBrand = 'rovo' | 'claude' | 'chatgpt';
 export declare const DIFF_AGENT_BRANDS: ReadonlySet<DiffAgentBrand>;
+/** The brand id `@atlaskit/agent-color` registers each `AgentBrandColorScheme` under. */
+type AgentColorBrandId = AgentBrandColorScheme extends `agent-brand-${infer BrandId}` ? BrandId : never;
+/**
+ * Compile-time-only: fails to build if `DiffAgentBrand` names a brand `@atlaskit/agent-color`
+ * hasn't registered a colour scheme for. Catches "added a brand here but forgot the colour"
+ * without needing a runtime check. Exported only so the unused check on this module-scope
+ * assertion doesn't fire; no consumer needs its value.
+ */
+export declare const ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED: DiffAgentBrand extends AgentColorBrandId ? true : ['DiffAgentBrand is missing from @atlaskit/agent-color', DiffAgentBrand];
 /** A complete identity for one of the accounts named by a step attribution. */
 export type DiffContributorProfile = {
     /** Matched against the `userId` and `agentId` on step attributions. */
@@ -50,7 +60,7 @@ export type DiffContributorProfile = {
     name: string;
 };
 type DiffContributorKind = 'user' | 'agent';
-/** Agent presentation: branded, identified by profile, or a generic external agent. */
+/** Agent presentation: branded (dedicated icon and reserved participant colour), identified by profile, or a generic external agent. */
 type DiffAgentKind = DiffAgentBrand | 'identified' | 'external';
 /**
  * A contributor the plugin has resolved from a step attribution and a supplied profile. Internal:

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "17.1.8",
+	"version": "17.1.9",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -26,7 +26,7 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.6.0",
-		"@atlaskit/agent-color": "^0.2.0",
+		"@atlaskit/agent-color": "^1.0.0",
 		"@atlaskit/avatar": "^28.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^19.0.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^202.0.0",
+		"@atlaskit/tmp-editor-statsig": "^203.0.0",
 		"@atlaskit/tokens": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -64,14 +64,14 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^33.0.0",
-		"@atlassian/editor-plugin-ai": "^73.6.0",
+		"@atlassian/editor-plugin-ai": "^73.7.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.7.0",
+		"@atlaskit/editor-common": "^123.8.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"