@adeu/core 1.17.1 → 1.17.2

package/src/engine.ts

@@ -65,6 +65,81 @@ function insertAtIndex(parent: Element, index: number, child: Node) {
   }
 }
 
+
+function safeCloneEdit(val: any, seen: WeakMap<any, any> = new WeakMap()): any {
+  if (val === null || typeof val !== "object") {
+    return val;
+  }
+  if (seen.has(val)) {
+    return seen.get(val);
+  }
+  if (val.nodeType !== undefined || typeof val.cloneNode === "function") {
+    return val;
+  }
+  if (Array.isArray(val)) {
+    const copy: any[] = [];
+    seen.set(val, copy);
+    for (let i = 0; i < val.length; i++) {
+      copy.push(safeCloneEdit(val[i], seen));
+    }
+    return copy;
+  }
+  const copy: any = {};
+  seen.set(val, copy);
+  for (const key of Object.keys(val)) {
+    copy[key] = safeCloneEdit(val[key], seen);
+  }
+  return copy;
+}
+
+function takeSnapshot(doc: any): any {
+  const parts = [...doc.pkg.parts];
+  const unzipped = { ...doc.pkg.unzipped };
+  const rels = new Map<any, Map<string, any>>();
+  const elements = new Map<any, Element>();
+  for (const part of parts) {
+    rels.set(part, new Map(part.rels));
+    if (part._element) {
+      elements.set(part, part._element.cloneNode(true) as Element);
+    }
+  }
+  return { parts, unzipped, rels, elements };
+}
+
+function restoreSnapshot(doc: any, snapshot: any): void {
+  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: string, newText: string): [string, string] {
+  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];
+}
+
 // --- Validation ---
 export class BatchValidationError extends Error {
   public errors: string[];
@@ -75,7 +150,7 @@ export class BatchValidationError extends Error {
   }
 }
 
-export function validate_edit_strings(edits: any[]): string[] {
+export function validate_edit_strings(edits: any[], index_offset: number = 0): string[] {
   const errors: string[] = [];
 
   for (let i = 0; i < edits.length; i++) {
@@ -90,7 +165,7 @@ export function validate_edit_strings(edits: any[]): string[] {
       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.`,
       );
     }
 
@@ -107,11 +182,11 @@ export function validate_edit_strings(edits: any[]): string[] {
           )
         ) {
           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.`,
           );
         }
       }
@@ -123,11 +198,11 @@ export function validate_edit_strings(edits: any[]): string[] {
       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 (
@@ -135,7 +210,7 @@ export function validate_edit_strings(edits: any[]): string[] {
         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.`,
         );
       }
     }
@@ -146,18 +221,18 @@ export function validate_edit_strings(edits: any[]): string[] {
       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 {
         // Advanced XREF validation simplified for port scope
         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.`,
           );
         }
       }
@@ -172,7 +247,7 @@ export function validate_edit_strings(edits: any[]): string[] {
           t_anchors.filter((x: string) => 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;
         }
@@ -190,7 +265,7 @@ export function validate_edit_strings(edits: any[]): string[] {
             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;
           }
@@ -202,10 +277,12 @@ export function validate_edit_strings(edits: any[]): string[] {
       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)")
+      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.`,
       );
     }
   }
@@ -233,11 +310,7 @@ export class RedlineEngine {
     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);
         }
@@ -256,7 +329,51 @@ export class RedlineEngine {
     }
     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.
+   */
+  private _nearest_match_hint(
+    target_text: string | undefined,
+    is_regex: boolean,
+  ): string {
+    if (!target_text) return "";
+    let probe = target_text;
+    if (is_regex) {
+      // Strip leading/trailing anchors and surrounding \s* the model tends to add.
+      probe = probe.replace(/^\^/, "").replace(/\$$/, "");
+      probe = probe.replace(/^\\s\*/, "").replace(/\\s\*$/, "");
+      // Unescape the common literal escapes so "\( x \)" -> "( x )".
+      probe = probe.replace(/\\([.^$*+?()[\]{}|\\/])/g, "$1");
+    }
+    probe = probe.trim();
+    if (!probe || probe === target_text) {
+      // No anchors to strip, or nothing changed: nothing useful to suggest.
+      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 (
+        `\n  Did you mean the literal "${probe}"? It appears in the document` +
+        ` (…${ctx}…). If you used a regex, drop the ^/$ anchors — they match` +
+        ` the start/end of the entire document, not a line.`
+      );
+    }
+    return "";
+  }
   private _build_edit_context_previews(
     edit: any,
   ): [string | null, string | null] {
@@ -264,10 +381,23 @@ export class RedlineEngine {
     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 === undefined || 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;
@@ -303,7 +433,11 @@ export class RedlineEngine {
     return maxId;
   }
 
-  private _get_heading_path_and_page(start_idx: number, text: string, page_offsets: number[]): [string, number] {
+  private _get_heading_path_and_page(
+    start_idx: number,
+    text: string,
+    page_offsets: number[],
+  ): [string, number] {
     let page = 1;
     for (let i = 0; i < page_offsets.length; i++) {
       if (start_idx >= page_offsets[i]) {
@@ -317,14 +451,17 @@ export class RedlineEngine {
     const lines = textBefore.split("\n");
     const path: string[] = [];
     let current_level = 999;
-    
+
     for (let i = lines.length - 1; i >= 0; i--) {
       const line = lines[i];
       const m = line.match(/^(#{1,6})\s+(.*)/);
       if (m) {
         const level = m[1].length;
         if (level < current_level) {
-          let cleanHeading = m[2].replace(/\*\*|__|[*_]/g, "").replace(/\{#[^}]+\}/g, "").trim();
+          let cleanHeading = m[2]
+            .replace(/\*\*|__|[*_]/g, "")
+            .replace(/\{#[^}]+\}/g, "")
+            .trim();
           if (cleanHeading.length > 80) {
             cleanHeading = cleanHeading.substring(0, 80) + "...";
           }
@@ -1220,33 +1357,39 @@ export class RedlineEngine {
     }
   }
 
-  public validate_edits(edits: any[]): string[] {
+  public validate_edits(edits: any[], index_offset: number = 0): string[] {
     const errors: string[] = [];
     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 as any).regex || false;
       const match_mode = (edit as any).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;
@@ -1278,7 +1421,10 @@ export class RedlineEngine {
         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) {
@@ -1289,7 +1435,10 @@ export class RedlineEngine {
               if (s.run !== null) {
                 let parent = s.run._element as Node | null;
                 while (parent) {
-                  if (parent.nodeType === 1 && (parent as Element).tagName === "w:del") {
+                  if (
+                    parent.nodeType === 1 &&
+                    (parent as Element).tagName === "w:del"
+                  ) {
                     const auth = (parent as Element).getAttribute("w:author");
                     if (auth) {
                       deleted_authors.add(auth);
@@ -1306,30 +1455,36 @@ export class RedlineEngine {
 
       if (matches.length === 0) {
         if (is_deleted_text) {
-          const author_phrase = deleted_authors.size > 0
-            ? `by ${Array.from(deleted_authors).sort().join(", ")}`
-            : "by an existing revision";
+          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:\n  "${edit.target_text}"`,
+            `- Edit ${i + 1 + index_offset} Failed: Target text not found in document:\n  "${edit.target_text}"${hint}`,
           );
         }
       } else if (matches.length > 1 && match_mode === "strict") {
-        const positions: [number, number][] = 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: [number, number][] = matches.map(([start, length]) => [
+            start,
+            start + length,
+          ]);
+          errors.push(
+            format_ambiguity_error(
+              i + 1 + index_offset,
+              edit.target_text,
+              activeText,
+              positions,
+            ),
+          );
+        }
       }
 
       // BUG-23-4: when the effective (context-trimmed) target spans a
@@ -1354,7 +1509,7 @@ export class RedlineEngine {
               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.`,
+                `- 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 {
@@ -1365,7 +1520,7 @@ export class RedlineEngine {
               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.`,
+                `- 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.`,
               );
             }
           }
@@ -1385,7 +1540,13 @@ export class RedlineEngine {
             ).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) {
+                const is_fully_contained_in_ins = start >= s.start && (start + length) <= s.end;
+                const is_lockout = is_fully_contained_in_ins || match_mode === "all";
+                if (is_lockout) {
+                  nestedAuthors.add(auth);
+                }
+              }
             }
           }
           if (s.comment_ids) {
@@ -1399,7 +1560,7 @@ export class RedlineEngine {
         }
         if (nestedAuthors.size > 0) {
           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.`,
           );
         }
       }
@@ -1481,22 +1642,13 @@ export class RedlineEngine {
     }
 
     if (dry_run) {
-      const baselines = new Map<any, Element>();
-      for (const part of this.doc.pkg.parts) {
-        if (part._element) {
-          baselines.set(part, part._element.cloneNode(true) as Element);
-        }
-      }
+      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;
@@ -1510,23 +1662,95 @@ export class RedlineEngine {
     changes: DocumentChange[],
     dry_run_mode: boolean = false,
   ): any {
+    // Pre-process edits: strip identical leading heading hashes from target_text and new_text
+    for (const c of changes) {
+      if (c && typeof c === "object" && (c as any).type === "modify" && (c as any).target_text && (c as any).new_text) {
+        const [strippedTarget, strippedNew] = stripMatchingHeadingHashes((c as any).target_text, (c as any).new_text);
+        (c as any).target_text = strippedTarget;
+        (c as any).new_text = strippedNew;
+      }
+    }
+
     this.skipped_details = [];
-    const actions = changes.filter((c) =>
-      c !== null && typeof c === "object" && ["accept", "reject", "reply"].includes(c.type),
+
+    const actions = changes.filter(
+      (c) =>
+        c !== null &&
+        typeof c === "object" &&
+        ["accept", "reject", "reply"].includes(c.type),
     );
     const edits = changes.filter(
-      (c) => c === null || typeof c !== "object" || !["accept", "reject", "reply"].includes(c.type),
+      (c) =>
+        c === null ||
+        typeof c !== "object" ||
+        !["accept", "reject", "reply"].includes(c.type),
     );
 
-    // BUG-7: Unified single-pass validation in wet-run / standard mode
-    if (!dry_run_mode) {
-      const all_errors: string[] = [];
-      if (actions.length > 0) {
-        all_errors.push(...this.validate_review_actions(actions));
+    // Run edits_for_merge logic to unwrap collaborative active insertions
+    let mapper_dirty = false;
+    for (const edit of edits as any[]) {
+      if (typeof edit !== "object" || edit === null || !edit.target_text) continue;
+      const is_regex = edit.regex || false;
+      let matches = this.mapper.find_all_match_indices(edit.target_text, is_regex);
+      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);
+        target_mapper = this.clean_mapper!;
       }
-      if (edits.length > 0) {
-        all_errors.push(...this.validate_edits(edits));
+      for (const [start, length] of matches) {
+        const spans = target_mapper.spans.filter(
+          (s) => s.end > start && s.start < start + length,
+        );
+        for (const s of spans) {
+          if (s.ins_id) {
+            const insNodes = findAllDescendants(this.doc.element, "w:ins").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) {
+                const is_fully_contained_in_ins = start >= s.start && (start + length) <= s.end;
+                const match_mode = edit.match_mode || "strict";
+                if (!is_fully_contained_in_ins && match_mode !== "all") {
+                  const node = insNodes[0];
+                  this._clean_wrapping_comments(node);
+                  const parent = node.parentNode as Element | null;
+                  if (parent) {
+                    if (parent.tagName === "w:trPr") {
+                      parent.removeChild(node);
+                    } else {
+                      while (node.firstChild) {
+                        parent.insertBefore(node.firstChild, node);
+                      }
+                      parent.removeChild(node);
+                    }
+                  }
+                  mapper_dirty = true;
+                }
+              }
+            }
+          }
+        }
       }
+    }
+    if (mapper_dirty) {
+      this.mapper = new DocumentMapper(this.doc);
+      this.clean_mapper = null;
+    }
+
+    // BUG-7: Unified single-pass validation in wet-run / standard mode.
+    if (!dry_run_mode) {
+      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);
       }
@@ -1564,8 +1788,9 @@ export class RedlineEngine {
 
     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 as any).target_text || "",
           );
@@ -1599,6 +1824,8 @@ export class RedlineEngine {
               occurrences_modified: (edit as any)._occurrences_modified || 0,
               match_mode: (edit as any).match_mode || "strict",
             });
+            this.mapper = new DocumentMapper(this.doc);
+            this.clean_mapper = null;
           } else {
             skipped_edits++;
             const error_msg =
@@ -1617,16 +1844,40 @@ export class RedlineEngine {
           }
         }
       } else {
-        const errors = this.validate_edits(edits);
-        if (errors.length > 0) {
-          throw new BatchValidationError(errors);
+        // Simulated dry-run sequentially for wet-run validation parity
+        const snapshot = takeSnapshot(this.doc);
+        const originalCurrentId = this.current_id;
+        try {
+          const sequential_errors: string[] = [];
+          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;
         }
-        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 as any)._applied_status).length;
-        skipped_edits = cloned_edits.length - applied_edits;
 
-        for (const edit of cloned_edits) {
+        applied_edits = edits.filter(
+          (e) => (e as any)._applied_status,
+        ).length;
+        skipped_edits = edits.length - applied_edits;
+
+        for (const edit of edits) {
           const success = (edit as any)._applied_status || false;
           const error_msg = (edit as any)._error_msg || null;
           const warning = this._check_punctuation_warning(
@@ -1655,7 +1906,6 @@ export class RedlineEngine {
         }
       }
     }
-
     return {
       actions_applied: applied_actions,
       actions_skipped: skipped_actions,
@@ -1668,7 +1918,10 @@ export class RedlineEngine {
     };
   }
 
-  public apply_edits(edits: any[], page_offsets: number[] = []): [number, number] {
+  public apply_edits(
+    edits: any[],
+    page_offsets: number[] = [],
+  ): [number, number] {
     let applied = 0;
     let skipped = 0;
 
@@ -1803,15 +2056,24 @@ export class RedlineEngine {
         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);
+          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: number[] = 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);
+          const [path, page] = this._get_heading_path_and_page(
+            start,
+            this.mapper.full_text,
+            page_offsets,
+          );
           const pages: number[] = edit._pages || [];
           if (!pages.includes(page)) pages.unshift(page);
           edit._pages = pages;
@@ -1993,13 +2255,19 @@ export class RedlineEngine {
     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;
     }
@@ -2009,7 +2277,8 @@ export class RedlineEngine {
     let live_matches: [number, number][] = [];
     for (const [s, match_len] of matches) {
       const realSpans = active_mapper.spans.filter(
-        (span) => span.run !== null && span.end > s && span.start < s + match_len
+        (span) =>
+          span.run !== null && span.end > s && span.start < s + match_len,
       );
       if (realSpans.length === 0 || realSpans.some((span) => !span.del_id)) {
         live_matches.push([s, match_len]);
@@ -2031,23 +2300,72 @@ export class RedlineEngine {
       );
       let current_effective_new_text = edit.new_text || "";
 
+      // Cell anchors ({#cell:<paraId>}) are pure position markers with no real
+      // content — they let the model address an empty (or any) table cell that
+      // has no run to diff against. Treat such a target as a clean INSERTION at
+      // the anchor's paragraph: never delete the marker, never run trim_common_context
+      // (which refuses to split inside {#...} markup and yields a no-op MODIFICATION).
+      // Strip any echoed anchor from new_text so the model can send either
+      // "June 22, 2026" or "June 22, 2026{#cell:...}" and get the same result.
+      if (/^\{#cell:[^}]+\}$/.test(actual_doc_text.trim())) {
+        let ins_text = current_effective_new_text;
+        // Drop a leading/trailing copy of the same anchor token if echoed.
+        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) {
+          // Anchor target with empty effective new_text but a comment: attach
+          // the comment to the cell paragraph.
+          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_target = actual_clean;
         const final_new = edit_new_clean;
-        const style_op = final_target === final_new ? "STYLE_ONLY" : "STYLE_AND_TEXT";
+        const style_op =
+          final_target === final_new ? "STYLE_ONLY" : "STYLE_AND_TEXT";
         const prefix_offset = actual_doc_text.indexOf(actual_clean);
-        const effective_start_idx = start_idx + (prefix_offset !== -1 ? prefix_offset : 0);
-        const resolved_style = edit_new_style !== null ? edit_new_style : "Normal";
+        const effective_start_idx =
+          start_idx + (prefix_offset !== -1 ? prefix_offset : 0);
+        const resolved_style =
+          edit_new_style !== null ? edit_new_style : "Normal";
 
         all_sub_edits.push({
           type: "modify",
@@ -2085,7 +2403,9 @@ export class RedlineEngine {
 
       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(
@@ -2172,7 +2492,10 @@ export class RedlineEngine {
             while (end_p && end_p.tagName !== "w:p")
               end_p = end_p.parentNode as Element;
             if (start_p && end_p) {
-              const ascend_to_paragraph_child = (el: Element, p: Element): Element => {
+              const ascend_to_paragraph_child = (
+                el: Element,
+                p: Element,
+              ): Element => {
                 let cur: Element = el;
                 while (cur.parentNode && cur.parentNode !== p) {
                   cur = cur.parentNode as Element;
@@ -2182,7 +2505,12 @@ export class RedlineEngine {
               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,