From f5cac1277c811b5906478ff9223853ce5771dfb5 Mon Sep 17 00:00:00 2001 From: James Long Date: Tue, 27 Oct 2026 18:20:10 -0400 Subject: [PATCH] fix(process-daemon): block subscriptions instead of polling (#59698) --- packages/process-daemon/src/daemon/server.rs | 1 - packages/process-daemon/tests/ownership.rs | 31 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/packages/process-daemon/src/daemon/server.rs b/packages/process-daemon/src/daemon/server.rs index b3603add9d3..48a20a84ad8 100644 --- a/packages/process-daemon/src/daemon/server.rs +++ b/packages/process-daemon/src/daemon/server.rs @@ -288,7 +288,6 @@ fn stream_subscription( Ok(event) => event, Err(_) => break Ok(()), }, - default(Duration::from_millis(100)) => continue, }; let response = match event { StreamEvent::Output { start, end, bytes } => { diff --git a/packages/process-daemon/tests/ownership.rs b/packages/process-daemon/tests/ownership.rs index a9f6725902e..ececcbcdbcf 100644 --- a/packages/process-daemon/tests/ownership.rs +++ b/packages/process-daemon/tests/ownership.rs @@ -277,6 +277,37 @@ fn subscription_delivers_final_exit_frame_before_closing() { daemon.wait(); } +#[test] +fn shutdown_ends_an_idle_subscription() { + let mut daemon = Daemon::start(); + let (mut owner, response) = daemon.own(None); + assert!(matches!(response, Response::Owned)); + let terminal = daemon.terminal("exec cat"); + let mut subscription = daemon.connect(); + assert!(matches!( + daemon.send( + &mut subscription, + Request::Subscribe { + id: terminal.id, + offset: 0, + attachment_id: "idle-observer".into(), + role: AttachmentRole::Observer, + takeover: false, + } + ), + Response::Attached { .. } + )); + // The subscription is blocked with no output; shutdown must still end it. + assert!(matches!( + daemon.send(&mut owner, Request::Shutdown), + Response::Ok + )); + // The 3s read timeout fails this read if the handler never closes the stream. + subscription.read_to_end(&mut Vec::new()).unwrap(); + daemon.wait(); + assert_terminal_stopped(&terminal); +} + #[test] fn handoff_preserves_daemon_and_terminal_and_shutdown_overrides_it() { let mut daemon = Daemon::start();