Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor directory formatting to use PathBuf for correctness
Maximilian Roose6995796e3fc
diff --git a/src/commands/statusline.rs b/src/commands/statusline.rsindex e1073fa68..0a358eb69 100644--- a/src/commands/statusline.rs+++ b/src/commands/statusline.rs@@ -84,41 +84,47 @@ impl ClaudeCodeContext {/// - `/home/user` -> `~`/// - `/tmp/test` -> `/t/test`fn format_directory_fish_style(path: &str) -> String {- let home = env::var("HOME").unwrap_or_default();+ use std::path::{Component, PathBuf};- // Replace home with ~- let path = if !home.is_empty() && path.starts_with(&home) {- format!("~{}", &path[home.len()..])- } else {- path.to_string()- };-- let is_absolute = path.starts_with('/');- let parts: Vec<&str> = path.split('/').filter(|p| !p.is_empty()).collect();-- if parts.is_empty() {- return path;- }+ let path = PathBuf::from(path);- let mut result = String::new();- if is_absolute {- result.push('/');- }+ // Replace $HOME prefix with ~+ let (suffix, tilde_prefix) = env::var_os("HOME")+ .and_then(|home| {+ path.strip_prefix(&home)+ .ok()+ .map(|s| (s.to_path_buf(), true))+ })+ .unwrap_or_else(|| (path.clone(), false));++ // Collect normal components (skip RootDir, CurDir, etc.)+ let components: Vec<_> = suffix+ .components()+ .filter_map(|c| match c {+ Component::Normal(s) => Some(s.to_string_lossy()),+ _ => None,+ })+ .collect();- for (i, part) in parts.iter().enumerate() {- if i > 0 {- result.push('/');- }+ // Build result: ~/a/b/last or /a/b/last+ let abbreviated = components+ .iter()+ .enumerate()+ .map(|(i, s)| {+ if i == components.len() - 1 {+ s.to_string() // Keep last component full+ } else {+ s.chars().next().map(String::from).unwrap_or_default()+ }+ })+ .collect::<Vec<_>>();- // Keep ~ and last component full, abbreviate others to first char- if (i == 0 && *part == "~") || i == parts.len() - 1 {- result.push_str(part);- } else if let Some(c) = part.chars().next() {- result.push(c);- }+ match (tilde_prefix, abbreviated.is_empty()) {+ (true, true) => "~".to_string(),+ (true, false) => format!("~/{}", abbreviated.join("/")),+ (false, _) if path.is_absolute() => format!("/{}", abbreviated.join("/")),+ (false, _) => abbreviated.join("/"),}-- result}/// Run the statusline command.@@ -284,6 +290,7 @@ mod tests {// Test with actual HOME (if set)if let Ok(home) = env::var("HOME") {+ // Basic home substitutionlet test_path = format!("{home}/workspace/project");let result = format_directory_fish_style(&test_path);assert!(result.starts_with("~/"), "Expected ~ prefix, got: {result}");@@ -291,6 +298,18 @@ mod tests {result.ends_with("/project"),"Expected /project suffix, got: {result}");++ // Exact HOME path should become just ~+ assert_eq!(format_directory_fish_style(&home), "~");++ // Path that shares HOME as string prefix but not as path component+ // e.g., /home/user vs /home/usered/nested+ let path_outside_home = format!("{home}ed/nested");+ let result = format_directory_fish_style(&path_outside_home);+ assert!(+ !result.starts_with("~"),+ "Path sharing HOME string prefix should not use ~: {result}"+ );}}