Skip to content

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

fix: color status symbols and inline code in help text tables (#1231)

Maximilian Roosc3d5bb218dbd
diff --git a/src/md_help.rs b/src/md_help.rs
index a86d65fcd..71370ba56 100644
--- a/src/md_help.rs
+++ b/src/md_help.rs
@@ -1,7 +1,8 @@
//! Minimal markdown rendering for CLI help text.
use anstyle::{AnsiColor, Color, Color as AnsiStyleColor, Style};
-use termimad::{MadSkin, TableBorderChars};
+use crossterm::style::Attribute;
+use termimad::{CompoundStyle, MadSkin, TableBorderChars};
use unicode_width::UnicodeWidthStr;
use worktrunk::styling::{DEFAULT_HELP_WIDTH, wrap_styled_text};
@@ -27,6 +28,10 @@ static HELP_TABLE_BORDERS: TableBorderChars = TableBorderChars {
fn help_table_skin() -> MadSkin {
let mut skin = MadSkin::no_style();
skin.table_border_chars = &HELP_TABLE_BORDERS;
+ // Render backtick-enclosed text as dimmed, matching render_inline_formatting().
+ // This is needed for colorize_status_symbols() to find and recolor symbols
+ // like `●` that appear in table cells.
+ skin.inline_code = CompoundStyle::with_attr(Attribute::Dim);
skin
}
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 2240c16e8..78dd35894 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -79,8 +79,8 @@ Show current configuration and file locations:
File Location Contains Committed & shared
────────────── ─────────────────────────────── ─────────────────────────────────────────────── ──────────────────
- User config ~/.config/worktrunk/config.toml Worktree path template, LLM commit configs, etc ✗
- Project config .config/wt.toml Project hooks, dev server URL ✓
+ User config ~/.config/worktrunk/config.toml Worktree path template, LLM commit configs, etc ✗
+ Project config .config/wt.toml Project hooks, dev server URL ✓
Organizations can also deploy a system-wide config file for shared defaults — run wt config show for the platform-specific location.
@@ -339,9 +339,9 @@ For nested config sections, use double underscores to separate levels:
Config Environment Variable
───────────────────────── ─────────────────────────────────────
- worktree-path WORKTRUNK_WORKTREE_PATH
- commit.generation.command WORKTRUNK_COMMIT__GENERATION__COMMAND
- commit.stage WORKTRUNK_COMMIT__STAGE
+ worktree-path WORKTRUNK_WORKTREE_PATH
+ commit.generation.command WORKTRUNK_COMMIT__GENERATION__COMMAND
+ commit.stage WORKTRUNK_COMMIT__STAGE
Note the single underscore after WORKTRUNK and double underscores between nested keys.
@@ -355,12 +355,12 @@ Override the LLM command in CI to use a mock:
Variable Purpose
───────────────────────────────── ─────────────────────────────────────────────────────────────────────────────────
- WORKTRUNK_BIN Override binary path for shell wrappers (useful for testing dev builds)
- WORKTRUNK_CONFIG_PATH Override user config file location
- WORKTRUNK_SYSTEM_CONFIG_PATH Override system config file location
- XDG_CONFIG_DIRS Colon-separated system config directories (default: /etc/xdg)
- WORKTRUNK_DIRECTIVE_FILE Internal: set by shell wrappers to enable directory changes
- WORKTRUNK_SHELL Internal: set by shell wrappers to indicate shell type (e.g., powershell)
- WORKTRUNK_MAX_CONCURRENT_COMMANDS Max parallel git commands (default: 32). Lower if hitting file descriptor limits.
- NO_COLOR Disable colored output (standard)
- CLICOLOR_FORCE Force colored output even when not a TTY
+ WORKTRUNK_BIN Override binary path for shell wrappers (useful for testing dev builds)
+ WORKTRUNK_CONFIG_PATH Override user config file location
+ WORKTRUNK_SYSTEM_CONFIG_PATH Override system config file location
+ XDG_CONFIG_DIRS Colon-separated system config directories (default: /etc/xdg)
+ WORKTRUNK_DIRECTIVE_FILE Internal: set by shell wrappers to enable directory changes
+ WORKTRUNK_SHELL Internal: set by shell wrappers to indicate shell type (e.g., powershell)
+ WORKTRUNK_MAX_CONCURRENT_COMMANDS Max parallel git commands (default: 32). Lower if hitting file descriptor limits.
+ NO_COLOR Disable colored output (standard)
+ CLICOLOR_FORCE Force colored output even when not a TTY
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
index 0887e6e0f..a61d1509e 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
@@ -17,10 +17,13 @@ info:
RUST_LOG: warn
SHELL: ""
TERM: alacritty
+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.toml
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
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"
---
@@ -63,12 +66,12 @@ Results cache for 30-60 seconds. Indicators dim when local changes haven't been
Status Meaning
───────── ───────────────────────────────────────
- passed All checks passed
- running Checks in progress
- failed Checks failed
- conflicts PR has merge conflicts
- no-ci No checks configured
- error Fetch error (rate limit, network, auth)
+ passed All checks passed
+ running Checks in progress
+ failed Checks failed
+ conflicts PR has merge conflicts
+ no-ci No checks configured
+ error Fetch error (rate limit, network, auth)
See wt list CI status for display symbols and colors.
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
index 39cc5905e..60a44bd1c 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
@@ -68,8 +68,8 @@ All hook executions and LLM commands are recorded automatically — one JSON obj
Operation Log file
────────────────── ───────────────────────────────────────
- post-start hooks {branch}-{source}-post-start-{name}.log
- Background removal {branch}-remove.log
+ post-start hooks {branch}-{source}-post-start-{name}.log
+ Background removal {branch}-remove.log
Source is user or project depending on where the hook is defined.
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index 686bca0a7..09717fc2a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -101,10 +101,10 @@ Output as JSON for scripting:
Status Compact symbols (see below)
HEAD± Uncommitted changes: +added -deleted lines
main↕ Commits ahead/behind default branch
- main…± Line diffs since the merge-base with the default branch (--full)
- Summary LLM-generated branch summary (--full + summary = true, requires commit.generation) (experimental)
+ main…± Line diffs since the merge-base with the default branch (--full)
+ Summary LLM-generated branch summary (--full + summary = true, requires commit.generation) (experimental)
Remote⇅ Commits ahead/behind tracking branch
- CI Pipeline status (--full)
+ CI Pipeline status (--full)
Path Worktree directory
URL Dev server URL from project config (dimmed if port not listening)
Commit Short hash (8 chars)
@@ -119,12 +119,12 @@ The CI column shows GitHub/GitLab pipeline status:
Indicator Meaning
───────── ─────────────────────────────────
- ● green All checks passed
- ● blue Checks running
- ● red Checks failed
- ● yellow Merge conflicts with base
- ● gray No checks configured
- ⚠ yellow Fetch error (rate limit, network)
+ ● green All checks passed
+ ● blue Checks running
+ ● red Checks failed
+ ● yellow Merge conflicts with base
+ ● gray No checks configured
+ ⚠ yellow Fetch error (rate limit, network)
(blank) No upstream or no PR/MR
CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when there are unpushed local changes (stale status). PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches (visible with --remotes) get CI status detection. Results are cached for 30-60 seconds; use wt config state to view or clear.
@@ -141,29 +141,29 @@ The Status column has multiple subcolumns. Within each, only the first matching
Subcolumn Symbol Meaning
──────────────── ────── ──────────────────────────────────────────────────────────────────────────────────────────
- Working tree (1) + Staged files
- Working tree (2) ! Modified files (unstaged)
- Working tree (3) ? Untracked files
- Worktree ✘ Merge conflicts
- ⤴ Rebase in progress
- ⤵ Merge in progress
- / Branch without worktree
- ⚑ Branch-worktree mismatch (branch name doesn't match worktree path)
- ⊟ Prunable (directory missing)
- ⊞ Locked worktree
- Default branch ^ Is the default branch
- ∅ Orphan branch (no common ancestor with the default branch)
- ✗ Would conflict if merged to the default branch (with --full, includes uncommitted changes)
- _ Same commit as the default branch, clean
- – Same commit as the default branch, uncommitted changes
- ⊂ Content integrated into the default branch or target
- ↕ Diverged from the default branch
- ↑ Ahead of the default branch
- ↓ Behind the default branch
- Remote | In sync with remote
- ⇅ Diverged from remote
- ⇡ Ahead of remote
- ⇣ Behind remote
+ Working tree (1) + Staged files
+ Working tree (2) ! Modified files (unstaged)
+ Working tree (3) ? Untracked files
+ Worktree ✘ Merge conflicts
+ ⤴ Rebase in progress
+ ⤵ Merge in progress
+ / Branch without worktree
+ ⚑ Branch-worktree mismatch (branch name doesn't match worktree path)
+ ⊟ Prunable (directory missing)
+ ⊞ Locked worktree
+ Default branch ^ Is the default branch
+ ∅ Orphan branch (no common ancestor with the default branch)
+ ✗ Would conflict if merged to the default branch (with --full, includes uncommitted changes)
+ _ Same commit as the default branch, clean
+ – Same commit as the default branch, uncommitted changes
+ ⊂ Content integrated into the default branch or target
+ ↕ Diverged from the default branch
+ ↑ Ahead of the default branch
+ ↓ Behind the default branch
+ Remote | In sync with remote
+ ⇅ Diverged from remote
+ ⇡ Ahead of remote
+ ⇣ Behind remote
Rows are dimmed when safe to delete (_ same commit with clean working tree or ⊂ content integrated).
@@ -201,79 +201,79 @@ Query structured data with --format=json:
Field Type Description
────────────────── ─────────── ───────────────────────────────────────────────────────────────────
- branch string/null Branch name (null for detached HEAD)
- path string Worktree path (absent for branches without worktrees)
- kind string "worktree" or "branch"
- commit object Commit info (see below)
- working_tree object Working tree state (see below)
- main_state string Relation to the default branch (see below)
- integration_reason string Why branch is integrated (see below)
- operation_state string "conflicts", "rebase", or "merge" (absent when clean)
- main object Relationship to the default branch (see below, absent when is_main)
- remote object Tracking branch info (see below, absent when no tracking)
- worktree object Worktree metadata (see below)
- is_main boolean Is the main worktree
- is_current boolean Is the current worktree
- is_previous boolean Previous worktree from wt switch
- ci object CI status (see below, absent when no CI)
- url string Dev server URL from project config (absent when not configured)
- url_active boolean Whether the URL's port is listening (absent when not configured)
- statusline string Pre-formatted status with ANSI colors
- symbols string Raw status symbols without colors (e.g., "!?↓")
+ branch string/null Branch name (null for detached HEAD)
+ path string Worktree path (absent for branches without worktrees)
+ kind string "worktree" or "branch"
+ commit object Commit info (see below)
+ working_tree object Working tree state (see below)
+ main_state string Relation to the default branch (see below)
+ integration_reason string Why branch is integrated (see below)
+ operation_state string "conflicts", "rebase", or "merge" (absent when clean)
+ main object Relationship to the default branch (see below, absent when is_main)
+ remote object Tracking branch info (see below, absent when no tracking)
+ worktree object Worktree metadata (see below)
+ is_main boolean Is the main worktree
+ is_current boolean Is the current worktree
+ is_previous boolean Previous worktree from wt switch
+ ci object CI status (see below, absent when no CI)
+ url string Dev server URL from project config (absent when not configured)
+ url_active boolean Whether the URL's port is listening (absent when not configured)
+ statusline string Pre-formatted status with ANSI colors
+ symbols string Raw status symbols without colors (e.g., "!?↓")
Commit object
Field Type Description
───────── ────── ───────────────────────────
- sha string Full commit SHA (40 chars)
- short_sha string Short commit SHA (7 chars)
- message string Commit message (first line)
- timestamp number Unix timestamp
+ sha string Full commit SHA (40 chars)
+ short_sha string Short commit SHA (7 chars)
+ message string Commit message (first line)
+ timestamp number Unix timestamp
working_tree object
Field Type Description
───────── ─────── ───────────────────────────────────────
- staged boolean Has staged files
- modified boolean Has modified files (unstaged)
- untracked boolean Has untracked files
- renamed boolean Has renamed files
- deleted boolean Has deleted files
- diff object Lines changed vs HEAD: {added, deleted}
+ staged boolean Has staged files
+ modified boolean Has modified files (unstaged)
+ untracked boolean Has untracked files
+ renamed boolean Has renamed files
+ deleted boolean Has deleted files
+ diff object Lines changed vs HEAD: {added, deleted}
main object
Field Type Description
────── ────── ─────────────────────────────────────────────────────
- ahead number Commits ahead of the default branch
- behind number Commits behind the default branch
- diff object Lines changed vs the default branch: {added, deleted}
+ ahead number Commits ahead of the default branch
+ behind number Commits behind the default branch
+ diff object Lines changed vs the default branch: {added, deleted}
remote object
Field Type Description
────── ────── ────────────────────────────
- name string Remote name (e.g., "origin")
- branch string Remote branch name
- ahead number Commits ahead of remote
- behind number Commits behind remote
+ name string Remote name (e.g., "origin")
+ branch string Remote branch name
+ ahead number Commits ahead of remote
+ behind number Commits behind remote
worktree object
Field Type Description
──────── ─────── ────────────────────────────────────────────────────────────────────────────────────
- state string "no_worktree", "branch_worktree_mismatch", "prunable", "locked" (absent when normal)
- reason string Reason for locked/prunable state
- detached boolean HEAD is detached
+ state string "no_worktree", "branch_worktree_mismatch", "prunable", "locked" (absent when normal)
+ reason string Reason for locked/prunable state
+ detached boolean HEAD is detached
ci object
Field Type Description
────── ─────── ─────────────────────────────────────────────────
- status string CI status (see below)
- source string "pr" (PR/MR) or "branch" (branch workflow)
- stale boolean Local HEAD differs from remote (unpushed changes)
- url string URL to the PR/MR page
+ status string CI status (see below)
+ source string "pr" (PR/MR) or "branch" (branch workflow)
+ stale boolean Local HEAD differs from remote (unpushed changes)
+ url string URL to the PR/MR page
main_state values
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
index cdeaa8349..889a5e792 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
@@ -107,11 +107,11 @@ Output as JSON for scripting:
Status Compact symbols (see below)
HEAD± Uncommitted changes: +added -deleted lines
main↕ Commits ahead/behind default branch
- main…± Line diffs since the merge-base with the default branch (--full)
- Summary LLM-generated branch summary (--full + summary = true, requires
- commit.generation) (experimental)
+ main…± Line diffs since the merge-base with the default branch (--full)
+ Summary LLM-generated branch summary (--full + summary = true, requires
+ commit.generation) (experimental)
Remote⇅ Commits ahead/behind tracking branch
- CI Pipeline status (--full)
+ CI Pipeline status (--full)
Path Worktree directory
URL Dev server URL from project config (dimmed if port not listening)
Commit Short hash (8 chars)
@@ -127,12 +127,12 @@ The CI column shows GitHub/GitLab pipeline status:
Indicator Meaning
───────── ─────────────────────────────────
- ● green All checks passed
- ● blue Checks running
- ● red Checks failed
- ● yellow Merge conflicts with base
- ● gray No checks configured
- ⚠ yellow Fetch error (rate limit, network)
+ ● green All checks passed
+ ● blue Checks running
+ ● red Checks failed
+ ● yellow Merge conflicts with base
+ ● gray No checks configured
+ ⚠ yellow Fetch error (rate limit, network)
(blank) No upstream or no PR/MR
CI indicators are clickable links to the PR or pipeline page. Any CI dot appears
@@ -158,33 +158,33 @@ symbol is shown (listed in priority order):
Subcolumn Symbol Meaning
──────────────── ────── ────────────────────────────────────────────────────
- Working tree (1) + Staged files
- Working tree (2) ! Modified files (unstaged)
- Working tree (3) ? Untracked files
- Worktree ✘ Merge conflicts
- ⤴ Rebase in progress
- ⤵ Merge in progress
- / Branch without worktree
- ⚑ Branch-worktree mismatch (branch name doesn't match
+ Working tree (1) + Staged files
+ Working tree (2) ! Modified files (unstaged)
+ Working tree (3) ? Untracked files
+ Worktree ✘ Merge conflicts
+ ⤴ Rebase in progress
+ ⤵ Merge in progress
+ / Branch without worktree
+ ⚑ Branch-worktree mismatch (branch name doesn't match
worktree path)
- ⊟ Prunable (directory missing)
- ⊞ Locked worktree
- Default branch ^ Is the default branch
- ∅ Orphan branch (no common ancestor with the default
+ ⊟ Prunable (directory missing)
+ ⊞ Locked worktree
+ Default branch ^ Is the default branch
+ ∅ Orphan branch (no common ancestor with the default
branch)
- ✗ Would conflict if merged to the default branch (with
- --full, includes uncommitted changes)
- _ Same commit as the default branch, clean
- – Same commit as the default branch, uncommitted
+ ✗ Would conflict if merged to the default branch (with
+ --full, includes uncommitted changes)
+ _ Same commit as the default branch, clean
+ – Same commit as the default branch, uncommitted
changes
- ⊂ Content integrated into the default branch or target
- ↕ Diverged from the default branch
- ↑ Ahead of the default branch
- ↓ Behind the default branch
- Remote | In sync with remote
- ⇅ Diverged from remote
- ⇡ Ahead of remote
- ⇣ Behind remote
+ ⊂ Content integrated into the default branch or target
+ ↕ Diverged from the default branch
+ ↑ Ahead of the default branch
+ ↓ Behind the default branch
+ Remote | In sync with remote
+ ⇅ Diverged from remote
+ ⇡ Ahead of remote
+ ⇣ Behind remote
Rows are dimmed when safe to delete (_ same commit with clean working tree or ⊂
content integrated).
@@ -223,87 +223,87 @@ Query structured data with --format=json:
Field Type Description
────────────────── ─────────── ─────────────────────────────────────────────
- branch string/null Branch name (null for detached HEAD)
- path string Worktree path (absent for branches without
+ branch string/null Branch name (null for detached HEAD)
+ path string Worktree path (absent for branches without
worktrees)
- kind string "worktree" or "branch"
- commit object Commit info (see below)
- working_tree object Working tree state (see below)
- main_state string Relation to the default branch (see below)
- integration_reason string Why branch is integrated (see below)
- operation_state string "conflicts", "rebase", or "merge" (absent
+ kind string "worktree" or "branch"
+ commit object Commit info (see below)
+ working_tree object Working tree state (see below)
+ main_state string Relation to the default branch (see below)
+ integration_reason string Why branch is integrated (see below)
+ operation_state string "conflicts", "rebase", or "merge" (absent
when clean)
- main object Relationship to the default branch (see
+ main object Relationship to the default branch (see
below, absent when is_main)
- remote object Tracking branch info (see below, absent when
+ remote object Tracking branch info (see below, absent when
no tracking)
- worktree object Worktree metadata (see below)
- is_main boolean Is the main worktree
- is_current boolean Is the current worktree
- is_previous boolean Previous worktree from wt switch
- ci object CI status (see below, absent when no CI)
- url string Dev server URL from project config (absent
+ worktree object Worktree metadata (see below)
+ is_main boolean Is the main worktree
+ is_current boolean Is the current worktree
+ is_previous boolean Previous worktree from wt switch
+ ci object CI status (see below, absent when no CI)
+ url string Dev server URL from project config (absent
when not configured)
- url_active boolean Whether the URL's port is listening (absent
+ url_active boolean Whether the URL's port is listening (absent
when not configured)
- statusline string Pre-formatted status with ANSI colors
- symbols string Raw status symbols without colors (e.g.,
- "!?↓")
+ statusline string Pre-formatted status with ANSI colors
+ symbols string Raw status symbols without colors (e.g.,
+ "!?↓")
Commit object
Field Type Description
───────── ────── ───────────────────────────
- sha string Full commit SHA (40 chars)
- short_sha string Short commit SHA (7 chars)
- message string Commit message (first line)
- timestamp number Unix timestamp
+ sha string Full commit SHA (40 chars)
+ short_sha string Short commit SHA (7 chars)
+ message string Commit message (first line)
+ timestamp number Unix timestamp
working_tree object
Field Type Description
───────── ─────── ───────────────────────────────────────
- staged boolean Has staged files
- modified boolean Has modified files (unstaged)
- untracked boolean Has untracked files
- renamed boolean Has renamed files
- deleted boolean Has deleted files
- diff object Lines changed vs HEAD: {added, deleted}
+ staged boolean Has staged files
+ modified boolean Has modified files (unstaged)
+ untracked boolean Has untracked files
+ renamed boolean Has renamed files
+ deleted boolean Has deleted files
+ diff object Lines changed vs HEAD: {added, deleted}
main object
Field Type Description
────── ────── ─────────────────────────────────────────────────────
- ahead number Commits ahead of the default branch
- behind number Commits behind the default branch
- diff object Lines changed vs the default branch: {added, deleted}
+ ahead number Commits ahead of the default branch
+ behind number Commits behind the default branch
+ diff object Lines changed vs the default branch: {added, deleted}
remote object
Field Type Description
────── ────── ────────────────────────────
- name string Remote name (e.g., "origin")
- branch string Remote branch name
- ahead number Commits ahead of remote
- behind number Commits behind remote
+ name string Remote name (e.g., "origin")
+ branch string Remote branch name
+ ahead number Commits ahead of remote
+ behind number Commits behind remote
worktree object
Field Type Description
──────── ─────── ───────────────────────────────────────────────────────────
- state string "no_worktree", "branch_worktree_mismatch", "prunable",
- "locked" (absent when normal)
- reason string Reason for locked/prunable state
- detached boolean HEAD is detached
+ state string "no_worktree", "branch_worktree_mismatch", "prunable",
+ "locked" (absent when normal)
+ reason string Reason for locked/prunable state
+ detached boolean HEAD is detached
ci object
Field Type Description
────── ─────── ─────────────────────────────────────────────────
- status string CI status (see below)
- source string "pr" (PR/MR) or "branch" (branch workflow)
- stale boolean Local HEAD differs from remote (unpushed changes)
- url string URL to the PR/MR page
+ status string CI status (see below)
+ source string "pr" (PR/MR) or "branch" (branch workflow)
+ stale boolean Local HEAD differs from remote (unpushed changes)
+ url string URL to the PR/MR page
main_state values
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
index ceb614b94..aae18b84c 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -15,10 +15,13 @@ info:
RUST_LOG: warn
SHELL: ""
TERM: alacritty
+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.toml
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
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"
---
@@ -112,8 +115,8 @@ Worktrunk has two force flags for different situations:
Flag Scope When to use
─────────────────── ──────── ──────────────────────────────────────────────────────────
- --force (-f) Worktree Worktree has untracked files (build artifacts, IDE config)
- --force-delete (-D) Branch Branch has unmerged commits
+ --force (-f) Worktree Worktree has untracked files (build artifacts, IDE config)
+ --force-delete (-D) Branch Branch has unmerged commits
wt remove feature --force # Remove worktree with untracked files
wt remove feature -D # Delete unmerged branch
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index 3988488d4..5f0b9cdb7 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -141,11 +141,11 @@ When creating a worktree, worktrunk:
Shortcut Meaning
──────── ─────────────────────────────
- ^ Default branch (main/master)
- @ Current branch/worktree
- - Previous worktree (like cd -)
- pr:{N} GitHub PR #N's branch
- mr:{N} GitLab MR !N's branch
+ ^ Default branch (main/master)
+ @ Current branch/worktree
+ - Previous worktree (like cd -)
+ pr:{N} GitHub PR #N's branch
+ mr:{N} GitLab MR !N's branch
wt switch - # Back to previous
wt switch ^ # Default branch worktree
@@ -161,14 +161,14 @@ When called without arguments, wt switch opens an interactive picker to
Key Action
───────────── ──────────────────────────────
- ↑/↓ Navigate worktree list
+ ↑/↓ Navigate worktree list
(type) Filter worktrees
- Enter Switch to selected worktree
- Alt-c Create new worktree from query
- Esc Cancel
- 1–5 Switch preview tab
- Alt-p Toggle preview panel
- Ctrl-u/Ctrl-d Scroll preview up/down
+ Enter Switch to selected worktree
+ Alt-c Create new worktree from query
+ Esc Cancel
+ 1–5 Switch preview tab
+ Alt-p Toggle preview panel
+ Ctrl-u/Ctrl-d Scroll preview up/down
Preview tabs (toggle with number keys):