@atlaskit/editor-synced-block-provider 6.6.7 → 6.6.9

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-synced-block-provider
 
+## 6.6.9
+
+### Patch Changes
+
+- [`085a281306c03`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/085a281306c03) -
+  Add defensive mechanisms for synced block EntityNotFound errors:
+  - Add retry with exponential backoff when fetching synced block references returns EntityNotFound
+    (up to 3 retries with 2s/4s/8s delays)
+  - Add transformPasted handler to convert any bodiedSyncBlock nodes arriving via paste into
+    syncBlock references, preventing createBlock from being called with the wrong parentId
+
+  Both changes are gated behind `platform_synced_block_patch_13`.
+
+## 6.6.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.6.7
 
 ### Patch Changes

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

@@ -29,6 +29,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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; }
 var CACHE_KEY_PREFIX = 'sync-block-data-';
+var ENTITY_NOT_FOUND_MAX_RETRIES = 3;
+var ENTITY_NOT_FOUND_INITIAL_DELAY_MS = 2000;
 
 // A store manager responsible for the lifecycle and state management of reference sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
@@ -36,8 +38,6 @@ var CACHE_KEY_PREFIX = 'sync-block-data-';
 // Handles fetching source URL and title for sync blocks.
 // Can be used in both editor and renderer contexts.
 var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
-  // Track the setTimeout handle for queued flush so we can cancel it on destroy
-
   function ReferenceSyncBlockStoreManager(dataProvider, viewMode) {
     var _this = this,
       _this$dataProvider;
@@ -52,6 +52,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     (0, _defineProperty2.default)(this, "isFlushInProgress", false);
     // Track if another flush is needed after the current one completes
     (0, _defineProperty2.default)(this, "flushNeededAfterCurrent", false);
+    // Track retry attempts for EntityNotFound errors (block may be in the process of being created)
+    (0, _defineProperty2.default)(this, "entityNotFoundRetryCount", new Map());
+    (0, _defineProperty2.default)(this, "entityNotFoundRetryTimers", new Map());
     this.dataProvider = dataProvider;
     this.viewMode = viewMode;
     this.syncBlockFetchDataRequests = new Map();
@@ -211,6 +214,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
       var providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
       if (providerData) {
+        // Initial provider cache data can come from SSR/prefetch and bypass updateCache(),
+        // so strip annotations here before references render existing synced block payloads.
         return this.stripAnnotationMarksFromReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
@@ -248,6 +253,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         if (!raw) {
           return undefined;
         }
+        // Session cache entries written before this sanitizer existed may still include
+        // source annotation marks, so keep this read-time safety net for legacy data.
         return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
       } catch (error) {
         (0, _monitoring.logException)(error, {
@@ -577,11 +584,37 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           // Remove from newly added set even if not unpublished (to clean up)
           _this5.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
         }
+
+        // Clear retry tracking on successful fetch — block has been created
+        if (!syncBlockInstance.error && _this5.entityNotFoundRetryCount.has(syncBlockInstance.resourceId)) {
+          var timer = _this5.entityNotFoundRetryTimers.get(syncBlockInstance.resourceId);
+          if (timer) {
+            clearTimeout(timer);
+            _this5.entityNotFoundRetryTimers.delete(syncBlockInstance.resourceId);
+          }
+          _this5.entityNotFoundRetryCount.delete(syncBlockInstance.resourceId);
+        }
         if (syncBlockInstance.error) {
-          var _this5$fireAnalyticsE2, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, (0, _errorHandling.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 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
+          var _this5$entityNotFound;
+          // Skip error analytics when EntityNotFound will be retried, to avoid
+          // inflating error-rate metrics with expected transient failures
+          var isRetryingEntityNotFound = syncBlockInstance.error.type === _types.SyncBlockError.EntityNotFound && ((_this5$entityNotFound = _this5.entityNotFoundRetryCount.get(syncBlockInstance.resourceId)) !== null && _this5$entityNotFound !== void 0 ? _this5$entityNotFound : 0) < ENTITY_NOT_FOUND_MAX_RETRIES && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_13');
+          if (!isRetryingEntityNotFound) {
+            var _this5$fireAnalyticsE2, _syncBlockInstance$da, _syncBlockInstance$da2;
+            (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, (0, _errorHandling.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 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
+          }
           if (syncBlockInstance.error.type === _types.SyncBlockError.NotFound || syncBlockInstance.error.type === _types.SyncBlockError.Forbidden) {
             hasExpectedError = true;
+          } else if (syncBlockInstance.error.type === _types.SyncBlockError.EntityNotFound) {
+            // Schedule a retry for EntityNotFound — the source block may be in
+            // the process of being created by a collaborator (race condition
+            // between NCS propagation and Block Service createBlock call).
+            if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_13')) {
+              _this5.scheduleEntityNotFoundRetry(syncBlockInstance.resourceId);
+            }
+            if (!isRetryingEntityNotFound) {
+              hasUnexpectedError = true;
+            }
           } else if (syncBlockInstance.error) {
             hasUnexpectedError = true;
           }
@@ -645,6 +678,58 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || _this$dataProvider5.removeFromCache([resourceId]);
       this._providerFactoryManager.deleteFactory(resourceId);
     }
+
+    /**
+     * Schedules a delayed retry for a block that returned EntityNotFound.
+     * The block may be in the process of being created by a collaborator —
+     * the NCS transaction propagates the bodiedSyncBlock ADF node before
+     * the Block Service createBlock call completes.
+     */
+  }, {
+    key: "scheduleEntityNotFoundRetry",
+    value: function scheduleEntityNotFoundRetry(resourceId) {
+      var _this$entityNotFoundR,
+        _this6 = this;
+      var currentRetries = (_this$entityNotFoundR = this.entityNotFoundRetryCount.get(resourceId)) !== null && _this$entityNotFoundR !== void 0 ? _this$entityNotFoundR : 0;
+      if (currentRetries >= ENTITY_NOT_FOUND_MAX_RETRIES) {
+        // Max retries exceeded — keep count at max so future calls immediately exit
+        // (don't delete — that would reset the counter and allow unbounded retry waves)
+        return;
+      }
+
+      // If a timer is already pending, don't schedule another one — let the
+      // existing timer fire. This prevents rapid EntityNotFound responses from
+      // exhausting the retry budget through cancellations without any actual
+      // fetch completing.
+      if (this.entityNotFoundRetryTimers.has(resourceId)) {
+        return;
+      }
+      var delay = ENTITY_NOT_FOUND_INITIAL_DELAY_MS * Math.pow(2, currentRetries);
+      var timer = setTimeout(function () {
+        var _cached$error;
+        _this6.entityNotFoundRetryTimers.delete(resourceId);
+
+        // If no active subscriptions remain for this block, clean up and skip
+        var subscriptions = _this6._subscriptionManager.getSubscriptions().get(resourceId);
+        if (!subscriptions || Object.keys(subscriptions).length === 0) {
+          _this6.entityNotFoundRetryCount.delete(resourceId);
+          return;
+        }
+
+        // Increment count only when the timer fires, not when scheduled
+        _this6.entityNotFoundRetryCount.set(resourceId, currentRetries + 1);
+
+        // Clear the error from cache so fetchSyncBlocksData doesn't skip it
+        var cached = _this6.getFromCache(resourceId);
+        if ((cached === null || cached === void 0 || (_cached$error = cached.error) === null || _cached$error === void 0 ? void 0 : _cached$error.type) === _types.SyncBlockError.EntityNotFound) {
+          _this6.deleteFromCache(resourceId);
+        }
+
+        // Trigger a re-fetch via the batch fetcher
+        _this6.debouncedBatchedFetchSyncBlocks(resourceId);
+      }, delay);
+      this.entityNotFoundRetryTimers.set(resourceId, timer);
+    }
   }, {
     key: "debouncedBatchedFetchSyncBlocks",
     value: function debouncedBatchedFetchSyncBlocks(resourceId) {
@@ -653,12 +738,12 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "setSSRDataInSessionCache",
     value: function setSSRDataInSessionCache(resourceIds) {
-      var _this6 = this;
+      var _this7 = this;
       if (!resourceIds || resourceIds.length === 0) {
         return;
       }
       resourceIds.forEach(function (resourceId) {
-        _this6.updateSessionCache(resourceId);
+        _this7.updateSessionCache(resourceId);
       });
     }
   }, {
@@ -731,7 +816,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     key: "flush",
     value: (function () {
       var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var _this7 = this;
+        var _this8 = this;
         var success, syncedBlocksToFlush, _this$saveExperience, blocks, _iterator, _step, _loop, updateResult, _this$saveExperience2, _this$fireAnalyticsEv6, _this$saveExperience3, _this$fireAnalyticsEv7, _this$saveExperience4;
         return _regenerator.default.wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -873,8 +958,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 // Use setTimeout to avoid deep recursion and run queued flush asynchronously
                 // Note: flush() handles all exceptions internally and never rejects
                 this.queuedFlushTimeout = setTimeout(function () {
-                  _this7.queuedFlushTimeout = undefined;
-                  void _this7.flush();
+                  _this8.queuedFlushTimeout = undefined;
+                  void _this8.flush();
                 }, 0);
               }
               return _context4.finish(49);
@@ -900,6 +985,13 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         clearTimeout(this.queuedFlushTimeout);
         this.queuedFlushTimeout = undefined;
       }
+
+      // Cancel any pending EntityNotFound retry timers
+      this.entityNotFoundRetryTimers.forEach(function (timer) {
+        return clearTimeout(timer);
+      });
+      this.entityNotFoundRetryTimers.clear();
+      this.entityNotFoundRetryCount.clear();
       this._subscriptionManager.destroy();
       this._providerFactoryManager.destroy();
       this._batchFetcher.destroy();

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

@@ -12,6 +12,8 @@ import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
 import { SyncBlockSubscriptionManager } from './syncBlockSubscriptionManager';
 const CACHE_KEY_PREFIX = 'sync-block-data-';
+const ENTITY_NOT_FOUND_MAX_RETRIES = 3;
+const ENTITY_NOT_FOUND_INITIAL_DELAY_MS = 2000;
 
 // A store manager responsible for the lifecycle and state management of reference sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
@@ -19,8 +21,6 @@ const CACHE_KEY_PREFIX = 'sync-block-data-';
 // Handles fetching source URL and title for sync blocks.
 // Can be used in both editor and renderer contexts.
 export class ReferenceSyncBlockStoreManager {
-  // Track the setTimeout handle for queued flush so we can cancel it on destroy
-
   constructor(dataProvider, viewMode) {
     var _this$dataProvider;
     // Keeps track of addition and deletion of reference synced blocks on the document
@@ -33,6 +33,9 @@ export class ReferenceSyncBlockStoreManager {
     _defineProperty(this, "isFlushInProgress", false);
     // Track if another flush is needed after the current one completes
     _defineProperty(this, "flushNeededAfterCurrent", false);
+    // Track retry attempts for EntityNotFound errors (block may be in the process of being created)
+    _defineProperty(this, "entityNotFoundRetryCount", new Map());
+    _defineProperty(this, "entityNotFoundRetryTimers", new Map());
     this.dataProvider = dataProvider;
     this.viewMode = viewMode;
     this.syncBlockFetchDataRequests = new Map();
@@ -142,6 +145,8 @@ export class ReferenceSyncBlockStoreManager {
     const syncBlockNode = createSyncBlockNode('', resourceId);
     const providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : (_this$dataProvider2$g = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2$g === void 0 ? void 0 : _this$dataProvider2$g.data;
     if (providerData) {
+      // Initial provider cache data can come from SSR/prefetch and bypass updateCache(),
+      // so strip annotations here before references render existing synced block payloads.
       return this.stripAnnotationMarksFromReferenceData(providerData);
     }
     return this.getFromSessionCache(resourceId);
@@ -175,6 +180,8 @@ export class ReferenceSyncBlockStoreManager {
       if (!raw) {
         return undefined;
       }
+      // Session cache entries written before this sanitizer existed may still include
+      // source annotation marks, so keep this read-time safety net for legacy data.
       return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
     } catch (error) {
       logException(error, {
@@ -449,11 +456,37 @@ export class ReferenceSyncBlockStoreManager {
         // Remove from newly added set even if not unpublished (to clean up)
         this.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
       }
+
+      // Clear retry tracking on successful fetch — block has been created
+      if (!syncBlockInstance.error && this.entityNotFoundRetryCount.has(syncBlockInstance.resourceId)) {
+        const timer = this.entityNotFoundRetryTimers.get(syncBlockInstance.resourceId);
+        if (timer) {
+          clearTimeout(timer);
+          this.entityNotFoundRetryTimers.delete(syncBlockInstance.resourceId);
+        }
+        this.entityNotFoundRetryCount.delete(syncBlockInstance.resourceId);
+      }
       if (syncBlockInstance.error) {
-        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)));
+        var _this$entityNotFoundR;
+        // Skip error analytics when EntityNotFound will be retried, to avoid
+        // inflating error-rate metrics with expected transient failures
+        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)));
+        }
         if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
           hasExpectedError = true;
+        } else if (syncBlockInstance.error.type === SyncBlockError.EntityNotFound) {
+          // Schedule a retry for EntityNotFound — the source block may be in
+          // the process of being created by a collaborator (race condition
+          // between NCS propagation and Block Service createBlock call).
+          if (fg('platform_synced_block_patch_13')) {
+            this.scheduleEntityNotFoundRetry(syncBlockInstance.resourceId);
+          }
+          if (!isRetryingEntityNotFound) {
+            hasUnexpectedError = true;
+          }
         } else if (syncBlockInstance.error) {
           hasUnexpectedError = true;
         }
@@ -514,6 +547,55 @@ export class ReferenceSyncBlockStoreManager {
     (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 ? void 0 : _this$dataProvider5.removeFromCache([resourceId]);
     this._providerFactoryManager.deleteFactory(resourceId);
   }
+
+  /**
+   * Schedules a delayed retry for a block that returned EntityNotFound.
+   * The block may be in the process of being created by a collaborator —
+   * the NCS transaction propagates the bodiedSyncBlock ADF node before
+   * the Block Service createBlock call completes.
+   */
+  scheduleEntityNotFoundRetry(resourceId) {
+    var _this$entityNotFoundR2;
+    const currentRetries = (_this$entityNotFoundR2 = this.entityNotFoundRetryCount.get(resourceId)) !== null && _this$entityNotFoundR2 !== void 0 ? _this$entityNotFoundR2 : 0;
+    if (currentRetries >= ENTITY_NOT_FOUND_MAX_RETRIES) {
+      // Max retries exceeded — keep count at max so future calls immediately exit
+      // (don't delete — that would reset the counter and allow unbounded retry waves)
+      return;
+    }
+
+    // If a timer is already pending, don't schedule another one — let the
+    // existing timer fire. This prevents rapid EntityNotFound responses from
+    // exhausting the retry budget through cancellations without any actual
+    // fetch completing.
+    if (this.entityNotFoundRetryTimers.has(resourceId)) {
+      return;
+    }
+    const delay = ENTITY_NOT_FOUND_INITIAL_DELAY_MS * Math.pow(2, currentRetries);
+    const timer = setTimeout(() => {
+      var _cached$error;
+      this.entityNotFoundRetryTimers.delete(resourceId);
+
+      // If no active subscriptions remain for this block, clean up and skip
+      const subscriptions = this._subscriptionManager.getSubscriptions().get(resourceId);
+      if (!subscriptions || Object.keys(subscriptions).length === 0) {
+        this.entityNotFoundRetryCount.delete(resourceId);
+        return;
+      }
+
+      // Increment count only when the timer fires, not when scheduled
+      this.entityNotFoundRetryCount.set(resourceId, currentRetries + 1);
+
+      // Clear the error from cache so fetchSyncBlocksData doesn't skip it
+      const cached = this.getFromCache(resourceId);
+      if ((cached === null || cached === void 0 ? void 0 : (_cached$error = cached.error) === null || _cached$error === void 0 ? void 0 : _cached$error.type) === SyncBlockError.EntityNotFound) {
+        this.deleteFromCache(resourceId);
+      }
+
+      // Trigger a re-fetch via the batch fetcher
+      this.debouncedBatchedFetchSyncBlocks(resourceId);
+    }, delay);
+    this.entityNotFoundRetryTimers.set(resourceId, timer);
+  }
   debouncedBatchedFetchSyncBlocks(resourceId) {
     this._batchFetcher.queueFetch(resourceId);
   }
@@ -691,6 +773,11 @@ export class ReferenceSyncBlockStoreManager {
       clearTimeout(this.queuedFlushTimeout);
       this.queuedFlushTimeout = undefined;
     }
+
+    // Cancel any pending EntityNotFound retry timers
+    this.entityNotFoundRetryTimers.forEach(timer => clearTimeout(timer));
+    this.entityNotFoundRetryTimers.clear();
+    this.entityNotFoundRetryCount.clear();
     this._subscriptionManager.destroy();
     this._providerFactoryManager.destroy();
     this._batchFetcher.destroy();

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

@@ -22,6 +22,8 @@ import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
 import { SyncBlockSubscriptionManager } from './syncBlockSubscriptionManager';
 var CACHE_KEY_PREFIX = 'sync-block-data-';
+var ENTITY_NOT_FOUND_MAX_RETRIES = 3;
+var ENTITY_NOT_FOUND_INITIAL_DELAY_MS = 2000;
 
 // A store manager responsible for the lifecycle and state management of reference sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
@@ -29,8 +31,6 @@ var CACHE_KEY_PREFIX = 'sync-block-data-';
 // Handles fetching source URL and title for sync blocks.
 // Can be used in both editor and renderer contexts.
 export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
-  // Track the setTimeout handle for queued flush so we can cancel it on destroy
-
   function ReferenceSyncBlockStoreManager(dataProvider, viewMode) {
     var _this = this,
       _this$dataProvider;
@@ -45,6 +45,9 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     _defineProperty(this, "isFlushInProgress", false);
     // Track if another flush is needed after the current one completes
     _defineProperty(this, "flushNeededAfterCurrent", false);
+    // Track retry attempts for EntityNotFound errors (block may be in the process of being created)
+    _defineProperty(this, "entityNotFoundRetryCount", new Map());
+    _defineProperty(this, "entityNotFoundRetryTimers", new Map());
     this.dataProvider = dataProvider;
     this.viewMode = viewMode;
     this.syncBlockFetchDataRequests = new Map();
@@ -204,6 +207,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       var syncBlockNode = createSyncBlockNode('', resourceId);
       var providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
       if (providerData) {
+        // Initial provider cache data can come from SSR/prefetch and bypass updateCache(),
+        // so strip annotations here before references render existing synced block payloads.
         return this.stripAnnotationMarksFromReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
@@ -241,6 +246,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         if (!raw) {
           return undefined;
         }
+        // Session cache entries written before this sanitizer existed may still include
+        // source annotation marks, so keep this read-time safety net for legacy data.
         return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
       } catch (error) {
         logException(error, {
@@ -570,11 +577,37 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           // Remove from newly added set even if not unpublished (to clean up)
           _this5.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
         }
+
+        // Clear retry tracking on successful fetch — block has been created
+        if (!syncBlockInstance.error && _this5.entityNotFoundRetryCount.has(syncBlockInstance.resourceId)) {
+          var timer = _this5.entityNotFoundRetryTimers.get(syncBlockInstance.resourceId);
+          if (timer) {
+            clearTimeout(timer);
+            _this5.entityNotFoundRetryTimers.delete(syncBlockInstance.resourceId);
+          }
+          _this5.entityNotFoundRetryCount.delete(syncBlockInstance.resourceId);
+        }
         if (syncBlockInstance.error) {
-          var _this5$fireAnalyticsE2, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, 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)));
+          var _this5$entityNotFound;
+          // Skip error analytics when EntityNotFound will be retried, to avoid
+          // inflating error-rate metrics with expected transient failures
+          var isRetryingEntityNotFound = syncBlockInstance.error.type === SyncBlockError.EntityNotFound && ((_this5$entityNotFound = _this5.entityNotFoundRetryCount.get(syncBlockInstance.resourceId)) !== null && _this5$entityNotFound !== void 0 ? _this5$entityNotFound : 0) < ENTITY_NOT_FOUND_MAX_RETRIES && fg('platform_synced_block_patch_13');
+          if (!isRetryingEntityNotFound) {
+            var _this5$fireAnalyticsE2, _syncBlockInstance$da, _syncBlockInstance$da2;
+            (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, 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)));
+          }
           if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
             hasExpectedError = true;
+          } else if (syncBlockInstance.error.type === SyncBlockError.EntityNotFound) {
+            // Schedule a retry for EntityNotFound — the source block may be in
+            // the process of being created by a collaborator (race condition
+            // between NCS propagation and Block Service createBlock call).
+            if (fg('platform_synced_block_patch_13')) {
+              _this5.scheduleEntityNotFoundRetry(syncBlockInstance.resourceId);
+            }
+            if (!isRetryingEntityNotFound) {
+              hasUnexpectedError = true;
+            }
           } else if (syncBlockInstance.error) {
             hasUnexpectedError = true;
           }
@@ -638,6 +671,58 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || _this$dataProvider5.removeFromCache([resourceId]);
       this._providerFactoryManager.deleteFactory(resourceId);
     }
+
+    /**
+     * Schedules a delayed retry for a block that returned EntityNotFound.
+     * The block may be in the process of being created by a collaborator —
+     * the NCS transaction propagates the bodiedSyncBlock ADF node before
+     * the Block Service createBlock call completes.
+     */
+  }, {
+    key: "scheduleEntityNotFoundRetry",
+    value: function scheduleEntityNotFoundRetry(resourceId) {
+      var _this$entityNotFoundR,
+        _this6 = this;
+      var currentRetries = (_this$entityNotFoundR = this.entityNotFoundRetryCount.get(resourceId)) !== null && _this$entityNotFoundR !== void 0 ? _this$entityNotFoundR : 0;
+      if (currentRetries >= ENTITY_NOT_FOUND_MAX_RETRIES) {
+        // Max retries exceeded — keep count at max so future calls immediately exit
+        // (don't delete — that would reset the counter and allow unbounded retry waves)
+        return;
+      }
+
+      // If a timer is already pending, don't schedule another one — let the
+      // existing timer fire. This prevents rapid EntityNotFound responses from
+      // exhausting the retry budget through cancellations without any actual
+      // fetch completing.
+      if (this.entityNotFoundRetryTimers.has(resourceId)) {
+        return;
+      }
+      var delay = ENTITY_NOT_FOUND_INITIAL_DELAY_MS * Math.pow(2, currentRetries);
+      var timer = setTimeout(function () {
+        var _cached$error;
+        _this6.entityNotFoundRetryTimers.delete(resourceId);
+
+        // If no active subscriptions remain for this block, clean up and skip
+        var subscriptions = _this6._subscriptionManager.getSubscriptions().get(resourceId);
+        if (!subscriptions || Object.keys(subscriptions).length === 0) {
+          _this6.entityNotFoundRetryCount.delete(resourceId);
+          return;
+        }
+
+        // Increment count only when the timer fires, not when scheduled
+        _this6.entityNotFoundRetryCount.set(resourceId, currentRetries + 1);
+
+        // Clear the error from cache so fetchSyncBlocksData doesn't skip it
+        var cached = _this6.getFromCache(resourceId);
+        if ((cached === null || cached === void 0 || (_cached$error = cached.error) === null || _cached$error === void 0 ? void 0 : _cached$error.type) === SyncBlockError.EntityNotFound) {
+          _this6.deleteFromCache(resourceId);
+        }
+
+        // Trigger a re-fetch via the batch fetcher
+        _this6.debouncedBatchedFetchSyncBlocks(resourceId);
+      }, delay);
+      this.entityNotFoundRetryTimers.set(resourceId, timer);
+    }
   }, {
     key: "debouncedBatchedFetchSyncBlocks",
     value: function debouncedBatchedFetchSyncBlocks(resourceId) {
@@ -646,12 +731,12 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "setSSRDataInSessionCache",
     value: function setSSRDataInSessionCache(resourceIds) {
-      var _this6 = this;
+      var _this7 = this;
       if (!resourceIds || resourceIds.length === 0) {
         return;
       }
       resourceIds.forEach(function (resourceId) {
-        _this6.updateSessionCache(resourceId);
+        _this7.updateSessionCache(resourceId);
       });
     }
   }, {
@@ -724,7 +809,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     key: "flush",
     value: (function () {
       var _flush = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var _this7 = this;
+        var _this8 = this;
         var success, syncedBlocksToFlush, _this$saveExperience, blocks, _iterator, _step, _loop, updateResult, _this$saveExperience2, _this$fireAnalyticsEv6, _this$saveExperience3, _this$fireAnalyticsEv7, _this$saveExperience4;
         return _regeneratorRuntime.wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -866,8 +951,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 // Use setTimeout to avoid deep recursion and run queued flush asynchronously
                 // Note: flush() handles all exceptions internally and never rejects
                 this.queuedFlushTimeout = setTimeout(function () {
-                  _this7.queuedFlushTimeout = undefined;
-                  void _this7.flush();
+                  _this8.queuedFlushTimeout = undefined;
+                  void _this8.flush();
                 }, 0);
               }
               return _context4.finish(49);
@@ -893,6 +978,13 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         clearTimeout(this.queuedFlushTimeout);
         this.queuedFlushTimeout = undefined;
       }
+
+      // Cancel any pending EntityNotFound retry timers
+      this.entityNotFoundRetryTimers.forEach(function (timer) {
+        return clearTimeout(timer);
+      });
+      this.entityNotFoundRetryTimers.clear();
+      this.entityNotFoundRetryCount.clear();
       this._subscriptionManager.destroy();
       this._providerFactoryManager.destroy();
       this._batchFetcher.destroy();

package/dist/types/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -18,6 +18,8 @@ export declare class ReferenceSyncBlockStoreManager {
     private isFlushInProgress;
     private flushNeededAfterCurrent;
     private queuedFlushTimeout?;
+    private entityNotFoundRetryCount;
+    private entityNotFoundRetryTimers;
     fetchExperience: Experience | undefined;
     private fetchSourceInfoExperience;
     private saveExperience;
@@ -88,6 +90,13 @@ export declare class ReferenceSyncBlockStoreManager {
     private updateCache;
     getFromCache(resourceId: ResourceId): SyncBlockInstance | undefined;
     private deleteFromCache;
+    /**
+     * Schedules a delayed retry for a block that returned EntityNotFound.
+     * The block may be in the process of being created by a collaborator —
+     * the NCS transaction propagates the bodiedSyncBlock ADF node before
+     * the Block Service createBlock call completes.
+     */
+    private scheduleEntityNotFoundRetry;
     private debouncedBatchedFetchSyncBlocks;
     private setSSRDataInSessionCache;
     subscribeToSyncBlock(resourceId: string, localId: string, callback: SubscriptionCallback): () => void;

package/dist/types-ts4.5/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -18,6 +18,8 @@ export declare class ReferenceSyncBlockStoreManager {
     private isFlushInProgress;
     private flushNeededAfterCurrent;
     private queuedFlushTimeout?;
+    private entityNotFoundRetryCount;
+    private entityNotFoundRetryTimers;
     fetchExperience: Experience | undefined;
     private fetchSourceInfoExperience;
     private saveExperience;
@@ -88,6 +90,13 @@ export declare class ReferenceSyncBlockStoreManager {
     private updateCache;
     getFromCache(resourceId: ResourceId): SyncBlockInstance | undefined;
     private deleteFromCache;
+    /**
+     * Schedules a delayed retry for a block that returned EntityNotFound.
+     * The block may be in the process of being created by a collaborator —
+     * the NCS transaction propagates the bodiedSyncBlock ADF node before
+     * the Block Service createBlock call completes.
+     */
+    private scheduleEntityNotFoundRetry;
     private debouncedBatchedFetchSyncBlocks;
     private setSSRDataInSessionCache;
     subscribeToSyncBlock(resourceId: string, localId: string, callback: SubscriptionCallback): () => void;

package/package.json

@@ -24,12 +24,12 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-utils": "^19.30.0",
+		"@atlaskit/adf-utils": "^19.31.0",
 		"@atlaskit/editor-json-transformer": "^8.32.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/node-data-provider": "^11.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^82.1.0",
+		"@atlaskit/tmp-editor-statsig": "^83.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"graphql-ws": "^5.14.2",
@@ -38,11 +38,12 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.39.0",
+		"@atlaskit/editor-common": "^114.46.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
 		"@testing-library/react": "^16.3.0",
+		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
 	"techstack": {
@@ -81,7 +82,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "6.6.7",
+	"version": "6.6.9",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -91,6 +92,9 @@
 	"platform-feature-flags": {
 		"platform_synced_block_patch_12": {
 			"type": "boolean"
+		},
+		"platform_synced_block_patch_13": {
+			"type": "boolean"
 		}
 	}
 }