Skip to content

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

Use @ before paths in all section headings (#1376)

Maximilian Roosdece4131ebea
diff --git a/.claude/skills/writing-user-outputs/SKILL.md b/.claude/skills/writing-user-outputs/SKILL.md
index 9d1692771..352b2bfd6 100644
--- a/.claude/skills/writing-user-outputs/SKILL.md
+++ b/.claude/skills/writing-user-outputs/SKILL.md
@@ -84,8 +84,8 @@ use worktrunk::styling::format_heading;
format_heading("BINARIES", None) // => "BINARIES" (cyan)
// Heading with suffix
-format_heading("USER CONFIG", Some("~/.config/wt.toml"))
-// => "USER CONFIG ~/.config/wt.toml" (title cyan, suffix plain)
+format_heading("USER CONFIG", Some("@ ~/.config/wt.toml"))
+// => "USER CONFIG @ ~/.config/wt.toml" (title cyan, suffix plain)
```
## stdout vs stderr
@@ -839,21 +839,25 @@ regular users.
`worktrunk::path`. This function replaces home directory prefixes with `~` for
readability (e.g., `/Users/alex/projects/repo` → `~/projects/repo`).
-**Use `@` (not "at") before paths in status messages.** This is the codebase
-convention for associating an entity with a location:
+**Use `@` (not "at") before paths in all user-facing output.** This is the
+codebase convention for associating an entity with a location — in status
+messages, section headings, hints, and everywhere else:
```rust
// GOOD - @ before path
"Created worktree for feature @ ~/code/repo.feature"
"Squashed @ a1b2c3d"
"Worktree for feature @ ~/repo.feature, but cannot change directory..."
+format_heading("USER HOOKS", Some(&format!("@ {}", format_path_for_display(p))))
// BAD - "at" before path
"Created worktree for feature at ~/code/repo.feature"
+// BAD - heading without @
+format_heading("USER HOOKS", Some(&format_path_for_display(p)))
```
-**Exception:** Prose contexts (error descriptions, doc comments, help text) use
-"at" — `@` is for terse status messages only.
+**Exception:** Prose contexts (doc comments, help text) use "at" — `@` is for
+terse output only.
```rust
use worktrunk::path::format_path_for_display;
@@ -876,6 +880,7 @@ eprintln!("{}", success_message(format!(
**Applies to:**
- Success/info/warning/error messages
+- Section headings (`format_heading` with path suffix)
- Hints suggesting paths
- Progress messages
- Dry-run previews
diff --git a/src/commands/config/show.rs b/src/commands/config/show.rs
index 9bc9cd3e7..7b229b4f4 100644
--- a/src/commands/config/show.rs
+++ b/src/commands/config/show.rs
@@ -358,7 +358,7 @@ fn render_system_config(out: &mut String) -> anyhow::Result<bool> {
"{}",
format_heading(
"SYSTEM CONFIG",
- Some(&format_path_for_display(&system_path))
+ Some(&format!("@ {}", format_path_for_display(&system_path)))
)
)?;
@@ -394,7 +394,10 @@ fn render_user_config(out: &mut String, has_system_config: bool) -> anyhow::Resu
writeln!(
out,
"{}",
- format_heading("USER CONFIG", Some(&format_path_for_display(&config_path)))
+ format_heading(
+ "USER CONFIG",
+ Some(&format!("@ {}", format_path_for_display(&config_path)))
+ )
)?;
// Check if file exists
@@ -537,7 +540,7 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {
"{}",
format_heading(
"PROJECT CONFIG",
- Some(&format_path_for_display(&config_path))
+ Some(&format!("@ {}", format_path_for_display(&config_path)))
)
)?;
diff --git a/src/commands/hook_commands.rs b/src/commands/hook_commands.rs
index 6899b06e3..736e88141 100644
--- a/src/commands/hook_commands.rs
+++ b/src/commands/hook_commands.rs
@@ -448,7 +448,7 @@ fn render_user_hooks(
Some(
&config_path
.as_ref()
- .map(|p| format_path_for_display(p))
+ .map(|p| format!("@ {}", format_path_for_display(p)))
.unwrap_or_else(|| "(not found)".to_string())
)
)
@@ -509,7 +509,7 @@ fn render_project_hooks(
"{}",
format_heading(
"PROJECT HOOKS",
- Some(&format_path_for_display(&config_path))
+ Some(&format!("@ {}", format_path_for_display(&config_path)))
)
)?;
diff --git a/src/styling/constants.rs b/src/styling/constants.rs
index 88a2e14c2..cf0e50a4a 100644
--- a/src/styling/constants.rs
+++ b/src/styling/constants.rs
@@ -223,12 +223,12 @@ pub fn prompt_message(content: impl AsRef<str>) -> FormattedMessage {
/// // => "BINARIES"
///
/// // Heading with suffix
-/// let h = format_heading("USER CONFIG", Some("~/.config/wt.toml"));
-/// // => "USER CONFIG ~/.config/wt.toml"
+/// let h = format_heading("USER CONFIG", Some("@ ~/.config/wt.toml"));
+/// // => "USER CONFIG @ ~/.config/wt.toml"
/// ```
pub fn format_heading(title: &str, suffix: Option<&str>) -> String {
match suffix {
- Some(s) => cformat!("<cyan>{}</> {}", title, s),
+ Some(s) => cformat!("<cyan>{}</> {}", title, s),
None => cformat!("<cyan>{}</>", title),
}
}
@@ -357,11 +357,11 @@ mod tests {
#[test]
fn test_format_heading_with_suffix() {
- let heading = format_heading("USER CONFIG", Some("~/.config/wt.toml"));
+ let heading = format_heading("USER CONFIG", Some("@ ~/.config/wt.toml"));
assert!(heading.contains("USER CONFIG"));
- assert!(heading.contains("~/.config/wt.toml"));
- // Should have double-space separator
- assert!(heading.contains(" "));
+ assert!(heading.contains("@ ~/.config/wt.toml"));
+ // Title and suffix separated by single space (plus ANSI reset between them)
+ assert!(!heading.contains(" "));
}
#[test]
diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rs
index 83f19e859..193dbb431 100644
--- a/tests/integration_tests/config_state.rs
+++ b/tests/integration_tests/config_state.rs
@@ -695,10 +695,10 @@ fn test_state_get_empty(repo: TestRepo) {
HINTS
  (none)
- COMMAND LOG @ <PATH>
+ COMMAND LOG @ <PATH>
  (none)
- HOOK OUTPUT @ <PATH>
+ HOOK OUTPUT @ <PATH>
  (none)
");
});
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap
index 873912f48..1d0236e6d 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
▲ Project config uses deprecated template variables: main_worktree → repo
↳ To apply:
  wt config update
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap
index 314ce005a..ad7935542 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap
index 3f0becabb..e93be731b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config uses deprecated template variables: repo_root → repo_path, main_worktree → repo
↳ To apply:
  wt config update
@@ -60,7 +60,7 @@ exit_code: 0
  post-create = "ln -sf {{ repo_root }}/node_modules"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap
index 2afa6bd86..7c3fc7669 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config uses deprecated config sections: [projects."github.com/example/repo".commit-generation] → [projects."github.com/example/repo".commit.generation]
↳ To apply:
  wt config update
@@ -63,7 +63,7 @@ exit_code: 0
  command = "llm -m gpt-4"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap
index 05eee7312..c6e0b2de6 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Empty file
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap
index 53a38364c..1527fe394 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
@@ -41,13 +42,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-SYSTEM CONFIG [PROJECT_ID]
+SYSTEM CONFIG @ [PROJECT_ID]
↳ Empty file (no system defaults)
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap
index a0b550dd8..6072775d1 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap
index 4d23a7ba3..9d61a995c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap
index 60dce5f0d..5bb576758 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap
index dc514fd7e..2b9ab6156 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
-PROJECT CONFIG [PROJECT_ID]
+PROJECT CONFIG @ [PROJECT_ID]
▲ Project config uses deprecated template variables: main_worktree → repo
↳ To apply:
  wt -C _REPO_ config update
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
index e275b713f..27ebd5080 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
@@ -44,14 +44,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
 
  [commit.generation]
  command = "nonexistent-llm-command-12345 -m test-model"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
index 09e8b84e3..bb3dd3594 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
@@ -44,11 +44,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap
index 0ef830e59..d4f03a7dd 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap
@@ -44,11 +44,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap
index 086df7246..6f87c2e26 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap
@@ -44,11 +44,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap
index 18533a552..01641d8d7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap
index 18533a552..01641d8d7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap
index 2c8f355c8..53387f919 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
✗ Invalid config
  TOML parse error at line 1, column 28
  |
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap
index 3a17ccccd..d4bd2ffd8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-SYSTEM CONFIG [PROJECT_ID]
+SYSTEM CONFIG @ [PROJECT_ID]
✗ Invalid config
  TOML parse error at line 1, column 17
  |
@@ -51,10 +51,10 @@ exit_code: 0
  unclosed array, expected `]`
  invalid = [toml
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap
index 02b4ce0c2..4184b6874 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
✗ Invalid config
  TOML parse error at line 1, column 6
  |
@@ -52,7 +52,7 @@ exit_code: 0
  this is not valid toml {{{
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
index 18533a552..01641d8d7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap
index ed43af5b0..2495784d0 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap
index d1bf515d4..4b76048ff 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
index 30fef64f5..4b29de1a1 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
@@ -37,11 +37,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG Not in a git repository
+PROJECT CONFIG Not in a git repository
SHELL INTEGRATION
▲ Shell integration not active
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
index 32ff0ae7e..a77fdae33 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
@@ -43,10 +43,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap
index 31b43aefd..5a065bc98 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap
index 2ba07fda9..789578283 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap
index 25541a460..1b2b96dae 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap
@@ -43,11 +43,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap
index 47f345973..ef2ac92e8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap
index 781500e1d..0498ffb5d 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
▲ Key ci belongs in project config (will be ignored)
  worktree-path = "../{{ repo }}.{{ branch }}"
 
@@ -50,7 +50,7 @@ exit_code: 0
  platform = "github"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap
index c69752be9..0bb794901 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
▲ Project config uses deprecated config sections: [commit-generation] → [commit.generation]
↳ To apply:
  wt config update
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap
index 7ce52e404..6a72115d0 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap
@@ -43,10 +43,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
index 0f0a7b403..335850e38 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
▲ Unknown key post-merge-command will be ignored
  [post-merge-command]
  deploy = "task deploy"
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
index e62a8caa5..205553e39 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
▲ Unknown key commit-gen will be ignored
  worktree-path = "../{{ repo }}.{{ branch }}"
 
@@ -50,7 +50,7 @@ exit_code: 0
  command = "llm"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
index 05eee7312..c6e0b2de6 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Empty file
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
index 0f8b2337b..8e641bc43 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
@@ -42,11 +42,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
  post-create = "npm install"
 
  [post-start]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap
index fe0703644..ff1d66133 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap
@@ -42,7 +42,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-SYSTEM CONFIG [PROJECT_ID]
+SYSTEM CONFIG @ [PROJECT_ID]
  [merge]
  squash = true
  verify = true
@@ -50,10 +50,10 @@ exit_code: 0
  [commit.generation]
  command = "company-llm-tool"
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
index e21fc0f1b..3b65c8d3a 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
@@ -43,10 +43,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
index e37f8f18c..4b163f1f6 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
@@ -43,10 +43,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap b/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
index ec4a77f8f..b58181ebd 100644
--- a/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
+++ b/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
@@ -22,10 +22,10 @@ expression: "String::from_utf8_lossy(&output.stderr)"
HINTS
  (none)
-COMMAND LOG @ <PATH>
+COMMAND LOG @ <PATH>
  (none)
-HOOK OUTPUT @ <PATH>
+HOOK OUTPUT @ <PATH>
File Size Age
────────────────────────── ──── ──────
bugfix-remove.log 13B future
diff --git a/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap b/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
index 2acfe1b6e..523e339a5 100644
--- a/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
+++ b/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
@@ -21,8 +21,8 @@ expression: "String::from_utf8_lossy(&output.stderr)"
HINTS
  (none)
-COMMAND LOG @ <PATH>
+COMMAND LOG @ <PATH>
  (none)
-HOOK OUTPUT @ <PATH>
+HOOK OUTPUT @ <PATH>
  (none)
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap b/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap
index a3bad3c4d..300d1c019 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap b/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap
index a82ea07e1..cbf3b0c13 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap
@@ -42,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER CONFIG ~/.config/worktrunk/config.toml
+USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
-PROJECT CONFIG _REPO_/.config/wt.toml
+PROJECT CONFIG @ _REPO_/.config/wt.toml
↳ Not found
SHELL INTEGRATION
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
index 65727d893..996216867 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
@@ -19,16 +19,20 @@ info:
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]"
@@ -38,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS ~/.config/worktrunk/config.toml
+USER HOOKS @ ~/.config/worktrunk/config.toml
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
○ pre-merge build:
  cargo build
❯ pre-merge test: (requires approval)
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap
index 7b1554636..54b0ee703 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap
@@ -21,16 +21,20 @@ info:
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]"
@@ -40,10 +44,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit broken: (requires approval)
  # Failed to expand hook preview: syntax error: unexpected end of input, expected end of variable block @ line 1
  echo {{ branch
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap
index da708896b..1f18bd106 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap
@@ -21,16 +21,20 @@ info:
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]"
@@ -40,10 +44,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit optional-var: (requires approval)
  # Failed to expand hook preview: undefined value @ line 1
  echo {{ base }}
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap
index 13b30d5ef..ab83af04c 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap
@@ -21,16 +21,20 @@ info:
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]"
@@ -40,9 +44,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit valid: (requires approval)
  echo branch=main repo=repo
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap
index 2e3b85440..88c89526b 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap
@@ -20,16 +20,20 @@ info:
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]"
@@ -39,10 +43,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-merge build: (requires approval)
  cargo build
❯ pre-merge test: (requires approval)
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap
index c8c781a6a..0925459d2 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap
@@ -20,16 +20,20 @@ info:
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]"
@@ -39,9 +43,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-merge deploy: (requires approval)
  scripts/deploy.sh
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap
index b0ad83fd7..5ea57f8a7 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap
@@ -20,16 +20,20 @@ info:
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]"
@@ -39,9 +43,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-remove notify: (requires approval)
  echo removed
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap
index 7e7a22f64..f37e985f5 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap
@@ -20,16 +20,20 @@ info:
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]"
@@ -39,9 +43,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-remove cleanup: (requires approval)
  echo cleanup
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap
index 7a656fc53..a8c41d450 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap
@@ -19,16 +19,20 @@ info:
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]"
@@ -38,8 +42,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
↳ (not found)
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap
index ab6cf1ef4..ebb6c010f 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap
@@ -19,16 +19,20 @@ info:
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]"
@@ -38,8 +42,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
↳ (none configured)
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap
index 03ac5e132..fed690190 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap
@@ -19,16 +19,20 @@ info:
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]"
@@ -38,10 +42,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-USER HOOKS [TEST_CONFIG]
+USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
-PROJECT HOOKS _REPO_/.config/wt.toml
+PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-start deps: (requires approval)
  npm install
❯ pre-merge build: (requires approval)