@createiq/htmldiff 1.2.0-beta.0 → 1.2.0-beta.10

package/test/HtmlDiff.threeWay.tables.spec.ts

@@ -2,67 +2,78 @@ import { describe, expect, it } from 'vitest'
 
 import HtmlDiff from '../src/HtmlDiff'
 
-describe('HtmlDiff.executeThreeWay (tables, positional case)', () => {
-  describe('cell-level attribution propagates through table scaffolding', () => {
-    it('CP-only edit inside a cell', () => {
+/**
+ * Table tests under the genesis-spine model.
+ *
+ * `executeThreeWay(genesis, cpLatest, meCurrent)` walks the genesis
+ * table structure as the spine and attributes cp/me changes
+ * independently. Tables/rows/cells that both authors changed identically
+ * settle and emit plain; one-sided changes carry author attribution;
+ * disagreements show both authors' contributions.
+ */
+describe('HtmlDiff.executeThreeWay (tables, genesis-spine)', () => {
+  describe('cell-level attribution through table scaffolding', () => {
+    it('CP only changed, Me kept genesis → cp attribution', () => {
       expect(
         HtmlDiff.executeThreeWay(
-          '<table><tr><td>Rate</td><td>five</td></tr></table>',
-          '<table><tr><td>Interest Rate</td><td>five</td></tr></table>',
-          '<table><tr><td>Interest Rate</td><td>five</td></tr></table>'
+          '<table><tr><td>Rate</td></tr></table>',
+          '<table><tr><td>Interest Rate</td></tr></table>',
+          '<table><tr><td>Rate</td></tr></table>'
         )
-      ).toBe(
-        "<table><tr><td><ins class='diffins cp' data-author='cp'>Interest </ins>Rate</td><td>five</td></tr></table>"
-      )
+      ).toBe("<table><tr><td><ins class='diffins cp' data-author='cp'>Interest </ins>Rate</td></tr></table>")
     })
 
-    it('Me-only edit inside a cell', () => {
+    it('Me only changed, CP kept genesis → me attribution', () => {
       expect(
         HtmlDiff.executeThreeWay(
-          '<table><tr><td>Rate</td><td>five</td></tr></table>',
-          '<table><tr><td>Rate</td><td>five</td></tr></table>',
-          '<table><tr><td>Rate</td><td>five percent</td></tr></table>'
+          '<table><tr><td>Rate</td></tr></table>',
+          '<table><tr><td>Rate</td></tr></table>',
+          '<table><tr><td>Rate per annum</td></tr></table>'
         )
-      ).toBe(
-        "<table><tr><td>Rate</td><td>five<ins class='diffins me' data-author='me'>&nbsp;percent</ins></td></tr></table>"
-      )
+      ).toBe("<table><tr><td>Rate<ins class='diffins me' data-author='me'>&nbsp;per annum</ins></td></tr></table>")
     })
 
-    it('Me keeps a CP cell insertion AND adds their own to a different cell', () => {
+    it('Settled — both made the same change → no markup', () => {
       expect(
         HtmlDiff.executeThreeWay(
-          '<table><tr><td>Rate</td><td>five</td></tr></table>',
-          '<table><tr><td>Interest Rate</td><td>five</td></tr></table>',
-          '<table><tr><td>Interest Rate</td><td>five percent</td></tr></table>'
+          '<table><tr><td>Rate</td></tr></table>',
+          '<table><tr><td>Interest Rate</td></tr></table>',
+          '<table><tr><td>Interest Rate</td></tr></table>'
         )
-      ).toBe(
-        "<table><tr><td><ins class='diffins cp' data-author='cp'>Interest </ins>Rate</td><td>five<ins class='diffins me' data-author='me'>&nbsp;percent</ins></td></tr></table>"
-      )
-    })
-
-    it('Me rejects a CP cell insertion (reject markup inside the cell)', () => {
+      ).toBe('<table><tr><td>Interest Rate</td></tr></table>')
+    })
+
+    it('Disagreement — different changes at the same place', () => {
+      // Genesis cell "five"; CP extended to "five and a half"; Me
+      // replaced with "seven". Intent reading from a reviewer's
+      // perspective:
+      //   - del-me "five": Me already removed the genesis word from
+      //     their cell (genesis tracking).
+      //   - ins-cp " and a half": CP wants this appended.
+      //   - del-cp "seven": CP wants Me's "seven" removed (Me has it,
+      //     CP doesn't).
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>five</td></tr></table>',
           '<table><tr><td>five and a half</td></tr></table>',
-          '<table><tr><td>five</td></tr></table>'
+          '<table><tr><td>seven</td></tr></table>'
         )
       ).toBe(
-        "<table><tr><td>five<del class='diffdel me rejects-cp' data-author='me' data-rejects='cp'>&nbsp;and a half</del></td></tr></table>"
+        "<table><tr><td><del class='diffdel me' data-author='me'>five</del><ins class='diffins cp' data-author='cp'>&nbsp;and a half</ins><del class='diffdel cp' data-author='cp'>seven</del></td></tr></table>"
       )
     })
 
-    it('CP-deletion of V1 cell content', () => {
+    it('CP deletes content, Me kept', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>five and a half</td></tr></table>',
           '<table><tr><td>five</td></tr></table>',
-          '<table><tr><td>five</td></tr></table>'
+          '<table><tr><td>five and a half</td></tr></table>'
         )
       ).toBe("<table><tr><td>five<del class='diffdel cp' data-author='cp'>&nbsp;and a half</del></td></tr></table>")
     })
 
-    it('Me-deletion of V1 cell content (CP did nothing)', () => {
+    it('Me deletes content, CP kept', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>five and a half</td></tr></table>',
@@ -74,103 +85,74 @@ describe('HtmlDiff.executeThreeWay (tables, positional case)', () => {
   })
 
   describe('scaffolding scanner edge cases', () => {
-    it('preserves <thead>/<tbody> wrappers', () => {
+    it('<thead>/<tbody> wrappers', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><thead><tr><th>Term</th></tr></thead><tbody><tr><td>Old</td></tr></tbody></table>',
           '<table><thead><tr><th>Term</th></tr></thead><tbody><tr><td>New</td></tr></tbody></table>',
-          '<table><thead><tr><th>Term</th></tr></thead><tbody><tr><td>New</td></tr></tbody></table>'
+          '<table><thead><tr><th>Term</th></tr></thead><tbody><tr><td>Old</td></tr></tbody></table>'
         )
       ).toBe(
         "<table><thead><tr><th>Term</th></tr></thead><tbody><tr><td><del class='diffdel cp' data-author='cp'>Old</del><ins class='diffins cp' data-author='cp'>New</ins></td></tr></tbody></table>"
       )
     })
 
-    it('handles <th> header cells correctly', () => {
-      // Branches on td vs th in the scanner; the contentEnd computation
-      // uses the right tagName length.
+    it('<th> header cells', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><th>Label</th><th>Value</th></tr></table>',
           '<table><tr><th>Description</th><th>Value</th></tr></table>',
-          '<table><tr><th>Description</th><th>Value</th></tr></table>'
+          '<table><tr><th>Label</th><th>Value</th></tr></table>'
         )
       ).toBe(
         "<table><tr><th><del class='diffdel cp' data-author='cp'>Label</del><ins class='diffins cp' data-author='cp'>Description</ins></th><th>Value</th></tr></table>"
       )
     })
 
-    it('handles an empty cell (contentStart == contentEnd)', () => {
-      // Empty cell on both sides — no diff, just scaffolding pass-through.
+    it('rowspan attribute preserved with author attribution on cell content', () => {
       expect(
         HtmlDiff.executeThreeWay(
-          '<table><tr><td>a</td><td></td></tr></table>',
-          '<table><tr><td>a</td><td></td></tr></table>',
-          '<table><tr><td>a</td><td></td></tr></table>'
-        )
-      ).toBe('<table><tr><td>a</td><td></td></tr></table>')
-    })
-
-    it('handles cells with inline HTML (formatting tags)', () => {
-      // The formatting-tag special case kicks in inside the cell content.
-      const out = HtmlDiff.executeThreeWay(
-        '<table><tr><td>The fee is due.</td></tr></table>',
-        '<table><tr><td>The <strong>fee</strong> is due.</td></tr></table>',
-        '<table><tr><td>The <strong>fee</strong> is due.</td></tr></table>'
-      )
-      expect(out).toContain("data-author='cp'")
-      expect(out).toMatch(/<ins class='mod[^']*cp'/)
-      expect(out).toContain('<table>')
-      expect(out).toContain('</table>')
-    })
-
-    it('preserves attributes on the <table> element', () => {
-      expect(
-        HtmlDiff.executeThreeWay(
-          '<table class="rates"><tr><td>Old</td></tr></table>',
-          '<table class="rates"><tr><td>New</td></tr></table>',
-          '<table class="rates"><tr><td>New</td></tr></table>'
+          '<table><tr><td rowspan="2">Foo</td></tr></table>',
+          '<table><tr><td rowspan="2">Bar</td></tr></table>',
+          '<table><tr><td rowspan="2">Foo</td></tr></table>'
         )
       ).toBe(
-        "<table class=\"rates\"><tr><td><del class='diffdel cp' data-author='cp'>Old</del><ins class='diffins cp' data-author='cp'>New</ins></td></tr></table>"
+        "<table><tr><td rowspan=\"2\"><del class='diffdel cp' data-author='cp'>Foo</del><ins class='diffins cp' data-author='cp'>Bar</ins></td></tr></table>"
       )
     })
 
-    it('multi-row table with edit in only one row', () => {
-      // Cursor handoff between rows must work — row 0 unchanged, row 1 edited by CP, row 2 unchanged.
+    it('multi-row table with edit in one row only', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr><tr><td>b</td></tr><tr><td>c</td></tr></table>',
           '<table><tr><td>a</td></tr><tr><td>B</td></tr><tr><td>c</td></tr></table>',
-          '<table><tr><td>a</td></tr><tr><td>B</td></tr><tr><td>c</td></tr></table>'
+          '<table><tr><td>a</td></tr><tr><td>b</td></tr><tr><td>c</td></tr></table>'
         )
       ).toBe(
         "<table><tr><td>a</td></tr><tr><td><del class='diffdel cp' data-author='cp'>b</del><ins class='diffins cp' data-author='cp'>B</ins></td></tr><tr><td>c</td></tr></table>"
       )
     })
 
-    it('preserves whitespace between row/cell tags', () => {
-      // Real Word-sourced HTML has \n and indentation between tags;
-      // confirm the cursor-based emission passes it through unchanged.
-      const text = '<table>\n  <tr>\n    <td>a</td>\n  </tr>\n</table>'
+    it('identity input passes through unchanged', () => {
+      const text = '<table><tr><td>a</td><td>b</td></tr><tr><td>c</td><td>d</td></tr></table>'
       expect(HtmlDiff.executeThreeWay(text, text, text)).toBe(text)
     })
   })
 
-  describe('structural changes (rows added or removed)', () => {
-    it('CP-inserted row (V1 → V2 adds a row, Me kept it)', () => {
+  describe('structural row changes (rows added or removed)', () => {
+    it('CP inserted a row, Me kept the absence → cp-attributed row insertion', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr></table>',
           '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>',
-          '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>'
+          '<table><tr><td>a</td></tr></table>'
         )
       ).toBe(
         "<table><tr><td>a</td></tr><tr class='diffins cp' data-author='cp'><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>b</ins></td></tr></table>"
       )
     })
 
-    it('Me-inserted row (V2 → V3 adds a row, CP did nothing)', () => {
+    it('Me inserted a row, CP kept the absence → me-attributed row insertion', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr></table>',
@@ -182,19 +164,19 @@ describe('HtmlDiff.executeThreeWay (tables, positional case)', () => {
       )
     })
 
-    it('CP-deleted V1 row (V1 → V2 removes a row, Me kept the removal)', () => {
+    it('CP deleted a row, Me kept it → cp-attributed row deletion (content from Me)', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>',
           '<table><tr><td>a</td></tr></table>',
-          '<table><tr><td>a</td></tr></table>'
+          '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>'
         )
       ).toBe(
         "<table><tr><td>a</td></tr><tr class='diffdel cp' data-author='cp'><td class='diffdel cp' data-author='cp'><del class='diffdel cp' data-author='cp'>b</del></td></tr></table>"
       )
     })
 
-    it('Me-deleted V1 row (V2 == V1, Me removed it in V3)', () => {
+    it('Me deleted a row, CP kept it → me-attributed row deletion', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>',
@@ -206,57 +188,31 @@ describe('HtmlDiff.executeThreeWay (tables, positional case)', () => {
       )
     })
 
-    it('Me rejects CP-inserted row (CP added it, Me removed it)', () => {
+    it('Both inserted same row → settled, no markup', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr></table>',
           '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>',
-          '<table><tr><td>a</td></tr></table>'
-        )
-      ).toBe(
-        "<table><tr><td>a</td></tr><tr class='diffdel me rejects-cp' data-author='me' data-rejects='cp'><td class='diffdel me rejects-cp' data-author='me' data-rejects='cp'><del class='diffdel me rejects-cp' data-author='me' data-rejects='cp'>b</del></td></tr></table>"
-      )
-    })
-
-    it('both CP and Me add their own rows in different places', () => {
-      expect(
-        HtmlDiff.executeThreeWay(
-          '<table><tr><td>row1</td></tr></table>',
-          '<table><tr><td>row1</td></tr><tr><td>cp-added</td></tr></table>',
-          '<table><tr><td>row1</td></tr><tr><td>cp-added</td></tr><tr><td>me-added</td></tr></table>'
+          '<table><tr><td>a</td></tr><tr><td>b</td></tr></table>'
         )
-      ).toBe(
-        "<table><tr><td>row1</td></tr><tr class='diffins cp' data-author='cp'><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>cp-added</ins></td></tr><tr class='diffins me' data-author='me'><td class='diffins me' data-author='me'><ins class='diffins me' data-author='me'>me-added</ins></td></tr></table>"
-      )
+      ).toBe('<table><tr><td>a</td></tr><tr><td>b</td></tr></table>')
     })
   })
 
-  describe('multi-table mismatch (D3)', () => {
-    it('CP added a whole new table, Me kept it', () => {
+  describe('multi-table (table count diverges)', () => {
+    it('CP added a whole new table, Me kept absence → cp insertion of whole table', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr></table>',
           '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>',
-          '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>'
-        )
-      ).toBe(
-        "<table><tr><td>a</td></tr></table><ins class='diffins cp' data-author='cp'><table><tr><td>b</td></tr></table></ins>"
-      )
-    })
-
-    it('CP removed a table that was in V1, Me kept it removed', () => {
-      expect(
-        HtmlDiff.executeThreeWay(
-          '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>',
-          '<table><tr><td>a</td></tr></table>',
           '<table><tr><td>a</td></tr></table>'
         )
       ).toBe(
-        "<table><tr><td>a</td></tr></table><del class='diffdel cp' data-author='cp'><table><tr><td>b</td></tr></table></del>"
+        "<table><tr><td>a</td></tr></table><ins class='diffins cp' data-author='cp'><table><tr><td>b</td></tr></table></ins>"
       )
     })
 
-    it('Me added a brand-new table in V3 (CP did not touch it)', () => {
+    it('Me added a whole new table, CP kept absence → me insertion', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr></table>',
@@ -268,140 +224,188 @@ describe('HtmlDiff.executeThreeWay (tables, positional case)', () => {
       )
     })
 
-    it('Me removed a table that V1 had and CP kept (Me-deletion of preserved table)', () => {
+    it('CP deleted a table from genesis, Me kept it → cp deletion', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>',
-          '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>',
-          '<table><tr><td>a</td></tr></table>'
+          '<table><tr><td>a</td></tr></table>',
+          '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>'
         )
       ).toBe(
-        "<table><tr><td>a</td></tr></table><del class='diffdel me' data-author='me'><table><tr><td>b</td></tr></table></del>"
+        "<table><tr><td>a</td></tr></table><del class='diffdel cp' data-author='cp'><table><tr><td>b</td></tr></table></del>"
       )
     })
 
-    it('Me rejected a CP-added table (CP added, Me removed)', () => {
+    it('Me deleted a table from genesis, CP kept it → me deletion', () => {
       expect(
         HtmlDiff.executeThreeWay(
-          '<table><tr><td>a</td></tr></table>',
+          '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>',
           '<table><tr><td>a</td></tr></table><table><tr><td>b</td></tr></table>',
           '<table><tr><td>a</td></tr></table>'
         )
       ).toBe(
-        "<table><tr><td>a</td></tr></table><del class='diffdel me rejects-cp' data-author='me' data-rejects='cp'><table><tr><td>b</td></tr></table></del>"
+        "<table><tr><td>a</td></tr></table><del class='diffdel me' data-author='me'><table><tr><td>b</td></tr></table></del>"
       )
     })
 
-    it('falls through to content-LCS when tables are reordered (counts match but positions diverge)', () => {
-      // V1: [Schedule of Fees, Penalty Notices]. V2 swaps them. V3 keeps the swap.
-      // Counts match but the positional pairing would compare unrelated
-      // tables — the similarity gate routes to content-LCS, which pairs
-      // by content regardless of position.
-      const fees = '<table><tr><td>Schedule of Fees</td><td>five percent annually</td></tr></table>'
-      const penalties = '<table><tr><td>Penalty Notices</td><td>seven days written notice</td></tr></table>'
-      const v1 = fees + penalties
-      const v2 = penalties + fees
-      const v3 = penalties + fees
-      const out = HtmlDiff.executeThreeWay(v1, v2, v3)
-      // Me did nothing — should produce zero Me attribution.
-      expect(out).not.toContain("data-author='me'")
-      // Both tables preserved verbatim (content-paired across positions).
-      // Positional pairing would have produced wild ins/del replacing
-      // "Schedule of Fees" with "Penalty Notices" and vice versa.
-      expect(out).toContain('Schedule of Fees')
-      expect(out).toContain('Penalty Notices')
-      // Output should NOT contain replace-style ins/del wrapping the
-      // distinctive table names (they should appear unchanged).
-      expect(out).not.toMatch(/<del[^>]*>Schedule/)
-      expect(out).not.toMatch(/<ins[^>]*>Penalty/)
-    })
-
-    it('both CP and Me each add their own new table', () => {
+    it('Both added the same new table → settled, plain output', () => {
       expect(
         HtmlDiff.executeThreeWay(
           '<table><tr><td>orig</td></tr></table>',
-          '<table><tr><td>orig</td></tr></table><table><tr><td>cp-added</td></tr></table>',
-          '<table><tr><td>orig</td></tr></table><table><tr><td>cp-added</td></tr></table><table><tr><td>me-added</td></tr></table>'
+          '<table><tr><td>orig</td></tr></table><table><tr><td>added</td></tr></table>',
+          '<table><tr><td>orig</td></tr></table><table><tr><td>added</td></tr></table>'
         )
-      ).toBe(
-        "<table><tr><td>orig</td></tr></table><ins class='diffins cp' data-author='cp'><table><tr><td>cp-added</td></tr></table></ins><ins class='diffins me' data-author='me'><table><tr><td>me-added</td></tr></table></ins>"
-      )
+      ).toBe('<table><tr><td>orig</td></tr></table><table><tr><td>added</td></tr></table>')
     })
   })
 
   describe('cell-level edge cases', () => {
-    it('rowspan attribute preserved and content within attributed correctly', () => {
-      // V1 has a rowspan="2" cell with "Foo"; CP edits to "Bar"; Me kept.
-      // The rowspan attribute survives; the content is attributed.
-      expect(
-        HtmlDiff.executeThreeWay(
-          '<table><tr><td rowspan="2">Foo</td></tr></table>',
-          '<table><tr><td rowspan="2">Bar</td></tr></table>',
-          '<table><tr><td rowspan="2">Bar</td></tr></table>'
-        )
-      ).toBe(
-        "<table><tr><td rowspan=\"2\"><del class='diffdel cp' data-author='cp'>Foo</del><ins class='diffins cp' data-author='cp'>Bar</ins></td></tr></table>"
-      )
-    })
-
     it('exceedsSizeLimit bail-out: oversized table falls through to word-level path', () => {
-      // Build a table with > 1500 rows. preprocessTablesThreeWay returns
-      // null on size cap, so executeThreeWay treats the table as raw HTML
-      // — output is V2 (since V1==V2==V3 in this construction) verbatim.
+      // 1501-row table: preprocessTablesThreeWay returns null on size cap,
+      // so executeThreeWay treats the table as raw HTML.
       const rows = Array.from({ length: 1501 }, (_, i) => `<tr><td>row ${i}</td></tr>`).join('')
       const html = `<table>${rows}</table>`
-      // Identical inputs — output is verbatim regardless of size-cap path.
       expect(HtmlDiff.executeThreeWay(html, html, html)).toBe(html)
     })
+
+    it('cell-count mismatch: CP added a column — CP row content is visible (not silently dropped)', () => {
+      // Regression: the previous fallback in emitPreservedRow emitted
+      // only `del me` + `ins me` for any cell-count mismatch, which
+      // silently destroyed CP's row content whenever CP changed the
+      // cell count. A reader in cp-only mode would see no trace of
+      // CP's added column — a content-loss bug that violates the
+      // "CP's changes always visible" invariant.
+      const out = HtmlDiff.executeThreeWay(
+        '<table><tr><td>a</td><td>b</td></tr></table>',
+        '<table><tr><td>a</td><td>X</td><td>b</td></tr></table>',
+        '<table><tr><td>a</td><td>b</td></tr></table>'
+      )
+      expect(out).toBe(
+        "<table><tr class='diffdel cp' data-author='cp'><td class='diffdel cp' data-author='cp'><del class='diffdel cp' data-author='cp'>a</del></td><td class='diffdel cp' data-author='cp'><del class='diffdel cp' data-author='cp'>b</del></td></tr><tr class='diffins cp' data-author='cp'><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>a</ins></td><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>X</ins></td><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>b</ins></td></tr></table>"
+      )
+    })
+
+    it('cell-count mismatch: Me removed a column — symmetric to the CP case', () => {
+      const out = HtmlDiff.executeThreeWay(
+        '<table><tr><td>a</td><td>b</td></tr></table>',
+        '<table><tr><td>a</td><td>b</td></tr></table>',
+        '<table><tr><td>a</td></tr></table>'
+      )
+      expect(out).toBe(
+        "<table><tr class='diffdel me' data-author='me'><td class='diffdel me' data-author='me'><del class='diffdel me' data-author='me'>a</del></td><td class='diffdel me' data-author='me'><del class='diffdel me' data-author='me'>b</del></td></tr><tr class='diffins me' data-author='me'><td class='diffins me' data-author='me'><ins class='diffins me' data-author='me'>a</ins></td></tr></table>"
+      )
+    })
+
+    it('CP edited one cell in a row (same shape) — fuzzy-pairs and emits a cell-level diff, not whole-row del+ins', () => {
+      // Regression: the 3-way row aligner only did exact lcsAlign over
+      // rowKey, so a row where CP edited a single cell's text produced
+      // no key match and the algorithm split the row into a whole-row
+      // delete + whole-row insert. The 2-way path has always run a
+      // fuzzy-pairing pass after lcsAlign; bringing the 3-way path in
+      // step removes the asymmetry where cp-only / all-changes views
+      // looked materially worse than 2-way for ordinary cell edits.
+      //
+      // Same-shape genesis/cp/me; CP edited the middle cell's text.
+      // Me === genesis. Expect a paired row with cell-level cp-ins
+      // markup, NOT two distinct whole-row entries.
+      const out = HtmlDiff.executeThreeWay(
+        '<table><tr><td>Party A</td><td>old details</td><td>kept</td></tr></table>',
+        '<table><tr><td>Party A</td><td>new details</td><td>kept</td></tr></table>',
+        '<table><tr><td>Party A</td><td>old details</td><td>kept</td></tr></table>'
+      )
+      // CP's edit lives inside the row, not as a parallel whole-row
+      // delete-then-insert. Whole-row markers would carry `class='diffdel ...'`
+      // or `class='diffins ...'` on the `<tr>` itself.
+      expect(out).not.toMatch(/<tr [^>]*class=['"]diffdel/)
+      expect(out).not.toMatch(/<tr [^>]*class=['"]diffins/)
+      expect(out).toContain('Party A')
+      expect(out).toContain("data-author='cp'")
+      // Me === genesis so any me attribution would indicate a swap.
+      expect(out).not.toContain("data-author='me'")
+    })
+
+    it('cell-count mismatch: both sides restructured differently — both ins rows attributed', () => {
+      // Genesis 2 cells, CP 3 cells, Me 4 cells. Neither side keeps
+      // the genesis shape, so both restructures must be visible.
+      const out = HtmlDiff.executeThreeWay(
+        '<table><tr><td>a</td><td>b</td></tr></table>',
+        '<table><tr><td>a</td><td>X</td><td>b</td></tr></table>',
+        '<table><tr><td>a</td><td>b</td><td>Y</td><td>Z</td></tr></table>'
+      )
+      expect(out).toBe(
+        "<table><tr class='diffins cp' data-author='cp'><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>a</ins></td><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>X</ins></td><td class='diffins cp' data-author='cp'><ins class='diffins cp' data-author='cp'>b</ins></td></tr><tr class='diffins me' data-author='me'><td class='diffins me' data-author='me'><ins class='diffins me' data-author='me'>a</ins></td><td class='diffins me' data-author='me'><ins class='diffins me' data-author='me'>b</ins></td><td class='diffins me' data-author='me'><ins class='diffins me' data-author='me'>Y</ins></td><td class='diffins me' data-author='me'><ins class='diffins me' data-author='me'>Z</ins></td></tr></table>"
+      )
+    })
   })
 
   describe('nested tables', () => {
     it('handles a table nested inside a cell — both attributed correctly', () => {
-      // Outer table with a single cell containing an inner table. CP edits
-      // the inner table's content; Me doesn't touch it. The recursion
-      // through cellDiff should reach the inner table and attribute it.
-      const v1 = '<table><tr><td><table><tr><td>inner</td></tr></table></td></tr></table>'
-      const v2 = '<table><tr><td><table><tr><td>INNER</td></tr></table></td></tr></table>'
-      const v3 = '<table><tr><td><table><tr><td>INNER</td></tr></table></td></tr></table>'
-      const out = HtmlDiff.executeThreeWay(v1, v2, v3)
-      // Inner cell content attributed to CP via the recursive cellDiff.
+      const out = HtmlDiff.executeThreeWay(
+        '<table><tr><td><table><tr><td>inner</td></tr></table></td></tr></table>',
+        '<table><tr><td><table><tr><td>INNER</td></tr></table></td></tr></table>',
+        '<table><tr><td><table><tr><td>inner</td></tr></table></td></tr></table>'
+      )
       expect(out).toMatch(/<del[^>]*data-author='cp'[^>]*>inner<\/del>/)
       expect(out).toMatch(/<ins[^>]*data-author='cp'[^>]*>INNER<\/ins>/)
-      // Outer table scaffolding intact.
+      // me == genesis here, so any me attribution would indicate a
+      // cp↔me swap inside the table-cell merge.
+      expect(out).not.toContain("data-author='me'")
       expect(out.startsWith('<table><tr><td><table>')).toBe(true)
       expect(out.endsWith('</table></td></tr></table>')).toBe(true)
     })
 
-    it('safely handles deeply-nested tables without infinite recursion', () => {
-      // Build a 10-deep nested table. The MaxThreeWayDepth cap kicks in
-      // at level 8, falling back to word-level treatment of deeper tables.
-      // The test just verifies no crash and reasonable output.
+    it('deeply-nested identity tables pass through unchanged (depth cap exercised)', () => {
       let v = 'leaf'
       for (let i = 0; i < 10; i++) v = `<table><tr><td>${v}</td></tr></table>`
-      // Identical inputs — should produce input verbatim regardless of depth.
       expect(HtmlDiff.executeThreeWay(v, v, v)).toBe(v)
     })
   })
 
   describe('integration with surrounding prose', () => {
-    it('attributes both the cell content AND the surrounding prose', () => {
-      const out = HtmlDiff.executeThreeWay(
-        '<p>Rates as follows:</p><table><tr><td>five</td></tr></table>',
-        '<p>Interest rates as follows:</p><table><tr><td>five and a half</td></tr></table>',
-        '<p>Interest rates as follows:</p><table><tr><td>five</td></tr></table>'
+    it('prose and table both attributed correctly', () => {
+      expect(
+        HtmlDiff.executeThreeWay(
+          '<p>Rates as follows:</p><table><tr><td>five</td></tr></table>',
+          '<p>Interest rates as follows:</p><table><tr><td>five and a half</td></tr></table>',
+          '<p>Rates as follows:</p><table><tr><td>five</td></tr></table>'
+        )
+      ).toBe(
+        "<p><del class='diffdel cp' data-author='cp'>Rates</del><ins class='diffins cp' data-author='cp'>Interest rates</ins> as follows:</p><table><tr><td>five<ins class='diffins cp' data-author='cp'>&nbsp;and a half</ins></td></tr></table>"
       )
-      // CP edited the prose (added "Interest "), Me rejected CP's table edit.
-      expect(out).toContain("<ins class='diffins cp' data-author='cp'>Interest")
-      expect(out).toContain("data-rejects='cp'")
-      // Table scaffolding intact.
-      expect(out).toContain('<table>')
-      expect(out).toContain('</table>')
     })
 
-    it('passes inputs with no tables through to the word-level path unchanged', () => {
-      // No tables → preprocessTablesThreeWay returns null → executeThreeWay
-      // skips straight to word-level. Sanity check the no-op.
+    it('no-tables path is unaffected', () => {
       expect(HtmlDiff.executeThreeWay('<p>a</p>', '<p>a</p>', '<p>a</p>')).toBe('<p>a</p>')
     })
   })
+
+  describe('positional pairing under moderate dissimilarity', () => {
+    it('column rename + value rewrite still routes through cell-level diff (not whole-table del+ins)', () => {
+      // Real-world regression: cp renamed a column ("Form/Document/Certificate"
+      // → "Extra column") and replaced the values in that column with short
+      // tokens. Word-level Jaccard between the genesis table and cp's edited
+      // table drops to ~0.38 — under the 0.5 threshold the three-way path
+      // used to take, which kicked the diff into multi-table content-LCS
+      // and produced whole-table del+ins (the cp's CP-bubble showed the
+      // entire old table struck through and the entire new table inserted).
+      // 2-way had no such guard and produced a cell-level diff for the same
+      // inputs; lowering the 3-way threshold brings the two paths in step.
+      const genesis =
+        '<table><tr><td>A</td><td>Form/Document/Certificate</td><td>Date</td></tr><tr><td>Party A</td><td>IRS W-8</td><td>On execution</td></tr></table>'
+      const cp =
+        '<table><tr><td>A</td><td>Extra column</td><td>Date</td></tr><tr><td>Party A</td><td>Yes</td><td>On execution</td></tr></table>'
+      const me = genesis
+      const out = HtmlDiff.executeThreeWay(genesis, cp, me)
+      // Expect cell-level cp attribution INSIDE the table cells, NOT a
+      // whole-table del+ins wrapping the entire <table>.
+      expect(out).not.toMatch(/<del[^>]*><table/)
+      expect(out).toMatch(/data-author='cp'/)
+      // me === genesis, so any me-attribution markers would mean the
+      // diff swapped CP's edits onto Me. Negative assertion locks the
+      // attribution direction.
+      expect(out).not.toContain("data-author='me'")
+      expect(out).toContain('Extra column')
+      expect(out).toContain('Form/Document/Certificate')
+    })
+  })
 })

package/test/Utils.spec.ts

@@ -138,10 +138,10 @@ describe('Utils', () => {
     it('combines extraClasses and dataAttrs in one call', () => {
       expect(
         Utils.wrapText('hello', 'del', 'diffdel', {
-          extraClasses: 'me rejects-cp',
-          dataAttrs: { author: 'me', rejects: 'cp' },
+          extraClasses: 'me',
+          dataAttrs: { author: 'me', source: 'edit' },
         })
-      ).toBe("<del class='diffdel me rejects-cp' data-author='me' data-rejects='cp'>hello</del>")
+      ).toBe("<del class='diffdel me' data-author='me' data-source='edit'>hello</del>")
     })
 
     it('skips the metadata path entirely when neither extraClasses nor dataAttrs is set', () => {