Skip to content

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

Separate config state, advice and parser diagnostics (#4351)

Maximilian Roos2469187460a7
diff --git a/src/commands/config/mod.rs b/src/commands/config/mod.rs
index e8c9ce39d..a45ff9b3d 100644
--- a/src/commands/config/mod.rs
+++ b/src/commands/config/mod.rs
@@ -386,32 +386,41 @@ mod tests {
fn test_render_ci_tool_status() {
// Installed and authenticated
let mut out = String::new();
- render_ci_tool_status(&mut out, "gh", "GitHub", true, true).unwrap();
- assert_snapshot!(out, @"✓ gh installed & authenticated");
+ render_ci_tool_status(&mut out, "gh", "GitHub", true, true);
+ assert_snapshot!(out, @"○ gh installed & authenticated");
// Installed but not authenticated
let mut out = String::new();
- render_ci_tool_status(&mut out, "gh", "GitHub", true, false).unwrap();
- assert_snapshot!(out, @"▲ gh installed but not authenticated; run gh auth login");
+ render_ci_tool_status(&mut out, "gh", "GitHub", true, false);
+ assert_snapshot!(out, @"
+ ▲ gh installed but not authenticated
+ ↳ To authenticate, run gh auth login
+ ");
// The auth-setup command differs by CLI: `tea` uses `tea login add`,
// `az` uses `az login`, the rest use `<tool> auth login`.
let mut out = String::new();
- render_ci_tool_status(&mut out, "tea", "Gitea", true, false).unwrap();
- assert_snapshot!(out, @"▲ tea installed but not authenticated; run tea login add");
+ render_ci_tool_status(&mut out, "tea", "Gitea", true, false);
+ assert_snapshot!(out, @"
+ ▲ tea installed but not authenticated
+ ↳ To authenticate, run tea login add
+ ");
let mut out = String::new();
- render_ci_tool_status(&mut out, "az", "Azure DevOps", true, false).unwrap();
- assert_snapshot!(out, @"▲ az installed but not authenticated; run az login");
+ render_ci_tool_status(&mut out, "az", "Azure DevOps", true, false);
+ assert_snapshot!(out, @"
+ ▲ az installed but not authenticated
+ ↳ To authenticate, run az login
+ ");
// Not installed
let mut out = String::new();
- render_ci_tool_status(&mut out, "glab", "GitLab", false, false).unwrap();
- assert_snapshot!(out, @"↳ glab not found (GitLab CI status unavailable)");
+ render_ci_tool_status(&mut out, "glab", "GitLab", false, false);
+ assert_snapshot!(out, @"○ glab not found (GitLab CI status unavailable)");
// glab installed and authenticated
let mut out = String::new();
- render_ci_tool_status(&mut out, "glab", "GitLab", true, true).unwrap();
- assert_snapshot!(out, @"✓ glab installed & authenticated");
+ render_ci_tool_status(&mut out, "glab", "GitLab", true, true);
+ assert_snapshot!(out, @"○ glab installed & authenticated");
}
}
diff --git a/src/commands/config/show.rs b/src/commands/config/show.rs
index 7c7f418ff..0d3798b8c 100644
--- a/src/commands/config/show.rs
+++ b/src/commands/config/show.rs
@@ -11,8 +11,8 @@ use anyhow::Context;
use color_print::cformat;
use serde::{Serialize, de::DeserializeOwned};
use worktrunk::config::{
- LoadError, ProjectConfig, UserConfig, default_system_config_path, require_config_path,
- system_config_path,
+ ConfigError, ConfigFileKind, ConfigParseError, LoadError, ProjectConfig, UserConfig,
+ default_system_config_path, require_config_path, system_config_path,
};
use worktrunk::git::remote_ref::azure::azure_devops_extension_installed;
use worktrunk::git::{ErrorExt, ForgeKind, Repository, WorktrunkError};
@@ -23,7 +23,7 @@ use worktrunk::shell::{
use worktrunk::shell_exec::Cmd;
use worktrunk::styling::{
FormattedMessage, error_message, format_bash_with_gutter, format_heading, format_toml,
- format_with_gutter, hint_message, info_message, success_message, warning_message,
+ format_with_gutter, hint_message, info_message, warning_message,
};
use crate::cli::{SwitchFormat, version_str};
@@ -200,7 +200,7 @@ fn handle_config_show_json() -> anyhow::Result<()> {
let system_exists = system_path.as_ref().is_some_and(|p| p.exists());
let system_invalid = if let Some(path) = system_path.as_deref().filter(|_| system_exists) {
match std::fs::read_to_string(path) {
- Ok(contents) => parse_user_config(&contents).is_err(),
+ Ok(contents) => parse_user_config(&contents, path, ConfigFileKind::System).is_err(),
Err(_) => true,
}
} else {
@@ -257,13 +257,18 @@ where
fn read_user_config(path: &Path) -> Option<UserConfig> {
let contents = std::fs::read_to_string(path).ok()?;
- parse_user_config(&contents).ok()
+ parse_user_config(&contents, path, ConfigFileKind::User).ok()
}
-fn parse_user_config(contents: &str) -> Result<UserConfig, String> {
+fn parse_user_config(
+ contents: &str,
+ path: &Path,
+ kind: ConfigFileKind,
+) -> Result<UserConfig, ConfigError> {
let migrated = worktrunk::config::migrate_content(contents);
- let config = toml::from_str::<UserConfig>(&migrated).map_err(|err| err.to_string())?;
- config.validate().map_err(|err| err.to_string())?;
+ let config = toml::from_str::<UserConfig>(&migrated)
+ .map_err(|err| ConfigError::Parse(ConfigParseError::new(kind, path, err)))?;
+ config.validate()?;
Ok(config)
}
@@ -360,6 +365,16 @@ pub(super) fn is_statusline_configured() -> bool {
// ==================== Render Functions ====================
+/// Existing state is neutral; an action the reader can take belongs on its own row.
+fn state_with_advice(state: &str, advice: Option<String>) -> String {
+ let mut rendered = info_message(state).to_string();
+ if let Some(advice) = advice {
+ rendered.push('\n');
+ rendered.push_str(&hint_message(advice).to_string());
+ }
+ rendered
+}
+
/// Render CLAUDE CODE section (plugin and statusline status).
/// Caller must check `is_claude_available()` first.
fn render_claude_code_status(out: &mut String) -> anyhow::Result<()> {
@@ -369,28 +384,34 @@ fn render_claude_code_status(out: &mut String) -> anyhow::Result<()> {
// plain absence: the install it points at is idempotent, so following it
// is safe either way, and Claude Code's own output then says what is true.
if super::plugins::is_plugin_installed() == Some(true) {
- writeln!(out, "{}", success_message("Plugin installed"))?;
+ writeln!(out, "{}", info_message("Plugin installed"))?;
} else {
writeln!(
out,
"{}",
- hint_message(cformat!(
- "Plugin not installed. To install, run <underline>wt config plugins claude install</>"
- ))
+ state_with_advice(
+ "Plugin not installed",
+ Some(cformat!(
+ "To install, run <underline>wt config plugins claude install</>"
+ ))
+ )
)?;
}
// Statusline status
let statusline_configured = is_statusline_configured();
if statusline_configured {
- writeln!(out, "{}", success_message("Statusline configured"))?;
+ writeln!(out, "{}", info_message("Statusline configured"))?;
} else {
writeln!(
out,
"{}",
- hint_message(cformat!(
- "Statusline not configured. To configure, run <underline>wt config plugins claude install-statusline</>"
- ))
+ state_with_advice(
+ "Statusline not configured",
+ Some(cformat!(
+ "To configure, run <underline>wt config plugins claude install-statusline</>"
+ ))
+ )
)?;
}
@@ -401,7 +422,7 @@ fn render_claude_code_status(out: &mut String) -> anyhow::Result<()> {
/// Caller must check `is_codex_available()` first.
fn render_codex_status(out: &mut String) -> anyhow::Result<()> {
writeln!(out, "{}", format_heading("CODEX", None))?;
- writeln!(out, "{}", success_message("Codex CLI available"))?;
+ writeln!(out, "{}", info_message("Codex CLI available"))?;
writeln!(
out,
"{}",
@@ -439,7 +460,8 @@ pub(super) fn is_omp_available() -> bool {
}
/// The section for a plugin the installer writes as a plain file: a heading,
-/// then one line of status, with the trailing newline the caller would add.
+/// then neutral state and, when needed, separate installation/update advice.
+/// Includes the trailing newline the caller would add.
///
/// OpenCode, Pi, and oh-my-pi each install one file and each report the same
/// three states, differing only in the heading and the command that writes the
@@ -453,15 +475,17 @@ fn file_plugin_status(
file_exists: bool,
) -> String {
let status = if installed {
- success_message("Plugin installed")
+ state_with_advice("Plugin installed", None)
} else if file_exists {
- hint_message(cformat!(
- "Plugin outdated. To update, run <underline>{install_command}</>"
- ))
+ state_with_advice(
+ "Plugin outdated",
+ Some(cformat!("To update, run <underline>{install_command}</>")),
+ )
} else {
- hint_message(cformat!(
- "Plugin not installed. To install, run <underline>{install_command}</>"
- ))
+ state_with_advice(
+ "Plugin not installed",
+ Some(cformat!("To install, run <underline>{install_command}</>")),
+ )
};
format!("{}\n{status}\n", format_heading(heading, None))
}
@@ -495,14 +519,17 @@ fn render_gemini_status(out: &mut String) -> anyhow::Result<()> {
writeln!(out, "{}", format_heading("GEMINI CLI", None))?;
if is_gemini_extension_installed() == Some(true) {
- writeln!(out, "{}", success_message("Extension installed"))?;
+ writeln!(out, "{}", info_message("Extension installed"))?;
} else {
writeln!(
out,
"{}",
- hint_message(cformat!(
- "Extension not installed. To install, run <underline>gemini extensions install https://github.com/max-sixty/worktrunk</>"
- ))
+ state_with_advice(
+ "Extension not installed",
+ Some(cformat!(
+ "To install, run <underline>gemini extensions install https://github.com/max-sixty/worktrunk</>"
+ ))
+ )
)?;
}
@@ -563,7 +590,7 @@ fn render_diagnostics(out: &mut String, repo: Option<&Repository>) -> anyhow::Re
"GitHub",
ci_tools.gh_installed,
ci_tools.gh_authenticated,
- )?;
+ );
}
Some((_, ForgeKind::GitLab)) => {
let ci_tools = CiToolsStatus::detect(None);
@@ -573,7 +600,7 @@ fn render_diagnostics(out: &mut String, repo: Option<&Repository>) -> anyhow::Re
"GitLab",
ci_tools.glab_installed,
ci_tools.glab_authenticated,
- )?;
+ );
}
Some((_, ForgeKind::Gitea)) => {
let ci_tools = CiToolsStatus::detect(None);
@@ -583,7 +610,7 @@ fn render_diagnostics(out: &mut String, repo: Option<&Repository>) -> anyhow::Re
"Gitea",
ci_tools.tea_installed,
ci_tools.tea_authenticated,
- )?;
+ );
}
Some((repo, ForgeKind::AzureDevOps)) => {
let ci_tools = CiToolsStatus::detect(None);
@@ -593,7 +620,7 @@ fn render_diagnostics(out: &mut String, repo: Option<&Repository>) -> anyhow::Re
"Azure DevOps",
ci_tools.az_installed,
ci_tools.az_authenticated,
- )?;
+ );
// The whole `az repos` command group ships in the azure-devops
// extension, so an `az` without it reports no CI status however
// well it's authenticated — and only the user can install it.
@@ -625,7 +652,7 @@ fn render_diagnostics(out: &mut String, repo: Option<&Repository>) -> anyhow::Re
let commit_config = config.commit_generation(project_id.as_deref());
if !commit_config.is_configured() {
- writeln!(out, "{}", hint_message("Commit generation not configured"))?;
+ writeln!(out, "{}", info_message("Commit generation not configured"))?;
} else {
// `is_configured()` guarantees `command` is `Some` and non-empty here;
// `unwrap_or_default()` avoids a panic-prone `unwrap()` in this
@@ -637,7 +664,7 @@ fn render_diagnostics(out: &mut String, repo: Option<&Repository>) -> anyhow::Re
writeln!(
out,
"{}",
- success_message(cformat!(
+ info_message(cformat!(
"Commit generation working (<bold>{command_display}</>)"
))
)?;
@@ -684,11 +711,12 @@ fn render_system_config(out: &mut String) -> Option<bool> {
};
if contents.trim().is_empty() {
- let _ = writeln!(out, "{}", hint_message("Empty file (no system defaults)"));
+ let _ = writeln!(out, "{}", info_message("Empty file (no system defaults)"));
return Some(false);
}
- let invalid = render_user_config_diagnostics(out, &contents);
+ let invalid =
+ render_user_config_diagnostics(out, &contents, &system_path, ConfigFileKind::System);
// Display TOML with syntax highlighting
let _ = writeln!(out, "{}", format_toml(&contents));
@@ -718,9 +746,12 @@ fn render_user_config(
writeln!(
out,
"{}",
- hint_message(cformat!(
- "Not found; to create one, run <underline>wt config create</>"
- ))
+ state_with_advice(
+ "Not found",
+ Some(cformat!(
+ "To create one, run <underline>wt config create</>"
+ ))
+ )
)?;
// A `[list] columns` selection can still arrive from the system layer,
// the environment, or `--config-set`, so the check runs either way.
@@ -767,11 +798,11 @@ fn render_user_config(
};
if contents.trim().is_empty() {
- writeln!(out, "{}", hint_message("Empty file (using defaults)"))?;
+ writeln!(out, "{}", info_message("Empty file (using defaults)"))?;
return Ok(invalid | render_column_selection(out, repo)?);
}
- invalid |= render_user_config_diagnostics(out, &contents);
+ invalid |= render_user_config_diagnostics(out, &contents, &config_path, ConfigFileKind::User);
// Display TOML with syntax highlighting (gutter at column 0).
// Skip when deprecations were shown — the proposed diff already covers it.
@@ -791,7 +822,7 @@ fn render_system_config_hint(out: &mut String) -> anyhow::Result<()> {
writeln!(
out,
"{}",
- hint_message(cformat!(
+ info_message(cformat!(
"Optional system config not found @ <dim>{}</>",
format_path_for_display(&path)
))
@@ -805,16 +836,30 @@ fn render_config_read_error(out: &mut String, err: &std::io::Error) {
let _ = writeln!(out, "{}", format_with_gutter(&err.to_string(), None));
}
+/// Render a typed parse diagnosis or a non-parser config failure.
+fn render_config_error(out: &mut String, error: ConfigError, fallback: &str) {
+ let error = anyhow::Error::new(error);
+ if let Some(diagnostic) = error.render_diagnostic() {
+ let _ = writeln!(out, "{diagnostic}");
+ } else {
+ let _ = writeln!(out, "{}", error_message(fallback));
+ let _ = writeln!(out, "{}", format_with_gutter(&error.to_string(), None));
+ }
+}
+
/// Render parse, validation, and unknown-key diagnostics for a user-config source.
-fn render_user_config_diagnostics(out: &mut String, contents: &str) -> bool {
- let Err(error) = parse_user_config(contents) else {
+fn render_user_config_diagnostics(
+ out: &mut String,
+ contents: &str,
+ path: &Path,
+ kind: ConfigFileKind,
+) -> bool {
+ let Err(error) = parse_user_config(contents, path, kind) else {
out.push_str(&warn_unknown_keys::<UserConfig>(contents));
return false;
};
- let _ = writeln!(out, "{}", error_message("Invalid config"));
- // Use a gutter to avoid interpreting user-controlled parser output as markup.
- let _ = writeln!(out, "{}", format_with_gutter(&error, None));
+ render_config_error(out, error, "Invalid config");
true
}
@@ -950,14 +995,14 @@ fn render_project_config(out: &mut String, repo: Option<&Repository>) -> anyhow:
};
let source = format!("@ {}", format_path_for_display(&path));
write_heading_and_identifier(out, repo, &source)?;
- writeln!(out, "{}", hint_message("Not found"))?;
+ writeln!(out, "{}", info_message("Not found"))?;
return Ok(false);
}
},
};
if contents.trim().is_empty() {
- writeln!(out, "{}", hint_message("Empty file"))?;
+ writeln!(out, "{}", info_message("Empty file"))?;
return Ok(false);
}
@@ -997,8 +1042,12 @@ fn render_project_config(out: &mut String, repo: Option<&Repository>) -> anyhow:
if let Err(e) = toml::from_str::<ProjectConfig>(&contents) {
// Use gutter for error details to avoid markup interpretation of user content
invalid = true;
- writeln!(out, "{}", error_message("Invalid config"))?;
- writeln!(out, "{}", format_with_gutter(&e.to_string(), None))?;
+ out.push_str(&worktrunk::git::Diagnostic::render(&ConfigParseError::new(
+ ConfigFileKind::Project,
+ &config_path,
+ e,
+ )));
+ out.push('\n');
} else {
out.push_str(&warn_unknown_keys::<ProjectConfig>(&contents));
}
@@ -1018,8 +1067,7 @@ fn render_approvals(out: &mut String, repo: Option<&Repository>) -> bool {
ApprovalsDiagnostic::Valid => false,
ApprovalsDiagnostic::Invalid(err) => {
render_approvals_heading(out);
- let _ = writeln!(out, "{}", error_message("Invalid approvals"));
- let _ = writeln!(out, "{}", format_with_gutter(&err, None));
+ render_config_error(out, err, "Invalid approvals");
true
}
ApprovalsDiagnostic::Pending(pending) => {
@@ -1044,7 +1092,7 @@ fn render_approvals_heading(out: &mut String) {
enum ApprovalsDiagnostic {
Valid,
- Invalid(String),
+ Invalid(ConfigError),
Pending(usize),
}
@@ -1055,7 +1103,7 @@ fn approvals_diagnostic(repo: Option<&Repository>) -> ApprovalsDiagnostic {
let approvals = match worktrunk::config::Approvals::load() {
Ok(approvals) => approvals,
Err(err) if approvals_file_exists => {
- return ApprovalsDiagnostic::Invalid(err.to_string());
+ return ApprovalsDiagnostic::Invalid(err);
}
// With no approvals file, `Approvals::load` falls back to the user
// config. Its error belongs to that section, which already reports the
@@ -1622,40 +1670,34 @@ pub(super) fn render_ci_tool_status(
platform: &str,
installed: bool,
authenticated: bool,
-) -> anyhow::Result<()> {
- if installed {
- if authenticated {
- writeln!(
- out,
- "{}",
- success_message(cformat!("<bold>{tool}</> installed & authenticated"))
- )?;
- } else {
- // The auth-setup command differs by CLI: `gh`/`glab` use
- // `<tool> auth login`, `az` uses `az login`, `tea` uses `tea login add`.
- let auth_command = match tool {
- "az" => format!("{tool} login"),
- "tea" => format!("{tool} login add"),
- _ => format!("{tool} auth login"),
- };
- writeln!(
- out,
- "{}",
- warning_message(cformat!(
- "<bold>{tool}</> installed but not authenticated; run <bold>{auth_command}</>"
- ))
- )?;
- }
+) {
+ let status = if !installed {
+ info_message(cformat!(
+ "<bold>{tool}</> not found ({platform} CI status unavailable)"
+ ))
+ } else if authenticated {
+ info_message(cformat!("<bold>{tool}</> installed & authenticated"))
} else {
- writeln!(
- out,
- "{}",
- hint_message(cformat!(
- "<bold>{tool}</> not found ({platform} CI status unavailable)"
+ warning_message(cformat!("<bold>{tool}</> installed but not authenticated"))
+ };
+ out.push_str(&status.to_string());
+ out.push('\n');
+
+ if installed && !authenticated {
+ // The auth-setup command differs by CLI.
+ let auth_command = match tool {
+ "az" => format!("{tool} login"),
+ "tea" => format!("{tool} login add"),
+ _ => format!("{tool} auth login"),
+ };
+ out.push_str(
+ &hint_message(cformat!(
+ "To authenticate, run <underline>{auth_command}</>"
))
- )?;
+ .to_string(),
+ );
+ out.push('\n');
}
- Ok(())
}
/// Format the version-check line given the latest release version.
diff --git a/src/commands/hook_commands.rs b/src/commands/hook_commands.rs
index 89e992fc0..91b4639b6 100644
--- a/src/commands/hook_commands.rs
+++ b/src/commands/hook_commands.rs
@@ -16,8 +16,8 @@ use worktrunk::config::{
use worktrunk::git::Repository;
use worktrunk::path::format_path_for_display;
use worktrunk::styling::{
- INFO_SYMBOL, PROMPT_SYMBOL, eprintln, format_bash_with_gutter, format_heading, hint_message,
- info_message, println, warning_message,
+ INFO_SYMBOL, PROMPT_SYMBOL, eprintln, format_bash_with_gutter, format_heading, info_message,
+ println, warning_message,
};
use crate::output::print_json;
@@ -364,9 +364,7 @@ pub fn handle_hook_show(
let repo = Repository::current().context("Failed to show hooks")?;
let config: &UserConfig = repo.user_config();
- // No `.context()`: `project_config()` already wraps the load failure with
- // exactly that header, and a second copy renders as a header restating
- // its own gutter.
+ // Preserve the loader's typed source diagnosis through command context.
let project_config: Option<&ProjectConfig> = repo.project_config()?;
let approvals = Approvals::load().context("Failed to load approvals")?;
let project_id = repo.project_identifier().ok();
@@ -563,7 +561,7 @@ fn render_project_hooks(
)?;
let Some(config) = project_config else {
- writeln!(out, "{}", hint_message("(not found)"))?;
+ writeln!(out, "{}", info_message("Not found"))?;
return Ok(());
};
@@ -584,7 +582,7 @@ fn render_project_hooks(
}
/// Render a section's body: every hook that survives `filter`, or
-/// `(none configured)` when that leaves the section with nothing.
+/// a neutral "No hooks configured" state when nothing remains.
///
/// The fallback keys off what was printed, not off what the config declared —
/// a hook type carrying an empty command list (`post-switch = []`) has an entry
@@ -611,7 +609,7 @@ fn render_hook_section(
}
if !has_any {
- writeln!(out, "{}", hint_message("(none configured)"))?;
+ writeln!(out, "{}", info_message("No hooks configured"))?;
}
Ok(())
diff --git a/src/config/approvals.rs b/src/config/approvals.rs
index 34b5249c7..e1debca6f 100644
--- a/src/config/approvals.rs
+++ b/src/config/approvals.rs
@@ -95,7 +95,9 @@ pub fn approvals_path() -> Option<PathBuf> {
/// that save approvals and need a concrete path.
pub fn require_approvals_path() -> Result<PathBuf, ConfigError> {
approvals_path().ok_or_else(|| {
- ConfigError("Cannot determine approvals path. Set $HOME or $XDG_CONFIG_HOME".to_string())
+ ConfigError::Message(
+ "Cannot determine approvals path. Set $HOME or $XDG_CONFIG_HOME".to_string(),
+ )
})
}
@@ -125,19 +127,14 @@ impl Approvals {
/// Load approvals from a specific file path.
fn load_from_file(path: &Path) -> Result<Self, ConfigError> {
let content = std::fs::read_to_string(path).map_err(|e| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Failed to read approvals file {}: {}",
format_path_for_display(path),
e
))
})?;
- let approvals: Self = toml::from_str(&content).map_err(|e| {
- ConfigError(format!(
- "Failed to parse approvals file {}: {}",
- format_path_for_display(path),
- e
- ))
- })?;
+ let approvals: Self = toml::from_str(&content)
+ .map_err(|e| ConfigError::Parse(super::ConfigParseError::approvals(path, e)))?;
Ok(approvals)
}
@@ -172,8 +169,9 @@ impl Approvals {
/// Save approvals to a specific file path.
pub fn save_to(&self, path: &Path) -> Result<(), ConfigError> {
let parent = save_parent(path);
- std::fs::create_dir_all(parent)
- .map_err(|e| ConfigError(format!("Failed to create approvals directory: {e}")))?;
+ std::fs::create_dir_all(parent).map_err(|e| {
+ ConfigError::Message(format!("Failed to create approvals directory: {e}"))
+ })?;
let mut doc = toml_edit::DocumentMut::new();
@@ -203,7 +201,7 @@ impl Approvals {
};
write_atomically(path, &output)
- .map_err(|e| ConfigError(format!("Failed to write approvals file: {e}")))?;
+ .map_err(|e| ConfigError::Message(format!("Failed to write approvals file: {e}")))?;
Ok(())
}
@@ -327,7 +325,7 @@ impl Approvals {
/// Extract approved-commands from a specific config file.
pub(crate) fn load_from_config_file(config_path: &Path) -> Result<Self, ConfigError> {
let content = std::fs::read_to_string(config_path).map_err(|e| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Failed to read config file {}: {}",
format_path_for_display(config_path),
e
@@ -335,10 +333,10 @@ impl Approvals {
})?;
let config: super::UserConfig = toml::from_str(&content).map_err(|e| {
- ConfigError(format!(
- "Failed to parse config file {}: {}",
- format_path_for_display(config_path),
- e
+ ConfigError::Parse(super::ConfigParseError::new(
+ crate::config::ConfigFileKind::User,
+ config_path,
+ e,
))
})?;
@@ -372,7 +370,7 @@ impl Approvals {
approvals_path: &Path,
) -> Result<(), ConfigError> {
if project.contains('*') {
- return Err(ConfigError(format!(
+ return Err(ConfigError::Message(format!(
"Cannot save approvals for `{project}`: `*` in the identifier reads as a \
pattern, so the entry would apply to every repository it matches"
)));
@@ -791,6 +789,26 @@ approved-commands = ["npm test"]
assert!(loaded.is_command_approved("github.com/user/repo", "npm test"));
}
+ /// Failure to create the approvals directory must leave the blocking file
+ /// untouched and must not report that any approvals were saved.
+ #[test]
+ fn test_save_to_blocked_parent_preserves_file() {
+ let dir = TempDir::new().unwrap();
+ let parent = dir.path().join("blocked");
+ std::fs::write(&parent, "keep this file").unwrap();
+ let path = parent.join("approvals.toml");
+
+ let err = Approvals::default().save_to(&path).unwrap_err();
+
+ assert!(
+ err.to_string()
+ .contains("Failed to create approvals directory"),
+ "{err}"
+ );
+ assert_eq!(std::fs::read_to_string(parent).unwrap(), "keep this file");
+ assert!(!path.exists());
+ }
+
#[cfg(unix)]
#[test]
fn test_save_failure_preserves_existing_file() {
@@ -1016,7 +1034,7 @@ approved-commands = ["npm install"]
std::fs::write(&path, "this is { not valid toml").unwrap();
let err = Approvals::load_from_file(&path).unwrap_err();
assert!(
- err.to_string().contains("Failed to parse approvals file"),
+ err.to_string().contains("Approvals @"),
"Expected parse error, got: {}",
err
);
@@ -1036,7 +1054,7 @@ approved-commands = ["npm test"]
.unwrap();
let err = Approvals::load_from_file(&path).unwrap_err();
assert!(
- err.to_string().contains("Failed to parse approvals file"),
+ err.to_string().contains("Approvals @"),
"Expected parse error, got: {}",
err
);
@@ -1056,7 +1074,7 @@ approved-command = ["npm test"]
.unwrap();
let err = Approvals::load_from_file(&path).unwrap_err();
assert!(
- err.to_string().contains("Failed to parse approvals file"),
+ err.to_string().contains("Approvals @"),
"Expected parse error, got: {}",
err
);
@@ -1069,7 +1087,7 @@ approved-command = ["npm test"]
std::fs::write(&config_path, "not { valid toml here").unwrap();
let err = Approvals::load_from_config_file(&config_path).unwrap_err();
assert!(
- err.to_string().contains("Failed to parse config file"),
+ err.to_string().contains("User config @"),
"Expected parse error, got: {}",
err
);
diff --git a/src/config/deprecation.rs b/src/config/deprecation.rs
index b8e480620..054b04c29 100644
--- a/src/config/deprecation.rs
+++ b/src/config/deprecation.rs
@@ -1610,12 +1610,8 @@ fn validate_existing_approvals_file(approvals_path: &Path) -> anyhow::Result<()>
crate::path::format_path_for_display(approvals_path)
)
})?;
- toml::from_str::<super::approvals::Approvals>(&content).with_context(|| {
- format!(
- "Failed to parse existing approvals file {}",
- crate::path::format_path_for_display(approvals_path)
- )
- })?;
+ toml::from_str::<super::approvals::Approvals>(&content)
+ .map_err(|error| super::ConfigParseError::approvals(approvals_path, error))?;
Ok(())
}
@@ -4713,10 +4709,7 @@ approved-commands = ["npm install"]
"Invalid existing approvals.toml must surface as Err; got {result:?}"
);
assert!(
- result
- .unwrap_err()
- .to_string()
- .contains("Failed to parse existing approvals file"),
+ result.unwrap_err().to_string().contains("Approvals @"),
"Error should identify the invalid approvals file"
);
}
diff --git a/src/config/error.rs b/src/config/error.rs
new file mode 100644
index 000000000..58b96fd24
--- /dev/null
+++ b/src/config/error.rs
@@ -0,0 +1,135 @@
+//! Config failures retain the parser and its source through command context.
+//!
+//! A parse error owns its file attribution and quoted parser output. Loaders,
+//! config reports, and tolerant-load warnings share that presentation; an
+//! outer "failed to load" context must not replace the source's diagnosis.
+
+use std::error::Error;
+use std::path::{Path, PathBuf};
+
+use color_print::cformat;
+
+use crate::git::Diagnostic;
+use crate::path::format_path_for_display;
+use crate::styling::{error_message, format_with_gutter, warning_message};
+
+/// A configuration operation failed, preserving typed load and parse causes.
+#[derive(Debug)]
+pub enum ConfigError {
+ Message(String),
+ Load(super::LoadError),
+ Parse(ConfigParseError),
+}
+
+impl std::fmt::Display for ConfigError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Self::Message(message) => f.write_str(message),
+ Self::Load(error) => error.fmt(f),
+ Self::Parse(error) => error.fmt(f),
+ }
+ }
+}
+
+impl Error for ConfigError {
+ fn source(&self) -> Option<&(dyn Error + 'static)> {
+ match self {
+ Self::Message(_) => None,
+ // Display already delegates to this transparent wrapper. Expose
+ // its cause without repeating the same diagnosis in the chain.
+ Self::Load(error) => error.source(),
+ Self::Parse(error) => Some(error),
+ }
+ }
+}
+
+/// A parser's failure and the config source it read.
+#[derive(Debug)]
+pub struct ConfigParseError {
+ source: ConfigParseSource,
+ path: PathBuf,
+ error: Box<dyn Error + Send + Sync>,
+}
+
+/// Approval data is separate from the config layers that carry settings/hooks.
+#[derive(Debug)]
+enum ConfigParseSource {
+ Config(super::ConfigFileKind),
+ Approvals,
+}
+
+impl ConfigParseSource {
+ fn label(&self) -> &'static str {
+ match self {
+ Self::Config(kind) => kind.label(),
+ Self::Approvals => "Approvals",
+ }
+ }
+}
+
+impl ConfigParseError {
+ pub fn new(
+ kind: super::ConfigFileKind,
+ path: &Path,
+ error: impl Error + Send + Sync + 'static,
+ ) -> Self {
+ Self::from_source(ConfigParseSource::Config(kind), path, error)
+ }
+
+ pub fn approvals(path: &Path, error: impl Error + Send + Sync + 'static) -> Self {
+ Self::from_source(ConfigParseSource::Approvals, path, error)
+ }
+
+ fn from_source(
+ source: ConfigParseSource,
+ path: &Path,
+ error: impl Error + Send + Sync + 'static,
+ ) -> Self {
+ Self {
+ source,
+ path: path.to_path_buf(),
+ error: Box::new(error),
+ }
+ }
+
+ fn title(&self) -> String {
+ let path = format_path_for_display(&self.path);
+ let label = self.source.label();
+ cformat!("{label} @ <bold>{path}</> failed to parse")
+ }
+
+ /// Tolerant loading skips the broken source, retaining valid lower layers.
+ pub(crate) fn render_warning(&self) -> String {
+ self.render_with(warning_message(format!("{}, skipping", self.title())).to_string())
+ }
+
+ fn render_with(&self, header: String) -> String {
+ format!(
+ "{header}\n{}",
+ format_with_gutter(&self.error.to_string(), None)
+ )
+ }
+}
+
+impl std::fmt::Display for ConfigParseError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(
+ f,
+ "{} @ {} failed to parse",
+ self.source.label(),
+ format_path_for_display(&self.path)
+ )
+ }
+}
+
+impl Error for ConfigParseError {
+ fn source(&self) -> Option<&(dyn Error + 'static)> {
+ Some(self.error.as_ref())
+ }
+}
+
+impl Diagnostic for ConfigParseError {
+ fn render(&self) -> String {
+ self.render_with(error_message(self.title()).to_string())
+ }
+}
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 9036392cf..124c468ab 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -19,6 +19,7 @@
pub mod approvals;
mod commands;
pub(crate) mod deprecation;
+mod error;
mod expansion;
mod hooks;
mod project;
@@ -97,20 +98,7 @@ impl WorktrunkConfig for ProjectConfig {
}
}
-/// Configuration error type.
-///
-/// Replaces the `config` crate's `ConfigError` with a simple string wrapper.
-/// Every usage was `ConfigError::Message(String)` — no other variants were used.
-#[derive(Debug)]
-pub struct ConfigError(pub String);
-
-impl std::fmt::Display for ConfigError {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- f.write_str(&self.0)
- }
-}
-
-impl std::error::Error for ConfigError {}
+pub use error::{ConfigError, ConfigParseError};
/// Returns true if the given value equals `T::default()`.
///
@@ -193,7 +181,7 @@ pub fn is_user_project_override_key(key: &str) -> bool {
/// itself broke the syntax, and the file on disk stays as it was.
pub fn ensure_config_parses(content: &str) -> Result<(), ConfigError> {
content.parse::<toml::Table>().map(|_| ()).map_err(|e| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Refusing to write a config file wt could not read back: {e}"
))
})
@@ -265,7 +253,7 @@ mod tests {
// comment rendered inside the brackets.
let err =
ensure_config_parses("[# why squash is off\nmerge ]\nsquash = true\n").unwrap_err();
- assert!(err.0.contains("could not read back"), "{}", err.0);
+ assert!(err.to_string().contains("could not read back"), "{}", err);
ensure_config_parses("# why squash is off\n[merge]\nsquash = true\n").unwrap();
}
diff --git a/src/config/project.rs b/src/config/project.rs
index 2f6690362..8f57c6d0c 100644
--- a/src/config/project.rs
+++ b/src/config/project.rs
@@ -252,13 +252,13 @@ impl ProjectConfig {
pub fn load(repo: &crate::git::Repository, write_hints: bool) -> anyhow::Result<Option<Self>> {
let (contents, config_path) = match repo
.project_config_path()
- .map_err(|e| ConfigError(format!("Failed to get config path: {}", e)))?
+ .map_err(|e| ConfigError::Message(format!("Failed to get config path: {}", e)))?
{
Some(path) if path.exists() => {
// Load directly with toml crate to preserve insertion order
// (with preserve_order feature).
let contents = std::fs::read_to_string(&path).map_err(|e| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Failed to read {}: {e}",
crate::path::format_path_for_display(&path)
))
@@ -290,7 +290,7 @@ impl ProjectConfig {
repo_for_hints,
true, // emit_inline_warnings
)
- .map_err(|e| ConfigError(e.to_string()))?
+ .map_err(|e| ConfigError::Message(e.to_string()))?
.migrated_content;
// Warn about unknown fields, from every worktree. Unlike the
@@ -312,10 +312,12 @@ impl ProjectConfig {
// Deserialize the structurally migrated content so deprecated keys
// (e.g. `pre-start`/`post-start`) still load into their canonical fields.
- let config: ProjectConfig = toml::from_str(&migrated).map_err(|e| LoadError::File {
- path: config_path,
- kind: super::ConfigFileKind::Project,
- err: Box::new(e),
+ let config: ProjectConfig = toml::from_str(&migrated).map_err(|e| {
+ LoadError::File(super::ConfigParseError::new(
+ super::ConfigFileKind::Project,
+ &config_path,
+ e,
+ ))
})?;
Ok(Some(config))
diff --git a/src/config/user/mod.rs b/src/config/user/mod.rs
index 96e98e72b..7f0b10828 100644
--- a/src/config/user/mod.rs
+++ b/src/config/user/mod.rs
@@ -83,13 +83,8 @@ pub use sections::{
/// usable config.
#[derive(Debug)]
pub enum LoadError {
- /// A config file failed to parse. The `toml::de::Error` includes
- /// line/column info and a source-snippet pointer.
- File {
- path: PathBuf,
- kind: ConfigFileKind,
- err: Box<toml::de::Error>,
- },
+ /// A file parser failed, retaining its source and raw diagnosis.
+ File(super::ConfigParseError),
/// Config files parsed cleanly; applying env-var overrides failed.
/// `vars` lists the exact `WORKTRUNK_*` env vars that were parsed
/// as `(name, value)` pairs.
@@ -108,14 +103,7 @@ pub enum LoadError {
impl std::fmt::Display for LoadError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
- LoadError::File { path, kind, err } => {
- write!(
- f,
- "{} @ {} failed to parse:\n{err}",
- kind.label(),
- crate::path::format_path_for_display(path)
- )
- }
+ LoadError::File(error) => error.fmt(f),
LoadError::Env { err, .. } => write!(f, "{err}"),
LoadError::CliOverride { err, .. } => write!(f, "{err}"),
LoadError::Validation(err) => write!(f, "{err}"),
@@ -123,7 +111,14 @@ impl std::fmt::Display for LoadError {
}
}
-impl std::error::Error for LoadError {}
+impl std::error::Error for LoadError {
+ fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+ match self {
+ Self::File(error) => Some(error),
+ _ => None,
+ }
+ }
+}
// ---- Env-var overlay ----
@@ -366,7 +361,7 @@ fn merge_layer(merged_table: &mut toml::Table, layer: toml::Table) {
/// first failure. The probe every layer runs before it commits.
fn deserialize_and_validate(table: &toml::Table) -> Result<(), String> {
match toml::Value::Table(table.clone()).try_into::<UserConfig>() {
- Ok(config) => config.validate().map_err(|e| e.0),
+ Ok(config) => config.validate().map_err(|e| e.to_string()),
Err(err) => Err(err.to_string()),
}
}
@@ -454,11 +449,9 @@ fn load_config_file(
) -> Result<toml::Table, LoadError> {
// Validate by deserializing — gives rich line/col errors.
if let Err(err) = toml::from_str::<UserConfig>(migrated) {
- return Err(LoadError::File {
- path: path.to_path_buf(),
- kind,
- err: Box::new(err),
- });
+ return Err(LoadError::File(super::ConfigParseError::new(
+ kind, path, err,
+ )));
}
// Parse as table for merging. Infallible after from_str::<UserConfig>
// succeeds — valid UserConfig TOML is always valid TOML.
@@ -579,7 +572,7 @@ impl UserConfig {
/// 3. User config file (personal preferences)
/// 4. Environment variables (WORKTRUNK_*)
pub fn load() -> Result<Self, ConfigError> {
- Self::load_with_cause().map_err(|e| ConfigError(e.to_string()))
+ Self::load_with_cause().map_err(ConfigError::Load)
}
/// Like [`load()`](Self::load), but returns a [`LoadError`] that
@@ -804,7 +797,7 @@ impl UserConfig {
// Validation means the config is semantically wrong (e.g.,
// worktree-path=""). Using it causes bad behavior, so fall
// back to defaults rather than applying the broken config.
- warnings.push(LoadError::Validation(e.0));
+ warnings.push(LoadError::Validation(e.to_string()));
(Self::default(), warnings)
}
},
@@ -819,7 +812,8 @@ impl UserConfig {
#[cfg(test)]
pub(crate) fn load_from_str(content: &str) -> Result<Self, ConfigError> {
let migrated = crate::config::deprecation::migrate_content(content);
- let config: Self = toml::from_str(&migrated).map_err(|e| ConfigError(e.to_string()))?;
+ let config: Self =
+ toml::from_str(&migrated).map_err(|e| ConfigError::Message(e.to_string()))?;
config.validate()?;
Ok(config)
}
diff --git a/src/config/user/mutation.rs b/src/config/user/mutation.rs
index f4c76fc90..06fbd78dd 100644
--- a/src/config/user/mutation.rs
+++ b/src/config/user/mutation.rs
@@ -27,7 +27,7 @@ pub(crate) fn acquire_config_lock(
// Create parent directory if needed
if let Some(parent) = lock_path.parent() {
std::fs::create_dir_all(parent)
- .map_err(|e| ConfigError(format!("Failed to create config directory: {e}")))?;
+ .map_err(|e| ConfigError::Message(format!("Failed to create config directory: {e}")))?;
}
let file = std::fs::OpenOptions::new()
@@ -36,10 +36,10 @@ pub(crate) fn acquire_config_lock(
.create(true)
.truncate(false)
.open(&lock_path)
- .map_err(|e| ConfigError(format!("Failed to open lock file: {e}")))?;
+ .map_err(|e| ConfigError::Message(format!("Failed to open lock file: {e}")))?;
file.lock_exclusive()
- .map_err(|e| ConfigError(format!("Failed to acquire config lock: {e}")))?;
+ .map_err(|e| ConfigError::Message(format!("Failed to acquire config lock: {e}")))?;
Ok(file)
}
@@ -73,7 +73,7 @@ impl UserConfig {
};
let edited = file.edited(&edit, &changed)?;
crate::utils::write_atomically(config_path, edited.content()).map_err(|e| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Failed to write config file {}: {}",
format_path_for_display(config_path),
e
diff --git a/src/config/user/path.rs b/src/config/user/path.rs
index b07b40c19..4f49b77ea 100644
--- a/src/config/user/path.rs
+++ b/src/config/user/path.rs
@@ -81,7 +81,9 @@ pub fn config_path() -> Option<PathBuf> {
/// absence.
pub fn require_config_path() -> Result<PathBuf, ConfigError> {
config_path().ok_or_else(|| {
- ConfigError("Cannot determine config directory. Set $HOME or $XDG_CONFIG_HOME".to_string())
+ ConfigError::Message(
+ "Cannot determine config directory. Set $HOME or $XDG_CONFIG_HOME".to_string(),
+ )
})
}
diff --git a/src/config/user/persistence.rs b/src/config/user/persistence.rs
index 816bd0cbc..4c4159b50 100644
--- a/src/config/user/persistence.rs
+++ b/src/config/user/persistence.rs
@@ -64,7 +64,7 @@ impl ConfigEdit<'_> {
});
inline = item.is_inline_table();
table = item.as_table_like_mut().ok_or_else(|| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Failed to write config file: `{name}` is not a table"
))
})?;
@@ -103,23 +103,26 @@ impl ConfigFile {
}
let content = std::fs::read_to_string(path).map_err(|e| {
- ConfigError(format!(
+ ConfigError::Message(format!(
"Failed to read config file {}: {}",
format_path_for_display(path),
e
))
})?;
- let parse_error = |e: String| {
- ConfigError(format!(
- "Failed to parse config file {}: {}",
- format_path_for_display(path),
- e
+ let doc: DocumentMut = content.parse().map_err(|e: toml_edit::TomlError| {
+ ConfigError::Parse(crate::config::ConfigParseError::new(
+ crate::config::ConfigFileKind::User,
+ path,
+ e,
))
- };
- let doc: DocumentMut = content
- .parse()
- .map_err(|e: toml_edit::TomlError| parse_error(e.to_string()))?;
- let config = load(&doc).map_err(|e| parse_error(e.to_string()))?;
+ })?;
+ let config = load(&doc).map_err(|e| {
+ ConfigError::Parse(crate::config::ConfigParseError::new(
+ crate::config::ConfigFileKind::User,
+ path,
+ e,
+ ))
+ })?;
Ok(Self { doc, config })
}
@@ -154,7 +157,7 @@ impl ConfigFile {
let changes = migrate_doc(&mut doc);
edit.apply(&mut doc)?;
if !loads_as(&doc, expected) {
- return Err(ConfigError(format!(
+ return Err(ConfigError::Message(format!(
"Refusing to write a config file wt could not read back: {} would not load as written",
edit.key_path()
)));
@@ -210,7 +213,7 @@ impl UserConfig {
if let Some(ref path) = self.worktree_path
&& path.trim().is_empty()
{
- return Err(ConfigError("worktree-path cannot be empty".into()));
+ return Err(ConfigError::Message("worktree-path cannot be empty".into()));
}
// Validate per-project configs
@@ -219,7 +222,7 @@ impl UserConfig {
if let Some(ref path) = project_config.worktree_path
&& path.trim().is_empty()
{
- return Err(ConfigError(format!(
+ return Err(ConfigError::Message(format!(
"projects.{project}.worktree-path cannot be empty"
)));
}
diff --git a/src/config/user/tests.rs b/src/config/user/tests.rs
index f8b01562c..2eace0958 100644
--- a/src/config/user/tests.rs
+++ b/src/config/user/tests.rs
@@ -1959,16 +1959,23 @@ fn test_mutation_invalid_toml() {
let mut config = UserConfig::default();
let result = config.set_skip_shell_integration_prompt(&config_path);
- assert!(result.is_err());
- let err = result.unwrap_err().to_string();
- assert!(
- err.contains("Failed to parse config file"),
- "Expected parse error, got: {err}"
- );
- // Verify path is included in error (format_path_for_display would format it)
- assert!(
- err.contains("config.toml"),
- "Expected path in error, got: {err}"
+ let error = anyhow::Error::new(result.unwrap_err());
+ let rendered = crate::git::ErrorExt::render_diagnostic(&error).unwrap();
+ let rendered = ansi_str::AnsiStr::ansi_strip(&rendered).replace(
+ &crate::path::format_path_for_display(&config_path),
+ "[CONFIG]",
+ );
+ insta::assert_snapshot!(rendered, @"
+ ✗ User config @ [CONFIG] failed to parse
+ TOML parse error at line 1, column 6
+ |
+ 1 | this is not valid toml [[[
+ | ^
+ key with no value, expected `=`
+ ");
+ assert_eq!(
+ std::fs::read_to_string(&config_path).unwrap(),
+ "this is not valid toml [[["
);
}
@@ -2190,15 +2197,22 @@ fn test_mutation_permission_error() {
#[test]
fn test_load_error_display_file() {
let toml_err = toml::from_str::<UserConfig>("[list]\nbranches = \"bad\"\n").unwrap_err();
- let err = LoadError::File {
- path: std::path::PathBuf::from("/tmp/config.toml"),
- kind: ConfigFileKind::User,
- err: Box::new(toml_err),
- };
+ let err = LoadError::File(crate::config::ConfigParseError::new(
+ ConfigFileKind::User,
+ std::path::Path::new("/tmp/config.toml"),
+ toml_err,
+ ));
let msg = err.to_string();
assert!(msg.contains("User config @"), "{msg}");
assert!(msg.contains("failed to parse"), "{msg}");
- assert!(msg.contains("line 2"), "{msg}");
+ let error = anyhow::Error::new(ConfigError::Load(err));
+ assert!(matches!(
+ error.downcast_ref::<ConfigError>(),
+ Some(ConfigError::Load(LoadError::File(_)))
+ ));
+ assert!(error.root_cause().is::<toml::de::Error>());
+ let rendered = crate::git::ErrorExt::render_diagnostic(&error).unwrap();
+ assert!(rendered.contains("line 2"), "{rendered}");
}
#[test]
@@ -2876,7 +2890,7 @@ fn test_mutation_fails_on_a_file_that_is_not_a_valid_config_and_leaves_it() {
.set_commit_generation_command("llm".to_string(), &config_path)
.unwrap_err();
assert!(
- err.to_string().contains("Failed to parse config file"),
+ err.to_string().contains("failed to parse"),
"expected parse error, got: {err}"
);
assert_eq!(std::fs::read_to_string(&config_path).unwrap(), content);
diff --git a/src/git/error.rs b/src/git/error.rs
index 654ea4d3a..84d9321a3 100644
--- a/src/git/error.rs
+++ b/src/git/error.rs
@@ -315,6 +315,9 @@ pub fn try_render_diagnostic(err: &(dyn std::error::Error + 'static)) -> Option<
if let Some(e) = err.downcast_ref::<CommandError>() {
return Some(e.render());
}
+ if let Some(e) = err.downcast_ref::<crate::config::ConfigParseError>() {
+ return Some(e.render());
+ }
None
}
diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rs
index 137bbc140..d1db8adb5 100644
--- a/src/git/repository/mod.rs
+++ b/src/git/repository/mod.rs
@@ -137,7 +137,6 @@ use std::sync::{Arc, LazyLock, OnceLock, RwLock, RwLockReadGuard, RwLockWriteGua
use crate::shell_exec::Cmd;
-use color_print::cformat;
use dashmap::DashMap;
use once_cell::sync::OnceCell;
@@ -2287,19 +2286,8 @@ fn emit_user_config_warnings(warnings: &[LoadError]) {
/// counterpart are one line of code rather than two that can drift.
fn emit_config_load_warning(warning: &LoadError) {
match warning {
- LoadError::File { path, kind, err } => {
- let label = kind.label();
- let path_display = crate::path::format_path_for_display(path);
- crate::styling::eprintln!(
- "{}",
- crate::styling::warning_message(cformat!(
- "{label} @ <bold>{path_display}</> failed to parse, skipping"
- ))
- );
- crate::styling::eprintln!(
- "{}",
- crate::styling::format_with_gutter(&err.to_string(), None)
- );
+ LoadError::File(error) => {
+ crate::styling::eprintln!("{}", error.render_warning());
}
LoadError::Env { err, vars } => {
let var_list: Vec<_> = vars
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index ae3bc4088..16cd9c6d6 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -831,7 +831,7 @@ fn add_placeholder_cleanup_filters(settings: &mut insta::Settings) {
/// — macOS keeps the absolute form (canonicalized HOME `/private/var/...`
/// doesn't prefix the uncanonicalized config path), Linux strips to a tilde
/// (HOME == tempdir, prefix matches).
-const TEST_PATH_PREFIX: &str =
+pub(crate) const TEST_PATH_PREFIX: &str =
r"'?(?:~(?:/\.tmp[^/\\']+)?|(?:[A-Z]:)?[/\\][^\s']+[/\\]\.tmp[^/\\']+)[/\\]";
fn add_temp_path_placeholder_filters(settings: &mut insta::Settings) {
diff --git a/tests/integration_tests/approvals.rs b/tests/integration_tests/approvals.rs
index cecda4b72..171eb88c5 100644
--- a/tests/integration_tests/approvals.rs
+++ b/tests/integration_tests/approvals.rs
@@ -6,6 +6,7 @@ use crate::common::{
setup_temp_snapshot_settings, temp_home, wt_command,
};
use insta_cmd::assert_cmd_snapshot;
+use path_slash::PathExt as _;
use rstest::rstest;
use std::fs;
use tempfile::TempDir;
@@ -51,6 +52,65 @@ fn snapshot_list_approvals(test_name: &str, repo: &TestRepo) {
// list tests
// ============================================================================
+/// An unreadable approvals source is a failure, including the legacy fallback;
+/// it must not be mistaken for an empty set of approved commands.
+#[rstest]
+#[case::approvals(false)]
+#[case::legacy_config(true)]
+fn test_approvals_unreadable_source_is_not_empty(repo: TestRepo, #[case] legacy: bool) {
+ let source_dir = repo.home_path().join("source with spaces");
+ fs::create_dir(&source_dir).unwrap();
+ let source_dir = dunce::canonicalize(source_dir).unwrap();
+ let approvals_path = source_dir.join("test-approvals.toml");
+ let source = if legacy {
+ approvals_path.with_file_name("config.toml")
+ } else {
+ approvals_path.clone()
+ };
+ fs::write(&source, [0xff]).unwrap();
+
+ let mut settings = insta::Settings::new();
+ settings.set_snapshot_path("../snapshots");
+ let absolute = shell_escape::unix::escape(source.to_slash_lossy());
+ let path_pattern = format!(
+ r"(?:{}|{}{}'?)",
+ regex::escape(&absolute),
+ crate::common::TEST_PATH_PREFIX,
+ regex::escape(source.file_name().unwrap().to_str().unwrap()),
+ );
+ crate::common::add_path_placeholder_filter(&mut settings, &path_pattern, "[APPROVALS_SOURCE]");
+ // Exercise the real formatter's home-relative and quoted absolute output,
+ // regardless of host HOME canonicalization or platform path layout.
+ for home in [&source_dir, repo.root_path()] {
+ let mut cmd = repo.wt_command();
+ cmd.args(["config", "approvals", "list"])
+ .env("WORKTRUNK_APPROVALS_PATH", &approvals_path)
+ .env("HOME", home)
+ .env("USERPROFILE", home);
+ let output = cmd.output().unwrap();
+ assert_eq!(output.status.code(), Some(1));
+ assert!(output.stdout.is_empty());
+ assert_eq!(fs::read(&source).unwrap(), [0xff]);
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ if home == source_dir.as_path() {
+ assert!(stderr.contains(&format!(
+ "~/{}:",
+ source.file_name().unwrap().to_str().unwrap()
+ )));
+ } else {
+ assert!(stderr.contains(&format!("{absolute}:")));
+ }
+ settings.bind(|| {
+ let name = if legacy {
+ "approvals_unreadable_legacy_source"
+ } else {
+ "approvals_unreadable_source"
+ };
+ insta::assert_snapshot!(name, String::from_utf8_lossy(&output.stderr));
+ });
+ }
+}
+
#[rstest]
fn test_list_approvals_no_config(repo: TestRepo) {
snapshot_list_approvals("list_approvals_no_config", &repo);
@@ -735,3 +795,25 @@ fn test_config_create_project_bare_repo_uses_primary_worktree() {
bare_root_config
);
}
+
+/// The approvals source remains authoritative when malformed, including mutation
+/// commands: none may silently fall back or overwrite the unreadable file.
+#[rstest]
+#[case::list(&["list"])]
+#[case::add(&["add", "--yes"])]
+#[case::clear(&["clear", "--global"])]
+fn test_approvals_malformed_file(repo: TestRepo, #[case] args: &[&str]) {
+ let contents = "[projects\n";
+ fs::write(repo.test_approvals_path(), contents).unwrap();
+ repo.write_project_config(r#"pre-start = "echo hello""#);
+ let settings = setup_snapshot_settings(&repo);
+ settings.bind(|| {
+ let mut command = repo.wt_command();
+ command.args(["config", "approvals"]).args(args);
+ assert_cmd_snapshot!(format!("malformed_approvals_{}", args[0]), command);
+ });
+ assert_eq!(
+ fs::read_to_string(repo.test_approvals_path()).unwrap(),
+ contents
+ );
+}
diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rs
index ad1294755..bcaf381ee 100644
--- a/tests/integration_tests/config_show.rs
+++ b/tests/integration_tests/config_show.rs
@@ -91,7 +91,7 @@ fn test_config_show_rejects_invalid_approvals_file(repo: TestRepo) {
assert_eq!(output.status.code(), Some(1));
let stdout = String::from_utf8_lossy(&output.stdout);
let stdout = stdout.ansi_strip();
- assert!(stdout.contains("Invalid approvals"), "stdout:\n{stdout}");
+ assert!(stdout.contains("Approvals @"), "stdout:\n{stdout}");
assert!(stdout.contains("approvals.toml"), "stdout:\n{stdout}");
}
@@ -606,23 +606,8 @@ fn test_config_show_reports_unreadable_source_and_continues(repo: TestRepo, #[ca
assert!(stdout.contains("OTHER"), "report was truncated:\n{stdout}");
}
-/// A user config that doesn't parse must fail these commands *legibly*.
-///
-/// `UserConfig::load()`'s error is `LoadError::File`'s multi-line Display —
-/// the header plus the TOML parser's caret diagram — flattened into a
-/// `ConfigError` string. Propagated bare with `?`, it reaches anyhow with no
-/// context and no cause chain, which is the one shape `main.rs`'s renderer
-/// has no arm for: it trips that function's `debug_assert!`, so a debug build
-/// panics with exit 101 instead of erroring. A release build still prints the
-/// parse detail in the gutter — what it loses is the header, which becomes a
-/// bare `✗ Command failed` naming neither the config nor the file.
-/// `.context("Failed to load config")` — what 7 of the 22 `UserConfig::load()`
-/// call sites already did, and what all 13 propagating ones do after this —
-/// gives the renderer that header back.
-///
-/// One case per fixed call site, because the `debug_assert!` only fires on a
-/// path something exercises: an uncovered site is one where a future bare `?`
-/// regresses silently. The JSON form has a separate in-band error test below.
+/// Commands that require user config retain its typed parser diagnosis through
+/// their operation context and fail cleanly in both debug and release builds.
#[rstest]
#[case::step_prune(&["step", "prune", "--dry-run"])]
#[case::step_relocate(&["step", "relocate", "--dry-run"])]
@@ -663,7 +648,7 @@ fn test_unparsable_user_config_errors_legibly(
// The header the renderer needs, and the parse detail it would otherwise
// have replaced with "Command failed".
assert!(
- stderr.contains("Failed to load config"),
+ stderr.contains("User config @"),
"{args:?} should name what failed; stderr:\n{stderr}"
);
assert!(
@@ -1564,6 +1549,34 @@ fn test_config_show_full_not_configured(mut repo: TestRepo, temp_home: TempDir)
});
}
+/// A successful connectivity probe is existing state, and includes the actual
+/// response from the configured command in the diagnostic report.
+#[rstest]
+fn test_config_show_full_working_commit_generation(repo: TestRepo) {
+ repo.write_test_config(
+ "[commit.generation]\ncommand = \"cat >/dev/null && echo diagnostic-probe\"\n",
+ );
+ let output = repo
+ .wt_command()
+ .env("WORKTRUNK_TEST_LATEST_VERSION", env!("CARGO_PKG_VERSION"))
+ .args(["config", "show", "--full"])
+ .output()
+ .unwrap();
+ assert!(output.status.success(), "{output:?}");
+
+ let stdout = String::from_utf8_lossy(&output.stdout);
+ let stdout = stdout.ansi_strip();
+ let lines: Vec<_> = stdout.lines().collect();
+ let index = lines
+ .iter()
+ .position(|line| line.contains("Commit generation working"))
+ .unwrap();
+ insta::assert_snapshot!(lines[index..index + 2].join("\n"), @"
+ ○ Commit generation working (cat >/dev/null && echo diagnostic-probe)
+ diagnostic-probe
+ ");
+}
+
#[rstest]
fn test_config_show_full_command_not_found(mut repo: TestRepo, temp_home: TempDir) {
// Setup mock gh/glab for deterministic BINARIES output
diff --git a/tests/integration_tests/eval.rs b/tests/integration_tests/eval.rs
index 8544b8d2a..7a0859878 100644
--- a/tests/integration_tests/eval.rs
+++ b/tests/integration_tests/eval.rs
@@ -1,6 +1,7 @@
//! Integration tests for `wt step eval`
use crate::common::{TestRepo, make_snapshot_cmd, make_snapshot_cmd_with_global_flags, repo};
+use ansi_str::AnsiStr;
use insta_cmd::assert_cmd_snapshot;
use rstest::rstest;
@@ -14,6 +15,27 @@ fn test_eval_branch(repo: TestRepo) {
));
}
+/// A strict command keeps the invalid override's diagnosis once in its fatal
+/// block, independently of the earlier tolerant-load warning.
+#[rstest]
+fn test_eval_invalid_env_override_keeps_one_fatal_diagnosis(repo: TestRepo) {
+ repo.write_test_config("[list]\nbranches = true\n");
+ let mut cmd = repo.wt_command();
+ cmd.env("WORKTRUNK__LIST__BRANCHES", "not-a-bool")
+ .args(["step", "eval", "{{ branch }}"]);
+
+ let output = cmd.output().unwrap();
+ assert_eq!(output.status.code(), Some(1));
+ assert!(output.stdout.is_empty());
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ let stderr = stderr.ansi_strip();
+ let (_, fatal) = stderr.split_once("✗ Failed to load config").unwrap();
+ assert_eq!(fatal.matches("invalid type:").count(), 1, "{stderr}");
+
+ let settings = crate::common::setup_snapshot_settings(&repo);
+ settings.bind(|| insta::assert_snapshot!(stderr));
+}
+
#[rstest]
fn test_eval_hash_port(repo: TestRepo) {
assert_cmd_snapshot!(make_snapshot_cmd(
diff --git a/tests/integration_tests/hook_show.rs b/tests/integration_tests/hook_show.rs
index e5395ce3d..10bcfbaa1 100644
--- a/tests/integration_tests/hook_show.rs
+++ b/tests/integration_tests/hook_show.rs
@@ -292,10 +292,7 @@ fn test_error_with_context_formatting(temp_home: TempDir) {
/// half-read hook list is worse than stopping — and the failure renders as one
/// header over the parser's own output.
///
-/// `Repository::project_config()` already wraps the load with "Failed to load
-/// project config", so the handler must not add a second copy: that rendered
-/// as a header restating its own gutter line. The snapshot pins the single
-/// header, and the `@` before the path (never "at", per the path vocabulary).
+/// The typed parser diagnosis owns the title despite the loader's outer context.
#[rstest]
fn test_hook_show_invalid_project_config(repo: TestRepo, temp_home: TempDir) {
// Unclosed table header — the file cannot be parsed at all.
@@ -345,7 +342,7 @@ url = "http://localhost:8080"
}
/// A hook type declared with an empty command list contributes no commands, so
-/// both sections read as `(none configured)` rather than a bare heading.
+/// both sections read as `No hooks configured` rather than a bare heading.
#[rstest]
fn test_hook_show_empty_command_lists(repo: TestRepo, temp_home: TempDir) {
repo.write_test_config(
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index d64f053a3..4f624505f 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -1774,9 +1774,10 @@ approved-commands = ["echo 'fish background task'"]
let stub_dir = repo.root_path().join("stub-bin");
fs::create_dir_all(&stub_dir).unwrap();
let stub_cargo = stub_dir.join("cargo");
+ let stub_marker = repo.root_path().join("cargo-stub-ran");
fs::write(
&stub_cargo,
- "#!/bin/sh\nshift 5\nexec \"$WORKTRUNK_BIN\" \"$@\"\n",
+ "#!/bin/sh\nprintf invoked > \"$WORKTRUNK_TEST_CARGO_STUB_MARKER\"\nshift 5\nexec \"$WORKTRUNK_BIN\" \"$@\"\n",
)
.unwrap();
fs::set_permissions(&stub_cargo, fs::Permissions::from_mode(0o755)).unwrap();
@@ -1829,6 +1830,7 @@ approved-commands = ["echo 'fish background task'"]
let config_path = repo.test_config_path().to_string_lossy().to_string();
let approvals_path = repo.test_approvals_path().to_string_lossy().to_string();
+ let stub_marker_path = stub_marker.to_string_lossy().to_string();
let fixture_home = repo.home_path().to_string_lossy().to_string();
let xdg_config = repo
.home_path()
@@ -1839,6 +1841,7 @@ approved-commands = ["echo 'fish background task'"]
("HOME", &fixture_home),
("XDG_CONFIG_HOME", &xdg_config),
("PATH", &stub_path),
+ ("WORKTRUNK_TEST_CARGO_STUB_MARKER", &stub_marker_path),
("CLICOLOR_FORCE", "1"),
("WORKTRUNK_CONFIG_PATH", &config_path),
("WORKTRUNK_APPROVALS_PATH", &approvals_path),
@@ -1870,6 +1873,11 @@ approved-commands = ["echo 'fish background task'"]
exit_code,
};
+ assert!(
+ stub_marker.exists(),
+ "{shell}: --source must execute the cargo stub, not compile live source"
+ );
+
// Shell-agnostic assertions
assert_ne!(output.exit_code, 0, "{}: Command should fail", shell);
diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rs
index e2abe174b..0ae82f40e 100644
--- a/tests/integration_tests/switch.rs
+++ b/tests/integration_tests/switch.rs
@@ -5993,7 +5993,7 @@ fn test_switch_pr_malformed_project_config_bails_before_forge_selection(
);
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(
- stderr.contains("Failed to load project config"),
+ stderr.contains("Project config @"),
"expected project-config load error, got:\n{stderr}"
);
assert!(
diff --git a/tests/snapshots/integration__integration_tests__approvals__approvals_unreadable_legacy_source.snap b/tests/snapshots/integration__integration_tests__approvals__approvals_unreadable_legacy_source.snap
new file mode 100644
index 000000000..3256abc45
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__approvals__approvals_unreadable_legacy_source.snap
@@ -0,0 +1,6 @@
+---
+source: tests/integration_tests/approvals.rs
+expression: "String::from_utf8_lossy(&output.stderr)"
+---
+✗ Failed to load approvals
+  Failed to read config file [APPROVALS_SOURCE]: stream did not contain valid UTF-8
diff --git a/tests/snapshots/integration__integration_tests__approvals__approvals_unreadable_source.snap b/tests/snapshots/integration__integration_tests__approvals__approvals_unreadable_source.snap
new file mode 100644
index 000000000..0fa6513b2
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__approvals__approvals_unreadable_source.snap
@@ -0,0 +1,6 @@
+---
+source: tests/integration_tests/approvals.rs
+expression: "String::from_utf8_lossy(&output.stderr)"
+---
+✗ Failed to load approvals
+  Failed to read approvals file [APPROVALS_SOURCE]: stream did not contain valid UTF-8
diff --git a/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_add.snap b/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_add.snap
new file mode 100644
index 000000000..59664a19d
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_add.snap
@@ -0,0 +1,69 @@
+---
+source: tests/integration_tests/approvals.rs
+info:
+ program: wt
+ args:
+ - config
+ - approvals
+ - add
+ - "--yes"
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
+ PATH: "[PATH]"
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_PARENT_SHELL: ""
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: false
+exit_code: 1
+----- stdout -----
+
+----- stderr -----
+✗ Approvals @ [TEST_APPROVALS] failed to parse
+  TOML parse error at line 1, column 10
+  |
+  1 | [projects
+  | ^
+  unclosed table, expected `]`
diff --git a/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_clear.snap b/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_clear.snap
new file mode 100644
index 000000000..9aec4dbdc
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_clear.snap
@@ -0,0 +1,69 @@
+---
+source: tests/integration_tests/approvals.rs
+info:
+ program: wt
+ args:
+ - config
+ - approvals
+ - clear
+ - "--global"
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
+ PATH: "[PATH]"
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_PARENT_SHELL: ""
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: false
+exit_code: 1
+----- stdout -----
+
+----- stderr -----
+✗ Approvals @ [TEST_APPROVALS] failed to parse
+  TOML parse error at line 1, column 10
+  |
+  1 | [projects
+  | ^
+  unclosed table, expected `]`
diff --git a/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_list.snap b/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_list.snap
new file mode 100644
index 000000000..d47f38d8b
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__approvals__malformed_approvals_list.snap
@@ -0,0 +1,68 @@
+---
+source: tests/integration_tests/approvals.rs
+info:
+ program: wt
+ args:
+ - config
+ - approvals
+ - list
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
+ PATH: "[PATH]"
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
+ WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_PARENT_SHELL: ""
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: false
+exit_code: 1
+----- stdout -----
+
+----- stderr -----
+✗ Approvals @ [TEST_APPROVALS] failed to parse
+  TOML parse error at line 1, column 10
+  |
+  1 | [projects
+  | ^
+  unclosed table, expected `]`
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap
index 0aa89abcf..ab8aa135b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap
@@ -60,11 +60,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 2beb749d1..44ae90339 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,8 +71,10 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
CLAUDE CODE
-↳ Plugin not installed. To install, run wt config plugins claude install
-↳ Statusline not configured. To configure, run wt config plugins claude install-statusline
+○ Plugin not installed
+↳ To install, run wt config plugins claude install
+○ Statusline not configured
+↳ To configure, run wt config plugins claude install-statusline
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap
index 82ae1149c..6a5f05a93 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap
@@ -55,11 +55,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -67,24 +67,30 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
CLAUDE CODE
-↳ Plugin not installed. To install, run wt config plugins claude install
-↳ Statusline not configured. To configure, run wt config plugins claude install-statusline
+○ Plugin not installed
+↳ To install, run wt config plugins claude install
+○ Statusline not configured
+↳ To configure, run wt config plugins claude install-statusline
CODEX
-✓ Codex CLI available
+○ Codex CLI available
↳ If Worktrunk is not installed in /plugins yet, run wt config plugins codex install
OPENCODE
-↳ Plugin not installed. To install, run wt config plugins opencode install
+○ Plugin not installed
+↳ To install, run wt config plugins opencode install
OH-MY-PI
-↳ Plugin not installed. To install, run wt config plugins omp install
+○ Plugin not installed
+↳ To install, run wt config plugins omp install
PI
-↳ Plugin not installed. To install, run wt config plugins pi install
+○ Plugin not installed
+↳ To install, run wt config plugins pi install
GEMINI CLI
-↳ Extension not installed. To install, run gemini extensions install https://github.com/max-sixty/worktrunk
+○ Extension not installed
+↳ To install, run gemini extensions install https://github.com/max-sixty/worktrunk
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap
index 8ad37a251..7a2ccbf6a 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,7 +71,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
CODEX
-✓ Codex CLI available
+○ Codex CLI available
↳ If Worktrunk is not installed in /plugins yet, run wt config plugins codex install
OTHER
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_detected_shell_via_process_tree.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_detected_shell_via_process_tree.snap
index a21462182..490b9c28b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_detected_shell_via_process_tree.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_detected_shell_via_process_tree.snap
@@ -60,11 +60,12 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Not found; to create one, run wt config create
+○ Not found
+↳ To create one, run wt config create
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 695c07542..79bad9023 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
@@ -71,11 +71,11 @@ exit_code: 0
  -pre-start = "ln -sf {{ repo_root }}/node_modules"
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +pre-start = "ln -sf {{ repo_path }}/node_modules"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 bce4f8b61..b8e173aea 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
@@ -71,11 +71,11 @@ exit_code: 0
  -[projects."github.com/example/repo".commit-generation]
  +[projects."github.com/example/repo".commit.generation]
  command = "llm -m gpt-4"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 dba50404c..f73eeedfc 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Empty file
+○ Empty file
SHELL INTEGRATION
▲ Shell integration not configured
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 ecc38e5f5..74ee84cc5 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
@@ -58,14 +58,14 @@ success: true
exit_code: 0
----- stdout -----
SYSTEM CONFIG @ [PROJECT_ID]
-↳ Empty file (no system defaults)
+○ Empty file (no system defaults)
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 2e0171a87..f01a90fa2 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
@@ -58,11 +58,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 bcb2f0bdf..ed4275304 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
@@ -58,11 +58,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 9881151b2..f0e29428f 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
@@ -58,11 +58,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 7e77b37db..9a0b98b59 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
@@ -58,7 +58,8 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Not found; to create one, run wt config create
+○ Not found
+↳ To create one, run wt config create
PROJECT CONFIG @ [PROJECT_ID]
○ Identifier: ../origin
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap
index 68d106d6d..41c9bd27e 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: dev.azure.com/myorg/myproject/_git/test-repo
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -73,9 +73,9 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
DIAGNOSTICS
-✓ az installed & authenticated
+○ az installed & authenticated
○ Up to date ([VERSION])
-↳ Commit generation not configured
+○ Commit generation not configured
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap
index ab3d6cb7f..4812550ff 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: dev.azure.com/myorg/myproject/_git/test-repo
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -73,10 +73,10 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
DIAGNOSTICS
-✓ az installed & authenticated
+○ az installed & authenticated
▲ azure-devops extension not installed; run az extension add --name azure-devops
○ Up to date ([VERSION])
-↳ Commit generation not configured
+○ Commit generation not configured
OTHER
○ wt: [VERSION]
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 c1736264b..a6088bf56 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
@@ -64,11 +64,11 @@ exit_code: 0
 
  [commit.generation]
  command = "nonexistent-llm-command-12345 -m test-model"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap
index 9aad0d770..67e3dbf73 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: gitea.example.com/example/repo
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -73,9 +73,10 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
DIAGNOSTICS
-▲ tea installed but not authenticated; run tea login add
+▲ tea installed but not authenticated
+↳ To authenticate, run tea login add
○ Up to date ([VERSION])
-↳ Commit generation not configured
+○ Commit generation not configured
OTHER
○ wt: [VERSION]
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 36ef207c0..73a795157 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
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -75,7 +75,7 @@ exit_code: 0
DIAGNOSTICS
↳ CI status requires GitHub, GitLab, Gitea, or Azure DevOps remote
○ Up to date ([VERSION])
-↳ Commit generation not configured
+○ Commit generation not configured
OTHER
○ wt: [VERSION]
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 d62e44107..593cff25f 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
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -75,7 +75,7 @@ exit_code: 0
DIAGNOSTICS
↳ CI status requires GitHub, GitLab, Gitea, or Azure DevOps remote
○ Update available: 99.0.0 (current: [VERSION])
-↳ Commit generation not configured
+○ Commit generation not configured
OTHER
○ wt: [VERSION]
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 e68126198..189012320 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
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -75,7 +75,7 @@ exit_code: 0
DIAGNOSTICS
↳ CI status requires GitHub, GitLab, Gitea, or Azure DevOps remote
↳ Version check unavailable
-↳ Commit generation not configured
+○ Commit generation not configured
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap
index b7a9d9fd0..64c9ac992 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,7 +71,8 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
GEMINI CLI
-↳ Extension not installed. To install, run gemini extensions install https://github.com/max-sixty/worktrunk
+○ Extension not installed
+↳ To install, run gemini extensions install https://github.com/max-sixty/worktrunk
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap
index 112f65fa9..3f77d6705 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,7 +71,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
GEMINI CLI
-✓ Extension installed
+○ Extension installed
OTHER
○ wt: [VERSION]
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 fb0d89eff..d6adef9a7 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: github.com/example/repo
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 58962d8a2..5af00db25 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: gitlab.com/example/repo
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 06f19e385..98cf5b159 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
@@ -59,11 +59,11 @@ exit_code: 1
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-✗ Invalid config
+✗ Project config @ _REPO_/.config/wt.toml failed to parse
  TOML parse error at line 1, column 28
  |
  1 | invalid = [unclosed bracket
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 4a4cac546..f16dcb885 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
@@ -58,7 +58,7 @@ success: false
exit_code: 1
----- stdout -----
SYSTEM CONFIG @ [PROJECT_ID]
-✗ Invalid config
+✗ System config @ [PROJECT_ID] failed to parse
  TOML parse error at line 1, column 16
  |
  1 | invalid = [toml
@@ -67,11 +67,11 @@ exit_code: 1
  invalid = [toml
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 6f17d220c..1cba2caad 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
@@ -58,18 +58,18 @@ success: false
exit_code: 1
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-✗ Invalid config
+✗ User config @ ~/.config/worktrunk/config.toml failed to parse
  TOML parse error at line 1, column 6
  |
  1 | this is not valid toml {{{
  | ^
  key with no value, expected `=`
  this is not valid toml {{{
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 f66ff3f5b..a5cc42c91 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 fb4c05a4d..cc399defc 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
@@ -58,11 +58,12 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Not found; to create one, run wt config create
+○ Not found
+↳ To create one, run wt config create
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 f2b0b69f4..e7d283d2c 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
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap
index fa601ea50..cde261349 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,7 +71,8 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
OPENCODE
-↳ Plugin not installed. To install, run wt config plugins opencode install
+○ Plugin not installed
+↳ To install, run wt config plugins opencode install
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap
index 2040759d7..60f7be62c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,7 +71,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
OPENCODE
-✓ Plugin installed
+○ Plugin installed
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap
index 17b5adb95..d37598e71 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,7 +71,8 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
OPENCODE
-↳ Plugin outdated. To update, run wt config plugins opencode install
+○ Plugin outdated
+↳ To update, run wt config plugins opencode install
OTHER
○ wt: [VERSION]
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 3a10c4d59..f799c7de5 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
@@ -52,7 +52,7 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG Not in a git repository
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 b3f18d6e9..9c9edd0e4 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
@@ -60,11 +60,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 c879d4a71..920461e52 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,8 +71,9 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
CLAUDE CODE
-✓ Plugin installed
-↳ Statusline not configured. To configure, run wt config plugins claude install-statusline
+○ Plugin installed
+○ Statusline not configured
+↳ To configure, run wt config plugins claude install-statusline
OTHER
○ wt: [VERSION]
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 f63d19906..b780ae52f 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
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap
index b5d54c827..263626cad 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap
@@ -61,11 +61,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
○ Shell integration active
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 1dca6867e..ca852a271 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
@@ -60,11 +60,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
○ Shell integration active
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap
index 67f62457f..d42c1a660 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 6b9ccb0b6..1a8d0fbd2 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
@@ -59,11 +59,11 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
@@ -71,8 +71,8 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
CLAUDE CODE
-✓ Plugin installed
-✓ Statusline configured
+○ Plugin installed
+○ Statusline configured
OTHER
○ wt: [VERSION]
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 d2e01903d..2dfafc8b3 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
@@ -74,11 +74,11 @@ exit_code: 0
  +[forge]
  +platform = "github"
▲ Key ci belongs in project config as [forge]
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 62c0bca5d..4d26d0208 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
@@ -59,7 +59,7 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unknown_list_column.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unknown_list_column.snap
index 0b798ec07..1a8fba3a1 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unknown_list_column.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unknown_list_column.snap
@@ -61,12 +61,12 @@ exit_code: 1
  [list]
  json-schema = 2
  columns = ["branch", "nosuchcolumn"]
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
✗ Unknown column "nosuchcolumn" in [list] columns. Valid columns: branch, status, working-diff, ahead-behind, branch-diff, summary, upstream, ci, path, url, commit, age, message
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap
index bbfae147a..23d2abe9a 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap
index 1f471eb17..5e7f50bfe 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 a05dc346a..6d2ed6f7c 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
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 382330c7b..63eb11fd3 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
@@ -59,7 +59,7 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
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 12ee9311d..c53bfc2da 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
@@ -63,11 +63,11 @@ exit_code: 0
 
  [commit-gen]
  command = "llm"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 3b21b9fe7..0367b1328 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
@@ -59,7 +59,7 @@ exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
-↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
+○ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
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 51748b568..932044bcd 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
@@ -70,7 +70,7 @@ exit_code: 0
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not configured
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 754abb730..ba97afe8e 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
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 f7bcd5ecf..ac2dee224 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
@@ -59,11 +59,11 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Empty file (using defaults)
+○ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 eb31f6813..2ce8d3433 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
@@ -59,11 +59,12 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Not found; to create one, run wt config create
+○ Not found
+↳ To create one, run wt config create
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
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 3177e415a..97f94f567 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
@@ -59,11 +59,12 @@ success: true
exit_code: 0
----- stdout -----
USER CONFIG @ ~/.config/worktrunk/config.toml
-↳ Not found; to create one, run wt config create
+○ Not found
+↳ To create one, run wt config create
PROJECT CONFIG @ _REPO_/.config/wt.toml
○ Identifier: ../origin
-↳ Not found
+○ Not found
SHELL INTEGRATION
▲ Shell integration not active
diff --git a/tests/snapshots/integration__integration_tests__eval__eval_invalid_env_override_keeps_one_fatal_diagnosis.snap b/tests/snapshots/integration__integration_tests__eval__eval_invalid_env_override_keeps_one_fatal_diagnosis.snap
new file mode 100644
index 000000000..2b96a44b5
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__eval__eval_invalid_env_override_keeps_one_fatal_diagnosis.snap
@@ -0,0 +1,10 @@
+---
+source: tests/integration_tests/eval.rs
+expression: stderr
+---
+▲ Ignoring env var overrides: WORKTRUNK__LIST__BRANCHES=not-a-bool
+ invalid type: string "not-a-bool", expected a boolean
+ in `list.branches`
+✗ Failed to load config
+ invalid type: string "not-a-bool", expected a boolean
+ in `list.branches`
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 a959e2415..b29dd889c 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
@@ -58,7 +58,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ ~/.config/worktrunk/config.toml
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
○ pre-merge build:
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_empty_command_lists.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_empty_command_lists.snap
index 8611407d3..4730b8c91 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_empty_command_lists.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_empty_command_lists.snap
@@ -58,9 +58,9 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
-↳ (none configured)
+○ No hooks configured
----- stderr -----
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 5a98c1942..cfc5ccd36 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
@@ -60,7 +60,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit broken: (requires approval)
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 95a39ff2a..728f94d87 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
@@ -60,7 +60,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit optional-var: (requires approval)
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 6c9eb61c6..2d08ddef5 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
@@ -60,7 +60,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit valid: (requires approval)
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 3f53853cd..c69c02901 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
@@ -59,7 +59,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-merge build: (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 86813fd2e..9df2bd364 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
@@ -59,7 +59,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-merge deploy: (requires approval)
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 9288099af..6752298ee 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
@@ -59,7 +59,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-remove notify: (requires approval)
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 eaddbfb94..c38c0f022 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
@@ -59,7 +59,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-remove cleanup: (requires approval)
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_invalid_project_config.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_invalid_project_config.snap
index 390f30a55..2be2171b6 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_invalid_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_invalid_project_config.snap
@@ -59,8 +59,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-✗ Failed to load project config
-  Project config @ _REPO_/.config/wt.toml failed to parse:
+✗ Project config @ _REPO_/.config/wt.toml failed to parse
  TOML parse error at line 1, column 11
  |
  1 | [pre-merge
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_merges_user_project_hooks.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_merges_user_project_hooks.snap
index 749e025d9..bea2e5267 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_merges_user_project_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_merges_user_project_hooks.snap
@@ -64,6 +64,6 @@ exit_code: 0
  echo per-project
PROJECT HOOKS @ _REPO_/.config/wt.toml
-↳ (not found)
+○ Not found
----- stderr -----
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 623999eeb..584fbea26 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
@@ -58,9 +58,9 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
-↳ (not found)
+○ Not found
----- stderr -----
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 8611407d3..4730b8c91 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
@@ -58,9 +58,9 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
-↳ (none configured)
+○ No hooks configured
----- stderr -----
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 b2739f1ce..ee87b2d3f 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
@@ -58,7 +58,7 @@ success: true
exit_code: 0
----- stdout -----
USER HOOKS @ [TEST_CONFIG]
-↳ (none configured)
+○ No hooks configured
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-start deps: (requires approval)
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap
index 40751c128..3e62e6530 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap
@@ -60,8 +60,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-✗ Failed to load project config
-  Project config @ _REPO_/.config/wt.toml failed to parse:
+✗ Project config @ _REPO_/.config/wt.toml failed to parse
  TOML parse error at line 1, column 28
  |
  1 | pre-start = [invalid syntax