Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

mux-server: load the stored access mode before listening, publish it if it differs

RoversXda1119dd8695
diff --git a/mux/src/lib.rs b/mux/src/lib.rs
index 6066c373..a45d384e 100644
--- a/mux/src/lib.rs
+++ b/mux/src/lib.rs
@@ -1368,12 +1368,22 @@ impl Mux {
/// intentionally one-shot so a configuration reload cannot overwrite a
/// mode selected while this server process is running.
pub fn initialize_frontend_access_mode(&self, mode: FrontendAccessMode) {
- let mut lease = self.frontend_lease.lock();
- if lease.access_initialized {
- return;
+ let changed = {
+ let mut lease = self.frontend_lease.lock();
+ if lease.access_initialized {
+ return;
+ }
+ let changed = lease.access_mode != mode;
+ lease.access_mode = mode;
+ lease.access_initialized = true;
+ changed
+ };
+ // A client that registered before this ran was told the default
+ // mode at generation 0 and drops later states at that generation;
+ // a published change is the only correction it will accept.
+ if changed {
+ self.publish_frontend_access_state();
}
- lease.access_mode = mode;
- lease.access_initialized = true;
}
pub fn frontend_access_mode_is_initialized(&self) -> bool {
@@ -3855,6 +3865,25 @@ mod tests {
assert!(is_sole_live_renderer(&tabs, &live, &me));
}
+ #[test]
+ fn initializing_a_different_mode_publishes_a_newer_generation() {
+ // The default state (Handoff, generation 0) may already have been
+ // sent to a client; the stored mode must arrive with a generation
+ // that client accepts, and an unchanged mode must stay quiet.
+ let mux = Mux::new(None);
+ let before = mux.frontend_access_state();
+ assert_eq!(before.mode, FrontendAccessMode::Handoff);
+ mux.initialize_frontend_access_mode(FrontendAccessMode::TmuxLatest);
+ let after = mux.frontend_access_state();
+ assert_eq!(after.mode, FrontendAccessMode::TmuxLatest);
+ assert!(after.generation > before.generation);
+
+ let quiet = Mux::new(None);
+ let before = quiet.frontend_access_state();
+ quiet.initialize_frontend_access_mode(FrontendAccessMode::Handoff);
+ assert_eq!(quiet.frontend_access_state().generation, before.generation);
+ }
+
#[test]
fn unclaimed_handoff_lease_belongs_to_the_first_renderer() {
let mux = Mux::new(None);
diff --git a/wezterm-mux-server/src/main.rs b/wezterm-mux-server/src/main.rs
index 5f23d0c8..b0725679 100644
--- a/wezterm-mux-server/src/main.rs
+++ b/wezterm-mux-server/src/main.rs
@@ -341,6 +341,9 @@ fn run() -> anyhow::Result<()> {
#[cfg(not(unix))]
let mux = Arc::new(mux::Mux::new(Some(domain.clone())));
Mux::set_mux(&mux);
+ // Before the listener: a client registering earlier than the stored
+ // mode is loaded gets the default one and never accepts the fix-up.
+ wezterm_mux_server_impl::thinkterm_access::initialize_mux(&mux);
install_shutdown_signal_handler()?;