Skip to content

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

feat(config): Display LLM setup guide and config hints

Maximilian Roosf36cbd1b1be3
diff --git a/src/commands/config.rs b/src/commands/config.rs
index 56ad50920..cfa0733db 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -138,3 +138,56 @@ fn get_global_config_path() -> Option<PathBuf> {
let strategy = choose_base_strategy().ok()?;
Some(strategy.config_dir().join("worktrunk").join("config.toml"))
}
+
+/// Handle the config help command - show LLM setup guide
+pub fn handle_config_help() -> Result<(), GitError> {
+ let bold = AnstyleStyle::new().bold();
+ let dim = AnstyleStyle::new().dimmed();
+
+ // Get config path for display
+ let config_path = get_global_config_path()
+ .map(|p| p.display().to_string())
+ .unwrap_or_else(|| "~/.config/worktrunk/config.toml".to_string());
+
+ let help_text = format!(
+ "
+{bold}LLM Setup Guide{bold:#}
+{dim}Enable AI-generated commit messages{dim:#}
+
+{bold}1. Install an LLM tool (llm, aichat){bold:#}
+
+ uv tool install -U llm
+
+{bold}2. Configure a model{bold:#}
+
+ {dim}For Claude:{dim:#}
+ llm install llm-anthropic
+ llm keys set anthropic
+ {dim}# Paste your API key from: https://console.anthropic.com/settings/keys{dim:#}
+ llm models default claude-3.5-sonnet
+
+ {dim}For OpenAI:{dim:#}
+ llm keys set openai
+ {dim}# Paste your API key from: https://platform.openai.com/api-keys{dim:#}
+
+{bold}3. Test it works{bold:#}
+
+ llm \"say hello\"
+
+{bold}4. Configure worktrunk{bold:#}
+
+ Add to {bold}{config_path}{bold:#}:
+
+ {dim}[commit-generation]{dim:#}
+ {dim}command = \"llm\"{dim:#}
+
+{HINT_EMOJI} {HINT}Use 'wt config init' to create the config file if it doesn't exist{HINT:#}
+{HINT_EMOJI} {HINT}Use 'wt config list' to view your current configuration{HINT:#}
+{HINT_EMOJI} {HINT}Docs: https://llm.datasette.io/ | https://github.com/sigoden/aichat{HINT:#}
+"
+ );
+
+ print!("{}", help_text);
+
+ Ok(())
+}
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 5f19c6bd8..f5764bdcb 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -207,6 +207,25 @@ fn format_commit_message_for_display(message: &str) -> String {
result
}
+/// Show hint if no LLM command is configured
+fn show_llm_config_hint_if_needed(
+ commit_generation_config: &worktrunk::config::CommitGenerationConfig,
+) -> Result<(), GitError> {
+ // Check if LLM is NOT configured (matching llm.rs logic)
+ let is_configured = commit_generation_config
+ .command
+ .as_ref()
+ .map(|s| !s.trim().is_empty())
+ .unwrap_or(false);
+
+ if !is_configured {
+ crate::output::hint(format!(
+ "{HINT_EMOJI} {HINT}Using fallback commit message. Run 'wt config help' to configure LLM-generated messages{HINT:#}"
+ ))?;
+ }
+ Ok(())
+}
+
/// Commit already-staged changes with an LLM-generated message
fn commit_with_generated_message(
progress_msg: &str,
@@ -230,7 +249,9 @@ fn commit_with_generated_message(
crate::output::progress(format!("πŸ”„ {CYAN}{full_progress_msg}{CYAN:#}"))?;
crate::output::progress(format!("πŸ”„ {CYAN}Generating commit message...{CYAN:#}"))?;
+ show_llm_config_hint_if_needed(commit_generation_config)?;
let commit_message = crate::llm::generate_commit_message(commit_generation_config)?;
+
let formatted_message = format_commit_message_for_display(&commit_message);
crate::output::progress(format_with_gutter(&formatted_message, "", None))?;
@@ -329,6 +350,8 @@ fn handle_squash(
"πŸ”„ {CYAN}Generating squash commit message...{CYAN:#}"
))?;
+ show_llm_config_hint_if_needed(commit_generation_config)?;
+
// Get current branch and repo name for template variables
let current_branch = repo.current_branch()?.unwrap_or_else(|| "HEAD".to_string());
let repo_root = repo.worktree_root()?;
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 888368287..5b8e5af88 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -11,7 +11,7 @@ pub mod process;
pub mod worktree;
pub use completion::{handle_complete, handle_completion};
-pub use config::{handle_config_init, handle_config_list};
+pub use config::{handle_config_help, handle_config_init, handle_config_list};
pub use configure_shell::{ConfigAction, handle_configure_shell};
pub use dev::handle_dev_run_hook;
pub use init::handle_init;
diff --git a/src/config.rs b/src/config.rs
index 09fbd6255..23d86ccb9 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -242,7 +242,7 @@ impl WorktrunkConfig {
}
}
-fn get_config_path() -> Option<PathBuf> {
+pub fn get_config_path() -> Option<PathBuf> {
// Check for test override first (WORKTRUNK_CONFIG_PATH env var)
if let Ok(path) = std::env::var("WORKTRUNK_CONFIG_PATH") {
return Some(PathBuf::from(path));
diff --git a/src/main.rs b/src/main.rs
index a9d1db690..e23de6da3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,9 +11,9 @@ mod llm;
mod output;
use commands::{
- ConfigAction, Shell, handle_complete, handle_completion, handle_config_init,
- handle_config_list, handle_configure_shell, handle_dev_run_hook, handle_init, handle_list,
- handle_merge, handle_push, handle_remove, handle_switch,
+ ConfigAction, Shell, handle_complete, handle_completion, handle_config_help,
+ handle_config_init, handle_config_list, handle_configure_shell, handle_dev_run_hook,
+ handle_init, handle_list, handle_merge, handle_push, handle_remove, handle_switch,
};
use output::{handle_remove_output, handle_switch_output};
@@ -49,6 +49,8 @@ enum ConfigCommand {
Init,
/// List all configuration files and their locations
List,
+ /// Show setup guide for AI-generated commit messages
+ Help,
}
#[derive(Debug, Clone, Copy, ValueEnum)]
@@ -387,6 +389,7 @@ fn main() {
Commands::Config { action } => match action {
ConfigCommand::Init => handle_config_init(),
ConfigCommand::List => handle_config_list(),
+ ConfigCommand::Help => handle_config_help(),
},
Commands::Dev { action } => match action {
DevCommand::RunHook { hook_type, force } => handle_dev_run_hook(hook_type, force),
diff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snap
index 2bef8bfca..29c380c7e 100644
--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSZbFNE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcKkzLk/test-config.toml
---
success: true
exit_code: 0
@@ -190,6 +190,9 @@ _wt() {
wt,switch)
cmd="wt__switch"
;;
+ wt__config,help)
+ cmd="wt__config__help"
+ ;;
wt__config,init)
cmd="wt__config__init"
;;
@@ -248,7 +251,7 @@ _wt() {
return 0
;;
wt__config)
- opts="-v -h --verbose --help init list"
+ opts="-v -h --verbose --help init list help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@@ -261,6 +264,20 @@ _wt() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
+ wt__config__help)
+ opts="-v -h --verbose --help"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
wt__config__init)
opts="-v -h --verbose --help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
diff --git a/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap b/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap
index 3fd165387..2b344d563 100644
--- a/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_bash_custom_prefix.snap
@@ -18,7 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEXV3PM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk3RZ0C/test-config.toml
---
success: true
exit_code: 0
@@ -192,6 +192,9 @@ _wt() {
wt,switch)
cmd="wt__switch"
;;
+ wt__config,help)
+ cmd="wt__config__help"
+ ;;
wt__config,init)
cmd="wt__config__init"
;;
@@ -250,7 +253,7 @@ _wt() {
return 0
;;
wt__config)
- opts="-v -h --verbose --help init list"
+ opts="-v -h --verbose --help init list help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@@ -263,6 +266,20 @@ _wt() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
+ wt__config__help)
+ opts="-v -h --verbose --help"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
wt__config__init)
opts="-v -h --verbose --help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index fecf23f2b..63b945c4c 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp84YMkU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKans54/test-config.toml
---
success: true
exit_code: 0
@@ -228,14 +228,17 @@ complete -c wt -n "__fish_wt_using_subcommand configure-shell" -l cmd -d 'Comman
complete -c wt -n "__fish_wt_using_subcommand configure-shell" -s y -l yes -d 'Skip confirmation prompt'
complete -c wt -n "__fish_wt_using_subcommand configure-shell" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
complete -c wt -n "__fish_wt_using_subcommand configure-shell" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list" -f -a "init" -d 'Initialize global configuration file with examples'
-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list" -f -a "list" -d 'List all configuration files and their locations'
+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help" -s h -l help -d 'Print help'
+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help" -f -a "init" -d 'Initialize global configuration file with examples'
+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help" -f -a "list" -d 'List all configuration files and their locations'
+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help" -f -a "help" -d 'Show setup guide for AI-generated commit messages'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from init" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s h -l help -d 'Print help'
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from help" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from help" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook" -f -a "run-hook" -d 'Run a project hook for testing'
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index b4d3e835b..bf37d3096 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpohHD45/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIY93iE/test-config.toml
---
success: true
exit_code: 0
@@ -205,6 +205,14 @@ _arguments "${_arguments_options[@]}" : \
'-h[Print help]' \
'--help[Print help]' \
&& ret=0
+;;
+(help)
+_arguments "${_arguments_options[@]}" : \
+'-v[Enable verbose output (show git commands and debug info)]' \
+'--verbose[Enable verbose output (show git commands and debug info)]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
;;
esac
;;
@@ -360,9 +368,15 @@ _wt__config_commands() {
local commands; commands=(
'init:Initialize global configuration file with examples' \
'list:List all configuration files and their locations' \
+'help:Show setup guide for AI-generated commit messages' \
)
_describe -t commands 'wt config commands' commands "$@"
}
+(( $+functions[_wt__config__help_commands] )) ||
+_wt__config__help_commands() {
+ local commands; commands=()
+ _describe -t commands 'wt config help commands' commands "$@"
+}
(( $+functions[_wt__config__init_commands] )) ||
_wt__config__init_commands() {
local commands; commands=()
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
index d1bd9999b..f38c18354 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpR6XD8f/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCsDdYc/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 1c6094623..5dd1bc581 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -19,13 +19,14 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpisDYxs/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcStXH3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits into 1 (2 files, +2)...
πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Squash commits from main
 
  Combined commits:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 011a76076..89c65e0a4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -16,13 +16,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLuX5t1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpihdRQG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Committing changes... (1 file, +1, -1)
πŸ”„ Generating commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 7b952dac9..e1a165802 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -18,13 +18,14 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2sHvTX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKEHACQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Committing changes... (1 file, +1, -1)
πŸ”„ Generating commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index c903acfda..d7cb802b9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -16,13 +16,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKeOZyO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRNzM33/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Committing changes... (1 file, +1)
πŸ”„ Generating commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
index 74f63a1a1..7624d1c67 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp40HU2R/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd5boub/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 22a9c4618..a96b855b9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMSxCO3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2LUcmx/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 3ac89575f..aed34e706 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV53u6s/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppgXnRW/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index ec6328c5f..5f185dc79 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2ySiyI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoVUaLF/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index c4f6af0bd..e60650da4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJYHpXe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp91cVDV/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 8d516cdb6..151dc606c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpow17hQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7Rysra/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index a23814240..bea8104e4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXNzYyg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUQwx9m/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 6e69289d0..3ce1d7590 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQYFkT2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2PnhTr/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index dd7241649..a86014f55 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFqDlWx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJUdrZx/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index 486a40179..b3f02d834 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTlDjqL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpW2WaUb/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 6923e9c02..41ef68142 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQoY18o/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVkQo4K/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index ea92f7462..645062d1a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprt2F7E/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp54dUDd/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 60626ed11..21d8de3af 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -17,13 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBQQvyf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzPj54S/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Squash commits from main
 
  Combined commits:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index d26a5ba7c..7cf32c810 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
@@ -18,13 +18,14 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk6VxVV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcSbP5q/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits into 1 (2 files, +2)...
πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Squash commits from main
 
  Combined commits:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 1a1f97949..5361e071f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVJnMrc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjRu5dO/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index e399e5b20..89d0758ae 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -20,13 +20,14 @@ info:
WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"
WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"
WORKTRUNK_COMMIT_GENERATION__COMMAND: sh
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr4HNo8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1sT6wJ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits into 1 (1 file, +1)...
πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Squash commits from main
 
  Combined commits:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 26457aed1..c9c30fa49 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbRVLSV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8rFQyH/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
index 894f93695..e0601b29c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmHisFy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOXbS7l/test-config.toml
---
success: true
exit_code: 0