diff -U3 /tmp/cirrus-ci-build/contrib/workmem/expected/workmem.out /tmp/cirrus-ci-build/contrib/workmem/results/workmem.out
--- /tmp/cirrus-ci-build/contrib/workmem/expected/workmem.out	2025-03-16 11:18:06.941606890 +0000
+++ /tmp/cirrus-ci-build/contrib/workmem/results/workmem.out	2025-03-16 11:24:27.285959208 +0000
@@ -30,9 +30,10 @@
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
 group by grouping sets((a, b), (a));
 ');
-                            workmem_filter                            
-----------------------------------------------------------------------
+                                       workmem_filter                                       
+--------------------------------------------------------------------------------------------
  WindowAgg  (work_mem=N kB limit=25600 kB)
+   Window: w1 AS (ORDER BY "*VALUES*".column1, "*VALUES*".column2 ROWS UNBOUNDED PRECEDING)
    ->  Sort  (work_mem=N kB limit=25600 kB)
          Sort Key: "*VALUES*".column1, "*VALUES*".column2 NULLS FIRST
          ->  HashAggregate  (work_mem=N kB limit=51200 kB)
@@ -42,7 +43,7 @@
                      Filter: (column1 = column2)
  Total Working Memory: N kB
  Total Working Memory Limit: 102400 kB
-(10 rows)
+(11 rows)
 
 select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
@@ -63,9 +64,10 @@
 from (values (1, 1, 1, 1), (2, 2, 2, 2)) as t (a, b, c, d) where a = b
 group by grouping sets((a, b), (a), (b), (c), (d));
 ');
-                            workmem_filter                            
-----------------------------------------------------------------------
+                                       workmem_filter                                       
+--------------------------------------------------------------------------------------------
  WindowAgg  (work_mem=N kB limit=20480 kB)
+   Window: w1 AS (ORDER BY "*VALUES*".column1, "*VALUES*".column2 ROWS UNBOUNDED PRECEDING)
    ->  Sort  (work_mem=N kB limit=20480 kB)
          Sort Key: "*VALUES*".column1, "*VALUES*".column2 NULLS FIRST
          ->  GroupAggregate  (work_mem=N kB limit=40960 kB)
@@ -83,7 +85,7 @@
                            Filter: (column1 = column2)
  Total Working Memory: N kB
  Total Working Memory Limit: 102400 kB
-(18 rows)
+(19 rows)
 
 select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1, 1, 1), (2, 2, 2, 2)) as t (a, b, c, d) where a = b
@@ -164,12 +166,13 @@
 --------------------------------------------------------------------------------------
  Limit
    ->  WindowAgg  (work_mem=N kB limit=34134 kB)
+         Window: w1 AS (PARTITION BY ((a.n < 3)))
          ->  Sort  (work_mem=N kB limit=34133 kB)
                Sort Key: ((a.n < 3))
                ->  Function Scan on generate_series a  (work_mem=N kB limit=34133 kB)
  Total Working Memory: N kB
  Total Working Memory Limit: 102400 kB
-(7 rows)
+(8 rows)
 
 select sum(n) over(partition by m)
 from (SELECT n < 3 as m, n from generate_series(1,2000) a(n))
@@ -245,9 +248,10 @@
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
 group by grouping sets((a, b), (a));
 ');
-                            workmem_filter                            
-----------------------------------------------------------------------
+                                       workmem_filter                                       
+--------------------------------------------------------------------------------------------
  WindowAgg  (work_mem=N kB limit=1024 kB)
+   Window: w1 AS (ORDER BY "*VALUES*".column1, "*VALUES*".column2 ROWS UNBOUNDED PRECEDING)
    ->  Sort  (work_mem=N kB limit=1024 kB)
          Sort Key: "*VALUES*".column1, "*VALUES*".column2 NULLS FIRST
          ->  HashAggregate  (work_mem=N kB limit=2048 kB)
@@ -257,7 +261,7 @@
                      Filter: (column1 = column2)
  Total Working Memory: N kB
  Total Working Memory Limit: 4096 kB
-(10 rows)
+(11 rows)
 
 select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
@@ -278,9 +282,10 @@
 from (values (1, 1, 1, 1), (2, 2, 2, 2)) as t (a, b, c, d) where a = b
 group by grouping sets((a, b), (a), (b), (c), (d));
 ');
-                            workmem_filter                            
-----------------------------------------------------------------------
+                                       workmem_filter                                       
+--------------------------------------------------------------------------------------------
  WindowAgg  (work_mem=N kB limit=820 kB)
+   Window: w1 AS (ORDER BY "*VALUES*".column1, "*VALUES*".column2 ROWS UNBOUNDED PRECEDING)
    ->  Sort  (work_mem=N kB limit=819 kB)
          Sort Key: "*VALUES*".column1, "*VALUES*".column2 NULLS FIRST
          ->  GroupAggregate  (work_mem=N kB limit=1638 kB)
@@ -298,7 +303,7 @@
                            Filter: (column1 = column2)
  Total Working Memory: N kB
  Total Working Memory Limit: 4096 kB
-(18 rows)
+(19 rows)
 
 select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1, 1, 1), (2, 2, 2, 2)) as t (a, b, c, d) where a = b
@@ -379,12 +384,13 @@
 -------------------------------------------------------------------------------------
  Limit
    ->  WindowAgg  (work_mem=N kB limit=1366 kB)
+         Window: w1 AS (PARTITION BY ((a.n < 3)))
          ->  Sort  (work_mem=N kB limit=1365 kB)
                Sort Key: ((a.n < 3))
                ->  Function Scan on generate_series a  (work_mem=N kB limit=1365 kB)
  Total Working Memory: N kB
  Total Working Memory Limit: 4096 kB
-(7 rows)
+(8 rows)
 
 select sum(n) over(partition by m)
 from (SELECT n < 3 as m, n from generate_series(1,2000) a(n))
@@ -462,9 +468,10 @@
 group by grouping sets((a, b), (a));
 ');
 WARNING:  not enough working memory for query: increase workmem.query_work_mem
-                            workmem_filter                            
-----------------------------------------------------------------------
+                                       workmem_filter                                       
+--------------------------------------------------------------------------------------------
  WindowAgg  (work_mem=N kB limit=20 kB)
+   Window: w1 AS (ORDER BY "*VALUES*".column1, "*VALUES*".column2 ROWS UNBOUNDED PRECEDING)
    ->  Sort  (work_mem=N kB limit=20 kB)
          Sort Key: "*VALUES*".column1, "*VALUES*".column2 NULLS FIRST
          ->  HashAggregate  (work_mem=N kB limit=40 kB)
@@ -474,7 +481,7 @@
                      Filter: (column1 = column2)
  Total Working Memory: N kB
  Total Working Memory Limit: 80 kB
-(10 rows)
+(11 rows)
 
 select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1), (2, 2)) as t (a, b) where a = b
@@ -497,9 +504,10 @@
 group by grouping sets((a, b), (a), (b), (c), (d));
 ');
 WARNING:  not enough working memory for query: increase workmem.query_work_mem
-                            workmem_filter                            
-----------------------------------------------------------------------
+                                       workmem_filter                                       
+--------------------------------------------------------------------------------------------
  WindowAgg  (work_mem=N kB limit=16 kB)
+   Window: w1 AS (ORDER BY "*VALUES*".column1, "*VALUES*".column2 ROWS UNBOUNDED PRECEDING)
    ->  Sort  (work_mem=N kB limit=16 kB)
          Sort Key: "*VALUES*".column1, "*VALUES*".column2 NULLS FIRST
          ->  GroupAggregate  (work_mem=N kB limit=32 kB)
@@ -517,7 +525,7 @@
                            Filter: (column1 = column2)
  Total Working Memory: N kB
  Total Working Memory Limit: 80 kB
-(18 rows)
+(19 rows)
 
 select a, b, row_number() over (order by a, b nulls first)
 from (values (1, 1, 1, 1), (2, 2, 2, 2)) as t (a, b, c, d) where a = b
@@ -602,12 +610,13 @@
 -----------------------------------------------------------------------------------
  Limit
    ->  WindowAgg  (work_mem=N kB limit=27 kB)
+         Window: w1 AS (PARTITION BY ((a.n < 3)))
          ->  Sort  (work_mem=N kB limit=27 kB)
                Sort Key: ((a.n < 3))
                ->  Function Scan on generate_series a  (work_mem=N kB limit=26 kB)
  Total Working Memory: N kB
  Total Working Memory Limit: 80 kB
-(7 rows)
+(8 rows)
 
 select sum(n) over(partition by m)
 from (SELECT n < 3 as m, n from generate_series(1,2000) a(n))