Skip to content

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

Fix: Message column width respects ideal width

Maximilian Roos17f3a61b92bb
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 92c6090e8..30cb79819 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -242,7 +242,7 @@ pub fn calculate_responsive_layout(infos: &[WorktreeInfo]) -> LayoutConfig {
};
if max_message_len > 0 {
- widths.message = max_message_len;
+ widths.message = max_message_len.min(ideal_widths.message);
}
// Ahead/behind column (only if dense and fits)
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 083da6dac..8de1fdc67 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -18,7 +18,7 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch  Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
-(detached) 9 months ago b834638e Initial commit  .
+Branch  Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
+(detached) 9 months ago b834638e Initial commit .
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 5f3111c8c..42a7f7cae 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -18,9 +18,9 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch  Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
-main  9 months ago b834638e Initial commit  ./main
-feature-a 9 months ago [SHA] Initial commit  ./feature-a
-feature-b 9 months ago [SHA] Initial commit  ./feature-b
+Branch  Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
+main  9 months ago b834638e Initial commit ./main
+feature-a 9 months ago [SHA] Initial commit ./feature-a
+feature-b 9 months ago [SHA] Initial commit ./feature-b
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index ecd3144da..9a9a98d40 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -18,7 +18,7 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
-main  9 months ago b834638e Initial commit  .
+Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
+main  9 months ago b834638e Initial commit .
----- stderr -----
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 8c2be8020..668061bc2 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
@@ -18,10 +18,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
-main  9 months ago b834638e Initial commit  ./main
-long 9 months ago [SHA] Initial commit  ./extremely-long-branch-name-that-might-cause-layout-issues
-medium 9 months ago [SHA] Initial commit  ./medium-length-name
-x 9 months ago [SHA] Initial commit  ./x
+Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
+main  9 months ago b834638e Initial commit ./main
+long 9 months ago [SHA] Initial commit ./extremely-long-branch-name-that-might-cause-layout-issues
+medium 9 months ago [SHA] Initial commit ./medium-length-name
+x 9 months ago [SHA] Initial commit ./x
----- stderr -----
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 3db8243b1..547a31ca8 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
@@ -18,10 +18,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
-main  9 months ago b834638e Initial commit  ./main
-a 9 months ago [SHA] Initial commit  ./a
-bb 9 months ago [SHA] Initial commit  ./bb
-ccc 9 months ago [SHA] Initial commit  ./ccc
+Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
+main  9 months ago b834638e Initial commit ./main
+a 9 months ago [SHA] Initial commit ./a
+bb 9 months ago [SHA] Initial commit ./bb
+ccc 9 months ago [SHA] Initial commit ./ccc
----- stderr -----
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 e2b21c675..2e90d9f27 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
@@ -18,10 +18,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
-main  9 months ago b834638e Initial commit  ./main
-cafe 9 months ago [SHA] Initial commit  ./café
-naive 9 months ago [SHA] Initial commit  ./naïve
-resume 9 months ago [SHA] Initial commit  ./résumé
+Branch Age  Cmts Cmt +/- WT +/- Remote Commit  Message  State Path
+main  9 months ago b834638e Initial commit ./main
+cafe 9 months ago [SHA] Initial commit ./café
+naive 9 months ago [SHA] Initial commit ./naïve
+resume 9 months ago [SHA] Initial commit ./résumé
----- stderr -----