Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Introduce atomic commit, squash, push, and rebase workflows
Maximilian Roos6c17731349d3
diff --git a/src/commands/dev.rs b/src/commands/dev.rsindex 77f748dd0..03926822e 100644--- a/src/commands/dev.rs+++ b/src/commands/dev.rs@@ -1,13 +1,18 @@use worktrunk::HookType;use worktrunk::config::{ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt, Repository};-use worktrunk::styling::{HINT, HINT_EMOJI, eprintln};+use worktrunk::styling::{+ AnstyleStyle, CYAN, CYAN_BOLD, HINT, HINT_EMOJI, eprintln, format_with_gutter,+};use super::merge::{- execute_post_merge_commands, run_pre_commit_commands, run_pre_merge_commands,- run_pre_squash_commands,+ commit_with_generated_message, execute_post_merge_commands, format_commit_message_for_display,+ run_pre_commit_commands, run_pre_merge_commands, run_pre_squash_commands,+ show_llm_config_hint_if_needed,+};+use super::worktree::{+ execute_post_create_commands, execute_post_start_commands_sequential, parse_diff_shortstat,};-use super::worktree::{execute_post_create_commands, execute_post_start_commands_sequential};/// Handle `wt dev run-hook` commandpub fn handle_dev_run_hook(hook_type: HookType, force: bool) -> Result<(), GitError> {@@ -123,3 +128,228 @@ fn check_hook_configured<T>(hook: &Option<T>, hook_type: HookType) -> Result<(),}Ok(())}++/// Handle `wt dev commit` command+pub fn handle_dev_commit(force: bool, no_hooks: bool) -> Result<(), GitError> {+ let repo = Repository::current();+ let config = WorktrunkConfig::load().git_context("Failed to load config")?;+ let current_branch = repo+ .current_branch()?+ .ok_or_else(|| GitError::CommandFailed("Not on a branch (detached HEAD)".to_string()))?;++ // Run pre-commit hook unless --no-hooks was specified+ if !no_hooks && let Ok(Some(project_config)) = ProjectConfig::load(&repo.worktree_root()?) {+ let worktree_path =+ std::env::current_dir().git_context("Failed to get current directory")?;+ run_pre_commit_commands(+ &project_config,+ ¤t_branch,+ &worktree_path,+ &repo,+ &config,+ force,+ )?;+ }++ // Stage all changes including untracked files+ repo.run_command(&["add", "-A"])+ .git_context("Failed to stage changes")?;++ commit_with_generated_message("Committing changes...", &config.commit_generation)+}++/// Handle `wt dev squash` command+pub fn handle_dev_squash(+ target: Option<&str>,+ force: bool,+ no_hooks: bool,+) -> Result<(), GitError> {+ let repo = Repository::current();+ let config = WorktrunkConfig::load().git_context("Failed to load config")?;+ let current_branch = repo+ .current_branch()?+ .ok_or_else(|| GitError::CommandFailed("Not on a branch (detached HEAD)".to_string()))?;++ // Get target branch (default to default branch if not provided)+ let target_branch = target.map_or_else(|| repo.default_branch(), |b| Ok(b.to_string()))?;++ // Run pre-squash hook unless --no-hooks was specified+ if !no_hooks && let Ok(Some(project_config)) = ProjectConfig::load(&repo.worktree_root()?) {+ let worktree_path =+ std::env::current_dir().git_context("Failed to get current directory")?;+ run_pre_squash_commands(+ &project_config,+ ¤t_branch,+ &target_branch,+ &worktree_path,+ &repo,+ &config,+ force,+ )?;+ }++ // Get merge base with target branch+ let merge_base = repo.merge_base("HEAD", &target_branch)?;++ // Count commits since merge base+ let commit_count = repo.count_commits(&merge_base, "HEAD")?;++ // Check if there are staged changes+ let has_staged = repo.has_staged_changes()?;++ // Handle different scenarios+ if commit_count == 0 && !has_staged {+ // No commits and no staged changes - nothing to squash+ let dim = AnstyleStyle::new().dimmed();+ crate::output::progress(format!(+ "{dim}No commits to squash - already at merge base{dim:#}"+ ))?;+ return Ok(());+ }++ if commit_count == 0 && has_staged {+ // Just staged changes, no commits - commit them directly (no squashing needed)+ commit_with_generated_message("Committing changes...", &config.commit_generation)?;+ return Ok(());+ }++ if commit_count == 1 && !has_staged {+ // Single commit, no staged changes - nothing to do+ crate::output::hint(format!(+ "{HINT_EMOJI} {HINT}Only 1 commit since {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT} - no squashing needed{HINT:#}"+ ))?;+ return Ok(());+ }++ // Either multiple commits OR single commit with staged changes - squash them+ // Get diff stats early for display in progress message+ let range = format!("{}..HEAD", merge_base);+ let diff_shortstat = repo+ .run_command(&["diff", "--shortstat", &range])+ .unwrap_or_default();+ let stats = parse_diff_shortstat(&diff_shortstat);+ let stats_parts = stats.format_summary();++ let squash_progress = match stats_parts.is_empty() {+ true => format!("π {CYAN}Squashing {commit_count} commits into 1...{CYAN:#}"),+ false => format!(+ "π {CYAN}Squashing {commit_count} commits into 1{CYAN:#} ({})...",+ stats_parts.join(", ")+ ),+ };+ crate::output::progress(squash_progress)?;++ // Get commit subjects for the squash message+ let subjects = repo.commit_subjects(&range)?;++ // Generate squash commit message+ crate::output::progress(format!(+ "π {CYAN}Generating squash commit message...{CYAN:#}"+ ))?;++ show_llm_config_hint_if_needed(&config.commit_generation)?;++ // Get current branch and repo name for template variables+ let repo_root = repo.worktree_root()?;+ let repo_name = repo_root+ .file_name()+ .and_then(|n| n.to_str())+ .unwrap_or("repo");++ let commit_message = crate::llm::generate_squash_message(+ &target_branch,+ &subjects,+ ¤t_branch,+ repo_name,+ &config.commit_generation,+ )+ .git_context("Failed to generate commit message")?;++ // Display the generated commit message+ let formatted_message = format_commit_message_for_display(&commit_message);+ crate::output::progress(format_with_gutter(&formatted_message, "", None))?;++ // Reset to merge base (soft reset stages all changes, including any already-staged uncommitted changes)+ repo.run_command(&["reset", "--soft", &merge_base])+ .git_context("Failed to reset to merge base")?;++ // Check if there are actually any changes to commit+ if !repo.has_staged_changes()? {+ use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT};+ return Err(GitError::CommandFailed(format!(+ "{ERROR_EMOJI} {ERROR}No changes to commit after squashing {commit_count} commits{ERROR:#}\n\n{HINT_EMOJI} {HINT}The commits resulted in no net changes (e.g., changes were reverted or already in {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT}){HINT:#}"+ )));+ }++ // Commit with the generated message+ repo.run_command(&["commit", "-m", &commit_message])+ .git_context("Failed to create squash commit")?;++ // Get commit hash for display+ let commit_hash = repo+ .run_command(&["rev-parse", "--short", "HEAD"])?+ .trim()+ .to_string();++ // Show success immediately after completing the squash+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ crate::output::success(format!(+ "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"+ ))?;++ Ok(())+}++/// Handle `wt dev push` command+pub fn handle_dev_push(target: Option<&str>, allow_merge_commits: bool) -> Result<(), GitError> {+ super::worktree::handle_push(target, allow_merge_commits, "Pushed to")+}++/// Handle `wt dev rebase` command+pub fn handle_dev_rebase(target: Option<&str>) -> Result<(), GitError> {+ let repo = Repository::current();++ // Get target branch (default to default branch if not provided)+ let target_branch = target.map_or_else(|| repo.default_branch(), |b| Ok(b.to_string()))?;++ // Rebase onto target+ crate::output::progress(format!(+ "π {CYAN}Rebasing onto {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"+ ))?;++ let rebase_result = repo.run_command(&["rebase", &target_branch]);++ // If rebase failed, check if it's due to conflicts+ if let Err(e) = rebase_result {+ if let Some(state) = repo.worktree_state()?+ && state.starts_with("REBASING")+ {+ return Err(GitError::RebaseConflict {+ state,+ target_branch: target_branch.to_string(),+ });+ }+ // Not a rebase conflict, return original error+ return Err(GitError::CommandFailed(format!(+ "Failed to rebase onto '{}': {}",+ target_branch, e+ )));+ }++ // Verify rebase completed successfully (safety check for edge cases)+ if let Some(state) = repo.worktree_state()? {+ return Err(GitError::RebaseConflict {+ state,+ target_branch: target_branch.to_string(),+ });+ }++ // Success+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ let green_bold = GREEN.bold();+ crate::output::success(format!(+ "{SUCCESS_EMOJI} {GREEN}Rebased onto {green_bold}{target_branch}{green_bold:#}{GREEN:#}"+ ))?;++ Ok(())+}diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex af7a88b67..212d98153 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -104,46 +104,11 @@ pub fn handle_merge(// Squash commits if enabledif squash_enabled {- handle_squash(- &target_branch,- &config.commit_generation,- ¤t_branch,- no_hooks,- force,- )?;- }-- // Rebase onto target- crate::output::progress(format!(- "π {CYAN}Rebasing onto {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"- ))?;-- let rebase_result = repo.run_command(&["rebase", &target_branch]);-- // If rebase failed, check if it's due to conflicts- if let Err(e) = rebase_result {- if let Some(state) = repo.worktree_state()?- && state.starts_with("REBASING")- {- return Err(GitError::RebaseConflict {- state,- target_branch: target_branch.to_string(),- });- }- // Not a rebase conflict, return original error- return Err(GitError::CommandFailed(format!(- "Failed to rebase onto '{}': {}",- target_branch, e- )));+ handle_squash(&target_branch, no_hooks, force)?;}- // Verify rebase completed successfully (safety check for edge cases)- if let Some(state) = repo.worktree_state()? {- return Err(GitError::RebaseConflict {- state,- target_branch: target_branch.to_string(),- });- }+ // Rebase onto target (delegate to atomic dev command)+ super::dev::handle_dev_rebase(Some(&target_branch))?;// Run pre-merge checks unless --no-hooks was specified// Do this AFTER rebase to validate the final state that will be pushed@@ -247,7 +212,7 @@ fn handle_merge_summary_output(primary_path: Option<&std::path::Path>) -> Result}/// Format a commit message with the first line in bold, ready for gutter display-fn format_commit_message_for_display(message: &str) -> String {+pub fn format_commit_message_for_display(message: &str) -> String {let bold = AnstyleStyle::new().bold();let lines: Vec<&str> = message.lines().collect();@@ -270,7 +235,7 @@ fn format_commit_message_for_display(message: &str) -> String {}/// Show hint if no LLM command is configured-fn show_llm_config_hint_if_needed(+pub 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)@@ -289,7 +254,7 @@ fn show_llm_config_hint_if_needed(}/// Commit already-staged changes with an LLM-generated message-fn commit_with_generated_message(+pub fn commit_with_generated_message(progress_msg: &str,commit_generation_config: &worktrunk::config::CommitGenerationConfig,) -> Result<(), GitError> {@@ -383,141 +348,12 @@ fn handle_commit_changes(fn handle_squash(target_branch: &str,- commit_generation_config: &worktrunk::config::CommitGenerationConfig,- current_branch: &str,no_hooks: bool,force: bool,) -> Result<Option<usize>, GitError> {- let repo = Repository::current();- let config = WorktrunkConfig::load().git_context("Failed to load config")?;-- // Run pre-squash hook unless --no-hooks was specified- if !no_hooks && let Ok(Some(project_config)) = ProjectConfig::load(&repo.worktree_root()?) {- let worktree_path =- std::env::current_dir().git_context("Failed to get current directory")?;- run_pre_squash_commands(- &project_config,- current_branch,- target_branch,- &worktree_path,- &repo,- &config,- force,- )?;- }-- // Get merge base with target branch- let merge_base = repo.merge_base("HEAD", target_branch)?;-- // Count commits since merge base- let commit_count = repo.count_commits(&merge_base, "HEAD")?;-- // Check if there are staged changes- let has_staged = repo.has_staged_changes()?;-- // Handle different scenarios- if commit_count == 0 && !has_staged {- // No commits and no staged changes - nothing to squash- let dim = AnstyleStyle::new().dimmed();- crate::output::progress(format!(- "{dim}No commits to squash - already at merge base{dim:#}"- ))?;- return Ok(None);- }-- if commit_count == 0 && has_staged {- // Just staged changes, no commits - commit them directly (no squashing needed)- commit_with_generated_message("Committing changes...", commit_generation_config)?;- return Ok(None);- }-- if commit_count == 1 && !has_staged {- // Single commit, no staged changes - nothing to do- crate::output::hint(format!(- "{HINT_EMOJI} {HINT}Only 1 commit since {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT} - no squashing needed{HINT:#}"- ))?;- return Ok(None);- }-- // Either multiple commits OR single commit with staged changes - squash them- // Get diff stats early for display in progress message- let range = format!("{}..HEAD", merge_base);- let diff_shortstat = repo- .run_command(&["diff", "--shortstat", &range])- .unwrap_or_default();- let stats = parse_diff_shortstat(&diff_shortstat);- let stats_parts = stats.format_summary();-- let squash_progress = match stats_parts.is_empty() {- true => format!("π {CYAN}Squashing {commit_count} commits into 1...{CYAN:#}"),- false => format!(- "π {CYAN}Squashing {commit_count} commits into 1{CYAN:#} ({})...",- stats_parts.join(", ")- ),- };- crate::output::progress(squash_progress)?;-- // Get commit subjects for the squash message- let subjects = repo.commit_subjects(&range)?;-- // Generate squash commit message- crate::output::progress(format!(- "π {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()?;- let repo_name = repo_root- .file_name()- .and_then(|n| n.to_str())- .unwrap_or("repo");-- let commit_message = crate::llm::generate_squash_message(- target_branch,- &subjects,- ¤t_branch,- repo_name,- commit_generation_config,- )- .git_context("Failed to generate commit message")?;-- // Display the generated commit message- let formatted_message = format_commit_message_for_display(&commit_message);- crate::output::progress(format_with_gutter(&formatted_message, "", None))?;-- // Reset to merge base (soft reset stages all changes, including any already-staged uncommitted changes)- repo.run_command(&["reset", "--soft", &merge_base])- .git_context("Failed to reset to merge base")?;-- // Check if there are actually any changes to commit- // This can happen if all commits result in no net changes (e.g., series of changes and reverts)- if !repo.has_staged_changes()? {- use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};- return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} {ERROR}No changes to commit after squashing {commit_count} commits{ERROR:#}\n\n{HINT_EMOJI} {HINT}The commits resulted in no net changes (e.g., changes were reverted or already in {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT}){HINT:#}"- )));- }-- // Commit with the generated message- repo.run_command(&["commit", "-m", &commit_message])- .git_context("Failed to create squash commit")?;-- // Get commit hash for display- let commit_hash = repo- .run_command(&["rev-parse", "--short", "HEAD"])?- .trim()- .to_string();-- // Show success immediately after completing the squash- use worktrunk::styling::{GREEN, HINT, SUCCESS_EMOJI};- crate::output::success(format!(- "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"- ))?;-- Ok(Some(commit_count))+ // Delegate to the atomic dev command+ super::dev::handle_dev_squash(Some(target_branch), force, no_hooks)?;+ Ok(None)}/// Run pre-merge commands sequentially (blocking, fail-fast)diff --git a/src/commands/mod.rs b/src/commands/mod.rsindex 3835701ca..475f42d23 100644--- a/src/commands/mod.rs+++ b/src/commands/mod.rs@@ -15,7 +15,9 @@ pub use config::{handle_config_help, handle_config_init, handle_config_list, handle_config_refresh_cache,};pub use configure_shell::{ConfigAction, handle_configure_shell};-pub use dev::handle_dev_run_hook;+pub use dev::{+ handle_dev_commit, handle_dev_push, handle_dev_rebase, handle_dev_run_hook, handle_dev_squash,+};pub use init::handle_init;pub use list::handle_list;pub use merge::handle_merge;diff --git a/src/main.rs b/src/main.rsindex d190cf750..ed42a39d7 100644--- a/src/main.rs+++ b/src/main.rs@@ -14,8 +14,8 @@ mod output;use commands::{ConfigAction, Shell, handle_complete, handle_completion, handle_config_help,handle_config_init, handle_config_list, handle_config_refresh_cache, handle_configure_shell,- handle_dev_run_hook, handle_init, handle_list, handle_merge, handle_push, handle_remove,- handle_switch,+ handle_dev_commit, handle_dev_push, handle_dev_rebase, handle_dev_run_hook, handle_dev_squash,+ handle_init, handle_list, handle_merge, handle_push, handle_remove, handle_switch,};use output::{handle_remove_output, handle_switch_output};@@ -78,6 +78,47 @@ enum DevCommand {#[arg(short, long)]force: bool,},++ /// Commit changes with LLM-generated message+ Commit {+ /// Skip command approval prompts+ #[arg(short, long)]+ force: bool,++ /// Skip all project hooks (pre-commit-command)+ #[arg(long)]+ no_hooks: bool,+ },++ /// Squash commits with LLM-generated message+ Squash {+ /// Target branch to squash against (defaults to default branch)+ target: Option<String>,++ /// Skip command approval prompts+ #[arg(short, long)]+ force: bool,++ /// Skip all project hooks (pre-squash-command)+ #[arg(long)]+ no_hooks: bool,+ },++ /// Push changes to target branch+ Push {+ /// Target branch (defaults to default branch)+ target: Option<String>,++ /// Allow pushing merge commits (non-linear history)+ #[arg(long)]+ allow_merge_commits: bool,+ },++ /// Rebase current branch onto target branch+ Rebase {+ /// Target branch to rebase onto (defaults to default branch)+ target: Option<String>,+ },}#[derive(Subcommand)]@@ -393,6 +434,17 @@ fn main() {},Commands::Dev { action } => match action {DevCommand::RunHook { hook_type, force } => handle_dev_run_hook(hook_type, force),+ DevCommand::Commit { force, no_hooks } => handle_dev_commit(force, no_hooks),+ DevCommand::Squash {+ target,+ force,+ no_hooks,+ } => handle_dev_squash(target.as_deref(), force, no_hooks),+ DevCommand::Push {+ target,+ allow_merge_commits,+ } => handle_dev_push(target.as_deref(), allow_merge_commits),+ DevCommand::Rebase { target } => handle_dev_rebase(target.as_deref()),},Commands::List {format,diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex 2853812ac..77e5dc5a4 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snapindex 59d9b1f95..503cc5aba 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex ff97215d7..f24a45645 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap@@ -10,6 +10,7 @@ Command failed with exit code: exit status: 1π‘ [2mUse --no-hooks to skip pre-merge commands[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 62b69ba34..b1f73f49a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snapindex c6066ec25..e6fd232e6 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex a06eae903..e99011fa0 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap@@ -6,6 +6,7 @@ expression: output.normalized().as_ref()[0mβ Linting passed - no warnings[0mβ All 47 tests passed in 2.3sπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snapindex 0f8234dd3..4375d1831 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap differdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex b79263c0a..839d2022b 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snapindex 1482e8cd0..a3216f2da 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpto9WHD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp3kdWd/test-config.toml---success: trueexit_code: 0@@ -202,9 +202,21 @@ _wt() {wt__config,shell)cmd="wt__config__shell";;+ wt__dev,commit)+ cmd="wt__dev__commit"+ ;;+ wt__dev,push)+ cmd="wt__dev__push"+ ;;+ wt__dev,rebase)+ cmd="wt__dev__rebase"+ ;;wt__dev,run-hook)cmd="wt__dev__run__hook";;+ wt__dev,squash)+ cmd="wt__dev__squash"+ ;;*);;esac@@ -342,7 +354,7 @@ _wt() {return 0;;wt__dev)- opts="-v -h --verbose --help run-hook"+ opts="-v -h --verbose --help run-hook commit squash push rebase"if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; thenCOMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )return 0@@ -355,6 +367,48 @@ _wt() {COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )return 0;;+ wt__dev__commit)+ opts="-f -v -h --force --no-hooks --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__dev__push)+ opts="-v -h --allow-merge-commits --verbose --help [TARGET]"+ 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__dev__rebase)+ opts="-v -h --verbose --help [TARGET]"+ 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__dev__run__hook)opts="-f -v -h --force --verbose --help post-create post-start pre-commit pre-squash pre-merge post-merge"if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then@@ -369,6 +423,20 @@ _wt() {COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )return 0;;+ wt__dev__squash)+ opts="-f -v -h --force --no-hooks --verbose --help [TARGET]"+ 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__init)opts="-v -h --verbose --help bash elvish fish nushell oil powershell xonsh zsh"if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; thendiff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snapindex fb169a385..318aa645f 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpj1imH2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIAOMmN/test-config.toml---success: trueexit_code: 0@@ -169,6 +169,9 @@ if type -q wt; or set -q WORKTRUNK_BIN# Register dynamic completionscomplete -c wt -n '__fish_seen_subcommand_from init' -f -a '(__wt_complete)' -d 'Shell to generate code for'complete -c wt -n '__fish_seen_subcommand_from dev; and __fish_seen_subcommand_from run-hook' -f -a '(__wt_complete)' -d 'Hook type to run'+ complete -c wt -n '__fish_seen_subcommand_from dev; and __fish_seen_subcommand_from squash' -f -a '(__wt_complete)' -d 'Target branch to squash against (defaults to default branch)'+ complete -c wt -n '__fish_seen_subcommand_from dev; and __fish_seen_subcommand_from push' -f -a '(__wt_complete)' -d 'Target branch (defaults to default branch)'+ complete -c wt -n '__fish_seen_subcommand_from dev; and __fish_seen_subcommand_from rebase' -f -a '(__wt_complete)' -d 'Target branch to rebase onto (defaults to default branch)'complete -c wt -n '__fish_seen_subcommand_from switch' -f -a '(__wt_complete)' -d 'Branch name or worktree path'complete -c wt -n '__fish_seen_subcommand_from remove' -f -a '(__wt_complete)' -d 'Worktree names or branches to remove (defaults to current worktree if none specified)'complete -c wt -n '__fish_seen_subcommand_from push' -f -a '(__wt_complete)' -d 'Target branch (defaults to default branch)'@@ -243,12 +246,29 @@ zsh\t''"complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s f -l force -d 'Skip confirmation prompt'complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from 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 __fish_seen_subcommand_from shell" -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'+complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook commit squash push rebase" -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 commit squash push rebase" -s h -l help -d 'Print help'+complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook commit squash push rebase" -f -a "run-hook" -d 'Run a project hook for testing'+complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook commit squash push rebase" -f -a "commit" -d 'Commit changes with LLM-generated message'+complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook commit squash push rebase" -f -a "squash" -d 'Squash commits with LLM-generated message'+complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook commit squash push rebase" -f -a "push" -d 'Push changes to target branch'+complete -c wt -n "__fish_wt_using_subcommand dev; and not __fish_seen_subcommand_from run-hook commit squash push rebase" -f -a "rebase" -d 'Rebase current branch onto target branch'complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from run-hook" -s f -l force -d 'Skip command approval prompts'complete -c wt -n "__fish_wt_using_subcommand dev; and __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 __fish_seen_subcommand_from run-hook" -s h -l help -d 'Print help'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from commit" -s f -l force -d 'Skip command approval prompts'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from commit" -l no-hooks -d 'Skip all project hooks (pre-commit-command)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from commit" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from commit" -s h -l help -d 'Print help'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from squash" -s f -l force -d 'Skip command approval prompts'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from squash" -l no-hooks -d 'Skip all project hooks (pre-squash-command)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from squash" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from squash" -s h -l help -d 'Print help'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from push" -l allow-merge-commits -d 'Allow pushing merge commits (non-linear history)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from push" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from push" -s h -l help -d 'Print help'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from rebase" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'+complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_from rebase" -s h -l help -d 'Print help'complete -c wt -n "__fish_wt_using_subcommand list" -l format -d 'Output format' -r -f -a "table\t'Human-readable table format'json\t'JSON format with colored unicode display fields'"complete -c wt -n "__fish_wt_using_subcommand list" -l branches -d 'Also display branches that don\'t have worktrees'diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex 121b5a383..13c619b31 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwPTuOe/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVE3LFA/test-config.toml---success: trueexit_code: 0@@ -250,6 +250,48 @@ _arguments "${_arguments_options[@]}" : \'--help[Print help]' \':hook_type -- Hook type to run:(post-create post-start pre-commit pre-squash pre-merge post-merge)' \&& ret=0+;;+(commit)+_arguments "${_arguments_options[@]}" : \+'-f[Skip command approval prompts]' \+'--force[Skip command approval prompts]' \+'--no-hooks[Skip all project hooks (pre-commit-command)]' \+'-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+;;+(squash)+_arguments "${_arguments_options[@]}" : \+'-f[Skip command approval prompts]' \+'--force[Skip command approval prompts]' \+'--no-hooks[Skip all project hooks (pre-squash-command)]' \+'-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]' \+'::target -- Target branch to squash against (defaults to default branch):_default' \+&& ret=0+;;+(push)+_arguments "${_arguments_options[@]}" : \+'--allow-merge-commits[Allow pushing merge commits (non-linear history)]' \+'-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]' \+'::target -- Target branch (defaults to default branch):_default' \+&& ret=0+;;+(rebase)+_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]' \+'::target -- Target branch to rebase onto (defaults to default branch):_default' \+&& ret=0;;esac;;@@ -410,14 +452,38 @@ _wt__config__shell_commands() {_wt__dev_commands() {local commands; commands=('run-hook:Run a project hook for testing' \+'commit:Commit changes with LLM-generated message' \+'squash:Squash commits with LLM-generated message' \+'push:Push changes to target branch' \+'rebase:Rebase current branch onto target branch' \)_describe -t commands 'wt dev commands' commands "$@"}+(( $+functions[_wt__dev__commit_commands] )) ||+_wt__dev__commit_commands() {+ local commands; commands=()+ _describe -t commands 'wt dev commit commands' commands "$@"+}+(( $+functions[_wt__dev__push_commands] )) ||+_wt__dev__push_commands() {+ local commands; commands=()+ _describe -t commands 'wt dev push commands' commands "$@"+}+(( $+functions[_wt__dev__rebase_commands] )) ||+_wt__dev__rebase_commands() {+ local commands; commands=()+ _describe -t commands 'wt dev rebase commands' commands "$@"+}(( $+functions[_wt__dev__run-hook_commands] )) ||_wt__dev__run-hook_commands() {local commands; commands=()_describe -t commands 'wt dev run-hook commands' commands "$@"}+(( $+functions[_wt__dev__squash_commands] )) ||+_wt__dev__squash_commands() {+ local commands; commands=()+ _describe -t commands 'wt dev squash commands' commands "$@"+}(( $+functions[_wt__init_commands] )) ||_wt__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 f173e25f6..075df36dc 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@@ -18,7 +18,7 @@ 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/.tmpoq8xKF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppsiALg/test-config.toml---success: trueexit_code: 0@@ -34,6 +34,7 @@ exit_code: 0β [32mSquashed 2 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 a397dafcd..c2ab6be6f 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,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBtoMwe/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGXOLHR/test-config.toml---success: trueexit_code: 0@@ -31,6 +31,7 @@ exit_code: 0β [32mSquashed 1 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 019e34ad4..c3d8b3781 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,7 +18,7 @@ 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/.tmpw4kOyY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa0yrih/test-config.toml---success: trueexit_code: 0@@ -33,6 +33,7 @@ exit_code: 0β [32mSquashed 1 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 17178ed3c..1d3ad6ca7 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,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprf8zoj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK8i1Lp/test-config.toml---success: trueexit_code: 0@@ -29,6 +29,7 @@ exit_code: 0β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 5db047502..4ca894ba6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -16,13 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiPkNmb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw1pT9Z/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex ed0277399..fdd5f07c5 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -17,12 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPwjMHL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNxX0fb/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 2 commits to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex eb8509987..8bb7e9b3f 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,13 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjOOZid/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPjP2Oj/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 3fd3e81a0..80fd8e40a 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjTXaoZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprPSs36/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 350d023d3..760ae1454 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOj6qHL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxc7RHg/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 7eb81b144..ba9779b93 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6Xgulv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGGTD8y/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex 84f71720d..872b1ca87 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg6iL0s/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpquh1wW/test-config.toml---success: trueexit_code: 0@@ -30,6 +30,7 @@ exit_code: 0β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --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 290ea9e56..e7a3950b0 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@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSPaz7H/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpecKl28/test-config.toml---success: trueexit_code: 0@@ -30,6 +30,7 @@ exit_code: 0β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snapindex a0e5143dc..9211d181a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap@@ -5,6 +5,7 @@ expression: outputExit code: 0π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mfirst[0m[0m[40m [0m [1m[34mecho [32m'STDOUT-FROM-FIRST' [36m&& [1m[34mecho [32m'STDERR-FROM-FIRST' >&2diff --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.snapindex 7e72770ff..33c5f644e 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnUhwLD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1GXQ92/test-config.toml---success: falseexit_code: 1----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge:[0m[40m [0m [1m[34mexit 1diff --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.snapindex a3e768973..60326e08f 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK2fWWa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwVFrLQ/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mexit 0diff --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.snapindex eb4873d81..9711ab160 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgjkV0P/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNmojSk/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 3cb8ce423..8bec17921 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH2jh86/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpusbLYb/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge: [1mcheck1[0m[0m[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3diff --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.snapindex 2a6dd7e79..a1d3a5eb2 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,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZtJve8/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpih5fiP/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mRunning pre-merge:[0m[40m [0m [1m[34mexit 0diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snapindex 977f47df9..dc8533d06 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWOgEtO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX4nX8J/test-config.toml---success: trueexit_code: 0@@ -27,6 +27,7 @@ exit_code: 0π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex af2c0c185..ec92bea12 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplEePPv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppEnM0q/test-config.toml---success: trueexit_code: 0@@ -33,6 +33,7 @@ exit_code: 0β [32mSquashed 3 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 b35564b66..4a2cc3918 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@@ -17,7 +17,7 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQHSiFx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZXmgNV/test-config.toml---success: trueexit_code: 0@@ -33,6 +33,7 @@ exit_code: 0β [32mSquashed 2 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex ead421d00..2cad18722 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@@ -16,13 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2vAl0t/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpn7WcLT/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commitdiff --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 b82091410..7a3c73289 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@@ -19,7 +19,7 @@ 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/.tmpUHqZqc/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkJlhWQ/test-config.toml---success: trueexit_code: 0@@ -35,6 +35,7 @@ exit_code: 0β [32mSquashed 2 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 968b2d809..c499f9ad3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -15,13 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplC6pQP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3UD0bD/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 6e8232c8d..09712a614 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -17,13 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptHYVnK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS90eIp/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0mπ [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 bcdc21e43..f4410cec7 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@@ -18,7 +18,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCnchmX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbltNyI/test-config.toml---success: trueexit_code: 0@@ -34,6 +34,7 @@ exit_code: 0β [32mSquashed 1 commits into 1[0m @ [SHA]π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m+β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main