From 95d14837d8e319541a44f3516422e2a1c0875e27 Mon Sep 17 00:00:00 2001
From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com>
Date: Thu, 27 Aug 2026 17:58:58 -0700
Subject: [PATCH 1/3] test(cmux-tui): cover ordered durable notice replay

---
 .../cmux-tui/src/machine_provider_client.rs   | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs b/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
index 5a94c935791b..9eeee90cbf56 100644
--- a/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
+++ b/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
@@ -1878,16 +1878,18 @@ mod tests {
                     ref consumer_id
                 }) if consumer_id == &id("cmux-process-1")
             ));
-            write_test_frame(
-                &mut stream,
-                &EventEnvelope::with_delivery(
-                    ProviderEvent::Notice(ProviderNotice {
-                        level: NoticeLevel::Warning,
-                        message: "trial has ten minutes remaining".into(),
-                    }),
-                    NoticeDelivery { notice_id: id("usage-warning-90"), sequence: 42 },
-                ),
-            );
+            for (notice_id, sequence) in [("usage-warning-90", 42), ("usage-warning-91", 43)] {
+                write_test_frame(
+                    &mut stream,
+                    &EventEnvelope::with_delivery(
+                        ProviderEvent::Notice(ProviderNotice {
+                            level: NoticeLevel::Warning,
+                            message: format!("trial warning {sequence}"),
+                        }),
+                        NoticeDelivery { notice_id: id(notice_id), sequence },
+                    ),
+                );
+            }
             write_test_frame(
                 &mut stream,
                 &ResponseEnvelope::success(subscribe.id, SubscribeNoticesResult { sequence: 41 }),
@@ -1907,13 +1909,28 @@ mod tests {
         );
         assert!(provider.is_live(), "valid replay closed the provider connection");
         let events = provider.subscribe_events().expect("subscribe to retained events");
+        let first = events
+            .recv_timeout(Duration::from_secs(2))
+            .expect("receive first replay after cursor initialization");
         assert_eq!(
-            events
-                .recv_timeout(Duration::from_secs(2))
-                .expect("receive replay after cursor initialization")
-                .delivery,
+            first.delivery,
             Some(NoticeDelivery { notice_id: id("usage-warning-90"), sequence: 42 })
         );
+        assert!(matches!(
+            first.event,
+            ProviderEvent::Notice(ProviderNotice { ref message, .. }) if message == "trial warning 42"
+        ));
+        let second = events
+            .recv_timeout(Duration::from_secs(2))
+            .expect("receive second replay after cursor initialization");
+        assert_eq!(
+            second.delivery,
+            Some(NoticeDelivery { notice_id: id("usage-warning-91"), sequence: 43 })
+        );
+        assert!(matches!(
+            second.event,
+            ProviderEvent::Notice(ProviderNotice { ref message, .. }) if message == "trial warning 43"
+        ));
 
         finish.send(()).expect("finish provider server");
         drop(provider);

From dac3d88b56d5fe09681070af4d8cd38daa38b800 Mon Sep 17 00:00:00 2001
From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com>
Date: Thu, 27 Aug 2026 17:59:22 -0700
Subject: [PATCH 2/3] perf(cmux-tui): replay durable notices without a
 temporary vec

---
 cmux-tui/crates/cmux-tui/src/machine_provider_client.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs b/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
index 9eeee90cbf56..13b740903d03 100644
--- a/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
+++ b/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
@@ -553,7 +553,8 @@ impl ProviderClientInner {
         }
         events.acknowledged_sequence = sequence;
         events.durable_subscription = DurableSubscriptionState::Active;
-        for event in events.retained_durable.iter().cloned().collect::<Vec<_>>() {
+        for index in 0..events.retained_durable.len() {
+            let event = events.retained_durable[index].clone();
             Self::publish_to_event_subscribers(&mut events, event)?;
         }
         Ok(())

From cd55ac6e3cda48f0660d1c3a93923b551341464f Mon Sep 17 00:00:00 2001
From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com>
Date: Thu, 27 Aug 2026 19:57:01 -0700
Subject: [PATCH 3/3] test(cmux-tui): exercise indexed notice replay

---
 cmux-tui/crates/cmux-tui/src/machine_provider_client.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs b/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
index 13b740903d03..94984fb1f8f1 100644
--- a/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
+++ b/cmux-tui/crates/cmux-tui/src/machine_provider_client.rs
@@ -1904,12 +1904,14 @@ mod tests {
             client_descriptor(),
         )
         .expect("authenticate provider");
+        // Install the receiver before the cursor response so this assertion
+        // exercises complete_notice_subscription's ordered replay path.
+        let events = provider.subscribe_events().expect("subscribe to replay events");
         assert_eq!(
             provider.subscribe_notices(id("cmux-process-1")).expect("resume durable subscription"),
             SubscribeNoticesResult { sequence: 41 }
         );
         assert!(provider.is_live(), "valid replay closed the provider connection");
-        let events = provider.subscribe_events().expect("subscribe to retained events");
         let first = events
             .recv_timeout(Duration::from_secs(2))
             .expect("receive first replay after cursor initialization");