Skip to content

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

test: width survey snapshots for picker layout at various sizes (#1613)

worktrunk-bote8855102b758
diff --git a/tests/integration_tests/spacing_edge_cases.rs b/tests/integration_tests/spacing_edge_cases.rs
index e6e0d3465..0f11a3c96 100644
--- a/tests/integration_tests/spacing_edge_cases.rs
+++ b/tests/integration_tests/spacing_edge_cases.rs
@@ -129,3 +129,70 @@ fn test_column_alignment_extreme_diff_sizes(mut repo: TestRepo) {
snapshot_list_with_width("alignment_extreme_diffs", &repo, 180);
}
+
+// Width survey: visualize column layout at various terminal widths.
+// These snapshots show what columns are visible and how branch names render
+// at each size. The picker in Right layout gets terminal_width/2, so
+// "picker at 80 cols" = list at 40 cols.
+//
+// Context: https://github.com/max-sixty/worktrunk/pull/1564
+
+#[rstest]
+fn test_width_survey_typical_branches(mut repo: TestRepo) {
+ // Realistic mix: short default branch + medium feature branches
+ repo.add_worktree("feature/auth-redesign");
+ repo.add_worktree("fix/login-timeout");
+ repo.add_worktree("chore/update-deps");
+
+ // Add some dirty files so status columns have data
+ let auth_path = repo.worktrees.get("feature/auth-redesign").unwrap();
+ std::fs::write(auth_path.join("auth.rs"), "changed").unwrap();
+ std::fs::write(auth_path.join("tests.rs"), "changed").unwrap();
+
+ let fix_path = repo.worktrees.get("fix/login-timeout").unwrap();
+ std::fs::write(fix_path.join("timeout.rs"), "changed").unwrap();
+
+ for width in [30, 40, 50, 60, 80, 100, 120] {
+ snapshot_list_with_width(&format!("width_survey_typical_{width}"), &repo, width);
+ }
+}
+
+#[rstest]
+fn test_width_survey_long_branches(mut repo: TestRepo) {
+ // Long branch names that stress the allocator at narrow widths
+ repo.add_worktree("feature/implement-oauth2-social-login");
+ repo.add_worktree("fix/database-connection-pool-exhaustion");
+ repo.add_worktree("short");
+
+ let long_path = repo
+ .worktrees
+ .get("feature/implement-oauth2-social-login")
+ .unwrap();
+ std::fs::write(long_path.join("oauth.rs"), "changed").unwrap();
+
+ for width in [30, 40, 50, 60, 80, 100, 120] {
+ snapshot_list_with_width(&format!("width_survey_long_{width}"), &repo, width);
+ }
+}
+
+#[rstest]
+fn test_width_survey_picker_equivalent(mut repo: TestRepo) {
+ // Simulate what the picker sees in Right layout: half the terminal width.
+ // "picker_right_80" = picker list pane when terminal is 80 cols (list gets 40).
+ repo.add_worktree("feature/auth-redesign");
+ repo.add_worktree("fix/login-timeout");
+ repo.add_worktree("chore/update-deps");
+
+ let auth_path = repo.worktrees.get("feature/auth-redesign").unwrap();
+ std::fs::write(auth_path.join("auth.rs"), "changed").unwrap();
+
+ // Right layout: list gets terminal_width / 2
+ for terminal_width in [60, 80, 100, 120, 160] {
+ let list_width = terminal_width / 2;
+ snapshot_list_with_width(
+ &format!("width_survey_picker_right_{terminal_width}"),
+ &repo,
+ list_width,
+ );
+ }
+}
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
new file mode 100644
index 000000000..3e5d8ef98
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "100"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅ Commit Age
+@ main ^| | 05a4a45d 16h
++ feature-a ↑ ↑1 1b87d473 16h
++ feature-b ↑ ↑1 f62940fc 16h
++ feature-c ↑ ↑1 345c7c93 16h
++ feature/implement-oauth2-social-login ? – 05a4a45d 16h
++ fix/database-connection-pool-exhaustion _ 05a4a45d 16h
++ short _ 05a4a45d 16h
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 2 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
new file mode 100644
index 000000000..fa917a738
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "120"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅ Commit Age Message
+@ main ^| | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 345c7c93 16h Add feature-c file
++ feature/implement-oauth2-social-login ? – 05a4a45d 16h Initial commit
++ fix/database-connection-pool-exhaustion _ 05a4a45d 16h Initial commit
++ short _ 05a4a45d 16h Initial commit
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 1 column hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
new file mode 100644
index 000000000..f589b6ab1
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "30"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch
+@ main
++ feature-a
++ feature-b
++ feature-c
++ feature/implement-oauth2-so…
++ fix/database-connection-poo…
++ short
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
new file mode 100644
index 000000000..ed4128245
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "40"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch
+@ main
++ feature-a
++ feature-b
++ feature-c
++ feature/implement-oauth2-social-login
++ fix/database-connection-pool-exhausti…
++ short
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
new file mode 100644
index 000000000..b2edd8cdf
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "50"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch main↕
+@ main
++ feature-a ↑1
++ feature-b ↑1
++ feature-c ↑1
++ feature/implement-oauth2-social-login
++ fix/database-connection-pool-exhaustion
++ short
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
new file mode 100644
index 000000000..282cd3fb3
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "60"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status main↕
+@ main ^|
++ feature-a ↑ ↑1
++ feature-b ↑ ↑1
++ feature-c ↑ ↑1
++ feature/implement-oauth2-social-login ? –
++ fix/database-connection-pool-exhaustion _
++ short _
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
new file mode 100644
index 000000000..7f8f6a845
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "80"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅
+@ main ^| |
++ feature-a ↑ ↑1
++ feature-b ↑ ↑1
++ feature-c ↑ ↑1
++ feature/implement-oauth2-social-login ? –
++ fix/database-connection-pool-exhaustion _
++ short _
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 4 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
new file mode 100644
index 000000000..226b5e6e4
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "50"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± Age
+@ main ^| 16h
++ chore/update-deps _ 16h
++ feature-a ↑ 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ 16h
++ feature-c ↑ 16h
++ fix/login-timeout _ 16h
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
new file mode 100644
index 000000000..bb76d50a9
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "60"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Age
+@ main ^| 16h
++ chore/update-deps _ 16h
++ feature-a ↑ ↑1 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ ↑1 16h
++ feature-c ↑ ↑1 16h
++ fix/login-timeout _ 16h
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 4 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
new file mode 100644
index 000000000..061d6b542
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "80"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅ Commit Age
+@ main ^| | 05a4a45d 16h
++ chore/update-deps _ 05a4a45d 16h
++ feature-a ↑ ↑1 1b87d473 16h
++ feature/auth-redesign ? – 05a4a45d 16h
++ feature-b ↑ ↑1 f62940fc 16h
++ feature-c ↑ ↑1 345c7c93 16h
++ fix/login-timeout _ 05a4a45d 16h
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 2 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
new file mode 100644
index 000000000..2b4043218
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "30"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Age
+@ main 16h
++ chore/update-deps 16h
++ feature-a 16h
++ feature/auth-redesign 16h
++ feature-b 16h
++ feature-c 16h
++ fix/login-timeout 16h
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
new file mode 100644
index 000000000..b68c3eaf2
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "40"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status Age
+@ main ^| 16h
++ chore/update-deps _ 16h
++ feature-a ↑ 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ 16h
++ feature-c ↑ 16h
++ fix/login-timeout _ 16h
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
new file mode 100644
index 000000000..297ab8719
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "100"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅ Commit Age Message
+@ main ^| | 05a4a45d 16h Initial commit
++ chore/update-deps _ 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 1b87d473 16h Add feature-a file
++ feature/auth-redesign ? – 05a4a45d 16h Initial commit
++ feature-b ↑ ↑1 f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 345c7c93 16h Add feature-c file
++ fix/login-timeout ? – 05a4a45d 16h Initial commit
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 1 column hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
new file mode 100644
index 000000000..5a7aafe3e
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "120"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅ Commit Age Message
+@ main ^| | 05a4a45d 16h Initial commit
++ chore/update-deps _ 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 1b87d473 16h Add feature-a file
++ feature/auth-redesign ? – 05a4a45d 16h Initial commit
++ feature-b ↑ ↑1 f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 345c7c93 16h Add feature-c file
++ fix/login-timeout ? – 05a4a45d 16h Initial commit
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 1 column hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
new file mode 100644
index 000000000..d2db6ddde
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "30"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Age
+@ main 16h
++ chore/update-deps 16h
++ feature-a 16h
++ feature/auth-redesign 16h
++ feature-b 16h
++ feature-c 16h
++ fix/login-timeout 16h
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 7 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
new file mode 100644
index 000000000..19b39138d
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "40"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status Age
+@ main ^| 16h
++ chore/update-deps _ 16h
++ feature-a ↑ 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ 16h
++ feature-c ↑ 16h
++ fix/login-timeout ? – 16h
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 6 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
new file mode 100644
index 000000000..fa46d5f05
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "50"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± Age
+@ main ^| 16h
++ chore/update-deps _ 16h
++ feature-a ↑ 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ 16h
++ feature-c ↑ 16h
++ fix/login-timeout ? – 16h
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 5 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
new file mode 100644
index 000000000..3ac7e5dc3
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "60"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Age
+@ main ^| 16h
++ chore/update-deps _ 16h
++ feature-a ↑ ↑1 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ ↑1 16h
++ feature-c ↑ ↑1 16h
++ fix/login-timeout ? – 16h
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 4 columns hidden
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
new file mode 100644
index 000000000..c7f70643a
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
@@ -0,0 +1,53 @@
+---
+source: tests/integration_tests/spacing_edge_cases.rs
+info:
+ program: wt
+ args:
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "80"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ PATH: "[PATH]"
+ PSModulePath: ""
+ RUST_LOG: warn
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ Remote⇅ Commit Age
+@ main ^| | 05a4a45d 16h
++ chore/update-deps _ 05a4a45d 16h
++ feature-a ↑ ↑1 1b87d473 16h
++ feature/auth-redesign ? – 05a4a45d 16h
++ feature-b ↑ ↑1 f62940fc 16h
++ feature-c ↑ ↑1 345c7c93 16h
++ fix/login-timeout ? – 05a4a45d 16h
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 2 columns hidden
+
+----- stderr -----