Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Respect COLUMNS env var for terminal width
Maximilian Roose0402b2940aa
diff --git a/src/styling.rs b/src/styling.rsindex edd9c644e..e9578ccc5 100644--- a/src/styling.rs+++ b/src/styling.rs@@ -199,6 +199,24 @@ impl StyledLine {/// Default terminal width fallback if detection failsconst DEFAULT_TERMINAL_WIDTH: usize = 80;+/// Get terminal width, defaulting to 80 if detection fails+///+/// Checks COLUMNS environment variable first (for testing and scripts),+/// then falls back to actual terminal size detection.+fn get_terminal_width() -> usize {+ // Check COLUMNS environment variable first (for testing and scripts)+ if let Ok(cols) = std::env::var("COLUMNS")+ && let Ok(width) = cols.parse::<usize>()+ {+ return width;+ }++ // Fall back to actual terminal size+ terminal_size::terminal_size()+ .map(|(terminal_size::Width(w), _)| w as usize)+ .unwrap_or(DEFAULT_TERMINAL_WIDTH)+}+/// Wraps text at word boundaries to fit within the specified width////// # Arguments@@ -283,12 +301,8 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<uslet gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Black)));let mut output = String::new();- // Use provided width or detect terminal width- let term_width = max_width.unwrap_or_else(|| {- terminal_size::terminal_size()- .map(|(w, _)| w.0 as usize)- .unwrap_or(DEFAULT_TERMINAL_WIDTH)- });+ // Use provided width or detect terminal width (respects COLUMNS env var)+ let term_width = max_width.unwrap_or_else(get_terminal_width);// Account for gutter (1) + space (1) + left_marginlet left_margin_width = left_margin.width();diff --git a/tests/common/mod.rs b/tests/common/mod.rsindex 9bc7adae3..0fc56f7b9 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -120,6 +120,11 @@ impl TestRepo {cmd.env("CLICOLOR_FORCE", "1");// Set isolated config path to prevent polluting user's configcmd.env("WORKTRUNK_CONFIG_PATH", &self.test_config_path);+ // Set consistent terminal width for stable snapshot output+ // (can be overridden by individual tests that want to test specific widths)+ if std::env::var("COLUMNS").is_err() {+ cmd.env("COLUMNS", "150");+ }}/// Get the root path of the repositorydiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 753ebfa7b..d214babbb 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -6,21 +6,23 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZrYQbj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKMuXWG/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mAge [0m [2mCommit [0m [2mState [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [1m[35m./test-repo[0m-locked-no-reason [2m10 months ago[0m [2mb834638e[0m (locked) ./locked-no-reason+[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mState [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+locked-no-reason [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m (locked) ./locked-no-reason[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex d6a40b267..c57e731cd 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -6,21 +6,23 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDGUhFz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8CpaX3/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m-locked-feature [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./locked-feature+[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mState [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+locked-feature [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m (locked: Testing lock functionality) ./locked-feature[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 98a237bc9..335c662db 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -6,21 +6,23 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwao8hC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptdCPqR/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35m1310bfb9[0m [2mShort message[0m [1m[35m./test-repo[0m-feature-a [2m10 months ago[0m [2mf078644e[0m [2mThis is a very long commit...[0m ./feature-a+[2mBranch [0m [2mAge [0m [2mCmts [0m [2mCommit [0m [2mMessage [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35m1310bfb9[0m [2mShort message[0m [1m[35m./test-repo[0m+feature-a [2m10 months ago[0m [33m↑0 ↓1[0m [2mf078644e[0m [2mThis is a very long commit message that should...[0m ./feature-a[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 14620161f..50ba51442 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -6,24 +6,26 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFpHlqd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9lYhHU/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mCommit [0m [2mPath[0m-[1m[35mmain [0m [1m[35mb834638e[0m [1m[35m./test-repo[0m-medium-name [2mb834638e[0m ./medium-name-short [2mb834638e[0m ./short-very-long-branch-name-here [2mb834638e[0m ./very-long-branch-name-here-with-changes [2mb834638e[0m ./with-changes+[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+medium-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./medium-name+short [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./short+very-long-branch-name-here [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./very-long-branch-name-here+with-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./with-changes[2mShowing 5 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 5fc66647a..2c1bd19cf 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -6,21 +6,23 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp86rMtz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVBlTvV/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35me4614cb7[0m [2mFix bug with café...[0m [1m[35m./test-repo[0m-feature-test [2m10 months ago[0m [2m0c53695b[0m [2mAdd support for...[0m ./feature-test+[2mBranch [0m [2mAge [0m [2mCmts [0m [2mCommit [0m [2mMessage [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35me4614cb7[0m [2mFix bug with café ☕ handling[0m [1m[35m./test-repo[0m+feature-test [2m10 months ago[0m [33m↑0 ↓1[0m [2m0c53695b[0m [2mAdd support for 日本語 and...[0m ./feature-test[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 8805e616e..0a833c2a9 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -7,24 +7,26 @@ info:- "--branches"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaWMlqS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0bKwSg/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mAge [0m [2mCommit [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [1m[35m./test-repo[0m-feature-with-worktree [2m10 months ago[0m [2mb834638e[0m ./feature-with-worktree-another-branch [2m10 months ago[0m [2mb834638e[0m-feature-without-worktree [2m10 months ago[0m [2mb834638e[0m-fix-bug [2m10 months ago[0m [2mb834638e[0m+[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+feature-with-worktree [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-with-worktree+another-branch [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+feature-without-worktree [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+fix-bug [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 2 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snapindex addab1beb..aa6566f93 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap@@ -12,23 +12,20 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEhsvbw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2NpdwS/test-config.toml---success: trueexit_code: 0----- stdout -----🔄 [36mValidating merge...[0m🔄 [36mRunning pre-merge command [1m[36mcheck1[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh-[40m [0m check1 3+[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3🔄 [36mRunning pre-merge command [1m[36mcheck2[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh-[40m [0m check2 3+[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3🔄 [36mRebasing onto [1m[36mmain[0m...[0m🔄 [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snapindex d03f9d913..1430a4be9 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap@@ -8,6 +8,7 @@ info:- feature/testenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6jYMFA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVEaiug/test-config.toml---success: trueexit_code: 0@@ -28,14 +29,10 @@ exit_code: 0[40m [0m echo 'Branch: feature-test' >> info.txt🔄 [36mExecuting (post-create):[0m-[40m [0m echo 'Worktree:-[40m [0m [REPO].feature-test'-[40m [0m >> info.txt+[40m [0m echo 'Worktree: [REPO].feature-test' >> info.txt🔄 [36mExecuting (post-create):[0m-[40m [0m echo 'Root:-[40m [0m [REPO]'-[40m [0m >> info.txt+[40m [0m echo 'Root: [REPO]' >> info.txt✅ [32mCreated new worktree for [1m[32mfeature/test[0m at [REPO].feature-test[0mdiff --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 0145ad499..c25cd3f3e 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@@ -6,23 +6,25 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxbRVlC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9fmblF/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mCommit [0m [2mPath[0m-[1m[35mmain [0m [1m[35mb834638e[0m [1m[35m./test-repo[0m-another-extremely-long-name-here [2mb834638e[0m ./another-extremely-long-name-here-short [2mb834638e[0m ./short-very-long-feature-branch-name [2mb834638e[0m ./very-long-feature-branch-name+[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+another-extremely-long-name-here [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./another-extremely-long-name-here+short [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./short+very-long-feature-branch-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./very-long-feature-branch-name[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 901c91897..c6bb6eac6 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@@ -6,23 +6,25 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuQ3ikY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLwaTxi/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch[0m [2mCommit [0m [2mPath[0m-[1m[35mmain [0m [1m[35mb834638e[0m [1m[35m./test-repo[0m-long [2mb834638e[0m ./extremely-long-branch-name-that-might-cause-layout-issues-medium [2mb834638e[0m ./medium-length-name-x [2mb834638e[0m ./x+[2mBranch[0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m+[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+long [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./extremely-long-branch-name-that-might-cause-layout-issues+medium [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./medium-length-name+x [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./x[2mShowing 4 worktrees[0m