@stll/folio-core 0.35.1 → 0.37.0

package/dist/ai-edits/block-identity.d.ts

@@ -1,4 +1,7 @@
+import { FolioAIBlock } from "./types.js";
 //#region src/ai-edits/block-identity.d.ts
+/** Resolve explicit snapshot provenance, falling back to the legacy id-shape convention. */
+declare const folioAIBlockIdStability: ({ id, idStability }: FolioAIBlock) => "stable" | "positional";
 declare const stripBlockIdentityAttrs: (attrs: Record<string, unknown>) => Record<string, unknown>;
 //#endregion
-export { stripBlockIdentityAttrs };
+export { folioAIBlockIdStability, stripBlockIdentityAttrs };

package/dist/ai-edits/block-identity.js

@@ -1,9 +1,12 @@
+import { getFolioParaIdFromBlockId } from "../types/block-id.js";
 //#region src/ai-edits/block-identity.ts
 const IDENTITY_BLOCK_ATTRS = /* @__PURE__ */ new Set(["paraId", "textId"]);
+/** Resolve explicit snapshot provenance, falling back to the legacy id-shape convention. */
+const folioAIBlockIdStability = ({ id, idStability }) => idStability ?? (getFolioParaIdFromBlockId(id) === null ? "positional" : "stable");
 const stripBlockIdentityAttrs = (attrs) => {
 	const next = {};
 	for (const [key, value] of Object.entries(attrs)) next[key] = IDENTITY_BLOCK_ATTRS.has(key) ? null : value;
 	return next;
 };
 //#endregion
-export { stripBlockIdentityAttrs };
+export { folioAIBlockIdStability, stripBlockIdentityAttrs };

package/dist/ai-edits/blockRange.js

@@ -1,6 +1,6 @@
 import { findParagraphByParaId } from "../prosemirror/utils/findParagraphByParaId.js";
 import { getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex } from "../types/block-id.js";
-import { buildCleanBlockText } from "./clean-text.js";
+import { buildCleanBlockText, resolveCleanTextRange } from "./clean-text.js";
 import { createFolioAIEditSnapshot, hashFolioAIBlockText, isFolioAIContentBlock } from "./snapshot.js";
 //#region src/ai-edits/blockRange.ts
 const resolveFolioAIBlockRange = ({ blockId, doc, snapshot }) => {
@@ -28,14 +28,14 @@ const resolveFolioAITextRange = ({ range, doc, snapshot }) => {
 	const blockNode = doc.nodeAt(blockRange.from);
 	if (!blockNode?.isTextblock) return null;
 	const cleanBlock = buildCleanBlockText(blockNode, blockRange.from);
-	const from = cleanBlock.offsets[range.startOffset];
-	const to = cleanBlock.offsets[range.endOffset];
-	if (from === void 0 || to === void 0) return null;
-	if (hashFolioAIBlockText(cleanBlock.text.slice(range.startOffset, range.endOffset)) !== range.selectedTextHash) return null;
-	return clampRangeToDocSize(doc.content.size, {
-		from,
-		to
+	const resolved = resolveCleanTextRange({
+		cleanBlock,
+		startOffset: range.startOffset,
+		endOffset: range.endOffset
 	});
+	if (resolved === null) return null;
+	if (hashFolioAIBlockText(cleanBlock.text.slice(range.startOffset, range.endOffset)) !== range.selectedTextHash) return null;
+	return clampRangeToDocSize(doc.content.size, resolved);
 };
 /**
 * Resolve a free-text passage inside a block to a `{ from, to }` PM range.
@@ -66,13 +66,13 @@ const resolvePassageRange = ({ blockId, text, doc, snapshot }) => {
 	const cleanBlock = buildCleanBlockText(blockNode, blockRange.from);
 	const match = matchPassage(cleanBlock.text, needleSource);
 	if (match === null) return null;
-	const from = cleanBlock.offsets[match.start];
-	const to = cleanBlock.offsets[match.end];
-	if (from === void 0 || to === void 0) return null;
-	return clampRangeToDocSize(doc.content.size, {
-		from,
-		to
+	const resolved = resolveCleanTextRange({
+		cleanBlock,
+		startOffset: match.start,
+		endOffset: match.end
 	});
+	if (resolved === null) return null;
+	return clampRangeToDocSize(doc.content.size, resolved);
 };
 /**
 * Turn a caller-supplied passage into a regex source that tolerates whitespace

package/dist/ai-edits/clean-text.d.ts

@@ -1,3 +1,4 @@
+import { PageBreakRunAttrs } from "../prosemirror/schema/nodes.js";
 import { Node } from "prosemirror-model";
 //#region src/ai-edits/clean-text.d.ts
 /**
@@ -21,7 +22,45 @@ import { Node } from "prosemirror-model";
 type CleanBlockText = {
   text: string;
   offsets: number[];
+  /**
+   * Zero-width structural carriers projected at their clean-text boundary.
+   *
+   * A single clean offset cannot identify both sides of an atom: the PM
+   * position immediately after the preceding character is before the atom,
+   * while the next character starts after it. Callers that select text must
+   * resolve through {@link resolveCleanTextRange}; indexing `offsets`
+   * directly can accidentally absorb the carrier into an adjacent range.
+   */
+  structuralBoundaries: readonly CleanTextStructuralBoundary[];
 };
+type CleanTextStructuralBoundary = {
+  type: "pageBreakRun";
+  /** Clean-text offset at which the zero-width carrier occurs. */
+  offset: number;
+  /** PM range owned by the carrier. */
+  from: number;
+  to: number;
+  /** Preserved even though `clear` does not alter page-break layout. */
+  clear?: PageBreakRunAttrs["clear"];
+  /** Whether the post-tracked-changes projection retains this carrier. */
+  presentInCleanView: boolean;
+};
+type ResolveCleanTextRangeOptions = {
+  cleanBlock: CleanBlockText;
+  startOffset: number;
+  endOffset: number;
+};
+/**
+ * Resolve clean-text offsets without selecting a zero-width structural atom.
+ *
+ * A range wholly on one side of a boundary is biased away from the atom. A
+ * range spanning both sides is unrepresentable as a generic text selection
+ * and returns `null`; a structural operation must own that mutation instead.
+ */
+declare const resolveCleanTextRange: ({ cleanBlock, startOffset, endOffset }: ResolveCleanTextRangeOptions) => {
+  from: number;
+  to: number;
+} | null;
 declare const buildCleanBlockText: (blockNode: Node, blockFrom: number) => CleanBlockText;
 /**
  * A "redline-aware" view of a textblock: the same left-to-right traversal as
@@ -44,4 +83,4 @@ declare const buildCleanBlockText: (blockNode: Node, blockFrom: number) => Clean
  */
 declare const buildAnnotatedBlockText: (blockNode: Node) => string;
 //#endregion
-export { CleanBlockText, buildAnnotatedBlockText, buildCleanBlockText };
+export { CleanBlockText, CleanTextStructuralBoundary, buildAnnotatedBlockText, buildCleanBlockText, resolveCleanTextRange };

package/dist/ai-edits/clean-text.js

@@ -1,4 +1,39 @@
+import { expectPageBreakRunAttrs } from "../prosemirror/attrs/index.js";
 //#region src/ai-edits/clean-text.ts
+const EMPTY_CLEAN_TEXT_STRUCTURAL_BOUNDARIES = Object.freeze([]);
+/**
+* Resolve clean-text offsets without selecting a zero-width structural atom.
+*
+* A range wholly on one side of a boundary is biased away from the atom. A
+* range spanning both sides is unrepresentable as a generic text selection
+* and returns `null`; a structural operation must own that mutation instead.
+*/
+const resolveCleanTextRange = ({ cleanBlock, startOffset, endOffset }) => {
+	if (!Number.isInteger(startOffset) || !Number.isInteger(endOffset) || startOffset < 0 || endOffset < startOffset || endOffset > cleanBlock.text.length) return null;
+	const baseFrom = cleanBlock.offsets[startOffset];
+	const baseTo = cleanBlock.offsets[endOffset];
+	if (baseFrom === void 0 || baseTo === void 0) return null;
+	const { structuralBoundaries } = cleanBlock;
+	if (structuralBoundaries.length === 0) return baseFrom <= baseTo ? {
+		from: baseFrom,
+		to: baseTo
+	} : null;
+	let from = baseFrom;
+	let to = baseTo;
+	for (const boundary of structuralBoundaries) {
+		if (boundary.offset > startOffset && boundary.offset < endOffset) return null;
+		if (boundary.offset === startOffset) from = Math.max(from, boundary.to);
+		if (startOffset !== endOffset && boundary.offset === endOffset) to = Math.min(to, boundary.from);
+	}
+	if (startOffset === endOffset) return {
+		from,
+		to: from
+	};
+	return from <= to ? {
+		from,
+		to
+	} : null;
+};
 const DELETION_MARK = "deletion";
 const INSERTION_MARK = "insertion";
 const COMMENT_MARK = "comment";
@@ -6,8 +41,22 @@ const HIDDEN_MARK = "hidden";
 const buildCleanBlockText = (blockNode, blockFrom) => {
 	let text = "";
 	const offsets = [];
+	let structuralBoundaries;
 	let lastEnd = blockFrom + 1;
 	blockNode.descendants((node, pos) => {
+		if (node.type.name === "pageBreakRun") {
+			const from = blockFrom + 1 + pos;
+			const { clear } = expectPageBreakRunAttrs(node);
+			(structuralBoundaries ??= []).push({
+				type: "pageBreakRun",
+				offset: text.length,
+				from,
+				to: from + node.nodeSize,
+				...clear !== void 0 ? { clear } : {},
+				presentInCleanView: !node.marks.some(({ type }) => type.name === DELETION_MARK)
+			});
+			return false;
+		}
 		if (!node.isText || node.text === void 0) return true;
 		if (node.marks.some((mark) => mark.type.name === DELETION_MARK || mark.type.name === HIDDEN_MARK)) return false;
 		const startPos = blockFrom + 1 + pos;
@@ -19,7 +68,8 @@ const buildCleanBlockText = (blockNode, blockFrom) => {
 	offsets.push(lastEnd);
 	return {
 		text,
-		offsets
+		offsets,
+		structuralBoundaries: structuralBoundaries ?? EMPTY_CLEAN_TEXT_STRUCTURAL_BOUNDARIES
 	};
 };
 /**
@@ -89,4 +139,4 @@ const renderAnnotatedSegment = ({ annotation, text }) => {
 	return inner;
 };
 //#endregion
-export { buildAnnotatedBlockText, buildCleanBlockText };
+export { buildAnnotatedBlockText, buildCleanBlockText, resolveCleanTextRange };

package/dist/ai-edits/headless.d.ts

@@ -361,6 +361,9 @@ declare class FolioDocxReviewer {
   private resolveEveryStory;
   /** The current document model with edits merged back in. */
   toDocument(): document_d_exports.Document;
+  private captureReviewerState;
+  private documentFromStateSnapshot;
+  private captureSaveSnapshot;
   /**
    * Serialise the reviewed document to a new `.docx` buffer. Tries a selective
    * patch first (only changed paragraphs are rewritten; every other byte of the
@@ -369,7 +372,6 @@ declare class FolioDocxReviewer {
    */
   toBuffer(): Promise<ArrayBuffer>;
   private assertResolvedStoriesSerialized;
-  private getChangedNoteParaIds;
   /**
    * Attempt the selective patch, treating a throw the same as a decline. Odd
    * source XML can make the paragraph diff throw rather than return `null`; a

package/dist/ai-edits/headless.js

@@ -1,20 +1,25 @@
 import { applyFolioDocumentOperations } from "../document-operations.js";
 import { getEndnoteText, getFootnoteText, isSeparatorEndnote, isSeparatorFootnote } from "../docx/footnoteParser.js";
 import { getHeaderFooterText } from "../docx/headerFooterParser.js";
+import { recreateProseNodeWithParagraphPropertySource, transferProseParagraphPropertySource } from "../docx/paragraphPropertySource.js";
 import { parseDocx } from "../docx/parser.js";
 import { createReply } from "../docx/replyToComment.js";
 import { repackDocx } from "../docx/rezip.js";
 import { attemptSelectiveSave } from "../docx/selectiveSave.js";
-import { acceptAIEditRevision, acceptAllChanges, rejectAIEditRevision, rejectAllChanges } from "../prosemirror/commands/comments.js";
+import { pluginsForHeadlessRevisionResolution } from "../internal/headlessRevisionResolutionGuard.js";
+import { withTrackedSectionEndpointRemoval } from "../internal/sectionEndpointResolution.js";
+import { acceptAIEditRevision, rejectAIEditRevision, resolveAllChangesInHeadlessState } from "../prosemirror/commands/comments.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, hasStructuralChanges, hasUntrackedChanges } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
+import { getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
+import { createDocumentNumberingPlugin } from "../prosemirror/plugins/documentNumbering.js";
+import { createDocumentStylesPlugin, getDocumentStyleResolver } from "../prosemirror/plugins/documentStyles.js";
 import { schema, singletonManager } from "../prosemirror/schema/index.js";
 import { deterministicHexId } from "../utils/hexId.js";
 import { buildAnnotatedBlockText } from "./clean-text.js";
 import { getCommentAnchorsFromDoc, getTrackedChangesFromDoc } from "./read.js";
-import { createFolioAIEditSnapshot, folioStoryTables, isFolioAIContentBlock, normalizeFolioAIBlockText } from "./snapshot.js";
+import { createFolioAIEditSnapshotWithStyleResolver, folioStoryTables, isFolioAIContentBlock, normalizeFolioAIBlockText } from "./snapshot.js";
 import { matchTableGeometry } from "./table-geometry.js";
 import { TaggedError } from "better-result";
 import { Fragment } from "prosemirror-model";
@@ -109,14 +114,17 @@ const ensureDeterministicParaIdsInDoc = (doc) => {
 					let paraId = deterministicHexId(`${child.textContent}:${ordinal}`);
 					for (let salt = 1; seen.has(paraId); salt++) paraId = deterministicHexId(`${child.textContent}:${ordinal}:${salt}`);
 					seen.add(paraId);
-					next = child.type.create({
+					next = recreateProseNodeWithParagraphPropertySource(child, { attrs: {
 						...child.attrs,
-						paraId
-					}, child.content, child.marks);
+						paraId,
+						idStability: "positional"
+					} });
 				}
+				const paraId = next.attrs["paraId"];
+				if (typeof paraId === "string") transferProseParagraphPropertySource(next, child, paraId);
 			} else if (child.childCount > 0) {
 				const content = rewrite(child);
-				if (content !== child.content) next = child.copy(content);
+				if (content !== child.content) next = recreateProseNodeWithParagraphPropertySource(child, { content });
 			}
 			if (next !== child) changed = true;
 			children.push(next);
@@ -124,7 +132,7 @@ const ensureDeterministicParaIdsInDoc = (doc) => {
 		return changed ? Fragment.fromArray(children) : parent.content;
 	};
 	const content = rewrite(doc);
-	return content === doc.content ? doc : doc.copy(content);
+	return content === doc.content ? doc : recreateProseNodeWithParagraphPropertySource(doc, { content });
 };
 const FOLIO_REVIEWED_VIEWS = Object.freeze([
 	"original",
@@ -134,7 +142,24 @@ const FOLIO_REVIEWED_VIEWS = Object.freeze([
 const FOLIO_RESOLVED_REVIEWED_VIEWS = Object.freeze(["original", "final"]);
 var UnsupportedFolioReviewedViewError = class extends TaggedError("UnsupportedFolioReviewedViewError") {};
 var FolioDocumentStoryNotFoundError = class extends TaggedError("FolioDocumentStoryNotFoundError") {};
+const FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES = Object.freeze({
+	storyMissing: "story-missing",
+	revisionMarkupRemains: "revision-markup-remains",
+	textProjection: "text-projection",
+	blockProjection: "block-projection"
+});
 var FolioResolvedStorySerializationError = class extends TaggedError("FolioResolvedStorySerializationError") {};
+/**
+* `idStability` records how an id entered the current snapshot. A synthesized
+* paraId is positional until save writes it into the package, then becomes an
+* authored stable id when reopened. Compare the persisted block projection
+* without changing that live snapshot identity contract.
+*/
+const resolvedStoryBlockProjection = (block) => {
+	const persisted = { ...block };
+	delete persisted.idStability;
+	return persisted;
+};
 const MAIN_STORY = Object.freeze({ type: "main" });
 const headerFooterStoryKey = ({ type, relationshipId }) => `${type}:${relationshipId}`;
 const noteStoryKey = ({ type, noteId }) => `${type}:${noteId}`;
@@ -142,19 +167,18 @@ const secondaryStoryKey = (story) => story.type === "header" || story.type === "
 const editableStoryKey = (story) => story.type === "main" ? "main" : secondaryStoryKey(story);
 const isFolioReviewedView = (value) => FOLIO_REVIEWED_VIEWS.some((view) => view === value);
 const isFolioResolvedReviewedView = (value) => FOLIO_RESOLVED_REVIEWED_VIEWS.some((view) => view === value);
-const applyCommandToState = (state, command) => {
-	let nextState = state;
-	command(state, (transaction) => {
-		nextState = nextState.apply(transaction);
-	});
-	return nextState;
-};
 const resolveReviewedState = (state, view) => {
 	if (view === "current-markup") return state;
-	return applyCommandToState(state, view === "original" ? rejectAllChanges() : acceptAllChanges());
+	return resolveAllChangesInHeadlessState(state, view === "original" ? "reject" : "accept");
 };
+const createHeadlessPlugins = (styles, numbering) => [
+	...pluginsForHeadlessRevisionResolution(singletonManager.getPlugins()),
+	createDocumentStylesPlugin(styles),
+	createDocumentNumberingPlugin(numbering)
+];
+const createStateSnapshot = (state) => createFolioAIEditSnapshotWithStyleResolver(state.doc, getDocumentStyleResolver(state));
 const formatStoryStateForLLM = (state, annotated) => {
-	const snapshot = createFolioAIEditSnapshot(state.doc);
+	const snapshot = createStateSnapshot(state);
 	const blocks = snapshot.blocks.filter(isFolioAIContentBlock);
 	if (!annotated) return blocks.map(formatBlockForLLM).join("\n");
 	const nodeByStart = /* @__PURE__ */ new Map();
@@ -248,7 +272,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			preloadFonts: false,
 			password: options.password
 		});
-		const plugins = singletonManager.getPlugins();
+		const plugins = createHeadlessPlugins(baseDocument.package.styles, baseDocument.package.numbering);
 		const state = ensureBaseDirectionInState(EditorState.create({
 			schema,
 			doc: ensureDeterministicParaIdsInDoc(toProseDoc(baseDocument)),
@@ -266,7 +290,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* the anchor map the apply layer resolves operations against.
 	*/
 	snapshot() {
-		return createFolioAIEditSnapshot(this.state.doc);
+		return createStateSnapshot(this.state);
 	}
 	/**
 	* The package's numbering, flattened to what a reader sees: one entry per
@@ -313,7 +337,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	/** Snapshot one editable story into stable, operation-ready blocks. */
 	snapshotStory(story) {
 		const state = this.getEditableStoryState(story);
-		return state ? createFolioAIEditSnapshot(state.doc) : null;
+		return state ? createStateSnapshot(state) : null;
 	}
 	/**
 	* One story's tables, in the document order {@link snapshotStory} numbers
@@ -376,7 +400,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		return {
 			story,
 			view,
-			snapshot: createFolioAIEditSnapshot(state.doc),
+			snapshot: createStateSnapshot(state),
 			text: formatStoryStateForLLM(state, view === "current-markup"),
 			changes: getTrackedChangesFromDoc(state.doc)
 		};
@@ -394,7 +418,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		this.resolvedStoryExpectations.set(editableStoryKey(story), {
 			story,
 			text: formatStoryStateForLLM(resolvedState, false),
-			blocks: createFolioAIEditSnapshot(resolvedState.doc).blocks
+			blocks: createStateSnapshot(resolvedState).blocks.map(resolvedStoryBlockProjection)
 		});
 		return true;
 	}
@@ -413,6 +437,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			},
 			...options.snapshot !== void 0 && { snapshot: options.snapshot },
 			...options.revisionStamp !== void 0 && { revisionStamp: options.revisionStamp },
+			...options.wordDiff !== void 0 && { wordDiff: options.wordDiff },
 			createUndoEntry: false
 		});
 		return {
@@ -432,6 +457,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			batch,
 			...options.snapshot !== void 0 && { snapshot: options.snapshot },
 			...options.revisionStamp !== void 0 && { revisionStamp: options.revisionStamp },
+			...options.wordDiff !== void 0 && { wordDiff: options.wordDiff },
 			createUndoEntry: true
 		});
 	}
@@ -458,7 +484,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		};
 		const result = applyFolioDocumentOperations({
 			view,
-			snapshot: snapshot ?? createFolioAIEditSnapshot(beforeState.doc),
+			snapshot: snapshot ?? createStateSnapshot(beforeState),
 			batch,
 			story: story.type === "main" ? "main" : story,
 			author: this.author,
@@ -524,7 +550,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* feed straight back into {@link applyOperations} and accept / reject.
 	*/
 	getContent() {
-		return this.snapshot().blocks;
+		return [...this.snapshot().blocks];
 	}
 	/**
 	* The body as LLM-ready plain text: one line per block, each prefixed with
@@ -761,29 +787,73 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* document still carries a redline nobody can see from the body.
 	*/
 	acceptAll() {
-		return this.resolveEveryStory(acceptAllChanges());
+		return this.resolveEveryStory("accept");
 	}
 	/** Reject every tracked change in the package. See {@link acceptAll}. */
 	rejectAll() {
-		return this.resolveEveryStory(rejectAllChanges());
+		return this.resolveEveryStory("reject");
 	}
-	resolveEveryStory(command) {
+	resolveEveryStory(mode) {
 		let count = 0;
 		for (const { handle } of this.listStories()) {
 			const state = this.getEditableStoryState(handle);
 			if (!state) continue;
 			count += getTrackedChangesFromDoc(state.doc).length;
-			this.runStoryCommand(command, handle);
+			this.setEditableStoryState(handle, resolveAllChangesInHeadlessState(state, mode));
 		}
 		return count;
 	}
 	/** The current document model with edits merged back in. */
 	toDocument() {
-		const document = updateDocumentContent(this.baseDocument, this.state.doc);
-		this.mergeEditedSecondaryStories(document);
-		if (this.createdComments.length > 0 || this.resolvedOverrides.size > 0) document.package.document.comments = this.withResolvedOverrides([...document.package.document.comments ?? [], ...this.createdComments]);
+		return this.documentFromStateSnapshot(this.captureReviewerState());
+	}
+	captureReviewerState() {
+		const secondaryStoryStates = [];
+		for (const { handle, initialState, state } of this.secondaryStoryStates.values()) secondaryStoryStates.push({
+			handle,
+			initialState,
+			state
+		});
+		return {
+			mainState: this.state,
+			secondaryStoryStates,
+			createdComments: [...this.createdComments],
+			resolvedOverrides: new Map(this.resolvedOverrides),
+			resolvedStoryExpectations: [...this.resolvedStoryExpectations.values()]
+		};
+	}
+	documentFromStateSnapshot(snapshot) {
+		const document = updateDocumentContent(this.baseDocument, snapshot.mainState.doc);
+		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);
 		return document;
 	}
+	captureSaveSnapshot() {
+		const snapshot = this.captureReviewerState();
+		const changedParaIds = new Set(getChangedParagraphIds(snapshot.mainState));
+		let structuralChange = hasStructuralChanges(snapshot.mainState);
+		let untrackedChanges = hasUntrackedChanges(snapshot.mainState);
+		const changedNoteParaIds = /* @__PURE__ */ new Set();
+		for (const entry of snapshot.secondaryStoryStates) {
+			if (entry.handle.type !== "footnote" && entry.handle.type !== "endnote") continue;
+			for (const paraId of getChangedParagraphIds(entry.state)) {
+				changedParaIds.add(paraId);
+				changedNoteParaIds.add(paraId);
+			}
+			structuralChange ||= hasStructuralChanges(entry.state);
+			untrackedChanges ||= hasUntrackedChanges(entry.state);
+		}
+		return {
+			document: this.documentFromStateSnapshot(snapshot),
+			path: structuralChange || untrackedChanges ? { type: "full-repack" } : {
+				type: "selective-first",
+				changedParaIds
+			},
+			changedNoteParaIds,
+			sectionEndpointRemoval: getTrackedSectionEndpointRemoval(snapshot.mainState),
+			resolvedStoryExpectations: snapshot.resolvedStoryExpectations
+		};
+	}
 	/**
 	* Serialise the reviewed document to a new `.docx` buffer. Tries a selective
 	* patch first (only changed paragraphs are rewritten; every other byte of the
@@ -791,67 +861,65 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* structural edits — the same two-tier path the editor's save uses.
 	*/
 	async toBuffer() {
-		const document = this.toDocument();
-		const selective = await this.trySelectiveSave(document);
+		const save = this.captureSaveSnapshot();
+		const selective = save.path.type === "selective-first" ? await this.trySelectiveSave(save.document, save.path.changedParaIds) : null;
 		if (selective) {
-			await this.assertResolvedStoriesSerialized(selective);
+			await this.assertResolvedStoriesSerialized(selective, save.resolvedStoryExpectations);
 			return selective;
 		}
-		const buffer = await repackDocx({
-			...document,
+		const repackDocument = {
+			...save.document,
 			originalBuffer: this.originalBuffer
-		}, { changedNoteParaIds: this.getChangedNoteParaIds() });
-		await this.assertResolvedStoriesSerialized(buffer);
+		};
+		const buffer = save.sectionEndpointRemoval ? await withTrackedSectionEndpointRemoval({
+			document: repackDocument,
+			resolution: save.sectionEndpointRemoval,
+			repack: () => repackDocx(repackDocument, { changedNoteParaIds: save.changedNoteParaIds })
+		}) : await repackDocx(repackDocument, { changedNoteParaIds: save.changedNoteParaIds });
+		await this.assertResolvedStoriesSerialized(buffer, save.resolvedStoryExpectations);
 		return buffer;
 	}
-	async assertResolvedStoriesSerialized(buffer) {
-		if (this.resolvedStoryExpectations.size === 0) return;
+	async assertResolvedStoriesSerialized(buffer, expectations) {
+		if (expectations.length === 0) return;
 		const reopened = await FolioDocxReviewer.fromBuffer(buffer);
-		for (const { story, text, blocks } of this.resolvedStoryExpectations.values()) {
+		for (const { story, text, blocks } of expectations) {
 			const serialized = reopened.readReviewedStory({
 				story,
 				view: "current-markup"
 			});
 			const serializedState = reopened.getEditableStoryState(story);
-			if (serialized && serializedState && serialized.changes.length === 0 && formatStoryStateForLLM(serializedState, false) === text && JSON.stringify(createFolioAIEditSnapshot(serializedState.doc).blocks) === JSON.stringify(blocks)) continue;
+			const serializedText = serializedState ? formatStoryStateForLLM(serializedState, false) : null;
+			const serializedBlocks = serializedState ? createStateSnapshot(serializedState).blocks.map(resolvedStoryBlockProjection) : null;
+			const mismatches = [];
+			if (!serialized || !serializedState) mismatches.push(FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES.storyMissing);
+			else {
+				if (serialized.changes.length > 0) mismatches.push(FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES.revisionMarkupRemains);
+				if (serializedText !== text) mismatches.push(FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES.textProjection);
+				if (JSON.stringify(serializedBlocks) !== JSON.stringify(blocks)) mismatches.push(FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES.blockProjection);
+			}
+			if (mismatches.length === 0) continue;
 			throw new FolioResolvedStorySerializationError({
 				message: "Resolved document story did not persist to the serialized DOCX.",
 				story,
-				expectedText: text,
-				actualText: serializedState ? formatStoryStateForLLM(serializedState, false) : null,
+				mismatches,
+				expectedBlockCount: blocks.length,
+				actualBlockCount: serializedBlocks?.length ?? null,
 				remainingChangeCount: serialized?.changes.length ?? null
 			});
 		}
 	}
-	getChangedNoteParaIds() {
-		const changed = /* @__PURE__ */ new Set();
-		for (const entry of this.secondaryStoryStates.values()) {
-			if (entry.handle.type !== "footnote" && entry.handle.type !== "endnote") continue;
-			for (const paraId of getChangedParagraphIds(entry.state)) changed.add(paraId);
-		}
-		return changed;
-	}
 	/**
 	* Attempt the selective patch, treating a throw the same as a decline. Odd
 	* source XML can make the paragraph diff throw rather than return `null`; a
 	* full repack is the correct lossless fallback in both cases, so the fallback
 	* is the graceful handling — no separate error surface is needed here.
 	*/
-	async trySelectiveSave(document) {
-		const changedParaIds = new Set(getChangedParagraphIds(this.state));
-		let structuralChange = hasStructuralChanges(this.state);
-		let untrackedChanges = hasUntrackedChanges(this.state);
-		for (const entry of this.secondaryStoryStates.values()) {
-			if (entry.handle.type !== "footnote" && entry.handle.type !== "endnote") continue;
-			for (const paraId of getChangedParagraphIds(entry.state)) changedParaIds.add(paraId);
-			structuralChange ||= hasStructuralChanges(entry.state);
-			untrackedChanges ||= hasUntrackedChanges(entry.state);
-		}
+	async trySelectiveSave(document, changedParaIds) {
 		try {
 			return await attemptSelectiveSave(document, this.originalBuffer, {
 				changedParaIds,
-				structuralChange,
-				hasUntrackedChanges: untrackedChanges
+				structuralChange: false,
+				hasUntrackedChanges: false
 			});
 		} catch {
 			return null;
@@ -872,7 +940,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const state = ensureBaseDirectionInState(EditorState.create({
 			schema,
 			doc: ensureDeterministicParaIdsInDoc(storyDoc),
-			plugins: singletonManager.getPlugins()
+			plugins: createHeadlessPlugins(this.baseDocument.package.styles, this.baseDocument.package.numbering)
 		}));
 		this.secondaryStoryStates.set(key, {
 			handle: story,
@@ -918,19 +986,19 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const sourceText = source.type === "footnote" ? getFootnoteText(source) : getEndnoteText(source);
 		return normalizeFolioAIBlockText(state?.doc.textContent ?? sourceText);
 	}
-	mergeEditedSecondaryStories(document) {
+	mergeEditedSecondaryStories(document, secondaryStoryStates = this.secondaryStoryStates.values()) {
 		let headers;
 		let footers;
 		let footnotes;
 		let endnotes;
-		for (const entry of this.secondaryStoryStates.values()) {
+		for (const entry of secondaryStoryStates) {
 			if (entry.state === entry.initialState) continue;
 			if (entry.handle.type === "header" || entry.handle.type === "footer") {
 				const source = this.getHeaderFooterStory(entry.handle);
 				if (!source) continue;
 				const edited = {
 					...source,
-					content: proseDocToBlocks(entry.state.doc)
+					content: proseDocToBlocks(entry.state.doc, source.content, document.package.styles)
 				};
 				if (entry.handle.type === "header") {
 					headers ??= new Map(document.package.headers);
@@ -947,7 +1015,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 				if (!source) continue;
 				const edited = {
 					...source,
-					content: proseDocToBlocks(entry.state.doc)
+					content: proseDocToBlocks(entry.state.doc, source.content, document.package.styles)
 				};
 				footnotes ??= [...document.package.footnotes ?? []];
 				const index = footnotes.findIndex((note) => note.id === noteId);
@@ -959,7 +1027,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			if (!source) continue;
 			const edited = {
 				...source,
-				content: proseDocToBlocks(entry.state.doc)
+				content: proseDocToBlocks(entry.state.doc, source.content, document.package.styles)
 			};
 			endnotes ??= [...document.package.endnotes ?? []];
 			const index = endnotes.findIndex((note) => note.id === noteId);
@@ -971,10 +1039,10 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		if (endnotes) document.package.endnotes = endnotes;
 	}
 	/** Apply any {@link resolveComment} overrides recorded for these comments. */
-	withResolvedOverrides(comments) {
-		if (this.resolvedOverrides.size === 0) return [...comments];
+	withResolvedOverrides(comments, resolvedOverrides = this.resolvedOverrides) {
+		if (resolvedOverrides.size === 0) return [...comments];
 		return comments.map((comment) => {
-			const override = this.resolvedOverrides.get(comment.id);
+			const override = resolvedOverrides.get(comment.id);
 			return override === void 0 ? comment : {
 				...comment,
 				done: override