RTC: Fix Block Hooks auto-inserted blocks duplication on collaboration

packages/core-data/src/resolvers.js

@@ -28,6 +28,7 @@ import {
 } from './utils';
 import { fetchBlockPatterns } from './fetch';
 import { restoreSelection, getSelectionHistory } from './utils/crdt-selection';
+import { stripServerManagedMeta } from './utils/crdt';
 
 /**
  * Requests authors from the REST API.
@@ -247,13 +248,25 @@ export const getEntityRecord =
 										return;
 									}
 
+									// Shallow-clone the record and its meta so we
+									// don't mutate the cached selector result.
+									// Strip server-managed meta keys before saving —
+									// sending their (possibly stale) client values
+									// can overwrite what the server calculates
+									// during save (e.g. _wp_ignored_hooked_blocks).
+									const recordToSave = {
+										...editedRecord,
+										meta: { ...meta },
+									};
+									stripServerManagedMeta( recordToSave );
+
 									// Trigger a save to persist the CRDT document. The entity's
 									// pre-persist hooks will create the persisted CRDT document
 									// and apply it to the record's meta.
 									dispatch.saveEntityRecord(
 										kind,
 										name,
-										editedRecord
+										recordToSave
 									);
 								} );
 						},

packages/core-data/src/utils/crdt.ts

@@ -76,11 +76,36 @@ export interface YPostRecord extends YMapRecord {
 
 export const POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE = '_crdt_document';
 
-// Post meta keys that should *not* be synced.
 const disallowedPostMetaKeys = new Set< string >( [
 	POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE,
 ] );
 
+// Post meta keys that are server-managed and must not be sent by the client
+// during saves. Sending stale client values for these keys overwrites the
+// server's calculations (e.g. update_ignored_hooked_blocks_postmeta).
+const serverManagedPostMetaKeys = new Set< string >( [
+	'_wp_ignored_hooked_blocks',
+] );
+
+/**
+ * Remove server-managed meta keys from a record's meta object in place.
+ * These keys are calculated by the server during save and must not be
+ * overwritten by possibly stale client values.
+ *
+ * @param {Object} record An entity record with an optional `meta` property.
+ */
+export function stripServerManagedMeta(
+	record: Record< string, unknown >
+): void {
+	const meta = record.meta;
+	if ( ! meta || typeof meta !== 'object' ) {
+		return;
+	}
+	serverManagedPostMetaKeys.forEach( ( metaKey ) => {
+		delete ( meta as Record< string, unknown > )[ metaKey ];
+	} );
+}
+
 /**
  * Given a set of local changes to a generic entity record, apply those changes
  * to the local Y.Doc.

packages/core-data/src/utils/test/crdt.ts

@@ -59,6 +59,7 @@ import {
 	applyPostChangesToCRDTDoc,
 	getPostChangesFromCRDTDoc,
 	POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE,
+	stripServerManagedMeta,
 	type PostChanges,
 	type YPostRecord,
 } from '../crdt';
@@ -932,3 +933,34 @@ function addBlockToDoc(
 
 	return ytext;
 }
+
+describe( 'stripServerManagedMeta', () => {
+	it( 'should remove _wp_ignored_hooked_blocks from meta', () => {
+		const record = {
+			meta: {
+				_wp_ignored_hooked_blocks: '',
+				footnotes: '',
+			},
+		};
+		stripServerManagedMeta( record );
+		expect( record.meta ).toEqual( { footnotes: '' } );
+	} );
+
+	it( 'should be a no-op when the key is not present', () => {
+		const record = { meta: { footnotes: '' } };
+		stripServerManagedMeta( record );
+		expect( record.meta ).toEqual( { footnotes: '' } );
+	} );
+
+	it( 'should be a no-op when meta is null', () => {
+		const record = { meta: null };
+		stripServerManagedMeta( record );
+		expect( record.meta ).toBeNull();
+	} );
+
+	it( 'should be a no-op when meta is undefined', () => {
+		const record = {};
+		stripServerManagedMeta( record );
+		expect( record ).toEqual( {} );
+	} );
+} );

test/e2e/specs/editor/plugins/block-hooks.spec.js

@@ -3,13 +3,6 @@
  */
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
-/**
- * Internal dependencies
- */
-const {
-	setCollaboration,
-} = require( '../../editor/collaboration/fixtures/collaboration-utils' );
-
 const dummyBlocksContent = `<!-- wp:heading -->
 <h2 class="wp-block-heading">This is a dummy heading</h2>
 <!-- /wp:heading -->
@@ -72,12 +65,6 @@ test.describe( 'Block Hooks API', () => {
 				} else {
 					containerPost = postObject;
 				}
-
-				/**
-				 * Since the Block Hooks API relies on server-side rendering to insert
-				 * the hooked blocks, there is a fundamental incompatibility with RTC.
-				 */
-				await setCollaboration( requestUtils, false );
 			} );
 
 			test.afterAll( async ( { requestUtils } ) => {
@@ -87,7 +74,6 @@ test.describe( 'Block Hooks API', () => {
 
 				await requestUtils.deleteAllPosts();
 				await requestUtils.deleteAllBlocks();
-				await setCollaboration( requestUtils, true );
 			} );
 
 			test( `should insert hooked blocks into ${ name } on frontend`, async ( {
@@ -212,12 +198,6 @@ test.describe( 'Block Hooks API', () => {
 				} else {
 					containerPost = postObject;
 				}
-
-				/**
-				 * Since the Block Hooks API relies on server-side rendering to insert
-				 * the hooked blocks, there is a fundamental incompatibility with RTC.
-				 */
-				await setCollaboration( requestUtils, false );
 			} );
 
 			test.afterAll( async ( { requestUtils } ) => {
@@ -227,7 +207,6 @@ test.describe( 'Block Hooks API', () => {
 
 				await requestUtils.deleteAllPosts();
 				await requestUtils.deleteAllBlocks();
-				await setCollaboration( requestUtils, true );
 			} );
 
 			test( `should insert hooked blocks into ${ name } on frontend`, async ( {