Skip to content

Bound daemon loss classification probes #11151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lawrencecchen merged 6 commits into from
Aug 28, 2026
Merged

Bound daemon loss classification probes #11151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42ff075
Bound daemon loss classification probes
lawrencecchen Aug 28, 2026
04ac656
Test bounded daemon tree probe timeout
lawrencecchen Aug 28, 2026
dafcb70
Bound tree refresh lock acquisition
lawrencecchen Aug 28, 2026
6a81ab8
Share daemon probe deadline across phases
lawrencecchen Aug 28, 2026
b34e877
Fix timeout test assertions
lawrencecchen Aug 28, 2026
befc239
fix(tui): park during bounded tree refresh lock waits
lawrencecchen Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions cmux-tui/crates/cmux-tui/src/pipe_io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use std::io::{BufRead, Write};
use std::path::Path;
use std::sync::Arc;
use std::sync::mpsc::{Receiver, SyncSender};
use std::time::{Duration, Instant};

use base64::Engine as _;
use cmux_tui_core::SurfaceId;
Expand All @@ -46,6 +47,7 @@ const EVENT_QUEUE_CAPACITY: usize = 4096;
/// reset plus erase-scrollback, so the replacement replay does not stack on
/// top of the embedder's previous terminal state.
const REPLAY_RESET: &[u8] = b"\x1bc\x1b[3J";
const DAEMON_LOSS_PROBE_TIMEOUT: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum PipeIoExitReason {
Expand Down Expand Up @@ -160,14 +162,17 @@ fn classify_daemon_loss(
socket_path: &Path,
terminal: &TerminalPublicId,
) -> PipeIoExitReason {
let terminal_still_exists =
remote.refresh_tree().ok().map(|tree| tree.resolve_terminal(terminal).is_some()).or_else(
|| {
let probe = RemoteSession::connect_for_terminal_attach(socket_path).ok()?;
let tree = probe.refresh_tree().ok()?;
Some(tree.resolve_terminal(terminal).is_some())
},
);
let deadline = Instant::now() + DAEMON_LOSS_PROBE_TIMEOUT;
let terminal_still_exists = remote
.refresh_tree_until(deadline)
.ok()
.map(|tree| tree.resolve_terminal(terminal).is_some())
.or_else(|| {
let probe =
RemoteSession::connect_for_terminal_attach_until(socket_path, deadline).ok()?;
let tree = probe.refresh_tree_until(deadline).ok()?;
Some(tree.resolve_terminal(terminal).is_some())
});
match terminal_still_exists {
Some(false) => PipeIoExitReason::TerminalEnded,
Some(true) | None => PipeIoExitReason::DaemonLost,
Expand Down
Loading
Loading