@atlaskit/editor-synced-block-provider 8.2.0 → 8.3.1

package/dist/es2019/clients/jira/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+const JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+
 /**
  * Generates the Jira work item ARI
  * @param workItemId - the ID of the work item
@@ -21,7 +23,7 @@ export const getJiraWorkItemAri = ({
 export const getJiraWorkItemIdFromAri = ({
   ari
 }) => {
-  const match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
+  const match = ari.match(JIRA_WORK_ITEM_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -3,7 +3,7 @@ import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isProviderNotReadyError, SyncBlockError } from '../common/types';
-import { fetchErrorPayload } from '../utils/errorHandling';
+import { buildFetchErrorAttribution, fetchErrorPayload } from '../utils/errorHandling';
 import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalyticsEvent) => {
   var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4;
@@ -72,7 +72,7 @@ export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalytic
       logException(error, {
         location: 'editor-synced-block-provider/useFetchSyncBlockData'
       });
-      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
 
       // Set error state if fetching fails
       setFetchState({

package/dist/es2019/providers/block-service/blockServiceAPI.js

@@ -7,6 +7,8 @@ import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 import { createResourceIdForReference } from '../../utils/resourceId';
 import { convertContentUpdatedAt } from '../../utils/utils';
+const BLOCK_ARI_TO_RESOURCE_ID_REGEX = /^ari:cloud:blocks:.*:synced-block\/(.+)$/;
+const EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 const mapBlockError = error => {
   switch (error.status) {
     case 400:
@@ -73,7 +75,7 @@ export const blockAriToResourceId = blockAri => {
   // The regex captures the full path after synced-block/
   // e.g. ari:cloud:blocks:DUMMY-a5a01d21-1cc3-4f29-9565-f2bb8cd969f5:synced-block/confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
   // should return confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
-  const match = blockAri.match(/^ari:cloud:blocks:.*:synced-block\/(.+)$/);
+  const match = blockAri.match(BLOCK_ARI_TO_RESOURCE_ID_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 
@@ -160,7 +162,7 @@ export const fetchReferences = async documentAri => {
  * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
  */
 export const extractResourceIdFromBlockAri = blockAri => {
-  const match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  const match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return match === null || match === void 0 ? void 0 : match[1];
 };
 
@@ -300,11 +302,16 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers, c
       }));
     }
 
-    // If batch request fails, return error for all resourceIds
+    // If batch request fails, return error for all resourceIds. Capture the HTTP
+    // status from `BlockError` so fetch analytics can break failures down by
+    // statusCode (EDITOR-7862); undefined for non-HTTP failures.
     return blockNodeIdentifiers.map(blockNodeIdentifier => ({
       error: {
         type: error instanceof BlockError ? mapBlockError(error) : SyncBlockError.Errored,
-        reason: error.message
+        reason: error.message,
+        ...(error instanceof BlockError && {
+          statusCode: error.status
+        })
       },
       resourceId: blockNodeIdentifier.resourceId
     }));
@@ -458,10 +465,13 @@ class BlockServiceADFFetchProvider {
       };
     } catch (error) {
       if (error instanceof BlockError) {
+        // Capture the HTTP status so fetch analytics can break failures down by
+        // statusCode (EDITOR-7862).
         return {
           error: {
             type: mapBlockError(error),
-            reason: error.message
+            reason: error.message,
+            statusCode: error.status
           },
           resourceId
         };

package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js

@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isProviderNotReadyError, ProviderNotReadyError, SyncBlockError } from '../common/types';
-import { buildErrorAttribution, cacheDeletionForcedPayload, fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, sourceInfoOrphanedPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
+import { buildErrorAttribution, buildFetchErrorAttribution, cacheDeletionForcedPayload, fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, sourceInfoOrphanedPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { createSyncBlockNode, getSourceProductFromResourceIdSafe, normalizeSyncBlockJSONContent } from '../utils/utils';
@@ -472,10 +472,12 @@ export class ReferenceSyncBlockStoreManager {
     data.forEach(syncBlockInstance => {
       var _resolvedSyncBlockIns;
       if (!syncBlockInstance.resourceId) {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$fireAnalyticsEv8;
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$fireAnalyticsEv8, _syncBlockInstance$er3, _syncBlockInstance$er4, _syncBlockInstance$er5;
         const payload = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type) || 'Returned sync block instance does not have resource id';
         // No resourceId means we cannot derive a sourceProduct here; intentionally omit.
-        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, fetchErrorPayload(payload));
+        // Classify on the structured `type` first, falling back to the free-text
+        // `reason`/payload (EDITOR-7862).
+        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, fetchErrorPayload(payload, undefined, undefined, buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), ((_syncBlockInstance$er3 = syncBlockInstance.error) === null || _syncBlockInstance$er3 === void 0 ? void 0 : _syncBlockInstance$er3.type) || ((_syncBlockInstance$er4 = syncBlockInstance.error) === null || _syncBlockInstance$er4 === void 0 ? void 0 : _syncBlockInstance$er4.reason) || payload, (_syncBlockInstance$er5 = syncBlockInstance.error) === null || _syncBlockInstance$er5 === void 0 ? void 0 : _syncBlockInstance$er5.statusCode)));
         return;
       }
       const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
@@ -509,7 +511,10 @@ export class ReferenceSyncBlockStoreManager {
         const isRetryingEntityNotFound = syncBlockInstance.error.type === SyncBlockError.EntityNotFound && ((_this$entityNotFoundR = this.entityNotFoundRetryCount.get(syncBlockInstance.resourceId)) !== null && _this$entityNotFoundR !== void 0 ? _this$entityNotFoundR : 0) < ENTITY_NOT_FOUND_MAX_RETRIES && fg('platform_synced_block_patch_13');
         if (!isRetryingEntityNotFound) {
           var _this$fireAnalyticsEv9, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
+          // Classify on the structured `type` (a `SyncBlockError` enum value) first,
+          // falling back to the free-text `reason` so source-state/permission strings
+          // are still bucketed (EDITOR-7862). The emitted `error` attribute is unchanged.
+          (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), syncBlockInstance.error.type || syncBlockInstance.error.reason, syncBlockInstance.error.statusCode)));
         }
         if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
           hasExpectedError = true;
@@ -806,7 +811,7 @@ export class ReferenceSyncBlockStoreManager {
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, fetchErrorPayload(error.message));
+      (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, fetchErrorPayload(error.message, undefined, undefined, buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
       return () => {};
     }
   }

package/dist/es2019/store-manager/syncBlockBatchFetcher.js

@@ -3,7 +3,7 @@ import rafSchedule from 'raf-schd';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isProviderNotReadyError } from '../common/types';
-import { fetchErrorPayload } from '../utils/errorHandling';
+import { buildFetchErrorAttribution, fetchErrorPayload } from '../utils/errorHandling';
 import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
  * Handles debounced batch-fetching of sync block data via `raf-schd`.
@@ -60,9 +60,10 @@ export class SyncBlockBatchFetcher {
         logException(error, {
           location: 'editor-synced-block-provider/syncBlockBatchFetcher/batchedFetchSyncBlocks'
         });
+        const attribution = buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message);
         resourceIds.forEach(resId => {
           var _this$deps$getFireAna;
-          (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resId, getSourceProductFromResourceIdSafe(resId)));
+          (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resId, getSourceProductFromResourceIdSafe(resId), attribution));
         });
       }).finally(() => {
         // If the fetcher was destroyed while the request was in flight,

package/dist/es2019/store-manager/syncBlockProviderFactoryManager.js

@@ -1,7 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { fetchErrorPayload } from '../utils/errorHandling';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { buildFetchErrorAttribution, fetchErrorPayload } from '../utils/errorHandling';
 import { parseResourceId } from '../utils/resourceId';
 import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
@@ -21,7 +22,7 @@ export class SyncBlockProviderFactoryManager {
       logException(error, {
         location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
       });
-      (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+      (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
       return undefined;
     }
     const {
@@ -55,7 +56,7 @@ export class SyncBlockProviderFactoryManager {
         logException(error, {
           location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
         });
-        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
       }
     }
     return providerFactory;
@@ -133,7 +134,7 @@ export class SyncBlockProviderFactoryManager {
     if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
       var _this$deps$getFireAna3, _syncBlock$data$produ;
       (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchErrorPayload('Sync block source ari or product not found', resourceId, // Prefer cached product when available; fall back to parsing resourceId.
-      (_syncBlock$data$produ = syncBlock.data.product) !== null && _syncBlock$data$produ !== void 0 ? _syncBlock$data$produ : getSourceProductFromResourceIdSafe(resourceId)));
+      (_syncBlock$data$produ = syncBlock.data.product) !== null && _syncBlock$data$produ !== void 0 ? _syncBlock$data$produ : getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), 'Sync block source ari or product not found')));
       return;
     }
     const parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);

package/dist/es2019/store-manager/syncBlockSubscriptionManager.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { fetchErrorPayload, fetchSuccessPayload } from '../utils/errorHandling';
+import { buildFetchErrorAttribution, fetchErrorPayload, fetchSuccessPayload } from '../utils/errorHandling';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
@@ -87,7 +87,7 @@ export class SyncBlockSubscriptionManager {
         logException(error, {
           location: 'editor-synced-block-provider/syncBlockSubscriptionManager/notifySubscriptionChangeListeners'
         });
-        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message));
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, undefined, undefined, buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
       }
     });
   }
@@ -264,6 +264,9 @@ export class SyncBlockSubscriptionManager {
       // recovers on reconnect, so under the gate we don't fire a
       // user-facing error here — it's only surfaced on exhaustion (see
       // scheduleReconnection). Gate OFF keeps the legacy fire-on-drop.
+      // This branch only runs when the gate is OFF, so buildFetchErrorAttribution
+      // would return undefined; the structured attribution (EDITOR-7862) is therefore
+      // applied at the gate-ON exhaustion site in scheduleReconnection instead.
       if (!fg('platform_editor_blocks_patch_3')) {
         var _this$deps$getFireAna2;
         (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
@@ -310,7 +313,7 @@ export class SyncBlockSubscriptionManager {
       logException(new Error(errorMessage), {
         location: 'editor-synced-block-provider/syncBlockSubscriptionManager/max-retries-exhausted'
       });
-      (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchErrorPayload(errorMessage, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+      (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchErrorPayload(errorMessage, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), errorMessage)));
       return;
     }
     const delay = this.getReconnectionDelay(attempts);
@@ -409,9 +412,13 @@ export class SyncBlockSubscriptionManager {
       });
       this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
     } else {
-      var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna5, _syncBlockInstance$da3, _syncBlockInstance$da4;
+      var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna5, _syncBlockInstance$da3, _syncBlockInstance$da4, _syncBlockInstance$er3, _syncBlockInstance$er4, _syncBlockInstance$er5;
       const errorMessage = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type);
-      (_this$deps$getFireAna5 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna5 === void 0 ? void 0 : _this$deps$getFireAna5(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
+
+      // Prefer the structured `type` (a `SyncBlockError` enum value) for classification
+      // and fall back to the free-text `reason` so source-state/permission strings are
+      // still bucketed (EDITOR-7862). The emitted free-text `error` attribute is unchanged.
+      (_this$deps$getFireAna5 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna5 === void 0 ? void 0 : _this$deps$getFireAna5(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), ((_syncBlockInstance$er3 = syncBlockInstance.error) === null || _syncBlockInstance$er3 === void 0 ? void 0 : _syncBlockInstance$er3.type) || ((_syncBlockInstance$er4 = syncBlockInstance.error) === null || _syncBlockInstance$er4 === void 0 ? void 0 : _syncBlockInstance$er4.reason), (_syncBlockInstance$er5 = syncBlockInstance.error) === null || _syncBlockInstance$er5 === void 0 ? void 0 : _syncBlockInstance$er5.statusCode)));
     }
   }
 }

package/dist/es2019/utils/errorHandling.js

@@ -58,34 +58,179 @@ export const buildErrorAttribution = (gateEnabled, error, statusCode) => {
   };
 };
 
+/**
+ * The set of categorical failure reasons emitted on synced-block fetch/subscribe
+ * operational error events (EDITOR-7862). Extends the write-path
+ * {@link SyncBlockErrorReason} set with read-path-specific buckets so the analytics
+ * dashboard can break fetch failures down by cause instead of regex-matching the
+ * free-text `error` blob.
+ *
+ * The read path surfaces several causes the write-path `SyncBlockError` enum does not
+ * model (benign source-state transitions, permission denials, WebSocket lifecycle, and
+ * client-side readiness errors), so those are added here. Known `SyncBlockError` enum
+ * values (`not_found`, `forbidden`, ...) still pass through unchanged.
+ */
+
+/**
+ * Fetch reasons that represent benign (working-as-designed) outcomes rather than genuine
+ * system failures. The dashboard uses this to compute a "true error rate" by excluding
+ * benign reasons via the structured `reason` attribute instead of brittle free-text regex
+ * (EDITOR-7862).
+ */
+export const FETCH_BENIGN_REASONS = new Set(['source_deleted', 'source_unpublished', 'source_unsynced', 'source_not_found', 'permission_denied', 'unauthenticated',
+// Mirror the benign write-path enum equivalents so already-classified errors are
+// treated consistently.
+'not_found', 'forbidden', 'unpublished'
+// NOTE: `entity_not_found` and `offline` are intentionally NOT benign.
+// - `entity_not_found` is retried up to ENTITY_NOT_FOUND_MAX_RETRIES (analytics are
+//   suppressed during retries); by the time the error event fires, retries are
+//   exhausted and it is a genuine failure.
+// - `offline` is genuine client connectivity loss, not a working-as-designed outcome.
+// Both still emit `reason` (so they can be inspected) but are counted as true errors.
+]);
+
+/**
+ * Ordered list of substring matchers mapping known free-text fetch/subscribe error
+ * strings to a categorical {@link SyncBlockFetchErrorReason}. Each entry is a list of
+ * lowercase needles; if ANY needle is found (case-insensitively) in the raw `error`
+ * string, the entry's reason is used. Order matters: more specific entries must precede
+ * more general ones.
+ *
+ * Plain `String.includes` substring matching is used deliberately instead of `RegExp`:
+ * it sidesteps the `require-unicode-regexp` lint rule AND the declaration build's lower
+ * compile target (which rejects the regex `u` flag with TS1501), while being faster and
+ * easier to read. Doing this classification in code (rather than in dashboard SQL) keeps
+ * the buckets versioned with the source strings that produce them (EDITOR-7862).
+ */
+const FETCH_REASON_MATCHERS = [
+// Benign: source-state transitions (deletionReason values + free text).
+[['source-document-deleted'], 'source_deleted'], [['source-block-deleted'], 'source_deleted'], [['source-block-unpublished'], 'source_unpublished'], [['source-block-unsynced'], 'source_unsynced'], [['does not exist'], 'source_not_found'], [['unpublished'], 'source_unpublished'],
+// Working-as-designed permission outcomes.
+[['unauthenticated'], 'unauthenticated'], [['not permitted to read synced block'], 'permission_denied'], [['bulk permission check failed'], 'permission_denied'], [['permission denied'], 'permission_denied'],
+// Genuine system failures.
+[['reconnection failed after'], 'websocket_exhausted'],
+// `reconnect to the subscription` (not a bare `reconnect`) avoids false positives on
+// unrelated DB/GraphQL "reconnect" messages while still matching the WS-drop string.
+[['websocket', 'reconnect to the subscription', 'subscription terminated'], 'websocket_drop'], [['429', 'rate limit', 'rate-limit', 'ratelimit'], 'rate_limited'],
+// `econnrefused`/`econnreset` (not a bare `econn`, which would also match `reconnect`).
+[['network', 'failed to fetch', 'econnrefused', 'econnreset', 'timed out', 'timeout'], 'network'], [['data provider not set'], 'data_provider_not_ready']];
+
+/**
+ * Maps a fetch/subscribe `error` field — which may be a {@link SyncBlockError} enum
+ * value, a {@link DeletionReason} value, or an arbitrary free-text/JSON blob — to a
+ * stable categorical {@link SyncBlockFetchErrorReason} for analytics grouping.
+ *
+ * Resolution order:
+ * 1. Known `SyncBlockError` enum value → passed through (via {@link classifyErrorReason}).
+ * 2. Known free-text substring → mapped to a fetch-specific bucket.
+ * 3. Anything else (including opaque blobs like `errored`-only payloads or
+ *    `ErrorEvent: "undefined"`) → `'unknown'`, so the dashboard never groups on free text.
+ *
+ * Note: the bare string `'errored'` IS a `SyncBlockError` enum value and therefore
+ * classifies as `'errored'` (not `'unknown'`); only genuinely unrecognised strings
+ * collapse to `'unknown'`.
+ */
+export const classifyFetchErrorReason = error => {
+  const enumReason = classifyErrorReason(error);
+  if (enumReason !== 'unknown') {
+    return enumReason;
+  }
+  if (error) {
+    const haystack = error.toLowerCase();
+    for (const [needles, reason] of FETCH_REASON_MATCHERS) {
+      if (needles.some(needle => haystack.includes(needle))) {
+        return reason;
+      }
+    }
+  }
+  return 'unknown';
+};
+
+/**
+ * Extra, optional analytics attributes describing WHY a fetch/subscribe synced-block
+ * action failed. Spread conditionally so we never emit `undefined` keys (EDITOR-7862).
+ *
+ * Adds `benign` on top of the shared {@link ErrorAttributionAttributes} so the dashboard
+ * can compute a true error rate (`genuine / total`) without any free-text regex.
+ */
+
+/**
+ * Builds the {@link FetchErrorAttributionAttributes} for a failed fetch/subscribe
+ * synced-block operation from the raw `error` field and optional backend `statusCode`.
+ * Returns `undefined` when the `platform_editor_blocks_patch_3` gate is OFF, so the new
+ * `reason`/`statusCode`/`benign` attributes are only emitted once the gate is rolled out
+ * (EDITOR-7862). The existing free-text `error` attribute is always left unchanged.
+ *
+ * `gateEnabled` is injected by the caller (the store managers evaluate `fg(...)`) so this
+ * helper stays pure and trivially unit-testable for both gate states.
+ */
+export const buildFetchErrorAttribution = (gateEnabled, error, statusCode) => {
+  if (!gateEnabled) {
+    return undefined;
+  }
+  const reason = classifyFetchErrorReason(error);
+  return {
+    reason,
+    benign: FETCH_BENIGN_REASONS.has(reason),
+    ...(statusCode !== undefined && {
+      statusCode
+    })
+  };
+};
+
 // `sourceProduct` is threaded through every helper so analytics
 // events can be attributed to the source product (`confluence-page` vs `jira-work-item`).
 // All helpers accept it as an optional trailing argument; the spread-only-when-truthy
 // pattern below ensures we never emit `sourceProduct: undefined` (which would dirty the
 // event schema with empty keys).
 
-export const getErrorPayload = (actionSubjectId, error, resourceId, sourceProduct, attribution) => ({
-  action: ACTION.ERROR,
-  actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-  actionSubjectId,
-  eventType: EVENT_TYPE.OPERATIONAL,
-  attributes: {
-    error,
-    ...(resourceId && {
-      resourceId
-    }),
-    ...(sourceProduct && {
-      sourceProduct
-    }),
-    ...((attribution === null || attribution === void 0 ? void 0 : attribution.reason) && {
-      reason: attribution.reason
-    }),
-    ...((attribution === null || attribution === void 0 ? void 0 : attribution.statusCode) !== undefined && {
-      statusCode: attribution.statusCode
-    })
-  }
-});
-export const fetchErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error, resourceId, sourceProduct);
+/**
+ * Shared operational ERROR payload builder for synced-block events.
+ *
+ * Overloaded so the emitted `reason` type stays accurate per path (raised in review on
+ * EDITOR-7862): fetch/subscribe callers pass a {@link FetchErrorAttributionAttributes}
+ * (discriminated by its required `benign` field) and get the wider
+ * {@link SyncBlockFetchErrorReason}; write-path callers pass an
+ * {@link ErrorAttributionAttributes} (or nothing) and keep the narrower
+ * {@link SyncBlockErrorReason}, so write-path payloads never claim to carry fetch-only
+ * buckets like `source_deleted` they never emit.
+ */
+
+export function getErrorPayload(actionSubjectId, error, resourceId, sourceProduct, attribution) {
+  return {
+    action: ACTION.ERROR,
+    actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+    actionSubjectId,
+    eventType: EVENT_TYPE.OPERATIONAL,
+    attributes: {
+      error,
+      ...(resourceId && {
+        resourceId
+      }),
+      ...(sourceProduct && {
+        sourceProduct
+      }),
+      ...((attribution === null || attribution === void 0 ? void 0 : attribution.reason) && {
+        reason: attribution.reason
+      }),
+      ...((attribution === null || attribution === void 0 ? void 0 : attribution.statusCode) !== undefined && {
+        statusCode: attribution.statusCode
+      }),
+      // `benign` is only present on fetch/subscribe attribution (EDITOR-7862). It is a
+      // boolean (never UGC); the `'benign' in attribution` check both guards the
+      // write-path attribution (which has no `benign`) and narrows the union so
+      // `attribution.benign` is accessible.
+      ...(attribution && 'benign' in attribution && {
+        benign: attribution.benign
+      })
+    }
+  };
+}
+export const fetchErrorPayload = (error, resourceId, sourceProduct, attribution) =>
+// Branch on attribution presence so each call resolves to a concrete overload: with
+// attribution it hits the fetch overload (wider `reason`); without it (gate OFF) it
+// hits the no-attribution overload. Both produce a fetch event regardless.
+attribution ? getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error, resourceId, sourceProduct, attribution) : getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error, resourceId, sourceProduct);
 export const getSourceInfoErrorPayload = (error, resourceId, sourceProduct) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_GET_SOURCE_INFO, error, resourceId, sourceProduct);
 export const updateErrorPayload = (error, resourceId, sourceProduct, attribution) => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct, attribution);
 export const updateReferenceErrorPayload = (error, resourceId, sourceProduct, attribution) => getErrorPayload(ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct, attribution);

package/dist/es2019/utils/utils.js

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 
+const GET_CONTENT_ID_AND_PRODUCT_REGEX = /^(confluence-page|jira-work-item)\/([^/]+)/;
 const normalizeSyncBlockJSONContentInternal = (content, options) => {
   var _normalizedContent3;
   let normalizedContent;
@@ -94,7 +95,7 @@ export const convertPMNodesToSyncBlockNodes = nodes => {
  * Extracts the source page content id and source product
  */
 export const getContentIdAndProductFromResourceId = resourceId => {
-  const match = resourceId.match(/^(confluence-page|jira-work-item)\/([^/]+)/);
+  const match = resourceId.match(GET_CONTENT_ID_AND_PRODUCT_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       sourceProduct: match[1],

package/dist/esm/clients/block-service/ari.js

@@ -1,5 +1,9 @@
 /* eslint-disable require-unicode-regexp */
 
+var GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/;
+var JIRA_SOURCE_ARI_REGEX = /ari:cloud:jira:.*/;
+var CONFLUENCE_SOURCE_ARI_REGEX = /ari:cloud:confluence:.*/;
+
 /**
  * Generates the block ARI from the source page ARI and the source block's resource ID.
  * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
@@ -36,18 +40,18 @@ export var generateBlockAriFromReference = function generateBlockAriFromReferenc
  * @returns the localId of the block node. A randomly generated UUID
  */
 export var getLocalIdFromBlockResourceId = function getLocalIdFromBlockResourceId(ari) {
-  var match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
+  var match = ari.match(GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
   throw new Error("Invalid block ARI: ".concat(ari));
 };
 export var getProductFromSourceAri = function getProductFromSourceAri(ari) {
-  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);
+  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(JIRA_SOURCE_ARI_REGEX);
   if (jiraMatch !== -1) {
     return 'jira-work-item';
   }
-  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:confluence:.*/);
+  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(CONFLUENCE_SOURCE_ARI_REGEX);
   if (confluenceMatch !== -1) {
     return 'confluence-page';
   }

package/dist/esm/clients/block-service/blockSubscription.js

@@ -3,6 +3,9 @@ import { createClient } from 'graphql-ws';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { convertContentUpdatedAt } from '../../utils/utils';
 var GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
+
+// eslint-disable-next-line require-unicode-regexp
+var EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 var blockServiceClient = null;
 
 /**
@@ -122,8 +125,7 @@ export var extractGraphQLWSErrorMessage = function extractGraphQLWSErrorMessage(
  * @returns The resourceId portion of the ARI
  */
 var extractResourceIdFromBlockAri = function extractResourceIdFromBlockAri(blockAri) {
-  // eslint-disable-next-line require-unicode-regexp
-  var match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  var match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 

package/dist/esm/clients/confluence/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+var CONFLUENCE_PAGE_ARI_REGEX = /ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/;
+
 /**
  * The type of the Confluence page
  */
@@ -25,7 +27,7 @@ export var getConfluencePageAri = function getConfluencePageAri(_ref) {
  */
 export var getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(_ref2) {
   var ari = _ref2.ari;
-  var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
+  var match = ari.match(CONFLUENCE_PAGE_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       type: match[1],

package/dist/esm/clients/jira/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+var JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+
 /**
  * Generates the Jira work item ARI
  * @param workItemId - the ID of the work item
@@ -19,7 +21,7 @@ export var getJiraWorkItemAri = function getJiraWorkItemAri(_ref) {
  */
 export var getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
   var ari = _ref2.ari;
-  var match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
+  var match = ari.match(JIRA_WORK_ITEM_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }

package/dist/esm/hooks/useFetchSyncBlockData.js

@@ -9,7 +9,7 @@ import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isProviderNotReadyError, SyncBlockError } from '../common/types';
-import { fetchErrorPayload } from '../utils/errorHandling';
+import { buildFetchErrorAttribution, fetchErrorPayload } from '../utils/errorHandling';
 import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 export var useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, fireAnalyticsEvent) {
   var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4;
@@ -98,7 +98,7 @@ export var useFetchSyncBlockData = function useFetchSyncBlockData(manager, resou
           logException(_t, {
             location: 'editor-synced-block-provider/useFetchSyncBlockData'
           });
-          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent(fetchErrorPayload(_t.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent(fetchErrorPayload(_t.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), _t.message)));
 
           // Set error state if fetching fails
           setFetchState({