Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Adjust terminal width calculation
Maximilian Roos2002bcdec109
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex 60ababfd5..29808cb70 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -183,15 +183,9 @@ pub const HEADER_CI: &str = "CI";pub const HEADER_COMMIT: &str = "Commit";pub const HEADER_MESSAGE: &str = "Message";-/// Get safe terminal width for list rendering.-///-/// Reserves 2 columns as a safety margin to prevent line wrapping:-/// - Off-by-one terminal behavior-/// - Emoji width safety margin-///-/// This matches the clamping logic in progressive mode (collect.rs).+/// Get terminal width for list rendering.pub fn get_safe_list_width() -> usize {- get_terminal_width().saturating_sub(2)+ get_terminal_width()}/// Ensures a column width is at least as wide as its header.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.snapindex c78b29667..84f3cff18 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@@ -22,10 +22,10 @@ exit_code: 0----- stdout ---------- stderr ------ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10mo[0m-+ [2manother-extremely-long-name-here[0m [2m∅[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10mo[0m-+ [2mshort[0m [2m∅[0m [2m./short[0m [2mb834638e[0m [2m10mo[0m-+ [2mvery-long-feature-branch-name[0m [2m∅[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10mo[0m+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2manother-extremely-long-name-here[0m [2m∅[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mshort[0m [2m∅[0m [2m./short[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mvery-long-feature-branch-name[0m [2m∅[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-⚪ [2mShowing 4 worktrees, 1 column hidden[0m+⚪ [2mShowing 4 worktrees[0mdiff --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.snapindex 0b0e1f199..5599613a4 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@@ -22,10 +22,10 @@ exit_code: 0----- stdout ---------- stderr ------ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10mo[0m-+ [2mlong[0m [2m∅[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10mo[0m-+ [2mmedium[0m [2m∅[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10mo[0m-+ [2mx[0m [2m∅[0m [2m./x[0m [2mb834638e[0m [2m10mo[0m+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mlong[0m [2m∅[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mmedium[0m [2m∅[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mx[0m [2m∅[0m [2m./x[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-⚪ [2mShowing 4 worktrees, 1 column hidden[0m+⚪ [2mShowing 4 worktrees[0m