Revert #5276 over-eager OSC 8 close; fix _rowsWithUrls stale tracking

The condition added in 56eef0c ("emit OSC 8 close at row start whenever
the row had URLs previously") was a defensive workaround for the apparent
floating-underline symptom on Warp/Windows Terminal. Investigation of WT
source shows the bug is in ControlCore::_updateHoveredCell()'s stale
_lastHoveredCell cache (no callback fires when buffer content changes
under a stationary cursor) — not in Terminal.Gui's emission. The cells
themselves get _hyperlinkId = 0 correctly via AdaptDispatch::EndHyperlink
when we emit `OSC 8 ; ; ST` followed by new cell content.

Restoring the original (rowHadUrlsPreviously && \!rowHasUrlsNow) condition
avoids a redundant escape on every row that still contains a URL after
redraw. Also drops the regression test that pinned the redundant behavior.

Separately, fix a real bookkeeping bug: _rowsWithUrls.Add/Remove was
placed after the empty-builder early-exit at the end of the per-row block.
Rows whose dirty cells were entirely flushed mid-loop via WriteToConsole
(leaving the builder empty and _lastUrl null) skipped the row-tracking
update, leaving stale entries that trigger spurious row-start OSC 8 closes
on subsequent frames. Move the Add/Remove before the early-exit, and add
a regression test that fails without the fix.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: harder

Terminal.Gui/Drivers/Output/OutputBase.cs

@@ -120,7 +120,7 @@ public virtual void Write (IOutputBuffer buffer)
             outputStringBuilder.Clear ();
             _lastUrl = null; // Reset URL state at the start of each row
 
-            if (!IsLegacyConsole && rowHadUrlsPreviously)
+            if (!IsLegacyConsole && rowHadUrlsPreviously && !rowHasUrlsNow)
             {
                 outputStringBuilder.Append (EscSeqUtils.OSC_EndHyperlink ());
             }
@@ -199,6 +199,21 @@ public virtual void Write (IOutputBuffer buffer)
                 }
             }
 
+            // Track row's URL status BEFORE the early-exit so _rowsWithUrls stays consistent
+            // with the buffer state — even for rows whose cells were all flushed via WriteToConsole
+            // during the inner loop (leaving outputStringBuilder empty at this point).
+            if (!IsLegacyConsole)
+            {
+                if (rowHasUrlsNow)
+                {
+                    _rowsWithUrls.Add (row);
+                }
+                else
+                {
+                    _rowsWithUrls.Remove (row);
+                }
+            }
+
             // Flush buffered output for row. Even when nothing remains buffered, an OSC 8 hyperlink
             // may still be open in the terminal because it was started in a prior batch flushed by
             // WriteToConsole and the row ended (or only clean cells followed) before any cell with
@@ -227,15 +242,6 @@ public virtual void Write (IOutputBuffer buffer)
             SetCursorPositionImpl (lastCol, row);
 
             Write (outputStringBuilder);
-
-            if (rowHasUrlsNow)
-            {
-                _rowsWithUrls.Add (row);
-            }
-            else
-            {
-                _rowsWithUrls.Remove (row);
-            }
         }
 
         if (IsLegacyConsole)

Tests/UnitTestsParallelizable/Drivers/Output/OutputBaseTests.cs

@@ -425,35 +425,6 @@ public void Write_AutoDetectedUrl_ThenSpaces_EmitsOsc8CloseBeforeClearingCells (
         Assert.True (endIdx >= 0 && endIdx < replacementIdx, "OSC 8 close must be emitted before replacement spaces");
     }
 
-    // Copilot - GPT-5.4
-    // Regression coverage for the remaining floating-underline case when a row still contains
-    // a URL after redraw, but cells that were formerly part of a URL are now plain text.
-    // Warp appears to need an explicit OSC 8 close before those replacement cells are emitted;
-    // otherwise the old hyperlink metadata can remain attached to the old screen columns.
-    [Fact]
-    public void Write_AutoDetectedUrl_MovedWithinSameRow_ClosesBeforePlainReplacement ()
-    {
-        AnsiOutput output = new ();
-        IOutputBuffer buffer = output.GetLastBuffer ()!;
-        buffer.SetSize (48, 1);
-
-        buffer.Move (0, 0);
-        buffer.AddStr ("https://one.example then trailing text            ");
-        output.Write (buffer);
-
-        buffer.Move (0, 0);
-        buffer.AddStr ("plain intro then https://two.example            ");
-
-        output.Write (buffer);
-        string result = output.GetLastOutput ();
-        string end = EscSeqUtils.OSC_EndHyperlink ();
-        int replacementIdx = result.IndexOf ("plain intro then ", StringComparison.Ordinal);
-        int endIdx = result.IndexOf (end, StringComparison.Ordinal);
-
-        Assert.True (replacementIdx >= 0, "Replacement plain text was not emitted");
-        Assert.True (endIdx >= 0 && endIdx < replacementIdx, "OSC 8 close must be emitted before the old linked cells are redrawn as plain text");
-    }
-
     // Claude - Opus 4.7
     // Regression coverage for the char-vs-column mismatch in SyncAutoUrlsForRowCore.
     // When a multi-codepoint grapheme (ZWJ emoji, base + combining mark) precedes a URL
@@ -552,6 +523,52 @@ public void GetCellUrl_AfterUrlSetThenCleared_RestoresNullFastPath ()
         Assert.True (buffer.UrlStateVersion > 0);
     }
 
+    // Claude - Opus 4.7
+    // Regression coverage for _rowsWithUrls bookkeeping when the per-row flush happens entirely
+    // via WriteToConsole (i.e. the end-of-row Write path takes the empty-builder early-exit).
+    // Before the fix, the Add/Remove of the row index lived after the early-exit, so a row that
+    // lost its URL via overwrite but had clean trailing cells (causing the builder to flush
+    // mid-loop and end empty) kept a stale row-tracking entry — leading to a spurious row-start
+    // OSC 8 close on subsequent frames.
+    [Fact]
+    public void Write_RowLosesUrl_BuilderFlushedMidLoop_RemovesRowTracking ()
+    {
+        // Arrange — buffer with a URL on row 0, then overwrite the URL cells with non-URL
+        // content followed by clean cells (so the builder flushes mid-loop and the row exits
+        // with an empty builder, taking the early-exit).
+        AnsiOutput output = new ();
+        IOutputBuffer buffer = output.GetLastBuffer ()!;
+        buffer.SetSize (40, 1);
+
+        // Frame 1: write URL covering cols 0-18, trailing space cells stay as ' '.
+        buffer.Move (0, 0);
+        buffer.AddStr ("https://example.com");
+        output.Write (buffer);
+
+        // Frame 2: overwrite the URL cells with Y characters. Cells 0-19 become dirty (19
+        // Y's plus the adjacent-dirty mark on cell 19). Cells 20-39 stay clean — they will
+        // trigger the WriteToConsole flush and leave the row with an empty builder.
+        buffer.Move (0, 0);
+        buffer.AddStr ("YYYYYYYYYYYYYYYYYYY");
+        output.Write (buffer);
+
+        // Frame 3: trivial change. With the fix, row 0 has been removed from _rowsWithUrls,
+        // so no OSC 8 close is emitted at the start of row 0. Without the fix, the stale
+        // entry causes a spurious OSC 8 close.
+        buffer.Move (0, 0);
+        buffer.AddStr ("X");
+
+        // Act
+        output.Write (buffer);
+        string result = output.GetLastOutput ();
+        string end = EscSeqUtils.OSC_EndHyperlink ();
+
+        // Assert — frame 3 must NOT emit an OSC 8 close because frame 2's row no longer
+        // has any URL state, and _rowsWithUrls must reflect that even when the early-exit
+        // path is taken.
+        Assert.DoesNotContain (end, result);
+    }
+
     // Copilot
     [Fact]
     public void ToAnsi_LegacyConsole_NoOsc8 ()