@adeu/core 1.17.1 → 1.18.0

package/dist/index.js

@@ -1333,7 +1333,19 @@ ${header}`;
           this._add_virtual_text(" | ", current, null);
           current += 3;
         }
+        const cell_start = current;
         current = this._map_blocks(cell, current);
+        if (!this.clean_view && !this.original_view) {
+          const firstP = cell._element.getElementsByTagName("w:p")[0];
+          const paraId = firstP ? firstP.getAttribute("w14:paraId") : null;
+          if (paraId && firstP) {
+            const cellPara = new Paragraph(firstP, cell);
+            this._add_virtual_text("", current, cellPara);
+            const anchor = `{#cell:${paraId}}`;
+            this._add_virtual_text(anchor, current, cellPara);
+            current += anchor.length;
+          }
+        }
         cells_processed += 1;
       }
       if (ins && !this.clean_view && !this.original_view) {
@@ -1710,7 +1722,7 @@ ${header}`;
     target_text = this._strip_markdown_formatting(target_text);
     target_text = this._replace_smart_quotes(target_text);
     const parts = [];
-    const token_pattern = /(\[_+\])|(\s+)|(['"])|([.,;:\/])/g;
+    const token_pattern = /(\[_+\])|(\s+)|(['"])|([.,;:\/\-\[\](){}+=$?*!|#^<>\\%&@~`_])/g;
     let last_idx = 0;
     let match;
     const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -2596,7 +2608,7 @@ function _refine_match_boundaries(text, start, end) {
 function _make_fuzzy_regex(target_text) {
   target_text = _replace_smart_quotes(target_text);
   const parts = [];
-  const token_pattern = /(_+)|(\s+)|(['"])|([.,;:\/])/g;
+  const token_pattern = /(_+)|(\s+)|(['"])|([.,;:\/\-\[\](){}+=$?*!|#^<>\\%&@~`])/g;
   const md_noise = "[*_]*";
   const structural_noise = "(?:\\s*(?:[*+\\->]|\\d+\\.)\\s+|\\s*\\n\\s*)";
   const start_list_marker = "(?:[ \\t]*(?:[*+\\->]|\\d+\\.)\\s+)?";
@@ -2818,6 +2830,51 @@ function insertAfter(newNode, refNode) {
     refNode.parentNode.insertBefore(newNode, refNode.nextSibling);
   }
 }
+function takeSnapshot(doc) {
+  const parts = [...doc.pkg.parts];
+  const unzipped = { ...doc.pkg.unzipped };
+  const rels = /* @__PURE__ */ new Map();
+  const elements = /* @__PURE__ */ new Map();
+  for (const part of parts) {
+    rels.set(part, new Map(part.rels));
+    if (part._element) {
+      elements.set(part, part._element.cloneNode(true));
+    }
+  }
+  return { parts, unzipped, rels, elements };
+}
+function restoreSnapshot(doc, snapshot) {
+  doc.pkg.parts = [...snapshot.parts];
+  for (const key of Object.keys(doc.pkg.unzipped)) {
+    delete doc.pkg.unzipped[key];
+  }
+  for (const [key, val] of Object.entries(snapshot.unzipped)) {
+    doc.pkg.unzipped[key] = val;
+  }
+  for (const part of snapshot.parts) {
+    part.rels = new Map(snapshot.rels.get(part));
+    const originalEl = snapshot.elements.get(part);
+    if (originalEl && part._element) {
+      const xmlDoc = part._element.ownerDocument;
+      if (xmlDoc && xmlDoc.documentElement) {
+        xmlDoc.replaceChild(originalEl, xmlDoc.documentElement);
+      }
+      part._element = originalEl;
+    }
+  }
+}
+function stripMatchingHeadingHashes(target, newText) {
+  if (!target || !newText) return [target, newText];
+  const targetMatch = target.match(/^(#+)\s+/);
+  const newMatch = newText.match(/^(#+)\s+/);
+  if (targetMatch && newMatch && targetMatch[1] === newMatch[1]) {
+    const hashes = targetMatch[1];
+    const targetClean = target.substring(hashes.length).trimStart();
+    const newClean = newText.substring(hashes.length).trimStart();
+    return [targetClean, newClean];
+  }
+  return [target, newText];
+}
 var BatchValidationError = class extends Error {
   errors;
   constructor(errors) {
@@ -2826,7 +2883,7 @@ var BatchValidationError = class extends Error {
     this.errors = errors;
   }
 };
-function validate_edit_strings(edits) {
+function validate_edit_strings(edits, index_offset = 0) {
   const errors = [];
   for (let i = 0; i < edits.length; i++) {
     const edit = edits[i];
@@ -2834,7 +2891,7 @@ function validate_edit_strings(edits) {
     const n_text = edit.new_text || "";
     if (n_text.includes("{++") || n_text.includes("{--") || n_text.includes("{>>") || n_text.includes("{==")) {
       errors.push(
-        `- Edit ${i + 1} Failed: Do not manually write CriticMarkup tags ({++, {--, {>>, {==) in \`new_text\`. The engine handles redlining automatically. To add a comment, use the \`comment\` parameter.`
+        `- Edit ${i + 1 + index_offset} Failed: Do not manually write CriticMarkup tags ({++, {--, {>>, {==) in \`new_text\`. The engine handles redlining automatically. To add a comment, use the \`comment\` parameter.`
       );
     }
     if (t_text.includes("[^") || n_text.includes("[^")) {
@@ -2845,11 +2902,11 @@ function validate_edit_strings(edits) {
           (f) => n_fns.filter((x) => x === f).length > t_fns.filter((x) => x === f).length
         )) {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot insert footnote/endnote markers via text replace. Markers like \`[^fn-N]\` are read-only projections. Use Word's References menu.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot insert footnote/endnote markers via text replace. Markers like \`[^fn-N]\` are read-only projections. Use Word's References menu.`
           );
         } else {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot delete footnote/endnote references via text replace. The marker corresponds to a structural XML element.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot delete footnote/endnote references via text replace. The marker corresponds to a structural XML element.`
           );
         }
       }
@@ -2860,16 +2917,16 @@ function validate_edit_strings(edits) {
       if (t_links.length !== n_links.length) {
         if (n_links.length > t_links.length) {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot insert hyperlinks via text replace. Use a dedicated structural operation.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot insert hyperlinks via text replace. Use a dedicated structural operation.`
           );
         } else {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot delete hyperlinks via text replace. The marker corresponds to a structural XML element.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot delete hyperlinks via text replace. The marker corresponds to a structural XML element.`
           );
         }
       } else if (t_links.length > 1 && JSON.stringify(t_links) !== JSON.stringify(n_links)) {
         errors.push(
-          `- Edit ${i + 1} Failed: Can only edit or retarget one hyperlink per text replacement. Please split into multiple edits.`
+          `- Edit ${i + 1 + index_offset} Failed: Can only edit or retarget one hyperlink per text replacement. Please split into multiple edits.`
         );
       }
     }
@@ -2879,17 +2936,17 @@ function validate_edit_strings(edits) {
       if (t_xrefs.length !== n_xrefs.length) {
         if (n_xrefs.length > t_xrefs.length) {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot insert cross-references via text replace. Markers are read-only projections.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot insert cross-references via text replace. Markers are read-only projections.`
           );
         } else {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot delete cross-references via text replace. The marker corresponds to a structural XML element.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot delete cross-references via text replace. The marker corresponds to a structural XML element.`
           );
         }
       } else {
         if (JSON.stringify(t_xrefs) !== JSON.stringify(n_xrefs)) {
           errors.push(
-            `- Edit ${i + 1} Failed: Modifying or retargeting cross-reference markers is disallowed to prevent dependency corruption.`
+            `- Edit ${i + 1 + index_offset} Failed: Modifying or retargeting cross-reference markers is disallowed to prevent dependency corruption.`
           );
         }
       }
@@ -2900,7 +2957,7 @@ function validate_edit_strings(edits) {
       for (const a of n_anchors) {
         if (n_anchors.filter((x) => x === a).length > t_anchors.filter((x) => x === a).length) {
           errors.push(
-            `- Edit ${i + 1} Failed: Cannot modify or insert internal anchor markers (\`{#...}\`). These represent structural XML bookmarks.`
+            `- Edit ${i + 1 + index_offset} Failed: Cannot modify or insert internal anchor markers (\`{#...}\`). These represent structural XML bookmarks.`
           );
           break;
         }
@@ -2914,16 +2971,16 @@ function validate_edit_strings(edits) {
           const level = stripped.length - stripped.replace(/^#+/, "").length;
           if (stripped.substring(level).startsWith(" ") || stripped.substring(level) === "") {
             errors.push(
-              `- Edit ${i + 1} Failed: Heading level ${level} is not supported (maximum is 6).`
+              `- Edit ${i + 1 + index_offset} Failed: Heading level ${level} is not supported (maximum is 6).`
             );
             break;
           }
         }
       }
     }
-    if (t_text.includes("READONLY_BOUNDARY_START") || n_text.includes("READONLY_BOUNDARY_START") || t_text.includes("# Document Structure (Read-Only)") || n_text.includes("# Document Structure (Read-Only)")) {
+    if (t_text.includes("READONLY_BOUNDARY_START") || n_text.includes("READONLY_BOUNDARY_START") || t_text.includes("# Document Structure (Read-Only)") || n_text.includes("# Document Structure (Read-Only)") || t_text.includes("Document Structure (Read-Only)") || n_text.includes("Document Structure (Read-Only)")) {
       errors.push(
-        `- Edit ${i + 1} Failed: Modification targets the read-only boundary (Structural Appendix). This section cannot be edited.`
+        `- Edit ${i + 1 + index_offset} Failed: Modification targets the read-only boundary (Structural Appendix). This section cannot be edited.`
       );
     }
   }
@@ -2945,7 +3002,7 @@ var RedlineEngine = class {
     this.timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
     const w16du_ns = "http://schemas.microsoft.com/office/word/2023/wordml/word16du";
     for (const part of this.doc.pkg.parts) {
-      if (part === this.doc.part || part.contentType.includes("wordprocessingml") && part.contentType.endsWith("+xml")) {
+      if (part === this.doc.part) {
         if (!part._element.hasAttribute("xmlns:w16du")) {
           part._element.setAttribute("xmlns:w16du", w16du_ns);
         }
@@ -2962,15 +3019,59 @@ var RedlineEngine = class {
     }
     return null;
   }
+  /**
+   * Best-effort "did you mean" hint for a failed target. The common loop trap
+   * (observed in the field) is an anchored regex like `^\( x \)$` against a
+   * mid-document string: ^/$ bind to the whole full_text, so it never matches
+   * even though the literal `( x )` is present. We strip regex anchoring/escapes
+   * and probe full_text for a literal occurrence; if found, we tell the model
+   * the exact literal that WOULD match so it drops the anchors instead of
+   * escalating the regex further.
+   */
+  _nearest_match_hint(target_text, is_regex) {
+    if (!target_text) return "";
+    let probe = target_text;
+    if (is_regex) {
+      probe = probe.replace(/^\^/, "").replace(/\$$/, "");
+      probe = probe.replace(/^\\s\*/, "").replace(/\\s\*$/, "");
+      probe = probe.replace(/\\([.^$*+?()[\]{}|\\/])/g, "$1");
+    }
+    probe = probe.trim();
+    if (!probe || probe === target_text) {
+      if (!is_regex) return "";
+    }
+    const idx = this.mapper.full_text.indexOf(probe);
+    if (idx !== -1) {
+      const ctx_start = Math.max(0, idx - 15);
+      const ctx_end = Math.min(
+        this.mapper.full_text.length,
+        idx + probe.length + 15
+      );
+      const ctx = this.mapper.full_text.substring(ctx_start, ctx_end).replace(/\n/g, " ");
+      return `
+  Did you mean the literal "${probe}"? It appears in the document (\u2026${ctx}\u2026). If you used a regex, drop the ^/$ anchors \u2014 they match the start/end of the entire document, not a line.`;
+    }
+    return "";
+  }
   _build_edit_context_previews(edit) {
     if (edit.type !== "modify") return [null, null];
     if (edit._resolved_proxy_edit) {
       edit = edit._resolved_proxy_edit;
     }
-    const start_idx = edit._resolved_start_idx;
+    let start_idx = edit._resolved_start_idx;
     if (start_idx === void 0 || start_idx === null) return [null, null];
-    const target_text = edit.target_text || "";
-    const new_text = edit.new_text || "";
+    let target_text = edit.target_text || "";
+    let new_text = edit.new_text || "";
+    const [clean_target, target_style] = this._parse_markdown_style(target_text);
+    if (target_style && target_style.startsWith("Heading")) {
+      const prefix_len = target_text.length - clean_target.length;
+      start_idx += prefix_len;
+      target_text = clean_target;
+    }
+    const [clean_new, new_style] = this._parse_markdown_style(new_text);
+    if (new_style && new_style.startsWith("Heading")) {
+      new_text = clean_new;
+    }
     const length = target_text.length;
     const active_mapper = edit._active_mapper_ref || this.mapper;
     const full_text = active_mapper.full_text;
@@ -3194,6 +3295,93 @@ var RedlineEngine = class {
       }
     }
   }
+  /**
+   * Revert every tracked change, returning the document to the state it had
+   * before any revision was proposed. The exact inverse of
+   * accept_all_revisions:
+   *
+   *   - <w:ins>  -> removed together with all of its content (the proposed
+   *                 insertion never existed); an inserted row (<w:ins> in
+   *                 <w:trPr>) drops the whole row.
+   *   - <w:del>  -> unwrapped, restoring the original text (<w:delText> becomes
+   *                 <w:t> again); a row-deletion mark in <w:trPr> is removed so
+   *                 the row survives.
+   *   - paragraph-mark <w:del> in pPr/rPr -> removed, undoing a proposed merge.
+   *
+   * Comments are annotations, not revisions, so standalone comments are left in
+   * place; only anchors stranded inside a rejected insertion are cleaned up.
+   *
+   * Insertions are reverted before deletions are restored so a deletion nested
+   * inside a foreign author's insertion is removed wholesale with the insertion
+   * — the contingent text disappears rather than being promoted to committed
+   * body text.
+   *
+   * Known limitation: tracked paragraph STRUCTURE changes (a split recorded as a
+   * pilcrow <w:ins>, or a merge recorded as a pilcrow <w:del>) are reverted only
+   * to the extent of dropping/keeping the mark; the original paragraph boundary
+   * is not reconstructed, because the merge protocol coalesces paragraphs
+   * destructively at edit time. Reverting run-level insertions/deletions (the
+   * common case) is exact. This limitation is shared with the Python engine.
+   */
+  reject_all_revisions() {
+    const parts_to_process = [this.doc.element];
+    for (const part of this.doc.pkg.parts) {
+      if (part === this.doc.part) continue;
+      if (part.contentType.includes("wordprocessingml") && part.contentType.endsWith("+xml")) {
+        parts_to_process.push(part._element);
+      }
+    }
+    for (const root_element of parts_to_process) {
+      const insNodes = findAllDescendants(root_element, "w:ins");
+      for (const ins of insNodes) {
+        const parent = ins.parentNode;
+        if (!parent) continue;
+        this._clean_wrapping_comments(ins);
+        this._delete_comments_in_element(ins);
+        if (parent.tagName === "w:trPr") {
+          const row = parent.parentNode;
+          if (row && row.parentNode) {
+            row.parentNode.removeChild(row);
+          }
+        } else {
+          parent.removeChild(ins);
+        }
+      }
+      const pNodes = findAllDescendants(root_element, "w:p");
+      for (const p of pNodes) {
+        const pPr = findChild(p, "w:pPr");
+        if (pPr) {
+          const rPr = findChild(pPr, "w:rPr");
+          const delMark = rPr ? findChild(rPr, "w:del") : null;
+          if (rPr && delMark) {
+            rPr.removeChild(delMark);
+          }
+        }
+      }
+      const delNodes = findAllDescendants(root_element, "w:del");
+      for (const d of delNodes) {
+        const parent = d.parentNode;
+        if (!parent) continue;
+        this._clean_wrapping_comments(d);
+        if (parent.tagName === "w:trPr") {
+          parent.removeChild(d);
+          continue;
+        }
+        const delTexts = Array.from(d.getElementsByTagName("w:delText"));
+        for (const dt of delTexts) {
+          const t = d.ownerDocument.createElement("w:t");
+          t.textContent = dt.textContent;
+          if (dt.hasAttribute("xml:space"))
+            t.setAttribute("xml:space", "preserve");
+          dt.parentNode?.replaceChild(t, dt);
+        }
+        while (d.firstChild) {
+          parent.insertBefore(d.firstChild, d);
+        }
+        parent.removeChild(d);
+      }
+    }
+  }
   _getNextId() {
     this.current_id++;
     return this.current_id.toString();
@@ -3722,28 +3910,34 @@ var RedlineEngine = class {
       }
     }
   }
-  validate_edits(edits) {
+  validate_edits(edits, index_offset = 0) {
     const errors = [];
     if (!this.mapper.full_text) this.mapper["_build_map"]();
-    errors.push(...validate_edit_strings(edits));
+    errors.push(...validate_edit_strings(edits, index_offset));
     for (let i = 0; i < edits.length; i++) {
       const edit = edits[i];
       if (typeof edit !== "object" || edit === null) {
         errors.push(
-          `- Edit ${i + 1} Failed: Invalid change format. Expected a JSON object, but received a primitive ${typeof edit}. Do not pass raw strings.`
+          `- Edit ${i + 1 + index_offset} Failed: Invalid change format. Expected a JSON object, but received a primitive ${typeof edit}. Do not pass raw strings.`
         );
         continue;
       }
       if (!edit.target_text) continue;
       const is_regex = edit.regex || false;
       const match_mode = edit.match_mode || "strict";
-      let matches = this.mapper.find_all_match_indices(edit.target_text, is_regex);
+      let matches = this.mapper.find_all_match_indices(
+        edit.target_text,
+        is_regex
+      );
       let activeText = this.mapper.full_text;
       let target_mapper = this.mapper;
       if (matches.length === 0) {
         if (!this.clean_mapper)
           this.clean_mapper = new DocumentMapper(this.doc, true);
-        matches = this.clean_mapper.find_all_match_indices(edit.target_text, is_regex);
+        matches = this.clean_mapper.find_all_match_indices(
+          edit.target_text,
+          is_regex
+        );
         if (matches.length > 0) {
           activeText = this.clean_mapper.full_text;
           target_mapper = this.clean_mapper;
@@ -3765,7 +3959,10 @@ var RedlineEngine = class {
         if (!this.original_mapper) {
           this.original_mapper = new DocumentMapper(this.doc, false, true);
         }
-        const orig_matches = this.original_mapper.find_all_match_indices(edit.target_text, is_regex);
+        const orig_matches = this.original_mapper.find_all_match_indices(
+          edit.target_text,
+          is_regex
+        );
         if (orig_matches.length > 0) {
           is_deleted_text = true;
           for (const [start, length] of orig_matches) {
@@ -3794,27 +3991,32 @@ var RedlineEngine = class {
         if (is_deleted_text) {
           const author_phrase = deleted_authors.size > 0 ? `by ${Array.from(deleted_authors).sort().join(", ")}` : "by an existing revision";
           errors.push(
-            `- Edit ${i + 1} Failed: Target text matches text inside a tracked deletion ${author_phrase}. Reject/accept that change first or target the active replacement text instead.`
+            `- Edit ${i + 1 + index_offset} Failed: Target text matches text inside a tracked deletion ${author_phrase}. Reject/accept that change first or target the active replacement text instead.`
           );
         } else {
+          const hint = this._nearest_match_hint(edit.target_text, is_regex);
           errors.push(
-            `- Edit ${i + 1} Failed: Target text not found in document:
-  "${edit.target_text}"`
+            `- Edit ${i + 1 + index_offset} Failed: Target text not found in document:
+  "${edit.target_text}"${hint}`
           );
         }
       } else if (matches.length > 1 && match_mode === "strict") {
-        const positions = matches.map(([start, length]) => [
-          start,
-          start + length
-        ]);
-        errors.push(
-          format_ambiguity_error(
-            i + 1,
-            edit.target_text,
-            activeText,
-            positions
-          )
-        );
+        if (edit.target_text.includes("|")) {
+          matches = matches.slice(0, 1);
+        } else {
+          const positions = matches.map(([start, length]) => [
+            start,
+            start + length
+          ]);
+          errors.push(
+            format_ambiguity_error(
+              i + 1 + index_offset,
+              edit.target_text,
+              activeText,
+              positions
+            )
+          );
+        }
       }
       if (matches.length === 1) {
         const [m_start, m_len] = matches[0];
@@ -3827,29 +4029,36 @@ var RedlineEngine = class {
           (edit.new_text || "").length - sfx
         );
         if (final_target.includes("\n\n")) {
-          if (final_new.includes("\n\n")) {
-            const parts = matched.split("\n\n");
-            if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
-              errors.push(
-                `- Edit ${i + 1} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
-              );
-            }
-          } else {
-            const parts = final_target.split("\n\n");
-            if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
-              errors.push(
-                `- Edit ${i + 1} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
-              );
+          const balanced = matched.split("\n\n").length === (edit.new_text || "").split("\n\n").length;
+          if (!balanced) {
+            if (final_new.includes("\n\n")) {
+              const parts = matched.split("\n\n");
+              if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
+                errors.push(
+                  `- Edit ${i + 1 + index_offset} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
+                );
+              }
+            } else {
+              const parts = final_target.split("\n\n");
+              if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
+                errors.push(
+                  `- Edit ${i + 1 + index_offset} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
+                );
+              }
             }
           }
         }
       }
       for (const [start, length] of matches) {
-        const spans = this.mapper.spans.filter(
+        const spans = target_mapper.spans.filter(
           (s) => s.end > start && s.start < start + length
         );
-        const nestedAuthors = /* @__PURE__ */ new Set();
+        const insAuthors = /* @__PURE__ */ new Set();
+        const commentAuthors = /* @__PURE__ */ new Set();
+        let hasNonForeignRealText = false;
         for (const s of spans) {
+          if (s.run === null) continue;
+          let isForeignIns = false;
           if (s.ins_id) {
             const insNodes = findAllDescendants(
               this.doc.element,
@@ -3857,21 +4066,35 @@ var RedlineEngine = class {
             ).filter((n) => n.getAttribute("w:id") === s.ins_id);
             if (insNodes.length > 0) {
               const auth = insNodes[0].getAttribute("w:author");
-              if (auth && auth !== this.author) nestedAuthors.add(auth);
+              if (auth && auth !== this.author) {
+                insAuthors.add(auth);
+                isForeignIns = true;
+              }
             }
           }
+          if (!isForeignIns) hasNonForeignRealText = true;
+        }
+        for (const s of spans) {
           if (s.comment_ids) {
             for (const cid of s.comment_ids) {
               const c_data = this.mapper.comments_map[cid];
               if (c_data && c_data.author && c_data.author !== this.author) {
-                nestedAuthors.add(c_data.author);
+                commentAuthors.add(c_data.author);
               }
             }
           }
         }
-        if (nestedAuthors.size > 0) {
+        if (insAuthors.size > 0 || commentAuthors.size > 0) {
+          const fullyWithinForeignIns = insAuthors.size > 0 && !hasNonForeignRealText && commentAuthors.size === 0;
+          if ((match_mode === "strict" || match_mode === "first") && fullyWithinForeignIns) {
+            continue;
+          }
+          const nestedAuthors = /* @__PURE__ */ new Set([
+            ...insAuthors,
+            ...commentAuthors
+          ]);
           errors.push(
-            `- Edit ${i + 1} Failed: Modification targets an active insertion from another author (${Array.from(nestedAuthors).join(", ")}). Accept that change first or scope your edit outside of it.`
+            `- Edit ${i + 1 + index_offset} Failed: Modification targets an active insertion from another author (${Array.from(nestedAuthors).join(", ")}). Accept that change first or scope your edit outside of it.`
           );
         }
       }
@@ -3933,22 +4156,13 @@ var RedlineEngine = class {
       });
     }
     if (dry_run) {
-      const baselines = /* @__PURE__ */ new Map();
-      for (const part of this.doc.pkg.parts) {
-        if (part._element) {
-          baselines.set(part, part._element.cloneNode(true));
-        }
-      }
+      const snapshot = takeSnapshot(this.doc);
+      const originalCurrentId = this.current_id;
       try {
         return this._process_batch_internal(changes, true);
       } finally {
-        for (const [part, originalEl] of baselines.entries()) {
-          const doc = part._element.ownerDocument;
-          if (doc && doc.documentElement) {
-            doc.replaceChild(originalEl, doc.documentElement);
-          }
-          part._element = originalEl;
-        }
+        restoreSnapshot(this.doc, snapshot);
+        this.current_id = originalCurrentId;
         this.mapper = new DocumentMapper(this.doc);
         this.comments_manager = new CommentsManager(this.doc);
         this.clean_mapper = null;
@@ -3958,6 +4172,13 @@ var RedlineEngine = class {
     }
   }
   _process_batch_internal(changes, dry_run_mode = false) {
+    for (const c of changes) {
+      if (c && typeof c === "object" && c.type === "modify" && c.target_text && c.new_text) {
+        const [strippedTarget, strippedNew] = stripMatchingHeadingHashes(c.target_text, c.new_text);
+        c.target_text = strippedTarget;
+        c.new_text = strippedNew;
+      }
+    }
     this.skipped_details = [];
     const actions = changes.filter(
       (c) => c !== null && typeof c === "object" && ["accept", "reject", "reply"].includes(c.type)
@@ -3966,13 +4187,13 @@ var RedlineEngine = class {
       (c) => c === null || typeof c !== "object" || !["accept", "reject", "reply"].includes(c.type)
     );
     if (!dry_run_mode) {
-      const all_errors = [];
-      if (actions.length > 0) {
-        all_errors.push(...this.validate_review_actions(actions));
-      }
-      if (edits.length > 0) {
-        all_errors.push(...this.validate_edits(edits));
-      }
+      const action_errors = actions.length > 0 ? this.validate_review_actions(actions) : [];
+      const validate_edits_now = edits.length > 0 && action_errors.length > 0;
+      const edit_errors = validate_edits_now ? this.validate_edits(edits) : [];
+      const all_errors = [
+        ...action_errors,
+        ...edit_errors
+      ];
       if (all_errors.length > 0) {
         throw new BatchValidationError(all_errors);
       }
@@ -4006,8 +4227,9 @@ var RedlineEngine = class {
     let skipped_edits = 0;
     if (edits.length > 0) {
       if (dry_run_mode) {
-        for (const edit of edits) {
-          const single_errors = this.validate_edits([edit]);
+        for (let i = 0; i < edits.length; i++) {
+          const edit = edits[i];
+          const single_errors = this.validate_edits([edit], i);
           const warning = this._check_punctuation_warning(
             edit.target_text || ""
           );
@@ -4041,6 +4263,8 @@ var RedlineEngine = class {
               occurrences_modified: edit._occurrences_modified || 0,
               match_mode: edit.match_mode || "strict"
             });
+            this.mapper = new DocumentMapper(this.doc);
+            this.clean_mapper = null;
           } else {
             skipped_edits++;
             const error_msg = this.skipped_details.length > 0 ? this.skipped_details[this.skipped_details.length - 1] : "Failed to apply edit";
@@ -4056,15 +4280,37 @@ var RedlineEngine = class {
           }
         }
       } else {
-        const errors = this.validate_edits(edits);
-        if (errors.length > 0) {
-          throw new BatchValidationError(errors);
-        }
-        const cloned_edits = edits.map((e) => JSON.parse(JSON.stringify(e)));
-        const res = this.apply_edits(cloned_edits, page_offsets);
-        applied_edits = cloned_edits.filter((e) => e._applied_status).length;
-        skipped_edits = cloned_edits.length - applied_edits;
-        for (const edit of cloned_edits) {
+        const snapshot = takeSnapshot(this.doc);
+        const originalCurrentId = this.current_id;
+        try {
+          const sequential_errors = [];
+          for (let i = 0; i < edits.length; i++) {
+            const edit = edits[i];
+            const single_errors = this.validate_edits([edit], i);
+            if (single_errors.length > 0) {
+              sequential_errors.push(...single_errors);
+            } else {
+              this.apply_edits([edit], page_offsets);
+              this.mapper = new DocumentMapper(this.doc);
+              this.clean_mapper = null;
+            }
+          }
+          if (sequential_errors.length > 0) {
+            throw new BatchValidationError(sequential_errors);
+          }
+        } catch (err) {
+          restoreSnapshot(this.doc, snapshot);
+          this.current_id = originalCurrentId;
+          this.mapper = new DocumentMapper(this.doc);
+          this.comments_manager = new CommentsManager(this.doc);
+          this.clean_mapper = null;
+          throw err;
+        }
+        applied_edits = edits.filter(
+          (e) => e._applied_status
+        ).length;
+        skipped_edits = edits.length - applied_edits;
+        for (const edit of edits) {
           const success = edit._applied_status || false;
           const error_msg = edit._error_msg || null;
           const warning = this._check_punctuation_warning(
@@ -4183,6 +4429,7 @@ var RedlineEngine = class {
       (a, b) => (b[0]._resolved_start_idx || 0) - (a[0]._resolved_start_idx || 0)
     );
     const occupied_ranges = [];
+    const counted_split_groups = /* @__PURE__ */ new Set();
     for (const [edit, orig_new] of resolved_edits) {
       const start = edit._resolved_start_idx || 0;
       const end = start + (edit.target_text ? edit.target_text.length : 0);
@@ -4211,21 +4458,38 @@ var RedlineEngine = class {
         success = this._apply_table_edit(edit, false);
       }
       if (success) {
-        applied++;
+        const group_id = edit._split_group_id;
+        const first_in_group = group_id === void 0 || group_id === null || !counted_split_groups.has(group_id);
+        if (first_in_group && group_id !== void 0 && group_id !== null) {
+          counted_split_groups.add(group_id);
+        }
+        if (first_in_group) applied++;
         occupied_ranges.push([start, end]);
         edit._applied_status = true;
         const parent = edit._parent_edit_ref;
         if (parent) {
           parent._applied_status = true;
-          parent._occurrences_modified = (parent._occurrences_modified || 0) + 1;
-          const [path, page] = this._get_heading_path_and_page(start, this.mapper.full_text, page_offsets);
+          if (first_in_group) {
+            parent._occurrences_modified = (parent._occurrences_modified || 0) + 1;
+          }
+          const [path, page] = this._get_heading_path_and_page(
+            start,
+            this.mapper.full_text,
+            page_offsets
+          );
           const pages = parent._pages || [];
           if (!pages.includes(page)) pages.unshift(page);
           parent._pages = pages;
           parent._heading_path = path;
         } else {
-          edit._occurrences_modified = (edit._occurrences_modified || 0) + 1;
-          const [path, page] = this._get_heading_path_and_page(start, this.mapper.full_text, page_offsets);
+          if (first_in_group) {
+            edit._occurrences_modified = (edit._occurrences_modified || 0) + 1;
+          }
+          const [path, page] = this._get_heading_path_and_page(
+            start,
+            this.mapper.full_text,
+            page_offsets
+          );
           const pages = edit._pages || [];
           if (!pages.includes(page)) pages.unshift(page);
           edit._pages = pages;
@@ -4386,12 +4650,18 @@ var RedlineEngine = class {
     if (!edit.target_text) return null;
     const is_regex = edit.regex || false;
     const match_mode = edit.match_mode || "strict";
-    let matches = this.mapper.find_all_match_indices(edit.target_text, is_regex);
+    let matches = this.mapper.find_all_match_indices(
+      edit.target_text,
+      is_regex
+    );
     let use_clean_map = false;
     if (matches.length === 0) {
       if (!this.clean_mapper)
         this.clean_mapper = new DocumentMapper(this.doc, true);
-      matches = this.clean_mapper.find_all_match_indices(edit.target_text, is_regex);
+      matches = this.clean_mapper.find_all_match_indices(
+        edit.target_text,
+        is_regex
+      );
       if (matches.length > 0) use_clean_map = true;
       else return null;
     }
@@ -4416,14 +4686,49 @@ var RedlineEngine = class {
         start_idx + match_len
       );
       let current_effective_new_text = edit.new_text || "";
+      if (/^\{#cell:[^}]+\}$/.test(actual_doc_text.trim())) {
+        let ins_text = current_effective_new_text;
+        ins_text = ins_text.split(actual_doc_text.trim()).join("");
+        if (ins_text) {
+          all_sub_edits.push({
+            type: "modify",
+            target_text: "",
+            new_text: ins_text,
+            comment: edit.comment,
+            // Insert at the anchor token's start so the new run lands inside
+            // the cell paragraph that get_insertion_anchor resolves there.
+            _match_start_index: start_idx,
+            _internal_op: "INSERTION",
+            _active_mapper_ref: active_mapper
+          });
+        } else if (edit.comment) {
+          all_sub_edits.push({
+            type: "modify",
+            target_text: "",
+            new_text: "",
+            comment: edit.comment,
+            _match_start_index: start_idx,
+            _internal_op: "COMMENT_ONLY",
+            _active_mapper_ref: active_mapper
+          });
+        }
+        continue;
+      }
       if (is_regex && current_effective_new_text) {
         try {
-          current_effective_new_text = actual_doc_text.replace(new RegExp(edit.target_text), current_effective_new_text);
+          current_effective_new_text = actual_doc_text.replace(
+            new RegExp(edit.target_text),
+            current_effective_new_text
+          );
         } catch (e) {
         }
       }
-      const [edit_target_clean, edit_target_style] = this._parse_markdown_style(edit.target_text);
-      const [edit_new_clean, edit_new_style] = this._parse_markdown_style(current_effective_new_text);
+      const [edit_target_clean, edit_target_style] = this._parse_markdown_style(
+        edit.target_text
+      );
+      const [edit_new_clean, edit_new_style] = this._parse_markdown_style(
+        current_effective_new_text
+      );
       if (edit_target_style !== edit_new_style) {
         const [actual_clean] = this._parse_markdown_style(actual_doc_text);
         const final_target2 = actual_clean;
@@ -4462,7 +4767,9 @@ var RedlineEngine = class {
       let effective_start_idx = start_idx;
       if (current_effective_new_text.startsWith(actual_doc_text)) {
         effective_op = "INSERTION";
-        final_new = current_effective_new_text.substring(actual_doc_text.length);
+        final_new = current_effective_new_text.substring(
+          actual_doc_text.length
+        );
         effective_start_idx = start_idx + match_len;
       } else {
         const [prefix_len, suffix_len] = trim_common_context(
@@ -4474,6 +4781,51 @@ var RedlineEngine = class {
         final_target = actual_doc_text.substring(prefix_len, t_end);
         final_new = current_effective_new_text.substring(prefix_len, n_end);
         effective_start_idx = start_idx + prefix_len;
+        const target_segs = actual_doc_text.split("\n\n");
+        const new_segs = current_effective_new_text.split("\n\n");
+        if (actual_doc_text.includes("\n\n") && target_segs.length === new_segs.length) {
+          const split_sub_edits = [];
+          let seg_offset = start_idx;
+          let comment_assigned = false;
+          for (let k = 0; k < target_segs.length; k++) {
+            const t_seg = target_segs[k];
+            const n_seg = new_segs[k];
+            if (t_seg !== n_seg) {
+              const [seg_prefix, seg_suffix] = trim_common_context(t_seg, n_seg);
+              const seg_target = t_seg.substring(
+                seg_prefix,
+                t_seg.length - seg_suffix
+              );
+              const seg_new = n_seg.substring(
+                seg_prefix,
+                n_seg.length - seg_suffix
+              );
+              const seg_start = seg_offset + seg_prefix;
+              let seg_op;
+              if (!seg_target && seg_new) seg_op = "INSERTION";
+              else if (seg_target && !seg_new) seg_op = "DELETION";
+              else if (seg_target && seg_new) seg_op = "MODIFICATION";
+              else seg_op = "COMMENT_ONLY";
+              const seg_comment = edit.comment && !comment_assigned ? edit.comment : null;
+              if (seg_comment) comment_assigned = true;
+              split_sub_edits.push({
+                type: "modify",
+                target_text: seg_target,
+                new_text: seg_new,
+                comment: seg_comment,
+                _match_start_index: seg_start,
+                _internal_op: seg_op,
+                _active_mapper_ref: active_mapper,
+                _split_group_id: start_idx
+              });
+            }
+            seg_offset += t_seg.length + 2;
+          }
+          if (split_sub_edits.length > 0) {
+            for (const sub of split_sub_edits) all_sub_edits.push(sub);
+            continue;
+          }
+        }
         if (!final_target && final_new) effective_op = "INSERTION";
         else if (final_target && !final_new) effective_op = "DELETION";
         else if (final_target && final_new) effective_op = "MODIFICATION";
@@ -4493,6 +4845,35 @@ var RedlineEngine = class {
     if (match_mode === "all" || all_sub_edits.length > 1) return all_sub_edits;
     return all_sub_edits[0];
   }
+  /**
+   * Split a <w:ins> so that everything up to and INCLUDING split_after stays in
+   * a left <w:ins>, new_elem is placed between, and the remainder moves to a
+   * right <w:ins> — all at the grandparent level. Used when revising another
+   * author's pending insertion: the <w:del> stays nested in their <w:ins> while
+   * our replacement <w:ins> lands as a sibling, so we never nest <w:ins> in
+   * <w:ins>.
+   */
+  _insert_and_split_ins(parent_ins, split_after, new_elem) {
+    const grandparent = parent_ins.parentNode;
+    if (!grandparent) return;
+    const left = parent_ins.cloneNode(false);
+    const right = parent_ins.cloneNode(false);
+    let toRight = false;
+    for (const kid of Array.from(parent_ins.childNodes)) {
+      parent_ins.removeChild(kid);
+      if (!toRight) {
+        left.appendChild(kid);
+        if (kid === split_after) toRight = true;
+      } else {
+        right.appendChild(kid);
+      }
+    }
+    if (left.childNodes.length > 0) grandparent.insertBefore(left, parent_ins);
+    grandparent.insertBefore(new_elem, parent_ins);
+    if (right.childNodes.length > 0)
+      grandparent.insertBefore(right, parent_ins);
+    grandparent.removeChild(parent_ins);
+  }
   _apply_single_edit_indexed(edit, orig_new, rebuild_map) {
     let op = edit._internal_op;
     const active_mapper = edit._active_mapper_ref || this.mapper;
@@ -4543,7 +4924,12 @@ var RedlineEngine = class {
               const first_anchor = ascend_to_paragraph_child(first_el, start_p);
               const last_anchor = ascend_to_paragraph_child(last_el, end_p);
               if (start_p === end_p) {
-                this._attach_comment(start_p, first_anchor, last_anchor, edit.comment);
+                this._attach_comment(
+                  start_p,
+                  first_anchor,
+                  last_anchor,
+                  edit.comment
+                );
               } else {
                 this._attach_comment_spanning(
                   start_p,
@@ -4695,7 +5081,16 @@ var RedlineEngine = class {
       const is_inline_first = result.first_node.tagName === "w:ins";
       if (is_inline_first) {
         if (anchor_run) {
-          insertAfter(result.first_node, anchor_run._element);
+          const anchor_parent = anchor_run._element.parentNode;
+          if (anchor_parent && anchor_parent.tagName === "w:ins") {
+            this._insert_and_split_ins(
+              anchor_parent,
+              anchor_run._element,
+              result.first_node
+            );
+          } else {
+            insertAfter(result.first_node, anchor_run._element);
+          }
         } else if (anchor_para) {
           anchor_para._element.appendChild(result.first_node);
         }
@@ -4805,7 +5200,12 @@ var RedlineEngine = class {
       if (result.first_node) {
         const is_inline_first = result.first_node.tagName === "w:ins";
         if (is_inline_first) {
-          insertAfter(result.first_node, last_del);
+          const del_parent = last_del.parentNode;
+          if (del_parent && del_parent.tagName === "w:ins") {
+            this._insert_and_split_ins(del_parent, last_del, result.first_node);
+          } else {
+            insertAfter(result.first_node, last_del);
+          }
           ins_elem = result.first_node;
         } else {
           ins_elem = result.last_ins;
@@ -5832,13 +6232,21 @@ function extract_table(table, comments_map, cleanView, cursor, paragraph_offsets
       if (seen_cells.has(cell)) continue;
       seen_cells.add(cell);
       if (!first_cell) cell_cursor += 3;
-      const cell_content = _extract_blocks(
+      let cell_content = _extract_blocks(
         cell,
         comments_map,
         cleanView,
         cell_cursor,
         paragraph_offsets
       );
+      if (!cleanView) {
+        const firstP = cell._element.getElementsByTagName("w:p")[0];
+        const paraId = firstP ? firstP.getAttribute("w14:paraId") : null;
+        if (paraId) {
+          const anchor = `{#cell:${paraId}}`;
+          cell_content = cell_content + anchor;
+        }
+      }
       cell_texts.push(cell_content);
       cell_cursor += cell_content.length;
       first_cell = false;