Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 24 additions & 2 deletions grove/grove-core/src/pty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ fn preferred_utf8_locale() -> String {
for key in ["LC_ALL", "LC_CTYPE", "LANG"] {
if let Ok(value) = env::var(key) {
let trimmed = value.trim();
if !trimmed.is_empty() && is_utf8_locale(trimmed) {
if !trimmed.is_empty() && is_utf8_locale(trimmed) && is_usable_locale(trimmed) {
return trimmed.to_string();
}
}
Expand All @@ -164,6 +164,14 @@ fn preferred_utf8_locale() -> String {
"C.UTF-8".to_string()
}

/// Bare "UTF-8" / "UTF8" are not valid POSIX locale names and cause tools
/// like zsh and tmux to mishandle multi-byte input. Require a proper locale
/// prefix (e.g. "en_US.UTF-8", "C.UTF-8").
fn is_usable_locale(locale: &str) -> bool {
let upper = locale.to_ascii_uppercase();
upper != "UTF-8" && upper != "UTF8"
}

pub fn create(
request: CreatePtyRequest,
sink: Arc<dyn PtyEventSink>,
Expand Down Expand Up @@ -219,6 +227,7 @@ pub fn create(
.map_err(|e| e.to_string())?;

let mut cmd = CommandBuilder::new("tmux");
cmd.arg("-u");
cmd.arg("attach-session");
cmd.arg("-t");
cmd.arg(&session_name);
Expand Down Expand Up @@ -946,9 +955,12 @@ fn ensure_grove_tmux_session(
}

fn grove_tmux_environment(session_name: &str) -> Vec<(&'static str, String)> {
let locale = preferred_utf8_locale();
let mut vars = vec![
("GROVE_TMUX_SESSION", session_name.to_string()),
("PATH", enriched_path().to_string()),
("LANG", locale.clone()),
("LC_CTYPE", locale),
];
if let Some(ssh_auth_sock) = preferred_ssh_auth_sock() {
vars.push(("SSH_AUTH_SOCK", ssh_auth_sock));
Expand Down Expand Up @@ -976,7 +988,7 @@ fn grove_real_zdotdir() -> String {

fn create_tmux_session(session_name: &str, cwd: &str) -> Result<bool, String> {
let mut command = Command::new("tmux");
command.args(["new-session", "-d", "-s", session_name, "-c", cwd]);
command.args(["-u", "new-session", "-d", "-s", session_name, "-c", cwd]);
for (key, value) in grove_tmux_environment(session_name) {
command.arg("-e").arg(format!("{key}={value}"));
}
Expand Down Expand Up @@ -1578,6 +1590,16 @@ mod tests {
assert!(!is_utf8_locale("C"));
}

#[test]
fn rejects_bare_utf8_as_unusable_locale() {
assert!(!is_usable_locale("UTF-8"));
assert!(!is_usable_locale("UTF8"));
assert!(!is_usable_locale("utf-8"));
assert!(is_usable_locale("en_US.UTF-8"));
assert!(is_usable_locale("ko_KR.UTF-8"));
assert!(is_usable_locale("C.UTF-8"));
}

#[test]
fn scrollback_cap_discards_oldest_bytes() {
let mut scrollback = b"abc".to_vec();
Expand Down
8 changes: 4 additions & 4 deletions grove/patches/@xterm__xterm.patch

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions grove/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading