Merge remote-tracking branch 'origin/suggest/inline-wiring' into fix/73411-f18-accept-undo

# Conflicts:
#	packages/editor/CHANGELOG.md

Author: adamsilverstein

docs/explanations/architecture/suggestions.md

@@ -165,7 +165,7 @@ The Suggest-mode subsystem lives in `packages/editor/src/components/suggestion-m
 | `with-suggestion-overlay.js`| `editor.BlockEdit` HOC that detects format-only / reconcilable content edits and hands them to the marker singletons, diverting everything else into the overlay (marker-stripped); plus the `editor.BlockListBlock` filter for pending-state classes and move ghosts. |
 | `store-interceptor.js`      | Snapshot/diff/revert subscriber for store-level mutations (attribute and structural); multi-peer accept logic; revert-echo identity tokens. |
 | `provider.js`               | `useSuggestionsProvider` — the `createSuggestion` / `applySuggestion` / `rejectSuggestion` API. Owns `operationsFromOverlay`, `applyOperations`, `hasAttributeConflict`, `findStructuralOp`, `clearSuggestionMarkerAttributes`, `parseSuggestionPayload`, and the wrapper-aware equality check. |
-| `suggestion-summary.js`     | Compact sidebar summary ("Add: …", "Delete: …", "Formatting: …") used in thread lists — the sole suggestion renderer in the sidebar. |
+| `suggestion-summary.js`     | Compact sidebar summary ("Add: …", "Delete: …", "Add formatting: …", "Remove formatting: …") used in thread lists — the sole suggestion renderer in the sidebar. Inline format changes carry their direction, since adding and removing a format are opposite proposals. |
 | `word-diff.js`              | `wordDiff` — the word-level LCS behind the summary, bounded by `MAX_DIFF_LENGTH` (characters, applied by callers) and `MAX_DIFF_TOKENS` (tokens, applied internally). |
 | `auto-save.js`              | Debounced background persistence of pending overlays as note comments (replaces the explicit "Submit" affordance from earlier phases). |
 | `suggestion-deletion-keyboard.js` | `beforeinput`/`cut`-capture handler turning selection, collapsed-cursor, word/line deletes and cut into `del` markers. |

packages/editor/CHANGELOG.md

@@ -13,6 +13,7 @@
 -   Suggest mode: keep the code editor closed while the Suggest intent is active and while the post still carries unresolved inline suggestion markers, and identify a marker by its element rather than by a substring of the document ([#81662](https://github.com/WordPress/gutenberg/pull/81662)).
 -   Suggest mode: Announce inline suggestion markers to screen readers. A marker's state was carried entirely by color and text decoration, so a run proposed for deletion was read aloud as ordinary prose. Each marker is now bracketed by an announcement naming the kind of change and the person who proposed it, and add and delete markers carry `role="insertion"` and `role="deletion"`; a formatting suggestion no longer claims to be a deletion. Suggestions over overlapping runs nest, and each is announced and attributed to the person who made it ([#81663](https://github.com/WordPress/gutenberg/pull/81663), [#81957](https://github.com/WordPress/gutenberg/pull/81957)).
 -   Suggest mode: keep a review decision and its note together through undo. Accepting or rejecting a suggestion changes block content and resolves the note, but only the content half is in the undo stack, so undo put the marker back on a note that stayed resolved - a marked-up run with no Accept/Reject on it and no way to clear it. Undoing a decision made in this session now reopens its note along with the marker ([#81669](https://github.com/WordPress/gutenberg/pull/81669)).
+-   Suggest mode: extend a format suggestion on a second toggle instead of opening a second one. Toggling a further format over a run that already carries the suggester's own pending `format` marker recorded a suggestion whose before and after were both empty - unreviewable and unapplyable - and made every marker in the block disappear. The existing suggestion is now revised in place, a toggle that restores the original run retracts it rather than storing a note that proposes nothing, and a note that has replies is revised rather than withdrawn ([#81665](https://github.com/WordPress/gutenberg/pull/81665)).
 -   Suggest mode: refuse post status changes while suggesting. `editPost` drops the `status` field in the `suggest` intent, the status control and the summary panel show the status without offering to change it, and the publish button is disabled there rather than dropping the status edit and saving the post anyway. A status edit that travels with a companion field - the `password` that visibility changes carry, the `date` that scheduling carries - is refused whole rather than half-applied, a status repeated at the value it already holds is not announced as a refusal, and a status staged before the intent changed is discarded on the way in. The refusal is announced and shown in a snackbar ([#81664](https://github.com/WordPress/gutenberg/pull/81664)).
 -   Register the editor and block editor keyboard shortcuts from the editor provider, so shortcuts work for consumers that mount the editor without rendering `EditorKeyboardShortcutsRegister` themselves ([#81580](https://github.com/WordPress/gutenberg/pull/81580)).
 -   Header: Allow the Back button column to grow when "Show button text labels" is enabled so the label is not obscured by the following controls ([#81701](https://github.com/WordPress/gutenberg/pull/81701)).

packages/editor/src/components/collab-sidebar/hooks.js

@@ -35,13 +35,26 @@ import {
 
 const { cleanEmptyObject } = unlock( blockEditorPrivateApis );
 
-export function useNoteThreads( postId ) {
-	const queryArgs = {
+/**
+ * Query that loads every note thread on a post, replies included. Exported so
+ * code outside the sidebar can read the same cached list synchronously with
+ * `select( coreStore ).getEntityRecords()` — a queried list is only found under
+ * the exact query it was fetched with.
+ *
+ * @param {number} postId Post id.
+ * @return {Object} Query arguments for the `root`/`comment` entity.
+ */
+export function getNoteThreadsQuery( postId ) {
+	return {
 		post: postId,
 		type: 'note',
 		status: 'all',
 		per_page: -1,
 	};
+}
+
+export function useNoteThreads( postId ) {
+	const queryArgs = getNoteThreadsQuery( postId );
 
 	const { records: threads } = useEntityRecords(
 		'root',

packages/editor/src/components/inline-suggestions/operations.js

@@ -366,6 +366,19 @@ export function acceptInlineFormat( value, suggestionId ) {
 	return unwrapMarker( value, suggestionId );
 }
 
+/**
+ * Extract the HTML of a block attribute value, tolerating plain strings.
+ *
+ * @param {*} value Block attribute value.
+ * @return {?string} HTML, or null when the value carries none.
+ */
+function toHTML( value ) {
+	if ( value instanceof RichTextData ) {
+		return value.toHTMLString();
+	}
+	return typeof value === 'string' ? value : null;
+}
+
 /**
  * Reject a suggested formatting change: replace the marked run with the original
  * run captured when the suggestion was made, so the proposed formatting (and the
@@ -374,20 +387,25 @@ export function acceptInlineFormat( value, suggestionId ) {
  * `plan.beforeHTML`) because the marked run in content holds the *proposed*
  * formatting, not the original.
  *
- * @param {*}             value        Block attribute value (RichTextData or other).
+ * Accepts a plain-string value as well as `RichTextData`: the format keyboard's
+ * retract path passes the raw `content` attribute, which a block may hold as a
+ * string.
+ *
+ * @param {*}             value        Block attribute value (RichTextData, string, or other).
  * @param {number|string} suggestionId Suggestion (marker) id to reject.
  * @param {string}        beforeHTML   HTML of the original run to restore.
  * @return {*} New RichTextData with the original run restored, or the original value.
  */
 export function rejectInlineFormat( value, suggestionId, beforeHTML ) {
-	if ( ! ( value instanceof RichTextData ) ) {
+	const html = toHTML( value );
+	if ( html === null ) {
 		return value;
 	}
 	const range = findSuggestionRange( value, suggestionId );
 	if ( ! range ) {
 		return value;
 	}
-	const record = create( { html: value.toHTMLString() } );
+	const record = create( { html } );
 	const original = create( { html: beforeHTML ?? '' } );
 	// `insert` replaces the [start, end) range with the original run, which
 	// carries neither the proposed formatting nor the marker.