@stll/folio-core 0.55.0 → 0.57.0

package/dist/ai-edits/apply.js

@@ -1,6 +1,7 @@
 import { paragraphNumberingReference, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { formattingEquals } from "../docx/runConsolidator.js";
 import { isStyleSourcedParagraphNumbering } from "../internal/paragraphFormattingSerialization.js";
+import { addTrackedDeletionMark } from "../prosemirror/addTrackedDeletionMark.js";
 import { deleteTextBoxesAnchoredAt, droppedTextBoxAnchorIds, endOfParagraphWithItsTextBoxes, gatherTextBoxesAfterParagraph, textBoxAnchorIdOf, textBoxAnchorIdsBetween } from "../prosemirror/anchoredTextBoxes.js";
 import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs, expectTableRowAttrs } from "../prosemirror/attrs/index.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot } from "../prosemirror/commands/propertyChangeScope.js";
@@ -17,7 +18,7 @@ import { directParagraphAlignment } from "../prosemirror/paragraphAlignment.js";
 import { styleResolvedParagraphFormatting } from "../prosemirror/paragraphFormattingProvenance.js";
 import { directParagraphIndentation, paragraphIndentationAttrPatch, paragraphIndentationEqual, paragraphIndentationFromFormatting, withDirectParagraphIndentation } from "../prosemirror/paragraphIndentation.js";
 import { joinAtParagraphMark } from "../prosemirror/paragraphMarkJoin.js";
-import { carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties } from "../prosemirror/paragraphPropertyCarry.js";
+import { carriedParagraphProperties, carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties } from "../prosemirror/paragraphPropertyCarry.js";
 import { directParagraphSpacing, paragraphSpacingAttrPatch, paragraphSpacingEqual, paragraphSpacingFromFormatting, withDirectParagraphSpacing } from "../prosemirror/paragraphSpacing.js";
 import { getDocumentNumbering, getDocumentNumberingInstanceIds } from "../prosemirror/plugins/documentNumbering.js";
 import { getDocumentStyleDefinitions, getDocumentStyleResolver } from "../prosemirror/plugins/documentStyleState.js";
@@ -33,7 +34,8 @@ import { listAttrsFromNumbering, listLevelAttrPatch } from "../prosemirror/style
 import { removeRowsWithoutCellsAfterBatch } from "../prosemirror/tableGridMutation.js";
 import { isZeroWidthAnchor } from "../prosemirror/zeroWidthAnchors.js";
 import { getFolioParaIdFromBlockId } from "../types/block-id.js";
-import { BatchClaims } from "./batch-claims.js";
+import { CANONICAL_GAP } from "../types/canonicalCapabilities.js";
+import { BatchClaims, compareBatchTieOrder } from "./batch-claims.js";
 import { stripBlockIdentityAttrs } from "./block-identity.js";
 import { describeCharacterSplit } from "./character-boundaries.js";
 import { buildCleanBlockText, resolveCleanTextRange } from "./clean-text.js";
@@ -436,6 +438,10 @@ const preserveRunFormattingAcrossTrackedStyleChange = ({ allocateRevisionInfo, n
 		revisionIds
 	};
 };
+const appendParagraphPropertyChange = (existing, change) => {
+	if (change.info.provenance !== "suggested" && hasSerializableParagraphPropertyChange(existing)) panic("A paragraph-property write must resolve its occupied revision slot first");
+	return [...existing ?? [], change];
+};
 /**
 * Apply one paragraph-property patch to a live node. A tracked patch stores
 * the complete previous pPr: a partial snapshot cannot distinguish a property
@@ -482,7 +488,7 @@ const applyBlockParagraphProperties = ({ tr, position, node, properties, styleRe
 	const nextAttrs = {
 		...node.attrs,
 		...patch,
-		...change ? { _propertyChanges: [...Array.isArray(existing) ? existing : [], change] } : {}
+		...change ? { _propertyChanges: appendParagraphPropertyChange(existing, change) } : {}
 	};
 	const bridgeResult = preserveRunFormatting && revisionInfo ? preserveRunFormattingAcrossTrackedStyleChange({
 		allocateRevisionInfo: revisionInfo,
@@ -560,7 +566,7 @@ const applyReplaceBlockStyleId = ({ item, tr, styleResolver, revisionInfo }) =>
 	const nextAttrs = {
 		...block.attrs,
 		...patch,
-		...change ? { _propertyChanges: [...Array.isArray(existing) ? existing : [], change] } : {}
+		...change ? { _propertyChanges: appendParagraphPropertyChange(existing, change) } : {}
 	};
 	const bridgeResult = preserveRunFormatting && revisionInfo ? preserveRunFormattingAcrossTrackedStyleChange({
 		allocateRevisionInfo: revisionInfo,
@@ -1280,6 +1286,11 @@ const isInsertedPPrMark = (value) => typeof value === "object" && value !== null
 const isSuggestedParagraphInsert = (paragraph) => typeof paragraph.attrs["_suggestedInsert"] === "object" && paragraph.attrs["_suggestedInsert"] !== null;
 /** A paragraph mark that is a pending deletion, or a relocation's source. */
 const isDeletedPPrMark = (value) => typeof value === "object" && value !== null && "kind" in value && (value.kind === "del" || value.kind === "moveFrom");
+const pendingParagraphMarkPropertyRefusal = {
+	reason: "pendingParagraphMarkDeletion",
+	canonicalRefusal: { gap: CANONICAL_GAP.publicPendingParagraphMarkProperties },
+	message: "Resolve the pending paragraph mark deletion before editing its properties, or provide mergedParagraphProperties on the merge operation for atomic intent."
+};
 const hasRevisionMarker = (value) => typeof value === "object" && value !== null && "revisionId" in value;
 const isDeletedCell = (cell) => {
 	const marker = cell.attrs["cellMarker"];
@@ -1501,6 +1512,10 @@ const crossesBatchDeletion = ({ doc, from, to, batchRevisionIds }) => {
 	}
 	return false;
 };
+const canRetractFinalBreak = ({ predecessor, target }) => {
+	if (target.type !== predecessor.type) return false;
+	return !(JSON.stringify(paragraphPropertiesBeforePendingChanges(target)) !== JSON.stringify(paragraphPropertiesSnapshot(predecessor)) && hasSerializableParagraphPropertyChange(expectParagraphAttrs(predecessor)._propertyChanges));
+};
 /** Pending retirements, read after the merge has mapped any inserted separator. */
 const pendingRemovedFinalBreakPositions = (tr, deletions) => {
 	const positions = /* @__PURE__ */ new Set();
@@ -1512,6 +1527,92 @@ const pendingRemovedFinalBreakPositions = (tr, deletions) => {
 	}
 	return positions;
 };
+/** An unoccupied final carrier takes admissible writes from the finished batch. */
+const finalParagraphCarry = ({ tr, at, target, predecessor, batchRevisionIds, styleResolver, numbering }) => {
+	const { node: previous, position } = predecessor;
+	const beforeBatch = hasSerializableParagraphPropertyChange(expectParagraphAttrs(target)._propertyChanges) ? resolveParagraphChangeAttrs({
+		node: previous,
+		mode: "reject",
+		boundaryCovered: true,
+		revisionSet: batchRevisionIds,
+		styleResolver,
+		numbering
+	}) : null;
+	return {
+		source: beforeBatch ? previous.type.create(beforeBatch, previous.content, previous.marks) : previous,
+		keep: crossesBatchDeletion({
+			doc: tr.doc,
+			from: position + previous.nodeSize,
+			to: at,
+			batchRevisionIds
+		}) ? /* @__PURE__ */ new Set() : propertiesSetInBatch(target, batchRevisionIds)
+	};
+};
+/** Deferred retirement still owns a slot before a later explicit formatting merge. */
+const hasDeferredParagraphPropertyWrite = ({ tr, deletions, targets, mergedPropertyTargets, batchRevisionIds, styleResolver, numbering }) => {
+	for (const deletion of deletions) {
+		const at = tr.mapping.slice(deletion.mappedFrom).map(deletion.position);
+		const target = tr.doc.nodeAt(at);
+		if (!target) continue;
+		const predecessor = finalParagraphPredecessor(tr.doc, at);
+		if (!predecessor) continue;
+		const mark = predecessor.node.attrs["pPrMark"];
+		if (mark == null && mergedPropertyTargets.some(({ position, mappedFrom }) => {
+			const mapped = tr.mapping.slice(mappedFrom).mapResult(position);
+			return !mapped.deleted && mapped.pos === at;
+		})) continue;
+		const writeTarget = mark == null ? target : tr.doc.nodeAt(predecessor.position + predecessor.node.nodeSize);
+		if (!writeTarget || !targets.includes(writeTarget)) continue;
+		if (mark != null && !(isInsertedPPrMark(mark) && canRetractFinalBreak({
+			predecessor: predecessor.node,
+			target: writeTarget
+		}))) continue;
+		const transfer = mark == null ? finalParagraphCarry({
+			tr,
+			at,
+			target,
+			predecessor,
+			batchRevisionIds,
+			styleResolver,
+			numbering
+		}) : {
+			source: predecessor.node,
+			keep: propertiesSetInBatch(writeTarget, batchRevisionIds)
+		};
+		if (JSON.stringify(paragraphPropertiesSnapshot(writeTarget)) !== JSON.stringify(carriedParagraphProperties({
+			...transfer,
+			target: writeTarget
+		}))) return true;
+	}
+	return false;
+};
+/** The paragraph a merge leaves owns its properties, even across pending deleted breaks. */
+const paragraphPropertyRevisionTargets = ({ item, tr, deletedFinalParagraphs }) => {
+	const position = tr.mapping.map(item.blockFrom, item.operation.type === "replaceBlock" ? -1 : 1);
+	const source = tr.doc.nodeAt(position) ?? item.blockNode;
+	const targets = source.type.name === "paragraph" ? [source] : [];
+	if (item.operation.type !== "mergeBlockWithNext") return targets;
+	const removedBreakPositions = pendingRemovedFinalBreakPositions(tr, deletedFinalParagraphs);
+	for (const deletion of deletedFinalParagraphs) {
+		const at = tr.mapping.slice(deletion.mappedFrom).map(deletion.position);
+		const predecessor = finalParagraphPredecessor(tr.doc, at);
+		if (!predecessor || !isInsertedPPrMark(predecessor.node.attrs["pPrMark"])) continue;
+		const target = tr.doc.nodeAt(predecessor.position + predecessor.node.nodeSize);
+		if (!target) continue;
+		if (canRetractFinalBreak({
+			predecessor: predecessor.node,
+			target
+		})) removedBreakPositions.add(predecessor.position);
+	}
+	const survivorPosition = paragraphLeftAfter({
+		doc: tr.doc,
+		paragraphPos: position,
+		removedBreakPositions
+	});
+	const survivor = survivorPosition === null ? null : tr.doc.nodeAt(survivorPosition);
+	if (survivor?.type.name === "paragraph") targets.push(survivor);
+	return targets;
+};
 /**
 * Finish the tracked deletion of every paragraph a container ends with.
 *
@@ -1562,21 +1663,21 @@ const withRetiredFinalParagraphs = ({ tr, deletions, mergedPropertyTargets, appl
 					...revisionExtras
 				}
 			});
-			const beforeBatch = resolveParagraphChangeAttrs({
-				node: previous,
-				mode: "reject",
-				boundaryCovered: true,
-				revisionSet: batchRevisionIds,
-				styleResolver,
-				numbering
-			});
 			if (!mergedPropertyTargets.some(({ position: target, mappedFrom }) => {
 				const mapped = tr.mapping.slice(mappedFrom).mapResult(target);
 				return !mapped.deleted && mapped.pos === at;
 			})) carryParagraphProperties({
 				tr,
 				position: at,
-				source: beforeBatch ? previous.type.create(beforeBatch, previous.content, previous.marks) : previous,
+				...finalParagraphCarry({
+					tr,
+					at,
+					target: emptied,
+					predecessor,
+					batchRevisionIds,
+					styleResolver,
+					numbering
+				}),
 				styleResolver,
 				numbering,
 				revision: {
@@ -1584,13 +1685,7 @@ const withRetiredFinalParagraphs = ({ tr, deletions, mergedPropertyTargets, appl
 					author,
 					date,
 					...revisionExtras
-				},
-				keep: crossesBatchDeletion({
-					doc: tr.doc,
-					from: position + previous.nodeSize,
-					to: at,
-					batchRevisionIds
-				}) ? /* @__PURE__ */ new Set() : propertiesSetInBatch(emptied, batchRevisionIds)
+				}
 			});
 			resolvedOperationIds.add(operationId);
 			addedRevisions.push({
@@ -1601,11 +1696,10 @@ const withRetiredFinalParagraphs = ({ tr, deletions, mergedPropertyTargets, appl
 		}
 		if (isInsertedPPrMark(mark)) {
 			const following = tr.doc.nodeAt(position + previous.nodeSize);
-			if (following?.type.name !== emptied.type.name) continue;
-			const previousFormatting = paragraphPropertiesBeforePendingChanges(following);
-			const formattingChanges = JSON.stringify(previousFormatting) !== JSON.stringify(paragraphPropertiesSnapshot(previous));
-			const existing = expectParagraphAttrs(previous)._propertyChanges;
-			if (formattingChanges && hasSerializableParagraphPropertyChange(existing)) continue;
+			if (!following || !canRetractFinalBreak({
+				predecessor: previous,
+				target: following
+			})) continue;
 			joinAtParagraphMark({
 				tr,
 				paragraphPos: position,
@@ -2148,6 +2242,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			skipped.push({
 				id: operation.id,
 				reason: resolution.reason,
+				...resolution.canonicalRefusal !== void 0 && { canonicalRefusal: resolution.canonicalRefusal },
 				...resolution.message !== void 0 && { message: resolution.message }
 			});
 			continue;
@@ -2323,7 +2418,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			if (leftCellShape.tablePosition !== rightCellShape.tablePosition) return rightCellShape.tablePosition - leftCellShape.tablePosition;
 			if (leftCellShape.rectangle.bottom !== rightCellShape.rectangle.bottom) return rightCellShape.rectangle.bottom - leftCellShape.rectangle.bottom;
 			if (leftCellShape.rectangle.right !== rightCellShape.rectangle.right) return rightCellShape.rectangle.right - leftCellShape.rectangle.right;
-			return right.originalIndex - left.originalIndex;
+			return compareBatchTieOrder(left.originalIndex, right.originalIndex);
 		}
 		const leftColumn = left.tableColumnInsertion ?? left.tableColumnDeletion;
 		const rightColumn = right.tableColumnInsertion ?? right.tableColumnDeletion;
@@ -2334,19 +2429,32 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			if (leftColumn.columnIndex !== rightColumn.columnIndex) return rightColumn.columnIndex - leftColumn.columnIndex;
 			const leftIsInsertion = left.tableColumnInsertion !== void 0;
 			if (leftIsInsertion !== (right.tableColumnInsertion !== void 0)) return leftIsInsertion ? -1 : 1;
-			return right.originalIndex - left.originalIndex;
+			return compareBatchTieOrder(left.originalIndex, right.originalIndex);
 		}
 		if (left.from !== right.from) return right.from - left.from;
-		return right.originalIndex - left.originalIndex;
+		return compareBatchTieOrder(left.originalIndex, right.originalIndex);
 	});
 	for (let executionIndex = 0; executionIndex < executionOrder.length; executionIndex++) {
 		const item = executionOrder[executionIndex];
 		if (!item) panic("The operation execution index exceeded the resolved plan", { executionIndex });
 		continueSharedRevisionIds();
 		if (mode === "tracked-changes" && writesParagraphPropertyChange(item)) {
-			const livePosition = tr.mapping.map(item.blockFrom);
-			const liveBlock = tr.doc.nodeAt(livePosition) ?? item.blockNode;
-			if (hasSerializableParagraphPropertyChange(liveBlock.type.name === "paragraph" ? expectParagraphAttrs(liveBlock)._propertyChanges : void 0)) {
+			const appliedIds = new Set(applied.map(({ id }) => id));
+			const pendingDeletions = deletedFinalParagraphs.filter(({ operationId }) => appliedIds.has(operationId));
+			const targets = paragraphPropertyRevisionTargets({
+				item,
+				tr,
+				deletedFinalParagraphs: pendingDeletions
+			});
+			if (targets.some((target) => hasSerializableParagraphPropertyChange(expectParagraphAttrs(target)._propertyChanges)) || item.operation.type === "mergeBlockWithNext" && hasDeferredParagraphPropertyWrite({
+				tr,
+				deletions: pendingDeletions,
+				targets,
+				mergedPropertyTargets,
+				batchRevisionIds: new Set(applied.flatMap(({ revisionIds }) => revisionIds ?? [])),
+				styleResolver,
+				numbering
+			})) {
 				skipped.push({
 					id: item.operation.id,
 					reason: "pendingParagraphPropertyChange"
@@ -2580,6 +2688,13 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			case "replaceBlock": {
 				if (!isResolvedReplaceBlockOperation(item)) panic("Resolved replaceBlock operation lost its impact discriminator");
 				const { changesStyle, changesText } = REPLACE_BLOCK_IMPACT[item.replaceBlockImpact];
+				if (changesStyle && isDeletedPPrMark(tr.doc.nodeAt(tr.mapping.map(item.blockFrom, -1))?.attrs["pPrMark"])) {
+					skipped.push({
+						id: item.operation.id,
+						...pendingParagraphMarkPropertyRefusal
+					});
+					continue;
+				}
 				const revisionIdDelete = operationRevisionSeed;
 				const revisionIdInsert = changesText ? operationRevisionSeed + 1 : operationRevisionSeed;
 				const revisionIdBackgroundSeed = changesText ? operationRevisionSeed + 2 : operationRevisionSeed;
@@ -3072,9 +3187,21 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 						...isPairedMove(item.operation.moveId) && { moveKind: "moveFrom" },
 						...trackedRevisionExtras
 					});
-					tr = tr.addMark(item.from, item.to, deletionMark);
+					addTrackedDeletionMark({
+						insertionPolicy: "preserve-pending",
+						tr,
+						from: item.from,
+						to: item.to,
+						mark: deletionMark
+					});
 					const atomRanges = undeletedContentAtomRanges(tr, item.blockFrom);
-					for (const { from, to } of atomRanges) tr = tr.addMark(from, to, deletionMark);
+					for (const { from, to } of atomRanges) addTrackedDeletionMark({
+						insertionPolicy: "preserve-pending",
+						tr,
+						from,
+						to,
+						mark: deletionMark
+					});
 					for (const anchorId of textBoxAnchorIdsBetween(tr.doc, tr.mapping.map(item.blockFrom), tr.mapping.map(item.blockTo))) deletedTextBoxAnchorIds.add(anchorId);
 					encloseWholeControls({
 						tr,
@@ -3312,6 +3439,13 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 					continue;
 				}
 				const blockPosition = mapped.pos;
+				if (isDeletedPPrMark(liveBlock.attrs["pPrMark"])) {
+					skipped.push({
+						id: item.operation.id,
+						...pendingParagraphMarkPropertyRefusal
+					});
+					continue;
+				}
 				const appliedProperties = applyBlockParagraphProperties({
 					tr,
 					position: blockPosition,
@@ -3360,12 +3494,18 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 					appliedRevisionIds = [revisionIdMark];
 					if (item.to > item.from && deletionType) {
 						const revisionIdSeparator = operationRevisionSeed++;
-						tr = tr.addMark(item.from, item.to, deletionType.create({
-							revisionId: revisionIdSeparator,
-							author,
-							date,
-							...trackedRevisionExtras
-						}));
+						addTrackedDeletionMark({
+							insertionPolicy: "preserve-pending",
+							tr,
+							from: item.from,
+							to: item.to,
+							mark: deletionType.create({
+								revisionId: revisionIdSeparator,
+								author,
+								date,
+								...trackedRevisionExtras
+							})
+						});
 						appliedRevisionIds.push(revisionIdSeparator);
 					}
 					tr = tr.split(item.from);
@@ -3861,7 +4001,13 @@ const applyTextReplacement = ({ tr, item, mode, author, date, revisionIdDelete,
 		if (commentMark) nextTr = nextTr.addMark(inserted.start, inserted.end, commentMark);
 	}
 	if (item.to > item.from && deletionType) {
-		nextTr = nextTr.addMark(item.from, item.to, deletionType.create(delAttrs));
+		addTrackedDeletionMark({
+			insertionPolicy: "preserve-pending",
+			tr: nextTr,
+			from: item.from,
+			to: item.to,
+			mark: deletionType.create(delAttrs)
+		});
 		if (commentMark && replacement.length === 0) nextTr = nextTr.addMark(item.from, item.to, commentMark);
 	}
 	return nextTr;
@@ -4353,7 +4499,13 @@ const applyMinimalTrackedReplacement = ({ tr, item, noteReferences, replacement,
 			removedFrom = first.from;
 			marks = addCarriedMarks(inheritedReplacementMarks(doc, styleSource.from, styleSource.to), surveyReplacedAnnotations(doc, first.from, last.to).carried);
 			for (const piece of change.pieces) {
-				nextTr = nextTr.addMark(piece.from, piece.to, deletion);
+				addTrackedDeletionMark({
+					insertionPolicy: "preserve-pending",
+					tr: nextTr,
+					from: piece.from,
+					to: piece.to,
+					mark: deletion
+				});
 				if (commentMark) nextTr = nextTr.addMark(piece.from, piece.to, commentMark);
 			}
 		}
@@ -4889,17 +5041,23 @@ const resolveOperationTarget = ({ snapshot, operation, liveBlocks, liveBlocksByP
 			}
 		};
 	}
-	if (operation.type === "setBlockParagraphProperties") return {
-		type: "resolved",
-		operation: {
-			operation,
-			from: blockFrom,
-			to: blockTo,
-			blockFrom,
-			blockTo,
-			blockNode
-		}
-	};
+	if (operation.type === "setBlockParagraphProperties") {
+		if (isDeletedPPrMark(blockNode.attrs["pPrMark"])) return {
+			type: "skip",
+			...pendingParagraphMarkPropertyRefusal
+		};
+		return {
+			type: "resolved",
+			operation: {
+				operation,
+				from: blockFrom,
+				to: blockTo,
+				blockFrom,
+				blockTo,
+				blockNode
+			}
+		};
+	}
 	if (operation.type === "splitBlock") {
 		const separator = operation.separator ?? "";
 		const startOffset = operation.offset;
@@ -4965,6 +5123,10 @@ const resolveOperationTarget = ({ snapshot, operation, liveBlocks, liveBlocksByP
 	if (operation.type === "deleteBlock" || operation.type === "replaceBlock") {
 		const replaceChangesText = operation.type === "replaceBlock" && operation.text !== currentText;
 		const replaceChangesStyle = operation.type === "replaceBlock" && operation.styleId !== void 0 && operation.styleId !== (expectParagraphAttrs(blockNode).styleId ?? null);
+		if (replaceChangesStyle && isDeletedPPrMark(blockNode.attrs["pPrMark"])) return {
+			type: "skip",
+			...pendingParagraphMarkPropertyRefusal
+		};
 		if (replaceChangesText && cleanBlock.structuralBoundaries.some((boundary) => boundary.type !== "field" && boundary.type !== "noteReference")) return {
 			type: "skip",
 			reason: "unsupportedBlock"

package/dist/ai-edits/batch-claims.d.ts

@@ -21,6 +21,8 @@
  * Positions are the ones the batch resolved against. A block is keyed by the
  * position before its node.
  */
+/** Equal snapshot coordinates execute in reverse input order. */
+declare const compareBatchTieOrder: (leftIndex: number, rightIndex: number) => number;
 type PositionRange = {
   from: number;
   to: number;
@@ -142,4 +144,4 @@ declare class BatchClaims {
   add(operationId: string, claim: BatchClaim): void;
 }
 //#endregion
-export { BatchClaim, BatchClaims };
+export { BatchClaim, BatchClaims, compareBatchTieOrder };

package/dist/ai-edits/batch-claims.js

@@ -1,4 +1,28 @@
 //#region src/ai-edits/batch-claims.ts
+/**
+* Which operations of one batch may not share their targets.
+*
+* A batch resolves every operation against the document as it was read and
+* applies them from the end of the document backwards, so an operation never
+* moves the positions an earlier-placed one resolved to. That holds only while
+* the operations' targets are disjoint. Two operations on the same stretch of
+* text, or an operation inside a paragraph another one deletes, rewrites,
+* splits or merges away, are applied against coordinates the first one has
+* already invalidated — and the second then edits whatever now sits there,
+* which can be a paragraph neither operation named.
+*
+* Each operation therefore states what it claims before anything is applied,
+* and the later of two operations whose claims conflict is refused
+* (`overlappingOperation`). The caller re-reads the document after the batch
+* and sends the refused operation again against the result. What remains
+* applies exactly as the same operations applied one at a time, from the end
+* of the document backwards, would.
+*
+* Positions are the ones the batch resolved against. A block is keyed by the
+* position before its node.
+*/
+/** Equal snapshot coordinates execute in reverse input order. */
+const compareBatchTieOrder = (leftIndex, rightIndex) => rightIndex - leftIndex;
 const blockRolesOf = (claim) => {
 	switch (claim.type) {
 		case "text":
@@ -272,4 +296,4 @@ var BatchClaims = class {
 	}
 };
 //#endregion
-export { BatchClaims };
+export { BatchClaims, compareBatchTieOrder };

package/dist/ai-edits/headless.js

@@ -5,8 +5,7 @@ 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";
+import { isSeparatorEndnote, isSeparatorFootnote } from "../docx/footnoteParser.js";
 import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { getCachedNumberingMap } from "../docx/numberingParser.js";
 import { recreateProseNodeWithParagraphPropertySource, transferProseParagraphPropertySource } from "../docx/paragraphPropertySource.js";
@@ -15,6 +14,7 @@ import { createReply } from "../docx/replyToComment.js";
 import { repackDocx } from "../docx/rezip.js";
 import { sectionReferenceHistory } from "../docx/sectionReferenceHistory.js";
 import { attemptSelectiveSave } from "../docx/selectiveSave.js";
+import { getEndnoteText, getFootnoteText, getHeaderFooterText } from "../docx/storyPlainText.js";
 import { pluginsForHeadlessRevisionResolution } from "../internal/headlessRevisionResolutionGuard.js";
 import { withTrackedSectionEndpointRemoval } from "../internal/sectionEndpointResolution.js";
 import { captureSectionReferenceInventory, resolvedSectionReferenceLosses, withSectionReferenceResolution } from "../internal/sectionReferenceResolution.js";

package/dist/ai-edits/table-row-column-mutations.js

@@ -1,3 +1,4 @@
+import { addTrackedDeletionMark } from "../prosemirror/addTrackedDeletionMark.js";
 import { markStructuralChange } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
 import { markRowsEmptiedInBatch, reconcileTableGridAfterColumnInsertion, reconcileTableGridAfterColumnRemoval, removeRowsWithoutCells, removeTableRow } from "../prosemirror/tableGridMutation.js";
 import { stripBlockIdentityAttrs } from "./block-identity.js";
@@ -130,7 +131,7 @@ const markTableRowContent = ({ tr, rowPosition, kind, revision }) => {
 		if (!node.isInline) return true;
 		if (node.marks.some(isTrackedChangeMark)) {
 			wholeRowMarkable = false;
-			if (kind === "insertion" || node.marks.some(({ type }) => type.name === "deletion")) return false;
+			if (kind === "insertion") return false;
 		}
 		const from = contentFrom + offset;
 		markable.push({
@@ -140,10 +141,23 @@ const markTableRowContent = ({ tr, rowPosition, kind, revision }) => {
 		return false;
 	});
 	if (wholeRowMarkable) {
-		tr.addMark(contentFrom, rowPosition + row.nodeSize - 1, mark);
+		if (kind === "deletion") addTrackedDeletionMark({
+			insertionPolicy: "preserve-pending",
+			tr,
+			from: contentFrom,
+			to: rowPosition + row.nodeSize - 1,
+			mark
+		});
+		else tr.addMark(contentFrom, rowPosition + row.nodeSize - 1, mark);
 		return;
 	}
-	for (const range of markable) tr.addMark(range.from, range.to, mark);
+	for (const range of markable) if (kind === "deletion") addTrackedDeletionMark({
+		insertionPolicy: "preserve-pending",
+		tr,
+		...range,
+		mark
+	});
+	else tr.addMark(range.from, range.to, mark);
 };
 const isTrackedChangeMark = (mark) => mark.type.name === "insertion" || mark.type.name === "deletion";
 const isRowSpanningCell = (node) => {

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

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../types/document.js";
+import { CanonicalGap } from "../types/canonicalCapabilities.js";
 import { FolioContentBlock, FolioContentInlineBooleanProperty, FolioContentInlineFormatting, FolioContentInlineFormattingPatch, FolioContentListReference, FolioContentParagraphIndentation, FolioContentParagraphKind, FolioContentParagraphSpacing, FolioContentRun, FolioContentSnapshot, FolioContentTableLocation } from "../compare/content-types.js";
 import { ListKind } from "../docx/listNumberingInstances.js";
 //#region src/ai-edits/types.d.ts
@@ -656,7 +657,9 @@ type FolioAIEditSkipReason = "missingBlock" | "changedBlock" | "ambiguousFind" |
  * deletion is accepted. Reject that deletion first, or insert a new block
  * next to it.
  */
-"pendingDeletion";
+"pendingDeletion" |
+/** Resolve the removed paragraph mark before editing its properties separately. */
+"pendingParagraphMarkDeletion";
 type FolioAIEditAppliedOperation = {
   id: string;
   commentId?: number;
@@ -689,6 +692,9 @@ type FolioAIEditAppliedOperation = {
 type FolioAIEditSkippedOperation = {
   id: string;
   reason: FolioAIEditSkipReason;
+  canonicalRefusal?: {
+    gap: CanonicalGap;
+  };
   /**
    * What exactly was wrong when the reason alone does not say: the values a
    * `payloadDoesNotFit` skip could not place, the earlier operation an

package/dist/ai-suggestions/apply.js

@@ -1,6 +1,19 @@
+import { addTrackedDeletionMark } from "../prosemirror/addTrackedDeletionMark.js";
 import { mintRevisionId, seedRevisionIdsFromDoc } from "../prosemirror/plugins/revisionIds.js";
 import { resolveSuggestionAnchor } from "./conflict.js";
 //#region src/ai-suggestions/apply.ts
+/**
+* Apply AI suggestions to the document.
+*
+* Two modes:
+*  - "direct": replace text in place.
+*  - "tracked-changes": insertion + deletion marks, attributed to the
+*    configured author. Reuses the editor's existing tracked-change
+*    schema and resolution commands.
+*
+* Apply is always preceded by anchor resolution; stale suggestions are
+* skipped and reported back to the caller.
+*/
 function applySuggestions(options) {
 	const { view, suggestions, mode, author } = options;
 	const applied = [];
@@ -51,7 +64,13 @@ function applySuggestions(options) {
 				tr.insertText(suggestion.suggestedText, to, to);
 				tr.addMark(to, to + suggestion.suggestedText.length, insertionType.create(attrs));
 			}
-			if (to > from) tr.addMark(from, to, deletionType.create(attrs));
+			if (to > from) addTrackedDeletionMark({
+				insertionPolicy: "preserve-pending",
+				tr,
+				from,
+				to,
+				mark: deletionType.create(attrs)
+			});
 			applied.push(suggestion.id);
 		}
 	}

package/dist/compare/compare.js

@@ -486,6 +486,7 @@ const COMPARE_SKIP_DISPOSITION = {
 	staleRange: "fatal",
 	emptyOperation: "unwritable",
 	pendingParagraphPropertyChange: "unwritable",
+	pendingParagraphMarkDeletion: "unwritable",
 	pendingRunPropertyChange: "unwritable",
 	noopOperation: "unwritable",
 	documentVersionMismatch: "fatal",