@atlaskit/editor-synced-block-provider 6.6.6 → 6.6.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 6.6.8
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.6.7
+
+### Patch Changes
+
+- [`bfba4158ff047`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bfba4158ff047) -
+  Fix subscription reconnection for synced blocks when WebSocket or Relay subscriptions complete or
+  error silently
+
 ## 6.6.6
 
 ### Patch Changes

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

@@ -174,7 +174,7 @@ var parseSubscriptionPayload = function parseSubscriptionPayload(payload) {
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-var subscribeToBlockUpdates = exports.subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri, onData, onError) {
+var subscribeToBlockUpdates = exports.subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri, onData, onError, onComplete) {
   var client = getBlockServiceClient();
   if (!client) {
     // Return a no-op unsubscribe if client is not available (e.g., SSR)
@@ -210,7 +210,7 @@ var subscribeToBlockUpdates = exports.subscribeToBlockUpdates = function subscri
       onError === null || onError === void 0 || onError(new Error(extractGraphQLWSErrorMessage(error)));
     }),
     complete: function complete() {
-      // Subscription completed
+      onComplete === null || onComplete === void 0 || onComplete();
     }
   });
   return unsubscribe;

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

@@ -793,7 +793,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     )
   }, {
     key: "subscribeToBlockUpdates",
-    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
       var blockAri = (0, _ari.generateBlockAriFromReference)({
         cloudId: this.cloudId,
         resourceId: resourceId
@@ -829,7 +829,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             resourceId: parsedData.resourceId
           };
           onUpdate(syncBlockInstance);
-        }, onError);
+        }, onError, onComplete);
       }).catch(function (err) {
         if (cancelled) {
           return;

package/dist/cjs/providers/syncBlockProvider.js

@@ -469,9 +469,9 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
      */
   }, {
     key: "subscribeToBlockUpdates",
-    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
       if (this.fetchProvider.subscribeToBlockUpdates) {
-        return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError);
+        return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete);
       }
       return undefined;
     }

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

@@ -211,6 +211,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 +250,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, {

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

@@ -9,6 +9,7 @@ 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 _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _errorHandling = require("../utils/errorHandling");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
 var _utils = require("../utils/utils");
@@ -36,6 +37,8 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
     // causing the cache to be deleted prematurely. We delay deletion to allow
     // the new component to subscribe and cancel the pending deletion.
     (0, _defineProperty2.default)(this, "pendingCacheDeletions", new Map());
+    (0, _defineProperty2.default)(this, "retryAttempts", new Map());
+    (0, _defineProperty2.default)(this, "pendingRetries", new Map());
     this.deps = deps;
   }
 
@@ -250,6 +253,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
       if (!(dataProvider !== null && dataProvider !== void 0 && dataProvider.subscribeToBlockUpdates)) {
         return;
       }
+      var reconnectEnabled = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12');
       var unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
         _this5.handleGraphQLUpdate(syncBlockInstance);
       }, function (error) {
@@ -258,11 +262,115 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
           location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
         });
         (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
-      });
+        if (reconnectEnabled) {
+          _this5.handleSubscriptionTerminated(resourceId);
+        }
+      }, reconnectEnabled ? function () {
+        _this5.handleSubscriptionTerminated(resourceId);
+      } : undefined);
       if (unsubscribe) {
         this.graphqlSubscriptions.set(resourceId, unsubscribe);
       }
     }
+
+    /**
+     * Handles subscription termination (complete or error) by cleaning up the
+     * stale entry and scheduling a reconnection with exponential backoff.
+     */
+  }, {
+    key: "handleSubscriptionTerminated",
+    value: function handleSubscriptionTerminated(resourceId) {
+      // Remove the stale subscription entry so setupSubscription won't early-return
+      this.graphqlSubscriptions.delete(resourceId);
+
+      // Guard against duplicate calls (graphql-ws can fire both error and complete)
+      if (this.pendingRetries.has(resourceId)) {
+        return;
+      }
+
+      // Only reconnect if there are still active subscribers for this resource
+      if (this.subscriptions.has(resourceId) && this.shouldUseRealTime()) {
+        this.scheduleReconnection(resourceId);
+      }
+    }
+
+    /**
+     * Schedules a reconnection attempt with exponential backoff.
+     * Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
+     * e.g. 1s, 2s, 4s, 8s, 16s
+     */
+  }, {
+    key: "scheduleReconnection",
+    value: function scheduleReconnection(resourceId) {
+      var _this$retryAttempts$g,
+        _this6 = this;
+      var attempts = (_this$retryAttempts$g = this.retryAttempts.get(resourceId)) !== null && _this$retryAttempts$g !== void 0 ? _this$retryAttempts$g : 0;
+      if (attempts >= SyncBlockSubscriptionManager.MAX_RETRY_ATTEMPTS) {
+        var _this$deps$getFireAna;
+        var errorMessage = "Subscription reconnection failed after ".concat(attempts, " attempts");
+        (0, _monitoring.logException)(new Error(errorMessage), {
+          location: 'editor-synced-block-provider/syncBlockSubscriptionManager/max-retries-exhausted'
+        });
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
+        return;
+      }
+      var delay = SyncBlockSubscriptionManager.INITIAL_RETRY_DELAY_MS * Math.pow(SyncBlockSubscriptionManager.RETRY_BACKOFF_MULTIPLIER, attempts);
+      var timer = setTimeout(function () {
+        _this6.pendingRetries.delete(resourceId);
+
+        // Only re-subscribe if still relevant
+        if (_this6.subscriptions.has(resourceId) && _this6.shouldUseRealTime()) {
+          _this6.setupSubscription(resourceId);
+
+          // Only increment if the subscription was actually established
+          // (setupSubscription may be a no-op if another code path already re-established it)
+          if (_this6.graphqlSubscriptions.has(resourceId)) {
+            _this6.retryAttempts.set(resourceId, attempts + 1);
+          }
+        } else {
+          // Conditions no longer met — clean up stale retry state
+          _this6.retryAttempts.delete(resourceId);
+        }
+      }, delay);
+      this.pendingRetries.set(resourceId, timer);
+    }
+
+    /**
+     * Resets the retry counter for a resource. Called when a successful
+     * update is received, indicating the subscription is healthy.
+     */
+  }, {
+    key: "resetRetryCount",
+    value: function resetRetryCount(resourceId) {
+      this.retryAttempts.delete(resourceId);
+    }
+  }, {
+    key: "cancelPendingRetry",
+    value: function cancelPendingRetry(resourceId) {
+      var timer = this.pendingRetries.get(resourceId);
+      if (timer) {
+        clearTimeout(timer);
+        this.pendingRetries.delete(resourceId);
+      }
+    }
+  }, {
+    key: "cancelAllPendingRetries",
+    value: function cancelAllPendingRetries() {
+      var _iterator = _createForOfIteratorHelper(this.pendingRetries.values()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var timer = _step.value;
+          clearTimeout(timer);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      this.pendingRetries.clear();
+      this.retryAttempts.clear();
+    }
   }, {
     key: "cleanupSubscription",
     value: function cleanupSubscription(resourceId) {
@@ -271,39 +379,46 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
         unsubscribe();
         this.graphqlSubscriptions.delete(resourceId);
       }
+      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
+        this.cancelPendingRetry(resourceId);
+        this.retryAttempts.delete(resourceId);
+      }
     }
   }, {
     key: "setupSubscriptionsForAllBlocks",
     value: function setupSubscriptionsForAllBlocks() {
-      var _iterator = _createForOfIteratorHelper(this.subscriptions.keys()),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(this.subscriptions.keys()),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var resourceId = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var resourceId = _step2.value;
           this.setupSubscription(resourceId);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
     }
   }, {
     key: "cleanupAll",
     value: function cleanupAll() {
-      var _iterator2 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var unsubscribe = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var unsubscribe = _step3.value;
           unsubscribe();
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       this.graphqlSubscriptions.clear();
+      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
+        this.cancelAllPendingRetries();
+      }
     }
   }, {
     key: "destroy",
@@ -315,17 +430,17 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
       this.useRealTimeSubscriptions = false;
 
       // Clear any pending cache deletions
-      var _iterator3 = _createForOfIteratorHelper(this.pendingCacheDeletions.values()),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(this.pendingCacheDeletions.values()),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var timeout = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var timeout = _step4.value;
           clearTimeout(timeout);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       this.pendingCacheDeletions.clear();
     }
@@ -337,7 +452,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
   }, {
     key: "handleGraphQLUpdate",
     value: function handleGraphQLUpdate(syncBlockInstance) {
-      var _this6 = this;
+      var _this7 = this;
       if (!syncBlockInstance.resourceId) {
         return;
       }
@@ -345,18 +460,26 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
       var resolved = existing ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existing, syncBlockInstance) : syncBlockInstance;
       this.deps.updateCache(resolved);
       if (!syncBlockInstance.error) {
+        // Successful data delivery means the subscription is healthy — reset retry counter
+        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
+          this.resetRetryCount(syncBlockInstance.resourceId);
+        }
         var callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
-          var _this6$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn((0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_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 _this7$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
+          (_this7$deps$getFireAn = _this7.deps.getFireAnalyticsEvent()) === null || _this7$deps$getFireAn === void 0 || _this7$deps$getFireAn((0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_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)));
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna, _syncBlockInstance$da3, _syncBlockInstance$da4;
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna2, _syncBlockInstance$da3, _syncBlockInstance$da4;
         var 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$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.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 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2((0, _errorHandling.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 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
       }
     }
   }]);
-}();
+}();
+// Reconnection with exponential backoff
+(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "INITIAL_RETRY_DELAY_MS", 1000);
+(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "RETRY_BACKOFF_MULTIPLIER", 2);
+(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS", 5);

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

@@ -181,7 +181,7 @@ const parseSubscriptionPayload = payload => {
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-export const subscribeToBlockUpdates = (blockAri, onData, onError) => {
+export const subscribeToBlockUpdates = (blockAri, onData, onError, onComplete) => {
   const client = getBlockServiceClient();
   if (!client) {
     // Return a no-op unsubscribe if client is not available (e.g., SSR)
@@ -209,7 +209,7 @@ export const subscribeToBlockUpdates = (blockAri, onData, onError) => {
       onError === null || onError === void 0 ? void 0 : onError(new Error(extractGraphQLWSErrorMessage(error)));
     },
     complete: () => {
-      // Subscription completed
+      onComplete === null || onComplete === void 0 ? void 0 : onComplete();
     }
   });
   return unsubscribe;

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

@@ -533,7 +533,7 @@ class BlockServiceADFFetchProvider {
    * @param onError - Optional callback function invoked on subscription errors
    * @returns Unsubscribe function to stop receiving updates
    */
-  subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+  subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
     const blockAri = generateBlockAriFromReference({
       cloudId: this.cloudId,
       resourceId
@@ -568,7 +568,7 @@ class BlockServiceADFFetchProvider {
           resourceId: parsedData.resourceId
         };
         onUpdate(syncBlockInstance);
-      }, onError);
+      }, onError, onComplete);
     }).catch(err => {
       if (cancelled) {
         return;

package/dist/es2019/providers/syncBlockProvider.js

@@ -313,9 +313,9 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
    * @param onError - Optional callback function invoked on subscription errors
    * @returns Unsubscribe function to stop receiving updates, or undefined if not supported
    */
-  subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+  subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
     if (this.fetchProvider.subscribeToBlockUpdates) {
-      return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError);
+      return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete);
     }
     return undefined;
   }

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

@@ -142,6 +142,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 +177,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, {

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

@@ -1,5 +1,6 @@
 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 { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { getSourceProductFromResourceIdSafe } from '../utils/utils';
@@ -21,6 +22,8 @@ export class SyncBlockSubscriptionManager {
     // causing the cache to be deleted prematurely. We delay deletion to allow
     // the new component to subscribe and cancel the pending deletion.
     _defineProperty(this, "pendingCacheDeletions", new Map());
+    _defineProperty(this, "retryAttempts", new Map());
+    _defineProperty(this, "pendingRetries", new Map());
     this.deps = deps;
   }
 
@@ -213,6 +216,7 @@ export class SyncBlockSubscriptionManager {
     if (!(dataProvider !== null && dataProvider !== void 0 && dataProvider.subscribeToBlockUpdates)) {
       return;
     }
+    const reconnectEnabled = fg('platform_synced_block_patch_12');
     const unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, syncBlockInstance => {
       this.handleGraphQLUpdate(syncBlockInstance);
     }, error => {
@@ -221,17 +225,105 @@ export class SyncBlockSubscriptionManager {
         location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
       });
       (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
-    });
+      if (reconnectEnabled) {
+        this.handleSubscriptionTerminated(resourceId);
+      }
+    }, reconnectEnabled ? () => {
+      this.handleSubscriptionTerminated(resourceId);
+    } : undefined);
     if (unsubscribe) {
       this.graphqlSubscriptions.set(resourceId, unsubscribe);
     }
   }
+
+  /**
+   * Handles subscription termination (complete or error) by cleaning up the
+   * stale entry and scheduling a reconnection with exponential backoff.
+   */
+  handleSubscriptionTerminated(resourceId) {
+    // Remove the stale subscription entry so setupSubscription won't early-return
+    this.graphqlSubscriptions.delete(resourceId);
+
+    // Guard against duplicate calls (graphql-ws can fire both error and complete)
+    if (this.pendingRetries.has(resourceId)) {
+      return;
+    }
+
+    // Only reconnect if there are still active subscribers for this resource
+    if (this.subscriptions.has(resourceId) && this.shouldUseRealTime()) {
+      this.scheduleReconnection(resourceId);
+    }
+  }
+
+  /**
+   * Schedules a reconnection attempt with exponential backoff.
+   * Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
+   * e.g. 1s, 2s, 4s, 8s, 16s
+   */
+  scheduleReconnection(resourceId) {
+    var _this$retryAttempts$g;
+    const attempts = (_this$retryAttempts$g = this.retryAttempts.get(resourceId)) !== null && _this$retryAttempts$g !== void 0 ? _this$retryAttempts$g : 0;
+    if (attempts >= SyncBlockSubscriptionManager.MAX_RETRY_ATTEMPTS) {
+      var _this$deps$getFireAna3;
+      const errorMessage = `Subscription reconnection failed after ${attempts} attempts`;
+      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)));
+      return;
+    }
+    const delay = SyncBlockSubscriptionManager.INITIAL_RETRY_DELAY_MS * Math.pow(SyncBlockSubscriptionManager.RETRY_BACKOFF_MULTIPLIER, attempts);
+    const timer = setTimeout(() => {
+      this.pendingRetries.delete(resourceId);
+
+      // Only re-subscribe if still relevant
+      if (this.subscriptions.has(resourceId) && this.shouldUseRealTime()) {
+        this.setupSubscription(resourceId);
+
+        // Only increment if the subscription was actually established
+        // (setupSubscription may be a no-op if another code path already re-established it)
+        if (this.graphqlSubscriptions.has(resourceId)) {
+          this.retryAttempts.set(resourceId, attempts + 1);
+        }
+      } else {
+        // Conditions no longer met — clean up stale retry state
+        this.retryAttempts.delete(resourceId);
+      }
+    }, delay);
+    this.pendingRetries.set(resourceId, timer);
+  }
+
+  /**
+   * Resets the retry counter for a resource. Called when a successful
+   * update is received, indicating the subscription is healthy.
+   */
+  resetRetryCount(resourceId) {
+    this.retryAttempts.delete(resourceId);
+  }
+  cancelPendingRetry(resourceId) {
+    const timer = this.pendingRetries.get(resourceId);
+    if (timer) {
+      clearTimeout(timer);
+      this.pendingRetries.delete(resourceId);
+    }
+  }
+  cancelAllPendingRetries() {
+    for (const timer of this.pendingRetries.values()) {
+      clearTimeout(timer);
+    }
+    this.pendingRetries.clear();
+    this.retryAttempts.clear();
+  }
   cleanupSubscription(resourceId) {
     const unsubscribe = this.graphqlSubscriptions.get(resourceId);
     if (unsubscribe) {
       unsubscribe();
       this.graphqlSubscriptions.delete(resourceId);
     }
+    if (fg('platform_synced_block_patch_12')) {
+      this.cancelPendingRetry(resourceId);
+      this.retryAttempts.delete(resourceId);
+    }
   }
   setupSubscriptionsForAllBlocks() {
     for (const resourceId of this.subscriptions.keys()) {
@@ -243,6 +335,9 @@ export class SyncBlockSubscriptionManager {
       unsubscribe();
     }
     this.graphqlSubscriptions.clear();
+    if (fg('platform_synced_block_patch_12')) {
+      this.cancelAllPendingRetries();
+    }
   }
   destroy() {
     this.cleanupAll();
@@ -268,17 +363,25 @@ export class SyncBlockSubscriptionManager {
     const resolved = existing ? resolveSyncBlockInstance(existing, syncBlockInstance) : syncBlockInstance;
     this.deps.updateCache(resolved);
     if (!syncBlockInstance.error) {
+      // Successful data delivery means the subscription is healthy — reset retry counter
+      if (fg('platform_synced_block_patch_12')) {
+        this.resetRetryCount(syncBlockInstance.resourceId);
+      }
       const callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
-        var _this$deps$getFireAna3, _syncBlockInstance$da, _syncBlockInstance$da2;
-        (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 ? void 0 : _this$deps$getFireAna3(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_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$deps$getFireAna4, _syncBlockInstance$da, _syncBlockInstance$da2;
+        (_this$deps$getFireAna4 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna4 === void 0 ? void 0 : _this$deps$getFireAna4(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_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)));
       });
       this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
     } else {
-      var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna4, _syncBlockInstance$da3, _syncBlockInstance$da4;
+      var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna5, _syncBlockInstance$da3, _syncBlockInstance$da4;
       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$getFireAna4 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna4 === void 0 ? void 0 : _this$deps$getFireAna4(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)));
+      (_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)));
     }
   }
-}
+}
+// Reconnection with exponential backoff
+_defineProperty(SyncBlockSubscriptionManager, "INITIAL_RETRY_DELAY_MS", 1000);
+_defineProperty(SyncBlockSubscriptionManager, "RETRY_BACKOFF_MULTIPLIER", 2);
+_defineProperty(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS", 5);

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

@@ -167,7 +167,7 @@ var parseSubscriptionPayload = function parseSubscriptionPayload(payload) {
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-export var subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri, onData, onError) {
+export var subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri, onData, onError, onComplete) {
   var client = getBlockServiceClient();
   if (!client) {
     // Return a no-op unsubscribe if client is not available (e.g., SSR)
@@ -203,7 +203,7 @@ export var subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri,
       onError === null || onError === void 0 || onError(new Error(extractGraphQLWSErrorMessage(error)));
     }),
     complete: function complete() {
-      // Subscription completed
+      onComplete === null || onComplete === void 0 || onComplete();
     }
   });
   return unsubscribe;

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

@@ -786,7 +786,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     )
   }, {
     key: "subscribeToBlockUpdates",
-    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
       var blockAri = generateBlockAriFromReference({
         cloudId: this.cloudId,
         resourceId: resourceId
@@ -820,7 +820,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             resourceId: parsedData.resourceId
           };
           onUpdate(syncBlockInstance);
-        }, onError);
+        }, onError, onComplete);
       }).catch(function (err) {
         if (cancelled) {
           return;

package/dist/esm/providers/syncBlockProvider.js

@@ -462,9 +462,9 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
      */
   }, {
     key: "subscribeToBlockUpdates",
-    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
       if (this.fetchProvider.subscribeToBlockUpdates) {
-        return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError);
+        return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete);
       }
       return undefined;
     }

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

@@ -204,6 +204,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 +243,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, {

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

@@ -7,6 +7,7 @@ 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) { _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 { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchErrorPayload, fetchSuccessPayload } from '../utils/errorHandling';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { getSourceProductFromResourceIdSafe } from '../utils/utils';
@@ -29,6 +30,8 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
     // causing the cache to be deleted prematurely. We delay deletion to allow
     // the new component to subscribe and cancel the pending deletion.
     _defineProperty(this, "pendingCacheDeletions", new Map());
+    _defineProperty(this, "retryAttempts", new Map());
+    _defineProperty(this, "pendingRetries", new Map());
     this.deps = deps;
   }
 
@@ -243,6 +246,7 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
       if (!(dataProvider !== null && dataProvider !== void 0 && dataProvider.subscribeToBlockUpdates)) {
         return;
       }
+      var reconnectEnabled = fg('platform_synced_block_patch_12');
       var unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
         _this5.handleGraphQLUpdate(syncBlockInstance);
       }, function (error) {
@@ -251,11 +255,115 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
           location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
         });
         (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
-      });
+        if (reconnectEnabled) {
+          _this5.handleSubscriptionTerminated(resourceId);
+        }
+      }, reconnectEnabled ? function () {
+        _this5.handleSubscriptionTerminated(resourceId);
+      } : undefined);
       if (unsubscribe) {
         this.graphqlSubscriptions.set(resourceId, unsubscribe);
       }
     }
+
+    /**
+     * Handles subscription termination (complete or error) by cleaning up the
+     * stale entry and scheduling a reconnection with exponential backoff.
+     */
+  }, {
+    key: "handleSubscriptionTerminated",
+    value: function handleSubscriptionTerminated(resourceId) {
+      // Remove the stale subscription entry so setupSubscription won't early-return
+      this.graphqlSubscriptions.delete(resourceId);
+
+      // Guard against duplicate calls (graphql-ws can fire both error and complete)
+      if (this.pendingRetries.has(resourceId)) {
+        return;
+      }
+
+      // Only reconnect if there are still active subscribers for this resource
+      if (this.subscriptions.has(resourceId) && this.shouldUseRealTime()) {
+        this.scheduleReconnection(resourceId);
+      }
+    }
+
+    /**
+     * Schedules a reconnection attempt with exponential backoff.
+     * Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
+     * e.g. 1s, 2s, 4s, 8s, 16s
+     */
+  }, {
+    key: "scheduleReconnection",
+    value: function scheduleReconnection(resourceId) {
+      var _this$retryAttempts$g,
+        _this6 = this;
+      var attempts = (_this$retryAttempts$g = this.retryAttempts.get(resourceId)) !== null && _this$retryAttempts$g !== void 0 ? _this$retryAttempts$g : 0;
+      if (attempts >= SyncBlockSubscriptionManager.MAX_RETRY_ATTEMPTS) {
+        var _this$deps$getFireAna;
+        var errorMessage = "Subscription reconnection failed after ".concat(attempts, " attempts");
+        logException(new Error(errorMessage), {
+          location: 'editor-synced-block-provider/syncBlockSubscriptionManager/max-retries-exhausted'
+        });
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(errorMessage, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+        return;
+      }
+      var delay = SyncBlockSubscriptionManager.INITIAL_RETRY_DELAY_MS * Math.pow(SyncBlockSubscriptionManager.RETRY_BACKOFF_MULTIPLIER, attempts);
+      var timer = setTimeout(function () {
+        _this6.pendingRetries.delete(resourceId);
+
+        // Only re-subscribe if still relevant
+        if (_this6.subscriptions.has(resourceId) && _this6.shouldUseRealTime()) {
+          _this6.setupSubscription(resourceId);
+
+          // Only increment if the subscription was actually established
+          // (setupSubscription may be a no-op if another code path already re-established it)
+          if (_this6.graphqlSubscriptions.has(resourceId)) {
+            _this6.retryAttempts.set(resourceId, attempts + 1);
+          }
+        } else {
+          // Conditions no longer met — clean up stale retry state
+          _this6.retryAttempts.delete(resourceId);
+        }
+      }, delay);
+      this.pendingRetries.set(resourceId, timer);
+    }
+
+    /**
+     * Resets the retry counter for a resource. Called when a successful
+     * update is received, indicating the subscription is healthy.
+     */
+  }, {
+    key: "resetRetryCount",
+    value: function resetRetryCount(resourceId) {
+      this.retryAttempts.delete(resourceId);
+    }
+  }, {
+    key: "cancelPendingRetry",
+    value: function cancelPendingRetry(resourceId) {
+      var timer = this.pendingRetries.get(resourceId);
+      if (timer) {
+        clearTimeout(timer);
+        this.pendingRetries.delete(resourceId);
+      }
+    }
+  }, {
+    key: "cancelAllPendingRetries",
+    value: function cancelAllPendingRetries() {
+      var _iterator = _createForOfIteratorHelper(this.pendingRetries.values()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var timer = _step.value;
+          clearTimeout(timer);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      this.pendingRetries.clear();
+      this.retryAttempts.clear();
+    }
   }, {
     key: "cleanupSubscription",
     value: function cleanupSubscription(resourceId) {
@@ -264,39 +372,46 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
         unsubscribe();
         this.graphqlSubscriptions.delete(resourceId);
       }
+      if (fg('platform_synced_block_patch_12')) {
+        this.cancelPendingRetry(resourceId);
+        this.retryAttempts.delete(resourceId);
+      }
     }
   }, {
     key: "setupSubscriptionsForAllBlocks",
     value: function setupSubscriptionsForAllBlocks() {
-      var _iterator = _createForOfIteratorHelper(this.subscriptions.keys()),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(this.subscriptions.keys()),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var resourceId = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var resourceId = _step2.value;
           this.setupSubscription(resourceId);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
     }
   }, {
     key: "cleanupAll",
     value: function cleanupAll() {
-      var _iterator2 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var unsubscribe = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var unsubscribe = _step3.value;
           unsubscribe();
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       this.graphqlSubscriptions.clear();
+      if (fg('platform_synced_block_patch_12')) {
+        this.cancelAllPendingRetries();
+      }
     }
   }, {
     key: "destroy",
@@ -308,17 +423,17 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
       this.useRealTimeSubscriptions = false;
 
       // Clear any pending cache deletions
-      var _iterator3 = _createForOfIteratorHelper(this.pendingCacheDeletions.values()),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(this.pendingCacheDeletions.values()),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var timeout = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var timeout = _step4.value;
           clearTimeout(timeout);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       this.pendingCacheDeletions.clear();
     }
@@ -330,7 +445,7 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
   }, {
     key: "handleGraphQLUpdate",
     value: function handleGraphQLUpdate(syncBlockInstance) {
-      var _this6 = this;
+      var _this7 = this;
       if (!syncBlockInstance.resourceId) {
         return;
       }
@@ -338,18 +453,26 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
       var resolved = existing ? resolveSyncBlockInstance(existing, syncBlockInstance) : syncBlockInstance;
       this.deps.updateCache(resolved);
       if (!syncBlockInstance.error) {
+        // Successful data delivery means the subscription is healthy — reset retry counter
+        if (fg('platform_synced_block_patch_12')) {
+          this.resetRetryCount(syncBlockInstance.resourceId);
+        }
         var callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
-          var _this6$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_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 _this7$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
+          (_this7$deps$getFireAn = _this7.deps.getFireAnalyticsEvent()) === null || _this7$deps$getFireAn === void 0 || _this7$deps$getFireAn(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_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)));
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna, _syncBlockInstance$da3, _syncBlockInstance$da4;
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna2, _syncBlockInstance$da3, _syncBlockInstance$da4;
         var 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$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(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)));
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2(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)));
       }
     }
   }]);
-}();
+}();
+// Reconnection with exponential backoff
+_defineProperty(SyncBlockSubscriptionManager, "INITIAL_RETRY_DELAY_MS", 1000);
+_defineProperty(SyncBlockSubscriptionManager, "RETRY_BACKOFF_MULTIPLIER", 2);
+_defineProperty(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS", 5);

package/dist/types/clients/block-service/blockSubscription.d.ts

@@ -31,6 +31,7 @@ export type ParsedBlockSubscriptionData = {
 };
 type SubscriptionCallback = (data: ParsedBlockSubscriptionData) => void;
 type ErrorCallback = (error: Error) => void;
+type CompleteCallback = () => void;
 type Unsubscribe = () => void;
 /**
  * Extracts a meaningful error message from the error: GraphQL WebSocket Error: {"isTrusted":true}
@@ -47,5 +48,5 @@ export declare const extractGraphQLWSErrorMessage: (error: unknown) => string;
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-export declare const subscribeToBlockUpdates: (blockAri: string, onData: SubscriptionCallback, onError?: ErrorCallback) => Unsubscribe;
+export declare const subscribeToBlockUpdates: (blockAri: string, onData: SubscriptionCallback, onError?: ErrorCallback, onComplete?: CompleteCallback) => Unsubscribe;
 export {};

package/dist/types/entry-points/providers-types.d.ts

@@ -1 +1 @@
-export type { ADFFetchProvider, ADFWriteProvider, BatchFetchConfig, BlockNodeIdentifiers, BlockSubscriptionErrorCallback, BlockUpdateCallback, SyncBlockDataProviderInterface, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, SyncedBlockRendererDataProviders, Unsubscribe, UpdateReferenceSyncBlockResult, WriteSyncBlockResult, SyncBlockParentInfo, SyncBlockSourceInfo, SyncBlockJiraIssueType, } from '../providers/types';
+export type { ADFFetchProvider, ADFWriteProvider, BatchFetchConfig, BlockNodeIdentifiers, BlockSubscriptionCompleteCallback, BlockSubscriptionErrorCallback, BlockUpdateCallback, SyncBlockDataProviderInterface, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, SyncedBlockRendererDataProviders, Unsubscribe, UpdateReferenceSyncBlockResult, WriteSyncBlockResult, SyncBlockParentInfo, SyncBlockSourceInfo, SyncBlockJiraIssueType, } from '../providers/types';

package/dist/types/providers/block-service/blockServiceAPI.d.ts

@@ -73,7 +73,7 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
      * @param onError - Optional callback function invoked on subscription errors
      * @returns Unsubscribe function to stop receiving updates
      */
-    subscribeToBlockUpdates(resourceId: ResourceId, onUpdate: (data: SyncBlockInstance) => void, onError?: (error: Error) => void): () => void;
+    subscribeToBlockUpdates(resourceId: ResourceId, onUpdate: (data: SyncBlockInstance) => void, onError?: (error: Error) => void, onComplete?: () => void): () => void;
 }
 interface BlockServiceADFWriteProviderProps {
     cloudId: string;

package/dist/types/providers/syncBlockProvider.d.ts

@@ -98,7 +98,7 @@ export declare class SyncedBlockProvider extends SyncBlockDataProviderInterface
      * @param onError - Optional callback function invoked on subscription errors
      * @returns Unsubscribe function to stop receiving updates, or undefined if not supported
      */
-    subscribeToBlockUpdates(resourceId: string, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback): Unsubscribe | undefined;
+    subscribeToBlockUpdates(resourceId: string, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback, onComplete?: () => void): Unsubscribe | undefined;
 }
 type UseMemoizedSyncedBlockProviderProps = {
     fetchProvider: ADFFetchProvider;

package/dist/types/providers/types.d.ts

@@ -92,6 +92,7 @@ export type BatchFetchConfig = {
 };
 export type BlockUpdateCallback = (data: SyncBlockInstance) => void;
 export type BlockSubscriptionErrorCallback = (error: Error) => void;
+export type BlockSubscriptionCompleteCallback = () => void;
 export type Unsubscribe = () => void;
 export interface ADFFetchProvider {
     batchFetchData: (blockNodeIdentifiers: BlockNodeIdentifiers[], config?: BatchFetchConfig) => Promise<SyncBlockInstance[]>;
@@ -100,7 +101,7 @@ export interface ADFFetchProvider {
     /**
      * Subscribes to real-time updates for a specific block.
      */
-    subscribeToBlockUpdates?: (resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback) => Unsubscribe;
+    subscribeToBlockUpdates?: (resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback, onComplete?: BlockSubscriptionCompleteCallback) => Unsubscribe;
 }
 export interface ADFWriteProvider {
     createData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
@@ -174,9 +175,10 @@ export declare abstract class SyncBlockDataProviderInterface extends NodeDataPro
      * @param resourceId - The resource ID of the block to subscribe to
      * @param onUpdate - Callback function invoked when the block is updated
      * @param onError - Optional callback function invoked on subscription errors
+     * @param onComplete - Optional callback function invoked when the subscription completes
      * @returns Unsubscribe function to stop receiving updates, or undefined if not supported
      */
-    subscribeToBlockUpdates?(resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback): Unsubscribe | undefined;
+    subscribeToBlockUpdates?(resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback, onComplete?: BlockSubscriptionCompleteCallback): Unsubscribe | undefined;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

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

@@ -26,6 +26,11 @@ export declare class SyncBlockSubscriptionManager {
     private subscriptionChangeListeners;
     private useRealTimeSubscriptions;
     private pendingCacheDeletions;
+    private static readonly INITIAL_RETRY_DELAY_MS;
+    private static readonly RETRY_BACKOFF_MULTIPLIER;
+    private static readonly MAX_RETRY_ATTEMPTS;
+    private retryAttempts;
+    private pendingRetries;
     constructor(deps: SyncBlockSubscriptionManagerDeps);
     /**
      * Returns the subscriptions map. Used by external consumers (e.g. batch fetcher, flush)
@@ -48,6 +53,24 @@ export declare class SyncBlockSubscriptionManager {
      */
     notifySubscriptionCallbacks(resourceId: ResourceId, syncBlock: SyncBlockInstance): void;
     setupSubscription(resourceId: ResourceId): void;
+    /**
+     * Handles subscription termination (complete or error) by cleaning up the
+     * stale entry and scheduling a reconnection with exponential backoff.
+     */
+    private handleSubscriptionTerminated;
+    /**
+     * Schedules a reconnection attempt with exponential backoff.
+     * Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
+     * e.g. 1s, 2s, 4s, 8s, 16s
+     */
+    private scheduleReconnection;
+    /**
+     * Resets the retry counter for a resource. Called when a successful
+     * update is received, indicating the subscription is healthy.
+     */
+    private resetRetryCount;
+    private cancelPendingRetry;
+    private cancelAllPendingRetries;
     cleanupSubscription(resourceId: ResourceId): void;
     setupSubscriptionsForAllBlocks(): void;
     cleanupAll(): void;

package/dist/types-ts4.5/clients/block-service/blockSubscription.d.ts

@@ -31,6 +31,7 @@ export type ParsedBlockSubscriptionData = {
 };
 type SubscriptionCallback = (data: ParsedBlockSubscriptionData) => void;
 type ErrorCallback = (error: Error) => void;
+type CompleteCallback = () => void;
 type Unsubscribe = () => void;
 /**
  * Extracts a meaningful error message from the error: GraphQL WebSocket Error: {"isTrusted":true}
@@ -47,5 +48,5 @@ export declare const extractGraphQLWSErrorMessage: (error: unknown) => string;
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-export declare const subscribeToBlockUpdates: (blockAri: string, onData: SubscriptionCallback, onError?: ErrorCallback) => Unsubscribe;
+export declare const subscribeToBlockUpdates: (blockAri: string, onData: SubscriptionCallback, onError?: ErrorCallback, onComplete?: CompleteCallback) => Unsubscribe;
 export {};

package/dist/types-ts4.5/entry-points/providers-types.d.ts

@@ -1 +1 @@
-export type { ADFFetchProvider, ADFWriteProvider, BatchFetchConfig, BlockNodeIdentifiers, BlockSubscriptionErrorCallback, BlockUpdateCallback, SyncBlockDataProviderInterface, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, SyncedBlockRendererDataProviders, Unsubscribe, UpdateReferenceSyncBlockResult, WriteSyncBlockResult, SyncBlockParentInfo, SyncBlockSourceInfo, SyncBlockJiraIssueType, } from '../providers/types';
+export type { ADFFetchProvider, ADFWriteProvider, BatchFetchConfig, BlockNodeIdentifiers, BlockSubscriptionCompleteCallback, BlockSubscriptionErrorCallback, BlockUpdateCallback, SyncBlockDataProviderInterface, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, SyncedBlockRendererDataProviders, Unsubscribe, UpdateReferenceSyncBlockResult, WriteSyncBlockResult, SyncBlockParentInfo, SyncBlockSourceInfo, SyncBlockJiraIssueType, } from '../providers/types';

package/dist/types-ts4.5/providers/block-service/blockServiceAPI.d.ts

@@ -73,7 +73,7 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
      * @param onError - Optional callback function invoked on subscription errors
      * @returns Unsubscribe function to stop receiving updates
      */
-    subscribeToBlockUpdates(resourceId: ResourceId, onUpdate: (data: SyncBlockInstance) => void, onError?: (error: Error) => void): () => void;
+    subscribeToBlockUpdates(resourceId: ResourceId, onUpdate: (data: SyncBlockInstance) => void, onError?: (error: Error) => void, onComplete?: () => void): () => void;
 }
 interface BlockServiceADFWriteProviderProps {
     cloudId: string;

package/dist/types-ts4.5/providers/syncBlockProvider.d.ts

@@ -98,7 +98,7 @@ export declare class SyncedBlockProvider extends SyncBlockDataProviderInterface
      * @param onError - Optional callback function invoked on subscription errors
      * @returns Unsubscribe function to stop receiving updates, or undefined if not supported
      */
-    subscribeToBlockUpdates(resourceId: string, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback): Unsubscribe | undefined;
+    subscribeToBlockUpdates(resourceId: string, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback, onComplete?: () => void): Unsubscribe | undefined;
 }
 type UseMemoizedSyncedBlockProviderProps = {
     fetchProvider: ADFFetchProvider;

package/dist/types-ts4.5/providers/types.d.ts

@@ -92,6 +92,7 @@ export type BatchFetchConfig = {
 };
 export type BlockUpdateCallback = (data: SyncBlockInstance) => void;
 export type BlockSubscriptionErrorCallback = (error: Error) => void;
+export type BlockSubscriptionCompleteCallback = () => void;
 export type Unsubscribe = () => void;
 export interface ADFFetchProvider {
     batchFetchData: (blockNodeIdentifiers: BlockNodeIdentifiers[], config?: BatchFetchConfig) => Promise<SyncBlockInstance[]>;
@@ -100,7 +101,7 @@ export interface ADFFetchProvider {
     /**
      * Subscribes to real-time updates for a specific block.
      */
-    subscribeToBlockUpdates?: (resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback) => Unsubscribe;
+    subscribeToBlockUpdates?: (resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback, onComplete?: BlockSubscriptionCompleteCallback) => Unsubscribe;
 }
 export interface ADFWriteProvider {
     createData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
@@ -174,9 +175,10 @@ export declare abstract class SyncBlockDataProviderInterface extends NodeDataPro
      * @param resourceId - The resource ID of the block to subscribe to
      * @param onUpdate - Callback function invoked when the block is updated
      * @param onError - Optional callback function invoked on subscription errors
+     * @param onComplete - Optional callback function invoked when the subscription completes
      * @returns Unsubscribe function to stop receiving updates, or undefined if not supported
      */
-    subscribeToBlockUpdates?(resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback): Unsubscribe | undefined;
+    subscribeToBlockUpdates?(resourceId: ResourceId, onUpdate: BlockUpdateCallback, onError?: BlockSubscriptionErrorCallback, onComplete?: BlockSubscriptionCompleteCallback): Unsubscribe | undefined;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

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

@@ -26,6 +26,11 @@ export declare class SyncBlockSubscriptionManager {
     private subscriptionChangeListeners;
     private useRealTimeSubscriptions;
     private pendingCacheDeletions;
+    private static readonly INITIAL_RETRY_DELAY_MS;
+    private static readonly RETRY_BACKOFF_MULTIPLIER;
+    private static readonly MAX_RETRY_ATTEMPTS;
+    private retryAttempts;
+    private pendingRetries;
     constructor(deps: SyncBlockSubscriptionManagerDeps);
     /**
      * Returns the subscriptions map. Used by external consumers (e.g. batch fetcher, flush)
@@ -48,6 +53,24 @@ export declare class SyncBlockSubscriptionManager {
      */
     notifySubscriptionCallbacks(resourceId: ResourceId, syncBlock: SyncBlockInstance): void;
     setupSubscription(resourceId: ResourceId): void;
+    /**
+     * Handles subscription termination (complete or error) by cleaning up the
+     * stale entry and scheduling a reconnection with exponential backoff.
+     */
+    private handleSubscriptionTerminated;
+    /**
+     * Schedules a reconnection attempt with exponential backoff.
+     * Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
+     * e.g. 1s, 2s, 4s, 8s, 16s
+     */
+    private scheduleReconnection;
+    /**
+     * Resets the retry counter for a resource. Called when a successful
+     * update is received, indicating the subscription is healthy.
+     */
+    private resetRetryCount;
+    private cancelPendingRetry;
+    private cancelAllPendingRetries;
     cleanupSubscription(resourceId: ResourceId): void;
     setupSubscriptionsForAllBlocks(): void;
     cleanupAll(): 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.0.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.37.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.6",
+	"version": "6.6.8",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",