Composite tag layers into the macOS e2e captures

Tag text stopped living in the frame grid when the core moved the topbar, the
column bar and every pane tag into tag layers of their own; the grid keeps the
chrome and the physical grips. readFrame still read the grid alone, so every
capture recorded blank header rows and each script timed out waiting for text
that was on screen but not in the dump. Flatten the layers back over the grid
at one cell per column — the tty backend's spelling, which these goldens exist
to stay comparable with — and follow pardes_font_take to its size out-param.

The goldens were recorded before the column bar and before the tag gap, so
they are rerecorded here: the captures now agree column for column with what
the tty renderer paints today.

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>

1 files changed, 64 insertions, 64 deletions

diff --git a/test/macos-snapshots/rotate.golden b/test/macos-snapshots/rotate.golden
index 3254a7fc..0f6dcc4b 100644
--- a/test/macos-snapshots/rotate.golden
+++ b/test/macos-snapshots/rotate.golden
@@ -1,6 +1,7 @@
-== snap results grid=100x30 cursor=7,4
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+== snap results grid=100x30 cursor=7,5
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -24,14 +25,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     1 @p0:3:3-6 x MARK 01
-|     2 @p0:5:3-6 x MARK 02
-|     3 @p0:7:3-6 x MARK 03
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     1 @p0:3:3-6
+|     2 x MARK 01
+|     3 @p0:5:3-6
 == snap forward grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -55,14 +56,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     1 @p0:3:3-6 x MARK 01
-|     2 @p0:5:3-6 x MARK 02
-|     3 @p0:7:3-6 x MARK 03
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     2 x MARK 01
+|     3 @p0:5:3-6
+|     4 x MARK 02
 == snap forward2 grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -86,14 +87,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     2 @p0:5:3-6 x MARK 02
-|     3 @p0:7:3-6 x MARK 03
-|     4 @p0:9:3-6 x MARK 04
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     4 x MARK 02
+|     5 @p0:7:3-6
+|     6 x MARK 03
 == snap back grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -117,14 +118,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     2 @p0:5:3-6 x MARK 02
-|     3 @p0:7:3-6 x MARK 03
-|     4 @p0:9:3-6 x MARK 04
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     4 x MARK 02
+|     5 @p0:7:3-6
+|     6 x MARK 03
 == snap forward_by_key grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -148,14 +149,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     3 @p0:7:3-6 x MARK 03
-|     4 @p0:9:3-6 x MARK 04
-|     5 @p0:11:3-6 x MARK 05
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     6 x MARK 03
+|     7 @p0:9:3-6
+|     8 x MARK 04
 == snap placed grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -179,14 +180,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     3 @p0:7:3-6 x MARK 03
-|     4 @p0:9:3-6 x MARK 04
-|     5 @p0:11:3-6 x MARK 05
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     6 x MARK 03
+|     7 @p0:9:3-6
+|     8 x MARK 04
 == snap placed_released grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -210,14 +211,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     3 @p0:7:3-6 x MARK 03
-|     4 @p0:9:3-6 x MARK 04
-|     5 @p0:11:3-6 x MARK 05
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|     6 x MARK 03
+|     7 @p0:9:3-6
+|     8 x MARK 04
 == snap thrown grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -241,14 +242,14 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|     7 @p0:15:3-6 x MARK 07
-|     8 @p0:17:3-6 x MARK 08
-|     9 @p0:19:3-6 x MARK 09
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|    14 x MARK 07
+|    15 @p0:17:3-6
+|    16 x MARK 08
 == snap thrown_coasted grid=100x30 cursor=7,28
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /private/tmp/pardes-macos-e2e/rotate/cwd            Save New Newtty Del Filter
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|   New Tty Find Grep Joincol
+|   /private/tmp/pardes-macos-e2e/rotate/cwd Tty Save Del Mode Filter Collapse
 |  printf 'x MA''RK %s\nzz\n' 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 |  24
 |  x MARK 01
@@ -272,9 +273,8 @@
 |  x MARK 10
 |  zz
 |  x MARK 11
-|  zz
-|  /private/tmp/pardes-macos-e2e/rotate/cwd/+Search           Save New Newtty Del
-|    17 @p0:35:3-6 x MARK 17
-|    18 @p0:37:3-6 x MARK 18
-|    19 @p0:39:3-6 x MARK 19
+|   /private/tmp/pardes-macos-e2e/rotate/cwd/+Search Save Tty Del Collapse LocationsConfig
+|    34 x MARK 17
+|    35 @p0:37:3-6
+|    36 x MARK 18
 == draw rotate 850x495 nonblank