Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat: Improve column padding for unicode characters

Maximilian Roosecdd3d6ddd2d
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 0d9036785..02963e4f4 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -207,12 +207,13 @@ pub fn format_header_line(layout: &LayoutConfig) {
for (i, column) in layout.columns.iter().enumerate() {
line.pad_to(column.start);
let is_last = i == layout.columns.len() - 1;
- let header = if is_last {
- column.header.to_string()
- } else {
- format!("{:width$}", column.header, width = column.width)
- };
- line.push_styled(header, style);
+ let header_start = line.width();
+
+ line.push_styled(column.header.to_string(), style);
+
+ if !is_last {
+ line.pad_to(header_start + column.width);
+ }
}
println!("{}", line.render());
@@ -296,29 +297,30 @@ pub fn format_list_item_line(
match (column.kind, column.format) {
(ColumnKind::Branch, _) => {
- let branch_text = if is_last {
- item.branch_name().to_string()
- } else {
- format!("{:width$}", item.branch_name(), width = column.width)
- };
+ let branch_start = line.width();
+ let branch_text = item.branch_name().to_string();
+
if let Some(style) = text_style {
line.push_styled(branch_text, style);
} else {
line.push_raw(branch_text);
}
+
+ if !is_last {
+ line.pad_to(branch_start + column.width);
+ }
}
(ColumnKind::Status, _) => {
// Combine git status symbols + user-defined status from worktrunk.status
let status_content = item.combined_status();
-
- let status_text = if is_last {
- status_content
- } else {
- format!("{:width$}", status_content, width = column.width)
- };
+ let status_start = line.width();
// Status column never inherits row color
- line.push_raw(status_text);
+ line.push_raw(status_content);
+
+ if !is_last {
+ line.pad_to(status_start + column.width);
+ }
}
(ColumnKind::WorkingDiff, ColumnFormat::Diff { digits, variant }) => {
if let Some(info) = worktree_info {
@@ -382,15 +384,16 @@ pub fn format_list_item_line(
(ColumnKind::Path, _) => {
if let Some(info) = worktree_info {
let path_str = shorten_path(&info.worktree.path, &layout.common_prefix);
- let path_text = if is_last {
- path_str
- } else {
- format!("{:width$}", path_str, width = column.width)
- };
+ let path_start = line.width();
+
if let Some(style) = text_style {
- line.push_styled(path_text, style);
+ line.push_styled(path_str, style);
} else {
- line.push_raw(path_text);
+ line.push_raw(path_str);
+ }
+
+ if !is_last {
+ line.pad_to(path_start + column.width);
}
} else if !is_last {
push_blank(&mut line, column.width);
@@ -417,16 +420,13 @@ pub fn format_list_item_line(
}
}
(ColumnKind::Time, _) => {
- let time_str = if is_last {
- format_relative_time(commit.timestamp)
- } else {
- format!(
- "{:width$}",
- format_relative_time(commit.timestamp),
- width = column.width
- )
- };
+ let time_str = format_relative_time(commit.timestamp);
+ let time_start = line.width();
line.push_styled(time_str, Style::new().dimmed());
+
+ if !is_last {
+ line.pad_to(time_start + column.width);
+ }
}
(ColumnKind::CiStatus, _) => {
if let Some(pr_status) = item.pr_status() {
@@ -440,12 +440,12 @@ pub fn format_list_item_line(
}
}
(ColumnKind::Commit, _) => {
- let commit_text = if is_last {
- short_head.to_string()
- } else {
- format!("{:width$}", short_head, width = column.width)
- };
- line.push_styled(commit_text, Style::new().dimmed());
+ let commit_start = line.width();
+ line.push_styled(short_head.to_string(), Style::new().dimmed());
+
+ if !is_last {
+ line.pad_to(commit_start + column.width);
+ }
}
(ColumnKind::Message, _) => {
let msg = truncate_at_word_boundary(&commit.commit_message, layout.max_message_len);
@@ -838,4 +838,65 @@ mod tests {
"Should render ↑0 ↓0 with padding"
);
}
+
+ #[test]
+ fn test_status_column_padding_with_emoji() {
+ use unicode_width::UnicodeWidthStr;
+
+ // Test that status column with emoji is padded correctly using visual width
+ // This reproduces the issue where "↑🤖" was misaligned
+
+ // Case 1: Status with emoji (↑ is 1 column, 🤖 is 2 columns = 3 total)
+ let status_with_emoji = "↑🤖";
+ assert_eq!(
+ status_with_emoji.width(),
+ 3,
+ "Status '↑🤖' should have visual width 3"
+ );
+
+ let mut line1 = StyledLine::new();
+ let status_start = line1.width(); // 0
+ line1.push_raw(status_with_emoji.to_string());
+ line1.pad_to(status_start + 6); // Pad to width 6 (typical Status column width)
+
+ assert_eq!(line1.width(), 6, "Status column with emoji should pad to 6");
+
+ // Case 2: Status with only ASCII symbols (↑ is 1 column = 1 total)
+ let status_ascii = "↑";
+ assert_eq!(
+ status_ascii.width(),
+ 1,
+ "Status '↑' should have visual width 1"
+ );
+
+ let mut line2 = StyledLine::new();
+ let status_start2 = line2.width();
+ line2.push_raw(status_ascii.to_string());
+ line2.pad_to(status_start2 + 6);
+
+ assert_eq!(line2.width(), 6, "Status column with ASCII should pad to 6");
+
+ // Both should have the same visual width after padding
+ assert_eq!(
+ line1.width(),
+ line2.width(),
+ "Unicode and ASCII status should pad to same visual width"
+ );
+
+ // Case 3: Complex status with multiple emoji (git symbols + user status)
+ let complex_status = "↑⇡🤖📝";
+ // ↑ (1) + ⇡ (1) + 🤖 (2) + 📝 (2) = 6 visual columns
+ assert_eq!(
+ complex_status.width(),
+ 6,
+ "Complex status should have visual width 6"
+ );
+
+ let mut line3 = StyledLine::new();
+ let status_start3 = line3.width();
+ line3.push_raw(complex_status.to_string());
+ line3.pad_to(status_start3 + 10); // Pad to width 10
+
+ assert_eq!(line3.width(), 10, "Complex status should pad to 10");
+ }
}
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index e9180caa6..0e6b47f38 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpY0biwu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRXxM1r/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path Remote↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap
index 2488419c7..0fc731ae9 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSZiNaw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplee5sV/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path Remote↕ Commit  Age  Message
-main  🏠 .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main 🏠 . b834638e 10 months ago Initial commit
branch-only 🌿 b834638e 10 months ago Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 2c36ce50e..8b813a220 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqg3Uzx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWdVbzD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path Remote↕ Commit  Age  Message
-(detached) .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+(detached) . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 45a38a7ef..0233c7e25 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK96GlU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpybO5k3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago  Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago  Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago  Commit at 00:30
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo 6c3da842 10 months ago Initial commit on main
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 2e5860dc7..08b3998c2 100644
--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIBidsY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSg5Jbh/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-develop  ./test-repo b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+develop ./test-repo b834638e 10 months ago Initial commit
feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index 3e1c701c6..55cbb6cad 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFppUjE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdSqKUl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
locked-no-reason ≡ ⊠ ./locked-no-reason b834638e 10 months ago Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index 38cc20640..c8387af06 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqclNf5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjlYXTK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
locked-feature ≡ ⊠ ./locked-feature b834638e 10 months ago Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 3e1507552..91df95c2d 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO5qeHk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfBW90h/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo 1310bfb9 10 months ago Short message
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo 1310bfb9 10 months ago Short message
feature-a ∅ ↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should test how the...
⚪ Showing 2 worktrees, 1 behind
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index 3c30e11d6..0bd207ecf 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp79brGl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpc1p6ui/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-medium-name  ≡ ./medium-name  b834638e 10 months ago Initial commit
-short  ≡ ./short  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+medium-name ≡ ./medium-name b834638e 10 months ago Initial commit
+short ≡ ./short b834638e 10 months ago Initial commit
very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago Initial commit
-with-changes  ≡ ./with-changes  b834638e 10 months ago Initial commit
+with-changes ≡ ./with-changes b834638e 10 months ago Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 98f89aab2..221caec42 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5m0th3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZtdqHh/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 659693956..79fb846d6 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMMeNkK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHJAtx9/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path Remote↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index 04b695a94..8e66550b8 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMs0gUU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeBoewF/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo e4614cb7 10 months ago Fix bug with café ☕ handling
feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees, 1 behind
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index 48f557fac..d091a8723 100644
--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqrRHQM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5uHWVQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-emoji  ≡🔄 ./emoji  b834638e 10 months ago Initial commit
-multi  ≡👨‍💻 ./multi  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+emoji ≡🔄 ./emoji b834638e 10 months ago Initial commit
+multi ≡👨‍💻 ./multi b834638e 10 months ago Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index 1771c09ee..1ebd553f4 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -16,17 +16,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOQ5Lff/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0q3R8F/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-with-worktree  ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
-another-branch  · b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+feature-with-worktree ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
+another-branch · b834638e 10 months ago Initial commit
feature-without-worktree · b834638e 10 months ago Initial commit
-fix-bug  · b834638e 10 months ago Initial commit
+fix-bug · b834638e 10 months ago Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index 76f6b6f40..ccd38ee89 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ9aNQZ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAeVNH0/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index 18a8db090..98a918973 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -16,15 +16,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzrqoYc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiGydZK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path Remote↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main . b834638e 10 months ago Initial commit
branch-alpha · b834638e 10 months ago Initial commit
-branch-beta  · b834638e 10 months ago Initial commit
+branch-beta · b834638e 10 months ago Initial commit
branch-gamma · b834638e 10 months ago Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 53279781a..d749b6657 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -17,17 +17,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBMl2d2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYC2mEF/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ main…± Path  Remote↕ CI Commit  Age  Message
-main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+Branch Status HEAD± main↕ main…± Path Remote↕ CI Commit Age Message
+main ./test-repo ↑0 ↓0 6c3da842 10 months ago Initial commit on main
ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
-behind  ≡ ⇣ ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10 months ago Initial commit on main
diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
-in-sync  ≡ ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
no-upstream ≡ ./no-upstream 6c3da842 10 months ago Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index a0c7ee7c7..3cba3d6e1 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZ3h1R0/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfK8fKr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status  HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-clean-no-status  ≡ ./clean-no-status  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+clean-no-status ≡ ./clean-no-status b834638e 10 months ago Initial commit
clean-with-status ≡⏸️ ./clean-with-status b834638e 10 months ago Initial commit
dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
dirty-with-status ≡ ?🤖 ./dirty-with-status b834638e 10 months ago Initial commit
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index 6e4e6eaed..0c74ee603 100644
--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7xqeoB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8s96uL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-feature ≡ ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature ≡ ./feature [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index 4fb96393b..0f991358f 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0QXl5t/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMvLZSx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path Remote↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index 3cb3948a8..85a520c59 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd9se16/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOWIvjQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status  HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
-no-changes  ≡ ./no-changes  b834638e 10 months ago Initial commit
+no-changes ≡ ./no-changes b834638e 10 months ago Initial commit
with-changes ! +1 -1 ./with-changes b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index 9ceb2be10..bbc569f10 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpG0npLV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiKG71I/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status  HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-huge  ≡ ? ./huge  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+huge ≡ ? ./huge b834638e 10 months ago Initial commit
tiny ! +1 -1 ./tiny b834638e 10 months ago Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index 113002bb1..cb37d9f81 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprkX0w6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTtJ7zr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status  HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-large  ≡ ? ./feature-large  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+feature-large ≡ ? ./feature-large b834638e 10 months ago Initial commit
feature-medium ≡ ? ./feature-medium b834638e 10 months ago Initial commit
-feature-small  ≡ ? ./feature-small  b834638e 10 months ago Initial commit
+feature-small ≡ ? ./feature-small b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index 74bd49801..6443739f7 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVl4cGG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpldRIzz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago Initial commit
-short  ≡ ./short  b834638e 10 months ago Initial commit
-very-long-feature-branch-name  ≡ ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
+short ≡ ./short b834638e 10 months ago Initial commit
+very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index f7e5023ec..abe6b75a2 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk6uHYm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbX8BzY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-long  ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
-medium ≡ ./medium-length-name  b834638e 10 months ago Initial commit
-x  ≡ ./x  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
+medium ≡ ./medium-length-name b834638e 10 months ago Initial commit
+x ≡ ./x b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index 4863e55ed..e2e4eeb49 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp38qlRl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP1gIXm/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-a  ≡ ./a  b834638e 10 months ago Initial commit
-bb  ≡ ./bb  b834638e 10 months ago Initial commit
-ccc  ≡ ./ccc  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+a ≡ ./a b834638e 10 months ago Initial commit
+bb ≡ ./bb b834638e 10 months ago Initial commit
+ccc ≡ ./ccc b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index 7266482fa..7aca87780 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAI8U2z/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQWWUFK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-cafe  ≡ ./café  b834638e 10 months ago Initial commit
-naive  ≡ ./naïve  b834638e 10 months ago Initial commit
-resume ≡ ./résumé  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path Remote↕ Commit Age Message
+main ./test-repo b834638e 10 months ago Initial commit
+cafe ≡ ./café b834638e 10 months ago Initial commit
+naive ≡ ./naïve b834638e 10 months ago Initial commit
+resume ≡ ./résumé b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees