Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Update `wt config help` to `wt config --help`
Maximilian Roosc204e70b679d
diff --git a/.claude-plugin/skills/worktrunk/SKILL.md b/.claude-plugin/skills/worktrunk/SKILL.mdindex ba57bd5b7..efbe43657 100644--- a/.claude-plugin/skills/worktrunk/SKILL.md+++ b/.claude-plugin/skills/worktrunk/SKILL.md@@ -171,7 +171,7 @@ wt config listwt config init# LLM setup guide-wt config help+wt config --help```## When to Load Reference Filesdiff --git a/.claude-plugin/skills/worktrunk/reference/user-config.md b/.claude-plugin/skills/worktrunk/reference/user-config.mdindex cf4c246f7..9979c6648 100644--- a/.claude-plugin/skills/worktrunk/reference/user-config.md+++ b/.claude-plugin/skills/worktrunk/reference/user-config.md@@ -260,7 +260,7 @@ command = "npm install"```bashwt config list # View current configwt config init # Create initial config file-wt config help # Show LLM setup guide+wt config --help # Show LLM setup guide```## Config File Locationdiff --git a/CLAUDE.md b/CLAUDE.mdindex 0857155ad..6a0c24cbe 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -665,7 +665,7 @@ The output module (`src/output/global.rs`) provides these functions:- `progress()` - Operations in progress (e.g., "π Squashing commits...")- `info()` - Neutral status/metadata (e.g., "βͺ No changes detected")- `warning()` - Non-blocking issues (e.g., "π‘ Uncommitted changes detected")-- `hint()` - Actionable suggestions for users (e.g., "π‘ Run 'wt config help'")+- `hint()` - Actionable suggestions for users (e.g., "π‘ Run 'wt config --help'")For the complete API, see `src/output/global.rs`.diff --git a/README.md b/README.mdindex cda0713e3..48657a299 100644--- a/README.md+++ b/README.md@@ -97,7 +97,7 @@ $ wt mergeβ Squashed @ a1b2c3d```-Set up LLM integration: run `wt config help` to see the setup guide, or `wt config init` to create an example config file.+Set up LLM integration: run `wt config --help` to see the setup guide, or `wt config init` to create an example config file.<details><summary><b>Advanced: Custom Prompt Templates</b></summary>@@ -323,9 +323,9 @@ Symbols combine to show complete state (e.g., `β‘β!` means matches main, behi## Configuration```bash-wt config list # Show all config files and locations-wt config init # Create global config with examples-wt config help # Show LLM setup guide+wt config list # Show all config files and locations+wt config init # Create global config with examples+wt config --help # Show LLM setup guide```<details>diff --git a/src/cli.rs b/src/cli.rsindex dae7fd16b..c3018ef22 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -50,8 +50,6 @@ pub enum ConfigCommand {Init,/// List all configuration files and their locationsList,- /// Show setup guide for AI-generated commit messages- Help,/// Refresh the cached default branch by querying the remoteRefreshCache,/// Configure shell by writing to config files@@ -199,6 +197,43 @@ pub enum Commands {},/// Manage configuration+ #[command(+ about = "Manage configuration. For AI commit setup, run: `wt config --help` (see 'LLM SETUP GUIDE').",+ after_long_help = r#"LLM SETUP GUIDE:+Enable AI-generated commit messages++1. Install an LLM tool (llm, aichat)++ uv tool install -U llm++2. Configure a model++For Claude:+ llm install llm-anthropic+ llm keys set anthropic+ # Paste your API key from: https://console.anthropic.com/settings/keys+ llm models default claude-3.5-sonnet++For OpenAI:+ llm keys set openai+ # Paste your API key from: https://platform.openai.com/api-keys++3. Test it works++ llm "say hello"++4. Configure worktrunk++Add to ~/.config/worktrunk/config.toml:++ [commit-generation]+ command = "llm"++Use 'wt config init' to create the config file if it doesn't exist+Use 'wt config list' to view your current configuration+Docs: https://llm.datasette.io/ | https://github.com/sigoden/aichat+"#+ )]Config {#[command(subcommand)]action: ConfigCommand,diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex d1454ea9b..67f682c4e 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -64,7 +64,7 @@ impl<'a> CommitGenerator<'a> {pub fn emit_hint_if_needed(&self) -> Result<(), GitError> {if !self.config.is_configured() {crate::output::hint(format!(- "{HINT}Using fallback commit message. Run 'wt config help' to configure LLM-generated messages{HINT:#}"+ "{HINT}Using fallback commit message. Run 'wt config --help' for LLM setup guide{HINT:#}"))?;}Ok(())diff --git a/src/commands/config.rs b/src/commands/config.rsindex c3af8d33e..9403d0143 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -184,56 +184,3 @@ pub fn handle_config_refresh_cache() -> Result<(), GitError> {Ok(())}--/// 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/mod.rs b/src/commands/mod.rsindex 49b2ab39b..7894e618e 100644--- a/src/commands/mod.rs+++ b/src/commands/mod.rs@@ -18,9 +18,7 @@ pub mod standalone;pub mod worktree;pub use completion::handle_complete;-pub use config::{- handle_config_help, handle_config_init, handle_config_list, handle_config_refresh_cache,-};+pub use config::{handle_config_init, handle_config_list, handle_config_refresh_cache};pub use configure_shell::{ConfigAction, handle_configure_shell};pub use init::handle_init;pub use list::handle_list;diff --git a/src/main.rs b/src/main.rsindex c15e4741c..cc0426f89 100644--- a/src/main.rs+++ b/src/main.rs@@ -18,7 +18,7 @@ use commands::command_executor::CommandContext;use commands::handle_select;use commands::worktree::{SwitchResult, handle_push};use commands::{- ConfigAction, handle_complete, handle_config_help, handle_config_init, handle_config_list,+ ConfigAction, handle_complete, handle_config_init, handle_config_list,handle_config_refresh_cache, handle_configure_shell, handle_init, handle_list, handle_merge,handle_rebase, handle_remove, handle_squash, handle_standalone_ask_approvals,handle_standalone_clear_approvals, handle_standalone_commit, handle_standalone_run_hook,@@ -103,7 +103,6 @@ fn main() {Commands::Config { action } => match action {ConfigCommand::Init => handle_config_init(),ConfigCommand::List => handle_config_list(),- ConfigCommand::Help => handle_config_help(),ConfigCommand::RefreshCache => handle_config_refresh_cache(),ConfigCommand::Shell { shell, force } => {handle_configure_shell(shell, force)diff --git a/tests/snapshots/git_error_display__worktree_removal_failed.snap b/tests/snapshots/git_error_display__worktree_removal_failed.snapindex 6ce69c2d5..28394cd2b 100644--- a/tests/snapshots/git_error_display__worktree_removal_failed.snap+++ b/tests/snapshots/git_error_display__worktree_removal_failed.snap@@ -1,6 +1,5 @@---source: tests/git_error_display.rs-assertion_line: 12expression: err.to_string()---β [31mFailed to remove worktree for [1m[31mfeature-x[0m[31m at [1m[31m/tmp/repo.feature-x[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snapindex b91ed3b02..e0dd95f52 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/init.rs-assertion_line: 23info:program: wtargs:@@ -17,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxCeqZT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGhsyJ7/test-config.toml---success: trueexit_code: 0@@ -192,9 +191,6 @@ _wt() {wt__beta,squash)cmd="wt__beta__squash";;- wt__config,help)- cmd="wt__config__help"- ;;wt__config,init)cmd="wt__config__init";;@@ -368,7 +364,7 @@ _wt() {return 0;;wt__config)- opts="-v -h --verbose --help init list help refresh-cache shell"+ opts="-v -h --verbose --help init list refresh-cache shell"if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; thenCOMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )return 0@@ -381,20 +377,6 @@ _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 ]] ; thendiff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snapindex 34b352609..109dafc86 100644--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/init.rs-assertion_line: 23info:program: wtargs:@@ -17,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBzxXJn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9iNHoU/test-config.toml---success: trueexit_code: 0@@ -200,7 +199,7 @@ complete -c wt -n "__fish_wt_needs_command" -s v -l verbose -d 'Enable verbose ocomplete -c wt -n "__fish_wt_needs_command" -s h -l help -d 'Print help'complete -c wt -n "__fish_wt_needs_command" -s V -l version -d 'Print version'complete -c wt -n "__fish_wt_needs_command" -f -a "init" -d 'Generate shell integration code'-complete -c wt -n "__fish_wt_needs_command" -f -a "config" -d 'Manage configuration'+complete -c wt -n "__fish_wt_needs_command" -f -a "config" -d 'Manage configuration. For AI commit setup, run: `wt config --help` (see \'LLM SETUP GUIDE\').'complete -c wt -n "__fish_wt_needs_command" -f -a "beta" -d 'Development and testing utilities'complete -c wt -n "__fish_wt_needs_command" -f -a "list" -d 'List worktrees and optionally branches'complete -c wt -n "__fish_wt_needs_command" -f -a "switch" -d 'Switch to a worktree'@@ -208,19 +207,16 @@ complete -c wt -n "__fish_wt_needs_command" -f -a "remove" -d 'Finish current wocomplete -c wt -n "__fish_wt_needs_command" -f -a "merge" -d 'Merge worktree into target branch'complete -c wt -n "__fish_wt_using_subcommand init" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'complete -c wt -n "__fish_wt_using_subcommand init" -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 refresh-cache shell" -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 refresh-cache 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 help refresh-cache shell" -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 refresh-cache shell" -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 refresh-cache shell" -f -a "help" -d 'Show setup guide for AI-generated commit messages'-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help refresh-cache shell" -f -a "refresh-cache" -d 'Refresh the cached default branch by querying the remote'-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list help refresh-cache shell" -f -a "shell" -d 'Configure shell by writing to config files'+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -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 refresh-cache shell" -s h -l help -d 'Print help (see more with \'--help\')'+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -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 refresh-cache shell" -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 refresh-cache shell" -f -a "refresh-cache" -d 'Refresh the cached default branch by querying the remote'+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from init list refresh-cache shell" -f -a "shell" -d 'Configure shell by writing to config files'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 config; and __fish_seen_subcommand_from refresh-cache" -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 refresh-cache" -s h -l help -d 'Print help'complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -l shell -d 'Specific shell to configure (default: all shells with existing config files)' -r -f -a "bash\t''diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex d89eba299..9d2900055 100644--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/init.rs-assertion_line: 23info:program: wtargs:@@ -17,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMoxDqw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKY05V9/test-config.toml---success: trueexit_code: 0@@ -185,8 +184,8 @@ _arguments "${_arguments_options[@]}" : \_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]' \+'-h[Print help (see more with '\''--help'\'')]' \+'--help[Print help (see more with '\''--help'\'')]' \":: :_wt__config_commands" \"*::: :->config" \&& ret=0@@ -213,14 +212,6 @@ _arguments "${_arguments_options[@]}" : \'--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-;;(refresh-cache)_arguments "${_arguments_options[@]}" : \'-v[Enable verbose output (show git commands and debug info)]' \@@ -420,7 +411,7 @@ esac_wt_commands() {local commands; commands=('init:Generate shell integration code' \-'config:Manage configuration' \+'config:Manage configuration. For AI commit setup, run\: \`wt config --help\` (see '\''LLM SETUP GUIDE'\'').' \'beta:Development and testing utilities' \'list:List worktrees and optionally branches' \'switch:Switch to a worktree' \@@ -494,17 +485,11 @@ _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' \'refresh-cache:Refresh the cached default branch by querying the remote' \'shell:Configure shell by writing to config files' \)_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_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 828a01c01..5fb73b0a1 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@@ -12,19 +12,20 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_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/.tmpbpcDI7/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSSwp5e/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m 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.snapindex d930256ba..0ece4310f 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@@ -12,17 +12,18 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnsdP1O/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3XJFhk/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits: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.snapindex 4694dca3e..0c2e71642 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@@ -12,19 +12,20 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_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/.tmpLVc45l/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK1SDEB/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits: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.snapindex 4147354c2..e25a60158 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@@ -12,10 +12,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpumaJpl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOTMGKu/test-config.toml---success: trueexit_code: 0@@ -23,7 +24,7 @@ exit_code: 0π‘ [33mAuto-staging 1 untracked file:[0m[40m [0m dirty.txtπ [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mChanges to dirty.txt[0mβ [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex 114a2a128..bb9560b1d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -12,10 +12,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp426xs3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaDm0S1/test-config.toml---success: trueexit_code: 0@@ -23,7 +24,7 @@ exit_code: 0π‘ [33mAuto-staging 1 untracked file:[0m[40m [0m newfile.txtπ [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mChanges to newfile.txt[0mβ [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex 87664327e..199385541 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap@@ -13,10 +13,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWhRbqP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpit6B51/test-config.toml---success: trueexit_code: 0@@ -26,7 +27,7 @@ exit_code: 0π [36mRunning pre-commit:[0m[40m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0mπ [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mChanges to feature.txt[0mβ [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex fb254ba96..b8fd16fc7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -12,17 +12,18 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdTaIlL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdJuHDk/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 3 commits into 1[0m (3 files, [32m+3[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex 5d21c1237..4f36215f2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -12,17 +12,18 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUG0jFh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX8vgSy/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 3 commits into 1...[0mπ [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m 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.snapindex 03687985d..0c2483e8d 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@@ -12,18 +12,19 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDNVxVF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfNAwi9/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 2 commits into 1[0m (2 files, [32m+2[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits: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.snapindex 9067a1934..840def929 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@@ -12,20 +12,21 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"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/.tmpcgBcIT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3kKR3W/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mSquashing 2 commits into 1[0m (1 file, [32m+1[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex 7c98be1b9..2f7850f13 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -12,12 +12,13 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAYDALB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWPwD37/test-config.toml---success: trueexit_code: 0@@ -27,7 +28,7 @@ exit_code: 0[40m [0m untracked2.txtπ [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...π [36mGenerating squash commit message...[0m-π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits: