@stll/folio-core 0.62.0 → 0.63.0

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

@@ -2,9 +2,9 @@ import { document_d_exports } from "../types/document.js";
 import { FolioTableTemplates } from "./table-template.js";
 import { FolioAIBlock, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditOperation, FolioAIEditSnapshot } from "./types.js";
 import { FolioReplacementBackground, FolioRevisionStamp, FolioUndefinedReferencePolicy, FolioWordDiffOptions } from "./apply.js";
-import { ImportReferencedStyleDefinitionsResult } from "../compare/style-resources.js";
-import { InlineProvenanceTargetOptions } from "../compare/inline-provenance.js";
 import { MatchInlineAtomsOptions } from "../compare/inline-atoms.js";
+import { InlineProvenanceTargetOptions } from "../compare/inline-provenance.js";
+import { ImportReferencedStyleDefinitionsResult } from "../compare/style-resources.js";
 import { FolioDocumentOperationBatch, FolioDocumentOperationResult, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult } from "../document-operations.js";
 import { FolioPendingSuggestionLoadResult, FolioPendingSuggestionRecord } from "./pending-suggestions.js";
 import { FolioReviewChange, FolioReviewChangeKind } from "./read.js";
@@ -13,14 +13,14 @@ import { TableGeometryPairing } from "./table-geometry.js";
 import { Node } from "prosemirror-model";
 //#region src/ai-edits/headless.d.ts
 /** Options for {@link FolioDocxReviewer.fromBuffer}. */
-type FolioDocxReviewerOptions = {
+export type FolioDocxReviewerOptions = {
   /** Default author for tracked changes and comments. (default: `"AI"`) */
   author?: string;
   /** Password for Agile-encrypted .docx files (Office 2010+). */
   password?: string | undefined;
 };
 /** Options for {@link FolioDocxReviewer.applyOperations}. */
-type FolioApplyOperationsOptions = {
+export type FolioApplyOperationsOptions = {
   /** Required policy for undefined style and numbering references. */
   undefinedReferences: FolioUndefinedReferencePolicy;
   /** `"tracked-changes"` (default) produces ins/del redlines; `"direct"` edits in place. */
@@ -37,7 +37,7 @@ type FolioApplyOperationsOptions = {
   wordDiff?: FolioWordDiffOptions;
 };
 /** Options for {@link FolioDocxReviewer.applyDocumentOperations}. */
-type FolioApplyDocumentOperationsOptions = Omit<FolioApplyOperationsOptions, "mode">;
+export type FolioApplyDocumentOperationsOptions = Omit<FolioApplyOperationsOptions, "mode">;
 /**
  * Why a save rewrote the whole package instead of patching the edited
  * paragraphs into the original: `structuralChange` (paragraphs added or
@@ -45,9 +45,9 @@ type FolioApplyDocumentOperationsOptions = Omit<FolioApplyOperationsOptions, "mo
  * `untrackedChange` (an edit the change tracker cannot key to a paragraph), or
  * `selectiveDeclined` (the patch could not express the edit safely).
  */
-type FolioReviewerRepackReason = "structuralChange" | "untrackedChange" | "selectiveDeclined";
+export type FolioReviewerRepackReason = "structuralChange" | "untrackedChange" | "selectiveDeclined";
 /** Options for {@link FolioDocxReviewer.save}. */
-type FolioReviewerSaveOptions = {
+export type FolioReviewerSaveOptions = {
   /**
    * `"allow"` (default) falls back to a full repack when the selective patch
    * does not apply; `"refuse"` reports the reason and writes nothing.
@@ -55,7 +55,7 @@ type FolioReviewerSaveOptions = {
   repack?: "allow" | "refuse";
 };
 /** Result of {@link FolioDocxReviewer.save}. */
-type FolioReviewerSaveResult = {
+export type FolioReviewerSaveResult = {
   type: "selective";
   buffer: ArrayBuffer;
 } | {
@@ -67,7 +67,7 @@ type FolioReviewerSaveResult = {
   reason: FolioReviewerRepackReason;
 };
 /** Options for {@link FolioDocxReviewer.getContentAsText}. */
-type FolioGetContentAsTextOptions = {
+export type FolioGetContentAsTextOptions = {
   /**
    * Render tracked changes and comment anchors inline as `<ins>` / `<del>` /
    * `<comment>` tags instead of the default flattened, post-tracked-changes
@@ -75,11 +75,11 @@ type FolioGetContentAsTextOptions = {
    */
   annotated?: boolean;
 };
-declare const FOLIO_REVIEWED_VIEWS: readonly ["original", "current-markup", "final"];
-type FolioReviewedView = (typeof FOLIO_REVIEWED_VIEWS)[number];
-declare const FOLIO_RESOLVED_REVIEWED_VIEWS: readonly ["original", "final"];
-type FolioResolvedReviewedView = (typeof FOLIO_RESOLVED_REVIEWED_VIEWS)[number];
-type FolioDocumentStoryHandle = {
+export declare const FOLIO_REVIEWED_VIEWS: readonly ["original", "current-markup", "final"];
+export type FolioReviewedView = (typeof FOLIO_REVIEWED_VIEWS)[number];
+export declare const FOLIO_RESOLVED_REVIEWED_VIEWS: readonly ["original", "final"];
+export type FolioResolvedReviewedView = (typeof FOLIO_RESOLVED_REVIEWED_VIEWS)[number];
+export type FolioDocumentStoryHandle = {
   type: "main";
 } | {
   type: "header";
@@ -94,28 +94,28 @@ type FolioDocumentStoryHandle = {
   type: "endnote";
   noteId: number;
 };
-type FolioEditableDocumentStoryHandle = FolioDocumentStoryHandle;
+export type FolioEditableDocumentStoryHandle = FolioDocumentStoryHandle;
 /**
  * One numbering level as a reader meets it: which list, which depth, and the
  * format and template that produce the label.
  */
-type FolioNumberingLevel = {
+export type FolioNumberingLevel = {
   numId: number;
   level: number;
   format: string;
   levelText: string;
   start?: number;
 };
-type FolioDocumentStory = {
+export type FolioDocumentStory = {
   handle: FolioDocumentStoryHandle;
   text: string;
 };
-type FolioReadReviewedStoryOptions = {
+export type FolioReadReviewedStoryOptions = {
   story?: FolioEditableDocumentStoryHandle;
   view?: FolioReviewedView;
 };
 /** What {@link FolioDocxReviewer.matchStoryTableGeometry} needs to move a table's properties. */
-type FolioMatchStoryTableGeometryOptions = {
+export type FolioMatchStoryTableGeometryOptions = {
   story?: FolioEditableDocumentStoryHandle;
   /** The other document's tables, by the index its snapshot numbers them with. */
   targetTables: ReadonlyMap<number, Node>;
@@ -123,11 +123,11 @@ type FolioMatchStoryTableGeometryOptions = {
   pairings: readonly TableGeometryPairing[];
   revisionStamp: FolioRevisionStamp;
 };
-type FolioResolveReviewedStoryOptions = {
+export type FolioResolveReviewedStoryOptions = {
   story?: FolioEditableDocumentStoryHandle;
   view: FolioResolvedReviewedView;
 };
-type FolioReviewedStory = {
+export type FolioReviewedStory = {
   story: FolioEditableDocumentStoryHandle;
   view: FolioReviewedView;
   snapshot: FolioAIEditSnapshot;
@@ -135,16 +135,16 @@ type FolioReviewedStory = {
   changes: FolioReviewChange[];
 };
 declare const UnsupportedFolioReviewedViewError_base: import("better-result").TaggedErrorClass<"UnsupportedFolioReviewedViewError">;
-declare class UnsupportedFolioReviewedViewError extends UnsupportedFolioReviewedViewError_base<{
+export declare class UnsupportedFolioReviewedViewError extends UnsupportedFolioReviewedViewError_base<{
   message: string;
   receivedView: unknown;
 }> {}
 declare const FolioDocumentStoryNotFoundError_base: import("better-result").TaggedErrorClass<"FolioDocumentStoryNotFoundError">;
-declare class FolioDocumentStoryNotFoundError extends FolioDocumentStoryNotFoundError_base<{
+export declare class FolioDocumentStoryNotFoundError extends FolioDocumentStoryNotFoundError_base<{
   message: string;
   story: FolioEditableDocumentStoryHandle;
 }> {}
-type FolioApplyDocumentOperationsToStoryOptions = FolioApplyDocumentOperationsOptions & {
+export type FolioApplyDocumentOperationsToStoryOptions = FolioApplyDocumentOperationsOptions & {
   story: FolioEditableDocumentStoryHandle;
   batch: FolioDocumentOperationBatch;
   /**
@@ -267,21 +267,21 @@ type FolioDocxComparisonAccess = {
     status: "budget-exceeded";
   };
 };
-declare const isFolioReviewedView: (value: unknown) => value is FolioReviewedView;
-declare const isFolioResolvedReviewedView: (value: unknown) => value is FolioResolvedReviewedView;
+export declare const isFolioReviewedView: (value: unknown) => value is FolioReviewedView;
+export declare const isFolioResolvedReviewedView: (value: unknown) => value is FolioResolvedReviewedView;
 /** Filter for {@link FolioDocxReviewer.getChanges}. */
-type FolioReviewChangeFilter = {
+export type FolioReviewChangeFilter = {
   author?: string;
   type?: FolioReviewChangeKind;
 };
-type FolioReviewCommentReply = {
+export type FolioReviewCommentReply = {
   id: number;
   author: string;
   date: string | null;
   text: string;
 };
 /** Input for {@link FolioDocxReviewer.replyTo}. */
-type FolioReviewReplyInput = {
+export type FolioReviewReplyInput = {
   /** Reply body text. */
   text: string;
   /** Reply author; defaults to the reviewer's author. */
@@ -291,7 +291,7 @@ type FolioReviewReplyInput = {
   date?: string;
 };
 /** A comment thread discovered in the document. */
-type FolioReviewComment = {
+export type FolioReviewComment = {
   id: number;
   author: string;
   date: string | null;
@@ -315,7 +315,7 @@ type FolioReviewComment = {
   done: boolean;
 };
 /** Filter for {@link FolioDocxReviewer.getComments}. */
-type FolioReviewCommentFilter = {
+export type FolioReviewCommentFilter = {
   author?: string;
   done?: boolean;
 };
@@ -334,7 +334,7 @@ type FolioReviewCommentFilter = {
  * const reviewed = await reviewer.toBuffer();
  * ```
  */
-declare class FolioDocxReviewer {
+export declare class FolioDocxReviewer {
   /** Default author for tracked changes and comments. */
   readonly author: string;
   private readonly baseDocument;
@@ -383,6 +383,8 @@ declare class FolioDocxReviewer {
    * the anchor map the apply layer resolves operations against.
    */
   snapshot(): FolioAIEditSnapshot;
+  /** Every suggestion id the document's stories still carry. */
+  private activeSuggestionIds;
   /** Export staged AI operations for storage by the host, outside the DOCX. */
   exportPendingSuggestions(): FolioPendingSuggestionRecord[];
   /** Validate saved proposals against this document before restaging them. */
@@ -676,9 +678,9 @@ declare class FolioDocxReviewer {
   private runStoryCommand;
 }
 /** @internal Comparison-only access to atomic and fresh reviewer projections. */
-declare const getFolioDocxComparisonAccess: (reviewer: FolioDocxReviewer) => FolioDocxComparisonAccess;
+export declare const getFolioDocxComparisonAccess: (reviewer: FolioDocxReviewer) => FolioDocxComparisonAccess;
 /** Options for {@link applyFolioAIEditsToBuffer}. */
-type ApplyFolioAIEditsToBufferOptions = {
+export type ApplyFolioAIEditsToBufferOptions = {
   /** Default author for tracked changes and comments. (default: `"AI"`) */
   author?: string;
   /** `"tracked-changes"` (default) produces ins/del redlines; `"direct"` edits in place. */
@@ -692,7 +694,7 @@ type ApplyFolioAIEditsToBufferOptions = {
   snapshot?: FolioAIEditSnapshot;
 };
 /** Result of {@link applyFolioAIEditsToBuffer}. */
-type ApplyFolioAIEditsToBufferResult = FolioAIEditApplyResult & {
+export type ApplyFolioAIEditsToBufferResult = FolioAIEditApplyResult & {
   /** The reviewed `.docx` as a new buffer. */
   buffer: ArrayBuffer;
 };
@@ -702,6 +704,6 @@ type ApplyFolioAIEditsToBufferResult = FolioAIEditApplyResult & {
  * wrapper over {@link FolioDocxReviewer} for callers that already hold the
  * operations to run.
  */
-declare const applyFolioAIEditsToBuffer: (buffer: ArrayBuffer, operations: FolioAIEditOperation[], options?: ApplyFolioAIEditsToBufferOptions) => Promise<ApplyFolioAIEditsToBufferResult>;
+export declare const applyFolioAIEditsToBuffer: (buffer: ArrayBuffer, operations: FolioAIEditOperation[], options?: ApplyFolioAIEditsToBufferOptions) => Promise<ApplyFolioAIEditsToBufferResult>;
 //#endregion
-export { ApplyFolioAIEditsToBufferOptions, ApplyFolioAIEditsToBufferResult, FOLIO_RESOLVED_REVIEWED_VIEWS, FOLIO_REVIEWED_VIEWS, FolioApplyDocumentOperationsOptions, FolioApplyDocumentOperationsToStoryOptions, FolioApplyOperationsOptions, FolioDocumentStory, FolioDocumentStoryHandle, FolioDocumentStoryNotFoundError, FolioDocxReviewer, FolioDocxReviewerOptions, FolioEditableDocumentStoryHandle, FolioGetContentAsTextOptions, FolioMatchStoryTableGeometryOptions, FolioNumberingLevel, FolioReadReviewedStoryOptions, FolioResolveReviewedStoryOptions, FolioResolvedReviewedView, type FolioReviewChange, FolioReviewChangeFilter, type FolioReviewChangeKind, FolioReviewComment, FolioReviewCommentFilter, FolioReviewCommentReply, FolioReviewReplyInput, FolioReviewedStory, FolioReviewedView, FolioReviewerRepackReason, FolioReviewerSaveOptions, FolioReviewerSaveResult, type FolioRevisionStamp, UnsupportedFolioReviewedViewError, applyFolioAIEditsToBuffer, getFolioDocxComparisonAccess, isFolioResolvedReviewedView, isFolioReviewedView };
+export type { FolioReviewChange, FolioReviewChangeKind, FolioRevisionStamp };

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, styleClosureNumberingReferences } from "../compare/style-resources.js";
 import { applyFolioDocumentOperations } from "../document-operations.js";
+import { removeCommentMarkers } from "../docx/commentAnchorIndex.js";
 import { applyReplyThreadMarkers } from "../docx/commentReplyMarkers.js";
 import { commentTextParagraph } from "../docx/commentTextParagraph.js";
 import { buildSections } from "../docx/documentParser.js";
@@ -12,6 +13,7 @@ import { normalizeListModelRendering } from "../docx/listModelNormalization.js";
 import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { getCachedNumberingMap } from "../docx/numberingParser.js";
 import { recreateProseNodeWithParagraphPropertySource, transferProseParagraphPropertySource } from "../docx/paragraphPropertySource.js";
+import { visitDocxParagraphs } from "../docx/paragraphTraversal.js";
 import { parseDocx } from "../docx/parser.js";
 import { createReply } from "../docx/replyToComment.js";
 import { repackDocx } from "../docx/rezip.js";
@@ -32,16 +34,17 @@ import { getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructural
 import { completeNumberingForDoc } from "../prosemirror/listInstanceReferences.js";
 import "../prosemirror/listMarker.js";
 import { deleteNoteWithReference, noteDeletionRevisions, noteKeysReferencedIn, noteReferenceStates, noteReferencesRestored, referenceDeletions, referencedNotes } from "../prosemirror/noteReferenceReview.js";
-import { createDocumentNumberingPlugin, withDocumentNumbering } from "../prosemirror/plugins/documentNumbering.js";
+import { createDocumentNumberingPlugin, getDocumentNumbering, withDocumentNumbering } from "../prosemirror/plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "../prosemirror/plugins/documentStyleState.js";
 import { createDocumentStylesPlugin, 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 { collapseEmptyTextBoxHosts } from "../prosemirror/textBoxHostCollapse.js";
 import { canonicalJson } from "../utils/canonicalJson.js";
 import { deterministicHexId } from "../utils/hexId.js";
 import { buildAnnotatedBlockTextWithNoteReferences } from "./clean-text.js";
-import { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, withoutLostCommentThreads } from "./comment-lifecycle.js";
+import { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, coveredCommentIdsInProseDoc, withoutLostCommentThreads } from "./comment-lifecycle.js";
 import { noteReferenceEditsAllowed } from "./note-references.js";
 import { noteStoryInventory } from "./note-story-inventory.js";
 import { FolioPendingSuggestionRegistry, createPendingSuggestionSourceSnapshot, withoutPendingSuggestionCommentMarks } from "./pending-suggestions.js";
@@ -51,7 +54,7 @@ import { collectNoteReferenceLabels, createFolioAIEditSnapshotWithStyleResolver,
 import { matchTableGeometry } from "./table-geometry.js";
 import { tableTemplateCanCrossPackageLosslessly } from "./table-template.js";
 import { TaggedError, panic } from "better-result";
-import { REVIEW_CARRIERS } from "@stll/docx-core/model";
+import { REVIEW_CARRIERS, finalizeParagraphFormatting, numberingLevelEntries, setDocumentBodyComments } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
 import { reconcileDocumentPartRelationships } from "@stll/docx-core/ops";
 import { EditorState } from "prosemirror-state";
@@ -79,6 +82,7 @@ import JSZip from "jszip";
 let undoHandleCursor = Date.now();
 const createReviewerComment = ({ id, text, author, date }) => ({
 	id,
+	anchorKind: "range",
 	author,
 	date: date ?? (/* @__PURE__ */ new Date()).toISOString(),
 	content: [commentTextParagraph(text)]
@@ -202,23 +206,16 @@ const resolvedStoryProjection = (snapshot, minted) => {
 };
 const numberingLevelsOf = (numbering) => {
 	if (!numbering) return [];
-	const levelsByAbstractId = new Map(numbering.abstractNums.map((abstractNum) => [abstractNum.abstractNumId, abstractNum.levels]));
-	const levels = [];
-	for (const instance of numbering.nums) {
-		const overrides = new Map((instance.levelOverrides ?? []).map((override) => [override.ilvl, override]));
-		for (const level of levelsByAbstractId.get(instance.abstractNumId) ?? []) {
-			const override = overrides.get(level.ilvl);
-			const resolved = override?.lvl ?? level;
-			levels.push({
-				numId: instance.numId,
-				level: resolved.ilvl,
-				format: resolved.numFmt,
-				levelText: resolved.lvlText,
-				...(override?.startOverride ?? resolved.start) !== void 0 ? { start: override?.startOverride ?? resolved.start } : {}
-			});
-		}
-	}
-	return levels;
+	return numberingLevelEntries(numbering).map(({ numId, ilvl, level }) => {
+		const entry = {
+			numId,
+			level: ilvl,
+			format: level.numFmt,
+			levelText: level.lvlText
+		};
+		if (level.start !== void 0) entry.start = level.start;
+		return entry;
+	});
 };
 const referencedNumberingLevelsByNumId = ({ references }) => {
 	const levelsByNumId = /* @__PURE__ */ new Map();
@@ -302,7 +299,7 @@ const createHeadlessPlugins = (styles, numbering) => [
 	createDocumentStylesPlugin(styles),
 	createDocumentNumberingPlugin(numbering)
 ];
-const createStateSnapshot = (state) => createFolioAIEditSnapshotWithStyleResolver(state.doc, getDocumentStyleResolver(state));
+const createStateSnapshot = (state) => createFolioAIEditSnapshotWithStyleResolver(state.doc, getDocumentStyleResolver(state), getDocumentNumbering(state));
 const formatStorySnapshotForLLM = (snapshot, annotated) => {
 	const blocks = snapshot.blocks.filter(isFolioAIContentBlock);
 	if (!annotated) return blocks.map(formatBlockForLLM).join("\n");
@@ -580,7 +577,8 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const targetAbstracts = new Map(target.abstractNums.map((entry) => [entry.abstractNumId, entry]));
 		const levelsByNumId = referencedNumberingLevelsByNumId({ references });
 		const importedAbstractIds = /* @__PURE__ */ new Map();
-		const abstractIds = createNumberingIdAllocator("abstract", [...abstracts.keys(), ...targetAbstracts.keys()]);
+		const existingAbstractIds = [...abstracts.keys(), ...targetAbstracts.keys()];
+		const abstractIds = createNumberingIdAllocator("abstract", existingAbstractIds);
 		for (const numId of levelsByNumId.keys()) {
 			const targetNum = targetNums.get(numId);
 			if (!targetNum) return "conflict";
@@ -635,7 +633,8 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const targetNums = new Map(target.nums.map((entry) => [entry.numId, entry]));
 		const targetAbstracts = new Map(target.abstractNums.map((entry) => [entry.abstractNumId, entry]));
 		const levelsByNumId = referencedNumberingLevelsByNumId({ references });
-		const numberingIds = createNumberingIdAllocator("num", [...nums.keys(), ...targetNums.keys()]);
+		const existingNumIds = [...nums.keys(), ...targetNums.keys()];
+		const numberingIds = createNumberingIdAllocator("num", existingNumIds);
 		const remapped = /* @__PURE__ */ new Map();
 		for (const numId of levelsByNumId.keys()) {
 			const targetNum = targetNums.get(numId);
@@ -678,10 +677,15 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	snapshot() {
 		return createStateSnapshot(this.state);
 	}
-	/** Export staged AI operations for storage by the host, outside the DOCX. */
-	exportPendingSuggestions() {
+	/** Every suggestion id the document's stories still carry. */
+	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;
+	}
+	/** Export staged AI operations for storage by the host, outside the DOCX. */
+	exportPendingSuggestions() {
+		const active = this.activeSuggestionIds();
 		return this.pendingSuggestions.exportPendingSuggestions({
 			activeSuggestionIds: active,
 			snapshotForStory: (story, commentIds) => {
@@ -702,6 +706,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			apply: (record, snapshot) => {
 				const result = this.applyDocumentOperationsInternal({
 					undefinedReferences: "refuse",
+					restagesSuggestions: true,
 					story: record.story,
 					batch: {
 						version: 1,
@@ -945,7 +950,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		if (noteReferenceEditsAllowed()) return this.applyDocumentOperationsToStoryState(options);
 		return this.withNotesFollowingReferences(() => this.applyDocumentOperationsToStoryState(options));
 	}
-	applyDocumentOperationsToStoryState({ story, batch, author, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground, undefinedReferences, createUndoEntry }) {
+	applyDocumentOperationsToStoryState({ story, batch, author, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground, undefinedReferences, createUndoEntry, restagesSuggestions }) {
 		const beforeState = this.requireEditableStoryState(story);
 		const operationAuthor = author ?? this.author;
 		const sourceSnapshot = snapshot ?? createStateSnapshot(beforeState);
@@ -967,6 +972,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			...tableTemplates !== void 0 && { tableTemplates },
 			...replacementBackground !== void 0 && { replacementBackground },
 			undefinedReferences,
+			...restagesSuggestions === true ? { restagesSuggestions } : { pendingSuggestionIds: this.activeSuggestionIds() },
 			createCommentId: (text) => {
 				const comment = createReviewerComment({
 					id: this.nextCommentId(),
@@ -1171,9 +1177,15 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* (nested tracked changes, hyperlinks) is out of scope.
 	*/
 	getComments(filter) {
-		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 covered = /* @__PURE__ */ new Set();
+		for (const story of this.listStoryHandlesInternal()) {
+			const doc = story.type === "main" ? this.state.doc : this.readSecondaryStoryDoc(story);
+			if (!doc) continue;
+			for (const id of coveredCommentIdsInProseDoc(doc)) covered.add(id);
+		}
+		const definitions = this.withResolvedOverrides(this.keptCommentThreads([...this.baseDocument.package.document.comments ?? [], ...this.createdComments], this.state, this.secondaryStoryStates.values()).filter(({ id, parentId, anchorKind }) => anchorKind !== "range" || parentId !== void 0 || covered.has(id)));
+		if (definitions.length === 0) return [];
 		const repliesByParent = /* @__PURE__ */ new Map();
 		const topLevel = [];
 		for (const comment of definitions) {
@@ -1218,7 +1230,8 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	*/
 	replyTo(target, input) {
 		const parentId = typeof target === "number" ? target : target.id;
-		const reply = createReply([...this.baseDocument.package.document.comments ?? [], ...this.createdComments], parentId, {
+		const existing = [...this.baseDocument.package.document.comments ?? [], ...this.createdComments];
+		const reply = createReply(existing, parentId, {
 			author: input.author ?? this.author,
 			text: input.text,
 			...input.initials !== void 0 ? { initials: input.initials } : {},
@@ -1408,7 +1421,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const id = revisionIdOf(target);
 		const ids = getTrackedChangeGroupIdsFromDoc(this.state.doc, id);
 		const suggestionId = suggestionIdOfRevision(this.state, id);
-		if (suggestionId !== null) this.runCommand(acceptSuggestion(suggestionId, { author: this.author }));
+		if (suggestionId !== null && !this.runCommand(acceptSuggestion(suggestionId, { author: this.author }))) return false;
 		let bodyChanged = false;
 		for (const memberId of ids) bodyChanged = this.runCommand(acceptAIEditRevision(memberId)) || bodyChanged;
 		const sectionChanged = this.resolveFinalSectionProperties("accept", id) > 0;
@@ -1623,6 +1636,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			};
 			const applied = applyFolioDocumentOperations({
 				undefinedReferences: "refuse",
+				restagesSuggestions: true,
 				view,
 				snapshot,
 				batch: {
@@ -1673,6 +1687,15 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	toDocument() {
 		const document = this.documentFromStateSnapshot(this.captureReviewerState());
 		applyReplyThreadMarkers(document);
+		visitDocxParagraphs({
+			documentBody: document.package.document,
+			headers: document.package.headers,
+			footers: document.package.footers,
+			footnotes: document.package.footnotes,
+			endnotes: document.package.endnotes
+		}, (paragraph) => {
+			if (finalizeParagraphFormatting(paragraph.formatting) === void 0) delete paragraph.formatting;
+		});
 		return document;
 	}
 	captureReviewerState() {
@@ -1743,9 +1766,61 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			Object.assign(document.package, noteStoryInventory(document.package, removed));
 		}
 		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 normalizeListModelRendering(reconcileDocumentPartRelationships(document)).document;
+		const knownDefinitions = [...this.baseDocument.package.document.comments ?? [], ...snapshot.createdComments];
+		const keptThreadIds = new Set(this.keptCommentThreads(knownDefinitions, snapshot.mainState, snapshot.secondaryStoryStates).map(({ id }) => id));
+		const kept = definitions.filter(({ id }) => keptThreadIds.has(id));
+		const keptIds = new Set(kept.map(({ id }) => id));
+		const retiredCommentIds = new Set(knownDefinitions.filter(({ id }) => !keptIds.has(id)).map(({ id }) => id));
+		const modelStories = [
+			document.package.document,
+			...document.package.headers?.values() ?? [],
+			...document.package.footers?.values() ?? [],
+			...document.package.footnotes ?? [],
+			...document.package.endnotes ?? []
+		];
+		for (const story of modelStories) for (const id of anchoredCommentIdsInBlocks(story.content)) if (!keptIds.has(id)) retiredCommentIds.add(id);
+		if (retiredCommentIds.size > 0) {
+			document.package.document = {
+				...document.package.document,
+				content: removeCommentMarkers(document.package.document.content, retiredCommentIds)
+			};
+			if (document.package.headers) {
+				const headers = new Map(document.package.headers);
+				for (const [id, header] of headers) headers.set(id, {
+					...header,
+					content: removeCommentMarkers(header.content, retiredCommentIds)
+				});
+				document.package.headers = headers;
+			}
+			if (document.package.footers) {
+				const footers = new Map(document.package.footers);
+				for (const [id, footer] of footers) footers.set(id, {
+					...footer,
+					content: removeCommentMarkers(footer.content, retiredCommentIds)
+				});
+				document.package.footers = footers;
+			}
+			if (document.package.footnotes) document.package.footnotes = document.package.footnotes.map((footnote) => ({
+				...footnote,
+				content: removeCommentMarkers(footnote.content, retiredCommentIds)
+			}));
+			if (document.package.endnotes) document.package.endnotes = document.package.endnotes.map((endnote) => ({
+				...endnote,
+				content: removeCommentMarkers(endnote.content, retiredCommentIds)
+			}));
+		}
+		if (kept.length !== definitions.length || snapshot.createdComments.length > 0 || snapshot.resolvedOverrides.size > 0) setDocumentBodyComments(document.package.document, this.withResolvedOverrides(kept, snapshot.resolvedOverrides));
+		const normalized = normalizeListModelRendering(reconcileDocumentPartRelationships(document)).document;
+		visitDocxParagraphs({
+			documentBody: normalized.package.document,
+			headers: normalized.package.headers,
+			footers: normalized.package.footers,
+			footnotes: normalized.package.footnotes,
+			endnotes: normalized.package.endnotes
+		}, (paragraph) => {
+			if (finalizeParagraphFormatting(paragraph.formatting) === void 0) delete paragraph.formatting;
+		});
+		return normalized;
 	}
 	captureSaveSnapshot() {
 		const snapshot = this.captureReviewerState();
@@ -1934,10 +2009,11 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			story
 		});
 	}
-	setEditableStoryState(story, state) {
+	setEditableStoryState(story, projected) {
 		this.resolvedStoryExpectations.delete(editableStoryKey(story));
+		const folded = (stored) => stored.doc === projected.doc ? projected : collapseEmptyTextBoxHosts(projected);
 		if (story.type === "main") {
-			this.state = state;
+			this.state = folded(this.state);
 			return;
 		}
 		const entry = this.secondaryStoryStates.get(secondaryStoryKey(story));
@@ -1945,7 +2021,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			message: `Document story ${JSON.stringify(story)} was not found.`,
 			story
 		});
-		entry.state = state;
+		entry.state = folded(entry.state);
 	}
 	getHeaderFooterStory(story) {
 		if (this.removedHeaderFooterStories.has(headerFooterStoryKey(story))) return void 0;
@@ -2161,19 +2237,35 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const addAll = (target, ids) => {
 			for (const id of ids) target.add(id);
 		};
+		const referenceStates = noteReferenceStates(mainState.doc);
+		for (const entry of loaded.values()) {
+			addAll(anchoredBefore, anchoredCommentIdsInProseDoc(entry.initialState.doc));
+			if ((entry.handle.type === "footnote" || entry.handle.type === "endnote") && this.removedNoteStories.has(noteStoryKey(entry.handle)) && referenceStates.get(noteStoryKey(entry.handle)) !== "deleted") continue;
+			addAll(anchoredNow, anchoredCommentIdsInProseDoc(entry.state.doc, entry.initialState.doc));
+		}
 		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));
+			if (loaded.get(secondaryStoryKey(handle))) continue;
+			const source = handle.type === "header" || handle.type === "footer" ? this.getHeaderFooterStory(handle) : this.getNoteStory(handle);
+			addAll(anchoredNow, anchoredCommentIdsInBlocks(source?.content ?? []));
+		}
+		for (const handle of this.removedNoteStories.values()) {
+			if (loaded.get(secondaryStoryKey(handle))) {
+				if (referenceStates.get(noteStoryKey(handle)) === "deleted") {
+					const source = (handle.type === "footnote" ? this.baseDocument.package.footnotes : this.baseDocument.package.endnotes)?.find((note) => note.id === handle.noteId);
+					addAll(anchoredNow, anchoredCommentIdsInBlocks(source?.content ?? []));
+				}
 				continue;
 			}
-			addAll(anchoredNow, anchoredCommentIdsInBlocks((handle.type === "header" || handle.type === "footer" ? this.getHeaderFooterStory(handle) : this.getNoteStory(handle))?.content ?? []));
+			const removed = anchoredCommentIdsInBlocks((handle.type === "footnote" ? this.baseDocument.package.footnotes : this.baseDocument.package.endnotes)?.find((note) => note.id === handle.noteId)?.content ?? []);
+			addAll(anchoredBefore, removed);
+			if (referenceStates.get(noteStoryKey(handle)) === "deleted") addAll(anchoredNow, removed);
 		}
-		for (const handle of this.removedNoteStories.values()) {
-			const entry = loaded.get(secondaryStoryKey(handle));
-			addAll(anchoredBefore, entry ? anchoredCommentIdsInProseDoc(entry.initialState.doc) : anchoredCommentIdsInBlocks((handle.type === "footnote" ? this.baseDocument.package.footnotes : this.baseDocument.package.endnotes)?.find((note) => note.id === handle.noteId)?.content ?? []));
+		for (const [key, state] of referenceStates) {
+			if (state !== "deleted") continue;
+			const handle = noteStoryHandleOf(key);
+			if (!handle || loaded.has(secondaryStoryKey(handle))) continue;
+			addAll(anchoredNow, anchoredCommentIdsInBlocks(this.getNoteStory(handle)?.content ?? []));
 		}
 		return withoutLostCommentThreads(comments, {
 			anchoredBefore,
@@ -2187,14 +2279,22 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	*/
 	commentAnchors() {
 		const anchors = /* @__PURE__ */ new Map();
-		for (const story of this.listStoryHandlesInternal()) {
-			const doc = story.type === "main" ? this.state.doc : this.readSecondaryStoryDoc(story);
-			if (!doc) continue;
+		const add = (doc, story) => {
 			for (const anchor of getCommentAnchorsFromDoc(doc)) if (!anchors.has(anchor.commentId)) anchors.set(anchor.commentId, {
 				text: anchor.quote,
 				blockId: anchor.blockId,
 				story
 			});
+		};
+		for (const story of this.listStoryHandlesInternal()) {
+			const doc = story.type === "main" ? this.state.doc : this.readSecondaryStoryDoc(story);
+			if (!doc) continue;
+			add(doc, story);
+		}
+		for (const story of this.removedNoteStories.values()) {
+			if (noteReferenceStates(this.state.doc).get(noteStoryKey(story)) !== "deleted") continue;
+			const entry = this.secondaryStoryStates.get(secondaryStoryKey(story));
+			if (entry) add(entry.initialState.doc, story);
 		}
 		return anchors;
 	}

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

@@ -10,5 +10,6 @@ import { FolioCommentAnchor, FolioReviewChange, FolioReviewChangeKind, getCommen
 import { createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, hashFolioAIBlockText, isFolioAIContentBlock, normalizeFolioAIBlockText } from "./snapshot.js";
 import { FOLIO_RESOLVED_REVIEWED_VIEWS, FOLIO_REVIEWED_VIEWS, FolioApplyDocumentOperationsToStoryOptions, FolioDocumentStory, FolioDocumentStoryHandle, FolioDocumentStoryNotFoundError, FolioEditableDocumentStoryHandle, FolioReadReviewedStoryOptions, FolioResolveReviewedStoryOptions, FolioResolvedReviewedView, FolioReviewedStory, FolioReviewedView, UnsupportedFolioReviewedViewError, isFolioResolvedReviewedView, isFolioReviewedView } from "./headless.js";
 import { getFolioDocumentOutline, readFolioDocumentSection } from "./scoped-reading.js";
+import { getFolioDocumentOperationRemovedBlockIds } from "./removed-blocks.js";
 import { getFolioParaIdFromBlockId } from "../types/block-id.js";
-export { type ApplyFolioDocumentOperationsOptions, type DocPositionRange, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_PENDING_SUGGESTION_VERSION, FOLIO_RESOLVED_REVIEWED_VIEWS, FOLIO_REVIEWED_VIEWS, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIDiagnosticBlock, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAIEditView, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIInsertFormattingScope, type FolioAIParagraphBlock, type FolioAIParagraphSpacing, type FolioAISignatureParty, type FolioAITextRangeHandle, type FolioApplyDocumentOperationsToStoryOptions, type FolioCommentAnchor, type FolioContentParagraphKind, type FolioDocumentNavigationTarget, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocumentOutline, type FolioDocumentOutlineEntry, type FolioDocumentSection, type FolioDocumentSectionHandle, type FolioDocumentSectionReadResult, type FolioDocumentStory, type FolioDocumentStoryHandle, FolioDocumentStoryNotFoundError, type FolioEditableDocumentStoryHandle, type FolioPendingSuggestionLoadResult, type FolioPendingSuggestionRecord, FolioPendingSuggestionRegistry, type FolioPendingSuggestionStaleReason, type FolioReadReviewedStoryOptions, type FolioResolveReviewedStoryOptions, type FolioResolvedReviewedView, type FolioReviewChange, type FolioReviewChangeKind, type FolioReviewedStory, type FolioReviewedView, type FolioRevisionStamp, type FolioUndefinedReferencePolicy, type FolioWordDiffOptions, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, UnsupportedFolioReviewedViewError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, applyFolioAIEditOperations, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, buildAnnotatedBlockText, clampRangeToDocSize, createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, createPendingSuggestionSourceSnapshot, diffWordSegments, getCommentAnchorsFromDoc, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioDocumentOutline, getFolioParaIdFromBlockId, getTrackedChangesFromDoc, hashFolioAIBlockText, isFolioAIContentBlock, isFolioDocumentOperationModeSupported, isFolioResolvedReviewedView, isFolioReviewedView, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, readFolioDocumentSection, resolveFolioAIBlockRange, resolveFolioAITextRange, resolvePassageRange };
+export { type ApplyFolioDocumentOperationsOptions, type DocPositionRange, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_PENDING_SUGGESTION_VERSION, FOLIO_RESOLVED_REVIEWED_VIEWS, FOLIO_REVIEWED_VIEWS, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIDiagnosticBlock, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAIEditView, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIInsertFormattingScope, type FolioAIParagraphBlock, type FolioAIParagraphSpacing, type FolioAISignatureParty, type FolioAITextRangeHandle, type FolioApplyDocumentOperationsToStoryOptions, type FolioCommentAnchor, type FolioContentParagraphKind, type FolioDocumentNavigationTarget, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocumentOutline, type FolioDocumentOutlineEntry, type FolioDocumentSection, type FolioDocumentSectionHandle, type FolioDocumentSectionReadResult, type FolioDocumentStory, type FolioDocumentStoryHandle, FolioDocumentStoryNotFoundError, type FolioEditableDocumentStoryHandle, type FolioPendingSuggestionLoadResult, type FolioPendingSuggestionRecord, FolioPendingSuggestionRegistry, type FolioPendingSuggestionStaleReason, type FolioReadReviewedStoryOptions, type FolioResolveReviewedStoryOptions, type FolioResolvedReviewedView, type FolioReviewChange, type FolioReviewChangeKind, type FolioReviewedStory, type FolioReviewedView, type FolioRevisionStamp, type FolioUndefinedReferencePolicy, type FolioWordDiffOptions, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, UnsupportedFolioReviewedViewError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, applyFolioAIEditOperations, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, buildAnnotatedBlockText, clampRangeToDocSize, createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, createPendingSuggestionSourceSnapshot, diffWordSegments, getCommentAnchorsFromDoc, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioDocumentOperationRemovedBlockIds, getFolioDocumentOutline, getFolioParaIdFromBlockId, getTrackedChangesFromDoc, hashFolioAIBlockText, isFolioAIContentBlock, isFolioDocumentOperationModeSupported, isFolioResolvedReviewedView, isFolioReviewedView, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, readFolioDocumentSection, resolveFolioAIBlockRange, resolveFolioAITextRange, resolvePassageRange };