@stll/folio-core 0.52.0 → 0.53.0

package/dist/ai-edits/headless.js

@@ -3,6 +3,7 @@ import { matchInlineProvenance } from "../compare/inline-provenance.js";
 import { stageSectionBoundaryProperties } from "../compare/section-boundary-properties.js";
 import { importReferencedStyleDefinitions } from "../compare/style-resources.js";
 import { applyFolioDocumentOperations } from "../document-operations.js";
+import { applyReplyThreadMarkers } from "../docx/commentReplyMarkers.js";
 import { rebindDrawingImageRelationship } from "../docx/drawingRelationships.js";
 import { getEndnoteText, getFootnoteText, isSeparatorEndnote, isSeparatorFootnote } from "../docx/footnoteParser.js";
 import { getHeaderFooterText } from "../docx/headerFooterParser.js";
@@ -17,21 +18,26 @@ import { pluginsForHeadlessRevisionResolution } from "../internal/headlessRevisi
 import { withTrackedSectionEndpointRemoval } from "../internal/sectionEndpointResolution.js";
 import { captureSectionReferenceInventory, resolvedSectionReferenceLosses, withSectionReferenceResolution } from "../internal/sectionReferenceResolution.js";
 import { expectCharacterStyleMarkAttrs } from "../prosemirror/attrs/index.js";
-import { acceptAIEditRevision, rejectAIEditRevision, resolveAllChangesInHeadlessState } from "../prosemirror/commands/comments.js";
+import { acceptAIEditRevision, acceptSuggestion, getSuggestions, rejectAIEditRevision, rejectAllSuggestions, rejectSuggestion, resolveAllChangesInHeadlessState, suggestionIdOfRevision } from "../prosemirror/commands/comments.js";
 import { sectionRejectProperties } from "../prosemirror/commands/propertyChangeScope.js";
 import { proseDocToBlocks, updateDocumentContent } from "../prosemirror/conversion/fromProseDoc.js";
 import { footnoteToProseDoc, headerFooterToProseDoc, toProseDoc } from "../prosemirror/conversion/toProseDoc.js";
 import { ensureBaseDirectionInState } from "../prosemirror/extensions/features/AutoBidiDetectionExtension.js";
 import { getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
+import { completeNumberingForDoc } from "../prosemirror/listInstanceReferences.js";
 import "../prosemirror/listMarker.js";
 import { createDocumentNumberingPlugin, withDocumentNumbering } from "../prosemirror/plugins/documentNumbering.js";
 import { createDocumentStylesPlugin, getDocumentStyleResolver, withDocumentStyles } from "../prosemirror/plugins/documentStyles.js";
 import { schema, singletonManager } from "../prosemirror/schema/index.js";
+import { sectionPropertiesOf } from "../prosemirror/sectionCarrier.js";
+import { storyListNumbering } from "../prosemirror/storyListNumbering.js";
 import { canonicalJson } from "../utils/canonicalJson.js";
 import { deterministicHexId } from "../utils/hexId.js";
-import { buildAnnotatedBlockText } from "./clean-text.js";
+import { buildAnnotatedBlockTextWithNoteReferences } from "./clean-text.js";
+import { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, withoutLostCommentThreads } from "./comment-lifecycle.js";
+import { FolioPendingSuggestionRegistry, createPendingSuggestionSourceSnapshot, withoutPendingSuggestionCommentMarks } from "./pending-suggestions.js";
 import { getCommentAnchorsFromDoc, getTrackedChangeStatsFromDoc, getTrackedChangesFromDoc, getTrackedChangesFromSnapshot } from "./read.js";
-import { createFolioAIEditSnapshotWithStyleResolver, detachFolioAIEditSnapshotExternalHyperlinks, folioStoryTables, isFolioAIContentBlock, normalizeFolioAIBlockText, sourceDocumentOf } from "./snapshot.js";
+import { collectNoteReferenceLabels, createFolioAIEditSnapshotWithStyleResolver, detachFolioAIEditSnapshotExternalHyperlinks, folioStoryTables, isFolioAIContentBlock, normalizeFolioAIBlockText, sourceDocumentOf } from "./snapshot.js";
 import { matchTableGeometry } from "./table-geometry.js";
 import { tableTemplateCanCrossPackageLosslessly } from "./table-template.js";
 import { TaggedError, panic } from "better-result";
@@ -248,6 +254,15 @@ const comparisonAccessByReviewer = /* @__PURE__ */ new WeakMap();
 const MAIN_STORY = Object.freeze({ type: "main" });
 const headerFooterStoryKey = ({ type, relationshipId }) => `${type}:${relationshipId}`;
 const noteStoryKey = ({ type, noteId }) => `${type}:${noteId}`;
+/**
+* A part's roles as a reader label: `first`, or, in a document with several
+* sections, `first (sections 1, 3), default (section 2)`.
+*/
+const describePlacements = (placements, sectionCount) => {
+	const sectionsByRole = /* @__PURE__ */ new Map();
+	for (const { type, section } of placements) sectionsByRole.set(type, [...sectionsByRole.get(type) ?? [], section]);
+	return [...sectionsByRole].map(([type, sections]) => sectionCount > 1 ? `${type} (${sections.length > 1 ? "sections" : "section"} ${sections.join(", ")})` : type).join(", ");
+};
 const secondaryStoryKey = (story) => story.type === "header" || story.type === "footer" ? headerFooterStoryKey(story) : noteStoryKey(story);
 const editableStoryKey = (story) => story.type === "main" ? "main" : secondaryStoryKey(story);
 const isFolioReviewedView = (value) => FOLIO_REVIEWED_VIEWS.some((view) => view === value);
@@ -256,6 +271,18 @@ const resolveReviewedState = (state, view) => {
 	if (view === "current-markup") return state;
 	return resolveAllChangesInHeadlessState(state, view === "original" ? "reject" : "accept");
 };
+/**
+* Reject suggestions before resolving all ordinary revisions. A suggested
+* whole-paragraph or table insert is flagged on the node; its flag must stay
+* intact until that suggestion is explicitly accepted or rejected.
+*/
+const rejectSuggestions = (state) => {
+	let settled = state;
+	rejectAllSuggestions()(state, (transaction) => {
+		settled = state.apply(transaction);
+	});
+	return settled;
+};
 const createHeadlessPlugins = (styles, numbering) => [
 	...pluginsForHeadlessRevisionResolution(singletonManager.getPlugins()),
 	createDocumentStylesPlugin(styles),
@@ -266,7 +293,9 @@ const formatStorySnapshotForLLM = (snapshot, annotated) => {
 	const blocks = snapshot.blocks.filter(isFolioAIContentBlock);
 	if (!annotated) return blocks.map(formatBlockForLLM).join("\n");
 	const nodeByStart = /* @__PURE__ */ new Map();
-	sourceDocumentOf(snapshot).descendants((node, pos) => {
+	const sourceDocument = sourceDocumentOf(snapshot);
+	const noteReferences = collectNoteReferenceLabels(sourceDocument);
+	sourceDocument.descendants((node, pos) => {
 		if (!node.isTextblock) return true;
 		nodeByStart.set(pos, node);
 		return false;
@@ -276,18 +305,22 @@ const formatStorySnapshotForLLM = (snapshot, annotated) => {
 	return blocks.map((block) => {
 		const from = startById.get(block.id);
 		const node = from === void 0 ? void 0 : nodeByStart.get(from);
-		const text = node ? buildAnnotatedBlockText(node) : block.text;
+		const text = node ? buildAnnotatedBlockTextWithNoteReferences(node, noteReferences) : block.text;
 		return formatBlockLine(block, text);
 	}).join("\n");
 };
 /**
 * One LLM-ready line for a block: `[<blockId>] text`, with an `(h<level>)` tag
-* for headings and the list marker for list items, so a model can copy the
-* block id straight back into an operation.
+* for headings, then the number a numbered heading shows, and the list marker
+* for list items, so a model can copy the block id straight back into an
+* operation and match the numbers the document shows.
 */
 const formatBlockLine = (block, text) => {
 	const label = `[${block.id}]`;
-	if (block.kind === "heading") return `${label} (h${headingLevel(block)}) ${text}`;
+	if (block.kind === "heading") {
+		const number = block.displayLabel !== void 0 && block.displayLabel !== block.styleId ? `${block.displayLabel} ` : "";
+		return `${label} (h${headingLevel(block)}) ${number}${text}`;
+	}
 	if (block.kind === "listItem") return `${label} ${block.displayLabel ?? "•"} ${text}`;
 	return `${label} ${text}`;
 };
@@ -340,7 +373,10 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	resolvedStoryExpectations = /* @__PURE__ */ new Map();
 	createdComments = [];
 	usedCommentIds;
+	/** Comments the body anchored when it was loaded, read as the editor projects it. */
+	loadedMainCommentIds;
 	documentOperationUndoEntries = [];
+	pendingSuggestions = new FolioPendingSuggestionRegistry();
 	/**
 	* Resolved-state overrides recorded by {@link resolveComment}, keyed by
 	* comment id. Applied on read ({@link getComments}) and on write
@@ -356,6 +392,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		this.state = args.state;
 		this.author = args.author;
 		this.usedCommentIds = new Set((args.baseDocument.package.document.comments ?? []).map(({ id }) => id));
+		this.loadedMainCommentIds = anchoredCommentIdsInProseDoc(args.state.doc);
 		comparisonAccessByReviewer.set(this, Object.freeze({
 			stageTerminalTableReviewCarrier: (target) => this.stageTerminalTableReviewCarrier(target),
 			stageTargetStyles: (source, snapshots, importedHeaderFooterSnapshots) => this.stageTargetStyles(source, snapshots, importedHeaderFooterSnapshots),
@@ -609,6 +646,51 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	snapshot() {
 		return createStateSnapshot(this.state);
 	}
+	/** Export staged AI operations for storage by the host, outside the DOCX. */
+	exportPendingSuggestions() {
+		const active = new Set(getSuggestions(this.state).map(({ suggestionId }) => suggestionId));
+		for (const entry of this.secondaryStoryStates.values()) for (const { suggestionId } of getSuggestions(entry.state)) active.add(suggestionId);
+		return this.pendingSuggestions.exportPendingSuggestions({
+			activeSuggestionIds: active,
+			snapshotForStory: (story, commentIds) => {
+				const state = this.getEditableStoryState(story);
+				return state ? createPendingSuggestionSourceSnapshot(state, commentIds) : null;
+			}
+		});
+	}
+	/** Validate saved proposals against this document before restaging them. */
+	loadPendingSuggestions(records) {
+		return this.pendingSuggestions.loadPendingSuggestions({
+			records,
+			snapshotForStory: (story) => this.snapshotStory(story),
+			sourceSnapshotForStory: (story, commentIds) => {
+				const state = this.getEditableStoryState(story);
+				return state ? createPendingSuggestionSourceSnapshot(state, commentIds) : null;
+			},
+			apply: (record, snapshot) => {
+				const result = this.applyDocumentOperationsInternal({
+					story: record.story,
+					batch: {
+						version: 1,
+						operations: [record.operation],
+						mode: "suggested"
+					},
+					snapshot,
+					author: record.author,
+					createUndoEntry: false
+				});
+				return {
+					applied: result.applied,
+					skipped: result.skipped
+				};
+			},
+			activeSuggestionIds: () => {
+				const active = new Set(getSuggestions(this.state).map(({ suggestionId }) => suggestionId));
+				for (const entry of this.secondaryStoryStates.values()) for (const { suggestionId } of getSuggestions(entry.state)) active.add(suggestionId);
+				return active;
+			}
+		});
+	}
 	/**
 	* The package's numbering, flattened to what a reader sees: one entry per
 	* numbering instance and level, with the format and level text that produce
@@ -621,7 +703,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* packages can be compared entry by entry.
 	*/
 	readNumberingDefinitions() {
-		return numberingLevelsOf(this.baseDocument.package.numbering).toSorted((left, right) => left.numId - right.numId || left.level - right.level);
+		return numberingLevelsOf(completeNumberingForDoc(this.baseDocument.package.numbering, this.state.doc)).toSorted((left, right) => left.numId - right.numId || left.level - right.level);
 	}
 	/** Return parsed package metadata without exposing the mutable document model. */
 	getDocumentProperties() {
@@ -810,7 +892,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		});
 	}
 	/** Apply a versioned operation batch to one editable document story. */
-	applyDocumentOperationsToStory({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground }) {
+	applyDocumentOperationsToStory({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground, undefinedStyles }) {
 		return this.applyDocumentOperationsInternal({
 			story,
 			batch,
@@ -819,11 +901,14 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			...wordDiff !== void 0 && { wordDiff },
 			...tableTemplates !== void 0 && { tableTemplates },
 			...replacementBackground !== void 0 && { replacementBackground },
+			...undefinedStyles !== void 0 && { undefinedStyles },
 			createUndoEntry: true
 		});
 	}
-	applyDocumentOperationsInternal({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground, createUndoEntry }) {
+	applyDocumentOperationsInternal({ story, batch, author, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground, undefinedStyles, createUndoEntry }) {
 		const beforeState = this.requireEditableStoryState(story);
+		const operationAuthor = author ?? this.author;
+		const sourceSnapshot = snapshot ?? createStateSnapshot(beforeState);
 		const createdCommentsLengthBefore = this.createdComments.length;
 		const view = {
 			state: beforeState,
@@ -833,19 +918,20 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		};
 		const result = applyFolioDocumentOperations({
 			view,
-			snapshot: snapshot ?? createStateSnapshot(beforeState),
+			snapshot: sourceSnapshot,
 			batch,
 			story: story.type === "main" ? "main" : story,
-			author: this.author,
+			author: operationAuthor,
 			...revisionStamp !== void 0 && { revisionStamp },
 			...wordDiff !== void 0 && { wordDiff },
 			...tableTemplates !== void 0 && { tableTemplates },
 			...replacementBackground !== void 0 && { replacementBackground },
+			...undefinedStyles !== void 0 && { undefinedStyles },
 			createCommentId: (text) => {
 				const comment = createReviewerComment({
 					id: this.nextCommentId(),
 					text,
-					author: this.author,
+					author: operationAuthor,
 					date: revisionStamp?.date
 				});
 				this.createdComments.push(comment);
@@ -856,7 +942,23 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 				id: `headless-${String(undoHandleCursor++)}`
 			}) }
 		});
+		const appliedCommentIds = new Set(result.applied.flatMap(({ commentId }) => commentId === void 0 ? [] : [commentId]));
+		const createdByBatch = this.createdComments.splice(createdCommentsLengthBefore);
+		this.createdComments.push(...createdByBatch.filter((comment) => appliedCommentIds.has(comment.id)));
 		this.setEditableStoryState(story, view.state);
+		if (batch.mode === "suggested") {
+			const activeSuggestionIds = new Set(getSuggestions(beforeState).map(({ suggestionId }) => suggestionId));
+			for (const { suggestionId } of getSuggestions(this.state)) activeSuggestionIds.add(suggestionId);
+			for (const entry of this.secondaryStoryStates.values()) for (const { suggestionId } of getSuggestions(entry.state)) activeSuggestionIds.add(suggestionId);
+			this.pendingSuggestions.recordApplied({
+				snapshot: sourceSnapshot,
+				story,
+				operations: batch.operations,
+				applied: result.applied,
+				author: operationAuthor,
+				activeSuggestionIds
+			});
+		}
 		if (result.undoHandle !== null) this.documentOperationUndoEntries.push({
 			undoHandle: result.undoHandle,
 			story,
@@ -926,10 +1028,15 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* one per non-empty part: `[header default] …`, `[footer default] …`,
 	* `[footnote #N] …`, `[endnote #N] …`. Lines reflect in-memory edits. Empty
 	* parts and separator notes are omitted.
+	*
+	* A header or footer is labelled with the role its section references give
+	* it (`default`, `first`, `even`); in a document with several sections, also
+	* with the sections that show it: `[header first (sections 1, 3)] …`.
 	*/
 	getNotesAsText() {
 		const pkg = this.baseDocument.package;
 		const lines = [];
+		const placements = this.headerFooterPlacements();
 		const pushHeaderFooter = (map, label) => {
 			if (!map) return;
 			for (const [relationshipId, hf] of map) {
@@ -938,7 +1045,10 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 					relationshipId
 				};
 				const text = this.getHeaderFooterStoryText(handle, hf);
-				if (text.length > 0) lines.push(`[${label} ${hf.hdrFtrType}] ${text}`);
+				if (text.length > 0) {
+					const roles = placements.byPart.get(`${label}:${relationshipId}`);
+					lines.push(`[${label} ${roles ? describePlacements(roles, placements.sectionCount) : hf.hdrFtrType}] ${text}`);
+				}
 			}
 		};
 		pushHeaderFooter(pkg.headers, "header");
@@ -1031,7 +1141,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* (nested tracked changes, hyperlinks) is out of scope.
 	*/
 	getComments(filter) {
-		const definitions = this.withResolvedOverrides([...this.baseDocument.package.document.comments ?? [], ...this.createdComments]);
+		const definitions = this.withResolvedOverrides(this.keptCommentThreads([...this.baseDocument.package.document.comments ?? [], ...this.createdComments], this.state, this.secondaryStoryStates.values()));
 		if (definitions.length === 0) return [];
 		const anchors = this.commentAnchors();
 		const repliesByParent = /* @__PURE__ */ new Map();
@@ -1054,6 +1164,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 				text: commentPlainText(comment),
 				anchoredText: anchor?.text ?? "",
 				blockId: anchor?.blockId ?? null,
+				story: anchor?.story ?? null,
 				replies: (repliesByParent.get(comment.id) ?? []).map((reply) => ({
 					id: reply.id,
 					author: reply.author,
@@ -1071,7 +1182,8 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* {@link getComments} or its id; the reply threads under that comment's root
 	* (Word threads are flat). On {@link toBuffer} the reply is written as a real
 	* Word reply — linked via `commentsExtended.xml` and given its own
-	* `commentRange` markers + reference anchored on the parent's range. Returns
+	* `commentRange` markers + reference anchored on the parent's range. The
+	* live document carries the same anchor. Returns
 	* the created reply, or `null` when the target comment is absent.
 	*/
 	replyTo(target, input) {
@@ -1085,6 +1197,10 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		if (!reply) return null;
 		this.createdComments.push(reply);
 		this.usedCommentIds.add(reply.id);
+		this.anchorReplyInEditor({
+			parentId: reply.parentId ?? parentId,
+			replyId: reply.id
+		});
 		return {
 			id: reply.id,
 			author: reply.author,
@@ -1092,6 +1208,31 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			text: input.text
 		};
 	}
+	anchorReplyInEditor({ parentId, replyId }) {
+		for (const story of this.listStoryHandlesInternal()) {
+			const state = this.getEditableStoryState(story);
+			if (!state) continue;
+			const commentMark = state.schema.marks["comment"];
+			const referenceNode = state.schema.nodes["commentReference"];
+			if (!commentMark || !referenceNode) continue;
+			let from = null;
+			let to = 0;
+			let referenceAt = null;
+			state.doc.descendants((node, pos) => {
+				if (node.type === referenceNode && node.attrs["commentId"] === parentId) referenceAt ??= pos + node.nodeSize;
+				if (node.isInline && node.marks.some((mark) => mark.type === commentMark && mark.attrs["commentId"] === parentId)) {
+					from ??= pos;
+					to = pos + node.nodeSize;
+				}
+			});
+			if (referenceAt === null || from === null || from >= to) continue;
+			let transaction = state.tr;
+			transaction = transaction.addMark(from, to, commentMark.create({ commentId: replyId }));
+			transaction = transaction.insert(referenceAt, referenceNode.create({ commentId: replyId }));
+			this.setEditableStoryState(story, state.apply(transaction));
+			return;
+		}
+	}
 	/**
 	* Mark a comment thread resolved, or reopen a previously resolved one. Pass
 	* the id from {@link getComments} / {@link FolioReviewComment.id}. Applies
@@ -1111,6 +1252,39 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		this.resolvedOverrides.set(target.id, resolved);
 		return true;
 	}
+	/**
+	* Where each header and footer part is shown, as the live section
+	* references state it: its role (`w:type`) and the 1-based section, in
+	* section order. A part's own `hdrFtrType` holds one role, and one part can
+	* serve several sections, in different roles.
+	*/
+	headerFooterPlacements() {
+		const records = [];
+		this.state.doc.descendants((node) => {
+			if (node.type.name !== "paragraph") return true;
+			const record = sectionPropertiesOf(node);
+			if (record && !records.includes(record)) records.push(record);
+			return false;
+		});
+		const final = this.currentFinalSectionProperties();
+		if (final) records.push(final);
+		const byPart = /* @__PURE__ */ new Map();
+		for (const [index, record] of records.entries()) {
+			const place = (part, type, rId) => {
+				const key = `${part}:${rId}`;
+				byPart.set(key, [...byPart.get(key) ?? [], {
+					type,
+					section: index + 1
+				}]);
+			};
+			for (const { type, rId } of record.headerReferences ?? []) place("header", type, rId);
+			for (const { type, rId } of record.footerReferences ?? []) place("footer", type, rId);
+		}
+		return {
+			byPart,
+			sectionCount: records.length
+		};
+	}
 	currentFinalSectionProperties() {
 		return this.finalSectionPropertiesOverride ?? this.baseDocument.package.document.finalSectionProperties;
 	}
@@ -1203,6 +1377,8 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	}
 	acceptChangeInternal(target) {
 		const id = revisionIdOf(target);
+		const suggestionId = suggestionIdOfRevision(this.state, id);
+		if (suggestionId !== null) this.runCommand(acceptSuggestion(suggestionId, { author: this.author }));
 		const bodyChanged = this.runCommand(acceptAIEditRevision(id));
 		const sectionChanged = this.resolveFinalSectionProperties("accept", id) > 0;
 		return bodyChanged || sectionChanged;
@@ -1216,13 +1392,40 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	}
 	rejectChangeInternal(target) {
 		const id = revisionIdOf(target);
+		const suggestionId = suggestionIdOfRevision(this.state, id);
+		if (suggestionId !== null && this.runCommand(rejectSuggestion(suggestionId))) return true;
 		const bodyChanged = this.runCommand(rejectAIEditRevision(id));
 		const sectionChanged = this.resolveFinalSectionProperties("reject", id) > 0;
 		return bodyChanged || sectionChanged;
 	}
+	/** Convert one pending suggestion into an ordinary tracked change. */
+	acceptSuggestion(suggestionId, options) {
+		return this.resolveWithSectionReferenceHistory(() => {
+			let accepted = false;
+			for (const handle of this.listStoryHandlesInternal()) {
+				const state = this.getEditableStoryState(handle);
+				if (!state || !getSuggestions(state).some((entry) => entry.suggestionId === suggestionId)) continue;
+				accepted = this.runStoryCommand(acceptSuggestion(suggestionId, { author: options?.author ?? this.author }), handle) || accepted;
+			}
+			return accepted;
+		});
+	}
+	/** Remove one pending suggestion without applying it. */
+	rejectSuggestion(suggestionId) {
+		return this.resolveWithSectionReferenceHistory(() => {
+			let rejected = false;
+			for (const handle of this.listStoryHandlesInternal()) {
+				const state = this.getEditableStoryState(handle);
+				if (!state || !getSuggestions(state).some((entry) => entry.suggestionId === suggestionId)) continue;
+				rejected = this.runStoryCommand(rejectSuggestion(suggestionId), handle) || rejected;
+			}
+			return rejected;
+		});
+	}
 	/**
-	* Accept every tracked change in the package. Returns the number of changes
-	* present before the sweep.
+	* Accept every ordinary tracked change in the package. Pending suggestions
+	* remain staged until {@link acceptSuggestion} is called. Returns the number
+	* of ordinary changes present before the sweep.
 	*
 	* Every story, not just the body: a revision in a header or a footnote is
 	* one a reviewer meant to resolve, and leaving it behind means an accepted
@@ -1271,17 +1474,89 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	}
 	resolveEveryStory(mode) {
 		let count = 0;
-		for (const { handle } of this.listStories()) {
+		const resolvedStories = [];
+		const refreshes = [];
+		for (const handle of this.listStoryHandlesInternal()) {
 			const state = this.getEditableStoryState(handle);
 			if (!state) continue;
-			count += getTrackedChangesFromDoc(state.doc).length;
-			this.setEditableStoryState(handle, resolveAllChangesInHeadlessState(state, mode));
+			const ordinaryCount = getTrackedChangesFromDoc(state.doc).filter(({ id }) => mode === "reject" || suggestionIdOfRevision(state, id) === null).length;
+			count += ordinaryCount;
+			const withSuggestions = mode === "accept" && ordinaryCount > 0 && getSuggestions(state).length > 0 ? this.acceptOrdinaryChangesWithSuggestions(state, handle) : null;
+			if (withSuggestions) refreshes.push(withSuggestions.refresh);
+			let resolvedState = state;
+			if (mode === "reject") resolvedState = resolveAllChangesInHeadlessState(rejectSuggestions(state), mode);
+			else if (ordinaryCount > 0) resolvedState = withSuggestions?.state ?? resolveAllChangesInHeadlessState(state, mode);
+			resolvedStories.push({
+				handle,
+				state: resolvedState
+			});
+		}
+		for (const { handle, state } of resolvedStories) this.setEditableStoryState(handle, state);
+		if (refreshes.length > 0) {
+			const activeSuggestionIds = new Set(getSuggestions(this.state).map(({ suggestionId }) => suggestionId));
+			for (const entry of this.secondaryStoryStates.values()) for (const { suggestionId } of getSuggestions(entry.state)) activeSuggestionIds.add(suggestionId);
+			for (const refresh of refreshes) refresh(activeSuggestionIds);
 		}
 		return count;
 	}
+	acceptOrdinaryChangesWithSuggestions(state, story) {
+		const originalSuggestions = getSuggestions(state);
+		const records = this.exportPendingSuggestions().filter((record) => editableStoryKey(record.story) === editableStoryKey(story));
+		const recordedIds = new Set(records.map(({ suggestionId }) => suggestionId));
+		if (originalSuggestions.some(({ suggestionId }) => !recordedIds.has(suggestionId))) panic("A pending suggestion has no operation to restage after bulk acceptance");
+		let clean = rejectSuggestions(state);
+		const restagedCommentIds = new Set(records.flatMap(({ commentId }) => commentId === void 0 ? [] : [commentId]));
+		clean = withoutPendingSuggestionCommentMarks(clean, restagedCommentIds);
+		let resolved = resolveAllChangesInHeadlessState(clean, "accept");
+		const restaged = [];
+		for (const record of records) {
+			const snapshot = createStateSnapshot(resolved);
+			const view = {
+				state: resolved,
+				dispatch: (transaction) => {
+					view.state = view.state.apply(transaction);
+				}
+			};
+			const applied = applyFolioDocumentOperations({
+				view,
+				snapshot,
+				batch: {
+					version: 1,
+					mode: "suggested",
+					operations: [record.operation]
+				},
+				story: story.type === "main" ? "main" : story,
+				author: record.author,
+				createCommentId: () => {
+					if (record.commentId === void 0) panic("A staged comment suggestion has no comment id", { suggestionId: record.suggestionId });
+					return record.commentId;
+				}
+			}).applied.find(({ id }) => id === record.operation.id);
+			if (!applied) continue;
+			restaged.push({
+				snapshot,
+				operation: record.operation,
+				applied,
+				author: record.author
+			});
+			resolved = view.state;
+		}
+		const restagedIds = new Set(getSuggestions(resolved).map(({ suggestionId }) => suggestionId));
+		if (restaged.some(({ applied }) => !restagedIds.has(applied.suggestionId ?? applied.id))) panic("Bulk acceptance lost a pending suggestion");
+		return {
+			state: resolved,
+			refresh: (activeSuggestionIds) => this.pendingSuggestions.replaceRestagedStory({
+				story,
+				restaged,
+				activeSuggestionIds
+			})
+		};
+	}
 	/** The current document model with edits merged back in. */
 	toDocument() {
-		return this.documentFromStateSnapshot(this.captureReviewerState());
+		const document = this.documentFromStateSnapshot(this.captureReviewerState());
+		applyReplyThreadMarkers(document);
+		return document;
 	}
 	captureReviewerState() {
 		const secondaryStoryStates = [];
@@ -1326,11 +1601,14 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			document.package.footers.delete(handle.relationshipId);
 		}
 		this.mergeEditedSecondaryStories(document, snapshot.secondaryStoryStates);
-		if (snapshot.createdComments.length > 0 || snapshot.resolvedOverrides.size > 0) document.package.document.comments = this.withResolvedOverrides([...document.package.document.comments ?? [], ...snapshot.createdComments], snapshot.resolvedOverrides);
+		const definitions = [...document.package.document.comments ?? [], ...snapshot.createdComments];
+		const kept = this.keptCommentThreads(definitions, snapshot.mainState, snapshot.secondaryStoryStates);
+		if (kept.length !== definitions.length || snapshot.createdComments.length > 0 || snapshot.resolvedOverrides.size > 0) document.package.document.comments = this.withResolvedOverrides(kept, snapshot.resolvedOverrides);
 		return document;
 	}
 	captureSaveSnapshot() {
 		const snapshot = this.captureReviewerState();
+		const pendingCommentIds = new Set(this.exportPendingSuggestions().flatMap(({ commentId }) => commentId === void 0 ? [] : [commentId]));
 		const changedParaIds = new Set(getChangedParagraphIds(snapshot.mainState));
 		let structuralChange = hasStructuralChanges(snapshot.mainState) || snapshot.finalSectionPropertiesOverride !== void 0 || snapshot.importedStyles !== void 0 || snapshot.importedHeaders.size > 0 || snapshot.importedFooters.size > 0;
 		let untrackedChanges = hasUntrackedChanges(snapshot.mainState);
@@ -1357,7 +1635,15 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			reason: "untrackedChange"
 		};
 		return {
-			document: this.documentFromStateSnapshot(snapshot),
+			document: this.documentFromStateSnapshot({
+				...snapshot,
+				mainState: withoutPendingSuggestionCommentMarks(rejectSuggestions(snapshot.mainState), pendingCommentIds),
+				secondaryStoryStates: snapshot.secondaryStoryStates.map((entry) => ({
+					...entry,
+					state: withoutPendingSuggestionCommentMarks(rejectSuggestions(entry.state), pendingCommentIds)
+				})),
+				createdComments: snapshot.createdComments.filter(({ id }) => !pendingCommentIds.has(id))
+			}),
 			path,
 			changedNoteParaIds,
 			sectionReferenceRemovals: snapshot.sectionReferenceRemovals,
@@ -1469,16 +1755,11 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const key = secondaryStoryKey(story);
 		const existing = this.secondaryStoryStates.get(key);
 		if (existing) return existing.state;
-		const source = story.type === "header" || story.type === "footer" ? this.getHeaderFooterStory(story) : this.getNoteStory(story);
-		if (!source) return null;
-		const conversionOptions = {
-			...this.baseDocument.package.styles !== void 0 && { styles: this.baseDocument.package.styles },
-			...this.baseDocument.package.theme !== void 0 && { theme: this.baseDocument.package.theme }
-		};
-		const storyDoc = story.type === "header" || story.type === "footer" ? headerFooterToProseDoc(source.content, conversionOptions) : footnoteToProseDoc(source.content, conversionOptions);
+		const doc = this.secondaryStoryDoc(story);
+		if (!doc) return null;
 		const state = ensureBaseDirectionInState(EditorState.create({
 			schema,
-			doc: ensureDeterministicParaIdsInDoc(storyDoc),
+			doc,
 			plugins: createHeadlessPlugins(this.baseDocument.package.styles, this.baseDocument.package.numbering)
 		}));
 		this.secondaryStoryStates.set(key, {
@@ -1488,6 +1769,25 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		});
 		return state;
 	}
+	/**
+	* A secondary story as its editable state holds it: the loaded state's
+	* document once an operation has loaded it, otherwise the conversion loading
+	* performs — with the same deterministic block ids — without retaining a
+	* state for a story nothing edits.
+	*/
+	readSecondaryStoryDoc(story) {
+		return this.secondaryStoryStates.get(secondaryStoryKey(story))?.state.doc ?? this.secondaryStoryDoc(story);
+	}
+	secondaryStoryDoc(story) {
+		const source = story.type === "header" || story.type === "footer" ? this.getHeaderFooterStory(story) : this.getNoteStory(story);
+		if (!source) return null;
+		const conversionOptions = {
+			...this.baseDocument.package.styles !== void 0 && { styles: this.baseDocument.package.styles },
+			...this.baseDocument.package.theme !== void 0 && { theme: this.baseDocument.package.theme }
+		};
+		const storyDoc = story.type === "header" || story.type === "footer" ? headerFooterToProseDoc(source.content, conversionOptions) : footnoteToProseDoc(source.content, conversionOptions);
+		return ensureDeterministicParaIdsInDoc(storyDoc);
+	}
 	requireEditableStoryState(story) {
 		const state = this.getEditableStoryState(story);
 		if (state) return state;
@@ -1650,12 +1950,14 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		let endnotes;
 		for (const entry of secondaryStoryStates) {
 			if (entry.state === entry.initialState) continue;
+			const lists = storyListNumbering(entry.state, document.package.numbering);
+			if (lists.numbering) document.package.numbering = lists.numbering;
 			if (entry.handle.type === "header" || entry.handle.type === "footer") {
 				const source = entry.handle.type === "header" ? document.package.headers?.get(entry.handle.relationshipId) : document.package.footers?.get(entry.handle.relationshipId);
 				if (!source) continue;
 				const edited = {
 					...source,
-					content: proseDocToBlocks(entry.state.doc, source.content, document.package.styles)
+					content: proseDocToBlocks(lists.doc, source.content, document.package.styles)
 				};
 				if (entry.handle.type === "header") {
 					headers ??= new Map(document.package.headers);
@@ -1672,7 +1974,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 				if (!source) continue;
 				const edited = {
 					...source,
-					content: proseDocToBlocks(entry.state.doc, source.content, document.package.styles)
+					content: proseDocToBlocks(lists.doc, source.content, document.package.styles)
 				};
 				footnotes ??= [...document.package.footnotes ?? []];
 				const index = footnotes.findIndex((note) => note.id === noteId);
@@ -1684,7 +1986,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			if (!source) continue;
 			const edited = {
 				...source,
-				content: proseDocToBlocks(entry.state.doc, source.content, document.package.styles)
+				content: proseDocToBlocks(lists.doc, source.content, document.package.styles)
 			};
 			endnotes ??= [...document.package.endnotes ?? []];
 			const index = endnotes.findIndex((note) => note.id === noteId);
@@ -1706,13 +2008,51 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			};
 		});
 	}
-	/** Map each anchored comment id to its anchored text and containing block id. */
+	/**
+	* `comments` without the threads an edit left anchored nowhere: anchored in
+	* a story when it was loaded (or created anchored by this reviewer), and
+	* anchored in no story now. See `comment-lifecycle.ts`.
+	*/
+	keptCommentThreads(comments, mainState, secondaryStoryStates) {
+		const anchoredBefore = new Set(this.loadedMainCommentIds);
+		for (const { id } of this.createdComments) anchoredBefore.add(id);
+		const anchoredNow = anchoredCommentIdsInProseDoc(mainState.doc);
+		const loaded = /* @__PURE__ */ new Map();
+		for (const entry of secondaryStoryStates) loaded.set(secondaryStoryKey(entry.handle), entry);
+		const addAll = (target, ids) => {
+			for (const id of ids) target.add(id);
+		};
+		for (const handle of this.listStoryHandlesInternal()) {
+			if (handle.type === "main") continue;
+			const entry = loaded.get(secondaryStoryKey(handle));
+			if (entry) {
+				addAll(anchoredBefore, anchoredCommentIdsInProseDoc(entry.initialState.doc));
+				addAll(anchoredNow, anchoredCommentIdsInProseDoc(entry.state.doc));
+				continue;
+			}
+			addAll(anchoredNow, anchoredCommentIdsInBlocks((handle.type === "header" || handle.type === "footer" ? this.getHeaderFooterStory(handle) : this.getNoteStory(handle))?.content ?? []));
+		}
+		return withoutLostCommentThreads(comments, {
+			anchoredBefore,
+			anchoredNow
+		});
+	}
+	/**
+	* Map each anchored comment id to its anchored text, its containing block id
+	* and the story holding it. A comment can be anchored in any story, so every
+	* story is read, not only the body.
+	*/
 	commentAnchors() {
 		const anchors = /* @__PURE__ */ new Map();
-		for (const anchor of getCommentAnchorsFromDoc(this.state.doc)) anchors.set(anchor.commentId, {
-			text: anchor.quote,
-			blockId: anchor.blockId
-		});
+		for (const story of this.listStoryHandlesInternal()) {
+			const doc = story.type === "main" ? this.state.doc : this.readSecondaryStoryDoc(story);
+			if (!doc) continue;
+			for (const anchor of getCommentAnchorsFromDoc(doc)) if (!anchors.has(anchor.commentId)) anchors.set(anchor.commentId, {
+				text: anchor.quote,
+				blockId: anchor.blockId,
+				story
+			});
+		}
 		return anchors;
 	}
 	/** Allocate outside every parsed or newly-created comment and reply id. */