diff --git a/crates/tui/src/commands/config_main_host.rs b/crates/tui/src/commands/config_main_host.rs index 22474e4701..bedc810dbc 100644 --- a/crates/tui/src/commands/config_main_host.rs +++ b/crates/tui/src/commands/config_main_host.rs @@ -4122,6 +4122,10 @@ mod tests { )); fs::create_dir_all(&temp_root).unwrap(); let _guard = EnvGuard::new(&temp_root); + let _tmux = EnvVarGuard::remove("TMUX"); + let _sty = EnvVarGuard::remove("STY"); + let _tilix_id = EnvVarGuard::remove("TILIX_ID"); + let _terminator_uuid = EnvVarGuard::remove("TERMINATOR_UUID"); // Neutralize the SSH markers: production intentionally caps motion // over SSH, and the suite routinely runs inside one. let _ssh_client = EnvVarGuard::remove("SSH_CLIENT"); diff --git a/crates/tui/src/commands/session_export_regression_tests.rs b/crates/tui/src/commands/session_export_regression_tests.rs index 77ae69b92e..ca4b4f668c 100644 --- a/crates/tui/src/commands/session_export_regression_tests.rs +++ b/crates/tui/src/commands/session_export_regression_tests.rs @@ -42,6 +42,7 @@ struct ExportHarness { // temporary files are removed (matches ControlHarness). _home: EnvVarGuard, _codewhale_home: EnvVarGuard, + _ssh: [EnvVarGuard; 3], _env_lock: TestEnvLock, temp: TempDir, } @@ -54,6 +55,7 @@ impl ExportHarness { std::fs::create_dir_all(&home).expect("home dir"); let _home = EnvVarGuard::set("HOME", &home); let _codewhale_home = EnvVarGuard::set("CODEWHALE_HOME", &home); + let _ssh = ["SSH_CLIENT", "SSH_CONNECTION", "SSH_TTY"].map(EnvVarGuard::remove); let options = TuiOptions { skills_dir: temp.path().join("skills"), memory_path: temp.path().join("memory.md"), @@ -66,6 +68,7 @@ impl ExportHarness { app, _home, _codewhale_home, + _ssh, _env_lock: env_lock, temp, } diff --git a/crates/tui/src/settings.rs b/crates/tui/src/settings.rs index fd14437120..cdb230d7df 100644 --- a/crates/tui/src/settings.rs +++ b/crates/tui/src/settings.rs @@ -4531,6 +4531,11 @@ zai = ["GLM-5.2", "GLM-5.3"] #[test] fn ghostty_term_program_keeps_full_motion_without_the_legacy_30_fps_cap() { let _g = term_program_test_guard(); + let _tmux = crate::test_support::EnvVarGuard::remove("TMUX"); + let _sty = crate::test_support::EnvVarGuard::remove("STY"); + let _tilix_id = crate::test_support::EnvVarGuard::remove("TILIX_ID"); + let _terminator_uuid = crate::test_support::EnvVarGuard::remove("TERMINATOR_UUID"); + let _no_animations = crate::test_support::EnvVarGuard::remove("NO_ANIMATIONS"); // Neutralize the SSH markers: production intentionally caps motion // over SSH, and the suite routinely runs inside one. let _ssh_client = crate::test_support::EnvVarGuard::remove("SSH_CLIENT"); @@ -4559,6 +4564,11 @@ zai = ["GLM-5.2", "GLM-5.3"] #[test] fn ghostty_term_fallback_keeps_full_motion_without_the_legacy_30_fps_cap() { let _g = term_program_test_guard(); + let _tmux = crate::test_support::EnvVarGuard::remove("TMUX"); + let _sty = crate::test_support::EnvVarGuard::remove("STY"); + let _tilix_id = crate::test_support::EnvVarGuard::remove("TILIX_ID"); + let _terminator_uuid = crate::test_support::EnvVarGuard::remove("TERMINATOR_UUID"); + let _no_animations = crate::test_support::EnvVarGuard::remove("NO_ANIMATIONS"); // Neutralize the SSH markers: production intentionally caps motion // over SSH, and the suite routinely runs inside one. let _ssh_client = crate::test_support::EnvVarGuard::remove("SSH_CLIENT"); @@ -4592,6 +4602,7 @@ zai = ["GLM-5.2", "GLM-5.3"] #[test] fn non_vscode_term_program_does_not_force_low_motion() { let _g = term_program_test_guard(); + let _no_animations = crate::test_support::EnvVarGuard::remove("NO_ANIMATIONS"); let prev = std::env::var_os("TERM_PROGRAM"); let prev_term = std::env::var_os("TERM"); let prev_ssh_client = std::env::var_os("SSH_CLIENT"); @@ -4659,6 +4670,7 @@ zai = ["GLM-5.2", "GLM-5.3"] #[test] fn tilix_and_terminator_cap_redraws_without_disabling_motion() { let _g = term_program_test_guard(); + let _no_animations = crate::test_support::EnvVarGuard::remove("NO_ANIMATIONS"); // Neutralize the SSH markers: production intentionally caps motion // over SSH, and the suite routinely runs inside one. let _ssh_client = crate::test_support::EnvVarGuard::remove("SSH_CLIENT");